commit f8169ab

hovercats  ·  2026-05-07 13:25:22 +0000 UTC
parent 2c04de8 
tohu: drop
8 files changed,  +0, -155
M .gitmodules
M pkg/gen.lua
D pkg/tohu/config.h
D pkg/tohu/gen.lua
D pkg/tohu/patch/0001-use-anglebrackets-for-config.h-so-we-can-override-it.patch
D pkg/tohu/patch/0002-stop-setting-default-background-color.patch
D pkg/tohu/src
D pkg/tohu/ver
M .gitmodules
+0, -4 
 1@@ -345,10 +345,6 @@
 2 [submodule "pkg/swall/src"]
 3 	path = pkg/swall/src
 4 	url = https://git.sr.ht/~uint/swall
 5-[submodule "pkg/tohu/src"]
 6-	path = pkg/tohu/src
 7-	url = https://git.sr.ht/~shrub900/tohu
 8-	ignore = all
 9 [submodule "pkg/swiv/src"]
10 	path = pkg/swiv/src
11 	url = https://git.sr.ht/~shrub900/swiv
M pkg/gen.lua
+0, -1 
1@@ -106,7 +106,6 @@ subgen 'terminus-font'
2 subgen 'texi2mdoc'
3 subgen 'the_silver_searcher'
4 subgen 'tinyalsa'
5-subgen 'tohu'
6 subgen 'transmission'
7 subgen 'tz'
8 subgen 'u-config'
D pkg/tohu/config.h
+0, -61 
 1@@ -1,61 +0,0 @@
 2-#ifndef CONFIG_H
 3-#define CONFIG_H
 4-#include <xkbcommon/xkbcommon-keysyms.h>
 5-#include "types.h"
 6-#include "tohu.h"
 7-static const struct config cfg = {
 8-	.motion_throttle_hz = 85,
 9-	.border_col_active = 0xdeadca7,
10-	.border_col_normal = 0xff444444,
11-	.border_width = 3,
12-	.gaps = 0,
13-};
14-
15-static const char* termcmd[] = { "st", NULL };
16-static const char* menucmd[] = { "dmenu_run", NULL };
17-
18-static const char* cplay[] = { "cmus-remote", "--play", NULL };
19-static const char* cpause[] = { "cmus-remote", "--pause", NULL };
20-static const char* cnext[] = { "cmus-remote", "--next", NULL };
21-static const char* cprev[] = { "cmus-remote", "--prev", NULL };
22-
23-static const char* voli[] = { "vol", "-i", NULL };
24-static const char* vold[] = { "vol", "-d", NULL };
25-
26-static struct bind binds[] = {
27-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_Return, { .v = termcmd }, spawn },
28-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_r,      { .v = menucmd }, spawn },
29-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_i,      { .v = cplay },   spawn },
30-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_i,      { .v = cpause },  spawn },
31-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_o,      { .v = cnext },   spawn },
32-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_o,      { .v = cprev },   spawn },
33-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_q,      { .v = NULL },    quit },
34-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_9,      { .v = vold },    spawn },
35-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_0,      { .v = voli },    spawn },
36-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_Tab,    { .v = NULL },    focus_prev },
37-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_Tab,    { .v = NULL },    focus_next },
38-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_f,      { .v = NULL },    fullscreen },
39-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_q,      { .v = NULL },    kill_sel },
40-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_1,      { .ui = 1 },      workspace_goto },
41-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_2,      { .ui = 2 },      workspace_goto },
42-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_3,      { .ui = 3 },      workspace_goto },
43-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_4,      { .ui = 4 },      workspace_goto },
44-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_5,      { .ui = 5 },      workspace_goto },
45-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_6,      { .ui = 6 },      workspace_goto },
46-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_7,      { .ui = 7 },      workspace_goto },
47-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_8,      { .ui = 8 },      workspace_goto },
48-	{ SWC_BINDING_KEY,    MOD1,        XKB_KEY_9,      { .ui = 9 },      workspace_goto },
49-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_1,      { .ui = 1 },      workspace_moveto },
50-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_2,      { .ui = 2 },      workspace_moveto },
51-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_3,      { .ui = 3 },      workspace_moveto },
52-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_4,      { .ui = 4 },      workspace_moveto },
53-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_5,      { .ui = 5 },      workspace_moveto },
54-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_6,      { .ui = 6 },      workspace_moveto },
55-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_7,      { .ui = 7 },      workspace_moveto },
56-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_8,      { .ui = 8 },      workspace_moveto },
57-	{ SWC_BINDING_KEY,    MOD1|SHFT,   XKB_KEY_9,      { .ui = 9 },      workspace_moveto },
58-	{ SWC_BINDING_BUTTON, MOD1,        BTN_LEFT,       { .v = NULL },    mouse_move },
59-	{ SWC_BINDING_BUTTON, MOD1,        BTN_RIGHT,      { .v = NULL },    mouse_resize },
60-};
61-
62-#endif /* CONFIG_H */
D pkg/tohu/gen.lua
+0, -37 
 1@@ -1,37 +0,0 @@
 2-cflags{
 3-	'-std=c99',
 4-	'-D _POSIX_C_SOURCE=200809L',
 5-	'-I $dir',
 6-	'-I $srcdir/source/include',
 7-	'-isystem $builddir/pkg/fontconfig/include',
 8-	'-isystem $builddir/pkg/libdrm/include',
 9-	'-isystem $builddir/pkg/libinput/include',
10-	'-isystem $builddir/pkg/libxkbcommon/include',
11-	'-isystem $builddir/pkg/swc/include',
12-	'-isystem $builddir/pkg/wld/include',
13-	'-isystem $builddir/pkg/pixman/include',
14-	'-isystem $builddir/pkg/wayland-protocols/include',
15-	'-isystem $builddir/pkg/wayland/include',
16-}
17-
18-pkg.deps = {
19-	'pkg/fontconfig/headers',
20-	'pkg/libdrm/headers',
21-	'pkg/libinput/headers',
22-	'pkg/libxkbcommon/headers',
23-	'pkg/swc/headers',
24-	'pkg/wld/headers',
25-	'pkg/pixman/headers',
26-	'pkg/wayland/headers',
27-	'pkg/wayland-protocols/headers',
28-}
29-
30-exe('tohu', {
31-	'source/tohu.c',
32-	'source/util.c',
33-	'$builddir/pkg/swc/libswc.a.d',
34-})
35-
36-file('bin/tohu', '755', '$outdir/tohu')
37-
38-fetch 'git'
D pkg/tohu/patch/0001-use-anglebrackets-for-config.h-so-we-can-override-it.patch
+0, -25 
 1@@ -1,25 +0,0 @@
 2-From c676ff3798d491ee2eeaa0d955acc47e4ab557e3 Mon Sep 17 00:00:00 2001
 3-From: hovercats <hovercatswithlasereyes@protonmail.com>
 4-Date: Mon, 9 Mar 2026 12:55:12 +0100
 5-Subject: [PATCH] use anglebrackets for config.h so we can override it
 6-
 7----
 8- source/tohu.c | 2 +-
 9- 1 file changed, 1 insertion(+), 1 deletion(-)
10-
11-diff --git a/source/tohu.c b/source/tohu.c
12-index 602dfad..9dbe146 100644
13---- a/source/tohu.c
14-+++ b/source/tohu.c
15-@@ -8,7 +8,7 @@
16- #include <wayland-util.h>
17- #include <xkbcommon/xkbcommon-keysyms.h>
18- 
19--#include "config.h"
20-+#include <config.h>
21- #include "types.h"
22- #include "util.h"
23- #include "tohu.h"
24--- 
25-2.49.0
26-
D pkg/tohu/patch/0002-stop-setting-default-background-color.patch
+0, -25 
 1@@ -1,25 +0,0 @@
 2-From 95a9288116f3ae1ee02e646eb67e8b798c819227 Mon Sep 17 00:00:00 2001
 3-From: uint <abhinav.prsai@gmail.com>
 4-Date: Sat, 21 Feb 2026 03:12:57 +0000
 5-Subject: [PATCH] stop setting default background color
 6-
 7----
 8- source/tohu.c | 2 --
 9- 1 file changed, 2 deletions(-)
10-
11-diff --git a/source/tohu.c b/source/tohu.c
12-index 179c6be..60f45c2 100644
13---- a/source/tohu.c
14-+++ b/source/tohu.c
15-@@ -153,8 +153,6 @@ static void setup(void)
16- 	if (!swc_initialize(wm.dpy, wm.ev_loop, &manager))
17- 		die(EXIT_FAILURE, "swc_initialize failed\n");
18- 
19--	/* TODO: temp wallpaper and quit binding */
20--	swc_wallpaper_color_set(0xff1e1f21);
21- 	setup_binds();
22- 
23- 	/* display socket */
24--- 
25-2.49.0
26-
D pkg/tohu/src
+0, -1 
1@@ -1 +0,0 @@
2-Subproject commit 9236a46f77799ff10b7ce630f44c6cde4af8b95b
D pkg/tohu/ver
+0, -1 
1@@ -1 +0,0 @@
2-9236a46 r0