s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow non-keysym symbols in XML.

Browse Source
This commit is contained in:
Daiki Ueno
2011-08-18 17:02:39 +09:00
parent 5c09147551
commit 39900bd987
10 changed files with 91 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
eekboard/eekboard-context.c
View File

@ -82,19 +82,20 @@ eekboard_context_real_g_signal (GDBusProxy *self,
}
if (g_strcmp0 (signal_name, "KeyPressed") == 0) {
guint keycode = 0;
const gchar *keyname;
GVariant *variant = NULL;
guint modifiers = 0;
EekSerializable *serializable;
g_variant_get (parameters, "(uvu)", &keycode, &variant, &modifiers);
g_variant_get (parameters, "(&svu)", &keyname, &variant, &modifiers);
g_return_if_fail (variant != NULL);
serializable = eek_serializable_deserialize (variant);
g_return_if_fail (EEK_IS_SYMBOL(serializable));
g_signal_emit_by_name (context, "key-pressed",
keycode, EEK_SYMBOL(serializable), modifiers);
keyname, EEK_SYMBOL(serializable), modifiers);
return;
}
@ -139,7 +140,7 @@ eekboard_context_real_disabled (EekboardContext *self)
static void
eekboard_context_real_key_pressed (EekboardContext *self,
guint keycode,
const gchar *keyname,
EekSymbol *symbol,
guint modifiers)
{
@ -253,10 +254,10 @@ eekboard_context_class_init (EekboardContextClass *klass)
G_STRUCT_OFFSET(EekboardContextClass, key_pressed),
NULL,
NULL,
_eekboard_marshal_VOID__UINT_OBJECT_UINT,
_eekboard_marshal_VOID__STRING_OBJECT_UINT,
G_TYPE_NONE,
3,
G_TYPE_UINT,
G_TYPE_STRING,
G_TYPE_OBJECT,
G_TYPE_UINT);

2
eekboard/eekboard-context.h
View File

@ -67,7 +67,7 @@ struct _EekboardContextClass {
void (*enabled) (EekboardContext *self);
void (*disabled) (EekboardContext *self);
void (*key_pressed) (EekboardContext *self,
guint keycode,
const gchar *keyname,
EekSymbol *symbol,
guint modifiers);
void (*destroyed) (EekboardContext *self);

2
eekboard/eekboard-marshalers.list
View File

@ -1 +1 @@
VOID:UINT,OBJECT,UINT
VOID:STRING,OBJECT,UINT