changeset 7557:889a8cd345b2

(setup_frame_gcs): Move cursor_bits variable out of setup_frame_gcs and rename to setup_frame_cursor_bits.
author Richard M. Stallman <rms@gnu.org>
date Thu, 19 May 1994 18:32:59 +0000
parents 48f98b59a339
children 8497bcb9fb8e
files src/widget.c
diffstat 1 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/widget.c	Thu May 19 17:21:02 1994 +0000
+++ b/src/widget.c	Thu May 19 18:32:59 1994 +0000
@@ -532,6 +532,14 @@
     XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), 0, 0);
 }
 
+static char setup_frame_cursor_bits[] =
+{
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
 static void
 setup_frame_gcs (ew)
      EmacsFrame ew;
@@ -540,14 +548,6 @@
   struct frame* s = ew->emacs_frame.frame;
   Pixmap blank_stipple, blank_tile;
 
-  static char cursor_bits[] =
-    {
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-    };
-
   /* We have to initialize all of our GCs to have a stipple/tile, otherwise
      XGetGCValues returns uninitialized data when we query the stipple
      (instead of None or something sensible) and it makes things hard.
@@ -559,7 +559,7 @@
 
   blank_stipple = 
     XCreateBitmapFromData (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)),
-			   cursor_bits, 2, 2);
+			   setup_frame_cursor_bits, 2, 2);
 
   /* use fg = 0, bg = 1 below, but it's irrelevant since this pixmap should
      never actually get used as a background tile!
@@ -567,7 +567,8 @@
   blank_tile =
     XCreatePixmapFromBitmapData (XtDisplay(ew),
 				 RootWindowOfScreen (XtScreen (ew)),
-				 cursor_bits, 2, 2, 0, 1, ew->core.depth);
+				 setup_frame_cursor_bits, 2, 2, 0, 1,
+				 ew->core.depth);
 
   /* Normal video */
   gc_values.font = ew->emacs_frame.font->fid;
@@ -602,7 +603,7 @@
   gc_values.stipple =
     XCreateBitmapFromData (XtDisplay (ew),
 			   RootWindowOfScreen (XtScreen (ew)),
-			   cursor_bits, 16, 16);
+			   setup_frame_cursor_bits, 16, 16);
   XChangeGC (XtDisplay (ew), s->display.x->cursor_gc,
 	     (GCFont | GCForeground | GCBackground | GCGraphicsExposures
 	      | GCStipple | GCTile),