Implement strip_workspace_name. #3083

cedws · 2018-11-06T19:37:30Z

#3082.
~~For some reason, the strip_workspace_name is deemed invalid in the config file. Still trying to find out why.~~

sway/commands/bar/strip_workspace_name.c

cedws · 2018-11-06T20:49:13Z

I'm almost certain that I have put a strip_workspace_name everywhere necessary, but it's still invalid when the config loads.

2018-11-06 20:18:29 - [sway/config.c:655] Read line 212:     strip_workspace_numbers yes
2018-11-06 20:18:29 - [sway/commands.c:374] handling config command 'bar strip_workspace_numbers yes'
2018-11-06 20:18:29 - [sway/commands.c:156] find_handler(strip_workspace_numbers)
2018-11-06 20:18:29 - [sway/commands.c:409] Subcommand: strip_workspace_numbers yes
2018-11-06 20:18:29 - [sway/commands.c:156] find_handler(strip_workspace_numbers)
2018-11-06 20:18:29 - [sway/commands/bar/strip_workspace_numbers.c:23] Stripping workspace numbers on bar: bar-0
2018-11-06 20:18:29 - [sway/config.c:655] Read line 213:     strip_workspace_name yes
2018-11-06 20:18:29 - [sway/commands.c:374] handling config command 'bar strip_workspace_name yes'
2018-11-06 20:18:29 - [sway/commands.c:156] find_handler(strip_workspace_name)
2018-11-06 20:18:29 - [sway/commands.c:409] Subcommand: strip_workspace_name yes
2018-11-06 20:18:29 - [sway/commands.c:156] find_handler(strip_workspace_name)
2018-11-06 20:18:29 - [sway/config.c:708] Error on line 213 'strip_workspace_name yes': Unknown/invalid command (/home/cedwards/.config/sway/config)

It fails to find the handler, even though I've defined it:

...
{ "strip_workspace_numbers", bar_cmd_strip_workspace_numbers },
{ "strip_workspace_name", bar_cmd_strip_workspace_name },
...

I've also tried an rm -rf build since I had to add a file to meson.build. No luck.

RedSoxFan · 2018-11-06T20:50:43Z

...
{ "strip_workspace_numbers", bar_cmd_strip_workspace_numbers },
{ "strip_workspace_name", bar_cmd_strip_workspace_name },
...

The handlers need to be in alphabetical order. Just reverse the two lines and it should work.

cedws · 2018-11-06T20:57:04Z

Can't believe I missed that, thanks a lot.

swaybar/render.c

sway/commands/bar/strip_workspace_name.c

sway/commands/bar/strip_workspace_numbers.c

swaybar/ipc.c

swaybar/render.c

cedws · 2018-11-08T20:27:05Z

I have committed another solution. I'm not sure how picky i3 is about the [n]:[NAME] formatting, currently the code will just split by the : character and use the substrings.

RedSoxFan

Since strtok alters the original string, strip_workspace_name is forced when strip_workspace_numbers is set to no. Additionally, anything else that uses ws->name will have just the number (regardless of the settings), instead of the full name.

Also, when strip_workspace_numbers is set to yes and the workspace is not of the form n:name, then (null) is displayed.

RedSoxFan

Just needs documentation. Aside from that LGTM.

cedws · 2018-11-08T23:21:40Z

Let me know before you merge and I will do a squash.

swaybar/ipc.c

missed edge cases

cedws · 2018-11-09T20:39:37Z

This commit fixes all the edge cases I'm aware of. I noticed some unrelated behaviour with custom workspace names - if you rename a workspace so that the num becomes 2 (swaymsg rename workspace "1" to "2"), using $mod+2 won't switch to that workspace. Is this intended?

EDIT - I've squashed the commits together, but the relevant changes are in ipc.c.

RyanDwyer

Code LGTM but I haven't tested it.

BTW, my original intention was for the swaybar_workspace struct to have something like name and label rather than name, stripped_name and stripped_number. You could then make render_workspace_button use the label field without having to check the stripping config. But I'm not fussed about this.

ianyfan

The variable names stripped_name and stripped_number keep confusing me because I keep forgetting which way round they are. But that might just be me.

swaybar/ipc.c

cedws · 2018-11-10T12:11:13Z

@RyanDwyer I think this commit should do it the way you suggested.

swaybar/ipc.c

cedws · 2018-11-13T10:50:07Z

I have managed to get strip_workspace_numbers to work with/without a semicolon according to i3's behaviour, but having issues with strip_workspace_name.

There's some kind of memory bug I can't figure out. I'm allocating 2 bytes, one for the first character and one for the null terminator, and then calling strncat to copy the first character, but something is going wrong here.

swaybar/ipc.c

cedws · 2018-11-14T14:18:15Z

Ready for review again, it has the same behaviour as i3 AFAIK from testing.

swaybar/ipc.c

cedws · 2018-11-15T12:37:17Z

I have done some testing and these cases now work:

strip_workspace_name 1234: names the workspace 1234
strip_workspace_numbers :abcd names the workspace ~~abcd~~ :abcd
strip_workspace_name 1234:abcd names the workspace 1234
strip_workspace_numbers 1234:abcd names the workspace abcd
strip_workspace_name 1234abcd names the workspace 1234
strip_workspace_numbers 1234abcd names the workspace abcd

ianyfan · 2018-11-15T13:56:40Z

strip_workspace_numbers :abcd should name the workspace :abcd

Dismissing my review. There's been heaps of changes since I last looked at this.

cedws · 2018-11-15T17:59:51Z

@ddevault It looks like something has gone wrong with the CI.

swaybar/ipc.c

ianyfan

Implementation all works now, just (mostly) style fixes.

common/util.c

sway/commands/bar/strip_workspace_name.c

sway/commands/bar/strip_workspace_numbers.c

swaybar/ipc.c

ianyfan · 2018-11-17T09:43:08Z

swaybar/ipc.c

+					if (bar->config->strip_workspace_name) {
+						free(ws->label);
+						ws->label = malloc(len_offset + 1 * sizeof(char));
+						ws->label[len_offset] = '\0';


I just realised you should be able to remove the three other lines in this block and this will still work, since it'll terminate the string in the correct place, even if there's leftover characters after it.

ianyfan · 2018-11-17T09:48:04Z

swaybar/ipc.c

+					} else if (bar->config->strip_workspace_numbers) {
+						len_offset += ws->label[len_offset] == ':';
+						if (strlen(ws->name) > len_offset) {
+							free(ws->label);


You could remove this line and use strcpy below, though it's less of a fun solution as the one above.

swaybar/ipc.c

emersion · 2018-11-19T16:56:26Z

Thanks!

cedws commented Nov 6, 2018

View reviewed changes

sway/commands/bar/strip_workspace_name.c Outdated Show resolved Hide resolved

cedws force-pushed the feature/StripWorkspaceName branch from b9d8d7f to 7927b24 Compare November 6, 2018 20:01

cedws force-pushed the feature/StripWorkspaceName branch from 3f7ac47 to 7927b24 Compare November 6, 2018 22:41

cedws commented Nov 7, 2018

View reviewed changes

swaybar/render.c Outdated Show resolved Hide resolved

cedws changed the title ~~[WIP] Implement strip_workspace_name.~~ Implement strip_workspace_name. Nov 7, 2018

RyanDwyer suggested changes Nov 7, 2018

View reviewed changes

cedws force-pushed the feature/StripWorkspaceName branch from c380a75 to 5f0fcdd Compare November 8, 2018 20:24

RedSoxFan requested changes Nov 8, 2018

View reviewed changes

RedSoxFan reviewed Nov 8, 2018

View reviewed changes

RedSoxFan previously approved these changes Nov 8, 2018

View reviewed changes

ianyfan requested changes Nov 9, 2018

View reviewed changes