#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,
class MouseData {
public:
int screen;
- OBClient *client;
+ Client *client;
Time time;
unsigned int state;
unsigned int button;
int press_clientwidth;
int press_clientheight;
- MouseData(int screen, OBClient *client, Time time, unsigned int state,
+ 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->press_clientwidth = initarea.width();
this->press_clientheight = initarea.height();
}
- MouseData(int screen, OBClient *client, Time time, unsigned int state,
+ MouseData(int screen, Client *client, Time time, unsigned int state,
unsigned int button, MouseContext context, MouseAction action) {
this->screen = screen;
this->client = client;
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;
- 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));
}
};
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 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);
}