#include "otk/rect.hh"
#include "otk/property.hh"
#include "otk/display.hh"
+#include "otk/ustring.hh"
extern "C" {
#include <X11/Xlib.h>
namespace ob {
-class OBClient;
+class Client;
enum MouseContext {
MC_Frame,
MC_MaximizeButton,
MC_CloseButton,
MC_IconifyButton,
- MC_StickyButton,
+ MC_AllDesktopsButton,
MC_Grip,
MC_Root,
MC_MenuItem,
EventCloseWindow,
EventStartup,
EventShutdown,
+ EventKey,
EventFocus,
EventBell,
NUM_EVENTS
};
-// *** 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;
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 context, MouseAction action,
+ int xroot, int yroot, const otk::Point &initpos,
+ const otk::Rect &initarea) {
this->screen = screen;
this->client = client;
this->time = time;
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 context, MouseAction action) {
this->screen = screen;
this->client = client;
this->time = time;
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;
- EventData(int screen, OBClient *client, EventAction action,
+ EventData(int screen, Client *client, EventAction action,
unsigned int state) {
this->screen = screen;
this->client = client;
class KeyData {
public:
int screen;
- OBClient *client;
+ Client *client;
Time time;
unsigned int state;
std::string key;
+ EventAction action; // this is here so that all the Data structs have .action
- KeyData(int screen, OBClient *client, Time time, unsigned int state,
+ KeyData(int screen, Client *client, Time time, unsigned int state,
unsigned int key) {
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 = EventKey;
}
};
bool 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<std::string> *value);
+bool python_get_string(const char *name, otk::ustring *value);
+bool python_get_stringlist(const char *name, std::vector<otk::ustring> *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, MouseData *data);
void python_callback(PyObject *func, EventData *data);
void python_callback(PyObject *func, KeyData *data);
void set_reset_key(const std::string &key);
-PyObject *send_client_msg(Window target, int type, Window about,
+PyObject *send_client_msg(Window target, Atom type, Window about,
long data, long data1 = 0, long data2 = 0,
long data3 = 0, long data4 = 0);
}