From d9298f6edb3eabbf9a1a0f0d75a2e22cdcf4c5fd Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 29 Jan 2008 08:31:13 +0100 Subject: [PATCH] rename get_current_tags to tags_get_current() --- client.c | 2 +- ewmh.c | 2 +- focus.c | 6 +++--- layout.c | 4 ++-- layouts/tile.c | 8 ++++---- mouse.c | 2 +- tag.c | 6 +++--- tag.h | 2 +- widgets/layoutinfo.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/client.c b/client.c index caaf5c5d..b2e4cc6a 100644 --- a/client.c +++ b/client.c @@ -799,7 +799,7 @@ uicb_client_moveresize(int screen, char *arg) Window dummy; Area area; Client *sel = globalconf.focus->client; - Tag **curtags = get_current_tags(screen); + Tag **curtags = tags_get_current(screen); if(curtags[0]->layout->arrange != layout_floating) if(!sel || !sel->isfloating || sel->isfixed || !arg) diff --git a/ewmh.c b/ewmh.c index 984a1779..71d17e97 100644 --- a/ewmh.c +++ b/ewmh.c @@ -183,7 +183,7 @@ void ewmh_update_net_current_desktop(int phys_screen) { CARD32 count = 0; - Tag *tag, **curtags = get_current_tags(phys_screen); + Tag *tag, **curtags = tags_get_current(phys_screen); for(tag = globalconf.screens[phys_screen].tags; tag != curtags[0]; tag = tag->next) count++; diff --git a/focus.c b/focus.c index 40a4232b..836221b6 100644 --- a/focus.c +++ b/focus.c @@ -91,7 +91,7 @@ focus_get_latest_client_for_tags(Tag **t, int nindex) Client * focus_get_current_client(int screen) { - Tag **curtags = get_current_tags(screen); + Tag **curtags = tags_get_current(screen); Client *sel = focus_get_latest_client_for_tags(curtags, 0); p_delete(&curtags); @@ -116,7 +116,7 @@ uicb_focus_history(int screen, char *arg) if(i < 0) { - curtags = get_current_tags(screen); + curtags = tags_get_current(screen); c = focus_get_latest_client_for_tags(curtags, i); p_delete(&curtags); if(c) @@ -133,7 +133,7 @@ uicb_focus_client_byname(int screen, char *arg) if(arg) { - curtags = get_current_tags(screen); + curtags = tags_get_current(screen); if((c = client_get_byname(globalconf.clients, arg))) for(tag = curtags; *tag; tag++) if(is_client_tagged(c, *tag)) diff --git a/layout.c b/layout.c index 51355718..d3102184 100644 --- a/layout.c +++ b/layout.c @@ -108,7 +108,7 @@ layout_refresh(void) Layout * get_current_layout(int screen) { - Tag **curtags = get_current_tags(screen); + Tag **curtags = tags_get_current(screen); Layout *l = curtags[0]->layout; p_delete(&curtags); return l; @@ -172,7 +172,7 @@ uicb_tag_setlayout(int screen, char *arg) if(arg) { - curtags = get_current_tags(screen); + curtags = tags_get_current(screen); for(i = 0; l && l != curtags[0]->layout; i++, l = l->next); p_delete(&curtags); diff --git a/layouts/tile.c b/layouts/tile.c index 76fd0fd7..10b2c4e1 100644 --- a/layouts/tile.c +++ b/layouts/tile.c @@ -34,7 +34,7 @@ extern AwesomeConf globalconf; void uicb_tag_setnmaster(int screen, char * arg) { - Tag **curtags = get_current_tags(screen); + Tag **curtags = tags_get_current(screen); Layout *curlay = curtags[0]->layout; if(!arg || (curlay->arrange != layout_tile @@ -54,7 +54,7 @@ uicb_tag_setnmaster(int screen, char * arg) void uicb_tag_setncol(int screen, char * arg) { - Tag **curtags = get_current_tags(screen); + Tag **curtags = tags_get_current(screen); Layout *curlay = curtags[0]->layout; if(!arg || (curlay->arrange != layout_tile @@ -75,7 +75,7 @@ void uicb_tag_setmwfact(int screen, char *arg) { char *newarg; - Tag **curtags = get_current_tags(screen); + Tag **curtags = tags_get_current(screen); Layout *curlay = curtags[0]->layout; if(!arg || (curlay->arrange != layout_tile @@ -114,7 +114,7 @@ _tile(int screen, const Position position) int real_ncol = 1, win_by_col = 1, current_col = 0; Area area, geometry; Client *c; - Tag **curtags = get_current_tags(screen); + Tag **curtags = tags_get_current(screen); area = get_screen_area(screen, globalconf.screens[screen].statusbar, diff --git a/mouse.c b/mouse.c index 2d3e153f..85ad2764 100644 --- a/mouse.c +++ b/mouse.c @@ -151,7 +151,7 @@ uicb_client_resizemouse(int screen, char *arg __attribute__ ((unused))) int ocx = 0, ocy = 0, n; XEvent ev; Client *c = globalconf.focus->client; - Tag **curtags = get_current_tags(screen); + Tag **curtags = tags_get_current(screen); Layout *layout = curtags[0]->layout; Area area = { 0, 0, 0, 0 , NULL}, geometry; double mwfact; diff --git a/tag.c b/tag.c index 7ed97906..bb1bc503 100644 --- a/tag.c +++ b/tag.c @@ -153,7 +153,7 @@ tag_client_with_rule(Client *c, Rule *r) } Tag ** -get_current_tags(int screen) +tags_get_current(int screen) { Tag *tag, **tags = NULL; int n = 1; @@ -373,7 +373,7 @@ uicb_tag_prev_selected(int screen, char *arg __attribute__ ((unused))) void uicb_tag_viewnext(int screen, char *arg __attribute__ ((unused))) { - Tag *tag, **curtags = get_current_tags(screen); + Tag *tag, **curtags = tags_get_current(screen); tag = tag_list_next_cycle(&globalconf.screens[screen].tags, curtags[0]); @@ -391,7 +391,7 @@ uicb_tag_viewnext(int screen, char *arg __attribute__ ((unused))) void uicb_tag_viewprev(int screen, char *arg __attribute__ ((unused))) { - Tag *tag, **curtags = get_current_tags(screen); + Tag *tag, **curtags = tags_get_current(screen); tag = tag_list_prev_cycle(&globalconf.screens[screen].tags, curtags[0]); diff --git a/tag.h b/tag.h index 45cc84fc..14774796 100644 --- a/tag.h +++ b/tag.h @@ -31,7 +31,7 @@ Tag * tag_new(const char *, Layout *, double, int, int); void tag_view(Tag *, Bool); void tag_view_byindex(int, int, Bool); void tag_push_to_screen(Tag *, int); -Tag ** get_current_tags(int); +Tag ** tags_get_current(int); void tag_client(Client *, Tag *); void untag_client(Client *, Tag *); Bool is_client_tagged(Client *, Tag *); diff --git a/widgets/layoutinfo.c b/widgets/layoutinfo.c index d7dcc7b6..111aec27 100644 --- a/widgets/layoutinfo.c +++ b/widgets/layoutinfo.c @@ -33,7 +33,7 @@ layoutinfo_draw(Widget *widget, int offset, int used __attribute__ ((unused))) { - Tag **curtags = get_current_tags(widget->statusbar->screen); + Tag **curtags = tags_get_current(widget->statusbar->screen); Area area = draw_get_image_size(curtags[0]->layout->image); if(!widget->user_supplied_x)