From 5edc7398485c000860068da6456a5b74a3709af4 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Thu, 20 Apr 2017 09:24:09 +0200
Subject: [PATCH] Try to improve error message a bit (damn g_warning replace)

---
 include/dialogs/script.h |  9 ++++++
 source/dialogs/script.c  |  5 +++
 source/rofi.c            | 67 ++++++++++++++++++++++++++--------------
 3 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/include/dialogs/script.h b/include/dialogs/script.h
index ec9a4383..5695b640 100644
--- a/include/dialogs/script.h
+++ b/include/dialogs/script.h
@@ -43,5 +43,14 @@
  * @returns NULL when it fails, a newly allocated ScriptOptions when successful.
  */
 Mode *script_switcher_parse_setup ( const char *str );
+
+/**
+ * @param token The modi str to check
+ *
+ * Check if token could be a valid script modi.
+ *
+ * @returns true when valid.
+ */
+gboolean script_switcher_is_valid ( const char *token );
 /*@}*/
 #endif // ROFI_DIALOG_SCRIPT_H
diff --git a/source/dialogs/script.c b/source/dialogs/script.c
index 25509d1b..b2fd1fd9 100644
--- a/source/dialogs/script.c
+++ b/source/dialogs/script.c
@@ -207,3 +207,8 @@ Mode *script_switcher_parse_setup ( const char *str )
     script_switcher_free ( sw );
     return NULL;
 }
+
+gboolean script_switcher_is_valid ( const char *token )
+{
+    return strchr ( token, ':') != NULL;
+}
diff --git a/source/rofi.c b/source/rofi.c
index a9db81ce..a7f4a9b3 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -272,6 +272,25 @@ void process_result ( RofiViewState *state )
 /**
  * Help function.
  */
+static void print_list_of_modi ( int is_term )
+{
+    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;
+            }
+        }
+        printf ( "        * %s%s%s%s\n",
+                active?"+":"" ,
+                is_term ? (active?color_green:color_red) : "",
+                available_modi[i]->name,
+                is_term ? color_reset : ""
+               );
+    }
+
+}
 static void print_main_application_options ( int is_term )
 {
     print_help_msg ( "-no-config", "", "Do not load configuration, use default values.", NULL, is_term );
@@ -302,21 +321,7 @@ static void help ( G_GNUC_UNUSED int argc, char **argv )
     x11_dump_monitor_layout ();
     printf("\n");
     printf("Detected modi:\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;
-            }
-        }
-        printf ( "        * %s%s%s%s\n",
-                active?"+":"" ,
-                is_term ? (active?color_green:color_red) : "",
-                  available_modi[i]->name,
-                  is_term ? color_reset : ""
-                   );
-    }
+    print_list_of_modi ( is_term );
     printf ( "\n" );
     printf ( "Compile time options:\n" );
 #ifdef WINDOW_MODE
@@ -376,6 +381,15 @@ static void help_print_disabled_mode ( const char *mode )
                   );
     }
 }
+static void help_print_mode_not_found ( const char *mode )
+{
+    int is_term = isatty ( fileno ( stdout ) );
+    fprintf ( stderr, "Mode %s%s%s is not found.\n",
+            is_term?color_red:"", mode, is_term?color_reset:"");
+    fprintf( stderr, "The following modi are known:\n");
+    print_list_of_modi ( is_term );
+    printf ( "\n" );
+}
 static void help_print_no_arguments ( void )
 {
     int is_term = isatty ( fileno ( stdout ) );
@@ -613,21 +627,17 @@ static int add_mode ( const char * token )
         modi[num_modi] = mode;
         num_modi++;
     }
-    else {
+    else if ( script_switcher_is_valid ( token ) ){
         // If not build in, use custom modi.
         Mode *sw = script_switcher_parse_setup ( token );
         if ( sw != NULL ) {
             modi[num_modi] = sw;
             num_modi++;
         }
-        else {
-            // Report error, don't continue.
-            g_warning ( "Invalid script mode: %s", token );
-        }
     }
     return ( index == num_modi ) ? -1 : (int) index;
 }
-static void setup_modi ( void )
+static gboolean setup_modi ( void )
 {
     const char *const sep     = ",#";
     char              *savept = NULL;
@@ -635,10 +645,15 @@ static void setup_modi ( void )
     char              *switcher_str = g_strdup ( config.modi );
     // Split token on ','. This modifies switcher_str.
     for ( char *token = strtok_r ( switcher_str, sep, &savept ); token != NULL; token = strtok_r ( NULL, sep, &savept ) ) {
-        add_mode ( token );
+        if ( add_mode ( token ) == -1 ){
+            help_print_mode_not_found ( token );
+            g_free ( switcher_str );
+            return TRUE;
+        }
     }
     // Free string that was modified by strtok_r
     g_free ( switcher_str );
+    return FALSE;
 }
 
 /**
@@ -874,7 +889,7 @@ static gboolean startup ( G_GNUC_UNUSED gpointer data )
             run_switcher ( index );
         }
         else {
-            g_warning ( "The %s mode has not been enabled", sname );
+            help_print_mode_not_found ( sname );
             g_main_loop_quit ( main_loop );
             return G_SOURCE_REMOVE;
         }
@@ -1146,7 +1161,11 @@ int main ( int argc, char *argv[] )
 
     if ( !dmenu_mode ) {
         // setup_modi
-        setup_modi ();
+        if ( setup_modi () )
+        {
+            cleanup ();
+            return EXIT_FAILURE;
+        }
         TICK_N ( "Setup Modi" );
     }