#include <X11/Xatom.h>
#include <X11/keysym.h>
-#ifdef STDC_HEADERS
+#ifdef HAVE_STRING_H
# include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
#ifdef DEBUG
# ifdef HAVE_STDIO_H
associateClientWindow();
- if (! screen->isSloppyFocus())
+ if (! screen->sloppyFocus())
openbox.grabButton(Button1, 0, frame.plate, True, ButtonPressMask,
GrabModeSync, GrabModeSync, None, None);
configure(frame.x, frame.y, frame.width, frame.height);
- if (! screen->isSloppyFocus())
+ if (! screen->sloppyFocus())
openbox.grabButton(Button1, 0, frame.plate, True, ButtonPressMask,
GrabModeSync, GrabModeSync, None, None);
else
XSendEvent(display, client.window, False, NoEventMask, &ce);
}
- if (screen->isSloppyFocus() && screen->doAutoRaise())
+ if (screen->sloppyFocus() && screen->autoRaise())
timer->start();
ret = True;
XMapSubwindows(display, frame.window);
XMapWindow(display, frame.window);
- if (flags.iconic && screen->doFocusNew()) setInputFocus();
+ if (flags.iconic && screen->focusNew()) setInputFocus();
flags.visible = True;
flags.iconic = False;
dh -= client.base_height;
dh -= frame.y_border;
- if (! screen->doFullMax())
+ if (! screen->fullMax())
dh -= screen->getToolbar()->getExposedHeight() + frame.border_w;
if (dw < client.min_width) dw = client.min_width;
dx += ((screen->size().w() - dw) / 2) - frame.border_w;
- if (screen->doFullMax()) {
+ if (screen->fullMax()) {
dy += ((screen->size().h() - dh) / 2) - frame.border_w;
} else {
dy += (((screen->size().h() - screen->getToolbar()->getExposedHeight())
- dh) / 2) - frame.border_w;
- switch (screen->getToolbarPlacement()) {
+ switch (screen->getToolbar()->placement()) {
case Toolbar::TopLeft:
case Toolbar::TopCenter:
case Toolbar::TopRight:
XSetWindowBorder(display, frame.plate, frame.uborder_pixel);
}
- if (screen->isSloppyFocus() && screen->doAutoRaise() && timer->isTiming())
+ if (screen->sloppyFocus() && screen->autoRaise() && timer->isTiming())
timer->stop();
}
redrawAllButtons();
- if (flags.transient || screen->doFocusNew())
+ if (flags.transient || screen->focusNew())
setInputFocus();
else
setFocusFlag(False);
shade();
}
- if (! (flags.focused || screen->isSloppyFocus()) ) {
+ if (! (flags.focused || screen->sloppyFocus()) ) {
setInputFocus(); // any click focus' the window in 'click to focus'
}
if (stack_change < 0) {
flags.moving = False;
openbox.maskWindowEvents(0, (OpenboxWindow *) 0);
- if (!screen->doOpaqueMove()) {
+ if (!screen->opaqueMove()) {
XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),
frame.move_x, frame.move_y, frame.resize_w - 1,
frame.resize_h - 1);
openbox.maskWindowEvents(client.window, this);
- if (! screen->doOpaqueMove()) {
+ if (! screen->opaqueMove()) {
openbox.grab();
frame.move_x = frame.x;
dx -= frame.border_w;
dy -= frame.border_w;
- int snap_distance = screen->getEdgeSnapThreshold();
+ int snap_distance = screen->edgeSnapThreshold();
// width/height of the snapping window
unsigned int snap_w = frame.width + (frame.border_w * 2);
unsigned int snap_h = size().h() + (frame.border_w * 2);
dx = screen->size().w() - snap_w;
int dtty, dbby, dty, dby;
- switch (screen->getToolbarPlacement()) {
+ switch (screen->getToolbar()->placement()) {
case Toolbar::TopLeft:
case Toolbar::TopCenter:
case Toolbar::TopRight:
dy = dbby - snap_h;
}
- if (screen->doOpaqueMove()) {
+ if (screen->opaqueMove()) {
configure(dx, dy, frame.width, frame.height);
} else {
XDrawRectangle(display, screen->getRootWindow(), screen->getOpGC(),