3f8c235593
Reuse the existing infrastructure in GtkActionMuxer for propagation of
accelerator information: in particular, what accel label ought to appear
on menu items for a particular action and target.
This is a good idea because we want accels to travel along with the
actions that they're tied to and reusing GtkActionMuxer will allow us to
do that without creating another hierarchy of a different class for the
sole purpose of filling in accel labels on menu items.
Doing it this ways also allows those who copy/paste GtkActionMuxer to
insert the accels for themselves.
Add a new method on the GtkActionObserver interface to report changes.
This patch introduces a new concept: "action and target" notation for
actions. This format looks like so:
"'target'|app.action"
or for non-targeted actions:
"|app.action"
and it is used over a number of possible alternative formats for some
good reasons:
- it's very easy to get a nul-terminated action name out of this format
when we need it, by using strrchr('|') + 1
- we can also get the target out of it using g_variant_parse() because
this function takes a pointer to a 'limit' character that is not
parsed past: we use the '|' for this
- it's extremely easy to hash on this format (just use a normal string
hash) vs. attempting to hash on a string plus a GVariant
A close contender was to use detailed action strings here, but these are
not used for two reasons:
- it's not possible to easily get the action name or target out of the
strings without more work than the "action and target" format
requires
- we still intend to use detailed action strings on API (since they are
a lot nicer to look at) but detailed action strings can be given in
non-canonical forms (eg: 'foo::bar' and 'foo("bar")' are equivalent)
so we'd have to go through a normalisation step anyway. Since we're
doing that already, we may as well convert to a more convenient
internal format.
This new "action and target" format is going to start appearing in a lot
more places as action descriptions are introduced.
I suspect that nobody is using '|' in their action names, but in case I
am proven wrong, we can always switch to using something more exotic as
a separator character (such as '\x01' or '\xff' or the like).
65 lines
3.2 KiB
C
65 lines
3.2 KiB
C
/*
|
|
* Copyright © 2011 Canonical Limited
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the licence, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* 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, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Author: Ryan Lortie <desrt@desrt.ca>
|
|
*/
|
|
|
|
#ifndef __GTK_ACTION_MUXER_H__
|
|
#define __GTK_ACTION_MUXER_H__
|
|
|
|
#include <gio/gio.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define GTK_TYPE_ACTION_MUXER (gtk_action_muxer_get_type ())
|
|
#define GTK_ACTION_MUXER(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
|
|
GTK_TYPE_ACTION_MUXER, GtkActionMuxer))
|
|
#define GTK_IS_ACTION_MUXER(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
|
|
GTK_TYPE_ACTION_MUXER))
|
|
|
|
typedef struct _GtkActionMuxer GtkActionMuxer;
|
|
|
|
GType gtk_action_muxer_get_type (void);
|
|
GtkActionMuxer * gtk_action_muxer_new (void);
|
|
|
|
void gtk_action_muxer_insert (GtkActionMuxer *muxer,
|
|
const gchar *prefix,
|
|
GActionGroup *action_group);
|
|
|
|
void gtk_action_muxer_remove (GtkActionMuxer *muxer,
|
|
const gchar *prefix);
|
|
|
|
GtkActionMuxer * gtk_action_muxer_get_parent (GtkActionMuxer *muxer);
|
|
|
|
void gtk_action_muxer_set_parent (GtkActionMuxer *muxer,
|
|
GtkActionMuxer *parent);
|
|
|
|
void gtk_action_muxer_set_primary_accel (GtkActionMuxer *muxer,
|
|
const gchar *action_and_target,
|
|
const gchar *primary_accel);
|
|
|
|
const gchar * gtk_action_muxer_get_primary_accel (GtkActionMuxer *muxer,
|
|
const gchar *action_and_target);
|
|
|
|
/* No better place for this... */
|
|
gchar * gtk_print_action_and_target (const gchar *action_namespace,
|
|
const gchar *action_name,
|
|
GVariant *target);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __GTK_ACTION_MUXER_H__ */
|