X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkapplication.c;h=9072907513ffb70707d19487a01e29b763adaed1;hb=c6fbdb67f3dc86cf49f2ac5ac8c072f4e586fd29;hp=cb9a082b61ccbb38be6cdd9170457a14e03f4d0a;hpb=df1ff836a8ba09bd9d17ba288ea297028b1bb756;p=~andy%2Fgtk
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index cb9a082b6..907290751 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*
* Author: Ryan Lortie
*/
@@ -35,11 +33,10 @@
#include "gtkmain.h"
#include "gtkrecentmanager.h"
#include "gtkaccelmapprivate.h"
-#include "gactionmuxer.h"
#include "gtkintl.h"
#ifdef GDK_WINDOWING_QUARTZ
-#include "gtkquartz-menu.h"
+#include "gtkmodelmenu-quartz.h"
#import
#include
#include "gtkmessagedialog.h"
@@ -50,6 +47,8 @@
#include
#endif
+extern void _gtk_accessibility_shutdown (void);
+
/**
* SECTION:gtkapplication
* @title: GtkApplication
@@ -77,12 +76,15 @@
* associated with #GtkApplicationWindow and to the 'activate' and
* 'open' #GApplication methods.
*
- * To set an application menu on a GtkApplication, use
+ * To set an application menu for a GtkApplication, use
* gtk_application_set_app_menu(). The #GMenuModel that this function
* expects is usually constructed using #GtkBuilder, as seen in the
- * following example. To set a menubar that will be automatically picked
- * up by #GApplicationWindows, use gtk_application_set_menubar(). GTK+
- * makes these menus appear as expected, depending on the platform
+ * following example. To specify a menubar that will be shown by
+ * #GtkApplicationWindows, use gtk_application_set_menubar(). Use the base
+ * #GActionMap interface to add actions, to respond to the user
+ * selecting these menu items.
+ *
+ * GTK+ displays these menus as expected, depending on the platform
* the application is running on.
*
*
@@ -131,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)
@@ -148,7 +151,7 @@ struct _GtkApplicationPrivate
#ifdef GDK_WINDOWING_X11
GDBusConnection *session_bus;
const gchar *application_id;
- gchar *object_path;
+ const gchar *object_path;
gchar *app_menu_path;
guint app_menu_id;
@@ -165,7 +168,6 @@ struct _GtkApplicationPrivate
#endif
#ifdef GDK_WINDOWING_QUARTZ
- GActionMuxer *muxer;
GMenu *combined;
GSList *inhibitors;
@@ -184,6 +186,9 @@ gtk_application_x11_publish_menu (GtkApplication *application,
{
gint i;
+ if (application->priv->session_bus == NULL)
+ return;
+
/* unexport any existing menu */
if (*id)
{
@@ -251,8 +256,8 @@ gtk_application_window_added_x11 (GtkApplication *application,
guint window_id;
window_id = application->priv->next_id++;
- window_path = g_strdup_printf ("%s/window/%d", application->priv->object_path, window_id);
- success = gtk_application_window_publish (app_window, application->priv->session_bus, window_path);
+ window_path = g_strdup_printf ("%s/window/%u", application->priv->object_path, window_id);
+ success = gtk_application_window_publish (app_window, application->priv->session_bus, window_path, window_id);
g_free (window_path);
}
while (!success);
@@ -270,34 +275,13 @@ gtk_application_window_removed_x11 (GtkApplication *application,
gtk_application_window_unpublish (GTK_APPLICATION_WINDOW (window));
}
-static gchar *
-object_path_from_appid (const gchar *appid)
-{
- gchar *appid_path, *iter;
-
- appid_path = g_strconcat ("/", appid, NULL);
- for (iter = appid_path; *iter; iter++)
- {
- if (*iter == '.')
- *iter = '/';
-
- if (*iter == '-')
- *iter = '_';
- }
-
- return appid_path;
-}
-
static void gtk_application_startup_session_dbus (GtkApplication *app);
static void
gtk_application_startup_x11 (GtkApplication *application)
{
- const gchar *application_id;
-
- application_id = g_application_get_application_id (G_APPLICATION (application));
- application->priv->session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
- application->priv->object_path = object_path_from_appid (application_id);
+ application->priv->session_bus = g_application_get_dbus_connection (G_APPLICATION (application));
+ application->priv->object_path = g_application_get_dbus_object_path (G_APPLICATION (application));
gtk_application_startup_session_dbus (GTK_APPLICATION (application));
}
@@ -305,9 +289,11 @@ gtk_application_startup_x11 (GtkApplication *application)
static void
gtk_application_shutdown_x11 (GtkApplication *application)
{
- g_free (application->priv->object_path);
+ 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;
- g_clear_object (&application->priv->session_bus);
g_clear_object (&application->priv->sm_proxy);
g_clear_object (&application->priv->client_proxy);
@@ -315,12 +301,6 @@ gtk_application_shutdown_x11 (GtkApplication *application)
g_free (application->priv->client_path);
}
-const gchar *
-gtk_application_get_dbus_object_path (GtkApplication *application)
-{
- return application->priv->object_path;
-}
-
const gchar *
gtk_application_get_app_menu_object_path (GtkApplication *application)
{
@@ -364,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);
@@ -374,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);
@@ -387,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
@@ -424,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;
}
@@ -459,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);
}
@@ -525,6 +495,10 @@ gtk_application_init (GtkApplication *application)
application->priv = G_TYPE_INSTANCE_GET_PRIVATE (application,
GTK_TYPE_APPLICATION,
GtkApplicationPrivate);
+
+#ifdef GDK_WINDOWING_X11
+ application->priv->next_id = 1;
+#endif
}
static void
@@ -544,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
@@ -551,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);
@@ -563,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
@@ -770,21 +752,29 @@ 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));
}
/**
* gtk_application_new:
- * @application_id: the application id
+ * @application_id: (allow-none): The application ID.
* @flags: the application flags
*
* 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
- * startup() signal. Therefore, #GtkApplication subclasses should
- * chain up in their startup() handler before using any GTK+ API.
+ * #GApplication::startup signal. Therefore, #GtkApplication subclasses should
+ * chain up in their #GApplication:startup handler before using any GTK+ API.
*
* Note that commandline arguments are not passed to gtk_init().
* All GTK+ functionality that is available via commandline arguments
@@ -794,7 +784,12 @@ gtk_application_class_init (GtkApplicationClass *class)
* you can explicitly call gtk_init() before creating the application
* instance.
*
- * The application id must be valid. See g_application_id_is_valid().
+ * If non-%NULL, the application ID must be valid. See
+ * g_application_id_is_valid().
+ *
+ * If no application ID is given then some features (most notably application
+ * uniqueness) will be disabled. A null application ID is only allowed with
+ * GTK+ 3.6 or later.
*
* Returns: a new #GtkApplication instance
*
@@ -804,9 +799,7 @@ GtkApplication *
gtk_application_new (const gchar *application_id,
GApplicationFlags flags)
{
- g_return_val_if_fail (g_application_id_is_valid (application_id), NULL);
-
- g_type_init ();
+ g_return_val_if_fail (application_id == NULL || g_application_id_is_valid (application_id), NULL);
return g_object_new (GTK_TYPE_APPLICATION,
"application-id", application_id,
@@ -819,7 +812,7 @@ gtk_application_new (const gchar *application_id,
* @application: a #GtkApplication
* @window: a #GtkWindow
*
- * Adds a window from @application.
+ * Adds a window to @application.
*
* This call is equivalent to setting the #GtkWindow:application
* property of @window to @application.
@@ -897,6 +890,59 @@ gtk_application_get_windows (GtkApplication *application)
return application->priv->windows;
}
+/**
+ * gtk_application_get_window_by_id:
+ * @application: a #GtkApplication
+ * @id: an identifier number
+ *
+ * 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
+ */
+GtkWindow *
+gtk_application_get_window_by_id (GtkApplication *application,
+ guint id)
+{
+ GList *l;
+
+ g_return_val_if_fail (GTK_IS_APPLICATION (application), NULL);
+
+ for (l = application->priv->windows; l != NULL; l = l->next)
+ {
+ if (GTK_IS_APPLICATION_WINDOW (l->data) &&
+ gtk_application_window_get_id (GTK_APPLICATION_WINDOW (l->data)) == id)
+ return l->data;
+ }
+
+ 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
@@ -910,7 +956,8 @@ gtk_application_get_windows (GtkApplication *application)
* is pressed.
*
* @accelerator must be a string that can be parsed by
- * gtk_accelerator_parse(), e.g. "q" or "p".
+ * gtk_accelerator_parse(), e.g. "<Primary>q" or
+ * "<Control><Alt>p".
*
* @action_name must be the name of an action as it would be used
* in the app menu, i.e. actions that have been added to the application
@@ -998,6 +1045,10 @@ gtk_application_remove_accelerator (GtkApplication *application,
*
* Sets or unsets the application menu for @application.
*
+ * This can only be done in the primary instance of the application,
+ * after it has been registered. #GApplication:startup is a good place
+ * to call this.
+ *
* The application menu is a single menu containing items that typically
* impact the application as a whole, rather than acting on a specific
* window or document. For example, you would expect to see
@@ -1007,6 +1058,9 @@ gtk_application_remove_accelerator (GtkApplication *application,
* If supported, the application menu will be rendered by the desktop
* environment.
*
+ * Use the base #GActionMap interface to add actions, to respond to the user
+ * selecting these menu items.
+ *
* Since: 3.4
*/
void
@@ -1014,6 +1068,8 @@ gtk_application_set_app_menu (GtkApplication *application,
GMenuModel *app_menu)
{
g_return_if_fail (GTK_IS_APPLICATION (application));
+ g_return_if_fail (g_application_get_is_registered (G_APPLICATION (application)));
+ g_return_if_fail (!g_application_get_is_remote (G_APPLICATION (application)));
if (app_menu != application->priv->app_menu)
{
@@ -1025,7 +1081,8 @@ gtk_application_set_app_menu (GtkApplication *application,
if (application->priv->app_menu != NULL)
g_object_ref (application->priv->app_menu);
- extract_accels_from_menu (app_menu, application);
+ if (app_menu)
+ extract_accels_from_menu (app_menu, application);
#ifdef GDK_WINDOWING_X11
gtk_application_set_app_menu_x11 (application, app_menu);
@@ -1063,6 +1120,10 @@ gtk_application_get_app_menu (GtkApplication *application)
*
* This is a menubar in the traditional sense.
*
+ * This can only be done in the primary instance of the application,
+ * after it has been registered. #GApplication:startup is a good place
+ * to call this.
+ *
* Depending on the desktop environment, this may appear at the top of
* each window, or at the top of the screen. In some environments, if
* both the application menu and the menubar are set, the application
@@ -1071,6 +1132,9 @@ gtk_application_get_app_menu (GtkApplication *application)
* example, the application menu may be rendered by the desktop shell
* while the menubar (if set) remains in each individual window.
*
+ * Use the base #GActionMap interface to add actions, to respond to the user
+ * selecting these menu items.
+ *
* Since: 3.4
*/
void
@@ -1078,6 +1142,8 @@ gtk_application_set_menubar (GtkApplication *application,
GMenuModel *menubar)
{
g_return_if_fail (GTK_IS_APPLICATION (application));
+ g_return_if_fail (g_application_get_is_registered (G_APPLICATION (application)));
+ g_return_if_fail (!g_application_get_is_remote (G_APPLICATION (application)));
if (menubar != application->priv->menubar)
{
@@ -1089,7 +1155,8 @@ gtk_application_set_menubar (GtkApplication *application,
if (application->priv->menubar != NULL)
g_object_ref (application->priv->menubar);
- extract_accels_from_menu (menubar, application);
+ if (menubar)
+ extract_accels_from_menu (menubar, application);
#ifdef GDK_WINDOWING_X11
gtk_application_set_menubar_x11 (application, menubar);
@@ -1321,7 +1388,7 @@ gtk_application_startup_session_dbus (GtkApplication *app)
* that should not be interrupted, such as creating a CD or DVD. The
* types of actions that may be blocked are specified by the @flags
* parameter. When the application completes the operation it should
- * call g_application_uninhibit() to remove the inhibitor. Note that
+ * call gtk_application_uninhibit() to remove the inhibitor. Note that
* an application can have multiple inhibitors, and all of the must
* be individually removed. Inhibitors are also cleared when the
* application exits.
@@ -1336,7 +1403,7 @@ gtk_application_startup_session_dbus (GtkApplication *app)
* this window to find out more about why the action is inhibited.
*
* Returns: A non-zero cookie that is used to uniquely identify this
- * request. It should be used as an argument to g_application_uninhibit()
+ * request. It should be used as an argument to gtk_application_uninhibit()
* in order to remove the request. If the platform does not support
* inhibiting or the request failed for some reason, 0 is returned.
*
@@ -1351,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",
@@ -1389,9 +1462,9 @@ gtk_application_inhibit (GtkApplication *application,
/**
* gtk_application_uninhibit:
* @application: the #GApplication
- * @cookie: a cookie that was returned by g_application_inhibit()
+ * @cookie: a cookie that was returned by gtk_application_inhibit()
*
- * Removes an inhibitor that has been established with g_application_inhibit().
+ * Removes an inhibitor that has been established with gtk_application_inhibit().
* Inhibitors are also cleared when the application exits.
*
* Since: 3.4