From: martin f. krafft Date: Sat, 9 Aug 2008 20:17:21 +0000 (-0300) Subject: follow config changes X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/311e3834c913999f702be34f7f813b18f3ef14e5 follow config changes Signed-off-by: martin f. krafft --- diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index b819f02..f7a4bd0 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -6,11 +6,12 @@ package.path = AWESOME_DATADIR .. "/lib/?.lua;" .. package.path -- Include awesome library, with lots of useful function! require("awful") require("tabulous") - --- Uncomment this to activate autotabbing --- tabulous.autotab_start() +require("beautiful") -- {{{ Variable definitions +-- This is a file path to a theme file which will defines colors. +theme_path = AWESOME_DATADIR .. "/themes/default" + -- This is used later as the default terminal to run. terminal = "x-terminal-emulator" @@ -28,17 +29,21 @@ layouts = "tileleft", "tilebottom", "tiletop", - "magnifier", +-- "magnifier", "max", - "spiral", - "dwindle", +-- "spiral", +-- "dwindle", "floating" } --- Table of clients that should be set floating -floatings = +-- Table of clients that should be set floating. The index may be either +-- the application class or instance. The instance is useful when running +-- a console app in a terminal like (Music on Console) +-- xterm -name mocp -e mocp +floatapps = { - ["mplayer"] = true, + -- by class + ["MPlayer"] = true, ["pinentry"] = true, ["GIMP"] = true, ["twinkle"] = true, @@ -46,37 +51,44 @@ floatings = ["Play stream"] = true } --- Color & Appearance definitions, we use these later to display things -font = "RotisSansSerif 10" -border_width = 1 +-- Applications to be moved to a pre-defined tag by class or instance. +-- Use the screen and workspace indices. +apptags = +{ + ["Firefox"] = { screen = 1, tag = 9 }, + ["jpilot"] = { screen = 1, tag = 8 }, +} -bg_normal = "#222222" -fg_normal = "#aaaaaa" -border_normal = "#000000" +-- Define if we want to use titlebar on all applications. +use_titlebar = false +-- }}} -bg_focus = "#535d6c" -fg_focus = "#ffffff" -border_focus = bg_focus -border_marked = "#91231C" +-- {{{ Initialization +-- Initialize theme (colors). +beautiful.init(theme_path) -awesome.font_set(font) -awesome.colors_set({ fg = fg_normal, bg = bg_normal }) +-- Register theme in awful. +-- This allows to not pass plenty of arguments to each function +-- to inform it about colors we want it to draw. +awful.beautiful.register(beautiful) +-- Uncomment this to activate autotabbing +-- tabulous.autotab_start() -- }}} -- {{{ Tags --- Define tags table +-- Define tags table. tags = {} for s = 1, screen.count() do - -- Each screen has its own tag table + -- Each screen has its own tag table. tags[s] = {} - -- Create 9 tags per screen + -- Create 9 tags per screen. for tagnumber = 1, 9 do tags[s][tagnumber] = tag({ name = tagnumber, layout = layouts[1] }) -- Add tags to screen one by one -- split at 0.5/50% exactly tags[s][tagnumber].mwfact = 0.5 - tags[s][tagnumber]:add(s) + tags[s][tagnumber].screen = s end -- I'm sure you want to see at least one tag. tags[s][1].selected = true @@ -92,33 +104,14 @@ mytaglist:mouse_add(mouse({}, 3, function (object, tag) tag.selected = not tag.s mytaglist:mouse_add(mouse({ modkey }, 3, function (object, tag) awful.client.toggletag(tag) end)) mytaglist:mouse_add(mouse({ }, 4, awful.tag.viewnext)) mytaglist:mouse_add(mouse({ }, 5, awful.tag.viewprev)) -function mytaglist.label(t) - local text = "" - if t.selected then - text = " "..t.name.." " - else - text = " "..t.name.." " - end - return text -end +mytaglist.label = awful.widget.taglist.label.all -- Create a tasklist widget mytasklist = widget({ type = "tasklist", name = "mytasklist" }) mytasklist:mouse_add(mouse({ }, 1, function (object, c) c:focus_set(); c:raise() end)) -mytasklist:mouse_add(mouse({ }, 4, function () awful.client.focus(1) end)) -mytasklist:mouse_add(mouse({ }, 5, function () awful.client.focus(-1) end)) -function mytasklist.label(c) - local text = "" - if c.floating then - text = "" - end - if client.focus_get() == c then - text = text .. " "..c.name.." " - else - text = text .. " "..awful.escape(c.name).." " - end - return text -end +mytasklist:mouse_add(mouse({ }, 4, function () awful.client.focusbyidx(1) end)) +mytasklist:mouse_add(mouse({ }, 5, function () awful.client.focusbyidx(-1) end)) +mytasklist.label = awful.widget.tasklist.label.currenttags -- Create a textbox widget mytextbox = widget({ type = "textbox", name = "mytextbox", align = "right" }) @@ -149,16 +142,19 @@ end mystatusbar = {} for s = 1, screen.count() do mystatusbar[s] = statusbar({ position = "top", name = "mystatusbar" .. s, - fg = fg_normal, bg = bg_normal }) + fg = beautiful.fg_normal, bg = beautiful.bg_normal }) -- Add widgets to the statusbar - order matters - mystatusbar[s]:widget_add(mytaglist) - mystatusbar[s]:widget_add(mytasklist) - mystatusbar[s]:widget_add(mypromptbox) - mystatusbar[s]:widget_add(mytextbox) - mystatusbar[s]:widget_add(mylayoutbox[s]) - mystatusbar[s]:add(s) + mystatusbar[s].widgets = + { + mytaglist, + mytasklist, + mypromptbox, + mytextbox, + mylayoutbox[s], + s == screen.count() and mysystray or nil + } + mystatusbar[s].screen = s end -mystatusbar[screen.count()]:widget_add(mysystray) -- }}} -- {{{ Mouse bindings @@ -213,6 +209,7 @@ end keybinding({ modkey }, "Left", awful.tag.viewprev):add() keybinding({ modkey }, "Right", awful.tag.viewnext):add() +keybinding({ modkey }, "Escape", awful.tag.history.restore):add() -- Standard program keybinding({ modkey }, "Return", function () awful.spawn(terminal) end):add() @@ -221,9 +218,10 @@ keybinding({ modkey, "Control" }, "r", awesome.restart):add() keybinding({ modkey, "Shift" }, "q", awesome.quit):add() -- Client manipulation +keybinding({ modkey }, "m", awful.client.maximize):add() keybinding({ modkey, "Shift" }, "c", function () client.focus_get():kill() end):add() -keybinding({ modkey }, "j", function () awful.client.focus(1); client.focus_get():raise() end):add() -keybinding({ modkey }, "k", function () awful.client.focus(-1); client.focus_get():raise() end):add() +keybinding({ modkey }, "j", function () awful.client.focusbyidx(1); client.focus_get():raise() end):add() +keybinding({ modkey }, "k", function () awful.client.focusbyidx(-1); client.focus_get():raise() end):add() keybinding({ modkey, "Shift" }, "j", function () awful.client.swap(1) end):add() keybinding({ modkey, "Shift" }, "k", function () awful.client.swap(-1) end):add() keybinding({ modkey, "Control" }, "j", function () awful.screen.focus(1) end):add() @@ -231,6 +229,7 @@ keybinding({ modkey, "Control" }, "k", function () awful.screen.focus(-1) end):a keybinding({ modkey, "Control" }, "space", awful.client.togglefloating):add() keybinding({ modkey, "Control" }, "Return", function () client.focus_get():swap(awful.client.master()) end):add() keybinding({ modkey }, "o", awful.client.movetoscreen):add() +keybinding({ modkey }, "Tab", awful.client.focus.history.previous):add() -- Layout manipulation keybinding({ modkey }, "l", function () awful.tag.incmwfact(0.05) end):add() @@ -244,10 +243,10 @@ keybinding({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, - -- Prompt keybinding({ modkey }, "F1", function () - awful.prompt({ prompt = "Run: ", cursor_fg = fg_focus, cursor_bg = bg_focus }, mypromptbox, awful.spawn, awful.completion.bash) + awful.prompt({ prompt = "Run: " }, mypromptbox, awful.spawn, awful.completion.bash) end):add() keybinding({ modkey }, "F4", function () - awful.prompt({ prompt = "Run Lua code: ", cursor_fg = fg_focus, cursor_bg = bg_focus }, mypromptbox, awful.eval, awful.prompt.bash) + awful.prompt({ prompt = "Run Lua code: " }, mypromptbox, awful.eval) end):add() --- Tabulous, tab manipulation @@ -255,10 +254,10 @@ keybinding({ modkey, "Control" }, "y", function () local tabbedview = tabulous.tabindex_get() local nextclient = awful.client.next(1) - if tabbedview == nil then + if not tabbedview then tabbedview = tabulous.tabindex_get(nextclient) - if tabbedview == nil then + if not tabbedview then tabbedview = tabulous.tab_create() tabulous.tab(tabbedview, nextclient) else @@ -274,7 +273,7 @@ keybinding({ modkey, "Shift" }, "y", tabulous.untab):add() keybinding({ modkey }, "y", function () local tabbedview = tabulous.tabindex_get() - if tabbedview ~= nil then + if tabbedview then local n = tabulous.next(tabbedview) tabulous.display(tabbedview, n) end @@ -286,7 +285,7 @@ keybinding({ modkey, 'Shift' }, "t", function () local tabbedview = tabulous.tabindex_get() local clients = awful.client.getmarked() - if tabbedview == nil then + if not tabbedview then tabbedview = tabulous.tab_create(clients[1]) table.remove(clients, 1) end @@ -314,25 +313,25 @@ end -- Hook function to execute when focusing a client. function hook_focus(c) if not awful.client.ismarked(c) then - c.border_color = border_focus + c.border_color = beautiful.border_focus end end -- Hook function to execute when unfocusing a client. function hook_unfocus(c) if not awful.client.ismarked(c) then - c.border_color = border_normal + c.border_color = beautiful.border_normal end end -- Hook function to execute when marking a client function hook_marked(c) - c.border_color = border_marked + c.border_color = beautiful.border_marked end -- Hook function to execute when unmarking a client function hook_unmarked(c) - c.border_color = border_focus + c.border_color = beautiful.border_focus end -- Hook function to execute when the mouse is over a client. @@ -345,18 +344,43 @@ end -- Hook function to execute when a new client appears. function hook_manage(c) + -- Set floating placement to be smart! + c.floating_placement = "smart" + if use_titlebar then + -- Add a titlebar + awful.titlebar.add(c, { modkey = modkey }) + end -- Add mouse bindings c:mouse_add(mouse({ }, 1, function (c) c:focus_set(); c:raise() end)) c:mouse_add(mouse({ modkey }, 1, function (c) c:mouse_move() end)) c:mouse_add(mouse({ modkey }, 3, function (c) c:mouse_resize() end)) -- New client may not receive focus -- if they're not focusable, so set border anyway. - c.border_width = border_width - c.border_color = border_normal + c.border_width = beautiful.border_width + c.border_color = beautiful.border_normal c:focus_set() - if floatings[c.name:lower()] then - c.floating = true + + -- Check if the application should be floating. + local cls = c.class + local inst = c.instance + if floatapps[cls] then + c.floating = floatapps[cls] + elseif floatapps[inst] then + c.floating = floatapps[inst] end + + -- Check application->screen/tag mappings. + local target + if apptags[cls] then + target = apptags[cls] + elseif apptags[inst] then + target = apptags[inst] + end + if target then + c.screen = target.screen + awful.client.movetotag(tags[target.screen][target.tag], c) + end + -- Honor size hints c.honorsizehints = true end @@ -364,8 +388,14 @@ end -- Hook function to execute when arranging the screen -- (tag switch, new client, etc) function hook_arrange(screen) - local layout = awful.layout.get(screen) - mylayoutbox[screen].text = "" + mylayoutbox[screen].text = + "" + + -- If no window has focus, give focus to the latest in history + if not client.focus_get() then + local c = awful.client.focus.history.get(screen, 0) + if c then c:focus_set() end + end -- Uncomment if you want mouse warping --[[ @@ -393,14 +423,14 @@ function hook_timer () end -- Set up some hooks -awful.hooks.focus(hook_focus) -awful.hooks.unfocus(hook_unfocus) -awful.hooks.marked(hook_marked) -awful.hooks.unmarked(hook_unmarked) -awful.hooks.manage(hook_manage) -awful.hooks.mouseover(hook_mouseover) -awful.hooks.arrange(hook_arrange) -awful.hooks.timer(1, hook_timer) +awful.hooks.focus.register(hook_focus) +awful.hooks.unfocus.register(hook_unfocus) +awful.hooks.marked.register(hook_marked) +awful.hooks.unmarked.register(hook_unmarked) +awful.hooks.manage.register(hook_manage) +awful.hooks.mouseover.register(hook_mouseover) +awful.hooks.arrange.register(hook_arrange) +awful.hooks.timer.register(1, hook_timer) -- }}} cmdmodkey = "Mod3"