From 32e8dc45b03e667e2181b2d3239e26326f94d505 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Wed, 29 Apr 1998 00:51:55 +0000 Subject: [PATCH] Random debugging fixed this bug: There is no need to set the ExposureMask 1998-04-28 Miguel de Icaza * gdk/gdk.c (gdk_event_translate): Random debugging fixed this bug: There is no need to set the ExposureMask in the XGrabPointer (this caused DnD programs to crash). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/gdk.c | 6 +++--- gdk/x11/gdkmain-x11.c | 6 +++--- 9 files changed, 48 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f064fb9855..becc9e9dab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1998-04-28 Miguel de Icaza + + * gdk/gdk.c (gdk_event_translate): Random debugging fixed this + bug: There is no need to set the ExposureMask in the XGrabPointer + (this caused DnD programs to crash). + Fri Apr 24 01:29:04 1998 Tim Janik * gtk/gtkaccelerator.h (struct _GtkAcceleratorTable): changed ref_count diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f064fb9855..becc9e9dab 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +1998-04-28 Miguel de Icaza + + * gdk/gdk.c (gdk_event_translate): Random debugging fixed this + bug: There is no need to set the ExposureMask in the XGrabPointer + (this caused DnD programs to crash). + Fri Apr 24 01:29:04 1998 Tim Janik * gtk/gtkaccelerator.h (struct _GtkAcceleratorTable): changed ref_count diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f064fb9855..becc9e9dab 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +1998-04-28 Miguel de Icaza + + * gdk/gdk.c (gdk_event_translate): Random debugging fixed this + bug: There is no need to set the ExposureMask in the XGrabPointer + (this caused DnD programs to crash). + Fri Apr 24 01:29:04 1998 Tim Janik * gtk/gtkaccelerator.h (struct _GtkAcceleratorTable): changed ref_count diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f064fb9855..becc9e9dab 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +1998-04-28 Miguel de Icaza + + * gdk/gdk.c (gdk_event_translate): Random debugging fixed this + bug: There is no need to set the ExposureMask in the XGrabPointer + (this caused DnD programs to crash). + Fri Apr 24 01:29:04 1998 Tim Janik * gtk/gtkaccelerator.h (struct _GtkAcceleratorTable): changed ref_count diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f064fb9855..becc9e9dab 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +1998-04-28 Miguel de Icaza + + * gdk/gdk.c (gdk_event_translate): Random debugging fixed this + bug: There is no need to set the ExposureMask in the XGrabPointer + (this caused DnD programs to crash). + Fri Apr 24 01:29:04 1998 Tim Janik * gtk/gtkaccelerator.h (struct _GtkAcceleratorTable): changed ref_count diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f064fb9855..becc9e9dab 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +1998-04-28 Miguel de Icaza + + * gdk/gdk.c (gdk_event_translate): Random debugging fixed this + bug: There is no need to set the ExposureMask in the XGrabPointer + (this caused DnD programs to crash). + Fri Apr 24 01:29:04 1998 Tim Janik * gtk/gtkaccelerator.h (struct _GtkAcceleratorTable): changed ref_count diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f064fb9855..becc9e9dab 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +1998-04-28 Miguel de Icaza + + * gdk/gdk.c (gdk_event_translate): Random debugging fixed this + bug: There is no need to set the ExposureMask in the XGrabPointer + (this caused DnD programs to crash). + Fri Apr 24 01:29:04 1998 Tim Janik * gtk/gtkaccelerator.h (struct _GtkAcceleratorTable): changed ref_count diff --git a/gdk/gdk.c b/gdk/gdk.c index 9cd94cee72..30b11087b0 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -2329,11 +2329,11 @@ gdk_event_translate (GdkEvent *event, gdk_dnd_drag_addwindow((GdkWindow *) gdk_dnd.real_sw); gdk_dnd_drag_begin((GdkWindow *) gdk_dnd.real_sw); xgpret = - XGrabPointer(gdk_display, gdk_dnd.real_sw->xwindow, False, + XGrabPointer(gdk_display, gdk_dnd.real_sw->xwindow, True, ButtonMotionMask | PointerMotionMask | /* PointerMotionHintMask | */ /* HINTME */ - ButtonPressMask | ButtonReleaseMask | ExposureMask, - GrabModeAsync, GrabModeAsync, gdk_root_window, + ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, None, None, CurrentTime); #ifdef G_ENABLE_DEBUG GDK_NOTE(DND, g_print("xgpret = %d\n", xgpret)); diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 9cd94cee72..30b11087b0 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -2329,11 +2329,11 @@ gdk_event_translate (GdkEvent *event, gdk_dnd_drag_addwindow((GdkWindow *) gdk_dnd.real_sw); gdk_dnd_drag_begin((GdkWindow *) gdk_dnd.real_sw); xgpret = - XGrabPointer(gdk_display, gdk_dnd.real_sw->xwindow, False, + XGrabPointer(gdk_display, gdk_dnd.real_sw->xwindow, True, ButtonMotionMask | PointerMotionMask | /* PointerMotionHintMask | */ /* HINTME */ - ButtonPressMask | ButtonReleaseMask | ExposureMask, - GrabModeAsync, GrabModeAsync, gdk_root_window, + ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, None, None, CurrentTime); #ifdef G_ENABLE_DEBUG GDK_NOTE(DND, g_print("xgpret = %d\n", xgpret));