#include "openbox.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 "gettext.h"
-#include "config.h"
+#include "parse.h"
#include "grab.h"
-#include "engine.h"
-#include "themerc.h"
#include "plugin.h"
#include "timer.h"
-#include "../render/render.h"
-#include "../render/font.h"
+#include "group.h"
+#include "config.h"
+#include "gettext.h"
+#include "render/render.h"
+#include "render/font.h"
+#include "render/theme.h"
#ifdef HAVE_FCNTL_H
# include <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
gboolean ob_shutdown = FALSE;
gboolean ob_restart = FALSE;
char *ob_restart_path = NULL;
-gboolean ob_remote = FALSE;
+gboolean ob_remote = TRUE;
gboolean ob_sync = FALSE;
Cursors ob_cursors;
char *ob_rc_path = NULL;
struct sigaction action;
sigset_t sigset;
char *path;
+ char *theme;
ob_state = State_Starting;
/* initialize the locale */
if (!setlocale(LC_ALL, ""))
g_warning("Couldn't set locale from environment.\n");
- bindtextdomain(PACKAGE, LOCALEDIR);
- bind_textdomain_codeset(PACKAGE, "UTF-8");
- textdomain(PACKAGE);
+ bindtextdomain(PACKAGE_NAME, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
+ textdomain(PACKAGE_NAME);
/* start our event dispatcher and register for signals */
dispatch_startup();
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);
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);
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.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();
- config_startup();
render_startup();
font_startup();
+ theme_startup();
+ event_startup();
+ grab_startup();
plugin_startup();
-
/* load the plugins specified in the pluginrc */
plugin_loadall();
- /* parse/load user options */
- config_parse();
- engine_startup();
- event_startup();
- screen_startup();
+ /* set up the kernel config shit */
+ config_startup();
+ /* parse/load user options */
+ parse_rc();
+ /* 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;
+
+ menu_startup();
+ frame_startup();
+ stacking_startup();
+ moveresize_startup();
focus_startup();
+ screen_startup();
+ group_startup();
client_startup();
- grab_startup();
/* call startup for all the plugins */
plugin_startall();
client_unmanage_all();
plugin_shutdown(); /* calls all the plugins' shutdown functions */
- grab_shutdown();
client_shutdown();
- focus_shutdown();
+ group_shutdown();
screen_shutdown();
+ focus_shutdown();
+ moveresize_shutdown();
+ stacking_shutdown();
+ frame_shutdown();
+ menu_shutdown();
+ grab_shutdown();
event_shutdown();
- engine_shutdown();
- themerc_shutdown();
+ theme_shutdown();
render_shutdown();
- config_shutdown();
timer_shutdown();
+ config_shutdown();
}
dispatch_shutdown();
ob_shutdown = ob_restart = TRUE;
break;
- case SIGCHLD:
- wait(NULL);
- break;
-
case SIGHUP:
case SIGINT:
case SIGTERM:
void print_version()
{
- g_print("Openbox %s\n\n", VERSION);
+ g_print("Openbox %s\n\n", PACKAGE_VERSION);
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");
g_print(" -version Display the version and exit\n");
g_print(" -sync Run in synchronous mode (this is slow and meant\n"
" for debugging X routines)\n");
- g_print("\nPlease report bugs at %s\n", BUGURL);
+ g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
}
void parse_args(int argc, char **argv)
}
}
}
+
+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);
+}
projects / chaz / openbox / blobdiff