changeset 1122:e52c710e6d08

Minor change to allow dw_pointer_query_pos() to take NULL paramaters on GTK.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 26 Aug 2011 18:47:39 +0000
parents fb92778105b2
children 38856b5bb72e
files gtk/dw.c gtk3/dw.c
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/dw.c	Fri Aug 26 18:36:53 2011 +0000
+++ b/gtk/dw.c	Fri Aug 26 18:47:39 2011 +0000
@@ -3889,8 +3889,11 @@
 
    DW_MUTEX_LOCK;
    gdk_window_get_pointer (GDK_ROOT_PARENT(), &gx, &gy, &state);
-   *x = gx;
-   *y = gy;
+   if(x)
+      *x = gx;
+   if(y)
+      *y = gy;
+   printf("x %d y %d\n", gx, gy);
    DW_MUTEX_UNLOCK;
 }
 
--- a/gtk3/dw.c	Fri Aug 26 18:36:53 2011 +0000
+++ b/gtk3/dw.c	Fri Aug 26 18:47:39 2011 +0000
@@ -3552,8 +3552,10 @@
 #ifdef GDK_WINDOWING_X11
    gdk_window_get_pointer (gdk_x11_window_lookup_for_display(gdk_display_get_default(), GDK_ROOT_WINDOW()), &gx, &gy, &state);
 #endif
-   *x = gx;
-   *y = gy;
+   if(x)
+      *x = gx;
+   if(y)
+      *y = gy;
    DW_MUTEX_UNLOCK;
 }