From e1eb5e225b316a55aaab34547c20ad8c67168c3e Mon Sep 17 00:00:00 2001 From: Mark Tiefenbruck Date: Sat, 4 Oct 2008 19:08:50 -0700 Subject: remove line style resources from init file --- ChangeLog | 2 ++ doc/asciidoc/fluxbox.1 | 7 ------- doc/asciidoc/fluxbox.txt | 7 ------- doc/fluxbox.1.in | 7 ------- src/RootTheme.cc | 1 - src/RootTheme.hh | 7 ------- src/Screen.cc | 28 ---------------------------- src/Screen.hh | 5 ----- 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 @@ (Format: Year/Month/Day) Changes for 1.1.2 *08/10/05: + * Remove line style resources from init file (Mark) + Screen.cc/hh * Remove rootcommand from init, as fbsetbg is run automatically nowadays. For other purposes, use startup instead. (Mark) 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: Used to specify the iconbar button width for Left/Right alignment\&. Default: 70 -session\&.screen0\&.overlay\&.lineWidth: 1 -session\&.screen0\&.overlay\&.lineStyle: LineSolid -session\&.screen0\&.overlay\&.joinStyle: JoinMiter -session\&.screen0\&.overlay\&.capStyle: CapNotLast - These are options for how fluxbox draws lines\&. See - `man XSetLineAttributes\' for more details\&. Defaults: listed above - session\&.screen0\&.strftimeFormat: This adjusts the way the current time is displayed in the toolbar\&. The 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: Used to specify the iconbar button width for Left/Right alignment. Default: 70 -session.screen0.overlay.lineWidth: 1 -session.screen0.overlay.lineStyle: LineSolid -session.screen0.overlay.joinStyle: JoinMiter -session.screen0.overlay.capStyle: CapNotLast - These are options for how fluxbox draws lines. See - `man XSetLineAttributes' for more details. Defaults: listed above - session.screen0.strftimeFormat: This adjusts the way the current time is displayed in the toolbar. The 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: Used to specify the iconbar button width for Left/Right alignment\&. Default: 70 -session\&.screen0\&.overlay\&.lineWidth: 1 -session\&.screen0\&.overlay\&.lineStyle: LineSolid -session\&.screen0\&.overlay\&.joinStyle: JoinMiter -session\&.screen0\&.overlay\&.capStyle: CapNotLast - These are options for how fluxbox draws lines\&. See - `man XSetLineAttributes\' for more details\&. Defaults: listed above - session\&.screen0\&.strftimeFormat: This adjusts the way the current time is displayed in the toolbar\&. The 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): m_opgc.setForeground(WhitePixel(disp, screenNum())^BlackPixel(disp, screenNum())); m_opgc.setFunction(GXxor); m_opgc.setSubwindowMode(IncludeInferiors); - m_opgc.setLineAttributes(1, LineSolid, CapNotLast, JoinMiter); FbTk::ThemeManager::instance().loadTheme(*this); } 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: GC opGC() const { return m_opgc.gc(); } - void setLineAttributes(unsigned int width, - int line_style, - int cap_style, - int join_style) { - m_opgc.setLineAttributes(width, line_style, cap_style, join_style); - } - virtual FbTk::Subject &reconfigSig() { return FbTk::Theme::reconfigSig(); } virtual const FbTk::Subject &reconfigSig() const { return FbTk::Theme::reconfigSig(); } 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, tab_width(rm, 64, scrname + ".tab.width", altscrname+".Tab.Width"), tooltip_delay(rm, 500, scrname + ".tooltipDelay", altscrname+".TooltipDelay"), menu_mode(rm, FbTk::MenuTheme::DELAY_OPEN, scrname+".menuMode", altscrname+".MenuMode"), - - gc_line_width(rm, 1, scrname+".overlay.lineWidth", altscrname+".Overlay.LineWidth"), - gc_line_style(rm, - FbTk::GContext::LINESOLID, - scrname+".overlay.lineStyle", - altscrname+".Overlay.LineStyle"), - gc_join_style(rm, - FbTk::GContext::JOINMITER, - scrname+".overlay.joinStyle", - altscrname+".Overlay.JoinStyle"), - gc_cap_style(rm, - FbTk::GContext::CAPNOTLAST, - scrname+".overlay.capStyle", - altscrname+".overlay.CapStyle"), allow_remote_actions(rm, false, scrname+".allowRemoteActions", altscrname+".AllowRemoteActions"), clientmenu_use_pixmap(rm, true, scrname+".clientMenu.usePixmap", altscrname+".ClientMenu.UsePixmap"), tabs_use_pixmap(rm, true, scrname+".tabs.usePixmap", altscrname+".Tabs.UsePixmap"), @@ -532,15 +518,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm, changeWorkspaceID(first_desktop); - // we need to load win frame theme before we create any fluxbox window - // and after we've load the resources - // else we get some bad handle/grip height/width - // FbTk::ThemeManager::instance().loadTheme(*m_windowtheme.get()); - m_root_theme->setLineAttributes(*resource.gc_line_width, - *resource.gc_line_style, - *resource.gc_cap_style, - *resource.gc_join_style); - #ifdef SLIT m_slit.reset(new Slit(*this, *layerManager().getLayer(Layer::DESKTOP), fluxbox->getSlitlistFilename().c_str())); @@ -948,11 +925,6 @@ void BScreen::reconfigure() { if (*resource.menu_delay_close < 0) *resource.menu_delay_close = 0; - m_root_theme->setLineAttributes(*resource.gc_line_width, - *resource.gc_line_style, - *resource.gc_cap_style, - *resource.gc_join_style); - m_menutheme->setDelayOpen(*resource.menu_delay); m_menutheme->setDelayClose(*resource.menu_delay_close); 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: unfocused_alpha, menu_alpha, menu_delay, menu_delay_close, tab_width, tooltip_delay; FbTk::Resource menu_mode; - - FbTk::Resource gc_line_width; - FbTk::Resource gc_line_style; - FbTk::Resource gc_join_style; - FbTk::Resource gc_cap_style; FbTk::Resource allow_remote_actions; FbTk::Resource clientmenu_use_pixmap; FbTk::Resource tabs_use_pixmap; -- cgit v0.11.2