From a34c161a6643f184348f42235bcda46352b68da0 Mon Sep 17 00:00:00 2001 From: BossCode45 Date: Sun, 18 Sep 2022 14:38:41 +1200 Subject: Starting work on multiple monitors --- config.h | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) (limited to 'config.h') diff --git a/config.h b/config.h index 72be653..d5d7ba5 100644 --- a/config.h +++ b/config.h @@ -5,16 +5,19 @@ #include //Startup -std::string startup[] = {"picom -fD 3", "feh --bg-scale /usr/share/backgrounds/vapor_trails_blue.png", "~/.config/polybar/launch.sh", "emacs --daemon"}; +const std::string startup[] = {"picom -fD 3", "feh --bg-scale /usr/share/backgrounds/vapor_trails_blue.png", "~/.config/polybar/launch.sh", "emacs --daemon"}; //Main config -int gaps = 3; -int outerGaps = 3; -std::string logFile = "/tmp/yatlog"; +const int gaps = 3; +const int outerGaps = 3; +const std::string logFile = "/tmp/yatlog.txt"; //WS config const int numWS = 10; -std::string workspaceNames[] = {"1: ", "2: 拾", "3: ", "4: ", "5: ", "6: ", "7: 拾", "8: ", "9: ", "10: "}; +const std::string workspaceNames[] = {"1: ", "2: 拾", "3: ", "4: ", "5: ", "6: ", "7: 拾", "8: ", "9: ", "10: "}; +//If you have more then 2 monitors change the number below +const int maxMonitors = 2; +const int screenPreferences[][maxMonitors] = {{0}, {0}, {0}, {0}, {0}, {1, 0}, {1, 0}, {1, 0}, {1, 0}, {1, 0}}; //Keys //The types and perhaps functions likely to be moved to seperate header file later @@ -35,8 +38,8 @@ typedef union struct Key { - unsigned int modifiers; - KeySym keysym; + const unsigned int modifiers; + const KeySym keysym; void (*function)(const KeyArg arg); const KeyArg arg; }; @@ -52,25 +55,28 @@ KEYCOM(changeWS); KEYCOM(wToWS); KEYCOM(focChange); KEYCOM(wMove); +KEYCOM(bashSpawn); +KEYCOM(screenTest); +//Super key mod +#define MOD Mod4Mask +//Alt key mod +//#define MOD Mod1Mask +#define SHIFT ShiftMask const char* alacritty[] = {"alacritty", NULL}; const char* rofi[] = {"rofi", "-i", "-show", "drun", NULL}; const char* qutebrowser[] = {"qutebrowser", NULL}; - const char* i3lock[] = {"i3lock", "-eti", "/usr/share/backgrounds/lockscreen.png", NULL}; const char* suspend[] = {"systemctl", "suspend", NULL}; -//Super key mod -//#define MOD Mod4Mask -//Alt key mod -#define MOD Mod1Mask -#define SHIFT ShiftMask +const char* monConfig[] = {"~/.i3_commands/monitor-config.sh"}; + #define WSKEY(K, X) \ {MOD, K, changeWS, {.num = X}}, \ {MOD|SHIFT, K, wToWS, {.num = X}} -static Key keyBinds[] = { +const Key keyBinds[] = { //Modifiers //Key //Func //Args //General {MOD, XK_e, exit, {NULL}}, @@ -82,6 +88,8 @@ static Key keyBinds[] = { {MOD, XK_x, spawn, {.str = i3lock}}, {MOD|SHIFT, XK_x, spawn, {.str = i3lock}}, {MOD|SHIFT, XK_x, spawn, {.str = suspend}}, + {MOD, XK_m, bashSpawn, {.str = monConfig}}, + {MOD|SHIFT, XK_t, screenTest, {NULL}}, //Focus {MOD, XK_h, focChange, {.dir = Left}}, {MOD, XK_j, focChange, {.dir = Down}}, -- cgit v1.2.3