X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=parser-specs%2Fconfig.spec;h=19e2d21a09166290b1251422a3ec01bcc30680f9;hb=c474ddd782782190f48c0ea045d485e7974977a0;hp=1c11bf9db8dce5b2b547095f4755adc79ba8558c;hpb=e964e7b6cdbcc19e5b7d69044583f9abc0c6c451;p=i3%2Fi3 diff --git a/parser-specs/config.spec b/parser-specs/config.spec index 1c11bf9d..19e2d21a 100644 --- a/parser-specs/config.spec +++ b/parser-specs/config.spec @@ -1,7 +1,7 @@ # vim:ts=2:sw=2:expandtab # # i3 - an improved dynamic tiling window manager -# © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE) +# © 2009 Michael Stapelberg and contributors (see also: LICENSE) # # parser-specs/config.spec: Specification file for generate-command-parser.pl # which will generate the appropriate header files for our C parser. @@ -15,8 +15,10 @@ state INITIAL: # We have an end token here for all the commands which just call some # function without using an explicit 'end' token. end -> + error -> '#' -> IGNORE_LINE 'set' -> IGNORE_LINE + 'set_from_resource' -> IGNORE_LINE bindtype = 'bindsym', 'bindcode', 'bind' -> BINDING 'bar' -> BARBRACE 'font' -> FONT @@ -30,12 +32,17 @@ state INITIAL: 'hide_edge_borders' -> HIDE_EDGE_BORDERS 'for_window' -> FOR_WINDOW 'assign' -> ASSIGN + 'no_focus' -> NO_FOCUS 'focus_follows_mouse' -> FOCUS_FOLLOWS_MOUSE + 'mouse_warping' -> MOUSE_WARPING 'force_focus_wrapping' -> FORCE_FOCUS_WRAPPING 'force_xinerama', 'force-xinerama' -> FORCE_XINERAMA + 'disable_randr15', 'disable-randr15' -> DISABLE_RANDR15 'workspace_auto_back_and_forth' -> WORKSPACE_BACK_AND_FORTH 'fake_outputs', 'fake-outputs' -> FAKE_OUTPUTS 'force_display_urgency_hint' -> FORCE_DISPLAY_URGENCY_HINT + 'focus_on_window_activation' -> FOCUS_ON_WINDOW_ACTIVATION + 'show_marks' -> SHOW_MARKS 'workspace' -> WORKSPACE 'ipc_socket', 'ipc-socket' -> IPC_SOCKET 'restart_state' -> RESTART_STATE @@ -43,12 +50,12 @@ state INITIAL: exectype = 'exec_always', 'exec' -> EXEC colorclass = 'client.background' -> COLOR_SINGLE - colorclass = 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent' + colorclass = 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent', 'client.placeholder' -> COLOR_BORDER # We ignore comments and 'set' lines (variables). state IGNORE_LINE: - end, string + line -> INITIAL # floating_minimum_size x @@ -98,8 +105,6 @@ state WORKSPACE_LAYOUT: # new_window # new_float -# TODO: new_float is not in the userguide yet -# TODO: pixel is not in the userguide yet state NEW_WINDOW: border = 'normal', 'pixel' -> NEW_WINDOW_PIXELS @@ -118,10 +123,10 @@ state NEW_WINDOW_PIXELS_PX: end -> call cfg_new_window($windowtype, $border, &width) -# hide_edge_borders +# hide_edge_borders # also hide_edge_borders for compatibility state HIDE_EDGE_BORDERS: - hide_borders = 'none', 'vertical', 'horizontal', 'both' + hide_borders = 'none', 'vertical', 'horizontal', 'both', 'smart' -> call cfg_hide_edge_borders($hide_borders) hide_borders = '1', 'yes', 'true', 'on', 'enable', 'active' -> call cfg_hide_edge_borders($hide_borders) @@ -143,9 +148,20 @@ state ASSIGN: state ASSIGN_WORKSPACE: '→' -> + 'workspace' + -> workspace = string -> call cfg_assign($workspace) +# no_focus +state NO_FOCUS: + '[' + -> call cfg_criteria_init(NO_FOCUS_END); CRITERIA + +state NO_FOCUS_END: + end + -> call cfg_no_focus() + # Criteria: Used by for_window and assign. state CRITERIA: ctype = 'class' -> CRITERION @@ -153,9 +169,13 @@ state CRITERIA: ctype = 'window_role' -> CRITERION ctype = 'con_id' -> CRITERION ctype = 'id' -> CRITERION + ctype = 'window_type' -> CRITERION ctype = 'con_mark' -> CRITERION ctype = 'title' -> CRITERION ctype = 'urgent' -> CRITERION + ctype = 'workspace' -> CRITERION + ctype = 'tiling', 'floating' + -> call cfg_criteria_add($ctype, NULL); CRITERIA ']' -> call cfg_criteria_pop_state() @@ -171,6 +191,11 @@ state FOCUS_FOLLOWS_MOUSE: value = word -> call cfg_focus_follows_mouse($value) +# mouse_warping warping_t +state MOUSE_WARPING: + value = 'none', 'output' + -> call cfg_mouse_warping($value) + # force_focus_wrapping state FORCE_FOCUS_WRAPPING: value = word @@ -181,6 +206,11 @@ state FORCE_XINERAMA: value = word -> call cfg_force_xinerama($value) +# disable_randr15 +state DISABLE_RANDR15: + value = word + -> call cfg_disable_randr15($value) + # workspace_back_and_forth state WORKSPACE_BACK_AND_FORTH: value = word @@ -197,12 +227,22 @@ state FORCE_DISPLAY_URGENCY_HINT: duration_ms = number -> FORCE_DISPLAY_URGENCY_HINT_MS +# show_marks +state SHOW_MARKS: + value = word + -> call cfg_show_marks($value) + state FORCE_DISPLAY_URGENCY_HINT_MS: 'ms' -> end -> call cfg_force_display_urgency_hint(&duration_ms) +# focus_on_window_activation +state FOCUS_ON_WINDOW_ACTIVATION: + mode = word + -> call cfg_focus_on_window_activation($mode) + # workspace output state WORKSPACE: workspace = word @@ -213,7 +253,7 @@ state WORKSPACE_OUTPUT: -> WORKSPACE_OUTPUT_STR state WORKSPACE_OUTPUT_STR: - output = string + output = word -> call cfg_workspace($workspace, $output) # ipc-socket @@ -228,7 +268,7 @@ state RESTART_STATE: # popup_during_fullscreen state POPUP_DURING_FULLSCREEN: - value = 'ignore', 'leave_fullscreen' + value = 'ignore', 'leave_fullscreen', 'smart' -> call cfg_popup_during_fullscreen($value) # client.background @@ -251,9 +291,15 @@ state COLOR_TEXT: state COLOR_INDICATOR: indicator = word - -> call cfg_color($colorclass, $border, $background, $text, $indicator) + -> COLOR_CHILD_BORDER end - -> call cfg_color($colorclass, $border, $background, $text, NULL) + -> call cfg_color($colorclass, $border, $background, $text, NULL, NULL) + +state COLOR_CHILD_BORDER: + child_border = word + -> call cfg_color($colorclass, $border, $background, $text, $indicator, $child_border) + end + -> call cfg_color($colorclass, $border, $background, $text, $indicator, NULL) # [--no-startup-id] command state EXEC: @@ -269,7 +315,13 @@ state FONT: # bindsym/bindcode state BINDING: - modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch' + release = '--release' + -> + border = '--border' + -> + whole_window = '--whole-window' + -> + modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch', 'Group1', 'Group2', 'Group3', 'Group4', '$mod' -> '+' -> @@ -279,16 +331,22 @@ state BINDING: state BINDCOMMAND: release = '--release' -> + border = '--border' + -> + whole_window = '--whole-window' + -> command = string - -> call cfg_binding($bindtype, $modifiers, $key, $release, $command) + -> call cfg_binding($bindtype, $modifiers, $key, $release, $border, $whole_window, $command) ################################################################################ # Mode configuration ################################################################################ state MODENAME: + pango_markup = '--pango_markup' + -> modename = word - -> call cfg_enter_mode($modename); MODEBRACE + -> call cfg_enter_mode($pango_markup, $modename); MODEBRACE state MODEBRACE: end @@ -298,6 +356,7 @@ state MODEBRACE: state MODE: end -> + error -> '#' -> MODE_IGNORE_LINE 'set' -> MODE_IGNORE_LINE bindtype = 'bindsym', 'bindcode', 'bind' @@ -307,11 +366,17 @@ state MODE: # We ignore comments and 'set' lines (variables). state MODE_IGNORE_LINE: - end, string + line -> MODE state MODE_BINDING: - modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch' + release = '--release' + -> + border = '--border' + -> + whole_window = '--whole-window' + -> + modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch', 'Group1', 'Group2', 'Group3', 'Group4', '$mod' -> '+' -> @@ -321,8 +386,12 @@ state MODE_BINDING: state MODE_BINDCOMMAND: release = '--release' -> + border = '--border' + -> + whole_window = '--whole-window' + -> command = string - -> call cfg_mode_binding($bindtype, $modifiers, $key, $release, $command); MODE + -> call cfg_mode_binding($bindtype, $modifiers, $key, $release, $border, $whole_window, $command); MODE ################################################################################ # Bar configuration (i3bar) @@ -332,30 +401,40 @@ state BARBRACE: end -> '{' - -> BAR + -> call cfg_bar_start(); BAR state BAR: end -> + error -> '#' -> BAR_IGNORE_LINE 'set' -> BAR_IGNORE_LINE - 'i3bar_command' -> BAR_BAR_COMMAND - 'status_command' -> BAR_STATUS_COMMAND - 'socket_path' -> BAR_SOCKET_PATH - 'mode' -> BAR_MODE - 'modifier' -> BAR_MODIFIER - 'position' -> BAR_POSITION - 'output' -> BAR_OUTPUT - 'tray_output' -> BAR_TRAY_OUTPUT - 'font' -> BAR_FONT - 'workspace_buttons' -> BAR_WORKSPACE_BUTTONS - 'verbose' -> BAR_VERBOSE - 'colors' -> BAR_COLORS_BRACE + 'i3bar_command' -> BAR_BAR_COMMAND + 'status_command' -> BAR_STATUS_COMMAND + 'socket_path' -> BAR_SOCKET_PATH + 'mode' -> BAR_MODE + 'hidden_state' -> BAR_HIDDEN_STATE + 'id' -> BAR_ID + 'modifier' -> BAR_MODIFIER + 'wheel_up_cmd' -> BAR_WHEEL_UP_CMD + 'wheel_down_cmd' -> BAR_WHEEL_DOWN_CMD + 'bindsym' -> BAR_BINDSYM + 'position' -> BAR_POSITION + 'output' -> BAR_OUTPUT + 'tray_output' -> BAR_TRAY_OUTPUT + 'tray_padding' -> BAR_TRAY_PADDING + 'font' -> BAR_FONT + 'separator_symbol' -> BAR_SEPARATOR_SYMBOL + 'binding_mode_indicator' -> BAR_BINDING_MODE_INDICATOR + 'workspace_buttons' -> BAR_WORKSPACE_BUTTONS + 'strip_workspace_numbers' -> BAR_STRIP_WORKSPACE_NUMBERS + 'verbose' -> BAR_VERBOSE + 'colors' -> BAR_COLORS_BRACE '}' -> call cfg_bar_finish(); INITIAL # We ignore comments and 'set' lines (variables). state BAR_IGNORE_LINE: - end, string + line -> BAR state BAR_BAR_COMMAND: @@ -371,13 +450,37 @@ state BAR_SOCKET_PATH: -> call cfg_bar_socket_path($path); BAR state BAR_MODE: - mode = 'dock', 'hide' + mode = 'dock', 'hide', 'invisible' -> call cfg_bar_mode($mode); BAR +state BAR_HIDDEN_STATE: + hidden_state = 'hide', 'show' + -> call cfg_bar_hidden_state($hidden_state); BAR + +state BAR_ID: + bar_id = word + -> call cfg_bar_id($bar_id); BAR + state BAR_MODIFIER: - modifier = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Control', 'Ctrl', 'Shift' + modifier = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Control', 'Ctrl', 'Shift', 'none', 'off' -> call cfg_bar_modifier($modifier); BAR +state BAR_WHEEL_UP_CMD: + command = string + -> call cfg_bar_wheel_up_cmd($command); BAR + +state BAR_WHEEL_DOWN_CMD: + command = string + -> call cfg_bar_wheel_down_cmd($command); BAR + +state BAR_BINDSYM: + button = word + -> BAR_BINDSYM_COMMAND + +state BAR_BINDSYM_COMMAND: + command = string + -> call cfg_bar_bindsym($button, $command); BAR + state BAR_POSITION: position = 'top', 'bottom' -> call cfg_bar_position($position); BAR @@ -387,17 +490,39 @@ state BAR_OUTPUT: -> call cfg_bar_output($output); BAR state BAR_TRAY_OUTPUT: - output = string + output = word -> call cfg_bar_tray_output($output); BAR +state BAR_TRAY_PADDING: + padding_px = number + -> BAR_TRAY_PADDING_PX + +state BAR_TRAY_PADDING_PX: + 'px' + -> + end + -> call cfg_bar_tray_padding(&padding_px); BAR + state BAR_FONT: font = string -> call cfg_bar_font($font); BAR +state BAR_SEPARATOR_SYMBOL: + separator = string + -> call cfg_bar_separator_symbol($separator); BAR + +state BAR_BINDING_MODE_INDICATOR: + value = word + -> call cfg_bar_binding_mode_indicator($value); BAR + state BAR_WORKSPACE_BUTTONS: value = word -> call cfg_bar_workspace_buttons($value); BAR +state BAR_STRIP_WORKSPACE_NUMBERS: + value = word + -> call cfg_bar_strip_workspace_numbers($value); BAR + state BAR_VERBOSE: value = word -> call cfg_bar_verbose($value); BAR @@ -412,16 +537,16 @@ state BAR_COLORS: end -> '#' -> BAR_COLORS_IGNORE_LINE 'set' -> BAR_COLORS_IGNORE_LINE - colorclass = 'background', 'statusline' + colorclass = 'background', 'statusline', 'separator', 'focused_background', 'focused_statusline', 'focused_separator' -> BAR_COLORS_SINGLE - colorclass = 'focused_workspace', 'active_workspace', 'inactive_workspace', 'urgent_workspace' + colorclass = 'focused_workspace', 'active_workspace', 'inactive_workspace', 'urgent_workspace', 'binding_mode' -> BAR_COLORS_BORDER '}' -> BAR # We ignore comments and 'set' lines (variables). state BAR_COLORS_IGNORE_LINE: - end, string + line -> BAR_COLORS state BAR_COLORS_SINGLE: