From cc6dee994023b99c24ab577d85d8e397f0d6f069 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Wed, 28 Jan 2009 12:08:33 +0100 Subject: [PATCH] awful.layout.suit.vile: rename to tile Signed-off-by: Julien Danjou --- awesomerc.lua.in | 8 +++--- lib/awful/layout/init.lua.in | 8 +++--- lib/awful/layout/suit/init.lua.in | 2 +- .../layout/suit/{vile.lua.in => tile.lua.in} | 12 ++++----- lib/awful/mouse.lua.in | 24 +++++++++--------- themes/default/layouts/{vile.png => tile.png} | Bin .../{vilebottom.png => tilebottom.png} | Bin .../{vilebottomw.png => tilebottomw.png} | Bin .../layouts/{vileleft.png => tileleft.png} | Bin .../layouts/{vileleftw.png => tileleftw.png} | Bin .../layouts/{viletop.png => tiletop.png} | Bin .../layouts/{viletopw.png => tiletopw.png} | Bin .../default/layouts/{vilew.png => tilew.png} | Bin themes/default/theme.in | 8 +++--- themes/sky/layouts/{vile.png => tile.png} | Bin .../{vilebottom.png => tilebottom.png} | Bin .../layouts/{vileleft.png => tileleft.png} | Bin .../sky/layouts/{viletop.png => tiletop.png} | Bin themes/sky/theme.in | 8 +++--- 19 files changed, 35 insertions(+), 35 deletions(-) rename lib/awful/layout/suit/{vile.lua.in => tile.lua.in} (95%) rename themes/default/layouts/{vile.png => tile.png} (100%) rename themes/default/layouts/{vilebottom.png => tilebottom.png} (100%) rename themes/default/layouts/{vilebottomw.png => tilebottomw.png} (100%) rename themes/default/layouts/{vileleft.png => tileleft.png} (100%) rename themes/default/layouts/{vileleftw.png => tileleftw.png} (100%) rename themes/default/layouts/{viletop.png => tiletop.png} (100%) rename themes/default/layouts/{viletopw.png => tiletopw.png} (100%) rename themes/default/layouts/{vilew.png => tilew.png} (100%) rename themes/sky/layouts/{vile.png => tile.png} (100%) rename themes/sky/layouts/{vilebottom.png => tilebottom.png} (100%) rename themes/sky/layouts/{vileleft.png => tileleft.png} (100%) rename themes/sky/layouts/{viletop.png => tiletop.png} (100%) diff --git a/awesomerc.lua.in b/awesomerc.lua.in index 50958007..cc43e9ff 100644 --- a/awesomerc.lua.in +++ b/awesomerc.lua.in @@ -30,10 +30,10 @@ modkey = "Mod4" -- Table of layouts to cover with awful.layout.inc, order matters. layouts = { - awful.layout.suit.vile, - awful.layout.suit.vile.left, - awful.layout.suit.vile.bottom, - awful.layout.suit.vile.top, + awful.layout.suit.tile, + awful.layout.suit.tile.left, + awful.layout.suit.tile.bottom, + awful.layout.suit.tile.top, awful.layout.suit.fair, awful.layout.suit.fair.horizontal, awful.layout.suit.max, diff --git a/lib/awful/layout/init.lua.in b/lib/awful/layout/init.lua.in index 996c70d5..3f7a2fa0 100644 --- a/lib/awful/layout/init.lua.in +++ b/lib/awful/layout/init.lua.in @@ -64,10 +64,10 @@ end local layouts_name = { - [suit.vile] = "vile", - [suit.vile.left] = "vileleft", - [suit.vile.bottom] = "vilebottom", - [suit.vile.top] = "viletop", + [suit.tile] = "tile", + [suit.tile.left] = "tileleft", + [suit.tile.bottom] = "tilebottom", + [suit.tile.top] = "tiletop", [suit.fair] = "fairv", [suit.fair.horizontal] = "fairh", [suit.max] = "max", diff --git a/lib/awful/layout/suit/init.lua.in b/lib/awful/layout/suit/init.lua.in index c0329264..ae83edf4 100644 --- a/lib/awful/layout/suit/init.lua.in +++ b/lib/awful/layout/suit/init.lua.in @@ -1,5 +1,5 @@ require("awful.layout.suit.max") -require("awful.layout.suit.vile") +require("awful.layout.suit.tile") require("awful.layout.suit.fair") require("awful.layout.suit.floating") require("awful.layout.suit.magnifier") diff --git a/lib/awful/layout/suit/vile.lua.in b/lib/awful/layout/suit/tile.lua.in similarity index 95% rename from lib/awful/layout/suit/vile.lua.in rename to lib/awful/layout/suit/tile.lua.in index e3f1e5c2..9753ab6f 100644 --- a/lib/awful/layout/suit/vile.lua.in +++ b/lib/awful/layout/suit/tile.lua.in @@ -18,7 +18,7 @@ local capi = } --- Tiled layouts module for awful -module("awful.layout.suit.vile") +module("awful.layout.suit.tile") local function tile_group(cls, wa, orientation, fact, group) -- get our orientation right @@ -79,7 +79,7 @@ local function tile_group(cls, wa, orientation, fact, group) end -local function vile(_, screen, orientation) +local function tile(_, screen, orientation) orientation = orientation or "right" -- this handles are different orientations @@ -159,19 +159,19 @@ end --- The main tile algo, on left. -- @param screen The screen number to tile. function left(screen) - return vile(nil, screen, "left") + return tile(nil, screen, "left") end --- The main tile algo, on bottom. -- @param screen The screen number to tile. function bottom(screen) - return vile(nil, screen, "bottom") + return tile(nil, screen, "bottom") end --- The main tile algo, on top. -- @param screen The screen number to tile. function top(screen) - return vile(nil, screen, "top") + return tile(nil, screen, "top") end -setmetatable(_M, { __call = vile }) +setmetatable(_M, { __call = tile }) diff --git a/lib/awful/mouse.lua.in b/lib/awful/mouse.lua.in index bbddb5fb..29985372 100644 --- a/lib/awful/mouse.lua.in +++ b/lib/awful/mouse.lua.in @@ -349,14 +349,14 @@ local function client_resize_magnifier(c, corner) end, corner .. "_corner") end -local function client_resize_viled(c, lay) +local function client_resize_tiled(c, lay) local wa = capi.screen[c.screen].workarea local mwfact = tag.getmwfact() local cursor local g = c:geometry() local offset = 0 local x,y - if lay == layout.suit.vile then + if lay == layout.suit.tile then cursor = "cross" if g.height+15 > wa.height then offset = g.height * .5 @@ -365,7 +365,7 @@ local function client_resize_viled(c, lay) offset = g.height end capi.mouse.coords({ x = wa.x + wa.width * mwfact, y = g.y + offset }) - elseif lay == layout.suit.vile.left then + elseif lay == layout.suit.tile.left then cursor = "cross" if g.height+15 >= wa.height then offset = g.height * .5 @@ -374,7 +374,7 @@ local function client_resize_viled(c, lay) offset = g.height end capi.mouse.coords({ x = wa.x + wa.width * (1 - mwfact), y = g.y + offset }) - elseif lay == layout.suit.vile.bottom then + elseif lay == layout.suit.tile.bottom then cursor = "cross" if g.width+15 >= wa.width then offset = g.width * .5 @@ -420,13 +420,13 @@ local function client_resize_viled(c, lay) end - if lay == layout.suit.vile then + if lay == layout.suit.tile then mwfact = fact_x wfact = wfact_y - elseif lay == layout.suit.vile.left then + elseif lay == layout.suit.tile.left then mwfact = 1 - fact_x wfact = wfact_y - elseif lay == layout.suit.vile.bottom then + elseif lay == layout.suit.tile.bottom then mwfact = fact_y wfact = wfact_x else @@ -529,12 +529,12 @@ function client.resize(c, corner) if lay == layout.suit.floating or aclient.floating.get(c) then return client_resize_floating(c, corner, fixed_x, fixed_y) - elseif lay == layout.suit.vile - or lay == layout.suit.vile.left - or lay == layout.suit.vile.top - or lay == layout.suit.vile.bottom + elseif lay == layout.suit.tile + or lay == layout.suit.tile.left + or lay == layout.suit.tile.top + or lay == layout.suit.tile.bottom then - return client_resize_viled(c, lay) + return client_resize_tiled(c, lay) elseif lay == layout.suit.magnifier then return client_resize_magnifier(c, corner) end diff --git a/themes/default/layouts/vile.png b/themes/default/layouts/tile.png similarity index 100% rename from themes/default/layouts/vile.png rename to themes/default/layouts/tile.png diff --git a/themes/default/layouts/vilebottom.png b/themes/default/layouts/tilebottom.png similarity index 100% rename from themes/default/layouts/vilebottom.png rename to themes/default/layouts/tilebottom.png diff --git a/themes/default/layouts/vilebottomw.png b/themes/default/layouts/tilebottomw.png similarity index 100% rename from themes/default/layouts/vilebottomw.png rename to themes/default/layouts/tilebottomw.png diff --git a/themes/default/layouts/vileleft.png b/themes/default/layouts/tileleft.png similarity index 100% rename from themes/default/layouts/vileleft.png rename to themes/default/layouts/tileleft.png diff --git a/themes/default/layouts/vileleftw.png b/themes/default/layouts/tileleftw.png similarity index 100% rename from themes/default/layouts/vileleftw.png rename to themes/default/layouts/tileleftw.png diff --git a/themes/default/layouts/viletop.png b/themes/default/layouts/tiletop.png similarity index 100% rename from themes/default/layouts/viletop.png rename to themes/default/layouts/tiletop.png diff --git a/themes/default/layouts/viletopw.png b/themes/default/layouts/tiletopw.png similarity index 100% rename from themes/default/layouts/viletopw.png rename to themes/default/layouts/tiletopw.png diff --git a/themes/default/layouts/vilew.png b/themes/default/layouts/tilew.png similarity index 100% rename from themes/default/layouts/vilew.png rename to themes/default/layouts/tilew.png diff --git a/themes/default/theme.in b/themes/default/theme.in index ed15e6f4..a8b93331 100644 --- a/themes/default/theme.in +++ b/themes/default/theme.in @@ -56,9 +56,9 @@ layout_fairv = @AWESOME_THEMES_PATH@/default/layouts/fairvw.png layout_floating = @AWESOME_THEMES_PATH@/default/layouts/floatingw.png layout_magnifier = @AWESOME_THEMES_PATH@/default/layouts/magnifierw.png layout_max = @AWESOME_THEMES_PATH@/default/layouts/maxw.png -layout_vilebottom = @AWESOME_THEMES_PATH@/default/layouts/vilebottomw.png -layout_vileleft = @AWESOME_THEMES_PATH@/default/layouts/vileleftw.png -layout_vile = @AWESOME_THEMES_PATH@/default/layouts/vilew.png -layout_viletop = @AWESOME_THEMES_PATH@/default/layouts/viletopw.png +layout_tilebottom = @AWESOME_THEMES_PATH@/default/layouts/tilebottomw.png +layout_tileleft = @AWESOME_THEMES_PATH@/default/layouts/tileleftw.png +layout_tile = @AWESOME_THEMES_PATH@/default/layouts/tilew.png +layout_tiletop = @AWESOME_THEMES_PATH@/default/layouts/tiletopw.png awesome_icon = @AWESOME_ICON_PATH@/awesome16.png diff --git a/themes/sky/layouts/vile.png b/themes/sky/layouts/tile.png similarity index 100% rename from themes/sky/layouts/vile.png rename to themes/sky/layouts/tile.png diff --git a/themes/sky/layouts/vilebottom.png b/themes/sky/layouts/tilebottom.png similarity index 100% rename from themes/sky/layouts/vilebottom.png rename to themes/sky/layouts/tilebottom.png diff --git a/themes/sky/layouts/vileleft.png b/themes/sky/layouts/tileleft.png similarity index 100% rename from themes/sky/layouts/vileleft.png rename to themes/sky/layouts/tileleft.png diff --git a/themes/sky/layouts/viletop.png b/themes/sky/layouts/tiletop.png similarity index 100% rename from themes/sky/layouts/viletop.png rename to themes/sky/layouts/tiletop.png diff --git a/themes/sky/theme.in b/themes/sky/theme.in index d6b6e205..f0cb4378 100644 --- a/themes/sky/theme.in +++ b/themes/sky/theme.in @@ -27,10 +27,10 @@ layout_floating = @AWESOME_THEMES_PATH@/sky/layouts/floating.png layout_magnifier = @AWESOME_THEMES_PATH@/sky/layouts/magnifier.png layout_max = @AWESOME_THEMES_PATH@/sky/layouts/max.png layout_fullscreen = @AWESOME_THEMES_PATH@/sky/layouts/fullscreen.png -layout_vilebottom = @AWESOME_THEMES_PATH@/sky/layouts/vilebottom.png -layout_vileleft = @AWESOME_THEMES_PATH@/sky/layouts/vileleft.png -layout_vile = @AWESOME_THEMES_PATH@/sky/layouts/vile.png -layout_viletop = @AWESOME_THEMES_PATH@/sky/layouts/viletop.png +layout_tilebottom = @AWESOME_THEMES_PATH@/sky/layouts/tilebottom.png +layout_tileleft = @AWESOME_THEMES_PATH@/sky/layouts/tileleft.png +layout_tile = @AWESOME_THEMES_PATH@/sky/layouts/tile.png +layout_tiletop = @AWESOME_THEMES_PATH@/sky/layouts/tiletop.png awesome_icon = @AWESOME_THEMES_PATH@/sky/awesome-icon.png tasklist_floating_icon = @AWESOME_THEMES_PATH@/sky/layouts/floating.png