From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 30 Nov 2011 20:10:45 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~206
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=fb90a556c88027b2ba639037bacb55770414a4e2;hp=-c

Merge branch 'master' into next
---

fb90a556c88027b2ba639037bacb55770414a4e2
diff --combined src/cfgparse.y
index ec3dde0b,7a6a7398..dbe227dd
--- a/src/cfgparse.y
+++ b/src/cfgparse.y
@@@ -552,15 -552,15 +552,15 @@@ void parse_file(const char *f) 
          /* We need to convert this v3 configuration */
          char *converted = migrate_config(new, stbuf.st_size);
          if (converted != NULL) {
-             printf("\n");
-             printf("****************************************************************\n");
-             printf("NOTE: Automatically converted configuration file from v3 to v4.\n");
-             printf("\n");
-             printf("Please convert your config file to v4. You can use this command:\n");
-             printf("    mv %s %s.O\n", f, f);
-             printf("    i3-migrate-config-to-v4 %s.O > %s\n", f, f);
-             printf("****************************************************************\n");
-             printf("\n");
+             ELOG("\n");
+             ELOG("****************************************************************\n");
+             ELOG("NOTE: Automatically converted configuration file from v3 to v4.\n");
+             ELOG("\n");
+             ELOG("Please convert your config file to v4. You can use this command:\n");
+             ELOG("    mv %s %s.O\n", f, f);
+             ELOG("    i3-migrate-config-to-v4 %s.O > %s\n", f, f);
+             ELOG("****************************************************************\n");
+             ELOG("\n");
              free(new);
              new = converted;
          } else {
@@@ -611,6 -611,9 +611,9 @@@
      }
  
      if (context->has_errors || context->has_warnings) {
+         ELOG("FYI: You are using i3 version " I3_VERSION "\n");
+         if (version == 3)
+             ELOG("Please convert your configfile first, then fix any remaining errors (see above).\n");
          start_configerror_nagbar(f);
      }
  
@@@ -707,7 -710,6 +710,7 @@@
  %token                  TOK_BAR_BOTTOM              "bottom"
  %token                  TOK_BAR_TOP                 "top"
  %token                  TOK_BAR_STATUS_COMMAND      "status_command"
 +%token                  TOK_BAR_I3BAR_COMMAND       "i3bar_command"
  %token                  TOK_BAR_FONT                "font (bar)"
  %token                  TOK_BAR_WORKSPACE_BUTTONS   "workspace_buttons"
  %token                  TOK_BAR_VERBOSE             "verbose"
@@@ -1032,7 -1034,6 +1035,7 @@@ barlines
  barline:
      comment
      | bar_status_command
 +    | bar_i3bar_command
      | bar_output
      | bar_tray_output
      | bar_position
@@@ -1059,15 -1060,6 +1062,15 @@@ bar_status_command
      }
      ;
  
 +bar_i3bar_command:
 +    TOK_BAR_I3BAR_COMMAND STR
 +    {
 +        DLOG("should add i3bar_command %s\n", $2);
 +        FREE(current_bar.i3bar_command);
 +        current_bar.i3bar_command = $2;
 +    }
 +    ;
 +
  bar_output:
      TOK_BAR_OUTPUT STR
      {
@@@ -1559,7 -1551,6 +1562,7 @@@ font
      TOKFONT STR
      {
          config.font = load_font($2, true);
 +        set_font(&config.font);
          printf("font %s\n", $2);
          FREE(font_pattern);
          font_pattern = $2;