Display *ob_display = NULL;
int ob_screen;
Window ob_root;
-State ob_state;
+ObState 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;
+Cursor ob_cursors[OB_NUM_CURSORS];
+KeyCode ob_keys[OB_NUM_KEYS];
char *ob_rc_path = NULL;
static void signal_handler(const ObEvent *e, void *data);
xmlDocPtr doc;
xmlNodePtr node;
- ob_state = State_Starting;
+ ob_state = OB_STATE_STARTING;
/* initialize the locale */
if (!setlocale(LC_ALL, ""))
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);
+ /* create available cursors */
+ ob_cursors[OB_CURSOR_POINTER] =
+ XCreateFontCursor(ob_display, XC_left_ptr);
+ ob_cursors[OB_CURSOR_BUSY] =
+ XCreateFontCursor(ob_display, XC_watch);
+ ob_cursors[OB_CURSOR_MOVE] =
+ XCreateFontCursor(ob_display, XC_fleur);
+ ob_cursors[OB_CURSOR_NORTH] =
+ XCreateFontCursor(ob_display, XC_top_side);
+ ob_cursors[OB_CURSOR_NORTHEAST] =
+ XCreateFontCursor(ob_display, XC_top_right_corner);
+ ob_cursors[OB_CURSOR_EAST] =
+ XCreateFontCursor(ob_display, XC_right_side);
+ ob_cursors[OB_CURSOR_SOUTHEAST] =
+ XCreateFontCursor(ob_display, XC_bottom_right_corner);
+ ob_cursors[OB_CURSOR_SOUTH] =
+ XCreateFontCursor(ob_display, XC_bottom_side);
+ ob_cursors[OB_CURSOR_SOUTHWEST] =
+ XCreateFontCursor(ob_display, XC_bottom_left_corner);
+ ob_cursors[OB_CURSOR_WEST] =
+ XCreateFontCursor(ob_display, XC_left_side);
+ ob_cursors[OB_CURSOR_NORTHWEST] =
+ XCreateFontCursor(ob_display, XC_top_left_corner);
+
+ /* create available keycodes */
+ ob_keys[OB_KEY_RETURN] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Return"));
+ ob_keys[OB_KEY_ESCAPE] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Escape"));
+ ob_keys[OB_KEY_LEFT] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Left"));
+ ob_keys[OB_KEY_RIGHT] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Right"));
+ ob_keys[OB_KEY_UP] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Up"));
+ ob_keys[OB_KEY_DOWN] =
+ XKeysymToKeycode(ob_display, XStringToKeysym("Down"));
prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */
/* get all the existing windows */
client_manage_all();
- ob_state = State_Running;
+ ob_state = OB_STATE_RUNNING;
while (!ob_shutdown)
event_loop();
- ob_state = State_Exiting;
+ ob_state = OB_STATE_EXITING;
dock_remove_all();
client_unmanage_all();
/* re-run me */
execvp(argv[0], argv); /* try how we were run */
- execlp(BINARY, BINARY, NULL); /* try this as a last resort */
}
return 0;
gboolean has_id;
for (i = 1; i < argc - 1; ++i)
- if (strcmp(argv[i], "-sm-client-id") == 0)
+ 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) {
+ 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_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) {
+ 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]);
}
}
- prop_res.vals[j].value = "-sm-client-id";
- prop_res.vals[j++].length = strlen("-sm-client-id");
+ 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.value = g_strdup(g_get_user_name());
val_uid.length = strlen(val_uid.value);
hint = SmRestartImmediately;
SmcSetProperties(ob_sm_conn, 7, props);
+ g_free(val_uid.value);
g_free(prop_cmd.vals);
g_free(prop_res.vals);
static void print_help()
{
print_version();
- g_print("Syntax: %s [options]\n\n", BINARY);
+ g_print("Syntax: openbox [options]\n\n");
g_print("Options:\n\n");
- g_print(" -rc PATH Specify the path to the rc file to use\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");
+ 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(" --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);
}
int i;
for (i = 1; i < argc; ++i) {
- if (!strcmp(argv[i], "-version")) {
+ 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")) {
+ } else if (!strcmp(argv[i], "--sync")) {
ob_sync = TRUE;
- } else if (!strcmp(argv[i], "-rc")) {
+ } else if (!strcmp(argv[i], "--rc")) {
if (i == argc - 1) /* no args left */
- g_printerr(_("-rc requires an argument\n"));
+ g_printerr(_("--rc requires an argument\n"));
else
ob_rc_path = argv[++i];
#ifdef USE_SM
- } else if (!strcmp(argv[i], "-sm-client-id")) {
+ } else if (!strcmp(argv[i], "--sm-client-id")) {
if (i == argc - 1) /* no args left */
- g_printerr(_("-sm-client-id requires an argument\n"));
+ 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], "--sm-disable")) {
ob_sm_use = FALSE;
#endif
} else {
sm_shutdown();
exit(EXIT_FAILURE);
}
+
+Cursor ob_cursor(ObCursor cursor)
+{
+ g_assert(cursor < OB_NUM_CURSORS);
+ return ob_cursors[cursor];
+}
+
+KeyCode ob_keycode(ObKey key)
+{
+ g_assert(key < OB_NUM_KEYS);
+ return ob_keys[key];
+}
projects / mikachu / openbox.git / blobdiff