rename resize() to client_resize()
This commit is contained in:
parent
e646072312
commit
d24413a75d
4
client.c
4
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;
|
||||
|
|
2
client.h
2
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 *);
|
||||
|
|
4
event.c
4
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;
|
||||
}
|
||||
}
|
||||
|
|
4
layout.c
4
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;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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++;
|
||||
}
|
||||
|
|
2
screen.c
2
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);
|
||||
|
|
12
tag.c
12
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);
|
||||
|
|
Loading…
Reference in New Issue