X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fwincontrol.c;h=5e818badd0b3d21d473b992e27ec4504defd94dc;hb=0b7798939c0193fd794985b503737e40d8602313;hp=b272905e50bce5cbdba8e001151daa9cd478b053;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue

diff --git a/src/client/wincontrol.c b/src/client/wincontrol.c
index b272905..5e818ba 100644
--- a/src/client/wincontrol.c
+++ b/src/client/wincontrol.c
@@ -3,6 +3,7 @@
 #include "wincontrol.h"
 #include <errno.h> /* global errno */
 #include <dirent.h> /* DIR, struct dirent, opendir(), closedir(), readdir() */
+#include <stddef.h> /* NULL */
 #include <stdint.h> /* uint8_t, uint16_t, uint32_t */
 #include <stdio.h> /* FILE */
 #include <stdlib.h> /* free(), atoi() */
@@ -117,9 +118,8 @@ static void init_winconf_from_file(char id, struct WinConf * winconf)
         kb_p->next = 0;
         kb_p->key = atoi(command);
         cmdptr = strchr(command, ' ') + 1;
-        kb_p->name = try_malloc(strlen(cmdptr), context);
-        memcpy(kb_p->name, cmdptr, strlen(cmdptr) - 1);
-        kb_p->name[strlen(cmdptr) - 1] = '\0';
+        cmdptr[strlen(cmdptr) - 1] = '\0';
+        kb_p->command = get_command(cmdptr);
         loc_last_ptr = & kb_p->next;
     }
 
@@ -174,9 +174,9 @@ static void save_win_config(char id)
     struct KeyBinding * kb_p = wc->kb.kbs;
     while (0 != kb_p)
     {
-        if (strlen(kb_p->name) > linemax)
+        if (strlen(kb_p->command->dsc_short) > linemax)
         {
-            linemax = strlen(kb_p->name);
+            linemax = strlen(kb_p->command->dsc_short);
         }
         kb_p = kb_p->next;
     }
@@ -185,7 +185,7 @@ static void save_win_config(char id)
     kb_p = wc->kb.kbs;
     while (0 != kb_p)
     {
-        sprintf(kb_line, "%d %s\n", kb_p->key, kb_p->name);
+        sprintf(kb_line, "%d %s\n", kb_p->key, kb_p->command->dsc_short);
         try_fwrite(kb_line, sizeof(char), strlen(kb_line), file, f_name);
         kb_p = kb_p->next;
     }