Ragnar build + EWMH status bars compliance

.gitattributes

@@ -0,0 +1,8 @@
+# keep CRLF out of the tree
+* text=auto eol=lf
+
+# build plumbing, not part of the language breakdown.
+# a pattern without a slash matches the basename at any depth, so this
+# covers ./Makefile and ./api/Makefile both.
+Makefile  linguist-detectable=false
+flake.nix linguist-detectable=false

.gitignore

@@ -1,5 +1,11 @@
-ragnar.o
-ragnarstart
+*.o
+*.a
 *.patch
 .cache/
 bin/
+pkg/
+ragnar/
+**.tar.zst
+.gdb.log
+compile_commands.json
+compile_flags.txt

Makefile

@@ -1,51 +1,51 @@
 CC = cc
-CFLAGS = -O3 -ffast-math -Wall -Wextra -pedantic
-CFLAGS += -isystem api/include
+# ?= so an exported CFLAGS (makepkg, distro build) replaces this wholesale.
+# geometry here is ratios and pixel rects cast back to ints, so -ffast-math
+# bought nothing and -ffinite-math-only would let divisions by a zero-sized
+# monitor fold away instead of showing up.
+CFLAGS ?= -O2
+ALL_CFLAGS = $(CFLAGS) $(CPPFLAGS) -Wall -Wextra -pedantic -isystem api/include
 
-LDLIBS = -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-cursor -lxcb-randr -lxcb-composite -lxcb-ewmh -lX11 -lX11-xcb -lGL -lm -lconfig -lxcb-util
+LDLIBS = -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-cursor -lxcb-randr -lxcb-xfixes -lX11 -lX11-xcb -lconfig
 
 SRC = ./src/*.c ./src/ipc/*.c
 BIN = ragnar
 
-RAGNAR_API = api/lib/ragnar.a
-
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin
+SYSCONFDIR = /etc
 
 .PHONY: all
-all: $(RAGNAR_API)
+all:
 	mkdir -p ./bin
-	$(CC) -o bin/$(BIN) $(CFLAGS) $(SRC) $(LDLIBS)
+	$(CC) -o bin/$(BIN) $(ALL_CFLAGS) $(LDFLAGS) $(SRC) $(LDLIBS)
 
-$(RAGNAR_API):
+# client-side IPC library. the WM links none of it, only the headers under
+# api/include are needed to build. opt-in, for writing external clients.
+.PHONY: api
+api:
 	$(MAKE) -C api
 
+.PHONY: install-api
+install-api:
+	$(MAKE) -C api install
 
-DEST_DIR := $(HOME)/.config/ragnarwm
-CONFIG_FILE := $(DEST_DIR)/ragnar.cfg
-
-.PHONY: config
-config:
-	@if [ ! -f "$(CONFIG_FILE)" ]; then \
-		echo "Config file does not exist. Copying default config..."; \
-		mkdir -p "$(DEST_DIR)"; \
-		cp -r "./cfg/ragnar.cfg" "$(CONFIG_FILE)"; \
-	else \
-		echo "Config file already exists. Skipping copy $(CONFIG_FILE)."; \
-	fi
-
+# no user config target: ragnar reads $HOME/.config/ragnarwm/ragnar.cfg first
+# and falls back to the copy installed below. an override is a plain cp, and
+# writing $HOME from a root install lands in the wrong home.
+# mirrors PKGBUILD logic, and is "standard practice" for config files.
 .PHONY: install
-install: 
-	install -Dm755 bin/$(BIN) -t $(BINDIR)
-	install -Dm755 ragnarstart -t $(BINDIR)
-	cp -f ragnar.desktop $(PREFIX)/share/xsessions/
+install:
+	install -Dm755 bin/$(BIN) -t $(DESTDIR)$(BINDIR)
+	install -Dm644 ragnar.desktop -t $(DESTDIR)$(PREFIX)/share/xsessions
+	install -Dm644 cfg/ragnar.cfg -t $(DESTDIR)$(SYSCONFDIR)/ragnarwm
 
 .PHONY: clean
 clean:
 	$(RM) bin/*
 
 .PHONY: uninstall
 uninstall:
-	$(RM) $(BINDIR)/ragnar
-	$(RM) $(PREFIX)/share/xsessions/ragnar.desktop
-	$(RM) $(BINDIR)/ragnarstart
+	$(RM) $(DESTDIR)$(BINDIR)/$(BIN)
+	$(RM) $(DESTDIR)$(PREFIX)/share/xsessions/ragnar.desktop
+	$(RM) -r $(DESTDIR)$(SYSCONFDIR)/ragnarwm

PKGBUILD

@@ -1,33 +1,53 @@
 # Contributor: Luxzi <luxzi@pm.me>
+# Contributor: h8d13 <hadean-eon-dev@proton.me>
 
 pkgname=ragnarwm
-_pkgname="Ragnar"
-pkgver='1.3'
+_pkgname="ragnar"
+pkgver='2'
 pkgrel=1
 pkgdesc="Minimal, flexible & user-friendly X tiling window manager"
 arch=('x86_64')
-url="https://github.com/cococry/Ragnar"
+url="https://github.com/h8d13/ragnar"
 license=('GPL')
 groups=()
-depends=('xcb' 'xcb-util' '')
+# mirrors the NEEDED entries of bin/ragnar, nothing more:
+# libxcb covers xcb + randr + xfixes, libx11 covers X11 + X11-xcb.
+depends=(
+  'libxcb'
+  'libx11'
+  'xcb-util-keysyms'
+  'xcb-util-cursor'
+  'xcb-util-wm'
+  'libconfig'
+  'xorg-server'
+  'xorg-xinit'
+)
 makedepends=('git' 'make' 'gcc')
+optdepends=(
+  'alacritty: default terminal keybind'
+  'polybar: optional status/desktops bars'
+  'ttf-dejavu: fonts for both the above'
+)
 provides=('ragnarwm')
-source=("${_pkgname}::git+https://github.com/cococry/${_pkgname}.git")
+options=('!debug')
+backup=('etc/ragnarwm/ragnar.cfg')
+source=("${_pkgname}::git+${url}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd $_pkgname
-    echo $pkgver
+  cd $_pkgname || exit 1
+  echo $pkgver
 }
 
 build() {
-    cd $_pkgname
-    make ragnar
+  cd $_pkgname || exit 1
+  make
 }
 
 package() {
-    cd $_pkgname 
-    install -D -m777 ./ragnar "$pkgdir/usr/bin/ragnar"
-    install -D -m777 ./ragnar.desktop "$pkgdir/usr/share/applications/ragnar.desktop"
-    install -D -m777 ./ragnarstart "$pkgdir/usr/bin/ragnarstart"
+  cd $_pkgname || exit 1
+  # single source of truth: same install target ./install.sh drives.
+  # only the systemwide default cfg is installed, user cfg is a manual cp.
+  # this is usually convention for most WM configs, template in /etc
+  make DESTDIR="$pkgdir" PREFIX=/usr install
 }

README.md

@@ -32,14 +32,13 @@ Installing Ragnar involves two steps.
 Install the following dependencies:
 
 ```console
-xcb-util
-xcb-proto
-xcb-util-keysyms
-xcb-util-cursor
-xcb-util-wm
-xorg-server
-xorg-xinit
-mesa
+libxcb \
+libx11 \
+xcb-util-keysyms \
+xcb-util-cursor \
+xcb-util-wm \
+xorg-server \
+xorg-xinit \
 libconfig
 ```
 
@@ -74,11 +73,23 @@ The IPC system communicates through a socket using binary data. This allows exte
 Ragnar uses `libconfig` to load an external configuration file:
 
 ```console
-~/.config/ragnarwm.cfg
+# by default, system-wide:
+/etc/ragnarwm/ragnar.cfg
+# or mkdir -p and cp the default per user.
+~/.config/ragnarwm/ragnar.cfg
 ```
 
 The configuration is loaded on startup and can be reloaded while the window manager is running, typically through a keybinding.
 
+You can add to `.xinitrc`:
+
+`exec path/to/ragnar` Then simply; `startx`
+
+> By default it uses `alacritty` (Super+Return) and `dmenu` (Super+S), if you haven't edited these yet.
+> Both of these need fonts file; for instance `ttf-dejavu`
+
+You can also for example add: `polybar &` before the `exec ragnar` line.
+
 ---
 
 ## Code Structure

api/Makefile

@@ -1,9 +1,9 @@
 CC=gcc
-CFLAGS=
-all: lib/ragnar.a
-lib/ragnar.a: lib/api.o
+CFLAGS ?=
+all: lib/libragnar.a
+lib/libragnar.a: lib/api.o
 	ar cr lib/libragnar.a lib/*.o
-lib/api.o: lib
+lib/api.o: api.c include/ragnar/api.h | lib
 	${CC} -c api.c -o lib/api.o ${CFLAGS}
 
 lib: