From 0940f2f81ae03474c884a2ffa3bc6bb9e3b18862 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 17 Jan 2008 17:04:40 +0100 Subject: [PATCH] rename tileup/down to top/bottom --- Makefile.am | 8 ++++---- awesomerc.1.txt | 4 ++-- awesomerc.in | 4 ++-- .../layouts/{tiledown.png => tilebottom.png} | Bin .../{tiledownw.png => tilebottomw.png} | Bin icons/layouts/{tileup.png => tiletop.png} | Bin icons/layouts/{tileupw.png => tiletopw.png} | Bin layouts/tile.c | 18 +++++++++--------- layouts/tile.h | 4 ++-- mouse.c | 10 +++++----- 10 files changed, 24 insertions(+), 24 deletions(-) rename icons/layouts/{tiledown.png => tilebottom.png} (100%) rename icons/layouts/{tiledownw.png => tilebottomw.png} (100%) rename icons/layouts/{tileup.png => tiletop.png} (100%) rename icons/layouts/{tileupw.png => tiletopw.png} (100%) diff --git a/Makefile.am b/Makefile.am index de0a32f3..de16d8b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,12 +145,12 @@ dist_iconslayouts_DATA += icons/layouts/maxw.png dist_iconslayouts_DATA += icons/layouts/spiral.png dist_iconslayouts_DATA += icons/layouts/spiralw.png dist_iconslayouts_DATA += icons/layouts/tile.png -dist_iconslayouts_DATA += icons/layouts/tiledown.png -dist_iconslayouts_DATA += icons/layouts/tiledownw.png +dist_iconslayouts_DATA += icons/layouts/tilebottom.png +dist_iconslayouts_DATA += icons/layouts/tilebottomw.png dist_iconslayouts_DATA += icons/layouts/tileleft.png dist_iconslayouts_DATA += icons/layouts/tileleftw.png -dist_iconslayouts_DATA += icons/layouts/tileup.png -dist_iconslayouts_DATA += icons/layouts/tileupw.png +dist_iconslayouts_DATA += icons/layouts/tiletop.png +dist_iconslayouts_DATA += icons/layouts/tiletopw.png dist_iconslayouts_DATA += icons/layouts/tilew.png clean-local: diff --git a/awesomerc.1.txt b/awesomerc.1.txt index 87656a5d..d3331f35 100644 --- a/awesomerc.1.txt +++ b/awesomerc.1.txt @@ -343,7 +343,7 @@ screen [MULTI] tag [MULTI] { layout = <{dwindle,floating,max, - spiral,tile,tileleft,tiledown,tileup}> + spiral,tile,tileleft,tilebottom,tiletop}> mwfact = nmaster = } @@ -352,7 +352,7 @@ screen [MULTI] { layout <{dwindle,floating,max, spiral,tile,tileleft, - tiledown,tileup}> { image = } [MULTI] + tilebottom,tiletop}> { image = } [MULTI] } colors { diff --git a/awesomerc.in b/awesomerc.in index d0869000..8827faad 100644 --- a/awesomerc.in +++ b/awesomerc.in @@ -16,8 +16,8 @@ screen 0 { layout tile { image = "@iconslayoutsdir@/tilew.png" } layout tileleft { image = "@iconslayoutsdir@/tileleftw.png" } - layout tiledown { image = "@iconslayoutsdir@/tiledownw.png" } - layout tileup { image = "@iconslayoutsdir@/tileupw.png" } + layout tilebottom { image = "@iconslayoutsdir@/tilebottomw.png" } + layout tiletop { image = "@iconslayoutsdir@/tiletopw.png" } layout max { image = "@iconslayoutsdir@/maxw.png" } layout spiral { image = "@iconslayoutsdir@/spiralw.png" } layout dwindle { image = "@iconslayoutsdir@/dwindlew.png" } diff --git a/icons/layouts/tiledown.png b/icons/layouts/tilebottom.png similarity index 100% rename from icons/layouts/tiledown.png rename to icons/layouts/tilebottom.png diff --git a/icons/layouts/tiledownw.png b/icons/layouts/tilebottomw.png similarity index 100% rename from icons/layouts/tiledownw.png rename to icons/layouts/tilebottomw.png diff --git a/icons/layouts/tileup.png b/icons/layouts/tiletop.png similarity index 100% rename from icons/layouts/tileup.png rename to icons/layouts/tiletop.png diff --git a/icons/layouts/tileupw.png b/icons/layouts/tiletopw.png similarity index 100% rename from icons/layouts/tileupw.png rename to icons/layouts/tiletopw.png diff --git a/layouts/tile.c b/layouts/tile.c index e966ed2f..a6ed820d 100644 --- a/layouts/tile.c +++ b/layouts/tile.c @@ -39,8 +39,8 @@ uicb_tag_setnmaster(int screen, char * arg) if(!arg || (curlay->arrange != layout_tile && curlay->arrange != layout_tileleft - && curlay->arrange != layout_tiledown - && curlay->arrange != layout_tileup)) + && curlay->arrange != layout_tilebottom + && curlay->arrange != layout_tiletop)) return; 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 && curlay->arrange != layout_tileleft - && curlay->arrange != layout_tiledown - && curlay->arrange != layout_tileup)) + && curlay->arrange != layout_tilebottom + && curlay->arrange != layout_tiletop)) return; 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 && curlay->arrange != layout_tileleft - && curlay->arrange != layout_tiledown - && curlay->arrange != layout_tileup)) + && curlay->arrange != layout_tilebottom + && curlay->arrange != layout_tiletop)) return; 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] == '+') newarg[0] = '-'; @@ -242,13 +242,13 @@ layout_tileleft(int screen) } void -layout_tiledown(int screen) +layout_tilebottom(int screen) { _tile(screen, True, False); } void -layout_tileup(int screen) +layout_tiletop(int screen) { _tile(screen, False, False); } diff --git a/layouts/tile.h b/layouts/tile.h index 0e0ce205..c221b9f9 100644 --- a/layouts/tile.h +++ b/layouts/tile.h @@ -27,8 +27,8 @@ LayoutArrange layout_tile; LayoutArrange layout_tileleft; -LayoutArrange layout_tiledown; -LayoutArrange layout_tileup; +LayoutArrange layout_tilebottom; +LayoutArrange layout_tiletop; Uicb uicb_tag_setnmaster; Uicb uicb_tag_setncol; diff --git a/mouse.c b/mouse.c index 4ab93f2f..f112a532 100644 --- a/mouse.c +++ b/mouse.c @@ -139,7 +139,7 @@ uicb_client_resizemouse(int screen, char *arg __attribute__ ((unused))) c->ismax = False; } 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) 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) 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); - 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); else 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); } 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) mwfact = (double) (ev.xmotion.x - area.x) / area.width; else if(curtags[0]->layout->arrange == layout_tileleft) 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; else mwfact = 1 - (double) (ev.xmotion.y - area.y) / area.height;