From d31fc5c8bc4d888b3a43aa9e09fbabb8df371a64 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Fri, 31 Mar 2017 10:11:50 +0200 Subject: [PATCH] Update message when launched without show argument. --- include/default-theme.h | 7 +++---- source/rofi.c | 25 ++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/include/default-theme.h b/include/default-theme.h index dc8e7fa2..b272ef4e 100644 --- a/include/default-theme.h +++ b/include/default-theme.h @@ -4,13 +4,13 @@ const char *default_theme = "* {" " spacing: 2;" -" background: #00000000;" +" background: #FFFDF6E3;" "}" "#window {" " border: 1;" " foreground: #FF002B36;" " padding: 5;" -" background: #FFFDF6E3;" +" background: @background;" "}" "#window.mainbox {" " border: 0;" @@ -22,7 +22,6 @@ const char *default_theme = "}" "#window.mainbox.message.normal {" " foreground: #FF002B36;" -" background: #FFFDF6E3;" "}" "#window.mainbox.listview {" " fixed-height: 0;" @@ -83,6 +82,6 @@ const char *default_theme = "}" "#window.mainbox.inputbar.normal {" " foreground: #FF002B36;" -" background: #FFFDF6E3;" +" background: @background;" "}"; #endif diff --git a/source/rofi.c b/source/rofi.c index aad30426..e9e285b6 100644 --- a/source/rofi.c +++ b/source/rofi.c @@ -797,7 +797,7 @@ static gboolean startup ( G_GNUC_UNUSED gpointer data ) run_switcher ( index ); } else { - fprintf ( stderr, "The %s switcher has not been enabled\n", sname ); + fprintf ( stderr, "The %s mode has not been enabled\n", sname ); g_main_loop_quit ( main_loop ); return G_SOURCE_REMOVE; } @@ -807,8 +807,27 @@ static gboolean startup ( G_GNUC_UNUSED gpointer data ) } else{ // Daemon mode - fprintf ( stderr, "Rofi daemon mode is now removed.\n" ); - fprintf ( stderr, "Please use your window manager binding functionality or xbindkeys to replace it.\n" ); + fprintf ( stderr, "Please specify the mode you want to show.\n\n" ); + fprintf ( stderr, " rofi -show {mode}\n\n"); + fprintf ( stderr, "The following modi are available:\n" ); + for ( unsigned int j = 0; j < num_modi; j++ ) { + fprintf ( stderr, " * %s\n", modi[j]->name); + } + fprintf ( stderr, "\nThe following can be enabled:\n" ); + for ( unsigned int i = 0; i < num_available_modi; i++ ) { + gboolean active = FALSE; + for ( unsigned int j = 0; j < num_modi; j++ ) { + if ( modi[j] == available_modi[i] ){ + active = TRUE; + break; + } + } + if ( ! active ) { + fprintf ( stderr, " * %s\n", available_modi[i]->name); + } + } + fprintf ( stderr, "\nTo activate a mode, add it to the list of modi in the 'modi' setting."); + g_main_loop_quit ( main_loop ); }