Changeset 19

Timestamp:

01/21/07 16:07:14 (2 years ago)

Author:

inz

Message:

Run commands from command line.

Files:

• osso-xterm/trunk/configure.ac (modified) (1 diff)
• osso-xterm/trunk/debian/changelog (modified) (1 diff)
• osso-xterm/trunk/debian/control (modified) (1 diff)
• osso-xterm/trunk/src/main.c (modified) (6 diffs)
• osso-xterm/trunk/src/terminal-app.c (modified) (2 diffs)
• osso-xterm/trunk/src/terminal-app.h (modified) (1 diff)

osso-xterm/trunk/configure.ac

@@ -1 @@
-4
+5
-
-dnl Initialize automake

osso-xterm/trunk/debian/changelog

@@ +1 @@
+osso-xterm (0.13.mh15) unstable; urgency=low
+
+  * Preliminary support for commands from command line.
+
+ -- Santtu Lakkala <inz@inz.fi>  Sun, 21 Jan 2007 16:02:30 +0200
+
-osso-xterm (0.13.mh14) unstable; urgency=low
-

osso-xterm/trunk/debian/control

@@ -8 +8 @@
-Package: osso-xterm
-Architecture: any
-k
+
-Provides: x-terminal-emulator
-Conflicts: xterminal

osso-xterm/trunk/src/main.c

@@ -32 +32 @@
-#include <stdlib.h>
-#include <stdio.h>
+#include <string.h>
-
-#include <gtk/gtk.h>
@@ -40 +41 @@
-#include "terminal-app.h"
-
+static gint osso_xterm_incoming(const gchar *interface,
+    const gchar *method,
+    GArray *arguments,
+    gpointer data,
+    osso_rpc_t *retval)
+{
+  gchar *command = NULL;
+
+  if (strcmp(method, "run_command")) {
+    retval->type = DBUS_TYPE_STRING;
+    retval->value.s = g_strdup("Meh");
+    return OSSO_ERROR;
+  }
+
+  if (arguments->len && 
+      g_array_index(arguments, osso_rpc_t, 0).type == DBUS_TYPE_STRING) {
+    command = g_array_index(arguments, osso_rpc_t, 0).value.s;
+  }
+
+  retval->value.b = terminal_app_launch(TERMINAL_APP(data),
+      command,
+      NULL);
+  retval->type = DBUS_TYPE_BOOLEAN;
+
+  return OSSO_OK;
+}
+
-int
-main (int argc, char **argv)
@@ -46 +74 @@
-  GError          *error = NULL;
-  osso_context_t  *osso_context;
+  const gchar     *command = NULL;
+  DBusConnection  *system_bus = NULL;
-
-  setlocale (LC_ALL, "");
@@ -59 +89 @@
-  gtk_init (&argc, &argv);
-
+  if (argc > 1) {
+    command = argv[1];
+  }
+
+  system_bus = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+  if (system_bus && dbus_bus_name_has_owner(system_bus,
+        "com.nokia.xterm",
+        NULL)) {
+    DBusConnection *session_bus = dbus_bus_get(DBUS_BUS_SESSION, NULL);
+    if (!session_bus) {
+      exit(EXIT_FAILURE);
+    }
+    DBusMessage *msg = dbus_message_new_method_call("com.nokia.xterm",
+        "/com/nokia/xterm",
+        "com.nokia.xterm",
+        "run_command");
+    if (!msg) {
+      exit(EXIT_FAILURE);
+    }
+    if (command) {
+      dbus_message_append_args(msg,
+          DBUS_TYPE_STRING, &command,
+          DBUS_TYPE_INVALID);
+    }
+    dbus_message_set_no_reply(msg, TRUE);
+    dbus_connection_send(session_bus, msg, NULL);
+    dbus_connection_flush(session_bus);
+    exit(EXIT_SUCCESS);
+  }
+
-  app = terminal_app_new();
-  g_object_add_weak_pointer(G_OBJECT(app), &app);
@@ -65 +125 @@
-
-  if (osso_context == NULL) {
-  
-  
+
+
-  }
-
-  g_object_set_data(G_OBJECT(app), "osso", osso_context);
-
+command, 
-    {
-      g_printerr (_("Unable to launch terminal: %s\n"), error->message);
@@ -76 +136 @@
-      exit(EXIT_FAILURE);
-    }
+
+  osso_rpc_set_default_cb_f(osso_context,
+      osso_xterm_incoming,
+      app);
-
-  gtk_main ();

osso-xterm/trunk/src/terminal-app.c

@@ -1263 +1263 @@
-gboolean
-terminal_app_launch (TerminalApp     *app,
+                     const gchar     *command,
-                     GError          **error)
-{
@@ -1276 +1277 @@
-
-  terminal_app_add (app, TERMINAL_WIDGET (terminal));
+  if (command) {
+    gint argc;
+    gchar **argv;
+
+    if (g_shell_parse_argv(command,
+          &argc,
+          &argv,
+          NULL)) {
+      terminal_widget_set_custom_command(TERMINAL_WIDGET (terminal),
+          argv);
+      g_strfreev(argv);
+    }
+  }
-  terminal_widget_launch_child (TERMINAL_WIDGET (terminal));
-

osso-xterm/trunk/src/terminal-app.h

@@ -60 +60 @@
-
-gboolean   terminal_app_launch (TerminalApp     *app,
+                                const gchar     *command,
-                                GError          **error);
-