From 68ffff93921dda690af9018e06bd33422c0f386b Mon Sep 17 00:00:00 2001 From: Alexis Jhon Gaspar Date: Fri, 15 Sep 2023 19:40:08 +0800 Subject: [PATCH] Parity with main --- dwm-flexipatch/config.def.h | 45 +++++++++++++++++++------ dwm-flexipatch/config.mk | 4 +-- dwm-flexipatch/patches.def.h | 64 ++++++++++++++++++------------------ 3 files changed, 69 insertions(+), 44 deletions(-) diff --git a/dwm-flexipatch/config.def.h b/dwm-flexipatch/config.def.h index af32234..6edb590 100644 --- a/dwm-flexipatch/config.def.h +++ b/dwm-flexipatch/config.def.h @@ -94,7 +94,7 @@ static const int horizpadbar = 2; /* horizontal padding for status static const int vertpadbar = 0; /* vertical padding for statusbar */ #endif // BAR_STATUSPADDING_PATCH #if BAR_STATUSBUTTON_PATCH -static const char buttonbar[] = ""; +static const char buttonbar[] = "󰕰 Start"; #endif // BAR_STATUSBUTTON_PATCH #if BAR_SYSTRAY_PATCH static const unsigned int systrayspacing = 2; /* systray spacing */ @@ -160,11 +160,11 @@ static void (*bartabmonfns[])(Monitor *) = { NULL /* , customlayoutfn */ }; #endif // MONOCLE_LAYOUT #endif // BAR_TABGROUPS_PATCH #if BAR_PANGO_PATCH -static const char font[] = "monospace 10"; +static const char font[] = "Hack Nerd Font 11"; #else -static const char *fonts[] = { "monospace:size=10" }; +static const char *fonts[] = { "Hack Nerd Font:size=11" }; #endif // BAR_PANGO_PATCH -static const char dmenufont[] = "monospace:size=10"; +static const char dmenufont[] = "Hack Nerd Font:size=11"; static char c000000[] = "#000000"; // placeholder value @@ -451,7 +451,7 @@ static char *tagicons[][NUMTAGS] = { [DEFAULT_TAGS] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }, [ALTERNATIVE_TAGS] = { "A", "B", "C", "D", "E", "F", "G", "H", "I" }, - [ALT_TAGS_DECORATION] = { "<1>", "<2>", "<3>", "<4>", "<5>", "<6>", "<7>", "<8>", "<9>" }, + [ALT_TAGS_DECORATION] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }, }; #if BAR_TAGGRID_PATCH @@ -628,7 +628,7 @@ static const int nmaster = 1; /* number of clients in master area */ #if FLEXTILE_DELUXE_LAYOUT static const int nstack = 0; /* number of clients in primary stack area */ #endif // FLEXTILE_DELUXE_LAYOUT -static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */ +static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ #if DECORATION_HINTS_PATCH static const int decorhints = 1; /* 1 means respect decoration hints */ @@ -867,9 +867,11 @@ static const char *dmenucmd[] = { #if BAR_DMENUMATCHTOP_PATCH topbar ? NULL : "-b", #endif // BAR_DMENUMATCHTOP_PATCH + "-g", "4", + "-l", "10", NULL }; -static const char *termcmd[] = { "st", NULL }; +static const char *termcmd[] = { "st", "-e", NULL }; #if BAR_STATUSCMD_PATCH #if BAR_DWMBLOCKS_PATCH @@ -897,15 +899,38 @@ static const Key on_empty_keys[] = { static const Key keys[] = { /* modifier key function argument */ + /* spmenu bindings here */ + { Mod4Mask, XK_s, spawn, SHCMD("spmenu_run -d -a '-g 4 -l 10'") }, + { Mod4Mask|ShiftMask, XK_s, spawn, SHCMD("spmenu_run -a '-g 4 -l 10'") }, + { Mod4Mask, XK_f, spawn, SHCMD("spmenu_run -fm -a '-g 4 -l 10'") }, + /* spmenu scripts down here */ + { Mod4Mask, XK_v, spawn, SHCMD("clipmenu-spmenu") }, + { Mod4Mask|ShiftMask, XK_Print, spawn, SHCMD("screenshot-spmenu -f") }, + { Mod4Mask|Mod1Mask, XK_Print, spawn, SHCMD("screenshot-spmenu -s") }, + { Mod4Mask, XK_p, spawn, SHCMD("pirokit") }, + { Mod4Mask|ShiftMask, XK_w, spawn, SHCMD("wallpaper-spmenu") }, + /* end of spmenu keybinds */ + /* dunst specific keybinds */ + { Mod4Mask, XK_n, spawn, SHCMD("dunstctl history-pop") }, + { Mod4Mask, XK_x, spawn, SHCMD("dunstctl close-all") }, + /* install paplay, dunst, and the scripts on scripts/dunst first */ + { Mod4Mask, XK_u, spawn, SHCMD("volume-dunst up") }, + { Mod4Mask, XK_d, spawn, SHCMD("volume-dunst down") }, + { Mod4Mask, XK_m, spawn, SHCMD("volume-dunst mute") }, #if KEYMODES_PATCH { MODKEY, XK_Escape, setkeymode, {.ui = COMMANDMODE} }, #endif // KEYMODES_PATCH - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, + { Mod4Mask|Mod1Mask, XK_s, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, #if RIODRAW_PATCH - { MODKEY|ControlMask, XK_p, riospawnsync, {.v = dmenucmd } }, + { MODKEY|ControlMask, XK_s, riospawnsync, {.v = dmenucmd } }, { MODKEY|ControlMask, XK_Return, riospawn, {.v = termcmd } }, { MODKEY, XK_s, rioresize, {0} }, + /* suckless-utils keymaps */ + { MODKEY|ShiftMask, XK_t, spawn, SHCMD("tabbed -r 2 st -w ''") }, + { MODKEY|ShiftMask, XK_i, spawn, SHCMD("firefox") }, + { Mod4Mask, XK_e, spawn, SHCMD("st -T sfm sfm") }, + { Mod4Mask, XK_Print, spawn, SHCMD("maim ~/Pictures/Screenshot_$(date +%s).png") }, #endif // RIODRAW_PATCH { MODKEY, XK_b, togglebar, {0} }, #if TOGGLETOPBAR_PATCH @@ -1332,7 +1357,7 @@ static const Command commands[] = { static const Button buttons[] = { /* click event mask button function argument */ #if BAR_STATUSBUTTON_PATCH - { ClkButton, 0, Button1, spawn, {.v = dmenucmd } }, + { ClkButton, 0, Button1, spawn, SHCMD("spmenu_run -d -a '-g 4 -l 10'") /* use spmenu instead of dmenu */ }, #endif // BAR_STATUSBUTTON_PATCH { ClkLtSymbol, 0, Button1, setlayout, {0} }, #if BAR_LAYOUTMENU_PATCH diff --git a/dwm-flexipatch/config.mk b/dwm-flexipatch/config.mk index 69b8092..4fe92fc 100644 --- a/dwm-flexipatch/config.mk +++ b/dwm-flexipatch/config.mk @@ -43,13 +43,13 @@ XRENDER = -lXrender #YAJLINC = -I/usr/include/yajl # Uncomment this for the rounded corners patch / ROUNDED_CORNERS_PATCH -#XEXTLIB = -lXext +XEXTLIB = -lXext # Uncomment this for the swallow patch / SWALLOW_PATCH #XCBLIBS = -lX11-xcb -lxcb -lxcb-res # This is needed for the winicon and tagpreview patches / BAR_WINICON_PATCH / BAR_TAGPREVIEW_PATCH -#IMLIB2LIBS = -lImlib2 +IMLIB2LIBS = -lImlib2 # Uncomment for the bidi patch #BDINC = `pkg-config --cflags fribidi` diff --git a/dwm-flexipatch/patches.def.h b/dwm-flexipatch/patches.def.h index 74361d8..8b47b55 100644 --- a/dwm-flexipatch/patches.def.h +++ b/dwm-flexipatch/patches.def.h @@ -162,25 +162,25 @@ * E.g. ^B5^ would use color5 as the background color. * https://dwm.suckless.org/patches/status2d/ */ -#define BAR_STATUS2D_XRDB_TERMCOLORS_PATCH 0 +#define BAR_STATUS2D_XRDB_TERMCOLORS_PATCH 1 /* The systray patch adds systray for the status bar. * https://dwm.suckless.org/patches/systray/ */ -#define BAR_SYSTRAY_PATCH 0 +#define BAR_SYSTRAY_PATCH 1 /* Show tag symbols in the bar. */ -#define BAR_TAGS_PATCH 1 +#define BAR_TAGS_PATCH 0 /* Show tag symbols + class of master window in the bar. * https://dwm.suckless.org/patches/taglabels/ */ -#define BAR_TAGLABELS_PATCH 0 +#define BAR_TAGLABELS_PATCH 1 /* This patch underlines the selected tag, or optionally all tags. * https://dwm.suckless.org/patches/underlinetags/ */ -#define BAR_UNDERLINETAGS_PATCH 0 +#define BAR_UNDERLINETAGS_PATCH 1 /* This patch adds the window icon next to the window title in the bar. * @@ -198,7 +198,7 @@ * https://github.com/AdamYuan/dwm-winicon * https://dwm.suckless.org/patches/winicon */ -#define BAR_WINICON_PATCH 0 +#define BAR_WINICON_PATCH 1 /* Show window title in bar */ #define BAR_WINTITLE_PATCH 1 @@ -249,19 +249,19 @@ * when including this patch. * https://dwm.suckless.org/patches/alpha/ */ -#define BAR_ALPHA_PATCH 0 +#define BAR_ALPHA_PATCH 1 /* This patch introduces alternative tags which can be switched on the fly for the * sole purpose of providing visual aid. * https://dwm.suckless.org/patches/alternativetags/ */ -#define BAR_ALTERNATIVE_TAGS_PATCH 0 +#define BAR_ALTERNATIVE_TAGS_PATCH 1 /* This patches provides the ability to use alternative text for tags which contain at * least one window. * https://dwm.suckless.org/patches/alttagsdecoration/ */ -#define BAR_ALTTAGSDECORATION_PATCH 0 +#define BAR_ALTTAGSDECORATION_PATCH 1 /* This patch enables dwm to manage external status bars such as lemonbar and polybar. * dwm treats the external bar as it would its own, so all regular dwm commands such as @@ -310,7 +310,7 @@ * renamed to more accurately reflect what it does - creating an extra status. * https://dwm.suckless.org/patches/extrabar/ */ -#define BAR_EXTRASTATUS_PATCH 0 +#define BAR_EXTRASTATUS_PATCH 1 /* Adds EWMH support for _NET_NUMBER_OF_DESKTOPS, _NET_CURRENT_DESKTOP, _NET_DESKTOP_NAMES * and _NET_DESKTOP_VIEWPORT, which allows for compatibility with other bars and programs @@ -326,17 +326,17 @@ * https://github.com/bakkeby/dwm-flexipatch/issues/50 (_IS_FLOATING patch) * https://dwm.suckless.org/patches/ewmhtags/ */ -#define BAR_EWMHTAGS_PATCH 0 +#define BAR_EWMHTAGS_PATCH 1 /* Allows the bar height to be explicitly set rather than being derived from font. * https://dwm.suckless.org/patches/bar_height/ */ -#define BAR_HEIGHT_PATCH 0 +#define BAR_HEIGHT_PATCH 1 /* This patch prevents dwm from drawing tags with no clients (i.e. vacant) on the bar. * https://dwm.suckless.org/patches/hide_vacant_tags/ */ -#define BAR_HIDEVACANTTAGS_PATCH 0 +#define BAR_HIDEVACANTTAGS_PATCH 1 /* With this patch dwm's built-in status bar is only shown when HOLDKEY is pressed * and the bar will now overlay the display. @@ -367,7 +367,7 @@ * toggled in unison when vanitygaps are toggled. Increasing or decreasing gaps during runtime * will not affect the bar padding. */ -#define BAR_PADDING_VANITYGAPS_PATCH 0 +#define BAR_PADDING_VANITYGAPS_PATCH 1 /* This patch adds simple markup for status messages using pango markup. * This depends on the pango library v1.44 or greater. @@ -441,14 +441,14 @@ /* Adds a window task switcher toggled using alt-tab. * https://dwm.suckless.org/patches/alt-tab/ */ -#define ALT_TAB_PATCH 0 +#define ALT_TAB_PATCH 1 /* All floating windows are centered, like the center patch, but without a rule. * The center patch takes precedence over this patch. * This patch interferes with the center transient windows patches. * https://dwm.suckless.org/patches/alwayscenter/ */ -#define ALWAYSCENTER_PATCH 0 +#define ALWAYSCENTER_PATCH 1 /* This patch allows windows to be resized with its aspect ratio remaining constant. * https://dwm.suckless.org/patches/aspectresize/ @@ -555,7 +555,7 @@ /* The cyclelayouts patch lets you cycle through all your layouts. * https://dwm.suckless.org/patches/cyclelayouts/ */ -#define CYCLELAYOUTS_PATCH 0 +#define CYCLELAYOUTS_PATCH 1 /* Make dwm respect _MOTIF_WM_HINTS property, and not draw borders around windows requesting * for it. Some applications use this property to notify window managers to not draw window @@ -564,7 +564,7 @@ * like chromium (with "Use system title bar and borders" turned off) or vlc in fullscreen mode. * https://dwm.suckless.org/patches/decoration_hints/ */ -#define DECORATION_HINTS_PATCH 0 +#define DECORATION_HINTS_PATCH 1 /* This feature distributes all clients on the current monitor evenly across all tags. * It is a variant of the reorganizetags patch. @@ -632,7 +632,7 @@ #define FLOATPOS_PATCH 0 /* Add-on functionality for the above: make the float positions respect outer (vanity)gaps. */ -#define FLOATPOS_RESPECT_GAPS_PATCH 0 +#define FLOATPOS_RESPECT_GAPS_PATCH 1 /* This patch provides the ability to focus the tag on the immediate left or right of the * currently focused tag. It also allows to send the focused window either on the left or @@ -660,7 +660,7 @@ /* Switch focus only by mouse click and not sloppy (focus follows mouse pointer). * https://dwm.suckless.org/patches/focusonclick/ */ -#define FOCUSONCLICK_PATCH 0 +#define FOCUSONCLICK_PATCH 1 /* Selects the next window having the urgent flag regardless of the tag it is on. * The urgent flag can be artificially set with the following xdotool command on any window: @@ -686,7 +686,7 @@ * again it shows the bar and restores the layout that was active before going fullscreen. * https://dwm.suckless.org/patches/fullscreen/ */ -#define FULLSCREEN_PATCH 0 +#define FULLSCREEN_PATCH 1 /* This patch provides a keybinding to rotate all clients in the currently selected * area (master or stack) without affecting the other area. @@ -878,7 +878,7 @@ * monitor (default). * https://dwm.suckless.org/patches/pertag/ */ -#define PERTAG_PATCH 0 +#define PERTAG_PATCH 1 /* Option to enable gaps on a per tag basis rather than globally. * Depends on both pertag and vanitygaps patches being enabled. @@ -942,7 +942,7 @@ * This takes precedence over the resizecorners patch. * https://github.com/bakkeby/patches/blob/master/dwm/dwm-resizepoint-6.2.diff */ -#define RESIZEPOINT_PATCH 0 +#define RESIZEPOINT_PATCH 1 /* Adds a keyboard shortcut to restart dwm or alternatively by using kill -HUP dwmpid. * Additionally dwm can quit cleanly by using kill -TERM dwmpid. @@ -1128,7 +1128,7 @@ * * https://github.com/bakkeby/patches/wiki/steam */ -#define STEAM_PATCH 0 +#define STEAM_PATCH 1 /* Adds toggleable keyboard shortcut to make a client 'sticky', i.e. visible on all tags. * https://dwm.suckless.org/patches/sticky/ @@ -1259,7 +1259,7 @@ /* This patch allows you to toggle fullscreen on and off using a single shortcut key. * https://github.com/bakkeby/patches/blob/master/dwm/dwm-togglefullscreen-6.2.diff */ -#define TOGGLEFULLSCREEN_PATCH 0 +#define TOGGLEFULLSCREEN_PATCH 1 /* This patch allows for the bar position (top or bottom) to be toggled during runtime. * https://dwm.suckless.org/patches/toggletopbar/ @@ -1289,7 +1289,7 @@ * https://www.reddit.com/r/suckless/comments/ik27vd/key_toggle_between_next_and_previous_tag_dwm/ * https://github.com/bakkeby/patches/wiki/toggletag */ -#define TOGGLETAG_PATCH 0 +#define TOGGLETAG_PATCH 1 /* Lets you transfer the currently focused client between the master and stack area * while increasing or decreasing the master area (nmaster) accordingly. @@ -1321,13 +1321,13 @@ * https://github.com/bakkeby/patches/blob/master/dwm/dwm-vanitygaps-6.2.diff * https://github.com/bakkeby/patches/blob/master/dwm/dwm-cfacts-vanitygaps-6.2.diff */ -#define VANITYGAPS_PATCH 0 +#define VANITYGAPS_PATCH 1 /* This patch adds outer gaps for the monocle layout. * Most gaps patches tries to avoid gaps on the monocle layout, as it is often used as a * fullscreen mode, hence this is enabled separately from the main vanitygaps patch. */ -#define VANITYGAPS_MONOCLE_PATCH 0 +#define VANITYGAPS_MONOCLE_PATCH 1 /* By default MOD+Tab will take the user back to the previous tag only. If the user keeps * using MOD+Tab then the view will switch back and forth between the current and previous tag. @@ -1376,7 +1376,7 @@ * the float border color, awesomebar, urgentborder and titlecolor patches. * https://dwm.suckless.org/patches/xrdb/ */ -#define XRDB_PATCH 0 +#define XRDB_PATCH 1 /* Simple patch that allows floating windows to be zoomed into the master stack position. * https://www.reddit.com/r/suckless/comments/ie5fe3/zoomfloating_my_own_simple_original_patch/ @@ -1443,17 +1443,17 @@ /* Gappless grid layout. * https://dwm.suckless.org/patches/gaplessgrid/ */ -#define GAPPLESSGRID_LAYOUT 0 +#define GAPPLESSGRID_LAYOUT 1 /* Gridmode (grid) layout. * https://dwm.suckless.org/patches/gridmode/ */ -#define GRIDMODE_LAYOUT 0 +#define GRIDMODE_LAYOUT 1 /* Horizontal grid (horizgrid) layout. * https://dwm.suckless.org/patches/horizgrid/ */ -#define HORIZGRID_LAYOUT 0 +#define HORIZGRID_LAYOUT 1 /* Grid layout where nmaster controls the number of rows. * https://dwm.suckless.org/patches/nrowgrid/