#include "openbox.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 "focus.h"
+#include "moveresize.h"
#include "frame.h"
#include "extensions.h"
-#include "parse.h"
#include "grab.h"
#include "plugin.h"
#include "timer.h"
#include "group.h"
#include "config.h"
#include "gettext.h"
+#include "parser/parse.h"
#include "render/render.h"
-#include "render/font.h"
#include "render/theme.h"
#ifdef HAVE_FCNTL_H
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/types.h>
-# include <sys/wait.h>
-#endif
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
# include <sys/types.h>
#endif
+#ifdef USE_SM
+#include <X11/SM/SMlib.h>
+#endif
+
#include <X11/cursorfont.h>
-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;
-
-void signal_handler(const ObEvent *e, void *data);
-void parse_args(int argc, char **argv);
+#ifdef USE_SM
+SmcConn ob_sm_conn;
+gchar *ob_sm_id = NULL;
+#endif
+
+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);
+#endif
+static void exit_with_error(gchar *msg);
int main(int argc, char **argv)
{
struct sigaction action;
sigset_t sigset;
char *path;
- char *theme;
+ xmlDocPtr doc;
+ xmlNodePtr node;
ob_state = State_Starting;
sigaction(SIGTERM, &action, (struct sigaction *) NULL);
sigaction(SIGINT, &action, (struct sigaction *) NULL);
sigaction(SIGHUP, &action, (struct sigaction *) NULL);
- sigaction(SIGCHLD, &action, (struct sigaction *) NULL);
-
- /* anything that died while we were restarting won't give us a SIGCHLD */
- while (waitpid(-1, NULL, WNOHANG) > 0);
/* create the ~/.openbox dir */
path = g_build_filename(g_get_home_dir(), ".openbox", NULL);
parse_args(argc, argv);
ob_display = XOpenDisplay(NULL);
- if (ob_display == NULL) {
- /* print a message and exit */
- g_critical("Failed to open the display.");
- exit(1);
- }
- if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) {
- /* print a message and exit */
- g_critical("Failed to set display as close-on-exec.");
- exit(1);
- }
-
+ 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
+
ob_screen = DefaultScreen(ob_display);
ob_root = RootWindow(ob_display, ob_screen);
+ ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
+ if (ob_rr_inst == NULL)
+ exit_with_error("Failed to initialize the render library.");
+
/* XXX fork self onto other screens */
XSynchronize(ob_display, ob_sync);
display we're using, so they open in the right place. */
putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
- ob_cursors.left_ptr = XCreateFontCursor(ob_display, XC_left_ptr);
- ob_cursors.ll_angle = XCreateFontCursor(ob_display, XC_ll_angle);
- ob_cursors.lr_angle = XCreateFontCursor(ob_display, XC_lr_angle);
+ 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();
+
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();
- render_startup();
- font_startup();
- theme_startup();
event_startup();
grab_startup();
plugin_startup();
/* set up the kernel config shit */
config_startup();
/* parse/load user options */
- parse_rc();
+ 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 */
- theme = theme_load(config_theme);
- g_free(theme);
- if (!theme) return 1;
+ ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
+ if (ob_rr_theme == NULL)
+ exit_with_error("Unable to load a theme.");
+ window_startup();
menu_startup();
frame_startup();
+ moveresize_startup();
focus_startup();
screen_startup();
group_startup();
client_startup();
+ dock_startup();
/* call startup for all the plugins */
plugin_startall();
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();
- theme_shutdown();
- render_shutdown();
timer_shutdown();
config_shutdown();
}
dispatch_shutdown();
+ RrThemeFree(ob_rr_theme);
+ RrInstanceFree(ob_rr_inst);
+
+ sm_shutdown();
+
XCloseDisplay(ob_display);
if (ob_restart) {
return 0;
}
-void signal_handler(const ObEvent *e, void *data)
+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_cmd;
+ SmPropValue val_res;
+ SmPropValue val_prog;
+ SmPropValue val_uid;
+ SmProp prop_cmd = { SmCloneCommand, "SmLISTofARRAY8", 1, };
+ SmProp prop_res = { SmRestartCommand, "SmLISTofARRAY8", 1, };
+ SmProp prop_prog = { SmProgram, "SmARRAY8", 1, };
+ SmProp prop_uid = { SmUserID, "SmARRAY8", 1, };
+ SmProp *props[4];
+
+ val_cmd.value = argv[0];
+ val_cmd.length = strlen(argv[0]);
+ val_res.value = argv[0];
+ val_res.length = strlen(argv[0]); /* XXX -id foo */
+ val_prog.value = argv[0];
+ val_prog.length = strlen(argv[0]);
+
+ val_uid.value = g_strdup_printf("%ld", (long)getuid());
+ val_uid.length = strlen(val_uid.value);
+
+ prop_cmd.vals = &val_cmd;
+ prop_res.vals = &val_res;
+ prop_prog.vals = &val_prog;
+ prop_uid.vals = &val_uid;
+
+ props[0] = &prop_cmd;
+ props[1] = &prop_res;
+ props[2] = &prop_prog;
+ props[3] = &prop_uid;
+
+ SmcSetProperties(ob_sm_conn, 3, props);
+
+ g_free(val_uid.value);
+
+ 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)
+ SmcCloseConnection(ob_sm_conn, 0, NULL);
+#endif
+}
+
+static void signal_handler(const ObEvent *e, void *data)
{
int s;
ob_shutdown = ob_restart = TRUE;
break;
- case SIGCHLD:
- wait(NULL);
- break;
-
case SIGHUP:
case SIGINT:
case SIGTERM:
case SIGFPE:
case SIGSEGV:
- g_error("Caught signal %d. Aborting and dumping core.", s);
+ g_message("Caught signal %d. Aborting and dumping core.", s);
+ abort();
}
}
-void print_version()
+static void print_version()
{
g_print("Openbox %s\n\n", PACKAGE_VERSION);
g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
g_print("under certain conditions. See the file COPYING for details.\n\n");
}
-void print_help()
+static void print_help()
{
print_version();
g_print("Syntax: %s [options]\n\n", BINARY);
g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
}
-void parse_args(int argc, char **argv)
+static void parse_args(int argc, char **argv)
{
int i;
}
}
}
+
+gboolean ob_pointer_pos(int *x, int *y)
+{
+ Window w;
+ int i;
+ guint u;
+
+ return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u);
+}
+
+#ifdef USE_SM
+static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
+ Bool shutdown, int interact_style, Bool fast)
+{
+ g_message("got SAVE YOURSELF from session manager");
+ SmcSaveYourselfDone(conn, TRUE);
+}
+
+static void sm_die(SmcConn conn, SmPointer data)
+{
+ ob_shutdown = TRUE;
+ g_message("got DIE from session manager");
+}
+
+static void sm_save_complete(SmcConn conn, SmPointer data)
+{
+ g_message("got SAVE COMPLETE from session manager");
+}
+
+static void sm_shutdown_cancelled(SmcConn conn, SmPointer data)
+{
+ g_message("got SHUTDOWN CANCELLED from session manager");
+}
+#endif
+
+static void exit_with_error(gchar *msg)
+{
+ g_critical(msg);
+ sm_shutdown();
+ exit(EXIT_FAILURE);
+}
projects / chaz / openbox / blobdiff