callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a gboolean create argument, so we don't create the structure unless we

Browse Source 
Tue Jun 18 11:46:33 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add
        a gboolean create argument, so we don't create the
        structure unless we actually emulate move-resize
        drags.
This commit is contained in:
Owen Taylor
2002-06-18 15:45:05 +00:00
committed by Owen Taylor
parent b80a2fe93d
commit 3c04199080
7 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Jun 18 11:46:33 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add
a gboolean create argument, so we don't create the
structure unless we actually emulate move-resize
drags.
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com> Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename): * gtk/gtkfilesel.c (gtk_file_selection_set_filename):

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
Tue Jun 18 11:46:33 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add
a gboolean create argument, so we don't create the
structure unless we actually emulate move-resize
drags.
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com> Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename): * gtk/gtkfilesel.c (gtk_file_selection_set_filename):

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
Tue Jun 18 11:46:33 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add
a gboolean create argument, so we don't create the
structure unless we actually emulate move-resize
drags.
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com> Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename): * gtk/gtkfilesel.c (gtk_file_selection_set_filename):

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
Tue Jun 18 11:46:33 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add
a gboolean create argument, so we don't create the
structure unless we actually emulate move-resize
drags.
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com> Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename): * gtk/gtkfilesel.c (gtk_file_selection_set_filename):

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
Tue Jun 18 11:46:33 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add
a gboolean create argument, so we don't create the
structure unless we actually emulate move-resize
drags.
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com> Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename): * gtk/gtkfilesel.c (gtk_file_selection_set_filename):

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
Tue Jun 18 11:46:33 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add
a gboolean create argument, so we don't create the
structure unless we actually emulate move-resize
drags.
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com> Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename): * gtk/gtkfilesel.c (gtk_file_selection_set_filename):

19
gdk/x11/gdkwindow-x11.c
View File

@ -4206,7 +4206,8 @@ wmspec_resize_drag (GdkWindow *window,
} }
static MoveResizeData * static MoveResizeData *
get_move_resize_data (GdkDisplay *display) get_move_resize_data (GdkDisplay *display,
gboolean create)
{ {
MoveResizeData *mv_resize; MoveResizeData *mv_resize;
static GQuark move_resize_quark = 0; static GQuark move_resize_quark = 0;
@ -4216,7 +4217,7 @@ get_move_resize_data (GdkDisplay *display)
mv_resize = g_object_get_qdata (G_OBJECT (display), move_resize_quark); mv_resize = g_object_get_qdata (G_OBJECT (display), move_resize_quark);
if (!mv_resize) if (!mv_resize && create)
{ {
mv_resize = g_new0 (MoveResizeData, 1); mv_resize = g_new0 (MoveResizeData, 1);
mv_resize->display = display; mv_resize->display = display;
@ -4296,7 +4297,7 @@ lookahead_motion_predicate (Display *xdisplay,
{ {
gboolean *seen_release = (gboolean *)arg; gboolean *seen_release = (gboolean *)arg;
GdkDisplay *display = gdk_x11_lookup_xdisplay (xdisplay); GdkDisplay *display = gdk_x11_lookup_xdisplay (xdisplay);
MoveResizeData *mv_resize = get_move_resize_data (display); MoveResizeData *mv_resize = get_move_resize_data (display, FALSE);
if (*seen_release) if (*seen_release)
return False; return False;
@ -4346,7 +4347,7 @@ _gdk_moveresize_handle_event (XEvent *event)
guint button_mask = 0; guint button_mask = 0;
GdkWindowObject *window_private; GdkWindowObject *window_private;
GdkDisplay *display= gdk_x11_lookup_xdisplay (event->xany.display); GdkDisplay *display= gdk_x11_lookup_xdisplay (event->xany.display);
MoveResizeData *mv_resize = get_move_resize_data (display); MoveResizeData *mv_resize = get_move_resize_data (display, FALSE);
if (!mv_resize->moveresize_window) if (!mv_resize->moveresize_window)
return FALSE; return FALSE;
@ -4402,13 +4403,11 @@ _gdk_moveresize_configure_done (GdkDisplay *display,
GdkWindow *window) GdkWindow *window)
{ {
XEvent *tmp_event; XEvent *tmp_event;
MoveResizeData *mv_resize = get_move_resize_data (display); MoveResizeData *mv_resize = get_move_resize_data (display, FALSE);
if (window != mv_resize->moveresize_window) if (!mv_resize || window != mv_resize->moveresize_window)
return FALSE; return FALSE;
g_assert (mv_resize != NULL);
if (mv_resize->moveresize_pending_event) if (mv_resize->moveresize_pending_event)
{ {
tmp_event = mv_resize->moveresize_pending_event; tmp_event = mv_resize->moveresize_pending_event;
@ -4476,7 +4475,7 @@ emulate_resize_drag (GdkWindow *window,
gint root_y, gint root_y,
guint32 timestamp) guint32 timestamp)
{ {
MoveResizeData *mv_resize = get_move_resize_data (GDK_WINDOW_DISPLAY (window)); MoveResizeData *mv_resize = get_move_resize_data (GDK_WINDOW_DISPLAY (window), TRUE);
mv_resize->is_resize = TRUE; mv_resize->is_resize = TRUE;
mv_resize->moveresize_button = button; mv_resize->moveresize_button = button;
@ -4504,7 +4503,7 @@ emulate_move_drag (GdkWindow *window,
gint root_y, gint root_y,
guint32 timestamp) guint32 timestamp)
{ {
MoveResizeData *mv_resize = get_move_resize_data (GDK_WINDOW_DISPLAY (window)); MoveResizeData *mv_resize = get_move_resize_data (GDK_WINDOW_DISPLAY (window), TRUE);
mv_resize->is_resize = FALSE; mv_resize->is_resize = FALSE;
mv_resize->moveresize_button = button; mv_resize->moveresize_button = button;