X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.hh;h=c1655503fafc25dc37dffa20c5577e4d23d97f71;hb=7d215bd255d0744101b9ceb52c235bdc985fa034;hp=189c29b32a05569d89dc30e8dfea14a8ac04024a;hpb=345d957e1ea577480f807b892b73c3f52fe913d2;p=chaz%2Fopenbox diff --git a/src/python.hh b/src/python.hh index 189c29b3..c1655503 100644 --- a/src/python.hh +++ b/src/python.hh @@ -10,71 +10,132 @@ #include "otk/rect.hh" #include "otk/property.hh" #include "otk/display.hh" +#include "otk/ustring.hh" extern "C" { #include -#include } #include #include + namespace ob { -class OBClient; - -enum MouseContext { - MC_Frame, - MC_Titlebar, - MC_Handle, - MC_Window, - MC_MaximizeButton, - MC_CloseButton, - MC_IconifyButton, - MC_StickyButton, - MC_Grip, - MC_Root, - MC_MenuItem, - NUM_MOUSE_CONTEXT +class Client; + +struct MouseContext { + enum MC { + Frame, + Titlebar, + Handle, + Window, + IconButton, + MaximizeButton, + CloseButton, + IconifyButton, + AllDesktopsButton, + Grip, + Root, + MenuItem +#ifndef DOXYGEN_IGNORE + , NUM_MOUSE_CONTEXT +#endif + }; +}; + +struct MouseAction { + enum MA { + Press, + Release, + Click, + DoubleClick, + Motion +#ifndef DOXYGEN_IGNORE + , NUM_MOUSE_ACTION +#endif + }; }; -enum MouseAction { - MousePress, - MouseClick, - MouseDoubleClick, - MouseMotion, - NUM_MOUSE_ACTION +struct KeyContext { + enum KC { + Menu, + All +#ifndef DOXYGEN_IGNORE + , NUM_KEY_CONTEXT +#endif + }; }; -enum KeyContext { - KC_Menu, - KC_All, - NUM_KEY_CONTEXT +struct KeyAction { + enum KA { + Press, + Release +#ifndef DOXYGEN_IGNORE + , NUM_KEY_ACTION +#endif + }; }; -enum EventAction { - EventEnterWindow, - EventLeaveWindow, - EventPlaceWindow, - EventNewWindow, - EventCloseWindow, - EventStartup, - EventShutdown, - EventFocus, - EventBell, - NUM_EVENTS +struct EventAction { + enum EA { + EnterWindow, //!< Occurs when the mouse enters a window + LeaveWindow, //!< Occurs when the mouse leaves a window + //! Occurs while a window is being managed. The handler should call + //! Client::move on the window + PlaceWindow, + //! Occurs while a window is being managed, just before the window is + //! displayed + /*! + Note that the window's state may not be completely stabilized by this + point. The NewWindow event should be used when possible. + */ + DisplayingWindow, + //! Occurs when a window is finished being managed + NewWindow, + //! Occurs when a window has been closed and is going to be unmanaged + CloseWindow, + //! Occurs when the window manager manages a screen + /*! + This event occurs on each managed screen during startup. + */ + Startup, + //! Occurs when the window manager unmanages a screen + /*! + This event occurs on each managed screen during shutdown. + */ + Shutdown, + //! Occurs when the input focus target changes + /*! + The data.client will be None of no client is focused. + */ + Focus, + //! Occurs when the system is fired through X. + /*! + The data.client will hold the client associated with the bell if + one has been specified, or None. + */ + Bell, + //! Occurs when a client toggles its urgent status. + /*! + The Client::urgent method can be used to get the status. + */ + UrgentWindow +#ifndef DOXYGEN_IGNORE + , NUM_EVENT_ACTION +#endif + }; }; -// *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** // -class MotionData { +class MouseData { public: int screen; - OBClient *client; + Client *client; Time time; unsigned int state; unsigned int button; - MouseContext context; - MouseAction action; + MouseContext::MC context; + MouseAction::MA action; int xroot; int yroot; int pressx; @@ -84,10 +145,10 @@ public: int press_clientwidth; int press_clientheight; - MotionData(int screen, OBClient *client, Time time, unsigned int state, - unsigned int button, MouseContext context, MouseAction action, - int xroot, int yroot, const otk::Point &initpos, - const otk::Rect &initarea) { + MouseData(int screen, Client *client, Time time, unsigned int state, + unsigned int button, MouseContext::MC context, + MouseAction::MA action, int xroot, int yroot, + const otk::Point &initpos, const otk::Rect &initarea) { this->screen = screen; this->client = client; this->time = time; @@ -104,21 +165,9 @@ public: this->press_clientwidth = initarea.width(); this->press_clientheight = initarea.height(); } -}; - -// *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** // -class ButtonData { -public: - int screen; - OBClient *client; - Time time; - unsigned int state; - unsigned int button; - MouseContext context; - MouseAction action; - - ButtonData(int screen, OBClient *client, Time time, unsigned int state, - unsigned int button, MouseContext context, MouseAction action) { + MouseData(int screen, Client *client, Time time, unsigned int state, + unsigned int button, MouseContext::MC context, + MouseAction::MA action) { this->screen = screen; this->client = client; this->time = time; @@ -126,17 +175,25 @@ public: this->button = button; this->context= context; this->action = action; + this->xroot = xroot; + this->yroot = yroot; + this->pressx = 0; + this->pressy = 0; + this->press_clientx = 0; + this->press_clienty = 0; + this->press_clientwidth = 0; + this->press_clientheight = 0; } }; class EventData { public: int screen; - OBClient *client; + Client *client; unsigned int state; - EventAction action; + EventAction::EA action; - EventData(int screen, OBClient *client, EventAction action, + EventData(int screen, Client *client, EventAction::EA action, unsigned int state) { this->screen = screen; this->client = client; @@ -148,54 +205,38 @@ public: class KeyData { public: int screen; - OBClient *client; + Client *client; Time time; unsigned int state; - std::string key; + char *key; + KeyAction::KA action; - KeyData(int screen, OBClient *client, Time time, unsigned int state, - unsigned int key) { + KeyData(int screen, Client *client, Time time, unsigned int state, + unsigned int key, KeyAction::KA action) { this->screen = screen; this->client = client; this->time = time; this->state = state; - this->key = XKeysymToString(XKeycodeToKeysym(otk::OBDisplay::display, + this->key = XKeysymToString(XKeycodeToKeysym(**otk::display, key, 0)); + this->action = action; } }; -#ifndef SWIG +// The void*'s will be used to hold the native language's function pointer +typedef void (*MouseCallback)(MouseData*, void*); +typedef void (*KeyCallback)(KeyData*, void*); +typedef void (*EventCallback)(EventData*, void*); 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, std::string *value); -bool python_get_stringlist(const char *name, std::vector *value); - -/*********************************************** - * These are found in openbox.i, not python.cc * - ***********************************************/ -void python_callback(PyObject *func, MotionData *data); -void python_callback(PyObject *func, ButtonData *data); -void python_callback(PyObject *func, EventData *data); -void python_callback(PyObject *func, KeyData *data); - -#endif // SWIG - -PyObject *mbind(const std::string &button, ob::MouseContext context, - ob::MouseAction action, PyObject *func); - -PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func); - -PyObject *ebind(ob::EventAction action, PyObject *func); - -void set_reset_key(const std::string &key); +bool python_get_string(const char *name, otk::ustring *value); +bool python_get_stringlist(const char *name, std::vector *value); -PyObject *send_client_msg(Window target, int type, Window about, - long data, long data1 = 0, long data2 = 0, - long data3 = 0, long data4 = 0); }