X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fdevice.h;h=1e8f0b5f7ac130a507fb630e2dbffd2041ac259c;hb=f8b0dcc32dce11bef09e2fbcde040aecd1f86fd1;hp=139809fa6a15cabf5769ece74d99a9f44b3f31b9;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git

diff --git a/src/device.h b/src/device.h
index 139809f..1e8f0b5 100644
--- a/src/device.h
+++ b/src/device.h
@@ -100,7 +100,7 @@ struct device
      frames on this device have the window-system focus), but
      selected_frame will never be nil if there are any frames on
      the device. */
-  Lisp_Object _selected_frame;
+  Lisp_Object selected_frame;
   /* Frame that currently contains the window-manager focus, or none.
      Note that we've split frame_with_focus into two variables.
      frame_with_focus_real is the value we use most of the time,
@@ -167,11 +167,13 @@ struct device
   unsigned int faces_changed :1;
   unsigned int frame_changed :1;
   unsigned int glyphs_changed :1;
+  unsigned int subwindows_changed :1;
   unsigned int icon_changed :1;
   unsigned int menubar_changed :1;
   unsigned int modeline_changed :1;
   unsigned int point_changed :1;
   unsigned int size_changed :1;
+  unsigned int gutter_changed :1;
   unsigned int toolbar_changed :1;
   unsigned int windows_changed :1;
   unsigned int windows_structure_changed :1;
@@ -308,7 +310,7 @@ int valid_device_class_p (Lisp_Object class);
 #define DEVICE_NAME(d) ((d)->name)
 #define DEVICE_CLASS(d) ((d)->device_class)
 /* Catch people attempting to set this. */
-#define DEVICE_SELECTED_FRAME(d) NON_LVALUE ((d)->_selected_frame)
+#define DEVICE_SELECTED_FRAME(d) NON_LVALUE ((d)->selected_frame)
 #define DEVICE_FRAME_WITH_FOCUS_REAL(d) ((d)->frame_with_focus_real)
 #define DEVICE_FRAME_WITH_FOCUS_FOR_HOOKS(d) ((d)->frame_with_focus_for_hooks)
 #define DEVICE_FRAME_THAT_OUGHT_TO_HAVE_FOCUS(d)			\
@@ -331,11 +333,11 @@ int valid_device_class_p (Lisp_Object class);
 #define INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE(d)			\
   ((void) ((d)->pixel_to_glyph_cache.valid = 0))
 
-#define INVALIDATE_PIXEL_TO_GLYPH_CACHE do {				\
-  Lisp_Object _devcons_, _concons_;					\
-  DEVICE_LOOP_NO_BREAK (_devcons_, _concons_)				\
-    INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE (XDEVICE (XCAR (_devcons_)));\
-  } while (0)
+#define INVALIDATE_PIXEL_TO_GLYPH_CACHE do {					\
+  Lisp_Object IPTGC_devcons, IPTGC_concons;					\
+  DEVICE_LOOP_NO_BREAK (IPTGC_devcons, IPTGC_concons)				\
+    INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE (XDEVICE (XCAR (IPTGC_devcons)));	\
+} while (0)
 
 #define MARK_DEVICE_FACES_CHANGED(d)			\
   ((void) (faces_changed = (d)->faces_changed = 1))
@@ -343,9 +345,15 @@ int valid_device_class_p (Lisp_Object class);
 #define MARK_DEVICE_GLYPHS_CHANGED(d)			\
   ((void) (glyphs_changed = (d)->glyphs_changed = 1))
 
+#define MARK_DEVICE_SUBWINDOWS_CHANGED(d)			\
+  ((void) (subwindows_changed = (d)->subwindows_changed = 1))
+
 #define MARK_DEVICE_TOOLBARS_CHANGED(d)			\
   ((void) (toolbar_changed = (d)->toolbar_changed = 1))
 
+#define MARK_DEVICE_GUTTERS_CHANGED(d)		\
+  ((void) (gutter_changed = (d)->gutter_changed = 1))
+
 #define MARK_DEVICE_SIZE_CHANGED(d)			\
   ((void) (size_changed = (d)->size_changed = 1))