]> Dogcows Code - chaz/openbox/blobdiff - openbox/openbox.c
Merge branch 'backport' into work
[chaz/openbox] / openbox / openbox.c
index e4aae9e8969cd2be3cd5900380202baaf59a9bf2..291b694b90328b574e4a6f5cd7cdfa7ac37482ae 100644 (file)
@@ -1,26 +1,54 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   openbox.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
+
+   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.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include "debug.h"
 #include "openbox.h"
+#include "session.h"
 #include "dock.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
-#include "dispatch.h"
-#include "xerror.h"
-#include "prop.h"
-#include "startup.h"
 #include "screen.h"
+#include "actions.h"
+#include "startupnotify.h"
 #include "focus.h"
+#include "focus_cycle.h"
+#include "focus_cycle_indicator.h"
+#include "focus_cycle_popup.h"
 #include "moveresize.h"
 #include "frame.h"
-#include "extensions.h"
+#include "framerender.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "menuframe.h"
 #include "grab.h"
-#include "plugin.h"
-#include "timer.h"
 #include "group.h"
 #include "config.h"
+#include "ping.h"
+#include "prompt.h"
 #include "gettext.h"
-#include "parser/parse.h"
 #include "render/render.h"
 #include "render/theme.h"
+#include "obt/display.h"
+#include "obt/prop.h"
+#include "obt/keyboard.h"
+#include "obt/parse.h"
 
 #ifdef HAVE_FCNTL_H
 #  include <fcntl.h>
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h>
 #  include <sys/types.h>
 #endif
-
-#ifdef USE_SM
-#include <X11/SM/SMlib.h>
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/types.h>
+#  include <sys/wait.h>
 #endif
-
-#include <X11/cursorfont.h>
-
-#ifdef USE_SM
-gboolean    ob_sm_use = TRUE;
-SmcConn     ob_sm_conn;
-gchar      *ob_sm_id = NULL;
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
 #endif
+#include <errno.h>
 
-RrInstance *ob_rr_inst = NULL;
-RrTheme    *ob_rr_theme = NULL;
-Display    *ob_display = NULL;
-int         ob_screen;
-Window      ob_root;
-State       ob_state;
-gboolean    ob_shutdown = FALSE;
-gboolean    ob_restart  = FALSE;
-char       *ob_restart_path = NULL;
-gboolean    ob_remote   = TRUE;
-gboolean    ob_sync     = FALSE;
-Cursors     ob_cursors;
-char       *ob_rc_path  = NULL;
-
-static void signal_handler(const ObEvent *e, void *data);
-static void parse_args(int argc, char **argv);
-
-static void sm_startup(int argc, char **argv);
-static void sm_shutdown();
-
-#ifdef USE_SM
-static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
-                             Bool shutdown, int interact_style, Bool fast);
-static void sm_die(SmcConn conn, SmPointer data);
-static void sm_save_complete(SmcConn conn, SmPointer data);
-static void sm_shutdown_cancelled(SmcConn conn, SmPointer data);
+#include <X11/cursorfont.h>
+#if USE_XCURSOR
+#include <X11/Xcursor/Xcursor.h>
 #endif
-static void exit_with_error(gchar *msg);
 
-int main(int argc, char **argv)
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+
+RrInstance   *ob_rr_inst;
+RrImageCache *ob_rr_icons;
+RrTheme      *ob_rr_theme;
+ObtMainLoop  *ob_main_loop;
+gint          ob_screen;
+gboolean      ob_replace_wm = FALSE;
+gboolean      ob_sm_use = TRUE;
+gchar        *ob_sm_id = NULL;
+gchar        *ob_sm_save_file = NULL;
+gboolean      ob_sm_restore = TRUE;
+gboolean      ob_debug_xinerama = FALSE;
+
+static ObState   state;
+static gboolean  xsync = FALSE;
+static gboolean  reconfigure = FALSE;
+static gboolean  restart = FALSE;
+static gchar    *restart_path = NULL;
+static Cursor    cursors[OB_NUM_CURSORS];
+static KeyCode   keys[OB_NUM_KEYS];
+static gint      exitcode = 0;
+static guint     remote_control = 0;
+static gboolean  being_replaced = FALSE;
+static gchar    *config_file = NULL;
+
+static void signal_handler(gint signal, gpointer data);
+static void remove_args(gint *argc, gchar **argv, gint index, gint num);
+static void parse_env();
+static void parse_args(gint *argc, gchar **argv);
+static Cursor load_cursor(const gchar *name, guint fontval);
+
+gint main(gint argc, gchar **argv)
 {
-    struct sigaction action;
-    sigset_t sigset;
-    char *path;
-    xmlDocPtr doc;
-    xmlNodePtr node;
+    gchar *program_name;
+
+    state = OB_STATE_STARTING;
 
-    ob_state = State_Starting;
+    ob_debug_startup();
 
     /* initialize the locale */
     if (!setlocale(LC_ALL, ""))
-       g_warning("Couldn't set locale from environment.\n");
+        g_message("Couldn't set locale from environment.");
     bindtextdomain(PACKAGE_NAME, LOCALEDIR);
     bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
     textdomain(PACKAGE_NAME);
 
-    /* start our event dispatcher and register for signals */
-    dispatch_startup();
-    dispatch_register(Event_Signal, signal_handler, NULL);
+    if (chdir(g_get_home_dir()) == -1)
+        g_message(_("Unable to change to home directory \"%s\": %s"),
+                  g_get_home_dir(), g_strerror(errno));
+
+    /* parse the command line args, which can change the argv[0] */
+    parse_args(&argc, argv);
+    /* parse the environment variables */
+    parse_env();
+
+    program_name = g_path_get_basename(argv[0]);
+    g_set_prgname(program_name);
+
+    if (!remote_control)
+        session_startup(argc, argv);
+
+    if (!obt_display_open(NULL))
+        ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable."));
+
+    if (remote_control) {
+        /* Send client message telling the OB process to:
+         * remote_control = 1 -> reconfigure
+         * remote_control = 2 -> restart */
+        OBT_PROP_MSG(ob_screen, obt_root(ob_screen),
+                     OB_CONTROL, remote_control, 0, 0, 0, 0);
+        obt_display_close();
+        exit(EXIT_SUCCESS);
+    }
+
+    ob_main_loop = obt_main_loop_new();
 
     /* set up signal handler */
-    sigemptyset(&sigset);
-    action.sa_handler = dispatch_signal;
-    action.sa_mask = sigset;
-    action.sa_flags = SA_NOCLDSTOP;
-    sigaction(SIGUSR1, &action, (struct sigaction *) NULL);
-    sigaction(SIGPIPE, &action, (struct sigaction *) NULL);
-    sigaction(SIGSEGV, &action, (struct sigaction *) NULL);
-    sigaction(SIGFPE, &action, (struct sigaction *) NULL);
-    sigaction(SIGTERM, &action, (struct sigaction *) NULL);
-    sigaction(SIGINT, &action, (struct sigaction *) NULL);
-    sigaction(SIGHUP, &action, (struct sigaction *) NULL);
-
-    /* create the ~/.openbox dir */
-    path = g_build_filename(g_get_home_dir(), ".openbox", NULL);
-    mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
-                 S_IROTH | S_IWOTH | S_IXOTH));
-    g_free(path);
-    /* create the ~/.openbox/themes dir */
-    path = g_build_filename(g_get_home_dir(), ".openbox", "themes", NULL);
-    mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
-                 S_IROTH | S_IWOTH | S_IXOTH));
-    g_free(path);
-     
-    /* parse out command line args */
-    parse_args(argc, argv);
-
-    ob_display = XOpenDisplay(NULL);
-    if (ob_display == NULL)
-       exit_with_error("Failed to open the display.");
-    if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
-        exit_with_error("Failed to set display as close-on-exec.");
-
-    sm_startup(argc, argv);
-
-#ifdef USE_LIBSN
-    ob_sn_display = sn_display_new(ob_display, NULL, NULL);
-#endif
+    obt_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL,NULL);
+    obt_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL,NULL);
+    obt_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL,NULL);
+    obt_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler,  NULL,NULL);
+    obt_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler,  NULL,NULL);
+    obt_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL,NULL);
+    obt_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL,NULL);
 
-    ob_screen = DefaultScreen(ob_display);
-    ob_root = RootWindow(ob_display, ob_screen);
+    ob_screen = DefaultScreen(obt_display);
 
-    ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
+    ob_rr_inst = RrInstanceNew(obt_display, ob_screen);
     if (ob_rr_inst == NULL)
-        exit_with_error("Failed to initialize the render library.");
+        ob_exit_with_error(_("Failed to initialize the obrender library."));
+    /* Saving 3 resizes of an RrImage makes a lot of sense for icons, as there
+       are generally 3 icon sizes needed: the titlebar icon, the menu icon,
+       and the alt-tab icon
+    */
+    ob_rr_icons = RrImageCacheNew(3);
 
-    /* XXX fork self onto other screens */
-     
-    XSynchronize(ob_display, ob_sync);
+    XSynchronize(obt_display, xsync);
 
     /* check for locale support */
     if (!XSupportsLocale())
-       g_warning("X server does not support locale.");
+        g_message(_("X server does not support locale."));
     if (!XSetLocaleModifiers(""))
-       g_warning("Cannot set locale modifiers for the X server.");
-
-    /* set our error handler */
-    XSetErrorHandler(xerror_handler);
+        g_message(_("Cannot set locale modifiers for the X server."));
 
     /* set the DISPLAY environment variable for any lauched children, to the
        display we're using, so they open in the right place. */
-    putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
-
-    ob_cursors.ptr = XCreateFontCursor(ob_display, XC_left_ptr);
-    ob_cursors.busy = XCreateFontCursor(ob_display, XC_watch);
-    ob_cursors.move = XCreateFontCursor(ob_display, XC_fleur);
-    ob_cursors.tl = XCreateFontCursor(ob_display, XC_top_left_corner);
-    ob_cursors.tr = XCreateFontCursor(ob_display, XC_top_right_corner);
-    ob_cursors.bl = XCreateFontCursor(ob_display, XC_bottom_left_corner);
-    ob_cursors.br = XCreateFontCursor(ob_display, XC_bottom_right_corner);
-    ob_cursors.t = XCreateFontCursor(ob_display, XC_top_side);
-    ob_cursors.r = XCreateFontCursor(ob_display, XC_right_side);
-    ob_cursors.b = XCreateFontCursor(ob_display, XC_bottom_side);
-    ob_cursors.l = XCreateFontCursor(ob_display, XC_left_side);
-
-    prop_startup(); /* get atoms values for the display */
-    extensions_query_all(); /* find which extensions are present */
-
-    /* save stuff that we can use to restore state */
-    startup_save();
+    setenv("DISPLAY", DisplayString(obt_display), TRUE);
+
+    /* create available cursors */
+    cursors[OB_CURSOR_NONE] = None;
+    cursors[OB_CURSOR_POINTER] = load_cursor("left_ptr", XC_left_ptr);
+    cursors[OB_CURSOR_BUSYPOINTER] = load_cursor("left_ptr_watch",XC_left_ptr);
+    cursors[OB_CURSOR_BUSY] = load_cursor("watch", XC_watch);
+    cursors[OB_CURSOR_MOVE] = load_cursor("fleur", XC_fleur);
+    cursors[OB_CURSOR_NORTH] = load_cursor("top_side", XC_top_side);
+    cursors[OB_CURSOR_NORTHEAST] = load_cursor("top_right_corner",
+                                               XC_top_right_corner);
+    cursors[OB_CURSOR_EAST] = load_cursor("right_side", XC_right_side);
+    cursors[OB_CURSOR_SOUTHEAST] = load_cursor("bottom_right_corner",
+                                               XC_bottom_right_corner);
+    cursors[OB_CURSOR_SOUTH] = load_cursor("bottom_side", XC_bottom_side);
+    cursors[OB_CURSOR_SOUTHWEST] = load_cursor("bottom_left_corner",
+                                               XC_bottom_left_corner);
+    cursors[OB_CURSOR_WEST] = load_cursor("left_side", XC_left_side);
+    cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner",
+                                               XC_top_left_corner);
 
     if (screen_annex()) { /* it will be ours! */
-        /* startup the parsing so everything can register sections of the rc */
-        parse_startup();
-
-        /* anything that is going to read data from the rc file needs to be 
-           in this group */
-       timer_startup();
-       event_startup();
-        grab_startup();
-        window_startup();
-        plugin_startup();
-        /* load the plugins specified in the pluginrc */
-        plugin_loadall();
-
-        /* set up the kernel config shit */
-        config_startup();
-        menu_startup();
-        /* parse/load user options */
-        if (parse_load_rc(&doc, &node))
-            parse_tree(doc, node->xmlChildrenNode, NULL);
-        /* we're done with parsing now, kill it */
-        parse_shutdown();
-
-        /* load the theme specified in the rc file */
-        ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
-        if (ob_rr_theme == NULL)
-            exit_with_error("Unable to load a theme.");
-
-        frame_startup();
-        moveresize_startup();
-       focus_startup();
-       screen_startup();
-        group_startup();
-       client_startup();
-        dock_startup();
-
-        /* call startup for all the plugins */
-        plugin_startall();
-
-       /* get all the existing windows */
-       client_manage_all();
-
-       ob_state = State_Running;
-       while (!ob_shutdown)
-           event_loop();
-       ob_state = State_Exiting;
-
-        dock_remove_all();
-       client_unmanage_all();
-
-        plugin_shutdown(); /* calls all the plugins' shutdown functions */
-        dock_shutdown();
-       client_shutdown();
-        group_shutdown();
-       screen_shutdown();
-       focus_shutdown();
-        moveresize_shutdown();
-        frame_shutdown();
-        menu_shutdown();
-        window_shutdown();
-        grab_shutdown();
-       event_shutdown();
-       timer_shutdown();
-        config_shutdown();
+        do {
+            if (reconfigure) obt_keyboard_reload();
+
+            /* get the keycodes for keys we use */
+            keys[OB_KEY_RETURN] = obt_keyboard_keysym_to_keycode(XK_Return);
+            keys[OB_KEY_ESCAPE] = obt_keyboard_keysym_to_keycode(XK_Escape);
+            keys[OB_KEY_LEFT] = obt_keyboard_keysym_to_keycode(XK_Left);
+            keys[OB_KEY_RIGHT] = obt_keyboard_keysym_to_keycode(XK_Right);
+            keys[OB_KEY_UP] = obt_keyboard_keysym_to_keycode(XK_Up);
+            keys[OB_KEY_DOWN] = obt_keyboard_keysym_to_keycode(XK_Down);
+            keys[OB_KEY_TAB] = obt_keyboard_keysym_to_keycode(XK_Tab);
+            keys[OB_KEY_SPACE] = obt_keyboard_keysym_to_keycode(XK_space);
+
+            {
+                ObtParseInst *i;
+
+                /* startup the parsing so everything can register sections
+                   of the rc */
+                i = obt_parse_instance_new();
+
+                /* register all the available actions */
+                actions_startup(reconfigure);
+                /* start up config which sets up with the parser */
+                config_startup(i);
+
+                /* parse/load user options */
+                if ((config_file &&
+                     obt_parse_load_file(i, config_file, "openbox_config")) ||
+                    obt_parse_load_config_file(i, "openbox", "rc.xml",
+                                               "openbox_config"))
+                {
+                    obt_parse_tree_from_root(i);
+                    obt_parse_close(i);
+                }
+                else {
+                    g_message(_("Unable to find a valid config file, using some simple defaults"));
+                    config_file = NULL;
+                }
+
+                if (config_file) {
+                    gchar *p = g_filename_to_utf8(config_file, -1,
+                                                  NULL, NULL, NULL);
+                    if (p)
+                        OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE,
+                                      utf8, p);
+                    g_free(p);
+                }
+                else
+                    OBT_PROP_ERASE(obt_root(ob_screen), OB_CONFIG_FILE);
+
+                /* we're done with parsing now, kill it */
+                obt_parse_instance_unref(i);
+            }
+
+            /* load the theme specified in the rc file */
+            {
+                RrTheme *theme;
+                if ((theme = RrThemeNew(ob_rr_inst, config_theme, TRUE,
+                                        config_font_activewindow,
+                                        config_font_inactivewindow,
+                                        config_font_menutitle,
+                                        config_font_menuitem,
+                                        config_font_osd)))
+                {
+                    RrThemeFree(ob_rr_theme);
+                    ob_rr_theme = theme;
+                }
+                if (ob_rr_theme == NULL)
+                    ob_exit_with_error(_("Unable to load a theme."));
+
+                OBT_PROP_SETS(obt_root(ob_screen),
+                              OB_THEME, utf8, ob_rr_theme->name);
+            }
+
+            if (reconfigure) {
+                GList *it;
+
+                /* update all existing windows for the new theme */
+                for (it = client_list; it; it = g_list_next(it)) {
+                    ObClient *c = it->data;
+                    frame_adjust_theme(c->frame);
+                }
+            }
+            event_startup(reconfigure);
+            /* focus_backup is used for stacking, so this needs to come before
+               anything that calls stacking_add */
+            sn_startup(reconfigure);
+            window_startup(reconfigure);
+            focus_startup(reconfigure);
+            focus_cycle_startup(reconfigure);
+            focus_cycle_indicator_startup(reconfigure);
+            focus_cycle_popup_startup(reconfigure);
+            screen_startup(reconfigure);
+            grab_startup(reconfigure);
+            group_startup(reconfigure);
+            ping_startup(reconfigure);
+            prompt_startup(reconfigure);
+            client_startup(reconfigure);
+            dock_startup(reconfigure);
+            moveresize_startup(reconfigure);
+            keyboard_startup(reconfigure);
+            mouse_startup(reconfigure);
+            menu_frame_startup(reconfigure);
+            menu_startup(reconfigure);
+
+            if (!reconfigure) {
+                guint32 xid;
+                ObWindow *w;
+
+                /* get all the existing windows */
+                window_manage_all();
+                focus_nothing();
+
+                /* focus what was focused if a wm was already running */
+                if (OBT_PROP_GET32(obt_root(ob_screen),
+                                   NET_ACTIVE_WINDOW, WINDOW, &xid) &&
+                    (w = window_find(xid)) && WINDOW_IS_CLIENT(w))
+                {
+                    client_focus(WINDOW_AS_CLIENT(w));
+                }
+            } else {
+                GList *it;
+
+                /* redecorate all existing windows */
+                for (it = client_list; it; it = g_list_next(it)) {
+                    ObClient *c = it->data;
+
+                    /* the new config can change the window's decorations */
+                    client_setup_decor_and_functions(c, FALSE);
+                    /* redraw the frames */
+                    frame_adjust_area(c->frame, TRUE, TRUE, FALSE);
+                    /* the decor sizes may have changed, so the windows may
+                       end up in new positions */
+                    client_reconfigure(c, FALSE);
+                }
+            }
+
+            reconfigure = FALSE;
+
+            state = OB_STATE_RUNNING;
+            obt_main_loop_run(ob_main_loop);
+            state = OB_STATE_EXITING;
+
+            if (!reconfigure)
+                window_unmanage_all();
+
+            menu_shutdown(reconfigure);
+            menu_frame_shutdown(reconfigure);
+            mouse_shutdown(reconfigure);
+            keyboard_shutdown(reconfigure);
+            moveresize_shutdown(reconfigure);
+            dock_shutdown(reconfigure);
+            client_shutdown(reconfigure);
+            prompt_shutdown(reconfigure);
+            ping_shutdown(reconfigure);
+            group_shutdown(reconfigure);
+            grab_shutdown(reconfigure);
+            screen_shutdown(reconfigure);
+            focus_cycle_popup_shutdown(reconfigure);
+            focus_cycle_indicator_shutdown(reconfigure);
+            focus_cycle_shutdown(reconfigure);
+            focus_shutdown(reconfigure);
+            window_shutdown(reconfigure);
+            sn_shutdown(reconfigure);
+            event_shutdown(reconfigure);
+            config_shutdown();
+            actions_shutdown(reconfigure);
+        } while (reconfigure);
     }
 
-    dispatch_shutdown();
+    XSync(obt_display, FALSE);
 
     RrThemeFree(ob_rr_theme);
+    RrImageCacheUnref(ob_rr_icons);
     RrInstanceFree(ob_rr_inst);
 
-    sm_shutdown();
+    session_shutdown(being_replaced);
 
-    XCloseDisplay(ob_display);
+    obt_display_close();
 
-    if (ob_restart) {
-        if (ob_restart_path != NULL) {
-            int argcp;
-            char **argvp;
+    if (restart) {
+        if (restart_path != NULL) {
+            gint argcp;
+            gchar **argvp;
             GError *err = NULL;
 
-            /* run other shit */
-            if (g_shell_parse_argv(ob_restart_path, &argcp, &argvp, &err)) {
+            /* run other window manager */
+            if (g_shell_parse_argv(restart_path, &argcp, &argvp, &err)) {
                 execvp(argvp[0], argvp);
                 g_strfreev(argvp);
             } else {
-                g_warning("failed to execute '%s': %s", ob_restart_path,
-                          err->message);
+                g_message(
+                    _("Restart failed to execute new executable \"%s\": %s"),
+                    restart_path, err->message);
+                g_error_free(err);
             }
         }
 
-        /* re-run me */
-        execvp(argv[0], argv); /* try how we were run */
-        execlp(BINARY, BINARY, NULL); /* try this as a last resort */
-    }
-     
-    return 0;
-}
-
-static void sm_startup(int argc, char **argv)
-{
-#ifdef USE_SM
-
-#define SM_ERR_LEN 1024
-
-    SmcCallbacks cb;
-    char sm_err[SM_ERR_LEN];
-
-    cb.save_yourself.callback = sm_save_yourself;
-    cb.save_yourself.client_data = NULL;
-
-    cb.die.callback = sm_die;
-    cb.die.client_data = NULL;
-
-    cb.save_complete.callback = sm_save_complete;
-    cb.save_complete.client_data = NULL;
-
-    cb.shutdown_cancelled.callback = sm_shutdown_cancelled;
-    cb.shutdown_cancelled.client_data = NULL;
-
-    ob_sm_conn = SmcOpenConnection(NULL, NULL, 1, 0,
-                                   SmcSaveYourselfProcMask |
-                                   SmcDieProcMask |
-                                   SmcSaveCompleteProcMask |
-                                   SmcShutdownCancelledProcMask,
-                                   &cb, ob_sm_id, &ob_sm_id,
-                                   SM_ERR_LEN, sm_err);
-    if (ob_sm_conn == NULL)
-        g_warning("Failed to connect to session manager: %s", sm_err);
-    else {
-        SmPropValue val_prog;
-        SmPropValue val_uid;
-        SmPropValue val_hint; 
-        SmPropValue val_pri;
-        SmPropValue val_pid;
-        SmProp prop_cmd = { SmCloneCommand, SmLISTofARRAY8, 1, };
-        SmProp prop_res = { SmRestartCommand, SmLISTofARRAY8, };
-        SmProp prop_prog = { SmProgram, SmARRAY8, 1, };
-        SmProp prop_uid = { SmUserID, SmARRAY8, 1, };
-        SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, };
-        SmProp prop_pid = { SmProcessID, SmARRAY8, 1, };
-        SmProp prop_pri = { "_GSM_Priority", SmCARD8, 1, };
-        SmProp *props[7];
-        gulong hint, pri;
-        gchar pid[32];
-        gint i, j;
-        gboolean has_id;
-
-        for (i = 1; i < argc - 1; ++i)
-            if (strcmp(argv[i], "-sm-client-id") == 0)
-                break;
-        has_id = (i < argc - 1);
-
-        prop_cmd.vals = g_new(SmPropValue, (has_id ? argc-2 : argc));
-        prop_cmd.num_vals = (has_id ? argc-2 : argc);
-        for (i = 0, j = 0; i < argc; ++i, ++j) {
-            if (strcmp (argv[i], "-sm-client-id") == 0) {
-                ++i, --j; /* skip the next as well, keep j where it is */
-            } else {
-                prop_cmd.vals[j].value = argv[i];
-                prop_cmd.vals[j].length = strlen(argv[i]);
+        /* we remove the session arguments from argv, so put them back,
+           also don't restore the session on restart */
+        if (ob_sm_save_file != NULL || ob_sm_id != NULL) {
+            gchar **nargv;
+            gint i, l;
+
+            l = argc + 1 +
+                (ob_sm_save_file != NULL ? 2 : 0) +
+                (ob_sm_id != NULL ? 2 : 0);
+            nargv = g_new0(gchar*, l+1);
+            for (i = 0; i < argc; ++i)
+                nargv[i] = argv[i];
+
+            if (ob_sm_save_file != NULL) {
+                nargv[i++] = g_strdup("--sm-save-file");
+                nargv[i++] = ob_sm_save_file;
             }
-        }
-
-        prop_res.vals = g_new(SmPropValue, (has_id ? argc : argc+2));
-        prop_res.num_vals = (has_id ? argc : argc+2);
-        for (i = 0, j = 0; i < argc; ++i, ++j) { 
-            if (strcmp (argv[i], "-sm-client-id") == 0) {
-                ++i, --j; /* skip the next as well, keep j where it is */
-            } else {
-                prop_res.vals[j].value = argv[i];
-                prop_res.vals[j].length = strlen(argv[i]);
+            if (ob_sm_id != NULL) {
+                nargv[i++] = g_strdup("--sm-client-id");
+                nargv[i++] = ob_sm_id;
             }
+            nargv[i++] = g_strdup("--sm-no-load");
+            g_assert(i == l);
+            argv = nargv;
         }
-        prop_res.vals[j].value = "-sm-client-id";
-        prop_res.vals[j++].length = strlen("-sm-client-id");
-        prop_res.vals[j].value = ob_sm_id;
-        prop_res.vals[j++].length = strlen(ob_sm_id);
-
-        val_prog.value = argv[0];
-        val_prog.length = strlen(argv[0]);
-
-        val_uid.value = g_get_user_name();
-        val_uid.length = strlen(val_uid.value);
-
-        hint = SmRestartImmediately;
-        val_hint.value = &hint;
-        val_hint.length = 1;
-
-        sprintf(pid, "%ld", (long)getpid());
-        val_pid.value = pid;
-        val_pid.length = strlen(pid);
-
-        /* priority with gnome-session-manager, low to run before other apps */
-        pri = 20;
-        val_pri.value = &pri;
-        val_pri.length = 1;
-
-        prop_prog.vals = &val_prog;
-        prop_uid.vals = &val_uid;
-        prop_hint.vals = &val_hint;
-        prop_pid.vals = &val_pid;
-        prop_pri.vals = &val_pri;
-
-        props[0] = &prop_prog;
-        props[1] = &prop_cmd;
-        props[2] = &prop_res;
-        props[3] = &prop_uid;
-        props[4] = &prop_hint;
-        props[5] = &prop_pid;
-        props[6] = &prop_pri;
-
-        SmcSetProperties(ob_sm_conn, 7, props);
-
-        g_free(prop_cmd.vals);
-        g_free(prop_res.vals);
-
-        g_message("Connected to session manager with id %s", ob_sm_id);
-    }
-    g_free (ob_sm_id);
-#endif
-}
-
-static void sm_shutdown()
-{
-#ifdef USE_SM
-    if (ob_sm_conn) {
-        SmPropValue val_hint;
-        SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, };
-        SmProp *props[1];
-        gulong hint;
-
-        /* when we exit, we want to reset this to a more friendly state */
-        hint = SmRestartIfRunning;
-        val_hint.value = &hint;
-        val_hint.length = 1;
 
-        prop_hint.vals = &val_hint;
+        /* re-run me */
+        execvp(argv[0], argv); /* try how we were run */
+        execlp(argv[0], program_name, (gchar*)NULL); /* last resort */
+    }
 
-        props[0] = &prop_hint;
+    /* free stuff passed in from the command line or environment */
+    g_free(ob_sm_save_file);
+    g_free(ob_sm_id);
+    g_free(program_name);
 
-        SmcSetProperties(ob_sm_conn, 1, props);
+    ob_debug_shutdown();
 
-        SmcCloseConnection(ob_sm_conn, 0, NULL);
-    }
-#endif
+    return exitcode;
 }
 
-static void signal_handler(const ObEvent *e, void *data)
+static void signal_handler(gint signal, gpointer data)
 {
-    int s;
-
-    s = e->data.s.signal;
-    switch (s) {
+    switch (signal) {
     case SIGUSR1:
-       g_message("Caught SIGUSR1 signal. Restarting.");
-       ob_shutdown = ob_restart = TRUE;
-       break;
-
-    case SIGHUP:
-    case SIGINT:
-    case SIGTERM:
-    case SIGPIPE:
-       g_message("Caught signal %d. Exiting.", s);
-       ob_shutdown = TRUE;
-       break;
-
-    case SIGFPE:
-    case SIGSEGV:
-       g_message("Caught signal %d. Aborting and dumping core.", s);
-        abort();
+        ob_debug("Caught signal %d. Restarting.", signal);
+        ob_restart();
+        break;
+    case SIGUSR2:
+        ob_debug("Caught signal %d. Reconfiguring.", signal);
+        ob_reconfigure();
+        break;
+    case SIGCHLD:
+        /* reap children */
+        while (waitpid(-1, NULL, WNOHANG) > 0);
+        break;
+    default:
+        ob_debug("Caught signal %d. Exiting.", signal);
+        /* TERM and INT return a 0 code */
+        ob_exit(!(signal == SIGTERM || signal == SIGINT));
     }
 }
 
-static void print_version()
+static void print_version(void)
 {
-    g_print("Openbox %s\n\n", PACKAGE_VERSION);
+    g_print("Openbox %s\n", PACKAGE_VERSION);
+    g_print(_("Copyright (c)"));
+    g_print(" 2008        Mikael Magnusson\n");
+    g_print(_("Copyright (c)"));
+    g_print(" 2003-2006   Dana Jansens\n\n");
     g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
     g_print("This is free software, and you are welcome to redistribute it\n");
     g_print("under certain conditions. See the file COPYING for details.\n\n");
 }
 
-static void print_help()
+static void print_help(void)
 {
-    print_version();
-    g_print("Syntax: %s [options]\n\n", BINARY);
-    g_print("Options:\n\n");
-    g_print("  -rc PATH          Specify the path to the rc file to use\n");
-#ifdef USE_SM
-    g_print("  -sm-client-id ID  Specify session management ID\n");
-    g_print("  -sm-disable       Disable connection to session manager\n");
-#endif
-    g_print("  -help             Display this help and exit\n");
-    g_print("  -version          Display the version and exit\n");
-    g_print("  -sync             Run in synchronous mode (this is slow and\n"
-            "                    meant for debugging X routines)\n");
-    g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
+    g_print(_("Syntax: openbox [options]\n"));
+    g_print(_("\nOptions:\n"));
+    g_print(_("  --help              Display this help and exit\n"));
+    g_print(_("  --version           Display the version and exit\n"));
+    g_print(_("  --replace           Replace the currently running window manager\n"));
+    g_print(_("  --config-file FILE  Specify the path to the config file to use\n"));
+    g_print(_("  --sm-disable        Disable connection to the session manager\n"));
+    g_print(_("\nPassing messages to a running Openbox instance:\n"));
+    g_print(_("  --reconfigure       Reload Openbox's configuration\n"));
+    g_print(_("  --restart           Restart Openbox\n"));
+    g_print(_("  --exit              Exit Openbox\n"));
+    g_print(_("\nDebugging options:\n"));
+    g_print(_("  --sync              Run in synchronous mode\n"));
+    g_print(_("  --debug             Display debugging output\n"));
+    g_print(_("  --debug-focus       Display debugging output for focus handling\n"));
+    g_print(_("  --debug-session     Display debugging output for session managment\n"));
+    g_print(_("  --debug-xinerama    Split the display into fake xinerama screens\n"));
+    g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT);
+}
+
+static void remove_args(gint *argc, gchar **argv, gint index, gint num)
+{
+    gint i;
+
+    for (i = index; i < *argc - num; ++i)
+        argv[i] = argv[i+num];
+    for (; i < *argc; ++i)
+        argv[i] = NULL;
+    *argc -= num;
+}
+
+static void parse_env(void)
+{
+    /* unset this so we don't pass it on unknowingly */
+    unsetenv("DESKTOP_STARTUP_ID");
 }
 
-static void parse_args(int argc, char **argv)
+static void parse_args(gint *argc, gchar **argv)
 {
-    int i;
+    gint i;
 
-    for (i = 1; i < argc; ++i) {
-        if (!strcmp(argv[i], "-version")) {
+    for (i = 1; i < *argc; ++i) {
+        if (!strcmp(argv[i], "--version")) {
             print_version();
             exit(0);
-        } else if (!strcmp(argv[i], "-help")) {
+        }
+        else if (!strcmp(argv[i], "--help")) {
             print_help();
             exit(0);
-        } else if (!strcmp(argv[i], "-sync")) {
-            ob_sync = TRUE;
-        } else if (!strcmp(argv[i], "-rc")) {
-            if (i == argc - 1) /* no args left */
-                g_printerr(_("-rc requires an argument\n"));
-            else
-                ob_rc_path = argv[++i];
-#ifdef USE_SM
-        } else if (!strcmp(argv[i], "-sm-client-id")) {
-            if (i == argc - 1) /* no args left */
-                g_printerr(_("-sm-client-id requires an argument\n"));
-            else
-                ob_sm_id = argv[++i];
-        } else if (!strcmp(argv[i], "-sm-disable")) {
+        }
+        else if (!strcmp(argv[i], "--g-fatal-warnings")) {
+            g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+        }
+        else if (!strcmp(argv[i], "--replace")) {
+            ob_replace_wm = TRUE;
+            remove_args(argc, argv, i, 1);
+            --i; /* this arg was removed so go back */
+        }
+        else if (!strcmp(argv[i], "--sync")) {
+            xsync = TRUE;
+        }
+        else if (!strcmp(argv[i], "--debug")) {
+            ob_debug_enable(OB_DEBUG_NORMAL, TRUE);
+            ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
+        }
+        else if (!strcmp(argv[i], "--debug-focus")) {
+            ob_debug_enable(OB_DEBUG_NORMAL, TRUE);
+            ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
+            ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
+        }
+        else if (!strcmp(argv[i], "--debug-session")) {
+            ob_debug_enable(OB_DEBUG_NORMAL, TRUE);
+            ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
+            ob_debug_enable(OB_DEBUG_SM, TRUE);
+        }
+        else if (!strcmp(argv[i], "--debug-xinerama")) {
+            ob_debug_xinerama = TRUE;
+        }
+        else if (!strcmp(argv[i], "--reconfigure")) {
+            remote_control = 1;
+        }
+        else if (!strcmp(argv[i], "--restart")) {
+            remote_control = 2;
+        }
+        else if (!strcmp(argv[i], "--exit")) {
+            remote_control = 3;
+        }
+        else if (!strcmp(argv[i], "--config-file")) {
+            if (i == *argc - 1) /* no args left */
+                g_printerr(_("--config-file requires an argument\n"));
+            else {
+                /* this will be in the current locale encoding, which is
+                   what we want */
+                config_file = argv[i+1];
+                ++i; /* skip the argument */
+                ob_debug("--config-file %s\n", config_file);
+            }
+        }
+        else if (!strcmp(argv[i], "--sm-save-file")) {
+            if (i == *argc - 1) /* no args left */
+                /* not translated cuz it's sekret */
+                g_printerr("--sm-save-file requires an argument\n");
+            else {
+                ob_sm_save_file = g_strdup(argv[i+1]);
+                remove_args(argc, argv, i, 2);
+                --i; /* this arg was removed so go back */
+                ob_debug_type(OB_DEBUG_SM, "--sm-save-file %s",
+                              ob_sm_save_file);
+            }
+        }
+        else if (!strcmp(argv[i], "--sm-client-id")) {
+            if (i == *argc - 1) /* no args left */
+                /* not translated cuz it's sekret */
+                g_printerr("--sm-client-id requires an argument\n");
+            else {
+                ob_sm_id = g_strdup(argv[i+1]);
+                remove_args(argc, argv, i, 2);
+                --i; /* this arg was removed so go back */
+                ob_debug_type(OB_DEBUG_SM, "--sm-client-id %s", ob_sm_id);
+            }
+        }
+        else if (!strcmp(argv[i], "--sm-disable")) {
             ob_sm_use = FALSE;
-#endif
-        } else {
-            g_printerr("Invalid option: '%s'\n\n", argv[i]);
-            print_help();
-            exit(1);
+        }
+        else if (!strcmp(argv[i], "--sm-no-load")) {
+            ob_sm_restore = FALSE;
+            remove_args(argc, argv, i, 1);
+            --i; /* this arg was removed so go back */
+        }
+        else {
+            /* this is a memleak.. oh well.. heh */
+            gchar *err = g_strdup_printf
+                (_("Invalid command line argument \"%s\"\n"), argv[i]);
+            ob_exit_with_error(err);
         }
     }
 }
 
-gboolean ob_pointer_pos(int *x, int *y)
+static Cursor load_cursor(const gchar *name, guint fontval)
 {
-    Window w;
-    int i;
-    guint u;
+    Cursor c = None;
 
-    return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u);
+#if USE_XCURSOR
+    c = XcursorLibraryLoadCursor(obt_display, name);
+#endif
+    if (c == None)
+        c = XCreateFontCursor(obt_display, fontval);
+    return c;
 }
 
-#ifdef USE_SM
-static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
-                             Bool shutdown, int interact_style, Bool fast)
+void ob_exit_with_error(const gchar *msg)
 {
-    g_message("got SAVE YOURSELF from session manager");
-    SmcSaveYourselfDone(conn, TRUE);
+    g_message(msg);
+    session_shutdown(TRUE);
+    exit(EXIT_FAILURE);
 }
 
-static void sm_die(SmcConn conn, SmPointer data)
+void ob_restart_other(const gchar *path)
 {
-    ob_shutdown = TRUE;
-    g_message("got DIE from session manager");
+    restart_path = g_strdup(path);
+    ob_restart();
 }
 
-static void sm_save_complete(SmcConn conn, SmPointer data)
+void ob_restart(void)
 {
-    g_message("got SAVE COMPLETE from session manager");
+    restart = TRUE;
+    ob_exit(0);
 }
 
-static void sm_shutdown_cancelled(SmcConn conn, SmPointer data)
+void ob_reconfigure(void)
 {
-    g_message("got SHUTDOWN CANCELLED from session manager");
+    reconfigure = TRUE;
+    ob_exit(0);
 }
-#endif
 
-static void exit_with_error(gchar *msg)
+void ob_exit(gint code)
 {
-    g_critical(msg);
-    sm_shutdown();
-    exit(EXIT_FAILURE);
+    exitcode = code;
+    obt_main_loop_exit(ob_main_loop);
+}
+
+void ob_exit_replace(void)
+{
+    exitcode = 0;
+    being_replaced = TRUE;
+    obt_main_loop_exit(ob_main_loop);
+}
+
+Cursor ob_cursor(ObCursor cursor)
+{
+    g_assert(cursor < OB_NUM_CURSORS);
+    return cursors[cursor];
+}
+
+KeyCode ob_keycode(ObKey key)
+{
+    g_assert(key < OB_NUM_KEYS);
+    return keys[key];
+}
+
+ObState ob_state(void)
+{
+    return state;
 }
This page took 0.046803 seconds and 4 git commands to generate.