awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename tileup/down to top/bottom

This commit is contained in:
Julien Danjou 2008-01-17 17:04:40 +01:00
parent 602d593af0
commit 0940f2f81a
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -145,12 +145,12 @@ dist_iconslayouts_DATA += icons/layouts/maxw.png
dist_iconslayouts_DATA += icons/layouts/spiral.png dist_iconslayouts_DATA += icons/layouts/spiral.png
dist_iconslayouts_DATA += icons/layouts/spiralw.png dist_iconslayouts_DATA += icons/layouts/spiralw.png
dist_iconslayouts_DATA += icons/layouts/tile.png dist_iconslayouts_DATA += icons/layouts/tile.png
dist_iconslayouts_DATA += icons/layouts/tiledown.png dist_iconslayouts_DATA += icons/layouts/tilebottom.png
dist_iconslayouts_DATA += icons/layouts/tiledownw.png dist_iconslayouts_DATA += icons/layouts/tilebottomw.png
dist_iconslayouts_DATA += icons/layouts/tileleft.png dist_iconslayouts_DATA += icons/layouts/tileleft.png
dist_iconslayouts_DATA += icons/layouts/tileleftw.png dist_iconslayouts_DATA += icons/layouts/tileleftw.png
dist_iconslayouts_DATA += icons/layouts/tileup.png dist_iconslayouts_DATA += icons/layouts/tiletop.png
dist_iconslayouts_DATA += icons/layouts/tileupw.png dist_iconslayouts_DATA += icons/layouts/tiletopw.png
dist_iconslayouts_DATA += icons/layouts/tilew.png dist_iconslayouts_DATA += icons/layouts/tilew.png
clean-local: clean-local:

4
awesomerc.1.txt
View File

@ -343,7 +343,7 @@ screen <integer> [MULTI]
tag <identifier> [MULTI] tag <identifier> [MULTI]
{ {
layout = <{dwindle,floating,max, layout = <{dwindle,floating,max,
spiral,tile,tileleft,tiledown,tileup}> spiral,tile,tileleft,tilebottom,tiletop}>
mwfact = <float> mwfact = <float>
nmaster = <integer> nmaster = <integer>
} }
@ -352,7 +352,7 @@ screen <integer> [MULTI]
{ {
layout <{dwindle,floating,max, layout <{dwindle,floating,max,
spiral,tile,tileleft, spiral,tile,tileleft,
tiledown,tileup}> { image = <image> } [MULTI] tilebottom,tiletop}> { image = <image> } [MULTI]
} }
colors colors
{ {

4
awesomerc.in
View File

@ -16,8 +16,8 @@ screen 0
{ {
layout tile { image = "@iconslayoutsdir@/tilew.png" } layout tile { image = "@iconslayoutsdir@/tilew.png" }
layout tileleft { image = "@iconslayoutsdir@/tileleftw.png" } layout tileleft { image = "@iconslayoutsdir@/tileleftw.png" }
layout tiledown { image = "@iconslayoutsdir@/tiledownw.png" } layout tilebottom { image = "@iconslayoutsdir@/tilebottomw.png" }
layout tileup { image = "@iconslayoutsdir@/tileupw.png" } layout tiletop { image = "@iconslayoutsdir@/tiletopw.png" }
layout max { image = "@iconslayoutsdir@/maxw.png" } layout max { image = "@iconslayoutsdir@/maxw.png" }
layout spiral { image = "@iconslayoutsdir@/spiralw.png" } layout spiral { image = "@iconslayoutsdir@/spiralw.png" }
layout dwindle { image = "@iconslayoutsdir@/dwindlew.png" } layout dwindle { image = "@iconslayoutsdir@/dwindlew.png" }

0
icons/layouts/tiledown.png → icons/layouts/tilebottom.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

0
icons/layouts/tiledownw.png → icons/layouts/tilebottomw.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 241 B

After

Width:  |  Height:  |  Size: 241 B

0
icons/layouts/tileup.png → icons/layouts/tiletop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

0
icons/layouts/tileupw.png → icons/layouts/tiletopw.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 238 B

18
layouts/tile.c
View File

@ -39,8 +39,8 @@ uicb_tag_setnmaster(int screen, char * arg)
if(!arg || (curlay->arrange != layout_tile if(!arg || (curlay->arrange != layout_tile
&& curlay->arrange != layout_tileleft && curlay->arrange != layout_tileleft
&& curlay->arrange != layout_tiledown && curlay->arrange != layout_tilebottom
&& curlay->arrange != layout_tileup)) && curlay->arrange != layout_tiletop))
return; return;
if((curtags[0]->nmaster = (int) compute_new_value_from_arg(arg, (double) curtags[0]->nmaster)) < 0) if((curtags[0]->nmaster = (int) compute_new_value_from_arg(arg, (double) curtags[0]->nmaster)) < 0)
@ -59,8 +59,8 @@ uicb_tag_setncol(int screen, char * arg)
if(!arg || (curlay->arrange != layout_tile if(!arg || (curlay->arrange != layout_tile
&& curlay->arrange != layout_tileleft && curlay->arrange != layout_tileleft
&& curlay->arrange != layout_tiledown && curlay->arrange != layout_tilebottom
&& curlay->arrange != layout_tileup)) && curlay->arrange != layout_tiletop))
return; return;
if((curtags[0]->ncol = (int) compute_new_value_from_arg(arg, (double) curtags[0]->ncol)) < 1) if((curtags[0]->ncol = (int) compute_new_value_from_arg(arg, (double) curtags[0]->ncol)) < 1)
@ -80,12 +80,12 @@ uicb_tag_setmwfact(int screen, char *arg)
if(!arg || (curlay->arrange != layout_tile if(!arg || (curlay->arrange != layout_tile
&& curlay->arrange != layout_tileleft && curlay->arrange != layout_tileleft
&& curlay->arrange != layout_tiledown && curlay->arrange != layout_tilebottom
&& curlay->arrange != layout_tileup)) && curlay->arrange != layout_tiletop))
return; return;
newarg = a_strdup(arg); newarg = a_strdup(arg);
if(curlay->arrange == layout_tileleft || curlay->arrange == layout_tileup) if(curlay->arrange == layout_tileleft || curlay->arrange == layout_tiletop)
{ {
if(newarg[0] == '+') if(newarg[0] == '+')
newarg[0] = '-'; newarg[0] = '-';
@ -242,13 +242,13 @@ layout_tileleft(int screen)
} }
void void
layout_tiledown(int screen) layout_tilebottom(int screen)
{ {
_tile(screen, True, False); _tile(screen, True, False);
} }
void void
layout_tileup(int screen) layout_tiletop(int screen)
{ {
_tile(screen, False, False); _tile(screen, False, False);
} }

4
layouts/tile.h
View File

@ -27,8 +27,8 @@
LayoutArrange layout_tile; LayoutArrange layout_tile;
LayoutArrange layout_tileleft; LayoutArrange layout_tileleft;
LayoutArrange layout_tiledown; LayoutArrange layout_tilebottom;
LayoutArrange layout_tileup; LayoutArrange layout_tiletop;
Uicb uicb_tag_setnmaster; Uicb uicb_tag_setnmaster;
Uicb uicb_tag_setncol; Uicb uicb_tag_setncol;

10
mouse.c
View File

@ -139,7 +139,7 @@ uicb_client_resizemouse(int screen, char *arg __attribute__ ((unused)))
c->ismax = False; c->ismax = False;
} }
else if (layout->arrange == layout_tile || layout->arrange == layout_tileleft else if (layout->arrange == layout_tile || layout->arrange == layout_tileleft
|| layout->arrange == layout_tiledown || layout->arrange == layout_tileup) || layout->arrange == layout_tilebottom || layout->arrange == layout_tiletop)
{ {
for(n = 0, c = globalconf.clients; c; c = c->next) for(n = 0, c = globalconf.clients; c; c = c->next)
if(IS_TILED(c, screen)) if(IS_TILED(c, screen))
@ -166,9 +166,9 @@ uicb_client_resizemouse(int screen, char *arg __attribute__ ((unused)))
if(curtags[0]->layout->arrange == layout_tileleft) if(curtags[0]->layout->arrange == layout_tileleft)
XWarpPointer(globalconf.display, None, c->win, 0, 0, 0, 0, 0, c->geometry.height + c->border - 1); XWarpPointer(globalconf.display, None, c->win, 0, 0, 0, 0, 0, c->geometry.height + c->border - 1);
else if(curtags[0]->layout->arrange == layout_tiledown) else if(curtags[0]->layout->arrange == layout_tilebottom)
XWarpPointer(globalconf.display, None, c->win, 0, 0, 0, 0, c->geometry.width + c->border - 1, c->geometry.height + c->border - 1); XWarpPointer(globalconf.display, None, c->win, 0, 0, 0, 0, c->geometry.width + c->border - 1, c->geometry.height + c->border - 1);
else if(curtags[0]->layout->arrange == layout_tileup) else if(curtags[0]->layout->arrange == layout_tiletop)
XWarpPointer(globalconf.display, None, c->win, 0, 0, 0, 0, c->geometry.width + c->border - 1, 0); XWarpPointer(globalconf.display, None, c->win, 0, 0, 0, 0, c->geometry.width + c->border - 1, 0);
else else
XWarpPointer(globalconf.display, None, c->win, 0, 0, 0, 0, c->geometry.width + c->border - 1, c->geometry.height + c->border - 1); XWarpPointer(globalconf.display, None, c->win, 0, 0, 0, 0, c->geometry.width + c->border - 1, c->geometry.height + c->border - 1);
@ -202,13 +202,13 @@ uicb_client_resizemouse(int screen, char *arg __attribute__ ((unused)))
client_resize(c, geometry, True); client_resize(c, geometry, True);
} }
else if(layout->arrange == layout_tile || layout->arrange == layout_tileleft else if(layout->arrange == layout_tile || layout->arrange == layout_tileleft
|| layout->arrange == layout_tileup || layout->arrange == layout_tiledown) || layout->arrange == layout_tiletop || layout->arrange == layout_tilebottom)
{ {
if(layout->arrange == layout_tile) if(layout->arrange == layout_tile)
mwfact = (double) (ev.xmotion.x - area.x) / area.width; mwfact = (double) (ev.xmotion.x - area.x) / area.width;
else if(curtags[0]->layout->arrange == layout_tileleft) else if(curtags[0]->layout->arrange == layout_tileleft)
mwfact = 1 - (double) (ev.xmotion.x - area.x) / area.width; mwfact = 1 - (double) (ev.xmotion.x - area.x) / area.width;
else if(curtags[0]->layout->arrange == layout_tiledown) else if(curtags[0]->layout->arrange == layout_tilebottom)
mwfact = (double) (ev.xmotion.y - area.y) / area.height; mwfact = (double) (ev.xmotion.y - area.y) / area.height;
else else
mwfact = 1 - (double) (ev.xmotion.y - area.y) / area.height; mwfact = 1 - (double) (ev.xmotion.y - area.y) / area.height;