diff options
author | Ryan Lortie <desrt@desrt.ca> | 2014-05-28 16:21:31 +0200 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2014-06-17 13:46:07 +1200 |
commit | 582231fe18340f454cba11b141ccc8bb6e886f74 (patch) | |
tree | 0e275a506cdb0fe68f8eee665804d267309dee4f | |
parent | 4073e6b3f515f6021be4d40f6d0058088a438750 (diff) | |
download | gtk+-582231fe18340f454cba11b141ccc8bb6e886f74.tar.gz |
mir: allow windows to become focused
Send focus change events to toplevels in response to getting the event
from mir.
Now that the window is focused, cursor blink works, so wire up those
GtkSettings as well.
-rw-r--r-- | gdk/mir/gdkmireventsource.c | 22 | ||||
-rw-r--r-- | gdk/mir/gdkmirscreen.c | 18 |
2 files changed, 36 insertions, 4 deletions
diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c index c1b7febaf0..78ea4c3a56 100644 --- a/gdk/mir/gdkmireventsource.c +++ b/gdk/mir/gdkmireventsource.c @@ -472,6 +472,23 @@ generate_crossing_event (GdkWindow *window, GdkEventType type, gdouble x, gdoubl send_event (window, get_pointer (window), event); } +static void +generate_focus_event (GdkWindow *window, gboolean focused) +{ + GdkEvent *event; + + if (focused) + gdk_synthesize_window_state (window, 0, GDK_WINDOW_STATE_FOCUSED); + else + gdk_synthesize_window_state (window, GDK_WINDOW_STATE_FOCUSED, 0); + + event = gdk_event_new (GDK_FOCUS_CHANGE); + event->focus_change.send_event = FALSE; + event->focus_change.in = focused; + + send_event (window, get_pointer (window), event); +} + static guint get_modifier_state (unsigned int modifiers, unsigned int button_state) { @@ -603,10 +620,7 @@ handle_surface_event (GdkWindow *window, const MirSurfaceEvent *event) case mir_surface_attrib_swapinterval: break; case mir_surface_attrib_focus: - if (event->value) - gdk_synthesize_window_state (window, 0, GDK_WINDOW_STATE_FOCUSED); - else - gdk_synthesize_window_state (window, GDK_WINDOW_STATE_FOCUSED, 0); + generate_focus_event (window, event->value != 0); break; default: break; diff --git a/gdk/mir/gdkmirscreen.c b/gdk/mir/gdkmirscreen.c index 122918e883..157405a1c0 100644 --- a/gdk/mir/gdkmirscreen.c +++ b/gdk/mir/gdkmirscreen.c @@ -525,6 +525,24 @@ gdk_mir_screen_get_setting (GdkScreen *screen, return TRUE; } + if (g_str_equal (name, "gtk-cursor-blink")) + { + g_value_set_boolean (value, TRUE); + return TRUE; + } + + if (g_str_equal (name, "gtk-cursor-blink-time")) + { + g_value_set_int (value, 1200); + return TRUE; + } + + if (g_str_equal (name, "gtk-cursor-blink-timeout")) + { + g_value_set_int (value, 10); + return TRUE; + } + g_error ("unknown property %s", name); return FALSE; |