add 'grab_server' for grabbing .. the .. server!

[chaz/openbox] / src / python.hh

diff --git a/src/python.hh b/src/python.hh
index 77a7bf5c676a02e4ae1c7bbc0627402f4dbb4b66..c1655503fafc25dc37dffa20c5577e4d23d97f71 100644 (file)
--- a/src/python.hh
+++ b/src/python.hh
@@ -14,12 +14,12 @@
 
 extern "C" {
 #include <X11/Xlib.h>
-#include <Python.h>
 }
 
 #include <string>
 #include <vector>
 
+
 namespace ob {
 
 class Client;
@@ -30,6 +30,7 @@ struct MouseContext {
     Titlebar,
     Handle,
     Window,
+    IconButton,
     MaximizeButton,
     CloseButton,
     IconifyButton,
@@ -37,7 +38,7 @@ struct MouseContext {
     Grip,
     Root,
     MenuItem
-#if ! (defined(DOXYGEN_IGNORE) || defined(SWIG))
+#ifndef DOXYGEN_IGNORE
     , NUM_MOUSE_CONTEXT
 #endif
   };
@@ -50,7 +51,7 @@ struct MouseAction {
     Click,
     DoubleClick,
     Motion
-#if ! (defined(DOXYGEN_IGNORE) || defined(SWIG))
+#ifndef DOXYGEN_IGNORE
     , NUM_MOUSE_ACTION
 #endif
   };
@@ -60,7 +61,7 @@ struct KeyContext {
   enum KC {
     Menu,
     All
-#if ! (defined(DOXYGEN_IGNORE) || defined(SWIG))
+#ifndef DOXYGEN_IGNORE
     , NUM_KEY_CONTEXT
 #endif
   };
@@ -70,7 +71,7 @@ struct KeyAction {
   enum KA {
     Press,
     Release
-#if ! (defined(DOXYGEN_IGNORE) || defined(SWIG))
+#ifndef DOXYGEN_IGNORE
     , NUM_KEY_ACTION
 #endif
   };
@@ -120,7 +121,7 @@ struct EventAction {
       The Client::urgent method can be used to get the status.
     */
     UrgentWindow
-#if ! (defined(DOXYGEN_IGNORE) || defined(SWIG))
+#ifndef DOXYGEN_IGNORE
     , NUM_EVENT_ACTION
 #endif
   };
@@ -227,18 +228,15 @@ typedef void (*MouseCallback)(MouseData*, void*);
 typedef void (*KeyCallback)(KeyData*, void*);
 typedef void (*EventCallback)(EventData*, void*);
 
-#ifndef SWIG
-
 void python_init(char *argv0);
 void python_destroy();
-bool python_exec(const std::string &path);
+//! Returns 0 for success, 1 for failing to open the file, 2 for an exception
+int python_exec(const std::string &path);
 
 bool python_get_long(const char *name, long *value);
 bool python_get_string(const char *name, otk::ustring *value);
 bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value);
 
-#endif // SWIG
-
 }