Jackojc
diff --git a/‎.gitignore
+4 b/‎.gitignore
+4
diff --git a/‎.travis.yml
+55-23 b/‎.travis.yml
+55-23
diff --git a/‎Makefile
+10-34 b/‎Makefile
+10-34
diff --git a/‎README.md
+20-34 b/‎README.md
+20-34
diff --git a/‎bench
-4 b/‎bench
-4
diff --git a/‎config.mk
+23-64 b/‎config.mk
+23-64
diff --git a/‎docs/todo
-17 b/‎docs/todo
-17
@@ -31,12 +31,16 @@
 *.out
 *.app
 
+test/
 build/
 old/
 
+todo
+
 massif.out*
 callgrind.out*
 cachgrind.out*
 perf.data*
 cg.out
 *.s
+
@@ -1,29 +1,61 @@
-dist: xenial
 language: cpp
-compiler:
-  - g++
-  - clang++
+sudo: true
+dist: bionic
 
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - libstdc++-8-dev
-    - libx11-xcb-dev
-    - libxcb-util-dev
-    - libxcb-icccm4-dev
-    - libxcb-randr0-dev
+script:
+  - make
+
+matrix:
+  include:
+    - os: linux
+      language: cpp
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:ubuntu-toolchain-r/test'
+          packages:
+            - gcc-9
+            - g++-9
+            - xcb
+            - xcb-proto
+            - libx11-dev
+            - libx11-xcb-dev
+            - libxcb1-dev
+            - libxcb-util-dev
+            - libxcb-icccm4-dev
+            - libxcb-randr0-dev
+            - libxcb-keysyms1-dev
+
+      env:
+        - MATRIX_EVAL="CC=gcc-9 CXX=g++-9"
+
+    - os: linux
+      language: cpp
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+          packages:
+            - clang-9
+            - xcb
+            - xcb-proto
+            - libx11-dev
+            - libx11-xcb-dev
+            - libxcb1-dev
+            - libxcb-util-dev
+            - libxcb-icccm4-dev
+            - libxcb-randr0-dev
+            - libxcb-keysyms1-dev
+
+      env:
+        - MATRIX_EVAL="CC=clang-9 CXX=clang++-9"
 
 before_install:
-  # C++17
-  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update -qq
+  - eval "${MATRIX_EVAL}"
 
 install:
-  # C++17
-  - sudo apt-get install -qq g++-8
-  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90
-
-script:
-  - make debug=yes
+  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
+  - sudo update-alternatives --config gcc
@@ -4,49 +4,25 @@
 
 include config.mk
 
-SRC=main.cpp
-
 all: options flukewm
 
 config:
-	mkdir -p build/
+	@mkdir -p $(BUILD_DIR)
 
 options:
-	@echo " \033[32;1m=>\033[39m Debug    = $(debug)\033[0m"
-	@echo " \033[32;1m=>\033[39m PGO      = $(pgo)\033[0m"
-	@echo " \033[32;1m=>\033[39m Symbols  = $(symbols)\033[0m"
-
-	@echo "\n \033[32m=>\033[39m CXX      = \033[0m$(CXX)"
-	@echo " \033[32m=>\033[39m CXXWARN  = \033[0m$(FLUKE_CXXWARN)"
-	@echo " \033[32m=>\033[39m CXXFLAGS = \033[0m$(FLUKE_CXXFLAGS)"
-	@echo " \033[32m=>\033[39m LDFLAGS  = \033[0m$(FLUKE_LDFLAGS)"
+	@echo " ┌\033[32m target\033[30m····\033[92;1m$(TARGET)\033[0m"
+	@echo " ├\033[34m debug\033[30m·····\033[94;1m$(debug)\033[0m"
+	@echo " ├\033[34m symbols\033[30m···\033[94;1m$(debug)\033[0m"
+	@echo " ├\033[31m compiler\033[30m··\033[91m$(CXX)\033[0m"
+	@echo " ├\033[31m warnings\033[30m··\033[91m$(PROGRAM_WARNINGS)\033[0m"
+	@echo " └\033[31m flags\033[30m·····\033[91m$(PROGRAM_CXXFLAGS) $(PROGRAM_LDFLAGS)\033[0m"
 
 flukewm: config
-	$(CXX) -std=c++17 $(FLUKE_CXXWARN) $(FLUKE_CXXFLAGS) -o build/$@ $(SRC) $(FLUKE_LDFLAGS)
-	@echo "$(logging)"
+	@$(COMPILE_COMMAND)
 
 clean:
-	rm -rf build/ flukewm.tar.gz *.gcda
-
-dist: clean
-	mkdir -p flukewm-tmp/
-	cp -Rf LICENSE README.md Makefile main.cpp src/ modules/ docs/ flukewm-tmp/
-	tar -cf - flukewm-tmp/ | gzip > flukewm.tar.gz
-	rm -rf flukewm-tmp/
-
-	@echo "\n \033[32;1m=>\033[39m Created flukewm.tar.gz\033[0m\n"
-
-install: flukewm
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f ./build/flukewm $(DESTDIR)$(PREFIX)/bin
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/flukewm
-
-	@echo "\n \033[32;1m=>\033[39m Installed flukewm to $(DESTDIR)$(PREFIX)/bin/flukewm\033[0m\n"
-
-uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/flukewm
+	rm -rf $(BUILD_DIR)/ *.gcda
 
-	@echo "\n \033[32;1m=>\033[39m Removed flukewm\033[0m\n"
+.PHONY: all options clean
 
-.PHONY: all options clean dist install uninstall
 
@@ -7,7 +7,7 @@
 ```
 
 # fluke window manager
-A simple, fast and efficient window manager for X.
+A simple, fast and efficient window manager for X, made with C++ & XCB.
 
 [![build](https://img.shields.io/travis/Jackojc/flukewm.svg?style=flat)](https://travis-ci.org/Jackojc/flukewm)
 ![c++](https://img.shields.io/badge/c%2B%2B-%3E%3D17-blue.svg?style=flat)
@@ -16,37 +16,30 @@ A simple, fast and efficient window manager for X.
 [![issues](https://img.shields.io/github/issues/Jackojc/flukewm.svg?style=flat)](https://github.com/Jackojc/flukewm/issues)
 [![discord](https://img.shields.io/discord/537732103765229590.svg?label=discord&style=flat)](https://discord.gg/RmgjcES)
 ### what is fluke?
-Fluke is designed to be a simple and fast controller for X. It can manipulate windows in various ways like resizing, moving, hiding etc. It is intended for use with a hotkey daemon like [sxhkd](https://github.com/baskerville/sxhkd). The hotkey daemon will call flukewm _as needed_ to perform various operations.
+Fluke is a simple (but not extremely barebones) window manager for X which uses XCB for more efficient asynchronous IO. Fluke is designed to be configured through source (á la dwm).
 
 ### rationale
-I wanted a very minimal window manager that could be scripted with ease. I spent a couple of years using [bspwm](https://github.com/baskerville/bspwm) but it felt a bit too feature rich for my needs and was required to run in the background alongside X at all times.
-
-bspwm makes uses of a server/client control model with bspc which is both good and bad. It's good in that it is very easy to script and bad in that it comes at the cost of some latency and extra resource usage.
+I wanted a very minimal window manager that suited my workflow, had good hotplug multimonitor support and was written in something a little bit less cryptic than C. I never really found what I was looking for in other window managers and decided to give it a try myself.
 
 ### features
 > The planned features list is by no means exhaustive, it's just what I have managed to think of right now.
 
 #### current
-- Move, resize windows
-- Retrieve cursor position relative to root window
-- Close/Kill windows
-
-#### planned
-- Focus windows (by id, direction, monitor)
-- Toggle fullscreen
-- Add some grids/layouts
-- Grow/Shrink windows
-- Snap windows left,right,top,bottom
-- Center a window
-- Resize window to a percentage of screen size
-- Workspaces
+- Focus windows using the mouse.
+- Adopt orphaned windows by default (allows you to restart flukewm in the case of a crash and not lose any work.)
 - Window borders
-- Focus on cursor hover
-- Implement a way to update a statusbar using xsetroot (something like dwm)
-- Move/resize windows using the mouse
-- Groups (seperate from workspaces in that you hide or show them regardless of what workspace you're on)
-- Respect EWMH for docks, notifications etc.
-- Query information about various things (currently focused display, currently focused window, primary display etc.)
+- Hooks which run every N ms
+
+#### planned/ideas
+- Move & resize windows
+- Fullscreen windows
+- Center windows
+- Window snapping
+- Workspaces (N per monitor)
+- Groups/Scratchpad (seperate from workspaces in that you hide or show them regardless of what workspace you're on)
+- _Basic_ EWMH support for docks, notifications, respectful closing of windows etc.
+- Monitor hotplug support (automatically re-adjust windows & layout, maybe a built in autorandr functionality?)
+- Keybindings
 
 ### prerequisites
 - Any C++17 compliant compiler should work (tested with Clang and GCC)
@@ -55,26 +48,19 @@ bspwm makes uses of a server/client control model with bspc which is both good a
 	- `xcb-util`
 	- `xcb-randr`
 	- `xcb-icccm`
-- [hyperfine](https://github.com/sharkdp/hyperfine) (optional for benchmarking)
-- A running X server for fluke to communicate with
 
 ### build & run
-- Run `make debug=yes` or `make` for debug and release build respectively (uses GCC by default)
+- Run `make` or `make debug=no symbols=no` for debug and release build respectively (uses GCC by default)
 - Binary will be placed in `build/flukewm` or you can run using the symlink in the root of the project, `./flukewm`
 
 ### installation
-> Optionally configure install directory with PREFIX variable.
-
-To install flukewm, simply run `make install` (you might need root).
-To uninstall, run `make uninstall`
-
-You may also use `make dist` if you wish to package flukewm as an archive.
+> todo...
 
 ### license
 This project uses the GPLv2 license. (check [LICENSE.md](LICENSE.md))
 
 ### acknowledgements
-This project was inspired by:
+This project was inspired and helped by the source code of the following projects:
 - [bspwm](https://github.com/baskerville/bspwm)
 - [wmutils](https://github.com/wmutils/core)
 - [disputils](https://github.com/tudurom/disputils)
 
@@ -1,91 +1,50 @@
-# options
-PREFIX = /usr/local
-MANPREFIX = $(PREFIX)/share/man
+SRC=main.cpp
+STD=c++17
 
-XCBINC = /usr/include/xcb/
-XCBLIB = /usr/lib/
+BUILD_DIR=build
+TARGET=flukewm
 
-PKG_CONFIG = pkg-config
 
-# includes and libs
-INCS = -I$(XCBINC) -Isrc/ -I. -Imodules/tinge/
-LIBS = -L$(XCBLIB) -lxcb -lxcb-util -lxcb-randr -lxcb-icccm $(LDLIBS)
+# Include & Link
+INCS=-I. -Isrc/ -Imodules/tinge/
+LIBS=-lxcb -lxcb-util -lxcb-randr -lxcb-icccm -lpthread $(LDLIBS)
 
 
-# preprocessor flags
-FLUKE_CPPFLAGS = $(CPPFLAGS)
+# Options
+PROGRAM_CPPFLAGS=$(CPPFLAGS)
+PROGRAM_LDFLAGS=$(LIBS) $(LDFLAGS)
 
-# linker flags
-FLUKE_LDFLAGS = $(LIBS) $(LDFLAGS) -static-libstdc++ -static-libgcc
+PROGRAM_WARNINGS=-Wall -Wextra -Wmissing-include-dirs -Wsign-conversion -Wshadow -Wundef -Wno-unused $(CXXWARN)
 
-# warnings
-FLUKE_CXXWARN = $(CXXWARN) -Wall -Wextra -Wcast-align -Wcast-qual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wdisabled-optimization -Wformat=2 -Wmissing-include-dirs -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wsign-conversion -Wstrict-overflow=4 -Wundef -Wno-unused
 
+# Make Flags
+debug ?= yes
+symbols ?= yes
 
-logging =
-
-
-# optimisation flags
-FLUKE_CXXFLAGS = $(INCS) $(FLUKE_CPPFLAGS) $(CXXFLAGS) -m64
-
-debug ?= no
 
+# Debugging
 ifeq ($(debug),no)
-	FLUKE_CXXFLAGS += -Ofast -march=native
-	FLUKE_LDFLAGS += -flto
-
-	ifeq ($(CXX),g++)
-		FLUKE_CXXFLAGS += -finline-limit=200 -fipa-pta -fsplit-loops -funswitch-loops -fwhole-program
-
-	else ifeq ($(CXX),clang++)
-		FLUKE_CXXFLAGS += -fwhole-program-vtables -fforce-emit-vtables
-	endif
-
-	pgo ?= yes
+	symbols ?= no
+	PROGRAM_CXXFLAGS=-O3 -march=native -flto $(CXXFLAGS)
 
 else ifeq ($(debug),yes)
-	FLUKE_CXXFLAGS += $(INCS) $(FLUKE_CPPFLAGS) $(CXXFLAGS) -Og -march=native
-
 	symbols ?= yes
-	pgo ?= no
+	PROGRAM_CXXFLAGS=-Og -march=native
 
 else
 $(error debug should be either yes or no)
 endif
 
 
-
-# debugging symbols
-symbols ?= no
+# Debugging Symbols
 ifeq ($(symbols),yes)
-	FLUKE_CXXFLAGS += -g
+	PROGRAM_CXXFLAGS += -g
+
 else ifneq ($(symbols),no)
 $(error symbols should be either yes or no)
 endif
 
 
-
-
-# profile guided optimisation
-ifeq ($(pgo),yes)
-	ifeq (,$(wildcard ./*.gcda))
-		FLUKE_CXXFLAGS += -fprofile-generate
-		logging += \033[32;1m=>\033[39m PGO enabled, run program and recompile.\033[0m
-
-	else
-		FLUKE_CXXFLAGS += -fprofile-use
-		logging += \033[32;1m=>\033[39m Used PGO profile.\033[0m
-	endif
-
-	# compiler specific flags
-	ifeq ($(CXX),g++)
-		# FLUKE_CXXFLAGS +=
-	else ifeq ($(CXX),clang++)
-		# FLUKE_CXXFLAGS +=
-	endif
-
-
-else ifneq ($(pgo),no)
-$(error pgo should be either yes or no)
-endif
+# Accumulate all flags
+COMPILE_COMMAND=$(CXX) $(PROGRAM_LDFLAGS) -std=$(STD) $(PROGRAM_WARNINGS) $(PROGRAM_CXXFLAGS) $(INCS) $(PROGRAM_CPPFLAGS) -o $(BUILD_DIR)/$(TARGET) $(SRC)