X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fwindows.c;h=6859e08f3a964c66a4c69fd8044b949979c54dab;hb=c74615b516cd7e44cc1a4005663eed1a373d0f68;hp=da830377e4d7d801e3382fe65aa4666177a744be;hpb=39ab34a368fbe30dc6639e021da89b1a20243fd6;p=plomrogue

diff --git a/src/client/windows.c b/src/client/windows.c
index da83037..6859e08 100644
--- a/src/client/windows.c
+++ b/src/client/windows.c
@@ -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)
@@ -505,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);
     }
 }
 
@@ -601,6 +601,7 @@ extern uint8_t read_winconf_from_file(char * line, uint32_t linemax,
                      "interface config file. ";
     char * err_id  = "Illegal ID(s) selected.";
     char * err_2   = "Double-initialized window.";
+    char * err_brk = "Illegal line break type index.";
     int test_for_end = try_fgetc(file, f_name);
     if (EOF == test_for_end || '\n' == test_for_end)
     {
@@ -618,6 +619,9 @@ extern uint8_t read_winconf_from_file(char * line, uint32_t linemax,
     win.title = try_malloc(strlen(line), f_name);
     memcpy(win.title, line, strlen(line) - 1);      /* Eliminate newline char */
     win.title[strlen(line) - 1] = '\0';             /* char at end of string. */
+    err_try_fgets(line, linemax, file, context, "0nsi");
+    err_line(atoi(line) > 2, line, context, err_brk);
+    win.linebreak = atoi(line);
     err_try_fgets(line, linemax, file, context, "0ni");
     win.target_height = atoi(line);
     win.target_height_type = (0 >= win.target_height);
@@ -659,6 +663,8 @@ extern void write_winconf_of_id_to_file(FILE * file, char c)
     try_fwrite(line, sizeof(char), strlen(line), file, f_name);
     sprintf(line, "%s\n", wc->title);
     try_fwrite(line, sizeof(char), strlen(line), file, f_name);
+    sprintf(line, "%d\n", wc->linebreak);
+    try_fwrite(line, sizeof(char), strlen(line), file, f_name);
     sprintf(line, "%d\n", wc->target_height);
     try_fwrite(line, sizeof(char), strlen(line), file, f_name);
     sprintf(line, "%d\n", wc->target_width);
@@ -877,6 +883,25 @@ extern void toggle_win_size_type(char axis)
 
 
 
+extern void toggle_linebreak_type()
+{
+    struct Win * w = get_win_by_id(world.winDB.active);
+    if      (0 == w->linebreak)
+    {
+        w->linebreak = 1;
+    }
+    else if (1 == w->linebreak)
+    {
+        w->linebreak = 2;
+    }
+    else if (2 == w->linebreak)
+    {
+        w->linebreak = 0;
+    }
+}
+
+
+
 extern void resize_active_win(char change)
 {
     if (world.winDB.active)