X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfig.h;h=4a95d43fee8e7f25df2ce4979dc0c97595715f1e;hb=fcdfab4d280cf469f339ce7168082658b9b76c8c;hp=ebb24864cded0cb06548cfaebe11340ca87854be;hpb=65e5bcfdf4c44845dadf057a6bde1f15db3381ff;p=i3%2Fi3 diff --git a/include/config.h b/include/config.h index ebb24864..4a95d43f 100644 --- a/include/config.h +++ b/include/config.h @@ -6,12 +6,12 @@ * * include/config.h: Contains all structs/variables for the configurable * part of i3 as well as functions handling the configuration file (calling - * the parser (src/cfgparse.y) with the correct path, switching key bindings - * mode). + * the parser (src/config_parse.c) with the correct path, switching key + * bindings mode). * */ -#ifndef _CONFIG_H -#define _CONFIG_H +#ifndef I3_CONFIG_H +#define I3_CONFIG_H #include #include "queue.h" @@ -98,6 +98,7 @@ struct Config { int default_layout; int container_stack_limit; int container_stack_limit_value; + int default_border_width; /** Default orientation for new containers */ int default_orientation; @@ -149,6 +150,13 @@ struct Config { * between two workspaces. */ bool workspace_auto_back_and_forth; + /** By default, urgency is cleared immediately when switching to another + * workspace leads to focusing the con with the urgency hint. When having + * multiple windows on that workspace, the user needs to guess which + * application raised the event. To prevent this, the reset of the urgency + * flag can be delayed using an urgency timer. */ + float workspace_urgency_timer; + /** The default border style for new windows. */ border_style_t default_border; @@ -181,8 +189,15 @@ struct Config { /** What should happen when a new popup is opened during fullscreen mode */ enum { - PDF_LEAVE_FULLSCREEN = 0, - PDF_IGNORE = 1 + /* display (and focus) the popup when it belongs to the fullscreen + * window only. */ + PDF_SMART = 0, + + /* leave fullscreen mode unconditionally */ + PDF_LEAVE_FULLSCREEN = 1, + + /* just ignore the popup, that is, don’t map it */ + PDF_IGNORE = 2, } popup_during_fullscreen; }; @@ -312,7 +327,7 @@ void switch_mode(const char *new_mode); * or NULL if no such binding exists. * */ -Binding *get_binding(uint16_t modifiers, xcb_keycode_t keycode); +Binding *get_binding(uint16_t modifiers, bool key_release, xcb_keycode_t keycode); /** * Kills the configerror i3-nagbar process, if any. @@ -325,7 +340,4 @@ Binding *get_binding(uint16_t modifiers, xcb_keycode_t keycode); */ void kill_configerror_nagbar(bool wait_for_it); -/* prototype for src/cfgparse.y */ -void parse_file(const char *f); - #endif