X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=8f19b31aa02f648a2f8f1a1b7b32bf8c32c1411b;hb=452f3f8aae796f70a5bd479986aa29937070951c;hp=0c254a69e4184d9e71007f56773ebf902c59d961;hpb=5d1718b81bf139e83d93e89727315e2e556c49b3;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 0c254a69..8f19b31a 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -60,13 +60,14 @@ RrTheme    *ob_rr_theme = NULL;
 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);
@@ -92,7 +93,7 @@ int main(int argc, char **argv)
     xmlDocPtr doc;
     xmlNodePtr node;
 
-    ob_state = State_Starting;
+    ob_state = OB_STATE_STARTING;
 
     /* initialize the locale */
     if (!setlocale(LC_ALL, ""))
@@ -170,17 +171,43 @@ int main(int argc, char **argv)
        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 */
@@ -232,10 +259,10 @@ int main(int argc, char **argv)
 	/* 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();
@@ -283,7 +310,6 @@ int main(int argc, char **argv)
 
         /* re-run me */
         execvp(argv[0], argv); /* try how we were run */
-        execlp(BINARY, BINARY, NULL); /* try this as a last resort */
     }
      
     return 0;
@@ -372,7 +398,7 @@ static void sm_startup(int argc, char **argv)
         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;
@@ -404,6 +430,7 @@ static void sm_startup(int argc, char **argv)
 
         SmcSetProperties(ob_sm_conn, 7, props);
 
+        g_free(val_uid.value);
         g_free(prop_cmd.vals);
         g_free(prop_res.vals);
 
@@ -475,7 +502,7 @@ static void print_version()
 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");
 #ifdef USE_SM
@@ -564,3 +591,15 @@ static void exit_with_error(gchar *msg)
     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];
+}