rnd-20030505-1-src

[rocksndiamonds.git] / src / libgame / x11.c

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index 907b9f71f3b3470b11bde6966506a140773e2eed..38365464e3d8617bf4d7c512f84e25cc9f46a0a1 100644 (file)
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -198,8 +198,9 @@ static DrawWindow *X11InitWindow()
   /* Select event types wanted */
   window_event_mask =
     ExposureMask | StructureNotifyMask | FocusChangeMask |
-    ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
-    PointerMotionHintMask | KeyPressMask | KeyReleaseMask;
+    ButtonPressMask | ButtonReleaseMask |
+    PointerMotionMask | PointerMotionHintMask |
+    KeyPressMask | KeyReleaseMask;
 
   XSelectInput(display, new_window->drawable, window_event_mask);
 #endif
@@ -382,10 +383,17 @@ inline void X11FillRectangle(Bitmap *bitmap, int x, int y,
   XFillRectangle(display, bitmap->drawable, bitmap->gc, x, y, width, height);
 }
 
+inline void X11DrawSimpleLine(Bitmap *bitmap, int from_x, int from_y,
+                             int to_x, int to_y, Pixel color)
+{
+  XSetForeground(display, bitmap->gc, color);
+  XDrawLine(display, bitmap->drawable, bitmap->gc, from_x, from_y, to_x, to_y);
+}
+
 inline Pixel X11GetPixel(Bitmap *bitmap, int x, int y)
 {
-  unsigned long pixel_value;
   XImage *pixel_image;
+  Pixel pixel_value;
 
   pixel_image = XGetImage(display, bitmap->drawable, x, y, 1, 1,
                          AllPlanes, ZPixmap);
@@ -413,4 +421,53 @@ inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
   return pixel;
 }
 
+/* ------------------------------------------------------------------------- */
+/* mouse pointer functions                                                   */
+/* ------------------------------------------------------------------------- */
+
+#if defined(TARGET_X11_NATIVE)
+
+static Cursor create_cursor(struct MouseCursorInfo *cursor_info)
+{
+  Pixmap pixmap_data, pixmap_mask;
+  XColor color_fg, color_bg;
+  Cursor cursor;
+
+  /* shape and mask are single plane pixmaps */
+  pixmap_data =
+    XCreatePixmapFromBitmapData(display, window->drawable, cursor_info->data,
+                               cursor_info->width, cursor_info->height,
+                               1, 0, 1);
+  pixmap_mask =
+    XCreatePixmapFromBitmapData(display, window->drawable, cursor_info->mask,
+                               cursor_info->width, cursor_info->height,
+                               1, 0, 1);
+
+  XParseColor(display, cmap, "black", &color_fg);
+  XParseColor(display, cmap, "white", &color_bg);
+
+  cursor = XCreatePixmapCursor(display, pixmap_data, pixmap_mask,
+                              &color_fg, &color_bg,
+                              cursor_info->hot_x, cursor_info->hot_y);
+
+  return cursor;
+}
+
+void X11SetMouseCursor(struct MouseCursorInfo *cursor_info)
+{
+  static struct MouseCursorInfo *last_cursor_info = NULL;
+  static Cursor cursor_default = None;
+  static Cursor cursor_current = None;
+
+  if (cursor_info != NULL && cursor_info != last_cursor_info)
+  {
+    cursor_current = create_cursor(cursor_info);
+    last_cursor_info = cursor_info;
+  }
+
+  XDefineCursor(display, window->drawable,
+               cursor_info ? cursor_current : cursor_default);
+}
+#endif /* TARGET_X11_NATIVE */
+
 #endif /* TARGET_X11 */