Made keybindings array into linked list; on the way rewrote / improved great parts...

[plomrogue] / src / wincontrol.c

diff --git a/src/wincontrol.c b/src/wincontrol.c
index 487b1fad03d70e47a89854fd762e9688bc1a983b..c88c56b8bd5f075e4008acc907eeea40ef7b302e 100644 (file)
--- a/src/wincontrol.c
+++ b/src/wincontrol.c
@@ -2,9 +2,8 @@
 
 #include "wincontrol.h"
 #include <stdlib.h> /* for free() */
-#include <string.h> /* for strlen() */
+#include <string.h> /* for strlen(), strchr(), strstr() */
 #include <stdint.h> /* for uint8_t, uint16_t */
-#include <stdio.h> /* for fwrite() */
 #include <unistd.h> /* for access(), unlink() */
 #include "windows.h" /* for suspend_win(), append_win(), reset_pad_offset(),
                       * resize_active_win(), init_win(), free_win(),
@@ -13,7 +12,7 @@
 #include "yx_uint16.h" /* for yx_uint16 struct */
 #include "main.h" /* for Wins struct */
 #include "readwrite.h" /* for get_linemax(), try_fopen(), try_fclose(),
-                        * try_fgets(), try_fclose_unlink_rename()
+                        * try_fgets(), try_fclose_unlink_rename(), try_fwrite()
                         */
 #include "rexit.h" /* for exit_err() */
 #include "main.h" /* for World, Wins structs */
@@ -55,7 +54,7 @@ static void set_winconf(struct World * world, char id);
 /* Get WinConf by "id"; get id of WinConf mothering "win". */
 static struct WinConf * get_winconf_by_id(struct World * world, char id);
 
-/* Get (Win->_draw) function identified by "c"; NULL if c not mapped to one. */
+/* Get (Win->draw) function identified by "c"; NULL if c not mapped to one. */
 static void * get_drawfunc_by_char(char c);
 
 /* Iterate over bytes of world->winconf_ids array. Re-start after null byte. */
@@ -158,13 +157,13 @@ extern void save_win_config(struct World * world, char id)
     }
     char line[size];
     sprintf(line, "%s\n", wc->title);
-    fwrite(line, sizeof(char), strlen(line), file);
+    try_fwrite(line, sizeof(char), strlen(line), file, world, f_name);
     sprintf(line, "%c\n", wc->draw);
-    fwrite(line, sizeof(char), strlen(line), file);
+    try_fwrite(line, sizeof(char), strlen(line), file, world, f_name);
     sprintf(line, "%d\n", wc->height);
-    fwrite(line, sizeof(char), strlen(line), file);
+    try_fwrite(line, sizeof(char), strlen(line), file, world, f_name);
     sprintf(line, "%d\n", wc->width);
-    fwrite(line, sizeof(char), strlen(line), file);
+    try_fwrite(line, sizeof(char), strlen(line), file, world, f_name);
 
     char * path = string_prefixed_id(world, "config/windows/Win_", id);
     try_fclose_unlink_rename(file, path_tmp, path, world, f_name);
@@ -304,7 +303,7 @@ extern void init_winconfs(struct World * world)
     winconf_ids[i] = '\0';
     exit_err(errno, world, err_r);
     exit_err(closedir(dp), world, err_c);
-    world->winconf_ids = try_malloc(strlen(winconf_ids + 1), world, f_name);
+    world->winconf_ids = try_malloc(strlen(winconf_ids) + 1, world, f_name);
     memcpy(world->winconf_ids, winconf_ids, strlen(winconf_ids) + 1);
     free(winconf_ids);
 
@@ -382,6 +381,10 @@ extern void sorted_wintoggle(struct World * world)
     uint8_t i = 0;
     for (; i < linemax - 1; i++)
     {
+        if (NULL == strchr(world->winconf_ids, win_order[i]))
+        {
+            continue;
+        }
         toggle_window(world->wmeta, get_win_by_id(world, win_order[i]));
     }
 }
@@ -418,17 +421,17 @@ extern void save_win_configs(struct World * world)
     FILE * file = try_fopen(path_tmp, "w", world, f_name);
 
     char line[6];
-    struct Win * w_p = world->wmeta->_chain_start;
+    struct Win * w_p = world->wmeta->chain_start;
     uint8_t i = 0;
     while (0 != w_p)
     {
         struct WinConf * wc = get_winconf_by_win(world, w_p);
         line[i] = wc->id;
-        w_p = w_p->_next;
+        w_p = w_p->next;
         i++;
     }
     line[i] = '\n';
-    fwrite(line, sizeof(char), strlen(line), file);
+    try_fwrite(line, sizeof(char), strlen(line), file, world, f_name);
 
     try_fclose_unlink_rename(file, path_tmp, path, world, f_name);
 }
@@ -454,12 +457,12 @@ extern void toggle_winconfig(struct World * world, struct Win * win)
     struct WinConf * wcp = get_winconf_by_win(world, win);
     if (0 == wcp->view)
     {
-        win->_draw = draw_winconf;
+        win->draw = draw_winconf;
         wcp->view = 1;
     }
     else
     {
-        win->_draw = get_drawfunc_by_char(wcp->draw);
+        win->draw = get_drawfunc_by_char(wcp->draw);
         wcp->view = 0;
     }
 }