koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Argument for 'kill' for killing a specific window (now default) or the whole client (+test)

Browse Source 
Use 'kill window' to kill a specific window (for example only one specific
popup), use 'kill client' to kill the whole application (or X11 connection to
be specific).
This commit is contained in:
Michael Stapelberg
2011-05-13 20:41:03 +02:00
parent 44c2555e67
commit 167bdd26b7
13 changed files with 111 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmdparse.l
View File

@ -2,7 +2,7 @@
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
* © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE)
* © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
*
* cmdparse.l: the lexer for commands you send to i3 (or bind on keys)
*
@ -92,6 +92,8 @@ exit { return TOK_EXIT; }
reload { return TOK_RELOAD; }
restart { return TOK_RESTART; }
kill { return TOK_KILL; }
window { return TOK_WINDOW; }
client { return TOK_CLIENT; }
fullscreen { return TOK_FULLSCREEN; }
global { return TOK_GLOBAL; }
layout { return TOK_LAYOUT; }

17
src/cmdparse.y
View File

@ -91,7 +91,7 @@ char *parse_cmd(const char *new) {
%}
%expect 4
%expect 5
%error-verbose
%lex-param { struct context *context }
@ -107,6 +107,8 @@ char *parse_cmd(const char *new) {
%token TOK_RELOAD "reload"
%token TOK_RESTART "restart"
%token TOK_KILL "kill"
%token TOK_WINDOW "window"
%token TOK_CLIENT "client"
%token TOK_FULLSCREEN "fullscreen"
%token TOK_GLOBAL "global"
%token TOK_LAYOUT "layout"
@ -161,6 +163,7 @@ char *parse_cmd(const char *new) {
%type <number> resize_px
%type <number> resize_way
%type <number> resize_tiling
%type <number> optional_kill_mode
%%
@ -398,24 +401,30 @@ focus:
;
kill:
TOK_KILL
TOK_KILL optional_kill_mode
{
owindow *current;
printf("killing!\n");
/* check if the match is empty, not if the result is empty */
if (match_is_empty(&current_match))
tree_close_con();
tree_close_con($2);
else {
TAILQ_FOREACH(current, &owindows, owindows) {
printf("matching: %p / %s\n", current->con, current->con->name);
tree_close(current->con, true, false);
tree_close(current->con, $2, false);
}
}
}
;
optional_kill_mode:
/* empty */ { $$ = KILL_WINDOW; }
| WHITESPACE TOK_WINDOW { $$ = KILL_WINDOW; }
| WHITESPACE TOK_CLIENT { $$ = KILL_CLIENT; }
;
workspace:
TOK_WORKSPACE WHITESPACE STR
{

2
src/con.c
View File

@ -885,7 +885,7 @@ static void con_on_remove_child(Con *con) {
int children = con_num_children(con);
if (children == 0) {
DLOG("Container empty, closing\n");
tree_close(con, false, false);
tree_close(con, DONT_KILL_WINDOW, false);
return;
}
}

4
src/floating.c
View File

@ -85,7 +85,7 @@ void floating_enable(Con *con, bool automatic) {
/* check if the parent container is empty and close it if so */
if ((con->parent->type == CT_CON || con->parent->type == CT_FLOATING_CON) && con_num_children(con->parent) == 0) {
DLOG("Old container empty after setting this child to floating, closing\n");
tree_close(con->parent, false, false);
tree_close(con->parent, DONT_KILL_WINDOW, false);
}
char *name;
@ -186,7 +186,7 @@ void floating_disable(Con *con, bool automatic) {
/* 2: kill parent container */
TAILQ_REMOVE(&(con->parent->parent->floating_head), con->parent, floating_windows);
TAILQ_REMOVE(&(con->parent->parent->focus_head), con->parent, focused);
tree_close(con->parent, false, false);
tree_close(con->parent, DONT_KILL_WINDOW, false);
/* 3: re-attach to the parent of the currently focused con on the workspace
* this floating con was on */

2
src/handlers.c
View File

@ -466,7 +466,7 @@ static int handle_unmap_notify_event(xcb_unmap_notify_event_t *event) {
return 1;
}
tree_close(con, false, false);
tree_close(con, DONT_KILL_WINDOW, false);
tree_render();
x_push_changes(croot);
return 1;

2
src/randr.c
View File

@ -709,7 +709,7 @@ void randr_query_outputs() {
}
DLOG("destroying disappearing con %p\n", output->con);
tree_close(output->con, false, true);
tree_close(output->con, DONT_KILL_WINDOW, true);
DLOG("Done. Should be fine now\n");
output->con = NULL;
}

16
src/tree.c
View File

@ -99,7 +99,7 @@ static bool _is_con_mapped(Con *con) {
* and the window is expected to kill itself.
*
*/
bool tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
bool tree_close(Con *con, kill_window_t kill_window, bool dont_kill_parent) {
bool was_mapped = con->mapped;
Con *parent = con->parent;
@ -133,8 +133,8 @@ bool tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
}
if (con->window != NULL) {
if (kill_window) {
x_window_kill(con->window->id);
if (kill_window != DONT_KILL_WINDOW) {
x_window_kill(con->window->id, kill_window);
return false;
} else {
/* un-parent the window */
@ -165,7 +165,7 @@ bool tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
if (con_is_floating(con)) {
Con *ws = con_get_workspace(con);
DLOG("Container was floating, killing floating container\n");
tree_close(parent, false, false);
tree_close(parent, DONT_KILL_WINDOW, false);
DLOG("parent container killed\n");
if (con == focused) {
DLOG("This is the focused container, i need to find another one to focus. I start looking at ws = %p\n", ws);
@ -192,7 +192,7 @@ bool tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
}
if (was_mapped || con == focused) {
if (kill_window || !dont_kill_parent || con == focused) {
if ((kill_window != DONT_KILL_WINDOW) || !dont_kill_parent || con == focused) {
DLOG("focusing %p / %s\n", next, next->name);
/* TODO: check if the container (or one of its children) was focused */
if (next->type == CT_DOCKAREA) {
@ -220,7 +220,7 @@ bool tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
* Closes the current container using tree_close().
*
*/
void tree_close_con() {
void tree_close_con(kill_window_t kill_window) {
assert(focused != NULL);
if (focused->type == CT_WORKSPACE) {
LOG("Cannot close workspace\n");
@ -232,7 +232,7 @@ void tree_close_con() {
assert(focused->type != CT_ROOT);
/* Kill con */
tree_close(focused, true, false);
tree_close(focused, kill_window, false);
}
/*
@ -463,7 +463,7 @@ void tree_flatten(Con *con) {
/* 4: close the redundant cons */
DLOG("closing redundant cons\n");
tree_close(con, false, true);
tree_close(con, DONT_KILL_WINDOW, true);
/* Well, we got to abort the recursion here because we destroyed the
* container. However, if tree_flatten() is called sufficiently often,

2
src/workspace.c
View File

@ -244,7 +244,7 @@ void workspace_show(const char *num) {
/* 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, false);
tree_close(old, DONT_KILL_WINDOW, false);
ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}");
changed_num_workspaces = true;
}

11
src/x.c
View File

@ -199,11 +199,16 @@ bool window_supports_protocol(xcb_window_t window, xcb_atom_t atom) {
* Kills the given X11 window using WM_DELETE_WINDOW (if supported).
*
*/
void x_window_kill(xcb_window_t window) {
void x_window_kill(xcb_window_t window, kill_window_t kill_window) {
/* if this window does not support WM_DELETE_WINDOW, we kill it the hard way */
if (!window_supports_protocol(window, A_WM_DELETE_WINDOW)) {
LOG("Killing window the hard way\n");
xcb_kill_client(conn, window);
if (kill_window == KILL_WINDOW) {
LOG("Killing specific window 0x%08x\n", window);
xcb_destroy_window(conn, window);
} else {
LOG("Killing the X11 client which owns window 0x%08x\n", window);
xcb_kill_client(conn, window);
}
return;
}