migrate-config: also make force_focus_wrapping a v4-only statement

This commit is contained in:
Michael Stapelberg 2011-07-08 00:17:48 +02:00
parent cf124e18f9
commit 0ca229ceb3
2 changed files with 4 additions and 1 deletions

View File

@ -60,7 +60,9 @@ sub need_to_convert {
for my $line (@lines) { for my $line (@lines) {
# only v4 configfiles can use bindcode or workspace_layout # only v4 configfiles can use bindcode or workspace_layout
return 0 if $line =~ /^bindcode/ || $line =~ /^workspace_layout/; return 0 if $line =~ /^bindcode/ ||
$line =~ /^workspace_layout/ ||
$line =~ /^force_focus_wrapping/;
# have a look at bindings # have a look at bindings
next unless $line =~ /^bind/; next unless $line =~ /^bind/;

View File

@ -65,6 +65,7 @@ static int detect_version(char *buf) {
/* check for some v4-only statements */ /* check for some v4-only statements */
if (strncasecmp(line, "bindcode", strlen("bindcode")) == 0 || if (strncasecmp(line, "bindcode", strlen("bindcode")) == 0 ||
strncasecmp(line, "force_focus_wrapping", strlen("force_focus_wrapping")) == 0 ||
strncasecmp(line, "# i3 config file (v4)", strlen("# i3 config file (v4)")) == 0 || strncasecmp(line, "# i3 config file (v4)", strlen("# i3 config file (v4)")) == 0 ||
strncasecmp(line, "workspace_layout", strlen("workspace_layout")) == 0) { strncasecmp(line, "workspace_layout", strlen("workspace_layout")) == 0) {
printf("deciding for version 4 due to this line: %.*s\n", (int)(walk-line), line); printf("deciding for version 4 due to this line: %.*s\n", (int)(walk-line), line);