Changed tab placement/alignment enums to uppercase letters
pekdon pekdon
6 files changed,
182 insertions(+),
181 deletions(-)
M
ChangeLog
→
ChangeLog
@@ -1,5 +1,6 @@
Changes for 0.1.6: *02/01/05: + * Changed placement/alignment enums to uppercase letters (Claes Nästén) * Fixed tab/iconbar resource bug (Claes Nästén) * Applied "maximize slit stop"-patch (Thanks Andrew Livesay ) * Fixed stickytoggle bug in Windowmenu (Thanks Chris Elston)
M
src/Tab.cc
→
src/Tab.cc
@@ -32,19 +32,19 @@ using namespace std;
bool Tab::m_stoptabs = false; Tab::t_tabplacementlist Tab::m_tabplacementlist[] = { - {PTop, "Top"}, - {PBottom, "Bottom"}, - {PLeft, "Left"}, - {PRight, "Right"}, - {pnone, "none"} + {PTOP, "Top"}, + {PBOTTOM, "Bottom"}, + {PLEFT, "Left"}, + {PRIGHT, "Right"}, + {PNONE, "none"} }; Tab::t_tabplacementlist Tab::m_tabalignmentlist[] = { - {ALeft, "Left"}, - {ACenter, "Center"}, - {ARight, "Right"}, - {ARelative, "Relative"}, - {anone, "none"} + {ALEFT, "Left"}, + {ACENTER, "Center"}, + {ARIGHT, "Right"}, + {ARELATIVE, "Relative"}, + {ANONE, "none"} }; Tab::Tab(FluxboxWindow *win, Tab *prev, Tab *next) {@@ -57,8 +57,8 @@ m_prev = prev; m_next = next;
m_win = win; m_display = Fluxbox::instance()->getXDisplay(); - if ((m_win->getScreen()->getTabPlacement() == PLeft || - m_win->getScreen()->getTabPlacement() == PRight) && + if ((m_win->getScreen()->getTabPlacement() == PLEFT || + m_win->getScreen()->getTabPlacement() == PRIGHT) && m_win->getScreen()->isTabRotateVertical()) { m_size_w = m_win->getScreen()->getTabHeight(); m_size_h = m_win->getScreen()->getTabWidth();@@ -290,7 +290,7 @@ }
} // need to resize tabs if in relative mode - if (m_win->getScreen()->getTabAlignment() == ARelative) { + if (m_win->getScreen()->getTabAlignment() == ARELATIVE) { calcIncrease(); setPosition(); }@@ -306,13 +306,13 @@ continue;
first->m_win->shade(); } - if (m_win->getScreen()->getTabPlacement() == PLeft || - m_win->getScreen()->getTabPlacement() == PRight) { + if (m_win->getScreen()->getTabPlacement() == PLEFT || + m_win->getScreen()->getTabPlacement() == PRIGHT) { resizeGroup(); calcIncrease(); } - if (!(m_win->getScreen()->getTabPlacement() == PTop)) + if (!(m_win->getScreen()->getTabPlacement() == PTOP)) setPosition(); }@@ -329,8 +329,8 @@ GC gc = ((m_win->focused) ? m_win->getScreen()->getWindowStyle()->tab.l_text_focus_gc :
m_win->getScreen()->getWindowStyle()->tab.l_text_unfocus_gc); // Different routines for drawing rotated text - if ((m_win->getScreen()->getTabPlacement() == PLeft || - m_win->getScreen()->getTabPlacement() == PRight) && + if ((m_win->getScreen()->getTabPlacement() == PLEFT || + m_win->getScreen()->getTabPlacement() == PRIGHT) && (!m_win->isShaded() && m_win->getScreen()->isTabRotateVertical())) { tabtext_w = Misc::XRotTextWidth(m_win->getScreen()->getWindowStyle()->tab.rot_font,@@ -384,10 +384,10 @@ //TODO: optimize! There is many ways to implement this...
//posible movement to a static member function //Tab placement - if (m_win->getScreen()->getTabPlacement() == PTop) { + if (m_win->getScreen()->getTabPlacement() == PTOP) { pos_y = m_win->frame.y - m_size_h; - } else if (m_win->getScreen()->getTabPlacement() == PBottom || + } else if (m_win->getScreen()->getTabPlacement() == PBOTTOM || m_win->isShaded()) { if (m_win->isShaded()) pos_y = m_win->frame.y + m_win->getTitleHeight() +@@ -397,42 +397,42 @@ else
pos_y = m_win->frame.y + m_win->getHeight() + m_win->getScreen()->getBorderWidth2x(); - } else if (m_win->getScreen()->getTabPlacement() == PLeft) { + } else if (m_win->getScreen()->getTabPlacement() == PLEFT) { pos_x = m_win->frame.x - m_size_w; - } else if (m_win->getScreen()->getTabPlacement() == PRight) { + } else if (m_win->getScreen()->getTabPlacement() == PRIGHT) { pos_x = m_win->frame.x + m_win->frame.width + m_win->getScreen()->getBorderWidth2x(); } //Tab alignment - if (m_win->getScreen()->getTabPlacement() == PTop || - m_win->getScreen()->getTabPlacement() == PBottom || + if (m_win->getScreen()->getTabPlacement() == PTOP || + m_win->getScreen()->getTabPlacement() == PBOTTOM || m_win->isShaded()) { switch(m_win->getScreen()->getTabAlignment()) { - case ARelative: - case ALeft: + case ARELATIVE: + case ALEFT: pos_x = m_win->frame.x; break; - case ACenter: + case ACENTER: pos_x = calcCenterXPos(); break; - case ARight: + case ARIGHT: pos_x = m_win->frame.x + m_win->frame.width + m_win->getScreen()->getBorderWidth2x() - m_size_w; break; } } else { //PLeft | PRight switch(m_win->getScreen()->getTabAlignment()) { - case ALeft: + case ALEFT: pos_y = m_win->frame.y - m_size_h + m_win->frame.height + m_win->getScreen()->getBorderWidth2x(); break; - case ACenter: + case ACENTER: pos_y = calcCenterYPos(); break; - case ARelative: - case ARight: + case ARELATIVE: + case ARIGHT: pos_y = m_win->frame.y; break; }@@ -468,40 +468,40 @@ Tab *first;
int inc_x = 0, inc_y = 0; unsigned int tabs = 0, i = 0; - if (m_win->getScreen()->getTabPlacement() == PTop || - m_win->getScreen()->getTabPlacement() == PBottom || + if (m_win->getScreen()->getTabPlacement() == PTOP || + m_win->getScreen()->getTabPlacement() == PBOTTOM || m_win->isShaded()) { inc_y = 0; switch(m_win->getScreen()->getTabAlignment()) { - case ALeft: + case ALEFT: inc_x = m_size_w; break; - case ACenter: + case ACENTER: inc_x = m_size_w; break; - case ARight: + case ARIGHT: inc_x = -m_size_w; break; - case ARelative: + case ARELATIVE: inc_x = calcRelativeWidth(); break; } - } else if (m_win->getScreen()->getTabPlacement() == PLeft || - m_win->getScreen()->getTabPlacement() == PRight) { + } else if (m_win->getScreen()->getTabPlacement() == PLEFT || + m_win->getScreen()->getTabPlacement() == PRIGHT) { inc_x = 0; switch(m_win->getScreen()->getTabAlignment()) { - case ALeft: + case ALEFT: inc_y = -m_size_h; break; - case ACenter: + case ACENTER: inc_y = m_size_h; break; - case ARight: + case ARIGHT: inc_y = m_size_h; break; - case ARelative: + case ARELATIVE: inc_y = calcRelativeHeight(); break; }@@ -512,10 +512,10 @@
for (first = getFirst(this); first!=0; first = first->m_next, i++){ //TODO: move this out from here? - if ((m_win->getScreen()->getTabPlacement() == PTop || - m_win->getScreen()->getTabPlacement() == PBottom || + if ((m_win->getScreen()->getTabPlacement() == PTOP || + m_win->getScreen()->getTabPlacement() == PBOTTOM || m_win->isShaded()) && - m_win->getScreen()->getTabAlignment() == ARelative) { + m_win->getScreen()->getTabAlignment() == ARELATIVE) { if (!((m_win->frame.width + m_win->getScreen()->getBorderWidth2x()) % tabs) || i >= ((m_win->frame.width +@@ -527,7 +527,7 @@ first->setTabWidth(inc_x + 1);
first->m_inc_x = inc_x + 1; } first->m_inc_y = inc_y; - } else if (m_win->getScreen()->getTabAlignment() == ARelative) { + } else if (m_win->getScreen()->getTabAlignment() == ARELATIVE) { if (!((m_win->frame.height + m_win->getScreen()->getBorderWidth2x()) % tabs) || i >= ((m_win->frame.height +@@ -620,32 +620,32 @@ // (ab)using dest_x and dest_y
dest_x = be->x_root; dest_y = be->y_root; - if (placement == PTop || placement == PBottom || m_win->isShaded()) { - if (placement == PBottom && !m_win->isShaded()) + if (placement == PTOP || placement == PBOTTOM || m_win->isShaded()) { + if (placement == PBOTTOM && !m_win->isShaded()) dest_y -= m_win->frame.height; - else if (placement != PTop && m_win->isShaded()) + else if (placement != PTOP && m_win->isShaded()) dest_y -= m_win->getTitleHeight(); - else // PTop + else // PTOP dest_y += m_win->getTitleHeight(); switch(m_win->getScreen()->getTabAlignment()) { - case ACenter: + case ACENTER: dest_x -= (m_win->frame.width / 2) - (m_size_w / 2); break; - case ARight: + case ARIGHT: dest_x -= m_win->frame.width - m_size_w; break; } - } else { // PLeft & PRight - if (placement == PRight) + } else { // PLEFT & PRIGHT + if (placement == PRIGHT) dest_x = be->x_root - m_win->frame.width; switch(m_win->getScreen()->getTabAlignment()) { - case ACenter: + case ACENTER: dest_y -= (m_win->frame.height / 2) - (m_size_h / 2); break; - case ALeft: + case ALEFT: dest_y -= m_win->frame.height - m_size_h; break; }@@ -840,8 +840,8 @@ for (; tab!=last->m_next; tab=tab->m_next) {
if (m_win->isShaded() != tab->m_win->isShaded()) { tab->m_stoptabs = true; // we don't want any actions performed on the // tabs, just the tab windows! - if (m_win->getScreen()->getTabPlacement() == PLeft || - m_win->getScreen()->getTabPlacement() == PRight) + if (m_win->getScreen()->getTabPlacement() == PLEFT || + m_win->getScreen()->getTabPlacement() == PRIGHT) resize_tabs = true; // if the window we are grouping to, we need to shade the tab window@@ -874,7 +874,7 @@ }
} // resize if in relative mode or resize_tabs is true - if(m_win->getScreen()->getTabAlignment() == ARelative || + if(m_win->getScreen()->getTabAlignment() == ARELATIVE || resize_tabs) { resizeGroup(); calcIncrease();@@ -903,12 +903,12 @@ m_next = 0;
//reposition the tabs if (tmp) { - if (m_win->getScreen()->getTabAlignment() == ARelative) + if (m_win->getScreen()->getTabAlignment() == ARELATIVE) tmp->calcIncrease(); tmp->setPosition(); } - if (m_win->getScreen()->getTabAlignment() == ARelative) + if (m_win->getScreen()->getTabAlignment() == ARELATIVE) calcIncrease(); setPosition();@@ -957,8 +957,8 @@ cerr << "Resising group" << endl;
#endif //DEBUG Tab *first; for (first = getFirst(this); first != 0; first = first->m_next) { - if ((m_win->getScreen()->getTabPlacement() == PLeft || - m_win->getScreen()->getTabPlacement() == PRight) && + if ((m_win->getScreen()->getTabPlacement() == PLEFT || + m_win->getScreen()->getTabPlacement() == PRIGHT) && m_win->getScreen()->isTabRotateVertical() && !m_win->isShaded()) { first->setTabWidth(m_win->getScreen()->getTabHeight());@@ -1026,7 +1026,7 @@ // Returns the tabplacement string of the
// tabplacement number on success else 0. //---------------------------------------- const char *Tab::getTabPlacementString(int placement) { - for (int i=0; i<(pnone / 5); i++) { + for (int i=0; i<(PNONE / 5); i++) { if (m_tabplacementlist[i] == placement) return m_tabplacementlist[i].string; }@@ -1039,12 +1039,12 @@ // tabplacement string on success else
// the type none on failure. //---------------------------------------- int Tab::getTabPlacementNum(const char *string) { - for (int i=0; i<(pnone / 5); i ++) { + for (int i=0; i<(PNONE / 5); i ++) { if (m_tabplacementlist[i] == string) { return m_tabplacementlist[i].tp; } } - return pnone; + return PNONE; } //------- getTabAlignmentString ----------@@ -1052,7 +1052,7 @@ // Returns the tabplacement string of the
// tabplacement number on success else 0. //---------------------------------------- const char *Tab::getTabAlignmentString(int placement) { - for (int i=0; i<anone; i++) { + for (int i=0; i<ANONE; i++) { if (m_tabalignmentlist[i] == placement) return m_tabalignmentlist[i].string; }@@ -1065,10 +1065,10 @@ // tabplacement string on success else
// the type none on failure. //---------------------------------------- int Tab::getTabAlignmentNum(const char *string) { - for (int i=0; i<anone; i++) { + for (int i=0; i<ANONE; i++) { if (m_tabalignmentlist[i] == string) { return m_tabalignmentlist[i].tp; } } - return anone; + return ANONE; }
M
src/Tab.hh
→
src/Tab.hh
@@ -68,8 +68,8 @@ static Tab *getFirst(Tab *current);
static Tab *getLast(Tab *current); void disconnect(); - enum { PTop = 0, PBottom = 5, PLeft = 10, PRight = 15, pnone = 20}; - enum { ALeft = 0, ACenter, ARight, ARelative, anone }; + enum { PTOP = 0, PBOTTOM = 5, PLEFT = 10, PRIGHT = 15, PNONE = 20}; + enum { ALEFT = 0, ACENTER, ARIGHT, ARELATIVE, ANONE }; static const char *getTabPlacementString(int placement); static int getTabPlacementNum(const char *string);
M
src/Window.cc
→
src/Window.cc
@@ -296,10 +296,10 @@ if (decorations.tab) { // window is cleanly fixed
int real_x = frame.x; int real_y = frame.y; - if (screen->getTabPlacement() == Tab::PTop) + if (screen->getTabPlacement() == Tab::PTOP) real_y -= screen->getTabHeight(); - else if (screen->getTabPlacement() == Tab::PLeft) { + else if (screen->getTabPlacement() == Tab::PLEFT) { if (screen->isTabRotateVertical()) real_x -= screen->getTabHeight(); else@@ -1927,11 +1927,11 @@ }
if (hasTab()) { switch(screen->getTabPlacement()) { - case Tab::PTop: + case Tab::PTOP: dy += screen->getTabHeight(); dh -= screen->getTabHeight(); break; - case Tab::PLeft: + case Tab::PLEFT: if (screen->isTabRotateVertical()) { dx += screen->getTabHeight(); dw -= screen->getTabHeight();@@ -1940,13 +1940,13 @@ dx += screen->getTabWidth();
dw -= screen->getTabWidth(); } break; - case Tab::PRight: + case Tab::PRIGHT: if (screen->isTabRotateVertical()) dw -= screen->getTabHeight(); else dw -= screen->getTabWidth(); break; - case Tab::PBottom: + case Tab::PBOTTOM: dh -= screen->getTabHeight(); break; default:
M
src/fluxbox.cc
→
src/fluxbox.cc
@@ -2336,7 +2336,7 @@ if (XrmGetResource(database, name_lookup, class_lookup,
&value_type, &value)) { screen->saveTabPlacement(Tab::getTabPlacementNum(value.addr)); } else - screen->saveTabPlacement(Tab::PTop); + screen->saveTabPlacement(Tab::PTOP); sprintf(name_lookup, "session.screen%d.tab.alignment", screen_number); sprintf(class_lookup, "Session.Screen%d.Tab.Alignment", screen_number);@@ -2344,7 +2344,7 @@ if (XrmGetResource(database, name_lookup, class_lookup,
&value_type, &value)) { screen->saveTabAlignment(Tab::getTabAlignmentNum(value.addr)); } else - screen->saveTabAlignment(Tab::ALeft); + screen->saveTabAlignment(Tab::ALEFT); sprintf(name_lookup, "session.screen%d.tab.rotatevertical", screen_number); sprintf(class_lookup, "Session.Screen%d.Tab.RotateVertical", screen_number);