nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1539 from mh21/wsrename-1527 

Rename workspaces in startup sequences
This commit is contained in:
Michael Stapelberg 2015-03-14 04:56:19 -07:00
parent 8eb5656c69 44f748a663
commit 56f420c3dd
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/startup.h
View File

@ -44,6 +44,12 @@ void startup_sequence_delete(struct Startup_Sequence *sequence);
*/
void startup_monitor_event(SnMonitorEvent *event, void *userdata);
/**
* Renames workspaces that are mentioned in the startup sequences.
*
*/
void startup_sequence_rename_workspace(char *old_name, char *new_name);
/**
* Gets the stored startup sequence for the _NET_STARTUP_ID of a given window.
*

2
src/commands.c
View File

@ -1934,6 +1934,8 @@ void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
ewmh_update_desktop_names();
ewmh_update_desktop_viewport();
ewmh_update_current_desktop();
startup_sequence_rename_workspace(old_name, new_name);
}
/*

16
src/startup.c
View File

@ -257,6 +257,22 @@ void startup_monitor_event(SnMonitorEvent *event, void *userdata) {
}
}
/**
* Renames workspaces that are mentioned in the startup sequences.
*
*/
void startup_sequence_rename_workspace(char *old_name, char *new_name) {
struct Startup_Sequence *current;
TAILQ_FOREACH(current, &startup_sequences, sequences) {
if (strcmp(current->workspace, old_name) != 0)
continue;
DLOG("Renaming workspace \"%s\" to \"%s\" in startup sequence %s.\n",
old_name, new_name, current->id);
free(current->workspace);
current->workspace = sstrdup(new_name);
}
}
/**
* Gets the stored startup sequence for the _NET_STARTUP_ID of a given window.
*

5
testcases/t/175-startup-notification.t
View File

@ -142,12 +142,17 @@ is_num_children($first_ws, 2, 'two containers on the first workspace');
complete_startup();
sync_with_i3;
# even when renaming the workspace, windows should end up on the correct one
cmd "rename workspace $first_ws to temp";
# Startup has completed but the 30-second deletion time hasn't elapsed,
# so this window should still go on the leader's initial workspace.
$win = open_window({ dont_map => 1, client_leader => $leader });
$win->map;
sync_with_i3;
cmd "rename workspace temp to $first_ws";
is_num_children($first_ws, 3, 'three containers on the first workspace');
# Switch to the first workspace and move the focused window to the