thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0854: cannot get terminal cell size

Browse Source 
Problem:  cannot get terminal cell size
Solution: add getcellpixels() function to return xpixel * ypixel
          cell size on terminal Unix (mikoto2000)

closes: #16004

Signed-off-by: mikoto2000 <mikoto2000@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
mikoto2000
2024-11-11 21:24:14 +01:00
committed by Christian Brabandt
parent 6fbf63de86
commit 1083cae709
10 changed files with 112 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/os_unix.c
View File

@@ -4348,6 +4348,68 @@ mch_get_shellsize(void)
return OK;
}
#if defined(FEAT_EVAL) || defined(PROTO)
void
f_getcellpixels(typval_T *argvars UNUSED, typval_T *rettv)
{
struct cellsize cs;
mch_calc_cell_size(&cs);
if (rettv_list_alloc(rettv) == FAIL)
return;
list_append_number(rettv->vval.v_list, (varnumber_T)cs.cs_xpixel);
list_append_number(rettv->vval.v_list, (varnumber_T)cs.cs_ypixel);
}
#endif
/*
* Try to get the current terminal cell size.
* If faile get cell size, fallback 5x10 pixel.
*/
void
mch_calc_cell_size(struct cellsize *cs_out)
{
#if defined(FEAT_GUI)
if (!gui.in_use)
{
#endif
// get current tty size.
struct winsize ws;
int fd = 1;
int retval = -1;
retval = ioctl(fd, TIOCGWINSZ, &ws);
# ifdef FEAT_EVAL
ch_log(NULL, "ioctl(TIOCGWINSZ) %s", retval == 0 ? "success" : "failed");
# endif
if (retval == -1)
{
cs_out->cs_xpixel = -1;
cs_out->cs_ypixel = -1;
return;
}
// calculate parent tty's pixel per cell.
int x_cell_size = ws.ws_xpixel / ws.ws_col;
int y_cell_size = ws.ws_ypixel / ws.ws_row;
// calculate current tty's pixel
cs_out->cs_xpixel = x_cell_size;
cs_out->cs_ypixel = y_cell_size;
# ifdef FEAT_EVAL
ch_log(NULL, "Got cell pixel size with TIOCGWINSZ: %d x %d", x_cell_size, y_cell_size);
# endif
#if defined(FEAT_GUI)
}
else
{
cs_out->cs_xpixel = -1;
cs_out->cs_ypixel = -1;
}
#endif
}
#if defined(FEAT_TERMINAL) || defined(PROTO)
/*
* Report the windows size "rows" and "cols" to tty "fd".
@@ -4367,8 +4429,13 @@ mch_report_winsize(int fd, int rows, int cols)
ws.ws_col = cols;
ws.ws_row = rows;
ws.ws_xpixel = cols * 5;
ws.ws_ypixel = rows * 10;
// calcurate and set tty pixel size
struct cellsize cs;
mch_calc_cell_size(&cs);
ws.ws_xpixel = cols * cs.cs_xpixel;
ws.ws_ypixel = rows * cs.cs_ypixel;
retval = ioctl(tty_fd, TIOCSWINSZ, &ws);
ch_log(NULL, "ioctl(TIOCSWINSZ) %s", retval == 0 ? "success" : "failed");
# elif defined(TIOCSSIZE)