Remove the terminal option from config.

The welcome message is displayed using xmessage(1), not using your
terminal. Thus, it makes no sense to have this option anymore. Also,
the new lex/yacc parser cannot correctly handle the situation:
normal variables are expanded before parsing the file. As a replacement,
you can use:
  set $terminal /usr/bin/urxvt

diff --git a/docs/userguide b/docs/userguide
index f7eb8ab1624feeaf16d665c48829b53a23851774..03d4452ce40853fe01d8ae8b769c839fa92709cc 100644 (file)
--- a/docs/userguide
+++ b/docs/userguide
@@ -178,10 +178,6 @@ and edit it with a text editor.
 
 === General configuration
 
-terminal::
-       Specifies the terminal emulator program you prefer. It will be started
-       by default when you press Mod1+Enter, but you can overwrite this. Refer
-       to it as +$terminal+ to keep things modular.
 font::
        Specifies the default font you want i3 to use. Use an X core font
        descriptor here, like

diff --git a/i3.config b/i3.config
index 6b429632ec6ac3889ed6b728815c51367fcf943a..2411004607410a1dc1cf99cd0582e25726adda7d 100644 (file)
--- a/i3.config
+++ b/i3.config
@@ -1,11 +1,6 @@
 # This configuration uses Mod1 and Mod3. Make sure they are mapped properly using xev(1)
 # and xmodmap(1). Usually, Mod1 is Alt (Alt_L) and Mod3 is Windows (Super_L)
 
-# Tell i3 about your preferred terminal. You can refer to this as $terminal
-# later. It is recommended to set this option to allow i3 to open a terminal
-# containing the introduction on first start.
-terminal /usr/bin/urxvt
-
 # ISO 10646 = Unicode
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 

diff --git a/src/cfgparse.y b/src/cfgparse.y
index efed14e0f19d658424e0b17db8acdf86df349f71..ff96bb5b9d3b90b32a3c352ab3e0a73844c45dbb 100644 (file)
--- a/src/cfgparse.y
+++ b/src/cfgparse.y
@@ -486,8 +486,8 @@ exec:
 terminal:
         TOKTERMINAL WHITESPACE STR
         {
-                config.terminal = sstrdup($<string>3);
-                printf("terminal %s\n", config.terminal);
+                LOG("The terminal option is DEPRECATED and has no effect. "
+                    "Please remove it from your configuration file.");
         }
         ;
 

diff --git a/src/config.c b/src/config.c
index 06953b0d1be7fb7eb5965e2dcd2911fe40acb65f..c26227302ac96455083d258218fc95fe7cc534a2 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -597,7 +597,6 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
         }
         }
 
-        REQUIRED_OPTION(terminal);
         REQUIRED_OPTION(font);
 
         /* Set an empty name for every workspace which got no name */