diff options
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 598 |
1 files changed, 314 insertions, 284 deletions
diff --git a/src/w32term.c b/src/w32term.c index edcdc56a9ea..fca1ef96ad0 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -87,9 +87,6 @@ extern unsigned int msh_mousewheel; extern int w32_codepage_for_font (char *fontname); extern Cursor w32_load_cursor (LPCTSTR name); -#define x_any_window_to_frame x_window_to_frame -#define x_top_window_to_frame x_window_to_frame - /* This is display since w32 does not support multiple ones. */ struct w32_display_info one_w32_display_info; @@ -171,27 +168,25 @@ static void w32_handle_tool_bar_click (struct frame *, struct input_event *); static void w32_define_cursor (Window, Cursor); -void x_lower_frame (struct frame *); -void x_scroll_bar_clear (struct frame *); -void x_raise_frame (struct frame *); -void x_wm_set_window_state (struct frame *, int); -void x_wm_set_icon_pixmap (struct frame *, int); +static void w32_scroll_bar_clear (struct frame *); +static void w32_raise_frame (struct frame *); +static void w32_lower_frame (struct frame *); static void w32_initialize (void); -static void x_update_end (struct frame *); +static void w32_update_end (struct frame *); static void w32_frame_up_to_date (struct frame *); -static void x_clear_frame (struct frame *); +static void w32_clear_frame (struct frame *); static void w32_frame_highlight (struct frame *); static void w32_frame_unhighlight (struct frame *); -static void x_new_focus_frame (struct w32_display_info *, - struct frame *); -static void x_focus_changed (int, int, struct w32_display_info *, +static void w32_new_focus_frame (struct w32_display_info *, + struct frame *); +static void w32_focus_changed (int, int, struct w32_display_info *, struct frame *, struct input_event *); static void w32_detect_focus_change (struct w32_display_info *, W32Msg *, struct input_event *); static void w32_frame_rehighlight (struct frame *); -static void x_frame_rehighlight (struct w32_display_info *); -static void x_draw_hollow_cursor (struct window *, struct glyph_row *); -static void x_draw_bar_cursor (struct window *, struct glyph_row *, int, +static void w32_frame_rehighlight_1 (struct w32_display_info *); +static void w32_draw_hollow_cursor (struct window *, struct glyph_row *); +static void w32_draw_bar_cursor (struct window *, struct glyph_row *, int, enum text_cursor_kinds); static void w32_clip_to_row (struct window *, struct glyph_row *, enum glyph_row_area, HDC); @@ -205,7 +200,7 @@ static void my_destroy_window (struct frame *, HWND); static void w32fullscreen_hook (struct frame *); #ifdef GLYPH_DEBUG -static void x_check_font (struct frame *, struct font *); +static void w32_check_font (struct frame *, struct font *); #endif @@ -263,7 +258,7 @@ XCreateGC (void *ignore, HWND wignore, unsigned long mask, XGCValues *xgcv) return gc; } -#if 0 /* unused for now, see x_draw_image_glyph_string below */ +#if 0 /* unused for now, see w32_draw_image_glyph_string below */ static void XGetGCValues (void *ignore, XGCValues *gc, unsigned long mask, XGCValues *xgcv) @@ -306,7 +301,7 @@ w32_restore_glyph_string_clip (struct glyph_string *s) } static void -x_get_scale_factor(struct w32_display_info *dpyinfo, int *scale_x, int *scale_y) +w32_get_scale_factor(struct w32_display_info *dpyinfo, int *scale_x, int *scale_y) { const int base_res = 96; @@ -338,7 +333,7 @@ w32_draw_underwave (struct glyph_string *s, COLORREF color) struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (s->f); int scale_x, scale_y; - x_get_scale_factor (dpyinfo, &scale_x, &scale_y); + w32_get_scale_factor (dpyinfo, &scale_x, &scale_y); int wave_height = 3 * scale_y, wave_length = 2 * scale_x, thickness = scale_y; int dx, dy, x0, y0, width, x1, y1, x2, y2, odd, xmax; @@ -457,8 +452,8 @@ w32_clear_window (struct frame *f) #define OPAQUE_FRAME 255 -void -x_set_frame_alpha (struct frame *f) +static void +w32_set_frame_alpha (struct frame *f) { struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); double alpha = 1.0; @@ -504,7 +499,7 @@ x_set_frame_alpha (struct frame *f) } int -x_display_pixel_height (struct w32_display_info *dpyinfo) +w32_display_pixel_height (struct w32_display_info *dpyinfo) { int pixels = GetSystemMetrics (SM_CYVIRTUALSCREEN); @@ -516,7 +511,7 @@ x_display_pixel_height (struct w32_display_info *dpyinfo) } int -x_display_pixel_width (struct w32_display_info *dpyinfo) +w32_display_pixel_width (struct w32_display_info *dpyinfo) { int pixels = GetSystemMetrics (SM_CXVIRTUALSCREEN); @@ -534,11 +529,11 @@ x_display_pixel_width (struct w32_display_info *dpyinfo) /* Start an update of frame F. This function is installed as a hook for update_begin, i.e. it is called when update_begin is called. - This function is called prior to calls to x_update_window_begin for - each window being updated. */ + This function is called prior to calls to w32_update_window_begin + for each window being updated. */ static void -x_update_begin (struct frame *f) +w32_update_begin (struct frame *f) { struct w32_display_info *display_info = FRAME_DISPLAY_INFO (f); @@ -558,7 +553,7 @@ x_update_begin (struct frame *f) /* Start update of window W. */ static void -x_update_window_begin (struct window *w) +w32_update_window_begin (struct window *w) { struct frame *f = XFRAME (WINDOW_FRAME (w)); Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); @@ -698,7 +693,7 @@ w32_draw_window_divider (struct window *w, int x0, int x1, int y0, int y1) here. */ static void -x_update_window_end (struct window *w, bool cursor_on_p, +w32_update_window_end (struct window *w, bool cursor_on_p, bool mouse_face_overwritten_p) { if (!w->pseudo_window_p) @@ -734,7 +729,7 @@ x_update_window_end (struct window *w, bool cursor_on_p, /* Unhide the caret. This won't actually show the cursor, unless it was visible before the corresponding call to HideCaret in - x_update_window_begin. */ + w32_update_window_begin. */ if (w32_use_visible_system_caret && w32_system_caret_hwnd) { SendMessageTimeout (w32_system_caret_hwnd, WM_EMACS_SHOW_CARET, 0, 0, @@ -747,7 +742,7 @@ x_update_window_end (struct window *w, bool cursor_on_p, update_end. */ static void -x_update_end (struct frame *f) +w32_update_end (struct frame *f) { if (! FRAME_W32_P (f)) return; @@ -775,7 +770,7 @@ w32_frame_up_to_date (struct frame *f) between bitmaps to be drawn between current row and DESIRED_ROW. */ static void -x_after_update_window_line (struct window *w, struct glyph_row *desired_row) +w32_after_update_window_line (struct window *w, struct glyph_row *desired_row) { struct frame *f; int width, height; @@ -942,27 +937,27 @@ w32_destroy_fringe_bitmap (int which) /* Function prototypes of this page. */ -static void x_set_glyph_string_clipping (struct glyph_string *); -static void x_set_glyph_string_gc (struct glyph_string *); -static void x_draw_glyph_string_background (struct glyph_string *, - bool); -static void x_draw_glyph_string_foreground (struct glyph_string *); -static void x_draw_composite_glyph_string_foreground (struct glyph_string *); -static void x_draw_glyph_string_box (struct glyph_string *); -static void x_draw_glyph_string (struct glyph_string *); -static void x_set_cursor_gc (struct glyph_string *); -static void x_set_mode_line_face_gc (struct glyph_string *); -static void x_set_mouse_face_gc (struct glyph_string *); +static void w32_set_glyph_string_clipping (struct glyph_string *); +static void w32_set_glyph_string_gc (struct glyph_string *); +static void w32_draw_glyph_string_background (struct glyph_string *, + bool); +static void w32_draw_glyph_string_foreground (struct glyph_string *); +static void w32_draw_composite_glyph_string_foreground (struct glyph_string *); +static void w32_draw_glyph_string_box (struct glyph_string *); +static void w32_draw_glyph_string (struct glyph_string *); +static void w32_set_cursor_gc (struct glyph_string *); +static void w32_set_mode_line_face_gc (struct glyph_string *); +static void w32_set_mouse_face_gc (struct glyph_string *); static int w32_alloc_lighter_color (struct frame *, COLORREF *, double, int); static void w32_setup_relief_color (struct frame *, struct relief *, double, int, COLORREF); -static void x_setup_relief_colors (struct glyph_string *); -static void x_draw_image_glyph_string (struct glyph_string *); -static void x_draw_image_relief (struct glyph_string *); -static void x_draw_image_foreground (struct glyph_string *); +static void w32_setup_relief_colors (struct glyph_string *); +static void w32_draw_image_glyph_string (struct glyph_string *); +static void w32_draw_image_relief (struct glyph_string *); +static void w32_draw_image_foreground (struct glyph_string *); static void w32_draw_image_foreground_1 (struct glyph_string *, HBITMAP); -static void x_clear_glyph_string_rect (struct glyph_string *, int, - int, int, int); +static void w32_clear_glyph_string_rect (struct glyph_string *, int, + int, int, int); static void w32_draw_relief_rect (struct frame *, int, int, int, int, int, int, int, int, int, int, RECT *); @@ -974,7 +969,7 @@ static void w32_draw_box_rect (struct glyph_string *, int, int, int, int, face. */ static void -x_set_cursor_gc (struct glyph_string *s) +w32_set_cursor_gc (struct glyph_string *s) { if (s->font == FRAME_FONT (s->f) && s->face->background == FRAME_BACKGROUND_PIXEL (s->f) @@ -1010,7 +1005,7 @@ x_set_cursor_gc (struct glyph_string *s) xgcv.foreground = s->face->background; } - IF_DEBUG (x_check_font (s->f, s->font)); + IF_DEBUG (w32_check_font (s->f, s->font)); xgcv.font = s->font; mask = GCForeground | GCBackground | GCFont; @@ -1029,7 +1024,7 @@ x_set_cursor_gc (struct glyph_string *s) /* Set up S->gc of glyph string S for drawing text in mouse face. */ static void -x_set_mouse_face_gc (struct glyph_string *s) +w32_set_mouse_face_gc (struct glyph_string *s) { int face_id; struct face *face; @@ -1059,7 +1054,7 @@ x_set_mouse_face_gc (struct glyph_string *s) xgcv.background = s->face->background; xgcv.foreground = s->face->foreground; - IF_DEBUG (x_check_font (s->f, s->font)); + IF_DEBUG (w32_check_font (s->f, s->font)); xgcv.font = s->font; mask = GCForeground | GCBackground | GCFont; @@ -1082,7 +1077,7 @@ x_set_mouse_face_gc (struct glyph_string *s) matrix was built, so there isn't much to do, here. */ static inline void -x_set_mode_line_face_gc (struct glyph_string *s) +w32_set_mode_line_face_gc (struct glyph_string *s) { s->gc = s->face->gc; } @@ -1093,7 +1088,7 @@ x_set_mode_line_face_gc (struct glyph_string *s) pattern. */ static inline void -x_set_glyph_string_gc (struct glyph_string *s) +w32_set_glyph_string_gc (struct glyph_string *s) { prepare_face_for_display (s->f, s->face); @@ -1104,17 +1099,17 @@ x_set_glyph_string_gc (struct glyph_string *s) } else if (s->hl == DRAW_INVERSE_VIDEO) { - x_set_mode_line_face_gc (s); + w32_set_mode_line_face_gc (s); s->stippled_p = s->face->stipple != 0; } else if (s->hl == DRAW_CURSOR) { - x_set_cursor_gc (s); + w32_set_cursor_gc (s); s->stippled_p = false; } else if (s->hl == DRAW_MOUSE_FACE) { - x_set_mouse_face_gc (s); + w32_set_mouse_face_gc (s); s->stippled_p = s->face->stipple != 0; } else if (s->hl == DRAW_IMAGE_RAISED @@ -1135,7 +1130,7 @@ x_set_glyph_string_gc (struct glyph_string *s) line or menu if we don't have X toolkit support. */ static inline void -x_set_glyph_string_clipping (struct glyph_string *s) +w32_set_glyph_string_clipping (struct glyph_string *s) { RECT *r = s->clip; int n = get_glyph_string_clip_rects (s, r, 2); @@ -1159,8 +1154,8 @@ x_set_glyph_string_clipping (struct glyph_string *s) the area of SRC. */ static void -x_set_glyph_string_clipping_exactly (struct glyph_string *src, - struct glyph_string *dst) +w32_set_glyph_string_clipping_exactly (struct glyph_string *src, + struct glyph_string *dst) { RECT r; @@ -1205,7 +1200,7 @@ w32_compute_glyph_string_overhangs (struct glyph_string *s) /* Fill rectangle X, Y, W, H with background color of glyph string S. */ static inline void -x_clear_glyph_string_rect (struct glyph_string *s, +w32_clear_glyph_string_rect (struct glyph_string *s, int x, int y, int w, int h) { int real_x = x; @@ -1236,7 +1231,7 @@ x_clear_glyph_string_rect (struct glyph_string *s, contains the first component of a composition. */ static void -x_draw_glyph_string_background (struct glyph_string *s, bool force_p) +w32_draw_glyph_string_background (struct glyph_string *s, bool force_p) { /* Nothing to do if background has already been drawn or if it shouldn't be drawn in the first place. */ @@ -1268,7 +1263,7 @@ x_draw_glyph_string_background (struct glyph_string *s, bool force_p) || s->extends_to_end_of_line_p || force_p) { - x_clear_glyph_string_rect (s, s->x, s->y + box_line_width, + w32_clear_glyph_string_rect (s, s->x, s->y + box_line_width, s->background_width, s->height - 2 * box_line_width); s->background_filled_p = true; @@ -1280,7 +1275,7 @@ x_draw_glyph_string_background (struct glyph_string *s, bool force_p) /* Draw the foreground of glyph string S. */ static void -x_draw_glyph_string_foreground (struct glyph_string *s) +w32_draw_glyph_string_foreground (struct glyph_string *s) { int i, x; @@ -1337,7 +1332,7 @@ x_draw_glyph_string_foreground (struct glyph_string *s) /* Draw the foreground of composite glyph string S. */ static void -x_draw_composite_glyph_string_foreground (struct glyph_string *s) +w32_draw_composite_glyph_string_foreground (struct glyph_string *s) { int i, j, x; struct font *font = s->font; @@ -1432,7 +1427,7 @@ x_draw_composite_glyph_string_foreground (struct glyph_string *s) /* Draw the foreground of glyph string S for glyphless characters. */ static void -x_draw_glyphless_glyph_string_foreground (struct glyph_string *s) +w32_draw_glyphless_glyph_string_foreground (struct glyph_string *s) { struct glyph *glyph = s->first_glyph; XChar2b char2b[8]; @@ -1598,8 +1593,8 @@ w32_alloc_lighter_color (struct frame *f, COLORREF *color, /* On frame F, translate pixel colors to RGB values for the NCOLORS colors in COLORS. On W32, we no longer try to map colors to a palette. */ -void -x_query_colors (struct frame *f, XColor *colors, int ncolors) +static void +w32_query_colors (struct frame *f, XColor *colors, int ncolors) { int i; @@ -1613,12 +1608,6 @@ x_query_colors (struct frame *f, XColor *colors, int ncolors) } } -void -x_query_color (struct frame *f, XColor *color) -{ - x_query_colors (f, color, 1); -} - /* Set up the foreground color for drawing relief lines of glyph string S. RELIEF is a pointer to a struct relief containing the GC @@ -1665,7 +1654,7 @@ w32_setup_relief_color (struct frame *f, struct relief *relief, double factor, /* Set up colors for the relief lines around glyph string S. */ static void -x_setup_relief_colors (struct glyph_string *s) +w32_setup_relief_colors (struct glyph_string *s) { struct w32_output *di = s->f->output_data.w32; COLORREF color; @@ -1799,7 +1788,7 @@ w32_draw_box_rect (struct glyph_string *s, /* Draw a box around glyph string S. */ static void -x_draw_glyph_string_box (struct glyph_string *s) +w32_draw_glyph_string_box (struct glyph_string *s) { int width, left_x, right_x, top_y, bottom_y, last_x; bool left_p, right_p, raised_p; @@ -1840,7 +1829,7 @@ x_draw_glyph_string_box (struct glyph_string *s) left_p, right_p, &clip_rect); else { - x_setup_relief_colors (s); + w32_setup_relief_colors (s); w32_draw_relief_rect (s->f, left_x, top_y, right_x, bottom_y, width, raised_p, 1, 1, left_p, right_p, &clip_rect); } @@ -1850,7 +1839,7 @@ x_draw_glyph_string_box (struct glyph_string *s) /* Draw foreground of image glyph string S. */ static void -x_draw_image_foreground (struct glyph_string *s) +w32_draw_image_foreground (struct glyph_string *s) { int x = s->x; int y = s->ybase - image_ascent (s->img, s->face, &s->slice); @@ -1881,7 +1870,7 @@ x_draw_image_foreground (struct glyph_string *s) DIBSECTION dib; SetBkColor (compat_hdc, RGB (255, 255, 255)); SetTextColor (s->hdc, RGB (0, 0, 0)); - x_set_glyph_string_clipping (s); + w32_set_glyph_string_clipping (s); /* Extract the original dimensions of the bitmap. */ if (GetObject (s->img->pixmap, sizeof (dib), &dib) > 0) { @@ -1891,7 +1880,7 @@ x_draw_image_foreground (struct glyph_string *s) } else { - DebPrint (("x_draw_image_foreground: GetObject failed!\n")); + DebPrint (("w32_draw_image_foreground: GetObject failed!\n")); orig_width = s->slice.width; orig_height = s->slice.height; } @@ -2008,7 +1997,7 @@ x_draw_image_foreground (struct glyph_string *s) /* Draw a relief around the image glyph string S. */ static void -x_draw_image_relief (struct glyph_string *s) +w32_draw_image_relief (struct glyph_string *s) { int x1, y1, thick, raised_p, top_p, bot_p, left_p, right_p; int extra_x, extra_y; @@ -2071,7 +2060,7 @@ x_draw_image_relief (struct glyph_string *s) if (s->slice.y + s->slice.height == s->img->height) y1 += thick + extra_y, bot_p = 1; - x_setup_relief_colors (s); + w32_setup_relief_colors (s); get_glyph_string_clip_rect (s, &r); w32_draw_relief_rect (s->f, x, y, x1, y1, thick, raised_p, top_p, bot_p, left_p, right_p, &r); @@ -2104,7 +2093,7 @@ w32_draw_image_foreground_1 (struct glyph_string *s, HBITMAP pixmap) /* FIXME (maybe): The below doesn't support image scaling. But it seems to never be called, because the conditions for its call in - x_draw_image_glyph_string are never fulfilled (they will be if + w32_draw_image_glyph_string are never fulfilled (they will be if the #ifdef'ed away part of that function is ever activated). */ if (s->img->pixmap) { @@ -2172,7 +2161,7 @@ w32_draw_image_foreground_1 (struct glyph_string *s, HBITMAP pixmap) give the rectangle to draw. */ static void -x_draw_glyph_string_bg_rect (struct glyph_string *s, int x, int y, int w, int h) +w32_draw_glyph_string_bg_rect (struct glyph_string *s, int x, int y, int w, int h) { #if 0 /* TODO: stipple */ if (s->stippled_p) @@ -2184,7 +2173,7 @@ x_draw_glyph_string_bg_rect (struct glyph_string *s, int x, int y, int w, int h) } else #endif - x_clear_glyph_string_rect (s, x, y, w, h); + w32_clear_glyph_string_rect (s, x, y, w, h); } @@ -2203,7 +2192,7 @@ x_draw_glyph_string_bg_rect (struct glyph_string *s, int x, int y, int w, int h) */ static void -x_draw_image_glyph_string (struct glyph_string *s) +w32_draw_image_glyph_string (struct glyph_string *s) { int x, y; int box_line_hwidth = eabs (s->face->box_line_width); @@ -2281,7 +2270,7 @@ x_draw_image_glyph_string (struct glyph_string *s) } else #endif - x_draw_glyph_string_bg_rect (s, x, y, width, height); + w32_draw_glyph_string_bg_rect (s, x, y, width, height); s->background_filled_p = true; } @@ -2290,7 +2279,7 @@ x_draw_image_glyph_string (struct glyph_string *s) if (pixmap != 0) { w32_draw_image_foreground_1 (s, pixmap); - x_set_glyph_string_clipping (s); + w32_set_glyph_string_clipping (s); { HDC compat_hdc = CreateCompatibleDC (s->hdc); HBRUSH fg_brush = CreateSolidBrush (s->gc->foreground); @@ -2311,20 +2300,20 @@ x_draw_image_glyph_string (struct glyph_string *s) pixmap = 0; } else - x_draw_image_foreground (s); + w32_draw_image_foreground (s); /* If we must draw a relief around the image, do it. */ if (s->img->relief || s->hl == DRAW_IMAGE_RAISED || s->hl == DRAW_IMAGE_SUNKEN) - x_draw_image_relief (s); + w32_draw_image_relief (s); } /* Draw stretch glyph string S. */ static void -x_draw_stretch_glyph_string (struct glyph_string *s) +w32_draw_stretch_glyph_string (struct glyph_string *s) { eassert (s->first_glyph->type == STRETCH_GLYPH); @@ -2361,7 +2350,7 @@ x_draw_stretch_glyph_string (struct glyph_string *s) x -= width; /* Draw cursor. */ - x_draw_glyph_string_bg_rect (s, x, s->y, width, s->height); + w32_draw_glyph_string_bg_rect (s, x, s->y, width, s->height); /* Clear rest using the GC of the original non-cursor face. */ if (width < background_width) @@ -2379,7 +2368,7 @@ x_draw_stretch_glyph_string (struct glyph_string *s) if (s->row->mouse_face_p && cursor_in_mouse_face_p (s->w)) { - x_set_mouse_face_gc (s); + w32_set_mouse_face_gc (s); gc = s->gc; } else @@ -2416,7 +2405,7 @@ x_draw_stretch_glyph_string (struct glyph_string *s) x = left_x; } if (background_width > 0) - x_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height); + w32_draw_glyph_string_bg_rect (s, x, s->y, background_width, s->height); } s->background_filled_p = true; @@ -2426,7 +2415,7 @@ x_draw_stretch_glyph_string (struct glyph_string *s) /* Draw glyph string S. */ static void -x_draw_glyph_string (struct glyph_string *s) +w32_draw_glyph_string (struct glyph_string *s) { bool relief_drawn_p = 0; @@ -2442,18 +2431,18 @@ x_draw_glyph_string (struct glyph_string *s) width += next->width, next = next->next) if (next->first_glyph->type != IMAGE_GLYPH) { - x_set_glyph_string_gc (next); - x_set_glyph_string_clipping (next); + w32_set_glyph_string_gc (next); + w32_set_glyph_string_clipping (next); if (next->first_glyph->type == STRETCH_GLYPH) - x_draw_stretch_glyph_string (next); + w32_draw_stretch_glyph_string (next); else - x_draw_glyph_string_background (next, true); + w32_draw_glyph_string_background (next, true); next->num_clips = 0; } } /* Set up S->gc, set clipping and draw S. */ - x_set_glyph_string_gc (s); + w32_set_glyph_string_gc (s); /* Draw relief (if any) in advance for char/composition so that the glyph string can be drawn over it. */ @@ -2463,10 +2452,10 @@ x_draw_glyph_string (struct glyph_string *s) || s->first_glyph->type == COMPOSITE_GLYPH)) { - x_set_glyph_string_clipping (s); - x_draw_glyph_string_background (s, true); - x_draw_glyph_string_box (s); - x_set_glyph_string_clipping (s); + w32_set_glyph_string_clipping (s); + w32_draw_glyph_string_background (s, true); + w32_draw_glyph_string_box (s); + w32_set_glyph_string_clipping (s); relief_drawn_p = 1; } else if (!s->clip_head /* draw_glyphs didn't specify a clip mask. */ @@ -2476,26 +2465,26 @@ x_draw_glyph_string (struct glyph_string *s) /* We must clip just this glyph. left_overhang part has already drawn when s->prev was drawn, and right_overhang part will be drawn later when s->next is drawn. */ - x_set_glyph_string_clipping_exactly (s, s); + w32_set_glyph_string_clipping_exactly (s, s); else - x_set_glyph_string_clipping (s); + w32_set_glyph_string_clipping (s); switch (s->first_glyph->type) { case IMAGE_GLYPH: - x_draw_image_glyph_string (s); + w32_draw_image_glyph_string (s); break; case STRETCH_GLYPH: - x_draw_stretch_glyph_string (s); + w32_draw_stretch_glyph_string (s); break; case CHAR_GLYPH: if (s->for_overlaps) s->background_filled_p = true; else - x_draw_glyph_string_background (s, false); - x_draw_glyph_string_foreground (s); + w32_draw_glyph_string_background (s, false); + w32_draw_glyph_string_foreground (s); break; case COMPOSITE_GLYPH: @@ -2503,16 +2492,16 @@ x_draw_glyph_string (struct glyph_string *s) && ! s->first_glyph->u.cmp.automatic)) s->background_filled_p = true; else - x_draw_glyph_string_background (s, true); - x_draw_composite_glyph_string_foreground (s); + w32_draw_glyph_string_background (s, true); + w32_draw_composite_glyph_string_foreground (s); break; case GLYPHLESS_GLYPH: if (s->for_overlaps) s->background_filled_p = true; else - x_draw_glyph_string_background (s, false); - x_draw_glyphless_glyph_string_foreground (s); + w32_draw_glyph_string_background (s, false); + w32_draw_glyphless_glyph_string_foreground (s); break; default: @@ -2665,7 +2654,7 @@ x_draw_glyph_string (struct glyph_string *s) /* Draw relief if not yet drawn. */ if (!relief_drawn_p && s->face->box != FACE_NO_BOX) - x_draw_glyph_string_box (s); + w32_draw_glyph_string_box (s); if (s->prev) { @@ -2680,12 +2669,12 @@ x_draw_glyph_string (struct glyph_string *s) enum draw_glyphs_face save = prev->hl; prev->hl = s->hl; - x_set_glyph_string_gc (prev); - x_set_glyph_string_clipping_exactly (s, prev); + w32_set_glyph_string_gc (prev); + w32_set_glyph_string_clipping_exactly (s, prev); if (prev->first_glyph->type == CHAR_GLYPH) - x_draw_glyph_string_foreground (prev); + w32_draw_glyph_string_foreground (prev); else - x_draw_composite_glyph_string_foreground (prev); + w32_draw_composite_glyph_string_foreground (prev); w32_set_clip_rectangle (prev->hdc, NULL); prev->hl = save; prev->num_clips = 0; @@ -2705,12 +2694,12 @@ x_draw_glyph_string (struct glyph_string *s) enum draw_glyphs_face save = next->hl; next->hl = s->hl; - x_set_glyph_string_gc (next); - x_set_glyph_string_clipping_exactly (s, next); + w32_set_glyph_string_gc (next); + w32_set_glyph_string_clipping_exactly (s, next); if (next->first_glyph->type == CHAR_GLYPH) - x_draw_glyph_string_foreground (next); + w32_draw_glyph_string_foreground (next); else - x_draw_composite_glyph_string_foreground (next); + w32_draw_composite_glyph_string_foreground (next); w32_set_clip_rectangle (next->hdc, NULL); next->hl = save; next->num_clips = 0; @@ -2745,7 +2734,7 @@ w32_shift_glyphs_for_insert (struct frame *f, int x, int y, for X frames. */ static void -x_delete_glyphs (struct frame *f, register int n) +w32_delete_glyphs (struct frame *f, register int n) { if (! FRAME_W32_P (f)) return; @@ -2757,7 +2746,7 @@ x_delete_glyphs (struct frame *f, register int n) /* Clear entire frame. */ static void -x_clear_frame (struct frame *f) +w32_clear_frame (struct frame *f) { if (! FRAME_W32_P (f)) return; @@ -2772,7 +2761,7 @@ x_clear_frame (struct frame *f) /* We have to clear the scroll bars, too. If we have changed colors or something like that, then they should be notified. */ - x_scroll_bar_clear (f); + w32_scroll_bar_clear (f); unblock_input (); } @@ -2811,7 +2800,7 @@ w32_ring_bell (struct frame *f) lines or deleting -N lines at vertical position VPOS. */ static void -x_ins_del_lines (struct frame *f, int vpos, int n) +w32_ins_del_lines (struct frame *f, int vpos, int n) { if (! FRAME_W32_P (f)) return; @@ -2823,7 +2812,7 @@ x_ins_del_lines (struct frame *f, int vpos, int n) /* Scroll part of the display as described by RUN. */ static void -x_scroll_run (struct window *w, struct run *run) +w32_scroll_run (struct window *w, struct run *run) { struct frame *f = XFRAME (w->frame); int x, y, width, height, from_y, to_y, bottom_y; @@ -2862,7 +2851,7 @@ x_scroll_run (struct window *w, struct run *run) block_input (); - /* Cursor off. Will be switched on again in x_update_window_end. */ + /* Cursor off. Will be switched on again in w32_update_window_end. */ gui_clear_cursor (w); { @@ -2907,14 +2896,14 @@ static void w32_frame_highlight (struct frame *f) { gui_update_cursor (f, 1); - x_set_frame_alpha (f); + w32_set_frame_alpha (f); } static void w32_frame_unhighlight (struct frame *f) { gui_update_cursor (f, 1); - x_set_frame_alpha (f); + w32_set_frame_alpha (f); } /* The focus has changed. Update the frames as necessary to reflect @@ -2924,7 +2913,7 @@ w32_frame_unhighlight (struct frame *f) Lisp code can tell when the switch took place by examining the events. */ static void -x_new_focus_frame (struct w32_display_info *dpyinfo, struct frame *frame) +w32_new_focus_frame (struct w32_display_info *dpyinfo, struct frame *frame) { struct frame *old_focus = dpyinfo->w32_focus_frame; @@ -2935,7 +2924,7 @@ x_new_focus_frame (struct w32_display_info *dpyinfo, struct frame *frame) dpyinfo->w32_focus_frame = frame; if (old_focus && old_focus->auto_lower) - x_lower_frame (old_focus); + w32_lower_frame (old_focus); if (dpyinfo->w32_focus_frame && dpyinfo->w32_focus_frame->auto_raise) dpyinfo->w32_pending_autoraise_frame = dpyinfo->w32_focus_frame; @@ -2943,7 +2932,7 @@ x_new_focus_frame (struct w32_display_info *dpyinfo, struct frame *frame) dpyinfo->w32_pending_autoraise_frame = NULL; } - x_frame_rehighlight (dpyinfo); + w32_reframe_highlight_1 (dpyinfo); } @@ -2952,14 +2941,14 @@ x_new_focus_frame (struct w32_display_info *dpyinfo, struct frame *frame) a FOCUS_IN_EVENT into *BUFP. */ static void -x_focus_changed (int type, int state, struct w32_display_info *dpyinfo, +w32_focus_changed (int type, int state, struct w32_display_info *dpyinfo, struct frame *frame, struct input_event *bufp) { if (type == WM_SETFOCUS) { if (dpyinfo->w32_focus_event_frame != frame) { - x_new_focus_frame (dpyinfo, frame); + w32_new_focus_frame (dpyinfo, frame); dpyinfo->w32_focus_event_frame = frame; bufp->kind = FOCUS_IN_EVENT; XSETFRAME (bufp->frame_or_window, frame); @@ -2976,7 +2965,7 @@ x_focus_changed (int type, int state, struct w32_display_info *dpyinfo, if (dpyinfo->w32_focus_event_frame == frame) { dpyinfo->w32_focus_event_frame = 0; - x_new_focus_frame (dpyinfo, 0); + w32_new_focus_frame (dpyinfo, 0); bufp->kind = FOCUS_OUT_EVENT; XSETFRAME (bufp->frame_or_window, frame); @@ -2998,15 +2987,15 @@ w32_detect_focus_change (struct w32_display_info *dpyinfo, W32Msg *event, { struct frame *frame; - frame = x_any_window_to_frame (dpyinfo, event->msg.hwnd); + frame = w32_window_to_frame (dpyinfo, event->msg.hwnd); if (! frame) return; /* On w32, this is only called from focus events, so no switch needed. */ - x_focus_changed (event->msg.message, - (event->msg.message == WM_KILLFOCUS ? - FOCUS_IMPLICIT : FOCUS_EXPLICIT), - dpyinfo, frame, bufp); + w32_focus_changed (event->msg.message, + (event->msg.message == WM_KILLFOCUS ? + FOCUS_IMPLICIT : FOCUS_EXPLICIT), + dpyinfo, frame, bufp); } @@ -3014,9 +3003,9 @@ w32_detect_focus_change (struct w32_display_info *dpyinfo, W32Msg *event, /* Handle an event saying the mouse has moved out of an Emacs frame. */ static void -x_mouse_leave (struct w32_display_info *dpyinfo) +w32_mouse_leave (struct w32_display_info *dpyinfo) { - x_new_focus_frame (dpyinfo, dpyinfo->w32_focus_event_frame); + w32_new_focus_frame (dpyinfo, dpyinfo->w32_focus_event_frame); } #endif @@ -3033,11 +3022,11 @@ w32_frame_rehighlight (struct frame *frame) { if (! FRAME_W32_P (frame)) return; - x_frame_rehighlight (FRAME_DISPLAY_INFO (frame)); + w32_frame_rehighlight_1 (FRAME_DISPLAY_INFO (frame)); } static void -x_frame_rehighlight (struct w32_display_info *dpyinfo) +w32_frame_rehighlight_1 (struct w32_display_info *dpyinfo) { struct frame *old_highlight = dpyinfo->x_highlight_frame; @@ -3070,7 +3059,7 @@ x_frame_rehighlight (struct w32_display_info *dpyinfo) /* Convert a keysym to its name. */ char * -x_get_keysym_name (int keysym) +get_keysym_name (int keysym) { /* Make static so we can always return it */ static char value[100]; @@ -3455,7 +3444,7 @@ w32_note_mouse_movement (struct frame *frame, MSG *msg) int mouse_y = HIWORD (msg->lParam); RECT *r; - if (!FRAME_X_OUTPUT (frame)) + if (!FRAME_OUTPUT_DATA (frame)) return 0; dpyinfo = FRAME_DISPLAY_INFO (frame); @@ -3499,15 +3488,15 @@ w32_note_mouse_movement (struct frame *frame, MSG *msg) Mouse Face ************************************************************************/ -static struct scroll_bar *x_window_to_scroll_bar (Window, int); -static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *, - enum scroll_bar_part *, - Lisp_Object *, Lisp_Object *, - Time *); -static void x_horizontal_scroll_bar_report_motion (struct frame **, Lisp_Object *, - enum scroll_bar_part *, - Lisp_Object *, Lisp_Object *, - Time *); +static struct scroll_bar *w32_window_to_scroll_bar (Window, int); +static void w32_scroll_bar_report_motion (struct frame **, Lisp_Object *, + enum scroll_bar_part *, + Lisp_Object *, Lisp_Object *, + Time *); +static void w32_horizontal_scroll_bar_report_motion (struct frame **, Lisp_Object *, + enum scroll_bar_part *, + Lisp_Object *, Lisp_Object *, + Time *); static void w32_define_cursor (Window window, Cursor cursor) { @@ -3548,9 +3537,9 @@ w32_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window, struct scroll_bar *bar = dpyinfo->last_mouse_scroll_bar; if (bar->horizontal) - x_horizontal_scroll_bar_report_motion (fp, bar_window, part, x, y, time); + w32_horizontal_scroll_bar_report_motion (fp, bar_window, part, x, y, time); else - x_scroll_bar_report_motion (fp, bar_window, part, x, y, time); + w32_scroll_bar_report_motion (fp, bar_window, part, x, y, time); } else { @@ -3572,7 +3561,7 @@ w32_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window, /* If mouse was grabbed on a frame, give coords for that frame even if the mouse is now outside it. Otherwise check for window under mouse on one of our frames. */ - if (x_mouse_grabbed (dpyinfo)) + if (gui_mouse_grabbed (dpyinfo)) f1 = dpyinfo->last_mouse_frame; else { @@ -3580,14 +3569,14 @@ w32_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window, if (wfp) { - f1 = x_any_window_to_frame (dpyinfo, wfp); + f1 = w32_window_to_frame (dpyinfo, wfp); if (f1) { HWND cwfp = ChildWindowFromPoint (wfp, pt); if (cwfp) { - struct frame *f2 = x_any_window_to_frame (dpyinfo, cwfp); + struct frame *f2 = w32_window_to_frame (dpyinfo, cwfp); /* If a child window was found, make sure that its frame is a child frame (Bug#26615, maybe). */ @@ -3602,7 +3591,7 @@ w32_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window, if (! f1) { struct scroll_bar *bar - = x_window_to_scroll_bar (WindowFromPoint (pt), 2); + = w32_window_to_scroll_bar (WindowFromPoint (pt), 2); if (bar) f1 = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); @@ -3674,7 +3663,7 @@ w32_handle_tool_bar_click (struct frame *f, struct input_event *button_event) strip off mark bits. */ static struct scroll_bar * -x_window_to_scroll_bar (Window window_id, int type) +w32_window_to_scroll_bar (Window window_id, int type) { Lisp_Object tail, frame; @@ -3893,7 +3882,8 @@ my_bring_window_to_top (HWND hwnd) scroll bar. */ static struct scroll_bar * -x_scroll_bar_create (struct window *w, int left, int top, int width, int height, bool horizontal) +w32_scroll_bar_create (struct window *w, int left, int top, + int width, int height, bool horizontal) { struct frame *f = XFRAME (WINDOW_FRAME (w)); HWND hwnd; @@ -3955,7 +3945,7 @@ x_scroll_bar_create (struct window *w, int left, int top, int width, int height, nil. */ static void -x_scroll_bar_remove (struct scroll_bar *bar) +w32_scroll_bar_remove (struct scroll_bar *bar) { struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); @@ -4009,7 +3999,7 @@ w32_set_vertical_scroll_bar (struct window *w, } unblock_input (); - bar = x_scroll_bar_create (w, left, top, width, height, false); + bar = w32_scroll_bar_create (w, left, top, width, height, false); } else { @@ -4042,7 +4032,7 @@ w32_set_vertical_scroll_bar (struct window *w, for them on the frame, we have to clear "under" them. */ w32_clear_area (f, hdc, left, top, width, height); release_frame_dc (f, hdc); - x_clear_under_internal_border (f); + w32_clear_under_internal_border (f); } /* Make sure scroll bar is "visible" before moving, to ensure the area of the parent window now exposed will be refreshed. */ @@ -4113,7 +4103,7 @@ w32_set_horizontal_scroll_bar (struct window *w, } unblock_input (); - bar = x_scroll_bar_create (w, left, top, width, height, true); + bar = w32_scroll_bar_create (w, left, top, width, height, true); } else { @@ -4144,7 +4134,7 @@ w32_set_horizontal_scroll_bar (struct window *w, for them on the frame, we have to clear "under" them. */ w32_clear_area (f, hdc, clear_left, top, clear_width, height); release_frame_dc (f, hdc); - x_clear_under_internal_border (f); + w32_clear_under_internal_border (f); } /* Make sure scroll bar is "visible" before moving, to ensure the area of the parent window now exposed will be refreshed. */ @@ -4319,7 +4309,7 @@ w32_judge_scroll_bars (struct frame *f) { struct scroll_bar *b = XSCROLL_BAR (bar); - x_scroll_bar_remove (b); + w32_scroll_bar_remove (b); next = b->next; b->next = b->prev = Qnil; @@ -4563,7 +4553,7 @@ w32_horizontal_scroll_bar_handle_click (struct scroll_bar *bar, W32Msg *msg, /* Return information to the user about the current position of the mouse on the vertical scroll bar. */ static void -x_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window, +w32_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window, enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, Time *time) @@ -4613,10 +4603,10 @@ x_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window, /* Return information to the user about the current position of the mouse on the horizontal scroll bar. */ static void -x_horizontal_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window, - enum scroll_bar_part *part, - Lisp_Object *x, Lisp_Object *y, - Time *time) +w32_horizontal_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_window, + enum scroll_bar_part *part, + Lisp_Object *x, Lisp_Object *y, + Time *time) { struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp); struct scroll_bar *bar = dpyinfo->last_mouse_scroll_bar; @@ -4667,8 +4657,8 @@ x_horizontal_scroll_bar_report_motion (struct frame **fp, Lisp_Object *bar_windo Clear out the scroll bars, and ask for expose events, so we can redraw them. */ -void -x_scroll_bar_clear (struct frame *f) +static void +w32_scroll_bar_clear (struct frame *f) { Lisp_Object bar; @@ -4691,7 +4681,7 @@ x_scroll_bar_clear (struct frame *f) GetClientRect (window, &rect); select_palette (f, hdc); w32_clear_rect (f, hdc, &rect); - x_clear_under_internal_border (f); + w32_clear_under_internal_border (f); deselect_palette (f, hdc); ReleaseDC (window, hdc); @@ -4763,7 +4753,7 @@ w32_read_socket (struct terminal *terminal, switch (msg.msg.message) { case WM_EMACS_PAINT: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) { @@ -4818,14 +4808,14 @@ w32_read_socket (struct terminal *terminal, msg.rect.top, msg.rect.right - msg.rect.left, msg.rect.bottom - msg.rect.top); - x_clear_under_internal_border (f); + w32_clear_under_internal_border (f); } } break; case WM_INPUTLANGCHANGE: /* Generate a language change event. */ - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); /* lParam contains the input language ID in its low 16 bits. Use it to update our record of the keyboard codepage. */ @@ -4843,7 +4833,7 @@ w32_read_socket (struct terminal *terminal, case WM_KEYDOWN: case WM_SYSKEYDOWN: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f && !FRAME_ICONIFIED_P (f)) { @@ -4868,7 +4858,7 @@ w32_read_socket (struct terminal *terminal, case WM_UNICHAR: case WM_SYSCHAR: case WM_CHAR: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f && !FRAME_ICONIFIED_P (f)) { @@ -4946,7 +4936,7 @@ w32_read_socket (struct terminal *terminal, break; case WM_APPCOMMAND: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f && !FRAME_ICONIFIED_P (f)) { @@ -4982,8 +4972,8 @@ w32_read_socket (struct terminal *terminal, previous_help_echo_string = help_echo_string; help_echo_string = Qnil; - f = (x_mouse_grabbed (dpyinfo) ? dpyinfo->last_mouse_frame - : x_window_to_frame (dpyinfo, msg.msg.hwnd)); + f = (gui_mouse_grabbed (dpyinfo) ? dpyinfo->last_mouse_frame + : w32_window_to_frame (dpyinfo, msg.msg.hwnd)); if (hlinfo->mouse_face_hidden) { @@ -5062,8 +5052,8 @@ w32_read_socket (struct terminal *terminal, int button = 0; int up = 0; - f = (x_mouse_grabbed (dpyinfo) ? dpyinfo->last_mouse_frame - : x_window_to_frame (dpyinfo, msg.msg.hwnd)); + f = (gui_mouse_grabbed (dpyinfo) ? dpyinfo->last_mouse_frame + : w32_window_to_frame (dpyinfo, msg.msg.hwnd)); if (f) { @@ -5123,8 +5113,8 @@ w32_read_socket (struct terminal *terminal, case WM_MOUSEWHEEL: case WM_MOUSEHWHEEL: { - f = (x_mouse_grabbed (dpyinfo) ? dpyinfo->last_mouse_frame - : x_window_to_frame (dpyinfo, msg.msg.hwnd)); + f = (gui_mouse_grabbed (dpyinfo) ? dpyinfo->last_mouse_frame + : w32_window_to_frame (dpyinfo, msg.msg.hwnd)); if (f) { @@ -5142,7 +5132,7 @@ w32_read_socket (struct terminal *terminal, dpyinfo->last_mouse_frame = f; } else if (FRAME_NO_ACCEPT_FOCUS (f) - && !x_mouse_grabbed (dpyinfo)) + && !gui_mouse_grabbed (dpyinfo)) { Lisp_Object frame1 = get_frame_param (f, Qmouse_wheel_frame); struct frame *f1 = FRAMEP (frame1) ? XFRAME (frame1) : NULL; @@ -5166,7 +5156,7 @@ w32_read_socket (struct terminal *terminal, break; case WM_DROPFILES: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) w32_construct_drag_n_drop (&inev, &msg, f); @@ -5175,7 +5165,7 @@ w32_read_socket (struct terminal *terminal, case WM_HSCROLL: { struct scroll_bar *bar = - x_window_to_scroll_bar ((HWND)msg.msg.lParam, 1); + w32_window_to_scroll_bar ((HWND)msg.msg.lParam, 1); if (bar) w32_horizontal_scroll_bar_handle_click (bar, &msg, &inev); @@ -5185,7 +5175,7 @@ w32_read_socket (struct terminal *terminal, case WM_VSCROLL: { struct scroll_bar *bar = - x_window_to_scroll_bar ((HWND)msg.msg.lParam, 0); + w32_window_to_scroll_bar ((HWND)msg.msg.lParam, 0); if (bar) w32_scroll_bar_handle_click (bar, &msg, &inev); @@ -5193,7 +5183,7 @@ w32_read_socket (struct terminal *terminal, } case WM_WINDOWPOSCHANGED: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) { @@ -5240,13 +5230,13 @@ w32_read_socket (struct terminal *terminal, case WM_ACTIVATE: case WM_ACTIVATEAPP: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) { /* Run the full-screen hook function also when we are being activated, to actually install the required size in effect, if the WAIT flag is set. This is - because when the hook is run from x_set_fullscreen, + because when the hook is run from gui_set_fullscreen, the frame might not yet be visible, if that call is a result of make-frame, and in that case the hook just sets the WAIT flag. */ @@ -5264,11 +5254,11 @@ w32_read_socket (struct terminal *terminal, break; case WM_MOVE: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f && FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P(f)) { - x_real_positions (f, &f->left_pos, &f->top_pos); + w32_real_positions (f, &f->left_pos, &f->top_pos); inev.kind = MOVE_FRAME_EVENT; XSETFRAME (inev.frame_or_window, f); } @@ -5283,7 +5273,7 @@ w32_read_socket (struct terminal *terminal, if (!msg.msg.wParam && msg.msg.hwnd == tip_window) { tip_window = NULL; - x_redo_mouse_highlight (dpyinfo); + gui_redo_mouse_highlight (dpyinfo); } /* If window has been obscured or exposed by another window @@ -5295,20 +5285,20 @@ w32_read_socket (struct terminal *terminal, check_visibility = 1; else { - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); f->async_visible = msg.msg.wParam; } #endif - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) - x_clear_under_internal_border (f); + w32_clear_under_internal_border (f); check_visibility = 1; break; case WM_SIZE: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); /* Inform lisp of whether frame has been iconified etc. */ if (f) @@ -5344,7 +5334,7 @@ w32_read_socket (struct terminal *terminal, BEFORE telling us the Window is minimized when the Window is iconified, with 3000,3000 as the co-ords. */ - x_real_positions (f, &x, &y); + w32_real_positions (f, &x, &y); f->left_pos = x; f->top_pos = y; @@ -5368,7 +5358,7 @@ w32_read_socket (struct terminal *terminal, { int x, y; - x_real_positions (f, &x, &y); + w32_real_positions (f, &x, &y); if (x < 0 && y < 0) store_frame_param (f, Qfullscreen, Qmaximized); } @@ -5399,7 +5389,7 @@ w32_read_socket (struct terminal *terminal, BEFORE telling us the Window is minimized when the Window is iconified, with 3000,3000 as the co-ords. */ - x_real_positions (f, &f->left_pos, &f->top_pos); + w32_real_positions (f, &f->left_pos, &f->top_pos); inev.kind = DEICONIFY_EVENT; XSETFRAME (inev.frame_or_window, f); @@ -5463,7 +5453,7 @@ w32_read_socket (struct terminal *terminal, break; case WM_MOUSELEAVE: - f = x_any_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) { if (f == hlinfo->mouse_face_mouse_frame) @@ -5492,7 +5482,7 @@ w32_read_socket (struct terminal *terminal, case WM_KILLFOCUS: w32_detect_focus_change (dpyinfo, &msg, &inev); - f = x_top_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) { @@ -5517,7 +5507,7 @@ w32_read_socket (struct terminal *terminal, break; case WM_CLOSE: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) { @@ -5531,7 +5521,7 @@ w32_read_socket (struct terminal *terminal, break; case WM_INITMENU: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) { @@ -5541,7 +5531,7 @@ w32_read_socket (struct terminal *terminal, break; case WM_COMMAND: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) { @@ -5552,7 +5542,7 @@ w32_read_socket (struct terminal *terminal, break; case WM_DISPLAYCHANGE: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) { @@ -5564,7 +5554,7 @@ w32_read_socket (struct terminal *terminal, The following code is untested yet. */ if (!NILP (fullscreen)) { - x_set_fullscreen (f, fullscreen, fullscreen); + gui_set_fullscreen (f, fullscreen, fullscreen); w32fullscreen_hook (f); } @@ -5578,7 +5568,7 @@ w32_read_socket (struct terminal *terminal, #if HAVE_W32NOTIFY case WM_EMACS_FILENOTIFY: - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + f = w32_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) w32_queue_notifications (&inev, &msg, f, &count); break; @@ -5636,7 +5626,7 @@ w32_read_socket (struct terminal *terminal, raise it now. FIXME: handle more than one such frame. */ if (dpyinfo->w32_pending_autoraise_frame) { - x_raise_frame (dpyinfo->w32_pending_autoraise_frame); + w32_raise_frame (dpyinfo->w32_pending_autoraise_frame); dpyinfo->w32_pending_autoraise_frame = NULL; } @@ -5748,7 +5738,7 @@ w32_clip_to_row (struct window *w, struct glyph_row *row, /* Draw a hollow box cursor on window W in glyph row ROW. */ static void -x_draw_hollow_cursor (struct window *w, struct glyph_row *row) +w32_draw_hollow_cursor (struct window *w, struct glyph_row *row) { struct frame *f = XFRAME (WINDOW_FRAME (w)); HDC hdc; @@ -5797,7 +5787,7 @@ x_draw_hollow_cursor (struct window *w, struct glyph_row *row) --gerd. */ static void -x_draw_bar_cursor (struct window *w, struct glyph_row *row, +w32_draw_bar_cursor (struct window *w, struct glyph_row *row, int width, enum text_cursor_kinds kind) { struct frame *f = XFRAME (w->frame); @@ -5976,7 +5966,7 @@ w32_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, switch (cursor_type) { case HOLLOW_BOX_CURSOR: - x_draw_hollow_cursor (w, glyph_row); + w32_draw_hollow_cursor (w, glyph_row); break; case FILLED_BOX_CURSOR: @@ -5984,11 +5974,11 @@ w32_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, break; case BAR_CURSOR: - x_draw_bar_cursor (w, glyph_row, cursor_width, BAR_CURSOR); + w32_draw_bar_cursor (w, glyph_row, cursor_width, BAR_CURSOR); break; case HBAR_CURSOR: - x_draw_bar_cursor (w, glyph_row, cursor_width, HBAR_CURSOR); + w32_draw_bar_cursor (w, glyph_row, cursor_width, HBAR_CURSOR); break; case NO_CURSOR: @@ -6005,8 +5995,8 @@ w32_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, /* Icons. */ -bool -x_bitmap_icon (struct frame *f, Lisp_Object icon) +static bool +w32_bitmap_icon (struct frame *f, Lisp_Object icon) { HANDLE main_icon; HANDLE small_icon = NULL; @@ -6093,8 +6083,8 @@ x_io_error_quitter (display) /* Changing the font of the frame. */ -Lisp_Object -x_new_font (struct frame *f, Lisp_Object font_object, int fontset) +static Lisp_Object +w32_new_font (struct frame *f, Lisp_Object font_object, int fontset) { struct font *font = XFONT_OBJECT (font_object); int unit, font_ascent, font_descent; @@ -6126,7 +6116,7 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset) } /* Now make the frame display the given font. */ - if (FRAME_X_WINDOW (f) != 0) + if (FRAME_NATIVE_WINDOW (f) != 0) { /* Don't change the size of a tip frame; there's no point in doing it because it's done in Fx_show_tip, and it leads to @@ -6162,7 +6152,7 @@ xim_close_dpy (dpyinfo) from its current recorded position values and gravity. */ static void -x_calc_absolute_position (struct frame *f) +w32_calc_absolute_position (struct frame *f) { int flags = f->size_hint_flags; @@ -6245,7 +6235,7 @@ x_calc_absolute_position (struct frame *f) + f->left_pos - left_right_borders_width); else - f->left_pos = (x_display_pixel_width (FRAME_DISPLAY_INFO (f)) + f->left_pos = (w32_display_pixel_width (FRAME_DISPLAY_INFO (f)) + display_left - FRAME_PIXEL_WIDTH (f) + f->left_pos @@ -6260,7 +6250,7 @@ x_calc_absolute_position (struct frame *f) + f->top_pos - top_bottom_borders_height); else - f->top_pos = (x_display_pixel_height (FRAME_DISPLAY_INFO (f)) + f->top_pos = (w32_display_pixel_height (FRAME_DISPLAY_INFO (f)) + display_top - FRAME_PIXEL_HEIGHT (f) + f->top_pos @@ -6274,13 +6264,13 @@ x_calc_absolute_position (struct frame *f) /* CHANGE_GRAVITY is 1 when calling from Fset_frame_position, to really change the position, and 0 when calling from - x_make_frame_visible (in that case, XOFF and YOFF are the current - position values). It is -1 when calling from x_set_frame_parameters, + w32_make_frame_visible (in that case, XOFF and YOFF are the current + position values). It is -1 when calling from gui_set_frame_parameters, which means, do adjust for borders but don't change the gravity. */ -void -x_set_offset (struct frame *f, register int xoff, register int yoff, - int change_gravity) +static void +w32_set_offset (struct frame *f, register int xoff, register int yoff, + int change_gravity) { int modified_top, modified_left; @@ -6295,10 +6285,10 @@ x_set_offset (struct frame *f, register int xoff, register int yoff, f->size_hint_flags |= YNegative; f->win_gravity = NorthWestGravity; } - x_calc_absolute_position (f); + w32_calc_absolute_position (f); block_input (); - x_wm_set_size_hint (f, (long) 0, false); + w32_wm_set_size_hint (f, (long) 0, false); modified_left = f->left_pos; modified_top = f->top_pos; @@ -6417,13 +6407,13 @@ w32fullscreen_hook (struct frame *f) f->want_fullscreen |= FULLSCREEN_WAIT; } -/* Call this to change the size of frame F's x-window. +/* Call this to change the size of frame F's native window. If CHANGE_GRAVITY, change to top-left-corner window gravity for this size change and subsequent size changes. Otherwise we leave the window gravity unchanged. */ -void -x_set_window_size (struct frame *f, bool change_gravity, +static void +w32_set_window_size (struct frame *f, bool change_gravity, int width, int height, bool pixelwise) { int pixelwidth, pixelheight; @@ -6472,7 +6462,7 @@ x_set_window_size (struct frame *f, bool change_gravity, } f->win_gravity = NorthWestGravity; - x_wm_set_size_hint (f, (long) 0, false); + w32_wm_set_size_hint (f, (long) 0, false); rect.left = rect.top = 0; rect.right = pixelwidth; @@ -6582,6 +6572,20 @@ frame_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y) unblock_input (); } +static Lisp_Object +w32_get_focus_frame (struct frame *f) +{ + Lisp_Object lisp_focus; + + struct frame *focus = FRAME_DISPLAY_INFO (f)->w32_focus_frame; + + if (!focus) + return Qnil; + + XSETFRAME (lisp_focus, focus); + return lisp_focus; +} + /* Focus shifting, raising and lowering. */ @@ -6589,8 +6593,8 @@ frame_set_mouse_pixel_position (struct frame *f, int pix_x, int pix_y) Windows API: An application cannot activate an inactive window without also bringing it to the top of the Z order. */ -void -x_focus_frame (struct frame *f, bool noactivate) +static void +w32_focus_frame (struct frame *f, bool noactivate) { #if 0 struct w32_display_info *dpyinfo = &one_w32_display_info; @@ -6600,7 +6604,7 @@ x_focus_frame (struct frame *f, bool noactivate) block_input (); #if 0 /* Try not to change its Z-order if possible. */ - if (x_window_to_frame (dpyinfo, GetForegroundWindow ())) + if (w32_window_to_frame (dpyinfo, GetForegroundWindow ())) my_set_focus (f, FRAME_W32_WINDOW (f)); else #endif @@ -6609,8 +6613,8 @@ x_focus_frame (struct frame *f, bool noactivate) } /* Raise frame F. */ -void -x_raise_frame (struct frame *f) +static void +w32_raise_frame (struct frame *f) { block_input (); @@ -6671,8 +6675,8 @@ x_raise_frame (struct frame *f) } /* Lower frame F. */ -void -x_lower_frame (struct frame *f) +static void +w32_lower_frame (struct frame *f) { block_input (); my_set_window_pos (FRAME_W32_WINDOW (f), @@ -6689,9 +6693,9 @@ w32_frame_raise_lower (struct frame *f, bool raise_flag) return; if (raise_flag) - x_raise_frame (f); + w32_raise_frame (f); else - x_lower_frame (f); + w32_lower_frame (f); } /* Change of visibility. */ @@ -6705,17 +6709,17 @@ w32_frame_raise_lower (struct frame *f, bool raise_flag) finishes with it. */ void -x_make_frame_visible (struct frame *f) +w32_make_frame_visible (struct frame *f) { block_input (); - x_set_bitmap_icon (f); + gui_set_bitmap_icon (f); if (! FRAME_VISIBLE_P (f)) { /* We test FRAME_GARBAGED_P here to make sure we don't - call x_set_offset a second time - if we get to x_make_frame_visible a second time + call w32_set_offset a second time + if we get to w32_make_frame_visible a second time before the window gets really visible. */ if (! FRAME_ICONIFIED_P (f) && ! f->output_data.w32->asked_for_visible) @@ -6736,7 +6740,7 @@ x_make_frame_visible (struct frame *f) workarea_rect.top); } - x_set_offset (f, f->left_pos, f->top_pos, 0); + w32_set_offset (f, f->left_pos, f->top_pos, 0); } f->output_data.w32->asked_for_visible = 1; @@ -6807,7 +6811,7 @@ x_make_frame_visible (struct frame *f) /* Make the frame visible (mapped and not iconified). */ void -x_make_frame_invisible (struct frame *f) +w32_make_frame_invisible (struct frame *f) { /* Don't keep the highlight on an invisible frame. */ if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f) @@ -6828,10 +6832,19 @@ x_make_frame_invisible (struct frame *f) unblock_input (); } +static void +w32_make_frame_visible_invisible (struct frame *f, bool visible) +{ + if (visible) + w32_make_frame_visible (f); + else + w32_make_frame_invisible (f); +} + /* Change window state from mapped to iconified. */ void -x_iconify_frame (struct frame *f) +w32_iconify_frame (struct frame *f) { /* Don't keep the highlight on an invisible frame. */ if (FRAME_DISPLAY_INFO (f)->x_highlight_frame == f) @@ -6842,7 +6855,7 @@ x_iconify_frame (struct frame *f) block_input (); - x_set_bitmap_icon (f); + gui_set_bitmap_icon (f); /* Simulate the user minimizing the frame. */ SendMessageTimeout (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MINIMIZE, 0, @@ -6855,10 +6868,10 @@ x_iconify_frame (struct frame *f) } -/* Free X resources of frame F. */ +/* Free resources of frame F. */ void -x_free_frame_resources (struct frame *f) +w32_free_frame_resources (struct frame *f) { struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); @@ -6893,11 +6906,11 @@ x_free_frame_resources (struct frame *f) /* Destroy the window of frame F. */ static void -x_destroy_window (struct frame *f) +w32_destroy_window (struct frame *f) { struct w32_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); - x_free_frame_resources (f); + w32_free_frame_resources (f); dpyinfo->reference_count--; } @@ -6910,7 +6923,7 @@ x_destroy_window (struct frame *f) If USER_POSITION, set the USPosition flag (this is useful when FLAGS is 0). */ void -x_wm_set_size_hint (struct frame *f, long flags, bool user_position) +w32_wm_set_size_hint (struct frame *f, long flags, bool user_position) { Window window = FRAME_W32_WINDOW (f); @@ -6935,7 +6948,7 @@ x_wm_set_size_hint (struct frame *f, long flags, bool user_position) font table. */ static void -x_check_font (struct frame *f, struct font *font) +w32_check_font (struct frame *f, struct font *font) { eassert (font != NULL && ! NILP (font->props[FONT_TYPE_INDEX])); if (font->driver->check) @@ -6951,7 +6964,7 @@ w32_show_hourglass (struct frame *f) { if (!menubar_in_use && !current_popup_menu) { - struct w32_output *w32 = FRAME_X_OUTPUT (f); + struct w32_output *w32 = FRAME_OUTPUT_DATA (f); w32->hourglass_p = 1; SetCursor (w32->hourglass_cursor); @@ -6963,7 +6976,7 @@ w32_show_hourglass (struct frame *f) static void w32_hide_hourglass (struct frame *f) { - struct w32_output *w32 = FRAME_X_OUTPUT (f); + struct w32_output *w32 = FRAME_OUTPUT_DATA (f); w32->hourglass_p = 0; if (f->pointer_invisible) @@ -7099,10 +7112,10 @@ static struct redisplay_interface w32_redisplay_interface = gui_write_glyphs, gui_insert_glyphs, gui_clear_end_of_line, - x_scroll_run, - x_after_update_window_line, - x_update_window_begin, - x_update_window_end, + w32_scroll_run, + w32_after_update_window_line, + w32_update_window_begin, + w32_update_window_end, 0, /* flush_display */ gui_clear_window_mouse_face, gui_get_glyph_overhangs, @@ -7111,9 +7124,10 @@ static struct redisplay_interface w32_redisplay_interface = w32_define_fringe_bitmap, w32_destroy_fringe_bitmap, w32_compute_glyph_string_overhangs, - x_draw_glyph_string, + w32_draw_glyph_string, w32_define_frame_cursor, w32_clear_frame_area, + w32_clear_under_internal_border, w32_draw_window_cursor, w32_draw_vertical_window_border, w32_draw_window_divider, @@ -7122,7 +7136,7 @@ static struct redisplay_interface w32_redisplay_interface = w32_hide_hourglass }; -static void x_delete_terminal (struct terminal *term); +static void w32_delete_terminal (struct terminal *term); static struct terminal * w32_create_terminal (struct w32_display_info *dpyinfo) @@ -7136,28 +7150,44 @@ w32_create_terminal (struct w32_display_info *dpyinfo) /* MSVC does not type K&R functions with no arguments correctly, and so we must explicitly cast them. */ - terminal->clear_frame_hook = x_clear_frame; - terminal->ins_del_lines_hook = x_ins_del_lines; - terminal->delete_glyphs_hook = x_delete_glyphs; + terminal->clear_frame_hook = w32_clear_frame; + terminal->ins_del_lines_hook = w32_ins_del_lines; + terminal->delete_glyphs_hook = w32_delete_glyphs; terminal->ring_bell_hook = w32_ring_bell; terminal->toggle_invisible_pointer_hook = w32_toggle_invisible_pointer; - terminal->update_begin_hook = x_update_begin; - terminal->update_end_hook = x_update_end; + terminal->update_begin_hook = w32_update_begin; + terminal->update_end_hook = w32_update_end; terminal->read_socket_hook = w32_read_socket; terminal->frame_up_to_date_hook = w32_frame_up_to_date; + terminal->query_colors = w32_query_colors; terminal->mouse_position_hook = w32_mouse_position; + terminal->get_focus_frame = w32_get_focus_frame; + terminal->focus_frame_hook = w32_focus_frame; terminal->frame_rehighlight_hook = w32_frame_rehighlight; terminal->frame_raise_lower_hook = w32_frame_raise_lower; + terminal->frame_visible_invisible_hook = w32_make_frame_visible_invisible; terminal->fullscreen_hook = w32fullscreen_hook; + terminal->iconify_frame_hook = w32_iconify_frame; + terminal->set_window_size_hook = w32_set_window_size; + terminal->set_frame_offset_hook = w32_set_offset; + terminal->set_frame_alpha_hook = w32_set_frame_alpha; + terminal->set_new_font_hook = w32_new_font; + terminal->set_bitmap_icon_hook = w32_bitmap_icon; + terminal->implicit_set_name_hook = w32_implicitly_set_name; terminal->menu_show_hook = w32_menu_show; + terminal->activate_menubar_hook = w32_activate_menubar; terminal->popup_dialog_hook = w32_popup_dialog; + terminal->change_tool_bar_height_hook = w32_change_tool_bar_height; terminal->set_vertical_scroll_bar_hook = w32_set_vertical_scroll_bar; terminal->set_horizontal_scroll_bar_hook = w32_set_horizontal_scroll_bar; + terminal->set_scroll_bar_default_width_hook = w32_set_scroll_bar_default_width; + terminal->set_scroll_bar_default_height_hook = w32_set_scroll_bar_default_height; terminal->condemn_scroll_bars_hook = w32_condemn_scroll_bars; terminal->redeem_scroll_bar_hook = w32_redeem_scroll_bar; terminal->judge_scroll_bars_hook = w32_judge_scroll_bars; - terminal->delete_frame_hook = x_destroy_window; - terminal->delete_terminal_hook = x_delete_terminal; + terminal->get_string_resource_hook = w32_get_string_resource; + terminal->delete_frame_hook = w32_destroy_window; + terminal->delete_terminal_hook = w32_delete_terminal; /* Other hooks are NULL by default. */ /* We don't yet support separate terminals on W32, so don't try to share @@ -7175,7 +7205,7 @@ w32_create_terminal (struct w32_display_info *dpyinfo) } static void -x_delete_terminal (struct terminal *terminal) +w32_delete_terminal (struct terminal *terminal) { struct w32_display_info *dpyinfo = terminal->display_info.w32; @@ -7186,7 +7216,7 @@ x_delete_terminal (struct terminal *terminal) block_input (); - x_delete_display (dpyinfo); + w32_delete_display (dpyinfo); unblock_input (); } @@ -7213,7 +7243,7 @@ w32_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) /* Set the name of the terminal. */ terminal->name = xlispstrdup (display_name); - dpyinfo->xrdb = xrm_option ? w32_make_rdb (xrm_option) : NULL; + dpyinfo->rdb = xrm_option ? w32_make_rdb (xrm_option) : NULL; /* Put this display on the chain. */ dpyinfo->next = x_display_list; @@ -7262,7 +7292,7 @@ w32_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) /* Get rid of display DPYINFO, assuming all frames are already gone. */ void -x_delete_display (struct w32_display_info *dpyinfo) +w32_delete_display (struct w32_display_info *dpyinfo) { /* FIXME: the only display info apparently can't be deleted. */ /* free palette table */ |