aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-12-09 08:48:08 (GMT)
committerrathnor <rathnor>2003-12-09 08:48:08 (GMT)
commit15b41a3c35992c61abba76a21cf3731b066a898e (patch)
tree4426c9830c7627b07dbe2599acb6d7fbdaa5b424
parentd84054ec5d1678f055bb90f2bf21d5709b385fdd (diff)
downloadfluxbox_paul-15b41a3c35992c61abba76a21cf3731b066a898e.zip
fluxbox_paul-15b41a3c35992c61abba76a21cf3731b066a898e.tar.bz2
add window.label.active theme items
-rw-r--r--ChangeLog7
-rw-r--r--src/FbWinFrame.cc75
-rw-r--r--src/FbWinFrame.hh12
-rw-r--r--src/FbWinFrameTheme.cc14
-rw-r--r--src/FbWinFrameTheme.hh12
-rw-r--r--src/main.cc4
6 files changed, 94 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 0bda497..d6c8d11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.7: 2Changes for 0.9.7:
3*03/12/09:
4 * New theme items: (Simon)
5 window.label.active: <texture>
6 window.label.active.textColor: <color>
7 For highlighting the active (visible) tab when not in focus.
8 - fixes bug with unfocused windows not getting unfocus.textColor
9 FbWinFrame.hh/cc FbWinFrameTheme.hh/cc
3*03/12/08: 10*03/12/08:
4 * fbsetbg now remembers -u option and it also has (Han) 11 * fbsetbg now remembers -u option and it also has (Han)
5 a new -U option which does the same thing without remembering 12 a new -U option which does the same thing without remembering
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 2ff7203..3270525 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrame.cc,v 1.63 2003/12/07 16:39:43 fluxgen Exp $ 22// $Id: FbWinFrame.cc,v 1.64 2003/12/09 08:48:08 rathnor Exp $
23 23
24#include "FbWinFrame.hh" 24#include "FbWinFrame.hh"
25 25
@@ -235,7 +235,7 @@ void FbWinFrame::setFocus(bool newvalue) {
235 if (newvalue) // focused 235 if (newvalue) // focused
236 renderButtonFocus(*m_current_label); 236 renderButtonFocus(*m_current_label);
237 else // unfocused 237 else // unfocused
238 renderButtonUnfocus(*m_current_label); 238 renderButtonActive(*m_current_label);
239 } 239 }
240 240
241 renderTitlebar(); 241 renderTitlebar();
@@ -287,6 +287,9 @@ void FbWinFrame::addLabelButton(FbTk::TextButton &btn) {
287 return; 287 return;
288 288
289 m_labelbuttons.push_back(&btn); 289 m_labelbuttons.push_back(&btn);
290
291 if (currentLabel() == 0)
292 setLabelButtonFocus(btn);
290} 293}
291 294
292void FbWinFrame::removeLabelButton(FbTk::TextButton &btn) { 295void FbWinFrame::removeLabelButton(FbTk::TextButton &btn) {
@@ -355,7 +358,10 @@ void FbWinFrame::setLabelButtonFocus(FbTk::TextButton &btn) {
355 358
356 m_current_label = *it; // current focused button 359 m_current_label = *it; // current focused button
357 360
358 renderButtonFocus(*m_current_label); 361 if (m_focused)
362 renderButtonFocus(*m_current_label);
363 else
364 renderButtonActive(*m_current_label);
359} 365}
360 366
361void FbWinFrame::setClientWindow(FbTk::FbWindow &win) { 367void FbWinFrame::setClientWindow(FbTk::FbWindow &win) {
@@ -688,6 +694,7 @@ void FbWinFrame::reconfigure() {
688 m_shape->update(); 694 m_shape->update();
689 695
690 // titlebar stuff rendered already by reconftitlebar 696 // titlebar stuff rendered already by reconftitlebar
697
691} 698}
692 699
693void FbWinFrame::setUseShape(bool value) { 700void FbWinFrame::setUseShape(bool value) {
@@ -833,6 +840,11 @@ void FbWinFrame::renderTitlebar() {
833 m_label_unfocused_pm, 840 m_label_unfocused_pm,
834 m_label.width(), m_label.height()); 841 m_label.width(), m_label.height());
835 842
843 render(m_theme.labelActiveTexture(), m_label_active_color,
844 m_label_active_pm,
845 m_label.width(), m_label.height());
846
847
836 // finaly set up pixmaps for titlebar windows 848 // finaly set up pixmaps for titlebar windows
837 Pixmap label_pm = None; 849 Pixmap label_pm = None;
838 Pixmap title_pm = None; 850 Pixmap title_pm = None;
@@ -973,7 +985,7 @@ void FbWinFrame::init() {
973 985
974 // clear pixmaps 986 // clear pixmaps
975 m_title_focused_pm = m_title_unfocused_pm = 0; 987 m_title_focused_pm = m_title_unfocused_pm = 0;
976 m_label_focused_pm = m_label_unfocused_pm = 0; 988 m_label_focused_pm = m_label_unfocused_pm = m_label_active_pm = 0;
977 m_handle_focused_pm = m_handle_unfocused_pm = 0; 989 m_handle_focused_pm = m_handle_unfocused_pm = 0;
978 m_button_pm = m_button_unfocused_pm = m_button_pressed_pm = 0; 990 m_button_pm = m_button_unfocused_pm = m_button_pressed_pm = 0;
979 m_grip_unfocused_pm = m_grip_focused_pm = 0; 991 m_grip_unfocused_pm = m_grip_focused_pm = 0;
@@ -1049,19 +1061,21 @@ void FbWinFrame::getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm,
1049 title_color = m_title_focused_color; 1061 title_color = m_title_focused_color;
1050 1062
1051 } else { 1063 } else {
1052 getUnfocusPixmap(label_pm, title_pm, 1064 getActiveLabelPixmap(label_pm, title_pm,
1053 label_color, title_color); 1065 label_color, title_color);
1054 } 1066 }
1055 1067
1056} 1068}
1057 1069
1058void FbWinFrame::getUnfocusPixmap(Pixmap &label_pm, Pixmap &title_pm, 1070// only called if not focused
1071void FbWinFrame::getActiveLabelPixmap(Pixmap &label_pm, Pixmap &title_pm,
1059 FbTk::Color &label_color, 1072 FbTk::Color &label_color,
1060 FbTk::Color &title_color) { 1073 FbTk::Color &title_color) {
1061 if (m_label_unfocused_pm != 0) { 1074
1062 label_pm = m_label_unfocused_pm; 1075 if (m_label_active_pm != 0)
1063 } else 1076 label_pm = m_label_active_pm;
1064 label_color = m_label_unfocused_color; 1077 else
1078 label_color = m_label_active_color;
1065 1079
1066 if (m_title_unfocused_pm != 0) 1080 if (m_title_unfocused_pm != 0)
1067 title_pm = m_title_unfocused_pm; 1081 title_pm = m_title_unfocused_pm;
@@ -1081,9 +1095,12 @@ void FbWinFrame::renderLabelButtons() {
1081 LabelList::iterator btn_it = m_labelbuttons.begin(); 1095 LabelList::iterator btn_it = m_labelbuttons.begin();
1082 LabelList::iterator btn_it_end = m_labelbuttons.end(); 1096 LabelList::iterator btn_it_end = m_labelbuttons.end();
1083 for (; btn_it != btn_it_end; ++btn_it) { 1097 for (; btn_it != btn_it_end; ++btn_it) {
1084 if (*btn_it == m_current_label) 1098 if (*btn_it == m_current_label) {
1085 renderButtonFocus(**btn_it); 1099 if (m_focused)
1086 else 1100 renderButtonFocus(**btn_it);
1101 else
1102 renderButtonActive(**btn_it);
1103 } else
1087 renderButtonUnfocus(**btn_it); 1104 renderButtonUnfocus(**btn_it);
1088 1105
1089 } 1106 }
@@ -1136,15 +1153,34 @@ void FbWinFrame::renderButtonFocus(FbTk::TextButton &button) {
1136 1153
1137 if (m_label_focused_pm != 0) { 1154 if (m_label_focused_pm != 0) {
1138 // already set 1155 // already set
1139 if (button.backgroundPixmap() == m_label_focused_pm) 1156 if (button.backgroundPixmap() != m_label_focused_pm)
1140 return; 1157 button.setBackgroundPixmap(m_label_focused_pm);
1141 button.setBackgroundPixmap(m_label_focused_pm);
1142 } else 1158 } else
1143 button.setBackgroundColor(m_label_focused_color); 1159 button.setBackgroundColor(m_label_focused_color);
1144 1160
1145 button.clear(); 1161 button.clear();
1146} 1162}
1147 1163
1164void FbWinFrame::renderButtonActive(FbTk::TextButton &button) {
1165
1166 button.setGC(theme().labelTextActiveGC());
1167 button.setJustify(theme().justify());
1168 button.setBorderWidth(1);
1169 button.setAlpha(theme().alpha());
1170
1171 if (m_label_active_pm == 0)
1172 m_label_active_pm = m_label_unfocused_pm;
1173
1174 if (m_label_active_pm != 0) {
1175 // already set
1176 if (button.backgroundPixmap() != m_label_active_pm)
1177 button.setBackgroundPixmap(m_label_active_pm);
1178 } else
1179 button.setBackgroundColor(m_label_active_color);
1180
1181 button.clear();
1182}
1183
1148void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) { 1184void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) {
1149 1185
1150 button.setGC(theme().labelTextUnfocusGC()); 1186 button.setGC(theme().labelTextUnfocusGC());
@@ -1154,9 +1190,8 @@ void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) {
1154 1190
1155 if (m_label_unfocused_pm != 0) { 1191 if (m_label_unfocused_pm != 0) {
1156 // already set 1192 // already set
1157 if (button.backgroundPixmap() == m_label_unfocused_pm) 1193 if (button.backgroundPixmap() != m_label_unfocused_pm)
1158 return; 1194 button.setBackgroundPixmap(m_label_unfocused_pm);
1159 button.setBackgroundPixmap(m_label_unfocused_pm);
1160 } else 1195 } else
1161 button.setBackgroundColor(m_label_unfocused_color); 1196 button.setBackgroundColor(m_label_unfocused_color);
1162 1197
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index 9c26903..f1db3fe 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrame.hh,v 1.24 2003/10/28 02:17:02 rathnor Exp $ 22// $Id: FbWinFrame.hh,v 1.25 2003/12/09 08:48:08 rathnor Exp $
23 23
24#ifndef FBWINFRAME_HH 24#ifndef FBWINFRAME_HH
25#define FBWINFRAME_HH 25#define FBWINFRAME_HH
@@ -197,14 +197,18 @@ private:
197 void renderTitlebar(); 197 void renderTitlebar();
198 void renderHandles(); 198 void renderHandles();
199 void renderButtons(); 199 void renderButtons();
200 // focused => has focus
200 void renderButtonFocus(FbTk::TextButton &button); 201 void renderButtonFocus(FbTk::TextButton &button);
202 // unfocus => has no focus, label not the active one
201 void renderButtonUnfocus(FbTk::TextButton &button); 203 void renderButtonUnfocus(FbTk::TextButton &button);
204 // active => doesn't have keybaord focus, but is the active tab
205 void renderButtonActive(FbTk::TextButton &button);
202 void renderLabel(); 206 void renderLabel();
203 /// renders to pixmap or sets color 207 /// renders to pixmap or sets color
204 void render(const FbTk::Texture &tex, FbTk::Color &col, Pixmap &pm, 208 void render(const FbTk::Texture &tex, FbTk::Color &col, Pixmap &pm,
205 unsigned int width, unsigned int height); 209 unsigned int width, unsigned int height);
206 void getUnfocusPixmap(Pixmap &label_pm, Pixmap &title_pm, 210 void getActiveLabelPixmap(Pixmap &label_pm, Pixmap &title_pm,
207 FbTk::Color &label_color, FbTk::Color &title_color); 211 FbTk::Color &label_color, FbTk::Color &title_color);
208 void getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm, 212 void getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm,
209 FbTk::Color &label_color, FbTk::Color &title_color); 213 FbTk::Color &label_color, FbTk::Color &title_color);
210 void renderLabelButtons(); 214 void renderLabelButtons();
@@ -256,6 +260,8 @@ private:
256 FbTk::Color m_label_focused_color; ///< color for focused label 260 FbTk::Color m_label_focused_color; ///< color for focused label
257 Pixmap m_label_unfocused_pm; ///< pixmap for unfocused label 261 Pixmap m_label_unfocused_pm; ///< pixmap for unfocused label
258 FbTk::Color m_label_unfocused_color; ///< color for unfocued label 262 FbTk::Color m_label_unfocused_color; ///< color for unfocued label
263 Pixmap m_label_active_pm; ///< pixmap for active label
264 FbTk::Color m_label_active_color; ///< color for active label
259 265
260 FbTk::Color m_handle_focused_color, m_handle_unfocused_color; 266 FbTk::Color m_handle_focused_color, m_handle_unfocused_color;
261 Pixmap m_handle_focused_pm, m_handle_unfocused_pm; 267 Pixmap m_handle_focused_pm, m_handle_unfocused_pm;
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index 67a618d..70312bf 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrameTheme.cc,v 1.13 2003/09/29 12:53:58 rathnor Exp $ 22// $Id: FbWinFrameTheme.cc,v 1.14 2003/12/09 08:48:08 rathnor Exp $
23 23
24#include "FbWinFrameTheme.hh" 24#include "FbWinFrameTheme.hh"
25#include "App.hh" 25#include "App.hh"
@@ -27,11 +27,13 @@
27#include <X11/cursorfont.h> 27#include <X11/cursorfont.h>
28 28
29#include <iostream> 29#include <iostream>
30using namespace std;
30 31
31FbWinFrameTheme::FbWinFrameTheme(int screen_num): 32FbWinFrameTheme::FbWinFrameTheme(int screen_num):
32 FbTk::Theme(screen_num), 33 FbTk::Theme(screen_num),
33 m_label_focus(*this, "window.label.focus", "Window.Label.Focus"), 34 m_label_focus(*this, "window.label.focus", "Window.Label.Focus"),
34 m_label_unfocus(*this, "window.label.unfocus", "Window.Label.Unfocus"), 35 m_label_unfocus(*this, "window.label.unfocus", "Window.Label.Unfocus"),
36 m_label_active(*this, "window.label.active", "Window.Label.Active"),
35 37
36 m_title_focus(*this, "window.title.focus", "Window.Title.Focus"), 38 m_title_focus(*this, "window.title.focus", "Window.Title.Focus"),
37 m_title_unfocus(*this, "window.title.unfocus", "Window.Title.Unfocus"), 39 m_title_unfocus(*this, "window.title.unfocus", "Window.Title.Unfocus"),
@@ -48,6 +50,7 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num):
48 50
49 m_label_focus_color(*this, "window.label.focus.textColor", "Window.Label.Focus.TextColor"), 51 m_label_focus_color(*this, "window.label.focus.textColor", "Window.Label.Focus.TextColor"),
50 m_label_unfocus_color(*this, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor"), 52 m_label_unfocus_color(*this, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor"),
53 m_label_active_color(*this, "window.label.active.textColor", "Window.Label.Active.TextColor"),
51 54
52 m_frame_focus_color(*this, "window.frame.focusColor", "Window.Frame.FocusColor"), 55 m_frame_focus_color(*this, "window.frame.focusColor", "Window.Frame.FocusColor"),
53 m_frame_unfocus_color(*this, "window.frame.unfocusColor", "Window.Frame.UnfocusColor"), 56 m_frame_unfocus_color(*this, "window.frame.unfocusColor", "Window.Frame.UnfocusColor"),
@@ -65,6 +68,7 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num):
65 m_border(*this, "window", "Window"), // for window.border* 68 m_border(*this, "window", "Window"), // for window.border*
66 m_label_text_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)), 69 m_label_text_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
67 m_label_text_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)), 70 m_label_text_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
71 m_label_text_active_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
68 m_button_pic_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)), 72 m_button_pic_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
69 m_button_pic_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)) { 73 m_button_pic_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)) {
70 74
@@ -80,6 +84,8 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num):
80 m_cursor_lower_right_angle = XCreateFontCursor(disp, XC_lr_angle); 84 m_cursor_lower_right_angle = XCreateFontCursor(disp, XC_lr_angle);
81 m_cursor_upper_right_angle = XCreateFontCursor(disp, XC_ur_angle); 85 m_cursor_upper_right_angle = XCreateFontCursor(disp, XC_ur_angle);
82 m_cursor_upper_left_angle = XCreateFontCursor(disp, XC_ul_angle); 86 m_cursor_upper_left_angle = XCreateFontCursor(disp, XC_ul_angle);
87
88 reconfigTheme();
83} 89}
84 90
85FbWinFrameTheme::~FbWinFrameTheme() { 91FbWinFrameTheme::~FbWinFrameTheme() {
@@ -95,6 +101,11 @@ bool FbWinFrameTheme::fallback(FbTk::ThemeItem_base &item) {
95 return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "bevelWidth"); 101 return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "bevelWidth");
96 else if (item.name() == "window.handleWidth") 102 else if (item.name() == "window.handleWidth")
97 return FbTk::ThemeManager::instance().loadItem(item, "handleWidth", "HandleWidth"); 103 return FbTk::ThemeManager::instance().loadItem(item, "handleWidth", "HandleWidth");
104 else if (item.name() == "window.label.active")
105 return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus", "Window.Label.Unfocus");
106 else if (item.name() == "window.label.active.textColor")
107 return FbTk::ThemeManager::instance().loadItem(item, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor");
108
98 109
99 return false; 110 return false;
100} 111}
@@ -117,6 +128,7 @@ void FbWinFrameTheme::reconfigTheme() {
117 128
118 m_label_text_focus_gc.setForeground(*m_label_focus_color); 129 m_label_text_focus_gc.setForeground(*m_label_focus_color);
119 m_label_text_unfocus_gc.setForeground(*m_label_unfocus_color); 130 m_label_text_unfocus_gc.setForeground(*m_label_unfocus_color);
131 m_label_text_active_gc.setForeground(*m_label_active_color);
120 m_button_pic_focus_gc.setForeground(*m_button_focus_color); 132 m_button_pic_focus_gc.setForeground(*m_button_focus_color);
121 m_button_pic_unfocus_gc.setForeground(*m_button_unfocus_color); 133 m_button_pic_unfocus_gc.setForeground(*m_button_unfocus_color);
122 134
diff --git a/src/FbWinFrameTheme.hh b/src/FbWinFrameTheme.hh
index 712f4be..bc567f8 100644
--- a/src/FbWinFrameTheme.hh
+++ b/src/FbWinFrameTheme.hh
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrameTheme.hh,v 1.12 2003/09/29 12:53:58 rathnor Exp $ 22// $Id: FbWinFrameTheme.hh,v 1.13 2003/12/09 08:48:08 rathnor Exp $
23 23
24#ifndef FBWINFRAMETHEME_HH 24#ifndef FBWINFRAMETHEME_HH
25#define FBWINFRAMETHEME_HH 25#define FBWINFRAMETHEME_HH
@@ -45,6 +45,7 @@ public:
45 //@{ 45 //@{
46 const FbTk::Texture &labelFocusTexture() const { return *m_label_focus; } 46 const FbTk::Texture &labelFocusTexture() const { return *m_label_focus; }
47 const FbTk::Texture &labelUnfocusTexture() const { return *m_label_unfocus; } 47 const FbTk::Texture &labelUnfocusTexture() const { return *m_label_unfocus; }
48 const FbTk::Texture &labelActiveTexture() const { return *m_label_active; }
48 49
49 const FbTk::Texture &titleFocusTexture() const { return *m_title_focus; } 50 const FbTk::Texture &titleFocusTexture() const { return *m_title_focus; }
50 const FbTk::Texture &titleUnfocusTexture() const { return *m_title_unfocus; } 51 const FbTk::Texture &titleUnfocusTexture() const { return *m_title_unfocus; }
@@ -66,6 +67,8 @@ public:
66 //@{ 67 //@{
67 const FbTk::Color &labelFocusColor() const { return *m_label_focus_color; } 68 const FbTk::Color &labelFocusColor() const { return *m_label_focus_color; }
68 const FbTk::Color &labelUnfocusColor() const { return *m_label_unfocus_color; } 69 const FbTk::Color &labelUnfocusColor() const { return *m_label_unfocus_color; }
70 const FbTk::Color &labelActiveColor() const { return *m_label_active_color; }
71
69 const FbTk::Color &frameFocuscolor() const { return *m_frame_focus_color; } 72 const FbTk::Color &frameFocuscolor() const { return *m_frame_focus_color; }
70 const FbTk::Color &frameUnfocuscolor() const { return *m_frame_unfocus_color; } 73 const FbTk::Color &frameUnfocuscolor() const { return *m_frame_unfocus_color; }
71 const FbTk::Color &buttonFocuscolor() const { return *m_button_focus_color; } 74 const FbTk::Color &buttonFocuscolor() const { return *m_button_focus_color; }
@@ -78,6 +81,7 @@ public:
78 81
79 GC labelTextFocusGC() const { return m_label_text_focus_gc.gc(); } 82 GC labelTextFocusGC() const { return m_label_text_focus_gc.gc(); }
80 GC labelTextUnfocusGC() const { return m_label_text_unfocus_gc.gc(); } 83 GC labelTextUnfocusGC() const { return m_label_text_unfocus_gc.gc(); }
84 GC labelTextActiveGC() const { return m_label_text_active_gc.gc(); }
81 GC buttonPicFocusGC() const { return m_button_pic_focus_gc.gc(); } 85 GC buttonPicFocusGC() const { return m_button_pic_focus_gc.gc(); }
82 GC buttonPicUnfocusGC() const { return m_button_pic_unfocus_gc.gc(); } 86 GC buttonPicUnfocusGC() const { return m_button_pic_unfocus_gc.gc(); }
83 87
@@ -102,13 +106,13 @@ public:
102 unsigned int handleWidth() const { return *m_handle_width; } 106 unsigned int handleWidth() const { return *m_handle_width; }
103 107
104private: 108private:
105 FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus; 109 FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus, m_label_active;
106 FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus; 110 FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus;
107 FbTk::ThemeItem<FbTk::Texture> m_handle_focus, m_handle_unfocus; 111 FbTk::ThemeItem<FbTk::Texture> m_handle_focus, m_handle_unfocus;
108 FbTk::ThemeItem<FbTk::Texture> m_button_focus, m_button_unfocus, m_button_pressed; 112 FbTk::ThemeItem<FbTk::Texture> m_button_focus, m_button_unfocus, m_button_pressed;
109 FbTk::ThemeItem<FbTk::Texture> m_grip_focus, m_grip_unfocus; 113 FbTk::ThemeItem<FbTk::Texture> m_grip_focus, m_grip_unfocus;
110 114
111 FbTk::ThemeItem<FbTk::Color> m_label_focus_color, m_label_unfocus_color; 115 FbTk::ThemeItem<FbTk::Color> m_label_focus_color, m_label_unfocus_color, m_label_active_color;
112 FbTk::ThemeItem<FbTk::Color> m_frame_focus_color, m_frame_unfocus_color; 116 FbTk::ThemeItem<FbTk::Color> m_frame_focus_color, m_frame_unfocus_color;
113 FbTk::ThemeItem<FbTk::Color> m_button_focus_color, m_button_unfocus_color; 117 FbTk::ThemeItem<FbTk::Color> m_button_focus_color, m_button_unfocus_color;
114 118
@@ -119,7 +123,7 @@ private:
119 FbTk::ThemeItem<int> m_alpha, m_title_height, m_bevel_width, m_handle_width; 123 FbTk::ThemeItem<int> m_alpha, m_title_height, m_bevel_width, m_handle_width;
120 BorderTheme m_border; 124 BorderTheme m_border;
121 125
122 FbTk::GContext m_label_text_focus_gc, m_label_text_unfocus_gc; 126 FbTk::GContext m_label_text_focus_gc, m_label_text_unfocus_gc, m_label_text_active_gc;
123 FbTk::GContext m_button_pic_focus_gc, m_button_pic_unfocus_gc; 127 FbTk::GContext m_button_pic_focus_gc, m_button_pic_unfocus_gc;
124 128
125 FbTk::Subject m_theme_change; 129 FbTk::Subject m_theme_change;
diff --git a/src/main.cc b/src/main.cc
index 9a91e35..fde14cb 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: main.cc,v 1.24 2003/10/02 16:14:41 rathnor Exp $ 23// $Id: main.cc,v 1.25 2003/12/09 08:48:08 rathnor Exp $
24 24
25#include "fluxbox.hh" 25#include "fluxbox.hh"
26#include "I18n.hh" 26#include "I18n.hh"
@@ -181,7 +181,7 @@ int main(int argc, char **argv) {
181 exit(0); 181 exit(0);
182 } else if (strcmp(argv[i], "-log") == 0 ) { 182 } else if (strcmp(argv[i], "-log") == 0 ) {
183 if (i + 1 >= argc) { 183 if (i + 1 >= argc) {
184 cerr<<"error: '-log' need an argument"<<endl; 184 cerr<<"error: '-log' needs an argument"<<endl;
185 exit(1); 185 exit(1);
186 } 186 }
187 log_filename = argv[++i]; 187 log_filename = argv[++i];