X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fwindows.c;h=4ef01c317acaf2d24fc7fdf63b1e1cf9036f0301;hb=5ae8d71f6b87c0cfc6b3ecf974f2cfbd6a611733;hp=763178bf596465660b1f2ea4fa084504e7a12092;hpb=0907037fc188c28471805286a67b786264ba3e2f;p=plomrogue
diff --git a/src/client/windows.c b/src/client/windows.c
index 763178b..4ef01c3 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)
@@ -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);
}
}
@@ -598,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)
{
@@ -615,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);
@@ -656,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);
@@ -750,7 +759,7 @@ extern void free_winDB()
-extern void winch_called(int signal)
+extern void winch_called()
{
world.winch = 1;
}
@@ -874,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)
@@ -883,7 +911,7 @@ extern void resize_active_win(char change)
{
w->frame_size.y--;
}
- else if (change == '_' && w->frame_size.y > 1)
+ else if (change == '_' && w->frame_size.x > 1)
{
w->frame_size.x--;
}