diff --git a/presets/all b/presets/all index fa3ba4398..d1d230c9e 100644 --- a/presets/all +++ b/presets/all @@ -1 +1 @@ ---structure Title:Separator:OS:Host:Kernel:Uptime:Processes:Packages:Shell:Resolution:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Disk:Battery:LocalIP:Locale:Break:Colors +--structure Title:Separator:OS:Host:Kernel:Uptime:Processes:Packages:Shell:Resolution:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Disk:Battery:Player:Song:PublicIP:LocalIP:Locale:Break:Colors diff --git a/presets/verbose b/presets/verbose index f7463a40d..ea3fa84a5 100644 --- a/presets/verbose +++ b/presets/verbose @@ -8,8 +8,8 @@ --packages-format "All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; xbps: {}; flatpak: {}; snap: {}" --shell-format "Process name: {}; Process path: {}; Process exe: {}; Process version: {}; User path: {}; User exe: {}; User version: {}" --resolution-format "Width: {}; Height: {}; Refresh rate: {}" ---de-format "Session desktop: {}; Process name: {}; Pretty name: {}; Version: {}" ---wm-format "Session desktop: {}; Process name: {}; Pretty name: {}; Protocol: {}" +--de-format "Process name: {}; Pretty name: {}; Version: {}" +--wm-format "Process name: {}; Pretty name: {}; Protocol: {}" --wm-theme-format "Name: {}" --theme-format "Plasma: {}; Plasma colors: {}; Plasma colors pretty: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}" --icons-format "Plasma: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}" diff --git a/src/detection/media.c b/src/detection/media.c index 4acc6733b..86279fbf8 100644 --- a/src/detection/media.c +++ b/src/detection/media.c @@ -64,8 +64,7 @@ static void getArray(DBusMessageIter* iter, FFstrbuf* result, DBusData* data) FF_DBUS_ITER_CONTINUE(arrayIter); } - if(ffStrbufEndsWithS(result, ", ")) - ffStrbufSubstrBefore(result, result->length - 2); + ffStrbufRemoveIgnCaseEndS(result, ", "); } static bool detectSong(const char* player, FFMediaResult* result, DBusData* data) diff --git a/src/modules/cursor.c b/src/modules/cursor.c index 476513738..2e70ed5c6 100644 --- a/src/modules/cursor.c +++ b/src/modules/cursor.c @@ -5,8 +5,6 @@ static void printCursor(FFinstance* instance, FFstrbuf* cursorTheme, const FFstrbuf* cursorSize) { - ffPrintLogoAndKey(instance, FF_CURSOR_MODULE_NAME, 0, &instance->config.cursorKey); - ffStrbufRemoveIgnCaseEndS(cursorTheme, "cursors"); ffStrbufRemoveIgnCaseEndS(cursorTheme, "cursor"); ffStrbufTrimRight(cursorTheme, '_'); @@ -14,16 +12,27 @@ static void printCursor(FFinstance* instance, FFstrbuf* cursorTheme, const FFstr if(cursorTheme->length == 0) ffStrbufAppendS(cursorTheme, "default"); - ffStrbufWriteTo(cursorTheme, stdout); - - if(cursorSize != NULL && cursorSize->length > 0) + if(instance->config.cursorFormat.length == 0) { - fputs(" (", stdout); - ffStrbufWriteTo(cursorSize, stdout); - fputs("px)", stdout); - } + ffPrintLogoAndKey(instance, FF_CURSOR_MODULE_NAME, 0, &instance->config.cursorKey); + ffStrbufWriteTo(cursorTheme, stdout); - putchar('\n'); + if(cursorSize != NULL && cursorSize->length > 0) + { + fputs(" (", stdout); + ffStrbufWriteTo(cursorSize, stdout); + fputs("px)", stdout); + } + + putchar('\n'); + } + else + { + ffPrintFormatString(instance, FF_CURSOR_MODULE_NAME, 0, &instance->config.cursorKey, &instance->config.cursorFormat, NULL, FF_CURSOR_NUM_FORMAT_ARGS, (FFformatarg[]){ + {FF_FORMAT_ARG_TYPE_STRBUF, cursorTheme}, + {FF_FORMAT_ARG_TYPE_STRBUF, cursorSize} + }); + } } static void printCursorGTK(FFinstance* instance)