X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.h;h=94f49105879bb415e6a5e4e4e04a11fb5e2eb569;hb=HEAD;hp=9d7551b9e60977552a45a4b16471dd60db2ab3dc;hpb=973507ff28b5d71433b3d0583e757fbc82b254c5;p=chaz%2Fopenbox

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 9d7551b9..94f49105 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -1,46 +1,66 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   openbox.h for the Openbox window manager
+   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.
+*/
+
 #ifndef __openbox_h
 #define __openbox_h
 
 #include "misc.h"
 
-#include "render/render.h"
-#include "render/theme.h"
+#include "obrender/render.h"
+#include "obrender/theme.h"
+#include "obt/display.h"
 
 #include <glib.h>
-#include <X11/Xlib.h>
-
-struct _ObMainLoop;
 
 extern RrInstance *ob_rr_inst;
+extern RrImageCache *ob_rr_icons;
 extern RrTheme    *ob_rr_theme;
 
-extern struct _ObMainLoop *ob_main_loop;
-
-/*! The X display */
-extern Display *ob_display; 
+extern GMainLoop *ob_main_loop;
 
 /*! The number of the screen on which we're running */
 extern gint     ob_screen;
 
-extern gchar   *ob_sm_id;
 extern gboolean ob_sm_use;
+extern gchar   *ob_sm_id;
+/* This save_file will get pass to ourselves if we restart too! So we won't
+ make a new file every time, yay. */
+extern gchar   *ob_sm_save_file;
+extern gboolean ob_sm_restore;
 extern gboolean ob_replace_wm;
+extern gboolean ob_debug_xinerama;
+
+/*! The current locale for the LC_MESSAGES category */
+extern const gchar *ob_locale_msg;
 
 /* The state of execution of the window manager */
-ObState ob_state();
+ObState ob_state(void);
+void ob_set_state(ObState state);
 
 void ob_restart_other(const gchar *path);
-void ob_restart();
-void ob_exit();
+void ob_restart(void);
+void ob_exit(gint code);
+void ob_exit_replace(void);
 
-void ob_reconfigure();
+void ob_reconfigure(void);
 
-void ob_exit_with_error(gchar *msg);
+void ob_exit_with_error(const gchar *msg) G_GNUC_NORETURN;
 
 Cursor ob_cursor(ObCursor cursor);
 
-KeyCode ob_keycode(ObKey key);
-
-gchar *ob_expand_tilde(const gchar *f);
-
 #endif