Commit 0f914b6112235f97dd76911426c3ee101fb51a7f
1 parent
8e335386
Exists in
master
and in
1 other branch
Fixing save/load of the keyfiles.
Showing
1 changed file
with
5 additions
and
14 deletions
Show diff stats
src/terminal/keyboard/keyfile.c
| @@ -141,26 +141,17 @@ | @@ -141,26 +141,17 @@ | ||
| 141 | 141 | ||
| 142 | if(accel->type == V3270_ACCELERATOR_TYPE_PFKEY) | 142 | if(accel->type == V3270_ACCELERATOR_TYPE_PFKEY) |
| 143 | { | 143 | { |
| 144 | + // It's a PFKey redirector | ||
| 145 | + | ||
| 144 | unsigned int pfkey = 0; | 146 | unsigned int pfkey = 0; |
| 145 | 147 | ||
| 146 | if(sscanf(keycodes[ix],"pf%u",&pfkey) != 1) | 148 | if(sscanf(keycodes[ix],"pf%u",&pfkey) != 1) |
| 147 | { | 149 | { |
| 148 | - g_warning("Can't parse accelerator %s",keys); | 150 | + g_warning("Can't parse key \"%s\" for accelerator %s",keycodes[ix],v3270_accelerator_get_name(accel)); |
| 149 | return; | 151 | return; |
| 150 | } | 152 | } |
| 151 | 153 | ||
| 152 | - // It's a PFKey redirector | ||
| 153 | - guint key; | ||
| 154 | - GdkModifierType mods; | ||
| 155 | - | ||
| 156 | debug("Creating special accelerator %s",v3270_accelerator_get_name(accel)); | 154 | debug("Creating special accelerator %s",v3270_accelerator_get_name(accel)); |
| 157 | - gtk_accelerator_parse(keycodes[ix],&key,&mods); | ||
| 158 | - | ||
| 159 | - if(!key) | ||
| 160 | - { | ||
| 161 | - g_warning("Can't parse accelerator %s",v3270_accelerator_get_name(accel)); | ||
| 162 | - return; | ||
| 163 | - } | ||
| 164 | 155 | ||
| 165 | // Remap PFKey accelerator | 156 | // Remap PFKey accelerator |
| 166 | V3270PFKeyAccelerator *pfAccel = g_new0(V3270PFKeyAccelerator,1); | 157 | V3270PFKeyAccelerator *pfAccel = g_new0(V3270PFKeyAccelerator,1); |
| @@ -168,8 +159,8 @@ | @@ -168,8 +159,8 @@ | ||
| 168 | pfAccel->keycode = (unsigned short) pfkey; | 159 | pfAccel->keycode = (unsigned short) pfkey; |
| 169 | pfAccel->name = ((V3270PFKeyAccelerator *) accel)->name; | 160 | pfAccel->name = ((V3270PFKeyAccelerator *) accel)->name; |
| 170 | pfAccel->parent.type = V3270_ACCELERATOR_TYPE_PFKEY; | 161 | pfAccel->parent.type = V3270_ACCELERATOR_TYPE_PFKEY; |
| 171 | - pfAccel->parent.key = key; | ||
| 172 | - pfAccel->parent.mods = mods; | 162 | + pfAccel->parent.key = accel->key; |
| 163 | + pfAccel->parent.mods = accel->mods; | ||
| 173 | pfAccel->parent.arg = (gconstpointer) pfAccel; | 164 | pfAccel->parent.arg = (gconstpointer) pfAccel; |
| 174 | pfAccel->parent.activate = G_CALLBACK(fire_pfkey_action); | 165 | pfAccel->parent.activate = G_CALLBACK(fire_pfkey_action); |
| 175 | 166 |