diff options
author | fluxgen <fluxgen> | 2002-03-01 15:28:56 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-03-01 15:28:56 (GMT) |
commit | 32cb305aadfb305af6ae96f8d15f8ab82e3cbb67 (patch) | |
tree | e71548423a479d438f952d1229e998e537e9f4b3 | |
parent | 78e0f1fea49dd2dc323670de3752c327b7e9e9bc (diff) | |
download | fluxbox_paul-32cb305aadfb305af6ae96f8d15f8ab82e3cbb67.zip fluxbox_paul-32cb305aadfb305af6ae96f8d15f8ab82e3cbb67.tar.bz2 |
fixed default arguments for titlebar
-rw-r--r-- | src/fluxbox.cc | 11 | ||||
-rw-r--r-- | src/fluxbox.hh | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index c2b616c..66c672e 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: fluxbox.cc,v 1.37 2002/02/27 22:04:01 fluxgen Exp $ | 25 | // $Id: fluxbox.cc,v 1.38 2002/03/01 15:28:56 fluxgen Exp $ |
26 | 26 | ||
27 | //Use some GNU extensions | 27 | //Use some GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -288,7 +288,10 @@ Fluxbox *Fluxbox::singleton=0; | |||
288 | Fluxbox *Fluxbox::instance(int m_argc, char **m_argv, char *dpy_name, char *rc) { | 288 | Fluxbox *Fluxbox::instance(int m_argc, char **m_argv, char *dpy_name, char *rc) { |
289 | return singleton; | 289 | return singleton; |
290 | } | 290 | } |
291 | 291 | //default values for titlebar left and right | |
292 | //don't forget to change last value in m_rc_titlebar_* if you add more to these | ||
293 | Fluxbox::Titlebar Fluxbox::m_titlebar_left[] = {STICK}; | ||
294 | Fluxbox::Titlebar Fluxbox::m_titlebar_right[] = {MINIMIZE, MAXIMIZE, CLOSE}; | ||
292 | 295 | ||
293 | Fluxbox::Fluxbox(int m_argc, char **m_argv, char *dpy_name, char *rc) | 296 | Fluxbox::Fluxbox(int m_argc, char **m_argv, char *dpy_name, char *rc) |
294 | : BaseDisplay(m_argv[0], dpy_name), | 297 | : BaseDisplay(m_argv[0], dpy_name), |
@@ -299,8 +302,8 @@ m_rc_colors_per_channel(m_resourcemanager, 4, "session.colorsPerChannel", "Sessi | |||
299 | m_rc_stylefile(m_resourcemanager, "", "session.styleFile", "Session.StyleFile"), | 302 | m_rc_stylefile(m_resourcemanager, "", "session.styleFile", "Session.StyleFile"), |
300 | m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), | 303 | m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), |
301 | m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), | 304 | m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), |
302 | m_rc_titlebar_left(m_resourcemanager, TitlebarList(0), "session.titlebar.left", "Session.Titlebar.Left"), | 305 | m_rc_titlebar_left(m_resourcemanager, TitlebarList(&m_titlebar_left[0], &m_titlebar_left[1]), "session.titlebar.left", "Session.Titlebar.Left"), |
303 | m_rc_titlebar_right(m_resourcemanager, TitlebarList(0), "session.titlebar.right", "Session.Titlebar.Right"), | 306 | m_rc_titlebar_right(m_resourcemanager, TitlebarList(&m_titlebar_right[0], &m_titlebar_right[3]), "session.titlebar.right", "Session.Titlebar.Right"), |
304 | m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), | 307 | m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), |
305 | m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), | 308 | m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), |
306 | focused_window(0), | 309 | focused_window(0), |
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index 7e5764f..4ba3e67 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: fluxbox.hh,v 1.12 2002/02/26 22:42:58 fluxgen Exp $ | 25 | // $Id: fluxbox.hh,v 1.13 2002/03/01 15:28:56 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef FLUXBOX_HH | 27 | #ifndef FLUXBOX_HH |
28 | #define FLUXBOX_HH | 28 | #define FLUXBOX_HH |
@@ -276,8 +276,9 @@ private: | |||
276 | char *rc_file, **argv; | 276 | char *rc_file, **argv; |
277 | int argc; | 277 | int argc; |
278 | Keys *key; | 278 | Keys *key; |
279 | //default arguments for titlebar left and right | ||
280 | static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[]; | ||
279 | 281 | ||
280 | |||
281 | protected: | 282 | protected: |
282 | Fluxbox(int, char **, char * = 0, char * = 0); | 283 | Fluxbox(int, char **, char * = 0, char * = 0); |
283 | char *getRcFilename(); | 284 | char *getRcFilename(); |