From 0f914b6112235f97dd76911426c3ee101fb51a7f Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 13 Dec 2019 10:48:24 -0300 Subject: [PATCH] Fixing save/load of the keyfiles. --- src/terminal/keyboard/keyfile.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/terminal/keyboard/keyfile.c b/src/terminal/keyboard/keyfile.c index b6f7bff..68b5962 100644 --- a/src/terminal/keyboard/keyfile.c +++ b/src/terminal/keyboard/keyfile.c @@ -141,26 +141,17 @@ if(accel->type == V3270_ACCELERATOR_TYPE_PFKEY) { + // It's a PFKey redirector + unsigned int pfkey = 0; if(sscanf(keycodes[ix],"pf%u",&pfkey) != 1) { - g_warning("Can't parse accelerator %s",keys); + g_warning("Can't parse key \"%s\" for accelerator %s",keycodes[ix],v3270_accelerator_get_name(accel)); return; } - // It's a PFKey redirector - guint key; - GdkModifierType mods; - debug("Creating special accelerator %s",v3270_accelerator_get_name(accel)); - gtk_accelerator_parse(keycodes[ix],&key,&mods); - - if(!key) - { - g_warning("Can't parse accelerator %s",v3270_accelerator_get_name(accel)); - return; - } // Remap PFKey accelerator V3270PFKeyAccelerator *pfAccel = g_new0(V3270PFKeyAccelerator,1); @@ -168,8 +159,8 @@ pfAccel->keycode = (unsigned short) pfkey; pfAccel->name = ((V3270PFKeyAccelerator *) accel)->name; pfAccel->parent.type = V3270_ACCELERATOR_TYPE_PFKEY; - pfAccel->parent.key = key; - pfAccel->parent.mods = mods; + pfAccel->parent.key = accel->key; + pfAccel->parent.mods = accel->mods; pfAccel->parent.arg = (gconstpointer) pfAccel; pfAccel->parent.activate = G_CALLBACK(fire_pfkey_action); -- libgit2 0.21.2