nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow decorations bitmask to be specified with 0x

Browse source
This commit is contained in:
markt 2007-10-21 21:37:48 +00:00
parent 72299cca48
commit f72633a0e0
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0.1: Changes for 1.0.1:
*07/10/21:
* Allow decorations bitmask to be specified using '0x' (Mark)
Window.cc
*07/10/18: *07/10/18:
* Fixed gcc 2.96 compile problem ( Thanks rumpole at hotmail ) * Fixed gcc 2.96 compile problem ( Thanks rumpole at hotmail )
bug #1809786 bug #1809786

6
TODO
View file

@ -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. Action: Move all ( or one specific ) windows from one head to another.
This is usefull if a head is disabled for some reason. 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 *** *** Rewrites ***

6
doc/asciidoc/fluxbox.txt
View file

@ -886,10 +886,10 @@ session.screen0.decorateTransient: <boolean>
decorations, currently the maximize button and handle. decorations, currently the maximize button and handle.
Default: True Default: True
session.screen0.defaultDeco: <bitmask> session.screen0.defaultDeco: <string>
This specifies the default window decorations, according to the same This specifies the default window decorations, according to the same
bitmask as used by the `[Deco]' option in the `apps' file, described in options available to the `[Deco]' option in the `apps' file, described in
the APPLICATIONS section. Default: all bits set. the APPLICATIONS section. Default: NORMAL.
session.screen0.menuMode: Delay|Click session.screen0.menuMode: Delay|Click
This setting controls the circumstances under which submenus open. With This setting controls the circumstances under which submenus open. With

9
src/Window.cc
View file

@ -4086,8 +4086,9 @@ int FluxboxWindow::getDecoMaskFromString(const string &str_label) {
return DECOR_BORDER; return DECOR_BORDER;
if (strcasecmp(str_label.c_str(), "TAB") == 0) if (strcasecmp(str_label.c_str(), "TAB") == 0)
return DECOR_TAB; return DECOR_TAB;
unsigned int mask = atoi(str_label.c_str()); int mask = -1;
if (mask) if (str_label.size() > 1 && str_label[0] == '0' && str_label[1] == 'x' ||
return mask; str_label.size() > 0 && isdigit(str_label[0]))
return -1; mask = strtol(str_label.c_str(), NULL, 0);
return mask;
} }