Compare commits
3 Commits
06c25ff838
...
8d32587144
Author | SHA1 | Date | |
---|---|---|---|
8d32587144 | |||
a1c5adece5 | |||
53a41568b0 |
12
src/client.c
12
src/client.c
@ -207,16 +207,16 @@ void wm_client_focus_dir(Wm *wm, Client *c, int dir)
|
||||
|
||||
switch (dir) {
|
||||
case UP:
|
||||
wm_client_focus(wm, wm_client_get_dir_rel_c(c, dir));
|
||||
wm_client_focus(wm, wm_find_client_direction(c, dir));
|
||||
break;
|
||||
case DOWN:
|
||||
wm_client_focus(wm, wm_client_get_dir_rel_c(c, dir));
|
||||
wm_client_focus(wm, wm_find_client_direction(c, dir));
|
||||
break;
|
||||
case LEFT:
|
||||
wm_client_focus(wm, wm_client_get_dir_rel_c(c, dir));
|
||||
wm_client_focus(wm, wm_find_client_direction(c, dir));
|
||||
break;
|
||||
case RIGHT:
|
||||
wm_client_focus(wm, wm_client_get_dir_rel_c(c, dir));
|
||||
wm_client_focus(wm, wm_find_client_direction(c, dir));
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "wm: %s invalid direction: %d\n", __func__, dir);
|
||||
@ -231,7 +231,7 @@ void wm_client_swap_dir(Wm* wm, Client *c, int dir)
|
||||
TreeNode *client_node = wm_treenode_ptr_find_client_node(c->ws->tree, c);
|
||||
assert(client_node);
|
||||
|
||||
Client *client = wm_client_get_dir_rel_c(c, dir);
|
||||
Client *client = wm_find_client_direction(c, dir);
|
||||
if (!client)
|
||||
return;
|
||||
|
||||
@ -335,7 +335,7 @@ Atom wm_client_get_atom(Wm *wm, Client *c, const char *name, unsigned char **ato
|
||||
return type_ret;
|
||||
}
|
||||
|
||||
Client* wm_client_get_dir_rel_c(Client *c, int dir)
|
||||
Client* wm_find_client_direction(Client *c, int dir)
|
||||
{
|
||||
DEBUG_PRINT("%s c: %p\n", __func__, (void*)c)
|
||||
|
||||
|
@ -126,7 +126,7 @@ Atom wm_client_get_atom(Wm *wm, Client *c, const char *name, unsigned char **ato
|
||||
/**
|
||||
* Finds the client in the direction `dir` relative to `c`.
|
||||
*/
|
||||
Client* wm_client_get_dir_rel_c(Client *c, int dir);
|
||||
Client* wm_find_client_direction(Client *c, int dir);
|
||||
|
||||
/**
|
||||
* Returns the currently focused client.
|
||||
|
@ -507,14 +507,6 @@ static void test_wm_logentries_calculate_distances(void **state)
|
||||
|
||||
// TODO check node distances
|
||||
|
||||
free(entry->workspaces->nodes[2]->children->nodes[0]->client->name);
|
||||
free(entry->workspaces->nodes[2]->children->nodes[0]->client);
|
||||
|
||||
free(entry->workspaces->nodes[2]->children->nodes[1]->client->name);
|
||||
free(entry->workspaces->nodes[2]->children->nodes[1]->client);
|
||||
|
||||
wm_treenode_free(entry->workspaces->nodes[2]->children->nodes[0]);
|
||||
wm_treenode_free(entry->workspaces->nodes[2]->children->nodes[1]);
|
||||
wm_logentries_free(entries);
|
||||
wm_treenode_free(node);
|
||||
wm_treenode_free(child);
|
||||
|
6
src/wm.c
6
src/wm.c
@ -596,7 +596,11 @@ void wm_kb_spawn(Wm *wm, Arg *args)
|
||||
if (wm->display)
|
||||
close(ConnectionNumber(wm->display));
|
||||
setsid();
|
||||
execvp(args->sl[0], &(args->sl[1]));
|
||||
|
||||
int ret = execvp(args->sl[0], &(args->sl[1]));
|
||||
if (ret == -1) {
|
||||
fprintf(stderr, "wm: could not run %s: %s\n", args->sl[0], strerror(errno));
|
||||
}
|
||||
|
||||
exit(0);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user