projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20031129-3-src
[rocksndiamonds.git]
/
src
/
libgame
/
x11.c
diff --git
a/src/libgame/x11.c
b/src/libgame/x11.c
index 278230de2cc7ea417641c1d93981f93c9d7c2f4e..ce520f6452ed70613d8fc664aec436669293541e 100644
(file)
--- a/
src/libgame/x11.c
+++ b/
src/libgame/x11.c
@@
-198,12
+198,10
@@
static DrawWindow *X11InitWindow()
/* Select event types wanted */
window_event_mask =
ExposureMask | StructureNotifyMask | FocusChangeMask |
/* Select event types wanted */
window_event_mask =
ExposureMask | StructureNotifyMask | FocusChangeMask |
- ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
+ ButtonPressMask | ButtonReleaseMask |
+ PointerMotionMask | PointerMotionHintMask |
KeyPressMask | KeyReleaseMask;
KeyPressMask | KeyReleaseMask;
- /* unwanted mouse motion events now get filtered out by filter function */
- /* window_event_mask |= PointerMotionHintMask; */
-
XSelectInput(display, new_window->drawable, window_event_mask);
#endif
XSelectInput(display, new_window->drawable, window_event_mask);
#endif
@@
-216,7
+214,7
@@
static DrawWindow *X11InitWindow()
XCreateGC(display, new_window->drawable, gc_valuemask, &gc_values);
/* create GCs for line drawing (black and white) */
XCreateGC(display, new_window->drawable, gc_valuemask, &gc_values);
/* create GCs for line drawing (black and white) */
- for
(i=0; i<
2; i++)
+ for
(i = 0; i <
2; i++)
{
gc_values.graphics_exposures = False;
gc_values.foreground = (i ? pen_fg : pen_bg);
{
gc_values.graphics_exposures = False;
gc_values.foreground = (i ? pen_fg : pen_bg);
@@
-406,6
+404,7
@@
inline Pixel X11GetPixel(Bitmap *bitmap, int x, int y)
return pixel_value;
}
return pixel_value;
}
+#if defined(TARGET_X11_NATIVE)
inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
unsigned int color_b)
{
inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
unsigned int color_b)
{
@@
-422,6
+421,8
@@
inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
return pixel;
}
return pixel;
}
+#endif /* TARGET_X11_NATIVE */
+
/* ------------------------------------------------------------------------- */
/* mouse pointer functions */
/* ------------------------------------------------------------------------- */
/* mouse pointer functions */