X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fx11.c;h=61d1a1a5d2b06d7759ea32533004215b3ffe6286;hp=fcf316019c9775a36ec2ec6d2819cdfa22617c4e;hb=de8b3ae622eae10f1caf96872fb1790f7bd9644b;hpb=27a283729bf1e7b956c5ceba87215a6d177b4bc7

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index fcf31601..61d1a1a5 100644
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -199,7 +199,10 @@ static DrawWindow *X11InitWindow()
   window_event_mask =
     ExposureMask | StructureNotifyMask | FocusChangeMask |
     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
@@ -420,4 +423,89 @@ 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(const char **image)
+{
+  Pixmap pixmap_data, pixmap_mask;
+  XColor color_fg, color_bg;
+  Cursor cursor;
+
+  int i, row, col;
+  char data[4*32];
+  char mask[4*32];
+  int hot_x, hot_y;
+
+  int data_width = 32, data_height = 32;
+  int mask_width = 32, mask_height = 32;
+
+  i = -1;
+  for (row=0; row<32; ++row)
+  {
+    for (col=0; col<32; ++col)
+    {
+      if (col % 8)
+      {
+        data[i] <<= 1;
+        mask[i] <<= 1;
+      }
+      else
+      {
+        i++;
+        data[i] = mask[i] = 0;
+      }
+
+      switch (image[4+row][col])
+      {
+        case 'X':
+	  data[i] |= 0x01;
+	  mask[i] |= 0x01;
+	  break;
+        case '.':
+	  mask[i] |= 0x01;
+	  break;
+        case ' ':
+	  break;
+      }
+    }
+  }
+
+  sscanf(image[4+row], "%d,%d", &hot_x, &hot_y);
+
+  /* shape and mask are single plane pixmaps */
+  pixmap_data = XCreatePixmapFromBitmapData(display, window->drawable, data,
+					    data_width, data_height, 1, 0, 1);
+  pixmap_mask = XCreatePixmapFromBitmapData(display, window->drawable, mask,
+					    mask_width, mask_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, hot_x, hot_y);
+
+  return cursor;
+}
+
+void X11SetMouseCursor(const char **cursor_image)
+{
+  static const char **last_cursor_image = NULL;
+  static Cursor cursor_default = None;
+  static Cursor cursor_current = None;
+
+  if (cursor_image != NULL && cursor_image != last_cursor_image)
+  {
+    cursor_current = create_cursor(cursor_image);
+    last_cursor_image = cursor_image;
+  }
+
+  XDefineCursor(display, window->drawable,
+		cursor_image ? cursor_current : cursor_default);
+}
+#endif	/* TARGET_X11_NATIVE */
+
 #endif /* TARGET_X11 */