diff --git a/docs/example.Xresources b/docs/example.Xresources index 074b22a..8806415 100644 --- a/docs/example.Xresources +++ b/docs/example.Xresources @@ -44,7 +44,7 @@ !! Client options !@ - speedwm.client.allowurgent: 1 ! Allow windows to have the 'urgent' status (0/1) - - speedwm.client.autoresize: 1 ! Allow windows to resize themselves on demand (0/1) + - speedwm.client.autoresize: 0 ! Allow windows to resize themselves on demand (0/1) - speedwm.client.decorhints: 1 ! Respect decoration hints for windows (0/1) - speedwm.client.fade.inactive: 1 ! Fade inactive windows (windows that are not focused) (0/1) - speedwm.client.fade.windows: 1 ! Fade windows (0/1) diff --git a/modules/module_music b/modules/module_music index 0563a1a..30f1c9e 100755 --- a/modules/module_music +++ b/modules/module_music @@ -121,21 +121,22 @@ PRINT() { # artist if [ "$ITEM9_DISPLAY_ARTIST" = "true" ]; then if [ "$(mocp -Q %artist | head -n 1)" != "" ]; then - MUSIC_ARTIST="$(mocp -Q %artist)" + MUSIC_ARTIST="$(mocp -Q %artist | sed "s|\&|stellar_amp|g")" fi fi # title if [ "$ITEM9_DISPLAY_TITLE" = "true" ]; then if [ "$(mocp -Q %song | head -n 1)" != "" ]; then - MUSIC_SONG="$(mocp -Q %song)" + MUSIC_SONG="$(mocp -Q %song | sed "s|\&|stellar_amp|g")" fi fi # album if [ "$ITEM9_DISPLAY_ALBUM" = "true" ]; then if [ "$(mocp -Q %album | head -n 1)" != "" ]; then - MUSIC_ALBUM="$(mocp -Q %album)" + MUSIC_ALBUM="$(mocp -Q %album | sed "s|\&|stellar_amp|g")" + echo "$MUSIC_ARTIST $MUSIC_SONG $MUSIC_ALBUM" | grep -q stellar_amp && EXTRASPACE=true fi fi @@ -153,7 +154,11 @@ PRINT() { fi fi - data="$(printf "$ITEM9_FORMAT" | sed "s|@ab|$MUSIC_ALBUM|; s|@t|$MUSIC_SONG|; s|@g||; s|@a|$MUSIC_ARTIST|; s|@tt|$MUSIC_TIMETOTAL|; s|@te|$MUSIC_TIMEELAPSED|; s| ||g")" + if [ "$EXTRASPACE" = "true" ]; then + data="$(printf "$ITEM9_FORMAT" | sed "s|@ab|$MUSIC_ALBUM|; s|@t|$MUSIC_SONG |; s|@g||; s|@a|$MUSIC_ARTIST|; s|@tt|$MUSIC_TIMETOTAL|; s|@te|$MUSIC_TIMEELAPSED|; s| ||g")" + else + data="$(printf "$ITEM9_FORMAT" | sed "s|@ab|$MUSIC_ALBUM|; s|@t|$MUSIC_SONG|; s|@g||; s|@a|$MUSIC_ARTIST|; s|@tt|$MUSIC_TIMETOTAL|; s|@te|$MUSIC_TIMEELAPSED|; s| ||g")" + fi # actually print it echo "$SEPARATOR $ITEM9_ICON $data" @@ -173,21 +178,21 @@ PRINT() { # artist if [ "$ITEM9_DISPLAY_ARTIST" = "true" ]; then if [ "$(cmus-remote -C status | grep "tag artist")" != "" ]; then - MUSIC_ARTIST="$(cmus-remote -C status | grep "tag artist" | sed "s/tag artist //g")" + MUSIC_ARTIST="$(cmus-remote -C status | grep "tag artist" | sed "s|\&|stellar_amp|g; s/tag artist //g")" fi fi # title if [ "$ITEM9_DISPLAY_TITLE" = "true" ]; then if [ "$(cmus-remote -C status | grep "tag title")" != "" ]; then - MUSIC_SONG="$(cmus-remote -C status | grep "tag title" | sed "s/tag title //g")" + MUSIC_SONG="$(cmus-remote -C status | grep "tag title" | sed "s|\&|stellar_amp|g; s/tag title //g")" fi fi # album if [ "$ITEM9_DISPLAY_ALBUM" = "true" ]; then if [ "$(cmus-remote -C status | grep "tag album")" != "" ]; then - MUSIC_ALBUM="$(cmus-remote -C status | grep "tag album" | head -n 1 | sed "s/tag album //g")" + MUSIC_ALBUM="$(cmus-remote -C status | grep "tag album" | head -n 1 | sed "s|\&|stellar_amp|g; s/tag album //g")" fi fi @@ -195,6 +200,7 @@ PRINT() { if [ "$ITEM9_DISPLAY_GENRE" = "true" ]; then if [ "$(cmus-remote -C status | grep "tag genre")" != "" ]; then MUSIC_GENRE="$(cmus-remote -C status | grep "tag genre" | sed "s/tag genre //g")" + echo "$MUSIC_ARTIST $MUSIC_SONG $MUSIC_ALBUM" | grep -q stellar_amp && EXTRASPACE=true fi fi @@ -212,7 +218,11 @@ PRINT() { fi fi - data="$(printf "$ITEM9_FORMAT" | sed "s|@ab|$MUSIC_ALBUM|; s|@t|$MUSIC_SONG|; s|@g|$MUSIC_GENRE|; s|@a|$MUSIC_ARTIST|; s|@tt|$MUSIC_TIMETOTAL|; s|@te|$MUSIC_TIMEELAPSED|; s| ||g")" + if [ "$EXTRASPACE" = "true" ]; then + data="$(printf "$ITEM9_FORMAT" | sed "s|@ab|$MUSIC_ALBUM |; s|@t|${MUSIC_SONG}|; s|@g|$MUSIC_GENRE|; s|@a|$MUSIC_ARTIST|; s|@tt|$MUSIC_TIMETOTAL|; s|@te|$MUSIC_TIMEELAPSED|; s| ||g")" + else + data="$(printf "$ITEM9_FORMAT" | sed "s|@ab|$MUSIC_ALBUM|; s|@t|$MUSIC_SONG|; s|@g|$MUSIC_GENRE|; s|@a|$MUSIC_ARTIST|; s|@tt|$MUSIC_TIMETOTAL|; s|@te|$MUSIC_TIMEELAPSED|; s| ||g")" + fi # actually print it if [ "$data" != "" ]; then diff --git a/options.h b/options.h index dfb31a1..689f12e 100644 --- a/options.h +++ b/options.h @@ -128,7 +128,7 @@ static int centerfloating = 1; /* Center floating windows by static int startontag = 1; /* Start on a tag or not? */ static int floatscratchpad = 0; /* Float the scratchpad window on hide (1/0) */ static int focusspawn = 0; /* Automatically focus the next spawned window. If warp is enabled, this is useless and will be disabled. (1/0) */ -static int autoresize = 1; /* Allow resizing clients automatically when they request it. */ +static int autoresize = 0; /* Allow resizing clients automatically when they request it. */ /* Font options * diff --git a/scripts/speedwm-stellar b/scripts/speedwm-stellar index 0afb513..13a8d80 100755 --- a/scripts/speedwm-stellar +++ b/scripts/speedwm-stellar @@ -162,7 +162,7 @@ setloading() { # print data print() { - setstatus "$(printf "$ITEMS_TEXT")" + setstatus "$(printf "$ITEMS_TEXT" | sed "s/stellar_amp/\&/g")" } # set status2d compatible colors