X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fx11.h;h=a7aaf38aa1a3b935ee5685ac6548d8cef109840e;hb=38ea4e57bc9b730abf7a15f8cc235465e6f0ad4c;hp=bce8ea69b8d75e5f33eea7c0f7a2cfff4154cadf;hpb=34ed45c14d923459972fecf7a3b46f44d7e03670;p=rocksndiamonds.git

diff --git a/src/libgame/x11.h b/src/libgame/x11.h
index bce8ea69..a7aaf38a 100644
--- a/src/libgame/x11.h
+++ b/src/libgame/x11.h
@@ -45,15 +45,20 @@
 
 #define FULLSCREEN_STATUS	FULLSCREEN_NOT_AVAILABLE
 
+#define CURSOR_MAX_WIDTH	32
+#define CURSOR_MAX_HEIGHT	32
+
 
 /* X11 type definitions */
 
 typedef struct X11DrawableInfo	Bitmap;
 typedef struct X11DrawableInfo	DrawWindow;
 typedef struct X11DrawableInfo	DrawBuffer;
-/* "Pixel" is already defined in X11/Intrinsic.h */
+/* "Pixel" is already defined */
+/* "Cursor" is already defined */
 
 typedef KeySym			Key;
+typedef unsigned int		KeyMod;
 
 typedef XEvent			Event;
 typedef XButtonEvent		ButtonEvent;
@@ -79,14 +84,21 @@ struct X11DrawableInfo
   GC clip_gc;		/* can be 'stored_clip_gc' or one-tile-only clip GC  */
 };
 
-struct XY
+struct MouseCursorInfo
 {
-  short x, y;
+  int width, height;
+  int hot_x, hot_y;
+
+  char data[CURSOR_MAX_WIDTH * CURSOR_MAX_HEIGHT / 8];
+  char mask[CURSOR_MAX_WIDTH * CURSOR_MAX_HEIGHT / 8];
 };
 
 
 /* X11 symbol definitions */
 
+#define BLACK_PIXEL		BlackPixel(display, screen)
+#define WHITE_PIXEL		WhitePixel(display, screen)
+
 #define EVENT_BUTTONPRESS	ButtonPress
 #define EVENT_BUTTONRELEASE	ButtonRelease
 #define EVENT_MOTIONNOTIFY	MotionNotify
@@ -299,20 +311,42 @@ struct XY
 #define KSYM_FKEY_LAST		KSYM_F24
 #define KSYM_NUM_FKEYS		(KSYM_FKEY_LAST - KSYM_FKEY_FIRST + 1)
 
+#define KMOD_None		None
+#define KMOD_Shift_L		0x0001
+#define KMOD_Shift_R		0x0002
+#define KMOD_Control_L		0x0040
+#define KMOD_Control_R		0x0080
+#define KMOD_Meta_L		0x0400
+#define KMOD_Meta_R		0x0800
+#define KMOD_Alt_L		0x0100
+#define KMOD_Alt_R		0x0200
+
+#define KMOD_Shift		(KMOD_Shift_L   | KMOD_Shift_R)
+#define KMOD_Control		(KMOD_Control_L | KMOD_Control_R)
+#define KMOD_Meta		(KMOD_Meta_L    | KMOD_Meta_R)
+#define KMOD_Alt		(KMOD_Alt_L     | KMOD_Alt_R)
+
 
 /* X11 function definitions */
 
-inline void X11InitVideoDisplay(void);
-inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
+void X11InitVideoDisplay(void);
+void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
 
 void X11ZoomBitmap(Bitmap *, Bitmap *);
 Bitmap *X11LoadImage(char *);
 
-inline void X11CreateBitmapContent(Bitmap *, int, int, int);
-inline void X11FreeBitmapPointers(Bitmap *);
-inline void X11CopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
-inline void X11FillRectangle(Bitmap *, int, int, int, int, Pixel);
-inline Pixel X11GetPixel(Bitmap *, int, int);
-inline Pixel X11GetPixelFromRGB(unsigned int, unsigned int, unsigned int);
+void X11CreateBitmapContent(Bitmap *, int, int, int);
+void X11FreeBitmapPointers(Bitmap *);
+void X11CopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
+void X11FillRectangle(Bitmap *, int, int, int, int, Pixel);
+void X11FadeScreen(Bitmap *, int, int, int);
+void X11DrawSimpleLine(Bitmap *, int, int, int, int, Pixel);
+Pixel X11GetPixel(Bitmap *, int, int);
+Pixel X11GetPixelFromRGB(unsigned int, unsigned int, unsigned int);
+void X11DestroyImage(XImage *);
+
+#if defined(TARGET_X11_NATIVE)
+void X11SetMouseCursor(struct MouseCursorInfo *);
+#endif
 
 #endif /* X11_H */