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

openbox scripting works again! config too!

Browse source
This commit is contained in:
Dana Jansens 2003-01-27 15:59:28 +00:00
parent 340c4c956e
commit d600bf8d58
4 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
otk/Makefile.am
View file

@ -2,7 +2,7 @@ buttonsdir = $(pkgdatadir)/buttons
scriptdir = $(libdir)/openbox/python scriptdir = $(libdir)/openbox/python
CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \ CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
-DBUTTONSDIR=\"$(buttonsdir)\" -DBUTTONSDIR=\"$(buttonsdir)\" -DSWIG_GLOBAL
INCLUDES= -I../src INCLUDES= -I../src
@ -40,6 +40,6 @@ otk.i: $(wildcard *.hh)
touch $@ touch $@
%_wrap.cc: %.i %_wrap.cc: %.i
swig -c $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $< swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
# local dependencies # local dependencies

8
src/Makefile.am
View file

@ -7,8 +7,7 @@ CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
-DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
-DLOCALEDIR=\"$(localedir)\" \ -DLOCALEDIR=\"$(localedir)\" \
-DSCRIPTDIR=\"$(scriptdir)\" -DSWIG_GLOBAL -DSCRIPTDIR=\"$(scriptdir)\"
# -DSWIG_GLOBAL is for the swigruntime.cc (see swigruntime.i for explanation)
LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@ LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@
@ -21,7 +20,7 @@ openbox3_LDADD=-L../otk -lotk @LIBINTL@
openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \ openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \
main.cc backgroundwidget.cc labelwidget.cc \ main.cc backgroundwidget.cc labelwidget.cc \
buttonwidget.cc python.cc bindings.cc \ buttonwidget.cc python.cc bindings.cc \
swigruntime.cc openbox_wrap.cc openbox_wrap.cc
openbox3_LDFLAGS= $(PYTHON_LDFLAGS) openbox3_LDFLAGS= $(PYTHON_LDFLAGS)
script_DATA = ob.py script_DATA = ob.py
@ -39,7 +38,4 @@ openbox.i: openbox.hh screen.hh client.hh python.hh frame.hh
%_wrap.cc: %.i %_wrap.cc: %.i
swig -c -I../otk $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $< swig -c -I../otk $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $<
swigruntime.cc: swigruntime.i
swig -python -c++ -o $@ $<
# local dependencies # local dependencies

2
src/python.cc
View file

@ -32,7 +32,7 @@ void python_init(char *argv0)
otk::expandTilde("~/.openbox/python") + otk::expandTilde("~/.openbox/python") +
"')").c_str())); "')").c_str()));
PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')"); PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')");
PyRun_SimpleString("import ob; import otk;"); PyRun_SimpleString("import ob; import otk; import config;");
// set up convenience global variables // set up convenience global variables
PyRun_SimpleString("ob.openbox = ob.Openbox_instance()"); PyRun_SimpleString("ob.openbox = ob.Openbox_instance()");
PyRun_SimpleString("otk.display = otk.Display_instance()"); PyRun_SimpleString("otk.display = otk.Display_instance()");

9
src/swigruntime.i
View file

@ -1,9 +0,0 @@
// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
/*
This module exists just to link in the stuff that libswigpy would normally
provide. This way you don't need swig to compile this package from
distributed source tarballs.
*/
%module swigruntime