diff --git a/docs/releaseinfo.md b/docs/releaseinfo.md new file mode 100644 index 0000000..da1815f --- /dev/null +++ b/docs/releaseinfo.md @@ -0,0 +1,21 @@ +### **speedwm 1.3** + +speedwm 1.3 mostly adds changes to stellar, the built in status bar such as speed improvements. The net module has also been rewritten. + +### Changelog +- Speed improvements to stellar +- ITEM_ORDER should no longer have whitespace. +- Rewrite module_net. New format sucks less! +- Fix module_weather not displaying +- Hide module_temp when not printing anything useful +- Update speedwm_run +- Fix keybind conflict +- Hide empty genre with default configuration in module_music +- Fix ampersand in module_music +- Release information is now in docs/releaseinfo.md +- Disable autoresize by default + +### Installation +Nothing has changed with the installation since last release, simply download and unpack the tarball, and `make clean install` as root. + +- If you are on Gentoo, you can install both x11-wm/speedwm and x11-wm/speedwm-extras by adding my overlay. diff --git a/scripts/speedwm_run b/scripts/speedwm_run index 1d23831..07fa060 100755 --- a/scripts/speedwm_run +++ b/scripts/speedwm_run @@ -54,7 +54,7 @@ LOADCONFIG() { if [ -e "$HOME/.config/speedwm/speedwmrc" ]; then xrdb -merge -quiet $HOME/.config/speedwm/speedwmrc else - sed "s| - ||g; s|!@||g" /usr/share/speedwm/example.Xresources > $HOME/.config/speedwm/speedwmrc && echo "Wrote example configuration file" + test /usr/share/speedwm/example.Xresources && sed "s| - ||g; s|!@||g" /usr/share/speedwm/example.Xresources > $HOME/.config/speedwm/speedwmrc && echo "Wrote example configuration file" fi fi @@ -66,8 +66,10 @@ LOADSWAL() { if [ "$DONOTLOADCONFIG" = "true" ]; then DONOTLOADCONFIG=true else - $HOME/.config/speedwm/swal/swal_wm > /dev/null - echo "Loaded wallpaper and pywal colors" + if [ -e "$HOME/.config/speedwm/swal/swal_wm" ]; then + $HOME/.config/speedwm/swal/swal_wm > /dev/null + echo "Loaded wallpaper and pywal colors" + fi fi } @@ -100,21 +102,11 @@ RESET() { fi } -# Check for running window managers -CHECKEXISTINGWM() { - if [ "$CARG" = "force" ]; then - echo "WARNING: Bypassing all checks (due to -f argument). Use this with caution!" - else - pgrep -x speedwm > /dev/null && echo "speedwm is already running. Use $0 -r to restart it." - pgrep -x speedwm > /dev/null && exit 1 - fi -} - # Start speedwm itself START_SPEEDWM() { if [ "$ISSFLAG" = "" ]; then while true; do - pgrep -x speedwm > /dev/null || speedwm > /tmp/speedwm-log + speedwm > /tmp/speedwm-log || exit done fi } @@ -154,8 +146,8 @@ DELETECONFIG() { } case "$ARGS" in -"") CHECKEXISTINGWM ; XRESOURCES ; AUTOSTART ; LOADSWAL ; LOADCONFIG ; RESET ; START_SPEEDWM ; exit 0 ;; -"-s") ISSFLAG=true ; CHECKEXISTINGWM ; XRESOURCES ; AUTOSTART ; LOADSWAL ; LOADCONFIG ; RESET ; START_SPEEDWM ; exit 0 ;; +"") XRESOURCES ; AUTOSTART ; LOADSWAL ; LOADCONFIG ; RESET ; START_SPEEDWM ; exit 0 ;; +"-s") ISSFLAG=true ; XRESOURCES ; AUTOSTART ; LOADSWAL ; LOADCONFIG ; RESET ; START_SPEEDWM ; exit 0 ;; "-r") XRESOURCES ; LOADSWAL ; LOADCONFIG ; RESET ; echo "Restarted speedwm." ; exit 0 ;; "-rcolors") XRESOURCES ; LOADSWAL ; LOADCONFIG ; LOADCOLS ; echo "Restarted speedwm." ; exit 0 ;; "-rnoloadcolors") LOADCONFIG ; LOADCOLS ; echo "Restarted speedwm." ; exit 0 ;; @@ -168,7 +160,7 @@ case "$ARGS" in "-noxrdb") START_SPEEDWM ; exit 0 ;; "-stop") pgrep -x speedwm && pkill -x speedwm && echo "speedwm has been stopped." ; exit echo "speedwm is not running, cannot stop it." ; exit 1 ;; -"-nomkconfig") CHECKEXISTINGWM ; XRESOURCES ; AUTOSTART ; LOADSWAL ; RESET ; START_SPEEDWM ; exit 0 ;; +"-nomkconfig") XRESOURCES ; AUTOSTART ; LOADSWAL ; RESET ; START_SPEEDWM ; exit 0 ;; esac exit 0 diff --git a/speedwm.c b/speedwm.c index 7ebff6b..80340cf 100644 --- a/speedwm.c +++ b/speedwm.c @@ -7125,7 +7125,7 @@ xerrordummy(Display *dpy, XErrorEvent *ee) int xerrorstart(Display *dpy, XErrorEvent *ee) { - die("speedwm: Do not start speedwm by running 'speedwm'. Your X session should run 'speedwm_run'. See 'speedwm-help -a' for more information.\nhttps://codeberg.org/speedie/speedwm"); + die("speedwm: Another instance of a window manager is already running, will not start speedwm."); return -1; }