#include "font.hh"
#include "gccache.hh"
#include "image.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
#include "bbwindow.hh"
#include "workspace.hh"
XUngrabServer(otk::OBDisplay::display);
#ifdef SHAPE
- if (blackbox->hasShapeExtensions() && flags.shaped)
+ if (otk::OBDisplay::shape() && flags.shaped)
configureShape();
#endif // SHAPE
XMapSubwindows(otk::OBDisplay::display, frame.plate);
#ifdef SHAPE
- if (blackbox->hasShapeExtensions()) {
+ if (otk::OBDisplay::shape()) {
XShapeSelectInput(otk::OBDisplay::display, client.window,
ShapeNotifyMask);
* move.
*/
void BlackboxWindow::configure(int dx, int dy,
- unsigned int dw, unsigned int dh) {
+ int dw, int dh) {
bool send_event = ((frame.rect.x() != dx || frame.rect.y() != dy) &&
! flags.moving);
frame.rect.bottom() - frame.margin.bottom);
#ifdef SHAPE
- if (blackbox->hasShapeExtensions() && flags.shaped) {
+ if (otk::OBDisplay::shape() && flags.shaped) {
configureShape();
}
#endif // SHAPE
#ifdef SHAPE
void BlackboxWindow::shapeEvent(XShapeEvent *e) {
- if (blackbox->hasShapeExtensions()) {
+ if (otk::OBDisplay::shape()) {
if (! e->shaped && flags.shaped) {
clearShape();
flags.shaped = False;
if (decorations & Decor_Border) {
frame.border_w = screen->getWindowStyle()->getBorderWidth();
if (! isTransient())
- frame.mwm_border_w = screen->getWindowSty2le()->getFrameWidth();
+ frame.mwm_border_w = screen->getWindowStyle()->getFrameWidth();
else
frame.mwm_border_w = 0;
} else {