allow decorations bitmask to be specified with 0x

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 @@
  (Format: Year/Month/Day)
 Changes for 1.0.1:
+*07/10/21:
+   * Allow decorations bitmask to be specified using '0x' (Mark)
+     Window.cc
 *07/10/18:
    * Fixed gcc 2.96 compile problem ( Thanks rumpole at hotmail )
      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.
 Action: Move all ( or one specific ) windows from one head to another.
 This is usefull if a head is disabled for some reason. 
 
-
-Focus cycling: Cycle through heads focusables.
-Which heads focusables should be be in the focus cycle should be determined by
-mouse position ( kind of "sloppy focus" ) or a "fixed" boolean variable set
-through setresource command.
-
 ******
 
 *** Rewrites ***
@@ -19,4 +13,4 @@ through setresource command.
   - Toolbar
   - Signal system
 
-******
\ No newline at end of file
+******
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>
       decorations, currently the maximize button and handle.
       Default: True
 
-session.screen0.defaultDeco: <bitmask>
+session.screen0.defaultDeco: <string>
       This specifies the default window decorations, according to the same
-      bitmask as used by the `[Deco]' option in the `apps' file, described in
-      the APPLICATIONS section. Default: all bits set.
+      options available to the `[Deco]' option in the `apps' file, described in
+      the APPLICATIONS section. Default: NORMAL.
 
 session.screen0.menuMode: Delay|Click
       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) {
         return DECOR_BORDER;
     if (strcasecmp(str_label.c_str(), "TAB") == 0)
         return DECOR_TAB;
-    unsigned int mask = atoi(str_label.c_str());
-    if (mask)
-        return mask;
-    return -1;
+    int mask = -1;
+    if (str_label.size() > 1 && str_label[0] == '0' && str_label[1] == 'x' ||
+        str_label.size() > 0 && isdigit(str_label[0]))
+        mask = strtol(str_label.c_str(), NULL, 0);
+    return mask;
 }