From 4c547ec4e3ee005d0a2df9c395505ca47864bf1c Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 7 Jun 2002 02:05:01 +0000 Subject: [PATCH] use the RootWindow of this screen for gdk_window_get_pointer. 2002-06-07 Mark McLoughlin * gtk/gtkwindow.c: (gtk_window_compute_configure_request): use the RootWindow of this screen for gdk_window_get_pointer. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkwindow.c | 3 ++- 7 files changed, 32 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0cac1bde88..37982521b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-06-07 Mark McLoughlin + + * gtk/gtkwindow.c: (gtk_window_compute_configure_request): use + the RootWindow of this screen for gdk_window_get_pointer. + 2002-06-06 Matthias Clasen * gdk/x11/gdkevents-x11.c (gdk_event_translate): Set diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0cac1bde88..37982521b0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-06-07 Mark McLoughlin + + * gtk/gtkwindow.c: (gtk_window_compute_configure_request): use + the RootWindow of this screen for gdk_window_get_pointer. + 2002-06-06 Matthias Clasen * gdk/x11/gdkevents-x11.c (gdk_event_translate): Set diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0cac1bde88..37982521b0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-06-07 Mark McLoughlin + + * gtk/gtkwindow.c: (gtk_window_compute_configure_request): use + the RootWindow of this screen for gdk_window_get_pointer. + 2002-06-06 Matthias Clasen * gdk/x11/gdkevents-x11.c (gdk_event_translate): Set diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0cac1bde88..37982521b0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-06-07 Mark McLoughlin + + * gtk/gtkwindow.c: (gtk_window_compute_configure_request): use + the RootWindow of this screen for gdk_window_get_pointer. + 2002-06-06 Matthias Clasen * gdk/x11/gdkevents-x11.c (gdk_event_translate): Set diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0cac1bde88..37982521b0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-06-07 Mark McLoughlin + + * gtk/gtkwindow.c: (gtk_window_compute_configure_request): use + the RootWindow of this screen for gdk_window_get_pointer. + 2002-06-06 Matthias Clasen * gdk/x11/gdkevents-x11.c (gdk_event_translate): Set diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0cac1bde88..37982521b0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-06-07 Mark McLoughlin + + * gtk/gtkwindow.c: (gtk_window_compute_configure_request): use + the RootWindow of this screen for gdk_window_get_pointer. + 2002-06-06 Matthias Clasen * gdk/x11/gdkevents-x11.c (gdk_event_translate): Set diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 70ff43b46c..104be1c2f4 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -4183,7 +4183,8 @@ gtk_window_compute_configure_request (GtkWindow *window, gint screen_height = gdk_screen_get_height (window->screen); int px, py; - gdk_window_get_pointer (NULL, &px, &py, NULL); + gdk_window_get_pointer (gdk_screen_get_root_window (window->screen), + &px, &py, NULL); x = px - w / 2; y = py - h / 2; x = CLAMP (x, 0, screen_width - w);