jazzman/xoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove duplicated code

Browse Source
This commit is contained in:
seanpringle
2012-09-05 00:41:13 +10:00
parent 9e39572194
commit 7464b017be
2 changed files with 31 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proto.h
View File

@@ -26,10 +26,8 @@ Window spot_active(int spot, int mon, Window except);
void client_stack(client *c, stack *all, stack *raise); void client_stack(client *c, stack *all, stack *raise);
void client_raise(client *c); void client_raise(client *c);
void client_active(client *c); void client_active(client *c);
void find_or_start(char *class);
void window_listen(Window win); void window_listen(Window win);
void client_review(client *c); void client_review(client *c);
void raise_tag(unsigned long tag);
void client_set_tags(client *c); void client_set_tags(client *c);
void action_move(void *data, int num); void action_move(void *data, int num);
void action_focus(void *data, int num); void action_focus(void *data, int num);
@@ -40,7 +38,7 @@ void action_command(void *data, int num);
void action_find_or_start(void *data, int num); void action_find_or_start(void *data, int num);
void action_move_monitor(void *data, int num); void action_move_monitor(void *data, int num);
void action_focus_monitor(void *data, int num); void action_focus_monitor(void *data, int num);
void action_raise_tag(void *data, int num); void action_raise_tag(void *data, int tag);
void action_fullscreen(void *data, int num); void action_fullscreen(void *data, int num);
void action_above(void *data, int num); void action_above(void *data, int num);
void action_tag(void *data, int num); void action_tag(void *data, int num);

70
xoat.c
View File

@@ -545,24 +545,6 @@ void client_active(client *c)
client_review(c); client_review(c);
} }
// real simple switcher/launcher
void find_or_start(char *class)
{
int i; client *c;
stack all; windows_visible(&all);
for (i = 0; i < all.depth; i++)
{
if ((c = all.clients[i]) && c->manage && !strcasecmp(c->class, class))
{
client_raise(c);
client_active(c);
return;
}
}
exec_cmd(class);
}
// client events we care about // client events we care about
void window_listen(Window win) void window_listen(Window win)
{ {
@@ -578,25 +560,6 @@ void client_review(client *c)
XSetWindowBorderWidth(display, c->window, client_state(c, atoms[_NET_WM_STATE_FULLSCREEN]) ? 0: BORDER); XSetWindowBorderWidth(display, c->window, client_state(c, atoms[_NET_WM_STATE_FULLSCREEN]) ? 0: BORDER);
} }
void raise_tag(unsigned long tag)
{
int i; client *c = NULL, *t = NULL;
stack all; windows_visible(&all);
for (i = all.depth-1; i > -1; i--)
{
if ((c = all.clients[i]) && c->manage && c->visible && c->tags & tag)
{
if (c->monitor == current_mon && c->spot == current_spot) t = c;
client_raise(c);
}
}
if (t) client_active(t);
unsigned long desktop = tag & TAG2 ? 1: (tag & TAG3 ? 2: 0);
window_set_cardinal_prop(root, atoms[_NET_CURRENT_DESKTOP], &desktop, 1);
}
void client_set_tags(client *c) void client_set_tags(client *c)
{ {
unsigned long tags = c->tags; unsigned long tags = c->tags;
@@ -644,9 +607,22 @@ void action_command(void *data, int num)
exec_cmd(data); exec_cmd(data);
} }
// real simple switcher/launcher
void action_find_or_start(void *data, int num) void action_find_or_start(void *data, int num)
{ {
find_or_start(data); int i; client *c; char *class = data;
stack all; windows_visible(&all);
for (i = 0; i < all.depth; i++)
{
if ((c = all.clients[i]) && c->manage && !strcasecmp(c->class, class))
{
client_raise(c);
client_active(c);
return;
}
}
exec_cmd(class);
} }
void action_move_monitor(void *data, int num) void action_move_monitor(void *data, int num)
@@ -670,9 +646,23 @@ void action_focus_monitor(void *data, int num)
if (spot_active(SPOT3, mon, None)) return; if (spot_active(SPOT3, mon, None)) return;
} }
void action_raise_tag(void *data, int num) void action_raise_tag(void *data, int tag)
{ {
raise_tag(num); int i; client *c = NULL, *t = NULL;
stack all; windows_visible(&all);
for (i = all.depth-1; i > -1; i--)
{
if ((c = all.clients[i]) && c->manage && c->visible && c->tags & tag)
{
if (c->monitor == current_mon && c->spot == current_spot) t = c;
client_raise(c);
}
}
if (t) client_active(t);
unsigned long desktop = tag & TAG2 ? 1: (tag & TAG3 ? 2: 0);
window_set_cardinal_prop(root, atoms[_NET_CURRENT_DESKTOP], &desktop, 1);
} }
void action_fullscreen(void *data, int num) void action_fullscreen(void *data, int num)