From 78be6c8a7b0b237d35a3b93b419bc743720fa033 Mon Sep 17 00:00:00 2001 From: girst Date: Sun, 20 May 2018 22:13:14 +0200 Subject: [PATCH] fix -d maxwidth --- mines.c | 2 +- schemes.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mines.c b/mines.c index 4ea10ac..bea6a6c 100644 --- a/mines.c +++ b/mines.c @@ -752,7 +752,7 @@ void clamp_fieldsize (void) { if (f.h < 1) f.h = 1; if (COL_OFFSET + f.w*CW + COL_OFFSET > w.ws_col) - f.w = (w.ws_col - COL_OFFSET - COL_OFFSET)/CW; //TODO: does not work in `-d' (in xterm) + f.w = (w.ws_col - COL_OFFSET - COL_OFFSET)/op.scheme->display_width; if (LINE_OFFSET + f.h + LINES_AFTER > w.ws_row) f.h = w.ws_row - (LINE_OFFSET+LINES_AFTER); if (COL_OFFSET + f.w*CW > MOUSE_MAX) diff --git a/schemes.h b/schemes.h index e9c7370..435ce45 100644 --- a/schemes.h +++ b/schemes.h @@ -54,6 +54,7 @@ struct minescheme { char* border[5][3]; int cell_width; + int display_width; char* init_seq; char* reset_seq; }; @@ -77,6 +78,7 @@ struct minescheme symbols_mono = { {"╚═","══","═╝"}}, .cell_width = 2, + .display_width = 2, }; struct minescheme symbols_col1 = { @@ -106,6 +108,7 @@ struct minescheme symbols_col1 = { {"╚═","══","═╝"}}, .cell_width = 2, + .display_width = 2, }; struct minescheme symbols_doublewidth = { @@ -140,6 +143,7 @@ struct minescheme symbols_doublewidth = { {"\033#6\x6d","\x71","\x6a"}}, .cell_width = 1, + .display_width = 2, .init_seq = "\033P0;1;0;4;1;1{P" /*config for DRCS "P": 7x10,erase-all*/ "??~^^^^/??N????\033\\" /* flag at '!' resembling ▕▀ */ "\033(0\033*B\033+P" /* G0=Graphics,G2=ASCII,G3="P" */ -- 2.39.3