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

broadway: Clean up moveresize code

Browse Source
This commit is contained in:
Alexander Larsson 2013-03-28 17:38:44 +01:00
parent 0129876ed3
commit 19e683e62a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/broadway/gdkdisplay-broadway.h
View File

@ -66,6 +66,8 @@ struct _GdkBroadwayDisplay
GdkWindow *active_offscreen_window; GdkWindow *active_offscreen_window;
GdkBroadwayServer *server; GdkBroadwayServer *server;
gpointer move_resize_data;
}; };
struct _GdkBroadwayDisplayClass struct _GdkBroadwayDisplayClass

13
gdk/broadway/gdkwindow-broadway.c
View File

@ -999,20 +999,19 @@ static MoveResizeData *
get_move_resize_data (GdkDisplay *display, get_move_resize_data (GdkDisplay *display,
gboolean create) gboolean create)
{ {
GdkBroadwayDisplay *broadway_display;
MoveResizeData *mv_resize; MoveResizeData *mv_resize;
static GQuark move_resize_quark = 0;
if (!move_resize_quark) broadway_display = GDK_BROADWAY_DISPLAY (display);
move_resize_quark = g_quark_from_static_string ("gdk-window-moveresize");
mv_resize = g_object_get_qdata (G_OBJECT (display), move_resize_quark); mv_resize = broadway_display->move_resize_data;
if (!mv_resize && create) if (!mv_resize && create)
{ {
mv_resize = g_new0 (MoveResizeData, 1); mv_resize = g_new0 (MoveResizeData, 1);
mv_resize->display = display; mv_resize->display = display;
g_object_set_qdata (G_OBJECT (display), move_resize_quark, mv_resize); broadway_display->move_resize_data = mv_resize;
} }
return mv_resize; return mv_resize;
@ -1135,7 +1134,7 @@ _gdk_broadway_moveresize_handle_event (GdkDisplay *display,
switch (event->base.type) switch (event->base.type)
{ {
case 'm': case BROADWAY_EVENT_POINTER_MOVE:
if (mv_resize->moveresize_window->resize_count > 0) if (mv_resize->moveresize_window->resize_count > 0)
{ {
if (mv_resize->moveresize_pending_event) if (mv_resize->moveresize_pending_event)
@ -1163,7 +1162,7 @@ _gdk_broadway_moveresize_handle_event (GdkDisplay *display,
finish_drag (mv_resize); finish_drag (mv_resize);
break; break;
case 'B': case BROADWAY_EVENT_BUTTON_RELEASE:
update_pos (mv_resize, update_pos (mv_resize,
event->pointer.root_x, event->pointer.root_x,
event->pointer.root_y); event->pointer.root_y);