X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfig.h;h=32212e3d3cce573eee6e6804af499bbfbd0af953;hb=fb9978b97533c5987f9af428ce58f6f0733e5ff5;hp=f11a7b5b249384ce92e807199cb4a688ac764279;hpb=e101940c5edd3094463fea362fc21e924a46eca4;p=i3%2Fi3

diff --git a/include/config.h b/include/config.h
index f11a7b5b..32212e3d 100644
--- a/include/config.h
+++ b/include/config.h
@@ -3,12 +3,14 @@
  *
  * i3 - an improved dynamic tiling window manager
  *
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
  *
  * See file LICENSE for license information.
  *
- * include/config.h: Contains all structs/variables for
- * the configurable part of i3
+ * 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).
  *
  */
 
@@ -21,9 +23,25 @@
 
 typedef struct Config Config;
 extern Config config;
-extern bool config_use_lexer;
 extern SLIST_HEAD(modes_head, Mode) modes;
 
+/**
+ * Used during the config file lexing/parsing to keep the state of the lexer
+ * in order to provide useful error messages in yyerror().
+ *
+ */
+struct context {
+        int line_number;
+        char *line_copy;
+        const char *filename;
+
+        char *compact_error;
+
+        /* These are the same as in YYLTYPE */
+        int first_column;
+        int last_column;
+};
+
 /**
  * Part of the struct Config. It makes sense to group colors for background,
  * border and text as every element in i3 has them (window decorations, bar).
@@ -68,20 +86,37 @@ struct Mode {
  */
 struct Config {
         const char *terminal;
-        const char *font;
+        i3Font font;
 
         const char *ipc_socket_path;
+        const char *restart_state_path;
 
         int container_mode;
         int container_stack_limit;
         int container_stack_limit_value;
 
+        /** By default, focus follows mouse. If the user explicitly wants to
+         * turn this off (and instead rely only on the keyboard for changing
+         * focus), we allow him to do this with this relatively special option.
+         * It is not planned to add any different focus models. */
+        bool disable_focus_follows_mouse;
+
+        /** By default, a workspace bar is drawn at the bottom of the screen.
+         * If you want to have a more fancy bar, it is recommended to replace
+         * the whole bar by dzen2, for example using the i3-wsbar script which
+         * comes with i3. Thus, you can turn it off entirely. */
+        bool disable_workspace_bar;
+
+        /** The default border style for new windows. */
+        border_style_t default_border;
+
         /** The modifier which needs to be pressed in combination with your mouse
          * buttons to do things with floating windows (move, resize) */
         uint32_t floating_modifier;
 
         /* Color codes are stored here */
         struct config_client {
+                uint32_t background;
                 struct Colortriple focused;
                 struct Colortriple focused_inactive;
                 struct Colortriple unfocused;
@@ -92,6 +127,12 @@ struct Config {
                 struct Colortriple unfocused;
                 struct Colortriple urgent;
         } bar;
+
+        /** What should happen when a new popup is opened during fullscreen mode */
+        enum {
+                PDF_LEAVE_FULLSCREEN = 0,
+                PDF_IGNORE = 1
+        } popup_during_fullscreen;
 };
 
 /**
@@ -103,6 +144,12 @@ struct Config {
  */
 void load_configuration(xcb_connection_t *conn, const char *override_configfile, bool reload);
 
+/**
+ * Translates keysymbols to keycodes for all bindings which use keysyms.
+ *
+ */
+void translate_keysyms();
+
 /**
  * Ungrabs all keys, to be called before re-grabbing the keys because of a
  * mapping_notify event or a configuration file reload
@@ -114,7 +161,7 @@ void ungrab_all_keys(xcb_connection_t *conn);
  * Grab the bound keys (tell X to send us keypress events for those keycodes)
  *
  */
-void grab_all_keys(xcb_connection_t *conn);
+void grab_all_keys(xcb_connection_t *conn, bool bind_mode_switch);
 
 /**
  * Switches the key bindings to the given mode, if the mode exists
@@ -122,4 +169,14 @@ void grab_all_keys(xcb_connection_t *conn);
  */
 void switch_mode(xcb_connection_t *conn, const char *new_mode);
 
+/**
+ * Returns a pointer to the Binding with the specified modifiers and keycode
+ * or NULL if no such binding exists.
+ *
+ */
+Binding *get_binding(uint16_t modifiers, xcb_keycode_t keycode);
+
+/* prototype for src/cfgparse.y */
+void parse_file(const char *f);
+
 #endif