#include "Toolbar.h"
-Slit::Slit(BScreen *scr) {
- screen = scr;
- openbox = screen->getOpenbox();
+Slit::Slit(BScreen &scr) : screen(scr), openbox(scr.getOpenbox()) {
+ on_top = screen.isSlitOnTop();
+ hidden = do_auto_hide = screen.doSlitAutoHide();
- on_top = screen->isSlitOnTop();
- hidden = do_auto_hide = screen->doSlitAutoHide();
-
- display = screen->getBaseDisplay()->getXDisplay();
+ display = screen.getBaseDisplay().getXDisplay();
frame.window = frame.pixmap = None;
- timer = new BTimer(*openbox, *this);
- timer->setTimeout(openbox->getAutoRaiseDelay());
+ timer = new BTimer(openbox, *this);
+ timer->setTimeout(openbox.getAutoRaiseDelay());
timer->fireOnce(True);
clientList = new LinkedList<SlitClient>;
CWColormap | CWOverrideRedirect | CWEventMask;
attrib.background_pixmap = None;
attrib.background_pixel = attrib.border_pixel =
- screen->getBorderColor()->getPixel();
- attrib.colormap = screen->getColormap();
+ screen.getBorderColor()->getPixel();
+ attrib.colormap = screen.getColormap();
attrib.override_redirect = True;
attrib.event_mask = SubstructureRedirectMask | ButtonPressMask |
EnterWindowMask | LeaveWindowMask;
- frame.x = frame.y = 0;
- frame.width = frame.height = 1;
-
+ frame.area = Rect(0, 0, 1, 1);
+
frame.window =
- XCreateWindow(display, screen->getRootWindow(), frame.x, frame.y,
- frame.width, frame.height, screen->getBorderWidth(),
- screen->getDepth(), InputOutput, screen->getVisual(),
+ XCreateWindow(display, screen.getRootWindow(),
+ frame.area.x(), frame.area.y(),
+ frame.area.w(), frame.area.h(), screen.getBorderWidth(),
+ screen.getDepth(), InputOutput, screen.getVisual(),
create_mask, &attrib);
- openbox->saveSlitSearch(frame.window, this);
+ openbox.saveSlitSearch(frame.window, this);
reconfigure();
}
Slit::~Slit() {
- openbox->grab();
+ openbox.grab();
if (timer->isTiming()) timer->stop();
delete timer;
delete clientList;
delete slitmenu;
- screen->getImageControl()->removeImage(frame.pixmap);
+ screen.getImageControl()->removeImage(frame.pixmap);
- openbox->removeSlitSearch(frame.window);
+ openbox.removeSlitSearch(frame.window);
XDestroyWindow(display, frame.window);
- openbox->ungrab();
+ openbox.ungrab();
}
void Slit::addClient(Window w) {
- openbox->grab();
+ openbox.grab();
- if (openbox->validateWindow(w)) {
+ if (openbox.validateWindow(w)) {
SlitClient *client = new SlitClient;
client->client_window = w;
if (wmhints) {
if ((wmhints->flags & IconWindowHint) &&
(wmhints->icon_window != None)) {
- XMoveWindow(display, client->client_window, screen->getWidth() + 10,
- screen->getHeight() + 10);
+ XMoveWindow(display, client->client_window, screen.size().w() + 10,
+ screen.size().h() + 10);
XMapWindow(display, client->client_window);
client->icon_window = wmhints->icon_window;
clientList->insert(client);
- openbox->saveSlitSearch(client->client_window, this);
- openbox->saveSlitSearch(client->icon_window, this);
+ openbox.saveSlitSearch(client->client_window, this);
+ openbox.saveSlitSearch(client->icon_window, this);
reconfigure();
}
- openbox->ungrab();
+ openbox.ungrab();
}
void Slit::removeClient(SlitClient *client, Bool remap) {
- openbox->removeSlitSearch(client->client_window);
- openbox->removeSlitSearch(client->icon_window);
+ openbox.removeSlitSearch(client->client_window);
+ openbox.removeSlitSearch(client->icon_window);
clientList->remove(client);
- screen->removeNetizen(client->window);
+ screen.removeNetizen(client->window);
- if (remap && openbox->validateWindow(client->window)) {
+ if (remap && openbox.validateWindow(client->window)) {
XSelectInput(display, frame.window, NoEventMask);
XSelectInput(display, client->window, NoEventMask);
- XReparentWindow(display, client->window, screen->getRootWindow(),
+ XReparentWindow(display, client->window, screen.getRootWindow(),
client->x, client->y);
XChangeSaveSet(display, client->window, SetModeDelete);
XSelectInput(display, frame.window, SubstructureRedirectMask |
void Slit::removeClient(Window w, Bool remap) {
- openbox->grab();
+ openbox.grab();
Bool reconf = False;
if (reconf) reconfigure();
- openbox->ungrab();
+ openbox.ungrab();
}
void Slit::reconfigure(void) {
- frame.width = 0;
- frame.height = 0;
+ frame.area.setSize(0, 0);
LinkedListIterator<SlitClient> it(clientList);
SlitClient *client;
- switch (screen->getSlitDirection()) {
+ switch (screen.getSlitDirection()) {
case Vertical:
for (client = it.current(); client; it++, client = it.current()) {
- frame.height += client->height + screen->getBevelWidth();
+ frame.area.setH(frame.area.h() + client->height + screen.getBevelWidth());
- if (frame.width < client->width)
- frame.width = client->width;
+ if (frame.area.w() < client->width)
+ frame.area.setW(client->width);
}
- if (frame.width < 1)
- frame.width = 1;
+ if (frame.area.w() < 1)
+ frame.area.setW(1);
else
- frame.width += (screen->getBevelWidth() * 2);
+ frame.area.setW(frame.area.w() + (screen.getBevelWidth() * 2));
- if (frame.height < 1)
- frame.height = 1;
+ if (frame.area.h() < 1)
+ frame.area.setH(1);
else
- frame.height += screen->getBevelWidth();
+ frame.area.setH(frame.area.h() + screen.getBevelWidth());
break;
case Horizontal:
for (client = it.current(); client; it++, client = it.current()) {
- frame.width += client->width + screen->getBevelWidth();
+ frame.area.setW(frame.area.w() + client->width + screen.getBevelWidth());
- if (frame.height < client->height)
- frame.height = client->height;
+ if (frame.area.h() < client->height)
+ frame.area.setH(client->height);
}
- if (frame.width < 1)
- frame.width = 1;
+ if (frame.area.w() < 1)
+ frame.area.setW(1);
else
- frame.width += screen->getBevelWidth();
+ frame.area.setW(frame.area.w() + screen.getBevelWidth());
- if (frame.height < 1)
- frame.height = 1;
+ if (frame.area.h() < 1)
+ frame.area.setH(1);
else
- frame.height += (screen->getBevelWidth() * 2);
+ frame.area.setH(frame.area.h() + (screen.getBevelWidth() * 2));
break;
}
reposition();
- XSetWindowBorderWidth(display ,frame.window, screen->getBorderWidth());
+ XSetWindowBorderWidth(display ,frame.window, screen.getBorderWidth());
XSetWindowBorder(display, frame.window,
- screen->getBorderColor()->getPixel());
+ screen.getBorderColor()->getPixel());
if (! clientList->count())
XUnmapWindow(display, frame.window);
XMapWindow(display, frame.window);
Pixmap tmp = frame.pixmap;
- BImageControl *image_ctrl = screen->getImageControl();
- BTexture *texture = &(screen->getToolbarStyle()->toolbar);
+ BImageControl *image_ctrl = screen.getImageControl();
+ BTexture *texture = &(screen.getToolbarStyle()->toolbar);
if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
frame.pixmap = None;
XSetWindowBackground(display, frame.window,
texture->getColor()->getPixel());
} else {
- frame.pixmap = image_ctrl->renderImage(frame.width, frame.height,
+ frame.pixmap = image_ctrl->renderImage(frame.area.w(), frame.area.h(),
texture);
XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap);
}
int x, y;
it.reset();
- switch (screen->getSlitDirection()) {
+ switch (screen.getSlitDirection()) {
case Vertical:
x = 0;
- y = screen->getBevelWidth();
+ y = screen.getBevelWidth();
for (client = it.current(); client; it++, client = it.current()) {
- x = (frame.width - client->width) / 2;
+ x = (frame.area.w() - client->width) / 2;
XMoveResizeWindow(display, client->window, x, y,
client->width, client->height);
XSendEvent(display, client->window, False, StructureNotifyMask, &event);
- y += client->height + screen->getBevelWidth();
+ y += client->height + screen.getBevelWidth();
}
break;
case Horizontal:
- x = screen->getBevelWidth();
+ x = screen.getBevelWidth();
y = 0;
for (client = it.current(); client; it++, client = it.current()) {
- y = (frame.height - client->height) / 2;
+ y = (frame.area.h() - client->height) / 2;
XMoveResizeWindow(display, client->window, x, y,
client->width, client->height);
XSendEvent(display, client->window, False, StructureNotifyMask, &event);
- x += client->width + screen->getBevelWidth();
+ x += client->width + screen.getBevelWidth();
}
break;
void Slit::reposition(void) {
// place the slit in the appropriate place
- switch (screen->getSlitPlacement()) {
+ switch (screen.getSlitPlacement()) {
case TopLeft:
- frame.x = 0;
- frame.y = 0;
- if (screen->getSlitDirection() == Vertical) {
- frame.x_hidden = screen->getBevelWidth() - screen->getBorderWidth()
- - frame.width;
- frame.y_hidden = 0;
+ frame.area.setOrigin(0, 0);
+ if (screen.getSlitDirection() == Vertical) {
+ frame.hidden = Point(screen.getBevelWidth() - screen.getBorderWidth()
+ - frame.area.w(), 0);
} else {
- frame.x_hidden = 0;
- frame.y_hidden = screen->getBevelWidth() - screen->getBorderWidth()
- - frame.height;
+ frame.hidden = Point(0, screen.getBevelWidth() - screen.getBorderWidth()
+ - frame.area.h());
}
break;
case CenterLeft:
- frame.x = 0;
- frame.y = (screen->getHeight() - frame.height) / 2;
- frame.x_hidden = screen->getBevelWidth() - screen->getBorderWidth()
- - frame.width;
- frame.y_hidden = frame.y;
+ frame.area.setOrigin(0, (screen.size().h() - frame.area.h()) / 2);
+ frame.hidden = Point(screen.getBevelWidth() - screen.getBorderWidth()
+ - frame.area.w(), frame.area.y());
break;
case BottomLeft:
- frame.x = 0;
- frame.y = screen->getHeight() - frame.height
- - (screen->getBorderWidth() * 2);
- if (screen->getSlitDirection() == Vertical) {
- frame.x_hidden = screen->getBevelWidth() - screen->getBorderWidth()
- - frame.width;
- frame.y_hidden = frame.y;
- } else {
- frame.x_hidden = 0;
- frame.y_hidden = screen->getHeight() - screen->getBevelWidth()
- - screen->getBorderWidth();
- }
+ frame.area.setOrigin(0, screen.size().h() - frame.area.h()
+ - (screen.getBorderWidth() * 2));
+ if (screen.getSlitDirection() == Vertical)
+ frame.hidden = Point(screen.getBevelWidth() - screen.getBorderWidth()
+ - frame.area.w(), frame.area.y());
+ else
+ frame.hidden = Point(0, screen.size().h() - screen.getBevelWidth()
+ - screen.getBorderWidth());
break;
case TopCenter:
- frame.x = (screen->getWidth() - frame.width) / 2;
- frame.y = 0;
- frame.x_hidden = frame.x;
- frame.y_hidden = screen->getBevelWidth() - screen->getBorderWidth()
- - frame.height;
+ frame.area.setOrigin((screen.size().w() - frame.area.w()) / 2, 0);
+ frame.hidden = Point(frame.area.x(), screen.getBevelWidth()
+ - screen.getBorderWidth() - frame.area.h());
break;
case BottomCenter:
- frame.x = (screen->getWidth() - frame.width) / 2;
- frame.y = screen->getHeight() - frame.height
- - (screen->getBorderWidth() * 2);
- frame.x_hidden = frame.x;
- frame.y_hidden = screen->getHeight() - screen->getBevelWidth()
- - screen->getBorderWidth();
+ frame.area.setOrigin((screen.size().w() - frame.area.w()) / 2,
+ screen.size().h() - frame.area.h()
+ - (screen.getBorderWidth() * 2));
+ frame.hidden = Point(frame.area.x(), screen.size().h()
+ - screen.getBevelWidth() - screen.getBorderWidth());
break;
case TopRight:
- frame.x = screen->getWidth() - frame.width
- - (screen->getBorderWidth() * 2);
- frame.y = 0;
- if (screen->getSlitDirection() == Vertical) {
- frame.x_hidden = screen->getWidth() - screen->getBevelWidth()
- - screen->getBorderWidth();
- frame.y_hidden = 0;
- } else {
- frame.x_hidden = frame.x;
- frame.y_hidden = screen->getBevelWidth() - screen->getBorderWidth()
- - frame.height;
- }
+ frame.area.setOrigin(screen.size().w() - frame.area.w()
+ - (screen.getBorderWidth() * 2), 0);
+ if (screen.getSlitDirection() == Vertical)
+ frame.hidden = Point(screen.size().w() - screen.getBevelWidth()
+ - screen.getBorderWidth(), 0);
+ else
+ frame.hidden = Point(frame.area.x(), screen.getBevelWidth()
+ - screen.getBorderWidth() - frame.area.h());
break;
case CenterRight:
default:
- frame.x = screen->getWidth() - frame.width
- - (screen->getBorderWidth() * 2);
- frame.y = (screen->getHeight() - frame.height) / 2;
- frame.x_hidden = screen->getWidth() - screen->getBevelWidth()
- - screen->getBorderWidth();
- frame.y_hidden = frame.y;
+ frame.area.setOrigin(screen.size().w() - frame.area.w()
+ - (screen.getBorderWidth() * 2),
+ (screen.size().h() - frame.area.h()) / 2);
+ frame.hidden = Point(screen.size().w() - screen.getBevelWidth()
+ - screen.getBorderWidth(), frame.area.y());
break;
case BottomRight:
- frame.x = screen->getWidth() - frame.width
- - (screen->getBorderWidth() * 2);
- frame.y = screen->getHeight() - frame.height
- - (screen->getBorderWidth() * 2);
- if (screen->getSlitDirection() == Vertical) {
- frame.x_hidden = screen->getWidth() - screen->getBevelWidth()
- - screen->getBorderWidth();
- frame.y_hidden = frame.y;
- } else {
- frame.x_hidden = frame.x;
- frame.y_hidden = screen->getHeight() - screen->getBevelWidth()
- - screen->getBorderWidth();
- }
+ frame.area.setOrigin(screen.size().w() - frame.area.w()
+ - (screen.getBorderWidth() * 2),
+ screen.size().h() - frame.area.h()
+ - (screen.getBorderWidth() * 2));
+ if (screen.getSlitDirection() == Vertical)
+ frame.hidden = Point(screen.size().w() - screen.getBevelWidth()
+ - screen.getBorderWidth(), frame.area.y());
+ else
+ frame.hidden = Point(frame.area.x(), screen.size().h() - screen.getBevelWidth()
+ - screen.getBorderWidth());
break;
}
- Toolbar *tbar = screen->getToolbar();
- int sw = frame.width + (screen->getBorderWidth() * 2),
- sh = frame.height + (screen->getBorderWidth() * 2),
- tw = tbar->getWidth() + screen->getBorderWidth(),
- th = tbar->getHeight() + screen->getBorderWidth();
-
- if (tbar->getX() < frame.x + sw && tbar->getX() + tw > frame.x &&
- tbar->getY() < frame.y + sh && tbar->getY() + th > frame.y) {
- if (frame.y < th) {
- frame.y += tbar->getExposedHeight();
- if (screen->getSlitDirection() == Vertical)
- frame.y_hidden += tbar->getExposedHeight();
+ Toolbar *tbar = screen.getToolbar();
+ int sw = frame.area.w() + (screen.getBorderWidth() * 2),
+ sh = frame.area.h() + (screen.getBorderWidth() * 2),
+ tw = tbar->getWidth() + screen.getBorderWidth(),
+ th = tbar->getHeight() + screen.getBorderWidth();
+
+ if (tbar->getX() < frame.area.x() + sw && tbar->getX() + tw > frame.area.x() &&
+ tbar->getY() < frame.area.y() + sh && tbar->getY() + th > frame.area.y()) {
+ if (frame.area.y() < th) {
+ frame.area.setY(frame.area.y() + tbar->getExposedHeight());
+ if (screen.getSlitDirection() == Vertical)
+ frame.hidden.setY(frame.hidden.y() + tbar->getExposedHeight());
else
- frame.y_hidden = frame.y;
+ frame.hidden.setY(frame.area.y());
} else {
- frame.y -= tbar->getExposedHeight();
- if (screen->getSlitDirection() == Vertical)
- frame.y_hidden -= tbar->getExposedHeight();
+ frame.area.setY(frame.area.y() - tbar->getExposedHeight());
+ if (screen.getSlitDirection() == Vertical)
+ frame.hidden.setY(frame.area.y() - tbar->getExposedHeight());
else
- frame.y_hidden = frame.y;
+ frame.hidden.setY(frame.area.y());
}
}
if (hidden)
- XMoveResizeWindow(display, frame.window, frame.x_hidden,
- frame.y_hidden, frame.width, frame.height);
+ XMoveResizeWindow(display, frame.window, frame.hidden.x(),
+ frame.hidden.y(), frame.area.w(), frame.area.h());
else
- XMoveResizeWindow(display, frame.window, frame.x,
- frame.y, frame.width, frame.height);
+ XMoveResizeWindow(display, frame.window, frame.area.x(),
+ frame.area.y(), frame.area.w(), frame.area.h());
}
if (e->button == Button1 && (! on_top)) {
Window w[1] = { frame.window };
- screen->raiseWindows(w, 1);
+ screen.raiseWindows(w, 1);
} else if (e->button == Button2 && (! on_top)) {
XLowerWindow(display, frame.window);
} else if (e->button == Button3) {
if (x < 0)
x = 0;
- else if (x + slitmenu->getWidth() > screen->getWidth())
- x = screen->getWidth() - slitmenu->getWidth();
+ else if (x + slitmenu->getWidth() > screen.size().w())
+ x = screen.size().w() - slitmenu->getWidth();
if (y < 0)
y = 0;
- else if (y + slitmenu->getHeight() > screen->getHeight())
- y = screen->getHeight() - slitmenu->getHeight();
+ else if (y + slitmenu->getHeight() > screen.size().h())
+ y = screen.size().h() - slitmenu->getHeight();
slitmenu->move(x, y);
slitmenu->show();
void Slit::configureRequestEvent(XConfigureRequestEvent *e) {
- openbox->grab();
+ openbox.grab();
- if (openbox->validateWindow(e->window)) {
+ if (openbox.validateWindow(e->window)) {
Bool reconf = False;
XWindowChanges xwc;
}
- openbox->ungrab();
+ openbox.ungrab();
}
void Slit::timeout(void) {
hidden = ! hidden;
if (hidden)
- XMoveWindow(display, frame.window, frame.x_hidden, frame.y_hidden);
+ XMoveWindow(display, frame.window, frame.hidden.x(), frame.hidden.y());
else
- XMoveWindow(display, frame.window, frame.x, frame.y);
+ XMoveWindow(display, frame.window, frame.area.x(), frame.area.y());
}
-Slitmenu::Slitmenu(Slit &sl) : Basemenu(*sl.screen), slit(sl) {
+Slitmenu::Slitmenu(Slit &sl) : Basemenu(sl.screen), slit(sl) {
setLabel(i18n->getMessage(SlitSet, SlitSlitTitle, "Slit"));
setInternalMenu();
slit.on_top = change;
setItemSelected(2, change);
- if (slit.isOnTop()) slit.screen->raiseWindows((Window *) 0, 0);
+ if (slit.isOnTop()) slit.screen.raiseWindows((Window *) 0, 0);
break;
}
Slitmenu::Directionmenu::Directionmenu(Slitmenu &sm)
- : Basemenu(*sm.slit.screen), slitmenu(sm) {
+ : Basemenu(sm.slit.screen), slitmenu(sm) {
setLabel(i18n->getMessage(SlitSet, SlitSlitDirection, "Slit Direction"));
setInternalMenu();
update();
- if (sm.slit.screen->getSlitDirection() == Slit::Horizontal)
+ if (sm.slit.screen.getSlitDirection() == Slit::Horizontal)
setItemSelected(0, True);
else
setItemSelected(1, True);
BasemenuItem *item = find(index);
if (! item) return;
- slitmenu.slit.screen->saveSlitDirection(item->function());
+ slitmenu.slit.screen.saveSlitDirection(item->function());
if (item->function() == Slit::Horizontal) {
setItemSelected(0, True);
Slitmenu::Placementmenu::Placementmenu(Slitmenu &sm)
- : Basemenu(*sm.slit.screen), slitmenu(sm) {
+ : Basemenu(sm.slit.screen), slitmenu(sm) {
setLabel(i18n->getMessage(SlitSet, SlitSlitPlacement, "Slit Placement"));
setMinimumSublevels(3);
BasemenuItem *item = find(index);
if (! (item && item->function())) return;
- slitmenu.slit.screen->saveSlitPlacement(item->function());
+ slitmenu.slit.screen.saveSlitPlacement(item->function());
hide();
slitmenu.slit.reconfigure();
}
projects / chaz / openbox / blobdiff