Mercurial > hg > xemacs-beta

changeset 5515:f87be7ddd60d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify clear_region interface. -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2011-05-29 Didier Verna <didier@xemacs.org> * 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.
author Didier Verna <didier@lrde.epita.fr>
date Sun, 29 May 2011 20:56:07 +0200
parents 9d519ab9fd68
children fa5fc2e3d9a6
files src/ChangeLog src/console-impl.h src/console-stream.c src/redisplay-msw.c src/redisplay-output.c src/redisplay-tty.c src/redisplay-xlike-inc.c
diffstat 7 files changed, 27 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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  <didier@xemacs.org>
+
+	* 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  <james@xemacs.org>
 
 	* Makefile.in.in: Default DESTDIR to the empty string, and use it in
--- 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);
--- 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))
--- 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,
--- 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));
 }
--- 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))
--- 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;