The testcase is changed because it was actually incorrect. Easy to
verify because:
> _NET_CURRENT_DESKTOP
> …
> The index of the current desktop. This is always an integer between 0
> and _NET_NUMBER_OF_DESKTOPS - 1.
Fixes #3696.
Also updates the viewports.
Finally, fixes an issue with _NET_CURRENT_DESKTOP not being updated
after a workspace rename. Example:
- workspaces 1, 2, 3
- rename workspace 1 to 5
- All workspaces changed their index but _NET_CURRENT_DESKTOP was not
updated
+/**
+ * Updates all the EWMH desktop properties.
+ *
+ */
+void ewmh_update_desktop_properties(void);
+
/**
* Updates _NET_CURRENT_DESKTOP with the current desktop number.
*
/**
* Updates _NET_CURRENT_DESKTOP with the current desktop number.
*
*/
void ewmh_update_current_desktop(void);
*/
void ewmh_update_current_desktop(void);
-/**
- * Updates _NET_NUMBER_OF_DESKTOPS which we interpret as the number of
- * noninternal workspaces.
- */
-void ewmh_update_number_of_desktops(void);
-
-/**
- * Updates _NET_DESKTOP_NAMES: "The names of all virtual desktops. This is a
- * list of NULL-terminated strings in UTF-8 encoding"
- */
-void ewmh_update_desktop_names(void);
-
-/**
- * Updates _NET_DESKTOP_VIEWPORT, which is an array of pairs of cardinals that
- * define the top left corner of each desktop's viewport.
- */
-void ewmh_update_desktop_viewport(void);
-
/**
* Updates _NET_WM_DESKTOP for all windows.
* A request will only be made if the cached value differs from the calculated value.
/**
* Updates _NET_WM_DESKTOP for all windows.
* A request will only be made if the cached value differs from the calculated value.
cmd_output->needs_tree_render = true;
ysuccess(true);
cmd_output->needs_tree_render = true;
ysuccess(true);
- ewmh_update_desktop_names();
- ewmh_update_desktop_viewport();
- ewmh_update_current_desktop();
+ ewmh_update_desktop_properties();
startup_sequence_rename_workspace(old_name_copy, new_name);
free(old_name_copy);
startup_sequence_rename_workspace(old_name_copy, new_name);
free(old_name_copy);
* Updates _NET_NUMBER_OF_DESKTOPS which we interpret as the number of
* noninternal workspaces.
*/
* Updates _NET_NUMBER_OF_DESKTOPS which we interpret as the number of
* noninternal workspaces.
*/
-void ewmh_update_number_of_desktops(void) {
+static void ewmh_update_number_of_desktops(void) {
Con *output, *ws;
static uint32_t old_idx = 0;
uint32_t idx = 0;
Con *output, *ws;
static uint32_t old_idx = 0;
uint32_t idx = 0;
* Updates _NET_DESKTOP_NAMES: "The names of all virtual desktops. This is a
* list of NULL-terminated strings in UTF-8 encoding"
*/
* Updates _NET_DESKTOP_NAMES: "The names of all virtual desktops. This is a
* list of NULL-terminated strings in UTF-8 encoding"
*/
-void ewmh_update_desktop_names(void) {
+static void ewmh_update_desktop_names(void) {
Con *output, *ws;
int msg_length = 0;
Con *output, *ws;
int msg_length = 0;
* Updates _NET_DESKTOP_VIEWPORT, which is an array of pairs of cardinals that
* define the top left corner of each desktop's viewport.
*/
* Updates _NET_DESKTOP_VIEWPORT, which is an array of pairs of cardinals that
* define the top left corner of each desktop's viewport.
*/
-void ewmh_update_desktop_viewport(void) {
+static void ewmh_update_desktop_viewport(void) {
Con *output, *ws;
int num_desktops = 0;
/* count number of desktops */
Con *output, *ws;
int num_desktops = 0;
/* count number of desktops */
A__NET_DESKTOP_VIEWPORT, XCB_ATOM_CARDINAL, 32, current_position, &viewports);
}
A__NET_DESKTOP_VIEWPORT, XCB_ATOM_CARDINAL, 32, current_position, &viewports);
}
+/*
+ * Updates all the EWMH desktop properties.
+ *
+ */
+void ewmh_update_desktop_properties(void) {
+ ewmh_update_number_of_desktops();
+ ewmh_update_desktop_viewport();
+ ewmh_update_current_desktop();
+ ewmh_update_desktop_names();
+ ewmh_update_wm_desktop();
+}
+
static void ewmh_update_wm_desktop_recursively(Con *con, const uint32_t desktop) {
Con *child;
static void ewmh_update_wm_desktop_recursively(Con *con, const uint32_t desktop) {
Con *child;
ewmh_update_workarea();
/* Set the ewmh desktop properties. */
ewmh_update_workarea();
/* Set the ewmh desktop properties. */
- ewmh_update_current_desktop();
- ewmh_update_number_of_desktops();
- ewmh_update_desktop_names();
- ewmh_update_desktop_viewport();
+ ewmh_update_desktop_properties();
struct ev_io *xcb_watcher = scalloc(1, sizeof(struct ev_io));
xcb_prepare = scalloc(1, sizeof(struct ev_prepare));
struct ev_io *xcb_watcher = scalloc(1, sizeof(struct ev_io));
xcb_prepare = scalloc(1, sizeof(struct ev_prepare));
if (ws == con) {
DLOG("Closing workspace container %s, updating EWMH atoms\n", ws->name);
if (ws == con) {
DLOG("Closing workspace container %s, updating EWMH atoms\n", ws->name);
- ewmh_update_number_of_desktops();
- ewmh_update_desktop_names();
- ewmh_update_wm_desktop();
+ ewmh_update_desktop_properties();
con_attach(workspace, content, false);
ipc_send_workspace_event("init", workspace, NULL);
con_attach(workspace, content, false);
ipc_send_workspace_event("init", workspace, NULL);
- ewmh_update_number_of_desktops();
- ewmh_update_desktop_names();
- ewmh_update_desktop_viewport();
- ewmh_update_wm_desktop();
+ ewmh_update_desktop_properties();
if (created != NULL)
*created = true;
} else if (created != NULL) {
if (created != NULL)
*created = true;
} else if (created != NULL) {
- ewmh_update_number_of_desktops();
- ewmh_update_desktop_names();
- ewmh_update_desktop_viewport();
- ewmh_update_wm_desktop();
+ ewmh_update_desktop_properties();
# Kill first window to close a workspace.
cmd '[id="' . $second->id . '"] kill';
# Kill first window to close a workspace.
cmd '[id="' . $second->id . '"] kill';
-is(get_current_desktop, 2, '_NET_CURRENT_DESKTOP should be updated');
+is(get_current_desktop, 1, '_NET_CURRENT_DESKTOP should be updated');
is(get_num_of_desktops, 2, '_NET_NUMBER_OF_DESKTOPS should be updated');
my @actual_names = get_desktop_names;
my @expected_names = ('0', '2');
is_deeply(\@actual_names, \@expected_names, '_NET_DESKTOP_NAMES should be updated');
is(get_num_of_desktops, 2, '_NET_NUMBER_OF_DESKTOPS should be updated');
my @actual_names = get_desktop_names;
my @expected_names = ('0', '2');
is_deeply(\@actual_names, \@expected_names, '_NET_DESKTOP_NAMES should be updated');
+# Rename workspace to reorder them.
+cmd 'rename workspace 0 to 5';
+
+is(get_current_desktop, 0, '_NET_CURRENT_DESKTOP should be updated');
+is(get_num_of_desktops, 2, '_NET_NUMBER_OF_DESKTOPS should remain the same');
+my @actual_names = get_desktop_names;
+my @expected_names = ('2', '5');
+is_deeply(\@actual_names, \@expected_names, '_NET_DESKTOP_NAMES should be updated');