X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpython.hh;h=ac5bd3e1821f727cc4588a6ba870db1530beffdc;hb=5face4c6f35172761367f63ac0b6eaf62d84e532;hp=2bf656d8620a4696f27c54350d1c74772636dba9;hpb=a0350e27b311db5cab49035752d3852ee68bf8a2;p=chaz%2Fopenbox diff --git a/src/python.hh b/src/python.hh index 2bf656d8..ac5bd3e1 100644 --- a/src/python.hh +++ b/src/python.hh @@ -8,6 +8,9 @@ #include "otk/point.hh" #include "otk/rect.hh" +#include "otk/property.hh" +#include "otk/display.hh" +#include "otk/ustring.hh" extern "C" { #include @@ -19,54 +22,76 @@ extern "C" { namespace ob { -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, + MaximizeButton, + CloseButton, + IconifyButton, + AllDesktopsButton, + Grip, + Root, + MenuItem, + NUM_MOUSE_CONTEXT + }; }; -enum MouseAction { - MousePress, - MouseClick, - MouseDoubleClick, - MouseMotion, - NUM_MOUSE_ACTION +struct MouseAction { + enum MA { + Press, + Click, + DoubleClick, + Motion, + NUM_MOUSE_ACTION + }; }; -enum KeyContext { - KC_Menu, - KC_All, - NUM_KEY_CONTEXT +struct KeyContext { + enum KC { + Menu, + All, + NUM_KEY_CONTEXT + }; }; -enum EventAction { - EventEnterWindow, - EventLeaveWindow, - EventNewWindow, - EventCloseWindow, - NUM_EVENTS +struct KeyAction { + enum KA { + Press, + Release, + NUM_KEY_ACTION + }; }; -#ifndef SWIG +struct EventAction { + enum EA { + EnterWindow, + LeaveWindow, + PlaceWindow, + NewWindow, + CloseWindow, + Startup, + Shutdown, + Focus, + Bell, + UrgentWindow, + NUM_EVENTS + }; +}; -// *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** // -typedef struct { - PyObject_HEAD; - Window window; +class MouseData { +public: + int screen; + 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; @@ -75,67 +100,124 @@ typedef struct { int press_clienty; int press_clientwidth; int press_clientheight; -} MotionData; -// *** MotionData can be (and is) cast ButtonData!! (in actions.cc) *** // -typedef struct { - PyObject_HEAD; - Window window; - Time time; - unsigned int state; - unsigned int button; - MouseContext context; - MouseAction action; -} ButtonData; + 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; + this->state = state; + this->button = button; + this->context= context; + this->action = action; + this->xroot = xroot; + this->yroot = yroot; + this->pressx = initpos.x(); + this->pressy = initpos.y(); + this->press_clientx = initarea.x(); + this->press_clienty = initarea.y(); + this->press_clientwidth = initarea.width(); + this->press_clientheight = initarea.height(); + } + 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; + this->state = state; + 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; + } +}; -typedef struct { - PyObject_HEAD; - Window window; +class EventData { +public: + int screen; + Client *client; unsigned int state; - EventAction action; -} EventData; + EventAction::EA action; + + EventData(int screen, Client *client, EventAction::EA action, + unsigned int state) { + this->screen = screen; + this->client = client; + this->action = action; + this->state = state; + } +}; -typedef struct { - PyObject_HEAD; - Window window; +class KeyData { +public: + int screen; + Client *client; Time time; unsigned int state; - unsigned int key; -} KeyData; + char *key; + KeyAction::KA action; + + 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::display, + key, 0)); + this->action = action; + } +}; + +#ifndef SWIG void python_init(char *argv0); void python_destroy(); bool python_exec(const std::string &path); - -MotionData *new_motion_data(Window window, Time time, unsigned int state, - unsigned int button, MouseContext context, - MouseAction action, int xroot, int yroot, - const otk::Point &initpos, - const otk::Rect &initarea); -ButtonData *new_button_data(Window window, Time time, unsigned int state, - unsigned int button, MouseContext context, - MouseAction action); -EventData *new_event_data(Window window, EventAction action, - unsigned int state); -KeyData *new_key_data(Window window, Time time, unsigned int state, - unsigned int key); - -void python_callback(PyObject *func, PyObject *data); 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); -#endif +bool python_get_string(const char *name, otk::ustring *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, MouseData *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::MC context, + ob::MouseAction::MA action, PyObject *func); -PyObject *mbind(const std::string &button, ob::MouseContext context, - ob::MouseAction action, PyObject *func); +PyObject *kbind(PyObject *keylist, ob::KeyContext::KC context, PyObject *func); -PyObject *kbind(PyObject *keylist, ob::KeyContext context, PyObject *func); +PyObject *kgrab(int screen, PyObject *func); +PyObject *kungrab(); -PyObject *ebind(ob::EventAction action, PyObject *func); +PyObject *ebind(ob::EventAction::EA action, PyObject *func); void set_reset_key(const std::string &key); +PyObject *send_client_msg(Window target, Atom type, Window about, + long data, long data1 = 0, long data2 = 0, + long data3 = 0, long data4 = 0); + + +void execute(const std::string &bin, int screen=0); + } + #endif // __python_hh