chore: fixes and cleanup

Author: dharmx

.github/README.md

@@ -36,6 +36,7 @@ SETTER COMMANDS:
 
 MONITOR COMMANDS:
      k, keyboard        print global keypresses and keyreleases
+     l, led             print led status
      h, help            help related to monitor commands
 
 EXAMPLES:

.github/workflows/release.yml

@@ -31,5 +31,5 @@ jobs:
           body_path: CHANGELOG.md
           draft: false
           generate_release_notes: true
-          files: xcore
+          files: src/xcore
           append_body: true

.gitignore

@@ -1,2 +1,2 @@
-*.o
-xcore
+src/*.o
+src/xcore

CHANGELOG.md

@@ -39,3 +39,8 @@ This is an experimental release.
 - added `apply.[window_focus|window_activate|center_pointer|window_state]`
 - added `monitor.[key_logger]`
 - added all `--help|-h|h|help`, `--version|-V` and argument error messages
+
+### Features
+
+- Added monitor option `led`.
+- Moved source files to `src` directory.

Makefile

@@ -1,48 +1,23 @@
-NAME := xcore
-VERCMD  ?= git describe --tags 2> /dev/null
-VERSION := $(shell $(VERCMD) || cat VERSION)
+all:
+	@make --directory=src
 
-CPPFLAGS += -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
-CFLAGS   += -std=c11 --optimize=3 -pedantic -Wall -Wextra -I/usr/include/X11
-LDLIBS   := -lX11 -lm -lXi
-
-PREFIX    ?= /usr/local
-BINPREFIX ?= $(PREFIX)/bin
-MANPREFIX ?= $(PREFIX)/share/man
-
-SRC := $(wildcard *.c)
-OBJ := $(SRC:.c=.o)
-DEF := $(wildcard *.h)
-
-all: $(NAME)
-
-install: $(NAME)
-	mkdir -p "$(DESTDIR)$(BINPREFIX)"
-	cp -p $(NAME) "$(DESTDIR)$(BINPREFIX)"
+install:
+	@make --directory=src install
 
 uninstall:
-	rm -f "$(DESTDIR)$(BINPREFIX)/$(NAME)"
+	@make --directory=src uninstall
 
-debug: build
-debug: CFLAGS += -O0 -g
 debug:
-	$(CC) -o $(NAME) $(OBJ) $(CFLAGS) $(LDLIBS)
-
-$(NAME): build
-	$(CC) -o $(NAME) $(OBJ) $(CFLAGS) $(LDLIBS)
+	@make --directory=src debug
 
 build:
-	$(CC) -c $(shell printf "%s\n" $(strip $1) | tac)$(SRC)
+	@make --directory=src build
 
 doc:
-	@echo Coming Soon...
+	@make --directory=src doc
 
 clean:
-	rm -f $(OBJ) $(NAME)
+	@make --directory=src clean
 
 format:
-	clang-format -i $(SRC) $(DEF)
-
-.PHONY: clean format doc build install uninstall debug all
-
-# vim:filetype=make
+	@make --directory=src format

VERSION

@@ -1 +1 @@
-v0.0.2-alpha
+v0.0.3-alpha

src/Makefile

@@ -0,0 +1,48 @@
+VERCMD  ?= git describe --tags 2> /dev/null
+VERSION := $(shell $(VERCMD) || cat ../VERSION)
+NAME := xcore
+
+CPPFLAGS += -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
+CFLAGS   += -std=c11 --optimize=3 -pedantic -Wall -Wextra -I/usr/include/X11
+LDLIBS   := -lX11 -lm -lXi
+
+PREFIX    ?= /usr/local
+BINPREFIX ?= $(PREFIX)/bin
+MANPREFIX ?= $(PREFIX)/share/man
+
+SRC := $(wildcard *.c)
+OBJ := $(SRC:.c=.o)
+DEF := $(wildcard *.h)
+
+all: $(NAME)
+
+install: $(NAME)
+	mkdir -p "$(DESTDIR)$(BINPREFIX)"
+	cp -p $(NAME) "$(DESTDIR)$(BINPREFIX)"
+
+uninstall:
+	rm -f "$(DESTDIR)$(BINPREFIX)/$(NAME)"
+
+debug: build
+debug: CFLAGS += -O0 -g
+debug:
+	$(CC) -o $(NAME) $(OBJ) $(CFLAGS) $(LDLIBS)
+
+$(NAME): build
+	$(CC) -o $(NAME) $(OBJ) $(CFLAGS) $(LDLIBS)
+
+build:
+	$(CC) -c $(shell printf "%s\n" $(strip $1) | tac)$(SRC)
+
+doc:
+	@echo Coming Soon...
+
+clean:
+	rm -f $(OBJ) $(NAME)
+
+format:
+	clang-format -i $(SRC) $(DEF)
+
+.PHONY: clean format doc build install uninstall debug all
+
+# vim:filetype=make

xcore-colors.h renamed to src/colors.h

@@ -1,4 +1,4 @@
-/* xcore-colors.h
+/* colors.h
  *
  * This is free and unencumbered software released into the public domain.
  * For more information, please refer to <https://unlicense.org>

xcore-jsmn.h renamed to src/jsmn.h

@@ -1,4 +1,4 @@
-/* xcore-logger.c
+/* logger.c
  *
  * Copyright 2022 dharmx
  *
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "xcore-logger.h"
+#include "logger.h"
+#define ON_OR_OFF(S) (S ? "on" : "off")
 
 void
 init_xinput(dump_t* dump, int version[2]) {
@@ -105,4 +106,47 @@ start_key_logger(char* up, char* down, Bool only_icon, RawKeyPressMode mode) {
     }
 }
 
+void
+display_ind_state(Bool ind_keys[2], int event_state) {
+    typedef enum {
+        NO_STATE        = 0,
+        CAPS_LOCK_STATE = 1,
+        NUM_LOCK_STATE  = 2,
+        BOTH_LOCK_STATE = 3,
+    } ind_state_t;
+
+    switch (event_state) {
+        case NO_STATE: ind_keys[0] = ind_keys[1] = False; break;
+        case CAPS_LOCK_STATE: ind_keys[0] = True; break;
+        case NUM_LOCK_STATE: ind_keys[1] = True; break;
+        case BOTH_LOCK_STATE: ind_keys[0] = ind_keys[1] = True; break;
+    }
+
+    printf("indicators %s %s\n", ON_OR_OFF(ind_keys[0]), ON_OR_OFF(ind_keys[1]));
+    fflush(stdout);
+}
+
+void
+query_led_state(Bool ind_keys[2]) {
+    unsigned int start_state;
+    XkbGetIndicatorState(display, XkbUseCoreKbd, &start_state);
+    if (ind_keys == NULL) {
+        Bool ind_keys_once[2] = {False, False};
+        display_ind_state(ind_keys_once, start_state);
+    } else display_ind_state(ind_keys, start_state);
+}
+
+void
+start_led_logger(Bool first) {
+    Bool ind_keys[2] = {False, False};
+    if (first) query_led_state(ind_keys);
+
+    XkbSelectEvents(display, XkbUseCoreKbd, XkbIndicatorStateNotifyMask, XkbIndicatorStateNotifyMask);
+    XkbIndicatorNotifyEvent event;
+    while (True) {
+        XNextEvent(display, (XEvent*) &event);
+        if (event.xkb_type == XkbIndicatorStateNotify) display_ind_state(ind_keys, event.state);
+    }
+}
+
 // vim:filetype=c