commit 6dcf4a9
hovercats
·
2026-03-01 07:50:45 +0000 UTC
parent 907f12f
hevel: bump to latest commit.
7 files changed,
+60,
-111
+15,
-0
1@@ -345,3 +345,18 @@
2 path = pkg/sndio/src
3 url = https://caoua.org/git/sndio
4 ignore = all
5+[submodule "pkg/swall/src"]
6+ path = pkg/swall/src
7+ url = https://git.sr.ht/~uint/swall
8+[submodule "pkg/tohu/src"]
9+ path = pkg/tohu/src
10+ url = https://git.sr.ht/~shrub900/tohu
11+ ignore = all
12+[submodule "pkg/swiv/src"]
13+ path = pkg/swiv/src
14+ url = https://git.sr.ht/~shrub900/swiv
15+ ignore = all
16+[submodule "pkg/wsxwm/src"]
17+ path = pkg/wsxwm/src
18+ url = https://github.com/uint23/wsxwm
19+ ignore = all
+12,
-9
1@@ -1,8 +1,6 @@
2-#define USE_IMAGE true
3-#ifdef USE_IMAGE
4- static char* imgpath = "/home/wololo/usr/img/wallhaven-yx357x.png";
5-#endif
6-static const uint32_t background_color = 0xff787878;
7+#ifndef CONFIG_H
8+#define CONFIG_H
9+static const uint32_t background_color = 0xff777777;
10 static const uint32_t outer_border_color_inactive = 0xffffffea;
11 static const uint32_t inner_border_color_inactive = 0xffddbd8c;
12 static const uint32_t outer_border_color_active = 0xffffffea;
13@@ -24,7 +22,12 @@ static const int chord_click_timeout_ms = 250;
14 static const int32_t move_scroll_edge_threshold = 80;
15 static const int32_t move_scroll_speed = 16;
16 static const float move_ease_factor = 0.30f;
17-static const bool scroll_drag_mode = false;
18-static const bool focus_center = true;
19-static const bool enable_zoom = false;
20-#define STICKY
21+static const int timerms = 16;
22+static const int scrollpx = 64;
23+static const int scrollease = 4;
24+static const int scrollcap = 64;
25+static const bool scroll_drag_mode = true;
26+static const bool enable_zoom = true;
27+#define FOCUS_CENTER true
28+#define JUMP
29+#endif
+6,
-82
1@@ -2,67 +2,19 @@ cflags{
2 '-std=c11',
3 '-D _GNU_SOURCE',
4 '-I $dir',
5- '-I $outdir',
6- '-I $outdir/protocol',
7- '-I $outdir/include',
8- '-I $srcdir/swc',
9- '-I $srcdir/swc/libswc',
10 '-isystem $builddir/pkg/fontconfig/include',
11+ '-isystem $builddir/pkg/libdrm/include',
12 '-isystem $builddir/pkg/libinput/include',
13 '-isystem $builddir/pkg/libxkbcommon/include',
14- '-isystem $builddir/pkg/libdrm/include',
15 '-isystem $builddir/pkg/linux-headers/include',
16+ '-isystem $builddir/pkg/swc/include',
17+ '-isystem $builddir/pkg/wld/include',
18 '-isystem $builddir/pkg/pixman/include',
19 '-isystem $builddir/pkg/wayland-protocols/include',
20 '-isystem $builddir/pkg/wayland/include',
21- '-isystem $builddir/pkg/wld/include',
22-}
23-
24-waylandproto('swc/protocol/swc.xml', {
25- client='include/swc-client-protocol.h',
26- server='include/swc-server-protocol.h',
27- code='swc-protocol.c',
28-})
29-
30-waylandproto('swc/protocol/server-decoration.xml', {
31- server='include/server-decoration-server-protocol.h',
32- code='server-decoration-protocol.c',
33-})
34-
35-waylandproto('swc/protocol/swc_snap.xml', {
36- server='protocol/swc_snap-server-protocol.h',
37- code='swc_snap-protocol.c',
38-})
39-
40-waylandproto('protocol/hevel.xml', {
41- server='protocol/hevel-server-protocol.h',
42- code='hevel-server.c',
43-})
44-
45-pkg.hdrs = {
46- '$outdir/protocol/hevel-server-protocol.h',
47- '$outdir/protocol/swc_snap-server-protocol.h',
48- '$outdir/include/server-decoration-server-protocol.h',
49- '$outdir/include/swc-client-protocol.h',
50- '$outdir/include/swc-server-protocol.h',
51 }
52
53-copy('$outdir/include', '$builddir/pkg/wld/protocol', {'wayland-drm-server-protocol.h'})
54-
55-sub('tools.ninja', function()
56- toolchain(config.host)
57- cflags{'-std=c99', '-D _POSIX_C_SOURCE=200809L'}
58- exe('convert_font', {'swc/cursor/convert_font.c'})
59-end)
60-
61-rule('convert_font', '$outdir/convert_font $in $out 2>/dev/null')
62-build('convert_font', '$outdir/cursor/cursor_data.h', {'$srcdir/swc/cursor/cursor.pcf', '|', '$outdir/convert_font'})
63-
64 pkg.deps = {
65- '$gendir/headers',
66- '$outdir/cursor/cursor_data.h',
67- '$outdir/protocol/hevel-server-protocol.h',
68- '$outdir/protocol/swc_snap-server-protocol.h',
69 'pkg/fontconfig/headers',
70 'pkg/libdrm/headers',
71 'pkg/libinput/headers',
72@@ -72,40 +24,12 @@ pkg.deps = {
73 'pkg/wayland/headers',
74 'pkg/wayland-protocols/headers',
75 'pkg/wld/headers',
76+ 'pkg/swc/headers',
77 }
78
79-lib('libswc.a', [[
80- swc/libswc/(
81- bindings.c compositor.c data.c
82- data_device.c data_device_manager.c
83- dmabuf.c drm.c input.c kde_decoration.c
84- keyboard.c launch.c mode.c output.c
85- panel.c panel_manager.c plane.c pointer.c
86- primary_plane.c region.c screen.c shell.c
87- shell_surface.c shm.c snap.c subcompositor.c
88- subsurface.c surface.c swc.c util.c view.c
89- wallpaper.c wayland_buffer.c window.c
90- xdg_decoration.c xdg_shell.c seat.c
91- )
92- swc/launch/protocol.c
93- server-decoration-protocol.c.o
94- swc-protocol.c.o
95- swc_snap-protocol.c.o
96- $builddir/(
97- pkg/libinput/libinput.a.d
98- pkg/libxkbcommon/libxkbcommon.a
99- pkg/wayland-protocols/xdg-decoration-unstable-v1-protocol.c.o
100- pkg/wayland-protocols/xdg-shell-protocol.c.o
101- pkg/wayland-protocols/linux-dmabuf-unstable-v1-protocol.c.o
102- pkg/wayland/libwayland-server.a.d
103- pkg/wld/libwld.a.d
104- )
105-]])
106-
107 exe('hevel', {
108- 'hevel.c',
109- 'hevel-server.c.o',
110- 'libswc.a',
111+ 'src/hevel.c',
112+ '$builddir/pkg/swc/libswc.a',
113 '$builddir/pkg/wld/libwld.a',
114 '$builddir/pkg/wayland/libwayland-server.a.d',
115 '$builddir/pkg/libinput/libinput.a.d',
1@@ -0,0 +1,25 @@
2+From f31bd43c2a8629d2e1aaa93b86b903190eea2e9f Mon Sep 17 00:00:00 2001
3+From: hovercats <hovercatswithlasereyes@protonmail.com>
4+Date: Thu, 12 Mar 2026 12:33:06 +0100
5+Subject: [PATCH] dont set path to config.h so we can override it
6+
7+---
8+ src/hevel.h | 2 +-
9+ 1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+diff --git a/src/hevel.h b/src/hevel.h
12+index 0c5577c..91cea4d 100644
13+--- a/src/hevel.h
14++++ b/src/hevel.h
15+@@ -23,7 +23,7 @@
16+ #include <swc.h>
17+ #include <xkbcommon/xkbcommon-keysyms.h>
18+
19+-#include "../config.h"
20++#include "config.h"
21+ #include "nein_cursor.h"
22+
23+ typedef enum {
24+--
25+2.49.0
26+
1@@ -1,18 +0,0 @@
2-From 7656f4df62a5763fb098d508977312889b052ea0 Mon Sep 17 00:00:00 2001
3-From: hovercats <hovercatswithlasereyes@protonmail.com>
4-Date: Wed, 21 Jan 2026 04:39:25 +0100
5-Subject: [PATCH] rename config.h to config.def.h to avoid conflicts with user
6- configs
7-
8----
9- config.h => config.def.h | 0
10- 1 file changed, 0 insertions(+), 0 deletions(-)
11- rename config.h => config.def.h (100%)
12-
13-diff --git a/config.h b/config.def.h
14-similarity index 100%
15-rename from config.h
16-rename to config.def.h
17---
18-2.49.0
19-
+1,
-1
1@@ -1 +1 @@
2-Subproject commit e37732f4bebf60a3f481da7220ab690a0973f0dd
3+Subproject commit f5f689cfe2d0f398ad227af1fba2d960cee000c6
+1,
-1
1@@ -1 +1 @@
2-e37732f r2
3+f5f689c r0