nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2203 from Airblader/bug-2202 

Ensure that the "border" command uses logical pixels.
This commit is contained in:
Michael Stapelberg 2016-02-10 22:04:07 +01:00
parent 5735e2de10 6cbff6bfd4
commit e2d1f0f567
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/userguide
View File

@ -2255,6 +2255,10 @@ and +border none+ to make the client borderless.
There is also +border toggle+ which will toggle the different border styles.
Note that "pixel" refers to logical pixel. On HiDPI displays, a logical pixel
may be represented by multiple physical pixels, so +pixel 1+ might not
necessarily translate into a single pixel row wide border.
*Syntax*:
-----------------------------------------------
border normal|pixel [<n>]

2
include/commands.h
View File

@ -76,7 +76,7 @@ void cmd_resize(I3_CMD, const char *way, const char *direction, long resize_px,
* Implementation of 'border normal|pixel [<n>]', 'border none|1pixel|toggle'.
*
*/
void cmd_border(I3_CMD, const char *border_style_str, const char *border_width);
void cmd_border(I3_CMD, const char *border_style_str, long border_width);
/**
* Implementation of 'nop <comment>'.

10
parser-specs/commands.spec
View File

@ -86,15 +86,15 @@ state BORDER:
border_style = 'normal', 'pixel'
-> BORDER_WIDTH
border_style = 'none', 'toggle'
-> call cmd_border($border_style, "0")
-> call cmd_border($border_style, 0)
border_style = '1pixel'
-> call cmd_border($border_style, "1")
-> call cmd_border($border_style, 1)
state BORDER_WIDTH:
end
-> call cmd_border($border_style, "2")
border_width = word
-> call cmd_border($border_style, $border_width)
-> call cmd_border($border_style, 2)
border_width = number
-> call cmd_border($border_style, &border_width)
# layout default|stacked|stacking|tabbed|splitv|splith
# layout toggle [split|all]

34
src/commands.c
View File

@ -716,8 +716,8 @@ void cmd_resize_set(I3_CMD, long cwidth, long cheight) {
* Implementation of 'border normal|pixel [<n>]', 'border none|1pixel|toggle'.
*
*/
void cmd_border(I3_CMD, const char *border_style_str, const char *border_width) {
DLOG("border style should be changed to %s with border width %s\n", border_style_str, border_width);
void cmd_border(I3_CMD, const char *border_style_str, long border_width) {
DLOG("border style should be changed to %s with border width %ld\n", border_style_str, border_width);
owindow *current;
HANDLE_EMPTY_MATCH;
@ -725,39 +725,35 @@ void cmd_border(I3_CMD, const char *border_style_str, const char *border_width)
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
int border_style = current->con->border_style;
char *end;
int tmp_border_width = -1;
tmp_border_width = strtol(border_width, &end, 10);
if (end == border_width) {
/* no valid digits found */
tmp_border_width = -1;
}
int con_border_width = border_width;
if (strcmp(border_style_str, "toggle") == 0) {
border_style++;
border_style %= 3;
if (border_style == BS_NORMAL)
tmp_border_width = 2;
con_border_width = 2;
else if (border_style == BS_NONE)
tmp_border_width = 0;
con_border_width = 0;
else if (border_style == BS_PIXEL)
tmp_border_width = 1;
con_border_width = 1;
} else {
if (strcmp(border_style_str, "normal") == 0)
if (strcmp(border_style_str, "normal") == 0) {
border_style = BS_NORMAL;
else if (strcmp(border_style_str, "pixel") == 0)
} else if (strcmp(border_style_str, "pixel") == 0) {
border_style = BS_PIXEL;
else if (strcmp(border_style_str, "1pixel") == 0) {
} else if (strcmp(border_style_str, "1pixel") == 0) {
border_style = BS_PIXEL;
tmp_border_width = 1;
} else if (strcmp(border_style_str, "none") == 0)
con_border_width = 1;
} else if (strcmp(border_style_str, "none") == 0) {
border_style = BS_NONE;
else {
} else {
ELOG("BUG: called with border_style=%s\n", border_style_str);
ysuccess(false);
return;
}
}
con_set_border_style(current->con, border_style, tmp_border_width);
con_set_border_style(current->con, border_style, logical_px(con_border_width));
}
cmd_output->needs_tree_render = true;