aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorsimonb <simonb>2006-03-20 11:31:24 (GMT)
committersimonb <simonb>2006-03-20 11:31:24 (GMT)
commitf2d3fff4d4db7677814379139dcec3e31fc68047 (patch)
tree95bd9dc99986104613acc37945895b0812e63801 /src/fluxbox.cc
parenteba0040373179cc6d34f8ee132209f2fa01c2889 (diff)
downloadfluxbox_pavel-f2d3fff4d4db7677814379139dcec3e31fc68047.zip
fluxbox_pavel-f2d3fff4d4db7677814379139dcec3e31fc68047.tar.bz2
external tabs
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 2ae8110..061bf1f 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -175,6 +175,8 @@ int handleXErrors(Display *d, XErrorEvent *e) {
175 XGetErrorText(d, e->error_code, errtxt, 128); 175 XGetErrorText(d, e->error_code, errtxt, 128);
176 cerr<<"Fluxbox: X Error: "<<errtxt<<"("<<(int)e->error_code<<") opcodes "<< 176 cerr<<"Fluxbox: X Error: "<<errtxt<<"("<<(int)e->error_code<<") opcodes "<<
177 (int)e->request_code<<"/"<<(int)e->minor_code<<" resource 0x"<<hex<<(int)e->resourceid<<dec<<endl; 177 (int)e->request_code<<"/"<<(int)e->minor_code<<" resource 0x"<<hex<<(int)e->resourceid<<dec<<endl;
178// if (e->error_code != 9 && e->error_code != 183)
179// kill(0, 2);
178 } 180 }
179#endif // !DEBUG 181#endif // !DEBUG
180 182
@@ -193,15 +195,15 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
193 // TODO: shouldn't need a separate one for screen 195 // TODO: shouldn't need a separate one for screen
194 m_screen_rm(m_resourcemanager), 196 m_screen_rm(m_resourcemanager),
195 m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"), 197 m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"),
196 m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"),
197 m_rc_focused_tab_min_width(m_resourcemanager, 0, "session.focusTabMinWidth",
198 "Session.FocusTabMinWidth"),
199 m_rc_ignoreborder(m_resourcemanager, false, "session.ignoreBorder", "Session.IgnoreBorder"), 198 m_rc_ignoreborder(m_resourcemanager, false, "session.ignoreBorder", "Session.IgnoreBorder"),
200 m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"), 199 m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"),
201 m_rc_colors_per_channel(m_resourcemanager, 4, 200 m_rc_colors_per_channel(m_resourcemanager, 4,
202 "session.colorsPerChannel", "Session.ColorsPerChannel"), 201 "session.colorsPerChannel", "Session.ColorsPerChannel"),
203 m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), 202 m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"),
204 m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), 203 m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"),
204 m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"),
205 m_rc_focused_tab_min_width(m_resourcemanager, 0, "session.focusTabMinWidth",
206 "Session.FocusTabMinWidth"),
205 m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), 207 m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"),
206 m_rc_styleoverlayfile(m_resourcemanager, "~/.fluxbox/overlay", "session.styleOverlay", "Session.StyleOverlay"), 208 m_rc_styleoverlayfile(m_resourcemanager, "~/.fluxbox/overlay", "session.styleOverlay", "Session.StyleOverlay"),
207 m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), 209 m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"),
@@ -358,8 +360,8 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
358 } 360 }
359 361
360 // init all "screens" 362 // init all "screens"
361 for(i = 0; i < screens.size(); i++) 363 for(unsigned int s = 0; s < screens.size(); s++)
362 initScreen(screens[i]); 364 initScreen(screens[s]);
363 365
364 XAllowEvents(disp, ReplayPointer, CurrentTime); 366 XAllowEvents(disp, ReplayPointer, CurrentTime);
365 367