Mercurial > emacs
changeset 111344:b775602e70c8
Cleanup fallout from redesigning mouse highlight.
dispextern.h (tty_draw_row_with_mouse_face): Add prototype.
xdisp.c (draw_row_with_mouse_face): Don't #ifdef away on MSDOS.
Call tty_draw_row_with_mouse_face on MSDOS as well.
msdos.c (tty_draw_row_with_mouse_face): Renamed from
draw_row_with_mouse_face. Make the argument list identical to the
GPM implementation.
msdos.h (Display_Info): Restore typedef.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 05 Nov 2010 12:03:17 +0200 |
| parents | f168d8610334 |
| children | 8ed4db9b46e6 |
| files | src/ChangeLog src/dispextern.h src/msdos.c src/msdos.h src/xdisp.c |
| diffstat | 5 files changed, 27 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Nov 02 21:35:12 2010 +0200 +++ b/src/ChangeLog Fri Nov 05 12:03:17 2010 +0200 @@ -1,3 +1,16 @@ +2010-11-05 Eli Zaretskii <eliz@gnu.org> + + * dispextern.h (tty_draw_row_with_mouse_face): Add prototype. + + * xdisp.c (draw_row_with_mouse_face): Don't #ifdef away on MSDOS. + Call tty_draw_row_with_mouse_face on MSDOS as well. + + * msdos.c (tty_draw_row_with_mouse_face): Renamed from + draw_row_with_mouse_face. Make the argument list identical with + GPM implementation. + + * msdos.h (Display_Info): Restore typedef. + 2010-11-02 Eli Zaretskii <eliz@gnu.org> * term.c: Remove static mouse_face_* variables. All users
--- a/src/dispextern.h Tue Nov 02 21:35:12 2010 +0200 +++ b/src/dispextern.h Fri Nov 05 12:03:17 2010 +0200 @@ -3040,12 +3040,13 @@ extern void note_mouse_highlight (struct frame *, int, int); extern void x_clear_window_mouse_face (struct window *); extern void cancel_mouse_face (struct frame *); -extern int clear_mouse_face (Display_Info *); -extern void show_mouse_face (Display_Info *, enum draw_glyphs_face); +extern int clear_mouse_face (Mouse_HLInfo *); +extern void show_mouse_face (Mouse_HLInfo *, enum draw_glyphs_face); extern int cursor_in_mouse_face_p (struct window *w); extern void draw_row_with_mouse_face (struct window *, int, struct glyph_row *, int, int, enum draw_glyphs_face); - +extern void tty_draw_row_with_mouse_face (struct window *, struct glyph_row *, + int, int, enum draw_glyphs_face); /* Flags passed to try_window. */ #define TRY_WINDOW_CHECK_MARGINS (1 << 0)
--- a/src/msdos.c Tue Nov 02 21:35:12 2010 +0200 +++ b/src/msdos.c Fri Nov 05 12:03:17 2010 +0200 @@ -948,12 +948,12 @@ } /* Draw TEXT_AREA glyphs between START and END of glyph row ROW on - window W, starting at x-position X. X is relative to TEXT_AREA - in W. HL is a face override for drawing the glyphs. */ + window W. X is relative to TEXT_AREA in W. HL is a face override + for drawing the glyphs. */ void -draw_row_with_mouse_face (struct window *w, int x, struct glyph_row *row, - int start_hpos, int end_hpos, - enum draw_glyphs_face hl) +tty_draw_row_with_mouse_face (struct window *w, struct glyph_row *row, + int start_hpos, int end_hpos, + enum draw_glyphs_face hl) { struct frame *f = XFRAME (WINDOW_FRAME (w)); struct tty_display_info *tty = FRAME_TTY (f);
--- a/src/msdos.h Tue Nov 02 21:35:12 2010 +0200 +++ b/src/msdos.h Fri Nov 05 12:03:17 2010 +0200 @@ -52,6 +52,8 @@ #define PIX_TYPE unsigned long #define XDISPLAY +typedef struct tty_display_info Display_Info; + extern struct tty_display_info the_only_display_info; #define FRAME_X_DISPLAY(f) ((Display *) 0)
--- a/src/xdisp.c Tue Nov 02 21:35:12 2010 +0200 +++ b/src/xdisp.c Fri Nov 05 12:03:17 2010 +0200 @@ -23614,9 +23614,8 @@ #endif /* HAVE_WINDOW_SYSTEM */ -/* Implementation of draw_row_with_mouse_face for GUI sessions and - GPM. MSDOS has its own implementation on msdos.c. */ -#ifndef MSDOS +/* Implementation of draw_row_with_mouse_face for GUI sessions, GPM, + and MSDOS. */ void draw_row_with_mouse_face (struct window *w, int start_x, struct glyph_row *row, int start_hpos, int end_hpos, @@ -23629,11 +23628,10 @@ return; } #endif -#ifdef HAVE_GPM +#if defined (HAVE_GPM) || defined (MSDOS) tty_draw_row_with_mouse_face (w, row, start_hpos, end_hpos, draw); #endif } -#endif /* not MSDOS */ /* EXPORT: Display the active region described by mouse_face_* according to DRAW. */