using std::string;
using std::abs;
+namespace ob {
+
/*
* Initializes the class with default values/the window's set initial values.
*/
// fetch client size and placement
XWindowAttributes wattrib;
- if (! XGetWindowAttributes(blackbox->getXDisplay(),
+ if (! XGetWindowAttributes(otk::OBDisplay::display,
client.window, &wattrib) ||
! wattrib.screen || wattrib.override_redirect) {
#ifdef DEBUG
StructureNotifyMask;
attrib_set.do_not_propagate_mask = ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask;
- XChangeWindowAttributes(blackbox->getXDisplay(), client.window,
+ XChangeWindowAttributes(otk::OBDisplay::display, client.window,
CWEventMask|CWDontPropagate, &attrib_set);
flags.moving = flags.resizing = flags.shaded = flags.visible =
upsize();
bool place_window = True;
- if (blackbox->isStartup() || isTransient() ||
+ if (blackbox->state() == Openbox::State_Starting || isTransient() ||
client.normal_hint_flags & (PPosition|USPosition)) {
applyGravity(frame.rect);
- if (blackbox->isStartup() || client.rect.intersects(screen->getRect()))
+ if (blackbox->state() == Openbox::State_Starting ||
+ client.rect.intersects(screen->getRect()))
place_window = False;
}
We hold the grab until after we are done moving the window around.
*/
- XGrabServer(blackbox->getXDisplay());
+ XGrabServer(otk::OBDisplay::display);
associateClientWindow();
positionWindows();
- XUngrabServer(blackbox->getXDisplay());
+ XUngrabServer(otk::OBDisplay::display);
#ifdef SHAPE
if (blackbox->hasShapeExtensions() && flags.shaped)
grabButtons();
- XMapSubwindows(blackbox->getXDisplay(), frame.window);
+ XMapSubwindows(otk::OBDisplay::display, frame.window);
// this ensures the title, buttons, and other decor are properly displayed
redrawWindowFrame();
if (frame.plate) {
blackbox->removeWindowSearch(frame.plate);
- XDestroyWindow(blackbox->getXDisplay(), frame.plate);
+ XDestroyWindow(otk::OBDisplay::display, frame.plate);
}
if (frame.window) {
blackbox->removeWindowSearch(frame.window);
- XDestroyWindow(blackbox->getXDisplay(), frame.window);
+ XDestroyWindow(otk::OBDisplay::display, frame.window);
}
blackbox->removeWindowSearch(client.window);
shade();
if (flags.visible && frame.window) {
- XMapSubwindows(blackbox->getXDisplay(), frame.window);
- XMapWindow(blackbox->getXDisplay(), frame.window);
+ XMapSubwindows(otk::OBDisplay::display, frame.window);
+ XMapWindow(otk::OBDisplay::display, frame.window);
}
reconfigure();
window's frame.
*/
- return XCreateWindow(blackbox->getXDisplay(), screen->getRootWindow(),
+ return XCreateWindow(otk::OBDisplay::display, screen->getRootWindow(),
0, 0, 1, 1, frame.border_w, screen->getDepth(),
InputOutput, screen->getVisual(), create_mask,
&attrib_create);
attrib_create.cursor = cursor;
}
- return XCreateWindow(blackbox->getXDisplay(), parent, 0, 0, 1, 1, 0,
+ return XCreateWindow(otk::OBDisplay::display, parent, 0, 0, 1, 1, 0,
screen->getDepth(), InputOutput, screen->getVisual(),
create_mask, &attrib_create);
}
void BlackboxWindow::associateClientWindow(void) {
- XSetWindowBorderWidth(blackbox->getXDisplay(), client.window, 0);
+ XSetWindowBorderWidth(otk::OBDisplay::display, client.window, 0);
getWMName();
getWMIconName();
- XChangeSaveSet(blackbox->getXDisplay(), client.window, SetModeInsert);
+ XChangeSaveSet(otk::OBDisplay::display, client.window, SetModeInsert);
- XSelectInput(blackbox->getXDisplay(), frame.plate, SubstructureRedirectMask);
+ XSelectInput(otk::OBDisplay::display, frame.plate, SubstructureRedirectMask);
/*
note we used to grab around this call to XReparentWindow however the
*/
unsigned long event_mask = PropertyChangeMask | FocusChangeMask |
StructureNotifyMask;
- XSelectInput(blackbox->getXDisplay(), client.window,
+ XSelectInput(otk::OBDisplay::display, client.window,
event_mask & ~StructureNotifyMask);
- XReparentWindow(blackbox->getXDisplay(), client.window, frame.plate, 0, 0);
- XSelectInput(blackbox->getXDisplay(), client.window, event_mask);
+ XReparentWindow(otk::OBDisplay::display, client.window, frame.plate, 0, 0);
+ XSelectInput(otk::OBDisplay::display, client.window, event_mask);
- XRaiseWindow(blackbox->getXDisplay(), frame.plate);
- XMapSubwindows(blackbox->getXDisplay(), frame.plate);
+ XRaiseWindow(otk::OBDisplay::display, frame.plate);
+ XMapSubwindows(otk::OBDisplay::display, frame.plate);
#ifdef SHAPE
if (blackbox->hasShapeExtensions()) {
- XShapeSelectInput(blackbox->getXDisplay(), client.window,
+ XShapeSelectInput(otk::OBDisplay::display, client.window,
ShapeNotifyMask);
Bool shaped = False;
int foo;
unsigned int ufoo;
- XShapeQueryExtents(blackbox->getXDisplay(), client.window, &shaped,
+ XShapeQueryExtents(otk::OBDisplay::display, client.window, &shaped,
&foo, &foo, &ufoo, &ufoo, &foo, &foo, &foo,
&ufoo, &ufoo);
flags.shaped = shaped;
void BlackboxWindow::decorate(void) {
- BTexture* texture;
+ otk::BTexture* texture;
texture = &(screen->getWindowStyle()->b_focus);
frame.fbutton = texture->render(frame.button_w, frame.button_w,
texture = &(screen->getWindowStyle()->b_pressed_focus);
- if (texture->texture() != BTexture::NoTexture) {
+ if (texture->texture() != otk::BTexture::NoTexture) {
frame.pfbutton = texture->render(frame.button_w, frame.button_w,
frame.pfbutton);
if (! frame.pfbutton)
texture = &(screen->getWindowStyle()->b_pressed_unfocus);
- if (texture->texture() != BTexture::NoTexture) {
+ if (texture->texture() != otk::BTexture::NoTexture) {
frame.pubutton = texture->render(frame.button_w, frame.button_w,
frame.pubutton);
if (! frame.pubutton)
if (! frame.utitle)
frame.utitle_pixel = texture->color().pixel();
- XSetWindowBorder(blackbox->getXDisplay(), frame.title,
+ XSetWindowBorder(otk::OBDisplay::display, frame.title,
screen->getBorderColor()->pixel());
decorateLabel();
if (! frame.ugrip)
frame.ugrip_pixel = texture->color().pixel();
- XSetWindowBorder(blackbox->getXDisplay(), frame.handle,
+ XSetWindowBorder(otk::OBDisplay::display, frame.handle,
screen->getBorderColor()->pixel());
- XSetWindowBorder(blackbox->getXDisplay(), frame.left_grip,
+ XSetWindowBorder(otk::OBDisplay::display, frame.left_grip,
screen->getBorderColor()->pixel());
- XSetWindowBorder(blackbox->getXDisplay(), frame.right_grip,
+ XSetWindowBorder(otk::OBDisplay::display, frame.right_grip,
screen->getBorderColor()->pixel());
}
- XSetWindowBorder(blackbox->getXDisplay(), frame.window,
+ XSetWindowBorder(otk::OBDisplay::display, frame.window,
screen->getBorderColor()->pixel());
}
void BlackboxWindow::decorateLabel(void) {
- BTexture *texture;
+ otk::BTexture *texture;
texture = &(screen->getWindowStyle()->l_focus);
frame.flabel = texture->render(frame.label_w, frame.label_h, frame.flabel);
blackbox->removeWindowSearch(frame.left_grip);
blackbox->removeWindowSearch(frame.right_grip);
- XDestroyWindow(blackbox->getXDisplay(), frame.left_grip);
- XDestroyWindow(blackbox->getXDisplay(), frame.right_grip);
+ XDestroyWindow(otk::OBDisplay::display, frame.left_grip);
+ XDestroyWindow(otk::OBDisplay::display, frame.right_grip);
frame.left_grip = frame.right_grip = None;
blackbox->removeWindowSearch(frame.handle);
- XDestroyWindow(blackbox->getXDisplay(), frame.handle);
+ XDestroyWindow(otk::OBDisplay::display, frame.handle);
frame.handle = None;
}
blackbox->removeWindowSearch(frame.title);
blackbox->removeWindowSearch(frame.label);
- XDestroyWindow(blackbox->getXDisplay(), frame.label);
- XDestroyWindow(blackbox->getXDisplay(), frame.title);
+ XDestroyWindow(otk::OBDisplay::display, frame.label);
+ XDestroyWindow(otk::OBDisplay::display, frame.title);
frame.title = frame.label = None;
}
void BlackboxWindow::destroyCloseButton(void) {
blackbox->removeWindowSearch(frame.close_button);
- XDestroyWindow(blackbox->getXDisplay(), frame.close_button);
+ XDestroyWindow(otk::OBDisplay::display, frame.close_button);
frame.close_button = None;
}
void BlackboxWindow::destroyIconifyButton(void) {
blackbox->removeWindowSearch(frame.iconify_button);
- XDestroyWindow(blackbox->getXDisplay(), frame.iconify_button);
+ XDestroyWindow(otk::OBDisplay::display, frame.iconify_button);
frame.iconify_button = None;
}
void BlackboxWindow::destroyMaximizeButton(void) {
blackbox->removeWindowSearch(frame.maximize_button);
- XDestroyWindow(blackbox->getXDisplay(), frame.maximize_button);
+ XDestroyWindow(otk::OBDisplay::display, frame.maximize_button);
frame.maximize_button = None;
}
void BlackboxWindow::destroyStickyButton(void) {
blackbox->removeWindowSearch(frame.stick_button);
- XDestroyWindow(blackbox->getXDisplay(), frame.stick_button);
+ XDestroyWindow(otk::OBDisplay::display, frame.stick_button);
frame.stick_button = None;
}
switch(*it) {
case 'C':
if (! frame.close_button) createCloseButton();
- XMoveResizeWindow(blackbox->getXDisplay(), frame.close_button, x, by,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.close_button, x, by,
frame.button_w, frame.button_w);
x += frame.button_w + bsep;
break;
case 'I':
if (! frame.iconify_button) createIconifyButton();
- XMoveResizeWindow(blackbox->getXDisplay(), frame.iconify_button, x, by,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.iconify_button, x, by,
frame.button_w, frame.button_w);
x += frame.button_w + bsep;
break;
case 'S':
if (! frame.stick_button) createStickyButton();
- XMoveResizeWindow(blackbox->getXDisplay(), frame.stick_button, x, by,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.stick_button, x, by,
frame.button_w, frame.button_w);
x += frame.button_w + bsep;
break;
case 'M':
if (! frame.maximize_button) createMaximizeButton();
- XMoveResizeWindow(blackbox->getXDisplay(), frame.maximize_button, x, by,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.maximize_button, x, by,
frame.button_w, frame.button_w);
x += frame.button_w + bsep;
break;
case 'L':
- XMoveResizeWindow(blackbox->getXDisplay(), frame.label, x, ty,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.label, x, ty,
frame.label_w, frame.label_h);
x += frame.label_w + bsep;
break;
if (! screen->isSloppyFocus() || screen->doClickRaise())
// grab button 1 for changing focus/raising
- blackbox->grabButton(Button1, 0, frame.plate, True, ButtonPressMask,
- GrabModeSync, GrabModeSync, frame.plate, None,
- screen->allowScrollLock());
+ otk::OBDisplay::grabButton(Button1, 0, frame.plate, True, ButtonPressMask,
+ GrabModeSync, GrabModeSync, frame.plate, None,
+ screen->allowScrollLock());
if (functions & Func_Move)
- blackbox->grabButton(Button1, mod_mask, frame.window, True,
+ otk::OBDisplay::grabButton(Button1, mod_mask, frame.window, True,
ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
GrabModeAsync, frame.window, None,
screen->allowScrollLock());
if (functions & Func_Resize)
- blackbox->grabButton(Button3, mod_mask, frame.window, True,
+ otk::OBDisplay::grabButton(Button3, mod_mask, frame.window, True,
ButtonReleaseMask | ButtonMotionMask, GrabModeAsync,
GrabModeAsync, frame.window, None,
screen->allowScrollLock());
// alt+middle lowers the window
- blackbox->grabButton(Button2, mod_mask, frame.window, True,
+ otk::OBDisplay::grabButton(Button2, mod_mask, frame.window, True,
ButtonReleaseMask, GrabModeAsync, GrabModeAsync,
frame.window, None, screen->allowScrollLock());
}
void BlackboxWindow::ungrabButtons(void) {
- blackbox->ungrabButton(Button1, 0, frame.plate);
- blackbox->ungrabButton(Button1, mod_mask, frame.window);
- blackbox->ungrabButton(Button2, mod_mask, frame.window);
- blackbox->ungrabButton(Button3, mod_mask, frame.window);
+ otk::OBDisplay::ungrabButton(Button1, 0, frame.plate);
+ otk::OBDisplay::ungrabButton(Button1, mod_mask, frame.window);
+ otk::OBDisplay::ungrabButton(Button2, mod_mask, frame.window);
+ otk::OBDisplay::ungrabButton(Button3, mod_mask, frame.window);
}
void BlackboxWindow::positionWindows(void) {
- XMoveResizeWindow(blackbox->getXDisplay(), frame.window,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.window,
frame.rect.x(), frame.rect.y(), frame.inside_w,
(flags.shaded) ? frame.title_h : frame.inside_h);
- XSetWindowBorderWidth(blackbox->getXDisplay(), frame.window,
+ XSetWindowBorderWidth(otk::OBDisplay::display, frame.window,
frame.border_w);
- XSetWindowBorderWidth(blackbox->getXDisplay(), frame.plate,
+ XSetWindowBorderWidth(otk::OBDisplay::display, frame.plate,
frame.mwm_border_w);
- XMoveResizeWindow(blackbox->getXDisplay(), frame.plate,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.plate,
frame.margin.left - frame.mwm_border_w - frame.border_w,
frame.margin.top - frame.mwm_border_w - frame.border_w,
client.rect.width(), client.rect.height());
- XMoveResizeWindow(blackbox->getXDisplay(), client.window,
+ XMoveResizeWindow(otk::OBDisplay::display, client.window,
0, 0, client.rect.width(), client.rect.height());
// ensure client.rect contains the real location
client.rect.setPos(frame.rect.left() + frame.margin.left,
if (decorations & Decor_Titlebar) {
if (frame.title == None) createTitlebar();
- XSetWindowBorderWidth(blackbox->getXDisplay(), frame.title,
+ XSetWindowBorderWidth(otk::OBDisplay::display, frame.title,
frame.border_w);
- XMoveResizeWindow(blackbox->getXDisplay(), frame.title, -frame.border_w,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.title, -frame.border_w,
-frame.border_w, frame.inside_w, frame.title_h);
positionButtons();
- XMapSubwindows(blackbox->getXDisplay(), frame.title);
- XMapWindow(blackbox->getXDisplay(), frame.title);
+ XMapSubwindows(otk::OBDisplay::display, frame.title);
+ XMapWindow(otk::OBDisplay::display, frame.title);
} else if (frame.title) {
destroyTitlebar();
}
if (decorations & Decor_Handle) {
if (frame.handle == None) createHandle();
- XSetWindowBorderWidth(blackbox->getXDisplay(), frame.handle,
+ XSetWindowBorderWidth(otk::OBDisplay::display, frame.handle,
frame.border_w);
- XSetWindowBorderWidth(blackbox->getXDisplay(), frame.left_grip,
+ XSetWindowBorderWidth(otk::OBDisplay::display, frame.left_grip,
frame.border_w);
- XSetWindowBorderWidth(blackbox->getXDisplay(), frame.right_grip,
+ XSetWindowBorderWidth(otk::OBDisplay::display, frame.right_grip,
frame.border_w);
// use client.rect here so the value is correct even if shaded
- XMoveResizeWindow(blackbox->getXDisplay(), frame.handle,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.handle,
-frame.border_w,
client.rect.height() + frame.margin.top +
frame.mwm_border_w - frame.border_w,
frame.inside_w, frame.handle_h);
- XMoveResizeWindow(blackbox->getXDisplay(), frame.left_grip,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.left_grip,
-frame.border_w, -frame.border_w,
frame.grip_w, frame.handle_h);
- XMoveResizeWindow(blackbox->getXDisplay(), frame.right_grip,
+ XMoveResizeWindow(otk::OBDisplay::display, frame.right_grip,
frame.inside_w - frame.grip_w - frame.border_w,
-frame.border_w, frame.grip_w, frame.handle_h);
- XMapSubwindows(blackbox->getXDisplay(), frame.handle);
- XMapWindow(blackbox->getXDisplay(), frame.handle);
+ XMapSubwindows(otk::OBDisplay::display, frame.handle);
+ XMapWindow(otk::OBDisplay::display, frame.handle);
} else if (frame.handle) {
destroyHandle();
}
- XSync(blackbox->getXDisplay(), False);
+ XSync(otk::OBDisplay::display, False);
}
Atom *proto;
int num_return = 0;
- if (XGetWMProtocols(blackbox->getXDisplay(), client.window,
+ if (XGetWMProtocols(otk::OBDisplay::display, client.window,
&proto, &num_return)) {
for (int i = 0; i < num_return; ++i) {
if (proto[i] == xatom->getAtom(XAtom::wm_delete_window)) {
}
client.window_group = None;
- XWMHints *wmhint = XGetWMHints(blackbox->getXDisplay(), client.window);
+ XWMHints *wmhint = XGetWMHints(otk::OBDisplay::display, client.window);
if (! wmhint) {
return;
}
client.max_height = (unsigned) -1;
- if (! XGetWMNormalHints(blackbox->getXDisplay(), client.window,
+ if (! XGetWMNormalHints(otk::OBDisplay::display, client.window,
&sizehint, &icccm_mask))
return;
client.transient_for = (BlackboxWindow *) 0;
Window trans_for;
- if (! XGetTransientForHint(blackbox->getXDisplay(), client.window,
+ if (! XGetTransientForHint(otk::OBDisplay::display, client.window,
&trans_for)) {
// transient_for hint not set
return;
} else {
frame.rect.setPos(dx, dy);
- XMoveWindow(blackbox->getXDisplay(), frame.window,
+ XMoveWindow(otk::OBDisplay::display, frame.window,
frame.rect.x(), frame.rect.y());
/*
we may have been called just after an opaque window move, so even though
XEvent event;
event.type = ConfigureNotify;
- event.xconfigure.display = blackbox->getXDisplay();
+ event.xconfigure.display = otk::OBDisplay::display;
event.xconfigure.event = client.window;
event.xconfigure.window = client.window;
event.xconfigure.x = client.rect.x();
event.xconfigure.above = frame.window;
event.xconfigure.override_redirect = False;
- XSendEvent(blackbox->getXDisplay(), client.window, False,
+ XSendEvent(otk::OBDisplay::display, client.window, False,
StructureNotifyMask, &event);
- XFlush(blackbox->getXDisplay());
+ XFlush(otk::OBDisplay::display);
}
}
#ifdef SHAPE
void BlackboxWindow::configureShape(void) {
- XShapeCombineShape(blackbox->getXDisplay(), frame.window, ShapeBounding,
+ XShapeCombineShape(otk::OBDisplay::display, frame.window, ShapeBounding,
frame.margin.left - frame.border_w,
frame.margin.top - frame.border_w,
client.window, ShapeBounding, ShapeSet);
++num;
}
- XShapeCombineRectangles(blackbox->getXDisplay(), frame.window,
+ XShapeCombineRectangles(otk::OBDisplay::display, frame.window,
ShapeBounding, 0, 0, xrect, num,
ShapeUnion, Unsorted);
}
void BlackboxWindow::clearShape(void) {
- XShapeCombineMask(blackbox->getXDisplay(), frame.window, ShapeBounding,
+ XShapeCombineMask(otk::OBDisplay::display, frame.window, ShapeBounding,
frame.margin.left - frame.border_w,
frame.margin.top - frame.border_w,
None, ShapeSet);
bool ret = True;
if (focus_mode == F_LocallyActive || focus_mode == F_Passive) {
- XSetInputFocus(blackbox->getXDisplay(), client.window,
+ XSetInputFocus(otk::OBDisplay::display, client.window,
RevertToPointerRoot, CurrentTime);
} else {
/* we could set the focus to none, since the window doesn't accept focus,
XEvent ce;
ce.xclient.type = ClientMessage;
ce.xclient.message_type = xatom->getAtom(XAtom::wm_protocols);
- ce.xclient.display = blackbox->getXDisplay();
+ ce.xclient.display = otk::OBDisplay::display;
ce.xclient.window = client.window;
ce.xclient.format = 32;
ce.xclient.data.l[0] = xatom->getAtom(XAtom::wm_take_focus);
ce.xclient.data.l[2] = 0l;
ce.xclient.data.l[3] = 0l;
ce.xclient.data.l[4] = 0l;
- XSendEvent(blackbox->getXDisplay(), client.window, False,
+ XSendEvent(otk::OBDisplay::display, client.window, False,
NoEventMask, &ce);
- XFlush(blackbox->getXDisplay());
+ XFlush(otk::OBDisplay::display);
}
return ret;
*/
unsigned long event_mask = PropertyChangeMask | FocusChangeMask |
StructureNotifyMask;
- XGrabServer(blackbox->getXDisplay());
- XSelectInput(blackbox->getXDisplay(), client.window,
+ XGrabServer(otk::OBDisplay::display);
+ XSelectInput(otk::OBDisplay::display, client.window,
event_mask & ~StructureNotifyMask);
- XUnmapWindow(blackbox->getXDisplay(), client.window);
- XSelectInput(blackbox->getXDisplay(), client.window, event_mask);
- XUngrabServer(blackbox->getXDisplay());
+ XUnmapWindow(otk::OBDisplay::display, client.window);
+ XSelectInput(otk::OBDisplay::display, client.window, event_mask);
+ XUngrabServer(otk::OBDisplay::display);
- XUnmapWindow(blackbox->getXDisplay(), frame.window);
+ XUnmapWindow(otk::OBDisplay::display, frame.window);
flags.visible = False;
flags.iconic = True;
current_state = (flags.shaded) ? IconicState : NormalState;
setState(current_state);
- XMapWindow(blackbox->getXDisplay(), client.window);
- XMapSubwindows(blackbox->getXDisplay(), frame.window);
- XMapWindow(blackbox->getXDisplay(), frame.window);
+ XMapWindow(otk::OBDisplay::display, client.window);
+ XMapSubwindows(otk::OBDisplay::display, frame.window);
+ XMapWindow(otk::OBDisplay::display, frame.window);
#if 0
int real_x, real_y;
Window child;
- XTranslateCoordinates(blackbox->getXDisplay(), client.window,
+ XTranslateCoordinates(otk::OBDisplay::display, client.window,
screen->getRootWindow(),
0, 0, &real_x, &real_y, &child);
fprintf(stderr, "%s -- assumed: (%d, %d), real: (%d, %d)\n", getTitle(),
XEvent ce;
ce.xclient.type = ClientMessage;
ce.xclient.message_type = xatom->getAtom(XAtom::wm_protocols);
- ce.xclient.display = blackbox->getXDisplay();
+ ce.xclient.display = otk::OBDisplay::display;
ce.xclient.window = client.window;
ce.xclient.format = 32;
ce.xclient.data.l[0] = xatom->getAtom(XAtom::wm_delete_window);
ce.xclient.data.l[2] = 0l;
ce.xclient.data.l[3] = 0l;
ce.xclient.data.l[4] = 0l;
- XSendEvent(blackbox->getXDisplay(), client.window, False, NoEventMask, &ce);
- XFlush(blackbox->getXDisplay());
+ XSendEvent(otk::OBDisplay::display, client.window, False, NoEventMask, &ce);
+ XFlush(otk::OBDisplay::display);
}
setState(current_state);
- XUnmapWindow(blackbox->getXDisplay(), frame.window);
+ XUnmapWindow(otk::OBDisplay::display, frame.window);
- XGrabServer(blackbox->getXDisplay());
+ XGrabServer(otk::OBDisplay::display);
unsigned long event_mask = PropertyChangeMask | FocusChangeMask |
StructureNotifyMask;
- XSelectInput(blackbox->getXDisplay(), client.window,
+ XSelectInput(otk::OBDisplay::display, client.window,
event_mask & ~StructureNotifyMask);
- XUnmapWindow(blackbox->getXDisplay(), client.window);
- XSelectInput(blackbox->getXDisplay(), client.window, event_mask);
+ XUnmapWindow(otk::OBDisplay::display, client.window);
+ XSelectInput(otk::OBDisplay::display, client.window, event_mask);
- XUngrabServer(blackbox->getXDisplay());
+ XUngrabServer(otk::OBDisplay::display);
}
void BlackboxWindow::shade(void) {
if (flags.shaded) {
- XResizeWindow(blackbox->getXDisplay(), frame.window,
+ XResizeWindow(otk::OBDisplay::display, frame.window,
frame.inside_w, frame.inside_h);
flags.shaded = False;
blackbox_attrib.flags ^= AttribShaded;
if (! (decorations & Decor_Titlebar))
return; // can't shade it without a titlebar!
- XResizeWindow(blackbox->getXDisplay(), frame.window,
+ XResizeWindow(otk::OBDisplay::display, frame.window,
frame.inside_w, frame.title_h);
flags.shaded = True;
blackbox_attrib.flags |= AttribShaded;
if (decorations & Decor_Titlebar) {
if (flags.focused) {
if (frame.ftitle)
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display,
frame.title, frame.ftitle);
else
- XSetWindowBackground(blackbox->getXDisplay(),
+ XSetWindowBackground(otk::OBDisplay::display,
frame.title, frame.ftitle_pixel);
} else {
if (frame.utitle)
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display,
frame.title, frame.utitle);
else
- XSetWindowBackground(blackbox->getXDisplay(),
+ XSetWindowBackground(otk::OBDisplay::display,
frame.title, frame.utitle_pixel);
}
- XClearWindow(blackbox->getXDisplay(), frame.title);
+ XClearWindow(otk::OBDisplay::display, frame.title);
redrawLabel();
redrawAllButtons();
if (decorations & Decor_Handle) {
if (flags.focused) {
if (frame.fhandle)
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display,
frame.handle, frame.fhandle);
else
- XSetWindowBackground(blackbox->getXDisplay(),
+ XSetWindowBackground(otk::OBDisplay::display,
frame.handle, frame.fhandle_pixel);
if (frame.fgrip) {
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display,
frame.left_grip, frame.fgrip);
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display,
frame.right_grip, frame.fgrip);
} else {
- XSetWindowBackground(blackbox->getXDisplay(),
+ XSetWindowBackground(otk::OBDisplay::display,
frame.left_grip, frame.fgrip_pixel);
- XSetWindowBackground(blackbox->getXDisplay(),
+ XSetWindowBackground(otk::OBDisplay::display,
frame.right_grip, frame.fgrip_pixel);
}
} else {
if (frame.uhandle)
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display,
frame.handle, frame.uhandle);
else
- XSetWindowBackground(blackbox->getXDisplay(),
+ XSetWindowBackground(otk::OBDisplay::display,
frame.handle, frame.uhandle_pixel);
if (frame.ugrip) {
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display,
frame.left_grip, frame.ugrip);
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display,
frame.right_grip, frame.ugrip);
} else {
- XSetWindowBackground(blackbox->getXDisplay(),
+ XSetWindowBackground(otk::OBDisplay::display,
frame.left_grip, frame.ugrip_pixel);
- XSetWindowBackground(blackbox->getXDisplay(),
+ XSetWindowBackground(otk::OBDisplay::display,
frame.right_grip, frame.ugrip_pixel);
}
}
- XClearWindow(blackbox->getXDisplay(), frame.handle);
- XClearWindow(blackbox->getXDisplay(), frame.left_grip);
- XClearWindow(blackbox->getXDisplay(), frame.right_grip);
+ XClearWindow(otk::OBDisplay::display, frame.handle);
+ XClearWindow(otk::OBDisplay::display, frame.left_grip);
+ XClearWindow(otk::OBDisplay::display, frame.right_grip);
}
if (decorations & Decor_Border) {
if (flags.focused)
- XSetWindowBorder(blackbox->getXDisplay(),
+ XSetWindowBorder(otk::OBDisplay::display,
frame.plate, frame.fborder_pixel);
else
- XSetWindowBorder(blackbox->getXDisplay(),
+ XSetWindowBorder(otk::OBDisplay::display,
frame.plate, frame.uborder_pixel);
}
}
void BlackboxWindow::installColormap(bool install) {
int i = 0, ncmap = 0;
- Colormap *cmaps = XListInstalledColormaps(blackbox->getXDisplay(),
+ Colormap *cmaps = XListInstalledColormaps(otk::OBDisplay::display,
client.window, &ncmap);
if (cmaps) {
XWindowAttributes wattrib;
- if (XGetWindowAttributes(blackbox->getXDisplay(),
+ if (XGetWindowAttributes(otk::OBDisplay::display,
client.window, &wattrib)) {
if (install) {
// install the window's colormap
}
// otherwise, install the window's colormap
if (install)
- XInstallColormap(blackbox->getXDisplay(), wattrib.colormap);
+ XInstallColormap(otk::OBDisplay::display, wattrib.colormap);
} else {
// uninstall the window's colormap
for (i = 0; i < ncmap; i++) {
if (*(cmaps + i) == wattrib.colormap)
// we found the colormap to uninstall
- XUninstallColormap(blackbox->getXDisplay(), wattrib.colormap);
+ XUninstallColormap(otk::OBDisplay::display, wattrib.colormap);
}
}
}
* Positions the Rect r according the the client window position and
* window gravity.
*/
-void BlackboxWindow::applyGravity(Rect &r) {
+void BlackboxWindow::applyGravity(otk::Rect &r) {
// apply horizontal window gravity
switch (client.win_gravity) {
default:
* Positions the Rect r according to the frame window position and
* window gravity.
*/
-void BlackboxWindow::restoreGravity(Rect &r) {
+void BlackboxWindow::restoreGravity(otk::Rect &r) {
// restore horizontal window gravity
switch (client.win_gravity) {
default:
void BlackboxWindow::redrawLabel(void) const {
if (flags.focused) {
if (frame.flabel)
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display,
frame.label, frame.flabel);
else
- XSetWindowBackground(blackbox->getXDisplay(),
+ XSetWindowBackground(otk::OBDisplay::display,
frame.label, frame.flabel_pixel);
} else {
if (frame.ulabel)
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(),
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display,
frame.label, frame.ulabel);
else
- XSetWindowBackground(blackbox->getXDisplay(),
+ XSetWindowBackground(otk::OBDisplay::display,
frame.label, frame.ulabel_pixel);
}
- XClearWindow(blackbox->getXDisplay(), frame.label);
+ XClearWindow(otk::OBDisplay::display, frame.label);
WindowStyle *style = screen->getWindowStyle();
}
if (p)
- XSetWindowBackgroundPixmap(blackbox->getXDisplay(), win, p);
+ XSetWindowBackgroundPixmap(otk::OBDisplay::display, win, p);
else
- XSetWindowBackground(blackbox->getXDisplay(), win, pix);
+ XSetWindowBackground(otk::OBDisplay::display, win, pix);
}
frame.fbutton, frame.fbutton_pixel,
frame.ubutton, frame.ubutton_pixel);
- XClearWindow(blackbox->getXDisplay(), frame.iconify_button);
- BPen pen((flags.focused) ? screen->getWindowStyle()->b_pic_focus :
- screen->getWindowStyle()->b_pic_unfocus);
+ XClearWindow(otk::OBDisplay::display, frame.iconify_button);
+ otk::BPen pen((flags.focused) ? screen->getWindowStyle()->b_pic_focus :
+ screen->getWindowStyle()->b_pic_unfocus);
PixmapMask pm = screen->getWindowStyle()->icon_button;
if (screen->getWindowStyle()->icon_button.mask != None) {
- XSetClipMask(blackbox->getXDisplay(), pen.gc(), pm.mask);
- XSetClipOrigin(blackbox->getXDisplay(), pen.gc(),
+ XSetClipMask(otk::OBDisplay::display, pen.gc(), pm.mask);
+ XSetClipOrigin(otk::OBDisplay::display, pen.gc(),
(frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2);
- XFillRectangle(blackbox->getXDisplay(), frame.iconify_button, pen.gc(),
+ XFillRectangle(otk::OBDisplay::display, frame.iconify_button, pen.gc(),
(frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2,
(frame.button_w + pm.w)/2, (frame.button_w + pm.h)/2);
- XSetClipMask(blackbox->getXDisplay(), pen.gc(), None);
- XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0);
+ XSetClipMask(otk::OBDisplay::display, pen.gc(), None);
+ XSetClipOrigin(otk::OBDisplay::display, pen.gc(), 0, 0);
} else {
- XDrawRectangle(blackbox->getXDisplay(), frame.iconify_button, pen.gc(),
+ XDrawRectangle(otk::OBDisplay::display, frame.iconify_button, pen.gc(),
2, (frame.button_w - 5), (frame.button_w - 5), 2);
}
}
frame.fbutton, frame.fbutton_pixel,
frame.ubutton, frame.ubutton_pixel);
- XClearWindow(blackbox->getXDisplay(), frame.maximize_button);
+ XClearWindow(otk::OBDisplay::display, frame.maximize_button);
- BPen pen((flags.focused) ? screen->getWindowStyle()->b_pic_focus :
- screen->getWindowStyle()->b_pic_unfocus);
+ otk::BPen pen((flags.focused) ? screen->getWindowStyle()->b_pic_focus :
+ screen->getWindowStyle()->b_pic_unfocus);
PixmapMask pm = screen->getWindowStyle()->max_button;
if (pm.mask != None) {
- XSetClipMask(blackbox->getXDisplay(), pen.gc(), pm.mask);
- XSetClipOrigin(blackbox->getXDisplay(), pen.gc(),
+ XSetClipMask(otk::OBDisplay::display, pen.gc(), pm.mask);
+ XSetClipOrigin(otk::OBDisplay::display, pen.gc(),
(frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2);
- XFillRectangle(blackbox->getXDisplay(), frame.maximize_button, pen.gc(),
+ XFillRectangle(otk::OBDisplay::display, frame.maximize_button, pen.gc(),
(frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2,
(frame.button_w + pm.w)/2, (frame.button_w + pm.h)/2);
- XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0 );
- XSetClipMask( blackbox->getXDisplay(), pen.gc(), None );
+ XSetClipOrigin(otk::OBDisplay::display, pen.gc(), 0, 0 );
+ XSetClipMask( otk::OBDisplay::display, pen.gc(), None );
} else {
- XDrawRectangle(blackbox->getXDisplay(), frame.maximize_button, pen.gc(),
+ XDrawRectangle(otk::OBDisplay::display, frame.maximize_button, pen.gc(),
2, 2, (frame.button_w - 5), (frame.button_w - 5));
- XDrawLine(blackbox->getXDisplay(), frame.maximize_button, pen.gc(),
+ XDrawLine(otk::OBDisplay::display, frame.maximize_button, pen.gc(),
2, 3, (frame.button_w - 3), 3);
}
}
frame.fbutton, frame.fbutton_pixel,
frame.ubutton, frame.ubutton_pixel);
- XClearWindow(blackbox->getXDisplay(), frame.close_button);
+ XClearWindow(otk::OBDisplay::display, frame.close_button);
- BPen pen((flags.focused) ? screen->getWindowStyle()->b_pic_focus :
- screen->getWindowStyle()->b_pic_unfocus);
+ otk::BPen pen((flags.focused) ? screen->getWindowStyle()->b_pic_focus :
+ screen->getWindowStyle()->b_pic_unfocus);
PixmapMask pm = screen->getWindowStyle()->close_button;
if (pm.mask != None) {
- XSetClipMask(blackbox->getXDisplay(), pen.gc(), pm.mask);
- XSetClipOrigin(blackbox->getXDisplay(), pen.gc(),
+ XSetClipMask(otk::OBDisplay::display, pen.gc(), pm.mask);
+ XSetClipOrigin(otk::OBDisplay::display, pen.gc(),
(frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2);
- XFillRectangle(blackbox->getXDisplay(), frame.close_button, pen.gc(),
+ XFillRectangle(otk::OBDisplay::display, frame.close_button, pen.gc(),
(frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2,
(frame.button_w + pm.w)/2, (frame.button_w + pm.h)/2);
- XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0 );
- XSetClipMask( blackbox->getXDisplay(), pen.gc(), None );
+ XSetClipOrigin(otk::OBDisplay::display, pen.gc(), 0, 0 );
+ XSetClipMask( otk::OBDisplay::display, pen.gc(), None );
} else {
- XDrawLine(blackbox->getXDisplay(), frame.close_button, pen.gc(),
+ XDrawLine(otk::OBDisplay::display, frame.close_button, pen.gc(),
2, 2, (frame.button_w - 3), (frame.button_w - 3));
- XDrawLine(blackbox->getXDisplay(), frame.close_button, pen.gc(),
+ XDrawLine(otk::OBDisplay::display, frame.close_button, pen.gc(),
2, (frame.button_w - 3), (frame.button_w - 3), 2);
}
}
frame.fbutton, frame.fbutton_pixel,
frame.ubutton, frame.ubutton_pixel);
- XClearWindow(blackbox->getXDisplay(), frame.stick_button);
+ XClearWindow(otk::OBDisplay::display, frame.stick_button);
- BPen pen((flags.focused) ? screen->getWindowStyle()->b_pic_focus :
- screen->getWindowStyle()->b_pic_unfocus);
+ otk::BPen pen((flags.focused) ? screen->getWindowStyle()->b_pic_focus :
+ screen->getWindowStyle()->b_pic_unfocus);
PixmapMask pm = screen->getWindowStyle()->stick_button;
if (pm.mask != None) {
- XSetClipMask(blackbox->getXDisplay(), pen.gc(), pm.mask);
- XSetClipOrigin(blackbox->getXDisplay(), pen.gc(),
+ XSetClipMask(otk::OBDisplay::display, pen.gc(), pm.mask);
+ XSetClipOrigin(otk::OBDisplay::display, pen.gc(),
(frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2);
- XFillRectangle(blackbox->getXDisplay(), frame.stick_button, pen.gc(),
+ XFillRectangle(otk::OBDisplay::display, frame.stick_button, pen.gc(),
(frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2,
(frame.button_w + pm.w)/2, (frame.button_w + pm.h)/2);
- XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0 );
- XSetClipMask( blackbox->getXDisplay(), pen.gc(), None );
+ XSetClipOrigin(otk::OBDisplay::display, pen.gc(), 0, 0 );
+ XSetClipMask( otk::OBDisplay::display, pen.gc(), None );
} else {
- XFillRectangle(blackbox->getXDisplay(), frame.stick_button, pen.gc(),
+ XFillRectangle(otk::OBDisplay::display, frame.stick_button, pen.gc(),
frame.button_w/2 - 1, frame.button_w/2 -1, 2, 2 );
}
}
show();
screen->getWorkspace(blackbox_attrib.workspace)->raiseWindow(this);
if (isNormal()) {
- if (! blackbox->isStartup()) {
- XSync(blackbox->getXDisplay(), False); // make sure the frame is mapped
+ if (blackbox->state() != Openbox::State_Starting) {
+ XSync(otk::OBDisplay::display, False); // make sure the frame is mapped
if (screen->doFocusNew() || (isTransient() && getTransientFor() &&
getTransientFor()->isFocused())) {
setInputFocus();
int x, y, rx, ry;
Window c, r;
unsigned int m;
- XQueryPointer(blackbox->getXDisplay(), screen->getRootWindow(),
+ XQueryPointer(otk::OBDisplay::display, screen->getRootWindow(),
&r, &c, &rx, &ry, &x, &y, &m);
beginMove(rx, ry);
}
XEvent ev;
ev.xreparent = *re;
- XPutBackEvent(blackbox->getXDisplay(), &ev);
+ XPutBackEvent(otk::OBDisplay::display, &ev);
screen->unmanageWindow(this, True);
}
setupDecor();
}
- Rect old_rect = frame.rect;
+ otk::Rect old_rect = frame.rect;
upsize();
createCloseButton();
if (decorations & Decor_Titlebar) {
positionButtons(True);
- XMapSubwindows(blackbox->getXDisplay(), frame.title);
+ XMapSubwindows(otk::OBDisplay::display, frame.title);
}
}
} else if (pe->atom == xatom->getAtom(XAtom::net_wm_strut)) {
} else if (frame.plate == be->window) {
screen->getWorkspace(blackbox_attrib.workspace)->raiseWindow(this);
- XAllowEvents(blackbox->getXDisplay(), ReplayPointer, be->time);
+ XAllowEvents(otk::OBDisplay::display, ReplayPointer, be->time);
} else {
if (frame.title == be->window || frame.label == be->window) {
if (((be->time - lastButtonPressTime) <=
endResize();
} else if (re->window == frame.window) {
if (re->button == 2 && re->state == mod_mask)
- XUngrabPointer(blackbox->getXDisplay(), CurrentTime);
+ XUngrabPointer(otk::OBDisplay::display, CurrentTime);
}
}
changing->endResize();
}
- XGrabPointer(blackbox->getXDisplay(), frame.window, False,
+ XGrabPointer(otk::OBDisplay::display, frame.window, False,
PointerMotionMask | ButtonReleaseMask,
GrabModeAsync, GrabModeAsync,
None, blackbox->getMoveCursor(), CurrentTime);
blackbox->setChangingWindow(this);
if (! screen->doOpaqueMove()) {
- XGrabServer(blackbox->getXDisplay());
+ XGrabServer(otk::OBDisplay::display);
frame.changing = frame.rect;
screen->showPosition(frame.changing.x(), frame.changing.y());
- XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
+ XDrawRectangle(otk::OBDisplay::display, screen->getRootWindow(),
screen->getOpGC(),
frame.changing.x(),
frame.changing.y(),
configure(dx, dy, frame.rect.width(), frame.rect.height());
} else {
- XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
+ XDrawRectangle(otk::OBDisplay::display, screen->getRootWindow(),
screen->getOpGC(),
frame.changing.x(),
frame.changing.y(),
frame.changing.setPos(dx, dy);
- XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
+ XDrawRectangle(otk::OBDisplay::display, screen->getRootWindow(),
screen->getOpGC(),
frame.changing.x(),
frame.changing.y(),
screen->changeWorkspaceID(dest);
if (screen->doOpaqueMove())
- XGrabServer(blackbox->getXDisplay());
+ XGrabServer(otk::OBDisplay::display);
- XUngrabPointer(blackbox->getXDisplay(), CurrentTime);
- XWarpPointer(blackbox->getXDisplay(), None,
+ XUngrabPointer(otk::OBDisplay::display, CurrentTime);
+ XWarpPointer(otk::OBDisplay::display, None,
screen->getRootWindow(), 0, 0, 0, 0,
dest_x, y_root);
- XGrabPointer(blackbox->getXDisplay(), frame.window, False,
+ XGrabPointer(otk::OBDisplay::display, frame.window, False,
PointerMotionMask | ButtonReleaseMask,
GrabModeAsync, GrabModeAsync,
None, blackbox->getMoveCursor(), CurrentTime);
if (screen->doOpaqueMove())
- XUngrabServer(blackbox->getXDisplay());
+ XUngrabServer(otk::OBDisplay::display);
if (focus)
setInputFocus();
const int snap_offset = screen->getSnapOffset();
// find the geomeetery where the moving window currently is
- const Rect &moving = screen->doOpaqueMove() ? frame.rect : frame.changing;
+ const otk::Rect &moving =
+ screen->doOpaqueMove() ? frame.rect : frame.changing;
// window corners
const int wleft = dx,
wbottom = dy + frame.rect.height() - 1;
if (snap_to_windows) {
- RectList rectlist;
+ otk::RectList rectlist;
Workspace *w = screen->getWorkspace(getWorkspaceNumber());
assert(w);
if (*st_it != this) // don't snap to ourself
rectlist.push_back( (*st_it)->frameRect() );
- RectList::const_iterator it, end = rectlist.end();
+ otk::RectList::const_iterator it, end = rectlist.end();
for (it = rectlist.begin(); it != end; ++it) {
bool snapped = False;
- const Rect &winrect = *it;
- Rect offsetrect;
+ const otk::Rect &winrect = *it;
+ otk::Rect offsetrect;
offsetrect.setCoords(winrect.left() - snap_offset,
winrect.top() - snap_offset,
winrect.right() + snap_offset,
}
if (snap_to_edges) {
- RectList rectlist;
+ otk::RectList rectlist;
// snap to the screen edges (and screen boundaries for xinerama)
#ifdef XINERAMA
#endif // XINERAMA
rectlist.push_back(screen->getRect());
- RectList::const_iterator it, end = rectlist.end();
+ otk::RectList::const_iterator it, end = rectlist.end();
for (it = rectlist.begin(); it != end; ++it) {
- const Rect &srect = *it;
- Rect offsetrect;
+ const otk::Rect &srect = *it;
+ otk::Rect offsetrect;
offsetrect.setCoords(srect.left() + snap_offset,
srect.top() + snap_offset,
srect.right() - snap_offset,
continue;
} else { // BScreen::WindowSnap
// if we're not in the rectangle then don't snap to it.
- if (! srect.intersects(Rect(wleft, wtop, frame.rect.width(),
- frame.rect.height())))
+ if (! srect.intersects(otk::Rect(wleft, wtop, frame.rect.width(),
+ frame.rect.height())))
continue;
}
* so we need to subtract 1 from changing_w/changing_h every where we
* draw the rubber band (for both moving and resizing)
*/
- XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
+ XDrawRectangle(otk::OBDisplay::display, screen->getRootWindow(),
screen->getOpGC(), frame.changing.x(), frame.changing.y(),
frame.changing.width() - 1, frame.changing.height() - 1);
- XUngrabServer(blackbox->getXDisplay());
+ XUngrabServer(otk::OBDisplay::display);
configure(frame.changing.x(), frame.changing.y(),
frame.changing.width(), frame.changing.height());
}
screen->hideGeometry();
- XUngrabPointer(blackbox->getXDisplay(), CurrentTime);
+ XUngrabPointer(otk::OBDisplay::display, CurrentTime);
// if there are any left over motions from the move, drop them now
- XSync(blackbox->getXDisplay(), false); // make sure we don't miss any
+ XSync(otk::OBDisplay::display, false); // make sure we don't miss any
XEvent e;
- while (XCheckTypedWindowEvent(blackbox->getXDisplay(), frame.window,
+ while (XCheckTypedWindowEvent(otk::OBDisplay::display, frame.window,
MotionNotify, &e));
}
return; // unreachable, for the compiler
}
- XGrabServer(blackbox->getXDisplay());
- XGrabPointer(blackbox->getXDisplay(), frame.window, False,
+ XGrabServer(otk::OBDisplay::display);
+ XGrabPointer(otk::OBDisplay::display, frame.window, False,
PointerMotionMask | ButtonReleaseMask,
GrabModeAsync, GrabModeAsync, None, cursor, CurrentTime);
constrain(anchor, &gw, &gh);
- XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
+ XDrawRectangle(otk::OBDisplay::display, screen->getRootWindow(),
screen->getOpGC(), frame.changing.x(), frame.changing.y(),
frame.changing.width() - 1, frame.changing.height() - 1);
assert(flags.resizing);
assert(blackbox->getChangingWindow() == this);
- XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
+ XDrawRectangle(otk::OBDisplay::display, screen->getRootWindow(),
screen->getOpGC(), frame.changing.x(), frame.changing.y(),
frame.changing.width() - 1, frame.changing.height() - 1);
constrain(anchor, &gw, &gh);
- XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
+ XDrawRectangle(otk::OBDisplay::display, screen->getRootWindow(),
screen->getOpGC(), frame.changing.x(), frame.changing.y(),
frame.changing.width() - 1, frame.changing.height() - 1);
assert(flags.resizing);
assert(blackbox->getChangingWindow() == this);
- XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
+ XDrawRectangle(otk::OBDisplay::display, screen->getRootWindow(),
screen->getOpGC(), frame.changing.x(), frame.changing.y(),
frame.changing.width() - 1, frame.changing.height() - 1);
- XUngrabServer(blackbox->getXDisplay());
+ XUngrabServer(otk::OBDisplay::display);
// unset maximized state after resized when fully maximized
if (flags.maximized == 1)
frame.changing.width(), frame.changing.height());
screen->hideGeometry();
- XUngrabPointer(blackbox->getXDisplay(), CurrentTime);
+ XUngrabPointer(otk::OBDisplay::display, CurrentTime);
// if there are any left over motions from the resize, drop them now
- XSync(blackbox->getXDisplay(), false); // make sure we don't miss any
+ XSync(otk::OBDisplay::display, false); // make sure we don't miss any
XEvent e;
- while (XCheckTypedWindowEvent(blackbox->getXDisplay(), frame.window,
+ while (XCheckTypedWindowEvent(otk::OBDisplay::display, frame.window,
MotionNotify, &e));
}
XEvent e;
bool leave = False, inferior = False;
- while (XCheckTypedWindowEvent(blackbox->getXDisplay(), ce->window,
+ while (XCheckTypedWindowEvent(otk::OBDisplay::display, ce->window,
LeaveNotify, &e)) {
if (e.type == LeaveNotify && e.xcrossing.mode == NotifyNormal) {
leave = True;
bool BlackboxWindow::validateClient(void) const {
- XSync(blackbox->getXDisplay(), False);
+ XSync(otk::OBDisplay::display, False);
XEvent e;
- if (XCheckTypedWindowEvent(blackbox->getXDisplay(), client.window,
+ if (XCheckTypedWindowEvent(otk::OBDisplay::display, client.window,
DestroyNotify, &e) ||
- XCheckTypedWindowEvent(blackbox->getXDisplay(), client.window,
+ XCheckTypedWindowEvent(otk::OBDisplay::display, client.window,
UnmapNotify, &e)) {
- XPutBackEvent(blackbox->getXDisplay(), &e);
+ XPutBackEvent(otk::OBDisplay::display, &e);
return False;
}
void BlackboxWindow::restore(bool remap) {
- XChangeSaveSet(blackbox->getXDisplay(), client.window, SetModeDelete);
- XSelectInput(blackbox->getXDisplay(), client.window, NoEventMask);
- XSelectInput(blackbox->getXDisplay(), frame.plate, NoEventMask);
+ XChangeSaveSet(otk::OBDisplay::display, client.window, SetModeDelete);
+ XSelectInput(otk::OBDisplay::display, client.window, NoEventMask);
+ XSelectInput(otk::OBDisplay::display, frame.plate, NoEventMask);
// do not leave a shaded window as an icon unless it was an icon
if (flags.shaded && ! flags.iconic)
restoreGravity(client.rect);
- XUnmapWindow(blackbox->getXDisplay(), frame.window);
- XUnmapWindow(blackbox->getXDisplay(), client.window);
+ XUnmapWindow(otk::OBDisplay::display, frame.window);
+ XUnmapWindow(otk::OBDisplay::display, client.window);
- XSetWindowBorderWidth(blackbox->getXDisplay(), client.window, client.old_bw);
+ XSetWindowBorderWidth(otk::OBDisplay::display, client.window, client.old_bw);
XEvent ev;
- if (XCheckTypedWindowEvent(blackbox->getXDisplay(), client.window,
+ if (XCheckTypedWindowEvent(otk::OBDisplay::display, client.window,
ReparentNotify, &ev)) {
remap = True;
} else {
// according to the ICCCM - if the client doesn't reparent to
// root, then we have to do it for them
- XReparentWindow(blackbox->getXDisplay(), client.window,
+ XReparentWindow(otk::OBDisplay::display, client.window,
screen->getRootWindow(),
client.rect.x(), client.rect.y());
}
- if (remap) XMapWindow(blackbox->getXDisplay(), client.window);
+ if (remap) XMapWindow(otk::OBDisplay::display, client.window);
}
BWindowGroup::BWindowGroup(Blackbox *b, Window _group)
: blackbox(b), group(_group) {
XWindowAttributes wattrib;
- if (! XGetWindowAttributes(blackbox->getXDisplay(), group, &wattrib)) {
+ if (! XGetWindowAttributes(otk::OBDisplay::display, group, &wattrib)) {
// group window doesn't seem to exist anymore
delete this;
return;
}
- XSelectInput(blackbox->getXDisplay(), group,
+ XSelectInput(otk::OBDisplay::display, group,
PropertyChangeMask | FocusChangeMask | StructureNotifyMask);
blackbox->saveGroupSearch(group, this);
return ret;
}
+
+}
projects / chaz / openbox / blobdiff