Re-wrote large parts of the server client architecture. No more fifo.

[plomrogue] / src / client / windows.c

diff --git a/src/client/windows.c b/src/client/windows.c
index b0734dc5cca71989e1b7bc9137b0a5dd33f62952..a9bea11c00c9ac04053ef3bb4fc7eb65399e60cc 100644 (file)
--- a/src/client/windows.c
+++ b/src/client/windows.c
@@ -23,7 +23,7 @@
                         * draw_win_keybindings_winconf_geometry(),
                         * draw_win_keybindings_global()
                         */
-#include "keybindings.h" /* free_keybindings(), write_keybidings_to_file(),
+#include "keybindings.h" /* write_keybidings_to_file(),
                           * read_keybindings_from_file()
                           */
 #include "misc.h" /* array_append() */
@@ -51,7 +51,7 @@ static void init_win_size_from_winconf_and_v_screen_size(char id);
  * match_func() is just a little helper to it.
  */
 static uint8_t match_func(char c, void (** f) (), char c_m, void (* f_m) ());
-static void * get_drawfunc_by_char(char c);
+static void (* get_drawfunc_by_char(char c)) ();
 
 /* Write "win"'s size back to .target_(height/width) as per .target_*_type. */
 static void set_win_target_size(struct Win * win);
@@ -170,7 +170,7 @@ static uint8_t match_func(char c, void (** f) (), char c_m, void (* f_m) ())
 
 
 
-static void * get_drawfunc_by_char(char c)
+static void (* get_drawfunc_by_char(char c)) ()
 {
     void (* f) (struct Win *) = NULL;
     if (   match_func(c, &f, 'c', draw_win_inventory)
@@ -180,7 +180,10 @@ static void * get_drawfunc_by_char(char c)
         || match_func(c, &f, 'm', draw_win_map)
         || match_func(c, &f, '0', draw_win_keybindings_global)
         || match_func(c, &f, '1', draw_win_keybindings_winconf_geometry)
-        || match_func(c, &f, '2', draw_win_keybindings_winconf_keybindings));
+        || match_func(c, &f, '2', draw_win_keybindings_winconf_keybindings))
+    {
+        ;
+    }
     return f;
 }
 
@@ -240,7 +243,7 @@ static void refit_v_screen()
     /* Only resize .v_screen if the rightmost window column has changed. */
     char * err_s = "refit_v_screen() grows virtual screen beyond legal sizes.";
     char * err_m = "refit_v_screen() triggers memory alloc error in wresize().";
-    if (getmaxx(world.winDB.v_screen) + 1 != lastwcol)
+    if ((uint32_t) getmaxx(world.winDB.v_screen) + 1 != lastwcol)
     {
         uint8_t t = (lastwcol + 2 > UINT16_MAX);
         exit_err(t, err_s);
@@ -502,7 +505,7 @@ static void draw_wins(struct Win * w)
     struct Win * next = get_win_after(w->id);
     if (next)
     {
-        return draw_wins(next);
+        draw_wins(next);
     }
 }
 
@@ -551,8 +554,8 @@ static void suspend_win(struct Win * w)
 
 
 
-extern uint16_t center_offset(uint16_t position, uint16_t mapsize,
-                              uint16_t frame_size)
+extern uint16_t center_offset(uint16_t position, uint32_t mapsize,
+                              uint32_t frame_size)
 {
     uint16_t offset = 0;
     if (mapsize > frame_size)
@@ -739,7 +742,8 @@ extern void free_winDB()
     {
         struct Win * wc = get_win_by_id(id);
         free(wc->title);
-        free_keybindings(wc->kb.kbs);
+        free(wc->kb.kbs);
+        wc->kb.kbs = NULL;
     }
     free(world.winDB.ids);  /* NULL this too since add_win_to_winDB() checks  */
     world.winDB.ids = NULL; /* for it to detect its first post-DB-purge round.*/
@@ -749,7 +753,7 @@ extern void free_winDB()
 
 
 
-extern void winch_called(int signal)
+extern void winch_called()
 {
     world.winch = 1;
 }