GNOME.org
 

gnome-shell r36 - in trunk: . js/ui src

Author: walters
Date: Fri Nov  7 18:42:23 2008
New Revision: 36
URL: http://svn.gnome.org/viewvc/gnome-shell?rev=36&view=rev

Log:
Run gnome-terminal on alt-f2

Added:
   trunk/src/shell-process.c
   trunk/src/shell-process.h
Modified:
   trunk/configure.ac
   trunk/js/ui/main.js
   trunk/src/Makefile.am
   trunk/src/gnome-shell-plugin.c
   trunk/src/metacity-symbols.c
   trunk/src/shell-global.c
   trunk/src/shell-global.h

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Nov  7 18:42:23 2008
@@ -16,7 +16,7 @@
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for our gettext translation domains.])
 
-PKG_CHECK_MODULES(MUTTER_PLUGIN, metacity-plugins gjs-gi-1.0)
+PKG_CHECK_MODULES(MUTTER_PLUGIN, gtk+-2.0 metacity-plugins gjs-gi-1.0)
 
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then

Modified: trunk/js/ui/main.js
==============================================================================
--- trunk/js/ui/main.js	(original)
+++ trunk/js/ui/main.js	Fri Nov  7 18:42:23 2008
@@ -26,6 +26,12 @@
     for (let i = 0; i < children.length; i++)
 	children[i].destroy();
 
+    global.connect('panel-run-dialog', function (panel) {
+      log("showing main menu!");
+      var p = new Shell.Process({'args' : ['gnome-terminal', 'gnome-terminal']})
+      p.run()
+    });
+
     panel = new Panel.Panel();
     overlay = new Overlay.Overlay();
     global.set_stage_input_area(0, 0, global.screen_width, Panel.PANEL_HEIGHT);

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Nov  7 18:42:23 2008
@@ -8,6 +8,8 @@
 
 libgnome_shell_la_SOURCES =			\
 	gnome-shell-plugin.c			\
+	shell-process.c				\
+	shell-process.h				\
 	shell-global.c				\
 	shell-global.h
 

Modified: trunk/src/gnome-shell-plugin.c
==============================================================================
--- trunk/src/gnome-shell-plugin.c	(original)
+++ trunk/src/gnome-shell-plugin.c	Fri Nov  7 18:42:23 2008
@@ -30,10 +30,14 @@
 
 #include <clutter/clutter.h>
 #include <clutter/x11/clutter-x11.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <gjs/gjs.h>
 #include <gmodule.h>
 #include <string.h>
 
+#include "display.h"
+
 #include "shell-global.h"
 
 static gboolean do_init (const char *params);
@@ -54,6 +58,9 @@
 {
   gboolean               debug_mode : 1;
   GjsContext            *gjs_context;
+  Atom panel_action;
+  Atom panel_action_run_dialog;
+  Atom panel_action_main_menu;
 } PluginState;
 
 
@@ -88,11 +95,16 @@
 do_init (const char *params)
 {
   MutterPlugin *plugin = mutter_get_plugin();
+  MetaScreen *screen;
+  MetaDisplay *display;
   GError *error = NULL;
   int status;
   const char *shell_js;
   char **search_path;
 
+  screen = mutter_plugin_get_screen (plugin);
+  display = meta_screen_get_display (screen);
+
   plugin_state = g_new0 (PluginState, 1);
 
   if (params)
@@ -115,6 +127,13 @@
 
   _shell_global_set_plugin (shell_global_get(), plugin);
 
+  plugin_state->panel_action = XInternAtom (meta_display_get_xdisplay (display),
+                                            "_GNOME_PANEL_ACTION", FALSE);
+  plugin_state->panel_action_run_dialog = XInternAtom (meta_display_get_xdisplay (display),
+                                                       "_GNOME_PANEL_ACTION_RUN_DIALOG", FALSE);
+  plugin_state->panel_action_main_menu = XInternAtom (meta_display_get_xdisplay (display),
+                                                      "_GNOME_PANEL_ACTION_MAIN_MENU", FALSE);
+
   if (!gjs_context_eval (plugin_state->gjs_context,
                          "const Main = imports.ui.main; Main.start();",
                          -1,
@@ -165,8 +184,42 @@
 }
 
 static gboolean
+handle_panel_event (XEvent *xev)
+{
+  MetaScreen *screen;
+  MetaDisplay *display;
+  XClientMessageEvent *xev_client;
+  Window root;
+
+  screen = mutter_plugin_get_screen (mutter_get_plugin ());
+  display = meta_screen_get_display (screen);
+
+  if (xev->type != ClientMessage)
+    return FALSE;
+
+  root = meta_screen_get_xroot (screen);
+
+  xev_client = (XClientMessageEvent*) xev;
+  if (!(xev_client->window == root &&
+        xev_client->message_type == plugin_state->panel_action &&
+        xev_client->format == 32))
+    return FALSE;
+
+  if (xev_client->data.l[0] == plugin_state->panel_action_run_dialog)
+    g_signal_emit_by_name (shell_global_get (), "panel-run-dialog",
+                           (guint32) xev_client->data.l[1]);
+  else if (xev_client->data.l[0] == plugin_state->panel_action_main_menu)
+    g_signal_emit_by_name (shell_global_get (), "panel-main-menu",
+                           (guint32) xev_client->data.l[1]);
+
+  return TRUE;
+}
+
+static gboolean
 xevent_filter (XEvent *xev)
 {
+  if (handle_panel_event (xev))
+    return TRUE;
   return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
 }
 

Modified: trunk/src/metacity-symbols.c
==============================================================================
--- trunk/src/metacity-symbols.c	(original)
+++ trunk/src/metacity-symbols.c	Fri Nov  7 18:42:23 2008
@@ -31,3 +31,23 @@
                                     gint x, gint y, gint width, gint height)
 {
 }
+
+MetaScreen *
+mutter_plugin_get_screen (MutterPlugin *plugin)
+{
+}
+
+Display *
+meta_display_get_xdisplay (MetaDisplay *display)
+{
+}
+
+MetaDisplay *
+meta_screen_get_display (MetaScreen *display)
+{
+}
+
+Window
+meta_screen_get_xroot (MetaScreen *display)
+{
+}

Modified: trunk/src/shell-global.c
==============================================================================
--- trunk/src/shell-global.c	(original)
+++ trunk/src/shell-global.c	Fri Nov  7 18:42:23 2008
@@ -8,10 +8,6 @@
   MutterPlugin *plugin;
 };
 
-struct _ShellGlobalClass {
-  GObjectClass parent_class;
-};
-
 enum {
   PROP_0,
 
@@ -21,8 +17,18 @@
   PROP_STAGE
 };
 
+/* Signals */
+enum
+{
+  PANEL_RUN_DIALOG,
+  PANEL_MAIN_MENU,
+  LAST_SIGNAL
+};
+
 G_DEFINE_TYPE(ShellGlobal, shell_global, G_TYPE_OBJECT);
 
+static guint shell_global_signals [LAST_SIGNAL] = { 0 };
+
 static void
 shell_global_set_property(GObject         *object,
                           guint            prop_id,
@@ -88,6 +94,24 @@
   gobject_class->get_property = shell_global_get_property;
   gobject_class->set_property = shell_global_set_property;
 
+  shell_global_signals[PANEL_RUN_DIALOG] =
+    g_signal_new ("panel-run-dialog",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (ShellGlobalClass, panel_run_dialog),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__INT,
+		  G_TYPE_NONE, 1, G_TYPE_INT);
+
+  shell_global_signals[PANEL_MAIN_MENU] =
+    g_signal_new ("panel-main-menu",
+		  G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (ShellGlobalClass, panel_main_menu),
+		  NULL, NULL,
+		  g_cclosure_marshal_VOID__INT,
+		  G_TYPE_NONE, 1, G_TYPE_INT);
+
   g_object_class_install_property (gobject_class,
                                    PROP_OVERLAY_GROUP,
                                    g_param_spec_object ("overlay-group",
@@ -169,7 +193,7 @@
 GList *
 shell_global_get_windows (ShellGlobal *global)
 {
-  g_return_if_fail (SHELL_IS_GLOBAL (global));
+  g_return_val_if_fail (SHELL_IS_GLOBAL (global), NULL);
 
   return mutter_plugin_get_windows (global->plugin);
 }

Modified: trunk/src/shell-global.h
==============================================================================
--- trunk/src/shell-global.h	(original)
+++ trunk/src/shell-global.h	Fri Nov  7 18:42:23 2008
@@ -17,6 +17,16 @@
 #define SHELL_IS_GLOBAL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), SHELL_TYPE_GLOBAL))
 #define SHELL_GLOBAL_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), SHELL_TYPE_GLOBAL, ShellGlobalClass))
 
+struct _ShellGlobalClass
+{
+  GObjectClass parent_class;
+
+  void (*panel_run_dialog) (ShellGlobal *global,
+			    int      timestamp);
+  void (*panel_main_menu) (ShellGlobal *global,
+			   int      timestamp);
+};
+
 GType            shell_global_get_type            (void) G_GNUC_CONST;
 
 ShellGlobal *shell_global_get (void);

Added: trunk/src/shell-process.c
==============================================================================
--- (empty file)
+++ trunk/src/shell-process.c	Fri Nov  7 18:42:23 2008
@@ -0,0 +1,127 @@
+#include "shell-process.h"
+
+#include <sys/types.h>
+#include <sys/wait.h>
+
+struct _ShellProcessPrivate {
+  char **args;
+  GPid pid;
+};
+
+enum {
+  PROP_0,
+  PROP_ARGS,
+};
+
+static void shell_process_dispose (GObject *object);
+static void shell_process_finalize (GObject *object);
+static void shell_process_set_property ( GObject *object,
+					 guint property_id,
+					 const GValue *value,
+					 GParamSpec *pspec );
+static void shell_process_get_property( GObject *object,
+					guint property_id,
+					GValue *value,
+					GParamSpec *pspec );
+
+G_DEFINE_TYPE( ShellProcess, shell_process, G_TYPE_OBJECT);
+
+static void shell_process_class_init( ShellProcessClass *klass)
+{
+  GObjectClass *gobject_class = (GObjectClass *)klass;
+
+  gobject_class->dispose = shell_process_dispose;
+  gobject_class->finalize = shell_process_finalize;
+  gobject_class->set_property = shell_process_set_property;
+  gobject_class->get_property = shell_process_get_property;
+
+  g_object_class_install_property (gobject_class,
+				   PROP_ARGS,
+				   g_param_spec_boxed ("args",
+						       "Arguments",
+						       "",
+						       G_TYPE_STRV,
+						       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+}
+
+static void shell_process_init (ShellProcess *self)
+{
+  self->priv = g_new0 (ShellProcessPrivate, 1);
+}
+
+static void shell_process_dispose (GObject *object)
+{
+  ShellProcess *self = (ShellProcess*)object;
+
+  G_OBJECT_CLASS (shell_process_parent_class)->dispose(object);
+}
+
+static void shell_process_finalize (GObject *object)
+{
+  ShellProcess *self = (ShellProcess*)object;
+
+  g_free (self->priv);
+  g_signal_handlers_destroy(object);
+  G_OBJECT_CLASS (shell_process_parent_class)->finalize(object);
+}
+static void shell_process_set_property ( GObject *object,
+                                         guint property_id,
+                                         const GValue *value,
+                                         GParamSpec *pspec ) 
+{
+  ShellProcess* self = SHELL_PROCESS(object);
+  switch (property_id) {
+  case PROP_ARGS:
+    self->priv->args = (char**) g_value_dup_boxed (value);
+    break;
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    break;
+  }
+}
+
+
+static void shell_process_get_property ( GObject *object,
+                                         guint property_id,
+                                         GValue *value,
+                                         GParamSpec *pspec ) 
+{
+  ShellProcess* self = SHELL_PROCESS(object);
+  switch (property_id) {
+  case PROP_ARGS:
+    g_value_set_boxed (value, self->priv->args);
+    break;
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    break;
+  }
+}
+
+ShellProcess* shell_process_new(char **args)
+{
+  return (ShellProcess*) g_object_new(SHELL_TYPE_PROCESS,
+				      "args", args,
+				      NULL);
+}
+
+gboolean
+shell_process_run (ShellProcess *self,
+		   GError      **error)
+{
+  return g_spawn_async (NULL, self->priv->args, NULL,
+			G_SPAWN_SEARCH_PATH, NULL, NULL,
+			&self->priv->pid,
+			error);
+}
+/*
+int
+shell_process_wait (ShellProcess *self)
+{
+  int status;
+
+  waitpid ((pid_t) self->priv->pid, &status, 0);
+
+  return status;
+}
+*/

Added: trunk/src/shell-process.h
==============================================================================
--- (empty file)
+++ trunk/src/shell-process.h	Fri Nov  7 18:42:23 2008
@@ -0,0 +1,36 @@
+#ifndef __SHELL_PROCESS_H__
+#define __SHELL_PROCESS_H__
+
+#include <glib-object.h>
+
+#define SHELL_TYPE_PROCESS                 (shell_process_get_type ())
+#define SHELL_PROCESS(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_PROCESS, ShellProcess))
+#define SHELL_PROCESS_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), SHELL_TYPE_PROCESS, ShellProcessClass))
+#define SHELL_IS_PROCESS(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHELL_TYPE_PROCESS))
+#define SHELL_IS_PROCESS_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), SHELL_TYPE_PROCESS))
+#define SHELL_PROCESS_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), SHELL_TYPE_PROCESS, ShellProcessClass))
+
+typedef struct _ShellProcess ShellProcess;
+typedef struct _ShellProcessClass ShellProcessClass;
+
+typedef struct _ShellProcessPrivate ShellProcessPrivate;
+
+struct _ShellProcess
+{
+  GObject parent;
+
+  ShellProcessPrivate *priv;
+};
+
+struct _ShellProcessClass
+{
+  GObjectClass parent_class;
+
+};
+
+GType shell_process_get_type (void) G_GNUC_CONST;
+ShellProcess* shell_process_new(char **args);
+
+gboolean shell_process_run (ShellProcess *process, GError **error);
+
+#endif /* __SHELL_PROCESS_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]