#include "Slit.h"
#include "Toolbar.h"
+#include <string>
+#include <strstream>
-Slit::Slit(BScreen &scr) : screen(scr), openbox(scr.getOpenbox()) {
- on_top = screen.isSlitOnTop();
- hidden = do_auto_hide = screen.doSlitAutoHide();
-
+Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
+ openbox(scr.getOpenbox()), config(conf)
+{
+ load();
+
display = screen.getBaseDisplay().getXDisplay();
frame.window = frame.pixmap = None;
timer->setTimeout(openbox.getAutoRaiseDelay());
timer->fireOnce(True);
- clientList = new LinkedList<SlitClient>;
-
slitmenu = new Slitmenu(*this);
XSetWindowAttributes attrib;
if (timer->isTiming()) timer->stop();
delete timer;
- delete clientList;
+ clientList.clear();
+
delete slitmenu;
screen.getImageControl()->removeImage(frame.pixmap);
void Slit::addClient(Window w) {
+ cout << "ADDCLIENT\n";
openbox.grab();
if (openbox.validateWindow(w)) {
SubstructureNotifyMask | EnterWindowMask);
XFlush(display);
- clientList->insert(client);
+ clientList.push_back(client);
+ cout << "SLIT COUNT " << clientList.size() << endl;
openbox.saveSlitSearch(client->client_window, this);
openbox.saveSlitSearch(client->icon_window, this);
void Slit::removeClient(SlitClient *client, Bool remap) {
openbox.removeSlitSearch(client->client_window);
openbox.removeSlitSearch(client->icon_window);
- clientList->remove(client);
+
+ clientList.remove(client);
screen.removeNetizen(client->window);
Bool reconf = False;
- LinkedListIterator<SlitClient> it(clientList);
- for (SlitClient *tmp = it.current(); tmp; it++, tmp = it.current()) {
- if (tmp->window == w) {
- removeClient(tmp, remap);
+ slitClientList::iterator it;
+ for (it = clientList.begin(); it != clientList.end(); it++)
+ if ((*it)->window == w) {
+ removeClient(*it, remap);
reconf = True;
-
break;
}
- }
- if (reconf) reconfigure();
+ if (reconf)
+ reconfigure();
openbox.ungrab();
}
+void Slit::setOnTop(bool b) {
+ m_ontop = b;
+ std::ostrstream s;
+ s << "session.screen" << screen.getScreenNumber() << ".slit.onTop" << ends;
+ config.setValue(s.str(), m_ontop ? "True" : "False");
+ s.rdbuf()->freeze(0);
+}
+
+void Slit::setAutoHide(bool b) {
+ m_autohide = b;
+ std::ostrstream s;
+ s << "session.screen" << screen.getScreenNumber() << ".slit.autoHide" << ends;
+ config.setValue(s.str(), m_autohide ? "True" : "False");
+ s.rdbuf()->freeze(0);
+}
+
+void Slit::setPlacement(int p) {
+ m_placement = p;
+ std::ostrstream s;
+ s << "session.screen" << screen.getScreenNumber() << ".slit.placement" <<
+ ends;
+ const char *placement;
+ switch (m_placement) {
+ case TopLeft: placement = "TopLeft"; break;
+ case CenterLeft: placement = "CenterLeft"; break;
+ case BottomLeft: placement = "BottomLeft"; break;
+ case TopCenter: placement = "TopCenter"; break;
+ case BottomCenter: placement = "BottomCenter"; break;
+ case TopRight: placement = "TopRight"; break;
+ case BottomRight: placement = "BottomRight"; break;
+ case CenterRight: default: placement = "CenterRight"; break;
+ }
+ config.setValue(s.str(), placement);
+ s.rdbuf()->freeze(0);
+}
+
+void Slit::setDirection(int d) {
+ m_direction = d;
+ std::ostrstream s;
+ s << "session.screen" << screen.getScreenNumber() << ".slit.direction" <<
+ ends;
+ config.setValue(s.str(),
+ m_direction == Horizontal ? "Horizontal" : "Vertical");
+ s.rdbuf()->freeze(0);
+}
+
+void Slit::save() {
+ setOnTop(m_ontop);
+ setAutoHide(m_autohide);
+ setPlacement(m_placement);
+ setDirection(m_direction);
+}
+
+void Slit::load() {
+ std::ostrstream rscreen, rname, rclass;
+ std::string s;
+ bool b;
+ rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends;
+
+ rname << rscreen.str() << "slit.placement" << ends;
+ rclass << rscreen.str() << "Slit.Placement" << ends;
+ if (config.getValue(rname.str(), rclass.str(), s)) {
+ if (0 == strncasecmp(s.c_str(), "TopLeft", s.length()))
+ m_placement = TopLeft;
+ else if (0 == strncasecmp(s.c_str(), "CenterLeft", s.length()))
+ m_placement = CenterLeft;
+ else if (0 == strncasecmp(s.c_str(), "BottomLeft", s.length()))
+ m_placement = BottomLeft;
+ else if (0 == strncasecmp(s.c_str(), "TopCenter", s.length()))
+ m_placement = TopCenter;
+ else if (0 == strncasecmp(s.c_str(), "BottomCenter", s.length()))
+ m_placement = BottomCenter;
+ else if (0 == strncasecmp(s.c_str(), "TopRight", s.length()))
+ m_placement = TopRight;
+ else if (0 == strncasecmp(s.c_str(), "BottomRight", s.length()))
+ m_placement = BottomRight;
+ else if (0 == strncasecmp(s.c_str(), "CenterRight", s.length()))
+ m_placement = CenterRight;
+ } else
+ m_placement = CenterRight;
+
+ rname.seekp(0); rclass.seekp(0);
+ rname << rscreen.str() << "slit.direction" << ends;
+ rclass << rscreen.str() << "Slit.Direction" << ends;
+ if (config.getValue(rname.str(), rclass.str(), s)) {
+ if (0 == strncasecmp(s.c_str(), "Horizontal", s.length()))
+ m_direction = Horizontal;
+ else if (0 == strncasecmp(s.c_str(), "Vertical", s.length()))
+ m_direction = Vertical;
+ } else
+ m_direction = Vertical;
+
+ rname.seekp(0); rclass.seekp(0);
+ rname << rscreen.str() << "slit.onTop" << ends;
+ rclass << rscreen.str() << "Slit.OnTop" << ends;
+ if (config.getValue(rname.str(), rclass.str(), b))
+ m_ontop = b;
+ else
+ m_ontop = false;
+
+ rname.seekp(0); rclass.seekp(0);
+ rname << rscreen.str() << "slit.autoHide" << ends;
+ rclass << rscreen.str() << "Slit.AutoHide" << ends;
+ if (config.getValue(rname.str(), rclass.str(), b))
+ m_hidden = m_autohide = b;
+ else
+ m_hidden = m_autohide = false;
+
+ rscreen.rdbuf()->freeze(0);
+ rname.rdbuf()->freeze(0);
+ rclass.rdbuf()->freeze(0);
+}
void Slit::reconfigure(void) {
frame.area.setSize(0, 0);
- LinkedListIterator<SlitClient> it(clientList);
- SlitClient *client;
+ slitClientList::const_iterator it;
- switch (screen.getSlitDirection()) {
+ switch (m_direction) {
case Vertical:
- for (client = it.current(); client; it++, client = it.current()) {
- frame.area.setH(frame.area.h() + client->height + screen.getBevelWidth());
+ for (it = clientList.begin(); it != clientList.end(); it++) {
+ frame.area.setH(frame.area.h() + (*it)->height + screen.getBevelWidth());
- if (frame.area.w() < client->width)
- frame.area.setW(client->width);
+ if (frame.area.w() < (*it)->width)
+ frame.area.setW((*it)->width);
}
if (frame.area.w() < 1)
break;
case Horizontal:
- for (client = it.current(); client; it++, client = it.current()) {
- frame.area.setW(frame.area.w() + client->width + screen.getBevelWidth());
+ for (it = clientList.begin(); it != clientList.end(); it++) {
+ frame.area.setW(frame.area.w() + (*it)->width + screen.getBevelWidth());
- if (frame.area.h() < client->height)
- frame.area.setH(client->height);
+ if (frame.area.h() < (*it)->height)
+ frame.area.setH((*it)->height);
}
if (frame.area.w() < 1)
break;
}
+ cout << "SLIT SIZE " << frame.area.w() << "," << frame.area.h() << endl;
reposition();
XSetWindowBorder(display, frame.window,
screen.getBorderColor()->getPixel());
- if (! clientList->count())
+ if (! clientList.size())
XUnmapWindow(display, frame.window);
else
XMapWindow(display, frame.window);
XClearWindow(display, frame.window);
int x, y;
- it.reset();
- switch (screen.getSlitDirection()) {
+ switch (m_direction) {
case Vertical:
x = 0;
y = screen.getBevelWidth();
- for (client = it.current(); client; it++, client = it.current()) {
- x = (frame.area.w() - client->width) / 2;
+ for (it = clientList.begin(); it != clientList.end(); it++) {
+ x = (frame.area.w() - (*it)->width) / 2;
- XMoveResizeWindow(display, client->window, x, y,
- client->width, client->height);
- XMapWindow(display, client->window);
+ XMoveResizeWindow(display, (*it)->window, x, y,
+ (*it)->width, (*it)->height);
+ XMapWindow(display, (*it)->window);
// for ICCCM compliance
- client->x = x;
- client->y = y;
+ (*it)->x = x;
+ (*it)->y = y;
XEvent event;
event.type = ConfigureNotify;
event.xconfigure.display = display;
- event.xconfigure.event = client->window;
- event.xconfigure.window = client->window;
+ event.xconfigure.event = (*it)->window;
+ event.xconfigure.window = (*it)->window;
event.xconfigure.x = x;
event.xconfigure.y = y;
- event.xconfigure.width = client->width;
- event.xconfigure.height = client->height;
+ event.xconfigure.width = (*it)->width;
+ event.xconfigure.height = (*it)->height;
event.xconfigure.border_width = 0;
event.xconfigure.above = frame.window;
event.xconfigure.override_redirect = False;
- XSendEvent(display, client->window, False, StructureNotifyMask, &event);
+ XSendEvent(display, (*it)->window, False, StructureNotifyMask, &event);
- y += client->height + screen.getBevelWidth();
+ y += (*it)->height + screen.getBevelWidth();
}
break;
x = screen.getBevelWidth();
y = 0;
- for (client = it.current(); client; it++, client = it.current()) {
- y = (frame.area.h() - client->height) / 2;
+ for (it = clientList.begin(); it != clientList.end(); it++) {
+ y = (frame.area.h() - (*it)->height) / 2;
- XMoveResizeWindow(display, client->window, x, y,
- client->width, client->height);
- XMapWindow(display, client->window);
+ XMoveResizeWindow(display, (*it)->window, x, y,
+ (*it)->width, (*it)->height);
+ XMapWindow(display, (*it)->window);
// for ICCCM compliance
- client->x = x;
- client->y = y;
+ (*it)->x = x;
+ (*it)->y = y;
XEvent event;
event.type = ConfigureNotify;
event.xconfigure.display = display;
- event.xconfigure.event = client->window;
- event.xconfigure.window = client->window;
+ event.xconfigure.event = (*it)->window;
+ event.xconfigure.window = (*it)->window;
event.xconfigure.x = x;
event.xconfigure.y = y;
- event.xconfigure.width = client->width;
- event.xconfigure.height = client->height;
+ event.xconfigure.width = (*it)->width;
+ event.xconfigure.height = (*it)->height;
event.xconfigure.border_width = 0;
event.xconfigure.above = frame.window;
event.xconfigure.override_redirect = False;
- XSendEvent(display, client->window, False, StructureNotifyMask, &event);
+ XSendEvent(display, (*it)->window, False, StructureNotifyMask, &event);
- x += client->width + screen.getBevelWidth();
+ x += (*it)->width + screen.getBevelWidth();
}
break;
void Slit::reposition(void) {
// place the slit in the appropriate place
- switch (screen.getSlitPlacement()) {
+ switch (m_placement) {
case TopLeft:
frame.area.setOrigin(0, 0);
- if (screen.getSlitDirection() == Vertical) {
+ if (m_direction == Vertical) {
frame.hidden = Point(screen.getBevelWidth() - screen.getBorderWidth()
- frame.area.w(), 0);
} else {
case BottomLeft:
frame.area.setOrigin(0, screen.size().h() - frame.area.h()
- (screen.getBorderWidth() * 2));
- if (screen.getSlitDirection() == Vertical)
+ if (m_direction == Vertical)
frame.hidden = Point(screen.getBevelWidth() - screen.getBorderWidth()
- frame.area.w(), frame.area.y());
else
case TopRight:
frame.area.setOrigin(screen.size().w() - frame.area.w()
- (screen.getBorderWidth() * 2), 0);
- if (screen.getSlitDirection() == Vertical)
+ if (m_direction == Vertical)
frame.hidden = Point(screen.size().w() - screen.getBevelWidth()
- screen.getBorderWidth(), 0);
else
- (screen.getBorderWidth() * 2),
screen.size().h() - frame.area.h()
- (screen.getBorderWidth() * 2));
- if (screen.getSlitDirection() == Vertical)
+ if (m_direction == 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());
+ frame.hidden = Point(frame.area.x(), screen.size().h() -
+ screen.getBevelWidth() - screen.getBorderWidth());
break;
}
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();
+ tw = tbar->area().w() + screen.getBorderWidth(),
+ th = tbar->area().h() + 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 (tbar->area().x() < frame.area.x() + sw &&
+ tbar->area().x() + tw > frame.area.x() &&
+ tbar->area().y() < frame.area.y() + sh &&
+ tbar->area().y() + th > frame.area.y()) {
if (frame.area.y() < th) {
frame.area.setY(frame.area.y() + tbar->getExposedHeight());
- if (screen.getSlitDirection() == Vertical)
+ if (m_direction == Vertical)
frame.hidden.setY(frame.hidden.y() + tbar->getExposedHeight());
else
frame.hidden.setY(frame.area.y());
} else {
frame.area.setY(frame.area.y() - tbar->getExposedHeight());
- if (screen.getSlitDirection() == Vertical)
+ if (m_direction == Vertical)
frame.hidden.setY(frame.area.y() - tbar->getExposedHeight());
else
frame.hidden.setY(frame.area.y());
}
}
- if (hidden)
+ if (m_hidden)
XMoveResizeWindow(display, frame.window, frame.hidden.x(),
frame.hidden.y(), frame.area.w(), frame.area.h());
else
void Slit::shutdown(void) {
- while (clientList->count())
- removeClient(clientList->first());
+ while (clientList.size())
+ removeClient(clientList.front());
}
void Slit::buttonPressEvent(XButtonEvent *e) {
if (e->window != frame.window) return;
- if (e->button == Button1 && (! on_top)) {
+ if (e->button == Button1 && !m_ontop) {
Window w[1] = { frame.window };
screen.raiseWindows(w, 1);
- } else if (e->button == Button2 && (! on_top)) {
+ } else if (e->button == Button2 && !m_ontop) {
XLowerWindow(display, frame.window);
} else if (e->button == Button3) {
if (! slitmenu->isVisible()) {
void Slit::enterNotifyEvent(XCrossingEvent *) {
- if (! do_auto_hide)
+ if (!m_autohide)
return;
- if (hidden) {
+ if (m_hidden) {
if (! timer->isTiming()) timer->start();
} else {
if (timer->isTiming()) timer->stop();
void Slit::leaveNotifyEvent(XCrossingEvent *) {
- if (! do_auto_hide)
+ if (!m_autohide)
return;
- if (hidden) {
+ if (m_hidden) {
if (timer->isTiming()) timer->stop();
} else if (! slitmenu->isVisible()) {
- if (! timer->isTiming()) timer->start();
+ if (!timer->isTiming()) timer->start();
}
}
XConfigureWindow(display, e->window, e->value_mask, &xwc);
- LinkedListIterator<SlitClient> it(clientList);
- SlitClient *client = it.current();
- for (; client; it++, client = it.current())
+ slitClientList::iterator it = clientList.begin();
+ for (; it != clientList.end(); it++) {
+ SlitClient *client = *it;
if (client->window == e->window)
if (client->width != ((unsigned) e->width) ||
client->height != ((unsigned) e->height)) {
client->width = (unsigned) e->width;
client->height = (unsigned) e->height;
-
reconf = True;
-
break;
}
+ }
- if (reconf) reconfigure();
-
+ if (reconf)
+ reconfigure();
}
-
openbox.ungrab();
}
void Slit::timeout(void) {
- hidden = ! hidden;
- if (hidden)
+ m_hidden = !m_hidden;
+ if (m_hidden)
XMoveWindow(display, frame.window, frame.hidden.x(), frame.hidden.y());
else
XMoveWindow(display, frame.window, frame.area.x(), frame.area.y());
update();
- if (slit.isOnTop()) setItemSelected(2, True);
- if (slit.doAutoHide()) setItemSelected(3, True);
+ setValues();
+}
+
+void Slitmenu::setValues() {
+ setItemSelected(2, slit.onTop());
+ setItemSelected(3, slit.autoHide());
}
switch (item->function()) {
case 1: { // always on top
- Bool change = ((slit.isOnTop()) ? False : True);
- slit.on_top = change;
+ bool change = ((slit.onTop()) ? false : true);
+ slit.setOnTop(change);
setItemSelected(2, change);
- if (slit.isOnTop()) slit.screen.raiseWindows((Window *) 0, 0);
+ if (slit.onTop()) slit.screen.raiseWindows((Window *) 0, 0);
break;
}
case 2: { // auto hide
- Bool change = ((slit.doAutoHide()) ? False : True);
- slit.do_auto_hide = change;
+ Bool change = ((slit.autoHide()) ? false : true);
+ slit.setAutoHide(change);
setItemSelected(3, change);
break;
void Slitmenu::internal_hide(void) {
Basemenu::internal_hide();
- if (slit.doAutoHide())
+ if (slit.autoHide())
slit.timeout();
}
void Slitmenu::reconfigure(void) {
+ setValues();
directionmenu->reconfigure();
placementmenu->reconfigure();
update();
- if (sm.slit.screen.getSlitDirection() == Slit::Horizontal)
+ setValues();
+}
+
+
+void Slitmenu::Directionmenu::setValues() {
+ if (slitmenu.slit.direction() == Slit::Horizontal)
setItemSelected(0, True);
else
setItemSelected(1, True);
}
+void Slitmenu::Directionmenu::reconfigure() {
+ setValues();
+}
+
void Slitmenu::Directionmenu::itemSelected(int button, int index) {
if (button != 1)
BasemenuItem *item = find(index);
if (! item) return;
- slitmenu.slit.screen.saveSlitDirection(item->function());
+ slitmenu.slit.setDirection(item->function());
if (item->function() == Slit::Horizontal) {
setItemSelected(0, True);
BasemenuItem *item = find(index);
if (! (item && item->function())) return;
- slitmenu.slit.screen.saveSlitPlacement(item->function());
+ slitmenu.slit.setPlacement(item->function());
hide();
slitmenu.slit.reconfigure();
}
-
#endif // SLIT
projects / chaz / openbox / blobdiff