all repos — fluxbox @ f72633a0e0df146c4860b5b3940e9c3a2f7260b1

custom fork of the fluxbox windowmanager

allow decorations bitmask to be specified with 0x
markt markt
commit

f72633a0e0df146c4860b5b3940e9c3a2f7260b1

parent

72299cca4829046d51bbbb8c74d506f7289dd879

4 files changed, 12 insertions(+), 14 deletions(-)

jump to
M ChangeLogChangeLog

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

@@ -6,12 +6,6 @@

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

- Toolbar - Signal system -******+******
M doc/asciidoc/fluxbox.txtdoc/asciidoc/fluxbox.txt

@@ -886,10 +886,10 @@ This controls whether or not transient windows get certain window

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
M src/Window.ccsrc/Window.cc

@@ -4086,8 +4086,9 @@ if (strcasecmp(str_label.c_str(), "BORDER") == 0)

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