xarus/i3
1
0
Fork 0
forked from mirrors/i3
Code Pull Requests Activity

Remove v3 to v4 automatic migration logic (#6144)

Browse Source 
Closes https://github.com/i3/i3/issues/6131
This commit is contained in:
Orestis Floros
2024-07-09 20:03:57 +02:00
committed by GitHub
parent 5413c15e97
commit 05feaecf8a
140 changed files with 18 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/userguide
View File

@@ -358,15 +358,6 @@ keyboard layout. To start the wizard, use the command +i3-config-wizard+.
Please note that you must not have +~/.i3/config+, otherwise the wizard will
exit.
Since i3 4.0, a new configuration format is used. i3 will try to automatically
detect the format version of a config file based on a few different keywords,
but if you want to make sure that your config is read with the new format,
include the following line in your config file:
---------------------
# i3 config file (v4)
---------------------
[[include]]
=== Include directive

1
include/config_parser.h
View File

@@ -35,7 +35,6 @@ struct stack {
struct parser_ctx {
bool use_nagbar;
bool assume_v4;
int state;
Match current_match;

1
release-notes/changes/2-migration-script Normal file
View File

@@ -0,0 +1 @@
disable automatic v3-to-v4 migration script

1
src/config.c
View File

@@ -267,7 +267,6 @@ bool load_configuration(const char *override_configpath, config_load_t load_type
memset(&stack, '\0', sizeof(struct stack));
struct parser_ctx ctx = {
.use_nagbar = (load_type != C_VALIDATE),
.assume_v4 = false,
.stack = &stack,
};
SLIST_INIT(&(ctx.variables));

4
src/config_directives.c
View File

@@ -56,10 +56,6 @@ CFGFUN(include, const char *pattern) {
memset(&stack, '\0', sizeof(struct stack));
struct parser_ctx ctx = {
.use_nagbar = result->ctx->use_nagbar,
/* The include mechanism was added in v4, so we can skip the
* auto-detection and get rid of the risk of detecting the wrong
* version in potentially very short include fragments: */
.assume_v4 = true,
.stack = &stack,
.variables = result->ctx->variables,
};

211
src/config_parser.c
View File

@@ -581,7 +581,6 @@ int main(int argc, char *argv[]) {
memset(&stack, '\0', sizeof(struct stack));
struct parser_ctx ctx = {
.use_nagbar = false,
.assume_v4 = false,
.stack = &stack,
};
SLIST_INIT(&(ctx.variables));
@@ -592,181 +591,6 @@ int main(int argc, char *argv[]) {
#else
/*
* Goes through each line of buf (separated by \n) and checks for statements /
* commands which only occur in i3 v4 configuration files. If it finds any, it
* returns version 4, otherwise it returns version 3.
*
*/
static int detect_version(char *buf) {
char *walk = buf;
char *line = buf;
while (*walk != '\0') {
if (*walk != '\n') {
walk++;
continue;
}
/* check for some v4-only statements */
if (strncasecmp(line, "bindcode", strlen("bindcode")) == 0 ||
strncasecmp(line, "include", strlen("include")) == 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, "workspace_layout", strlen("workspace_layout")) == 0) {
LOG("deciding for version 4 due to this line: %.*s\n", (int)(walk - line), line);
return 4;
}
/* if this is a bind statement, we can check the command */
if (strncasecmp(line, "bind", strlen("bind")) == 0) {
char *bind = strchr(line, ' ');
if (bind == NULL) {
goto next;
}
while ((*bind == ' ' || *bind == '\t') && *bind != '\0') {
bind++;
}
if (*bind == '\0') {
goto next;
}
if ((bind = strchr(bind, ' ')) == NULL) {
goto next;
}
while ((*bind == ' ' || *bind == '\t') && *bind != '\0') {
bind++;
}
if (*bind == '\0') {
goto next;
}
if (strncasecmp(bind, "layout", strlen("layout")) == 0 ||
strncasecmp(bind, "floating", strlen("floating")) == 0 ||
strncasecmp(bind, "workspace", strlen("workspace")) == 0 ||
strncasecmp(bind, "focus left", strlen("focus left")) == 0 ||
strncasecmp(bind, "focus right", strlen("focus right")) == 0 ||
strncasecmp(bind, "focus up", strlen("focus up")) == 0 ||
strncasecmp(bind, "focus down", strlen("focus down")) == 0 ||
strncasecmp(bind, "border normal", strlen("border normal")) == 0 ||
strncasecmp(bind, "border 1pixel", strlen("border 1pixel")) == 0 ||
strncasecmp(bind, "border pixel", strlen("border pixel")) == 0 ||
strncasecmp(bind, "border borderless", strlen("border borderless")) == 0 ||
strncasecmp(bind, "--no-startup-id", strlen("--no-startup-id")) == 0 ||
strncasecmp(bind, "bar", strlen("bar")) == 0) {
LOG("deciding for version 4 due to this line: %.*s\n", (int)(walk - line), line);
return 4;
}
}
next:
/* advance to the next line */
walk++;
line = walk;
}
return 3;
}
/*
* Calls i3-migrate-config-to-v4 to migrate a configuration file (input
* buffer).
*
* Returns the converted config file or NULL if there was an error (for
* example the script could not be found in $PATH or the i3 executable’s
* directory).
*
*/
static char *migrate_config(char *input, off_t size) {
int writepipe[2];
int readpipe[2];
if (pipe(writepipe) != 0 ||
pipe(readpipe) != 0) {
warn("migrate_config: Could not create pipes");
return NULL;
}
pid_t pid = fork();
if (pid == -1) {
warn("Could not fork()");
return NULL;
}
/* child */
if (pid == 0) {
/* close writing end of writepipe, connect reading side to stdin */
close(writepipe[1]);
dup2(writepipe[0], 0);
/* close reading end of readpipe, connect writing side to stdout */
close(readpipe[0]);
dup2(readpipe[1], 1);
static char *argv[] = {
NULL, /* will be replaced by the executable path */
NULL};
exec_i3_utility("i3-migrate-config-to-v4", argv);
}
/* parent */
/* close reading end of the writepipe (connected to the script’s stdin) */
close(writepipe[0]);
/* write the whole config file to the pipe, the script will read everything
* immediately */
if (writeall(writepipe[1], input, size) == -1) {
warn("Could not write to pipe");
return NULL;
}
close(writepipe[1]);
/* close writing end of the readpipe (connected to the script’s stdout) */
close(readpipe[1]);
/* read the script’s output */
int conv_size = 65535;
char *converted = scalloc(conv_size, 1);
int read_bytes = 0, ret;
do {
if (read_bytes == conv_size) {
conv_size += 65535;
converted = srealloc(converted, conv_size);
}
ret = read(readpipe[0], converted + read_bytes, conv_size - read_bytes);
if (ret == -1) {
warn("Cannot read from pipe");
FREE(converted);
return NULL;
}
read_bytes += ret;
} while (ret > 0);
/* get the returncode */
int status;
wait(&status);
if (!WIFEXITED(status)) {
fprintf(stderr, "Child did not terminate normally, using old config file (will lead to broken behaviour)\n");
FREE(converted);
return NULL;
}
int returncode = WEXITSTATUS(status);
if (returncode != 0) {
fprintf(stderr, "Migration process exit code was != 0\n");
if (returncode == 2) {
fprintf(stderr, "could not start the migration script\n");
/* TODO: script was not found. tell the user to fix their system or create a v4 config */
} else if (returncode == 1) {
fprintf(stderr, "This already was a v4 config. Please add the following line to your config file:\n");
fprintf(stderr, "# i3 config file (v4)\n");
/* TODO: nag the user with a message to include a hint for i3 in their config file */
}
FREE(converted);
return NULL;
}
return converted;
}
/**
* Launch nagbar to indicate errors in the configuration file.
*/
@@ -1080,37 +904,6 @@ parse_file_result_t parse_file(struct parser_ctx *ctx, const char *f, IncludedFi
}
}
/* analyze the string to find out whether this is an old config file (3.x)
* or a new config file (4.x). If it’s old, we run the converter script. */
int version = 4;
if (!ctx->assume_v4) {
version = detect_version(buf);
}
if (version == 3) {
/* We need to convert this v3 configuration */
char *converted = migrate_config(new, strlen(new));
if (converted != NULL) {
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 {
LOG("\n");
LOG("**********************************************************************\n");
LOG("ERROR: Could not convert config file. Maybe i3-migrate-config-to-v4\n");
LOG("was not correctly installed on your system?\n");
LOG("**********************************************************************\n");
LOG("\n");
}
}
included_file->variable_replaced_contents = sstrdup(new);
struct context *context = scalloc(1, sizeof(struct context));
@@ -1124,10 +917,6 @@ parse_file_result_t parse_file(struct parser_ctx *ctx, const char *f, IncludedFi
if (ctx->use_nagbar && (context->has_errors || context->has_warnings || invalid_sets)) {
ELOG("FYI: You are using i3 version %s\n", i3_version);
if (version == 3) {
ELOG("Please convert your configfile first, then fix any remaining errors (see above).\n");
}
start_config_error_nagbar(f, context->has_errors || invalid_sets);
}

22
src/util.c
View File

@@ -147,19 +147,19 @@ bool update_if_necessary(uint32_t *destination, const uint32_t new_value) {
*
*/
void exec_i3_utility(char *name, char *argv[]) {
/* start the migration script, search PATH first */
char *migratepath = name;
argv[0] = migratepath;
execvp(migratepath, argv);
/* start the utility, search PATH first */
char *binary = name;
argv[0] = binary;
execvp(binary, argv);
/* if the script is not in path, maybe the user installed to a strange
/* if the utility is not in path, maybe the user installed to a strange
* location and runs the i3 binary with an absolute path. We use
* argv[0]’s dirname */
char *pathbuf = sstrdup(start_argv[0]);
char *dir = dirname(pathbuf);
sasprintf(&migratepath, "%s/%s", dir, name);
argv[0] = migratepath;
execvp(migratepath, argv);
sasprintf(&binary, "%s/%s", dir, name);
argv[0] = binary;
execvp(binary, argv);
#if defined(__linux__)
/* on linux, we have one more fall-back: dirname(/proc/self/exe) */
@@ -169,9 +169,9 @@ void exec_i3_utility(char *name, char *argv[]) {
_exit(EXIT_FAILURE);
}
dir = dirname(buffer);
sasprintf(&migratepath, "%s/%s", dir, name);
argv[0] = migratepath;
execvp(migratepath, argv);
sasprintf(&binary, "%s/%s", dir, name);
argv[0] = binary;
execvp(binary, argv);
#endif
warn("Could not start %s", name);

1
testcases/lib/i3test.pm.in
View File

@@ -897,7 +897,6 @@ tests which test specific config file directives.
use i3test i3_autostart => 0;
my $config = <<EOT;
# i3 config file (v4)
for_window [class="borderless"] border none
for_window [title="special borderless title"] border none
EOT

1
testcases/new-test
View File

@@ -84,7 +84,6 @@ if ($multi_monitor) {
use i3test i3_autostart => 0;
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0

1
testcases/t/113-urgent.t
View File

@@ -47,7 +47,6 @@ sub set_urgency {
}
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window [urgent=latest class=special] focus

1
testcases/t/133-size-hints.t
View File

@@ -17,7 +17,6 @@
# Checks if size hints are interpreted correctly.
#
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
default_floating_border none

1
testcases/t/156-fullscreen-focus.t
View File

@@ -19,7 +19,6 @@
# in other workspaces work even when there is a fullscreen container.
#
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0

2
testcases/t/159-socketpaths.t
View File

@@ -27,7 +27,6 @@ use v5.10;
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -73,7 +72,6 @@ $socketpath = $tmpdir . "/config.sock";
ok(! -e $socketpath, "$socketpath does not exist yet");
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
ipc-socket $socketpath
EOT

1
testcases/t/165-for_window.t
View File

@@ -20,7 +20,6 @@ use X11::XCB qw(PROP_MODE_REPLACE);
my (@nodes);
my $config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# test 1, test 2

8
testcases/t/166-assign.t
View File

@@ -64,7 +64,6 @@ sub test_workspace_assignment {
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -89,7 +88,6 @@ $window->destroy;
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [class="special"] → targetws
EOT
@@ -118,7 +116,6 @@ exit_gracefully($pid);
#####################################################################
my $config_numbered = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [class="special"] → workspace number 2
EOT
@@ -183,7 +180,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window [class="special"] floating enable
EOT
@@ -210,7 +206,6 @@ exit_gracefully($pid);
# test assignments to named outputs
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0,1024x768+1024+768,1024x768+0+768
@@ -275,7 +270,6 @@ exit_gracefully($pid);
# Test assignments to outputs with relative names
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0,1024x768+1024+768,1024x768+0+768
@@ -330,7 +324,6 @@ exit_gracefully($pid);
# Test assignments to primary / nonprimary outputs
#####################################################################
$config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0P,1024x768+1024+0
@@ -385,7 +378,6 @@ sub i3nagbar_running {
}
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window [title="special"] floating enable
EOT

4
testcases/t/167-workspace_layout.t
View File

@@ -25,7 +25,6 @@ use i3test i3_autostart => 0;
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -52,7 +51,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
workspace_layout stacked
EOT
@@ -383,7 +381,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
workspace_layout default
EOT
@@ -419,7 +416,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
workspace_layout default
EOT

2
testcases/t/170-force_focus_wrapping.t
View File

@@ -23,7 +23,6 @@ use i3test i3_autostart => 0;
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -63,7 +62,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
force_focus_wrapping true
EOT

7
testcases/t/172-start-on-named-ws.t
View File

@@ -23,7 +23,6 @@ use i3test i3_autostart => 0;
##############################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -39,7 +38,6 @@ exit_gracefully($pid);
##############################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Mod1+1 workspace foobar
@@ -57,7 +55,6 @@ exit_gracefully($pid);
##############################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Mod1+1 workspace "foobar"
@@ -75,7 +72,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Mod1+1 workspace 3
@@ -93,7 +89,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Mod1+1 workspace 3; exec foo
@@ -111,7 +106,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Mod1+1 workspace 3
@@ -130,7 +124,6 @@ exit_gracefully($pid);
##############################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Mod1+1 workspace --no-auto-back-and-forth number 3:three

4
testcases/t/174-border-config.t
View File

@@ -25,7 +25,6 @@ use i3test i3_autostart => 0;
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -49,7 +48,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window 1pixel
@@ -76,7 +74,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -102,7 +99,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_float 1pixel

2
testcases/t/176-workspace-baf.t
View File

@@ -21,7 +21,6 @@
use i3test i3_autostart => 0;
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -81,7 +80,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
workspace_auto_back_and_forth yes
EOT

9
testcases/t/177-bar-config.t
View File

@@ -24,7 +24,6 @@ use i3test i3_autostart => 0;
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -41,7 +40,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bar {
@@ -84,7 +82,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bar {
@@ -190,7 +187,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bar {
@@ -223,7 +219,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bar {
@@ -256,7 +251,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bar {
@@ -289,7 +283,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bar {
@@ -324,7 +317,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bar {
@@ -359,7 +351,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bar {

4
testcases/t/183-config-variables.t
View File

@@ -45,7 +45,6 @@ sub launch_get_border {
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -56,7 +55,6 @@ is(launch_get_border($config), 'normal', 'normal border');
#####################################################################
$config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
set $vartest special title
@@ -70,7 +68,6 @@ is(launch_get_border($config), 'none', 'no border');
#####################################################################
$config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
set $vartest special title
@@ -84,7 +81,6 @@ is(launch_get_border($config), 'none', 'no border');
#####################################################################
$config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
set $var normal title

1
testcases/t/186-regress-assign-focus-parent.t
View File

@@ -20,7 +20,6 @@
# f78caf8c5815ae7a66de9e4b734546fd740cc19d
#
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [title="testcase"] targetws

9
testcases/t/189-floating-constraints.t
View File

@@ -28,7 +28,6 @@ use X11::XCB qw/PROP_MODE_REPLACE/;
################################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# Test with different dimensions than the i3 default.
@@ -50,7 +49,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
floating_minimum_size -1 x -1
@@ -72,7 +70,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# Test with different dimensions than the i3 default.
@@ -93,7 +90,6 @@ exit_gracefully($pid);
# opening a window which is bigger than the testsuite screen (1280x1024).
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -112,7 +108,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# Test with different dimensions than the i3 default.
@@ -134,7 +129,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# Test with different dimensions than the i3 default.
@@ -159,7 +153,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# Test with different dimensions than the i3 default.
@@ -192,7 +185,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# Test with different dimensions than the i3 default.
@@ -224,7 +216,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT

1
testcases/t/194-regress-floating-size.t
View File

@@ -23,7 +23,6 @@ sub test_with_config {
my ($value) = @_;
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT

1
testcases/t/196-randr-output-names.t
View File

@@ -22,7 +22,6 @@ use File::Temp qw(tempfile);
my ($fh, $filename) = tempfile(UNLINK => 1);
print $fh <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
workspace 2 output DVI-I_1/digital

1
testcases/t/199-ipc-mode-event.t
View File

@@ -16,7 +16,6 @@
#
# Verifies that the IPC 'mode' event is sent when modes are changed.
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
mode "m1" {

1
testcases/t/200-urgency-timer.t
View File

@@ -21,7 +21,6 @@
use List::Util qw(first);
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
force_display_urgency_hint 500ms

16
testcases/t/201-config-parser.t
View File

@@ -606,9 +606,7 @@ $config = <<'EOT';
# "foo" client.focused #4c7899 #285577 #ffffff #2e9ef4
EOT
$expected = <<'EOT';
EOT
$expected = "\n";
is(parser_calls($config),
$expected,
@@ -619,8 +617,6 @@ is(parser_calls($config),
################################################################################
$config = <<'EOT';
# i3 config file (v4)
font foobar
unknown qux
@@ -635,12 +631,12 @@ EOT
my $expected_tail = <<'EOT';
ERROR: CONFIG: (in file <stdin>)
ERROR: CONFIG: Line 3: font foobar
ERROR: CONFIG: Line 4:
ERROR: CONFIG: Line 5: unknown qux
ERROR: CONFIG: Line 1: font foobar
ERROR: CONFIG: Line 2:
ERROR: CONFIG: Line 3: unknown qux
ERROR: CONFIG: ^^^^^^^^^^^
ERROR: CONFIG: Line 6:
ERROR: CONFIG: Line 7: # yay
ERROR: CONFIG: Line 4:
ERROR: CONFIG: Line 5: # yay
EOT
$expected = $expected_head . $expected_all_tokens . $expected_tail;

2
testcases/t/203-regress-assign-and-move.t
View File

@@ -21,7 +21,6 @@
use i3test i3_autostart => 0;
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [instance=__i3-test-window] 2
@@ -47,7 +46,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window [instance=__i3-test-window1] move workspace 3

1
testcases/t/208-regress-floating-criteria.t
View File

@@ -19,7 +19,6 @@
# Ticket: #1027
# Bug still in: 4.5.1-90-g6582da9
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [class="^special$"] → mail

1
testcases/t/209-ewmh-net-workarea.t
View File

@@ -57,7 +57,6 @@ sub is_net_workarea_set {
ok(is_net_workarea_set(), '_NET_WORKAREA is set before starting i3');
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0
EOT

1
testcases/t/211-regress-urgency-assign.t
View File

@@ -21,7 +21,6 @@
# Ticket: #1086
# Bug still in: 4.6-62-g7098ef6
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [class="special"] nonvisible

3
testcases/t/212-assign-urgency.t
View File

@@ -41,7 +41,6 @@ sub open_special {
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [class="special"] → targetws
EOT
@@ -65,7 +64,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [class="special"] → targetws
EOT
@@ -88,7 +86,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0

1
testcases/t/217-NET_CURRENT_DESKTOP.t
View File

@@ -26,7 +26,6 @@ use i3test i3_autostart => 0;
use X11::XCB qw(PROP_MODE_REPLACE);
my $config = <<EOT;
# i3 config file (v4)
font font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT

1
testcases/t/219-ipc-window-focus.t
View File

@@ -15,7 +15,6 @@
# (unless you are already familiar with Perl)
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# fake-1 under fake-0 to not interfere with left/right wrapping

1
testcases/t/222-regress-dock-resize.t
View File

@@ -19,7 +19,6 @@
# Ticket: #1201
# Bug still in: 4.7.2-107-g9b03be6
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT

2
testcases/t/226-internal-workspaces.t
View File

@@ -25,7 +25,6 @@ sub internal_workspaces {
}
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -49,7 +48,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Mod1+1 workspace __foo

3
testcases/t/228-border-widths.t
View File

@@ -27,7 +27,6 @@ use i3test i3_autostart => 0;
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window pixel 5
@@ -62,7 +61,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_float pixel 7
@@ -97,7 +95,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_float normal 6

3
testcases/t/229-cleanup-tmpdir.t
View File

@@ -23,7 +23,6 @@ use File::Temp qw(tempfile tempdir);
use X11::XCB qw(:all);
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -113,7 +112,6 @@ $ENV{XDG_RUNTIME_DIR} = tempdir(CLEANUP => 1);
my ($outfh, $outname) = tempfile('/tmp/i3-socket.XXXXXX', UNLINK => 1);
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
ipc-socket $outname
@@ -133,7 +131,6 @@ my ($outfh2, $outname2) = tempfile('/tmp/i3-socket.XXXXXX', UNLINK => 1);
my $config_path = get_config_path();
open(my $configfh, '>', $config_path);
say $configfh <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
ipc-socket $outname2
EOT

1
testcases/t/230-floating-fullscreen-restart.t
View File

@@ -19,7 +19,6 @@
# Ticket: #1263
# Bug still in: 4.7.2-200-g570b572
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window [instance=__i3-test-window] floating enable, border pixel 1

1
testcases/t/233-regress-manage-focus-unmapped.t
View File

@@ -20,7 +20,6 @@
# Ticket: #1283
# Bug still in: 4.8-24-g60070de
use i3test i3_config => <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window [class="^special_kill$"] kill

4
testcases/t/235-check-config-no-x.t
View File

@@ -38,7 +38,6 @@ sub check_config {
################################################################################
$cfg = <<EOT;
# i3 config file (v4)
i_am_an_unknown_config option
EOT
@@ -51,7 +50,6 @@ like($out, qr/ERROR: *CONFIG: *[Ee]xpected.*tokens/, 'bogus config file');
################################################################################
$cfg = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -64,7 +62,6 @@ is($out, "", 'valid config file');
################################################################################
$cfg = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Shift+a nop 1
bindsym Shift+a nop 2
@@ -79,7 +76,6 @@ like($out, qr/ERROR: *Duplicate keybinding in config file/, 'duplicate keybindin
################################################################################
$cfg = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Shift+a nop 1
EOT

1
testcases/t/237-regress-assign-focus.t
View File

@@ -19,7 +19,6 @@
# Ticket: #1338
# Bug still in: 4.8-91-g294d52e
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [title=".*"] 1

1
testcases/t/238-ipc-binding-event.t
View File

@@ -25,7 +25,6 @@ my @mods = ('Shift', 'Ctrl');
my $binding_symbol = join("+", @mods) . "+$keysym";
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym $binding_symbol $command

6
testcases/t/240-focus-on-window-activation.t
View File

@@ -49,7 +49,6 @@ sub get_urgency_for_window_on_workspace {
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_on_window_activation urgent
@@ -75,7 +74,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_on_window_activation urgent
@@ -103,7 +101,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_on_window_activation focus
@@ -129,7 +126,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_on_window_activation focus
@@ -157,7 +153,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_on_window_activation none
@@ -183,7 +178,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_on_window_activation none

1
testcases/t/241-consistent-center.t
View File

@@ -19,7 +19,6 @@
# windows upwards dependent on their decoration height.
#
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window none

3
testcases/t/242-no-focus.t
View File

@@ -25,7 +25,6 @@ my ($config, $pid, $ws, $first, $second, $focused);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -48,7 +47,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
no_focus [instance=notme]
@@ -72,7 +70,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
no_focus [instance=focusme]

1
testcases/t/244-new-workspace-floating-enable-center.t
View File

@@ -18,7 +18,6 @@
# leaves the window centered on the new workspace.
# Bug still in: 4.10.2-137-ga4f0ed6
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window none

4
testcases/t/245-move-position-mouse.t
View File

@@ -37,7 +37,6 @@ my $root_rect = $x->root->rect;
##########################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
$pid = launch_with_config($config);
@@ -63,7 +62,6 @@ exit_gracefully($pid);
##########################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
$pid = launch_with_config($config);
@@ -89,7 +87,6 @@ exit_gracefully($pid);
##########################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
$pid = launch_with_config($config);
@@ -117,7 +114,6 @@ exit_gracefully($pid);
##########################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 500x500+0+0,500x500+500+0,500x500+0+500,500x500+500+500
EOT

4
testcases/t/247-config-line-continuation.t
View File

@@ -44,7 +44,6 @@ sub launch_get_border {
#####################################################################
my $config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
set $vartest \"special title\"
@@ -58,7 +57,6 @@ is(launch_get_border($config), 'none', 'no border');
#####################################################################
$config = <<'EOT';
# i3 config file (v4)
font \
-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
@@ -185,7 +183,6 @@ is(launch_get_border($config), 'none', 'no border');
#####################################################################
$config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
set \
@@ -203,7 +200,6 @@ is(launch_get_border($config), 'none', 'no border');
#####################################################################
$config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
set $vartest \"special title\"

1
testcases/t/248-regress-urgency-clear.t
View File

@@ -19,7 +19,6 @@
# Ticket: #1825
# Bug still in: 4.10.3-253-g03799dd
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_on_window_activation urgent

1
testcases/t/252-floating-size.t
View File

@@ -18,7 +18,6 @@
# Ticket: #1727
# Bug still in: 4.10.2-1-gc0dbc5d
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1333x999+0+0

1
testcases/t/254-move-to-output-with-criteria.t
View File

@@ -18,7 +18,6 @@
# used with command criteria.
# Bug still in: 4.10.4-349-gee5db87
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 800x600+0+0,800x600+800+0,800x600+0+600,800x600+800+600

1
testcases/t/257-keypress-group1-fallback.t
View File

@@ -21,7 +21,6 @@
# Bug introduced with commit 0e5180cae9e9295678e3f053042b559e82cb8c98
use i3test
i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Print nop Print

1
testcases/t/258-keypress-release.t
View File

@@ -20,7 +20,6 @@
# Bug still in: 4.11-103-gc8d51b4
# Bug introduced with commit bf3cd41b5ddf1e757515ab5fbf811be56e5f69cc
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Print nop Print

1
testcases/t/262-config-validation.t
View File

@@ -21,7 +21,6 @@ use POSIX ":sys_wait_h";
use Time::HiRes qw(sleep);
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
invalid

1
testcases/t/263-config-reload-reverts-bind-mode.t
View File

@@ -19,7 +19,6 @@
# Ticket: #2228
# Bug still in: 4.11-262-geb631ce
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
mode "othermode" {

1
testcases/t/264-dock-criteria.t
View File

@@ -17,7 +17,6 @@
# Verifies that command or config criteria does not match dock clients
# Bug still in: 4.12-38-ge690e3d
use i3test i3_config => <<EOT;
# i3 config file (v4)
for_window [class="dock"] move workspace current
bar {

1
testcases/t/266-net-moveresize-window.t
View File

@@ -44,7 +44,6 @@ sub moveresize_window {
}
my $config = <<EOT;
# i3 config file (v4)
font font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window none

1
testcases/t/268-ipc-config.t
View File

@@ -25,7 +25,6 @@ my $socketpath = $tmpdir . "/config.sock";
ok(! -e $socketpath, "$socketpath does not exist yet");
my $config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
nop foo \

2
testcases/t/271-for_window_tilingfloating.t
View File

@@ -18,7 +18,6 @@ use i3test i3_autostart => 0;
use X11::XCB qw(PROP_MODE_REPLACE);
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window [tiling] mark --add tiling
for_window [floating] mark --add floating
@@ -94,7 +93,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window [tiling] mark --add tiling

1
testcases/t/272-regress-focus-assign.t
View File

@@ -18,7 +18,6 @@
# assigned to an invisible workspace
#
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
assign [class="special"] targetws
EOT

1
testcases/t/279-regress-default-floating-border.t
View File

@@ -19,7 +19,6 @@
# Ticket: #1305
# Bug still in: 4.8-62-g7381b50
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window pixel 5

1
testcases/t/280-wm-class-change-handler.t
View File

@@ -20,7 +20,6 @@
# Ticket: #1052
# Bug still in: 4.8-73-g6bf7f8e
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window [class="Special"] mark special_class_mark
EOT

1
testcases/t/281-regress-reload-bindsym.t
View File

@@ -17,7 +17,6 @@
# Test that the binding event works properly
# Ticket: #1210
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym r reload

1
testcases/t/282-tabbed-floating-disable-crash.t
View File

@@ -19,7 +19,6 @@
# Ticket: #1484
# Bug still in: 4.9.1-124-g856e1f9
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
workspace_layout tabbed
EOT

1
testcases/t/285-sticky.t
View File

@@ -17,7 +17,6 @@
# Tests sticky windows.
# Ticket: #1455
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
workspace ws-on-0 output fake-0

1
testcases/t/286-root-window-mouse-binding.t
View File

@@ -18,7 +18,6 @@
# --whole-window is set.
# Ticket: #2115
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
workspace_auto_back_and_forth no

6
testcases/t/287-edge-borders.t
View File

@@ -24,7 +24,6 @@ use i3test i3_autostart => 0;
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window pixel 2
@@ -55,7 +54,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window pixel 2
@@ -89,7 +87,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window pixel 2
@@ -120,7 +117,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window pixel 2
@@ -166,7 +162,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window pixel 2
@@ -198,7 +193,6 @@ exit_gracefully($pid);
#####################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
new_window pixel 2

4
testcases/t/290-keypress-numlock.t
View File

@@ -26,7 +26,6 @@ SKIP: {
ExtUtils::PkgConfig->atleast_version('xcb-xkb', '1.11');
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# Same key, different numlock states.
@@ -218,7 +217,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Mod4+Return nop Return
@@ -288,7 +286,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym KP_End nop KP_End
@@ -353,7 +350,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym --whole-window button4 nop button4

2
testcases/t/291-swap.t
View File

@@ -19,7 +19,6 @@
use i3test i3_autostart => 0;
my $config = <<EOT;
# i3 config file (v4)
font font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window[class="mark_A"] mark A
@@ -719,7 +718,6 @@ exit_gracefully($pid);
###############################################################################
$config = <<EOT;
# i3 config file (v4)
font font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
workspace_layout stacking

1
testcases/t/293-focus-follows-mouse.t
View File

@@ -16,7 +16,6 @@
#
# Tests the focus_follows_mouse setting.
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1000x1000+0+0

1
testcases/t/293-sticky-output-crash.t
View File

@@ -19,7 +19,6 @@
# Ticket: #3075
# Bug still in: 4.14-191-g9d2d602d
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0
EOT

1
testcases/t/294-focus-order.t
View File

@@ -17,7 +17,6 @@
# Verify that the current focus stack order is preserved after various
# operations.
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0
EOT

1
testcases/t/296-regress-focus-behind-fullscreen-floating.t
View File

@@ -19,7 +19,6 @@
# Ticket: #3201
# Bug still in: 4.15-59-gb849fe3e
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0

1
testcases/t/297-assign-workspace-to-output.t
View File

@@ -69,7 +69,6 @@ sub do_test {
}
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0P,1024x768+1024+0,1024x768+1024+768,1024x768+0+768

1
testcases/t/297-scroll-tabbed.t
View File

@@ -90,7 +90,6 @@ exit_gracefully($pid);
# See issue #5472.
###############################################################################
$pid = launch_with_config(<<EOT
# i3 config file (v4)
font font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_follows_mouse no
fake-outputs 1024x768+0+0,1024x768+1024+0

1
testcases/t/298-ipc-misbehaving-connection.t
View File

@@ -19,7 +19,6 @@
# Ticket: #2999
# Bug still in: 4.15-180-g715cea61
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# Set the timeout to 500ms to reduce the duration of this test.
ipc_kill_timeout 500

1
testcases/t/304-ipc-workspace-init.t
View File

@@ -19,7 +19,6 @@
# Bug still in: 4.16-85-g2d6e09a6
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# fake-1 under fake-0 to not interfere with left/right wrapping

1
testcases/t/308-focus_wrapping.t
View File

@@ -29,7 +29,6 @@ sub focus_wrapping {
exit_gracefully($pid) if $pid > 0;
my $config = <<"EOT";
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0,1024x768+1024+768,1024x768+0+768

1
testcases/t/311-get-binding-modes.t
View File

@@ -18,7 +18,6 @@
# Ticket: #3892
# Bug still in: 4.18-318-g50160eb1
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
mode "extra" {

14
testcases/t/313-include.t
View File

@@ -45,7 +45,6 @@ sub launch_get_border {
#####################################################################
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
@@ -64,7 +63,6 @@ print $fh $varconfig;
$fh->flush;
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
include $filename
@@ -83,7 +81,6 @@ EOT
$indirectfh->flush;
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
include $indirectfilename
@@ -103,7 +100,6 @@ EOT
$indirectfh2->flush;
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
include $indirectfilename2
@@ -116,7 +112,6 @@ is(launch_get_border($config), 'none', 'no border');
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
include `echo $filename`
@@ -129,7 +124,6 @@ is(launch_get_border($config), 'none', 'no border');
################################################################################
$config = <<'EOT';
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
include i3-`false`.conf
@@ -150,7 +144,6 @@ my $mode = 0055;
chmod($mode, $permissiondenied);
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
include $permissiondenied
@@ -168,7 +161,6 @@ unlink($dangling);
symlink("/dangling", $dangling);
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
include $dangling
@@ -190,7 +182,6 @@ EOT
$varfh->flush;
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
set \$vartest special title
@@ -213,7 +204,6 @@ EOT
$varfh->flush;
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
include $var
@@ -233,7 +223,6 @@ my ($wsfh, $ws) = tempfile(UNLINK => 1);
$wsfh->flush;
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym 1 workspace 1: eggs
@@ -276,7 +265,6 @@ EOT
$loopfh2->flush;
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# loop
@@ -293,7 +281,6 @@ is(launch_get_border($config), 'none', 'no border');
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
include $indirectfilename2
@@ -326,7 +313,6 @@ print $indirectfh3 $indirectconfig;
$indirectfh3->flush;
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
set \$vartest special title

2
testcases/t/314-window-icon-padding.t
View File

@@ -25,7 +25,6 @@ sub window_icon_padding {
}
my $config = <<"EOT";
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
EOT
my $pid = launch_with_config($config);
@@ -75,7 +74,6 @@ exit_gracefully($pid);
################################################################################
$config = <<"EOT";
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
for_window [class=".*"] title_window_icon padding 3px

1
testcases/t/316-drag-container.t
View File

@@ -19,7 +19,6 @@
my ($width, $height) = (1000, 500);
my $config = <<"EOT";
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_follows_mouse no

1
testcases/t/316-transient-for-loop.t
View File

@@ -20,7 +20,6 @@
# Bug still in: 4.20-69-g43e805a00
#
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
popup_during_fullscreen smart;

2
testcases/t/317-bar-config-font-fallback.t
View File

@@ -20,8 +20,6 @@
# Ticket: #5031
# Bug still in: 4.20-105-g4db383e4
use i3test i3_config => <<'EOT';
# i3 config file (v4)
bar {
# no font directive here, no i3-wide font configured (yet)
}

2
testcases/t/317-bar-config-font-order.t
View File

@@ -20,8 +20,6 @@
# Ticket: #5031
# Bug still in: 4.20-105-g4db383e4
use i3test i3_config => <<'EOT';
# i3 config file (v4)
bar {
# no font directive here, no i3-wide font configured (yet)
}

2
testcases/t/317-bar-output-trailing-space.t
View File

@@ -23,7 +23,6 @@ use i3test i3_autostart => 0;
# Test with a single output.
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bar {
@@ -46,7 +45,6 @@ exit_gracefully($pid);
# Test with multiple outputs for a single bar.
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bar {

7
testcases/t/319-gaps.t
View File

@@ -21,7 +21,6 @@ use i3test i3_autostart => 0;
use i3test::Util qw(slurp);
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
gaps inner 10
@@ -142,7 +141,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# This should result in a gap of 16px, not 26px
@@ -172,7 +170,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
gaps inner 10
@@ -208,7 +205,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
gaps inner 10
@@ -239,7 +235,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
gaps inner 10
@@ -258,7 +253,6 @@ is_gaps();
my $version = i3()->get_version()->recv;
open(my $configfh, '>', $version->{'loaded_config_file_name'});
say $configfh <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# Increase gaps for (existing) workspace 2 to 16px
@@ -283,7 +277,6 @@ exit_gracefully($pid);
################################################################################
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
gaps inner 33

1
testcases/t/320-mouse-bindings.t
View File

@@ -16,7 +16,6 @@
#
# Test button bindsyms
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
focus_follows_mouse no

1
testcases/t/322-match-error-crash.t
View File

@@ -19,7 +19,6 @@
# Ticket: #6141
# Bug still in: 4.23-47-gbe840af4
use i3test i3_config => <<EOT;
# i3 config file (v4)
assign [class="class" window_type="some_type"] workspace 1
assign [class="class" window_type="some_type"] output 1
for_window [class="class" window_type="some_type"] workspace 1

1
testcases/t/500-multi-monitor.t
View File

@@ -18,7 +18,6 @@
# multiple monitors.
#
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0

1
testcases/t/501-scratchpad.t
View File

@@ -19,7 +19,6 @@
# 89dded044b4fffe78f9d70778748fabb7ac533e9.
#
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0

1
testcases/t/502-focus-output.t
View File

@@ -17,7 +17,6 @@
# Verifies the 'focus output' command works properly.
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0

1
testcases/t/503-workspace.t
View File

@@ -18,7 +18,6 @@
#
use List::Util qw(first);
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0

1
testcases/t/504-move-workspace-to-output.t
View File

@@ -18,7 +18,6 @@
#
use List::Util qw(first);
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0

1
testcases/t/505-scratchpad-resolution.t
View File

@@ -18,7 +18,6 @@
# errors when repeatedly hiding/showing, no matter what display resolution.
#
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 683x768+0+0,1024x768+683+0

4
testcases/t/506-focus-right.t
View File

@@ -83,7 +83,6 @@ sub test_focus_left_right {
# +----+
#
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1080x1920+0+0,1920x1080+1080+500
@@ -99,7 +98,6 @@ test_focus_left_right($config);
# +----+
#
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1080x1920+0+0,1920x200+1080+0
@@ -115,7 +113,6 @@ test_focus_left_right($config);
# +----+--------+
#
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1080x1920+0+0,1920x200+1080+1720
@@ -131,7 +128,6 @@ test_focus_left_right($config);
# +----+--------+----+
#
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1080x1920+0+0,1920x200+1080+1720,1080x1920+1280+0

1
testcases/t/507-workspace-move-crash.t
View File

@@ -20,7 +20,6 @@
#
use List::Util qw(first);
use i3test i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0,1024x768+1024+0

Some files were not shown because too many files have changed in this diff Show More