AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Fixed restoration of old event mask

Browse Source
This commit is contained in:
Elliot Lee 1997-12-18 23:38:39 +00:00
parent 1cf3f510d1
commit 8d0318387f
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gdk/gdk.c
View File

@ -1876,6 +1876,14 @@ gdk_event_translate (GdkEvent *event,
if(dnd_drag_perhaps)
{
{
XSetWindowAttributes attrs;
/* Reset event mask to pre-drag value, assuming event_mask
doesn't change during drag */
attrs.event_mask = real_sw->dnd_drag_savedeventmask;
XChangeWindowAttributes(gdk_display, real_sw->xwindow,
CWEventMask, &attrs);
}
if(gdk_dnd.drag_really)
{
GdkPoint foo;
@ -1888,16 +1896,6 @@ gdk_event_translate (GdkEvent *event,
gdk_dnd_drag_end(dnd_drag_target, foo);
gdk_dnd.drag_really = 0;
if(gdk_dnd.drag_numwindows)
{
XSetWindowAttributes attrs;
/* Reset event mask to pre-drag value, assuming event_mask
doesn't change during drag */
attrs.event_mask = real_sw->dnd_drag_savedeventmask;
XChangeWindowAttributes(gdk_display, real_sw->xwindow,
CWEventMask, &attrs);
}
gdk_dnd.drag_numwindows = 0;
if(gdk_dnd.drag_startwindows)
{
@ -1913,8 +1911,9 @@ gdk_event_translate (GdkEvent *event,
dnd_drag_dropzone.x = dnd_drag_dropzone.y = 0;
dnd_drag_dropzone.width = dnd_drag_dropzone.height = 0;
dnd_drag_curwin = None;
}
return_val = window_private && !window_private->destroyed;
return_val = window_private?TRUE:FALSE;
} else
return_val = window_private && !window_private->destroyed;
break;
case MotionNotify:

23
gdk/x11/gdkmain-x11.c
View File

@ -1876,6 +1876,14 @@ gdk_event_translate (GdkEvent *event,
if(dnd_drag_perhaps)
{
{
XSetWindowAttributes attrs;
/* Reset event mask to pre-drag value, assuming event_mask
doesn't change during drag */
attrs.event_mask = real_sw->dnd_drag_savedeventmask;
XChangeWindowAttributes(gdk_display, real_sw->xwindow,
CWEventMask, &attrs);
}
if(gdk_dnd.drag_really)
{
GdkPoint foo;
@ -1888,16 +1896,6 @@ gdk_event_translate (GdkEvent *event,
gdk_dnd_drag_end(dnd_drag_target, foo);
gdk_dnd.drag_really = 0;
if(gdk_dnd.drag_numwindows)
{
XSetWindowAttributes attrs;
/* Reset event mask to pre-drag value, assuming event_mask
doesn't change during drag */
attrs.event_mask = real_sw->dnd_drag_savedeventmask;
XChangeWindowAttributes(gdk_display, real_sw->xwindow,
CWEventMask, &attrs);
}
gdk_dnd.drag_numwindows = 0;
if(gdk_dnd.drag_startwindows)
{
@ -1913,8 +1911,9 @@ gdk_event_translate (GdkEvent *event,
dnd_drag_dropzone.x = dnd_drag_dropzone.y = 0;
dnd_drag_dropzone.width = dnd_drag_dropzone.height = 0;
dnd_drag_curwin = None;
}
return_val = window_private && !window_private->destroyed;
return_val = window_private?TRUE:FALSE;
} else
return_val = window_private && !window_private->destroyed;
break;
case MotionNotify: