diff --git a/docs/labwc-actions.5.scd b/docs/labwc-actions.5.scd index 9cb6ae53..b5074019 100644 --- a/docs/labwc-actions.5.scd +++ b/docs/labwc-actions.5.scd @@ -393,13 +393,10 @@ Actions that execute other actions. Used in keyboard/mouse bindings. *shaded* [yes|no] Whether or not the client is rolled up. - *maximized* [yes|horizontal|vertical|no] - Whether the client is maximized along both axes (yes), - the horizontal axis only (horizontal), the vertical - axis only (vertical) or neither axis (no). - - The keyword "full" may be used as a synonym for "yes", - while "none" may be used as a synonym for "no". + *maximized* [both|horizontal|vertical|none] + Whether the client is maximized along both axes, the + horizontal axis only, the vertical axis only, or neither + axis (none). *iconified* [yes|no] Whether or not the client is iconified. diff --git a/include/view.h b/include/view.h index a5106d5a..6fc870e7 100644 --- a/include/view.h +++ b/include/view.h @@ -53,11 +53,15 @@ enum three_state { * Therefore when parsing rc.xml, "None" means "Invalid". */ enum view_axis { - VIEW_AXIS_INVALID = -1, VIEW_AXIS_NONE = 0, VIEW_AXIS_HORIZONTAL = (1 << 0), VIEW_AXIS_VERTICAL = (1 << 1), VIEW_AXIS_BOTH = (VIEW_AXIS_HORIZONTAL | VIEW_AXIS_VERTICAL), + /* + * If view_axis is treated as a bitfield, INVALID should never + * set the HORIZONTAL or VERTICAL bits. + */ + VIEW_AXIS_INVALID = (1 << 2), }; enum view_edge {