#include "otk/image.hh"
#include "otk/assassin.hh"
#include "screen.hh"
-#include "util.hh"
+#include "otk/util.hh"
#include "bbwindow.hh"
#include "workspace.hh"
argv = m_argv;
// try to make sure the ~/.openbox directory exists
- mkdir(expandTilde("~/.openbox").c_str(), S_IREAD | S_IWRITE | S_IEXEC |
+ mkdir(otk::expandTilde("~/.openbox").c_str(), S_IREAD | S_IWRITE | S_IEXEC |
S_IRGRP | S_IWGRP | S_IXGRP |
S_IROTH | S_IWOTH | S_IXOTH);
if (! rc) rc = "~/.openbox/rc3";
- rc_file = expandTilde(rc);
+ rc_file = otk::expandTilde(rc);
config.setFile(rc_file);
no_focus = False;
default: {
#ifdef SHAPE
- if (e->type == getShapeEventBase()) {
+ if (e->type == otk::OBDisplay::shapeEventBase()) {
XShapeEvent *shape_event = (XShapeEvent *) e;
BlackboxWindow *win = searchWindow(e->xany.window);
else if (resource.colors_per_channel > 6) resource.colors_per_channel = 6;
if (config.getValue("session.styleFile", s))
- resource.style_file = expandTilde(s);
+ resource.style_file = otk::expandTilde(s);
else
resource.style_file = DEFAULTSTYLE;