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

quartz: Factor out toplevel from NSEvent code into function

Browse Source
This commit is contained in:
Kristian Rietveld 2011-11-05 22:53:22 +01:00
parent 6a7280ce1a
commit 7269cdf315
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gdk/quartz/gdkevents-quartz.c
View File

@ -323,6 +323,29 @@ get_window_point_from_screen_point (GdkWindow *window,
*y = window->height - point.y; *y = window->height - point.y;
} }
static GdkWindow *
get_toplevel_from_ns_event (NSEvent *nsevent,
NSPoint *screen_point,
gint *x,
gint *y)
{
GdkQuartzView *view;
GdkWindow *toplevel;
NSPoint point;
view = (GdkQuartzView *)[[nsevent window] contentView];
toplevel = [view gdkWindow];
point = [nsevent locationInWindow];
*screen_point = [[nsevent window] convertBaseToScreen:point];
*x = point.x;
*y = toplevel->height - point.y;
return toplevel;
}
static GdkEvent * static GdkEvent *
create_focus_event (GdkWindow *window, create_focus_event (GdkWindow *window,
gboolean in) gboolean in)
@ -652,20 +675,13 @@ find_window_for_ns_event (NSEvent *nsevent,
gint *y_root) gint *y_root)
{ {
GdkQuartzView *view; GdkQuartzView *view;
NSPoint point; GdkWindow *toplevel;
NSPoint screen_point; NSPoint screen_point;
NSEventType event_type; NSEventType event_type;
GdkWindow *toplevel;
view = (GdkQuartzView *)[[nsevent window] contentView]; view = (GdkQuartzView *)[[nsevent window] contentView];
toplevel = [view gdkWindow];
point = [nsevent locationInWindow];
screen_point = [[nsevent window] convertBaseToScreen:point];
*x = point.x;
*y = toplevel->height - point.y;
toplevel = get_toplevel_from_ns_event (nsevent, &screen_point, x, y);
_gdk_quartz_window_nspoint_to_gdk_xy (screen_point, x_root, y_root); _gdk_quartz_window_nspoint_to_gdk_xy (screen_point, x_root, y_root);
event_type = [nsevent type]; event_type = [nsevent type];