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

Limit workspace numbers within 0..INT32_MAX 

Before this commit, large workspace numbers treated oddly:

   $ i3-msg 'rename workspace to 1234567890'
   # displayed in i3bar as `0`

   $ i3-msg 'rename workspace to 4294967200'
   $ i3-msg -t get_workspaces | jq '.[]|select(.focused).num'
   -96 # int32_t overflow

   $ i3-msg 'rename workspace to 99999999999999999999'
   $ i3-msg -t get_workspaces | jq '.[]|select(.focused).num'
   -1 # treated as unnumbered

This commit puts a consistent limit on workspace numbers.  Now
workspaces with numbers beyond INT32_MAX are treated as unnumbered.
This commit is contained in:
Albert Safin 2020-02-21 02:07:04 +00:00
parent d3976fee8c
commit 83c7aff089
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i3bar/src/workspaces.c
View File

@ -114,7 +114,7 @@ static int workspaces_string_cb(void *params_, const unsigned char *val, size_t
if ((config.strip_ws_numbers || config.strip_ws_name) && params->workspaces_walk->num >= 0) { if ((config.strip_ws_numbers || config.strip_ws_name) && params->workspaces_walk->num >= 0) {
/* Special case: strip off the workspace number/name */ /* Special case: strip off the workspace number/name */
static char ws_num[10]; static char ws_num[32];
snprintf(ws_num, sizeof(ws_num), "%d", params->workspaces_walk->num); snprintf(ws_num, sizeof(ws_num), "%d", params->workspaces_walk->num);

2
include/util.h
View File

@ -86,7 +86,7 @@ bool layout_from_name(const char *layout_str, layout_t *out);
* interpreted as a "named workspace". * interpreted as a "named workspace".
* *
*/ */
long ws_name_to_number(const char *name); int ws_name_to_number(const char *name);
/** /**
* Updates *destination with new_value and returns true if it was changed or false * Updates *destination with new_value and returns true if it was changed or false

10
src/util.c
View File

@ -109,14 +109,12 @@ bool layout_from_name(const char *layout_str, layout_t *out) {
* interpreted as a "named workspace". * interpreted as a "named workspace".
* *
*/ */
long ws_name_to_number(const char *name) { int ws_name_to_number(const char *name) {
/* positive integers and zero are interpreted as numbers */ /* positive integers and zero are interpreted as numbers */
char *endptr = NULL; char *endptr = NULL;
long parsed_num = strtol(name, &endptr, 10); errno = 0;
if (parsed_num == LONG_MIN || long long parsed_num = strtoll(name, &endptr, 10);
parsed_num == LONG_MAX || if (errno != 0 || parsed_num > INT32_MAX || parsed_num < 0 || endptr == name) {
parsed_num < 0 ||
endptr == name) {
parsed_num = -1; parsed_num = -1;
} }

15
testcases/t/117-workspace.t
View File

@ -130,6 +130,21 @@ $ws = get_ws("aa: $tmp");
ok(defined($ws), "workspace aa: $tmp was created"); ok(defined($ws), "workspace aa: $tmp was created");
is($ws->{num}, -1, 'workspace number is -1'); is($ws->{num}, -1, 'workspace number is -1');
cmd "workspace -42: $tmp";
$ws = get_ws("-42: $tmp");
ok(defined($ws), "workspace -42: $tmp was created");
is($ws->{num}, -1, 'negative workspace number is ignored');
cmd "workspace 2147483647: $tmp";
$ws = get_ws("2147483647: $tmp");
ok(defined($ws), "workspace 2147483647: $tmp was created");
is($ws->{num}, 2147483647, 'workspace number is 2147483647');
cmd "workspace 2147483648: $tmp";
$ws = get_ws("2147483648: $tmp");
ok(defined($ws), "workspace 2147483648: $tmp was created");
is($ws->{num}, -1, 'workspace number past the limit is ignored');
################################################################################ ################################################################################
# Check that we can go to workspace "4: foo" with the command # Check that we can go to workspace "4: foo" with the command
# "workspace number 4". # "workspace number 4".