aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-10-05 02:08:50 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-10-05 02:08:50 (GMT)
commite1eb5e225b316a55aaab34547c20ad8c67168c3e (patch)
treef90d406c98c745e43bcdca9d73cdc1a8c702615f
parentab25696328c49b7551ea242b740ff9c79953f722 (diff)
downloadfluxbox_pavel-e1eb5e225b316a55aaab34547c20ad8c67168c3e.zip
fluxbox_pavel-e1eb5e225b316a55aaab34547c20ad8c67168c3e.tar.bz2
remove line style resources from init file
-rw-r--r--ChangeLog2
-rw-r--r--doc/asciidoc/fluxbox.17
-rw-r--r--doc/asciidoc/fluxbox.txt7
-rw-r--r--doc/fluxbox.1.in7
-rw-r--r--src/RootTheme.cc1
-rw-r--r--src/RootTheme.hh7
-rw-r--r--src/Screen.cc28
-rw-r--r--src/Screen.hh5
8 files changed, 2 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog
index c26802b..ab1d29e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1.2 2Changes for 1.1.2
3*08/10/05: 3*08/10/05:
4 * Remove line style resources from init file (Mark)
5 Screen.cc/hh
4 * Remove rootcommand from init, as fbsetbg is run automatically nowadays. 6 * Remove rootcommand from init, as fbsetbg is run automatically nowadays.
5 For other purposes, use startup instead. (Mark) 7 For other purposes, use startup instead. (Mark)
6 Screen.cc/hh 8 Screen.cc/hh
diff --git a/doc/asciidoc/fluxbox.1 b/doc/asciidoc/fluxbox.1
index 2de2279..424e614 100644
--- a/doc/asciidoc/fluxbox.1
+++ b/doc/asciidoc/fluxbox.1
@@ -1740,13 +1740,6 @@ session\&.screen0\&.iconbar\&.iconWidth: <integer>
1740 Used to specify the iconbar button width for Left/Right alignment\&. 1740 Used to specify the iconbar button width for Left/Right alignment\&.
1741 Default: 70 1741 Default: 70
1742 1742
1743session\&.screen0\&.overlay\&.lineWidth: 1
1744session\&.screen0\&.overlay\&.lineStyle: LineSolid
1745session\&.screen0\&.overlay\&.joinStyle: JoinMiter
1746session\&.screen0\&.overlay\&.capStyle: CapNotLast
1747 These are options for how fluxbox draws lines\&. See
1748 `man XSetLineAttributes\' for more details\&. Defaults: listed above
1749
1750session\&.screen0\&.strftimeFormat: <date> 1743session\&.screen0\&.strftimeFormat: <date>
1751 This adjusts the way the current time is displayed in the toolbar\&. The 1744 This adjusts the way the current time is displayed in the toolbar\&. The
1752 strftime(3) format is used\&. Default: %I:%M %p 1745 strftime(3) format is used\&. Default: %I:%M %p
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index c584195..18f99c6 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -788,13 +788,6 @@ session.screen0.iconbar.iconWidth: <integer>
788 Used to specify the iconbar button width for Left/Right alignment. 788 Used to specify the iconbar button width for Left/Right alignment.
789 Default: 70 789 Default: 70
790 790
791session.screen0.overlay.lineWidth: 1
792session.screen0.overlay.lineStyle: LineSolid
793session.screen0.overlay.joinStyle: JoinMiter
794session.screen0.overlay.capStyle: CapNotLast
795 These are options for how fluxbox draws lines. See
796 `man XSetLineAttributes' for more details. Defaults: listed above
797
798session.screen0.strftimeFormat: <date> 791session.screen0.strftimeFormat: <date>
799 This adjusts the way the current time is displayed in the toolbar. The 792 This adjusts the way the current time is displayed in the toolbar. The
800 strftime(3) format is used. Default: %I:%M %p 793 strftime(3) format is used. Default: %I:%M %p
diff --git a/doc/fluxbox.1.in b/doc/fluxbox.1.in
index 2de2279..424e614 100644
--- a/doc/fluxbox.1.in
+++ b/doc/fluxbox.1.in
@@ -1740,13 +1740,6 @@ session\&.screen0\&.iconbar\&.iconWidth: <integer>
1740 Used to specify the iconbar button width for Left/Right alignment\&. 1740 Used to specify the iconbar button width for Left/Right alignment\&.
1741 Default: 70 1741 Default: 70
1742 1742
1743session\&.screen0\&.overlay\&.lineWidth: 1
1744session\&.screen0\&.overlay\&.lineStyle: LineSolid
1745session\&.screen0\&.overlay\&.joinStyle: JoinMiter
1746session\&.screen0\&.overlay\&.capStyle: CapNotLast
1747 These are options for how fluxbox draws lines\&. See
1748 `man XSetLineAttributes\' for more details\&. Defaults: listed above
1749
1750session\&.screen0\&.strftimeFormat: <date> 1743session\&.screen0\&.strftimeFormat: <date>
1751 This adjusts the way the current time is displayed in the toolbar\&. The 1744 This adjusts the way the current time is displayed in the toolbar\&. The
1752 strftime(3) format is used\&. Default: %I:%M %p 1745 strftime(3) format is used\&. Default: %I:%M %p
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 8317a5d..a40732e 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -157,7 +157,6 @@ RootTheme::RootTheme(FbTk::ImageControl &image_control):
157 m_opgc.setForeground(WhitePixel(disp, screenNum())^BlackPixel(disp, screenNum())); 157 m_opgc.setForeground(WhitePixel(disp, screenNum())^BlackPixel(disp, screenNum()));
158 m_opgc.setFunction(GXxor); 158 m_opgc.setFunction(GXxor);
159 m_opgc.setSubwindowMode(IncludeInferiors); 159 m_opgc.setSubwindowMode(IncludeInferiors);
160 m_opgc.setLineAttributes(1, LineSolid, CapNotLast, JoinMiter);
161 FbTk::ThemeManager::instance().loadTheme(*this); 160 FbTk::ThemeManager::instance().loadTheme(*this);
162} 161}
163 162
diff --git a/src/RootTheme.hh b/src/RootTheme.hh
index f623ba2..0867430 100644
--- a/src/RootTheme.hh
+++ b/src/RootTheme.hh
@@ -48,13 +48,6 @@ public:
48 48
49 GC opGC() const { return m_opgc.gc(); } 49 GC opGC() const { return m_opgc.gc(); }
50 50
51 void setLineAttributes(unsigned int width,
52 int line_style,
53 int cap_style,
54 int join_style) {
55 m_opgc.setLineAttributes(width, line_style, cap_style, join_style);
56 }
57
58 virtual FbTk::Subject &reconfigSig() { return FbTk::Theme::reconfigSig(); } 51 virtual FbTk::Subject &reconfigSig() { return FbTk::Theme::reconfigSig(); }
59 virtual const FbTk::Subject &reconfigSig() const { return FbTk::Theme::reconfigSig(); } 52 virtual const FbTk::Subject &reconfigSig() const { return FbTk::Theme::reconfigSig(); }
60 53
diff --git a/src/Screen.cc b/src/Screen.cc
index 2a89bad..2c54d5d 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -311,20 +311,6 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
311 tab_width(rm, 64, scrname + ".tab.width", altscrname+".Tab.Width"), 311 tab_width(rm, 64, scrname + ".tab.width", altscrname+".Tab.Width"),
312 tooltip_delay(rm, 500, scrname + ".tooltipDelay", altscrname+".TooltipDelay"), 312 tooltip_delay(rm, 500, scrname + ".tooltipDelay", altscrname+".TooltipDelay"),
313 menu_mode(rm, FbTk::MenuTheme::DELAY_OPEN, scrname+".menuMode", altscrname+".MenuMode"), 313 menu_mode(rm, FbTk::MenuTheme::DELAY_OPEN, scrname+".menuMode", altscrname+".MenuMode"),
314
315 gc_line_width(rm, 1, scrname+".overlay.lineWidth", altscrname+".Overlay.LineWidth"),
316 gc_line_style(rm,
317 FbTk::GContext::LINESOLID,
318 scrname+".overlay.lineStyle",
319 altscrname+".Overlay.LineStyle"),
320 gc_join_style(rm,
321 FbTk::GContext::JOINMITER,
322 scrname+".overlay.joinStyle",
323 altscrname+".Overlay.JoinStyle"),
324 gc_cap_style(rm,
325 FbTk::GContext::CAPNOTLAST,
326 scrname+".overlay.capStyle",
327 altscrname+".overlay.CapStyle"),
328 allow_remote_actions(rm, false, scrname+".allowRemoteActions", altscrname+".AllowRemoteActions"), 314 allow_remote_actions(rm, false, scrname+".allowRemoteActions", altscrname+".AllowRemoteActions"),
329 clientmenu_use_pixmap(rm, true, scrname+".clientMenu.usePixmap", altscrname+".ClientMenu.UsePixmap"), 315 clientmenu_use_pixmap(rm, true, scrname+".clientMenu.usePixmap", altscrname+".ClientMenu.UsePixmap"),
330 tabs_use_pixmap(rm, true, scrname+".tabs.usePixmap", altscrname+".Tabs.UsePixmap"), 316 tabs_use_pixmap(rm, true, scrname+".tabs.usePixmap", altscrname+".Tabs.UsePixmap"),
@@ -532,15 +518,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
532 518
533 changeWorkspaceID(first_desktop); 519 changeWorkspaceID(first_desktop);
534 520
535 // we need to load win frame theme before we create any fluxbox window
536 // and after we've load the resources
537 // else we get some bad handle/grip height/width
538 // FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get());
539 m_root_theme->setLineAttributes(*resource.gc_line_width,
540 *resource.gc_line_style,
541 *resource.gc_cap_style,
542 *resource.gc_join_style);
543
544#ifdef SLIT 521#ifdef SLIT
545 m_slit.reset(new Slit(*this, *layerManager().getLayer(Layer::DESKTOP), 522 m_slit.reset(new Slit(*this, *layerManager().getLayer(Layer::DESKTOP),
546 fluxbox->getSlitlistFilename().c_str())); 523 fluxbox->getSlitlistFilename().c_str()));
@@ -948,11 +925,6 @@ void BScreen::reconfigure() {
948 if (*resource.menu_delay_close < 0) 925 if (*resource.menu_delay_close < 0)
949 *resource.menu_delay_close = 0; 926 *resource.menu_delay_close = 0;
950 927
951 m_root_theme->setLineAttributes(*resource.gc_line_width,
952 *resource.gc_line_style,
953 *resource.gc_cap_style,
954 *resource.gc_join_style);
955
956 m_menutheme->setDelayOpen(*resource.menu_delay); 928 m_menutheme->setDelayOpen(*resource.menu_delay);
957 m_menutheme->setDelayClose(*resource.menu_delay_close); 929 m_menutheme->setDelayClose(*resource.menu_delay_close);
958 930
diff --git a/src/Screen.hh b/src/Screen.hh
index 4f36190..c81098b 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -560,11 +560,6 @@ private:
560 unfocused_alpha, menu_alpha, menu_delay, menu_delay_close, 560 unfocused_alpha, menu_alpha, menu_delay, menu_delay_close,
561 tab_width, tooltip_delay; 561 tab_width, tooltip_delay;
562 FbTk::Resource<FbTk::MenuTheme::MenuMode> menu_mode; 562 FbTk::Resource<FbTk::MenuTheme::MenuMode> menu_mode;
563
564 FbTk::Resource<int> gc_line_width;
565 FbTk::Resource<FbTk::GContext::LineStyle> gc_line_style;
566 FbTk::Resource<FbTk::GContext::JoinStyle> gc_join_style;
567 FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style;
568 FbTk::Resource<bool> allow_remote_actions; 563 FbTk::Resource<bool> allow_remote_actions;
569 FbTk::Resource<bool> clientmenu_use_pixmap; 564 FbTk::Resource<bool> clientmenu_use_pixmap;
570 FbTk::Resource<bool> tabs_use_pixmap; 565 FbTk::Resource<bool> tabs_use_pixmap;