added dependency on Zenity remove error_on_generic_command() and

* configure.in: added dependency on Zenity * src/core/keybindings.c: remove error_on_generic_command() and error_on_terminal_command(); rewrite error_on_command in terms of meta_show_dialog() * src/core/util.c: add meta_show_dialog() to call Zenity * src/include/util.h: ditto svn path=/trunk/; revision=4013
2008-11-08 18:51:56 +00:00
parent 51468bfb56
commit c4768a3b9f
5 changed files with 131 additions and 67 deletions
--- a/src/core/util.c
+++ b/src/core/util.c
@ -537,3 +537,75 @@ meta_gravity_to_string (int gravity)
      break;
    }
 }
+
+void
+meta_show_dialog (const char *type,
+                  const char *message,
+                  const char *timeout,
+                  const gint screen_number,
+                  const char **columns,
+                  const char **entries)
+{
+  GError *error = NULL;
+  char *screen_number_text = g_strdup_printf("%d", screen_number);
+
+  /*
+  We want:
+  
+zenity --display X --screen S --title Metacity --error --text "There was an error running <tt>terminal</tt>:\n\nYour computer is on fire."
+  ** with no pipes
+  
+zenity --display X --screen S --title Metacity --question --text "<big><b><tt>%s</tt> is not responding.</b></big>\n\n<i>You may choose to wait a short while for it to continue or force the application to quit entirely.</i>"
+
+zenity --display X --screen S --title Metacity --list --timeout 240 --text "These windows do not support \"save current setup\" and will have to be restarted manually next time you log in." --column "Window" --column "Class" "Firefox" "foo" "Duke Nukem Forever" "bar"
+  */
+
+  const char **argvl;
+  int i=0;
+  GPid child_pid;
+
+  argvl = g_malloc(sizeof (char*) *
+                   (9 + (timeout?2:0))
+                   );
+
+  argvl[i++] = "zenity";
+  argvl[i++] = type;
+  argvl[i++] = "--screen";
+  argvl[i++] = screen_number_text;
+  argvl[i++] = "--title";
+  /* Translators: This is the title used on dialog boxes */
+  argvl[i++] = _("Metacity");
+  argvl[i++] = "--text";
+  argvl[i++] = message;
+  
+  if (timeout)
+    {
+      argvl[i++] = "--timeout";
+      argvl[i++] = timeout;
+    }
+
+  argvl[i] = NULL;
+
+  g_spawn_async_with_pipes (
+                            "/",
+                            (char**) argvl, /* ugh */
+                            NULL,
+                            G_SPAWN_SEARCH_PATH,
+                            NULL, NULL,
+                            &child_pid,
+                            NULL, NULL, NULL,
+                            &error
+                            );
+
+  g_free (argvl);
+  g_free (screen_number_text);
+
+  if (error)
+    {
+      meta_warning ("%s\n", error->message);
+      g_error_free (error);
+    }
+}
+
+/* eof util.c */
+