nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove line style resources from init file

Browse source
This commit is contained in:
Mark Tiefenbruck 2008-10-04 19:08:50 -07:00
parent ab25696328
commit e1eb5e225b
8 changed files with 2 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -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

7
doc/asciidoc/fluxbox.1
View file

@ -1740,13 +1740,6 @@ session\&.screen0\&.iconbar\&.iconWidth: <integer>
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: <date>
This adjusts the way the current time is displayed in the toolbar\&. The
strftime(3) format is used\&. Default: %I:%M %p

7
doc/asciidoc/fluxbox.txt
View file

@ -788,13 +788,6 @@ session.screen0.iconbar.iconWidth: <integer>
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: <date>
This adjusts the way the current time is displayed in the toolbar. The
strftime(3) format is used. Default: %I:%M %p

7
doc/fluxbox.1.in
View file

@ -1740,13 +1740,6 @@ session\&.screen0\&.iconbar\&.iconWidth: <integer>
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: <date>
This adjusts the way the current time is displayed in the toolbar\&. The
strftime(3) format is used\&. Default: %I:%M %p

1
src/RootTheme.cc
View file

@ -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);
}

7
src/RootTheme.hh
View file

@ -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(); }

28
src/Screen.cc
View file

@ -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);

5
src/Screen.hh
View file

@ -560,11 +560,6 @@ private:
unfocused_alpha, menu_alpha, menu_delay, menu_delay_close,
tab_width, tooltip_delay;
FbTk::Resource<FbTk::MenuTheme::MenuMode> menu_mode;
FbTk::Resource<int> gc_line_width;
FbTk::Resource<FbTk::GContext::LineStyle> gc_line_style;
FbTk::Resource<FbTk::GContext::JoinStyle> gc_join_style;
FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style;
FbTk::Resource<bool> allow_remote_actions;
FbTk::Resource<bool> clientmenu_use_pixmap;
FbTk::Resource<bool> tabs_use_pixmap;