X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FToolbar.cc;h=8a3ea6b2828acea09a5d0cbd2394fcc9a9e01513;hb=90e7db977fc94e4a3c1ae5689f1998d9723d4c71;hp=b6469957ddf66d72583a9dd853b5bff7853a5ff9;hpb=66c879bd5c0c9f668096f620007388ef347becd0;p=chaz%2Fopenbox diff --git a/src/Toolbar.cc b/src/Toolbar.cc index b6469957..8a3ea6b2 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc @@ -64,15 +64,12 @@ #include #include +using std::ends; -Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn), - openbox(scrn.getOpenbox()), config(conf) +Toolbar::Toolbar(BScreen &scrn, Resource &conf) : openbox(scrn.getOpenbox()), + screen(scrn), config(conf) { - // default values - m_width_percent =66; - m_placement = BottomCenter; - m_ontop = false; - m_hidden = m_autohide = false; + load(); // get the clock updating every minute clock_timer = new BTimer(openbox, *this); @@ -158,14 +155,13 @@ Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn), mapToolbar(); } -int Toolbar::getX() const { - return ((m_hidden) ? frame.x_hidden : frame.x); -} - -int Toolbar::getY() const { - if (screen.hideToolbar()) return screen.size().h(); - else if (m_hidden) return frame.y_hidden; - else return frame.y; +Rect Toolbar::area() const { + int x = ((m_hidden) ? frame.x_hidden : frame.x); + int y; + if (screen.hideToolbar()) y = screen.size().h(); + else if (m_hidden) y = frame.y_hidden; + else y = frame.y; + return Rect(x, y, frame.width, frame.height); } unsigned int Toolbar::getExposedHeight() const { @@ -219,32 +215,35 @@ Toolbar::~Toolbar() { void Toolbar::setOnTop(bool b) { m_ontop = b; - ostrstream s; + std::ostrstream s; s << "session.screen" << screen.getScreenNumber() << ".toolbar.onTop" << ends; config.setValue(s.str(), m_ontop ? "True" : "False"); + s.rdbuf()->freeze(0); } void Toolbar::setAutoHide(bool b) { m_autohide = b; - ostrstream s; - s << "session.screen" << screen.getScreenNumber() << ".toolbar.autoHide" << - ends; + std::ostrstream s; + s << "session.screen" << screen.getScreenNumber() << ".toolbar.autoHide" + << ends; config.setValue(s.str(), m_autohide ? "True" : "False"); + s.rdbuf()->freeze(0); } void Toolbar::setWidthPercent(int w) { m_width_percent = w; - ostrstream s; + std::ostrstream s; s << "session.screen" << screen.getScreenNumber() << ".toolbar.widthPercent" << ends; config.setValue(s.str(), m_width_percent); + s.rdbuf()->freeze(0); } void Toolbar::setPlacement(int p) { m_placement = p; - ostrstream s; - s << "session.screen" << screen.getScreenNumber() << ".toolbar.placement" << - ends; + std::ostrstream s; + s << "session.screen" << screen.getScreenNumber() << ".toolbar.placement" + << ends; const char *placement; switch (m_placement) { case TopLeft: placement = "TopLeft"; break; @@ -255,6 +254,14 @@ void Toolbar::setPlacement(int p) { case BottomCenter: default: placement = "BottomCenter"; break; } config.setValue(s.str(), placement); + s.rdbuf()->freeze(0); +} + +void Toolbar::save() { + setOnTop(m_ontop); + setAutoHide(m_autohide); + setWidthPercent(m_width_percent); + setPlacement(m_placement); } void Toolbar::load() { @@ -268,8 +275,11 @@ void Toolbar::load() { rclass << rscreen.str() << "Toolbar.WidthPercent" << ends; if (config.getValue(rname.str(), rclass.str(), l) && (l > 0 && l <= 100)) m_width_percent = l; + else + m_width_percent =66; rname.seekp(0); rclass.seekp(0); + rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0); rname << rscreen.str() << "toolbar.placement" << ends; rclass << rscreen.str() << "Toolbar.Placement" << ends; if (config.getValue(rname.str(), rclass.str(), s)) { @@ -285,19 +295,29 @@ void Toolbar::load() { m_placement = BottomRight; else if ( 0 == strncasecmp(s.c_str(), "BottomCenter", s.length())) m_placement = BottomCenter; - } + } else + m_placement = BottomCenter; rname.seekp(0); rclass.seekp(0); + rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0); rname << rscreen.str() << "toolbar.onTop" << ends; rclass << rscreen.str() << "Toolbar.OnTop" << ends; if (config.getValue(rname.str(), rclass.str(), b)) m_ontop = b; + else + m_ontop = false; rname.seekp(0); rclass.seekp(0); + rname.rdbuf()->freeze(0); rclass.rdbuf()->freeze(0); rname << rscreen.str() << "toolbar.autoHide" << ends; rclass << rscreen.str() << "Toolbar.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 Toolbar::reconfigure() { @@ -379,8 +399,9 @@ void Toolbar::reconfigure() { tt = localtime(&ttmp); if (tt) { char t[1025], *time_string = (char *) 0; - int len = strftime(t, 1024, screen.getStrftimeFormat(), tt); - t[len++-1] = ' '; // add a space to the string for padding + int len = strftime(t, 1024, screen.strftimeFormat(), tt); + t[len++] = 'A'; // add size to the string for padding + t[len++] = 'A'; // add size to the string for padding t[len] = '\0'; if (i18n->multibyte()) { @@ -616,7 +637,7 @@ void Toolbar::checkClock(Bool redraw, Bool date) { if (redraw) { #ifdef HAVE_STRFTIME char t[1024]; - if (! strftime(t, 1024, screen.getStrftimeFormat(), tt)) + if (! strftime(t, 1024, screen.strftimeFormat(), tt)) return; #else // !HAVE_STRFTIME char t[9]; @@ -703,11 +724,13 @@ void Toolbar::checkClock(Bool redraw, Bool date) { void Toolbar::redrawWindowLabel(Bool redraw) { - if (screen.getOpenbox().getFocusedWindow()) { + OpenboxWindow *foc = screen.getOpenbox().focusedWindow(); + if (foc == (OpenboxWindow *) 0) { + XClearWindow(display, frame.window_label); + } else { if (redraw) XClearWindow(display, frame.window_label); - OpenboxWindow *foc = screen.getOpenbox().getFocusedWindow(); if (foc->getScreen() != &screen) return; int dx = (frame.bevel_w * 2), dlen = strlen(*foc->getTitle()); @@ -759,8 +782,6 @@ void Toolbar::redrawWindowLabel(Bool redraw) { else XDrawString(display, frame.window_label, style->w_text_gc, dx, (style->font->ascent + 1), *foc->getTitle(), dlen); - } else { - XClearWindow(display, frame.window_label); } } @@ -950,14 +971,12 @@ void Toolbar::edit() { return; XSetInputFocus(display, frame.workspace_label, - ((screen.isSloppyFocus()) ? RevertToPointerRoot : - RevertToParent), - CurrentTime); + RevertToPointerRoot, CurrentTime); XClearWindow(display, frame.workspace_label); openbox.setNoFocus(True); - if (openbox.getFocusedWindow()) - openbox.getFocusedWindow()->setFocusFlag(False); + if (openbox.focusedWindow()) + openbox.focusedWindow()->setFocusFlag(False); XDrawRectangle(display, frame.workspace_label, screen.getWindowStyle()->l_text_focus_gc, @@ -1132,12 +1151,12 @@ void Toolbar::keyPressEvent(XKeyEvent *ke) { m_editing = False; openbox.setNoFocus(False); - if (openbox.getFocusedWindow()) { - openbox.getFocusedWindow()->setInputFocus(); - openbox.getFocusedWindow()->setFocusFlag(True); - } else { - XSetInputFocus(display, PointerRoot, None, CurrentTime); - } + if (openbox.focusedWindow()) { + openbox.focusedWindow()->setInputFocus(); + openbox.focusedWindow()->setFocusFlag(True); + } else + openbox.focusWindow((OpenboxWindow *) 0); + // check to make sure that new_name[0] != 0... otherwise we have a null // workspace name which causes serious problems, especially for the // Openbox::LoadRC() method. @@ -1264,9 +1283,13 @@ Toolbarmenu::Toolbarmenu(Toolbar &tb) : Basemenu(tb.screen), toolbar(tb) { "Edit current workspace name"), 3); update(); + + setValues(); +} - if (toolbar.onTop()) setItemSelected(1, True); - if (toolbar.autoHide()) setItemSelected(2, True); +void Toolbarmenu::setValues() { + setItemSelected(1, toolbar.onTop()); + setItemSelected(2, toolbar.autoHide()); } @@ -1321,6 +1344,7 @@ void Toolbarmenu::internal_hide() { void Toolbarmenu::reconfigure() { + setValues(); placementmenu->reconfigure(); Basemenu::reconfigure(); @@ -1349,7 +1373,6 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu &tm) update(); } - void Toolbarmenu::Placementmenu::itemSelected(int button, int index) { if (button != 1) return;