Merge branch 'master' into next

[i3/i3] / i3-config-wizard / main.c

diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c
index d94ad96f557d80d381af94c4c274115a84a11448..b3404424f317f4e580102f0351bfc7e5ad5d8f43 100644 (file)
--- a/i3-config-wizard/main.c
+++ b/i3-config-wizard/main.c
@@ -592,6 +592,12 @@ static int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press
             finish();
     }
 
+    /* Swap between modifiers when up or down is pressed. */
+    if (sym == XK_Up || sym == XK_Down) {
+        modifier = (modifier == MOD_Mod1) ? MOD_Mod4 : MOD_Mod1;
+        handle_expose();
+    }
+
     /* cancel any time */
     if (sym == XK_Escape)
         exit(0);
@@ -760,8 +766,8 @@ static void finish() {
 int main(int argc, char *argv[]) {
     config_path = resolve_tilde("~/.i3/config");
     socket_path = getenv("I3SOCK");
-    char *pattern = "-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1";
-    char *patternbold = "-misc-fixed-bold-r-normal--13-120-75-75-C-70-iso10646-1";
+    char *pattern = "pango:monospace 8";
+    char *patternbold = "pango:monospace bold 8";
     int o, option_index = 0;
 
     static struct option long_options[] = {