aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-10-21 21:37:48 (GMT)
committermarkt <markt>2007-10-21 21:37:48 (GMT)
commitf72633a0e0df146c4860b5b3940e9c3a2f7260b1 (patch)
treeccbb237adaa4df190cf5992ad9ead51d365d7d66
parent72299cca4829046d51bbbb8c74d506f7289dd879 (diff)
downloadfluxbox-f72633a0e0df146c4860b5b3940e9c3a2f7260b1.zip
fluxbox-f72633a0e0df146c4860b5b3940e9c3a2f7260b1.tar.bz2
allow decorations bitmask to be specified with 0x
-rw-r--r--ChangeLog3
-rw-r--r--TODO8
-rw-r--r--doc/asciidoc/fluxbox.txt6
-rw-r--r--src/Window.cc9
4 files changed, 12 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index bc4420b..646720b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/10/21:
4 * Allow decorations bitmask to be specified using '0x' (Mark)
5 Window.cc
3*07/10/18: 6*07/10/18:
4 * Fixed gcc 2.96 compile problem ( Thanks rumpole at hotmail ) 7 * Fixed gcc 2.96 compile problem ( Thanks rumpole at hotmail )
5 bug #1809786 8 bug #1809786
diff --git a/TODO b/TODO
index 5a844fb..ce71631 100644
--- a/TODO
+++ b/TODO
@@ -6,12 +6,6 @@ Which states all newly created windows should be placed on a specific head.
6Action: Move all ( or one specific ) windows from one head to another. 6Action: Move all ( or one specific ) windows from one head to another.
7This is usefull if a head is disabled for some reason. 7This is usefull if a head is disabled for some reason.
8 8
9
10Focus cycling: Cycle through heads focusables.
11Which heads focusables should be be in the focus cycle should be determined by
12mouse position ( kind of "sloppy focus" ) or a "fixed" boolean variable set
13through setresource command.
14
15****** 9******
16 10
17*** Rewrites *** 11*** Rewrites ***
@@ -19,4 +13,4 @@ through setresource command.
19 - Toolbar 13 - Toolbar
20 - Signal system 14 - Signal system
21 15
22****** \ No newline at end of file 16******
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 0c136a0..0b11dad 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -886,10 +886,10 @@ session.screen0.decorateTransient: <boolean>
886 decorations, currently the maximize button and handle. 886 decorations, currently the maximize button and handle.
887 Default: True 887 Default: True
888 888
889session.screen0.defaultDeco: <bitmask> 889session.screen0.defaultDeco: <string>
890 This specifies the default window decorations, according to the same 890 This specifies the default window decorations, according to the same
891 bitmask as used by the `[Deco]' option in the `apps' file, described in 891 options available to the `[Deco]' option in the `apps' file, described in
892 the APPLICATIONS section. Default: all bits set. 892 the APPLICATIONS section. Default: NORMAL.
893 893
894session.screen0.menuMode: Delay|Click 894session.screen0.menuMode: Delay|Click
895 This setting controls the circumstances under which submenus open. With 895 This setting controls the circumstances under which submenus open. With
diff --git a/src/Window.cc b/src/Window.cc
index 5e9aec5..9a3d367 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -4086,8 +4086,9 @@ int FluxboxWindow::getDecoMaskFromString(const string &str_label) {
4086 return DECOR_BORDER; 4086 return DECOR_BORDER;
4087 if (strcasecmp(str_label.c_str(), "TAB") == 0) 4087 if (strcasecmp(str_label.c_str(), "TAB") == 0)
4088 return DECOR_TAB; 4088 return DECOR_TAB;
4089 unsigned int mask = atoi(str_label.c_str()); 4089 int mask = -1;
4090 if (mask) 4090 if (str_label.size() > 1 && str_label[0] == '0' && str_label[1] == 'x' ||
4091 return mask; 4091 str_label.size() > 0 && isdigit(str_label[0]))
4092 return -1; 4092 mask = strtol(str_label.c_str(), NULL, 0);
4093 return mask;
4093} 4094}