aboutsummaryrefslogtreecommitdiff
path: root/src/Theme.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Theme.cc')
-rw-r--r--src/Theme.cc17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index 765be80..80ab585 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -422,8 +422,7 @@ void Theme::loadWindowStyle() {
422 422
423 readDatabaseTexture("window.title.focus", "Window.Title.Focus", 423 readDatabaseTexture("window.title.focus", "Window.Title.Focus",
424 &m_windowstyle.t_focus, 424 &m_windowstyle.t_focus,
425 WhitePixel(m_display, 425 WhitePixel(m_display, m_screennum));
426 m_screennum));
427 readDatabaseTexture("window.title.unfocus", "Window.Title.Unfocus", 426 readDatabaseTexture("window.title.unfocus", "Window.Title.Unfocus",
428 &m_windowstyle.t_unfocus, 427 &m_windowstyle.t_unfocus,
429 BlackPixel(m_display, m_screennum)); 428 BlackPixel(m_display, m_screennum));
@@ -512,7 +511,7 @@ void Theme::loadWindowStyle() {
512} 511}
513 512
514void Theme::loadTabStyle() { 513void Theme::loadTabStyle() {
515 514
516 if (!readDatabaseTexture("window.tab.title.focus", "Window.Tab.Title.Focus", 515 if (!readDatabaseTexture("window.tab.title.focus", "Window.Tab.Title.Focus",
517 &m_windowstyle.tab.t_focus, 516 &m_windowstyle.tab.t_focus,
518 WhitePixel(m_display, m_screennum))) 517 WhitePixel(m_display, m_screennum)))
@@ -532,7 +531,6 @@ void Theme::loadTabStyle() {
532 &m_windowstyle.tab.l_unfocus, 531 &m_windowstyle.tab.l_unfocus,
533 BlackPixel(m_display, m_screennum))) 532 BlackPixel(m_display, m_screennum)))
534 m_windowstyle.tab.l_unfocus = m_windowstyle.l_unfocus; 533 m_windowstyle.tab.l_unfocus = m_windowstyle.l_unfocus;
535
536 534
537 if (!readDatabaseColor("window.tab.label.focus.textColor", 535 if (!readDatabaseColor("window.tab.label.focus.textColor",
538 "Window.Tab.Label.Focus.TextColor", 536 "Window.Tab.Label.Focus.TextColor",
@@ -549,11 +547,10 @@ void Theme::loadTabStyle() {
549 readDatabaseColor("window.tab.borderColor", "Window.Tab.BorderColor", 547 readDatabaseColor("window.tab.borderColor", "Window.Tab.BorderColor",
550 &m_windowstyle.tab.border_color, 548 &m_windowstyle.tab.border_color,
551 BlackPixel(m_display, m_screennum)); 549 BlackPixel(m_display, m_screennum));
552 550
553
554 XrmValue value; 551 XrmValue value;
555 char *value_type; 552 char *value_type;
556 553
557 if (XrmGetResource(m_database, "window.tab.borderWidth", "Window.Tab.BorderWidth", 554 if (XrmGetResource(m_database, "window.tab.borderWidth", "Window.Tab.BorderWidth",
558 &value_type, &value)) { 555 &value_type, &value)) {
559 if (sscanf(value.addr, "%u", &m_windowstyle.tab.border_width) != 1) 556 if (sscanf(value.addr, "%u", &m_windowstyle.tab.border_width) != 1)
@@ -578,7 +575,6 @@ void Theme::loadTabStyle() {
578 } 575 }
579 576
580 //--------- rotated font for left and right tabs 577 //--------- rotated font for left and right tabs
581
582 // TODO: add extra checking 578 // TODO: add extra checking
583 if (XrmGetResource(m_database, "window.tab.font", "Window.Tab.Font", 579 if (XrmGetResource(m_database, "window.tab.font", "Window.Tab.Font",
584 &value_type, &value)) { 580 &value_type, &value)) {
@@ -587,7 +583,6 @@ void Theme::loadTabStyle() {
587 } else 583 } else
588 m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, "fixed", 90); 584 m_windowstyle.tab.rot_font = Misc::XRotLoadFont(m_display, "fixed", 90);
589 585
590
591 if (XrmGetResource(m_database, "window.tab.justify", "Window.Tab.Justify", 586 if (XrmGetResource(m_database, "window.tab.justify", "Window.Tab.Justify",
592 &value_type, &value)) { 587 &value_type, &value)) {
593 if (strstr(value.addr, "right") || strstr(value.addr, "Right")) 588 if (strstr(value.addr, "right") || strstr(value.addr, "Right"))
@@ -668,9 +663,9 @@ void Theme::loadRootCommand() {
668 XrmValue value; 663 XrmValue value;
669 char *value_type; 664 char *value_type;
670 Fluxbox *fb=Fluxbox::instance(); 665 Fluxbox *fb=Fluxbox::instance();
671// printf("getting root command from fb->getRootCommand()"); 666
672 const char *root_cmd=fb->getRootCommand(); 667 const char *root_cmd=fb->getRootCommand();
673// printf("root kommandot: %s\n", root_cmd); 668
674 if (root_cmd) { 669 if (root_cmd) {
675 #ifndef __EMX__ 670 #ifndef __EMX__
676 const int display_strlen = 1024; 671 const int display_strlen = 1024;