commit 8102d4f

wf  ·  2026-04-14 14:25:14 +0000 UTC
parent d13f4c0
Add get_workspace, fix a few naming errors
4 files changed,  +24, -9
M howl.c
M ipc.c
+2, -1
 1@@ -32,11 +32,12 @@ static const struct command commands[] = {
 2 	{ "focus_next",          cmd_focus_next,          0, false },
 3 	{ "close",               cmd_close,               0, false },
 4 	{ "workspace",           cmd_workspace,           1, false },
 5-	{ "move_workspace",      cmd_move_workspace,      1, false },
 6+	{ "move_workspace",      cmd_send_workspace,      1, false },
 7 	{ "get_geometry",        cmd_get_geometry,        0, false },
 8 	{ "get_pid",             cmd_get_pid,             0, false },
 9 	{ "get_title",           cmd_get_title,           0, false },
10 	{ "get_app_id",          cmd_get_app_id,          0, false },
11+	{ "get_workspace",       cmd_get_workspace,       0, false },
12 	{ "bind",                cmd_bind,                2, false },
13 	{ "modkey",              cmd_modkey,              1, true  },
14 	{ "inner_focus_color",   cmd_inner_focus_color,   1, true  },
M howl.c
+8, -6
 1@@ -37,11 +37,12 @@ extern status ipc_focus_prev(char **);
 2 extern status ipc_focus_next(char **);
 3 extern status ipc_close(char **);
 4 extern status ipc_workspace(char **);
 5-extern status ipc_move_workspace(char **);
 6+extern status ipc_send_workspace(char **);
 7 extern status ipc_get_geometry(char **);
 8 extern status ipc_get_pid(char **);
 9 extern status ipc_get_title(char **);
10 extern status ipc_get_app_id(char **);
11+extern status ipc_get_workspace(char **);
12 extern status ipc_bind(char **);
13 extern status ipc_quit(char **);
14 extern status ipc_config(char **);
15@@ -80,11 +81,12 @@ static const cmd_handler_t cmd_handler [cmd_last] = {
16 	[cmd_focus_next]      = ipc_focus_next,
17 	[cmd_close]           = ipc_close,
18 	[cmd_workspace]       = ipc_workspace,
19-	[cmd_move_workspace]  = ipc_move_workspace,
20-	[cmd_geometry]        = ipc_get_geometry,
21-	[cmd_pid]             = ipc_get_pid,
22-	[cmd_title]           = ipc_get_title,
23-	[cmd_app_id]          = ipc_get_app_id,
24+	[cmd_send_workspace]  = ipc_send_workspace,
25+	[cmd_get_geometry]    = ipc_get_geometry,
26+	[cmd_get_pid]         = ipc_get_pid,
27+	[cmd_get_title]       = ipc_get_title,
28+	[cmd_get_app_id]      = ipc_get_app_id,
29+	[cmd_get_workspace]   = ipc_get_workspace,
30 	[cmd_bind]            = ipc_bind,
31 	[cmd_quit]            = ipc_quit,
32 	[cmd_config]          = ipc_config
+2, -1
 1@@ -17,11 +17,12 @@ enum cmd {
 2 	cmd_focus_next,
 3 	cmd_close,
 4 	cmd_workspace,
 5-	cmd_move_workspace,
 6+	cmd_send_workspace,
 7 	cmd_get_geometry,
 8 	cmd_get_pid,
 9 	cmd_get_title,
10 	cmd_get_app_id,
11+	cmd_get_workspace,
12 	cmd_bind,
13 	cmd_modkey,
14 	cmd_inner_focus_color,
M ipc.c
+12, -1
 1@@ -288,7 +288,7 @@ ipc_workspace(char **arg) {
 2 }
 3 
 4 status
 5-ipc_move_workspace(char **arg) {
 6+ipc_send_workspace(char **arg) {
 7 	if (arg[1] == NULL || !wm.cur)
 8 		return (status){ false, "" };
 9 
10@@ -359,6 +359,17 @@ ipc_get_app_id(char **arg) {
11 	return s;
12 }
13 
14+status
15+ipc_get_workspace(char **arg) {
16+	status s = {0};
17+
18+	UNUSED(arg);
19+	snprintf(s.msg, MAXSIZE * sizeof(char), "%d", wm.ws);
20+
21+	s.ok = true;
22+	return s;
23+}
24+
25 /*********/
26 
27 status