pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2026-01-11 16:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

window: Use loop instead of multiple ifs

Browse Source 
Binds modifier's mask and key, also fixes a compile time warning
spotted by clang:
 warning: cast from 'gchar *' (aka 'char *') to 'guint *' (aka 'unsigned
  int *') increases required alignment from 1 to 4 [-Wcast-align]
 return (guint*)g_array_free(a, FALSE);
This commit is contained in:
Pavel Grunt 2016-06-22 08:02:18 +02:00
parent 7b5e8ddc3f
commit f57cfee07f
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/virt-viewer-window.c
View File

@ -608,36 +608,33 @@ virt_viewer_menu_add_combo(VirtViewerWindow *self, GtkMenu *menu,
static guint*
accel_key_to_keys(const GtkAccelKey *key)
{
guint val;
GArray *a = g_array_new(FALSE, FALSE, sizeof(guint));
guint i;
guint *val, *keys;
const struct {
const guint mask;
const guint key;
} modifiers[] = {
{GDK_SHIFT_MASK, GDK_KEY_Shift_L},
{GDK_CONTROL_MASK, GDK_KEY_Control_L},
{GDK_MOD1_MASK, GDK_KEY_Alt_L},
};
g_warn_if_fail((key->accel_mods &
~(GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)) == 0);
keys = val = g_new(guint, 5); /* up to 3 modifiers, key and the stop symbol */
/* first, send the modifiers */
if (key->accel_mods & GDK_SHIFT_MASK) {
val = GDK_KEY_Shift_L;
g_array_append_val(a, val);
}
if (key->accel_mods & GDK_CONTROL_MASK) {
val = GDK_KEY_Control_L;
g_array_append_val(a, val);
}
if (key->accel_mods & GDK_MOD1_MASK) {
val = GDK_KEY_Alt_L;
g_array_append_val(a, val);
for (i = 0; i < G_N_ELEMENTS(modifiers); i++) {
if (key->accel_mods & modifiers[i].mask)
*val++ = modifiers[i].key;
}
/* only after, the non-modifier key (ctrl-t, not t-ctrl) */
val = key->accel_key;
g_array_append_val(a, val);
*val++ = key->accel_key;
/* stop symbol */
*val = GDK_KEY_VoidSymbol;
val = GDK_KEY_VoidSymbol;
g_array_append_val(a, val);
return (guint*)g_array_free(a, FALSE);
return keys;
}
struct accelCbData