From e9049909bc090ebabdd1450dd72937f774b970b3 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 27 Jun 2008 20:21:31 +0200 Subject: [PATCH] keep track of HEAD --- .awesomerc.lua | 81 ++++++++++++++++++++++++++-------------- .xsession.d/50-awesomewm | 6 +-- 2 files changed, 55 insertions(+), 32 deletions(-) diff --git a/.awesomerc.lua b/.awesomerc.lua index 688d175..216f8ae 100644 --- a/.awesomerc.lua +++ b/.awesomerc.lua @@ -8,7 +8,7 @@ require("awful") require("tabulous") -- Uncomment this to activate autotabbing -tabulous.autotab_start() +-- tabulous.autotab_start() -- {{{ Variable definitions -- This is used later as the default terminal to run. @@ -35,6 +35,16 @@ layouts = "floating" } +-- Table of clients that should be set floating +floatings = +{ + ["mplayer"] = true, + ["pinentry"] = true, + ["GIMP"] = true, + ["twinkle"] = true, + ["Add-ons"] = true +} + -- Color & Appearance definitions, we use these later to display things font = "RotisSansSerif 10" border_width = 1 @@ -50,7 +60,6 @@ border_marked = "#91231C" awesome.font_set(font) awesome.colors_set({ fg = fg_normal, bg = bg_normal }) -awesome.resizehints_set(true) -- }}} @@ -82,20 +91,24 @@ mytaglist:mouse_add(mouse.new({}, 3, function (object, tag) tag:view(not tag:iss mytaglist:mouse_add(mouse.new({ modkey }, 3, function (object, tag) awful.client.toggletag(tag) end)) mytaglist:mouse_add(mouse.new({ }, 4, awful.tag.viewnext)) mytaglist:mouse_add(mouse.new({ }, 5, awful.tag.viewprev)) -mytaglist:set("text_focus", " </span> ") +mytaglist:text_set({ ["focus"] = "<bg color='"..bg_focus.."'/> <span color='"..fg_focus.."'><title/></span> " }) -- Create a tasklist widget mytasklist = widget.new({ type = "tasklist", name = "mytasklist" }) mytasklist:mouse_add(mouse.new({ }, 1, function (object, c) c:focus_set(); c:raise() end)) mytasklist:mouse_add(mouse.new({ }, 4, function () awful.client.focus(1) end)) mytasklist:mouse_add(mouse.new({ }, 5, function () awful.client.focus(-1) end)) -mytasklist:set("text_focus", "<bg color='"..bg_focus.."'/> <span color='"..fg_focus.."'><title/></span> ") +mytasklist:text_set({ ["focus"] = "<bg color='"..bg_focus.."'/> <span color='"..fg_focus.."'><title/></span> " }) -- Create a textbox widget mytextbox = widget.new({ type = "textbox", name = "mytextbox", align = "right" }) -- Set the default text in textbox -mytextbox:set("text", "<b><small> awesome " .. AWESOME_VERSION .. " </small></b>") -mymenubox = widget.new({ type = "textbox", name = "mymenubox", align = "left" }) +mytextbox:text_set("<b><small> awesome " .. AWESOME_VERSION .. " </small></b>") +mypromptbox = widget.new({ type = "textbox", name = "mypromptbox", align = "left" }) + +-- Create an iconbox widget +myiconbox = widget.new({ type = "textbox", name = "myiconbox", align = "left" }) +myiconbox:text_set("<bg image=\"/usr/local/share/awesome/icons/awesome16.png\" resize=\"true\"/>") -- Create a systray mysystray = widget.new({ type = "systray", name = "mysystray", align = "right" }) @@ -104,12 +117,12 @@ mysystray = widget.new({ type = "systray", name = "mysystray", align = "right" } -- We need one layoutbox per screen. mylayoutbox = {} for s = 1, screen.count() do - mylayoutbox[s] = widget.new({ type = "iconbox", name = "mylayoutbox", align = "right" }) + mylayoutbox[s] = widget.new({ type = "textbox", name = "mylayoutbox", align = "right" }) mylayoutbox[s]:mouse_add(mouse.new({ }, 1, function () awful.layout.inc(layouts, 1) end)) mylayoutbox[s]:mouse_add(mouse.new({ }, 3, function () awful.layout.inc(layouts, -1) end)) mylayoutbox[s]:mouse_add(mouse.new({ }, 4, function () awful.layout.inc(layouts, 1) end)) mylayoutbox[s]:mouse_add(mouse.new({ }, 5, function () awful.layout.inc(layouts, -1) end)) - mylayoutbox[s]:set("image", AWESOME_DATADIR .. "/awesome/icons/layouts/tilew.png") + mylayoutbox[s]:text_set("<bg image=\"/usr/local/share/awesome/icons/layouts/tilew.png\" resize=\"true\"/>") end -- Create a statusbar for each screen and add it @@ -118,12 +131,12 @@ for s = 1, screen.count() do mystatusbar[s] = statusbar.new({ position = "top", name = "mystatusbar" .. s, fg = fg_normal, bg = bg_normal }) -- Add widgets to the statusbar - order matters - -- #TODO order is not really taken into account mystatusbar[s]:widget_add(mytaglist) + mystatusbar[s]:widget_add(myiconbox) mystatusbar[s]:widget_add(mytasklist) - mystatusbar[s]:widget_add(mylayoutbox[s]) - mystatusbar[s]:widget_add(mymenubox) + mystatusbar[s]:widget_add(mypromptbox) mystatusbar[s]:widget_add(mytextbox) + mystatusbar[s]:widget_add(mylayoutbox[s]) mystatusbar[s]:add(s) end mystatusbar[screen.count()]:widget_add(mysystray) @@ -185,7 +198,7 @@ keybinding.new({ modkey, "Control" }, "r", awesome.restart):add() keybinding.new({ modkey, "Shift" }, "q", awesome.quit):add() -- Client manipulation -keybinding.new({ modkey }, "Escape", function () client.focus_get():kill() end):add() +keybinding.new({ modkey, "Shift" }, "Escape", function () client.focus_get():kill() end):add() keybinding.new({ modkey }, "k", function () awful.client.focus(1); client.focus_get():raise() end):add() keybinding.new({ modkey }, "j", function () awful.client.focus(-1); client.focus_get():raise() end):add() keybinding.new({ modkey, "Shift" }, "k", function () awful.client.swap(1) end):add() @@ -206,12 +219,12 @@ keybinding.new({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end keybinding.new({ modkey }, "space", function () awful.layout.inc(layouts, 1) end):add() keybinding.new({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end):add() --- Menu +-- Prompt keybinding.new({ modkey }, "F1", function () - awful.menu({ prompt = "Run: ", cursor_fg = fg_focus, cursor_bg = bg_focus }, mymenubox, awful.spawn) + awful.prompt({ prompt = "Run: ", cursor_fg = fg_focus, cursor_bg = bg_focus }, mypromptbox, awful.spawn, awful.completion.bash) end):add() keybinding.new({ modkey }, "F4", function () - awful.menu({ prompt = "Run Lua code: ", cursor_fg = fg_focus, cursor_bg = bg_focus }, mymenubox, awful.eval) + awful.prompt({ prompt = "Run Lua code: ", cursor_fg = fg_focus, cursor_bg = bg_focus }, mypromptbox, awful.eval, awful.prompt.bash) end):add() --- Tabulous, tab manipulation @@ -299,7 +312,7 @@ function hook_unmarked(c) c:border_set({ width = border_width, color = border_focus }) end --- Hook function to exeucte when the mouse is over a client. +-- Hook function to execute when the mouse is over a client. function hook_mouseover(c) -- Sloppy focus, but disabled for magnifier layout if awful.layout.get(c:screen_get()) ~= "magnifier" then @@ -317,33 +330,43 @@ function hook_manage(c) -- if they're not focusable, so set border anyway. c:border_set({ width = border_width, color = border_normal }) c:focus_set() - if c:name_get():lower():find("mplayer") then - c:floating_set(true) - end - if c:name_get():find("pinentry") then - c:floating_set(true) - end - if c:name_get():lower():find("twinkle") then - c:floating_set(true) - end - if c:name_get():find("GIMP") then + if floatings[c:name_get():lower()] then c:floating_set(true) end + -- Honor size hints + c:honorsizehints_set(true) 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]:set("image", AWESOME_DATADIR .. "/awesome/icons/layouts/" .. layout .. "w.png") + mylayoutbox[screen]:text_set("<bg image=\"/usr/local/share/awesome/icons/layouts/" .. layout .. "w.png\" resize=\"true\"/>") + + -- Uncomment if you want mouse warping + --[[ + local sel = client.focus_get() + if sel then + local c_c = sel:coords_get() + local m_c = mouse.coords_get() + + if m_c.x < c_c.x or m_c.x >= c_c.x + c_c.width or + m_c.y < c_c.y or m_c.y >= c_c.y + c_c.height then + if table.maxn(m_c.buttons) == 0 then + mouse.coords_set(c_c.x + 5, c_c.y + 5) + end + end + end + ]] end + -- Hook called every second function hook_timer () -- For unix time_t lovers - -- mytextbox:set("text", " " .. os.time() .. " time_t ") + -- mytextbox:text_set(" " .. os.time() .. " time_t ") -- Otherwise use: - mytextbox:set("text", " " .. os.date() .. " ") + mytextbox:text_set(" " .. os.date() .. " ") end -- Set up some hooks diff --git a/.xsession.d/50-awesomewm b/.xsession.d/50-awesomewm index ed50286..9c48f8b 100644 --- a/.xsession.d/50-awesomewm +++ b/.xsession.d/50-awesomewm @@ -1,7 +1,7 @@ if [ -x ~/code/awesome/awesome ]; then - ~/code/awesome/awesome & + ~/code/awesome/awesome elif [[ -x =awesome ]]; then - awesome & + awesome else - x-window-manager & + x-window-manager fi -- 2.39.5