Slightly shortened and simplified windows library code.

diff --git a/src/main.c b/src/main.c
index 478f764d4586d43908632a0512a1b03bd58b495d..39837fefc9b02afa79e0bf7c164f67d7f3840504 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -152,14 +152,12 @@ int main(int argc, char *argv[])
     world.seed = restore_seed;
 
     /* Initialize window system and windows. */
-    WINDOW * screen = initscr();
+    init_win_meta();
     set_cleanup_flag(CLEANUP_NCURSES);
     noecho();
     curs_set(0);
-    keypad(screen, TRUE);
+    keypad(world.wmeta->screen, TRUE);
     raw();
-    init_win_meta(screen);
-    set_cleanup_flag(CLEANUP_WIN_META);
     load_interface_conf();
     set_cleanup_flag(CLEANUP_INTERFACE_CONF);
 

diff --git a/src/rexit.c b/src/rexit.c
index 0b673af4c2934a2e0457aa91d3c4019d5af60374..c96adc9076133b82fd88ddee32039feb16f99ae8 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -4,13 +4,12 @@
 #include <stdlib.h> /* for exit(), free(), defines EXIT_SUCESS, EXIT_FAILURE */
 #include <stdio.h> /* for printf(), perror() */
 #include <stdint.h> /* for uint8_t */
-#include <ncurses.h> /* for endwin() */
 #include <errno.h> /* for errno */
 #include "main.h" /* for world global */
 #include "map.h" /* for Map struct */
 #include "keybindings.h" /* for free_keybindings() */
 #include "command_db.h" /* for free_command_db() */
-#include "windows.h" /* for Win struct, free_win(), free_winmeta() */
+#include "windows.h" /* for Win struct, free_win(), free_winmeta_and_endwin() */
 #include "map_objects.h" /* for free_map_objects, free_map_object_defs() */
 #include "misc.h" /* for unload_interface_conf() */
 #include "map_object_actions.h" /* for free_map_object_actions() */
@@ -25,10 +24,6 @@ static void cleanup();
 
 static void cleanup()
 {
-    if (cleanup_flags & CLEANUP_NCURSES)
-    {
-        endwin();
-    }
     if (cleanup_flags & CLEANUP_MAP_OBJECTS)
     {
         free_map_objects(world.map_objs);
@@ -57,9 +52,9 @@ static void cleanup()
     {
         unload_interface_conf();
     }
-    if (cleanup_flags & CLEANUP_WIN_META)
+    if (cleanup_flags & CLEANUP_NCURSES)
     {
-        free_winmeta();
+        free_winmeta_and_endwin();
     }
 }
 

diff --git a/src/rexit.h b/src/rexit.h
index 459fcb9225a93c1ad32c78ac8c4f5edbd0a45485..a28efc20f0a49e1ff88e7daf38ce55298c56afc4 100644 (file)
--- a/src/rexit.h
+++ b/src/rexit.h
@@ -26,8 +26,7 @@ enum cleanup_flag
     CLEANUP_MAPOBJACTS      = 0x0010,
     CLEANUP_MAP_OBJECTS     = 0x0020,
     CLEANUP_MAP_OBJECT_DEFS = 0x0040,
-    CLEANUP_WIN_META        = 0x0080,
-    CLEANUP_INTERFACE_CONF  = 0x0100
+    CLEANUP_INTERFACE_CONF  = 0x0080
 };
 extern void set_cleanup_flag(enum cleanup_flag flag);
 

diff --git a/src/windows.c b/src/windows.c
index fafa566edf670842173455564a3fb74dbb2b7673..a0c42f11e298e831b6e5dd1a7e047ee39bc2696f 100644 (file)
--- a/src/windows.c
+++ b/src/windows.c
@@ -2,11 +2,11 @@
 
 #include "windows.h"
 #include <stdint.h>    /* for uint8_t, uint16_t, uint32_t, UINT16_MAX */
-#include <ncurses.h>   /* for typedefs WINDOW, chtype, wresize(), getmaxx(), */
-                       /* getmaxy(), delwin(), mvwaddch(), mvwaddstr(),      */
-                       /* newpad(), wnoutrefres(), erase(), werase(),        */
-                       /* pnoutrefresh(), doupdate(), getmaxyx()   */
-#include <stdlib.h>    /* for malloc(), free() */
+#include <ncurses.h>   /* for typedefs chtype, wresize(), getmaxx(), getmaxy(),
+                        * delwin(), mvwaddch(), mvwaddstr(), newpad(), erase(),
+                        * wnoutrefresh(), werase(), pnoutrefresh(), doupdate()
+                        */
+#include <stdlib.h>    /* for free() */
 #include <string.h>    /* for strlen(), strnlen(), memcpy() */
 #include "yx_uint16.h" /* for struct yx_uint16 */
 #include "misc.h"      /* for center_offset(), try_malloc() */
@@ -15,24 +15,21 @@
 
 
 
-/* Fit virtual screen's width to minimum width demanded by current windows'
- * geometries.
- */
+/* Make virtual screen just wide enough to contain all visible windows. */
 static void refit_pad();
 
 /* Update geometry (sizes, positions) of window "w" and its successors in the
- * window chain. For the positioning algorithm place_win() is used.
+ * window chain. Use place_win() for the positioning algorithm.
  */
 static void update_wins(struct Win * w);
 static void place_win(struct Win * w);
 
-/* Draw scroll hint (a line saying that there are "dist" more elements of
- * "unit" further into the direction symbolized by the "dir" char) into virtual
- * screen pad, onto an appropriate edge of either a window or the screen; the
- * left or right edge if "dir" is "<" or ">", or the upper or lower edge if it
- * is "^" or "v". "start" should be either the start coordinate of a window's
- * frame or .y=0, .x=wm->pad_offset if it describes the virtual screen pad.
- * winscroll_hint() and padscroll_hint() are wrappers to simplify these uses.
+/* Draw scroll hint (a line saying that there are "dist" more elements of "unit"
+ * further into the direction symbolized by "dir") into virtual screen, onto an
+ * appropriate edge of a window or the screen; the left/right edge if "dir" is
+ * "<"/">", or the top/bottom edge if it is "^"/"v". "start" be either the start
+ * coordinate of a window's frame, or .y=0, .x=wm->pad_offset for the virtual
+ * screen. winscroll_hint() and padscroll_hint() are wrappers to both cases.
  */
 static void scroll_hint(struct yx_uint16 fsize, char dir, uint16_t dist,
                         char * unit, struct yx_uint16 start);
@@ -42,22 +39,15 @@ static void padscroll_hint(char dir, uint16_t dist);
 /* Draw contents of all windows in window chain from window "w" onwards. */
 static void draw_wins(struct Win * w);
 
-/* draw_win_borderlines() draws the vertical and horizontal borders of window
- * "w" sans corners into the virtual screen "pad", and draws the top border
- * line as the windows' title bar (highlighted if the window is described
- * active by "active" being == 1).
- *
- * draw_wins_borderlines() calls draw_win_borderlines() recursively on all
- * windows from "w" on. "w_active" is a pointer to the one window that
- * draw_win_borderlines() is supposed to handle as the active window.
- *
- * Finally, draw_wins_bordercorners() draws into "pad" the borders of window "w"
- * and all its successors.
+/* draw_win_borderlines() draws vertical/horizontal borders of window "w" sans
+ * corners into the virtual screen. It draws the top border line as the windows'
+ * title bar (highlighted if the window is selected as active). It is called
+ * recursively by draw_wins_borderlines() on all windows from "w" on.
+ * draw_wins_bordercorners() draws the border corners of "w" and its successors.
  */
-static void draw_win_borderlines(struct Win * w, char active, WINDOW * pad);
-static void draw_wins_borderlines(struct Win * w, struct Win * w_active,
-                                  WINDOW * pad);
-static void draw_wins_bordercorners(struct Win * w, WINDOW * pad);
+static void draw_win_borderlines(struct Win * w);
+static void draw_wins_borderlines(struct Win * w);
+static void draw_wins_bordercorners(struct Win * w);
 
 /* Shift active window forwards / backwards in window chain. */
 static void shift_win_forward();
@@ -203,11 +193,9 @@ static void scroll_hint(struct yx_uint16 fsize, char dir, uint16_t dist,
         if ('<' == dir || '>' == dir)
         {
             mvwaddch(world.wmeta->pad, start.y + q, start.x + draw_offset, c);
+            continue;
         }
-        else
-        {
-            mvwaddch(world.wmeta->pad, start.y + draw_offset, start.x + q, c);
-        }
+        mvwaddch(world.wmeta->pad, start.y + draw_offset, start.x + q, c);
     }
 }
 
@@ -238,11 +226,11 @@ static void winscroll_hint(struct Win * w, char dir, uint16_t dist)
 static void draw_wins(struct Win * w)
 {
     w->draw(w);
-    uint16_t y, x, size_y, size_x;
-    size_y = w->winmapsize.y;
-    size_x = w->winmapsize.x;
+    uint16_t size_y = w->winmapsize.y;
+    uint16_t size_x = w->winmapsize.x;
     uint16_t offset_y = center_offset(w->center.y, size_y, w->framesize.y);
     uint16_t offset_x = center_offset(w->center.x, size_x, w->framesize.x);
+    uint16_t y, x;
     for (y = offset_y; y < w->framesize.y + offset_y && y < size_y; y++)
     {
         for (x = offset_x; x < w->framesize.x + offset_x && x < size_x; x++)
@@ -280,19 +268,19 @@ static void draw_wins(struct Win * w)
 
 
 
-static void draw_win_borderlines(struct Win * w, char active, WINDOW * pad)
+static void draw_win_borderlines(struct Win * w)
 {
     /* Draw vertical and horizontal border lines. */
     uint16_t y, x;
     for (y = w->start.y; y <= w->start.y + w->framesize.y; y++)
     {
-        mvwaddch(pad, y, w->start.x - 1,              '|');
-        mvwaddch(pad, y, w->start.x + w->framesize.x, '|');
+        mvwaddch(world.wmeta->pad, y, w->start.x - 1,              '|');
+        mvwaddch(world.wmeta->pad, y, w->start.x + w->framesize.x, '|');
     }
     for (x = w->start.x; x <= w->start.x + w->framesize.x; x++)
     {
-        mvwaddch(pad, w->start.y - 1,              x, '-');
-        mvwaddch(pad, w->start.y + w->framesize.y, x, '-');
+        mvwaddch(world.wmeta->pad, w->start.y - 1,              x, '-');
+        mvwaddch(world.wmeta->pad, w->start.y + w->framesize.y, x, '-');
     }
 
     /* Draw as much as possible of the title into center of top border line. */
@@ -307,45 +295,41 @@ static void draw_win_borderlines(struct Win * w, char active, WINDOW * pad)
         uint16_t length_visible = strnlen(w->title, w->framesize.x - 2);
         char title[length_visible + 3];
         char decoration = ' ';
-        if (1 == active)
+        if (w == world.wmeta->active)
         {
             decoration = '$';
         }
         memcpy(title + 1, w->title, length_visible);
         title[0] = title[length_visible + 1] = decoration;
         title[length_visible + 2] = '\0';
-        mvwaddstr(pad, w->start.y - 1, w->start.x + title_offset, title);
+        mvwaddstr(world.wmeta->pad,
+                  w->start.y - 1, w->start.x + title_offset, title);
     }
 }
 
 
 
-static void draw_wins_borderlines(struct Win * w, struct Win * w_active,
-                                  WINDOW * pad)
+static void draw_wins_borderlines(struct Win * w)
 {
-    char active = 0;
-    if (w == w_active)
-    {
-        active = 1;
-    }
-    draw_win_borderlines(w, active, pad);
+    draw_win_borderlines(w);
     if (0 != w->next)
     {
-        draw_wins_borderlines(w->next, w_active, pad);
+        draw_wins_borderlines(w->next);
     }
 }
 
 
 
-static void draw_wins_bordercorners(struct Win * w, WINDOW * pad)
+static void draw_wins_bordercorners(struct Win * w)
 {
-    mvwaddch(pad, w->start.y - 1, w->start.x - 1, '+');
-    mvwaddch(pad, w->start.y - 1, w->start.x + w->framesize.x, '+');
-    mvwaddch(pad, w->start.y + w->framesize.y, w->start.x - 1, '+');
-    mvwaddch(pad, w->start.y + w->framesize.y, w->start.x + w->framesize.x,'+');
+    mvwaddch(world.wmeta->pad, w->start.y - 1, w->start.x - 1, '+');
+    mvwaddch(world.wmeta->pad, w->start.y - 1, w->start.x + w->framesize.x, '+');
+    mvwaddch(world.wmeta->pad, w->start.y + w->framesize.y, w->start.x - 1, '+');
+    mvwaddch(world.wmeta->pad, w->start.y + w->framesize.y,
+             w->start.x + w->framesize.x,'+');
     if (0 != w->next)
     {
-        draw_wins_bordercorners(w->next, pad);
+        draw_wins_bordercorners(w->next);
     }
 }
 
@@ -433,17 +417,16 @@ static void shift_win_backward()
 
 
 
-extern void init_win_meta(WINDOW * screen)
+extern void init_win_meta()
 {
     char * f_name = "init_win_meta()";
     char * err_s = "init_win_meta() creates virtual screen beyond legal size.";
     char * err_m = "init_win_meta() triggers memory alloc error via newpad().";
     world.wmeta         = try_malloc(sizeof(struct WinMeta), f_name);
-    world.wmeta->screen = screen;
-    uint32_t maxy_test  = getmaxy(screen);
-    uint32_t maxx_test  = getmaxx(screen);
-    uint8_t test = (maxy_test > UINT16_MAX || maxx_test > UINT16_MAX);
-    exit_err(test, err_s);
+    world.wmeta->screen = initscr();
+    uint32_t maxy_test  = getmaxy(world.wmeta->screen);
+    uint32_t maxx_test  = getmaxx(world.wmeta->screen);
+    exit_err(maxy_test > UINT16_MAX || maxx_test > UINT16_MAX, err_s);
     world.wmeta->padsize.y   = maxy_test;
     world.wmeta->padsize.x   = maxx_test;
     world.wmeta->chain_start = 0;
@@ -465,7 +448,7 @@ extern void init_win(struct Win ** wp, char * title, int16_t height,
     w->next         = 0;
     w->winmapsize.y = 0;
     w->winmapsize.x = 0;
-    w->winmap = NULL;
+    w->winmap       = NULL;
     w->title        = try_malloc(strlen(title) + 1, f_name);
     sprintf(w->title, "%s", title);
     w->draw         = func;
@@ -492,10 +475,11 @@ extern void init_win(struct Win ** wp, char * title, int16_t height,
 
 
 
-extern void free_winmeta()
+extern void free_winmeta_and_endwin()
 {
     delwin(world.wmeta->pad);
     free(world.wmeta);
+    endwin();
 }
 
 
@@ -536,7 +520,7 @@ extern void suspend_win(struct Win * w)
     {
         world.wmeta->chain_start = w->next;
     }
-    char pad_refitted = 0;
+    uint8_t pad_refitted = 0;
     if (world.wmeta->chain_end != w)
     {
         w->next->prev = w->prev;
@@ -555,10 +539,8 @@ extern void suspend_win(struct Win * w)
             world.wmeta->active = w->prev;
         }
     }
-
     w->prev = 0;
     w->next = 0;
-
     if (0 == pad_refitted)
     {
         refit_pad();
@@ -632,11 +614,10 @@ extern void shift_active_win(char dir)
     if ('f' == dir)
     {
         shift_win_forward();
+        update_wins(world.wmeta->chain_start);
+        return;
     }
-    else
-    {
-        shift_win_backward();
-    }
+    shift_win_backward();
     update_wins(world.wmeta->chain_start);
 }
 
@@ -652,9 +633,8 @@ extern void draw_all_wins()
     {
 
         /* Draw windows' borders first, then windows. */
-        draw_wins_borderlines(world.wmeta->chain_start, world.wmeta->active,
-                              world.wmeta->pad);
-        draw_wins_bordercorners(world.wmeta->chain_start, world.wmeta->pad);
+        draw_wins_borderlines(world.wmeta->chain_start);
+        draw_wins_bordercorners(world.wmeta->chain_start);
         draw_wins(world.wmeta->chain_start);
 
         /* Draw virtual screen scroll hints. */

diff --git a/src/windows.h b/src/windows.h
index aeea14c336cedf28d58881843b7781667b372846..8485321cfa47f6637c8a4b905395c53bf3f35562 100644 (file)
--- a/src/windows.h
+++ b/src/windows.h
@@ -66,11 +66,11 @@ struct WinMeta
 
 
 
-/* Initialize empty "wmeta" on terminal "screen". All struct members are
- * initialized to 0, except for the newly created virtual screen "pad" and its
- * size (height: that of the terminal screen; width: 1 cell).
+/* Initialize empty "wmeta" on terminal screen. All struct members initialize to
+ * 0, except for .screen, the newly created virtual screen .pad and its .padsize
+ * (height: that of the terminal screen; width: 1 cell).
  */
-extern void init_win_meta(WINDOW * screen);
+extern void init_win_meta();
 
 /* Initialize a Win child "wp" of "wmeta" to "title", "height" and "width" and
  * appoint "func"() as its .draw. Initialize other members to 0.
@@ -85,8 +85,8 @@ extern void init_win_meta(WINDOW * screen);
 extern void init_win(struct Win ** wp, char * title, int16_t height,
                      int16_t width, void * func);
 
-/* Free allocated memory for an initialized Win / WinMeta structs. */
-extern void free_winmeta();
+/* Free memory initialized Win/WinMeta structs; endwin() for the latter, too. */
+extern void free_winmeta_and_endwin();
 extern void free_win(struct Win * win);
 
 /* Append/suspend window "w" to/from chain of visible windows below "wmeta".