# HG changeset patch # User Didier Verna # Date 1306695367 -7200 # Node ID f87be7ddd60d7047cc96a4bf735b6a37f45bedc2 # Parent 9d519ab9fd683ee9b3e426cebc22fa668308cae1 Simplify clear_region interface. -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2011-05-29 Didier Verna * console-impl.h (struct console_methods): Remove device parameter from the clear_region method prototype. * redisplay-output.c (redisplay_clear_region): Remove the device parameter from the clear_region method call. * console-stream.c (stream_clear_region): * redisplay-msw.c (mswindows_clear_region): * redisplay-tty.c (tty_clear_region): Update accordingly. * redisplay-xlike-inc.c (XLIKE_clear_region): Ditto. Get the device from the frame structure instead. diff -r 9d519ab9fd68 -r f87be7ddd60d src/ChangeLog --- a/src/ChangeLog Sun May 29 18:17:09 2011 +0100 +++ b/src/ChangeLog Sun May 29 20:56:07 2011 +0200 @@ -1,3 +1,15 @@ +2011-05-29 Didier Verna + + * console-impl.h (struct console_methods): Remove device parameter + from the clear_region method prototype. + * redisplay-output.c (redisplay_clear_region): Remove the device + parameter from the clear_region method call. + * console-stream.c (stream_clear_region): + * redisplay-msw.c (mswindows_clear_region): + * redisplay-tty.c (tty_clear_region): Update accordingly. + * redisplay-xlike-inc.c (XLIKE_clear_region): Ditto. Get the + device from the frame structure instead. + 2011-05-20 Jerry James * Makefile.in.in: Default DESTDIR to the empty string, and use it in diff -r 9d519ab9fd68 -r f87be7ddd60d src/console-impl.h --- a/src/console-impl.h Sun May 29 18:17:09 2011 +0100 +++ b/src/console-impl.h Sun May 29 20:56:07 2011 +0200 @@ -151,7 +151,7 @@ int (*eol_cursor_width_method) (void); void (*output_vertical_divider_method) (struct window *, int); void (*clear_to_window_end_method) (struct window *, int, int); - void (*clear_region_method) (Lisp_Object, struct device*, struct frame*, + void (*clear_region_method) (Lisp_Object, struct frame*, face_index, int, int, int, int, Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); diff -r 9d519ab9fd68 -r f87be7ddd60d src/console-stream.c --- a/src/console-stream.c Sun May 29 18:17:09 2011 +0100 +++ b/src/console-stream.c Sun May 29 20:56:07 2011 +0200 @@ -273,10 +273,11 @@ } static void -stream_clear_region (Lisp_Object UNUSED (window), struct device* UNUSED (d), - struct frame *UNUSED (f), face_index UNUSED (findex), - int UNUSED (x), int UNUSED (y), int UNUSED (width), - int UNUSED (height), Lisp_Object UNUSED (fcolor), +stream_clear_region (Lisp_Object UNUSED (window), struct frame *UNUSED (f), + face_index UNUSED (findex), + int UNUSED (x), int UNUSED (y), + int UNUSED (width), int UNUSED (height), + Lisp_Object UNUSED (fcolor), Lisp_Object UNUSED (bcolor), Lisp_Object UNUSED (background_pixmap), Lisp_Object UNUSED (background_placement)) diff -r 9d519ab9fd68 -r f87be7ddd60d src/redisplay-msw.c --- a/src/redisplay-msw.c Sun May 29 18:17:09 2011 +0100 +++ b/src/redisplay-msw.c Sun May 29 20:56:07 2011 +0200 @@ -1240,7 +1240,7 @@ ****************************************************************************/ static void mswindows_clear_region (Lisp_Object USED_IF_SCROLLBARS (locale), - struct device *UNUSED (d), struct frame *f, + struct frame *f, face_index UNUSED (findex), int x, int y, int width, int height, Lisp_Object fcolor, Lisp_Object bcolor, diff -r 9d519ab9fd68 -r f87be7ddd60d src/redisplay-output.c --- a/src/redisplay-output.c Sun May 29 18:17:09 2011 +0100 +++ b/src/redisplay-output.c Sun May 29 20:56:07 2011 +0200 @@ -1807,7 +1807,7 @@ if (UNBOUNDP (background_pixmap)) background_pixmap = Qnil; - DEVMETH (d, clear_region, (locale, d, f, findex, x, y, width, height, + DEVMETH (d, clear_region, (locale, f, findex, x, y, width, height, fcolor, bcolor, background_pixmap, background_placement)); } diff -r 9d519ab9fd68 -r f87be7ddd60d src/redisplay-tty.c --- a/src/redisplay-tty.c Sun May 29 18:17:09 2011 +0100 +++ b/src/redisplay-tty.c Sun May 29 20:56:07 2011 +0200 @@ -422,9 +422,9 @@ Clear the area in the box defined by the given parameters. ****************************************************************************/ static void -tty_clear_region (Lisp_Object window, struct device* UNUSED (d), - struct frame * f, face_index findex, int x, int y, - int width, int height, Lisp_Object UNUSED (fcolor), +tty_clear_region (Lisp_Object window, struct frame *f, face_index findex, + int x, int y, int width, int height, + Lisp_Object UNUSED (fcolor), Lisp_Object UNUSED (bcolor), Lisp_Object UNUSED (background_pixmap), Lisp_Object UNUSED (background_placement)) diff -r 9d519ab9fd68 -r f87be7ddd60d src/redisplay-xlike-inc.c --- a/src/redisplay-xlike-inc.c Sun May 29 18:17:09 2011 +0100 +++ b/src/redisplay-xlike-inc.c Sun May 29 20:56:07 2011 +0200 @@ -2021,14 +2021,14 @@ given face. ****************************************************************************/ static void -XLIKE_clear_region (Lisp_Object UNUSED (locale), struct device* d, - struct frame* f, face_index UNUSED (findex), int x, int y, - int width, int height, +XLIKE_clear_region (Lisp_Object UNUSED (locale), struct frame* f, + face_index UNUSED (findex), + int x, int y, int width, int height, Lisp_Object fcolor, Lisp_Object bcolor, Lisp_Object background_pixmap, Lisp_Object background_placement) { - XLIKE_DISPLAY dpy = GET_XLIKE_DISPLAY (d); + XLIKE_DISPLAY dpy = GET_XLIKE_DISPLAY (XDEVICE (f->device)); XLIKE_WINDOW x_win = GET_XLIKE_WINDOW (f); XLIKE_GC gc = NULL;