X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/706ddb8f9a2b4817c60501b27de0af41844a2b4f..6de0e1a2931f6b91a0fc8de1960e86dfb714def2:/src/w32term.c diff --git a/src/w32term.c b/src/w32term.c index 73740b2555..96d26344b5 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1,6 +1,6 @@ /* Implementation of GUI terminal on the Microsoft W32 API. - Copyright (C) 1989, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -16,8 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include #include @@ -59,131 +59,36 @@ Boston, MA 02111-1307, USA. */ #define abs(x) ((x) < 0 ? -(x) : (x)) -#define BETWEEN(X, LOWER, UPPER) ((X) >= (LOWER) && (X) < (UPPER)) - /* Fringe bitmaps. */ -enum fringe_bitmap_type -{ - NO_FRINGE_BITMAP, - LEFT_TRUNCATION_BITMAP, - RIGHT_TRUNCATION_BITMAP, - OVERLAY_ARROW_BITMAP, - CONTINUED_LINE_BITMAP, - CONTINUATION_LINE_BITMAP, - ZV_LINE_BITMAP -}; - -/* Bitmaps are all unsigned short, as Windows requires bitmap data to - be Word aligned. For some reason they are horizontally reflected - compared to how they appear on X, so changes in xterm.c should be - reflected here. */ - -/* Bitmap drawn to indicate lines not displaying text if - `indicate-empty-lines' is non-nil. */ - -#define zv_width 8 -#define zv_height 72 -#define zv_period 3 -static unsigned short zv_bits[] = { - 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, - 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, - 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, - 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, - 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, - 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, - 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, - 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00}; -static HBITMAP zv_bmp; - -/* An arrow like this: `<-'. */ - -#define left_width 8 -#define left_height 8 -static unsigned short left_bits[] = { - 0x18, 0x30, 0x60, 0xfc, 0xfc, 0x60, 0x30, 0x18}; -static HBITMAP left_bmp; - -/* Right truncation arrow bitmap `->'. */ - -#define right_width 8 -#define right_height 8 -static unsigned short right_bits[] = { - 0x18, 0x0c, 0x06, 0x3f, 0x3f, 0x06, 0x0c, 0x18}; -static HBITMAP right_bmp; - -/* Marker for continued lines. */ - -#define continued_width 8 -#define continued_height 8 -static unsigned short continued_bits[] = { - 0x3c, 0x3e, 0x03, 0x27, 0x3f, 0x3e, 0x3c, 0x3e}; -static HBITMAP continued_bmp; - -/* Marker for continuation lines. */ - -#define continuation_width 8 -#define continuation_height 8 -static unsigned short continuation_bits[] = { - 0x3c, 0x7c, 0xc0, 0xe4, 0xfc, 0x7c, 0x3c, 0x7c}; -static HBITMAP continuation_bmp; - -/* Overlay arrow bitmap. */ - -#if 0 -/* A bomb. */ -#define ov_width 8 -#define ov_height 8 -static unsigned short ov_bits[] = { - 0x0c, 0x10, 0x3c, 0x7e, 0x5e, 0x5e, 0x46, 0x3c}; -#else -/* A triangular arrow. */ -#define ov_width 8 -#define ov_height 8 -static unsigned short ov_bits[] = { - 0xc0, 0xf0, 0xf8, 0xfc, 0xfc, 0xf8, 0xf0, 0xc0}; -#endif -static HBITMAP ov_bmp; - -extern Lisp_Object Qhelp_echo; +static int max_fringe_bmp = 0; +static HBITMAP *fringe_bmp = 0; - /* Non-nil means Emacs uses toolkit scroll bars. */ Lisp_Object Vx_toolkit_scroll_bars; -/* If a string, w32_read_socket generates an event to display that string. - (The display is done in read_char.) */ - -static Lisp_Object help_echo; -static Lisp_Object help_echo_window; -static Lisp_Object help_echo_object; -static int help_echo_pos; - /* Temporary variables for w32_read_socket. */ -static Lisp_Object previous_help_echo; static int last_mousemove_x = 0; static int last_mousemove_y = 0; +/* Define GET_WHEEL_DELTA_WPARAM macro if system headers don't. */ +#ifndef GET_WHEEL_DELTA_WPARAM +#define GET_WHEEL_DELTA_WPARAM(wparam) ((short)HIWORD (wparam)) +#endif + /* Non-zero means that a HELP_EVENT has been generated since Emacs start. */ static int any_help_event_p; -/* Non-zero means autoselect window with the mouse cursor. */ - -int mouse_autoselect_window; - -/* Non-zero means draw block and hollow cursor as wide as the glyph - under it. For example, if a block cursor is over a tab, it will be - drawn as wide as that tab on the display. */ - -int x_stretch_cursor_p; - -/* Non-zero means make use of UNDERLINE_POSITION font properties. */ +/* Last window where we saw the mouse. Used by mouse-autoselect-window. */ +static Lisp_Object last_window; +/* Non-zero means make use of UNDERLINE_POSITION font properties. + (Not yet supported, see TODO in x_draw_glyph_string.) */ int x_use_underline_position_properties; extern unsigned int msh_mousewheel; @@ -191,6 +96,7 @@ extern unsigned int msh_mousewheel; extern void free_frame_menubar (); extern int w32_codepage_for_font (char *fontname); +extern Cursor w32_load_cursor (LPCTSTR name); extern glyph_metric *w32_BDF_TextMetric(bdffont *fontp, unsigned char *text, int dim); @@ -220,12 +126,6 @@ extern struct frame *updating_frame; /* This is a frame waiting to be autoraised, within w32_read_socket. */ struct frame *pending_autoraise_frame; -/* Nominal cursor position -- where to draw output. - HPOS and VPOS are window relative glyph matrix coordinates. - X and Y are window relative pixel coordinates. */ - -struct cursor_pos output_cursor; - /* The handle of the frame that currently owns the system caret. */ HWND w32_system_caret_hwnd; int w32_system_caret_height; @@ -238,6 +138,9 @@ int w32_use_visible_system_caret; for Far East languages. */ int w32_enable_unicode_output; +/* Flag to enable Cleartype hack for font metrics. */ +static int cleartype_active; + DWORD dwWindowsThreadId = 0; HANDLE hWindowsThread = NULL; DWORD dwMainThreadId = 0; @@ -279,11 +182,10 @@ int last_scroll_bar_drag_pos; /* Where the mouse was last time we reported a mouse event. */ -FRAME_PTR last_mouse_frame; static RECT last_mouse_glyph; static Lisp_Object last_mouse_press_frame; -Lisp_Object Vw32_num_mouse_buttons; +int w32_num_mouse_buttons; Lisp_Object Vw32_swap_mouse_buttons; @@ -327,8 +229,6 @@ static int input_signal_count; extern Lisp_Object Vcommand_line_args, Vsystem_name; -extern Lisp_Object Qface, Qmouse_face; - #ifndef USE_CRT_DLL extern int errno; #endif @@ -337,38 +237,11 @@ extern int errno; extern EMACS_INT extra_keyboard_modifiers; -/* Enumeration for overriding/changing the face to use for drawing - glyphs in x_draw_glyphs. */ - -enum draw_glyphs_face -{ - DRAW_NORMAL_TEXT, - DRAW_INVERSE_VIDEO, - DRAW_CURSOR, - DRAW_MOUSE_FACE, - DRAW_IMAGE_RAISED, - DRAW_IMAGE_SUNKEN -}; - static void x_update_window_end P_ ((struct window *, int, int)); -static void frame_to_window_pixel_xy P_ ((struct window *, int *, int *)); void w32_delete_display P_ ((struct w32_display_info *)); -static int fast_find_position P_ ((struct window *, int, int *, int *, - int *, int *, Lisp_Object)); -static int fast_find_string_pos P_ ((struct window *, int, Lisp_Object, - int *, int *, int *, int *, int)); -static void set_output_cursor P_ ((struct cursor_pos *)); -static struct glyph *x_y_to_hpos_vpos P_ ((struct window *, int, int, - int *, int *, int *, int)); -static void note_mode_line_highlight P_ ((struct window *, int, int)); -static void note_mouse_highlight P_ ((struct frame *, int, int)); -static void note_tool_bar_highlight P_ ((struct frame *f, int, int)); static void w32_handle_tool_bar_click P_ ((struct frame *, struct input_event *)); -static void show_mouse_face P_ ((struct w32_display_info *, - enum draw_glyphs_face)); -static int cursor_in_mouse_face_p P_ ((struct window *)); -static int clear_mouse_face P_ ((struct w32_display_info *)); +void w32_define_cursor P_ ((Window, Cursor)); void x_lower_frame P_ ((struct frame *)); void x_scroll_bar_clear P_ ((struct frame *)); @@ -380,53 +253,30 @@ void x_wm_set_icon_pixmap P_ ((struct frame *, int)); void w32_initialize P_ ((void)); static void x_font_min_bounds P_ ((XFontStruct *, int *, int *)); int x_compute_min_glyph_bounds P_ ((struct frame *)); -static void x_draw_phys_cursor_glyph P_ ((struct window *, - struct glyph_row *, - enum draw_glyphs_face)); static void x_update_end P_ ((struct frame *)); static void w32_frame_up_to_date P_ ((struct frame *)); static void w32_set_terminal_modes P_ ((void)); static void w32_reset_terminal_modes P_ ((void)); -static void w32_cursor_to P_ ((int, int, int, int)); -static void x_write_glyphs P_ ((struct glyph *, int)); -static void x_clear_end_of_line P_ ((int)); static void x_clear_frame P_ ((void)); -static void x_clear_cursor P_ ((struct window *)); static void frame_highlight P_ ((struct frame *)); static void frame_unhighlight P_ ((struct frame *)); static void x_new_focus_frame P_ ((struct w32_display_info *, struct frame *)); +static void x_focus_changed P_ ((int, int, struct w32_display_info *, + struct frame *, struct input_event *)); +static void w32_detect_focus_change P_ ((struct w32_display_info *, + W32Msg *, struct input_event *)); static void w32_frame_rehighlight P_ ((struct frame *)); static void x_frame_rehighlight P_ ((struct w32_display_info *)); static void x_draw_hollow_cursor P_ ((struct window *, struct glyph_row *)); static void x_draw_bar_cursor P_ ((struct window *, struct glyph_row *, int, enum text_cursor_kinds)); -static void expose_frame P_ ((struct frame *, int, int, int, int)); -static int expose_window_tree P_ ((struct window *, RECT *)); -static void expose_overlaps P_ ((struct window *, struct glyph_row *, - struct glyph_row *)); -static int expose_window P_ ((struct window *, RECT *)); -static void expose_area P_ ((struct window *, struct glyph_row *, - RECT *, enum glyph_row_area)); -static int expose_line P_ ((struct window *, struct glyph_row *, - RECT *)); -void x_update_cursor P_ ((struct frame *, int)); -static void x_update_cursor_in_window_tree P_ ((struct window *, int)); -static void x_update_window_cursor P_ ((struct window *, int)); -static void x_erase_phys_cursor P_ ((struct window *)); -void x_display_cursor P_ ((struct window *w, int, int, int, int, int)); -void x_display_and_set_cursor P_ ((struct window *, int, int, int, int, int)); -static void w32_draw_fringe_bitmap P_ ((struct window *, HDC hdc, - struct glyph_row *, - enum fringe_bitmap_type, int left_p)); -static void w32_clip_to_row P_ ((struct window *, struct glyph_row *, - HDC, int)); -static int x_phys_cursor_in_rect_p P_ ((struct window *, RECT *)); -static void x_draw_row_fringe_bitmaps P_ ((struct window *, - struct glyph_row *)); -static void notice_overwritten_cursor P_ ((struct window *, - enum glyph_row_area, - int, int, int, int)); +static void w32_clip_to_row P_ ((struct window *, struct glyph_row *, int, HDC)); +static BOOL my_show_window P_ ((struct frame *, HWND, int)); +static void my_set_window_pos P_ ((HWND, HWND, int, int, int, int, UINT)); +static void my_set_focus P_ ((struct frame *, HWND)); +static void my_set_foreground_window P_ ((HWND)); +static void my_destroy_window P_ ((struct frame *, HWND)); static Lisp_Object Qvendor_specific_keysyms; @@ -465,8 +315,9 @@ record_event (locus, type) #endif /* 0 */ -void XChangeGC (void * ignore, XGCValues* gc, unsigned long mask, - XGCValues *xgcv) +void +XChangeGC (void * ignore, XGCValues* gc, unsigned long mask, + XGCValues *xgcv) { if (mask & GCForeground) gc->foreground = xgcv->foreground; @@ -487,7 +338,8 @@ XGCValues *XCreateGC (void * ignore, Window window, unsigned long mask, return gc; } -void XGetGCValues (void* ignore, XGCValues *gc, +void +XGetGCValues (void* ignore, XGCValues *gc, unsigned long mask, XGCValues *xgcv) { XChangeGC (ignore, xgcv, mask, gc); @@ -603,8 +455,10 @@ x_update_window_begin (w) struct w32_display_info *display_info = FRAME_W32_DISPLAY_INFO (f); /* Hide the system caret during an update. */ - if (w32_use_visible_system_caret) - SendMessage (w32_system_caret_hwnd, WM_EMACS_HIDE_CARET, 0, 0); + if (w32_use_visible_system_caret && w32_system_caret_hwnd) + { + SendMessage (w32_system_caret_hwnd, WM_EMACS_HIDE_CARET, 0, 0); + } updated_window = w; set_output_cursor (&w->cursor); @@ -651,36 +505,31 @@ x_update_window_begin (w) UNBLOCK_INPUT; } - -/* Draw a vertical window border to the right of window W if W doesn't - have vertical scroll bars. */ +/* Draw a vertical window border from (x,y0) to (x,y1) */ static void -x_draw_vertical_border (w) +w32_draw_vertical_window_border (w, x, y0, y1) struct window *w; + int x, y0, y1; { struct frame *f = XFRAME (WINDOW_FRAME (w)); + RECT r; + HDC hdc; + struct face *face; - /* Redraw borders between horizontally adjacent windows. Don't - do it for frames with vertical scroll bars because either the - right scroll bar of a window, or the left scroll bar of its - neighbor will suffice as a border. */ - if (!WINDOW_RIGHTMOST_P (w) - && !FRAME_HAS_VERTICAL_SCROLL_BARS (f)) - { - RECT r; - HDC hdc; + r.left = x; + r.right = x + 1; + r.top = y0; + r.bottom = y1; - window_box_edges (w, -1, (int *) &r.left, (int *) &r.top, - (int *) &r.right, (int *) &r.bottom); - r.left = r.right + FRAME_X_RIGHT_FRINGE_WIDTH (f); - r.right = r.left + 1; - r.bottom -= 1; + hdc = get_frame_dc (f); + face = FACE_FROM_ID (f, VERTICAL_BORDER_FACE_ID); + if (face) + w32_fill_rect (f, hdc, face->foreground, &r); + else + w32_fill_rect (f, hdc, FRAME_FOREGROUND_PIXEL (f), &r); - hdc = get_frame_dc (f); - w32_fill_rect (f, hdc, FRAME_FOREGROUND_PIXEL (f), &r); - release_frame_dc (f, hdc); - } + release_frame_dc (f, hdc); } @@ -702,19 +551,20 @@ x_update_window_end (w, cursor_on_p, mouse_face_overwritten_p) struct window *w; int cursor_on_p, mouse_face_overwritten_p; { - struct w32_display_info *dpyinfo - = FRAME_W32_DISPLAY_INFO (XFRAME (w->frame)); + struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (XFRAME (w->frame)); if (!w->pseudo_window_p) { BLOCK_INPUT; if (cursor_on_p) - x_display_and_set_cursor (w, 1, output_cursor.hpos, - output_cursor.vpos, - output_cursor.x, output_cursor.y); + display_and_set_cursor (w, 1, output_cursor.hpos, + output_cursor.vpos, + output_cursor.x, output_cursor.y); + + if (draw_window_fringes (w, 1)) + x_draw_vertical_border (w); - x_draw_vertical_border (w); UNBLOCK_INPUT; } @@ -730,8 +580,10 @@ x_update_window_end (w, cursor_on_p, mouse_face_overwritten_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. */ - if (w32_use_visible_system_caret) - SendMessage (w32_system_caret_hwnd, WM_EMACS_SHOW_CARET, 0, 0); + if (w32_use_visible_system_caret && w32_system_caret_hwnd) + { + SendMessage (w32_system_caret_hwnd, WM_EMACS_SHOW_CARET, 0, 0); + } updated_window = NULL; } @@ -763,6 +615,7 @@ w32_frame_up_to_date (f) if (FRAME_W32_P (f)) { struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); + if (dpyinfo->mouse_face_deferred_gc || f == dpyinfo->mouse_face_mouse_frame) { @@ -796,11 +649,7 @@ x_after_update_window_line (desired_row) xassert (w); if (!desired_row->mode_line_p && !w->pseudo_window_p) - { - BLOCK_INPUT; - x_draw_row_fringe_bitmaps (w, desired_row); - UNBLOCK_INPUT; - } + desired_row->redraw_fringe_bitmaps_p = 1; /* When a window has disappeared, make sure that no rest of full-width rows stays visible in the internal border. Could @@ -817,6 +666,7 @@ x_after_update_window_line (desired_row) height > 0)) { int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y)); + /* Internal border is drawn below the tool bar. */ if (WINDOWP (f->tool_bar_window) && w == XWINDOW (f->tool_bar_window)) @@ -826,7 +676,7 @@ x_after_update_window_line (desired_row) { HDC hdc = get_frame_dc (f); w32_clear_area (f, hdc, 0, y, width, height); - w32_clear_area (f, hdc, f->output_data.w32->pixel_width - width, + w32_clear_area (f, hdc, FRAME_PIXEL_WIDTH (f) - width, y, width, height); release_frame_dc (f, hdc); } @@ -841,210 +691,129 @@ x_after_update_window_line (desired_row) drawn. */ static void -w32_draw_fringe_bitmap (w, hdc, row, which, left_p) +w32_draw_fringe_bitmap (w, row, p) struct window *w; - HDC hdc; struct glyph_row *row; - enum fringe_bitmap_type which; - int left_p; + struct draw_fringe_bitmap_params *p; { struct frame *f = XFRAME (WINDOW_FRAME (w)); - HDC compat_hdc; - int x, y, wd, h, dy; - int b1, b2; - HBITMAP pixmap; - HANDLE horig_obj; - struct face *face; + HDC hdc; + struct face *face = p->face; + int rowY; - /* Must clip because of partially visible lines. */ - w32_clip_to_row (w, row, hdc, 1); + hdc = get_frame_dc (f); - /* Convert row to frame coordinates. */ - y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); + /* Must clip because of partially visible lines. */ + rowY = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); + if (p->y < rowY) + { + /* Adjust position of "bottom aligned" bitmap on partially + visible last row. */ + int oldY = row->y; + int oldVH = row->visible_height; + row->visible_height = p->h; + row->y -= rowY - p->y; + w32_clip_to_row (w, row, -1, hdc); + row->y = oldY; + row->visible_height = oldVH; + } + else + w32_clip_to_row (w, row, -1, hdc); - switch (which) + if (p->bx >= 0 && !p->overlay_p) { - case NO_FRINGE_BITMAP: - wd = 0; - h = 0; - break; - - case LEFT_TRUNCATION_BITMAP: - wd = left_width; - h = left_height; - pixmap = left_bmp; - break; - - case OVERLAY_ARROW_BITMAP: - wd = ov_width; - h = ov_height; - pixmap = ov_bmp; - break; - - case RIGHT_TRUNCATION_BITMAP: - wd = right_width; - h = right_height; - pixmap = right_bmp; - break; - - case CONTINUED_LINE_BITMAP: - wd = continued_width; - h = continued_height; - pixmap = continued_bmp; - break; - - case CONTINUATION_LINE_BITMAP: - wd = continuation_width; - h = continuation_height; - pixmap = continuation_bmp; - break; - - case ZV_LINE_BITMAP: - wd = zv_width; - h = zv_height - (y % zv_period); - pixmap = zv_bmp; - break; - - default: - abort (); + w32_fill_area (f, hdc, face->background, + p->bx, p->by, p->nx, p->ny); } - /* Clip bitmap if too high. */ - if (h > row->height) - h = row->height; + if (p->which && p->which < max_fringe_bmp) + { + HBITMAP pixmap = fringe_bmp[p->which]; + HDC compat_hdc; + HANDLE horig_obj; - /* Set dy to the offset in the row to start drawing the bitmap. */ - dy = (row->height - h) / 2; + compat_hdc = CreateCompatibleDC (hdc); - /* Draw the bitmap. */ - face = FACE_FROM_ID (f, FRINGE_FACE_ID); - PREPARE_FACE_FOR_DISPLAY (f, face); + SaveDC (hdc); - /* Clear left fringe if no bitmap to draw or if bitmap doesn't fill - the fringe. */ - b1 = -1; - if (left_p) - { - if (wd > FRAME_X_LEFT_FRINGE_WIDTH (f)) - wd = FRAME_X_LEFT_FRINGE_WIDTH (f); - x = (WINDOW_TO_FRAME_PIXEL_X (w, 0) - - wd - - (FRAME_X_LEFT_FRINGE_WIDTH (f) - wd) / 2); - if (wd < FRAME_X_LEFT_FRINGE_WIDTH (f) || row->height > h) + horig_obj = SelectObject (compat_hdc, pixmap); + + /* Paint overlays transparently. */ + if (p->overlay_p) { - /* If W has a vertical border to its left, don't draw over it. */ - int border = ((XFASTINT (w->left) > 0 - && !FRAME_HAS_VERTICAL_SCROLL_BARS (f)) - ? 1 : 0); - b1 = (window_box_left (w, -1) - - FRAME_X_LEFT_FRINGE_WIDTH (f) - + border); - b2 = (FRAME_X_LEFT_FRINGE_WIDTH (f) - border); + HBRUSH h_brush, h_orig_brush; + + SetTextColor (hdc, BLACK_PIX_DEFAULT (f)); + SetBkColor (hdc, WHITE_PIX_DEFAULT (f)); + h_brush = CreateSolidBrush (face->foreground); + h_orig_brush = SelectObject (hdc, h_brush); + + BitBlt (hdc, p->x, p->y, p->wd, p->h, + compat_hdc, 0, p->dh, + DSTINVERT); + BitBlt (hdc, p->x, p->y, p->wd, p->h, + compat_hdc, 0, p->dh, + 0x2E064A); + BitBlt (hdc, p->x, p->y, p->wd, p->h, + compat_hdc, 0, p->dh, + DSTINVERT); + + SelectObject (hdc, h_orig_brush); + DeleteObject (h_brush); } - } - else - { - if (wd > FRAME_X_RIGHT_FRINGE_WIDTH (f)) - wd = FRAME_X_RIGHT_FRINGE_WIDTH (f); - x = (window_box_right (w, -1) - + (FRAME_X_RIGHT_FRINGE_WIDTH (f) - wd) / 2); - /* Clear right fringe if no bitmap to draw of if bitmap doesn't fill - the fringe. */ - if (wd < FRAME_X_RIGHT_FRINGE_WIDTH (f) || row->height > h) + else { - b1 = window_box_right (w, -1); - b2 = FRAME_X_RIGHT_FRINGE_WIDTH (f); + SetTextColor (hdc, face->background); + SetBkColor (hdc, (p->cursor_p + ? f->output_data.w32->cursor_pixel + : face->foreground)); + + BitBlt (hdc, p->x, p->y, p->wd, p->h, + compat_hdc, 0, p->dh, + SRCCOPY); } - } - - if (b1 >= 0) - { - int header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); - w32_fill_area (f, hdc, face->background, - b1, - WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, - row->y)), - b2, - row->visible_height); + SelectObject (compat_hdc, horig_obj); + DeleteDC (compat_hdc); + RestoreDC (hdc, -1); } - if (which == NO_FRINGE_BITMAP) - return; - - compat_hdc = CreateCompatibleDC (hdc); - SaveDC (hdc); - - horig_obj = SelectObject (compat_hdc, pixmap); - SetTextColor (hdc, face->background); - SetBkColor (hdc, face->foreground); - - BitBlt (hdc, x, y + dy, wd, h, compat_hdc, 0, - (which == ZV_LINE_BITMAP ? (row->y % zv_period) : 0), - SRCCOPY); + w32_set_clip_rectangle (hdc, NULL); - SelectObject (compat_hdc, horig_obj); - DeleteDC (compat_hdc); - RestoreDC (hdc, -1); + release_frame_dc (f, hdc); } - -/* Draw fringe bitmaps for glyph row ROW on window W. Call this - function with input blocked. */ - static void -x_draw_row_fringe_bitmaps (w, row) - struct window *w; - struct glyph_row *row; +w32_define_fringe_bitmap (which, bits, h, wd) + int which; + unsigned short *bits; + int h, wd; { - struct frame *f = XFRAME (w->frame); - enum fringe_bitmap_type bitmap; - HDC hdc; - - xassert (interrupt_input_blocked); - - /* If row is completely invisible, because of vscrolling, we - don't have to draw anything. */ - if (row->visible_height <= 0) - return; - - hdc = get_frame_dc (f); - - if (FRAME_X_LEFT_FRINGE_WIDTH (f) != 0) + if (which >= max_fringe_bmp) { - /* Decide which bitmap to draw in the left fringe. */ - if (row->overlay_arrow_p) - bitmap = OVERLAY_ARROW_BITMAP; - else if (row->truncated_on_left_p) - bitmap = LEFT_TRUNCATION_BITMAP; - else if (MATRIX_ROW_CONTINUATION_LINE_P (row)) - bitmap = CONTINUATION_LINE_BITMAP; - else if (row->indicate_empty_line_p) - bitmap = ZV_LINE_BITMAP; - else - bitmap = NO_FRINGE_BITMAP; - - w32_draw_fringe_bitmap (w, hdc, row, bitmap, 1); + int i = max_fringe_bmp; + max_fringe_bmp = which + 20; + fringe_bmp = (HBITMAP *) xrealloc (fringe_bmp, max_fringe_bmp * sizeof (HBITMAP)); + while (i < max_fringe_bmp) + fringe_bmp[i++] = 0; } - if (FRAME_X_RIGHT_FRINGE_WIDTH (f) != 0) - { - /* Decide which bitmap to draw in the right fringe. */ - if (row->truncated_on_right_p) - bitmap = RIGHT_TRUNCATION_BITMAP; - else if (row->continued_p) - bitmap = CONTINUED_LINE_BITMAP; - else if (row->indicate_empty_line_p && FRAME_X_LEFT_FRINGE_WIDTH (f) == 0) - bitmap = ZV_LINE_BITMAP; - else - bitmap = NO_FRINGE_BITMAP; + fringe_bmp[which] = CreateBitmap (wd, h, 1, 1, bits); +} - w32_draw_fringe_bitmap (w, hdc, row, bitmap, 0); - } +static void +w32_destroy_fringe_bitmap (which) + int which; +{ + if (which >= max_fringe_bmp) + return; - release_frame_dc (f, hdc); + if (fringe_bmp[which]) + DeleteObject (fringe_bmp[which]); + fringe_bmp[which] = 0; } + /* This is called when starting Emacs and when restarting after suspend. When starting Emacs, no window is mapped. And nothing @@ -1066,99 +835,14 @@ w32_reset_terminal_modes (void) -/*********************************************************************** - Output Cursor - ***********************************************************************/ - -/* Set the global variable output_cursor to CURSOR. All cursor - positions are relative to updated_window. */ - -static void -set_output_cursor (cursor) - struct cursor_pos *cursor; -{ - output_cursor.hpos = cursor->hpos; - output_cursor.vpos = cursor->vpos; - output_cursor.x = cursor->x; - output_cursor.y = cursor->y; -} - - -/* Set a nominal cursor position. - - HPOS and VPOS are column/row positions in a window glyph matrix. X - and Y are window text area relative pixel positions. - - If this is done during an update, updated_window will contain the - window that is being updated and the position is the future output - cursor position for that window. If updated_window is null, use - selected_window and display the cursor at the given position. */ - -static void -w32_cursor_to (vpos, hpos, y, x) - int vpos, hpos, y, x; -{ - struct window *w; - - /* If updated_window is not set, work on selected_window. */ - if (updated_window) - w = updated_window; - else - w = XWINDOW (selected_window); - - /* Set the output cursor. */ - output_cursor.hpos = hpos; - output_cursor.vpos = vpos; - output_cursor.x = x; - output_cursor.y = y; - - /* If not called as part of an update, really display the cursor. - This will also set the cursor position of W. */ - if (updated_window == NULL) - { - BLOCK_INPUT; - x_display_cursor (w, 1, hpos, vpos, x, y); - UNBLOCK_INPUT; - } -} - - - /*********************************************************************** Display Iterator ***********************************************************************/ /* Function prototypes of this page. */ -static struct face *x_get_glyph_face_and_encoding P_ ((struct frame *, - struct glyph *, - wchar_t *, - int *)); -static struct face *x_get_char_face_and_encoding P_ ((struct frame *, int, - int, wchar_t *, int)); -static XCharStruct *w32_per_char_metric P_ ((XFontStruct *, - wchar_t *, - enum w32_char_font_type)); -static enum w32_char_font_type - w32_encode_char P_ ((int, wchar_t *, struct font_info *, int *)); -static void x_append_glyph P_ ((struct it *)); -static void x_append_composite_glyph P_ ((struct it *)); -static void x_append_stretch_glyph P_ ((struct it *it, Lisp_Object, - int, int, double)); -static void x_produce_glyphs P_ ((struct it *)); -static void x_produce_image_glyph P_ ((struct it *it)); - - -/* Dealing with bits of wchar_t as if they were an XChar2B. */ -#define BUILD_WCHAR_T(byte1, byte2) \ - ((wchar_t)((((byte1) & 0x00ff) << 8) | ((byte2) & 0x00ff))) - - -#define BYTE1(ch) \ - (((ch) & 0xff00) >> 8) - -#define BYTE2(ch) \ - ((ch) & 0x00ff) +XCharStruct *w32_per_char_metric P_ ((XFontStruct *, wchar_t *, int)); +static int w32_encode_char P_ ((int, wchar_t *, struct font_info *, int *)); /* Get metrics of character CHAR2B in FONT. Value is always non-null. @@ -1179,8 +863,8 @@ w32_bdf_per_char_metric (font, char2b, dim, pcm) buf[0] = (char)(*char2b); else { - buf[0] = BYTE1 (*char2b); - buf[1] = BYTE2 (*char2b); + buf[0] = XCHAR2B_BYTE1 (char2b); + buf[1] = XCHAR2B_BYTE2 (char2b); } bdf_metric = w32_BDF_TextMetric (font->bdf, buf, dim); @@ -1237,6 +921,16 @@ w32_native_per_char_metric (font, char2b, font_type, pcm) int real_width; GetCharWidth (hdc, *char2b, *char2b, &real_width); #endif + if (cleartype_active) + { + /* Cleartype antialiasing causes characters to overhang + by a pixel on each side compared with what GetCharABCWidths + reports. */ + char_widths.abcA -= 1; + char_widths.abcC -= 1; + char_widths.abcB += 2; + } + pcm->width = char_widths.abcA + char_widths.abcB + char_widths.abcC; #if 0 /* As far as I can tell, this is the best way to determine what @@ -1294,18 +988,28 @@ w32_native_per_char_metric (font, char2b, font_type, pcm) } -static XCharStruct * +XCharStruct * w32_per_char_metric (font, char2b, font_type) XFontStruct *font; wchar_t *char2b; - enum w32_char_font_type font_type; + int /* enum w32_char_font_type */ font_type; { /* The result metric information. */ XCharStruct *pcm; BOOL retval; xassert (font && char2b); - xassert (font_type != UNKNOWN_FONT); + + /* TODO: This function is currently called through the RIF, and in + some cases font_type is UNKNOWN_FONT. We currently allow the + cached metrics to be used, which seems to work, but in cases + where font_type is UNKNOWN_FONT, we probably haven't encoded + char2b appropriately. All callers need checking to see what they + are passing. This is most likely to affect variable width fonts + outside the Latin-1 range, particularly in languages like Thai + that rely on rbearing and lbearing to provide composition. I + don't think that is working currently anyway, but we don't seem + to have anyone testing such languages on Windows. */ /* Handle the common cases quickly. */ if (!font->bdf && font->per_char == NULL) @@ -1314,6 +1018,8 @@ w32_per_char_metric (font, char2b, font_type) else if (!font->bdf && *char2b < 128) return &font->per_char[*char2b]; + xassert (font_type != UNKNOWN_FONT); + pcm = &font->scratch; if (font_type == BDF_1D_FONT) @@ -1399,7 +1105,7 @@ w32_use_unicode_for_codepage (codepage) /* Encode CHAR2B using encoding information from FONT_INFO. CHAR2B is the two-byte form of C. Encoding is returned in *CHAR2B. */ -static INLINE enum w32_char_font_type +static int /* enum w32_char_font_type */ w32_encode_char (c, char2b, font_info, two_byte_p) int c; wchar_t *char2b; @@ -1409,12 +1115,11 @@ w32_encode_char (c, char2b, font_info, two_byte_p) int charset = CHAR_CHARSET (c); int codepage; int unicode_p = 0; + int internal_two_byte_p = 0; XFontStruct *font = font_info->font; - xassert (two_byte_p); - - *two_byte_p = w32_font_is_double_byte (font); + internal_two_byte_p = w32_font_is_double_byte (font); /* FONT_INFO may define a scheme by which to encode byte1 and byte2. This may be either a program in a special encoder language or a @@ -1427,23 +1132,24 @@ w32_encode_char (c, char2b, font_info, two_byte_p) if (CHARSET_DIMENSION (charset) == 1) { ccl->reg[0] = charset; - ccl->reg[1] = BYTE2 (*char2b); + ccl->reg[1] = XCHAR2B_BYTE2 (char2b); + ccl->reg[2] = -1; } else { ccl->reg[0] = charset; - ccl->reg[1] = BYTE1 (*char2b); - ccl->reg[2] = BYTE2 (*char2b); + ccl->reg[1] = XCHAR2B_BYTE1 (char2b); + ccl->reg[2] = XCHAR2B_BYTE2 (char2b); } ccl_driver (ccl, NULL, NULL, 0, 0, NULL); /* We assume that MSBs are appropriately set/reset by CCL program. */ - if (!*two_byte_p) /* 1-byte font */ - *char2b = BUILD_WCHAR_T (0, ccl->reg[1]); + if (!internal_two_byte_p) /* 1-byte font */ + STORE_XCHAR2B (char2b, 0, ccl->reg[1]); else - *char2b = BUILD_WCHAR_T (ccl->reg[1], ccl->reg[2]); + STORE_XCHAR2B (char2b, ccl->reg[1], ccl->reg[2]); } else if (font_info->encoding[charset]) { @@ -1453,18 +1159,18 @@ w32_encode_char (c, char2b, font_info, two_byte_p) if ((enc == 1 || enc == 2) && CHARSET_DIMENSION (charset) == 2) - *char2b = BUILD_WCHAR_T (BYTE1 (*char2b) | 0x80, BYTE2 (*char2b)); + STORE_XCHAR2B (char2b, XCHAR2B_BYTE1 (char2b) | 0x80, XCHAR2B_BYTE2 (char2b)); if (enc == 1 || enc == 3 || (enc == 4 && CHARSET_DIMENSION (charset) == 1)) - *char2b = BUILD_WCHAR_T (BYTE1 (*char2b), BYTE2 (*char2b) | 0x80); + STORE_XCHAR2B (char2b, XCHAR2B_BYTE1 (char2b), XCHAR2B_BYTE2 (char2b) | 0x80); else if (enc == 4) { int sjis1, sjis2; - ENCODE_SJIS (BYTE1 (*char2b), BYTE2 (*char2b), + ENCODE_SJIS (XCHAR2B_BYTE1 (char2b), XCHAR2B_BYTE2 (char2b), sjis1, sjis2); - *char2b = BUILD_WCHAR_T (sjis1, sjis2); + STORE_XCHAR2B (char2b, sjis1, sjis2); } } codepage = font_info->codepage; @@ -1476,8 +1182,8 @@ w32_encode_char (c, char2b, font_info, two_byte_p) && charset != CHARSET_8_BIT_CONTROL && charset != CHARSET_8_BIT_GRAPHIC) { char temp[3]; - temp[0] = BYTE1 (*char2b); - temp[1] = BYTE2 (*char2b); + temp[0] = XCHAR2B_BYTE1 (char2b); + temp[1] = XCHAR2B_BYTE2 (char2b); temp[2] = '\0'; if (codepage != CP_UNICODE) { @@ -1487,8 +1193,12 @@ w32_encode_char (c, char2b, font_info, two_byte_p) MultiByteToWideChar (codepage, 0, temp+1, 1, char2b, 1); } unicode_p = 1; - *two_byte_p = 1; + internal_two_byte_p = 1; } + + if (two_byte_p) + *two_byte_p = internal_two_byte_p; + if (!font) return UNKNOWN_FONT; else if (font->bdf && CHARSET_DIMENSION (charset) == 1) @@ -1502,6241 +1212,2060 @@ w32_encode_char (c, char2b, font_info, two_byte_p) } -/* Get face and two-byte form of character C in face FACE_ID on frame - F. The encoding of C is returned in *CHAR2B. MULTIBYTE_P non-zero - means we want to display multibyte text. Value is a pointer to a - realized face that is ready for display. */ - -static INLINE struct face * -x_get_char_face_and_encoding (f, c, face_id, char2b, multibyte_p) - struct frame *f; - int c, face_id; - wchar_t *char2b; - int multibyte_p; -{ - struct face *face = FACE_FROM_ID (f, face_id); - - if (!multibyte_p) - { - /* Unibyte case. We don't have to encode, but we have to make - sure to use a face suitable for unibyte. */ - *char2b = BUILD_WCHAR_T (0, c); - face_id = FACE_FOR_CHAR (f, face, c); - face = FACE_FROM_ID (f, face_id); - } - else if (c < 128 && face_id < BASIC_FACE_ID_SENTINEL) - { - /* Case of ASCII in a face known to fit ASCII. */ - *char2b = BUILD_WCHAR_T (0, c); - } - else - { - int c1, c2, charset; - - /* Split characters into bytes. If c2 is -1 afterwards, C is - really a one-byte character so that byte1 is zero. */ - SPLIT_CHAR (c, charset, c1, c2); - if (c2 > 0) - *char2b = BUILD_WCHAR_T (c1, c2); - else - *char2b = BUILD_WCHAR_T (0, c1); + +/*********************************************************************** + Glyph display + ***********************************************************************/ - /* Maybe encode the character in *CHAR2B. */ - if (face->font != NULL) - { - struct font_info *font_info - = FONT_INFO_FROM_ID (f, face->font_info_id); - if (font_info) - w32_encode_char (c, char2b, font_info, &multibyte_p); - } - } - /* Make sure X resources of the face are allocated. */ - xassert (face != NULL); - PREPARE_FACE_FOR_DISPLAY (f, face); +/* Encapsulate the different ways of displaying text under W32. */ - return face; +static void +w32_text_out (s, x, y,chars,nchars) + struct glyph_string * s; + int x, y; + wchar_t * chars; + int nchars; +{ + int charset_dim = w32_font_is_double_byte (s->font) ? 2 : 1; + if (s->font->bdf) + w32_BDF_TextOut (s->font->bdf, s->hdc, + x, y, (char *) chars, charset_dim, + nchars * charset_dim, 0); + else if (s->first_glyph->font_type == UNICODE_FONT) + ExtTextOutW (s->hdc, x, y, 0, NULL, chars, nchars, NULL); + else + ExtTextOutA (s->hdc, x, y, 0, NULL, (char *) chars, + nchars * charset_dim, NULL); } -/* Get face and two-byte form of character glyph GLYPH on frame F. - The encoding of GLYPH->u.ch is returned in *CHAR2B. Value is - a pointer to a realized face that is ready for display. */ +static void x_set_glyph_string_clipping P_ ((struct glyph_string *)); +static void x_set_glyph_string_gc P_ ((struct glyph_string *)); +static void x_draw_glyph_string_background P_ ((struct glyph_string *, + int)); +static void x_draw_glyph_string_foreground P_ ((struct glyph_string *)); +static void x_draw_composite_glyph_string_foreground P_ ((struct glyph_string *)); +static void x_draw_glyph_string_box P_ ((struct glyph_string *)); +static void x_draw_glyph_string P_ ((struct glyph_string *)); +static void x_set_cursor_gc P_ ((struct glyph_string *)); +static void x_set_mode_line_face_gc P_ ((struct glyph_string *)); +static void x_set_mouse_face_gc P_ ((struct glyph_string *)); +static int w32_alloc_lighter_color (struct frame *, COLORREF *, double, int); +static void w32_setup_relief_color P_ ((struct frame *, struct relief *, + double, int, COLORREF)); +static void x_setup_relief_colors P_ ((struct glyph_string *)); +static void x_draw_image_glyph_string P_ ((struct glyph_string *)); +static void x_draw_image_relief P_ ((struct glyph_string *)); +static void x_draw_image_foreground P_ ((struct glyph_string *)); +static void w32_draw_image_foreground_1 P_ ((struct glyph_string *, HBITMAP)); +static void x_clear_glyph_string_rect P_ ((struct glyph_string *, int, + int, int, int)); +static void w32_draw_relief_rect P_ ((struct frame *, int, int, int, int, + int, int, int, int, int, int, + RECT *)); +static void w32_draw_box_rect P_ ((struct glyph_string *, int, int, int, int, + int, int, int, RECT *)); -static INLINE struct face * -x_get_glyph_face_and_encoding (f, glyph, char2b, two_byte_p) - struct frame *f; - struct glyph *glyph; - wchar_t *char2b; - int *two_byte_p; -{ - struct face *face; - int dummy = 0; +#if GLYPH_DEBUG +static void x_check_font P_ ((struct frame *, XFontStruct *)); +#endif - xassert (glyph->type == CHAR_GLYPH); - face = FACE_FROM_ID (f, glyph->face_id); - if (two_byte_p) - *two_byte_p = 0; - else - two_byte_p = &dummy; +/* Set S->gc to a suitable GC for drawing glyph string S in cursor + face. */ - if (!glyph->multibyte_p) - { - /* Unibyte case. We don't have to encode, but we have to make - sure to use a face suitable for unibyte. */ - *char2b = BUILD_WCHAR_T (0, glyph->u.ch); - } - else if (glyph->u.ch < 128 - && glyph->face_id < BASIC_FACE_ID_SENTINEL) - { - /* Case of ASCII in a face known to fit ASCII. */ - *char2b = BUILD_WCHAR_T (0, glyph->u.ch); - } +static void +x_set_cursor_gc (s) + struct glyph_string *s; +{ + if (s->font == FRAME_FONT (s->f) + && s->face->background == FRAME_BACKGROUND_PIXEL (s->f) + && s->face->foreground == FRAME_FOREGROUND_PIXEL (s->f) + && !s->cmp) + s->gc = s->f->output_data.w32->cursor_gc; else { - int c1, c2, charset; - - /* Split characters into bytes. If c2 is -1 afterwards, C is - really a one-byte character so that byte1 is zero. */ - SPLIT_CHAR (glyph->u.ch, charset, c1, c2); - if (c2 > 0) - *char2b = BUILD_WCHAR_T (c1, c2); - else - *char2b = BUILD_WCHAR_T (0, c1); + /* Cursor on non-default face: must merge. */ + XGCValues xgcv; + unsigned long mask; - /* Maybe encode the character in *CHAR2B. */ - if (charset != CHARSET_ASCII) - { - struct font_info *font_info - = FONT_INFO_FROM_ID (f, face->font_info_id); - if (font_info) - { - glyph->w32_font_type - = w32_encode_char (glyph->u.ch, char2b, font_info, two_byte_p); - } - } - } - - /* Make sure X resources of the face are allocated. */ - xassert (face != NULL); - PREPARE_FACE_FOR_DISPLAY (f, face); - return face; -} + xgcv.background = s->f->output_data.w32->cursor_pixel; + xgcv.foreground = s->face->background; + /* If the glyph would be invisible, try a different foreground. */ + if (xgcv.foreground == xgcv.background) + xgcv.foreground = s->face->foreground; + if (xgcv.foreground == xgcv.background) + xgcv.foreground = s->f->output_data.w32->cursor_foreground_pixel; + if (xgcv.foreground == xgcv.background) + xgcv.foreground = s->face->foreground; -/* Store one glyph for IT->char_to_display in IT->glyph_row. - Called from x_produce_glyphs when IT->glyph_row is non-null. */ + /* Make sure the cursor is distinct from text in this face. */ + if (xgcv.background == s->face->background + && xgcv.foreground == s->face->foreground) + { + xgcv.background = s->face->foreground; + xgcv.foreground = s->face->background; + } -static INLINE void -x_append_glyph (it) - struct it *it; -{ - struct glyph *glyph; - enum glyph_row_area area = it->area; + IF_DEBUG (x_check_font (s->f, s->font)); + xgcv.font = s->font; + mask = GCForeground | GCBackground | GCFont; - xassert (it->glyph_row); - xassert (it->char_to_display != '\n' && it->char_to_display != '\t'); + if (FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc) + XChangeGC (NULL, FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc, + mask, &xgcv); + else + FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc + = XCreateGC (NULL, s->window, mask, &xgcv); - glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area]; - if (glyph < it->glyph_row->glyphs[area + 1]) - { - glyph->charpos = CHARPOS (it->position); - glyph->object = it->object; - glyph->pixel_width = it->pixel_width; - glyph->voffset = it->voffset; - glyph->type = CHAR_GLYPH; - glyph->multibyte_p = it->multibyte_p; - glyph->left_box_line_p = it->start_of_box_run_p; - glyph->right_box_line_p = it->end_of_box_run_p; - glyph->overlaps_vertically_p = (it->phys_ascent > it->ascent - || it->phys_descent > it->descent); - glyph->padding_p = 0; - glyph->glyph_not_available_p = it->glyph_not_available_p; - glyph->face_id = it->face_id; - glyph->u.ch = it->char_to_display; - glyph->w32_font_type = UNKNOWN_FONT; - ++it->glyph_row->used[area]; + s->gc = FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc; } } -/* Store one glyph for the composition IT->cmp_id in IT->glyph_row. - Called from x_produce_glyphs when IT->glyph_row is non-null. */ -static INLINE void -x_append_composite_glyph (it) - struct it *it; +/* Set up S->gc of glyph string S for drawing text in mouse face. */ + +static void +x_set_mouse_face_gc (s) + struct glyph_string *s; { - struct glyph *glyph; - enum glyph_row_area area = it->area; + int face_id; + struct face *face; - xassert (it->glyph_row); + /* What face has to be used last for the mouse face? */ + face_id = FRAME_W32_DISPLAY_INFO (s->f)->mouse_face_face_id; + face = FACE_FROM_ID (s->f, face_id); + if (face == NULL) + face = FACE_FROM_ID (s->f, MOUSE_FACE_ID); - glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area]; - if (glyph < it->glyph_row->glyphs[area + 1]) - { - glyph->charpos = CHARPOS (it->position); - glyph->object = it->object; - glyph->pixel_width = it->pixel_width; - glyph->voffset = it->voffset; - glyph->type = COMPOSITE_GLYPH; - glyph->multibyte_p = it->multibyte_p; - glyph->left_box_line_p = it->start_of_box_run_p; - glyph->right_box_line_p = it->end_of_box_run_p; - glyph->overlaps_vertically_p = (it->phys_ascent > it->ascent - || it->phys_descent > it->descent); - glyph->padding_p = 0; - glyph->glyph_not_available_p = 0; - glyph->face_id = it->face_id; - glyph->u.cmp_id = it->cmp_id; - glyph->w32_font_type = UNKNOWN_FONT; - ++it->glyph_row->used[area]; - } -} + if (s->first_glyph->type == CHAR_GLYPH) + face_id = FACE_FOR_CHAR (s->f, face, s->first_glyph->u.ch); + else + face_id = FACE_FOR_CHAR (s->f, face, 0); + s->face = FACE_FROM_ID (s->f, face_id); + PREPARE_FACE_FOR_DISPLAY (s->f, s->face); + /* If font in this face is same as S->font, use it. */ + if (s->font == s->face->font) + s->gc = s->face->gc; + else + { + /* Otherwise construct scratch_cursor_gc with values from FACE + but font FONT. */ + XGCValues xgcv; + unsigned long mask; -/* Change IT->ascent and IT->height according to the setting of - IT->voffset. */ + xgcv.background = s->face->background; + xgcv.foreground = s->face->foreground; + IF_DEBUG (x_check_font (s->f, s->font)); + xgcv.font = s->font; + mask = GCForeground | GCBackground | GCFont; -static INLINE void -take_vertical_position_into_account (it) - struct it *it; -{ - if (it->voffset) - { - if (it->voffset < 0) - /* Increase the ascent so that we can display the text higher - in the line. */ - it->ascent += abs (it->voffset); + if (FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc) + XChangeGC (NULL, FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc, + mask, &xgcv); else - /* Increase the descent so that we can display the text lower - in the line. */ - it->descent += it->voffset; + FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc + = XCreateGC (NULL, s->window, mask, &xgcv); + + s->gc = FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc; } + + xassert (s->gc != 0); } -/* Produce glyphs/get display metrics for the image IT is loaded with. - See the description of struct display_iterator in dispextern.h for - an overview of struct display_iterator. */ +/* Set S->gc of glyph string S to a GC suitable for drawing a mode line. + Faces to use in the mode line have already been computed when the + matrix was built, so there isn't much to do, here. */ -static void -x_produce_image_glyph (it) - struct it *it; +static INLINE void +x_set_mode_line_face_gc (s) + struct glyph_string *s; { - struct image *img; - struct face *face; - - xassert (it->what == IT_IMAGE); - - face = FACE_FROM_ID (it->f, it->face_id); - img = IMAGE_FROM_ID (it->f, it->image_id); - xassert (img); + s->gc = s->face->gc; +} - /* Make sure X resources of the face and image are loaded. */ - PREPARE_FACE_FOR_DISPLAY (it->f, face); - prepare_image_for_display (it->f, img); - it->ascent = it->phys_ascent = image_ascent (img, face); - it->descent = it->phys_descent = img->height + 2 * img->vmargin - it->ascent; - it->pixel_width = img->width + 2 * img->hmargin; +/* Set S->gc of glyph string S for drawing that glyph string. Set + S->stippled_p to a non-zero value if the face of S has a stipple + pattern. */ - it->nglyphs = 1; +static INLINE void +x_set_glyph_string_gc (s) + struct glyph_string *s; +{ + PREPARE_FACE_FOR_DISPLAY (s->f, s->face); - if (face->box != FACE_NO_BOX) + if (s->hl == DRAW_NORMAL_TEXT) { - if (face->box_line_width > 0) - { - it->ascent += face->box_line_width; - it->descent += face->box_line_width; - } - - if (it->start_of_box_run_p) - it->pixel_width += abs (face->box_line_width); - if (it->end_of_box_run_p) - it->pixel_width += abs (face->box_line_width); + s->gc = s->face->gc; + s->stippled_p = s->face->stipple != 0; } - - take_vertical_position_into_account (it); - - if (it->glyph_row) + else if (s->hl == DRAW_INVERSE_VIDEO) { - struct glyph *glyph; - enum glyph_row_area area = it->area; - - glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area]; - if (glyph < it->glyph_row->glyphs[area + 1]) - { - glyph->charpos = CHARPOS (it->position); - glyph->object = it->object; - glyph->pixel_width = it->pixel_width; - glyph->voffset = it->voffset; - glyph->type = IMAGE_GLYPH; - glyph->multibyte_p = it->multibyte_p; - glyph->left_box_line_p = it->start_of_box_run_p; - glyph->right_box_line_p = it->end_of_box_run_p; - glyph->overlaps_vertically_p = 0; - glyph->padding_p = 0; - glyph->glyph_not_available_p = 0; - glyph->face_id = it->face_id; - glyph->u.img_id = img->id; - glyph->w32_font_type = UNKNOWN_FONT; - ++it->glyph_row->used[area]; - } + x_set_mode_line_face_gc (s); + s->stippled_p = s->face->stipple != 0; + } + else if (s->hl == DRAW_CURSOR) + { + x_set_cursor_gc (s); + s->stippled_p = 0; + } + else if (s->hl == DRAW_MOUSE_FACE) + { + x_set_mouse_face_gc (s); + s->stippled_p = s->face->stipple != 0; + } + else if (s->hl == DRAW_IMAGE_RAISED + || s->hl == DRAW_IMAGE_SUNKEN) + { + s->gc = s->face->gc; + s->stippled_p = s->face->stipple != 0; + } + else + { + s->gc = s->face->gc; + s->stippled_p = s->face->stipple != 0; } + + /* GC must have been set. */ + xassert (s->gc != 0); } -/* Append a stretch glyph to IT->glyph_row. OBJECT is the source - of the glyph, WIDTH and HEIGHT are the width and height of the - stretch. ASCENT is the percentage/100 of HEIGHT to use for the - ascent of the glyph (0 <= ASCENT <= 1). */ +/* Set clipping for output of glyph string S. S may be part of a mode + line or menu if we don't have X toolkit support. */ -static void -x_append_stretch_glyph (it, object, width, height, ascent) - struct it *it; - Lisp_Object object; - int width, height; - double ascent; +static INLINE void +x_set_glyph_string_clipping (s) + struct glyph_string *s; { - struct glyph *glyph; - enum glyph_row_area area = it->area; - - xassert (ascent >= 0 && ascent <= 1); - - glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area]; - if (glyph < it->glyph_row->glyphs[area + 1]) - { - glyph->charpos = CHARPOS (it->position); - glyph->object = object; - glyph->pixel_width = width; - glyph->voffset = it->voffset; - glyph->type = STRETCH_GLYPH; - glyph->multibyte_p = it->multibyte_p; - glyph->left_box_line_p = it->start_of_box_run_p; - glyph->right_box_line_p = it->end_of_box_run_p; - glyph->overlaps_vertically_p = 0; - glyph->padding_p = 0; - glyph->glyph_not_available_p = 0; - glyph->face_id = it->face_id; - glyph->u.stretch.ascent = height * ascent; - glyph->u.stretch.height = height; - glyph->w32_font_type = UNKNOWN_FONT; - ++it->glyph_row->used[area]; - } + RECT r; + get_glyph_string_clip_rect (s, &r); + w32_set_clip_rectangle (s->hdc, &r); } -/* Produce a stretch glyph for iterator IT. IT->object is the value - of the glyph property displayed. The value must be a list - `(space KEYWORD VALUE ...)' with the following KEYWORD/VALUE pairs - being recognized: - - 1. `:width WIDTH' specifies that the space should be WIDTH * - canonical char width wide. WIDTH may be an integer or floating - point number. - - 2. `:relative-width FACTOR' specifies that the width of the stretch - should be computed from the width of the first character having the - `glyph' property, and should be FACTOR times that width. +/* RIF: + Compute left and right overhang of glyph string S. If S is a glyph + string for a composition, assume overhangs don't exist. */ - 3. `:align-to HPOS' specifies that the space should be wide enough - to reach HPOS, a value in canonical character units. +static void +w32_compute_glyph_string_overhangs (s) + struct glyph_string *s; +{ + /* TODO: Windows does not appear to have a method for + getting this info without getting the ABC widths for each + individual character and working it out manually. */ +} - Exactly one of the above pairs must be present. - 4. `:height HEIGHT' specifies that the height of the stretch produced - should be HEIGHT, measured in canonical character units. +static void +w32_get_glyph_overhangs (glyph, f, left, right) + struct glyph *glyph; + struct frame *f; + int *left, *right; +{ + HDC hdc = get_frame_dc (f); + /* Convert to unicode! */ + x_get_glyph_overhangs (glyph, f, left, right); + release_frame_dc (f, hdc); +} - 5. `:relative-height FACTOR' specifies that the height of the - stretch should be FACTOR times the height of the characters having - the glyph property. - Either none or exactly one of 4 or 5 must be present. +/* Fill rectangle X, Y, W, H with background color of glyph string S. */ - 6. `:ascent ASCENT' specifies that ASCENT percent of the height - of the stretch should be used for the ascent of the stretch. - ASCENT must be in the range 0 <= ASCENT <= 100. */ +static INLINE void +x_clear_glyph_string_rect (s, x, y, w, h) + struct glyph_string *s; + int x, y, w, h; +{ + int real_x = x; + int real_y = y; + int real_w = w; + int real_h = h; +#if 0 + /* Take clipping into account. */ + if (s->gc->clip_mask == Rect) + { + real_x = max (real_x, s->gc->clip_rectangle.left); + real_y = max (real_y, s->gc->clip_rectangle.top); + real_w = min (real_w, s->gc->clip_rectangle.right + - s->gc->clip_rectangle.left); + real_h = min (real_h, s->gc->clip_rectangle.bottom + - s->gc->clip_rectangle.top); + } +#endif + w32_fill_area (s->f, s->hdc, s->gc->background, real_x, real_y, + real_w, real_h); +} -#define NUMVAL(X) \ - ((INTEGERP (X) || FLOATP (X)) \ - ? XFLOATINT (X) \ - : - 1) +/* Draw the background of glyph_string S. If S->background_filled_p + is non-zero don't draw it. FORCE_P non-zero means draw the + background even if it wouldn't be drawn normally. This is used + when a string preceding S draws into the background of S, or S + contains the first component of a composition. */ static void -x_produce_stretch_glyph (it) - struct it *it; +x_draw_glyph_string_background (s, force_p) + struct glyph_string *s; + int force_p; { - /* (space :width WIDTH :height HEIGHT. */ -#if GLYPH_DEBUG - extern Lisp_Object Qspace; -#endif - extern Lisp_Object QCwidth, QCheight, QCascent; - extern Lisp_Object QCrelative_width, QCrelative_height; - extern Lisp_Object QCalign_to; - Lisp_Object prop, plist; - double width = 0, height = 0, ascent = 0; - struct face *face = FACE_FROM_ID (it->f, it->face_id); - XFontStruct *font = face->font ? face->font : FRAME_FONT (it->f); - - PREPARE_FACE_FOR_DISPLAY (it->f, face); - - /* List should start with `space'. */ - xassert (CONSP (it->object) && EQ (XCAR (it->object), Qspace)); - plist = XCDR (it->object); - - /* Compute the width of the stretch. */ - if (prop = Fplist_get (plist, QCwidth), - NUMVAL (prop) > 0) - /* Absolute width `:width WIDTH' specified and valid. */ - width = NUMVAL (prop) * CANON_X_UNIT (it->f); - else if (prop = Fplist_get (plist, QCrelative_width), - NUMVAL (prop) > 0) + /* Nothing to do if background has already been drawn or if it + shouldn't be drawn in the first place. */ + if (!s->background_filled_p) { - /* Relative width `:relative-width FACTOR' specified and valid. - Compute the width of the characters having the `glyph' - property. */ - struct it it2; - unsigned char *p = BYTE_POS_ADDR (IT_BYTEPOS (*it)); - - it2 = *it; - if (it->multibyte_p) + int box_line_width = max (s->face->box_line_width, 0); + +#if 0 /* TODO: stipple */ + if (s->stippled_p) { - int maxlen = ((IT_BYTEPOS (*it) >= GPT ? ZV : GPT) - - IT_BYTEPOS (*it)); - it2.c = STRING_CHAR_AND_LENGTH (p, maxlen, it2.len); + /* Fill background with a stipple pattern. */ + XSetFillStyle (s->display, s->gc, FillOpaqueStippled); + XFillRectangle (s->display, s->window, s->gc, s->x, + s->y + box_line_width, + s->background_width, + s->height - 2 * box_line_width); + XSetFillStyle (s->display, s->gc, FillSolid); + s->background_filled_p = 1; } else - it2.c = *p, it2.len = 1; - - it2.glyph_row = NULL; - it2.what = IT_CHARACTER; - x_produce_glyphs (&it2); - width = NUMVAL (prop) * it2.pixel_width; - } - else if (prop = Fplist_get (plist, QCalign_to), - NUMVAL (prop) > 0) - width = NUMVAL (prop) * CANON_X_UNIT (it->f) - it->current_x; - else - /* Nothing specified -> width defaults to canonical char width. */ - width = CANON_X_UNIT (it->f); - - /* Compute height. */ - if (prop = Fplist_get (plist, QCheight), - NUMVAL (prop) > 0) - height = NUMVAL (prop) * CANON_Y_UNIT (it->f); - else if (prop = Fplist_get (plist, QCrelative_height), - NUMVAL (prop) > 0) - height = FONT_HEIGHT (font) * NUMVAL (prop); - else - height = FONT_HEIGHT (font); - - /* Compute percentage of height used for ascent. If - `:ascent ASCENT' is present and valid, use that. Otherwise, - derive the ascent from the font in use. */ - if (prop = Fplist_get (plist, QCascent), - NUMVAL (prop) > 0 && NUMVAL (prop) <= 100) - ascent = NUMVAL (prop) / 100.0; - else - ascent = (double) FONT_BASE (font) / FONT_HEIGHT (font); - - if (width <= 0) - width = 1; - if (height <= 0) - height = 1; - - if (it->glyph_row) - { - Lisp_Object object = it->stack[it->sp - 1].string; - if (!STRINGP (object)) - object = it->w->buffer; - x_append_stretch_glyph (it, object, width, height, ascent); - } - - it->pixel_width = width; - it->ascent = it->phys_ascent = height * ascent; - it->descent = it->phys_descent = height - it->ascent; - it->nglyphs = 1; - - if (face->box != FACE_NO_BOX) - { - if (face->box_line_width > 0) +#endif + if (FONT_HEIGHT (s->font) < s->height - 2 * box_line_width + || s->font_not_found_p + || s->extends_to_end_of_line_p + || s->font->bdf + || force_p) { - it->ascent += face->box_line_width; - it->descent += face->box_line_width; + x_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 = 1; } - - if (it->start_of_box_run_p) - it->pixel_width += abs (face->box_line_width); - if (it->end_of_box_run_p) - it->pixel_width += abs (face->box_line_width); } +} - take_vertical_position_into_account (it); -} - -/* Return proper value to be used as baseline offset of font that has - ASCENT and DESCENT to draw characters by the font at the vertical - center of the line of frame F. - - Here, out task is to find the value of BOFF in the following figure; - - -------------------------+-----------+- - -+-+---------+-+ | | - | | | | | | - | | | | F_ASCENT F_HEIGHT - | | | ASCENT | | - HEIGHT | | | | | - | | |-|-+------+-----------|------- baseline - | | | | BOFF | | - | |---------|-+-+ | | - | | | DESCENT | | - -+-+---------+-+ F_DESCENT | - -------------------------+-----------+- - - -BOFF + DESCENT + (F_HEIGHT - HEIGHT) / 2 = F_DESCENT - BOFF = DESCENT + (F_HEIGHT - HEIGHT) / 2 - F_DESCENT - DESCENT = FONT->descent - HEIGHT = FONT_HEIGHT (FONT) - F_DESCENT = (F->output_data.x->font->descent - - F->output_data.x->baseline_offset) - F_HEIGHT = FRAME_LINE_HEIGHT (F) -*/ - -#define VCENTER_BASELINE_OFFSET(FONT, F) \ - (FONT_DESCENT (FONT) \ - + (FRAME_LINE_HEIGHT ((F)) - FONT_HEIGHT ((FONT)) \ - + (FRAME_LINE_HEIGHT ((F)) > FONT_HEIGHT ((FONT)))) / 2 \ - - (FONT_DESCENT (FRAME_FONT (F)) - FRAME_BASELINE_OFFSET (F))) -/* Produce glyphs/get display metrics for the display element IT is - loaded with. See the description of struct display_iterator in - dispextern.h for an overview of struct display_iterator. */ +/* Draw the foreground of glyph string S. */ static void -x_produce_glyphs (it) - struct it *it; +x_draw_glyph_string_foreground (s) + struct glyph_string *s; { - it->glyph_not_available_p = 0; - - if (it->what == IT_CHARACTER) - { - wchar_t char2b; - XFontStruct *font; - struct face *face = FACE_FROM_ID (it->f, it->face_id); - XCharStruct *pcm; - int font_not_found_p; - struct font_info *font_info; - int boff; /* baseline offset */ - /* We may change it->multibyte_p upon unibyte<->multibyte - conversion. So, save the current value now and restore it - later. - - Note: It seems that we don't have to record multibyte_p in - struct glyph because the character code itself tells if or - not the character is multibyte. Thus, in the future, we must - consider eliminating the field `multibyte_p' in the struct - glyph. - */ - int saved_multibyte_p = it->multibyte_p; - - /* Maybe translate single-byte characters to multibyte, or the - other way. */ - it->char_to_display = it->c; - if (!ASCII_BYTE_P (it->c)) - { - if (unibyte_display_via_language_environment - && SINGLE_BYTE_CHAR_P (it->c) - && (it->c >= 0240 - || !NILP (Vnonascii_translation_table))) - { - it->char_to_display = unibyte_char_to_multibyte (it->c); - it->multibyte_p = 1; - it->face_id = FACE_FOR_CHAR (it->f, face, it->char_to_display); - face = FACE_FROM_ID (it->f, it->face_id); - } - else if (!SINGLE_BYTE_CHAR_P (it->c) - && !it->multibyte_p) - { - it->multibyte_p = 1; - it->face_id = FACE_FOR_CHAR (it->f, face, it->char_to_display); - face = FACE_FROM_ID (it->f, it->face_id); - } - } - - /* Get font to use. Encode IT->char_to_display. */ - x_get_char_face_and_encoding (it->f, it->char_to_display, - it->face_id, &char2b, - it->multibyte_p); - font = face->font; + int i, x; + HFONT old_font; - /* When no suitable font found, use the default font. */ - font_not_found_p = font == NULL; - if (font_not_found_p) - { - font = FRAME_FONT (it->f); - boff = it->f->output_data.w32->baseline_offset; - font_info = NULL; - } - else - { - font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id); - boff = font_info->baseline_offset; - if (font_info->vertical_centering) - boff = VCENTER_BASELINE_OFFSET (font, it->f) - boff; - } - - if (it->char_to_display >= ' ' - && (!it->multibyte_p || it->char_to_display < 128)) - { - /* Either unibyte or ASCII. */ - int stretched_p; - - it->nglyphs = 1; - - pcm = w32_per_char_metric (font, &char2b, - font->bdf ? BDF_1D_FONT : ANSI_FONT); - it->ascent = FONT_BASE (font) + boff; - it->descent = FONT_DESCENT (font) - boff; + /* If first glyph of S has a left box line, start drawing the text + of S to the right of that box line. */ + if (s->face->box != FACE_NO_BOX + && s->first_glyph->left_box_line_p) + x = s->x + abs (s->face->box_line_width); + else + x = s->x; - if (pcm) - { - it->phys_ascent = pcm->ascent + boff; - it->phys_descent = pcm->descent - boff; - it->pixel_width = pcm->width; - } - else - { - it->glyph_not_available_p = 1; - it->phys_ascent = FONT_BASE (font) + boff; - it->phys_descent = FONT_DESCENT (font) - boff; - it->pixel_width = FONT_WIDTH (font); - } + if (s->for_overlaps || (s->background_filled_p && s->hl != DRAW_CURSOR)) + SetBkMode (s->hdc, TRANSPARENT); + else + SetBkMode (s->hdc, OPAQUE); - /* If this is a space inside a region of text with - `space-width' property, change its width. */ - stretched_p = it->char_to_display == ' ' && !NILP (it->space_width); - if (stretched_p) - it->pixel_width *= XFLOATINT (it->space_width); + SetTextColor (s->hdc, s->gc->foreground); + SetBkColor (s->hdc, s->gc->background); + SetTextAlign (s->hdc, TA_BASELINE | TA_LEFT); - /* If face has a box, add the box thickness to the character - height. If character has a box line to the left and/or - right, add the box line width to the character's width. */ - if (face->box != FACE_NO_BOX) - { - int thick = face->box_line_width; + if (s->font && s->font->hfont) + old_font = SelectObject (s->hdc, s->font->hfont); - if (thick > 0) - { - it->ascent += thick; - it->descent += thick; - } - else - thick = -thick; + /* Draw characters of S as rectangles if S's font could not be + loaded. */ + if (s->font_not_found_p) + { + for (i = 0; i < s->nchars; ++i) + { + struct glyph *g = s->first_glyph + i; - if (it->start_of_box_run_p) - it->pixel_width += thick; - if (it->end_of_box_run_p) - it->pixel_width += thick; - } + w32_draw_rectangle (s->hdc, s->gc, x, s->y, g->pixel_width - 1, + s->height - 1); + x += g->pixel_width; + } + } + else + { + char *char1b = (char *) s->char2b; + int boff = s->font_info->baseline_offset; - /* If face has an overline, add the height of the overline - (1 pixel) and a 1 pixel margin to the character height. */ - if (face->overline_p) - it->ascent += 2; + if (s->font_info->vertical_centering) + boff = VCENTER_BASELINE_OFFSET (s->font, s->f) - boff; - take_vertical_position_into_account (it); + /* If we can use 8-bit functions, condense S->char2b. */ + if (!s->two_byte_p) + for (i = 0; i < s->nchars; ++i) + char1b[i] = XCHAR2B_BYTE2 (&s->char2b[i]); - /* If we have to actually produce glyphs, do it. */ - if (it->glyph_row) - { - if (stretched_p) - { - /* Translate a space with a `space-width' property - into a stretch glyph. */ - double ascent = (double) FONT_BASE (font) - / FONT_HEIGHT (font); - x_append_stretch_glyph (it, it->object, it->pixel_width, - it->ascent + it->descent, ascent); - } - else - x_append_glyph (it); + /* Draw text with TextOut and friends. */ + w32_text_out (s, x, s->ybase - boff, s->char2b, s->nchars); - /* If characters with lbearing or rbearing are displayed - in this line, record that fact in a flag of the - glyph row. This is used to optimize X output code. */ - if (pcm && (pcm->lbearing < 0 || pcm->rbearing > pcm->width)) - it->glyph_row->contains_overlapping_glyphs_p = 1; - } - } - else if (it->char_to_display == '\n') - { - /* A newline has no width but we need the height of the line. */ - it->pixel_width = 0; - it->nglyphs = 0; - it->ascent = it->phys_ascent = FONT_BASE (font) + boff; - it->descent = it->phys_descent = FONT_DESCENT (font) - boff; - - if (face->box != FACE_NO_BOX - && face->box_line_width > 0) - { - it->ascent += face->box_line_width; - it->descent += face->box_line_width; - } - } - else if (it->char_to_display == '\t') + if (s->face->overstrike) { - int tab_width = it->tab_width * CANON_X_UNIT (it->f); - int x = it->current_x + it->continuation_lines_width; - int next_tab_x = ((1 + x + tab_width - 1) / tab_width) * tab_width; - - /* If the distance from the current position to the next tab - stop is less than a canonical character width, use the - tab stop after that. */ - if (next_tab_x - x < CANON_X_UNIT (it->f)) - next_tab_x += tab_width; - - it->pixel_width = next_tab_x - x; - it->nglyphs = 1; - it->ascent = it->phys_ascent = FONT_BASE (font) + boff; - it->descent = it->phys_descent = FONT_DESCENT (font) - boff; - - if (it->glyph_row) - { - double ascent = (double) it->ascent / (it->ascent + it->descent); - x_append_stretch_glyph (it, it->object, it->pixel_width, - it->ascent + it->descent, ascent); - } + /* For overstriking (to simulate bold-face), draw the + characters again shifted to the right by one pixel. */ + w32_text_out (s, x + 1, s->ybase - boff, s->char2b, s->nchars); } - else - { - /* A multi-byte character. - If we found a font, this font should give us the right - metrics. If we didn't find a font, use the frame's - default font and calculate the width of the character - from the charset width; this is what old redisplay code - did. */ - enum w32_char_font_type type; - - if (font->bdf && CHARSET_DIMENSION (CHAR_CHARSET (it->c)) == 1) - type = BDF_1D_FONT; - else if (font->bdf) - type = BDF_2D_FONT; - else - type = UNICODE_FONT; - - pcm = w32_per_char_metric (font, &char2b, type); + } + if (s->font && s->font->hfont) + SelectObject (s->hdc, old_font); +} - if (font_not_found_p || !pcm) - { - int charset = CHAR_CHARSET (it->char_to_display); +/* Draw the foreground of composite glyph string S. */ - it->glyph_not_available_p = 1; - it->pixel_width = (FONT_WIDTH (FRAME_FONT (it->f)) - * CHARSET_WIDTH (charset)); - it->phys_ascent = FONT_BASE (font) + boff; - it->phys_descent = FONT_DESCENT (font) - boff; - } - else - { - it->pixel_width = pcm->width; - it->phys_ascent = pcm->ascent + boff; - it->phys_descent = pcm->descent - boff; - if (it->glyph_row - && (pcm->lbearing < 0 - || pcm->rbearing > pcm->width)) - it->glyph_row->contains_overlapping_glyphs_p = 1; - } - it->nglyphs = 1; - it->ascent = FONT_BASE (font) + boff; - it->descent = FONT_DESCENT (font) - boff; - if (face->box != FACE_NO_BOX) - { - int thick = face->box_line_width; +static void +x_draw_composite_glyph_string_foreground (s) + struct glyph_string *s; +{ + int i, x; + HFONT old_font; - if (thick > 0) - { - it->ascent += thick; - it->descent += thick; - } - else - thick = - thick; + /* If first glyph of S has a left box line, start drawing the text + of S to the right of that box line. */ + if (s->face->box != FACE_NO_BOX + && s->first_glyph->left_box_line_p) + x = s->x + abs (s->face->box_line_width); + else + x = s->x; - if (it->start_of_box_run_p) - it->pixel_width += thick; - if (it->end_of_box_run_p) - it->pixel_width += thick; - } + /* S is a glyph string for a composition. S->gidx is the index of + the first character drawn for glyphs of this composition. + S->gidx == 0 means we are drawing the very first character of + this composition. */ - /* If face has an overline, add the height of the overline - (1 pixel) and a 1 pixel margin to the character height. */ - if (face->overline_p) - it->ascent += 2; + SetTextColor (s->hdc, s->gc->foreground); + SetBkColor (s->hdc, s->gc->background); + SetBkMode (s->hdc, TRANSPARENT); + SetTextAlign (s->hdc, TA_BASELINE | TA_LEFT); - take_vertical_position_into_account (it); + if (s->font && s->font->hfont) + old_font = SelectObject (s->hdc, s->font->hfont); - if (it->glyph_row) - x_append_glyph (it); - } - it->multibyte_p = saved_multibyte_p; + /* Draw a rectangle for the composition if the font for the very + first character of the composition could not be loaded. */ + if (s->font_not_found_p) + { + if (s->gidx == 0) + w32_draw_rectangle (s->hdc, s->gc, x, s->y, s->width - 1, + s->height - 1); } - else if (it->what == IT_COMPOSITION) + else { - /* Note: A composition is represented as one glyph in the - glyph matrix. There are no padding glyphs. */ - wchar_t char2b; - XFontStruct *font; - struct face *face = FACE_FROM_ID (it->f, it->face_id); - XCharStruct *pcm; - int font_not_found_p; - struct font_info *font_info; - int boff; /* baseline offset */ - struct composition *cmp = composition_table[it->cmp_id]; - - /* Maybe translate single-byte characters to multibyte. */ - it->char_to_display = it->c; - if (unibyte_display_via_language_environment - && SINGLE_BYTE_CHAR_P (it->c) - && (it->c >= 0240 - || (it->c >= 0200 - && !NILP (Vnonascii_translation_table)))) - { - it->char_to_display = unibyte_char_to_multibyte (it->c); - } - - /* Get face and font to use. Encode IT->char_to_display. */ - it->face_id = FACE_FOR_CHAR (it->f, face, it->char_to_display); - face = FACE_FROM_ID (it->f, it->face_id); - x_get_char_face_and_encoding (it->f, it->char_to_display, - it->face_id, &char2b, it->multibyte_p); - font = face->font; - - /* When no suitable font found, use the default font. */ - font_not_found_p = font == NULL; - if (font_not_found_p) - { - font = FRAME_FONT (it->f); - boff = it->f->output_data.w32->baseline_offset; - font_info = NULL; - } - else + for (i = 0; i < s->nchars; i++, ++s->gidx) { - font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id); - boff = font_info->baseline_offset; - if (font_info->vertical_centering) - boff = VCENTER_BASELINE_OFFSET (font, it->f) - boff; + w32_text_out (s, x + s->cmp->offsets[s->gidx * 2], + s->ybase - s->cmp->offsets[s->gidx * 2 + 1], + s->char2b + i, 1); + if (s->face->overstrike) + w32_text_out (s, x + s->cmp->offsets[s->gidx * 2] + 1, + s->ybase - s->cmp->offsets[s->gidx * 2 + 1], + s->char2b + i, 1); } + } - /* There are no padding glyphs, so there is only one glyph to - produce for the composition. Important is that pixel_width, - ascent and descent are the values of what is drawn by - draw_glyphs (i.e. the values of the overall glyphs composed). */ - it->nglyphs = 1; - - /* If we have not yet calculated pixel size data of glyphs of - the composition for the current face font, calculate them - now. Theoretically, we have to check all fonts for the - glyphs, but that requires much time and memory space. So, - here we check only the font of the first glyph. This leads - to incorrect display very rarely, and C-l (recenter) can - correct the display anyway. */ - if (cmp->font != (void *) font) - { - /* Ascent and descent of the font of the first character of - this composition (adjusted by baseline offset). Ascent - and descent of overall glyphs should not be less than - them respectively. */ - int font_ascent = FONT_BASE (font) + boff; - int font_descent = FONT_DESCENT (font) - boff; - /* Bounding box of the overall glyphs. */ - int leftmost, rightmost, lowest, highest; - int i, width, ascent, descent; - enum w32_char_font_type font_type; - - cmp->font = (void *) font; - - if (font->bdf && CHARSET_DIMENSION (CHAR_CHARSET (it->c)) == 1) - font_type = BDF_1D_FONT; - else if (font->bdf) - font_type = BDF_2D_FONT; - else - font_type = UNICODE_FONT; - - /* Initialize the bounding box. */ - if (font_info - && (pcm = w32_per_char_metric (font, &char2b, font_type))) - { - width = pcm->width; - ascent = pcm->ascent; - descent = pcm->descent; - } - else - { - width = FONT_WIDTH (font); - ascent = FONT_BASE (font); - descent = FONT_DESCENT (font); - } - - rightmost = width; - lowest = - descent + boff; - highest = ascent + boff; - leftmost = 0; - - if (font_info - && font_info->default_ascent - && CHAR_TABLE_P (Vuse_default_ascent) - && !NILP (Faref (Vuse_default_ascent, - make_number (it->char_to_display)))) - highest = font_info->default_ascent + boff; - - /* Draw the first glyph at the normal position. It may be - shifted to right later if some other glyphs are drawn at - the left. */ - cmp->offsets[0] = 0; - cmp->offsets[1] = boff; - - /* Set cmp->offsets for the remaining glyphs. */ - for (i = 1; i < cmp->glyph_len; i++) - { - int left, right, btm, top; - int ch = COMPOSITION_GLYPH (cmp, i); - int face_id = FACE_FOR_CHAR (it->f, face, ch); - - face = FACE_FROM_ID (it->f, face_id); - x_get_char_face_and_encoding (it->f, ch, face->id, &char2b, - it->multibyte_p); - font = face->font; - if (font == NULL) - { - font = FRAME_FONT (it->f); - boff = it->f->output_data.w32->baseline_offset; - font_info = NULL; - } - else - { - font_info - = FONT_INFO_FROM_ID (it->f, face->font_info_id); - boff = font_info->baseline_offset; - if (font_info->vertical_centering) - boff = VCENTER_BASELINE_OFFSET (font, it->f) - boff; - } + if (s->font && s->font->hfont) + SelectObject (s->hdc, old_font); +} - if (font->bdf && CHARSET_DIMENSION (CHAR_CHARSET (ch)) == 1) - font_type = BDF_1D_FONT; - else if (font->bdf) - font_type = BDF_2D_FONT; - else - font_type = UNICODE_FONT; - if (font_info - && (pcm = w32_per_char_metric (font, &char2b, font_type))) - { - width = pcm->width; - ascent = pcm->ascent; - descent = pcm->descent; - } - else - { - width = FONT_WIDTH (font); - ascent = 1; - descent = 0; - } +/* Brightness beyond which a color won't have its highlight brightness + boosted. - if (cmp->method != COMPOSITION_WITH_RULE_ALTCHARS) - { - /* Relative composition with or without - alternate chars. */ - left = (leftmost + rightmost - width) / 2; - btm = - descent + boff; - if (font_info && font_info->relative_compose - && (! CHAR_TABLE_P (Vignore_relative_composition) - || NILP (Faref (Vignore_relative_composition, - make_number (ch))))) - { + Nominally, highlight colors for `3d' faces are calculated by + brightening an object's color by a constant scale factor, but this + doesn't yield good results for dark colors, so for colors who's + brightness is less than this value (on a scale of 0-255) have to + use an additional additive factor. - if (- descent >= font_info->relative_compose) - /* One extra pixel between two glyphs. */ - btm = highest + 1; - else if (ascent <= 0) - /* One extra pixel between two glyphs. */ - btm = lowest - 1 - ascent - descent; - } - } - else - { - /* A composition rule is specified by an integer - value that encodes global and new reference - points (GREF and NREF). GREF and NREF are - specified by numbers as below: - - 0---1---2 -- ascent - | | - | | - | | - 9--10--11 -- center - | | - ---3---4---5--- baseline - | | - 6---7---8 -- descent - */ - int rule = COMPOSITION_RULE (cmp, i); - int gref, nref, grefx, grefy, nrefx, nrefy; - - COMPOSITION_DECODE_RULE (rule, gref, nref); - grefx = gref % 3, nrefx = nref % 3; - grefy = gref / 3, nrefy = nref / 3; - - left = (leftmost - + grefx * (rightmost - leftmost) / 2 - - nrefx * width / 2); - btm = ((grefy == 0 ? highest - : grefy == 1 ? 0 - : grefy == 2 ? lowest - : (highest + lowest) / 2) - - (nrefy == 0 ? ascent + descent - : nrefy == 1 ? descent - boff - : nrefy == 2 ? 0 - : (ascent + descent) / 2)); - } + The value here is set so that the default menu-bar/mode-line color + (grey75) will not have its highlights changed at all. */ +#define HIGHLIGHT_COLOR_DARK_BOOST_LIMIT 187 - cmp->offsets[i * 2] = left; - cmp->offsets[i * 2 + 1] = btm + descent; - - /* Update the bounding box of the overall glyphs. */ - right = left + width; - top = btm + descent + ascent; - if (left < leftmost) - leftmost = left; - if (right > rightmost) - rightmost = right; - if (top > highest) - highest = top; - if (btm < lowest) - lowest = btm; - } - /* If there are glyphs whose x-offsets are negative, - shift all glyphs to the right and make all x-offsets - non-negative. */ - if (leftmost < 0) - { - for (i = 0; i < cmp->glyph_len; i++) - cmp->offsets[i * 2] -= leftmost; - rightmost -= leftmost; - } +/* Allocate a color which is lighter or darker than *COLOR by FACTOR + or DELTA. Try a color with RGB values multiplied by FACTOR first. + If this produces the same color as COLOR, try a color where all RGB + values have DELTA added. Return the allocated color in *COLOR. + DISPLAY is the X display, CMAP is the colormap to operate on. + Value is non-zero if successful. */ - cmp->pixel_width = rightmost; - cmp->ascent = highest; - cmp->descent = - lowest; - if (cmp->ascent < font_ascent) - cmp->ascent = font_ascent; - if (cmp->descent < font_descent) - cmp->descent = font_descent; - } +static int +w32_alloc_lighter_color (f, color, factor, delta) + struct frame *f; + COLORREF *color; + double factor; + int delta; +{ + COLORREF new; + long bright; - it->pixel_width = cmp->pixel_width; - it->ascent = it->phys_ascent = cmp->ascent; - it->descent = it->phys_descent = cmp->descent; + /* On Windows, RGB values are 0-255, not 0-65535, so scale delta. */ + delta /= 256; - if (face->box != FACE_NO_BOX) - { - int thick = face->box_line_width; + /* Change RGB values by specified FACTOR. Avoid overflow! */ + xassert (factor >= 0); + new = PALETTERGB (min (0xff, factor * GetRValue (*color)), + min (0xff, factor * GetGValue (*color)), + min (0xff, factor * GetBValue (*color))); - if (thick > 0) - { - it->ascent += thick; - it->descent += thick; - } - else - thick = - thick; + /* Calculate brightness of COLOR. */ + bright = (2 * GetRValue (*color) + 3 * GetGValue (*color) + + GetBValue (*color)) / 6; - if (it->start_of_box_run_p) - it->pixel_width += thick; - if (it->end_of_box_run_p) - it->pixel_width += thick; - } + /* We only boost colors that are darker than + HIGHLIGHT_COLOR_DARK_BOOST_LIMIT. */ + if (bright < HIGHLIGHT_COLOR_DARK_BOOST_LIMIT) + /* Make an additive adjustment to NEW, because it's dark enough so + that scaling by FACTOR alone isn't enough. */ + { + /* How far below the limit this color is (0 - 1, 1 being darker). */ + double dimness = 1 - (double)bright / HIGHLIGHT_COLOR_DARK_BOOST_LIMIT; + /* The additive adjustment. */ + int min_delta = delta * dimness * factor / 2; - /* If face has an overline, add the height of the overline - (1 pixel) and a 1 pixel margin to the character height. */ - if (face->overline_p) - it->ascent += 2; + if (factor < 1) + new = PALETTERGB (max (0, min (0xff, min_delta - GetRValue (*color))), + max (0, min (0xff, min_delta - GetGValue (*color))), + max (0, min (0xff, min_delta - GetBValue (*color)))); + else + new = PALETTERGB (max (0, min (0xff, min_delta + GetRValue (*color))), + max (0, min (0xff, min_delta + GetGValue (*color))), + max (0, min (0xff, min_delta + GetBValue (*color)))); + } - take_vertical_position_into_account (it); + if (new == *color) + new = PALETTERGB (max (0, min (0xff, delta + GetRValue (*color))), + max (0, min (0xff, delta + GetGValue (*color))), + max (0, min (0xff, delta + GetBValue (*color)))); - if (it->glyph_row) - x_append_composite_glyph (it); - } - else if (it->what == IT_IMAGE) - x_produce_image_glyph (it); - else if (it->what == IT_STRETCH) - x_produce_stretch_glyph (it); + /* TODO: Map to palette and retry with delta if same? */ + /* TODO: Free colors (if using palette)? */ - /* Accumulate dimensions. Note: can't assume that it->descent > 0 - because this isn't true for images with `:ascent 100'. */ - xassert (it->ascent >= 0 && it->descent >= 0); - if (it->area == TEXT_AREA) - it->current_x += it->pixel_width; + if (new == *color) + return 0; - it->descent += it->extra_line_spacing; + *color = new; - it->max_ascent = max (it->max_ascent, it->ascent); - it->max_descent = max (it->max_descent, it->descent); - it->max_phys_ascent = max (it->max_phys_ascent, it->phys_ascent); - it->max_phys_descent = max (it->max_phys_descent, it->phys_descent); + return 1; } -/* Estimate the pixel height of the mode or top line on frame F. - FACE_ID specifies what line's height to estimate. */ +/* Set up the foreground color for drawing relief lines of glyph + string S. RELIEF is a pointer to a struct relief containing the GC + with which lines will be drawn. Use a color that is FACTOR or + DELTA lighter or darker than the relief's background which is found + in S->f->output_data.x->relief_background. If such a color cannot + be allocated, use DEFAULT_PIXEL, instead. */ -int -x_estimate_mode_line_height (f, face_id) +static void +w32_setup_relief_color (f, relief, factor, delta, default_pixel) struct frame *f; - enum face_id face_id; + struct relief *relief; + double factor; + int delta; + COLORREF default_pixel; { - int height = FONT_HEIGHT (FRAME_FONT (f)); + XGCValues xgcv; + struct w32_output *di = f->output_data.w32; + unsigned long mask = GCForeground; + COLORREF pixel; + COLORREF background = di->relief_background; + struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); - /* This function is called so early when Emacs starts that the face - cache and mode line face are not yet initialized. */ - if (FRAME_FACE_CACHE (f)) - { - struct face *face = FACE_FROM_ID (f, face_id); - if (face) - { - if (face->font) - height = FONT_HEIGHT (face->font); - if (face->box_line_width > 0) - height += 2 * face->box_line_width; - } - } + /* TODO: Free colors (if using palette)? */ - return height; -} + /* Allocate new color. */ + xgcv.foreground = default_pixel; + pixel = background; + if (w32_alloc_lighter_color (f, &pixel, factor, delta)) + { + relief->allocated_p = 1; + xgcv.foreground = relief->pixel = pixel; + } - -/*********************************************************************** - Glyph display - ***********************************************************************/ + if (relief->gc == 0) + { +#if 0 /* TODO: stipple */ + xgcv.stipple = dpyinfo->gray; + mask |= GCStipple; +#endif + relief->gc = XCreateGC (NULL, FRAME_W32_WINDOW (f), mask, &xgcv); + } + else + XChangeGC (NULL, relief->gc, mask, &xgcv); +} -/* A sequence of glyphs to be drawn in the same face. - This data structure is not really completely X specific, so it - could possibly, at least partially, be useful for other systems. It - is currently not part of the external redisplay interface because - it's not clear what other systems will need. */ +/* Set up colors for the relief lines around glyph string S. */ -struct glyph_string +static void +x_setup_relief_colors (s) + struct glyph_string *s; { - /* X-origin of the string. */ - int x; - - /* Y-origin and y-position of the base line of this string. */ - int y, ybase; + struct w32_output *di = s->f->output_data.w32; + COLORREF color; - /* The width of the string, not including a face extension. */ - int width; + if (s->face->use_box_color_for_shadows_p) + color = s->face->box_color; + else if (s->first_glyph->type == IMAGE_GLYPH + && s->img->pixmap + && !IMAGE_BACKGROUND_TRANSPARENT (s->img, s->f, 0)) + color = IMAGE_BACKGROUND (s->img, s->f, 0); + else + color = s->gc->background; - /* The width of the string, including a face extension. */ - int background_width; + if (di->white_relief.gc == 0 + || color != di->relief_background) + { + di->relief_background = color; + w32_setup_relief_color (s->f, &di->white_relief, 1.2, 0x8000, + WHITE_PIX_DEFAULT (s->f)); + w32_setup_relief_color (s->f, &di->black_relief, 0.6, 0x4000, + BLACK_PIX_DEFAULT (s->f)); + } +} - /* The height of this string. This is the height of the line this - string is drawn in, and can be different from the height of the - font the string is drawn in. */ - int height; - /* Number of pixels this string overwrites in front of its x-origin. - This number is zero if the string has an lbearing >= 0; it is - -lbearing, if the string has an lbearing < 0. */ - int left_overhang; +/* Draw a relief on frame F inside the rectangle given by LEFT_X, + TOP_Y, RIGHT_X, and BOTTOM_Y. WIDTH is the thickness of the relief + to draw, it must be >= 0. RAISED_P non-zero means draw a raised + relief. LEFT_P non-zero means draw a relief on the left side of + the rectangle. RIGHT_P non-zero means draw a relief on the right + side of the rectangle. CLIP_RECT is the clipping rectangle to use + when drawing. */ - /* Number of pixels this string overwrites past its right-most - nominal x-position, i.e. x + width. Zero if the string's - rbearing is <= its nominal width, rbearing - width otherwise. */ - int right_overhang; +static void +w32_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width, + raised_p, top_p, bot_p, left_p, right_p, clip_rect) + struct frame *f; + int left_x, top_y, right_x, bottom_y, width; + int top_p, bot_p, left_p, right_p, raised_p; + RECT *clip_rect; +{ + int i; + XGCValues gc; + HDC hdc = get_frame_dc (f); - /* The frame on which the glyph string is drawn. */ - struct frame *f; + if (raised_p) + gc.foreground = f->output_data.w32->white_relief.gc->foreground; + else + gc.foreground = f->output_data.w32->black_relief.gc->foreground; - /* The window on which the glyph string is drawn. */ - struct window *w; + w32_set_clip_rectangle (hdc, clip_rect); - /* X display and window for convenience. */ - Window window; + /* Top. */ + if (top_p) + for (i = 0; i < width; ++i) + w32_fill_area (f, hdc, gc.foreground, + left_x + i * left_p, top_y + i, + right_x - left_x - i * (left_p + right_p ) + 1, 1); - /* The glyph row for which this string was built. It determines the - y-origin and height of the string. */ - struct glyph_row *row; + /* Left. */ + if (left_p) + for (i = 0; i < width; ++i) + w32_fill_area (f, hdc, gc.foreground, + left_x + i, top_y + i, 1, + bottom_y - top_y - 2 * i + 1); - /* The area within row. */ - enum glyph_row_area area; + if (raised_p) + gc.foreground = f->output_data.w32->black_relief.gc->foreground; + else + gc.foreground = f->output_data.w32->white_relief.gc->foreground; - /* Characters to be drawn, and number of characters. */ - wchar_t *char2b; - int nchars; + /* Bottom. */ + if (bot_p) + for (i = 0; i < width; ++i) + w32_fill_area (f, hdc, gc.foreground, + left_x + i * left_p, bottom_y - i, + right_x - left_x - i * (left_p + right_p) + 1, 1); - /* A face-override for drawing cursors, mouse face and similar. */ - enum draw_glyphs_face hl; + /* Right. */ + if (right_p) + for (i = 0; i < width; ++i) + w32_fill_area (f, hdc, gc.foreground, + right_x - i, top_y + i + 1, 1, + bottom_y - top_y - 2 * i - 1); - /* Face in which this string is to be drawn. */ - struct face *face; + w32_set_clip_rectangle (hdc, NULL); - /* Font in which this string is to be drawn. */ - XFontStruct *font; + release_frame_dc (f, hdc); +} - /* Font info for this string. */ - struct font_info *font_info; - /* Non-null means this string describes (part of) a composition. - All characters from char2b are drawn composed. */ - struct composition *cmp; +/* Draw a box on frame F inside the rectangle given by LEFT_X, TOP_Y, + RIGHT_X, and BOTTOM_Y. WIDTH is the thickness of the lines to + draw, it must be >= 0. LEFT_P non-zero means draw a line on the + left side of the rectangle. RIGHT_P non-zero means draw a line + on the right side of the rectangle. CLIP_RECT is the clipping + rectangle to use when drawing. */ - /* Index of this glyph string's first character in the glyph - definition of CMP. If this is zero, this glyph string describes - the first character of a composition. */ - int gidx; +static void +w32_draw_box_rect (s, left_x, top_y, right_x, bottom_y, width, + left_p, right_p, clip_rect) + struct glyph_string *s; + int left_x, top_y, right_x, bottom_y, width, left_p, right_p; + RECT *clip_rect; +{ + w32_set_clip_rectangle (s->hdc, clip_rect); - /* 1 means this glyph strings face has to be drawn to the right end - of the window's drawing area. */ - unsigned extends_to_end_of_line_p : 1; + /* Top. */ + w32_fill_area (s->f, s->hdc, s->face->box_color, + left_x, top_y, right_x - left_x + 1, width); - /* 1 means the background of this string has been drawn. */ - unsigned background_filled_p : 1; + /* Left. */ + if (left_p) + { + w32_fill_area (s->f, s->hdc, s->face->box_color, + left_x, top_y, width, bottom_y - top_y + 1); + } - /* 1 means glyph string must be drawn with 16-bit functions. */ - unsigned two_byte_p : 1; + /* Bottom. */ + w32_fill_area (s->f, s->hdc, s->face->box_color, + left_x, bottom_y - width + 1, right_x - left_x + 1, width); - /* 1 means that the original font determined for drawing this glyph - string could not be loaded. The member `font' has been set to - the frame's default font in this case. */ - unsigned font_not_found_p : 1; + /* Right. */ + if (right_p) + { + w32_fill_area (s->f, s->hdc, s->face->box_color, + right_x - width + 1, top_y, width, bottom_y - top_y + 1); + } - /* 1 means that the face in which this glyph string is drawn has a - stipple pattern. */ - unsigned stippled_p : 1; + w32_set_clip_rectangle (s->hdc, NULL); +} - /* 1 means only the foreground of this glyph string must be drawn, - and we should use the physical height of the line this glyph - string appears in as clip rect. */ - unsigned for_overlaps_p : 1; - /* The GC to use for drawing this glyph string. */ - XGCValues *gc; +/* Draw a box around glyph string S. */ - HDC hdc; +static void +x_draw_glyph_string_box (s) + struct glyph_string *s; +{ + int width, left_x, right_x, top_y, bottom_y, last_x, raised_p; + int left_p, right_p; + struct glyph *last_glyph; + RECT clip_rect; - /* A pointer to the first glyph in the string. This glyph - corresponds to char2b[0]. Needed to draw rectangles if - font_not_found_p is 1. */ - struct glyph *first_glyph; + last_x = ((s->row->full_width_p && !s->w->pseudo_window_p) + ? WINDOW_RIGHT_EDGE_X (s->w) + : window_box_right (s->w, s->area)); - /* Image, if any. */ - struct image *img; + /* The glyph that may have a right box line. */ + last_glyph = (s->cmp || s->img + ? s->first_glyph + : s->first_glyph + s->nchars - 1); - struct glyph_string *next, *prev; -}; + width = abs (s->face->box_line_width); + raised_p = s->face->box == FACE_RAISED_BOX; + left_x = s->x; + right_x = ((s->row->full_width_p && s->extends_to_end_of_line_p + ? last_x - 1 + : min (last_x, s->x + s->background_width) - 1)); + top_y = s->y; + bottom_y = top_y + s->height - 1; + left_p = (s->first_glyph->left_box_line_p + || (s->hl == DRAW_MOUSE_FACE + && (s->prev == NULL + || s->prev->hl != s->hl))); + right_p = (last_glyph->right_box_line_p + || (s->hl == DRAW_MOUSE_FACE + && (s->next == NULL + || s->next->hl != s->hl))); -/* Encapsulate the different ways of displaying text under W32. */ + get_glyph_string_clip_rect (s, &clip_rect); -static void -w32_text_out (s, x, y,chars,nchars) - struct glyph_string * s; - int x, y; - wchar_t * chars; - int nchars; -{ - int charset_dim = w32_font_is_double_byte (s->gc->font) ? 2 : 1; - if (s->gc->font->bdf) - w32_BDF_TextOut (s->gc->font->bdf, s->hdc, - x, y, (char *) chars, charset_dim, - nchars * charset_dim, 0); - else if (s->first_glyph->w32_font_type == UNICODE_FONT) - ExtTextOutW (s->hdc, x, y, 0, NULL, chars, nchars, NULL); + if (s->face->box == FACE_SIMPLE_BOX) + w32_draw_box_rect (s, left_x, top_y, right_x, bottom_y, width, + left_p, right_p, &clip_rect); else - ExtTextOutA (s->hdc, x, y, 0, NULL, (char *) chars, - nchars * charset_dim, NULL); + { + x_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); + } } -#if GLYPH_DEBUG + +/* Draw foreground of image glyph string S. */ static void -x_dump_glyph_string (s) +x_draw_image_foreground (s) struct glyph_string *s; { - fprintf (stderr, "glyph string\n"); - fprintf (stderr, " x, y, w, h = %d, %d, %d, %d\n", - s->x, s->y, s->width, s->height); - fprintf (stderr, " ybase = %d\n", s->ybase); - fprintf (stderr, " hl = %d\n", s->hl); - fprintf (stderr, " left overhang = %d, right = %d\n", - s->left_overhang, s->right_overhang); - fprintf (stderr, " nchars = %d\n", s->nchars); - fprintf (stderr, " extends to end of line = %d\n", - s->extends_to_end_of_line_p); - fprintf (stderr, " font height = %d\n", FONT_HEIGHT (s->font)); - fprintf (stderr, " bg width = %d\n", s->background_width); -} - -#endif /* GLYPH_DEBUG */ - - - -static void x_append_glyph_string_lists P_ ((struct glyph_string **, - struct glyph_string **, - struct glyph_string *, - struct glyph_string *)); -static void x_prepend_glyph_string_lists P_ ((struct glyph_string **, - struct glyph_string **, - struct glyph_string *, - struct glyph_string *)); -static void x_append_glyph_string P_ ((struct glyph_string **, - struct glyph_string **, - struct glyph_string *)); -static int x_left_overwritten P_ ((struct glyph_string *)); -static int x_left_overwriting P_ ((struct glyph_string *)); -static int x_right_overwritten P_ ((struct glyph_string *)); -static int x_right_overwriting P_ ((struct glyph_string *)); -static int x_fill_glyph_string P_ ((struct glyph_string *, int, int, int, - int)); -static void w32_init_glyph_string P_ ((struct glyph_string *, HDC hdc, - wchar_t *, struct window *, - struct glyph_row *, - enum glyph_row_area, int, - enum draw_glyphs_face)); -static int x_draw_glyphs P_ ((struct window *, int , struct glyph_row *, - enum glyph_row_area, int, int, - enum draw_glyphs_face, int)); -static void x_set_glyph_string_clipping P_ ((struct glyph_string *)); -static void x_set_glyph_string_gc P_ ((struct glyph_string *)); -static void x_draw_glyph_string_background P_ ((struct glyph_string *, - int)); -static void x_draw_glyph_string_foreground P_ ((struct glyph_string *)); -static void x_draw_composite_glyph_string_foreground P_ ((struct glyph_string *)); -static void x_draw_glyph_string_box P_ ((struct glyph_string *)); -static void x_draw_glyph_string P_ ((struct glyph_string *)); -static void x_compute_glyph_string_overhangs P_ ((struct glyph_string *)); -static void x_set_cursor_gc P_ ((struct glyph_string *)); -static void x_set_mode_line_face_gc P_ ((struct glyph_string *)); -static void x_set_mouse_face_gc P_ ((struct glyph_string *)); -static void w32_get_glyph_overhangs P_ ((HDC hdc, struct glyph *, - struct frame *, - int *, int *)); -static void x_compute_overhangs_and_x P_ ((struct glyph_string *, int, int)); -static int w32_alloc_lighter_color (struct frame *, COLORREF *, double, int); -static void w32_setup_relief_color P_ ((struct frame *, struct relief *, - double, int, COLORREF)); -static void x_setup_relief_colors P_ ((struct glyph_string *)); -static void x_draw_image_glyph_string P_ ((struct glyph_string *)); -static void x_draw_image_relief P_ ((struct glyph_string *)); -static void x_draw_image_foreground P_ ((struct glyph_string *)); -static void w32_draw_image_foreground_1 P_ ((struct glyph_string *, HBITMAP)); -static void x_fill_image_glyph_string P_ ((struct glyph_string *)); -static void x_clear_glyph_string_rect P_ ((struct glyph_string *, int, - int, int, int)); -static void w32_draw_relief_rect P_ ((struct frame *, int, int, int, int, - int, int, int, int, RECT *)); -static void w32_draw_box_rect P_ ((struct glyph_string *, int, int, int, int, - int, int, int, RECT *)); -static void x_fix_overlapping_area P_ ((struct window *, struct glyph_row *, - enum glyph_row_area)); -static int x_fill_stretch_glyph_string P_ ((struct glyph_string *, - struct glyph_row *, - enum glyph_row_area, int, int)); + int x = s->x; + int y = s->ybase - image_ascent (s->img, s->face, &s->slice); -#if GLYPH_DEBUG -static void x_check_font P_ ((struct frame *, XFontStruct *)); -#endif + /* If first glyph of S has a left box line, start drawing it to the + right of that line. */ + if (s->face->box != FACE_NO_BOX + && s->first_glyph->left_box_line_p + && s->slice.x == 0) + x += abs (s->face->box_line_width); + /* If there is a margin around the image, adjust x- and y-position + by that margin. */ + if (s->slice.x == 0) + x += s->img->hmargin; + if (s->slice.y == 0) + y += s->img->vmargin; -/* Append the list of glyph strings with head H and tail T to the list - with head *HEAD and tail *TAIL. Set *HEAD and *TAIL to the result. */ + SaveDC (s->hdc); -static INLINE void -x_append_glyph_string_lists (head, tail, h, t) - struct glyph_string **head, **tail; - struct glyph_string *h, *t; -{ - if (h) + if (s->img->pixmap) { - if (*head) - (*tail)->next = h; - else - *head = h; - h->prev = *tail; - *tail = t; - } -} + HDC compat_hdc = CreateCompatibleDC (s->hdc); + HBRUSH fg_brush = CreateSolidBrush (s->gc->foreground); + HBRUSH orig_brush = SelectObject (s->hdc, fg_brush); + HGDIOBJ orig_obj = SelectObject (compat_hdc, s->img->pixmap); + SetBkColor (compat_hdc, RGB (255, 255, 255)); + SetTextColor (s->hdc, RGB (0, 0, 0)); + x_set_glyph_string_clipping (s); + + if (s->img->mask) + { + HDC mask_dc = CreateCompatibleDC (s->hdc); + HGDIOBJ mask_orig_obj = SelectObject (mask_dc, s->img->mask); + SetTextColor (s->hdc, RGB (255, 255, 255)); + SetBkColor (s->hdc, RGB (0, 0, 0)); -/* Prepend the list of glyph strings with head H and tail T to the - list with head *HEAD and tail *TAIL. Set *HEAD and *TAIL to the - result. */ + BitBlt (s->hdc, x, y, s->slice.width, s->slice.height, + compat_hdc, s->slice.x, s->slice.y, SRCINVERT); + BitBlt (s->hdc, x, y, s->slice.width, s->slice.height, + mask_dc, s->slice.x, s->slice.y, SRCAND); + BitBlt (s->hdc, x, y, s->slice.width, s->slice.height, + compat_hdc, s->slice.x, s->slice.y, SRCINVERT); -static INLINE void -x_prepend_glyph_string_lists (head, tail, h, t) - struct glyph_string **head, **tail; - struct glyph_string *h, *t; -{ - if (h) - { - if (*head) - (*head)->prev = t; + SelectObject (mask_dc, mask_orig_obj); + DeleteDC (mask_dc); + } else - *tail = t; - t->next = *head; - *head = h; - } -} - + { + SetTextColor (s->hdc, s->gc->foreground); + SetBkColor (s->hdc, s->gc->background); -/* Append glyph string S to the list with head *HEAD and tail *TAIL. - Set *HEAD and *TAIL to the resulting list. */ + BitBlt (s->hdc, x, y, s->slice.width, s->slice.height, + compat_hdc, s->slice.x, s->slice.y, SRCCOPY); -static INLINE void -x_append_glyph_string (head, tail, s) - struct glyph_string **head, **tail; - struct glyph_string *s; -{ - s->next = s->prev = NULL; - x_append_glyph_string_lists (head, tail, s, s); + /* When the image has a mask, we can expect that at + least part of a mouse highlight or a block cursor will + be visible. If the image doesn't have a mask, make + a block cursor visible by drawing a rectangle around + the image. I believe it's looking better if we do + nothing here for mouse-face. */ + if (s->hl == DRAW_CURSOR) + { + int r = s->img->relief; + if (r < 0) r = -r; + w32_draw_rectangle (s->hdc, s->gc, x - r, y - r , + s->slice.width + r*2 - 1, + s->slice.height + r*2 - 1); + } + } + + w32_set_clip_rectangle (s->hdc, NULL); + SelectObject (s->hdc, orig_brush); + DeleteObject (fg_brush); + SelectObject (compat_hdc, orig_obj); + DeleteDC (compat_hdc); + } + else + w32_draw_rectangle (s->hdc, s->gc, x, y, + s->slice.width - 1, s->slice.height - 1); + + RestoreDC (s->hdc ,-1); } -/* Set S->gc to a suitable GC for drawing glyph string S in cursor - face. */ +/* Draw a relief around the image glyph string S. */ static void -x_set_cursor_gc (s) +x_draw_image_relief (s) struct glyph_string *s; { - if (s->font == FRAME_FONT (s->f) - && s->face->background == FRAME_BACKGROUND_PIXEL (s->f) - && s->face->foreground == FRAME_FOREGROUND_PIXEL (s->f) - && !s->cmp) - s->gc = s->f->output_data.w32->cursor_gc; - else - { - /* Cursor on non-default face: must merge. */ - XGCValues xgcv; - unsigned long mask; - - xgcv.background = s->f->output_data.w32->cursor_pixel; - xgcv.foreground = s->face->background; + int x0, y0, x1, y1, thick, raised_p; + RECT r; + int x = s->x; + int y = s->ybase - image_ascent (s->img, s->face, &s->slice); - /* If the glyph would be invisible, try a different foreground. */ - if (xgcv.foreground == xgcv.background) - xgcv.foreground = s->face->foreground; - if (xgcv.foreground == xgcv.background) - xgcv.foreground = s->f->output_data.w32->cursor_foreground_pixel; - if (xgcv.foreground == xgcv.background) - xgcv.foreground = s->face->foreground; + /* If first glyph of S has a left box line, start drawing it to the + right of that line. */ + if (s->face->box != FACE_NO_BOX + && s->first_glyph->left_box_line_p + && s->slice.x == 0) + x += abs (s->face->box_line_width); - /* Make sure the cursor is distinct from text in this face. */ - if (xgcv.background == s->face->background - && xgcv.foreground == s->face->foreground) - { - xgcv.background = s->face->foreground; - xgcv.foreground = s->face->background; - } + /* If there is a margin around the image, adjust x- and y-position + by that margin. */ + if (s->slice.x == 0) + x += s->img->hmargin; + if (s->slice.y == 0) + y += s->img->vmargin; - IF_DEBUG (x_check_font (s->f, s->font)); - xgcv.font = s->font; - mask = GCForeground | GCBackground | GCFont; + if (s->hl == DRAW_IMAGE_SUNKEN + || s->hl == DRAW_IMAGE_RAISED) + { + thick = tool_bar_button_relief >= 0 ? tool_bar_button_relief : DEFAULT_TOOL_BAR_BUTTON_RELIEF; + raised_p = s->hl == DRAW_IMAGE_RAISED; + } + else + { + thick = abs (s->img->relief); + raised_p = s->img->relief > 0; + } - if (FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc) - XChangeGC (NULL, FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc, - mask, &xgcv); - else - FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc - = XCreateGC (NULL, s->window, mask, &xgcv); + x0 = x - thick; + y0 = y - thick; + x1 = x + s->slice.width + thick - 1; + y1 = y + s->slice.height + thick - 1; - s->gc = FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc; - } + x_setup_relief_colors (s); + get_glyph_string_clip_rect (s, &r); + w32_draw_relief_rect (s->f, x0, y0, x1, y1, thick, raised_p, + s->slice.y == 0, + s->slice.y + s->slice.height == s->img->height, + s->slice.x == 0, + s->slice.x + s->slice.width == s->img->width, + &r); } -/* Set up S->gc of glyph string S for drawing text in mouse face. */ +/* Draw the foreground of image glyph string S to PIXMAP. */ static void -x_set_mouse_face_gc (s) +w32_draw_image_foreground_1 (s, pixmap) struct glyph_string *s; + HBITMAP pixmap; { - int face_id; - struct face *face; + HDC hdc = CreateCompatibleDC (s->hdc); + HGDIOBJ orig_hdc_obj = SelectObject (hdc, pixmap); + int x = 0; + int y = s->ybase - s->y - image_ascent (s->img, s->face, &s->slice); - /* What face has to be used last for the mouse face? */ - face_id = FRAME_W32_DISPLAY_INFO (s->f)->mouse_face_face_id; - face = FACE_FROM_ID (s->f, face_id); - if (face == NULL) - face = FACE_FROM_ID (s->f, MOUSE_FACE_ID); + /* If first glyph of S has a left box line, start drawing it to the + right of that line. */ + if (s->face->box != FACE_NO_BOX + && s->first_glyph->left_box_line_p + && s->slice.x == 0) + x += abs (s->face->box_line_width); - if (s->first_glyph->type == CHAR_GLYPH) - face_id = FACE_FOR_CHAR (s->f, face, s->first_glyph->u.ch); - else - face_id = FACE_FOR_CHAR (s->f, face, 0); - s->face = FACE_FROM_ID (s->f, face_id); - PREPARE_FACE_FOR_DISPLAY (s->f, s->face); + /* If there is a margin around the image, adjust x- and y-position + by that margin. */ + if (s->slice.x == 0) + x += s->img->hmargin; + if (s->slice.y == 0) + y += s->img->vmargin; - /* If font in this face is same as S->font, use it. */ - if (s->font == s->face->font) - s->gc = s->face->gc; - else + if (s->img->pixmap) { - /* Otherwise construct scratch_cursor_gc with values from FACE - but font FONT. */ - XGCValues xgcv; - unsigned long mask; + HDC compat_hdc = CreateCompatibleDC (hdc); + HBRUSH fg_brush = CreateSolidBrush (s->gc->foreground); + HBRUSH orig_brush = SelectObject (hdc, fg_brush); + HGDIOBJ orig_obj = SelectObject (compat_hdc, s->img->pixmap); - xgcv.background = s->face->background; - xgcv.foreground = s->face->foreground; - IF_DEBUG (x_check_font (s->f, s->font)); - xgcv.font = s->font; - mask = GCForeground | GCBackground | GCFont; + if (s->img->mask) + { + HDC mask_dc = CreateCompatibleDC (hdc); + HGDIOBJ mask_orig_obj = SelectObject (mask_dc, s->img->mask); - if (FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc) - XChangeGC (NULL, FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc, - mask, &xgcv); - else - FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc - = XCreateGC (NULL, s->window, mask, &xgcv); + SetTextColor (hdc, RGB (0, 0, 0)); + SetBkColor (hdc, RGB (255, 255, 255)); + BitBlt (hdc, x, y, s->slice.width, s->slice.height, + compat_hdc, s->slice.x, s->slice.y, SRCINVERT); + BitBlt (hdc, x, y, s->slice.width, s->slice.height, + mask_dc, s->slice.x, s->slice.y, SRCAND); + BitBlt (hdc, x, y, s->slice.width, s->slice.height, + compat_hdc, s->slice.x, s->slice.y, SRCINVERT); - s->gc = FRAME_W32_DISPLAY_INFO (s->f)->scratch_cursor_gc; - } + SelectObject (mask_dc, mask_orig_obj); + DeleteDC (mask_dc); + } + else + { + SetTextColor (hdc, s->gc->foreground); + SetBkColor (hdc, s->gc->background); - xassert (s->gc != 0); -} + BitBlt (hdc, x, y, s->slice.width, s->slice.height, + compat_hdc, s->slice.x, s->slice.y, SRCCOPY); + /* When the image has a mask, we can expect that at + least part of a mouse highlight or a block cursor will + be visible. If the image doesn't have a mask, make + a block cursor visible by drawing a rectangle around + the image. I believe it's looking better if we do + nothing here for mouse-face. */ + if (s->hl == DRAW_CURSOR) + { + int r = s->img->relief; + if (r < 0) r = -r; + w32_draw_rectangle (hdc, s->gc, x - r, y - r, + s->slice.width + r*2 - 1, + s->slice.height + r*2 - 1); + } + } -/* Set S->gc of glyph string S to a GC suitable for drawing a mode line. - Faces to use in the mode line have already been computed when the - matrix was built, so there isn't much to do, here. */ + SelectObject (hdc, orig_brush); + DeleteObject (fg_brush); + SelectObject (compat_hdc, orig_obj); + DeleteDC (compat_hdc); + } + else + w32_draw_rectangle (hdc, s->gc, x, y, + s->slice.width - 1, s->slice.height - 1); -static INLINE void -x_set_mode_line_face_gc (s) - struct glyph_string *s; -{ - s->gc = s->face->gc; + SelectObject (hdc, orig_hdc_obj); + DeleteDC (hdc); } -/* Set S->gc of glyph string S for drawing that glyph string. Set - S->stippled_p to a non-zero value if the face of S has a stipple - pattern. */ +/* Draw part of the background of glyph string S. X, Y, W, and H + give the rectangle to draw. */ -static INLINE void -x_set_glyph_string_gc (s) +static void +x_draw_glyph_string_bg_rect (s, x, y, w, h) struct glyph_string *s; + int x, y, w, h; { - PREPARE_FACE_FOR_DISPLAY (s->f, s->face); - - if (s->hl == DRAW_NORMAL_TEXT) - { - s->gc = s->face->gc; - s->stippled_p = s->face->stipple != 0; - } - else if (s->hl == DRAW_INVERSE_VIDEO) - { - x_set_mode_line_face_gc (s); - s->stippled_p = s->face->stipple != 0; - } - else if (s->hl == DRAW_CURSOR) - { - x_set_cursor_gc (s); - s->stippled_p = 0; - } - else if (s->hl == DRAW_MOUSE_FACE) - { - x_set_mouse_face_gc (s); - s->stippled_p = s->face->stipple != 0; - } - else if (s->hl == DRAW_IMAGE_RAISED - || s->hl == DRAW_IMAGE_SUNKEN) +#if 0 /* TODO: stipple */ + if (s->stippled_p) { - s->gc = s->face->gc; - s->stippled_p = s->face->stipple != 0; + /* Fill background with a stipple pattern. */ + XSetFillStyle (s->display, s->gc, FillOpaqueStippled); + XFillRectangle (s->display, s->window, s->gc, x, y, w, h); + XSetFillStyle (s->display, s->gc, FillSolid); } else - { - s->gc = s->face->gc; - s->stippled_p = s->face->stipple != 0; - } - - /* GC must have been set. */ - xassert (s->gc != 0); +#endif + x_clear_glyph_string_rect (s, x, y, w, h); } -/* Return in *R the clipping rectangle for glyph string S. */ +/* Draw image glyph string S. + + s->y + s->x +------------------------- + | s->face->box + | + | +------------------------- + | | s->img->vmargin + | | + | | +------------------- + | | | the image + + */ static void -w32_get_glyph_string_clip_rect (s, r) +x_draw_image_glyph_string (s) struct glyph_string *s; - RECT *r; { - int r_height, r_width; - - if (s->row->full_width_p) - { - /* Draw full-width. X coordinates are relative to S->w->left. */ - int canon_x = CANON_X_UNIT (s->f); + int x, y; + int box_line_hwidth = abs (s->face->box_line_width); + int box_line_vwidth = max (s->face->box_line_width, 0); + int height; + HBITMAP pixmap = 0; - r->left = WINDOW_LEFT_MARGIN (s->w) * canon_x; - r_width = XFASTINT (s->w->width) * canon_x; + height = s->height - 2 * box_line_vwidth; - if (FRAME_HAS_VERTICAL_SCROLL_BARS (s->f)) - { - int width = FRAME_SCROLL_BAR_WIDTH (s->f) * canon_x; - if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (s->f)) - r->left -= width; - } - - r->left += FRAME_INTERNAL_BORDER_WIDTH (s->f); - - /* Unless displaying a mode or menu bar line, which are always - fully visible, clip to the visible part of the row. */ - if (s->w->pseudo_window_p) - r_height = s->row->visible_height; - else - r_height = s->height; - } - else - { - /* This is a text line that may be partially visible. */ - r->left = WINDOW_AREA_TO_FRAME_PIXEL_X (s->w, s->area, 0); - r_width = window_box_width (s->w, s->area); - r_height = s->row->visible_height; - } - - /* If S draws overlapping rows, it's sufficient to use the top and - bottom of the window for clipping because this glyph string - intentionally draws over other lines. */ - if (s->for_overlaps_p) - { - r->top = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (s->w); - r_height = window_text_bottom_y (s->w) - r->top; - } - else + /* Fill background with face under the image. Do it only if row is + taller than image or if image has a clip mask to reduce + flickering. */ + s->stippled_p = s->face->stipple != 0; + if (height > s->slice.height + || s->img->hmargin + || s->img->vmargin + || s->img->mask + || s->img->pixmap == 0 + || s->width != s->background_width) { - /* Don't use S->y for clipping because it doesn't take partially - visible lines into account. For example, it can be negative for - partially visible lines at the top of a window. */ - if (!s->row->full_width_p - && MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (s->w, s->row)) - r->top = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (s->w); - else - r->top = max (0, s->row->y); - - /* If drawing a tool-bar window, draw it over the internal border - at the top of the window. */ - if (s->w == XWINDOW (s->f->tool_bar_window)) - r->top -= s->f->output_data.w32->internal_border_width; - } + x = s->x; + if (s->first_glyph->left_box_line_p + && s->slice.x == 0) + x += box_line_hwidth; - r->top = WINDOW_TO_FRAME_PIXEL_Y (s->w, r->top); + y = s->y; + if (s->slice.y == 0) + y += box_line_vwidth; - /* If drawing the cursor, don't let glyph draw outside its - advertised boundaries. Cleartype does this under some circumstances. */ - if (s->hl == DRAW_CURSOR) - { - if (s->x > r->left) +#if 0 /* TODO: figure out if we need to do this on Windows. */ + if (s->img->mask) { - r_width -= s->x - r->left; - r->left = s->x; - } - r_width = min (r_width, s->first_glyph->pixel_width); - } - - r->bottom = r->top + r_height; - r->right = r->left + r_width; -} - - -/* Set clipping for output of glyph string S. S may be part of a mode - line or menu if we don't have X toolkit support. */ - -static INLINE void -x_set_glyph_string_clipping (s) - struct glyph_string *s; -{ - RECT r; - w32_get_glyph_string_clip_rect (s, &r); - w32_set_clip_rectangle (s->hdc, &r); -} - - -/* Compute left and right overhang of glyph string S. If S is a glyph - string for a composition, assume overhangs don't exist. */ - -static INLINE void -x_compute_glyph_string_overhangs (s) - struct glyph_string *s; -{ - /* TODO: Windows does not appear to have a method for - getting this info without getting the ABC widths for each - individual character and working it out manually. */ -} + /* Create a pixmap as large as the glyph string. Fill it + with the background color. Copy the image to it, using + its mask. Copy the temporary pixmap to the display. */ + Screen *screen = FRAME_X_SCREEN (s->f); + int depth = DefaultDepthOfScreen (screen); + /* Create a pixmap as large as the glyph string. */ + pixmap = XCreatePixmap (s->display, s->window, + s->background_width, + s->height, depth); -/* Compute overhangs and x-positions for glyph string S and its - predecessors, or successors. X is the starting x-position for S. - BACKWARD_P non-zero means process predecessors. */ + /* Don't clip in the following because we're working on the + pixmap. */ + XSetClipMask (s->display, s->gc, None); -static void -x_compute_overhangs_and_x (s, x, backward_p) - struct glyph_string *s; - int x; - int backward_p; -{ - if (backward_p) - { - while (s) - { - x_compute_glyph_string_overhangs (s); - x -= s->width; - s->x = x; - s = s->prev; - } - } - else - { - while (s) - { - x_compute_glyph_string_overhangs (s); - s->x = x; - x += s->width; - s = s->next; + /* Fill the pixmap with the background color/stipple. */ + if (s->stippled_p) + { + /* Fill background with a stipple pattern. */ + XSetFillStyle (s->display, s->gc, FillOpaqueStippled); + XFillRectangle (s->display, pixmap, s->gc, + 0, 0, s->background_width, s->height); + XSetFillStyle (s->display, s->gc, FillSolid); + } + else + { + XGCValues xgcv; + XGetGCValues (s->display, s->gc, GCForeground | GCBackground, + &xgcv); + XSetForeground (s->display, s->gc, xgcv.background); + XFillRectangle (s->display, pixmap, s->gc, + 0, 0, s->background_width, s->height); + XSetForeground (s->display, s->gc, xgcv.foreground); + } } - } -} - - -/* Set *LEFT and *RIGHT to the left and right overhang of GLYPH on - frame F. Overhangs of glyphs other than type CHAR_GLYPH are - assumed to be zero. */ - -static void -w32_get_glyph_overhangs (hdc, glyph, f, left, right) - HDC hdc; - struct glyph *glyph; - struct frame *f; - int *left, *right; -{ - *left = *right = 0; - - if (glyph->type == CHAR_GLYPH) - { - XFontStruct *font; - struct face *face; - wchar_t char2b; - XCharStruct *pcm; - - face = x_get_glyph_face_and_encoding (f, glyph, &char2b, NULL); - font = face->font; + else +#endif + x_draw_glyph_string_bg_rect (s, x, y, s->background_width, height); - if (font - && (pcm = w32_per_char_metric (font, &char2b, - glyph->w32_font_type))) - { - if (pcm->rbearing > pcm->width) - *right = pcm->rbearing - pcm->width; - if (pcm->lbearing < 0) - *left = -pcm->lbearing; - } + s->background_filled_p = 1; } -} - - -static void -x_get_glyph_overhangs (glyph, f, left, right) - struct glyph *glyph; - struct frame *f; - int *left, *right; -{ - HDC hdc = get_frame_dc (f); - /* Convert to unicode! */ - w32_get_glyph_overhangs (hdc, glyph, f, left, right); - release_frame_dc (f, hdc); -} - -/* Return the index of the first glyph preceding glyph string S that - is overwritten by S because of S's left overhang. Value is -1 - if no glyphs are overwritten. */ - -static int -x_left_overwritten (s) - struct glyph_string *s; -{ - int k; - - if (s->left_overhang) + /* Draw the foreground. */ + if (pixmap != 0) { - int x = 0, i; - struct glyph *glyphs = s->row->glyphs[s->area]; - int first = s->first_glyph - glyphs; + w32_draw_image_foreground_1 (s, pixmap); + x_set_glyph_string_clipping (s); + { + HDC compat_hdc = CreateCompatibleDC (s->hdc); + HBRUSH fg_brush = CreateSolidBrush (s->gc->foreground); + HBRUSH orig_brush = SelectObject (s->hdc, fg_brush); + HGDIOBJ orig_obj = SelectObject (compat_hdc, pixmap); - for (i = first - 1; i >= 0 && x > -s->left_overhang; --i) - x -= glyphs[i].pixel_width; + SetTextColor (s->hdc, s->gc->foreground); + SetBkColor (s->hdc, s->gc->background); + BitBlt (s->hdc, s->x, s->y, s->background_width, s->height, + compat_hdc, 0, 0, SRCCOPY); - k = i + 1; + SelectObject (s->hdc, orig_brush); + DeleteObject (fg_brush); + SelectObject (compat_hdc, orig_obj); + DeleteDC (compat_hdc); + } + DeleteObject (pixmap); + pixmap = 0; } else - k = -1; - - return k; -} - - -/* Return the index of the first glyph preceding glyph string S that - is overwriting S because of its right overhang. Value is -1 if no - glyph in front of S overwrites S. */ - -static int -x_left_overwriting (s) - struct glyph_string *s; -{ - int i, k, x; - struct glyph *glyphs = s->row->glyphs[s->area]; - int first = s->first_glyph - glyphs; - - k = -1; - x = 0; - for (i = first - 1; i >= 0; --i) - { - int left, right; - w32_get_glyph_overhangs (s->hdc, glyphs + i, s->f, &left, &right); - if (x + right > 0) - k = i; - x -= glyphs[i].pixel_width; - } - - return k; -} - - -/* Return the index of the last glyph following glyph string S that is - not overwritten by S because of S's right overhang. Value is -1 if - no such glyph is found. */ - -static int -x_right_overwritten (s) - struct glyph_string *s; -{ - int k = -1; - - if (s->right_overhang) - { - int x = 0, i; - struct glyph *glyphs = s->row->glyphs[s->area]; - int first = (s->first_glyph - glyphs) + (s->cmp ? 1 : s->nchars); - int end = s->row->used[s->area]; - - for (i = first; i < end && s->right_overhang > x; ++i) - x += glyphs[i].pixel_width; - - k = i; - } + x_draw_image_foreground (s); - return k; + /* 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); } -/* Return the index of the last glyph following glyph string S that - overwrites S because of its left overhang. Value is negative - if no such glyph is found. */ +/* Draw stretch glyph string S. */ -static int -x_right_overwriting (s) +static void +x_draw_stretch_glyph_string (s) struct glyph_string *s; { - int i, k, x; - int end = s->row->used[s->area]; - struct glyph *glyphs = s->row->glyphs[s->area]; - int first = (s->first_glyph - glyphs) + (s->cmp ? 1 : s->nchars); + xassert (s->first_glyph->type == STRETCH_GLYPH); + s->stippled_p = s->face->stipple != 0; - k = -1; - x = 0; - for (i = first; i < end; ++i) + if (s->hl == DRAW_CURSOR + && !x_stretch_cursor_p) { - int left, right; - w32_get_glyph_overhangs (s->hdc, glyphs + i, s->f, &left, &right); - if (x - left < 0) - k = i; - x += glyphs[i].pixel_width; - } - - return k; -} - + /* If `x-stretch-block-cursor' is nil, don't draw a block cursor + as wide as the stretch glyph. */ + int width = min (FRAME_COLUMN_WIDTH (s->f), s->background_width); -/* Fill rectangle X, Y, W, H with background color of glyph string S. */ + /* Draw cursor. */ + x_draw_glyph_string_bg_rect (s, s->x, s->y, width, s->height); -static INLINE void -x_clear_glyph_string_rect (s, x, y, w, h) - struct glyph_string *s; - int x, y, w, h; -{ - int real_x = x; - int real_y = y; - int real_w = w; - int real_h = h; -#if 0 - /* Take clipping into account. */ - if (s->gc->clip_mask == Rect) - { - real_x = max (real_x, s->gc->clip_rectangle.left); - real_y = max (real_y, s->gc->clip_rectangle.top); - real_w = min (real_w, s->gc->clip_rectangle.right - - s->gc->clip_rectangle.left); - real_h = min (real_h, s->gc->clip_rectangle.bottom - - s->gc->clip_rectangle.top); - } -#endif - w32_fill_area (s->f, s->hdc, s->gc->background, real_x, real_y, - real_w, real_h); -} + /* Clear rest using the GC of the original non-cursor face. */ + if (width < s->background_width) + { + XGCValues *gc = s->face->gc; + int x = s->x + width, y = s->y; + int w = s->background_width - width, h = s->height; + RECT r; + HDC hdc = s->hdc; + if (s->row->mouse_face_p + && cursor_in_mouse_face_p (s->w)) + { + x_set_mouse_face_gc (s); + gc = s->gc; + } + else + gc = s->face->gc; -/* Draw the background of glyph_string S. If S->background_filled_p - is non-zero don't draw it. FORCE_P non-zero means draw the - background even if it wouldn't be drawn normally. This is used - when a string preceding S draws into the background of S, or S - contains the first component of a composition. */ + get_glyph_string_clip_rect (s, &r); + w32_set_clip_rectangle (hdc, &r); -static void -x_draw_glyph_string_background (s, force_p) - struct glyph_string *s; - int force_p; -{ - /* Nothing to do if background has already been drawn or if it - shouldn't be drawn in the first place. */ - if (!s->background_filled_p) - { - int box_line_width = max (s->face->box_line_width, 0); - -#if 0 /* TODO: stipple */ - if (s->stippled_p) - { - /* Fill background with a stipple pattern. */ - XSetFillStyle (s->display, s->gc, FillOpaqueStippled); - XFillRectangle (s->display, s->window, s->gc, s->x, - s->y + box_line_width, - s->background_width, - s->height - 2 * box_line_width); - XSetFillStyle (s->display, s->gc, FillSolid); - s->background_filled_p = 1; - } - else -#endif - if (FONT_HEIGHT (s->font) < s->height - 2 * box_line_width - || s->font_not_found_p - || s->extends_to_end_of_line_p - || s->font->bdf - || force_p) - { - x_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 = 1; - } - } -} - - -/* Draw the foreground of glyph string S. */ - -static void -x_draw_glyph_string_foreground (s) - struct glyph_string *s; -{ - int i, x; - HFONT old_font; - - /* If first glyph of S has a left box line, start drawing the text - of S to the right of that box line. */ - if (s->face->box != FACE_NO_BOX - && s->first_glyph->left_box_line_p) - x = s->x + abs (s->face->box_line_width); - else - x = s->x; - - if (s->for_overlaps_p || (s->background_filled_p && s->hl != DRAW_CURSOR)) - SetBkMode (s->hdc, TRANSPARENT); - else - SetBkMode (s->hdc, OPAQUE); - - SetTextColor (s->hdc, s->gc->foreground); - SetBkColor (s->hdc, s->gc->background); - SetTextAlign (s->hdc, TA_BASELINE | TA_LEFT); - - if (s->font && s->font->hfont) - old_font = SelectObject (s->hdc, s->font->hfont); - - /* Draw characters of S as rectangles if S's font could not be - loaded. */ - if (s->font_not_found_p) - { - for (i = 0; i < s->nchars; ++i) - { - struct glyph *g = s->first_glyph + i; - - w32_draw_rectangle (s->hdc, s->gc, x, s->y, g->pixel_width - 1, - s->height - 1); - x += g->pixel_width; - } - } - else - { - char *char1b = (char *) s->char2b; - int boff = s->font_info->baseline_offset; - - if (s->font_info->vertical_centering) - boff = VCENTER_BASELINE_OFFSET (s->font, s->f) - boff; - - /* If we can use 8-bit functions, condense S->char2b. */ - if (!s->two_byte_p) - for (i = 0; i < s->nchars; ++i) - char1b[i] = BYTE2 (s->char2b[i]); - - /* Draw text with TextOut and friends. */ - w32_text_out (s, x, s->ybase - boff, s->char2b, s->nchars); - } - if (s->font && s->font->hfont) - SelectObject (s->hdc, old_font); -} - -/* Draw the foreground of composite glyph string S. */ - -static void -x_draw_composite_glyph_string_foreground (s) - struct glyph_string *s; -{ - int i, x; - HFONT old_font; - - /* If first glyph of S has a left box line, start drawing the text - of S to the right of that box line. */ - if (s->face->box != FACE_NO_BOX - && s->first_glyph->left_box_line_p) - x = s->x + abs (s->face->box_line_width); - else - x = s->x; - - /* S is a glyph string for a composition. S->gidx is the index of - the first character drawn for glyphs of this composition. - S->gidx == 0 means we are drawing the very first character of - this composition. */ - - SetTextColor (s->hdc, s->gc->foreground); - SetBkColor (s->hdc, s->gc->background); - SetBkMode (s->hdc, TRANSPARENT); - SetTextAlign (s->hdc, TA_BASELINE | TA_LEFT); - - if (s->font && s->font->hfont) - old_font = SelectObject (s->hdc, s->font->hfont); - - /* Draw a rectangle for the composition if the font for the very - first character of the composition could not be loaded. */ - if (s->font_not_found_p) - { - if (s->gidx == 0) - w32_draw_rectangle (s->hdc, s->gc, x, s->y, s->width - 1, - s->height - 1); - } - else - { - for (i = 0; i < s->nchars; i++, ++s->gidx) - w32_text_out (s, x + s->cmp->offsets[s->gidx * 2], - s->ybase - s->cmp->offsets[s->gidx * 2 + 1], - s->char2b + i, 1); - } - if (s->font && s->font->hfont) - SelectObject (s->hdc, old_font); -} - - -/* Brightness beyond which a color won't have its highlight brightness - boosted. - - Nominally, highlight colors for `3d' faces are calculated by - brightening an object's color by a constant scale factor, but this - doesn't yield good results for dark colors, so for colors who's - brightness is less than this value (on a scale of 0-255) have to - use an additional additive factor. - - The value here is set so that the default menu-bar/mode-line color - (grey75) will not have its highlights changed at all. */ -#define HIGHLIGHT_COLOR_DARK_BOOST_LIMIT 187 - - -/* Allocate a color which is lighter or darker than *COLOR by FACTOR - or DELTA. Try a color with RGB values multiplied by FACTOR first. - If this produces the same color as COLOR, try a color where all RGB - values have DELTA added. Return the allocated color in *COLOR. - DISPLAY is the X display, CMAP is the colormap to operate on. - Value is non-zero if successful. */ - -static int -w32_alloc_lighter_color (f, color, factor, delta) - struct frame *f; - COLORREF *color; - double factor; - int delta; -{ - COLORREF new; - long bright; - - /* On Windows, RGB values are 0-255, not 0-65535, so scale delta. */ - delta /= 256; - - /* Change RGB values by specified FACTOR. Avoid overflow! */ - xassert (factor >= 0); - new = PALETTERGB (min (0xff, factor * GetRValue (*color)), - min (0xff, factor * GetGValue (*color)), - min (0xff, factor * GetBValue (*color))); - - /* Calculate brightness of COLOR. */ - bright = (2 * GetRValue (*color) + 3 * GetGValue (*color) - + GetBValue (*color)) / 6; - - /* We only boost colors that are darker than - HIGHLIGHT_COLOR_DARK_BOOST_LIMIT. */ - if (bright < HIGHLIGHT_COLOR_DARK_BOOST_LIMIT) - /* Make an additive adjustment to NEW, because it's dark enough so - that scaling by FACTOR alone isn't enough. */ - { - /* How far below the limit this color is (0 - 1, 1 being darker). */ - double dimness = 1 - (double)bright / HIGHLIGHT_COLOR_DARK_BOOST_LIMIT; - /* The additive adjustment. */ - int min_delta = delta * dimness * factor / 2; - - if (factor < 1) - new = PALETTERGB (max (0, min (0xff, min_delta - GetRValue (*color))), - max (0, min (0xff, min_delta - GetGValue (*color))), - max (0, min (0xff, min_delta - GetBValue (*color)))); - else - new = PALETTERGB (max (0, min (0xff, min_delta + GetRValue (*color))), - max (0, min (0xff, min_delta + GetGValue (*color))), - max (0, min (0xff, min_delta + GetBValue (*color)))); - } - - if (new == *color) - new = PALETTERGB (max (0, min (0xff, delta + GetRValue (*color))), - max (0, min (0xff, delta + GetGValue (*color))), - max (0, min (0xff, delta + GetBValue (*color)))); - - /* TODO: Map to palette and retry with delta if same? */ - /* TODO: Free colors (if using palette)? */ - - if (new == *color) - return 0; - - *color = new; - - return 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 - with which lines will be drawn. Use a color that is FACTOR or - DELTA lighter or darker than the relief's background which is found - in S->f->output_data.x->relief_background. If such a color cannot - be allocated, use DEFAULT_PIXEL, instead. */ - -static void -w32_setup_relief_color (f, relief, factor, delta, default_pixel) - struct frame *f; - struct relief *relief; - double factor; - int delta; - COLORREF default_pixel; -{ - XGCValues xgcv; - struct w32_output *di = f->output_data.w32; - unsigned long mask = GCForeground; - COLORREF pixel; - COLORREF background = di->relief_background; - struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); - - /* TODO: Free colors (if using palette)? */ - - /* Allocate new color. */ - xgcv.foreground = default_pixel; - pixel = background; - if (w32_alloc_lighter_color (f, &pixel, factor, delta)) - { - relief->allocated_p = 1; - xgcv.foreground = relief->pixel = pixel; - } - - if (relief->gc == 0) - { #if 0 /* TODO: stipple */ - xgcv.stipple = dpyinfo->gray; - mask |= GCStipple; -#endif - relief->gc = XCreateGC (NULL, FRAME_W32_WINDOW (f), mask, &xgcv); - } - else - XChangeGC (NULL, relief->gc, mask, &xgcv); -} - - -/* Set up colors for the relief lines around glyph string S. */ - -static void -x_setup_relief_colors (s) - struct glyph_string *s; -{ - struct w32_output *di = s->f->output_data.w32; - COLORREF color; - - if (s->face->use_box_color_for_shadows_p) - color = s->face->box_color; - else if (s->first_glyph->type == IMAGE_GLYPH - && s->img->pixmap - && !IMAGE_BACKGROUND_TRANSPARENT (s->img, s->f, 0)) - color = IMAGE_BACKGROUND (s->img, s->f, 0); - else - color = s->gc->background; - - if (di->white_relief.gc == 0 - || color != di->relief_background) - { - di->relief_background = color; - w32_setup_relief_color (s->f, &di->white_relief, 1.2, 0x8000, - WHITE_PIX_DEFAULT (s->f)); - w32_setup_relief_color (s->f, &di->black_relief, 0.6, 0x4000, - BLACK_PIX_DEFAULT (s->f)); - } -} - - -/* Draw a relief on frame F inside the rectangle given by LEFT_X, - TOP_Y, RIGHT_X, and BOTTOM_Y. WIDTH is the thickness of the relief - to draw, it must be >= 0. RAISED_P non-zero means draw a raised - relief. LEFT_P non-zero means draw a relief on the left side of - the rectangle. RIGHT_P non-zero means draw a relief on the right - side of the rectangle. CLIP_RECT is the clipping rectangle to use - when drawing. */ - -static void -w32_draw_relief_rect (f, left_x, top_y, right_x, bottom_y, width, - raised_p, left_p, right_p, clip_rect) - struct frame *f; - int left_x, top_y, right_x, bottom_y, left_p, right_p, raised_p; - RECT *clip_rect; -{ - int i; - XGCValues gc; - HDC hdc = get_frame_dc (f); - - if (raised_p) - gc.foreground = f->output_data.w32->white_relief.gc->foreground; - else - gc.foreground = f->output_data.w32->black_relief.gc->foreground; - - w32_set_clip_rectangle (hdc, clip_rect); - - /* Top. */ - for (i = 0; i < width; ++i) - w32_fill_area (f, hdc, gc.foreground, - left_x + i * left_p, top_y + i, - right_x - left_x - i * (left_p + right_p ) + 1, 1); - - /* Left. */ - if (left_p) - for (i = 0; i < width; ++i) - w32_fill_area (f, hdc, gc.foreground, - left_x + i, top_y + i, 1, - bottom_y - top_y - 2 * i + 1); - - if (raised_p) - gc.foreground = f->output_data.w32->black_relief.gc->foreground; - else - gc.foreground = f->output_data.w32->white_relief.gc->foreground; - - /* Bottom. */ - for (i = 0; i < width; ++i) - w32_fill_area (f, hdc, gc.foreground, - left_x + i * left_p, bottom_y - i, - right_x - left_x - i * (left_p + right_p) + 1, 1); - - /* Right. */ - if (right_p) - for (i = 0; i < width; ++i) - w32_fill_area (f, hdc, gc.foreground, - right_x - i, top_y + i + 1, 1, - bottom_y - top_y - 2 * i - 1); - - w32_set_clip_rectangle (hdc, NULL); - - release_frame_dc (f, hdc); -} - - -/* Draw a box on frame F inside the rectangle given by LEFT_X, TOP_Y, - RIGHT_X, and BOTTOM_Y. WIDTH is the thickness of the lines to - draw, it must be >= 0. LEFT_P non-zero means draw a line on the - left side of the rectangle. RIGHT_P non-zero means draw a line - on the right side of the rectangle. CLIP_RECT is the clipping - rectangle to use when drawing. */ - -static void -w32_draw_box_rect (s, left_x, top_y, right_x, bottom_y, width, - left_p, right_p, clip_rect) - struct glyph_string *s; - int left_x, top_y, right_x, bottom_y, width, left_p, right_p; - RECT *clip_rect; -{ - w32_set_clip_rectangle (s->hdc, clip_rect); - - /* Top. */ - w32_fill_area (s->f, s->hdc, s->face->box_color, - left_x, top_y, right_x - left_x + 1, width); - - /* Left. */ - if (left_p) - { - w32_fill_area (s->f, s->hdc, s->face->box_color, - left_x, top_y, width, bottom_y - top_y + 1); - } - - /* Bottom. */ - w32_fill_area (s->f, s->hdc, s->face->box_color, - left_x, bottom_y - width + 1, right_x - left_x + 1, width); - - /* Right. */ - if (right_p) - { - w32_fill_area (s->f, s->hdc, s->face->box_color, - right_x - width + 1, top_y, width, bottom_y - top_y + 1); - } - - w32_set_clip_rectangle (s->hdc, NULL); -} - - -/* Draw a box around glyph string S. */ - -static void -x_draw_glyph_string_box (s) - struct glyph_string *s; -{ - int width, left_x, right_x, top_y, bottom_y, last_x, raised_p; - int left_p, right_p; - struct glyph *last_glyph; - RECT clip_rect; - - last_x = window_box_right (s->w, s->area); - if (s->row->full_width_p - && !s->w->pseudo_window_p) - { - last_x += FRAME_X_RIGHT_FRINGE_WIDTH (s->f); - if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (s->f)) - last_x += FRAME_SCROLL_BAR_WIDTH (s->f) * CANON_X_UNIT (s->f); - } - - /* The glyph that may have a right box line. */ - last_glyph = (s->cmp || s->img - ? s->first_glyph - : s->first_glyph + s->nchars - 1); - - width = abs (s->face->box_line_width); - raised_p = s->face->box == FACE_RAISED_BOX; - left_x = s->x; - right_x = ((s->row->full_width_p && s->extends_to_end_of_line_p - ? last_x - 1 - : min (last_x, s->x + s->background_width) - 1)); - top_y = s->y; - bottom_y = top_y + s->height - 1; - - left_p = (s->first_glyph->left_box_line_p - || (s->hl == DRAW_MOUSE_FACE - && (s->prev == NULL - || s->prev->hl != s->hl))); - right_p = (last_glyph->right_box_line_p - || (s->hl == DRAW_MOUSE_FACE - && (s->next == NULL - || s->next->hl != s->hl))); - - w32_get_glyph_string_clip_rect (s, &clip_rect); - - if (s->face->box == FACE_SIMPLE_BOX) - w32_draw_box_rect (s, left_x, top_y, right_x, bottom_y, width, - left_p, right_p, &clip_rect); - else - { - x_setup_relief_colors (s); - w32_draw_relief_rect (s->f, left_x, top_y, right_x, bottom_y, - width, raised_p, left_p, right_p, &clip_rect); - } -} - - -/* Draw foreground of image glyph string S. */ - -static void -x_draw_image_foreground (s) - struct glyph_string *s; -{ - int x; - int y = s->ybase - image_ascent (s->img, s->face); - - /* If first glyph of S has a left box line, start drawing it to the - right of that line. */ - if (s->face->box != FACE_NO_BOX - && s->first_glyph->left_box_line_p) - x = s->x + abs (s->face->box_line_width); - else - x = s->x; - - /* If there is a margin around the image, adjust x- and y-position - by that margin. */ - x += s->img->hmargin; - y += s->img->vmargin; - - SaveDC (s->hdc); - - if (s->img->pixmap) - { - HDC compat_hdc = CreateCompatibleDC (s->hdc); - HBRUSH fg_brush = CreateSolidBrush (s->gc->foreground); - HBRUSH orig_brush = SelectObject (s->hdc, fg_brush); - HGDIOBJ orig_obj = SelectObject (compat_hdc, s->img->pixmap); - SetBkColor (compat_hdc, RGB (255, 255, 255)); - SetTextColor (s->hdc, RGB (0, 0, 0)); - x_set_glyph_string_clipping (s); - - if (s->img->mask) - { - HDC mask_dc = CreateCompatibleDC (s->hdc); - HGDIOBJ mask_orig_obj = SelectObject (mask_dc, s->img->mask); - - SetTextColor (s->hdc, RGB (255, 255, 255)); - SetBkColor (s->hdc, RGB (0, 0, 0)); - - BitBlt (s->hdc, x, y, s->img->width, s->img->height, - compat_hdc, 0, 0, SRCINVERT); - BitBlt (s->hdc, x, y, s->img->width, s->img->height, - mask_dc, 0, 0, SRCAND); - BitBlt (s->hdc, x, y, s->img->width, s->img->height, - compat_hdc, 0, 0, SRCINVERT); - - SelectObject (mask_dc, mask_orig_obj); - DeleteDC (mask_dc); - } - else - { - SetTextColor (s->hdc, s->gc->foreground); - SetBkColor (s->hdc, s->gc->background); - - BitBlt (s->hdc, x, y, s->img->width, s->img->height, - compat_hdc, 0, 0, SRCCOPY); - - /* When the image has a mask, we can expect that at - least part of a mouse highlight or a block cursor will - be visible. If the image doesn't have a mask, make - a block cursor visible by drawing a rectangle around - the image. I believe it's looking better if we do - nothing here for mouse-face. */ - if (s->hl == DRAW_CURSOR) - { - int r = s->img->relief; - if (r < 0) r = -r; - w32_draw_rectangle (s->hdc, s->gc, x - r, y - r , - s->img->width + r*2 - 1, s->img->height + r*2 - 1); - } - } - - w32_set_clip_rectangle (s->hdc, NULL); - SelectObject (s->hdc, orig_brush); - DeleteObject (fg_brush); - SelectObject (compat_hdc, orig_obj); - DeleteDC (compat_hdc); - } - else - w32_draw_rectangle (s->hdc, s->gc, x, y, s->img->width -1, - s->img->height - 1); - - RestoreDC (s->hdc ,-1); -} - - - -/* Draw a relief around the image glyph string S. */ - -static void -x_draw_image_relief (s) - struct glyph_string *s; -{ - int x0, y0, x1, y1, thick, raised_p; - RECT r; - int x; - int y = s->ybase - image_ascent (s->img, s->face); - - /* If first glyph of S has a left box line, start drawing it to the - right of that line. */ - if (s->face->box != FACE_NO_BOX - && s->first_glyph->left_box_line_p) - x = s->x + abs (s->face->box_line_width); - else - x = s->x; - - /* If there is a margin around the image, adjust x- and y-position - by that margin. */ - x += s->img->hmargin; - y += s->img->vmargin; - - if (s->hl == DRAW_IMAGE_SUNKEN - || s->hl == DRAW_IMAGE_RAISED) - { - thick = tool_bar_button_relief >= 0 ? tool_bar_button_relief : DEFAULT_TOOL_BAR_BUTTON_RELIEF; - raised_p = s->hl == DRAW_IMAGE_RAISED; - } - else - { - thick = abs (s->img->relief); - raised_p = s->img->relief > 0; - } - - x0 = x - thick; - y0 = y - thick; - x1 = x + s->img->width + thick - 1; - y1 = y + s->img->height + thick - 1; - - x_setup_relief_colors (s); - w32_get_glyph_string_clip_rect (s, &r); - w32_draw_relief_rect (s->f, x0, y0, x1, y1, thick, raised_p, 1, 1, &r); -} - - -/* Draw the foreground of image glyph string S to PIXMAP. */ - -static void -w32_draw_image_foreground_1 (s, pixmap) - struct glyph_string *s; - HBITMAP pixmap; -{ - HDC hdc = CreateCompatibleDC (s->hdc); - HGDIOBJ orig_hdc_obj = SelectObject (hdc, pixmap); - int x; - int y = s->ybase - s->y - image_ascent (s->img, s->face); - - /* If first glyph of S has a left box line, start drawing it to the - right of that line. */ - if (s->face->box != FACE_NO_BOX - && s->first_glyph->left_box_line_p) - x = abs (s->face->box_line_width); - else - x = 0; - - /* If there is a margin around the image, adjust x- and y-position - by that margin. */ - x += s->img->hmargin; - y += s->img->vmargin; - - if (s->img->pixmap) - { - HDC compat_hdc = CreateCompatibleDC (hdc); - HBRUSH fg_brush = CreateSolidBrush (s->gc->foreground); - HBRUSH orig_brush = SelectObject (hdc, fg_brush); - HGDIOBJ orig_obj = SelectObject (compat_hdc, s->img->pixmap); - - if (s->img->mask) - { - HDC mask_dc = CreateCompatibleDC (hdc); - HGDIOBJ mask_orig_obj = SelectObject (mask_dc, s->img->mask); - - SetTextColor (hdc, RGB (0, 0, 0)); - SetBkColor (hdc, RGB (255, 255, 255)); - BitBlt (hdc, x, y, s->img->width, s->img->height, - compat_hdc, 0, 0, SRCINVERT); - BitBlt (hdc, x, y, s->img->width, s->img->height, - mask_dc, 0, 0, SRCAND); - BitBlt (hdc, x, y, s->img->width, s->img->height, - compat_hdc, 0, 0, SRCINVERT); - - SelectObject (mask_dc, mask_orig_obj); - DeleteDC (mask_dc); - } - else - { - SetTextColor (hdc, s->gc->foreground); - SetBkColor (hdc, s->gc->background); - - BitBlt (hdc, x, y, s->img->width, s->img->height, - compat_hdc, 0, 0, SRCCOPY); - - /* When the image has a mask, we can expect that at - least part of a mouse highlight or a block cursor will - be visible. If the image doesn't have a mask, make - a block cursor visible by drawing a rectangle around - the image. I believe it's looking better if we do - nothing here for mouse-face. */ - if (s->hl == DRAW_CURSOR) - { - int r = s->img->relief; - if (r < 0) r = -r; - w32_draw_rectangle (hdc, s->gc, x - r, y - r , - s->img->width + r*2 - 1, s->img->height + r*2 - 1); - } - } - - SelectObject (hdc, orig_brush); - DeleteObject (fg_brush); - SelectObject (compat_hdc, orig_obj); - DeleteDC (compat_hdc); - } - else - w32_draw_rectangle (hdc, s->gc, x, y, s->img->width - 1, - s->img->height - 1); - - SelectObject (hdc, orig_hdc_obj); - DeleteDC (hdc); -} - - -/* Draw part of the background of glyph string S. X, Y, W, and H - give the rectangle to draw. */ - -static void -x_draw_glyph_string_bg_rect (s, x, y, w, h) - struct glyph_string *s; - int x, y, w, h; -{ -#if 0 /* TODO: stipple */ - if (s->stippled_p) - { - /* Fill background with a stipple pattern. */ - XSetFillStyle (s->display, s->gc, FillOpaqueStippled); - XFillRectangle (s->display, s->window, s->gc, x, y, w, h); - XSetFillStyle (s->display, s->gc, FillSolid); - } - else -#endif - x_clear_glyph_string_rect (s, x, y, w, h); -} - - -/* Draw image glyph string S. - - s->y - s->x +------------------------- - | s->face->box - | - | +------------------------- - | | s->img->vmargin - | | - | | +------------------- - | | | the image - - */ - -static void -x_draw_image_glyph_string (s) - struct glyph_string *s; -{ - int x, y; - int box_line_hwidth = abs (s->face->box_line_width); - int box_line_vwidth = max (s->face->box_line_width, 0); - int height; - HBITMAP pixmap = 0; - - height = s->height - 2 * box_line_vwidth; - - /* Fill background with face under the image. Do it only if row is - taller than image or if image has a clip mask to reduce - flickering. */ - s->stippled_p = s->face->stipple != 0; - if (height > s->img->height - || s->img->hmargin - || s->img->vmargin - || s->img->mask - || s->img->pixmap == 0 - || s->width != s->background_width) - { - if (box_line_hwidth && s->first_glyph->left_box_line_p) - x = s->x + box_line_hwidth; - else - x = s->x; - - y = s->y + box_line_vwidth; -#if 0 /* TODO: figure out if we need to do this on Windows. */ - if (s->img->mask) - { - /* Create a pixmap as large as the glyph string. Fill it - with the background color. Copy the image to it, using - its mask. Copy the temporary pixmap to the display. */ - Screen *screen = FRAME_X_SCREEN (s->f); - int depth = DefaultDepthOfScreen (screen); - - /* Create a pixmap as large as the glyph string. */ - pixmap = XCreatePixmap (s->display, s->window, - s->background_width, - s->height, depth); - - /* Don't clip in the following because we're working on the - pixmap. */ - XSetClipMask (s->display, s->gc, None); - - /* Fill the pixmap with the background color/stipple. */ - if (s->stippled_p) - { - /* Fill background with a stipple pattern. */ - XSetFillStyle (s->display, s->gc, FillOpaqueStippled); - XFillRectangle (s->display, pixmap, s->gc, - 0, 0, s->background_width, s->height); - XSetFillStyle (s->display, s->gc, FillSolid); - } - else - { - XGCValues xgcv; - XGetGCValues (s->display, s->gc, GCForeground | GCBackground, - &xgcv); - XSetForeground (s->display, s->gc, xgcv.background); - XFillRectangle (s->display, pixmap, s->gc, - 0, 0, s->background_width, s->height); - XSetForeground (s->display, s->gc, xgcv.foreground); - } - } - else -#endif - x_draw_glyph_string_bg_rect (s, x, y, s->background_width, height); - - s->background_filled_p = 1; - } - - /* Draw the foreground. */ - if (pixmap != 0) - { - w32_draw_image_foreground_1 (s, pixmap); - x_set_glyph_string_clipping (s); - { - HDC compat_hdc = CreateCompatibleDC (s->hdc); - HBRUSH fg_brush = CreateSolidBrush (s->gc->foreground); - HBRUSH orig_brush = SelectObject (s->hdc, fg_brush); - HGDIOBJ orig_obj = SelectObject (compat_hdc, pixmap); - - SetTextColor (s->hdc, s->gc->foreground); - SetBkColor (s->hdc, s->gc->background); - BitBlt (s->hdc, s->x, s->y, s->background_width, s->height, - compat_hdc, 0, 0, SRCCOPY); - - SelectObject (s->hdc, orig_brush); - DeleteObject (fg_brush); - SelectObject (compat_hdc, orig_obj); - DeleteDC (compat_hdc); - } - DeleteObject (pixmap); - pixmap = 0; - } - else - x_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); -} - - -/* Draw stretch glyph string S. */ - -static void -x_draw_stretch_glyph_string (s) - struct glyph_string *s; -{ - xassert (s->first_glyph->type == STRETCH_GLYPH); - s->stippled_p = s->face->stipple != 0; - - if (s->hl == DRAW_CURSOR - && !x_stretch_cursor_p) - { - /* If `x-stretch-block-cursor' is nil, don't draw a block cursor - as wide as the stretch glyph. */ - int width = min (CANON_X_UNIT (s->f), s->background_width); - - /* Draw cursor. */ - x_draw_glyph_string_bg_rect (s, s->x, s->y, width, s->height); - - /* Clear rest using the GC of the original non-cursor face. */ - if (width < s->background_width) - { - XGCValues *gc = s->face->gc; - int x = s->x + width, y = s->y; - int w = s->background_width - width, h = s->height; - RECT r; - HDC hdc = s->hdc; - - if (s->row->mouse_face_p - && cursor_in_mouse_face_p (s->w)) - { - x_set_mouse_face_gc (s); - gc = s->gc; - } - else - gc = s->face->gc; - - w32_get_glyph_string_clip_rect (s, &r); - w32_set_clip_rectangle (hdc, &r); - -#if 0 /* TODO: stipple */ - if (s->face->stipple) + if (s->face->stipple) { /* Fill background with a stipple pattern. */ XSetFillStyle (s->display, gc, FillOpaqueStippled); XFillRectangle (s->display, s->window, gc, x, y, w, h); XSetFillStyle (s->display, gc, FillSolid); - } - else -#endif - { - w32_fill_area (s->f, s->hdc, gc->background, x, y, w, h); - } - } - } - else if (!s->background_filled_p) - x_draw_glyph_string_bg_rect (s, s->x, s->y, s->background_width, - s->height); - - s->background_filled_p = 1; -} - - -/* Draw glyph string S. */ - -static void -x_draw_glyph_string (s) - struct glyph_string *s; -{ - int relief_drawn_p = 0; - - /* If S draws into the background of its successor, draw the - background of the successor first so that S can draw into it. - This makes S->next use XDrawString instead of XDrawImageString. */ - if (s->next && s->right_overhang && !s->for_overlaps_p) - { - xassert (s->next->img == NULL); - x_set_glyph_string_gc (s->next); - x_set_glyph_string_clipping (s->next); - x_draw_glyph_string_background (s->next, 1); - } - - /* Set up S->gc, set clipping and draw S. */ - x_set_glyph_string_gc (s); - - /* Draw relief (if any) in advance for char/composition so that the - glyph string can be drawn over it. */ - if (!s->for_overlaps_p - && s->face->box != FACE_NO_BOX - && (s->first_glyph->type == CHAR_GLYPH - || s->first_glyph->type == COMPOSITE_GLYPH)) - - { - x_set_glyph_string_clipping (s); - x_draw_glyph_string_background (s, 1); - x_draw_glyph_string_box (s); - x_set_glyph_string_clipping (s); - relief_drawn_p = 1; - } - else - x_set_glyph_string_clipping (s); - - switch (s->first_glyph->type) - { - case IMAGE_GLYPH: - x_draw_image_glyph_string (s); - break; - - case STRETCH_GLYPH: - x_draw_stretch_glyph_string (s); - break; - - case CHAR_GLYPH: - if (s->for_overlaps_p) - s->background_filled_p = 1; - else - x_draw_glyph_string_background (s, 0); - x_draw_glyph_string_foreground (s); - break; - - case COMPOSITE_GLYPH: - if (s->for_overlaps_p || s->gidx > 0) - s->background_filled_p = 1; - else - x_draw_glyph_string_background (s, 1); - x_draw_composite_glyph_string_foreground (s); - break; - - default: - abort (); - } - - if (!s->for_overlaps_p) - { - /* Draw underline. */ - if (s->face->underline_p - && (s->font->bdf || !s->font->tm.tmUnderlined)) - { - unsigned long h = 1; - unsigned long dy = s->height - h; - - /* TODO: Use font information for positioning and thickness - of underline. See OUTLINETEXTMETRIC, and xterm.c. */ - if (s->face->underline_defaulted_p) - { - w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x, - s->y + dy, s->width, 1); - } - else - { - w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x, - s->y + dy, s->width, 1); - } - } - - /* Draw overline. */ - if (s->face->overline_p) - { - unsigned long dy = 0, h = 1; - - if (s->face->overline_color_defaulted_p) - { - w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x, - s->y + dy, s->width, h); - } - else - { - w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x, - s->y + dy, s->width, h); - } - } - - /* Draw strike-through. */ - if (s->face->strike_through_p - && (s->font->bdf || !s->font->tm.tmStruckOut)) - { - unsigned long h = 1; - unsigned long dy = (s->height - h) / 2; - - if (s->face->strike_through_color_defaulted_p) - { - w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x, s->y + dy, - s->width, h); - } - else - { - w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x, - s->y + dy, s->width, h); - } - } - - /* Draw relief. */ - if (!relief_drawn_p && s->face->box != FACE_NO_BOX) - x_draw_glyph_string_box (s); - } - - /* Reset clipping. */ - w32_set_clip_rectangle (s->hdc, NULL); -} - - -static int x_fill_composite_glyph_string P_ ((struct glyph_string *, - struct face **, int)); - - -/* Fill glyph string S with composition components specified by S->cmp. - - FACES is an array of faces for all components of this composition. - S->gidx is the index of the first component for S. - OVERLAPS_P non-zero means S should draw the foreground only, and - use its physical height for clipping. - - Value is the index of a component not in S. */ - -static int -x_fill_composite_glyph_string (s, faces, overlaps_p) - struct glyph_string *s; - struct face **faces; - int overlaps_p; -{ - int i; - - xassert (s); - - s->for_overlaps_p = overlaps_p; - - s->face = faces[s->gidx]; - s->font = s->face->font; - s->font_info = FONT_INFO_FROM_ID (s->f, s->face->font_info_id); - - /* For all glyphs of this composition, starting at the offset - S->gidx, until we reach the end of the definition or encounter a - glyph that requires the different face, add it to S. */ - ++s->nchars; - for (i = s->gidx + 1; i < s->cmp->glyph_len && faces[i] == s->face; ++i) - ++s->nchars; - - /* All glyph strings for the same composition has the same width, - i.e. the width set for the first component of the composition. */ - - s->width = s->first_glyph->pixel_width; - - /* If the specified font could not be loaded, use the frame's - default font, but record the fact that we couldn't load it in - the glyph string so that we can draw rectangles for the - characters of the glyph string. */ - if (s->font == NULL) - { - s->font_not_found_p = 1; - s->font = FRAME_FONT (s->f); - } - - /* Adjust base line for subscript/superscript text. */ - s->ybase += s->first_glyph->voffset; - - xassert (s->face && s->face->gc); - - /* This glyph string must always be drawn with 16-bit functions. */ - s->two_byte_p = 1; - - return s->gidx + s->nchars; -} - - -/* Fill glyph string S from a sequence of character glyphs. - - FACE_ID is the face id of the string. START is the index of the - first glyph to consider, END is the index of the last + 1. - OVERLAPS_P non-zero means S should draw the foreground only, and - use its physical height for clipping. - - Value is the index of the first glyph not in S. */ - -static int -x_fill_glyph_string (s, face_id, start, end, overlaps_p) - struct glyph_string *s; - int face_id; - int start, end, overlaps_p; -{ - struct glyph *glyph, *last; - int voffset; - int glyph_not_available_p; - - xassert (s->f == XFRAME (s->w->frame)); - xassert (s->nchars == 0); - xassert (start >= 0 && end > start); - - s->for_overlaps_p = overlaps_p; - glyph = s->row->glyphs[s->area] + start; - last = s->row->glyphs[s->area] + end; - voffset = glyph->voffset; - - glyph_not_available_p = glyph->glyph_not_available_p; - - while (glyph < last - && glyph->type == CHAR_GLYPH - && glyph->voffset == voffset - /* Same face id implies same font, nowadays. */ - && glyph->face_id == face_id - && glyph->glyph_not_available_p == glyph_not_available_p) - { - int two_byte_p; - - s->face = x_get_glyph_face_and_encoding (s->f, glyph, - s->char2b + s->nchars, - &two_byte_p); - s->two_byte_p = two_byte_p; - ++s->nchars; - xassert (s->nchars <= end - start); - s->width += glyph->pixel_width; - ++glyph; - } - - s->font = s->face->font; - s->font_info = FONT_INFO_FROM_ID (s->f, s->face->font_info_id); - - /* If the specified font could not be loaded, use the frame's font, - but record the fact that we couldn't load it in - S->font_not_found_p so that we can draw rectangles for the - characters of the glyph string. */ - if (s->font == NULL || glyph_not_available_p) - { - s->font_not_found_p = 1; - s->font = FRAME_FONT (s->f); - } - - /* Adjust base line for subscript/superscript text. */ - s->ybase += voffset; - - xassert (s->face && s->face->gc); - return glyph - s->row->glyphs[s->area]; -} - - -/* Fill glyph string S from image glyph S->first_glyph. */ - -static void -x_fill_image_glyph_string (s) - struct glyph_string *s; -{ - xassert (s->first_glyph->type == IMAGE_GLYPH); - s->img = IMAGE_FROM_ID (s->f, s->first_glyph->u.img_id); - xassert (s->img); - s->face = FACE_FROM_ID (s->f, s->first_glyph->face_id); - s->font = s->face->font; - s->width = s->first_glyph->pixel_width; - - /* Adjust base line for subscript/superscript text. */ - s->ybase += s->first_glyph->voffset; -} - - -/* Fill glyph string S from a sequence of stretch glyphs. - - ROW is the glyph row in which the glyphs are found, AREA is the - area within the row. START is the index of the first glyph to - consider, END is the index of the last + 1. - - Value is the index of the first glyph not in S. */ - -static int -x_fill_stretch_glyph_string (s, row, area, start, end) - struct glyph_string *s; - struct glyph_row *row; - enum glyph_row_area area; - int start, end; -{ - struct glyph *glyph, *last; - int voffset, face_id; - - xassert (s->first_glyph->type == STRETCH_GLYPH); - - glyph = s->row->glyphs[s->area] + start; - last = s->row->glyphs[s->area] + end; - face_id = glyph->face_id; - s->face = FACE_FROM_ID (s->f, face_id); - s->font = s->face->font; - s->font_info = FONT_INFO_FROM_ID (s->f, s->face->font_info_id); - s->width = glyph->pixel_width; - voffset = glyph->voffset; - - for (++glyph; - (glyph < last - && glyph->type == STRETCH_GLYPH - && glyph->voffset == voffset - && glyph->face_id == face_id); - ++glyph) - s->width += glyph->pixel_width; - - /* Adjust base line for subscript/superscript text. */ - s->ybase += voffset; - - xassert (s->face); - return glyph - s->row->glyphs[s->area]; -} - - -/* Initialize glyph string S. CHAR2B is a suitably allocated vector - of XChar2b structures for S; it can't be allocated in - x_init_glyph_string because it must be allocated via `alloca'. W - is the window on which S is drawn. ROW and AREA are the glyph row - and area within the row from which S is constructed. START is the - index of the first glyph structure covered by S. HL is a - face-override for drawing S. */ - -static void -w32_init_glyph_string (s, hdc, char2b, w, row, area, start, hl) - struct glyph_string *s; - HDC hdc; - wchar_t *char2b; - struct window *w; - struct glyph_row *row; - enum glyph_row_area area; - int start; - enum draw_glyphs_face hl; -{ - bzero (s, sizeof *s); - s->w = w; - s->f = XFRAME (w->frame); - s->hdc = hdc; - s->window = FRAME_W32_WINDOW (s->f); - s->char2b = char2b; - s->hl = hl; - s->row = row; - s->area = area; - s->first_glyph = row->glyphs[area] + start; - s->height = row->height; - s->y = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); - - /* Display the internal border below the tool-bar window. */ - if (s->w == XWINDOW (s->f->tool_bar_window)) - s->y -= s->f->output_data.w32->internal_border_width; - - s->ybase = s->y + row->ascent; -} - - -/* Set background width of glyph string S. START is the index of the - first glyph following S. LAST_X is the right-most x-position + 1 - in the drawing area. */ - -static INLINE void -x_set_glyph_string_background_width (s, start, last_x) - struct glyph_string *s; - int start; - int last_x; -{ - /* If the face of this glyph string has to be drawn to the end of - the drawing area, set S->extends_to_end_of_line_p. */ - struct face *default_face = FACE_FROM_ID (s->f, DEFAULT_FACE_ID); - - if (start == s->row->used[s->area] - && s->area == TEXT_AREA - && ((s->hl == DRAW_NORMAL_TEXT - && (s->row->fill_line_p - || s->face->background != default_face->background - || s->face->stipple != default_face->stipple - || s->row->mouse_face_p)) - || s->hl == DRAW_MOUSE_FACE - || ((s->hl == DRAW_IMAGE_RAISED || s->hl == DRAW_IMAGE_SUNKEN) - && s->row->fill_line_p))) - s->extends_to_end_of_line_p = 1; - - /* If S extends its face to the end of the line, set its - background_width to the distance to the right edge of the drawing - area. */ - if (s->extends_to_end_of_line_p) - s->background_width = last_x - s->x + 1; - else - s->background_width = s->width; -} - - -/* Add a glyph string for a stretch glyph to the list of strings - between HEAD and TAIL. START is the index of the stretch glyph in - row area AREA of glyph row ROW. END is the index of the last glyph - in that glyph row area. X is the current output position assigned - to the new glyph string constructed. HL overrides that face of the - glyph; e.g. it is DRAW_CURSOR if a cursor has to be drawn. LAST_X - is the right-most x-position of the drawing area. */ - -#define BUILD_STRETCH_GLYPH_STRING(hdc, W, ROW, AREA, START, END, HEAD, TAIL, HL, X, LAST_X) \ - do \ - { \ - s = (struct glyph_string *) alloca (sizeof *s); \ - w32_init_glyph_string (s, hdc, NULL, W, ROW, AREA, START, HL); \ - START = x_fill_stretch_glyph_string (s, ROW, AREA, START, END); \ - x_append_glyph_string (&HEAD, &TAIL, s); \ - s->x = (X); \ - } \ - while (0) - - -/* Add a glyph string for an image glyph to the list of strings - between HEAD and TAIL. START is the index of the image glyph in - row area AREA of glyph row ROW. END is the index of the last glyph - in that glyph row area. X is the current output position assigned - to the new glyph string constructed. HL overrides that face of the - glyph; e.g. it is DRAW_CURSOR if a cursor has to be drawn. LAST_X - is the right-most x-position of the drawing area. */ - -#define BUILD_IMAGE_GLYPH_STRING(hdc, W, ROW, AREA, START, END, HEAD, TAIL, HL, X, LAST_X) \ - do \ - { \ - s = (struct glyph_string *) alloca (sizeof *s); \ - w32_init_glyph_string (s, hdc, NULL, W, ROW, AREA, START, HL); \ - x_fill_image_glyph_string (s); \ - x_append_glyph_string (&HEAD, &TAIL, s); \ - ++START; \ - s->x = (X); \ - } \ - while (0) - - -/* Add a glyph string for a sequence of character glyphs to the list - of strings between HEAD and TAIL. START is the index of the first - glyph in row area AREA of glyph row ROW that is part of the new - glyph string. END is the index of the last glyph in that glyph row - area. X is the current output position assigned to the new glyph - string constructed. HL overrides that face of the glyph; e.g. it - is DRAW_CURSOR if a cursor has to be drawn. LAST_X is the - right-most x-position of the drawing area. */ - -#define BUILD_CHAR_GLYPH_STRINGS(hdc, W, ROW, AREA, START, END, HEAD, TAIL, HL, X, LAST_X, OVERLAPS_P) \ - do \ - { \ - int c, face_id; \ - wchar_t *char2b; \ - \ - c = (ROW)->glyphs[AREA][START].u.ch; \ - face_id = (ROW)->glyphs[AREA][START].face_id; \ - \ - s = (struct glyph_string *) alloca (sizeof *s); \ - char2b = (wchar_t *) alloca ((END - START) * sizeof *char2b); \ - w32_init_glyph_string (s, hdc, char2b, W, ROW, AREA, START, HL); \ - x_append_glyph_string (&HEAD, &TAIL, s); \ - s->x = (X); \ - START = x_fill_glyph_string (s, face_id, START, END, \ - OVERLAPS_P); \ - } \ - while (0) - - -/* Add a glyph string for a composite sequence to the list of strings - between HEAD and TAIL. START is the index of the first glyph in - row area AREA of glyph row ROW that is part of the new glyph - string. END is the index of the last glyph in that glyph row area. - X is the current output position assigned to the new glyph string - constructed. HL overrides that face of the glyph; e.g. it is - DRAW_CURSOR if a cursor has to be drawn. LAST_X is the right-most - x-position of the drawing area. */ - -#define BUILD_COMPOSITE_GLYPH_STRING(hdc, W, ROW, AREA, START, END, HEAD, TAIL, HL, X, LAST_X, OVERLAPS_P) \ - do { \ - int cmp_id = (ROW)->glyphs[AREA][START].u.cmp_id; \ - int face_id = (ROW)->glyphs[AREA][START].face_id; \ - struct face *base_face = FACE_FROM_ID (XFRAME (w->frame), face_id); \ - struct composition *cmp = composition_table[cmp_id]; \ - int glyph_len = cmp->glyph_len; \ - wchar_t *char2b; \ - struct face **faces; \ - struct glyph_string *first_s = NULL; \ - int n; \ - \ - base_face = base_face->ascii_face; \ - char2b = (wchar_t *) alloca ((sizeof *char2b) * glyph_len); \ - faces = (struct face **) alloca ((sizeof *faces) * glyph_len); \ - /* At first, fill in `char2b' and `faces'. */ \ - for (n = 0; n < glyph_len; n++) \ - { \ - int c = COMPOSITION_GLYPH (cmp, n); \ - int this_face_id = FACE_FOR_CHAR (XFRAME (w->frame), base_face, c); \ - faces[n] = FACE_FROM_ID (XFRAME (w->frame), this_face_id); \ - x_get_char_face_and_encoding (XFRAME (w->frame), c, \ - this_face_id, char2b + n, 1); \ - } \ - \ - /* Make glyph_strings for each glyph sequence that is drawable by \ - the same face, and append them to HEAD/TAIL. */ \ - for (n = 0; n < cmp->glyph_len;) \ - { \ - s = (struct glyph_string *) alloca (sizeof *s); \ - w32_init_glyph_string (s, hdc, char2b + n, W, ROW, AREA, START, HL); \ - x_append_glyph_string (&(HEAD), &(TAIL), s); \ - s->cmp = cmp; \ - s->gidx = n; \ - s->x = (X); \ - \ - if (n == 0) \ - first_s = s; \ - \ - n = x_fill_composite_glyph_string (s, faces, OVERLAPS_P); \ - } \ - \ - ++START; \ - s = first_s; \ - } while (0) - - -/* Build a list of glyph strings between HEAD and TAIL for the glyphs - of AREA of glyph row ROW on window W between indices START and END. - HL overrides the face for drawing glyph strings, e.g. it is - DRAW_CURSOR to draw a cursor. X and LAST_X are start and end - x-positions of the drawing area. - - This is an ugly monster macro construct because we must use alloca - to allocate glyph strings (because x_draw_glyphs can be called - asynchronously). */ - -#define BUILD_GLYPH_STRINGS(hdc, W, ROW, AREA, START, END, HEAD, TAIL, HL, X, LAST_X, OVERLAPS_P) \ - do \ - { \ - HEAD = TAIL = NULL; \ - while (START < END) \ - { \ - struct glyph *first_glyph = (ROW)->glyphs[AREA] + START; \ - switch (first_glyph->type) \ - { \ - case CHAR_GLYPH: \ - BUILD_CHAR_GLYPH_STRINGS (hdc, W, ROW, AREA, START, END, \ - HEAD, TAIL, HL, X, LAST_X, \ - OVERLAPS_P); \ - break; \ - \ - case COMPOSITE_GLYPH: \ - BUILD_COMPOSITE_GLYPH_STRING (hdc, W, ROW, AREA, START, \ - END, HEAD, TAIL, HL, X, \ - LAST_X, OVERLAPS_P); \ - break; \ - \ - case STRETCH_GLYPH: \ - BUILD_STRETCH_GLYPH_STRING (hdc, W, ROW, AREA, START, END,\ - HEAD, TAIL, HL, X, LAST_X); \ - break; \ - \ - case IMAGE_GLYPH: \ - BUILD_IMAGE_GLYPH_STRING (hdc, W, ROW, AREA, START, END, \ - HEAD, TAIL, HL, X, LAST_X); \ - break; \ - \ - default: \ - abort (); \ - } \ - \ - x_set_glyph_string_background_width (s, START, LAST_X); \ - (X) += s->width; \ - } \ - } \ - while (0) - - -/* Draw glyphs between START and END in AREA of ROW on window W, - starting at x-position X. X is relative to AREA in W. HL is a - face-override with the following meaning: - - DRAW_NORMAL_TEXT draw normally - DRAW_CURSOR draw in cursor face - DRAW_MOUSE_FACE draw in mouse face. - DRAW_INVERSE_VIDEO draw in mode line face - DRAW_IMAGE_SUNKEN draw an image with a sunken relief around it - DRAW_IMAGE_RAISED draw an image with a raised relief around it - - If OVERLAPS_P is non-zero, draw only the foreground of characters - and clip to the physical height of ROW. - - Value is the x-position reached, relative to AREA of W. */ - -static int -x_draw_glyphs (w, x, row, area, start, end, hl, overlaps_p) - struct window *w; - int x; - struct glyph_row *row; - enum glyph_row_area area; - int start, end; - enum draw_glyphs_face hl; - int overlaps_p; -{ - struct glyph_string *head, *tail; - struct glyph_string *s; - int last_x, area_width; - int x_reached; - int i, j; - HDC hdc = get_frame_dc (XFRAME (WINDOW_FRAME (w))); - - /* Let's rather be paranoid than getting a SEGV. */ - end = min (end, row->used[area]); - start = max (0, start); - start = min (end, start); - - /* Translate X to frame coordinates. Set last_x to the right - end of the drawing area. */ - if (row->full_width_p) - { - /* X is relative to the left edge of W, without scroll bars - or fringes. */ - struct frame *f = XFRAME (WINDOW_FRAME (w)); - int window_left_x = WINDOW_LEFT_MARGIN (w) * CANON_X_UNIT (f); - - x += window_left_x; - area_width = XFASTINT (w->width) * CANON_X_UNIT (f); - last_x = window_left_x + area_width; - - if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) - { - int width = FRAME_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f); - if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) - last_x += width; - else - x -= width; - } - - x += FRAME_INTERNAL_BORDER_WIDTH (f); - last_x -= FRAME_INTERNAL_BORDER_WIDTH (f); - } - else - { - x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, area, x); - area_width = window_box_width (w, area); - last_x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, area, area_width); - } - - /* Build a doubly-linked list of glyph_string structures between - head and tail from what we have to draw. Note that the macro - BUILD_GLYPH_STRINGS will modify its start parameter. That's - the reason we use a separate variable `i'. */ - i = start; - BUILD_GLYPH_STRINGS (hdc, w, row, area, i, end, head, tail, hl, x, last_x, - overlaps_p); - if (tail) - x_reached = tail->x + tail->background_width; - else - x_reached = x; - - /* If there are any glyphs with lbearing < 0 or rbearing > width in - the row, redraw some glyphs in front or following the glyph - strings built above. */ - if (head && !overlaps_p && row->contains_overlapping_glyphs_p) - { - int dummy_x = 0; - struct glyph_string *h, *t; - - /* Compute overhangs for all glyph strings. */ - for (s = head; s; s = s->next) - x_compute_glyph_string_overhangs (s); - - /* Prepend glyph strings for glyphs in front of the first glyph - string that are overwritten because of the first glyph - string's left overhang. The background of all strings - prepended must be drawn because the first glyph string - draws over it. */ - i = x_left_overwritten (head); - if (i >= 0) - { - j = i; - BUILD_GLYPH_STRINGS (hdc, w, row, area, j, start, h, t, - DRAW_NORMAL_TEXT, dummy_x, last_x, - overlaps_p); - start = i; - x_compute_overhangs_and_x (t, head->x, 1); - x_prepend_glyph_string_lists (&head, &tail, h, t); - } - - /* Prepend glyph strings for glyphs in front of the first glyph - string that overwrite that glyph string because of their - right overhang. For these strings, only the foreground must - be drawn, because it draws over the glyph string at `head'. - The background must not be drawn because this would overwrite - right overhangs of preceding glyphs for which no glyph - strings exist. */ - i = x_left_overwriting (head); - if (i >= 0) - { - BUILD_GLYPH_STRINGS (hdc, w, row, area, i, start, h, t, - DRAW_NORMAL_TEXT, dummy_x, last_x, - overlaps_p); - for (s = h; s; s = s->next) - s->background_filled_p = 1; - x_compute_overhangs_and_x (t, head->x, 1); - x_prepend_glyph_string_lists (&head, &tail, h, t); - } - - /* Append glyphs strings for glyphs following the last glyph - string tail that are overwritten by tail. The background of - these strings has to be drawn because tail's foreground draws - over it. */ - i = x_right_overwritten (tail); - if (i >= 0) - { - BUILD_GLYPH_STRINGS (hdc, w, row, area, end, i, h, t, - DRAW_NORMAL_TEXT, x, last_x, - overlaps_p); - x_compute_overhangs_and_x (h, tail->x + tail->width, 0); - x_append_glyph_string_lists (&head, &tail, h, t); - } - - /* Append glyph strings for glyphs following the last glyph - string tail that overwrite tail. The foreground of such - glyphs has to be drawn because it writes into the background - of tail. The background must not be drawn because it could - paint over the foreground of following glyphs. */ - i = x_right_overwriting (tail); - if (i >= 0) - { - BUILD_GLYPH_STRINGS (hdc, w, row, area, end, i, h, t, - DRAW_NORMAL_TEXT, x, last_x, - overlaps_p); - for (s = h; s; s = s->next) - s->background_filled_p = 1; - x_compute_overhangs_and_x (h, tail->x + tail->width, 0); - x_append_glyph_string_lists (&head, &tail, h, t); - } - } - - /* Draw all strings. */ - for (s = head; s; s = s->next) - x_draw_glyph_string (s); - - if (area == TEXT_AREA - && !row->full_width_p - /* When drawing overlapping rows, only the glyph strings' - foreground is drawn, which doesn't erase a cursor - completely. */ - && !overlaps_p) - { - int x0 = head ? head->x : x; - int x1 = tail ? tail->x + tail->background_width : x; - - x0 = FRAME_TO_WINDOW_PIXEL_X (w, x0); - x1 = FRAME_TO_WINDOW_PIXEL_X (w, x1); - - if (!row->full_width_p && XFASTINT (w->left_margin_width) != 0) - { - int left_area_width = window_box_width (w, LEFT_MARGIN_AREA); - x0 -= left_area_width; - x1 -= left_area_width; - } - - notice_overwritten_cursor (w, area, x0, x1, - row->y, MATRIX_ROW_BOTTOM_Y (row)); - } - - /* Value is the x-position up to which drawn, relative to AREA of W. - This doesn't include parts drawn because of overhangs. */ - x_reached = FRAME_TO_WINDOW_PIXEL_X (w, x_reached); - if (!row->full_width_p) - { - if (area > LEFT_MARGIN_AREA) - x_reached -= window_box_width (w, LEFT_MARGIN_AREA); - if (area > TEXT_AREA) - x_reached -= window_box_width (w, TEXT_AREA); - } - - release_frame_dc (XFRAME (WINDOW_FRAME (w)), hdc); - - return x_reached; -} - - -/* Fix the display of area AREA of overlapping row ROW in window W. */ - -static void -x_fix_overlapping_area (w, row, area) - struct window *w; - struct glyph_row *row; - enum glyph_row_area area; -{ - int i, x; - - BLOCK_INPUT; - - if (area == LEFT_MARGIN_AREA) - x = 0; - else if (area == TEXT_AREA) - x = row->x + window_box_width (w, LEFT_MARGIN_AREA); - else - x = (window_box_width (w, LEFT_MARGIN_AREA) - + window_box_width (w, TEXT_AREA)); - - for (i = 0; i < row->used[area];) - { - if (row->glyphs[area][i].overlaps_vertically_p) - { - int start = i, start_x = x; - - do - { - x += row->glyphs[area][i].pixel_width; - ++i; - } - while (i < row->used[area] - && row->glyphs[area][i].overlaps_vertically_p); - - x_draw_glyphs (w, start_x, row, area, start, i, - DRAW_NORMAL_TEXT, 1); - } - else - { - x += row->glyphs[area][i].pixel_width; - ++i; - } - } - - UNBLOCK_INPUT; -} - - -/* Output LEN glyphs starting at START at the nominal cursor position. - Advance the nominal cursor over the text. The global variable - updated_window contains the window being updated, updated_row is - the glyph row being updated, and updated_area is the area of that - row being updated. */ - -static void -x_write_glyphs (start, len) - struct glyph *start; - int len; -{ - int x, hpos; - - xassert (updated_window && updated_row); - BLOCK_INPUT; - - /* Write glyphs. */ - - hpos = start - updated_row->glyphs[updated_area]; - x = x_draw_glyphs (updated_window, output_cursor.x, - updated_row, updated_area, - hpos, hpos + len, - DRAW_NORMAL_TEXT, 0); - - UNBLOCK_INPUT; - - /* Advance the output cursor. */ - output_cursor.hpos += len; - output_cursor.x = x; -} - - -/* Insert LEN glyphs from START at the nominal cursor position. */ - -static void -x_insert_glyphs (start, len) - struct glyph *start; - register int len; -{ - struct frame *f; - struct window *w; - int line_height, shift_by_width, shifted_region_width; - struct glyph_row *row; - struct glyph *glyph; - int frame_x, frame_y, hpos; - HDC hdc; - - xassert (updated_window && updated_row); - BLOCK_INPUT; - w = updated_window; - f = XFRAME (WINDOW_FRAME (w)); - hdc = get_frame_dc (f); - - /* Get the height of the line we are in. */ - row = updated_row; - line_height = row->height; - - /* Get the width of the glyphs to insert. */ - shift_by_width = 0; - for (glyph = start; glyph < start + len; ++glyph) - shift_by_width += glyph->pixel_width; - - /* Get the width of the region to shift right. */ - shifted_region_width = (window_box_width (w, updated_area) - - output_cursor.x - - shift_by_width); - - /* Shift right. */ - frame_x = window_box_left (w, updated_area) + output_cursor.x; - frame_y = WINDOW_TO_FRAME_PIXEL_Y (w, output_cursor.y); - BitBlt (hdc, frame_x + shift_by_width, frame_y, - shifted_region_width, line_height, - hdc, frame_x, frame_y, SRCCOPY); - - /* Write the glyphs. */ - hpos = start - row->glyphs[updated_area]; - x_draw_glyphs (w, output_cursor.x, row, updated_area, hpos, hpos + len, - DRAW_NORMAL_TEXT, 0); - - /* Advance the output cursor. */ - output_cursor.hpos += len; - output_cursor.x += shift_by_width; - release_frame_dc (f, hdc); - - UNBLOCK_INPUT; -} - - -/* Delete N glyphs at the nominal cursor position. Not implemented - for X frames. */ - -static void -x_delete_glyphs (n) - register int n; -{ - struct frame *f; - - if (updating_frame) - f = updating_frame; - else - f = SELECTED_FRAME (); - - if (! FRAME_W32_P (f)) - return; - - abort (); -} - - -/* Erase the current text line from the nominal cursor position - (inclusive) to pixel column TO_X (exclusive). The idea is that - everything from TO_X onward is already erased. - - TO_X is a pixel position relative to updated_area of - updated_window. TO_X == -1 means clear to the end of this area. */ - -static void -x_clear_end_of_line (to_x) - int to_x; -{ - struct frame *f; - struct window *w = updated_window; - int max_x, min_y, max_y; - int from_x, from_y, to_y; - - xassert (updated_window && updated_row); - f = XFRAME (w->frame); - - if (updated_row->full_width_p) - { - max_x = XFASTINT (w->width) * CANON_X_UNIT (f); - if (FRAME_HAS_VERTICAL_SCROLL_BARS (f) - && !w->pseudo_window_p) - max_x += FRAME_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f); - } - else - max_x = window_box_width (w, updated_area); - max_y = window_text_bottom_y (w); - - /* TO_X == 0 means don't do anything. TO_X < 0 means clear to end - of window. For TO_X > 0, truncate to end of drawing area. */ - if (to_x == 0) - return; - else if (to_x < 0) - to_x = max_x; - else - to_x = min (to_x, max_x); - - to_y = min (max_y, output_cursor.y + updated_row->height); - - /* Notice if the cursor will be cleared by this operation. */ - if (!updated_row->full_width_p) - notice_overwritten_cursor (w, updated_area, - output_cursor.x, -1, - updated_row->y, - MATRIX_ROW_BOTTOM_Y (updated_row)); - - from_x = output_cursor.x; - - /* Translate to frame coordinates. */ - if (updated_row->full_width_p) - { - from_x = WINDOW_TO_FRAME_PIXEL_X (w, from_x); - to_x = WINDOW_TO_FRAME_PIXEL_X (w, to_x); - } - else - { - from_x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, updated_area, from_x); - to_x = WINDOW_AREA_TO_FRAME_PIXEL_X (w, updated_area, to_x); - } - - min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); - from_y = WINDOW_TO_FRAME_PIXEL_Y (w, max (min_y, output_cursor.y)); - to_y = WINDOW_TO_FRAME_PIXEL_Y (w, to_y); - - /* Prevent inadvertently clearing to end of the X window. */ - if (to_x > from_x && to_y > from_y) - { - HDC hdc; - BLOCK_INPUT; - hdc = get_frame_dc (f); - - w32_clear_area (f, hdc, from_x, from_y, to_x - from_x, to_y - from_y); - release_frame_dc (f, hdc); - UNBLOCK_INPUT; - } -} - - -/* Clear entire frame. If updating_frame is non-null, clear that - frame. Otherwise clear the selected frame. */ - -static void -x_clear_frame () -{ - struct frame *f; - - if (updating_frame) - f = updating_frame; - else - f = SELECTED_FRAME (); - - if (! FRAME_W32_P (f)) - return; - - /* Clearing the frame will erase any cursor, so mark them all as no - longer visible. */ - mark_window_cursors_off (XWINDOW (FRAME_ROOT_WINDOW (f))); - output_cursor.hpos = output_cursor.vpos = 0; - output_cursor.x = -1; - - /* We don't set the output cursor here because there will always - follow an explicit cursor_to. */ - BLOCK_INPUT; - - w32_clear_window (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); - - UNBLOCK_INPUT; -} - - -/* Make audible bell. */ - -static void -w32_ring_bell (void) -{ - struct frame *f; - - f = SELECTED_FRAME (); - - BLOCK_INPUT; - - if (FRAME_W32_P (f) && visible_bell) - { - int i; - HWND hwnd = FRAME_W32_WINDOW (SELECTED_FRAME ()); - - for (i = 0; i < 5; i++) - { - FlashWindow (hwnd, TRUE); - Sleep (10); - } - FlashWindow (hwnd, FALSE); - } - else - w32_sys_ring_bell (); - - UNBLOCK_INPUT; -} - - -/* Specify how many text lines, from the top of the window, - should be affected by insert-lines and delete-lines operations. - This, and those operations, are used only within an update - that is bounded by calls to x_update_begin and x_update_end. */ - -static void -w32_set_terminal_window (n) - register int n; -{ - /* This function intentionally left blank. */ -} - - - -/*********************************************************************** - Line Dance - ***********************************************************************/ - -/* Perform an insert-lines or delete-lines operation, inserting N - lines or deleting -N lines at vertical position VPOS. */ - -static void -x_ins_del_lines (vpos, n) - int vpos, n; -{ - struct frame *f; - - if (updating_frame) - f = updating_frame; - else - f = SELECTED_FRAME (); - - if (! FRAME_W32_P (f)) - return; - - abort (); -} - - -/* Scroll part of the display as described by RUN. */ - -static void -x_scroll_run (w, run) - struct window *w; - struct run *run; -{ - struct frame *f = XFRAME (w->frame); - int x, y, width, height, from_y, to_y, bottom_y; - HWND hwnd = FRAME_W32_WINDOW (f); - HRGN expect_dirty; - - /* Get frame-relative bounding box of the text display area of W, - without mode lines. Include in this box the left and right - fringes of W. */ - window_box (w, -1, &x, &y, &width, &height); - width += FRAME_X_FRINGE_WIDTH (f); - x -= FRAME_X_LEFT_FRINGE_WIDTH (f); - - from_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->current_y); - to_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->desired_y); - bottom_y = y + height; - - if (to_y < from_y) - { - /* Scrolling up. Make sure we don't copy part of the mode - line at the bottom. */ - if (from_y + run->height > bottom_y) - height = bottom_y - from_y; - else - height = run->height; - expect_dirty = CreateRectRgn (x, y + height, x + width, bottom_y); - } - else - { - /* Scolling down. Make sure we don't copy over the mode line. - at the bottom. */ - if (to_y + run->height > bottom_y) - height = bottom_y - to_y; - else - height = run->height; - expect_dirty = CreateRectRgn (x, y, x + width, to_y); - } - - BLOCK_INPUT; - - /* Cursor off. Will be switched on again in x_update_window_end. */ - updated_window = w; - x_clear_cursor (w); - - { - RECT from; - RECT to; - HRGN dirty = CreateRectRgn (0, 0, 0, 0); - HRGN combined = CreateRectRgn (0, 0, 0, 0); - - from.left = to.left = x; - from.right = to.right = x + width; - from.top = from_y; - from.bottom = from_y + height; - to.top = y; - to.bottom = bottom_y; - - ScrollWindowEx (hwnd, 0, to_y - from_y, &from, &to, dirty, - NULL, SW_INVALIDATE); - - /* Combine this with what we expect to be dirty. This covers the - case where not all of the region we expect is actually dirty. */ - CombineRgn (combined, dirty, expect_dirty, RGN_OR); - - /* If the dirty region is not what we expected, redraw the entire frame. */ - if (!EqualRgn (combined, expect_dirty)) - SET_FRAME_GARBAGED (f); - } - - UNBLOCK_INPUT; -} - - - -/*********************************************************************** - Exposure Events - ***********************************************************************/ - -/* Redisplay an exposed area of frame F. X and Y are the upper-left - corner of the exposed rectangle. W and H are width and height of - the exposed area. All are pixel values. W or H zero means redraw - the entire frame. */ - -static void -expose_frame (f, x, y, w, h) - struct frame *f; - int x, y, w, h; -{ - RECT r; - int mouse_face_overwritten_p = 0; - - TRACE ((stderr, "expose_frame ")); - - /* No need to redraw if frame will be redrawn soon. */ - if (FRAME_GARBAGED_P (f)) - { - TRACE ((stderr, " garbaged\n")); - return; - } - - /* If basic faces haven't been realized yet, there is no point in - trying to redraw anything. This can happen when we get an expose - event while Emacs is starting, e.g. by moving another window. */ - if (FRAME_FACE_CACHE (f) == NULL - || FRAME_FACE_CACHE (f)->used < BASIC_FACE_ID_SENTINEL) - { - TRACE ((stderr, " no faces\n")); - return; - } - - if (w == 0 || h == 0) - { - r.left = r.top = 0; - r.right = CANON_X_UNIT (f) * f->width; - r.bottom = CANON_Y_UNIT (f) * f->height; - } - else - { - r.left = x; - r.top = y; - r.right = x + w; - r.bottom = y + h; - } - - TRACE ((stderr, "(%d, %d, %d, %d)\n", r.left, r.top, r.right, r.bottom)); - mouse_face_overwritten_p = expose_window_tree (XWINDOW (f->root_window), &r); - - if (WINDOWP (f->tool_bar_window)) - mouse_face_overwritten_p - |= expose_window (XWINDOW (f->tool_bar_window), &r); - - /* Some window managers support a focus-follows-mouse style with - delayed raising of frames. Imagine a partially obscured frame, - and moving the mouse into partially obscured mouse-face on that - frame. The visible part of the mouse-face will be highlighted, - then the WM raises the obscured frame. With at least one WM, KDE - 2.1, Emacs is not getting any event for the raising of the frame - (even tried with SubstructureRedirectMask), only Expose events. - These expose events will draw text normally, i.e. not - highlighted. Which means we must redo the highlight here. - Subsume it under ``we love X''. --gerd 2001-08-15 */ - /* Included in Windows version because Windows most likely does not - do the right thing if any third party tool offers - focus-follows-mouse with delayed raise. --jason 2001-10-12 */ - if (mouse_face_overwritten_p && !FRAME_GARBAGED_P (f)) - { - struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); - if (f == dpyinfo->mouse_face_mouse_frame) - { - int x = dpyinfo->mouse_face_mouse_x; - int y = dpyinfo->mouse_face_mouse_y; - clear_mouse_face (dpyinfo); - note_mouse_highlight (f, x, y); - } - } -} - - -/* Redraw (parts) of all windows in the window tree rooted at W that - intersect R. R contains frame pixel coordinates. */ - -static int -expose_window_tree (w, r) - struct window *w; - RECT *r; -{ - struct frame *f = XFRAME (w->frame); - int mouse_face_overwritten_p = 0; - - while (w && !FRAME_GARBAGED_P (f)) - { - if (!NILP (w->hchild)) - mouse_face_overwritten_p - |= expose_window_tree (XWINDOW (w->hchild), r); - else if (!NILP (w->vchild)) - mouse_face_overwritten_p - |= expose_window_tree (XWINDOW (w->vchild), r); - else - mouse_face_overwritten_p |= expose_window (w, r); - - w = NILP (w->next) ? NULL : XWINDOW (w->next); - } - - return mouse_face_overwritten_p; -} - - -/* Redraw the part of glyph row area AREA of glyph row ROW on window W - which intersects rectangle R. R is in window-relative coordinates. */ - -static void -expose_area (w, row, r, area) - struct window *w; - struct glyph_row *row; - RECT *r; - enum glyph_row_area area; -{ - struct glyph *first = row->glyphs[area]; - struct glyph *end = row->glyphs[area] + row->used[area]; - struct glyph *last; - int first_x, start_x, x; - - if (area == TEXT_AREA && row->fill_line_p) - /* If row extends face to end of line write the whole line. */ - x_draw_glyphs (w, 0, row, area, - 0, row->used[area], - DRAW_NORMAL_TEXT, 0); - else - { - /* Set START_X to the window-relative start position for drawing glyphs of - AREA. The first glyph of the text area can be partially visible. - The first glyphs of other areas cannot. */ - if (area == LEFT_MARGIN_AREA) - start_x = 0; - else if (area == TEXT_AREA) - start_x = row->x + window_box_width (w, LEFT_MARGIN_AREA); - else - start_x = (window_box_width (w, LEFT_MARGIN_AREA) - + window_box_width (w, TEXT_AREA)); - x = start_x; - - /* Find the first glyph that must be redrawn. */ - while (first < end - && x + first->pixel_width < r->left) - { - x += first->pixel_width; - ++first; - } - - /* Find the last one. */ - last = first; - first_x = x; - while (last < end - && x < r->right) - { - x += last->pixel_width; - ++last; - } - - /* Repaint. */ - if (last > first) - x_draw_glyphs (w, first_x - start_x, row, area, - first - row->glyphs[area], - last - row->glyphs[area], - DRAW_NORMAL_TEXT, 0); - } -} - - -/* Redraw the parts of the glyph row ROW on window W intersecting - rectangle R. R is in window-relative coordinates. Value is - non-zero if mouse face was overwritten. */ - -static int -expose_line (w, row, r) - struct window *w; - struct glyph_row *row; - RECT *r; -{ - xassert (row->enabled_p); - - if (row->mode_line_p || w->pseudo_window_p) - x_draw_glyphs (w, 0, row, TEXT_AREA, 0, row->used[TEXT_AREA], - DRAW_NORMAL_TEXT, 0); - else - { - if (row->used[LEFT_MARGIN_AREA]) - expose_area (w, row, r, LEFT_MARGIN_AREA); - if (row->used[TEXT_AREA]) - expose_area (w, row, r, TEXT_AREA); - if (row->used[RIGHT_MARGIN_AREA]) - expose_area (w, row, r, RIGHT_MARGIN_AREA); - x_draw_row_fringe_bitmaps (w, row); - } - - return row->mouse_face_p; -} - - -/* Return non-zero if W's cursor intersects rectangle R. */ - -static int -x_phys_cursor_in_rect_p (w, r) - struct window *w; - RECT *r; -{ - RECT cr, result; - struct glyph *cursor_glyph; - - cursor_glyph = get_phys_cursor_glyph (w); - if (cursor_glyph) - { - cr.left = w->phys_cursor.x; - cr.top = w->phys_cursor.y; - cr.right = cr.left + cursor_glyph->pixel_width; - cr.bottom = cr.top + w->phys_cursor_height; - return IntersectRect (&result, &cr, r); - } - else - return 0; -} - - -/* Redraw those parts of glyphs rows during expose event handling that - overlap other rows. Redrawing of an exposed line writes over parts - of lines overlapping that exposed line; this function fixes that. - - W is the window being exposed. FIRST_OVERLAPPING_ROW is the first - row in W's current matrix that is exposed and overlaps other rows. - LAST_OVERLAPPING_ROW is the last such row. */ - -static void -expose_overlaps (w, first_overlapping_row, last_overlapping_row) - struct window *w; - struct glyph_row *first_overlapping_row; - struct glyph_row *last_overlapping_row; -{ - struct glyph_row *row; - - for (row = first_overlapping_row; row <= last_overlapping_row; ++row) - if (row->overlapping_p) - { - xassert (row->enabled_p && !row->mode_line_p); - - if (row->used[LEFT_MARGIN_AREA]) - x_fix_overlapping_area (w, row, LEFT_MARGIN_AREA); - - if (row->used[TEXT_AREA]) - x_fix_overlapping_area (w, row, TEXT_AREA); - - if (row->used[RIGHT_MARGIN_AREA]) - x_fix_overlapping_area (w, row, RIGHT_MARGIN_AREA); - } -} - - -/* Redraw the part of window W intersection rectagle FR. Pixel - coordinates in FR are frame relative. Call this function with - input blocked. Value is non-zero if the exposure overwrites - mouse-face. */ - -static int -expose_window (w, fr) - struct window *w; - RECT *fr; -{ - struct frame *f = XFRAME (w->frame); - RECT wr, r; - int mouse_face_overwritten_p = 0; - - /* If window is not yet fully initialized, do nothing. This can - happen when toolkit scroll bars are used and a window is split. - Reconfiguring the scroll bar will generate an expose for a newly - created window. */ - if (w->current_matrix == NULL) - return 0; - - /* When we're currently updating the window, display and current - matrix usually don't agree. Arrange for a thorough display - later. */ - if (w == updated_window) - { - SET_FRAME_GARBAGED (f); - return 0; - } - - /* Frame-relative pixel rectangle of W. */ - wr.left = XFASTINT (w->left) * CANON_X_UNIT (f); - wr.top = XFASTINT (w->top) * CANON_Y_UNIT (f); - wr.right = wr.left + XFASTINT (w->width) * CANON_X_UNIT (f); - wr.bottom = wr.top + XFASTINT (w->height) * CANON_Y_UNIT (f); - - if (IntersectRect(&r, fr, &wr)) - { - int yb = window_text_bottom_y (w); - struct glyph_row *row; - int cursor_cleared_p; - struct glyph_row *first_overlapping_row, *last_overlapping_row; - - TRACE ((stderr, "expose_window (%d, %d, %d, %d)\n", - r.left, r.top, r.right, r.bottom)); - - /* Convert to window coordinates. */ - r.left = FRAME_TO_WINDOW_PIXEL_X (w, r.left); - r.right = FRAME_TO_WINDOW_PIXEL_X (w, r.right); - r.top = FRAME_TO_WINDOW_PIXEL_Y (w, r.top); - r.bottom = FRAME_TO_WINDOW_PIXEL_Y (w, r.bottom); - - /* Turn off the cursor. */ - if (!w->pseudo_window_p - && x_phys_cursor_in_rect_p (w, &r)) - { - x_clear_cursor (w); - cursor_cleared_p = 1; - } - else - cursor_cleared_p = 0; - - /* Update lines intersecting rectangle R. */ - first_overlapping_row = last_overlapping_row = NULL; - for (row = w->current_matrix->rows; - row->enabled_p; - ++row) - { - int y0 = row->y; - int y1 = MATRIX_ROW_BOTTOM_Y (row); - - if ((y0 >= r.top && y0 < r.bottom) - || (y1 > r.top && y1 < r.bottom) - || (r.top >= y0 && r.top < y1) - || (r.bottom > y0 && r.bottom < y1)) - { - if (row->overlapping_p) - { - if (first_overlapping_row == NULL) - first_overlapping_row = row; - last_overlapping_row = row; - } - - if (expose_line (w, row, &r)) - mouse_face_overwritten_p = 1; - } - - if (y1 >= yb) - break; - } - - /* Display the mode line if there is one. */ - if (WINDOW_WANTS_MODELINE_P (w) - && (row = MATRIX_MODE_LINE_ROW (w->current_matrix), - row->enabled_p) - && row->y < r.bottom) - { - if (expose_line (w, row, &r)) - mouse_face_overwritten_p = 1; - } - - if (!w->pseudo_window_p) - { - /* Fix the display of overlapping rows. */ - if (first_overlapping_row) - expose_overlaps (w, first_overlapping_row, last_overlapping_row); - - /* Draw border between windows. */ - x_draw_vertical_border (w); - - /* Turn the cursor on again. */ - if (cursor_cleared_p) - x_update_window_cursor (w, 1); - } - } - - return mouse_face_overwritten_p; -} - - -static void -frame_highlight (f) - struct frame *f; -{ - x_update_cursor (f, 1); -} - -static void -frame_unhighlight (f) - struct frame *f; -{ - x_update_cursor (f, 1); -} - -/* The focus has changed. Update the frames as necessary to reflect - the new situation. Note that we can't change the selected frame - here, because the Lisp code we are interrupting might become confused. - Each event gets marked with the frame in which it occurred, so the - Lisp code can tell when the switch took place by examining the events. */ - -static void -x_new_focus_frame (dpyinfo, frame) - struct w32_display_info *dpyinfo; - struct frame *frame; -{ - struct frame *old_focus = dpyinfo->w32_focus_frame; - - if (frame != dpyinfo->w32_focus_frame) - { - /* Set this before calling other routines, so that they see - the correct value of w32_focus_frame. */ - dpyinfo->w32_focus_frame = frame; - - if (old_focus && old_focus->auto_lower) - x_lower_frame (old_focus); - - if (dpyinfo->w32_focus_frame && dpyinfo->w32_focus_frame->auto_raise) - pending_autoraise_frame = dpyinfo->w32_focus_frame; - else - pending_autoraise_frame = 0; - } - - x_frame_rehighlight (dpyinfo); -} - -/* Handle an event saying the mouse has moved out of an Emacs frame. */ - -void -x_mouse_leave (dpyinfo) - struct w32_display_info *dpyinfo; -{ - x_new_focus_frame (dpyinfo, dpyinfo->w32_focus_event_frame); -} - -/* The focus has changed, or we have redirected a frame's focus to - another frame (this happens when a frame uses a surrogate - mini-buffer frame). Shift the highlight as appropriate. - - The FRAME argument doesn't necessarily have anything to do with which - frame is being highlighted or un-highlighted; we only use it to find - the appropriate X display info. */ - -static void -w32_frame_rehighlight (frame) - struct frame *frame; -{ - if (! FRAME_W32_P (frame)) - return; - x_frame_rehighlight (FRAME_W32_DISPLAY_INFO (frame)); -} - -static void -x_frame_rehighlight (dpyinfo) - struct w32_display_info *dpyinfo; -{ - struct frame *old_highlight = dpyinfo->x_highlight_frame; - - if (dpyinfo->w32_focus_frame) - { - dpyinfo->x_highlight_frame - = ((GC_FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame))) - ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame)) - : dpyinfo->w32_focus_frame); - if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame)) - { - FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame) = Qnil; - dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame; - } - } - else - dpyinfo->x_highlight_frame = 0; - - if (dpyinfo->x_highlight_frame != old_highlight) - { - if (old_highlight) - frame_unhighlight (old_highlight); - if (dpyinfo->x_highlight_frame) - frame_highlight (dpyinfo->x_highlight_frame); - } -} - -/* Keyboard processing - modifier keys, etc. */ - -/* Convert a keysym to its name. */ - -char * -x_get_keysym_name (keysym) - int keysym; -{ - /* Make static so we can always return it */ - static char value[100]; - - BLOCK_INPUT; - GetKeyNameText (keysym, value, 100); - UNBLOCK_INPUT; - - return value; -} - - - -/* Mouse clicks and mouse movement. Rah. */ - -/* Given a pixel position (PIX_X, PIX_Y) on frame F, return glyph - co-ordinates in (*X, *Y). Set *BOUNDS to the rectangle that the - glyph at X, Y occupies, if BOUNDS != 0. If NOCLIP is non-zero, do - not force the value into range. */ - -void -pixel_to_glyph_coords (f, pix_x, pix_y, x, y, bounds, noclip) - FRAME_PTR f; - register int pix_x, pix_y; - register int *x, *y; - RECT *bounds; - int noclip; -{ - /* Support tty mode: if Vwindow_system is nil, behave correctly. */ - if (NILP (Vwindow_system)) - { - *x = pix_x; - *y = pix_y; - return; - } - - /* Arrange for the division in PIXEL_TO_CHAR_COL etc. to round down - even for negative values. */ - if (pix_x < 0) - pix_x -= FONT_WIDTH (FRAME_FONT (f)) - 1; - if (pix_y < 0) - pix_y -= (f)->output_data.w32->line_height - 1; - - pix_x = PIXEL_TO_CHAR_COL (f, pix_x); - pix_y = PIXEL_TO_CHAR_ROW (f, pix_y); - - if (bounds) - { - bounds->left = CHAR_TO_PIXEL_COL (f, pix_x); - bounds->top = CHAR_TO_PIXEL_ROW (f, pix_y); - bounds->right = bounds->left + FONT_WIDTH (FRAME_FONT (f)) - 1; - bounds->bottom = bounds->top + f->output_data.w32->line_height - 1; - } - - if (!noclip) - { - if (pix_x < 0) - pix_x = 0; - else if (pix_x > FRAME_WINDOW_WIDTH (f)) - pix_x = FRAME_WINDOW_WIDTH (f); - - if (pix_y < 0) - pix_y = 0; - else if (pix_y > f->height) - pix_y = f->height; - } - - *x = pix_x; - *y = pix_y; -} - - -/* Given HPOS/VPOS in the current matrix of W, return corresponding - frame-relative pixel positions in *FRAME_X and *FRAME_Y. If we - can't tell the positions because W's display is not up to date, - return 0. */ - -int -glyph_to_pixel_coords (w, hpos, vpos, frame_x, frame_y) - struct window *w; - int hpos, vpos; - int *frame_x, *frame_y; -{ - int success_p; - - xassert (hpos >= 0 && hpos < w->current_matrix->matrix_w); - xassert (vpos >= 0 && vpos < w->current_matrix->matrix_h); - - if (display_completed) - { - struct glyph_row *row = MATRIX_ROW (w->current_matrix, vpos); - struct glyph *glyph = row->glyphs[TEXT_AREA]; - struct glyph *end = glyph + min (hpos, row->used[TEXT_AREA]); - - *frame_y = row->y; - *frame_x = row->x; - while (glyph < end) - { - *frame_x += glyph->pixel_width; - ++glyph; - } - - success_p = 1; - } - else - { - *frame_y = *frame_x = 0; - success_p = 0; - } - - *frame_y = WINDOW_TO_FRAME_PIXEL_Y (w, *frame_y); - *frame_x = WINDOW_TO_FRAME_PIXEL_X (w, *frame_x); - return success_p; -} - -/* Parse a button MESSAGE. The button index is returned in PBUTTON, and - the state in PUP. XBUTTON provides extra information for extended mouse - button messages. Returns FALSE if unable to parse the message. */ -BOOL -parse_button (message, xbutton, pbutton, pup) - int message; - int xbutton; - int * pbutton; - int * pup; -{ - int button = 0; - int up = 0; - - switch (message) - { - case WM_LBUTTONDOWN: - button = 0; - up = 0; - break; - case WM_LBUTTONUP: - button = 0; - up = 1; - break; - case WM_MBUTTONDOWN: - if (NILP (Vw32_swap_mouse_buttons)) - button = 1; - else - button = 2; - up = 0; - break; - case WM_MBUTTONUP: - if (NILP (Vw32_swap_mouse_buttons)) - button = 1; - else - button = 2; - up = 1; - break; - case WM_RBUTTONDOWN: - if (NILP (Vw32_swap_mouse_buttons)) - button = 2; - else - button = 1; - up = 0; - break; - case WM_RBUTTONUP: - if (NILP (Vw32_swap_mouse_buttons)) - button = 2; - else - button = 1; - up = 1; - break; - case WM_XBUTTONDOWN: - button = xbutton + 2; - up = 0; - break; - case WM_XBUTTONUP: - button = xbutton + 2; - up = 1; - break; - default: - return (FALSE); - } - - if (pup) *pup = up; - if (pbutton) *pbutton = button; - - return (TRUE); -} - - -/* Prepare a mouse-event in *RESULT for placement in the input queue. - - If the event is a button press, then note that we have grabbed - the mouse. */ - -static Lisp_Object -construct_mouse_click (result, msg, f) - struct input_event *result; - W32Msg *msg; - struct frame *f; -{ - int button; - int up; - - parse_button (msg->msg.message, HIWORD (msg->msg.wParam), - &button, &up); - - /* Make the event type NO_EVENT; we'll change that when we decide - otherwise. */ - result->kind = MOUSE_CLICK_EVENT; - result->code = button; - result->timestamp = msg->msg.time; - result->modifiers = (msg->dwModifiers - | (up - ? up_modifier - : down_modifier)); - - XSETINT (result->x, LOWORD (msg->msg.lParam)); - XSETINT (result->y, HIWORD (msg->msg.lParam)); - XSETFRAME (result->frame_or_window, f); - result->arg = Qnil; - return Qnil; -} - -static Lisp_Object -construct_mouse_wheel (result, msg, f) - struct input_event *result; - W32Msg *msg; - struct frame *f; -{ - POINT p; - result->kind = MOUSE_WHEEL_EVENT; - result->code = (short) HIWORD (msg->msg.wParam); - result->timestamp = msg->msg.time; - result->modifiers = msg->dwModifiers; - p.x = LOWORD (msg->msg.lParam); - p.y = HIWORD (msg->msg.lParam); - ScreenToClient (msg->msg.hwnd, &p); - XSETINT (result->x, p.x); - XSETINT (result->y, p.y); - XSETFRAME (result->frame_or_window, f); - result->arg = Qnil; - return Qnil; -} - -static Lisp_Object -construct_drag_n_drop (result, msg, f) - struct input_event *result; - W32Msg *msg; - struct frame *f; -{ - Lisp_Object files; - Lisp_Object frame; - HDROP hdrop; - POINT p; - WORD num_files; - char *name; - int i, len; - - result->kind = DRAG_N_DROP_EVENT; - result->code = 0; - result->timestamp = msg->msg.time; - result->modifiers = msg->dwModifiers; - - hdrop = (HDROP) msg->msg.wParam; - DragQueryPoint (hdrop, &p); - -#if 0 - p.x = LOWORD (msg->msg.lParam); - p.y = HIWORD (msg->msg.lParam); - ScreenToClient (msg->msg.hwnd, &p); -#endif - - XSETINT (result->x, p.x); - XSETINT (result->y, p.y); - - num_files = DragQueryFile (hdrop, 0xFFFFFFFF, NULL, 0); - files = Qnil; - - for (i = 0; i < num_files; i++) - { - len = DragQueryFile (hdrop, i, NULL, 0); - if (len <= 0) - continue; - name = alloca (len + 1); - DragQueryFile (hdrop, i, name, len + 1); - files = Fcons (DECODE_FILE (build_string (name)), files); - } - - DragFinish (hdrop); - - XSETFRAME (frame, f); - result->frame_or_window = Fcons (frame, files); - result->arg = Qnil; - return Qnil; -} - - -/* Function to report a mouse movement to the mainstream Emacs code. - The input handler calls this. - - We have received a mouse movement event, which is given in *event. - If the mouse is over a different glyph than it was last time, tell - the mainstream emacs code by setting mouse_moved. If not, ask for - another motion event, so we can check again the next time it moves. */ - -static MSG last_mouse_motion_event; -static Lisp_Object last_mouse_motion_frame; - -static void remember_mouse_glyph P_ ((struct frame *, int, int)); - -static void -note_mouse_movement (frame, msg) - FRAME_PTR frame; - MSG *msg; -{ - int mouse_x = LOWORD (msg->lParam); - int mouse_y = HIWORD (msg->lParam); - - last_mouse_movement_time = msg->time; - memcpy (&last_mouse_motion_event, msg, sizeof (last_mouse_motion_event)); - XSETFRAME (last_mouse_motion_frame, frame); - -#if 0 /* Calling Lisp asynchronously is not safe. */ - if (mouse_autoselect_window) - { - int area; - Lisp_Object window; - static Lisp_Object last_window; - - window = window_from_coordinates (frame, mouse_x, mouse_y, &area, 0); - - /* Window will be selected only when it is not selected now and - last mouse movement event was not in it. Minibuffer window - will be selected iff it is active. */ - if (!EQ (window, last_window) - && !EQ (window, selected_window) - && (!MINI_WINDOW_P (XWINDOW (window)) - || (EQ (window, minibuf_window) && minibuf_level > 0))) - Fselect_window (window); - - last_window=window; - } + } + else #endif - - if (msg->hwnd != FRAME_W32_WINDOW (frame)) - { - frame->mouse_moved = 1; - last_mouse_scroll_bar = Qnil; - note_mouse_highlight (frame, -1, -1); + { + w32_fill_area (s->f, s->hdc, gc->background, x, y, w, h); + } + } } + else if (!s->background_filled_p) + x_draw_glyph_string_bg_rect (s, s->x, s->y, s->background_width, + s->height); - /* Has the mouse moved off the glyph it was on at the last sighting? */ - else if (mouse_x < last_mouse_glyph.left - || mouse_x > last_mouse_glyph.right - || mouse_y < last_mouse_glyph.top - || mouse_y > last_mouse_glyph.bottom) - { - frame->mouse_moved = 1; - last_mouse_scroll_bar = Qnil; - note_mouse_highlight (frame, mouse_x, mouse_y); - /* Remember the mouse position here, as w32_mouse_position only - gets called when mouse tracking is enabled but we also need - to keep track of the mouse for help_echo and highlighting at - other times. */ - remember_mouse_glyph (frame, mouse_x, mouse_y); - } + s->background_filled_p = 1; } - -/************************************************************************ - Mouse Face - ************************************************************************/ -/* Find the glyph under window-relative coordinates X/Y in window W. - Consider only glyphs from buffer text, i.e. no glyphs from overlay - strings. Return in *HPOS and *VPOS the row and column number of - the glyph found. Return in *AREA the glyph area containing X. - Value is a pointer to the glyph found or null if X/Y is not on - text, or we can't tell because W's current matrix is not up to - date. */ +/* Draw glyph string S. */ -static struct glyph * -x_y_to_hpos_vpos (w, x, y, hpos, vpos, area, buffer_only_p) - struct window *w; - int x, y; - int *hpos, *vpos, *area; - int buffer_only_p; +static void +x_draw_glyph_string (s) + struct glyph_string *s; { - struct glyph *glyph, *end; - struct glyph_row *row = NULL; - int x0, i, left_area_width; + int relief_drawn_p = 0; - /* Find row containing Y. Give up if some row is not enabled. */ - for (i = 0; i < w->current_matrix->nrows; ++i) + /* If S draws into the background of its successor, draw the + background of the successor first so that S can draw into it. + This makes S->next use XDrawString instead of XDrawImageString. */ + if (s->next && s->right_overhang && !s->for_overlaps) { - row = MATRIX_ROW (w->current_matrix, i); - if (!row->enabled_p) - return NULL; - if (y >= row->y && y < MATRIX_ROW_BOTTOM_Y (row)) - break; + xassert (s->next->img == NULL); + x_set_glyph_string_gc (s->next); + x_set_glyph_string_clipping (s->next); + x_draw_glyph_string_background (s->next, 1); } - *vpos = i; - *hpos = 0; + /* Set up S->gc, set clipping and draw S. */ + x_set_glyph_string_gc (s); - /* Give up if Y is not in the window. */ - if (i == w->current_matrix->nrows) - return NULL; + /* Draw relief (if any) in advance for char/composition so that the + glyph string can be drawn over it. */ + if (!s->for_overlaps + && s->face->box != FACE_NO_BOX + && (s->first_glyph->type == CHAR_GLYPH + || s->first_glyph->type == COMPOSITE_GLYPH)) - /* Get the glyph area containing X. */ - if (w->pseudo_window_p) { - *area = TEXT_AREA; - x0 = 0; + x_set_glyph_string_clipping (s); + x_draw_glyph_string_background (s, 1); + x_draw_glyph_string_box (s); + x_set_glyph_string_clipping (s); + relief_drawn_p = 1; } else + x_set_glyph_string_clipping (s); + + switch (s->first_glyph->type) { - left_area_width = window_box_width (w, LEFT_MARGIN_AREA); - if (x < left_area_width) - { - *area = LEFT_MARGIN_AREA; - x0 = 0; - } - else if (x < left_area_width + window_box_width (w, TEXT_AREA)) - { - *area = TEXT_AREA; - x0 = row->x + left_area_width; - } + case IMAGE_GLYPH: + x_draw_image_glyph_string (s); + break; + + case STRETCH_GLYPH: + x_draw_stretch_glyph_string (s); + break; + + case CHAR_GLYPH: + if (s->for_overlaps) + s->background_filled_p = 1; else - { - *area = RIGHT_MARGIN_AREA; - x0 = left_area_width + window_box_width (w, TEXT_AREA); - } + x_draw_glyph_string_background (s, 0); + x_draw_glyph_string_foreground (s); + break; + + case COMPOSITE_GLYPH: + if (s->for_overlaps || s->gidx > 0) + s->background_filled_p = 1; + else + x_draw_glyph_string_background (s, 1); + x_draw_composite_glyph_string_foreground (s); + break; + + default: + abort (); } - /* Find glyph containing X. */ - glyph = row->glyphs[*area]; - end = glyph + row->used[*area]; - while (glyph < end) + if (!s->for_overlaps) { - if (x < x0 + glyph->pixel_width) - { - if (w->pseudo_window_p) - break; - else if (!buffer_only_p || BUFFERP (glyph->object)) - break; - } + /* Draw underline. */ + if (s->face->underline_p + && (s->font->bdf || !s->font->tm.tmUnderlined)) + { + unsigned long h = 1; + unsigned long dy = s->height - h; + + /* TODO: Use font information for positioning and thickness + of underline. See OUTLINETEXTMETRIC, and xterm.c. + Note: If you make this work, don't forget to change the + doc string of x-use-underline-position-properties below. */ + if (s->face->underline_defaulted_p) + { + w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x, + s->y + dy, s->width, 1); + } + else + { + w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x, + s->y + dy, s->width, 1); + } + } + + /* Draw overline. */ + if (s->face->overline_p) + { + unsigned long dy = 0, h = 1; + + if (s->face->overline_color_defaulted_p) + { + w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x, + s->y + dy, s->width, h); + } + else + { + w32_fill_area (s->f, s->hdc, s->face->overline_color, s->x, + s->y + dy, s->width, h); + } + } + + /* Draw strike-through. */ + if (s->face->strike_through_p + && (s->font->bdf || !s->font->tm.tmStruckOut)) + { + unsigned long h = 1; + unsigned long dy = (s->height - h) / 2; + + if (s->face->strike_through_color_defaulted_p) + { + w32_fill_area (s->f, s->hdc, s->gc->foreground, s->x, s->y + dy, + s->width, h); + } + else + { + w32_fill_area (s->f, s->hdc, s->face->underline_color, s->x, + s->y + dy, s->width, h); + } + } - x0 += glyph->pixel_width; - ++glyph; + /* Draw relief. */ + if (!relief_drawn_p && s->face->box != FACE_NO_BOX) + x_draw_glyph_string_box (s); } - if (glyph == end) - return NULL; + /* Reset clipping. */ + w32_set_clip_rectangle (s->hdc, NULL); +} + + +/* Shift display to make room for inserted glyphs. */ + +void +w32_shift_glyphs_for_insert (f, x, y, width, height, shift_by) + struct frame *f; + int x, y, width, height, shift_by; +{ + HDC hdc; + + hdc = get_frame_dc (f); + BitBlt (hdc, x + shift_by, y, width, height, + hdc, x, y, SRCCOPY); - *hpos = glyph - row->glyphs[*area]; - return glyph; + release_frame_dc (f, hdc); } -/* Convert frame-relative x/y to coordinates relative to window W. - Takes pseudo-windows into account. */ +/* Delete N glyphs at the nominal cursor position. Not implemented + for X frames. */ static void -frame_to_window_pixel_xy (w, x, y) - struct window *w; - int *x, *y; +x_delete_glyphs (n) + register int n; { - if (w->pseudo_window_p) - { - /* A pseudo-window is always full-width, and starts at the - left edge of the frame, plus a frame border. */ - struct frame *f = XFRAME (w->frame); - *x -= FRAME_INTERNAL_BORDER_WIDTH_SAFE (f); - *y = FRAME_TO_WINDOW_PIXEL_Y (w, *y); - } + struct frame *f; + + if (updating_frame) + f = updating_frame; else - { - *x = FRAME_TO_WINDOW_PIXEL_X (w, *x); - *y = FRAME_TO_WINDOW_PIXEL_Y (w, *y); - } + f = SELECTED_FRAME (); + + if (! FRAME_W32_P (f)) + return; + + abort (); } -/* Take proper action when mouse has moved to the mode or header line of - window W, x-position X. MODE_LINE_P non-zero means mouse is on the - mode line. X is relative to the start of the text display area of - W, so the width of fringes and scroll bars must be subtracted - to get a position relative to the start of the mode line. */ +/* Clear entire frame. If updating_frame is non-null, clear that + frame. Otherwise clear the selected frame. */ static void -note_mode_line_highlight (w, x, mode_line_p) - struct window *w; - int x, mode_line_p; +x_clear_frame () { - struct frame *f = XFRAME (w->frame); - struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); - Cursor cursor = dpyinfo->vertical_scroll_bar_cursor; - struct glyph_row *row; + struct frame *f; - if (mode_line_p) - row = MATRIX_MODE_LINE_ROW (w->current_matrix); + if (updating_frame) + f = updating_frame; else - row = MATRIX_HEADER_LINE_ROW (w->current_matrix); + f = SELECTED_FRAME (); + + if (! FRAME_W32_P (f)) + return; + + /* Clearing the frame will erase any cursor, so mark them all as no + longer visible. */ + mark_window_cursors_off (XWINDOW (FRAME_ROOT_WINDOW (f))); + output_cursor.hpos = output_cursor.vpos = 0; + output_cursor.x = -1; + + /* We don't set the output cursor here because there will always + follow an explicit cursor_to. */ + BLOCK_INPUT; + + w32_clear_window (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); + + UNBLOCK_INPUT; +} + + +/* Make audible bell. */ + +static void +w32_ring_bell (void) +{ + struct frame *f; - if (row->enabled_p) + f = SELECTED_FRAME (); + + BLOCK_INPUT; + + if (FRAME_W32_P (f) && visible_bell) { - struct glyph *glyph, *end; - Lisp_Object help, map; - int x0; - - /* Find the glyph under X. */ - glyph = row->glyphs[TEXT_AREA]; - end = glyph + row->used[TEXT_AREA]; - x0 = - (FRAME_LEFT_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f) - + FRAME_X_LEFT_FRINGE_WIDTH (f)); - - while (glyph < end - && x >= x0 + glyph->pixel_width) - { - x0 += glyph->pixel_width; - ++glyph; - } + int i; + HWND hwnd = FRAME_W32_WINDOW (SELECTED_FRAME ()); - if (glyph < end - && STRINGP (glyph->object) - && STRING_INTERVALS (glyph->object) - && glyph->charpos >= 0 - && glyph->charpos < SCHARS (glyph->object)) + for (i = 0; i < 5; i++) { - /* If we're on a string with `help-echo' text property, - arrange for the help to be displayed. This is done by - setting the global variable help_echo to the help string. */ - help = Fget_text_property (make_number (glyph->charpos), - Qhelp_echo, glyph->object); - if (!NILP (help)) - { - help_echo = help; - XSETWINDOW (help_echo_window, w); - help_echo_object = glyph->object; - help_echo_pos = glyph->charpos; - } - - /* Change the mouse pointer according to what is under X/Y. */ - map = Fget_text_property (make_number (glyph->charpos), - Qlocal_map, glyph->object); - if (KEYMAPP (map)) - cursor = f->output_data.w32->nontext_cursor; - else - { - map = Fget_text_property (make_number (glyph->charpos), - Qkeymap, glyph->object); - if (KEYMAPP (map)) - cursor = f->output_data.w32->nontext_cursor; - } + FlashWindow (hwnd, TRUE); + Sleep (10); } + FlashWindow (hwnd, FALSE); } -#if 0 /* TODO: mouse cursor */ - XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), cursor); -#endif + else + w32_sys_ring_bell (); + + UNBLOCK_INPUT; +} + + +/* Specify how many text lines, from the top of the window, + should be affected by insert-lines and delete-lines operations. + This, and those operations, are used only within an update + that is bounded by calls to x_update_begin and x_update_end. */ + +static void +w32_set_terminal_window (n) + register int n; +{ + /* This function intentionally left blank. */ } + +/*********************************************************************** + Line Dance + ***********************************************************************/ -/* Take proper action when the mouse has moved to position X, Y on - frame F as regards highlighting characters that have mouse-face - properties. Also de-highlighting chars where the mouse was before. - X and Y can be negative or out of range. */ +/* Perform an insert-lines or delete-lines operation, inserting N + lines or deleting -N lines at vertical position VPOS. */ static void -note_mouse_highlight (f, x, y) - struct frame *f; - int x, y; +x_ins_del_lines (vpos, n) + int vpos, n; { - struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); - int portion; - Lisp_Object window; - struct window *w; - struct buffer *b; - - /* When a menu is active, don't highlight because this looks odd. */ - if (popup_activated ()) - return; - - if (NILP (Vmouse_highlight) - || !f->glyphs_initialized_p) - return; + struct frame *f; - dpyinfo->mouse_face_mouse_x = x; - dpyinfo->mouse_face_mouse_y = y; - dpyinfo->mouse_face_mouse_frame = f; + if (updating_frame) + f = updating_frame; + else + f = SELECTED_FRAME (); - if (dpyinfo->mouse_face_defer) + if (! FRAME_W32_P (f)) return; - if (gc_in_progress) - { - dpyinfo->mouse_face_deferred_gc = 1; - return; - } - - /* Which window is that in? */ - window = window_from_coordinates (f, x, y, &portion, 1); + abort (); +} - /* If we were displaying active text in another window, clear that. */ - if (! EQ (window, dpyinfo->mouse_face_window)) - clear_mouse_face (dpyinfo); - /* Not on a window -> return. */ - if (!WINDOWP (window)) - return; +/* Scroll part of the display as described by RUN. */ - /* Reset help_echo. It will get recomputed below. */ - help_echo = Qnil; +static void +x_scroll_run (w, run) + struct window *w; + struct run *run; +{ + struct frame *f = XFRAME (w->frame); + int x, y, width, height, from_y, to_y, bottom_y; + HWND hwnd = FRAME_W32_WINDOW (f); + HRGN expect_dirty; - /* Convert to window-relative pixel coordinates. */ - w = XWINDOW (window); - frame_to_window_pixel_xy (w, &x, &y); + /* Get frame-relative bounding box of the text display area of W, + without mode lines. Include in this box the left and right + fringes of W. */ + window_box (w, -1, &x, &y, &width, &height); - /* Handle tool-bar window differently since it doesn't display a - buffer. */ - if (EQ (window, f->tool_bar_window)) - { - note_tool_bar_highlight (f, x, y); - return; - } + from_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->current_y); + to_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->desired_y); + bottom_y = y + height; - /* Mouse is on the mode or header line? */ - if (portion == 1 || portion == 3) + if (to_y < from_y) { - note_mode_line_highlight (w, x, portion == 1); - return; + /* Scrolling up. Make sure we don't copy part of the mode + line at the bottom. */ + if (from_y + run->height > bottom_y) + height = bottom_y - from_y; + else + height = run->height; + expect_dirty = CreateRectRgn (x, y + height, x + width, bottom_y); } -#if 0 /* TODO: mouse cursor */ - if (portion == 2) - cursor = f->output_data.x->horizontal_drag_cursor; else - cursor = f->output_data.x->text_cursor; -#endif - /* Are we in a window whose display is up to date? - And verify the buffer's text has not changed. */ - b = XBUFFER (w->buffer); - if (/* Within text portion of the window. */ - portion == 0 - && EQ (w->window_end_valid, w->buffer) - && XFASTINT (w->last_modified) == BUF_MODIFF (b) - && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b)) { - int hpos, vpos, pos, i, area; - struct glyph *glyph; - Lisp_Object object; - Lisp_Object mouse_face = Qnil, overlay = Qnil, position; - Lisp_Object *overlay_vec = NULL; - int len, noverlays; - struct buffer *obuf; - int obegv, ozv, same_region; - - /* Find the glyph under X/Y. */ - glyph = x_y_to_hpos_vpos (w, x, y, &hpos, &vpos, &area, 0); - - /* Clear mouse face if X/Y not over text. */ - if (glyph == NULL - || area != TEXT_AREA - || !MATRIX_ROW (w->current_matrix, vpos)->displays_text_p) - { - clear_mouse_face (dpyinfo); - /* TODO: mouse cursor */ - goto set_cursor; - } - - pos = glyph->charpos; - object = glyph->object; - if (!STRINGP (object) && !BUFFERP (object)) - goto set_cursor; - - /* If we get an out-of-range value, return now; avoid an error. */ - if (BUFFERP (object) && pos > BUF_Z (b)) - goto set_cursor; - - /* Make the window's buffer temporarily current for - overlays_at and compute_char_face. */ - obuf = current_buffer; - current_buffer = b; - obegv = BEGV; - ozv = ZV; - BEGV = BEG; - ZV = Z; - - /* Is this char mouse-active or does it have help-echo? */ - position = make_number (pos); - - if (BUFFERP (object)) - { - /* Put all the overlays we want in a vector in overlay_vec. - Store the length in len. If there are more than 10, make - enough space for all, and try again. */ - len = 10; - overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); - noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL, 0); - if (noverlays > len) - { - len = noverlays; - overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); - noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL,0); - } - - /* Sort overlays into increasing priority order. */ - noverlays = sort_overlays (overlay_vec, noverlays, w); - } + /* Scolling down. Make sure we don't copy over the mode line. + at the bottom. */ + if (to_y + run->height > bottom_y) + height = bottom_y - to_y; else - noverlays = 0; - - same_region = (EQ (window, dpyinfo->mouse_face_window) - && vpos >= dpyinfo->mouse_face_beg_row - && vpos <= dpyinfo->mouse_face_end_row - && (vpos > dpyinfo->mouse_face_beg_row - || hpos >= dpyinfo->mouse_face_beg_col) - && (vpos < dpyinfo->mouse_face_end_row - || hpos < dpyinfo->mouse_face_end_col - || dpyinfo->mouse_face_past_end)); - - /* TODO: if (same_region) - mouse cursor */ - - /* Check mouse-face highlighting. */ - if (! same_region - /* If there exists an overlay with mouse-face overlapping - the one we are currently highlighting, we have to - check if we enter the overlapping overlay, and then - highlight that. */ - || (OVERLAYP (dpyinfo->mouse_face_overlay) - && mouse_face_overlay_overlaps (dpyinfo->mouse_face_overlay))) - { - /* Find the highest priority overlay that has a mouse-face - property. */ - overlay = Qnil; - for (i = noverlays - 1; i >= 0 && NILP (overlay); --i) - { - mouse_face = Foverlay_get (overlay_vec[i], Qmouse_face); - if (!NILP (mouse_face)) - overlay = overlay_vec[i]; - } - - /* If we're actually highlighting the same overlay as - before, there's no need to do that again. */ - if (!NILP (overlay) - && EQ (overlay, dpyinfo->mouse_face_overlay)) - goto check_help_echo; - - dpyinfo->mouse_face_overlay = overlay; - - /* Clear the display of the old active region, if any. */ - clear_mouse_face (dpyinfo); - /* TODO: mouse cursor changes. */ - - /* If no overlay applies, get a text property. */ - if (NILP (overlay)) - mouse_face = Fget_text_property (position, Qmouse_face, object); - - /* Handle the overlay case. */ - if (!NILP (overlay)) - { - /* Find the range of text around this char that - should be active. */ - Lisp_Object before, after; - int ignore; - - before = Foverlay_start (overlay); - after = Foverlay_end (overlay); - /* Record this as the current active region. */ - fast_find_position (w, XFASTINT (before), - &dpyinfo->mouse_face_beg_col, - &dpyinfo->mouse_face_beg_row, - &dpyinfo->mouse_face_beg_x, - &dpyinfo->mouse_face_beg_y, Qnil); - - dpyinfo->mouse_face_past_end - = !fast_find_position (w, XFASTINT (after), - &dpyinfo->mouse_face_end_col, - &dpyinfo->mouse_face_end_row, - &dpyinfo->mouse_face_end_x, - &dpyinfo->mouse_face_end_y, Qnil); - dpyinfo->mouse_face_window = window; - - dpyinfo->mouse_face_face_id - = face_at_buffer_position (w, pos, 0, 0, - &ignore, pos + 1, - !dpyinfo->mouse_face_hidden); - - /* Display it as active. */ - show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); - /* TODO: mouse cursor changes. */ - } - /* Handle the text property case. */ - else if (! NILP (mouse_face) && BUFFERP (object)) - { - /* Find the range of text around this char that - should be active. */ - Lisp_Object before, after, beginning, end; - int ignore; - - beginning = Fmarker_position (w->start); - end = make_number (BUF_Z (XBUFFER (object)) - - XFASTINT (w->window_end_pos)); - before - = Fprevious_single_property_change (make_number (pos + 1), - Qmouse_face, - object, beginning); - after - = Fnext_single_property_change (position, Qmouse_face, - object, end); - - /* Record this as the current active region. */ - fast_find_position (w, XFASTINT (before), - &dpyinfo->mouse_face_beg_col, - &dpyinfo->mouse_face_beg_row, - &dpyinfo->mouse_face_beg_x, - &dpyinfo->mouse_face_beg_y, Qnil); - dpyinfo->mouse_face_past_end - = !fast_find_position (w, XFASTINT (after), - &dpyinfo->mouse_face_end_col, - &dpyinfo->mouse_face_end_row, - &dpyinfo->mouse_face_end_x, - &dpyinfo->mouse_face_end_y, Qnil); - dpyinfo->mouse_face_window = window; - - if (BUFFERP (object)) - dpyinfo->mouse_face_face_id - = face_at_buffer_position (w, pos, 0, 0, - &ignore, pos + 1, - !dpyinfo->mouse_face_hidden); - - /* Display it as active. */ - show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); - /* TODO: mouse cursor changes. */ - } - else if (!NILP (mouse_face) && STRINGP (object)) - { - Lisp_Object b, e; - int ignore; - - b = Fprevious_single_property_change (make_number (pos + 1), - Qmouse_face, - object, Qnil); - e = Fnext_single_property_change (position, Qmouse_face, - object, Qnil); - if (NILP (b)) - b = make_number (0); - if (NILP (e)) - e = make_number (SCHARS (object) - 1); - fast_find_string_pos (w, XINT (b), object, - &dpyinfo->mouse_face_beg_col, - &dpyinfo->mouse_face_beg_row, - &dpyinfo->mouse_face_beg_x, - &dpyinfo->mouse_face_beg_y, 0); - fast_find_string_pos (w, XINT (e), object, - &dpyinfo->mouse_face_end_col, - &dpyinfo->mouse_face_end_row, - &dpyinfo->mouse_face_end_x, - &dpyinfo->mouse_face_end_y, 1); - dpyinfo->mouse_face_past_end = 0; - dpyinfo->mouse_face_window = window; - dpyinfo->mouse_face_face_id - = face_at_string_position (w, object, pos, 0, 0, 0, &ignore, - glyph->face_id, 1); - show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); - /* TODO: mouse cursor changes. */ - } - else if (STRINGP (object) && NILP (mouse_face)) - { - /* A string which doesn't have mouse-face, but - the text ``under'' it might have. */ - struct glyph_row *r = MATRIX_ROW (w->current_matrix, vpos); - int start = MATRIX_ROW_START_CHARPOS (r); - - pos = string_buffer_position (w, object, start); - if (pos > 0) - mouse_face = get_char_property_and_overlay (make_number (pos), - Qmouse_face, - w->buffer, - &overlay); - if (!NILP (mouse_face) && !NILP (overlay)) - { - Lisp_Object before = Foverlay_start (overlay); - Lisp_Object after = Foverlay_end (overlay); - int ignore; - - /* Note that we might not be able to find position - BEFORE in the glyph matrix if the overlay is - entirely covered by a `display' property. In - this case, we overshoot. So let's stop in - the glyph matrix before glyphs for OBJECT. */ - fast_find_position (w, XFASTINT (before), - &dpyinfo->mouse_face_beg_col, - &dpyinfo->mouse_face_beg_row, - &dpyinfo->mouse_face_beg_x, - &dpyinfo->mouse_face_beg_y, - object); - - dpyinfo->mouse_face_past_end - = !fast_find_position (w, XFASTINT (after), - &dpyinfo->mouse_face_end_col, - &dpyinfo->mouse_face_end_row, - &dpyinfo->mouse_face_end_x, - &dpyinfo->mouse_face_end_y, - Qnil); - dpyinfo->mouse_face_window = window; - dpyinfo->mouse_face_face_id - = face_at_buffer_position (w, pos, 0, 0, - &ignore, pos + 1, - !dpyinfo->mouse_face_hidden); - - /* Display it as active. */ - show_mouse_face (dpyinfo, DRAW_MOUSE_FACE); - /* TODO: mouse cursor changes. */ - } - } - } + height = run->height; + expect_dirty = CreateRectRgn (x, y, x + width, to_y); + } - check_help_echo: + BLOCK_INPUT; - /* Look for a `help-echo' property. */ - { - Lisp_Object help, overlay; + /* Cursor off. Will be switched on again in x_update_window_end. */ + updated_window = w; + x_clear_cursor (w); - /* Check overlays first. */ - help = overlay = Qnil; - for (i = noverlays - 1; i >= 0 && NILP (help); --i) - { - overlay = overlay_vec[i]; - help = Foverlay_get (overlay, Qhelp_echo); - } + { + RECT from; + RECT to; + HRGN dirty = CreateRectRgn (0, 0, 0, 0); + HRGN combined = CreateRectRgn (0, 0, 0, 0); - if (!NILP (help)) - { - help_echo = help; - help_echo_window = window; - help_echo_object = overlay; - help_echo_pos = pos; - } - else - { - Lisp_Object object = glyph->object; - int charpos = glyph->charpos; + from.left = to.left = x; + from.right = to.right = x + width; + from.top = from_y; + from.bottom = from_y + height; + to.top = y; + to.bottom = bottom_y; - /* Try text properties. */ - if (STRINGP (object) - && charpos >= 0 - && charpos < SCHARS (object)) - { - help = Fget_text_property (make_number (charpos), - Qhelp_echo, object); - if (NILP (help)) - { - /* If the string itself doesn't specify a help-echo, - see if the buffer text ``under'' it does. */ - struct glyph_row *r - = MATRIX_ROW (w->current_matrix, vpos); - int start = MATRIX_ROW_START_CHARPOS (r); - int pos = string_buffer_position (w, object, start); - if (pos > 0) - { - help = Fget_char_property (make_number (pos), - Qhelp_echo, w->buffer); - if (!NILP (help)) - { - charpos = pos; - object = w->buffer; - } - } - } - } - else if (BUFFERP (object) - && charpos >= BEGV - && charpos < ZV) - help = Fget_text_property (make_number (charpos), Qhelp_echo, - object); + ScrollWindowEx (hwnd, 0, to_y - from_y, &from, &to, dirty, + NULL, SW_INVALIDATE); - if (!NILP (help)) - { - help_echo = help; - help_echo_window = window; - help_echo_object = object; - help_echo_pos = charpos; - } - } - } + /* Combine this with what we expect to be dirty. This covers the + case where not all of the region we expect is actually dirty. */ + CombineRgn (combined, dirty, expect_dirty, RGN_OR); - BEGV = obegv; - ZV = ozv; - current_buffer = obuf; - } + /* If the dirty region is not what we expected, redraw the entire frame. */ + if (!EqualRgn (combined, expect_dirty)) + SET_FRAME_GARBAGED (f); - set_cursor: - /* TODO: mouse cursor changes. */ - ; -} + DeleteObject (dirty); + DeleteObject (combined); + } -static void -redo_mouse_highlight () -{ - if (!NILP (last_mouse_motion_frame) - && FRAME_LIVE_P (XFRAME (last_mouse_motion_frame))) - note_mouse_highlight (XFRAME (last_mouse_motion_frame), - LOWORD (last_mouse_motion_event.lParam), - HIWORD (last_mouse_motion_event.lParam)); + UNBLOCK_INPUT; + DeleteObject (expect_dirty); } /*********************************************************************** - Tool-bars + Exposure Events ***********************************************************************/ -static int x_tool_bar_item P_ ((struct frame *, int, int, - struct glyph **, int *, int *, int *)); +static void +frame_highlight (f) + struct frame *f; +{ + x_update_cursor (f, 1); +} -/* Tool-bar item index of the item on which a mouse button was pressed - or -1. */ +static void +frame_unhighlight (f) + struct frame *f; +{ + x_update_cursor (f, 1); +} -static int last_tool_bar_item; +/* The focus has changed. Update the frames as necessary to reflect + the new situation. Note that we can't change the selected frame + here, because the Lisp code we are interrupting might become confused. + Each event gets marked with the frame in which it occurred, so the + Lisp code can tell when the switch took place by examining the events. */ +static void +x_new_focus_frame (dpyinfo, frame) + struct w32_display_info *dpyinfo; + struct frame *frame; +{ + struct frame *old_focus = dpyinfo->w32_focus_frame; -/* Get information about the tool-bar item at position X/Y on frame F. - Return in *GLYPH a pointer to the glyph of the tool-bar item in - the current matrix of the tool-bar window of F, or NULL if not - on a tool-bar item. Return in *PROP_IDX the index of the tool-bar - item in F->tool_bar_items. Value is + if (frame != dpyinfo->w32_focus_frame) + { + /* Set this before calling other routines, so that they see + the correct value of w32_focus_frame. */ + dpyinfo->w32_focus_frame = frame; - -1 if X/Y is not on a tool-bar item - 0 if X/Y is on the same item that was highlighted before. - 1 otherwise. */ + if (old_focus && old_focus->auto_lower) + x_lower_frame (old_focus); -static int -x_tool_bar_item (f, x, y, glyph, hpos, vpos, prop_idx) - struct frame *f; - int x, y; - struct glyph **glyph; - int *hpos, *vpos, *prop_idx; -{ - struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); - struct window *w = XWINDOW (f->tool_bar_window); - int area; - - /* Find the glyph under X/Y. */ - *glyph = x_y_to_hpos_vpos (w, x, y, hpos, vpos, &area, 0); - if (*glyph == NULL) - return -1; - - /* Get the start of this tool-bar item's properties in - f->tool_bar_items. */ - if (!tool_bar_item_info (f, *glyph, prop_idx)) - return -1; - - /* Is mouse on the highlighted item? */ - if (EQ (f->tool_bar_window, dpyinfo->mouse_face_window) - && *vpos >= dpyinfo->mouse_face_beg_row - && *vpos <= dpyinfo->mouse_face_end_row - && (*vpos > dpyinfo->mouse_face_beg_row - || *hpos >= dpyinfo->mouse_face_beg_col) - && (*vpos < dpyinfo->mouse_face_end_row - || *hpos < dpyinfo->mouse_face_end_col - || dpyinfo->mouse_face_past_end)) - return 0; + if (dpyinfo->w32_focus_frame && dpyinfo->w32_focus_frame->auto_raise) + pending_autoraise_frame = dpyinfo->w32_focus_frame; + else + pending_autoraise_frame = 0; + } - return 1; + x_frame_rehighlight (dpyinfo); } -/* Handle mouse button event on the tool-bar of frame F, at - frame-relative coordinates X/Y. EVENT_TYPE is either ButtionPress - or ButtonRelase. */ +/* Handle FocusIn and FocusOut state changes for FRAME. + If FRAME has focus and there exists more than one frame, puts + a FOCUS_IN_EVENT into *BUFP. */ static void -w32_handle_tool_bar_click (f, button_event) - struct frame *f; - struct input_event *button_event; +x_focus_changed (type, state, dpyinfo, frame, bufp) + int type; + int state; + struct w32_display_info *dpyinfo; + struct frame *frame; + struct input_event *bufp; { - struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); - struct window *w = XWINDOW (f->tool_bar_window); - int hpos, vpos, prop_idx; - struct glyph *glyph; - Lisp_Object enabled_p; - int x = XFASTINT (button_event->x); - int y = XFASTINT (button_event->y); - - /* If not on the highlighted tool-bar item, return. */ - frame_to_window_pixel_xy (w, &x, &y); - if (x_tool_bar_item (f, x, y, &glyph, &hpos, &vpos, &prop_idx) != 0) - return; + if (type == WM_SETFOCUS) + { + if (dpyinfo->w32_focus_event_frame != frame) + { + x_new_focus_frame (dpyinfo, frame); + dpyinfo->w32_focus_event_frame = frame; + + /* Don't stop displaying the initial startup message + for a switch-frame event we don't need. */ + if (GC_NILP (Vterminal_frame) + && GC_CONSP (Vframe_list) + && !GC_NILP (XCDR (Vframe_list))) + { + bufp->kind = FOCUS_IN_EVENT; + XSETFRAME (bufp->frame_or_window, frame); + } + } - /* If item is disabled, do nothing. */ - enabled_p = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_ENABLED_P); - if (NILP (enabled_p)) - return; + frame->output_data.x->focus_state |= state; - if (button_event->modifiers & down_modifier) - { - /* Show item in pressed state. */ - show_mouse_face (dpyinfo, DRAW_IMAGE_SUNKEN); - dpyinfo->mouse_face_image_state = DRAW_IMAGE_SUNKEN; - last_tool_bar_item = prop_idx; + /* TODO: IME focus? */ } - else + else if (type == WM_KILLFOCUS) { - Lisp_Object key, frame; - struct input_event event; - - /* Show item in released state. */ - show_mouse_face (dpyinfo, DRAW_IMAGE_RAISED); - dpyinfo->mouse_face_image_state = DRAW_IMAGE_RAISED; - - key = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_KEY); - - XSETFRAME (frame, f); - event.kind = TOOL_BAR_EVENT; - event.frame_or_window = frame; - event.arg = frame; - kbd_buffer_store_event (&event); - - event.kind = TOOL_BAR_EVENT; - event.frame_or_window = frame; - event.arg = key; - /* The keyboard buffer doesn't like the up modifier being set. */ - event.modifiers = button_event->modifiers & ~up_modifier; - kbd_buffer_store_event (&event); - last_tool_bar_item = -1; + frame->output_data.x->focus_state &= ~state; + + if (dpyinfo->w32_focus_event_frame == frame) + { + dpyinfo->w32_focus_event_frame = 0; + x_new_focus_frame (dpyinfo, 0); + } + + /* TODO: IME focus? */ } } -/* Possibly highlight a tool-bar item on frame F when mouse moves to - tool-bar window-relative coordinates X/Y. Called from - note_mouse_highlight. */ +/* The focus may have changed. Figure out if it is a real focus change, + by checking both FocusIn/Out and Enter/LeaveNotify events. + + Returns FOCUS_IN_EVENT event in *BUFP. */ static void -note_tool_bar_highlight (f, x, y) - struct frame *f; - int x, y; +w32_detect_focus_change (dpyinfo, event, bufp) + struct w32_display_info *dpyinfo; + W32Msg *event; + struct input_event *bufp; { - Lisp_Object window = f->tool_bar_window; - struct window *w = XWINDOW (window); - struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); - int hpos, vpos; - struct glyph *glyph; - struct glyph_row *row; - int i; - Lisp_Object enabled_p; - int prop_idx; - enum draw_glyphs_face draw = DRAW_IMAGE_RAISED; - int mouse_down_p, rc; - - /* Function note_mouse_highlight is called with negative x(y - values when mouse moves outside of the frame. */ - if (x <= 0 || y <= 0) - { - clear_mouse_face (dpyinfo); - return; - } + struct frame *frame; - rc = x_tool_bar_item (f, x, y, &glyph, &hpos, &vpos, &prop_idx); - if (rc < 0) - { - /* Not on tool-bar item. */ - clear_mouse_face (dpyinfo); - return; - } - else if (rc == 0) - /* On same tool-bar item as before. */ - goto set_help_echo; - - clear_mouse_face (dpyinfo); - - /* Mouse is down, but on different tool-bar item? */ - mouse_down_p = (dpyinfo->grabbed - && f == last_mouse_frame - && FRAME_LIVE_P (f)); - if (mouse_down_p - && last_tool_bar_item != prop_idx) + frame = x_any_window_to_frame (dpyinfo, event->msg.hwnd); + if (! frame) return; - dpyinfo->mouse_face_image_state = DRAW_NORMAL_TEXT; - draw = mouse_down_p ? DRAW_IMAGE_SUNKEN : DRAW_IMAGE_RAISED; + /* 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); +} - /* If tool-bar item is not enabled, don't highlight it. */ - enabled_p = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_ENABLED_P); - if (!NILP (enabled_p)) - { - /* Compute the x-position of the glyph. In front and past the - image is a space. We include this is the highlighted area. */ - row = MATRIX_ROW (w->current_matrix, vpos); - for (i = x = 0; i < hpos; ++i) - x += row->glyphs[TEXT_AREA][i].pixel_width; - - /* Record this as the current active region. */ - dpyinfo->mouse_face_beg_col = hpos; - dpyinfo->mouse_face_beg_row = vpos; - dpyinfo->mouse_face_beg_x = x; - dpyinfo->mouse_face_beg_y = row->y; - dpyinfo->mouse_face_past_end = 0; - - dpyinfo->mouse_face_end_col = hpos + 1; - dpyinfo->mouse_face_end_row = vpos; - dpyinfo->mouse_face_end_x = x + glyph->pixel_width; - dpyinfo->mouse_face_end_y = row->y; - dpyinfo->mouse_face_window = window; - dpyinfo->mouse_face_face_id = TOOL_BAR_FACE_ID; - - /* Display it as active. */ - show_mouse_face (dpyinfo, draw); - dpyinfo->mouse_face_image_state = draw; - } - set_help_echo: +/* Handle an event saying the mouse has moved out of an Emacs frame. */ - /* Set help_echo to a help string.to display for this tool-bar item. - w32_read_socket does the rest. */ - help_echo_object = help_echo_window = Qnil; - help_echo_pos = -1; - help_echo = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_HELP); - if (NILP (help_echo)) - help_echo = AREF (f->tool_bar_items, prop_idx + TOOL_BAR_ITEM_CAPTION); +void +x_mouse_leave (dpyinfo) + struct w32_display_info *dpyinfo; +{ + x_new_focus_frame (dpyinfo, dpyinfo->w32_focus_event_frame); } +/* The focus has changed, or we have redirected a frame's focus to + another frame (this happens when a frame uses a surrogate + mini-buffer frame). Shift the highlight as appropriate. - -/* Find the glyph matrix position of buffer position CHARPOS in window - *W. HPOS, *VPOS, *X, and *Y are set to the positions found. W's - current glyphs must be up to date. If CHARPOS is above window - start return (0, 0, 0, 0). If CHARPOS is after end of W, return end - of last line in W. In the row containing CHARPOS, stop before glyphs - having STOP as object. */ - -#if 0 /* This is a version of fast_find_position that's more correct - in the presence of hscrolling, for example. I didn't install - it right away because the problem fixed is minor, it failed - in 20.x as well, and I think it's too risky to install - so near the release of 21.1. 2001-09-25 gerd. */ + The FRAME argument doesn't necessarily have anything to do with which + frame is being highlighted or un-highlighted; we only use it to find + the appropriate X display info. */ -static int -fast_find_position (w, charpos, hpos, vpos, x, y, stop) - struct window *w; - int charpos; - int *hpos, *vpos, *x, *y; - Lisp_Object stop; +static void +w32_frame_rehighlight (frame) + struct frame *frame; +{ + if (! FRAME_W32_P (frame)) + return; + x_frame_rehighlight (FRAME_W32_DISPLAY_INFO (frame)); +} + +static void +x_frame_rehighlight (dpyinfo) + struct w32_display_info *dpyinfo; { - struct glyph_row *row, *first; - struct glyph *glyph, *end; - int i, past_end = 0; + struct frame *old_highlight = dpyinfo->x_highlight_frame; - first = MATRIX_FIRST_TEXT_ROW (w->current_matrix); - row = row_containing_pos (w, charpos, first, NULL, 0); - if (row == NULL) + if (dpyinfo->w32_focus_frame) { - if (charpos < MATRIX_ROW_START_CHARPOS (first)) - { - *x = *y = *hpos = *vpos = 0; - return 0; - } - else + dpyinfo->x_highlight_frame + = ((GC_FRAMEP (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame))) + ? XFRAME (FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame)) + : dpyinfo->w32_focus_frame); + if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame)) { - row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos)); - past_end = 1; + FRAME_FOCUS_FRAME (dpyinfo->w32_focus_frame) = Qnil; + dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame; } } + else + dpyinfo->x_highlight_frame = 0; - *x = row->x; - *y = row->y; - *vpos = MATRIX_ROW_VPOS (row, w->current_matrix); - - glyph = row->glyphs[TEXT_AREA]; - end = glyph + row->used[TEXT_AREA]; - - /* Skip over glyphs not having an object at the start of the row. - These are special glyphs like truncation marks on terminal - frames. */ - if (row->displays_text_p) - while (glyph < end - && INTEGERP (glyph->object) - && !EQ (stop, glyph->object) - && glyph->charpos < 0) - { - *x += glyph->pixel_width; - ++glyph; - } - - while (glyph < end - && !INTEGERP (glyph->object) - && !EQ (stop, glyph->object) - && (!BUFFERP (glyph->object) - || glyph->charpos < charpos)) + if (dpyinfo->x_highlight_frame != old_highlight) { - *x += glyph->pixel_width; - ++glyph; + if (old_highlight) + frame_unhighlight (old_highlight); + if (dpyinfo->x_highlight_frame) + frame_highlight (dpyinfo->x_highlight_frame); } - - *hpos = glyph - row->glyphs[TEXT_AREA]; - return past_end; } + +/* Keyboard processing - modifier keys, etc. */ -#else /* not 0 */ +/* Convert a keysym to its name. */ -static int -fast_find_position (w, pos, hpos, vpos, x, y, stop) - struct window *w; - int pos; - int *hpos, *vpos, *x, *y; - Lisp_Object stop; +char * +x_get_keysym_name (keysym) + int keysym; { - int i; - int lastcol; - int maybe_next_line_p = 0; - int line_start_position; - int yb = window_text_bottom_y (w); - struct glyph_row *row, *best_row; - int row_vpos, best_row_vpos; - int current_x; - - row = best_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix); - row_vpos = best_row_vpos = MATRIX_ROW_VPOS (row, w->current_matrix); - - while (row->y < yb) - { - if (row->used[TEXT_AREA]) - line_start_position = row->glyphs[TEXT_AREA]->charpos; - else - line_start_position = 0; - - if (line_start_position > pos) - break; - /* If the position sought is the end of the buffer, - don't include the blank lines at the bottom of the window. */ - else if (line_start_position == pos - && pos == BUF_ZV (XBUFFER (w->buffer))) - { - maybe_next_line_p = 1; - break; - } - else if (line_start_position > 0) - { - best_row = row; - best_row_vpos = row_vpos; - } + /* Make static so we can always return it */ + static char value[100]; - if (row->y + row->height >= yb) - break; + BLOCK_INPUT; + GetKeyNameText (keysym, value, 100); + UNBLOCK_INPUT; - ++row; - ++row_vpos; - } + return value; +} - /* Find the right column within BEST_ROW. */ - lastcol = 0; - current_x = best_row->x; - for (i = 0; i < best_row->used[TEXT_AREA]; i++) - { - struct glyph *glyph = best_row->glyphs[TEXT_AREA] + i; - int charpos = glyph->charpos; - if (BUFFERP (glyph->object)) - { - if (charpos == pos) - { - *hpos = i; - *vpos = best_row_vpos; - *x = current_x; - *y = best_row->y; - return 1; - } - else if (charpos > pos) - break; - } - else if (EQ (glyph->object, stop)) - break; + +/* Mouse clicks and mouse movement. Rah. */ - if (charpos > 0) - lastcol = i; - current_x += glyph->pixel_width; - } +/* Parse a button MESSAGE. The button index is returned in PBUTTON, and + the state in PUP. XBUTTON provides extra information for extended mouse + button messages. Returns FALSE if unable to parse the message. */ +BOOL +parse_button (message, xbutton, pbutton, pup) + int message; + int xbutton; + int * pbutton; + int * pup; +{ + int button = 0; + int up = 0; - /* If we're looking for the end of the buffer, - and we didn't find it in the line we scanned, - use the start of the following line. */ - if (maybe_next_line_p) + switch (message) { - ++best_row; - ++best_row_vpos; - lastcol = 0; - current_x = best_row->x; + case WM_LBUTTONDOWN: + button = 0; + up = 0; + break; + case WM_LBUTTONUP: + button = 0; + up = 1; + break; + case WM_MBUTTONDOWN: + if (NILP (Vw32_swap_mouse_buttons)) + button = 1; + else + button = 2; + up = 0; + break; + case WM_MBUTTONUP: + if (NILP (Vw32_swap_mouse_buttons)) + button = 1; + else + button = 2; + up = 1; + break; + case WM_RBUTTONDOWN: + if (NILP (Vw32_swap_mouse_buttons)) + button = 2; + else + button = 1; + up = 0; + break; + case WM_RBUTTONUP: + if (NILP (Vw32_swap_mouse_buttons)) + button = 2; + else + button = 1; + up = 1; + break; + case WM_XBUTTONDOWN: + button = xbutton + 2; + up = 0; + break; + case WM_XBUTTONUP: + button = xbutton + 2; + up = 1; + break; + default: + return (FALSE); } - *vpos = best_row_vpos; - *hpos = lastcol + 1; - *x = current_x; - *y = best_row->y; - return 0; -} - -#endif /* not 0 */ - - -/* Find the position of the glyph for position POS in OBJECT in - window W's current matrix, and return in *X/*Y the pixel - coordinates, and return in *HPOS/*VPOS the column/row of the glyph. - - RIGHT_P non-zero means return the position of the right edge of the - glyph, RIGHT_P zero means return the left edge position. - - If no glyph for POS exists in the matrix, return the position of - the glyph with the next smaller position that is in the matrix, if - RIGHT_P is zero. If RIGHT_P is non-zero, and no glyph for POS - exists in the matrix, return the position of the glyph with the - next larger position in OBJECT. + if (pup) *pup = up; + if (pbutton) *pbutton = button; - Value is non-zero if a glyph was found. */ + return (TRUE); +} -static int -fast_find_string_pos (w, pos, object, hpos, vpos, x, y, right_p) - struct window *w; - int pos; - Lisp_Object object; - int *hpos, *vpos, *x, *y; - int right_p; -{ - int yb = window_text_bottom_y (w); - struct glyph_row *r; - struct glyph *best_glyph = NULL; - struct glyph_row *best_row = NULL; - int best_x = 0; - - for (r = MATRIX_FIRST_TEXT_ROW (w->current_matrix); - r->enabled_p && r->y < yb; - ++r) - { - struct glyph *g = r->glyphs[TEXT_AREA]; - struct glyph *e = g + r->used[TEXT_AREA]; - int gx; - for (gx = r->x; g < e; gx += g->pixel_width, ++g) - if (EQ (g->object, object)) - { - if (g->charpos == pos) - { - best_glyph = g; - best_x = gx; - best_row = r; - goto found; - } - else if (best_glyph == NULL - || ((abs (g->charpos - pos) - < abs (best_glyph->charpos - pos)) - && (right_p - ? g->charpos < pos - : g->charpos > pos))) - { - best_glyph = g; - best_x = gx; - best_row = r; - } - } - } +/* Prepare a mouse-event in *RESULT for placement in the input queue. - found: + If the event is a button press, then note that we have grabbed + the mouse. */ - if (best_glyph) - { - *x = best_x; - *hpos = best_glyph - best_row->glyphs[TEXT_AREA]; +static Lisp_Object +construct_mouse_click (result, msg, f) + struct input_event *result; + W32Msg *msg; + struct frame *f; +{ + int button; + int up; - if (right_p) - { - *x += best_glyph->pixel_width; - ++*hpos; - } + parse_button (msg->msg.message, HIWORD (msg->msg.wParam), + &button, &up); - *y = best_row->y; - *vpos = best_row - w->current_matrix->rows; - } + /* Make the event type NO_EVENT; we'll change that when we decide + otherwise. */ + result->kind = MOUSE_CLICK_EVENT; + result->code = button; + result->timestamp = msg->msg.time; + result->modifiers = (msg->dwModifiers + | (up + ? up_modifier + : down_modifier)); - return best_glyph != NULL; + XSETINT (result->x, LOWORD (msg->msg.lParam)); + XSETINT (result->y, HIWORD (msg->msg.lParam)); + XSETFRAME (result->frame_or_window, f); + result->arg = Qnil; + return Qnil; } - -/* Display the active region described by mouse_face_* - in its mouse-face if HL > 0, in its normal face if HL = 0. */ - -static void -show_mouse_face (dpyinfo, draw) - struct w32_display_info *dpyinfo; - enum draw_glyphs_face draw; +static Lisp_Object +construct_mouse_wheel (result, msg, f) + struct input_event *result; + W32Msg *msg; + struct frame *f; { - struct window *w = XWINDOW (dpyinfo->mouse_face_window); - struct frame *f = XFRAME (WINDOW_FRAME (w)); - - if (/* If window is in the process of being destroyed, don't bother - to do anything. */ - w->current_matrix != NULL - /* Don't update mouse highlight if hidden */ - && (draw != DRAW_MOUSE_FACE || !dpyinfo->mouse_face_hidden) - /* Recognize when we are called to operate on rows that don't exist - anymore. This can happen when a window is split. */ - && dpyinfo->mouse_face_end_row < w->current_matrix->nrows) - { - int phys_cursor_on_p = w->phys_cursor_on_p; - struct glyph_row *row, *first, *last; + POINT p; + int delta; - first = MATRIX_ROW (w->current_matrix, dpyinfo->mouse_face_beg_row); - last = MATRIX_ROW (w->current_matrix, dpyinfo->mouse_face_end_row); + result->kind = WHEEL_EVENT; + result->code = 0; + result->timestamp = msg->msg.time; - for (row = first; row <= last && row->enabled_p; ++row) - { - int start_hpos, end_hpos, start_x; + /* A WHEEL_DELTA positive value indicates that the wheel was rotated + forward, away from the user (up); a negative value indicates that + the wheel was rotated backward, toward the user (down). */ + delta = GET_WHEEL_DELTA_WPARAM (msg->msg.wParam); - /* For all but the first row, the highlight starts at column 0. */ - if (row == first) - { - start_hpos = dpyinfo->mouse_face_beg_col; - start_x = dpyinfo->mouse_face_beg_x; - } - else - { - start_hpos = 0; - start_x = 0; - } + /* The up and down modifiers indicate if the wheel was rotated up or + down based on WHEEL_DELTA value. */ + result->modifiers = (msg->dwModifiers + | ((delta < 0 ) ? down_modifier : up_modifier)); - if (row == last) - end_hpos = dpyinfo->mouse_face_end_col; - else - end_hpos = row->used[TEXT_AREA]; + p.x = LOWORD (msg->msg.lParam); + p.y = HIWORD (msg->msg.lParam); + ScreenToClient (msg->msg.hwnd, &p); + XSETINT (result->x, p.x); + XSETINT (result->y, p.y); + XSETFRAME (result->frame_or_window, f); + result->arg = Qnil; + return Qnil; +} - if (end_hpos > start_hpos) - { - x_draw_glyphs (w, start_x, row, TEXT_AREA, - start_hpos, end_hpos, draw, 0); +static Lisp_Object +construct_drag_n_drop (result, msg, f) + struct input_event *result; + W32Msg *msg; + struct frame *f; +{ + Lisp_Object files; + Lisp_Object frame; + HDROP hdrop; + POINT p; + WORD num_files; + char *name; + int i, len; - row->mouse_face_p - = draw == DRAW_MOUSE_FACE || draw == DRAW_IMAGE_RAISED; - } - } + result->kind = DRAG_N_DROP_EVENT; + result->code = 0; + result->timestamp = msg->msg.time; + result->modifiers = msg->dwModifiers; - /* When we've written over the cursor, arrange for it to - be displayed again. */ - if (phys_cursor_on_p && !w->phys_cursor_on_p) - x_display_cursor (w, 1, - w->phys_cursor.hpos, w->phys_cursor.vpos, - w->phys_cursor.x, w->phys_cursor.y); - } + hdrop = (HDROP) msg->msg.wParam; + DragQueryPoint (hdrop, &p); -#if 0 /* TODO: mouse cursor */ - /* Change the mouse cursor. */ - if (draw == DRAW_NORMAL_TEXT) - XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - f->output_data.x->text_cursor); - else if (draw == DRAW_MOUSE_FACE) - XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - f->output_data.x->cross_cursor); - else - XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), - f->output_data.x->nontext_cursor); +#if 0 + p.x = LOWORD (msg->msg.lParam); + p.y = HIWORD (msg->msg.lParam); + ScreenToClient (msg->msg.hwnd, &p); #endif -} -/* Clear out the mouse-highlighted active region. - Redraw it un-highlighted first. */ + XSETINT (result->x, p.x); + XSETINT (result->y, p.y); -static int -clear_mouse_face (dpyinfo) - struct w32_display_info *dpyinfo; -{ - int cleared = 0; + num_files = DragQueryFile (hdrop, 0xFFFFFFFF, NULL, 0); + files = Qnil; - if (! NILP (dpyinfo->mouse_face_window)) + for (i = 0; i < num_files; i++) { - show_mouse_face (dpyinfo, DRAW_NORMAL_TEXT); - cleared = 1; + len = DragQueryFile (hdrop, i, NULL, 0); + if (len <= 0) + continue; + name = alloca (len + 1); + DragQueryFile (hdrop, i, name, len + 1); + files = Fcons (DECODE_FILE (build_string (name)), files); } - dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1; - dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1; - dpyinfo->mouse_face_window = Qnil; - dpyinfo->mouse_face_overlay = Qnil; - return cleared; + DragFinish (hdrop); + + XSETFRAME (frame, f); + result->frame_or_window = Fcons (frame, files); + result->arg = Qnil; + return Qnil; } + +/* Function to report a mouse movement to the mainstream Emacs code. + The input handler calls this. + + We have received a mouse movement event, which is given in *event. + If the mouse is over a different glyph than it was last time, tell + the mainstream emacs code by setting mouse_moved. If not, ask for + another motion event, so we can check again the next time it moves. */ -/* Clear any mouse-face on window W. This function is part of the - redisplay interface, and is called from try_window_id and similar - functions to ensure the mouse-highlight is off. */ +static MSG last_mouse_motion_event; +static Lisp_Object last_mouse_motion_frame; static void -x_clear_mouse_face (w) - struct window *w; +note_mouse_movement (frame, msg) + FRAME_PTR frame; + MSG *msg; { - struct w32_display_info *dpyinfo - = FRAME_W32_DISPLAY_INFO (XFRAME (w->frame)); - Lisp_Object window; - - BLOCK_INPUT; - XSETWINDOW (window, w); - if (EQ (window, dpyinfo->mouse_face_window)) - clear_mouse_face (dpyinfo); - UNBLOCK_INPUT; -} - + int mouse_x = LOWORD (msg->lParam); + int mouse_y = HIWORD (msg->lParam); -/* Just discard the mouse face information for frame F, if any. - This is used when the size of F is changed. */ + last_mouse_movement_time = msg->time; + memcpy (&last_mouse_motion_event, msg, sizeof (last_mouse_motion_event)); + XSETFRAME (last_mouse_motion_frame, frame); -void -cancel_mouse_face (f) - FRAME_PTR f; -{ - Lisp_Object window; - struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); + if (msg->hwnd != FRAME_W32_WINDOW (frame)) + { + frame->mouse_moved = 1; + last_mouse_scroll_bar = Qnil; + note_mouse_highlight (frame, -1, -1); + } - window = dpyinfo->mouse_face_window; - if (! NILP (window) && XFRAME (XWINDOW (window)->frame) == f) + /* Has the mouse moved off the glyph it was on at the last sighting? */ + else if (mouse_x < last_mouse_glyph.left + || mouse_x >= last_mouse_glyph.right + || mouse_y < last_mouse_glyph.top + || mouse_y >= last_mouse_glyph.bottom) { - dpyinfo->mouse_face_beg_row = dpyinfo->mouse_face_beg_col = -1; - dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_end_col = -1; - dpyinfo->mouse_face_window = Qnil; + frame->mouse_moved = 1; + last_mouse_scroll_bar = Qnil; + note_mouse_highlight (frame, mouse_x, mouse_y); + /* Remember the mouse position here, as w32_mouse_position only + gets called when mouse tracking is enabled but we also need + to keep track of the mouse for help_echo and highlighting at + other times. */ + remember_mouse_glyph (frame, mouse_x, mouse_y, &last_mouse_glyph); } } + +/************************************************************************ + Mouse Face + ************************************************************************/ + static struct scroll_bar *x_window_to_scroll_bar (); static void x_scroll_bar_report_motion (); static void x_check_fullscreen P_ ((struct frame *)); -static void x_check_fullscreen_move P_ ((struct frame *)); -static int glyph_rect P_ ((struct frame *f, int, int, RECT *)); - -/* Try to determine frame pixel position and size of the glyph under - frame pixel coordinates X/Y on frame F . Return the position and - size in *RECT. Value is non-zero if we could compute these - values. */ - -static int -glyph_rect (f, x, y, rect) - struct frame *f; - int x, y; - RECT *rect; +static void +redo_mouse_highlight () { - Lisp_Object window; - int part; - - window = window_from_coordinates (f, x, y, &part, 0); - if (!NILP (window)) - { - struct window *w = XWINDOW (window); - struct glyph_row *r = MATRIX_FIRST_TEXT_ROW (w->current_matrix); - struct glyph_row *end = r + w->current_matrix->nrows - 1; - - frame_to_window_pixel_xy (w, &x, &y); - - for (; r < end && r->enabled_p; ++r) - if (r->y <= y && r->y + r->height > y) - { - /* Found the row at y. */ - struct glyph *g = r->glyphs[TEXT_AREA]; - struct glyph *end = g + r->used[TEXT_AREA]; - int gx; - - rect->top = WINDOW_TO_FRAME_PIXEL_Y (w, r->y); - rect->bottom = rect->top + r->height; - - if (x < r->x) - { - /* x is to the left of the first glyph in the row. */ - rect->left = XINT (w->left); - rect->right = WINDOW_TO_FRAME_PIXEL_X (w, r->x); - return 1; - } - - for (gx = r->x; g < end; gx += g->pixel_width, ++g) - if (gx <= x && gx + g->pixel_width > x) - { - /* x is on a glyph. */ - rect->left = WINDOW_TO_FRAME_PIXEL_X (w, gx); - rect->right = rect->left + g->pixel_width; - return 1; - } - - /* x is to the right of the last glyph in the row. */ - rect->left = WINDOW_TO_FRAME_PIXEL_X (w, gx); - rect->right = XINT (w->left) + XINT (w->width); - return 1; - } - } - - /* The y is not on any row. */ - return 0; + if (!NILP (last_mouse_motion_frame) + && FRAME_LIVE_P (XFRAME (last_mouse_motion_frame))) + note_mouse_highlight (XFRAME (last_mouse_motion_frame), + LOWORD (last_mouse_motion_event.lParam), + HIWORD (last_mouse_motion_event.lParam)); } -/* Record the position of the mouse in last_mouse_glyph. */ -static void -remember_mouse_glyph (f1, gx, gy) - struct frame * f1; - int gx, gy; +void +w32_define_cursor (window, cursor) + Window window; + Cursor cursor; { - if (!glyph_rect (f1, gx, gy, &last_mouse_glyph)) - { - int width = FRAME_SMALLEST_CHAR_WIDTH (f1); - int height = FRAME_SMALLEST_FONT_HEIGHT (f1); - - /* Arrange for the division in PIXEL_TO_CHAR_COL etc. to - round down even for negative values. */ - if (gx < 0) - gx -= width - 1; - if (gy < 0) - gy -= height - 1; -#if 0 - /* This was the original code from XTmouse_position, but it seems - to give the position of the glyph diagonally next to the one - the mouse is over. */ - gx = (gx + width - 1) / width * width; - gy = (gy + height - 1) / height * height; -#else - gx = gx / width * width; - gy = gy / height * height; -#endif - - last_mouse_glyph.left = gx; - last_mouse_glyph.top = gy; - last_mouse_glyph.right = gx + width; - last_mouse_glyph.bottom = gy + height; - } + PostMessage (window, WM_EMACS_SETCURSOR, (WPARAM) cursor, 0); } - /* Return the current position of the mouse. *fp should be a frame which indicates which display to ask about. @@ -7839,7 +3368,7 @@ w32_mouse_position (fp, insist, bar_window, part, x, y, time) || insist); #else ScreenToClient (FRAME_W32_WINDOW (f1), &pt); - remember_mouse_glyph (f1, pt.x, pt.y); + remember_mouse_glyph (f1, pt.x, pt.y, &last_mouse_glyph); #endif *bar_window = Qnil; @@ -7856,6 +3385,35 @@ w32_mouse_position (fp, insist, bar_window, part, x, y, time) } +/*********************************************************************** + Tool-bars + ***********************************************************************/ + +/* Handle mouse button event on the tool-bar of frame F, at + frame-relative coordinates X/Y. EVENT_TYPE is either ButtionPress + or ButtonRelase. */ + +static void +w32_handle_tool_bar_click (f, button_event) + struct frame *f; + struct input_event *button_event; +{ + int x = XFASTINT (button_event->x); + int y = XFASTINT (button_event->y); + + if (button_event->modifiers & down_modifier) + handle_tool_bar_click (f, x, y, 1, 0); + else + handle_tool_bar_click (f, x, y, 0, + button_event->modifiers & ~up_modifier); +} + + + +/*********************************************************************** + Scroll bars + ***********************************************************************/ + /* Scroll bar support. */ /* Given a window ID, find the struct scroll_bar which manages it. @@ -7973,7 +3531,7 @@ my_create_scrollbar (f, bar) /*#define ATTACH_THREADS*/ -BOOL +static BOOL my_show_window (FRAME_PTR f, HWND hwnd, int how) { #ifndef ATTACH_THREADS @@ -7984,7 +3542,7 @@ my_show_window (FRAME_PTR f, HWND hwnd, int how) #endif } -void +static void my_set_window_pos (HWND hwnd, HWND hwndAfter, int x, int y, int cx, int cy, UINT flags) { @@ -8002,7 +3560,7 @@ my_set_window_pos (HWND hwnd, HWND hwndAfter, #endif } -void +static void my_set_focus (f, hwnd) struct frame * f; HWND hwnd; @@ -8011,14 +3569,15 @@ my_set_focus (f, hwnd) (WPARAM) hwnd, 0); } -void +static void my_set_foreground_window (hwnd) HWND hwnd; { SendMessage (hwnd, WM_EMACS_SETFOREGROUND, (WPARAM) hwnd, 0); } -void + +static void my_destroy_window (f, hwnd) struct frame * f; HWND hwnd; @@ -8125,31 +3684,26 @@ w32_set_vertical_scroll_bar (w, portion, whole, position) struct frame *f = XFRAME (w->frame); struct scroll_bar *bar; int top, height, left, sb_left, width, sb_width; - int window_x, window_y, window_width, window_height; + int window_y, window_height; /* Get window dimensions. */ - window_box (w, -1, &window_x, &window_y, &window_width, &window_height); + window_box (w, -1, 0, &window_y, 0, &window_height); top = window_y; - width = FRAME_SCROLL_BAR_COLS (f) * CANON_X_UNIT (f); + width = WINDOW_CONFIG_SCROLL_BAR_COLS (w) * FRAME_COLUMN_WIDTH (f); height = window_height; /* Compute the left edge of the scroll bar area. */ - if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) - left = XINT (w->left) + XINT (w->width) - FRAME_SCROLL_BAR_COLS (f); - else - left = XFASTINT (w->left); - left *= CANON_X_UNIT (f); - left += FRAME_INTERNAL_BORDER_WIDTH (f); + left = WINDOW_SCROLL_BAR_AREA_X (w); /* Compute the width of the scroll bar which might be less than the width of the area reserved for the scroll bar. */ - if (FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0) - sb_width = FRAME_SCROLL_BAR_PIXEL_WIDTH (f); + if (WINDOW_CONFIG_SCROLL_BAR_WIDTH (w) > 0) + sb_width = WINDOW_CONFIG_SCROLL_BAR_WIDTH (w); else sb_width = width; /* Compute the left edge of the scroll bar. */ - if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) + if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w)) sb_left = left + width - sb_width - (width - sb_width) / 2; else sb_left = left + (width - sb_width) / 2; @@ -8588,8 +4142,6 @@ static short temp_buffer[100]; This routine is called by the SIGIO handler. We return as soon as there are no more events to be read. - Events representing keys are stored in buffer BUFP, - which can hold up to NUMCHARS characters. We return the number of characters stored into the buffer, thus pretending to be `read'. @@ -8605,11 +4157,10 @@ static short temp_buffer[100]; */ int -w32_read_socket (sd, bufp, numchars, expected) +w32_read_socket (sd, expected, hold_quit) register int sd; - /* register */ struct input_event *bufp; - /* register */ int numchars; int expected; + struct input_event *hold_quit; { int count = 0; int check_visibility = 0; @@ -8629,13 +4180,16 @@ w32_read_socket (sd, bufp, numchars, expected) /* So people can tell when we have read the available input. */ input_signal_count++; - if (numchars <= 0) - abort (); /* Don't think this happens. */ - - /* TODO: tool-bars, ghostscript integration, mouse - cursors. */ + /* TODO: ghostscript integration. */ while (get_next_msg (&msg, FALSE)) { + struct input_event inev; + int do_help = 0; + + EVENT_INIT (inev); + inev.kind = NO_EVENT; + inev.arg = Qnil; + switch (msg.msg.message) { case WM_PAINT: @@ -8664,12 +4218,8 @@ w32_read_socket (sd, bufp, numchars, expected) visibility changes properly. */ if (f->iconified) { - bufp->kind = DEICONIFY_EVENT; - XSETFRAME (bufp->frame_or_window, f); - bufp->arg = Qnil; - bufp++; - count++; - numchars--; + inev.kind = DEICONIFY_EVENT; + XSETFRAME (inev.frame_or_window, f); } else if (! NILP (Vframe_list) && ! NILP (XCDR (Vframe_list))) @@ -8699,17 +4249,10 @@ w32_read_socket (sd, bufp, numchars, expected) if (f) { - if (numchars == 0) - abort (); - - bufp->kind = LANGUAGE_CHANGE_EVENT; - XSETFRAME (bufp->frame_or_window, f); - bufp->arg = Qnil; - bufp->code = msg.msg.wParam; - bufp->modifiers = msg.msg.lParam & 0xffff; - bufp++; - count++; - numchars--; + inev.kind = LANGUAGE_CHANGE_EVENT; + XSETFRAME (inev.frame_or_window, f); + inev.code = msg.msg.wParam; + inev.modifiers = msg.msg.lParam & 0xffff; } break; @@ -8721,22 +4264,18 @@ w32_read_socket (sd, bufp, numchars, expected) { if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)) { - dpyinfo->mouse_face_hidden = 1; clear_mouse_face (dpyinfo); + dpyinfo->mouse_face_hidden = 1; } if (temp_index == sizeof temp_buffer / sizeof (short)) temp_index = 0; temp_buffer[temp_index++] = msg.msg.wParam; - bufp->kind = NON_ASCII_KEYSTROKE_EVENT; - bufp->code = msg.msg.wParam; - bufp->modifiers = msg.dwModifiers; - XSETFRAME (bufp->frame_or_window, f); - bufp->arg = Qnil; - bufp->timestamp = msg.msg.time; - bufp++; - numchars--; - count++; + inev.kind = NON_ASCII_KEYSTROKE_EVENT; + inev.code = msg.msg.wParam; + inev.modifiers = msg.dwModifiers; + XSETFRAME (inev.frame_or_window, f); + inev.timestamp = msg.msg.time; } break; @@ -8748,22 +4287,18 @@ w32_read_socket (sd, bufp, numchars, expected) { if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)) { - dpyinfo->mouse_face_hidden = 1; clear_mouse_face (dpyinfo); + dpyinfo->mouse_face_hidden = 1; } if (temp_index == sizeof temp_buffer / sizeof (short)) temp_index = 0; temp_buffer[temp_index++] = msg.msg.wParam; - bufp->kind = ASCII_KEYSTROKE_EVENT; - bufp->code = msg.msg.wParam; - bufp->modifiers = msg.dwModifiers; - XSETFRAME (bufp->frame_or_window, f); - bufp->arg = Qnil; - bufp->timestamp = msg.msg.time; - bufp++; - numchars--; - count++; + inev.kind = ASCII_KEYSTROKE_EVENT; + inev.code = msg.msg.wParam; + inev.modifiers = msg.dwModifiers; + XSETFRAME (inev.frame_or_window, f); + inev.timestamp = msg.msg.time; } break; @@ -8778,7 +4313,7 @@ w32_read_socket (sd, bufp, numchars, expected) last_mousemove_y = y; } - previous_help_echo = help_echo; + previous_help_echo_string = help_echo_string; if (dpyinfo->grabbed && last_mouse_frame && FRAME_LIVE_P (last_mouse_frame)) @@ -8793,7 +4328,32 @@ w32_read_socket (sd, bufp, numchars, expected) } if (f) - note_mouse_movement (f, &msg.msg); + { + /* Generate SELECT_WINDOW_EVENTs when needed. */ + if (mouse_autoselect_window) + { + Lisp_Object window; + int x = LOWORD (msg.msg.lParam); + int y = HIWORD (msg.msg.lParam); + + window = window_from_coordinates (f, x, y, 0, 0, 0, 0); + + /* Window will be selected only when it is not + selected now and last mouse movement event was + not in it. Minibuffer window will be selected + iff it is active. */ + if (WINDOWP(window) + && !EQ (window, last_window) + && !EQ (window, selected_window)) + { + inev.kind = SELECT_WINDOW_EVENT; + inev.frame_or_window = window; + } + + last_window=window; + } + note_mouse_movement (f, &msg.msg); + } else { /* If we move outside the frame, then we're @@ -8801,31 +4361,18 @@ w32_read_socket (sd, bufp, numchars, expected) clear_mouse_face (dpyinfo); } - /* If the contents of the global variable help_echo + /* If the contents of the global variable help_echo_string has changed, generate a HELP_EVENT. */ - if (help_echo != previous_help_echo || - (!NILP (help_echo) && !STRINGP (help_echo) && f->mouse_moved)) - { - Lisp_Object frame; - int n; - - if (help_echo == Qnil) - { - help_echo_object = help_echo_window = Qnil; - help_echo_pos = -1; - } - - if (f) - XSETFRAME (frame, f); - else - frame = Qnil; - - any_help_event_p = 1; - n = gen_help_event (bufp, numchars, help_echo, frame, - help_echo_window, help_echo_object, - help_echo_pos); - bufp += n, count += n, numchars -= n; - } +#if 0 /* The below is an invalid comparison when USE_LISP_UNION_TYPE. + But it was originally changed to this to fix a bug, so I have + not removed it completely in case the bug is still there. */ + if (help_echo_string != previous_help_echo_string || + (!NILP (help_echo_string) && !STRINGP (help_echo_string) && f->mouse_moved)) +#else /* This is what xterm.c does. */ + if (!NILP (help_echo_string) + || !NILP (previous_help_echo_string)) + do_help = 1; +#endif break; case WM_LBUTTONDOWN: @@ -8839,13 +4386,10 @@ w32_read_socket (sd, bufp, numchars, expected) { /* If we decide we want to generate an event to be seen by the rest of Emacs, we put it here. */ - struct input_event emacs_event; int tool_bar_p = 0; int button; int up; - emacs_event.kind = NO_EVENT; - if (dpyinfo->grabbed && last_mouse_frame && FRAME_LIVE_P (last_mouse_frame)) f = last_mouse_frame; @@ -8854,38 +4398,29 @@ w32_read_socket (sd, bufp, numchars, expected) if (f) { - construct_mouse_click (&emacs_event, &msg, f); + construct_mouse_click (&inev, &msg, f); /* Is this in the tool-bar? */ if (WINDOWP (f->tool_bar_window) - && XFASTINT (XWINDOW (f->tool_bar_window)->height)) + && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window))) { Lisp_Object window; - int p, x, y; - - x = XFASTINT (emacs_event.x); - y = XFASTINT (emacs_event.y); + int x = XFASTINT (inev.x); + int y = XFASTINT (inev.y); - /* Set x and y. */ - window = window_from_coordinates (f, x, y, &p, 1); + window = window_from_coordinates (f, x, y, 0, 0, 0, 1); if (EQ (window, f->tool_bar_window)) { - w32_handle_tool_bar_click (f, &emacs_event); + w32_handle_tool_bar_click (f, &inev); tool_bar_p = 1; } } - if (!tool_bar_p) - if (!dpyinfo->w32_focus_frame - || f == dpyinfo->w32_focus_frame - && (numchars >= 1)) - { - construct_mouse_click (bufp, &msg, f); - bufp++; - count++; - numchars--; - } + if (tool_bar_p + || (dpyinfo->w32_focus_frame + && f != dpyinfo->w32_focus_frame)) + inev.kind = NO_EVENT; } parse_button (msg.msg.message, HIWORD (msg.msg.wParam), @@ -8912,37 +4447,39 @@ w32_read_socket (sd, bufp, numchars, expected) break; } - case WM_MOUSEWHEEL: - if (dpyinfo->grabbed && last_mouse_frame - && FRAME_LIVE_P (last_mouse_frame)) - f = last_mouse_frame; - else - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + case WM_MOUSEWHEEL: + { + if (dpyinfo->grabbed && last_mouse_frame + && FRAME_LIVE_P (last_mouse_frame)) + f = last_mouse_frame; + else + f = x_window_to_frame (dpyinfo, msg.msg.hwnd); - if (f) - { - if ((!dpyinfo->w32_focus_frame - || f == dpyinfo->w32_focus_frame) - && (numchars >= 1)) - { - construct_mouse_wheel (bufp, &msg, f); - bufp++; - count++; - numchars--; - } - } + if (f) + { + + if (!dpyinfo->w32_focus_frame + || f == dpyinfo->w32_focus_frame) + { + /* Emit an Emacs wheel-up/down event. */ + construct_mouse_wheel (&inev, &msg, f); + } + /* Ignore any mouse motion that happened before this + event; any subsequent mouse-movement Emacs events + should reflect only motion after the + ButtonPress. */ + f->mouse_moved = 0; + } + last_mouse_frame = f; + last_tool_bar_item = -1; + } break; case WM_DROPFILES: f = x_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) - { - construct_drag_n_drop (bufp, &msg, f); - bufp++; - count++; - numchars--; - } + construct_drag_n_drop (&inev, &msg, f); break; case WM_VSCROLL: @@ -8950,15 +4487,8 @@ w32_read_socket (sd, bufp, numchars, expected) struct scroll_bar *bar = x_window_to_scroll_bar ((HWND)msg.msg.lParam); - if (bar && numchars >= 1) - { - if (w32_scroll_bar_handle_click (bar, &msg, bufp)) - { - bufp++; - count++; - numchars--; - } - } + if (bar) + w32_scroll_bar_handle_click (bar, &msg, &inev); break; } @@ -8966,10 +4496,8 @@ w32_read_socket (sd, bufp, numchars, expected) f = x_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) { - x_check_fullscreen_move(f); - if (f->output_data.w32->want_fullscreen & FULLSCREEN_WAIT) - f->output_data.w32->want_fullscreen &= - ~(FULLSCREEN_WAIT|FULLSCREEN_BOTH); + if (f->want_fullscreen & FULLSCREEN_WAIT) + f->want_fullscreen &= ~(FULLSCREEN_WAIT|FULLSCREEN_BOTH); } check_visibility = 1; break; @@ -8990,8 +4518,8 @@ w32_read_socket (sd, bufp, numchars, expected) int x, y; x_real_positions (f, &x, &y); - f->output_data.w32->left_pos = x; - f->output_data.w32->top_pos = y; + f->left_pos = x; + f->top_pos = y; } check_visibility = 1; @@ -9036,12 +4564,8 @@ w32_read_socket (sd, bufp, numchars, expected) f->async_visible = 0; f->async_iconified = 1; - bufp->kind = ICONIFY_EVENT; - XSETFRAME (bufp->frame_or_window, f); - bufp->arg = Qnil; - bufp++; - count++; - numchars--; + inev.kind = ICONIFY_EVENT; + XSETFRAME (inev.frame_or_window, f); break; case SIZE_MAXIMIZED: @@ -9049,7 +4573,7 @@ w32_read_socket (sd, bufp, numchars, expected) f->async_visible = 1; f->async_iconified = 0; - /* wait_reading_process_input will notice this and update + /* wait_reading_process_output will notice this and update the frame's display structures. */ SET_FRAME_GARBAGED (f); @@ -9063,15 +4587,11 @@ w32_read_socket (sd, bufp, numchars, expected) when the Window is iconified, with 3000,3000 as the co-ords. */ x_real_positions (f, &x, &y); - f->output_data.w32->left_pos = x; - f->output_data.w32->top_pos = y; - - bufp->kind = DEICONIFY_EVENT; - XSETFRAME (bufp->frame_or_window, f); - bufp->arg = Qnil; - bufp++; - count++; - numchars--; + f->left_pos = x; + f->top_pos = y; + + inev.kind = DEICONIFY_EVENT; + XSETFRAME (inev.frame_or_window, f); } else if (! NILP (Vframe_list) && ! NILP (XCDR (Vframe_list))) @@ -9096,8 +4616,8 @@ w32_read_socket (sd, bufp, numchars, expected) height = rect.bottom - rect.top; width = rect.right - rect.left; - rows = PIXEL_TO_CHAR_HEIGHT (f, height); - columns = PIXEL_TO_CHAR_WIDTH (f, width); + rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, height); + columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, width); /* TODO: Clip size to the screen dimensions. */ @@ -9105,17 +4625,17 @@ w32_read_socket (sd, bufp, numchars, expected) not changed, the font size may have changed, so we need to check the pixel dimensions as well. */ - if (columns != f->width - || rows != f->height - || width != f->output_data.w32->pixel_width - || height != f->output_data.w32->pixel_height) + if (columns != FRAME_COLS (f) + || rows != FRAME_LINES (f) + || width != FRAME_PIXEL_WIDTH (f) + || height != FRAME_PIXEL_HEIGHT (f)) { change_frame_size (f, rows, columns, 0, 1, 0); SET_FRAME_GARBAGED (f); cancel_mouse_face (f); - f->output_data.w32->pixel_width = width; - f->output_data.w32->pixel_height = height; - f->output_data.w32->win_gravity = NorthWestGravity; + FRAME_PIXEL_WIDTH (f) = width; + FRAME_PIXEL_HEIGHT (f) = height; + f->win_gravity = NorthWestGravity; } } @@ -9139,34 +4659,18 @@ w32_read_socket (sd, bufp, numchars, expected) Otherwise, the startup message is cleared when the mouse leaves the frame. */ if (any_help_event_p) - { - Lisp_Object frame; - int n; - - XSETFRAME (frame, f); - help_echo = Qnil; - n = gen_help_event (bufp, numchars, - Qnil, frame, Qnil, Qnil, 0); - bufp += n, count += n, numchars -= n; - } + do_help = -1; } break; case WM_SETFOCUS: - f = x_any_window_to_frame (dpyinfo, msg.msg.hwnd); - - dpyinfo->w32_focus_event_frame = f; - - if (f) - x_new_focus_frame (dpyinfo, f); - + w32_detect_focus_change (dpyinfo, &msg, &inev); dpyinfo->grabbed = 0; check_visibility = 1; break; case WM_KILLFOCUS: - /* TODO: some of this belongs in MOUSE_LEAVE */ f = x_top_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) @@ -9190,16 +4694,7 @@ w32_read_socket (sd, bufp, numchars, expected) Otherwise, the startup message is cleared when the mouse leaves the frame. */ if (any_help_event_p) - { - Lisp_Object frame; - int n; - - XSETFRAME (frame, f); - help_echo = Qnil; - n = gen_help_event (bufp, numchars, - Qnil, frame, Qnil, Qnil, 0); - bufp += n, count += n, numchars -=n; - } + do_help = -1; } dpyinfo->grabbed = 0; @@ -9211,15 +4706,8 @@ w32_read_socket (sd, bufp, numchars, expected) if (f) { - if (numchars == 0) - abort (); - - bufp->kind = DELETE_WINDOW_EVENT; - XSETFRAME (bufp->frame_or_window, f); - bufp->arg = Qnil; - bufp++; - count++; - numchars--; + inev.kind = DELETE_WINDOW_EVENT; + XSETFRAME (inev.frame_or_window, f); } break; @@ -9228,15 +4716,8 @@ w32_read_socket (sd, bufp, numchars, expected) if (f) { - if (numchars == 0) - abort (); - - bufp->kind = MENU_BAR_ACTIVATE_EVENT; - XSETFRAME (bufp->frame_or_window, f); - bufp->arg = Qnil; - bufp++; - count++; - numchars--; + inev.kind = MENU_BAR_ACTIVATE_EVENT; + XSETFRAME (inev.frame_or_window, f); } break; @@ -9269,29 +4750,50 @@ w32_read_socket (sd, bufp, numchars, expected) break; default: - /* Check for messages registered at runtime. */ + /* Check for messages registered at runtime. */ if (msg.msg.message == msh_mousewheel) { - if (dpyinfo->grabbed && last_mouse_frame - && FRAME_LIVE_P (last_mouse_frame)) - f = last_mouse_frame; - else - f = x_window_to_frame (dpyinfo, msg.msg.hwnd); + /* Forward MSH_MOUSEWHEEL as WM_MOUSEWHEEL. */ + msg.msg.message = WM_MOUSEWHEEL; + prepend_msg (&msg); + } + break; + } + + if (inev.kind != NO_EVENT) + { + kbd_buffer_store_event_hold (&inev, hold_quit); + count++; + } - if (f) + if (do_help + && !(hold_quit && hold_quit->kind != NO_EVENT)) + { + Lisp_Object frame; + + if (f) + XSETFRAME (frame, f); + else + frame = Qnil; + + if (do_help > 0) + { + if (NILP (help_echo_string)) { - if ((!dpyinfo->w32_focus_frame - || f == dpyinfo->w32_focus_frame) - && (numchars >= 1)) - { - construct_mouse_wheel (bufp, &msg, f); - bufp++; - count++; - numchars--; - } + help_echo_object = help_echo_window = Qnil; + help_echo_pos = -1; } + + any_help_event_p = 1; + gen_help_event (help_echo_string, frame, help_echo_window, + help_echo_object, help_echo_pos); } - break; + else + { + help_echo_string = Qnil; + gen_help_event (Qnil, frame, Qnil, Qnil, 0); + } + count++; } } @@ -9314,65 +4816,65 @@ w32_read_socket (sd, bufp, numchars, expected) Lisp_Object tail, frame; FOR_EACH_FRAME (tail, frame) - { - FRAME_PTR f = XFRAME (frame); - /* The tooltip has been drawn already. Avoid the - SET_FRAME_GARBAGED below. */ - if (EQ (frame, tip_frame)) - continue; - - /* Check "visible" frames and mark each as obscured or not. - Note that async_visible is nonzero for unobscured and - obscured frames, but zero for hidden and iconified frames. */ - if (FRAME_W32_P (f) && f->async_visible) - { - RECT clipbox; - HDC hdc; - - enter_crit (); - /* Query clipping rectangle for the entire window area - (GetWindowDC), not just the client portion (GetDC). - Otherwise, the scrollbars and menubar aren't counted as - part of the visible area of the frame, and we may think - the frame is obscured when really a scrollbar is still - visible and gets WM_PAINT messages above. */ - hdc = GetWindowDC (FRAME_W32_WINDOW (f)); - GetClipBox (hdc, &clipbox); - ReleaseDC (FRAME_W32_WINDOW (f), hdc); - leave_crit (); - - if (clipbox.right == clipbox.left - || clipbox.bottom == clipbox.top) - { - /* Frame has become completely obscured so mark as - such (we do this by setting async_visible to 2 so - that FRAME_VISIBLE_P is still true, but redisplay - will skip it). */ - f->async_visible = 2; + { + FRAME_PTR f = XFRAME (frame); + /* The tooltip has been drawn already. Avoid the + SET_FRAME_GARBAGED below. */ + if (EQ (frame, tip_frame)) + continue; + + /* Check "visible" frames and mark each as obscured or not. + Note that async_visible is nonzero for unobscured and + obscured frames, but zero for hidden and iconified frames. */ + if (FRAME_W32_P (f) && f->async_visible) + { + RECT clipbox; + HDC hdc; + + enter_crit (); + /* Query clipping rectangle for the entire window area + (GetWindowDC), not just the client portion (GetDC). + Otherwise, the scrollbars and menubar aren't counted as + part of the visible area of the frame, and we may think + the frame is obscured when really a scrollbar is still + visible and gets WM_PAINT messages above. */ + hdc = GetWindowDC (FRAME_W32_WINDOW (f)); + GetClipBox (hdc, &clipbox); + ReleaseDC (FRAME_W32_WINDOW (f), hdc); + leave_crit (); + + if (clipbox.right == clipbox.left + || clipbox.bottom == clipbox.top) + { + /* Frame has become completely obscured so mark as + such (we do this by setting async_visible to 2 so + that FRAME_VISIBLE_P is still true, but redisplay + will skip it). */ + f->async_visible = 2; - if (!FRAME_OBSCURED_P (f)) - { - DebPrint (("frame %p (%s) obscured\n", f, - SDATA (f->name))); - } - } - else - { - /* Frame is not obscured, so mark it as such. */ - f->async_visible = 1; + if (!FRAME_OBSCURED_P (f)) + { + DebPrint (("frame %p (%s) obscured\n", f, + SDATA (f->name))); + } + } + else + { + /* Frame is not obscured, so mark it as such. */ + f->async_visible = 1; - if (FRAME_OBSCURED_P (f)) - { - SET_FRAME_GARBAGED (f); - DebPrint (("obscured frame %p (%s) found to be visible\n", f, - SDATA (f->name))); + if (FRAME_OBSCURED_P (f)) + { + SET_FRAME_GARBAGED (f); + DebPrint (("obscured frame %p (%s) found to be visible\n", f, + SDATA (f->name))); - /* Force a redisplay sooner or later. */ - record_asynch_buffer_change (); - } - } - } - } + /* Force a redisplay sooner or later. */ + record_asynch_buffer_change (); + } + } + } + } } UNBLOCK_INPUT; @@ -9380,70 +4882,37 @@ w32_read_socket (sd, bufp, numchars, expected) } - - -/*********************************************************************** - Text Cursor - ***********************************************************************/ - -/* Notice if the text cursor of window W has been overwritten by a - drawing operation that outputs glyphs starting at START_X and - ending at END_X in the line given by output_cursor.vpos. - Coordinates are area-relative. END_X < 0 means all the rest - of the line after START_X has been written. */ - -static void -notice_overwritten_cursor (w, area, x0, x1, y0, y1) - struct window *w; - enum glyph_row_area area; - int x0, x1, y0, y1; -{ - if (area == TEXT_AREA - && w->phys_cursor_on_p - && y0 <= w->phys_cursor.y - && y1 >= w->phys_cursor.y + w->phys_cursor_height - && x0 <= w->phys_cursor.x - && (x1 < 0 || x1 > w->phys_cursor.x)) - w->phys_cursor_on_p = 0; -} - - + +/*********************************************************************** + Text Cursor + ***********************************************************************/ + /* Set clipping for output in glyph row ROW. W is the window in which we operate. GC is the graphics context to set clipping in. - WHOLE_LINE_P non-zero means include the areas used for truncation - mark display and alike in the clipping rectangle. ROW may be a text row or, e.g., a mode line. Text rows must be clipped to the interior of the window dedicated to text display, mode lines must be clipped to the whole window. */ static void -w32_clip_to_row (w, row, hdc, whole_line_p) +w32_clip_to_row (w, row, area, hdc) struct window *w; struct glyph_row *row; + int area; HDC hdc; - int whole_line_p; { struct frame *f = XFRAME (WINDOW_FRAME (w)); RECT clip_rect; - int window_x, window_y, window_width, window_height; + int window_x, window_y, window_width; - window_box (w, -1, &window_x, &window_y, &window_width, &window_height); + window_box (w, area, &window_x, &window_y, &window_width, 0); - clip_rect.left = WINDOW_TO_FRAME_PIXEL_X (w, 0); + clip_rect.left = window_x; clip_rect.top = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); clip_rect.top = max (clip_rect.top, window_y); clip_rect.right = clip_rect.left + window_width; clip_rect.bottom = clip_rect.top + row->visible_height; - /* If clipping to the whole line, including trunc marks, extend - the rectangle to the left and increase its width. */ - if (whole_line_p) - { - clip_rect.left -= FRAME_X_LEFT_FRINGE_WIDTH (f); - clip_rect.right += FRAME_X_FRINGE_WIDTH (f); - } - w32_set_clip_rectangle (hdc, &clip_rect); } @@ -9458,37 +4927,28 @@ x_draw_hollow_cursor (w, row) struct frame *f = XFRAME (WINDOW_FRAME (w)); HDC hdc; RECT rect; - int wd; + int h; struct glyph *cursor_glyph; HBRUSH hb = CreateSolidBrush (f->output_data.w32->cursor_pixel); - /* Compute frame-relative coordinates from window-relative - coordinates. */ - rect.left = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); - rect.top = (WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y) - + row->ascent - w->phys_cursor_ascent); - rect.bottom = rect.top + row->height; - /* Get the glyph the cursor is on. If we can't tell because the current matrix is invalid or such, give up. */ cursor_glyph = get_phys_cursor_glyph (w); if (cursor_glyph == NULL) return; - /* Compute the width of the rectangle to draw. If on a stretch - glyph, and `x-stretch-block-cursor' is nil, don't draw a - rectangle as wide as the glyph, but use a canonical character - width instead. */ - wd = cursor_glyph->pixel_width; - if (cursor_glyph->type == STRETCH_GLYPH - && !x_stretch_cursor_p) - wd = min (CANON_X_UNIT (f), wd); + /* Compute frame-relative coordinates for phys cursor. */ + rect.left = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); + rect.top = get_phys_cursor_geometry (w, row, cursor_glyph, &h); + rect.bottom = rect.top + h; + rect.right = rect.left + w->phys_cursor_width; - rect.right = rect.left + wd; hdc = get_frame_dc (f); + /* Set clipping, draw the rectangle, and reset clipping again. */ + w32_clip_to_row (w, row, TEXT_AREA, hdc); FrameRect (hdc, &rect, hb); DeleteObject (hb); - + w32_set_clip_rectangle (hdc, NULL); release_frame_dc (f, hdc); } @@ -9526,17 +4986,13 @@ x_draw_bar_cursor (w, row, width, kind) { struct glyph_row *row; row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos); - x_draw_phys_cursor_glyph (w, row, DRAW_CURSOR); + draw_phys_cursor_glyph (w, row, DRAW_CURSOR); } else { COLORREF cursor_color = f->output_data.w32->cursor_pixel; struct face *face = FACE_FROM_ID (f, cursor_glyph->face_id); - if (width < 0) - width = FRAME_CURSOR_WIDTH (f); - width = min (cursor_glyph->pixel_width, width); - /* If the glyph's background equals the color we normally draw the bar cursor in, the bar cursor in its normal color is invisible. Use the glyph's foreground color instead in this @@ -9546,8 +5002,16 @@ x_draw_bar_cursor (w, row, width, kind) cursor_color = face->foreground; x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); + + if (width < 0) + width = FRAME_CURSOR_WIDTH (f); + width = min (cursor_glyph->pixel_width, width); + + w->phys_cursor_width = width; + + hdc = get_frame_dc (f); - w32_clip_to_row (w, row, hdc, 0); + w32_clip_to_row (w, row, TEXT_AREA, hdc); if (kind == BAR_CURSOR) { @@ -9562,279 +5026,66 @@ x_draw_bar_cursor (w, row, width, kind) row->height - width), cursor_glyph->pixel_width, width); } + + w32_set_clip_rectangle (hdc, NULL); release_frame_dc (f, hdc); } } -/* Clear the cursor of window W to background color, and mark the - cursor as not shown. This is used when the text where the cursor - is is about to be rewritten. */ +/* RIF: Define cursor CURSOR on frame F. */ static void -x_clear_cursor (w) - struct window *w; +w32_define_frame_cursor (f, cursor) + struct frame *f; + Cursor cursor; { - if (FRAME_VISIBLE_P (XFRAME (w->frame)) && w->phys_cursor_on_p) - x_update_window_cursor (w, 0); + w32_define_cursor (FRAME_W32_WINDOW (f), cursor); } -/* Draw the cursor glyph of window W in glyph row ROW. See the - comment of x_draw_glyphs for the meaning of HL. */ +/* RIF: Clear area on frame F. */ static void -x_draw_phys_cursor_glyph (w, row, hl) - struct window *w; - struct glyph_row *row; - enum draw_glyphs_face hl; +w32_clear_frame_area (f, x, y, width, height) + struct frame *f; + int x, y, width, height; { - /* If cursor hpos is out of bounds, don't draw garbage. This can - happen in mini-buffer windows when switching between echo area - glyphs and mini-buffer. */ - if (w->phys_cursor.hpos < row->used[TEXT_AREA]) - { - int on_p = w->phys_cursor_on_p; - x_draw_glyphs (w, w->phys_cursor.x, row, TEXT_AREA, - w->phys_cursor.hpos, w->phys_cursor.hpos + 1, - hl, 0); - w->phys_cursor_on_p = on_p; - - /* When we erase the cursor, and ROW is overlapped by other - rows, make sure that these overlapping parts of other rows - are redrawn. */ - if (hl == DRAW_NORMAL_TEXT && row->overlapped_p) - { - if (row > w->current_matrix->rows - && MATRIX_ROW_OVERLAPS_SUCC_P (row - 1)) - x_fix_overlapping_area (w, row - 1, TEXT_AREA); + HDC hdc; - if (MATRIX_ROW_BOTTOM_Y (row) < window_text_bottom_y (w) - && MATRIX_ROW_OVERLAPS_PRED_P (row + 1)) - x_fix_overlapping_area (w, row + 1, TEXT_AREA); - } - } + hdc = get_frame_dc (f); + w32_clear_area (f, hdc, x, y, width, height); + release_frame_dc (f, hdc); } - -/* Erase the image of a cursor of window W from the screen. */ +/* RIF: Draw or clear cursor on window W. */ static void -x_erase_phys_cursor (w) - struct window *w; -{ - struct frame *f = XFRAME (w->frame); - struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); - int hpos = w->phys_cursor.hpos; - int vpos = w->phys_cursor.vpos; - int mouse_face_here_p = 0; - struct glyph_matrix *active_glyphs = w->current_matrix; - struct glyph_row *cursor_row; - struct glyph *cursor_glyph; - enum draw_glyphs_face hl; - - /* No cursor displayed or row invalidated => nothing to do on the - screen. */ - if (w->phys_cursor_type == NO_CURSOR) - goto mark_cursor_off; - - /* VPOS >= active_glyphs->nrows means that window has been resized. - Don't bother to erase the cursor. */ - if (vpos >= active_glyphs->nrows) - goto mark_cursor_off; - - /* If row containing cursor is marked invalid, there is nothing we - can do. */ - cursor_row = MATRIX_ROW (active_glyphs, vpos); - if (!cursor_row->enabled_p) - goto mark_cursor_off; - - /* If row is completely invisible, don't attempt to delete a cursor which - isn't there. This may happen if cursor is at top of window, and - we switch to a buffer with a header line in that window. */ - if (cursor_row->visible_height <= 0) - goto mark_cursor_off; - - /* This can happen when the new row is shorter than the old one. - In this case, either x_draw_glyphs or clear_end_of_line - should have cleared the cursor. Note that we wouldn't be - able to erase the cursor in this case because we don't have a - cursor glyph at hand. */ - if (w->phys_cursor.hpos >= cursor_row->used[TEXT_AREA]) - goto mark_cursor_off; - - /* If the cursor is in the mouse face area, redisplay that when - we clear the cursor. */ - if (! NILP (dpyinfo->mouse_face_window) - && w == XWINDOW (dpyinfo->mouse_face_window) - && (vpos > dpyinfo->mouse_face_beg_row - || (vpos == dpyinfo->mouse_face_beg_row - && hpos >= dpyinfo->mouse_face_beg_col)) - && (vpos < dpyinfo->mouse_face_end_row - || (vpos == dpyinfo->mouse_face_end_row - && hpos < dpyinfo->mouse_face_end_col)) - /* Don't redraw the cursor's spot in mouse face if it is at the - end of a line (on a newline). The cursor appears there, but - mouse highlighting does not. */ - && cursor_row->used[TEXT_AREA] > hpos) - mouse_face_here_p = 1; - - /* Maybe clear the display under the cursor. */ - if (w->phys_cursor_type == HOLLOW_BOX_CURSOR) - { - int x; - int header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); - HDC hdc; - - cursor_glyph = get_phys_cursor_glyph (w); - if (cursor_glyph == NULL) - goto mark_cursor_off; - - x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x); - - hdc = get_frame_dc (f); - w32_clear_area (f, hdc, x, - WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, - cursor_row->y)), - cursor_glyph->pixel_width, - cursor_row->visible_height); - release_frame_dc (f, hdc); - } - - /* Erase the cursor by redrawing the character underneath it. */ - if (mouse_face_here_p) - hl = DRAW_MOUSE_FACE; - else - hl = DRAW_NORMAL_TEXT; - x_draw_phys_cursor_glyph (w, cursor_row, hl); - - mark_cursor_off: - w->phys_cursor_on_p = 0; - w->phys_cursor_type = NO_CURSOR; -} - - -/* Non-zero if physical cursor of window W is within mouse face. */ - -static int -cursor_in_mouse_face_p (w) - struct window *w; -{ - struct w32_display_info *dpyinfo - = FRAME_W32_DISPLAY_INFO (XFRAME (w->frame)); - int in_mouse_face = 0; - - if (WINDOWP (dpyinfo->mouse_face_window) - && XWINDOW (dpyinfo->mouse_face_window) == w) - { - int hpos = w->phys_cursor.hpos; - int vpos = w->phys_cursor.vpos; - - if (vpos >= dpyinfo->mouse_face_beg_row - && vpos <= dpyinfo->mouse_face_end_row - && (vpos > dpyinfo->mouse_face_beg_row - || hpos >= dpyinfo->mouse_face_beg_col) - && (vpos < dpyinfo->mouse_face_end_row - || hpos < dpyinfo->mouse_face_end_col - || dpyinfo->mouse_face_past_end)) - in_mouse_face = 1; - } - - return in_mouse_face; -} - - -/* Display or clear cursor of window W. If ON is zero, clear the - cursor. If it is non-zero, display the cursor. If ON is nonzero, - where to put the cursor is specified by HPOS, VPOS, X and Y. */ - -void -x_display_and_set_cursor (w, on, hpos, vpos, x, y) +w32_draw_window_cursor (w, glyph_row, x, y, cursor_type, cursor_width, on_p, active_p) struct window *w; - int on, hpos, vpos, x, y; + struct glyph_row *glyph_row; + int x, y; + int cursor_type, cursor_width; + int on_p, active_p; { - struct frame *f = XFRAME (w->frame); - int new_cursor_type; - int new_cursor_width; - int active_cursor; - struct glyph_matrix *current_glyphs; - struct glyph_row *glyph_row; - struct glyph *glyph; - - /* This is pointless on invisible frames, and dangerous on garbaged - windows and frames; in the latter case, the frame or window may - be in the midst of changing its size, and x and y may be off the - window. */ - if (! FRAME_VISIBLE_P (f) - || FRAME_GARBAGED_P (f) - || vpos >= w->current_matrix->nrows - || hpos >= w->current_matrix->matrix_w) - return; - - /* If cursor is off and we want it off, return quickly. */ - if (!on && !w->phys_cursor_on_p) - return; - - current_glyphs = w->current_matrix; - glyph_row = MATRIX_ROW (current_glyphs, vpos); - glyph = glyph_row->glyphs[TEXT_AREA] + hpos; - - /* If cursor row is not enabled, we don't really know where to - display the cursor. */ - if (!glyph_row->enabled_p) - { - w->phys_cursor_on_p = 0; - return; - } - - xassert (interrupt_input_blocked); - - /* Set new_cursor_type to the cursor we want to be displayed. */ - new_cursor_type = get_window_cursor_type (w, &new_cursor_width, &active_cursor); - - /* If cursor is currently being shown and we don't want it to be or - it is in the wrong place, or the cursor type is not what we want, - erase it. */ - if (w->phys_cursor_on_p - && (!on - || w->phys_cursor.x != x - || w->phys_cursor.y != y - || new_cursor_type != w->phys_cursor_type - || ((new_cursor_type == BAR_CURSOR || new_cursor_type == HBAR_CURSOR) - && new_cursor_width != w->phys_cursor_width))) - x_erase_phys_cursor (w); - - /* Don't check phys_cursor_on_p here because that flag is only set - to zero in some cases where we know that the cursor has been - completely erased, to avoid the extra work of erasing the cursor - twice. In other words, phys_cursor_on_p can be 1 and the cursor - still not be visible, or it has only been partly erased. */ - if (on) + if (on_p) { - w->phys_cursor_ascent = glyph_row->ascent; - w->phys_cursor_height = glyph_row->height; - - /* Set phys_cursor_.* before x_draw_.* is called because some - of them may need the information. */ - w->phys_cursor.x = x; - w->phys_cursor.y = glyph_row->y; - w->phys_cursor.hpos = hpos; - w->phys_cursor.vpos = vpos; - /* If the user wants to use the system caret, make sure our own cursor remains invisible. */ if (w32_use_visible_system_caret) { + /* Call to erase_phys_cursor here seems to use the + wrong values of w->phys_cursor, as they have been + overwritten before this function was called. */ if (w->phys_cursor_type != NO_CURSOR) - x_erase_phys_cursor (w); + erase_phys_cursor (w); - new_cursor_type = w->phys_cursor_type = NO_CURSOR; + cursor_type = w->phys_cursor_type = NO_CURSOR; w->phys_cursor_width = -1; } else { - w->phys_cursor_type = new_cursor_type; - w->phys_cursor_width = new_cursor_width; + w->phys_cursor_type = cursor_type; } w->phys_cursor_on_p = 1; @@ -9842,8 +5093,9 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y) /* If this is the active cursor, we need to track it with the system caret, so third party software like screen magnifiers and speech synthesizers can follow the cursor. */ - if (active_cursor) + if (active_p) { + struct frame *f = XFRAME (WINDOW_FRAME (w)); HWND hwnd = FRAME_W32_WINDOW (f); w32_system_caret_x @@ -9864,25 +5116,34 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y) PostMessage (hwnd, WM_EMACS_TRACK_CARET, 0, 0); } - switch (new_cursor_type) + if (glyph_row->exact_window_width_line_p + && w->phys_cursor.hpos >= glyph_row->used[TEXT_AREA]) + { + glyph_row->cursor_in_fringe_p = 1; + draw_fringe_bitmap (w, glyph_row, 0); + return; + } + + switch (cursor_type) { case HOLLOW_BOX_CURSOR: x_draw_hollow_cursor (w, glyph_row); break; case FILLED_BOX_CURSOR: - x_draw_phys_cursor_glyph (w, glyph_row, DRAW_CURSOR); + draw_phys_cursor_glyph (w, glyph_row, DRAW_CURSOR); break; case BAR_CURSOR: - x_draw_bar_cursor (w, glyph_row, new_cursor_width, BAR_CURSOR); + x_draw_bar_cursor (w, glyph_row, cursor_width, BAR_CURSOR); break; case HBAR_CURSOR: - x_draw_bar_cursor (w, glyph_row, new_cursor_width, HBAR_CURSOR); + x_draw_bar_cursor (w, glyph_row, cursor_width, HBAR_CURSOR); break; case NO_CURSOR: + w->phys_cursor_width = 0; break; default: @@ -9892,79 +5153,6 @@ x_display_and_set_cursor (w, on, hpos, vpos, x, y) } -/* Display the cursor on window W, or clear it. X and Y are window - relative pixel coordinates. HPOS and VPOS are glyph matrix - positions. If W is not the selected window, display a hollow - cursor. ON non-zero means display the cursor at X, Y which - correspond to HPOS, VPOS, otherwise it is cleared. */ - -void -x_display_cursor (w, on, hpos, vpos, x, y) - struct window *w; - int on, hpos, vpos, x, y; -{ - BLOCK_INPUT; - x_display_and_set_cursor (w, on, hpos, vpos, x, y); - UNBLOCK_INPUT; -} - - -/* Display the cursor on window W, or clear it, according to ON_P. - Don't change the cursor's position. */ - -void -x_update_cursor (f, on_p) - struct frame *f; - int on_p; -{ - x_update_cursor_in_window_tree (XWINDOW (f->root_window), on_p); -} - - -/* Call x_update_window_cursor with parameter ON_P on all leaf windows - in the window tree rooted at W. */ - -static void -x_update_cursor_in_window_tree (w, on_p) - struct window *w; - int on_p; -{ - while (w) - { - if (!NILP (w->hchild)) - x_update_cursor_in_window_tree (XWINDOW (w->hchild), on_p); - else if (!NILP (w->vchild)) - x_update_cursor_in_window_tree (XWINDOW (w->vchild), on_p); - else - x_update_window_cursor (w, on_p); - - w = NILP (w->next) ? 0 : XWINDOW (w->next); - } -} - - -/* Switch the display of W's cursor on or off, according to the value - of ON. */ - -static void -x_update_window_cursor (w, on) - struct window *w; - int on; -{ - /* Don't update cursor in windows whose frame is in the process - of being deleted. */ - if (w->current_matrix) - { - BLOCK_INPUT; - x_display_and_set_cursor (w, on, w->phys_cursor.hpos, - w->phys_cursor.vpos, w->phys_cursor.x, - w->phys_cursor.y); - UNBLOCK_INPUT; - } -} - - - /* Icons. */ @@ -9973,16 +5161,25 @@ x_bitmap_icon (f, icon) struct frame *f; Lisp_Object icon; { - HANDLE hicon; + HANDLE main_icon; + HANDLE small_icon = NULL; if (FRAME_W32_WINDOW (f) == 0) return 1; if (NILP (icon)) - hicon = LoadIcon (hinst, EMACS_CLASS); + main_icon = LoadIcon (hinst, EMACS_CLASS); else if (STRINGP (icon)) - hicon = LoadImage (NULL, (LPCTSTR) SDATA (icon), IMAGE_ICON, 0, 0, - LR_DEFAULTSIZE | LR_LOADFROMFILE); + { + /* Load the main icon from the named file. */ + main_icon = LoadImage (NULL, (LPCTSTR) SDATA (icon), IMAGE_ICON, 0, 0, + LR_DEFAULTSIZE | LR_LOADFROMFILE); + /* Try to load a small icon to go with it. */ + small_icon = LoadImage (NULL, (LPCSTR) SDATA (icon), IMAGE_ICON, + GetSystemMetrics (SM_CXSMICON), + GetSystemMetrics (SM_CYSMICON), + LR_LOADFROMFILE); + } else if (SYMBOLP (icon)) { LPCTSTR name; @@ -10002,16 +5199,21 @@ x_bitmap_icon (f, icon) else return 1; - hicon = LoadIcon (NULL, name); + main_icon = LoadIcon (NULL, name); } else return 1; - if (hicon == NULL) + if (main_icon == NULL) return 1; PostMessage (FRAME_W32_WINDOW (f), WM_SETICON, (WPARAM) ICON_BIG, - (LPARAM) hicon); + (LPARAM) main_icon); + + /* If there is a small icon that goes with it, set that too. */ + if (small_icon) + PostMessage (FRAME_W32_WINDOW (f), WM_SETICON, (WPARAM) ICON_SMALL, + (LPARAM) small_icon); return 0; } @@ -10063,29 +5265,31 @@ x_new_font (f, fontname) FRAME_BASELINE_OFFSET (f) = fontp->baseline_offset; FRAME_FONTSET (f) = -1; + FRAME_COLUMN_WIDTH (f) = fontp->average_width; + FRAME_SPACE_WIDTH (f) = fontp->space_width; + FRAME_LINE_HEIGHT (f) = FONT_HEIGHT (FRAME_FONT (f)); + + compute_fringe_widths (f, 1); + /* Compute the scroll bar width in character columns. */ - if (f->scroll_bar_pixel_width > 0) + if (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) > 0) { - int wid = FONT_WIDTH (FRAME_FONT (f)); - f->scroll_bar_cols = (f->scroll_bar_pixel_width + wid-1) / wid; + int wid = FRAME_COLUMN_WIDTH (f); + FRAME_CONFIG_SCROLL_BAR_COLS (f) + = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) + wid-1) / wid; } else { - int wid = FONT_WIDTH (FRAME_FONT (f)); - f->scroll_bar_cols = (14 + wid - 1) / wid; + int wid = FRAME_COLUMN_WIDTH (f); + FRAME_CONFIG_SCROLL_BAR_COLS (f) = (14 + wid - 1) / wid; } /* Now make the frame display the given font. */ if (FRAME_W32_WINDOW (f) != 0) { - frame_update_line_height (f); if (NILP (tip_frame) || XFRAME (tip_frame) != f) - x_set_window_size (f, 0, f->width, f->height); + x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); } - else - /* If we are setting a new frame's font for the first time, - there are no faces yet, so this font's height is the line height. */ - f->output_data.w32->line_height = FONT_HEIGHT (FRAME_FONT (f)); return build_string (fontp->full_name); } @@ -10123,90 +5327,6 @@ x_new_fontset (f, fontsetname) return build_string (fontsetname); } -/* Compute actual fringe widths */ - -void -x_compute_fringe_widths (f, redraw) - struct frame *f; - int redraw; -{ - int o_left = f->output_data.w32->left_fringe_width; - int o_right = f->output_data.w32->right_fringe_width; - int o_cols = f->output_data.w32->fringe_cols; - - Lisp_Object left_fringe = Fassq (Qleft_fringe, f->param_alist); - Lisp_Object right_fringe = Fassq (Qright_fringe, f->param_alist); - int left_fringe_width, right_fringe_width; - - if (!NILP (left_fringe)) - left_fringe = Fcdr (left_fringe); - if (!NILP (right_fringe)) - right_fringe = Fcdr (right_fringe); - - left_fringe_width = ((NILP (left_fringe) || !INTEGERP (left_fringe)) ? 8 : - XINT (left_fringe)); - right_fringe_width = ((NILP (right_fringe) || !INTEGERP (right_fringe)) ? 8 : - XINT (right_fringe)); - - if (left_fringe_width || right_fringe_width) - { - int left_wid = left_fringe_width >= 0 ? left_fringe_width : -left_fringe_width; - int right_wid = right_fringe_width >= 0 ? right_fringe_width : -right_fringe_width; - int conf_wid = left_wid + right_wid; - int font_wid = FONT_WIDTH (f->output_data.w32->font); - int cols = (left_wid + right_wid + font_wid-1) / font_wid; - int real_wid = cols * font_wid; - if (left_wid && right_wid) - { - if (left_fringe_width < 0) - { - /* Left fringe width is fixed, adjust right fringe if necessary */ - f->output_data.w32->left_fringe_width = left_wid; - f->output_data.w32->right_fringe_width = real_wid - left_wid; - } - else if (right_fringe_width < 0) - { - /* Right fringe width is fixed, adjust left fringe if necessary */ - f->output_data.w32->left_fringe_width = real_wid - right_wid; - f->output_data.w32->right_fringe_width = right_wid; - } - else - { - /* Adjust both fringes with an equal amount. - Note that we are doing integer arithmetic here, so don't - lose a pixel if the total width is an odd number. */ - int fill = real_wid - conf_wid; - f->output_data.w32->left_fringe_width = left_wid + fill/2; - f->output_data.w32->right_fringe_width = right_wid + fill - fill/2; - } - } - else if (left_fringe_width) - { - f->output_data.w32->left_fringe_width = real_wid; - f->output_data.w32->right_fringe_width = 0; - } - else - { - f->output_data.w32->left_fringe_width = 0; - f->output_data.w32->right_fringe_width = real_wid; - } - f->output_data.w32->fringe_cols = cols; - f->output_data.w32->fringes_extra = real_wid; - } - else - { - f->output_data.w32->left_fringe_width = 0; - f->output_data.w32->right_fringe_width = 0; - f->output_data.w32->fringe_cols = 0; - f->output_data.w32->fringes_extra = 0; - } - - if (redraw && FRAME_VISIBLE_P (f)) - if (o_left != f->output_data.w32->left_fringe_width || - o_right != f->output_data.w32->right_fringe_width || - o_cols != f->output_data.w32->fringe_cols) - redraw_frame (f); -} /*********************************************************************** TODO: W32 Input Methods @@ -10230,53 +5350,23 @@ void x_calc_absolute_position (f) struct frame *f; { - POINT pt; - int flags = f->output_data.w32->size_hint_flags; - - pt.x = pt.y = 0; - - /* Find the position of the outside upper-left corner of - the inner window, with respect to the outer window. - But do this only if we will need the results. */ - if (f->output_data.w32->parent_desc != FRAME_W32_DISPLAY_INFO (f)->root_window) - { - BLOCK_INPUT; - MapWindowPoints (FRAME_W32_WINDOW (f), - f->output_data.w32->parent_desc, - &pt, 1); - UNBLOCK_INPUT; - } - - { - RECT rt; - rt.left = rt.right = rt.top = rt.bottom = 0; - - BLOCK_INPUT; - AdjustWindowRect(&rt, f->output_data.w32->dwStyle, - FRAME_EXTERNAL_MENU_BAR (f)); - UNBLOCK_INPUT; - - pt.x += (rt.right - rt.left); - pt.y += (rt.bottom - rt.top); - } + int flags = f->size_hint_flags; /* Treat negative positions as relative to the leftmost bottommost position that fits on the screen. */ if (flags & XNegative) - f->output_data.w32->left_pos = (FRAME_W32_DISPLAY_INFO (f)->width - - 2 * f->output_data.w32->border_width - pt.x - - PIXEL_WIDTH (f) - + f->output_data.w32->left_pos); + f->left_pos = (FRAME_W32_DISPLAY_INFO (f)->width + - FRAME_PIXEL_WIDTH (f) + + f->left_pos); if (flags & YNegative) - f->output_data.w32->top_pos = (FRAME_W32_DISPLAY_INFO (f)->height - - 2 * f->output_data.w32->border_width - pt.y - - PIXEL_HEIGHT (f) - + f->output_data.w32->top_pos); + f->top_pos = (FRAME_W32_DISPLAY_INFO (f)->height + - FRAME_PIXEL_HEIGHT (f) + + f->top_pos); /* The left_pos and top_pos are now relative to the top and left screen edges, so the flags should correspond. */ - f->output_data.w32->size_hint_flags &= ~ (XNegative | YNegative); + f->size_hint_flags &= ~ (XNegative | YNegative); } /* CHANGE_GRAVITY is 1 when calling from Fset_frame_position, @@ -10295,22 +5385,22 @@ x_set_offset (f, xoff, yoff, change_gravity) if (change_gravity > 0) { - f->output_data.w32->top_pos = yoff; - f->output_data.w32->left_pos = xoff; - f->output_data.w32->size_hint_flags &= ~ (XNegative | YNegative); + f->top_pos = yoff; + f->left_pos = xoff; + f->size_hint_flags &= ~ (XNegative | YNegative); if (xoff < 0) - f->output_data.w32->size_hint_flags |= XNegative; + f->size_hint_flags |= XNegative; if (yoff < 0) - f->output_data.w32->size_hint_flags |= YNegative; - f->output_data.w32->win_gravity = NorthWestGravity; + f->size_hint_flags |= YNegative; + f->win_gravity = NorthWestGravity; } x_calc_absolute_position (f); BLOCK_INPUT; x_wm_set_size_hint (f, (long) 0, 0); - modified_left = f->output_data.w32->left_pos; - modified_top = f->output_data.w32->top_pos; + modified_left = f->left_pos; + modified_top = f->top_pos; my_set_window_pos (FRAME_W32_WINDOW (f), NULL, @@ -10327,108 +5417,28 @@ static void x_check_fullscreen (f) struct frame *f; { - if (f->output_data.w32->want_fullscreen & FULLSCREEN_BOTH) + if (f->want_fullscreen & FULLSCREEN_BOTH) { int width, height, ign; - x_real_positions (f, &f->output_data.w32->left_pos, - &f->output_data.w32->top_pos); + x_real_positions (f, &f->left_pos, &f->top_pos); x_fullscreen_adjust (f, &width, &height, &ign, &ign); /* We do not need to move the window, it shall be taken care of - when setting WM manager hints. - If the frame is visible already, the position is checked by - x_check_fullscreen_move. */ - if (f->width != width || f->height != height) + when setting WM manager hints. */ + if (FRAME_COLS (f) != width || FRAME_LINES (f) != height) { change_frame_size (f, height, width, 0, 1, 0); SET_FRAME_GARBAGED (f); cancel_mouse_face (f); /* Wait for the change of frame size to occur */ - f->output_data.w32->want_fullscreen |= FULLSCREEN_WAIT; + f->want_fullscreen |= FULLSCREEN_WAIT; } } } -/* If frame parameters are set after the frame is mapped, we need to move - the window. This is done in xfns.c. - Some window managers moves the window to the right position, some - moves the outer window manager window to the specified position. - Here we check that we are in the right spot. If not, make a second - move, assuming we are dealing with the second kind of window manager. */ -static void -x_check_fullscreen_move (f) - struct frame *f; -{ - if (f->output_data.w32->want_fullscreen & FULLSCREEN_MOVE_WAIT) - { - int expect_top = f->output_data.w32->top_pos; - int expect_left = f->output_data.w32->left_pos; - - if (f->output_data.w32->want_fullscreen & FULLSCREEN_HEIGHT) - expect_top = 0; - if (f->output_data.w32->want_fullscreen & FULLSCREEN_WIDTH) - expect_left = 0; - - if (expect_top != f->output_data.w32->top_pos - || expect_left != f->output_data.w32->left_pos) - x_set_offset (f, expect_left, expect_top, 1); - - /* Just do this once */ - f->output_data.w32->want_fullscreen &= ~FULLSCREEN_MOVE_WAIT; - } -} - - -/* Calculate fullscreen size. Return in *TOP_POS and *LEFT_POS the - wanted positions of the WM window (not emacs window). - Return in *WIDTH and *HEIGHT the wanted width and height of Emacs - window (FRAME_X_WINDOW). - */ -void -x_fullscreen_adjust (f, width, height, top_pos, left_pos) - struct frame *f; - int *width; - int *height; - int *top_pos; - int *left_pos; -{ - int newwidth = f->width, newheight = f->height; - - *top_pos = f->output_data.w32->top_pos; - *left_pos = f->output_data.w32->left_pos; - - if (f->output_data.w32->want_fullscreen & FULLSCREEN_HEIGHT) - { - int ph; - - ph = FRAME_X_DISPLAY_INFO (f)->height; - newheight = PIXEL_TO_CHAR_HEIGHT (f, ph); - ph = CHAR_TO_PIXEL_HEIGHT (f, newheight) - - f->output_data.w32->y_pixels_diff; - newheight = PIXEL_TO_CHAR_HEIGHT (f, ph); - *top_pos = 0; - } - - if (f->output_data.w32->want_fullscreen & FULLSCREEN_WIDTH) - { - int pw; - - pw = FRAME_X_DISPLAY_INFO (f)->width; - newwidth = PIXEL_TO_CHAR_WIDTH (f, pw); - pw = CHAR_TO_PIXEL_WIDTH (f, newwidth) - - f->output_data.w32->x_pixels_diff; - newwidth = PIXEL_TO_CHAR_WIDTH (f, pw); - *left_pos = 0; - } - - *width = newwidth; - *height = newheight; -} - - /* Call this to change the size of frame F's x-window. If CHANGE_GRAVITY is 1, we change to top-left-corner window gravity for this size change and subsequent size changes. @@ -10445,17 +5455,15 @@ x_set_window_size (f, change_gravity, cols, rows) BLOCK_INPUT; check_frame_size (f, &rows, &cols); - f->output_data.w32->vertical_scroll_bar_extra - = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f) - ? 0 - : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.w32->font))); + f->scroll_bar_actual_width + = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); - x_compute_fringe_widths (f, 0); + compute_fringe_widths (f, 0); - pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols); - pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows); + pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); + pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows); - f->output_data.w32->win_gravity = NorthWestGravity; + f->win_gravity = NorthWestGravity; x_wm_set_size_hint (f, (long) 0, 0); { @@ -10490,8 +5498,8 @@ x_set_window_size (f, change_gravity, cols, rows) We pass 1 for DELAY since we can't run Lisp code inside of a BLOCK_INPUT. */ change_frame_size (f, rows, cols, 0, 1, 0); - PIXEL_WIDTH (f) = pixelwidth; - PIXEL_HEIGHT (f) = pixelheight; + FRAME_PIXEL_WIDTH (f) = pixelwidth; + FRAME_PIXEL_HEIGHT (f) = pixelheight; /* We've set {FRAME,PIXEL}_{WIDTH,HEIGHT} to the values we hope to receive in the ConfigureNotify event; if we get what we asked @@ -10522,14 +5530,14 @@ x_set_mouse_position (f, x, y) { int pix_x, pix_y; - pix_x = CHAR_TO_PIXEL_COL (f, x) + FONT_WIDTH (f->output_data.w32->font) / 2; - pix_y = CHAR_TO_PIXEL_ROW (f, y) + f->output_data.w32->line_height / 2; + pix_x = FRAME_COL_TO_PIXEL_X (f, x) + FRAME_COLUMN_WIDTH (f) / 2; + pix_y = FRAME_LINE_TO_PIXEL_Y (f, y) + FRAME_LINE_HEIGHT (f) / 2; if (pix_x < 0) pix_x = 0; - if (pix_x > PIXEL_WIDTH (f)) pix_x = PIXEL_WIDTH (f); + if (pix_x > FRAME_PIXEL_WIDTH (f)) pix_x = FRAME_PIXEL_WIDTH (f); if (pix_y < 0) pix_y = 0; - if (pix_y > PIXEL_HEIGHT (f)) pix_y = PIXEL_HEIGHT (f); + if (pix_y > FRAME_PIXEL_HEIGHT (f)) pix_y = FRAME_PIXEL_HEIGHT (f); x_set_mouse_pixel_position (f, pix_x, pix_y); } @@ -10697,7 +5705,7 @@ x_make_frame_visible (f) before the window gets really visible. */ if (! FRAME_ICONIFIED_P (f) && ! f->output_data.w32->asked_for_visible) - x_set_offset (f, f->output_data.w32->left_pos, f->output_data.w32->top_pos, 0); + x_set_offset (f, f->left_pos, f->top_pos, 0); f->output_data.w32->asked_for_visible = 1; @@ -10885,15 +5893,16 @@ x_wm_set_size_hint (f, flags, user_position) enter_crit (); - SetWindowLong (window, WND_FONTWIDTH_INDEX, FONT_WIDTH (f->output_data.w32->font)); - SetWindowLong (window, WND_LINEHEIGHT_INDEX, f->output_data.w32->line_height); - SetWindowLong (window, WND_BORDER_INDEX, f->output_data.w32->internal_border_width); - SetWindowLong (window, WND_SCROLLBAR_INDEX, f->output_data.w32->vertical_scroll_bar_extra); + SetWindowLong (window, WND_FONTWIDTH_INDEX, FRAME_COLUMN_WIDTH (f)); + SetWindowLong (window, WND_LINEHEIGHT_INDEX, FRAME_LINE_HEIGHT (f)); + SetWindowLong (window, WND_BORDER_INDEX, FRAME_INTERNAL_BORDER_WIDTH (f)); + SetWindowLong (window, WND_SCROLLBAR_INDEX, f->scroll_bar_actual_width); leave_crit (); } /* Window manager things */ +void x_wm_set_icon_position (f, icon_x, icon_y) struct frame *f; int icon_x, icon_y; @@ -11061,10 +6070,67 @@ w32_initialize_display_info (display_name) dpyinfo->mouse_face_window = Qnil; dpyinfo->mouse_face_overlay = Qnil; dpyinfo->mouse_face_hidden = 0; + + dpyinfo->vertical_scroll_bar_cursor = w32_load_cursor (IDC_ARROW); /* TODO: dpyinfo->gray */ } +/* Create an xrdb-style database of resources to supercede registry settings. + The database is just a concatenation of C strings, finished by an additional + \0. The string are submitted to some basic normalization, so + + [ *]option[ *]:[ *]value... + + becomes + + option:value... + + but any whitespace following value is not removed. */ + +static char * +w32_make_rdb (xrm_option) + char *xrm_option; +{ + char *buffer = xmalloc (strlen (xrm_option) + 2); + char *current = buffer; + char ch; + int in_option = 1; + int before_value = 0; + + do { + ch = *xrm_option++; + + if (ch == '\n') + { + *current++ = '\0'; + in_option = 1; + before_value = 0; + } + else if (ch != ' ') + { + *current++ = ch; + if (in_option && (ch == ':')) + { + in_option = 0; + before_value = 1; + } + else if (before_value) + { + before_value = 0; + } + } + else if (!(in_option || before_value)) + { + *current++ = ch; + } + } while (ch); + + *current = '\0'; + + return buffer; +} + struct w32_display_info * w32_term_init (display_name, xrm_option, resource_name) Lisp_Object display_name; @@ -11082,23 +6148,12 @@ w32_term_init (display_name, xrm_option, resource_name) w32_initialized = 1; } - { - int argc = 0; - char *argv[3]; - - argv[0] = ""; - argc = 1; - if (xrm_option) - { - argv[argc++] = "-xrm"; - argv[argc++] = xrm_option; - } - } - w32_initialize_display_info (display_name); dpyinfo = &one_w32_display_info; + dpyinfo->xrdb = xrm_option ? w32_make_rdb (xrm_option) : NULL; + /* Put this display on the chain. */ dpyinfo->next = x_display_list; x_display_list = dpyinfo; @@ -11125,15 +6180,14 @@ w32_term_init (display_name, xrm_option, resource_name) w32_defined_color (0, "black", &color, 1); } - /* Create Row Bitmaps and store them for later use. */ - left_bmp = CreateBitmap (left_width, left_height, 1, 1, left_bits); - ov_bmp = CreateBitmap (ov_width, ov_height, 1, 1, ov_bits); - right_bmp = CreateBitmap (right_width, right_height, 1, 1, right_bits); - continued_bmp = CreateBitmap (continued_width, continued_height, 1, - 1, continued_bits); - continuation_bmp = CreateBitmap (continuation_width, continuation_height, - 1, 1, continuation_bits); - zv_bmp = CreateBitmap (zv_width, zv_height, 1, 1, zv_bits); + /* Create Fringe Bitmaps and store them for later use. + + On W32, bitmaps are all unsigned short, as Windows requires + bitmap data to be Word aligned. For some reason they are + horizontally reflected compared to how they appear on X, so we + need to bitswap and convert to unsigned shorts before creating + the bitmaps. */ + w32_init_fringe (); #ifndef F_SETOWN_BUG #ifdef F_SETOWN @@ -11201,13 +6255,7 @@ x_delete_display (dpyinfo) xfree (dpyinfo->font_table); xfree (dpyinfo->w32_id_name); - /* Destroy row bitmaps. */ - DeleteObject (left_bmp); - DeleteObject (ov_bmp); - DeleteObject (right_bmp); - DeleteObject (continued_bmp); - DeleteObject (continuation_bmp); - DeleteObject (zv_bmp); + w32_reset_fringes (); } /* Set up use of W32. */ @@ -11218,8 +6266,11 @@ void x_flush (struct frame * f) { /* Nothing to do */ } +extern frame_parm_handler w32_frame_parm_handlers[]; + static struct redisplay_interface w32_redisplay_interface = { + w32_frame_parm_handlers, x_produce_glyphs, x_write_glyphs, x_insert_glyphs, @@ -11228,11 +6279,24 @@ static struct redisplay_interface w32_redisplay_interface = x_after_update_window_line, x_update_window_begin, x_update_window_end, - w32_cursor_to, + x_cursor_to, x_flush, - x_clear_mouse_face, - x_get_glyph_overhangs, - x_fix_overlapping_area + 0, /* flush_display_optional */ + x_clear_window_mouse_face, + w32_get_glyph_overhangs, + x_fix_overlapping_area, + w32_draw_fringe_bitmap, + w32_define_fringe_bitmap, + w32_destroy_fringe_bitmap, + w32_per_char_metric, + w32_encode_char, + NULL, /* w32_compute_glyph_string_overhangs */ + x_draw_glyph_string, + w32_define_frame_cursor, + w32_clear_frame_area, + w32_draw_window_cursor, + w32_draw_vertical_window_border, + w32_shift_glyphs_for_insert }; void @@ -11258,7 +6322,6 @@ w32_initialize () condemn_scroll_bars_hook = w32_condemn_scroll_bars; redeem_scroll_bar_hook = w32_redeem_scroll_bar; judge_scroll_bars_hook = w32_judge_scroll_bars; - estimate_mode_line_height_hook = x_estimate_mode_line_height; scroll_region_ok = 1; /* we'll scroll partial frames */ char_ins_del_ok = 1; @@ -11273,6 +6336,12 @@ w32_initialize () w32_system_caret_x = 0; w32_system_caret_y = 0; + /* Initialize w32_use_visible_system_caret based on whether a screen + reader is in use. */ + if (!SystemParametersInfo (SPI_GETSCREENREADER, 0, + &w32_use_visible_system_caret, 0)) + w32_use_visible_system_caret = 0; + last_tool_bar_item = -1; any_help_event_p = 0; @@ -11317,6 +6386,8 @@ w32_initialize () /* Dynamically link to optional system components. */ { HANDLE user_lib = LoadLibrary ("user32.dll"); + UINT smoothing_type; + BOOL smoothing_enabled; #define LOAD_PROC(fn) pfn##fn = (void *) GetProcAddress (user_lib, #fn) @@ -11337,6 +6408,28 @@ w32_initialize () effectively form the border of the main scroll bar range. */ vertical_scroll_bar_top_border = vertical_scroll_bar_bottom_border = GetSystemMetrics (SM_CYVSCROLL); + + /* Constants that are not always defined by the system headers + since they only exist on certain versions of Windows. */ +#ifndef SPI_GETFONTSMOOTHING +#define SPI_GETFONTSMOOTHING 0x4A +#endif +#ifndef SPI_GETFONTSMOOTHINGTYPE +#define SPI_GETFONTSMOOTHINGTYPE 0x0200A +#endif +#ifndef FE_FONTSMOOTHINGCLEARTYPE +#define FE_FONTSMOOTHINGCLEARTYPE 0x2 +#endif + + /* Determine if Cleartype is in use. Used to enable a hack in + the char metric calculations which adds extra pixels to + compensate for the "sub-pixels" that are not counted by the + system APIs. */ + cleartype_active = + SystemParametersInfo (SPI_GETFONTSMOOTHING, 0, &smoothing_enabled, 0) + && smoothing_enabled + && SystemParametersInfo (SPI_GETFONTSMOOTHINGTYPE, 0, &smoothing_type, 0) + && smoothing_type == FE_FONTSMOOTHINGCLEARTYPE; } } @@ -11353,9 +6446,9 @@ syms_of_w32term () Qvendor_specific_keysyms = intern ("vendor-specific-keysyms"); DEFVAR_INT ("w32-num-mouse-buttons", - &Vw32_num_mouse_buttons, + &w32_num_mouse_buttons, doc: /* Number of physical mouse buttons. */); - Vw32_num_mouse_buttons = Qnil; + w32_num_mouse_buttons = 2; DEFVAR_LISP ("w32-swap-mouse-buttons", &Vw32_swap_mouse_buttons, @@ -11393,20 +6486,6 @@ NT uses Unicode internally anyway, so this flag will probably have no affect on NT machines. */); w32_enable_unicode_output = 1; - help_echo = Qnil; - staticpro (&help_echo); - help_echo_object = Qnil; - staticpro (&help_echo_object); - help_echo_window = Qnil; - staticpro (&help_echo_window); - previous_help_echo = Qnil; - staticpro (&previous_help_echo); - help_echo_pos = -1; - - DEFVAR_BOOL ("mouse-autoselect-window", &mouse_autoselect_window, - doc: /* *Non-nil means autoselect window with mouse pointer. */); - mouse_autoselect_window = 0; - DEFVAR_BOOL ("w32-use-visible-system-caret", &w32_use_visible_system_caret, doc: /* Flag to make the system caret visible. @@ -11420,25 +6499,19 @@ software is running as it starts up. When this variable is set, other variables affecting the appearance of the cursor have no effect. */); - /* Initialize w32_use_visible_system_caret based on whether a screen - reader is in use. */ - if (!SystemParametersInfo (SPI_GETSCREENREADER, 0, - &w32_use_visible_system_caret, 0)) - w32_use_visible_system_caret = 0; - - DEFVAR_BOOL ("x-stretch-cursor", &x_stretch_cursor_p, - doc: /* *Non-nil means draw block cursor as wide as the glyph under it. -For example, if a block cursor is over a tab, it will be drawn as -wide as that tab on the display. */); - x_stretch_cursor_p = 0; + w32_use_visible_system_caret = 0; + /* We don't yet support this, but defining this here avoids whining + from cus-start.el and other places, like "M-x set-variable". */ DEFVAR_BOOL ("x-use-underline-position-properties", &x_use_underline_position_properties, - doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. + doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. nil means ignore them. If you encounter fonts with bogus UNDERLINE_POSITION font properties, for example 7x13 on XFree prior -to 4.1, set this to nil. */); - x_use_underline_position_properties = 1; +to 4.1, set this to nil. + +NOTE: Not supported on MS-Windows yet. */); + x_use_underline_position_properties = 0; DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, doc: /* If not nil, Emacs uses toolkit scroll bars. */); @@ -11447,3 +6520,6 @@ to 4.1, set this to nil. */); staticpro (&last_mouse_motion_frame); last_mouse_motion_frame = Qnil; } + +/* arch-tag: 5fa70624-ab86-499c-8a85-473958ee4646 + (do not change this comment) */