X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fx11.c;h=6d5cb0a9ffe513e25af43487da2dad744eb53aff;hb=201eaae5ae325e0c99e43ab240163a99dc5c0db9;hp=907b9f71f3b3470b11bde6966506a140773e2eed;hpb=34ed45c14d923459972fecf7a3b46f44d7e03670;p=rocksndiamonds.git

diff --git a/src/libgame/x11.c b/src/libgame/x11.c
index 907b9f71..6d5cb0a9 100644
--- 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
@@ -213,7 +214,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);
@@ -382,20 +383,28 @@ 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);
   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)
 {
@@ -412,5 +421,70 @@ 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                                                   */
+/* ------------------------------------------------------------------------- */
+
+#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 */