tiling: add disable tiling hotkey and some cleanup

Author: nir9

README.md

@@ -14,19 +14,20 @@ Video in which I make the PoC of this project: https://youtu.be/cuPirXZ6AWo
 
 After building, run the executable ```lightwm.exe``` which will reside in the release and/or debug folder, depending on what you built.
 
-Upon running, it will immediately tile all the non-minimized windows on your screen.
+Upon running, it will immediately tile all the non-minimized windows on your screen. The program will run in the background.
 
-The program will run in the background. To quit LightWM, use ```alt+q```.
+If you want to configure it to run when you login, you can use the `Run` utility and type `shell:startup`, then create a LightWM shortcut in that folder.
 
-You can use ```alt+j``` and ```alt+k``` to go to the next/previous window with your keyboard.
+### Hotkeys
 
-You can use ```alt+f``` hotkey to toggle fullscreen mode which will disable tiling and put the focused window in fullscreen, pressing ```alt+f``` again will enable tiling again and tile all non-minimized windows
-
-You can use ```alt+1``` up until ```alt+9``` to go to workspace number ```1``` until ```9``` respectively
-
-You can move the current focused window to a different workspace number by adding ```shift``` to the above command.
-
-You can "force" retile by using ```alt+t```, you can use this as a trick to send the current focused window to the left.
+- ```alt+q``` - quit LightWM
+- ```alt+j``` - focus on next window
+- ```alt+k``` - focus on previous window
+- ```alt+f``` - toggle fullscreen mode (disables tiling and puts the focused window in fullscreen, pressing ```alt+f``` again will enable tiling again and tile all non-minimized windows)
+- ```alt+1``` up until ```alt+9``` - go to workspace number ```1``` until ```9``` respectively
+- You can move the current focused window to a different workspace number by adding ```shift``` to the above command.
+- You can "force" retile by using ```alt+t```, you can use this as a trick to send the current focused window to the left.
+- `alt+\` toggles whether the automatic tiling is enabled/disabled. This is useful if you also use programs which don't play well with LightWM automatic tiling
 
 ## Building
 

config.h

@@ -1,15 +1,15 @@
 #define TOGGLE_FULLSCREEN_MODE_HOTKEY_ID 0x00
 #define NEXT_WINDOW_HOTKEY_ID 0x01
 #define PREV_WINDOW_HOTKEY_ID 0x02
-#define QUIT_LIGHTWM_HOTKEY_ID 0x03
-#define FORCE_TILE_LIGHTWM_HOTKEY_ID 0x04
-#define WORKSPACE_LIGHTWM_HOTKEY_ID_BASE 0xFF
-#define SWITCH_WORKSPACE_HOTKEY_ID 0x10
+#define QUIT_HOTKEY_ID 0x03
+#define FORCE_TILE_HOTKEY_ID 0x04
+#define TOGGLE_DISABLE_ENABLE_TILING_HOTKEY_ID 0x05
+#define WORKSPACE_HOTKEY_ID_BASE 0x10
+#define SWITCH_WORKSPACE_HOTKEY_ID_BASE 0x20
 
 #define FULLSCREEN_MODE_HOTKEY 'f'
 #define NEXT_WINDOW_HOTKEY 'j'
 #define PREV_WINDOW_HOTKEY 'k'
-#define QUIT_LIGHTWM_HOTKEY 'q'
-#define FORCE_TILE_LIGHTWM_HOTKEY 't'
-#define WORKSPACE_LIGHTWM_HOTKEY_BASE '1'
-#define SWITCH_WORKSPACE_HOTKEY '1'
+#define QUIT_HOTKEY 'q'
+#define FORCE_TILE_HOTKEY 't'
+#define TOGGLE_DISABLE_ENABLE_TILING_HOTKEY '\\'

keyboard.c

@@ -22,15 +22,16 @@ bool initializeKeyboardConfig()
 	addKeyboardKeybind(TOGGLE_FULLSCREEN_MODE_HOTKEY_ID, getKeyCode(FULLSCREEN_MODE_HOTKEY), MOD_ALT | MOD_NOREPEAT);
 	addKeyboardKeybind(NEXT_WINDOW_HOTKEY_ID, getKeyCode(NEXT_WINDOW_HOTKEY), MOD_ALT | MOD_NOREPEAT);
 	addKeyboardKeybind(PREV_WINDOW_HOTKEY_ID, getKeyCode(PREV_WINDOW_HOTKEY), MOD_ALT | MOD_NOREPEAT);
-	addKeyboardKeybind(QUIT_LIGHTWM_HOTKEY_ID, getKeyCode(QUIT_LIGHTWM_HOTKEY), MOD_ALT | MOD_NOREPEAT);
-	addKeyboardKeybind(FORCE_TILE_LIGHTWM_HOTKEY_ID, getKeyCode(FORCE_TILE_LIGHTWM_HOTKEY), MOD_ALT | MOD_NOREPEAT);
+	addKeyboardKeybind(QUIT_HOTKEY_ID, getKeyCode(QUIT_HOTKEY), MOD_ALT | MOD_NOREPEAT);
+	addKeyboardKeybind(FORCE_TILE_HOTKEY_ID, getKeyCode(FORCE_TILE_HOTKEY), MOD_ALT | MOD_NOREPEAT);
+	addKeyboardKeybind(TOGGLE_DISABLE_ENABLE_TILING_HOTKEY_ID, getKeyCode(TOGGLE_DISABLE_ENABLE_TILING_HOTKEY), MOD_ALT | MOD_NOREPEAT);
 
 	for (int i = 0; i < 9; i++) {
-		addKeyboardKeybind(WORKSPACE_LIGHTWM_HOTKEY_ID_BASE + i, getKeyCode('1' + i), MOD_ALT | MOD_NOREPEAT);
+		addKeyboardKeybind(WORKSPACE_HOTKEY_ID_BASE + i, getKeyCode('1' + i), MOD_ALT | MOD_NOREPEAT);
 	}
 
 	for (int i = 0; i < 9; i++) {
-		addKeyboardKeybind(SWITCH_WORKSPACE_HOTKEY_ID + i, getKeyCode('1' + i), MOD_ALT | MOD_SHIFT | MOD_NOREPEAT);
+		addKeyboardKeybind(SWITCH_WORKSPACE_HOTKEY_ID_BASE + i, getKeyCode('1' + i), MOD_ALT | MOD_SHIFT | MOD_NOREPEAT);
 	}
 
 	return true;
@@ -41,12 +42,13 @@ void cleanupKeyboard()
 	UnregisterHotKey(NULL, TOGGLE_FULLSCREEN_MODE_HOTKEY_ID);
 	UnregisterHotKey(NULL, NEXT_WINDOW_HOTKEY_ID);
 	UnregisterHotKey(NULL, PREV_WINDOW_HOTKEY_ID);
-	UnregisterHotKey(NULL, QUIT_LIGHTWM_HOTKEY_ID);
-	UnregisterHotKey(NULL, FORCE_TILE_LIGHTWM_HOTKEY_ID);
+	UnregisterHotKey(NULL, QUIT_HOTKEY_ID);
+	UnregisterHotKey(NULL, FORCE_TILE_HOTKEY_ID);
+	UnregisterHotKey(NULL, TOGGLE_DISABLE_ENABLE_TILING_HOTKEY_ID);
 
 	for (int i = 0; i < 9; i++) {
-		UnregisterHotKey(NULL, WORKSPACE_LIGHTWM_HOTKEY_ID_BASE + i);
-		UnregisterHotKey(NULL, SWITCH_WORKSPACE_HOTKEY_ID + i);
+		UnregisterHotKey(NULL, WORKSPACE_HOTKEY_ID_BASE + i);
+		UnregisterHotKey(NULL, SWITCH_WORKSPACE_HOTKEY_ID_BASE + i);
 	}
 }
 
@@ -62,14 +64,17 @@ void handleHotkey(WPARAM wparam, LPARAM lparam)
 		case PREV_WINDOW_HOTKEY_ID:
 			focusNextWindow(true, 0);
 			break;
-		case FORCE_TILE_LIGHTWM_HOTKEY_ID:
+		case FORCE_TILE_HOTKEY_ID:
 			tileWindows();
 			break;
+		case TOGGLE_DISABLE_ENABLE_TILING_HOTKEY_ID:
+			toggleDisableEnableTiling();
+			break;
 	}
 
-	if (wparam >= WORKSPACE_LIGHTWM_HOTKEY_ID_BASE && wparam < WORKSPACE_LIGHTWM_HOTKEY_ID_BASE + 9) {
-		gotoWorkspace((int)wparam - WORKSPACE_LIGHTWM_HOTKEY_ID_BASE + 1);
-	} else if (wparam >= SWITCH_WORKSPACE_HOTKEY_ID && wparam < SWITCH_WORKSPACE_HOTKEY_ID + 9) {
-		moveWindowToWorkspace((int)wparam - SWITCH_WORKSPACE_HOTKEY_ID + 1);
+	if (wparam >= WORKSPACE_HOTKEY_ID_BASE && wparam < WORKSPACE_HOTKEY_ID_BASE + 9) {
+		gotoWorkspace((int)wparam - WORKSPACE_HOTKEY_ID_BASE + 1);
+	} else if (wparam >= SWITCH_WORKSPACE_HOTKEY_ID_BASE && wparam < SWITCH_WORKSPACE_HOTKEY_ID_BASE + 9) {
+		moveWindowToWorkspace((int)wparam - SWITCH_WORKSPACE_HOTKEY_ID_BASE + 1);
 	}
 }

tiling.c

@@ -11,6 +11,7 @@ typedef struct {
 } ManagedWindow;
 
 bool isFullscreen = false;
+bool isTilingEnabled = true;
 HWND managed[MAX_MANAGED];
 ManagedWindow totalManaged[MAX_MANAGED];
 int numOfTotalManaged = 0;
@@ -127,6 +128,10 @@ void updateManagedWindows()
 
 void tileWindows()
 {
+	if (!isTilingEnabled) {
+		return;
+	}
+
 	if (newWorkspace) {
 		newWorkspace = false;
 	} else {
@@ -213,3 +218,11 @@ void moveWindowToWorkspace(int workspaceNumber)
 	managedWindow->workspaceNumber = workspaceNumber;
 	tileWindows();
 }
+
+void toggleDisableEnableTiling() {
+	isTilingEnabled = !isTilingEnabled;
+
+	if (isTilingEnabled) {
+		tileWindows();
+	}
+}

tiling.h

@@ -8,3 +8,4 @@ void toggleFullscreenMode();
 void focusNextWindow(bool, unsigned int);
 void gotoWorkspace(int);
 void moveWindowToWorkspace(int);
+void toggleDisableEnableTiling();

wm.c

@@ -66,7 +66,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prevInstance, PWSTR cmdLine, i
 	while (GetMessage(&msg, (HWND)-1, 0, 0) != 0) {
 		switch (msg.message) {
 			case WM_HOTKEY:
-				if (msg.wParam == QUIT_LIGHTWM_HOTKEY_ID) {
+				if (msg.wParam == QUIT_HOTKEY_ID) {
 					exitCode = EXIT_OK;
 					goto cleanup;
 				}