X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2Fjwxyz.h;h=58d17fe497f3b5035d084c07c41380bd60d49c46;hp=ad3947c2d53da74ca7fa36968ea88ca1509c9974;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hpb=ec8d2b32b63649e6d32bdfb306eda062769af823

diff --git a/OSX/jwxyz.h b/OSX/jwxyz.h
index ad3947c2..58d17fe4 100644
--- a/OSX/jwxyz.h
+++ b/OSX/jwxyz.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1991-2010 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1991-2012 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -67,9 +67,15 @@ typedef struct jwxyz_XtAppContext *	XtAppContext;
 typedef struct jwxyz_XtIntervalId *	XtIntervalId;
 typedef struct jwxyz_XtInputId *	XtInputId;
 typedef void *				XtPointer;
+typedef unsigned long			XtInputMask;
 #define XtInputReadMask			(1L<<0)
 #define XtInputWriteMask		(1L<<1)
 #define XtInputExceptMask		(1L<<2)
+#define XtIMXEvent			1
+#define XtIMTimer			2
+#define XtIMAlternateInput		4
+#define XtIMSignal			8
+#define XtIMAll (XtIMXEvent | XtIMTimer | XtIMAlternateInput | XtIMSignal)
 
 #define True 1
 #define TRUE 1
@@ -195,6 +201,33 @@ typedef void *				XtPointer;
 #define Button4Mask		(1<<11)
 #define Button5Mask		(1<<12)
 
+#define XK_Shift_L		0xFFE1
+#define XK_Shift_R		0xFFE2
+#define XK_Control_L		0xFFE3
+#define XK_Control_R		0xFFE4
+#define XK_Caps_Lock		0xFFE5
+#define XK_Shift_Lock		0xFFE6
+#define XK_Meta_L		0xFFE7
+#define XK_Meta_R		0xFFE8
+#define XK_Alt_L		0xFFE9
+#define XK_Alt_R		0xFFEA
+#define XK_Super_L		0xFFEB
+#define XK_Super_R		0xFFEC
+#define XK_Hyper_L		0xFFED
+#define XK_Hyper_R		0xFFEE
+
+#define XK_Home			0xFF50
+#define XK_Left			0xFF51
+#define XK_Up			0xFF52
+#define XK_Right		0xFF53
+#define XK_Down			0xFF54
+#define XK_Prior		0xFF55
+#define XK_Page_Up		0xFF55
+#define XK_Next			0xFF56
+#define XK_Page_Down		0xFF56
+#define XK_End			0xFF57
+#define XK_Begin		0xFF58
+
 #define GXclear			0x0		/* 0 */
 #define GXand			0x1		/* src AND dst */
 // #define GXandReverse		0x2		/* src AND NOT dst */
@@ -233,10 +266,13 @@ typedef void *				XtPointer;
 #define DisplayHeight XDisplayHeight
 #define XMaxRequestSize(dpy) (65535)
 
-extern Display *jwxyz_make_display (void *nsview);
+extern Display *jwxyz_make_display (void *nsview, void *cgc);
 extern void jwxyz_free_display (Display *);
 extern void *jwxyz_window_view (Window);
-extern void jwxyz_window_resized (Display *, Window w);
+extern void jwxyz_window_resized (Display *, Window,
+                                  int, int, int, int,
+                                  void *cgc);
+extern void jwxyz_mouse_moved (Display *, Window, int x, int y);
 
 extern Window XRootWindow (Display *, int screen);
 extern Screen *XDefaultScreenOfDisplay (Display *);
@@ -395,6 +431,8 @@ extern void XtRemoveTimeOut (XtIntervalId);
 extern XtInputId XtAppAddInput (XtAppContext, int fd, XtPointer flags,
                                XtInputCallbackProc, XtPointer closure);
 extern void XtRemoveInput (XtInputId);
+extern XtInputMask XtAppPending (XtAppContext);
+extern void XtAppProcessEvent (XtAppContext, XtInputMask);
 extern struct jwxyz_sources_data *display_sources_data (Display *);
 
 // Some GLX stuff that also doesn't technically belong here...