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

don’t close workspaces which are still visible (multi-monitor)

This commit is contained in:
Michael Stapelberg 2010-11-12 17:34:13 +01:00
parent c1d574f84e
commit c6c084faa5
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/workspace.h
View File

@ -34,6 +34,7 @@ Con *workspace_get(const char *num);
*
*/
void workspace_set_name(Workspace *ws, const char *name);
#endif
/**
* Returns true if the workspace is currently visible. Especially important for
@ -41,9 +42,8 @@ void workspace_set_name(Workspace *ws, const char *name);
* workspaces.
*
*/
bool workspace_is_visible(Workspace *ws);
bool workspace_is_visible(Con *ws);
#endif
/** Switches to the given workspace */
void workspace_show(const char *num);

18
src/workspace.c
View File

@ -80,6 +80,7 @@ void workspace_set_name(Workspace *ws, const char *name) {
else ws->text_width = 0;
ws->utf8_name = label;
}
#endif
/*
* Returns true if the workspace is currently visible. Especially important for
@ -87,10 +88,14 @@ void workspace_set_name(Workspace *ws, const char *name) {
* workspaces.
*
*/
bool workspace_is_visible(Workspace *ws) {
return (ws->output != NULL && ws->output->current_workspace == ws);
bool workspace_is_visible(Con *ws) {
Con *output = con_get_output(ws);
if (output == NULL)
return false;
Con *fs = con_get_fullscreen_con(output);
LOG("workspace visible? fs = %p, ws = %p\n", fs, ws);
return (fs == ws);
}
#endif
/*
* XXX: we need to clean up all this recursive walking code.
@ -197,8 +202,11 @@ void workspace_show(const char *num) {
if (TAILQ_EMPTY(&(old->nodes_head))) {
LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name);
tree_close(old, false);
/* check if this workspace is currently visible */
if (!workspace_is_visible(old)) {
LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name);
tree_close(old, false);
}
}
con_focus(next);