diff --git a/README.md b/README.md index 0cb6d60..c38232b 100644 --- a/README.md +++ b/README.md @@ -58,11 +58,11 @@ Please let me know if any keybinds are missing as these have been manually added Keybinds for regular applications - Super+Shift+Enter - Opens the defined terminal (default is st) -- Super+Shift+Colon - Opens a dmenu prompt +- Super+Shift+Colon - Opens an spmenu prompt - Super+Shift+s - Opens 'maim' to take a screenshot and copies it to the clipboard using 'xclip' (requires speedwm-extras) - Super+Shift+f - Opens the defined file manager - Super+Shift+w - Opens the defined web browser -- Super+Shift+o - Opens the speedwm-dfmpeg dmenu script to record your screen. (requires speedwm-extras) +- Super+Shift+o - Opens the speedwm-dfmpeg spmenu script to record your screen. (requires speedwm-extras) - Super+Shift+t - Opens the defined editor in your terminal - Super+Shift+m - Kills the defined music player - Super+Shift+a - Opens the defined mixer in your terminal @@ -86,7 +86,7 @@ These keybinds are for navigating speedwm - Super+Minus - Show the scratchpad - Super+Equal - Remove the scratchpad - Super+Enter - Switch order of windows -- Super+Colon - Open a list of desktop entries in dmenu +- Super+Colon - Open a list of desktop entries in spmenu - Super+Tab - Switch between windows on the same tag. (Microsoft Windows-like Alt+Tab) - Super+v - Center the focused window. - Super+0 - Reset mfact @@ -148,7 +148,7 @@ These keybinds are for navigating speedwm - Super+Control+z/x - Increase/decrease gaps between windows by 5 - Super+Control+j/k - Move focus between hidden windows (Can then 'Show') - Super+Control+Arrow - Moves a window to any corner of your screen (Arrow key) -- Super+Control+Tab - Open a dmenu prompt asking the user what layout to switch to +- Super+Control+Tab - Open a spmenu prompt asking the user what layout to switch to - Super+Control+o - Show a hidden focused window - Super+Control+a/d - Move to the next/previous tag - Super+Control+Shift+o - Show all hidden windows @@ -246,7 +246,7 @@ These binds can be activated using your mouse - Tag (Scrolling up/down) - Switch to the next/previous tag - Layout indicator (Left click) - Switch to the next layout - Layout indicator (Right click) - Switch to the previous layout -- Layout indicator (Middle click) - Open a dmenu list of all layouts (requires speedwm-extras) +- Layout indicator (Middle click) - Open an spmenu list of all layouts (requires speedwm-extras) - Layout indicator (Scrolling up/down) - Switch to the next/previous layout - Window title (Left click) - Show/hide the window - Window title (Right click) - Open speedwm-utils (requires speedwm-extras) @@ -283,8 +283,8 @@ These are absolutely necessary, speedwm will NOT compile without them These are necessary for certain features and keybinds. If you want to use an alternative, change it in options.h and/or keybinds.h and mouse.h. -- dmenu - - dmenu is required for many keybinds included with this build of speedwm. It is also recommended that your build supports grids (-g argument) +- [spmenu](https://codeberg.org/speedie/spmenu) + - As of speedwm 1.9, speedwm now expects spmenu (fork of dmenu) to be on the system instead of dmenu. While you can revert this change I cannot provide support due to missing arguments.d - xrdb - xrdb is used for external speedwm configuration (ie. after compiling). It is **not** mandatory if you don't need this. diff --git a/docs/dependencies b/docs/dependencies index a65dfad..3c6052d 100644 --- a/docs/dependencies +++ b/docs/dependencies @@ -24,8 +24,8 @@ These are absolutely necessary, speedwm will NOT compile without them These are necessary for certain features and keybinds. If you want to use an alternative, change it in options.h and/or keybinds.h and mouse.h. -- dmenu - - dmenu is required for many keybinds included with this build of speedwm. It is also recommended that your build supports grids (-g argument) +- [spmenu](https://codeberg.org/speedie/spmenu) + - As of speedwm 1.9, speedwm now expects spmenu (fork of dmenu) to be on the system instead of dmenu. While you can revert this change I cannot provide support due to missing arguments.d - xrdb - xrdb is used for external speedwm configuration (ie. after compiling). It is **not** mandatory if you don't need this. diff --git a/docs/keybinds b/docs/keybinds index 80bf0ee..b5f8584 100644 --- a/docs/keybinds +++ b/docs/keybinds @@ -1,11 +1,11 @@ Keybinds for regular applications - Super+Shift+Enter - Opens the defined terminal (default is st) -- Super+Shift+Colon - Opens a dmenu prompt +- Super+Shift+Colon - Opens an spmenu prompt - Super+Shift+s - Opens 'maim' to take a screenshot and copies it to the clipboard using 'xclip' (requires speedwm-extras) - Super+Shift+f - Opens the defined file manager - Super+Shift+w - Opens the defined web browser -- Super+Shift+o - Opens the speedwm-dfmpeg dmenu script to record your screen. (requires speedwm-extras) +- Super+Shift+o - Opens the speedwm-dfmpeg spmenu script to record your screen. (requires speedwm-extras) - Super+Shift+t - Opens the defined editor in your terminal - Super+Shift+m - Kills the defined music player - Super+Shift+a - Opens the defined mixer in your terminal @@ -29,7 +29,7 @@ These keybinds are for navigating speedwm - Super+Minus - Show the scratchpad - Super+Equal - Remove the scratchpad - Super+Enter - Switch order of windows -- Super+Colon - Open a list of desktop entries in dmenu +- Super+Colon - Open a list of desktop entries in spmenu - Super+Tab - Switch between windows on the same tag. (Microsoft Windows-like Alt+Tab) - Super+v - Center the focused window. - Super+0 - Reset mfact @@ -91,7 +91,7 @@ These keybinds are for navigating speedwm - Super+Control+z/x - Increase/decrease gaps between windows by 5 - Super+Control+j/k - Move focus between hidden windows (Can then 'Show') - Super+Control+Arrow - Moves a window to any corner of your screen (Arrow key) -- Super+Control+Tab - Open a dmenu prompt asking the user what layout to switch to +- Super+Control+Tab - Open a spmenu prompt asking the user what layout to switch to - Super+Control+o - Show a hidden focused window - Super+Control+a/d - Move to the next/previous tag - Super+Control+Shift+o - Show all hidden windows @@ -189,7 +189,7 @@ These binds can be activated using your mouse - Tag (Scrolling up/down) - Switch to the next/previous tag - Layout indicator (Left click) - Switch to the next layout - Layout indicator (Right click) - Switch to the previous layout -- Layout indicator (Middle click) - Open a dmenu list of all layouts (requires speedwm-extras) +- Layout indicator (Middle click) - Open an spmenu list of all layouts (requires speedwm-extras) - Layout indicator (Scrolling up/down) - Switch to the next/previous layout - Window title (Left click) - Show/hide the window - Window title (Right click) - Open speedwm-utils (requires speedwm-extras) diff --git a/keybinds.h b/keybinds.h index e620a7c..bb7dcc1 100644 --- a/keybinds.h +++ b/keybinds.h @@ -49,8 +49,8 @@ static Key keys[] = { /* type modifier chain key key function argument */ /* Run keybinds */ - { KeyPress, MODIFIER1, -1, XK_semicolon, spawn, cmd( "j4-dmenu-desktop --term=st --dmenu='dmenu -l 20 -p Open:'" ) }, - { KeyPress, MODIFIER1|SHIFT, -1, XK_semicolon, spawn, cmd( "dmenu_run -l 0 -p 'Run:'" ) }, + { KeyPress, MODIFIER1, -1, XK_semicolon, spawn, cmd( "j4-dmenu-desktop --term=st --dmenu='spmenu -l 20 -p Open:'" ) }, + { KeyPress, MODIFIER1|SHIFT, -1, XK_semicolon, spawn, cmd( "spmenu_run -l 0 -p 'Run:'" ) }, /* Application keybinds */ { KeyPress, MODIFIER1|SHIFT, -1, XK_Return, spawn, cmd( TERMINAL ) }, diff --git a/mouse.h b/mouse.h index 6d9c61b..ab2b969 100644 --- a/mouse.h +++ b/mouse.h @@ -38,7 +38,7 @@ static const Button buttons[] = { { clickstatusbar, 0, Button3, spawn, {.v = clickstatus } }, { clicktitle, 0, Button3, spawn, cmd( "speedwm-utils" ) }, { clicktitle, 0, Button1, togglewin, {0} }, - { clickroot, 0, Button3, spawn, cmd( "j4-dmenu-desktop --term=st --dmenu='dmenu -l 20 -p Open:'" ) }, + { clickroot, 0, Button3, spawn, cmd( "j4-dmenu-desktop --term=st --dmenu='spmenu -l 20 -p Open:'" ) }, { clicktags, 0, Button1, view, {0} }, { clicktags, 0, Button4, viewtoleft, {0} }, { clicktags, 0, Button5, viewtoright, {0} }, diff --git a/speedwm.1 b/speedwm.1 index 3eed258..826a996 100644 --- a/speedwm.1 +++ b/speedwm.1 @@ -122,7 +122,7 @@ Keybinds for regular applications .IP \[bu] 2 Super+Shift+Enter - Opens the defined terminal (default is st) .IP \[bu] 2 -Super+Shift+Colon - Opens a dmenu prompt +Super+Shift+Colon - Opens an spmenu prompt .IP \[bu] 2 Super+Shift+s - Opens `maim' to take a screenshot and copies it to the clipboard using `xclip' (requires speedwm-extras) @@ -131,7 +131,7 @@ Super+Shift+f - Opens the defined file manager .IP \[bu] 2 Super+Shift+w - Opens the defined web browser .IP \[bu] 2 -Super+Shift+o - Opens the speedwm-dfmpeg dmenu script to record your +Super+Shift+o - Opens the speedwm-dfmpeg spmenu script to record your screen. (requires speedwm-extras) .IP \[bu] 2 @@ -178,7 +178,7 @@ Super+Equal - Remove the scratchpad .IP \[bu] 2 Super+Enter - Switch order of windows .IP \[bu] 2 -Super+Colon - Open a list of desktop entries in dmenu +Super+Colon - Open a list of desktop entries in spmenu .IP \[bu] 2 Super+Tab - Switch between windows on the same tag. (Microsoft Windows-like Alt+Tab) @@ -307,7 +307,7 @@ Super+Control+j/k - Move focus between hidden windows (Can then `Show') Super+Control+Arrow - Moves a window to any corner of your screen (Arrow key) .IP \[bu] 2 -Super+Control+Tab - Open a dmenu prompt asking the user what layout to +Super+Control+Tab - Open a spmenu prompt asking the user what layout to switch to .IP \[bu] 2 Super+Control+o - Show a hidden focused window @@ -497,7 +497,7 @@ Layout indicator (Left click) - Switch to the next layout .IP \[bu] 2 Layout indicator (Right click) - Switch to the previous layout .IP \[bu] 2 -Layout indicator (Middle click) - Open a dmenu list of all layouts +Layout indicator (Middle click) - Open an spmenu list of all layouts (requires speedwm-extras) .IP \[bu] 2 Layout indicator (Scrolling up/down) - Switch to the next/previous @@ -547,11 +547,13 @@ These are necessary for certain features and keybinds. If you want to use an alternative, change it in options.h and/or keybinds.h and mouse.h. .IP \[bu] 2 -dmenu +spmenu (https://codeberg.org/speedie/spmenu) .RS 2 .IP \[bu] 2 -dmenu is required for many keybinds included with this build of speedwm. -It is also recommended that your build supports grids (-g argument) +As of speedwm 1.9, speedwm now expects spmenu (fork of dmenu) to be on +the system instead of dmenu. +While you can revert this change I cannot provide support due to missing +arguments.d .RE .IP \[bu] 2 xrdb