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

Minor updates to accel_key_to_keys

Browse Source 
Make "modifiers" static, potentially avoids a copy to stack.
Use G_N_ELEMENTS also to allocate keys, as in the next loop
allowing to easily change "modifiers" size.

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
This commit is contained in:
Frediano Ziglio 2020-07-09 14:29:27 +01:00
parent ff11d5937e
commit 8297a178c4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -705,7 +705,7 @@ accel_key_to_keys(const GtkAccelKey *key)
{
guint i;
guint *val, *keys;
const struct {
static const struct {
const guint mask;
const guint key;
} modifiers[] = {
@ -717,7 +717,7 @@ accel_key_to_keys(const GtkAccelKey *key)
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 */
keys = val = g_new(guint, G_N_ELEMENTS(modifiers) + 2); /* up to 3 modifiers, key and the stop symbol */
/* first, send the modifiers */
for (i = 0; i < G_N_ELEMENTS(modifiers); i++) {
if (key->accel_mods & modifiers[i].mask)