nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stop including otk in the openbox module. makes the wm hooger for no good cause. simply import all the otk shit. add otk.hh

Browse source
This commit is contained in:
Dana Jansens 2003-01-10 06:40:31 +00:00
parent a6f1d6b82f
commit 678bb52123
7 changed files with 107 additions and 14748 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
otk/otk.i
View file

@ -7,33 +7,7 @@
# include "../config.h"
#endif
#include "application.hh"
#include "appwidget.hh"
#include "assassin.hh"
#include "button.hh"
#include "color.hh"
#include "configuration.hh"
#include "display.hh"
#include "eventdispatcher.hh"
#include "eventhandler.hh"
#include "focuslabel.hh"
#include "focuswidget.hh"
#include "font.hh"
#include "gccache.hh"
#include "image.hh"
#include "label.hh"
#include "point.hh"
#include "property.hh"
#include "rect.hh"
#include "screeninfo.hh"
#include "strut.hh"
#include "style.hh"
#include "texture.hh"
#include "timer.hh"
#include "timerqueue.hh"
#include "timerqueuemanager.hh"
#include "util.hh"
#include "widget.hh"
#include "otk.hh"
%}
%include "stl.i"
@ -104,6 +78,7 @@ namespace otk {
%include "timerqueue.hh"
%include "timerqueuemanager.hh"
%include "util.hh"
%include "widget.hh"
// for Mod1Mask etc
%include "X11/X.h"

28
otk/otk_wrap.cc
View file

@ -741,33 +741,7 @@ static swig_type_info *swig_types[81];
# include "../config.h"
#endif
#include "application.hh"
#include "appwidget.hh"
#include "assassin.hh"
#include "button.hh"
#include "color.hh"
#include "configuration.hh"
#include "display.hh"
#include "eventdispatcher.hh"
#include "eventhandler.hh"
#include "focuslabel.hh"
#include "focuswidget.hh"
#include "font.hh"
#include "gccache.hh"
#include "image.hh"
#include "label.hh"
#include "point.hh"
#include "property.hh"
#include "rect.hh"
#include "screeninfo.hh"
#include "strut.hh"
#include "style.hh"
#include "texture.hh"
#include "timer.hh"
#include "timerqueue.hh"
#include "timerqueuemanager.hh"
#include "util.hh"
#include "widget.hh"
#include "otk.hh"
#define SWIG_MemoryError 1

2
scripts/builtins.py
View file

@ -20,7 +20,7 @@ def state_shaded(data, add=2):
"""Toggles, adds or removes the 'shaded' state on a window."""
if not data.client: return
send_client_msg(OBDisplay_screenInfo(data.screen).rootWindow(),
OBProperty.net_wm_state, data.client,window(), add,
OBProperty.net_wm_state, data.client.window(), add,
openbox.property().atom(OBProperty.net_wm_state_shaded))
def close(data):

4
src/openbox.i
View file

@ -13,7 +13,7 @@
#include "bindings.hh"
#include "actions.hh"
#include "python.hh"
#include "otk/display.hh"
#include "otk/otk.hh"
%}
%include "stl.i"
@ -107,7 +107,7 @@ void python_callback(PyObject *func, KeyData *data)
}
};
%include "../otk/otk.i"
%import "../otk/otk.i"
%import "widgetbase.hh"
%import "actions.hh"

1626
src/openbox.py
View file

File diff suppressed because it is too large Load diff

13164
src/openbox_wrap.cc
View file

File diff suppressed because it is too large Load diff

2
src/python.cc
View file

@ -31,7 +31,7 @@ void python_init(char *argv0)
otk::expandTilde("~/.openbox/python") +
"')").c_str()));
// PyRun_SimpleString("from _otk import *; from _openbox import *;");
PyRun_SimpleString("from openbox import *;");
PyRun_SimpleString("from otk import *; from openbox import *;");
PyRun_SimpleString("openbox = Openbox_instance()");
PyRun_SimpleString("display = OBDisplay_display()");