diff options
Diffstat (limited to 'platforms')
19 files changed, 0 insertions, 2868 deletions
diff --git a/platforms/linux/default.nix b/platforms/linux/default.nix deleted file mode 100644 index f624fb3..0000000 --- a/platforms/linux/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - spotify - discord - python37Packages.pywal - ]; - - imports = [ - ./xorg - ./user-dirs.nix - ./gtk.nix - ]; - - -} diff --git a/platforms/linux/gtk.nix b/platforms/linux/gtk.nix deleted file mode 100644 index a0d60e4..0000000 --- a/platforms/linux/gtk.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - capitaine-cursors - papirus-icon-theme - hicolor-icon-theme - ]; - - gtk = { - enable = true; - theme.name = "Adwaita:dark"; - iconTheme.name = "Papirus"; - font.name = "Noto Sans 10"; - gtk3.extraConfig = { - gtk-cursor-theme-name = "capitaine-cursors"; - gtk-application-prefer-dark-theme=true; - }; - gtk3.extraCss = '' - window decoration { - margin: 0; - border: none; - } - ''; - gtk2.extraConfig = '' - gtk-cursor-theme-name="capitaine-cursors" - ''; - }; -} diff --git a/platforms/linux/xorg/config.h b/platforms/linux/xorg/config.h deleted file mode 100644 index 96c64b6..0000000 --- a/platforms/linux/xorg/config.h +++ /dev/null @@ -1,313 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -/* Constants */ -#define TERMINAL "st" -#define TERMCLASS "St" - -/* appearance */ -static const unsigned int borderpx = 3; /* border pixel of windows */ -static const unsigned int snap = 32; /* snap pixel */ -static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ -static const unsigned int systrayspacing = 2; /* systray spacing */ -static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ -static const int showsystray = 1; /* 0 means no systray */ -static const unsigned int gappih = 20; /* horiz inner gap between windows */ -static const unsigned int gappiv = 10; /* vert inner gap between windows */ -static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ -static const unsigned int gappov = 20; /* vert outer gap between windows and screen edge */ -static const int swallowfloating = 0; /* 1 means swallow floating windows by default */ -static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */ -static const int showbar = 1; /* 0 means no bar */ -static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "monospace:size=10", "JoyPixels:pixelsize=10:antialias=true:autohint=true" }; -static char dmenufont[] = "monospace:size=10"; -static char normbgcolor[] = "#222222"; -static char normbordercolor[] = "#444444"; -static char normfgcolor[] = "#bbbbbb"; -static char selfgcolor[] = "#eeeeee"; -static char selbordercolor[] = "#770000"; -static char selbgcolor[] = "#005577"; -static char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor }, - [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor }, -}; - -typedef struct { - const char *name; - const void *cmd; -} Sp; -const char *spcmd1[] = {TERMINAL, "-n", "spterm", "-g", "120x34", NULL }; -const char *spcmd2[] = {TERMINAL, "-n", "spcalc", "-f", "monospace:size=16", "-g", "50x20", "-e", "bc", "-lq", NULL }; -static Sp scratchpads[] = { - /* name cmd */ - {"spterm", spcmd1}, - {"spranger", spcmd2}, -}; - -/* tagging */ -static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; - -static const Rule rules[] = { - /* xprop(1): - * WM_CLASS(STRING) = instance, class - * WM_NAME(STRING) = title - */ - /* class instance title tags mask iscentered isfloating isterminal noswallow monitor */ - { "Gimp", NULL, NULL, 1 << 8, 0, 0, 0, 0, -1 }, - { TERMCLASS, NULL, NULL, 0, 0, 0, 1, 0, -1 }, - { NULL, NULL, "Event Tester", 0, 0, 0, 0, 1, -1 }, - { NULL, "spterm", NULL, SPTAG(0), 0, 1, 1, 0, -1 }, - { NULL, "spcalc", NULL, SPTAG(1), 0, 1, 1, 0, -1 }, - { NULL, "telegram-desktop", NULL, 0, 1, 1, 0, 0, -1 }, -}; - -/* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ -static const int nmaster = 1; /* number of clients in master area */ -static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ -#define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */ -#include "vanitygaps.c" -static const Layout layouts[] = { - /* symbol arrange function */ - { "[@]", spiral }, /* Fibonacci spiral */ - { "[]=", tile }, /* Default: Master on left, slaves on right */ - { "TTT", bstack }, /* Master on top, slaves on bottom */ - - { "[\\]", dwindle }, /* Decreasing in size right and leftward */ - - { "H[]", deck }, /* Master on left, slaves in monocle-like mode on right */ - { "[M]", monocle }, /* All windows on top of eachother */ - - { "|M|", centeredmaster }, /* Master in middle, slaves on sides */ - { ">M>", centeredfloatingmaster }, /* Same but master floats */ - - { "><>", NULL }, /* no layout function means floating behavior */ - { NULL, NULL }, -}; - -/* key definitions */ -#define MODKEY Mod4Mask -#define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, -#define STACKKEYS(MOD,ACTION) \ - { MOD, XK_j, ACTION##stack, {.i = INC(+1) } }, \ - { MOD, XK_k, ACTION##stack, {.i = INC(-1) } }, \ - { MOD, XK_v, ACTION##stack, {.i = 0 } }, \ - /* { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ */ - /* { MOD, XK_a, ACTION##stack, {.i = 1 } }, \ */ - /* { MOD, XK_z, ACTION##stack, {.i = 2 } }, \ */ - /* { MOD, XK_x, ACTION##stack, {.i = -1 } }, */ - -/* helper for spawning shell commands in the pre dwm-5.0 fashion */ -#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } - -/* commands */ -static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-i", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, "-c", "-bw", "2", "-l", "15", NULL }; -static const char *termcmd[] = { TERMINAL, NULL }; - -#include <X11/XF86keysym.h> -#include "shiftview.c" -static Key keys[] = { - /* modifier key function argument */ - STACKKEYS(MODKEY, focus) - STACKKEYS(MODKEY|ShiftMask, push) - /* { MODKEY|ShiftMask, XK_Escape, spawn, SHCMD("") }, */ - { MODKEY, XK_grave, spawn, SHCMD("dmenuunicode") }, - /* { MODKEY|ShiftMask, XK_grave, togglescratch, SHCMD("") }, */ - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) - TAGKEYS( XK_4, 3) - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) - TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - { MODKEY, XK_minus, spawn, SHCMD("pamixer --allow-boost -d 5; kill -44 $(pidof dwmblocks)") }, - { MODKEY|ShiftMask, XK_minus, spawn, SHCMD("pamixer --allow-boost -d 15; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_equal, spawn, SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof dwmblocks)") }, - { MODKEY|ShiftMask, XK_equal, spawn, SHCMD("pamixer --allow-boost -i 15; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_BackSpace, spawn, SHCMD("sysact") }, - { MODKEY|ShiftMask, XK_BackSpace, spawn, SHCMD("xset dpms force off") }, - - { MODKEY, XK_Tab, view, {0} }, - /* { MODKEY|ShiftMask, XK_Tab, spawn, SHCMD("") }, */ - { MODKEY, XK_q, killclient, {0} }, - { MODKEY|ShiftMask, XK_q, spawn, SHCMD("sysact") }, - { MODKEY, XK_w, spawn, SHCMD("$BROWSER") }, - { MODKEY|ShiftMask, XK_w, spawn, SHCMD(TERMINAL " -e sudo nmtui") }, - { MODKEY, XK_e, spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook") }, - { MODKEY|ShiftMask, XK_e, spawn, SHCMD(TERMINAL " -e abook") }, - { MODKEY, XK_r, spawn, SHCMD(TERMINAL " -e lf") }, - { MODKEY|ShiftMask, XK_r, spawn, SHCMD(TERMINAL " -e htop") }, - { MODKEY, XK_t, setlayout, {.v = &layouts[1]} }, /* tile */ - { MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[2]} }, /* bstack */ - { MODKEY, XK_y, setlayout, {.v = &layouts[0]} }, /* spiral */ - { MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[3]} }, /* dwindle */ - { MODKEY, XK_u, setlayout, {.v = &layouts[4]} }, /* deck */ - { MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[5]} }, /* monocle */ - { MODKEY, XK_i, setlayout, {.v = &layouts[6]} }, /* centeredmaster */ - { MODKEY|ShiftMask, XK_i, setlayout, {.v = &layouts[7]} }, /* centeredfloatingmaster */ - { MODKEY, XK_o, incnmaster, {.i = +1 } }, - { MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } }, - { MODKEY, XK_p, spawn, SHCMD("mpc toggle") }, - { MODKEY|ShiftMask, XK_p, spawn, SHCMD("mpc pause ; pauseallmpv") }, - { MODKEY, XK_bracketleft, spawn, SHCMD("mpc seek -10") }, - { MODKEY|ShiftMask, XK_bracketleft, spawn, SHCMD("mpc seek -60") }, - { MODKEY, XK_bracketright, spawn, SHCMD("mpc seek +10") }, - { MODKEY|ShiftMask, XK_bracketright, spawn, SHCMD("mpc seek +60") }, - { MODKEY, XK_backslash, spawn, SHCMD("telegram-desktop") }, - { MODKEY|ShiftMask, XK_backslash, spawn, SHCMD("passmenu") }, - - { MODKEY, XK_a, spawn, SHCMD(TERMINAL " -e amfora") }, - { MODKEY|ShiftMask, XK_a, defaultgaps, {0} }, - { MODKEY, XK_s, togglesticky, {0} }, - /* { MODKEY|ShiftMask, XK_s, spawn, SHCMD("") }, */ - { MODKEY, XK_d, spawn, {.v = dmenucmd } }, - /* { MODKEY, XK_d, spawn, SHCMD("") } }, */ - { MODKEY, XK_f, togglefullscr, {0} }, - { MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[8]} }, - { MODKEY, XK_g, shiftview, { .i = -1 } }, - { MODKEY|ShiftMask, XK_g, shifttag, { .i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} }, - /* J and K are automatically bound above in STACKEYS */ - { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_semicolon, shiftview, { .i = 1 } }, - { MODKEY|ShiftMask, XK_semicolon, shifttag, { .i = 1 } }, - { MODKEY, XK_apostrophe, togglescratch, {.ui = 1} }, - /* { MODKEY|ShiftMask, XK_apostrophe, spawn, SHCMD("") }, */ - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY|ShiftMask, XK_Return, togglescratch, {.ui = 0} }, - - { MODKEY, XK_z, incrgaps, {.i = +3 } }, - /* { MODKEY|ShiftMask, XK_z, spawn, SHCMD("") }, */ - { MODKEY, XK_x, incrgaps, {.i = -3 } }, - /* { MODKEY|ShiftMask, XK_x, spawn, SHCMD("") }, */ - { MODKEY, XK_c, spawn, SHCMD("Discord") }, - { MODKEY|ShiftMask, XK_c, spawn, SHCMD("caffeine") }, - /* V is automatically bound above in STACKKEYS */ - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY|ShiftMask, XK_b, spawn, SHCMD("y2mpv") }, - { MODKEY, XK_n, spawn, SHCMD(TERMINAL " -e nvim -c VimwikiIndex") }, - { MODKEY|ShiftMask, XK_n, spawn, SHCMD(TERMINAL " -e newsboat; pkill -RTMIN+6 dwmblocks") }, - { MODKEY, XK_m, spawn, SHCMD(TERMINAL " -e ncmpcpp") }, - { MODKEY|ShiftMask, XK_m, spawn, SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_comma, spawn, SHCMD("mpc prev") }, - { MODKEY|ShiftMask, XK_comma, spawn, SHCMD("mpc seek 0%") }, - { MODKEY, XK_period, spawn, SHCMD("mpc next") }, - { MODKEY|ShiftMask, XK_period, spawn, SHCMD("mpc repeat") }, - - { MODKEY, XK_Left, focusmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_Left, tagmon, {.i = -1 } }, - { MODKEY, XK_Right, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_Right, tagmon, {.i = +1 } }, - - { MODKEY, XK_Page_Up, shiftview, { .i = -1 } }, - { MODKEY|ShiftMask, XK_Page_Up, shifttag, { .i = -1 } }, - { MODKEY, XK_Page_Down, shiftview, { .i = +1 } }, - { MODKEY|ShiftMask, XK_Page_Down, shifttag, { .i = +1 } }, - { MODKEY, XK_Insert, spawn, SHCMD("xdotool type $(cat ~/.local/share/larbs/snippets | dmenu -i -l 50 | cut -d' ' -f1)") }, - - { MODKEY, XK_F1, spawn, SHCMD("groff -mom /usr/local/share/dwm/larbs.mom -Tpdf | zathura -") }, - { MODKEY, XK_F2, spawn, SHCMD("tutorialvids") }, - { MODKEY, XK_F3, spawn, SHCMD("displayselect") }, - { MODKEY, XK_F4, spawn, SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") }, - { MODKEY, XK_F5, xrdb, {.v = NULL } }, - { MODKEY, XK_F6, spawn, SHCMD("torwrap") }, - { MODKEY, XK_F7, spawn, SHCMD("newsup") }, - { MODKEY, XK_F8, spawn, SHCMD("mw -Y") }, - { MODKEY, XK_F9, spawn, SHCMD("dmenumount") }, - { MODKEY, XK_F10, spawn, SHCMD("dmenuumount") }, - { MODKEY, XK_F11, spawn, SHCMD("mpv --no-cache --no-osc --no-input-default-bindings --input-conf=/dev/null --title=webcam $(ls /dev/video[0,2,4,6,8] | tail -n 1)") }, - { MODKEY, XK_F12, xrdb, {.v = NULL } }, - { MODKEY, XK_space, zoom, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, - - { 0, XK_Print, spawn, SHCMD("maim pic-full-$(date '+%y%m%d-%H%M-%S').png") }, - { ShiftMask, XK_Print, spawn, SHCMD("maimpick") }, - { MODKEY, XK_Print, spawn, SHCMD("dmenurecord") }, - { MODKEY|ShiftMask, XK_Print, spawn, SHCMD("dmenurecord kill") }, - { MODKEY, XK_Delete, spawn, SHCMD("dmenurecord kill") }, - { MODKEY, XK_Scroll_Lock, spawn, SHCMD("killall screenkey || screenkey &") }, - - { 0, XF86XK_AudioMute, spawn, SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") }, - { 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer --allow-boost -i 3; kill -44 $(pidof dwmblocks)") }, - { 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer --allow-boost -d 3; kill -44 $(pidof dwmblocks)") }, - { 0, XF86XK_AudioPrev, spawn, SHCMD("playerctl previous") }, - { 0, XF86XK_AudioNext, spawn, SHCMD("playerctl next") }, - { 0, XF86XK_AudioPause, spawn, SHCMD("playerctl play-pause") }, - { 0, XF86XK_AudioPlay, spawn, SHCMD("playerctl play-pause") }, - { 0, XF86XK_AudioStop, spawn, SHCMD("playerctl stop") }, - { 0, XF86XK_AudioRewind, spawn, SHCMD("mpc seek -10") }, - { 0, XF86XK_AudioForward, spawn, SHCMD("mpc seek +10") }, - { 0, XF86XK_AudioMedia, spawn, SHCMD(TERMINAL " -e ncmpcpp") }, - { 0, XF86XK_AudioMicMute, spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") }, - { 0, XF86XK_PowerOff, spawn, SHCMD("sysact") }, - { 0, XF86XK_Calculator, spawn, SHCMD(TERMINAL " -e bc -l") }, - { 0, XF86XK_Sleep, spawn, SHCMD("sudo -A zzz") }, - { 0, XF86XK_WWW, spawn, SHCMD("$BROWSER") }, - { 0, XF86XK_DOS, spawn, SHCMD(TERMINAL) }, - { 0, XF86XK_ScreenSaver, spawn, SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") }, - { 0, XF86XK_TaskPane, spawn, SHCMD(TERMINAL " -e htop") }, - { 0, XF86XK_Mail, spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks") }, - { 0, XF86XK_MyComputer, spawn, SHCMD(TERMINAL " -e lf /") }, - /* { 0, XF86XK_Battery, spawn, SHCMD("") }, */ - { 0, XF86XK_Launch1, spawn, SHCMD("xset dpms force off") }, - { 0, XF86XK_TouchpadToggle, spawn, SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") }, - { 0, XF86XK_TouchpadOff, spawn, SHCMD("synclient TouchpadOff=1") }, - { 0, XF86XK_TouchpadOn, spawn, SHCMD("synclient TouchpadOff=0") }, - { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("xbacklight -inc 15") }, - { 0, XF86XK_MonBrightnessDown, spawn, SHCMD("xbacklight -dec 15") }, - - /* { MODKEY|Mod4Mask, XK_h, incrgaps, {.i = +1 } }, */ - /* { MODKEY|Mod4Mask, XK_l, incrgaps, {.i = -1 } }, */ - /* { MODKEY|Mod4Mask|ShiftMask, XK_h, incrogaps, {.i = +1 } }, */ - /* { MODKEY|Mod4Mask|ShiftMask, XK_l, incrogaps, {.i = -1 } }, */ - /* { MODKEY|Mod4Mask|ControlMask, XK_h, incrigaps, {.i = +1 } }, */ - /* { MODKEY|Mod4Mask|ControlMask, XK_l, incrigaps, {.i = -1 } }, */ - /* { MODKEY|Mod4Mask|ShiftMask, XK_0, defaultgaps, {0} }, */ - /* { MODKEY, XK_y, incrihgaps, {.i = +1 } }, */ - /* { MODKEY, XK_o, incrihgaps, {.i = -1 } }, */ - /* { MODKEY|ControlMask, XK_y, incrivgaps, {.i = +1 } }, */ - /* { MODKEY|ControlMask, XK_o, incrivgaps, {.i = -1 } }, */ - /* { MODKEY|Mod4Mask, XK_y, incrohgaps, {.i = +1 } }, */ - /* { MODKEY|Mod4Mask, XK_o, incrohgaps, {.i = -1 } }, */ - /* { MODKEY|ShiftMask, XK_y, incrovgaps, {.i = +1 } }, */ - /* { MODKEY|ShiftMask, XK_o, incrovgaps, {.i = -1 } }, */ - -}; - -/* button definitions */ -/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ -static Button buttons[] = { - /* click event mask button function argument */ -#ifndef __OpenBSD__ - { ClkWinTitle, 0, Button2, zoom, {0} }, - { ClkStatusText, 0, Button1, sigdwmblocks, {.i = 1} }, - { ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2} }, - { ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3} }, - { ClkStatusText, 0, Button4, sigdwmblocks, {.i = 4} }, - { ClkStatusText, 0, Button5, sigdwmblocks, {.i = 5} }, - { ClkStatusText, ShiftMask, Button1, sigdwmblocks, {.i = 6} }, -#endif - { ClkStatusText, ShiftMask, Button3, spawn, SHCMD(TERMINAL " -e nvim ~/.local/src/dwmblocks/config.h") }, - { ClkClientWin, MODKEY, Button1, movemouse, {0} }, - { ClkClientWin, MODKEY, Button2, defaultgaps, {0} }, - { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, - { ClkClientWin, MODKEY, Button4, incrgaps, {.i = +1} }, - { ClkClientWin, MODKEY, Button5, incrgaps, {.i = -1} }, - { ClkTagBar, 0, Button1, view, {0} }, - { ClkTagBar, 0, Button3, toggleview, {0} }, - { ClkTagBar, MODKEY, Button1, tag, {0} }, - { ClkTagBar, MODKEY, Button3, toggletag, {0} }, - { ClkTagBar, 0, Button4, shiftview, {.i = -1} }, - { ClkTagBar, 0, Button5, shiftview, {.i = 1} }, - { ClkRootWin, 0, Button2, togglebar, {0} }, -}; diff --git a/platforms/linux/xorg/default.nix b/platforms/linux/xorg/default.nix deleted file mode 100644 index 9303fee..0000000 --- a/platforms/linux/xorg/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ pkgs, ... }: -let - pndwmblocks = pkgs.nur.repos.pn.dwmblocks.override { - patches = [ - ./dwmblocks.diff - ./dwmblocks-todo.diff - ]; - }; - pndwm = pkgs.nur.repos.pn.dwm.override { - patches = [ - ./dwm-systray.diff - ./dwm-center.diff - ./dwm-autostart.diff - ./dwm-mediakeys.diff # Patch for slock mediakeys - # ./dwm-rounded.diff - Resize dont work - ]; - header_config_file = ./config.h; - }; - - todos = pkgs.writeScriptBin "todos" '' - #!${pkgs.stdenv.shell} - case $BLOCK_BUTTON in - 1) notify-send "Tasks" "\n$(todoist l | cut -d\ -f5- | sed 's/^/* /')" ;; - 6) "$TERMINAL" -e "$EDITOR" "$0" ;; - esac - - echo "✅$(todoist list | wc -l)" - ''; -in - { - imports = [ - ./dunst - ]; - - home.packages = with pkgs; [ - mpd - xcompmgr - dunst - nur.repos.pn.dockd - pndwmblocks - pndwm - todos - playerctl - ]; - - xsession = { - enable = true; - windowManager.command = "dbus-run-session -- dwm"; - profileExtra = '' - # Fix Gnome Apps Slow Start due to failing services - # Add this when you include flatpak in your system - dbus-update-activation-environment --systemd DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY - - mpd & # music player daemon-you might prefer it as a service though - remaps & # run the remaps script, switching caps/esc and more; check it for more info - setbg & # set the background with the `setbg` script - #xrdb $\{XDG_CONFIG_HOME:-$HOME/.config}/Xresources & # Uncomment to use Xresources colors/settings on startup - xcompmgr & - # picom & - dunst & # dunst for notifications - xset r rate 300 50 & # Speed xrate up - # unclutter & # Remove mouse when idle - #sxhkd & - dockd --daemon & - for app in `ls ~/.config/autostart/*.desktop`; do - $(grep '^Exec' $app | sed 's/^Exec=//') & - done - sleep .5 && screen-orient & - ''; - scriptPath = ".xinitrc"; - }; - } diff --git a/platforms/linux/xorg/dunst/default.nix b/platforms/linux/xorg/dunst/default.nix deleted file mode 100644 index d4de0b9..0000000 --- a/platforms/linux/xorg/dunst/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - xdg.configFile."dunst/dunstrc".source = ./dunstrc; -} diff --git a/platforms/linux/xorg/dunst/dunstrc b/platforms/linux/xorg/dunst/dunstrc deleted file mode 100644 index c2bb8f8..0000000 --- a/platforms/linux/xorg/dunst/dunstrc +++ /dev/null @@ -1,431 +0,0 @@ -[global] - ### Display ### - - # Which monitor should the notifications be displayed on. - monitor = 0 - - # Display notification on focused monitor. Possible modes are: - # mouse: follow mouse pointer - # keyboard: follow window with keyboard focus - # none: don't follow anything - # - # "keyboard" needs a window manager that exports the - # _NET_ACTIVE_WINDOW property. - # This should be the case for almost all modern window managers. - # - # If this option is set to mouse or keyboard, the monitor option - # will be ignored. - follow = mouse - - # The geometry of the window: - # [{width}]x{height}[+/-{x}+/-{y}] - # The geometry of the message window. - # The height is measured in number of notifications everything else - # in pixels. If the width is omitted but the height is given - # ("-geometry x2"), the message window expands over the whole screen - # (dmenu-like). If width is 0, the window expands to the longest - # message displayed. A positive x is measured from the left, a - # negative from the right side of the screen. Y is measured from - # the top and down respectively. - # The width can be negative. In this case the actual width is the - # screen width minus the width defined in within the geometry option. - geometry = "300x5-30+20" - - # Show how many messages are currently hidden (because of geometry). - indicate_hidden = yes - - # Shrink window if it's smaller than the width. Will be ignored if - # width is 0. - shrink = no - - # The transparency of the window. Range: [0; 100]. - # This option will only work if a compositing window manager is - # present (e.g. xcompmgr, compiz, etc.). - transparency = 0 - - # The height of the entire notification. If the height is smaller - # than the font height and padding combined, it will be raised - # to the font height and padding. - notification_height = 0 - - # Draw a line of "separator_height" pixel height between two - # notifications. - # Set to 0 to disable. - separator_height = 2 - - # Padding between text and separator. - padding = 8 - - # Horizontal padding. - horizontal_padding = 8 - - # Defines width in pixels of frame around the notification window. - # Set to 0 to disable. - frame_width = 3 - - # Defines color of the frame around the notification window. - frame_color = "#aaaaaa" - - # Define a color for the separator. - # possible values are: - # * auto: dunst tries to find a color fitting to the background; - # * foreground: use the same color as the foreground; - # * frame: use the same color as the frame; - # * anything else will be interpreted as a X color. - separator_color = frame - - # Sort messages by urgency. - sort = yes - - # Don't remove messages, if the user is idle (no mouse or keyboard input) - # for longer than idle_threshold seconds. - # Set to 0 to disable. - # A client can set the 'transient' hint to bypass this. See the rules - # section for how to disable this if necessary - idle_threshold = 120 - - ### Text ### - - font = Monospace 12 - - # The spacing between lines. If the height is smaller than the - # font height, it will get raised to the font height. - line_height = 0 - - # Possible values are: - # full: Allow a small subset of html markup in notifications: - # <b>bold</b> - # <i>italic</i> - # <s>strikethrough</s> - # <u>underline</u> - # - # For a complete reference see - # <https://developer.gnome.org/pango/stable/pango-Markup.html>. - # - # strip: This setting is provided for compatibility with some broken - # clients that send markup even though it's not enabled on the - # server. Dunst will try to strip the markup but the parsing is - # simplistic so using this option outside of matching rules for - # specific applications *IS GREATLY DISCOURAGED*. - # - # no: Disable markup parsing, incoming notifications will be treated as - # plain text. Dunst will not advertise that it has the body-markup - # capability if this is set as a global setting. - # - # It's important to note that markup inside the format option will be parsed - # regardless of what this is set to. - markup = full - - # The format of the message. Possible variables are: - # %a appname - # %s summary - # %b body - # %i iconname (including its path) - # %I iconname (without its path) - # %p progress value if set ([ 0%] to [100%]) or nothing - # %n progress value if set without any extra characters - # %% Literal % - # Markup is allowed - format = "<b>%s</b>\n%b" - - # Alignment of message text. - # Possible values are "left", "center" and "right". - alignment = left - - # Vertical alignment of message text and icon. - # Possible values are "top", "center" and "bottom". - vertical_alignment = center - - # Show age of message if message is older than show_age_threshold - # seconds. - # Set to -1 to disable. - show_age_threshold = 60 - - # Split notifications into multiple lines if they don't fit into - # geometry. - word_wrap = yes - - # When word_wrap is set to no, specify where to make an ellipsis in long lines. - # Possible values are "start", "middle" and "end". - ellipsize = middle - - # Ignore newlines '\n' in notifications. - ignore_newline = no - - # Stack together notifications with the same content - stack_duplicates = true - - # Hide the count of stacked notifications with the same content - hide_duplicate_count = false - - # Display indicators for URLs (U) and actions (A). - show_indicators = yes - - ### Icons ### - - # Align icons left/right/off - icon_position = left - - # Scale small icons up to this size, set to 0 to disable. Helpful - # for e.g. small files or high-dpi screens. In case of conflict, - # max_icon_size takes precedence over this. - min_icon_size = 0 - - # Scale larger icons down to this size, set to 0 to disable - max_icon_size = 32 - - # Paths to default icons. - icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ - - ### History ### - - # Should a notification popped up from history be sticky or timeout - # as if it would normally do. - sticky_history = yes - - # Maximum amount of notifications kept in history - history_length = 20 - - ### Misc/Advanced ### - - # dmenu path. - dmenu = /usr/bin/dmenu -p dunst: - - # Browser for opening urls in context menu. - browser = /usr/bin/firefox -new-tab - - # Always run rule-defined scripts, even if the notification is suppressed - always_run_script = true - - # Define the title of the windows spawned by dunst - title = Dunst - - # Define the class of the windows spawned by dunst - class = Dunst - - # Print a notification on startup. - # This is mainly for error detection, since dbus (re-)starts dunst - # automatically after a crash. - startup_notification = false - - # Manage dunst's desire for talking - # Can be one of the following values: - # crit: Critical features. Dunst aborts - # warn: Only non-fatal warnings - # mesg: Important Messages - # info: all unimportant stuff - # debug: all less than unimportant stuff - verbosity = mesg - - # Define the corner radius of the notification window - # in pixel size. If the radius is 0, you have no rounded - # corners. - # The radius will be automatically lowered if it exceeds half of the - # notification height to avoid clipping text and/or icons. - corner_radius = 0 - - # Ignore the dbus closeNotification message. - # Useful to enforce the timeout set by dunst configuration. Without this - # parameter, an application may close the notification sent before the - # user defined timeout. - ignore_dbusclose = false - - ### Legacy - - # Use the Xinerama extension instead of RandR for multi-monitor support. - # This setting is provided for compatibility with older nVidia drivers that - # do not support RandR and using it on systems that support RandR is highly - # discouraged. - # - # By enabling this setting dunst will not be able to detect when a monitor - # is connected or disconnected which might break follow mode if the screen - # layout changes. - force_xinerama = false - - ### mouse - - # Defines list of actions for each mouse event - # Possible values are: - # * none: Don't do anything. - # * do_action: If the notification has exactly one action, or one is marked as default, - # invoke it. If there are multiple and no default, open the context menu. - # * close_current: Close current notification. - # * close_all: Close all notifications. - # These values can be strung together for each mouse event, and - # will be executed in sequence. - mouse_left_click = close_current - mouse_middle_click = do_action, close_current - mouse_right_click = close_all - -# Experimental features that may or may not work correctly. Do not expect them -# to have a consistent behaviour across releases. -[experimental] - # Calculate the dpi to use on a per-monitor basis. - # If this setting is enabled the Xft.dpi value will be ignored and instead - # dunst will attempt to calculate an appropriate dpi value for each monitor - # using the resolution and physical size. This might be useful in setups - # where there are multiple screens with very different dpi values. - per_monitor_dpi = false - -[shortcuts] - - # Shortcuts are specified as [modifier+][modifier+]...key - # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", - # "mod3" and "mod4" (windows-key). - # Xev might be helpful to find names for keys. - - # Close notification. - close = ctrl+space - - # Close all notifications. - close_all = ctrl+shift+space - - # Redisplay last message(s). - # On the US keyboard layout "grave" is normally above TAB and left - # of "1". Make sure this key actually exists on your keyboard layout, - # e.g. check output of 'xmodmap -pke' - history = ctrl+grave - - # Context menu. - context = ctrl+shift+period - -[urgency_low] - # IMPORTANT: colors have to be defined in quotation marks. - # Otherwise the "#" and following would be interpreted as a comment. - background = "#222222" - foreground = "#888888" - timeout = 10 - # Icon for notifications with low urgency, uncomment to enable - #icon = /path/to/icon - -[urgency_normal] - background = "#285577" - foreground = "#ffffff" - timeout = 10 - # Icon for notifications with normal urgency, uncomment to enable - #icon = /path/to/icon - -[urgency_critical] - background = "#900000" - foreground = "#ffffff" - frame_color = "#ff0000" - timeout = 0 - # Icon for notifications with critical urgency, uncomment to enable - #icon = /path/to/icon - -# Every section that isn't one of the above is interpreted as a rules to -# override settings for certain messages. -# -# Messages can be matched by -# appname (discouraged, see desktop_entry) -# body -# category -# desktop_entry -# icon -# match_transient -# msg_urgency -# stack_tag -# summary -# -# and you can override the -# background -# foreground -# format -# frame_color -# fullscreen -# new_icon -# set_stack_tag -# set_transient -# timeout -# urgency -# -# Shell-like globbing will get expanded. -# -# Instead of the appname filter, it's recommended to use the desktop_entry filter. -# GLib based applications export their desktop-entry name. In comparison to the appname, -# the desktop-entry won't get localized. -# -# SCRIPTING -# You can specify a script that gets run when the rule matches by -# setting the "script" option. -# The script will be called as follows: -# script appname summary body icon urgency -# where urgency can be "LOW", "NORMAL" or "CRITICAL". -# -# NOTE: if you don't want a notification to be displayed, set the format -# to "". -# NOTE: It might be helpful to run dunst -print in a terminal in order -# to find fitting options for rules. - -# Disable the transient hint so that idle_threshold cannot be bypassed from the -# client -#[transient_disable] -# match_transient = yes -# set_transient = no -# -# Make the handling of transient notifications more strict by making them not -# be placed in history. -#[transient_history_ignore] -# match_transient = yes -# history_ignore = yes - -# fullscreen values -# show: show the notifications, regardless if there is a fullscreen window opened -# delay: displays the new notification, if there is no fullscreen window active -# If the notification is already drawn, it won't get undrawn. -# pushback: same as delay, but when switching into fullscreen, the notification will get -# withdrawn from screen again and will get delayed like a new notification -#[fullscreen_delay_everything] -# fullscreen = delay -#[fullscreen_show_critical] -# msg_urgency = critical -# fullscreen = show - -#[espeak] -# summary = "*" -# script = dunst_espeak.sh - -#[script-test] -# summary = "*script*" -# script = dunst_test.sh - -#[ignore] -# # This notification will not be displayed -# summary = "foobar" -# format = "" - -#[history-ignore] -# # This notification will not be saved in history -# summary = "foobar" -# history_ignore = yes - -#[skip-display] -# # This notification will not be displayed, but will be included in the history -# summary = "foobar" -# skip_display = yes - -#[signed_on] -# appname = Pidgin -# summary = "*signed on*" -# urgency = low -# -#[signed_off] -# appname = Pidgin -# summary = *signed off* -# urgency = low -# -#[says] -# appname = Pidgin -# summary = *says* -# urgency = critical -# -#[twitter] -# appname = Pidgin -# summary = *twitter.com* -# urgency = normal -# -#[stack-volumes] -# appname = "some_volume_notifiers" -# set_stack_tag = "volume" -# -# vim: ft=cfg diff --git a/platforms/linux/xorg/dunstrc b/platforms/linux/xorg/dunstrc deleted file mode 100644 index c2bb8f8..0000000 --- a/platforms/linux/xorg/dunstrc +++ /dev/null @@ -1,431 +0,0 @@ -[global] - ### Display ### - - # Which monitor should the notifications be displayed on. - monitor = 0 - - # Display notification on focused monitor. Possible modes are: - # mouse: follow mouse pointer - # keyboard: follow window with keyboard focus - # none: don't follow anything - # - # "keyboard" needs a window manager that exports the - # _NET_ACTIVE_WINDOW property. - # This should be the case for almost all modern window managers. - # - # If this option is set to mouse or keyboard, the monitor option - # will be ignored. - follow = mouse - - # The geometry of the window: - # [{width}]x{height}[+/-{x}+/-{y}] - # The geometry of the message window. - # The height is measured in number of notifications everything else - # in pixels. If the width is omitted but the height is given - # ("-geometry x2"), the message window expands over the whole screen - # (dmenu-like). If width is 0, the window expands to the longest - # message displayed. A positive x is measured from the left, a - # negative from the right side of the screen. Y is measured from - # the top and down respectively. - # The width can be negative. In this case the actual width is the - # screen width minus the width defined in within the geometry option. - geometry = "300x5-30+20" - - # Show how many messages are currently hidden (because of geometry). - indicate_hidden = yes - - # Shrink window if it's smaller than the width. Will be ignored if - # width is 0. - shrink = no - - # The transparency of the window. Range: [0; 100]. - # This option will only work if a compositing window manager is - # present (e.g. xcompmgr, compiz, etc.). - transparency = 0 - - # The height of the entire notification. If the height is smaller - # than the font height and padding combined, it will be raised - # to the font height and padding. - notification_height = 0 - - # Draw a line of "separator_height" pixel height between two - # notifications. - # Set to 0 to disable. - separator_height = 2 - - # Padding between text and separator. - padding = 8 - - # Horizontal padding. - horizontal_padding = 8 - - # Defines width in pixels of frame around the notification window. - # Set to 0 to disable. - frame_width = 3 - - # Defines color of the frame around the notification window. - frame_color = "#aaaaaa" - - # Define a color for the separator. - # possible values are: - # * auto: dunst tries to find a color fitting to the background; - # * foreground: use the same color as the foreground; - # * frame: use the same color as the frame; - # * anything else will be interpreted as a X color. - separator_color = frame - - # Sort messages by urgency. - sort = yes - - # Don't remove messages, if the user is idle (no mouse or keyboard input) - # for longer than idle_threshold seconds. - # Set to 0 to disable. - # A client can set the 'transient' hint to bypass this. See the rules - # section for how to disable this if necessary - idle_threshold = 120 - - ### Text ### - - font = Monospace 12 - - # The spacing between lines. If the height is smaller than the - # font height, it will get raised to the font height. - line_height = 0 - - # Possible values are: - # full: Allow a small subset of html markup in notifications: - # <b>bold</b> - # <i>italic</i> - # <s>strikethrough</s> - # <u>underline</u> - # - # For a complete reference see - # <https://developer.gnome.org/pango/stable/pango-Markup.html>. - # - # strip: This setting is provided for compatibility with some broken - # clients that send markup even though it's not enabled on the - # server. Dunst will try to strip the markup but the parsing is - # simplistic so using this option outside of matching rules for - # specific applications *IS GREATLY DISCOURAGED*. - # - # no: Disable markup parsing, incoming notifications will be treated as - # plain text. Dunst will not advertise that it has the body-markup - # capability if this is set as a global setting. - # - # It's important to note that markup inside the format option will be parsed - # regardless of what this is set to. - markup = full - - # The format of the message. Possible variables are: - # %a appname - # %s summary - # %b body - # %i iconname (including its path) - # %I iconname (without its path) - # %p progress value if set ([ 0%] to [100%]) or nothing - # %n progress value if set without any extra characters - # %% Literal % - # Markup is allowed - format = "<b>%s</b>\n%b" - - # Alignment of message text. - # Possible values are "left", "center" and "right". - alignment = left - - # Vertical alignment of message text and icon. - # Possible values are "top", "center" and "bottom". - vertical_alignment = center - - # Show age of message if message is older than show_age_threshold - # seconds. - # Set to -1 to disable. - show_age_threshold = 60 - - # Split notifications into multiple lines if they don't fit into - # geometry. - word_wrap = yes - - # When word_wrap is set to no, specify where to make an ellipsis in long lines. - # Possible values are "start", "middle" and "end". - ellipsize = middle - - # Ignore newlines '\n' in notifications. - ignore_newline = no - - # Stack together notifications with the same content - stack_duplicates = true - - # Hide the count of stacked notifications with the same content - hide_duplicate_count = false - - # Display indicators for URLs (U) and actions (A). - show_indicators = yes - - ### Icons ### - - # Align icons left/right/off - icon_position = left - - # Scale small icons up to this size, set to 0 to disable. Helpful - # for e.g. small files or high-dpi screens. In case of conflict, - # max_icon_size takes precedence over this. - min_icon_size = 0 - - # Scale larger icons down to this size, set to 0 to disable - max_icon_size = 32 - - # Paths to default icons. - icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ - - ### History ### - - # Should a notification popped up from history be sticky or timeout - # as if it would normally do. - sticky_history = yes - - # Maximum amount of notifications kept in history - history_length = 20 - - ### Misc/Advanced ### - - # dmenu path. - dmenu = /usr/bin/dmenu -p dunst: - - # Browser for opening urls in context menu. - browser = /usr/bin/firefox -new-tab - - # Always run rule-defined scripts, even if the notification is suppressed - always_run_script = true - - # Define the title of the windows spawned by dunst - title = Dunst - - # Define the class of the windows spawned by dunst - class = Dunst - - # Print a notification on startup. - # This is mainly for error detection, since dbus (re-)starts dunst - # automatically after a crash. - startup_notification = false - - # Manage dunst's desire for talking - # Can be one of the following values: - # crit: Critical features. Dunst aborts - # warn: Only non-fatal warnings - # mesg: Important Messages - # info: all unimportant stuff - # debug: all less than unimportant stuff - verbosity = mesg - - # Define the corner radius of the notification window - # in pixel size. If the radius is 0, you have no rounded - # corners. - # The radius will be automatically lowered if it exceeds half of the - # notification height to avoid clipping text and/or icons. - corner_radius = 0 - - # Ignore the dbus closeNotification message. - # Useful to enforce the timeout set by dunst configuration. Without this - # parameter, an application may close the notification sent before the - # user defined timeout. - ignore_dbusclose = false - - ### Legacy - - # Use the Xinerama extension instead of RandR for multi-monitor support. - # This setting is provided for compatibility with older nVidia drivers that - # do not support RandR and using it on systems that support RandR is highly - # discouraged. - # - # By enabling this setting dunst will not be able to detect when a monitor - # is connected or disconnected which might break follow mode if the screen - # layout changes. - force_xinerama = false - - ### mouse - - # Defines list of actions for each mouse event - # Possible values are: - # * none: Don't do anything. - # * do_action: If the notification has exactly one action, or one is marked as default, - # invoke it. If there are multiple and no default, open the context menu. - # * close_current: Close current notification. - # * close_all: Close all notifications. - # These values can be strung together for each mouse event, and - # will be executed in sequence. - mouse_left_click = close_current - mouse_middle_click = do_action, close_current - mouse_right_click = close_all - -# Experimental features that may or may not work correctly. Do not expect them -# to have a consistent behaviour across releases. -[experimental] - # Calculate the dpi to use on a per-monitor basis. - # If this setting is enabled the Xft.dpi value will be ignored and instead - # dunst will attempt to calculate an appropriate dpi value for each monitor - # using the resolution and physical size. This might be useful in setups - # where there are multiple screens with very different dpi values. - per_monitor_dpi = false - -[shortcuts] - - # Shortcuts are specified as [modifier+][modifier+]...key - # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2", - # "mod3" and "mod4" (windows-key). - # Xev might be helpful to find names for keys. - - # Close notification. - close = ctrl+space - - # Close all notifications. - close_all = ctrl+shift+space - - # Redisplay last message(s). - # On the US keyboard layout "grave" is normally above TAB and left - # of "1". Make sure this key actually exists on your keyboard layout, - # e.g. check output of 'xmodmap -pke' - history = ctrl+grave - - # Context menu. - context = ctrl+shift+period - -[urgency_low] - # IMPORTANT: colors have to be defined in quotation marks. - # Otherwise the "#" and following would be interpreted as a comment. - background = "#222222" - foreground = "#888888" - timeout = 10 - # Icon for notifications with low urgency, uncomment to enable - #icon = /path/to/icon - -[urgency_normal] - background = "#285577" - foreground = "#ffffff" - timeout = 10 - # Icon for notifications with normal urgency, uncomment to enable - #icon = /path/to/icon - -[urgency_critical] - background = "#900000" - foreground = "#ffffff" - frame_color = "#ff0000" - timeout = 0 - # Icon for notifications with critical urgency, uncomment to enable - #icon = /path/to/icon - -# Every section that isn't one of the above is interpreted as a rules to -# override settings for certain messages. -# -# Messages can be matched by -# appname (discouraged, see desktop_entry) -# body -# category -# desktop_entry -# icon -# match_transient -# msg_urgency -# stack_tag -# summary -# -# and you can override the -# background -# foreground -# format -# frame_color -# fullscreen -# new_icon -# set_stack_tag -# set_transient -# timeout -# urgency -# -# Shell-like globbing will get expanded. -# -# Instead of the appname filter, it's recommended to use the desktop_entry filter. -# GLib based applications export their desktop-entry name. In comparison to the appname, -# the desktop-entry won't get localized. -# -# SCRIPTING -# You can specify a script that gets run when the rule matches by -# setting the "script" option. -# The script will be called as follows: -# script appname summary body icon urgency -# where urgency can be "LOW", "NORMAL" or "CRITICAL". -# -# NOTE: if you don't want a notification to be displayed, set the format -# to "". -# NOTE: It might be helpful to run dunst -print in a terminal in order -# to find fitting options for rules. - -# Disable the transient hint so that idle_threshold cannot be bypassed from the -# client -#[transient_disable] -# match_transient = yes -# set_transient = no -# -# Make the handling of transient notifications more strict by making them not -# be placed in history. -#[transient_history_ignore] -# match_transient = yes -# history_ignore = yes - -# fullscreen values -# show: show the notifications, regardless if there is a fullscreen window opened -# delay: displays the new notification, if there is no fullscreen window active -# If the notification is already drawn, it won't get undrawn. -# pushback: same as delay, but when switching into fullscreen, the notification will get -# withdrawn from screen again and will get delayed like a new notification -#[fullscreen_delay_everything] -# fullscreen = delay -#[fullscreen_show_critical] -# msg_urgency = critical -# fullscreen = show - -#[espeak] -# summary = "*" -# script = dunst_espeak.sh - -#[script-test] -# summary = "*script*" -# script = dunst_test.sh - -#[ignore] -# # This notification will not be displayed -# summary = "foobar" -# format = "" - -#[history-ignore] -# # This notification will not be saved in history -# summary = "foobar" -# history_ignore = yes - -#[skip-display] -# # This notification will not be displayed, but will be included in the history -# summary = "foobar" -# skip_display = yes - -#[signed_on] -# appname = Pidgin -# summary = "*signed on*" -# urgency = low -# -#[signed_off] -# appname = Pidgin -# summary = *signed off* -# urgency = low -# -#[says] -# appname = Pidgin -# summary = *says* -# urgency = critical -# -#[twitter] -# appname = Pidgin -# summary = *twitter.com* -# urgency = normal -# -#[stack-volumes] -# appname = "some_volume_notifiers" -# set_stack_tag = "volume" -# -# vim: ft=cfg diff --git a/platforms/linux/xorg/dwm-autostart.diff b/platforms/linux/xorg/dwm-autostart.diff deleted file mode 100644 index 1df1fa8..0000000 --- a/platforms/linux/xorg/dwm-autostart.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dwm.c b/dwm.c -index 127ab8a..44c85ed 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -1773,6 +1773,7 @@ run(void) - void - runAutostart(void) { - system("killall -q dwmblocks; dwmblocks &"); -+ system("for app in `ls ~/.config/autostart/*.desktop`; do $(grep '^Exec' $app | sed 's/^Exec=//') &; done"); - } - - void diff --git a/platforms/linux/xorg/dwm-center.diff b/platforms/linux/xorg/dwm-center.diff deleted file mode 100644 index 1bacb63..0000000 --- a/platforms/linux/xorg/dwm-center.diff +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/config.h b/config.h -index 747d9a0..780550a 100644 ---- a/config.h -+++ b/config.h -@@ -49,12 +49,12 @@ static const Rule rules[] = { - * WM_CLASS(STRING) = instance, class - * WM_NAME(STRING) = title - */ -- /* class instance title tags mask isfloating isterminal noswallow monitor */ -- { "Gimp", NULL, NULL, 1 << 8, 0, 0, 0, -1 }, -- { TERMCLASS, NULL, NULL, 0, 0, 1, 0, -1 }, -- { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, -- { NULL, "spterm", NULL, SPTAG(0), 1, 1, 0, -1 }, -- { NULL, "spcalc", NULL, SPTAG(1), 1, 1, 0, -1 }, -+ /* class instance title tags mask iscentered isfloating isterminal noswallow monitor */ -+ { "Gimp", NULL, NULL, 1 << 8, 0, 0, 0, 0, -1 }, -+ { TERMCLASS, NULL, NULL, 0, 0, 0, 1, 0, -1 }, -+ { NULL, NULL, "Event Tester", 0, 0, 0, 0, 1, -1 }, -+ { NULL, "spterm", NULL, SPTAG(0), 0, 1, 1, 0, -1 }, -+ { NULL, "spcalc", NULL, SPTAG(1), 0, 1, 1, 0, -1 }, - }; - - /* layout(s) */ -diff --git a/dwm.c b/dwm.c -index 2e43282..4220f87 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -119,7 +119,7 @@ struct Client { - int basew, baseh, incw, inch, maxw, maxh, minw, minh; - int bw, oldbw; - unsigned int tags; -- int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow, issticky; -+ int isfixed, iscentered, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow, issticky; - pid_t pid; - Client *next; - Client *snext; -@@ -170,6 +170,7 @@ typedef struct { - const char *instance; - const char *title; - unsigned int tags; -+ int iscentered; - int isfloating; - int isterminal; - int noswallow; -@@ -348,6 +349,7 @@ applyrules(Client *c) - XClassHint ch = { NULL, NULL }; - - /* rule matching */ -+ c->iscentered = 0; - c->isfloating = 0; - c->tags = 0; - XGetClassHint(dpy, c->win, &ch); -@@ -361,6 +363,7 @@ applyrules(Client *c) - && (!r->instance || strstr(instance, r->instance))) - { - c->isterminal = r->isterminal; -+ c->iscentered = r->iscentered; - c->isfloating = r->isfloating; - c->noswallow = r->noswallow; - c->tags |= r->tags; -@@ -1250,6 +1253,10 @@ manage(Window w, XWindowAttributes *wa) - updatewindowtype(c); - updatesizehints(c); - updatewmhints(c); -+ if (c->iscentered) { -+ c->x = c->mon->mx + (c->mon->mw - WIDTH(c)) / 2; -+ c->y = c->mon->my + (c->mon->mh - HEIGHT(c)) / 2; -+ } - XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); - grabbuttons(c, 0); - if (!c->isfloating) -@@ -2339,8 +2346,10 @@ updatewindowtype(Client *c) - - if (state == netatom[NetWMFullscreen]) - setfullscreen(c, 1); -- if (wtype == netatom[NetWMWindowTypeDialog]) -+ if (wtype == netatom[NetWMWindowTypeDialog]) { -+ c->iscentered = 1; - c->isfloating = 1; -+ } - } - - void diff --git a/platforms/linux/xorg/dwm-mediakeys.diff b/platforms/linux/xorg/dwm-mediakeys.diff deleted file mode 100644 index 0ec5336..0000000 --- a/platforms/linux/xorg/dwm-mediakeys.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dwm.c b/dwm.c -index 2e43282..1565695 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -1847,7 +1847,7 @@ setup(void) - wa.cursor = cursor[CurNormal]->cursor; - wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask - |ButtonPressMask|PointerMotionMask|EnterWindowMask -- |LeaveWindowMask|StructureNotifyMask|PropertyChangeMask; -+ |LeaveWindowMask|StructureNotifyMask|PropertyChangeMask|KeyPressMask; - XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); - XSelectInput(dpy, root, wa.event_mask); - grabkeys(); diff --git a/platforms/linux/xorg/dwm-rounded.diff b/platforms/linux/xorg/dwm-rounded.diff deleted file mode 100644 index 6ad2b53..0000000 --- a/platforms/linux/xorg/dwm-rounded.diff +++ /dev/null @@ -1,114 +0,0 @@ -diff --git a/config.h b/config.h -index dffae22..ed83f31 100644 ---- a/config.h -+++ b/config.h -@@ -32,6 +32,7 @@ static char *colors[][3] = { - [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor }, - [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor }, - }; -+#define CORNER_RADIUS 5 - - typedef struct { - const char *name; -diff --git a/dwm.c b/dwm.c -index 290dc2d..f3e70c9 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -40,6 +40,7 @@ - #ifdef XINERAMA - #include <X11/extensions/Xinerama.h> - #endif /* XINERAMA */ -+#include <X11/extensions/shape.h> - #include <X11/Xft/Xft.h> - #include <X11/Xlib-xcb.h> - #include <xcb/res.h> -@@ -315,6 +316,7 @@ static Client *wintosystrayicon(Window w); - static int xerror(Display *dpy, XErrorEvent *ee); - static int xerrordummy(Display *dpy, XErrorEvent *ee); - static int xerrorstart(Display *dpy, XErrorEvent *ee); -+static void drawroundedcorners(Client *c); - static void xrdb(const Arg *arg); - static void zoom(const Arg *arg); - -@@ -1391,6 +1393,9 @@ manage(Window w, XWindowAttributes *wa) - unfocus(selmon->sel, 0); - c->mon->sel = c; - arrange(c->mon); -+ -+ drawroundedcorners(c); -+ - XMapWindow(dpy, c->win); - if (term) - swallow(term, c); -@@ -1508,6 +1513,7 @@ movemouse(const Arg *arg) - togglefloating(NULL); - if (!selmon->lt[selmon->sellt]->arrange || c->isfloating) - resize(c, nx, ny, c->w, c->h, 1); -+ drawroundedcorners(c); - break; - } - } while (ev.type != ButtonRelease); -@@ -1671,6 +1677,55 @@ resizeclient(Client *c, int x, int y, int w, int h) - XSync(dpy, False); - } - -+void drawroundedcorners(Client *c) { -+ // if set to zero in config.h, do not attempt to round -+ if(CORNER_RADIUS < 0) return; -+ -+ // NOTE: this is extremely hacky and surely could be optimized. -+ // Any X wizards out there reading this, please pull request. -+ if (CORNER_RADIUS > 0 && c && !c->isfullscreen) { -+ Window win; -+ win = c->win; -+ if(!win) return; -+ -+ XWindowAttributes win_attr; -+ if(!XGetWindowAttributes(dpy, win, &win_attr)) return; -+ -+ // set in config.h: -+ int dia = 2 * CORNER_RADIUS; -+ int w = c->w; -+ int h = c->h; -+ if(w < dia || h < dia) return; -+ -+ Pixmap mask; -+ mask = XCreatePixmap(dpy, win, w, h, 1); -+ if(!mask) return; -+ -+ XGCValues xgcv; -+ GC shape_gc; -+ shape_gc = XCreateGC(dpy, mask, 0, &xgcv); -+ -+ if(!shape_gc) { -+ XFreePixmap(dpy, mask); -+ free(shape_gc); -+ return; -+ } -+ -+ XSetForeground(dpy, shape_gc, 0); -+ XFillRectangle(dpy, mask, shape_gc, 0, 0, w, h); -+ XSetForeground(dpy, shape_gc, 1); -+ XFillArc(dpy, mask, shape_gc, 0, 0, dia, dia, 0, 23040); -+ XFillArc(dpy, mask, shape_gc, w-dia-1, 0, dia, dia, 0, 23040); -+ XFillArc(dpy, mask, shape_gc, 0, h-dia-1, dia, dia, 0, 23040); -+ XFillArc(dpy, mask, shape_gc, w-dia-1, h-dia-1, dia, dia, 0, 23040); -+ XFillRectangle(dpy, mask, shape_gc, CORNER_RADIUS, 0, w-dia, h); -+ XFillRectangle(dpy, mask, shape_gc, 0, CORNER_RADIUS, w, h-dia); -+ XShapeCombineMask(dpy, win, ShapeBounding, 0, 0, mask, ShapeSet); -+ XFreePixmap(dpy, mask); -+ XFreeGC(dpy, shape_gc); -+ } -+} -+ - void - resizemouse(const Arg *arg) - { -@@ -1726,6 +1781,7 @@ resizemouse(const Arg *arg) - selmon = m; - focus(NULL); - } -+ drawroundedcorners(c); - } - - void diff --git a/platforms/linux/xorg/dwm-systray.diff b/platforms/linux/xorg/dwm-systray.diff deleted file mode 100644 index 4abfa93..0000000 --- a/platforms/linux/xorg/dwm-systray.diff +++ /dev/null @@ -1,731 +0,0 @@ -diff --git a/config.h b/config.h -index 771e7a1..bb053d8 100644 ---- a/config.h -+++ b/config.h -@@ -3,6 +3,10 @@ - /* appearance */ - static const unsigned int borderpx = 3; /* border pixel of windows */ - static const unsigned int snap = 32; /* snap pixel */ -+static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ -+static const unsigned int systrayspacing = 2; /* systray spacing */ -+static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/ -+static const int showsystray = 1; /* 0 means no systray */ - static const unsigned int gappih = 20; /* horiz inner gap between windows */ - static const unsigned int gappiv = 10; /* vert inner gap between windows */ - static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ -diff --git a/dwm.c b/dwm.c -index 2e43282..127ab8a 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -84,12 +84,30 @@ - } \ - } - -+#define SYSTEM_TRAY_REQUEST_DOCK 0 -+ -+/* XEMBED messages */ -+#define XEMBED_EMBEDDED_NOTIFY 0 -+#define XEMBED_WINDOW_ACTIVATE 1 -+#define XEMBED_FOCUS_IN 4 -+#define XEMBED_MODALITY_ON 10 -+ -+#define XEMBED_MAPPED (1 << 0) -+#define XEMBED_WINDOW_ACTIVATE 1 -+#define XEMBED_WINDOW_DEACTIVATE 2 -+ -+#define VERSION_MAJOR 0 -+#define VERSION_MINOR 0 -+#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR -+ - /* enums */ - enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ - enum { SchemeNorm, SchemeSel }; /* color schemes */ - enum { NetSupported, NetWMName, NetWMState, NetWMCheck, -+ NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz, - NetWMFullscreen, NetActiveWindow, NetWMWindowType, - NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ -+enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */ - enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */ - enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, - ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ -@@ -176,6 +194,12 @@ typedef struct { - int monitor; - } Rule; - -+typedef struct Systray Systray; -+struct Systray { -+ Window win; -+ Client *icons; -+}; -+ - /* function declarations */ - static void applyrules(Client *c); - static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact); -@@ -208,6 +232,7 @@ static void focusstack(const Arg *arg); - static Atom getatomprop(Client *c, Atom prop); - static int getrootptr(int *x, int *y); - static long getstate(Window w); -+static unsigned int getsystraywidth(); - static int gettextprop(Window w, Atom atom, char *text, unsigned int size); - static void grabbuttons(Client *c, int focused); - static void grabkeys(void); -@@ -227,14 +252,17 @@ static void propertynotify(XEvent *e); - static void pushstack(const Arg *arg); - static void quit(const Arg *arg); - static Monitor *recttomon(int x, int y, int w, int h); -+static void removesystrayicon(Client *i); - static void resize(Client *c, int x, int y, int w, int h, int interact); -+static void resizebarwin(Monitor *m); - static void resizeclient(Client *c, int x, int y, int w, int h); - static void resizemouse(const Arg *arg); -+static void resizerequest(XEvent *e); - static void restack(Monitor *m); - static void run(void); - static void runAutostart(void); - static void scan(void); --static int sendevent(Client *c, Atom proto); -+static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4); - static void sendmon(Client *c, Monitor *m); - static void setclientstate(Client *c, long state); - static void setfocus(Client *c); -@@ -253,6 +281,7 @@ static void sighup(int unused); - static void sigterm(int unused); - static void spawn(const Arg *arg); - static int stackpos(const Arg *arg); -+static Monitor *systraytomon(Monitor *m); - static void tag(const Arg *arg); - static void tagmon(const Arg *arg); - static void togglebar(const Arg *arg); -@@ -272,12 +301,16 @@ static int updategeom(void); - static void updatenumlockmask(void); - static void updatesizehints(Client *c); - static void updatestatus(void); -+static void updatesystray(void); -+static void updatesystrayicongeom(Client *i, int w, int h); -+static void updatesystrayiconstate(Client *i, XPropertyEvent *ev); - static void updatetitle(Client *c); - static void updatewindowtype(Client *c); - static void updatewmhints(Client *c); - static void view(const Arg *arg); - static Client *wintoclient(Window w); - static Monitor *wintomon(Window w); -+static Client *wintosystrayicon(Window w); - static int xerror(Display *dpy, XErrorEvent *ee); - static int xerrordummy(Display *dpy, XErrorEvent *ee); - static int xerrorstart(Display *dpy, XErrorEvent *ee); -@@ -292,6 +325,7 @@ static pid_t winpid(Window w); - - - /* variables */ -+static Systray *systray = NULL; - static const char broken[] = "broken"; - static char stext[256]; - static char rawstext[256]; -@@ -317,9 +351,10 @@ static void (*handler[LASTEvent]) (XEvent *) = { - [MapRequest] = maprequest, - [MotionNotify] = motionnotify, - [PropertyNotify] = propertynotify, -+ [ResizeRequest] = resizerequest, - [UnmapNotify] = unmapnotify - }; --static Atom wmatom[WMLast], netatom[NetLast]; -+static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast]; - static int restart = 0; - static int running = 1; - static Cur *cursor[CurLast]; -@@ -560,7 +595,7 @@ buttonpress(XEvent *e) - arg.ui = 1 << i; - } else if (ev->x < x + blw) - click = ClkLtSymbol; -- else if (ev->x > (x = selmon->ww - TEXTW(stext) + lrpad)) { -+ else if (ev->x > (x = selmon->ww - TEXTW(stext) - getsystraywidth() + lrpad)) { - click = ClkStatusText; - - char *text = rawstext; -@@ -620,6 +655,11 @@ cleanup(void) - XUngrabKey(dpy, AnyKey, AnyModifier, root); - while (mons) - cleanupmon(mons); -+ if (showsystray) { -+ XUnmapWindow(dpy, systray->win); -+ XDestroyWindow(dpy, systray->win); -+ free(systray); -+ } - for (i = 0; i < CurLast; i++) - drw_cur_free(drw, cursor[i]); - for (i = 0; i < LENGTH(colors); i++) -@@ -650,9 +690,57 @@ cleanupmon(Monitor *mon) - void - clientmessage(XEvent *e) - { -+ XWindowAttributes wa; -+ XSetWindowAttributes swa; - XClientMessageEvent *cme = &e->xclient; - Client *c = wintoclient(cme->window); - -+ if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) { -+ /* add systray icons */ -+ if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) { -+ if (!(c = (Client *)calloc(1, sizeof(Client)))) -+ die("fatal: could not malloc() %u bytes\n", sizeof(Client)); -+ if (!(c->win = cme->data.l[2])) { -+ free(c); -+ return; -+ } -+ c->mon = selmon; -+ c->next = systray->icons; -+ systray->icons = c; -+ if (!XGetWindowAttributes(dpy, c->win, &wa)) { -+ /* use sane defaults */ -+ wa.width = bh; -+ wa.height = bh; -+ wa.border_width = 0; -+ } -+ c->x = c->oldx = c->y = c->oldy = 0; -+ c->w = c->oldw = wa.width; -+ c->h = c->oldh = wa.height; -+ c->oldbw = wa.border_width; -+ c->bw = 0; -+ c->isfloating = True; -+ /* reuse tags field as mapped status */ -+ c->tags = 1; -+ updatesizehints(c); -+ updatesystrayicongeom(c, wa.width, wa.height); -+ XAddToSaveSet(dpy, c->win); -+ XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask); -+ XReparentWindow(dpy, c->win, systray->win, 0, 0); -+ /* use parents background color */ -+ swa.background_pixel = scheme[SchemeNorm][ColBg].pixel; -+ XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa); -+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION); -+ /* FIXME not sure if I have to send these events, too */ -+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION); -+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION); -+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION); -+ XSync(dpy, False); -+ resizebarwin(selmon); -+ updatesystray(); -+ setclientstate(c, NormalState); -+ } -+ return; -+ } - if (!c) - return; - if (cme->message_type == netatom[NetWMState]) { -@@ -705,7 +793,7 @@ configurenotify(XEvent *e) - for (c = m->clients; c; c = c->next) - if (c->isfullscreen) - resizeclient(c, m->mx, m->my, m->mw, m->mh); -- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh); -+ resizebarwin(m); - } - focus(NULL); - arrange(NULL); -@@ -810,6 +898,12 @@ destroynotify(XEvent *e) - - else if ((c = swallowingclient(ev->window))) - unmanage(c->swallowing, 1); -+ -+ else if ((c = wintosystrayicon(ev->window))) { -+ removesystrayicon(c); -+ resizebarwin(selmon); -+ updatesystray(); -+ } - } - - void -@@ -853,19 +947,23 @@ dirtomon(int dir) - void - drawbar(Monitor *m) - { -- int x, w, tw = 0; -+ int x, w, tw = 0, stw = 0; - int boxs = drw->fonts->h / 9; - int boxw = drw->fonts->h / 6 + 2; - unsigned int i, occ = 0, urg = 0; - Client *c; - -+ if(showsystray && m == systraytomon(m)) -+ stw = getsystraywidth(); -+ - /* draw status first so it can be overdrawn by tags later */ - if (m == selmon) { /* status is only drawn on selected monitor */ - drw_setscheme(drw, scheme[SchemeNorm]); -- tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ -- drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0); -+ tw = TEXTW(stext) - lrpad / 2 + 2; /* 2px right padding */ -+ drw_text(drw, m->ww - tw - stw, 0, tw, bh, lrpad / 2 - 2, stext, 0); - } - -+ resizebarwin(m); - for (c = m->clients; c; c = c->next) { - occ |= c->tags == 255 ? 0 : c->tags; - if (c->isurgent) -@@ -886,7 +984,7 @@ drawbar(Monitor *m) - drw_setscheme(drw, scheme[SchemeNorm]); - x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); - -- if ((w = m->ww - tw - x) > bh) { -+ if ((w = m->ww - tw - stw - x) > bh) { - if (m->sel) { - drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); -@@ -897,7 +995,7 @@ drawbar(Monitor *m) - drw_rect(drw, x, 0, w, bh, 1, 1); - } - } -- drw_map(drw, m->barwin, 0, 0, m->ww, bh); -+ drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh); - } - - void -@@ -934,8 +1032,11 @@ expose(XEvent *e) - Monitor *m; - XExposeEvent *ev = &e->xexpose; - -- if (ev->count == 0 && (m = wintomon(ev->window))) -+ if (ev->count == 0 && (m = wintomon(ev->window))) { - drawbar(m); -+ if (m == selmon) -+ updatesystray(); -+ } - } - - void -@@ -1009,10 +1110,17 @@ getatomprop(Client *c, Atom prop) - unsigned long dl; - unsigned char *p = NULL; - Atom da, atom = None; -+ /* FIXME getatomprop should return the number of items and a pointer to -+ * the stored data instead of this workaround */ -+ Atom req = XA_ATOM; -+ if (prop == xatom[XembedInfo]) -+ req = xatom[XembedInfo]; - -- if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM, -+ if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req, - &da, &di, &dl, &dl, &p) == Success && p) { - atom = *(Atom *)p; -+ if (da == xatom[XembedInfo] && dl == 2) -+ atom = ((Atom *)p)[1]; - XFree(p); - } - return atom; -@@ -1060,6 +1168,16 @@ getstate(Window w) - return result; - } - -+unsigned int -+getsystraywidth() -+{ -+ unsigned int w = 0; -+ Client *i; -+ if(showsystray) -+ for(i = systray->icons; i; w += i->w + systrayspacing, i = i->next) ; -+ return w ? w + systrayspacing : 1; -+} -+ - int - gettextprop(Window w, Atom atom, char *text, unsigned int size) - { -@@ -1164,7 +1282,7 @@ killclient(const Arg *arg) - { - if (!selmon->sel) - return; -- if (!sendevent(selmon->sel, wmatom[WMDelete])) { -+ if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) { - XGrabServer(dpy); - XSetErrorHandler(xerrordummy); - XSetCloseDownMode(dpy, DestroyAll); -@@ -1287,6 +1405,12 @@ maprequest(XEvent *e) - { - static XWindowAttributes wa; - XMapRequestEvent *ev = &e->xmaprequest; -+ Client *i; -+ if ((i = wintosystrayicon(ev->window))) { -+ sendevent(i->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION); -+ resizebarwin(selmon); -+ updatesystray(); -+ } - - if (!XGetWindowAttributes(dpy, ev->window, &wa)) - return; -@@ -1434,6 +1558,17 @@ propertynotify(XEvent *e) - Window trans; - XPropertyEvent *ev = &e->xproperty; - -+ -+ if ((c = wintosystrayicon(ev->window))) { -+ if (ev->atom == XA_WM_NORMAL_HINTS) { -+ updatesizehints(c); -+ updatesystrayicongeom(c, c->w, c->h); -+ } -+ else -+ updatesystrayiconstate(c, ev); -+ resizebarwin(selmon); -+ updatesystray(); -+ } - if ((ev->window == root) && (ev->atom == XA_WM_NAME)) { - updatestatus(); - } else if (ev->state == PropertyDelete) { -@@ -1485,6 +1620,20 @@ recttomon(int x, int y, int w, int h) - return r; - } - -+void -+removesystrayicon(Client *i) -+{ -+ Client **ii; -+ -+ if (!showsystray || !i) -+ return; -+ for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next); -+ if (ii) -+ *ii = i->next; -+ free(i); -+} -+ -+ - void - resize(Client *c, int x, int y, int w, int h, int interact) - { -@@ -1492,6 +1641,14 @@ resize(Client *c, int x, int y, int w, int h, int interact) - resizeclient(c, x, y, w, h); - } - -+void -+resizebarwin(Monitor *m) { -+ unsigned int w = m->ww; -+ if (showsystray && m == systraytomon(m)) -+ w -= getsystraywidth(); -+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh); -+} -+ - void - resizeclient(Client *c, int x, int y, int w, int h) - { -@@ -1564,6 +1721,19 @@ resizemouse(const Arg *arg) - } - } - -+void -+resizerequest(XEvent *e) -+{ -+ XResizeRequestEvent *ev = &e->xresizerequest; -+ Client *i; -+ -+ if ((i = wintosystrayicon(ev->window))) { -+ updatesystrayicongeom(i, ev->width, ev->height); -+ resizebarwin(selmon); -+ updatesystray(); -+ } -+} -+ - void - restack(Monitor *m) - { -@@ -1658,26 +1828,36 @@ setclientstate(Client *c, long state) - } - - int --sendevent(Client *c, Atom proto) -+sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4) - { - int n; -- Atom *protocols; -+ Atom *protocols, mt; - int exists = 0; - XEvent ev; - -- if (XGetWMProtocols(dpy, c->win, &protocols, &n)) { -- while (!exists && n--) -- exists = protocols[n] == proto; -- XFree(protocols); -+ if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) { -+ mt = wmatom[WMProtocols]; -+ if (XGetWMProtocols(dpy, w, &protocols, &n)) { -+ while (!exists && n--) -+ exists = protocols[n] == proto; -+ XFree(protocols); -+ } -+ } -+ else { -+ exists = True; -+ mt = proto; - } - if (exists) { - ev.type = ClientMessage; -- ev.xclient.window = c->win; -- ev.xclient.message_type = wmatom[WMProtocols]; -+ ev.xclient.window = w; -+ ev.xclient.message_type = mt; - ev.xclient.format = 32; -- ev.xclient.data.l[0] = proto; -- ev.xclient.data.l[1] = CurrentTime; -- XSendEvent(dpy, c->win, False, NoEventMask, &ev); -+ ev.xclient.data.l[0] = d0; -+ ev.xclient.data.l[1] = d1; -+ ev.xclient.data.l[2] = d2; -+ ev.xclient.data.l[3] = d3; -+ ev.xclient.data.l[4] = d4; -+ XSendEvent(dpy, w, False, mask, &ev); - } - return exists; - } -@@ -1691,7 +1871,7 @@ setfocus(Client *c) - XA_WINDOW, 32, PropModeReplace, - (unsigned char *) &(c->win), 1); - } -- sendevent(c, wmatom[WMTakeFocus]); -+ sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0); - } - - void -@@ -1813,6 +1993,10 @@ setup(void) - wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False); - netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False); - netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False); -+ netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False); -+ netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False); -+ netatom[NetSystemTrayOrientation] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", False); -+ netatom[NetSystemTrayOrientationHorz] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False); - netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); - netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False); - netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False); -@@ -1820,6 +2004,9 @@ setup(void) - netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False); - netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False); - netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False); -+ xatom[Manager] = XInternAtom(dpy, "MANAGER", False); -+ xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False); -+ xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False); - /* init cursors */ - cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr); - cursor[CurResize] = drw_cur_create(drw, XC_sizing); -@@ -1828,6 +2015,8 @@ setup(void) - scheme = ecalloc(LENGTH(colors), sizeof(Clr *)); - for (i = 0; i < LENGTH(colors); i++) - scheme[i] = drw_scm_create(drw, colors[i], 3); -+ /* init system tray */ -+ updatesystray(); - /* init bars */ - updatebars(); - updatestatus(); -@@ -1970,7 +2159,18 @@ togglebar(const Arg *arg) - { - selmon->showbar = !selmon->showbar; - updatebarpos(selmon); -- XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); -+ resizebarwin(selmon); -+ if (showsystray) { -+ XWindowChanges wc; -+ if (!selmon->showbar) -+ wc.y = -bh; -+ else if (selmon->showbar) { -+ wc.y = 0; -+ if (!selmon->topbar) -+ wc.y = selmon->mh - bh; -+ } -+ XConfigureWindow(dpy, systray->win, CWY, &wc); -+ } - arrange(selmon); - } - -@@ -2124,11 +2324,18 @@ unmapnotify(XEvent *e) - else - unmanage(c, 0); - } -+ else if ((c = wintosystrayicon(ev->window))) { -+ /* KLUDGE! sometimes icons occasionally unmap their windows, but do -+ * _not_ destroy them. We map those windows back */ -+ XMapRaised(dpy, c->win); -+ updatesystray(); -+ } - } - - void - updatebars(void) - { -+ unsigned int w; - Monitor *m; - XSetWindowAttributes wa = { - .override_redirect = True, -@@ -2139,10 +2346,15 @@ updatebars(void) - for (m = mons; m; m = m->next) { - if (m->barwin) - continue; -- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), -+ w = m->ww; -+ if (showsystray && m == systraytomon(m)) -+ w -= getsystraywidth(); -+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0, DefaultDepth(dpy, screen), - CopyFromParent, DefaultVisual(dpy, screen), - CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); - XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor); -+ if (showsystray && m == systraytomon(m)) -+ XMapRaised(dpy, systray->win); - XMapRaised(dpy, m->barwin); - XSetClassHint(dpy, m->barwin, &ch); - } -@@ -2320,6 +2532,121 @@ updatestatus(void) - else - copyvalidchars(stext, rawstext); - drawbar(selmon); -+ updatesystray(); -+} -+ -+void -+updatesystrayicongeom(Client *i, int w, int h) -+{ -+ if (i) { -+ i->h = bh; -+ if (w == h) -+ i->w = bh; -+ else if (h == bh) -+ i->w = w; -+ else -+ i->w = (int) ((float)bh * ((float)w / (float)h)); -+ applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False); -+ /* force icons into the systray dimensions if they don't want to */ -+ if (i->h > bh) { -+ if (i->w == i->h) -+ i->w = bh; -+ else -+ i->w = (int) ((float)bh * ((float)i->w / (float)i->h)); -+ i->h = bh; -+ } -+ } -+} -+ -+void -+updatesystrayiconstate(Client *i, XPropertyEvent *ev) -+{ -+ long flags; -+ int code = 0; -+ -+ if (!showsystray || !i || ev->atom != xatom[XembedInfo] || -+ !(flags = getatomprop(i, xatom[XembedInfo]))) -+ return; -+ -+ if (flags & XEMBED_MAPPED && !i->tags) { -+ i->tags = 1; -+ code = XEMBED_WINDOW_ACTIVATE; -+ XMapRaised(dpy, i->win); -+ setclientstate(i, NormalState); -+ } -+ else if (!(flags & XEMBED_MAPPED) && i->tags) { -+ i->tags = 0; -+ code = XEMBED_WINDOW_DEACTIVATE; -+ XUnmapWindow(dpy, i->win); -+ setclientstate(i, WithdrawnState); -+ } -+ else -+ return; -+ sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0, -+ systray->win, XEMBED_EMBEDDED_VERSION); -+} -+ -+void -+updatesystray(void) -+{ -+ XSetWindowAttributes wa; -+ XWindowChanges wc; -+ Client *i; -+ Monitor *m = systraytomon(NULL); -+ unsigned int x = m->mx + m->mw; -+ unsigned int w = 1; -+ -+ if (!showsystray) -+ return; -+ if (!systray) { -+ /* init systray */ -+ if (!(systray = (Systray *)calloc(1, sizeof(Systray)))) -+ die("fatal: could not malloc() %u bytes\n", sizeof(Systray)); -+ systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel); -+ wa.event_mask = ButtonPressMask | ExposureMask; -+ wa.override_redirect = True; -+ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel; -+ XSelectInput(dpy, systray->win, SubstructureNotifyMask); -+ XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32, -+ PropModeReplace, (unsigned char *)&netatom[NetSystemTrayOrientationHorz], 1); -+ XChangeWindowAttributes(dpy, systray->win, CWEventMask|CWOverrideRedirect|CWBackPixel, &wa); -+ XMapRaised(dpy, systray->win); -+ XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime); -+ if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) { -+ sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0); -+ XSync(dpy, False); -+ } -+ else { -+ fprintf(stderr, "dwm: unable to obtain system tray.\n"); -+ free(systray); -+ systray = NULL; -+ return; -+ } -+ } -+ for (w = 0, i = systray->icons; i; i = i->next) { -+ /* make sure the background color stays the same */ -+ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel; -+ XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa); -+ XMapRaised(dpy, i->win); -+ w += systrayspacing; -+ i->x = w; -+ XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h); -+ w += i->w; -+ if (i->mon != m) -+ i->mon = m; -+ } -+ w = w ? w + systrayspacing : 1; -+ x -= w; -+ XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh); -+ wc.x = x; wc.y = m->by; wc.width = w; wc.height = bh; -+ wc.stack_mode = Above; wc.sibling = m->barwin; -+ XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc); -+ XMapWindow(dpy, systray->win); -+ XMapSubwindows(dpy, systray->win); -+ /* redraw background */ -+ XSetForeground(dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel); -+ XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh); -+ XSync(dpy, False); - } - - void -@@ -2491,6 +2818,16 @@ wintoclient(Window w) - return NULL; - } - -+Client * -+wintosystrayicon(Window w) { -+ Client *i = NULL; -+ -+ if (!showsystray || !w) -+ return i; -+ for (i = systray->icons; i && i->win != w; i = i->next) ; -+ return i; -+} -+ - Monitor * - wintomon(Window w) - { -@@ -2555,6 +2892,22 @@ xrdb(const Arg *arg) - arrange(NULL); - } - -+Monitor * -+systraytomon(Monitor *m) { -+ Monitor *t; -+ int i, n; -+ if(!systraypinning) { -+ if(!m) -+ return selmon; -+ return m == selmon ? m : NULL; -+ } -+ for(n = 1, t = mons; t && t->next; n++, t = t->next) ; -+ for(i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next) ; -+ if(systraypinningfailfirst && n < systraypinning) -+ return mons; -+ return t; -+} -+ - void - zoom(const Arg *arg) - { diff --git a/platforms/linux/xorg/dwmblocks-todo.diff b/platforms/linux/xorg/dwmblocks-todo.diff deleted file mode 100644 index 8615cf8..0000000 --- a/platforms/linux/xorg/dwmblocks-todo.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/config.h b/config.h -index cc9281b..7242149 100644 ---- a/config.h -+++ b/config.h -@@ -1,6 +1,7 @@ - //Modify this file to change what commands output to your statusbar, and recompile using the make command. - static const Block blocks[] = { - /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/ -+ {"", "todos", 800, 19}, - {"", "cat /tmp/recordingicon 2>/dev/null", 0, 9}, - /* {"", "music", 0, 11},*/ - {"", "pacpackages", 0, 8}, diff --git a/platforms/linux/xorg/dwmblocks.diff b/platforms/linux/xorg/dwmblocks.diff deleted file mode 100644 index ad22dac..0000000 --- a/platforms/linux/xorg/dwmblocks.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/config.h b/config.h -index cc9281b..3df46fc 100644 ---- a/config.h -+++ b/config.h -@@ -10,17 +10,17 @@ static const Block blocks[] = { - /* {"", "price btc Bitcoin 💰", 0, 21}, */ - /* {"", "price lbc \"LBRY Token\" 📚", 0, 22}, */ - {"", "torrent", 20, 7}, -- /* {"", "memory", 10, 14}, */ -- /* {"", "cpu", 10, 18}, */ -+ {"", "memory", 10, 14}, -+ {"", "cpu", 10, 18}, - /* {"", "moonphase", 18000, 17}, */ - {"", "weather", 18000, 5}, - {"", "mailbox", 180, 12}, -- /* {"", "nettraf", 1, 16}, */ -+ {"", "nettraf", 1, 16}, - {"", "volume", 0, 10}, - {"", "battery", 5, 3}, - {"", "clock", 60, 1}, - {"", "internet", 5, 4}, -- {"", "help-icon", 0, 15}, -+ /* {"", "help-icon", 0, 15}, */ - }; - - //Sets delimiter between status commands. NULL character ('\0') means no delimiter. diff --git a/platforms/linux/xorg/slock/slock-capscolor-20170106-2d2a21a.diff b/platforms/linux/xorg/slock/slock-capscolor-20170106-2d2a21a.diff deleted file mode 100644 index 82c5543..0000000 --- a/platforms/linux/xorg/slock/slock-capscolor-20170106-2d2a21a.diff +++ /dev/null @@ -1,86 +0,0 @@ -From 95463f58beb669d9221881deac3b6df7d9c4f162 Mon Sep 17 00:00:00 2001 -From: Klemens Nanni <kl3@posteo.org> -Date: Fri, 2 Sep 2016 14:53:30 +0200 -Subject: [PATCH] Indicate the state of CapsLock through a different color - ---- - config.def.h | 1 + - slock.c | 15 ++++++++++++--- - 2 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 9855e21..6288856 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -6,6 +6,7 @@ static const char *colorname[NUMCOLS] = { - [INIT] = "black", /* after initialization */ - [INPUT] = "#005577", /* during input */ - [FAILED] = "#CC3333", /* wrong password */ -+ [CAPS] = "red", /* CapsLock on */ - }; - - /* treat a cleared input like a wrong password (color) */ -diff --git a/slock.c b/slock.c -index d55eb3d..d7804f1 100644 ---- a/slock.c -+++ b/slock.c -@@ -18,6 +18,7 @@ - #include <X11/keysym.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> -+#include <X11/XKBlib.h> - - #include "arg.h" - #include "util.h" -@@ -28,6 +29,7 @@ enum { - INIT, - INPUT, - FAILED, -+ CAPS, - NUMCOLS - }; - -@@ -130,16 +132,20 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, - { - XRRScreenChangeNotifyEvent *rre; - char buf[32], passwd[256], *inputhash; -- int num, screen, running, failure, oldc; -- unsigned int len, color; -+ int caps, num, screen, running, failure, oldc; -+ unsigned int len, color, indicators; - KeySym ksym; - XEvent ev; - - len = 0; -+ caps = 0; - running = 1; - failure = 0; - oldc = INIT; - -+ if (!XkbGetIndicatorState(dpy, XkbUseCoreKbd, &indicators)) -+ caps = indicators & 1; -+ - while (running && !XNextEvent(dpy, &ev)) { - if (ev.type == KeyPress) { - explicit_bzero(&buf, sizeof(buf)); -@@ -179,6 +185,9 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, - if (len) - passwd[len--] = '\0'; - break; -+ case XK_Caps_Lock: -+ caps = !caps; -+ break; - default: - if (num && !iscntrl((int)buf[0]) && - (len + num < sizeof(passwd))) { -@@ -187,7 +196,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, - } - break; - } -- color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT); -+ color = len ? (caps ? CAPS : INPUT) : (failure || failonclear ? FAILED : INIT); - if (running && oldc != color) { - for (screen = 0; screen < nscreens; screen++) { - XSetWindowBackground(dpy, --- -2.11.0 diff --git a/platforms/linux/xorg/slock/slock-dpms-1.4.diff b/platforms/linux/xorg/slock/slock-dpms-1.4.diff deleted file mode 100644 index a3548ff..0000000 --- a/platforms/linux/xorg/slock/slock-dpms-1.4.diff +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 9855e21..d01bd38 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -10,3 +10,6 @@ static const char *colorname[NUMCOLS] = { - - /* treat a cleared input like a wrong password (color) */ - static const int failonclear = 1; -+ -+/* time in seconds before the monitor shuts down */ -+static const int monitortime = 20; -diff --git a/slock.c b/slock.c -index d2f0886..f65a43b 100644 ---- a/slock.c -+++ b/slock.c -@@ -15,6 +15,7 @@ - #include <unistd.h> - #include <sys/types.h> - #include <X11/extensions/Xrandr.h> -+#include <X11/extensions/dpms.h> - #include <X11/keysym.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> -@@ -306,6 +307,7 @@ main(int argc, char **argv) { - const char *hash; - Display *dpy; - int s, nlocks, nscreens; -+ CARD16 standby, suspend, off; - - ARGBEGIN { - case 'v': -@@ -366,6 +368,20 @@ main(int argc, char **argv) { - if (nlocks != nscreens) - return 1; - -+ /* DPMS magic to disable the monitor */ -+ if (!DPMSCapable(dpy)) -+ die("slock: DPMSCapable failed\n"); -+ if (!DPMSEnable(dpy)) -+ die("slock: DPMSEnable failed\n"); -+ if (!DPMSGetTimeouts(dpy, &standby, &suspend, &off)) -+ die("slock: DPMSGetTimeouts failed\n"); -+ if (!standby || !suspend || !off) -+ die("slock: at least one DPMS variable is zero\n"); -+ if (!DPMSSetTimeouts(dpy, monitortime, monitortime, monitortime)) -+ die("slock: DPMSSetTimeouts failed\n"); -+ -+ XSync(dpy, 0); -+ - /* run post-lock command */ - if (argc > 0) { - switch (fork()) { -@@ -383,5 +399,9 @@ main(int argc, char **argv) { - /* everything is now blank. Wait for the correct password */ - readpw(dpy, &rr, locks, nscreens, hash); - -+ /* reset DPMS values to inital ones */ -+ DPMSSetTimeouts(dpy, standby, suspend, off); -+ XSync(dpy, 0); -+ - return 0; - } diff --git a/platforms/linux/xorg/slock/slock-mediakeys.diff b/platforms/linux/xorg/slock/slock-mediakeys.diff deleted file mode 100644 index 098eb02..0000000 --- a/platforms/linux/xorg/slock/slock-mediakeys.diff +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/slock.c b/slock.c -index 5ae738c..bd54be2 100644 ---- a/slock.c -+++ b/slock.c -@@ -18,6 +18,7 @@ - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include <X11/XKBlib.h> -+#include <X11/XF86keysym.h> - - #include "arg.h" - #include "util.h" -@@ -157,6 +158,18 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, - IsPrivateKeypadKey(ksym)) - continue; - switch (ksym) { -+ case XF86XK_AudioPlay: -+ case XF86XK_AudioStop: -+ case XF86XK_AudioPrev: -+ case XF86XK_AudioNext: -+ case XF86XK_AudioRaiseVolume: -+ case XF86XK_AudioLowerVolume: -+ case XF86XK_AudioMute: -+ case XF86XK_AudioMicMute: -+ case XF86XK_MonBrightnessDown: -+ case XF86XK_MonBrightnessUp: -+ XSendEvent(dpy, DefaultRootWindow(dpy), True, KeyPressMask, &ev); -+ break; - case XK_Return: - passwd[len] = '\0'; - errno = 0; diff --git a/platforms/linux/xorg/slock/slock-message-20191002-b46028b.diff b/platforms/linux/xorg/slock/slock-message-20191002-b46028b.diff deleted file mode 100644 index 61ea1e8..0000000 --- a/platforms/linux/xorg/slock/slock-message-20191002-b46028b.diff +++ /dev/null @@ -1,250 +0,0 @@ -From b46028b2797b886154258dcafe71c349cdc68b43 Mon Sep 17 00:00:00 2001 -From: Blair Drummond <blair.robert.drummond@gmail.com> -Date: Wed, 2 Oct 2019 14:59:00 -0400 -Subject: [PATCH] Add a message command. Fixes old version's bugs. - ---- - config.def.h | 9 ++++ - config.mk | 2 +- - slock.1 | 7 +++ - slock.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++-- - 4 files changed, 133 insertions(+), 5 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 9855e21..c2a0ab2 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -10,3 +10,12 @@ static const char *colorname[NUMCOLS] = { - - /* time in seconds before the monitor shuts down */ - static const int monitortime = 5; -+ -+/* default message */ -+static const char * message = "Suckless: Software that sucks less."; -+ -+/* text color */ -+static const char * text_color = "#ffffff"; -+ -+/* text size (must be a valid size) */ -+static const char * font_name = "6x10"; -diff --git a/config.mk b/config.mk -index 74429ae..c4ccf66 100644 ---- a/config.mk -+++ b/config.mk -@@ -12,7 +12,7 @@ X11LIB = /usr/X11R6/lib - - # includes and libs - INCS = -I. -I/usr/include -I${X11INC} --LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -lXinerama - - # flags - CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H -diff --git a/slock.1 b/slock.1 -index 82cdcd6..946165f 100644 ---- a/slock.1 -+++ b/slock.1 -@@ -6,6 +6,8 @@ - .Sh SYNOPSIS - .Nm - .Op Fl v -+.Op Fl f -+.Op Fl m Ar message - .Op Ar cmd Op Ar arg ... - .Sh DESCRIPTION - .Nm -@@ -16,6 +18,11 @@ is executed after the screen has been locked. - .Bl -tag -width Ds - .It Fl v - Print version information to stdout and exit. -+.It Fl f -+List all valid X fonts and exit. -+.It Fl m Ar message -+Overrides default slock lock message. -+.TP - .El - .Sh SECURITY CONSIDERATIONS - To make sure a locked screen can not be bypassed by switching VTs -diff --git a/slock.c b/slock.c -index 5ae738c..610929b 100644 ---- a/slock.c -+++ b/slock.c -@@ -15,6 +15,7 @@ - #include <unistd.h> - #include <sys/types.h> - #include <X11/extensions/Xrandr.h> - #include <X11/extensions/dpms.h> -+#include <X11/extensions/Xinerama.h> - #include <X11/keysym.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> -@@ -24,6 +25,9 @@ - - char *argv0; - -+/* global count to prevent repeated error messages */ -+int count_error = 0; -+ - enum { - INIT, - INPUT, -@@ -83,6 +87,98 @@ dontkillme(void) - } - #endif - -+static void -+writemessage(Display *dpy, Window win, int screen) -+{ -+ int len, line_len, width, height, s_width, s_height, i, j, k, tab_replace, tab_size; -+ XGCValues gr_values; -+ XFontStruct *fontinfo; -+ XColor color, dummy; -+ XineramaScreenInfo *xsi; -+ GC gc; -+ fontinfo = XLoadQueryFont(dpy, font_name); -+ -+ if (fontinfo == NULL) { -+ if (count_error == 0) { -+ fprintf(stderr, "slock: Unable to load font \"%s\"\n", font_name); -+ fprintf(stderr, "slock: Try listing fonts with 'slock -f'\n"); -+ count_error++; -+ } -+ return; -+ } -+ -+ tab_size = 8 * XTextWidth(fontinfo, " ", 1); -+ -+ XAllocNamedColor(dpy, DefaultColormap(dpy, screen), -+ text_color, &color, &dummy); -+ -+ gr_values.font = fontinfo->fid; -+ gr_values.foreground = color.pixel; -+ gc=XCreateGC(dpy,win,GCFont+GCForeground, &gr_values); -+ -+ /* To prevent "Uninitialized" warnings. */ -+ xsi = NULL; -+ -+ /* -+ * Start formatting and drawing text -+ */ -+ -+ len = strlen(message); -+ -+ /* Max max line length (cut at '\n') */ -+ line_len = 0; -+ k = 0; -+ for (i = j = 0; i < len; i++) { -+ if (message[i] == '\n') { -+ if (i - j > line_len) -+ line_len = i - j; -+ k++; -+ i++; -+ j = i; -+ } -+ } -+ /* If there is only one line */ -+ if (line_len == 0) -+ line_len = len; -+ -+ if (XineramaIsActive(dpy)) { -+ xsi = XineramaQueryScreens(dpy, &i); -+ s_width = xsi[0].width; -+ s_height = xsi[0].height; -+ } else { -+ s_width = DisplayWidth(dpy, screen); -+ s_height = DisplayHeight(dpy, screen); -+ } -+ -+ height = s_height*3/7 - (k*20)/3; -+ width = (s_width - XTextWidth(fontinfo, message, line_len))/2; -+ -+ /* Look for '\n' and print the text between them. */ -+ for (i = j = k = 0; i <= len; i++) { -+ /* i == len is the special case for the last line */ -+ if (i == len || message[i] == '\n') { -+ tab_replace = 0; -+ while (message[j] == '\t' && j < i) { -+ tab_replace++; -+ j++; -+ } -+ -+ XDrawString(dpy, win, gc, width + tab_size*tab_replace, height + 20*k, message + j, i - j); -+ while (i < len && message[i] == '\n') { -+ i++; -+ j = i; -+ k++; -+ } -+ } -+ } -+ -+ /* xsi should not be NULL anyway if Xinerama is active, but to be safe */ -+ if (XineramaIsActive(dpy) && xsi != NULL) -+ XFree(xsi); -+} -+ -+ -+ - static const char * - gethash(void) - { -@@ -194,6 +290,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, - locks[screen]->win, - locks[screen]->colors[color]); - XClearWindow(dpy, locks[screen]->win); -+ writemessage(dpy, locks[screen]->win, screen); - } - oldc = color; - } -@@ -300,7 +397,7 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen) - static void - usage(void) - { -- die("usage: slock [-v] [cmd [arg ...]]\n"); -+ die("usage: slock [-v] [-f] [-m message] [cmd [arg ...]]\n"); - } - - int -@@ -313,12 +410,25 @@ main(int argc, char **argv) { - gid_t dgid; - const char *hash; - Display *dpy; -- int s, nlocks, nscreens; -+ int i, s, nlocks, nscreens; -+ int count_fonts; -+ char **font_names; - - ARGBEGIN { - case 'v': - fprintf(stderr, "slock-"VERSION"\n"); - return 0; -+ case 'm': -+ message = EARGF(usage()); -+ break; -+ case 'f': -+ if (!(dpy = XOpenDisplay(NULL))) -+ die("slock: cannot open display\n"); -+ font_names = XListFonts(dpy, "*", 10000 /* list 10000 fonts*/, &count_fonts); -+ for (i=0; i<count_fonts; i++) { -+ fprintf(stderr, "%s\n", *(font_names+i)); -+ } -+ return 0; - default: - usage(); - } ARGEND -@@ -363,10 +473,12 @@ main(int argc, char **argv) { - if (!(locks = calloc(nscreens, sizeof(struct lock *)))) - die("slock: out of memory\n"); - for (nlocks = 0, s = 0; s < nscreens; s++) { -- if ((locks[s] = lockscreen(dpy, &rr, s)) != NULL) -+ if ((locks[s] = lockscreen(dpy, &rr, s)) != NULL) { -+ writemessage(dpy, locks[s]->win, s); - nlocks++; -- else -+ } else { - break; -+ } - } - XSync(dpy, 0); - --- -2.20.1 diff --git a/platforms/linux/xorg/slock/slock-pam_auth-20190207-35633d4.diff b/platforms/linux/xorg/slock/slock-pam_auth-20190207-35633d4.diff deleted file mode 100644 index 34b12af..0000000 --- a/platforms/linux/xorg/slock/slock-pam_auth-20190207-35633d4.diff +++ /dev/null @@ -1,154 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 9855e21..19e7f62 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -6,7 +6,11 @@ static const char *colorname[NUMCOLS] = { - [INIT] = "black", /* after initialization */ - [INPUT] = "#005577", /* during input */ - [FAILED] = "#CC3333", /* wrong password */ -+ [PAM] = "#9400D3", /* waiting for PAM */ - }; - - /* treat a cleared input like a wrong password (color) */ - static const int failonclear = 1; -+ -+/* PAM service that's used for authentication */ -+static const char* pam_service = "u2f"; -diff --git a/config.mk b/config.mk -index 74429ae..6e82074 100644 ---- a/config.mk -+++ b/config.mk -@@ -12,7 +12,7 @@ X11LIB = /usr/X11R6/lib - - # includes and libs - INCS = -I. -I/usr/include -I${X11INC} --LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr -lpam - - # flags - CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H -diff --git a/slock.c b/slock.c -index 5ae738c..3a8da42 100644 ---- a/slock.c -+++ b/slock.c -@@ -18,16 +18,22 @@ - #include <X11/keysym.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> -+#include <security/pam_appl.h> -+#include <security/pam_misc.h> - - #include "arg.h" - #include "util.h" - - char *argv0; -+static int pam_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr); -+struct pam_conv pamc = {pam_conv, NULL}; -+char passwd[256]; - - enum { - INIT, - INPUT, - FAILED, -+ PAM, - NUMCOLS - }; - -@@ -57,6 +63,31 @@ die(const char *errstr, ...) - exit(1); - } - -+static int -+pam_conv(int num_msg, const struct pam_message **msg, -+ struct pam_response **resp, void *appdata_ptr) -+{ -+ int retval = PAM_CONV_ERR; -+ for(int i=0; i<num_msg; i++) { -+ if (msg[i]->msg_style == PAM_PROMPT_ECHO_OFF && -+ strncmp(msg[i]->msg, "Password: ", 10) == 0) { -+ struct pam_response *resp_msg = malloc(sizeof(struct pam_response)); -+ if (!resp_msg) -+ die("malloc failed\n"); -+ char *password = malloc(strlen(passwd) + 1); -+ if (!password) -+ die("malloc failed\n"); -+ memset(password, 0, strlen(passwd) + 1); -+ strcpy(password, passwd); -+ resp_msg->resp_retcode = 0; -+ resp_msg->resp = password; -+ resp[i] = resp_msg; -+ retval = PAM_SUCCESS; -+ } -+ } -+ return retval; -+} -+ - #ifdef __linux__ - #include <fcntl.h> - #include <linux/oom.h> -@@ -121,6 +152,8 @@ gethash(void) - } - #endif /* HAVE_SHADOW_H */ - -+ /* pam, store user name */ -+ hash = pw->pw_name; - return hash; - } - -@@ -129,11 +162,12 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, - const char *hash) - { - XRRScreenChangeNotifyEvent *rre; -- char buf[32], passwd[256], *inputhash; -- int num, screen, running, failure, oldc; -+ char buf[32]; -+ int num, screen, running, failure, oldc, retval; - unsigned int len, color; - KeySym ksym; - XEvent ev; -+ pam_handle_t *pamh; - - len = 0; - running = 1; -@@ -160,10 +194,26 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, - case XK_Return: - passwd[len] = '\0'; - errno = 0; -- if (!(inputhash = crypt(passwd, hash))) -- fprintf(stderr, "slock: crypt: %s\n", strerror(errno)); -+ retval = pam_start(pam_service, hash, &pamc, &pamh); -+ color = PAM; -+ for (screen = 0; screen < nscreens; screen++) { -+ XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]); -+ XClearWindow(dpy, locks[screen]->win); -+ XRaiseWindow(dpy, locks[screen]->win); -+ } -+ XSync(dpy, False); -+ -+ if (retval == PAM_SUCCESS) -+ retval = pam_authenticate(pamh, 0); -+ if (retval == PAM_SUCCESS) -+ retval = pam_acct_mgmt(pamh, 0); -+ -+ running = 1; -+ if (retval == PAM_SUCCESS) -+ running = 0; - else -- running = !!strcmp(inputhash, hash); -+ fprintf(stderr, "slock: %s\n", pam_strerror(pamh, retval)); -+ pam_end(pamh, retval); - if (running) { - XBell(dpy, 100); - failure = 1; -@@ -339,10 +389,9 @@ main(int argc, char **argv) { - dontkillme(); - #endif - -+ /* the contents of hash are used to transport the current user name */ - hash = gethash(); - errno = 0; -- if (!crypt("", hash)) -- die("slock: crypt: %s\n", strerror(errno)); - - if (!(dpy = XOpenDisplay(NULL))) - die("slock: cannot open display\n"); |