X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fwindows.c;h=4ef01c317acaf2d24fc7fdf63b1e1cf9036f0301;hb=1233a72ad3321fe69a8b43a70e077a7be00f8918;hp=a9bea11c00c9ac04053ef3bb4fc7eb65399e60cc;hpb=3a31142e9b3428ecaac3387ab81c1f9b7490051e;p=plomrogue
diff --git a/src/client/windows.c b/src/client/windows.c
index a9bea11..4ef01c3 100644
--- a/src/client/windows.c
+++ b/src/client/windows.c
@@ -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)
@@ -886,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--;
}