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

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index 61d1a1a5..30aaa1bc 100644
--- a/src/libgame/x11.c
+++ b/src/libgame/x11.c
@@ -93,9 +93,6 @@ static DrawWindow *X11InitWindow()
   Pixmap icon_pixmap, iconmask_pixmap;
   unsigned int icon_width, icon_height;
   int icon_hot_x, icon_hot_y;
-#if 0
-  char icon_filename[256];
-#endif
   XSizeHints size_hints;
   XWMHints wm_hints;
   XClassHint class_hints;
@@ -106,21 +103,11 @@ static DrawWindow *X11InitWindow()
 #endif
   int screen_width, screen_height;
   int win_xpos, win_ypos;
-  unsigned long pen_fg = WhitePixel(display,screen);
-  unsigned long pen_bg = BlackPixel(display,screen);
+  unsigned long pen_fg = WhitePixel(display, screen);
+  unsigned long pen_bg = BlackPixel(display, screen);
   const int width = video.width, height = video.height;
   int i;
 
-#if 0
-#if !defined(PLATFORM_MSDOS)
-  static struct IconFileInfo icon_pic =
-  {
-    "rocks_icon.xbm",
-    "rocks_iconmask.xbm"
-  };
-#endif
-#endif
-
   screen_width = XDisplayWidth(display, screen);
   screen_height = XDisplayHeight(display, screen);
 
@@ -140,10 +127,6 @@ static DrawWindow *X11InitWindow()
     XChangeProperty(display, new_window->drawable, proto_atom, XA_ATOM, 32,
 		    PropModePrepend, (unsigned char *) &delete_atom, 1);
 
-#if 0
-  sprintf(icon_filename, "%s/%s", options.graphics_directory,
-	  icon_pic.picture_filename);
-#endif
   if (XReadBitmapFile(display, new_window->drawable,
 		      getCustomImageFilename(program.x11_icon_filename),
 		      &icon_width, &icon_height, &icon_pixmap,
@@ -151,10 +134,6 @@ static DrawWindow *X11InitWindow()
     Error(ERR_EXIT, "cannot read icon bitmap file '%s'",
 	  program.x11_icon_filename);
 
-#if 0
-  sprintf(icon_filename, "%s/%s", options.graphics_directory,
-	  icon_pic.picturemask_filename);
-#endif
   if (XReadBitmapFile(display, new_window->drawable,
 		      getCustomImageFilename(program.x11_iconmask_filename),
 		      &icon_width, &icon_height, &iconmask_pixmap,
@@ -198,12 +177,10 @@ static DrawWindow *X11InitWindow()
   /* Select event types wanted */
   window_event_mask =
     ExposureMask | StructureNotifyMask | FocusChangeMask |
-    ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
+    ButtonPressMask | ButtonReleaseMask |
+    PointerMotionMask | PointerMotionHintMask |
     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
 
@@ -216,7 +193,7 @@ static DrawWindow *X11InitWindow()
     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);
@@ -401,11 +378,12 @@ inline Pixel X11GetPixel(Bitmap *bitmap, int x, int y)
 			  AllPlanes, ZPixmap);
   pixel_value = XGetPixel(pixel_image, 0, 0);
 
-  XDestroyImage(pixel_image);
+  X11DestroyImage(pixel_image);
 
   return pixel_value;
 }
 
+#if defined(TARGET_X11_NATIVE)
 inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
 				unsigned int color_b)
 {
@@ -422,6 +400,22 @@ inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
 
   return pixel;
 }
+#endif	/* TARGET_X11_NATIVE */
+
+inline void X11DestroyImage(XImage *ximage)
+{
+#if defined(TARGET_X11_NATIVE)
+  /* this seems to be needed for OS/2, but does not hurt on other platforms */
+  if (ximage->data != NULL)
+  {
+    free(ximage->data);
+    ximage->data = NULL;
+  }
+#endif	/* TARGET_X11_NATIVE */
+
+  XDestroyImage(ximage);
+}
+
 
 /* ------------------------------------------------------------------------- */
 /* mouse pointer functions                                                   */
@@ -429,82 +423,46 @@ inline Pixel X11GetPixelFromRGB(unsigned int color_r, unsigned int color_g,
 
 #if defined(TARGET_X11_NATIVE)
 
-static Cursor create_cursor(const char **image)
+static Cursor create_cursor(struct MouseCursorInfo *cursor_info)
 {
   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);
+  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, hot_x, hot_y);
+			       &color_fg, &color_bg,
+			       cursor_info->hot_x, cursor_info->hot_y);
 
   return cursor;
 }
 
-void X11SetMouseCursor(const char **cursor_image)
+void X11SetMouseCursor(struct MouseCursorInfo *cursor_info)
 {
-  static const char **last_cursor_image = NULL;
+  static struct MouseCursorInfo *last_cursor_info = NULL;
   static Cursor cursor_default = None;
   static Cursor cursor_current = None;
 
-  if (cursor_image != NULL && cursor_image != last_cursor_image)
+  if (cursor_info != NULL && cursor_info != last_cursor_info)
   {
-    cursor_current = create_cursor(cursor_image);
-    last_cursor_image = cursor_image;
+    cursor_current = create_cursor(cursor_info);
+    last_cursor_info = cursor_info;
   }
 
   XDefineCursor(display, window->drawable,
-		cursor_image ? cursor_current : cursor_default);
+		cursor_info ? cursor_current : cursor_default);
 }
 #endif	/* TARGET_X11_NATIVE */