From d24413a75d3a6335fb20fb3a11c7c88244494f91 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 26 Oct 2007 19:47:54 +0200 Subject: [PATCH] rename resize() to client_resize() --- client.c | 4 ++-- client.h | 2 +- event.c | 4 ++-- layout.c | 4 ++-- layouts/floating.c | 2 +- layouts/max.c | 2 +- layouts/tile.c | 4 ++-- screen.c | 2 +- tag.c | 12 ++++++------ 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/client.c b/client.c index 29bd9ce7..50791399 100644 --- a/client.c +++ b/client.c @@ -369,7 +369,7 @@ manage(Window w, XWindowAttributes *wa, awesome_config *awesomeconf) } void -resize(Client *c, int x, int y, int w, int h, awesome_config *awesomeconf, Bool sizehints) +client_resize(Client *c, int x, int y, int w, int h, awesome_config *awesomeconf, Bool sizehints) { double dx, dy, max, min, ratio; XWindowChanges wc; @@ -705,7 +705,7 @@ uicb_moveresize(awesome_config *awesomeconf, oh = (*awesomeconf->client_sel)->h; Bool xqp = XQueryPointer(awesomeconf->display, RootWindow(awesomeconf->display, awesomeconf->phys_screen), &dummy, &dummy, &mx, &my, &dx, &dy, &dui); - resize(*awesomeconf->client_sel, nx, ny, nw, nh, awesomeconf, True); + client_resize(*awesomeconf->client_sel, nx, ny, nw, nh, awesomeconf, True); if (xqp && ox <= mx && (ox + ow) >= mx && oy <= my && (oy + oh) >= my) { nmx = mx - ox + (*awesomeconf->client_sel)->w - ow - 1 < 0 ? 0 : mx - ox + (*awesomeconf->client_sel)->w - ow - 1; diff --git a/client.h b/client.h index 21b2f288..2e8111d7 100644 --- a/client.h +++ b/client.h @@ -31,7 +31,7 @@ void client_reattach_after(Client *, Client *); void ban(Client *); void focus(Client *, Bool, awesome_config *); void manage(Window, XWindowAttributes *, awesome_config *); -void resize(Client *, int, int, int, int, awesome_config *, Bool); +void client_resize(Client *, int, int, int, int, awesome_config *, Bool); void unban(Client *); void unmanage(Client *, long, awesome_config *); inline void updatesizehints(Client *); diff --git a/event.c b/event.c index 609aec94..16a7d284 100644 --- a/event.c +++ b/event.c @@ -86,7 +86,7 @@ movemouse(Client * c, awesome_config *awesomeconf) ny = si[c->screen].y_org; else if(abs((si[c->screen].y_org + si[c->screen].height) - (ny + c->h + 2 * c->border)) < awesomeconf[c->screen].snap) ny = si[c->screen].y_org + si[c->screen].height - c->h - 2 * c->border; - resize(c, nx, ny, c->w, c->h, &awesomeconf[c->screen], False); + client_resize(c, nx, ny, c->w, c->h, &awesomeconf[c->screen], False); break; } } @@ -131,7 +131,7 @@ resizemouse(Client * c, awesome_config *awesomeconf) nw = 1; if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0) nh = 1; - resize(c, c->x, c->y, nw, nh, &awesomeconf[c->screen], True); + client_resize(c, c->x, c->y, nw, nh, &awesomeconf[c->screen], True); break; } } diff --git a/layout.c b/layout.c index 54b8b475..e96093ed 100644 --- a/layout.c +++ b/layout.c @@ -247,10 +247,10 @@ maximize(int x, int y, int w, int h, awesome_config *awesomeconf) sel->ry = sel->y; sel->rw = sel->w; sel->rh = sel->h; - resize(sel, x, y, w, h, awesomeconf, True); + client_resize(sel, x, y, w, h, awesomeconf, True); } else if(sel->wasfloating) - resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, awesomeconf, True); + client_resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, awesomeconf, True); else sel->isfloating = False; diff --git a/layouts/floating.c b/layouts/floating.c index 1708ff6e..293ce345 100644 --- a/layouts/floating.c +++ b/layouts/floating.c @@ -29,6 +29,6 @@ layout_floating(awesome_config *awesomeconf) for(c = *awesomeconf->clients; c; c = c->next) if(isvisible(c, awesomeconf->screen, awesomeconf->tags, awesomeconf->ntags)) - resize(c, c->rx, c->ry, c->rw, c->rh, awesomeconf, True); + client_resize(c, c->rx, c->ry, c->rw, c->rh, awesomeconf, True); } // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 diff --git a/layouts/max.c b/layouts/max.c index deeca76e..f955160a 100644 --- a/layouts/max.c +++ b/layouts/max.c @@ -32,7 +32,7 @@ layout_max(awesome_config *awesomeconf) for(c = *awesomeconf->clients; c; c = c->next) if(IS_TILED(c, awesomeconf->screen, awesomeconf->tags, awesomeconf->ntags)) - resize(c, si[awesomeconf->screen].x_org, si[awesomeconf->screen].y_org, + client_resize(c, si[awesomeconf->screen].x_org, si[awesomeconf->screen].y_org, si[awesomeconf->screen].width - 2 * c->border, si[awesomeconf->screen].height - 2 * c->border, awesomeconf, awesomeconf->resize_hints); p_delete(&si); diff --git a/layouts/tile.c b/layouts/tile.c index c877295f..0e9ac450 100644 --- a/layouts/tile.c +++ b/layouts/tile.c @@ -138,7 +138,7 @@ _tile(awesome_config *awesomeconf, const Bool right) { /* master */ ny = way + i * mh; nx = wax + (right ? 0 : waw - mw); - resize(c, nx, ny, mw - 2 * c->border, mh - 2 * c->border, awesomeconf, awesomeconf->resize_hints); + client_resize(c, nx, ny, mw - 2 * c->border, mh - 2 * c->border, awesomeconf, awesomeconf->resize_hints); } else { /* tile window */ @@ -164,7 +164,7 @@ _tile(awesome_config *awesomeconf, const Bool right) ny = way + ((i - awesomeconf->nmaster) % win_by_col) * (nh + 2 * c->border); nx = wax + current_col * (nw + 2 * c->border) + (right ? mw : 0); - resize(c, nx, ny, nw, nh, awesomeconf, awesomeconf->resize_hints); + client_resize(c, nx, ny, nw, nh, awesomeconf, awesomeconf->resize_hints); } i++; } diff --git a/screen.c b/screen.c index 3e5381ca..83b5d5e0 100644 --- a/screen.c +++ b/screen.c @@ -183,7 +183,7 @@ move_client_to_screen(Client *c, awesome_config *acf_new, Bool doresize) if(c->ry >= si[c->screen].y_org + si[c->screen].height) c->ry = si[c->screen].y_org - c->rh; - resize(c, c->rx, c->ry, c->rw, c->rh, acf_new, True); + client_resize(c, c->rx, c->ry, c->rw, c->rh, acf_new, True); p_delete(&si); p_delete(&si_old); diff --git a/tag.c b/tag.c index 67ce567f..9d5833e9 100644 --- a/tag.c +++ b/tag.c @@ -174,12 +174,12 @@ uicb_togglefloating(awesome_config * awesomeconf, (*awesomeconf->client_sel)->isfloating = !(*awesomeconf->client_sel)->isfloating; - resize(*awesomeconf->client_sel, - (*awesomeconf->client_sel)->rx, - (*awesomeconf->client_sel)->ry, - (*awesomeconf->client_sel)->rw, - (*awesomeconf->client_sel)->rh, - awesomeconf, True); + client_resize(*awesomeconf->client_sel, + (*awesomeconf->client_sel)->rx, + (*awesomeconf->client_sel)->ry, + (*awesomeconf->client_sel)->rw, + (*awesomeconf->client_sel)->rh, + awesomeconf, True); client_untab(*awesomeconf->client_sel); saveprops(*awesomeconf->client_sel, awesomeconf->ntags);