summaryrefslogtreecommitdiff
path: root/src/widget.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-05-19 18:32:59 +0000
committerRichard M. Stallman <rms@gnu.org>1994-05-19 18:32:59 +0000
commit30b10b150de6e36c9331fab7ed3c63032d564c81 (patch)
tree4bfb149b6431466770cd232037eccd1154889603 /src/widget.c
parent44fd159587692942246e056b9b05c6af1ca61a1b (diff)
downloademacs-30b10b150de6e36c9331fab7ed3c63032d564c81.tar.gz
(setup_frame_gcs): Move cursor_bits variable out of
setup_frame_gcs and rename to setup_frame_cursor_bits.
Diffstat (limited to 'src/widget.c')
-rw-r--r--src/widget.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/widget.c b/src/widget.c
index df146b681cb..bc3845c1dd5 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -532,6 +532,14 @@ create_frame_gcs (ew)
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 @@ setup_frame_gcs (ew)
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 @@ setup_frame_gcs (ew)
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 @@ setup_frame_gcs (ew)
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 @@ setup_frame_gcs (ew)
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),