Convert README to markdown

[geeqie.git] / src / window.c

diff --git a/src/window.c b/src/window.c
index 763dccf..6ccd2ad 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1,22 +1,32 @@
 /*
- * Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
- * Authors: Vladimir Nadvornik / Laurent Monin
+ * Authors: Vladimir Nadvornik, Laurent Monin
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "main.h"
 #include "window.h"
 
+#include "misc.h"
 #include "pixbuf_util.h"
 #include "ui_fileops.h"
 #include "ui_help.h"
 
-GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
+GtkWidget *window_new(GtkWindowType type, const gchar *role, const gchar *icon,
                      const gchar *icon_file, const gchar *subtitle)
 {
        gchar *title;
@@ -38,8 +48,7 @@ GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
        g_free(title);
 
        window_set_icon(window, icon, icon_file);
-       gtk_window_set_role(GTK_WINDOW(window), name);
-       gtk_window_set_wmclass(GTK_WINDOW(window), name, GQ_WMCLASS);
+       gtk_window_set_role(GTK_WINDOW(window), role);
 
        return window;
 }
@@ -65,14 +74,14 @@ void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file)
                }
 }
 
-gint window_maximized(GtkWidget *window)
+gboolean window_maximized(GtkWidget *window)
 {
        GdkWindowState state;
 
-       if (!window || !window->window) return FALSE;
+       if (!window || !gtk_widget_get_window(window)) return FALSE;
 
-       state = gdk_window_get_state(window->window);
-       return (state & GDK_WINDOW_STATE_MAXIMIZED);
+       state = gdk_window_get_state(gtk_widget_get_window(window));
+       return !!(state & GDK_WINDOW_STATE_MAXIMIZED);
 }
 
 /*
@@ -113,14 +122,15 @@ static gchar *command_result(const gchar *binary, const gchar *command)
        return result;
 }
 
-static void help_browser_command(const gchar *command, const gchar *path)
+static int help_browser_command(const gchar *command, const gchar *path)
 {
        gchar *result;
        gchar *buf;
        gchar *begin;
        gchar *end;
+       int retval = -1;
 
-       if (!command || !path) return;
+       if (!command || !path) return retval;
 
        DEBUG_1("Help command pre \"%s\", \"%s\"", command, path);
 
@@ -142,9 +152,11 @@ static void help_browser_command(const gchar *command, const gchar *path)
 
        DEBUG_1("Help command post [%s]", result);
 
-       system(result);
+       retval = runcmd(result);
+       DEBUG_1("Help command exit code: %d", retval);
 
        g_free(result);
+       return retval;
 }
 
 /*
@@ -172,22 +184,37 @@ static gchar *html_browsers[] =
        "mozilla",      NULL,
        "konqueror",    NULL,
        "netscape",     NULL,
+       "opera",        "!opera --remote 'openURL(%s,new-page)'",
        NULL,           NULL
 };
 
-static void help_browser_run(void)
+static void help_browser_run(const gchar *section)
 {
-       gchar *path;
-       gchar *result;
+       gchar *name = options->helpers.html_browser.command_name;
+       gchar *cmd = options->helpers.html_browser.command_line;
+       gchar *path = g_build_filename("file://", GQ_HTMLDIR, section, NULL);
+       gchar *result = NULL;
        gint i;
 
-       result = command_result(options->helpers.html_browser.command_name, options->helpers.html_browser.command_line);
-
        i = 0;
-       while (!result && html_browsers[i])
+       while (!result)
                {
-               result = command_result(html_browsers[i], html_browsers[i+1]);
-               i += 2;
+               if ((name && *name) || (cmd && *cmd)) {
+                       DEBUG_1("Trying browser: name=%s command=%s", name, cmd);
+                       result = command_result(name, cmd);
+                       DEBUG_1("Result: %s", result);
+                       if (result)
+                               {
+                               int ret = help_browser_command(result, path);
+
+                               if (ret == 0) break;
+                               g_free(result);
+                               result = NULL;
+                       }
+               }
+               if (!html_browsers[i]) break;
+               name = html_browsers[i++];
+               cmd = html_browsers[i++];
                }
 
        if (!result)
@@ -196,10 +223,7 @@ static void help_browser_run(void)
                return;
                }
 
-       path = g_build_filename(options->documentation.htmldir, "index.html", NULL);
-       help_browser_command(result, path);
        g_free(path);
-
        g_free(result);
 }
 
@@ -220,9 +244,9 @@ void help_window_show(const gchar *key)
 {
        gchar *path;
 
-       if (key && strcmp(key, "html_contents") == 0)
+       if (key && strstr(key, ".html") != 0)
                {
-               help_browser_run();
+               help_browser_run(key);
                return;
                }
 
@@ -233,8 +257,8 @@ void help_window_show(const gchar *key)
                return;
                }
 
-       path = g_build_filename(options->documentation.helpdir, "README", NULL);
-       help_window = help_window_new(_("Help"), GQ_WMCLASS, "help", path, key);
+       path = g_build_filename(GQ_HELPDIR, "README.md", NULL);
+       help_window = help_window_new(_("Help"), "help", path, key);
        g_free(path);
 
        g_signal_connect(G_OBJECT(help_window), "destroy",