X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkapplication.c;h=9072907513ffb70707d19487a01e29b763adaed1;hb=e1edc998a2e9c557030d207533932b3120e13fe5;hp=efc1a8b48691cdb20f71b15a13942e0d00a5f0b0;hpb=f7683b05b1c29ecc715715b95b2011a895917cf4;p=~andy%2Fgtk diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c index efc1a8b48..907290751 100644 --- a/gtk/gtkapplication.c +++ b/gtk/gtkapplication.c @@ -33,7 +33,6 @@ #include "gtkmain.h" #include "gtkrecentmanager.h" #include "gtkaccelmapprivate.h" -#include "gactionmuxer.h" #include "gtkintl.h" #ifdef GDK_WINDOWING_QUARTZ @@ -48,6 +47,8 @@ #include #endif +extern void _gtk_accessibility_shutdown (void); + /** * SECTION:gtkapplication * @title: GtkApplication @@ -132,7 +133,8 @@ enum { PROP_ZERO, PROP_REGISTER_SESSION, PROP_APP_MENU, - PROP_MENUBAR + PROP_MENUBAR, + PROP_ACTIVE_WINDOW }; G_DEFINE_TYPE (GtkApplication, gtk_application, G_TYPE_APPLICATION) @@ -166,7 +168,6 @@ struct _GtkApplicationPrivate #endif #ifdef GDK_WINDOWING_QUARTZ - GActionMuxer *muxer; GMenu *combined; GSList *inhibitors; @@ -218,7 +219,6 @@ static void gtk_application_set_app_menu_x11 (GtkApplication *application, GMenuModel *app_menu) { - g_free (application->priv->app_menu_path); gtk_application_x11_publish_menu (application, "appmenu", app_menu, &application->priv->app_menu_id, &application->priv->app_menu_path); @@ -228,7 +228,6 @@ static void gtk_application_set_menubar_x11 (GtkApplication *application, GMenuModel *menubar) { - g_free (application->priv->menubar_path); gtk_application_x11_publish_menu (application, "menubar", menubar, &application->priv->menubar_id, &application->priv->menubar_path); @@ -290,6 +289,9 @@ gtk_application_startup_x11 (GtkApplication *application) static void gtk_application_shutdown_x11 (GtkApplication *application) { + gtk_application_set_app_menu_x11 (application, NULL); + gtk_application_set_menubar_x11 (application, NULL); + application->priv->session_bus = NULL; application->priv->object_path = NULL; @@ -297,9 +299,6 @@ gtk_application_shutdown_x11 (GtkApplication *application) g_clear_object (&application->priv->client_proxy); g_free (application->priv->app_id); g_free (application->priv->client_path); - - g_free (application->priv->app_menu_path); - g_free (application->priv->menubar_path); } const gchar * @@ -345,7 +344,9 @@ gtk_application_menu_changed_quartz (GObject *object, g_menu_append_submenu (combined, "Application", gtk_application_get_app_menu (application)); g_menu_append_section (combined, NULL, gtk_application_get_menubar (application)); - gtk_quartz_set_main_menu (G_MENU_MODEL (combined), G_ACTION_OBSERVABLE (application->priv->muxer)); + gtk_quartz_set_main_menu (G_MENU_MODEL (combined), application); + + g_object_unref (combined); } static void gtk_application_startup_session_quartz (GtkApplication *app); @@ -355,9 +356,6 @@ gtk_application_startup_quartz (GtkApplication *application) { [NSApp finishLaunching]; - application->priv->muxer = g_action_muxer_new (); - g_action_muxer_insert (application->priv->muxer, "app", G_ACTION_GROUP (application)); - g_signal_connect (application, "notify::app-menu", G_CALLBACK (gtk_application_menu_changed_quartz), NULL); g_signal_connect (application, "notify::menubar", G_CALLBACK (gtk_application_menu_changed_quartz), NULL); gtk_application_menu_changed_quartz (G_OBJECT (application), NULL, NULL); @@ -368,25 +366,14 @@ gtk_application_startup_quartz (GtkApplication *application) static void gtk_application_shutdown_quartz (GtkApplication *application) { - g_signal_handlers_disconnect_by_func (application, gtk_application_menu_changed_quartz, NULL); + gtk_quartz_clear_main_menu (); - g_object_unref (application->priv->muxer); - application->priv->muxer = NULL; + g_signal_handlers_disconnect_by_func (application, gtk_application_menu_changed_quartz, NULL); g_slist_free_full (application->priv->inhibitors, (GDestroyNotify) gtk_application_quartz_inhibitor_free); application->priv->inhibitors = NULL; } - -static void -gtk_application_focus_changed (GtkApplication *application, - GtkWindow *window) -{ - if (G_IS_ACTION_GROUP (window)) - g_action_muxer_insert (application->priv->muxer, "win", G_ACTION_GROUP (window)); - else - g_action_muxer_remove (application->priv->muxer, "win"); -} #endif static gboolean @@ -405,9 +392,7 @@ gtk_application_focus_in_event_cb (GtkWindow *window, priv->windows = g_list_concat (link, priv->windows); } -#ifdef GDK_WINDOWING_QUARTZ - gtk_application_focus_changed (application, window); -#endif + g_object_notify (G_OBJECT (application), "active-window"); return FALSE; } @@ -440,12 +425,16 @@ gtk_application_shutdown (GApplication *application) gtk_application_shutdown_quartz (GTK_APPLICATION (application)); #endif + /* Keep this section in sync with gtk_main() */ + /* Try storing all clipboard data we have */ _gtk_clipboard_store_all (); /* Synchronize the recent manager singleton */ _gtk_recent_manager_sync (); + _gtk_accessibility_shutdown (); + G_APPLICATION_CLASS (gtk_application_parent_class) ->shutdown (application); } @@ -529,6 +518,8 @@ gtk_application_window_added (GtkApplication *application, #ifdef GDK_WINDOWING_X11 gtk_application_window_added_x11 (application, window); #endif + + g_object_notify (G_OBJECT (application), "active-window"); } static void @@ -536,6 +527,9 @@ gtk_application_window_removed (GtkApplication *application, GtkWindow *window) { GtkApplicationPrivate *priv = application->priv; + gpointer old_active; + + old_active = priv->windows; #ifdef GDK_WINDOWING_X11 gtk_application_window_removed_x11 (application, window); @@ -548,6 +542,9 @@ gtk_application_window_removed (GtkApplication *application, g_application_release (G_APPLICATION (application)); priv->windows = g_list_remove (priv->windows, window); gtk_window_set_application (window, NULL); + + if (priv->windows != old_active) + g_object_notify (G_OBJECT (application), "active-window"); } static void @@ -755,6 +752,13 @@ gtk_application_class_init (GtkApplicationClass *class) P_("The GMenuModel for the menubar"), G_TYPE_MENU_MODEL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + g_object_class_install_property (object_class, PROP_ACTIVE_WINDOW, + g_param_spec_object ("active-window", + P_("Active window"), + P_("The window which most recently had focus"), + GTK_TYPE_WINDOW, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } /** @@ -764,8 +768,9 @@ gtk_application_class_init (GtkApplicationClass *class) * * Creates a new #GtkApplication instance. * - * This function calls g_type_init() for you. gtk_init() is called - * as soon as the application gets registered as the primary instance. + * When using #GtkApplication, it is not necessary to call gtk_init() + * manually. It is called as soon as the application gets registered as + * the primary instance. * * Concretely, gtk_init() is called in the default handler for the * #GApplication::startup signal. Therefore, #GtkApplication subclasses should @@ -796,8 +801,6 @@ gtk_application_new (const gchar *application_id, { g_return_val_if_fail (application_id == NULL || g_application_id_is_valid (application_id), NULL); - g_type_init (); - return g_object_new (GTK_TYPE_APPLICATION, "application-id", application_id, "flags", flags, @@ -892,7 +895,9 @@ gtk_application_get_windows (GtkApplication *application) * @application: a #GtkApplication * @id: an identifier number * - * Returns: (transfer none): the #GtkApplicationWindow with ID @id, or + * Returns the #GtkApplicationWindow with the given ID. + * + * Returns: (transfer none): the window with ID @id, or * %NULL if there is no window with this ID * * Since: 3.6 @@ -915,6 +920,29 @@ gtk_application_get_window_by_id (GtkApplication *application, return NULL; } +/** + * gtk_application_get_active_window: + * @application: a #GtkApplication + * + * Gets the "active" window for the application. + * + * The active window is the one that was most recently focused (within + * the application). This window may not have the focus at the moment + * if another application has it -- this is just the most + * recently-focused window within this application. + * + * Returns: (transfer none): the active window + * + * Since: 3.6 + **/ +GtkWindow * +gtk_application_get_active_window (GtkApplication *application) +{ + g_return_val_if_fail (GTK_IS_APPLICATION (application), NULL); + + return application->priv->windows ? application->priv->windows->data : NULL; +} + /** * gtk_application_add_accelerator: * @application: a #GtkApplication @@ -1390,16 +1418,22 @@ gtk_application_inhibit (GtkApplication *application, GVariant *res; GError *error = NULL; guint cookie; - guint xid; + guint xid = 0; g_return_val_if_fail (GTK_IS_APPLICATION (application), 0); g_return_val_if_fail (!g_application_get_is_remote (G_APPLICATION (application)), 0); g_return_val_if_fail (application->priv->sm_proxy != NULL, 0); if (window != NULL) - xid = GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))); - else - xid = 0; + { + GdkWindow *gdkwindow; + + gdkwindow = gtk_widget_get_window (GTK_WIDGET (window)); + if (gdkwindow == NULL) + g_warning ("Inhibit called with an unrealized window"); + else + xid = GDK_WINDOW_XID (gdkwindow); + } res = g_dbus_proxy_call_sync (application->priv->sm_proxy, "Inhibit",