Merge branch 'master' of sc:awesome into desktop

Conflicts:
	tags.lua

aweswt.lua

@@ -0,0 +1,50 @@
+   -- aweswt.lua
+   local io=io
+   local table=table
+   local pairs=pairs
+   local awful=awful
+   local client=client
+   local string=string
+   local USE_T=true
+   module("aweswt")
+   function get_out (a)
+       local  f=io.popen (a)
+       t={}
+       for line in f:lines() do
+         table.insert(t, line )
+       end
+       return t
+   end
+   function get_input (a)
+     s1='echo -e "'..a..'"|dmenu'
+     return get_out(s1)
+   end
+   
+   function switch()
+      local clients = client.get()
+      if table.getn(clients) == 0 then 
+        return
+      end
+      local m1=""
+      local t2={}
+      local tmp
+      for i, c in pairs(clients) do
+       if USE_T then do
+         tmp=i..':'..string.sub(c['name'], 1, 20)
+       end
+       else do
+         tmp=i..':'..c['instance']..'.'..c['class']
+       end
+       end
+         m1=m1..tmp..'\n'
+         t2[tmp]=c
+      end
+      local t6=t2[get_input(m1)[1]]
+      if t6 then
+         local ctags = t6:tags()
+         awful.tag.viewonly(ctags[1])
+         client.focus = t6
+         t6:raise()
+      end
+   end
+

bindings.lua

@@ -1,7 +1,6 @@
 
 -- {{{ Mouse bindings
 root.buttons(awful.util.table.join(
-awful.button({ }, 3, function () mymainmenu:toggle() end),
 awful.button({ }, 4, awful.tag.viewnext),
 awful.button({ }, 5, awful.tag.viewprev)
 ))
@@ -57,16 +56,24 @@ globalkeys = awful.util.table.join(
 --    awful.key({ modkey,           }, "p",      function () awful.util.spawn("pidgin") end),
 --    awful.key({ modkey,           }, "s",      function () awful.util.spawn("sunbird") end),
 --    awful.key({ modkey,           }, "g",      function () awful.util.spawn("gmpc") end),
-    awful.key({ modkey,           }, "f",      function () runraise("firefox", { class = "Firefox" }) end),
-    awful.key({ modkey,           }, "t",      function () runraise("thunderbird", { class = "Thunderbird" }) end),
-    awful.key({ modkey,           }, "p",      function () runraise("pidgin", { class = "Pidgin" }) end),
-    awful.key({ modkey,           }, "s",      function () runraised("sunbird", { class = "Sunbirdi-bin" }) end),
-    awful.key({ modkey,           }, "g",      function () runraise("gmpc", { class = "Gmpc" }) end),
+    awful.key({ modkey,           }, "f",      function () awful.util.spawn("firefox") end),
+    awful.key({ modkey,           }, "t",      function () awful.util.spawn("thunderbird") end),
+    awful.key({ modkey,           }, "p",      function () awful.util.spawn("pidgin") end),
+    awful.key({ modkey,           }, "s",      function () awful.util.spawn("sunbird") end),
+    awful.key({ modkey,           }, "g",      function () awful.util.spawn("gmpc") end),
     awful.key({ }, "XF86Mail",                 function () awful.util.spawn("xset dpms force off") end),
     awful.key({ }, "XF86Mail",                 function () awful.util.spawn("xset dpms force off") end),
     awful.key({ modkey }, "XF86Mail",                 function () awful.util.spawn("urslock") end),
     awful.key({ modkey, "Control" }, "r", awesome.restart),
     awful.key({ modkey, "Shift"   }, "q", awesome.quit),
+    awful.key({ }, "Menu", aweswt.switch),
+   
+    
+    --tabletpc keys
+    awful.key({ hyper }, "6", function () awful.util.spawn("/usr/local/bin/rotate") end),
+    --awful.key({ modkey }, "x", function () awful.util.spawn("cellwriter --show-window") end),
+    awful.key({ modkey }, "x",  function () teardrop("cellwriter","top","center", 0.99, 0.4)end ),
+    awful.key({ modkey, "Control" }, "Delete", function () awful.util.spawn("xlock") end),
     
     -- Audio control
     awful.key({ }, "Print",  function () teardrop("sakura --class=Teardrop -e alsamixer","top","center", 0.99, 0.4)end ),

obvious

@@ -1 +1 @@
-Subproject commit 565f11c05dd28a2bfe8a96a6ec0950b970f5abcd
+Subproject commit e3a3e05405d6c622326f3faba6ce6b7c188bf1e9

rc.lua

@@ -1,6 +1,7 @@
 terminal = "sakura -e screen"
 editor_cmd = "sakura -e vim"
 modkey = "Mod4"
+hyper = "Mod3"
 
 -- Standard awesome library
 require("awful")
@@ -11,6 +12,8 @@ require("naughty")
 require("teardrop")
 require("obvious.popup_run_prompt")
 require("vicious")
+require("aweswt")
+
 
 
 
@@ -21,12 +24,10 @@ beautiful.init("/home/crater2150/.config/awesome/zenburn/theme.lua")
 -- Table of layouts to cover with awful.layout.inc, order matters.
 layouts =
 {
-    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.tile,
+    awful.layout.suit.tile.bottom,
     awful.layout.suit.max,
     awful.layout.suit.max.fullscreen,
     awful.layout.suit.floating

rules.lua

@@ -24,11 +24,19 @@ awful.rules.rules = {
       properties = { floating = true } },
     -- Set Firefox to always map on tags number 2 of screen 1.
     { rule = { class = "Firefox" },
-      properties = { tag = tags[1][2] } },
+      properties = { tag = tags[1][2],
+                     floating = false } },
     { rule = { class = "Pidgin" },
       properties = { tag = tags[1][3]} },
     { rule = { role = "buddy_list" },
       properties = { master = true } },
+    { rule = { role = "conversation" },
+      callback = awful.client.setslave},
+    { rule = { class = "Irssi"},
+      properties = { tag = tags[1][3]} ,
+      callback = awful.client.setslave},
+    { rule = { class = "Claws-mail" },
+      properties = { tag = tags[1][4] } },
     { rule = { class = "Thunderbird" },
       properties = { tag = tags[1][4] } },
     { rule = { class = "Claws-mail" },
@@ -43,5 +51,13 @@ awful.rules.rules = {
       properties = { tag = tags[1][22] } },
     --{ rule = { class = "OpenOffice.org 3.2" },
       --properties = { floating = false } },
+    { rule = { class = "Cellwriter" },
+      properties = { tag = tags[1][1],
+                     ontop = true,
+                     size_hints_honor = true,
+                     float = true,
+                     sticky = true,
+                     fullscreen = true
+                     } },
 }
 -- }}}

tags.lua

@@ -3,10 +3,10 @@
 tags={}
 tags.setup = {
     { name = "1:⚙",   layout = layouts[1]  },
-    { name = "2:⌘",   layout = layouts[7]  },
-    { name = "3:☻",   layout = layouts[2], mwfact = 0.80 },
-    { name = "4:✉",   layout = layouts[7]  },
-    { name = "5:☑",   layout = layouts[7]  },
+    { name = "2:⌘",   layout = layouts[5]  },
+    { name = "3:☻",   layout = layouts[3], mwfact = 0.20 },
+    { name = "4:✉",   layout = layouts[5]  },
+    { name = "5:☑",   layout = layouts[1]  },
     { name = "6:♫",   layout = layouts[1]  },
     { name = "7:☣",   layout = layouts[1]  },
     { name = "8:☕",   layout = layouts[1]  },

zenburn.lua

@@ -1,141 +0,0 @@
--------------------------------
---  "Zenburn" awesome theme  --
---    By Adrian C. (anrxc)   --
--------------------------------
-
-
--- {{{ Main
-theme = {}
-theme.confdir       = awful.util.getdir("config")
-theme.wallpaper_cmd = { "/usr/bin/nitrogen --restore" }
---theme.wallpaper_cmd = { "awsetbg /usr/share/awesome/themes/zenburn/zenburn-background.png" }
--- }}}
-
-
--- {{{ Styles
-theme.font      = "Profont 8"
-
--- {{{ Colors
-theme.fg_normal = "#DCDCCC"
-theme.fg_focus  = "#F0DFAF"
-theme.fg_urgent = "#CC9393"
-theme.bg_normal = "#3F3F3F"
-theme.bg_focus  = "#1E2320"
-theme.bg_urgent = "#ff0000"
--- }}}
-
--- {{{ Borders
-theme.border_width  = "1"
-theme.border_normal = "#3F3F3F"
-theme.border_focus  = "#6F6F6F"
-theme.border_marked = "#CC9393"
--- }}}
-
--- {{{ Titlebars
-theme.titlebar_bg_focus  = "#3F3F3F"
-theme.titlebar_bg_normal = "#3F3F3F"
--- theme.titlebar_[normal|focus]
--- }}}
-
--- {{{ Widgets
-theme.fg_widget        = "#AECF96"
-theme.fg_center_widget = "#88A175"
-theme.fg_end_widget    = "#FF5656"
-theme.fg_off_widget    = "#494B4F"
-theme.fg_netup_widget  = "#7F9F7F"
-theme.fg_netdn_widget  = "#CC9393"
-theme.bg_widget        = "#3F3F3F"
-theme.border_widget    = "#3F3F3F"
--- }}}
-
--- {{{ Mouse finder
-theme.mouse_finder_color = "#CC9393"
--- theme.mouse_finder_[timeout|animate_timeout|radius|factor]
--- }}}
-
--- {{{ Tooltips
--- theme.tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- }}}
-
--- {{{ Taglist and Tasklist
--- theme.[taglist|tasklist]_[bg|fg]_[focus|urgent]
--- }}}
-
--- {{{ Menu
--- theme.menu_[bg|fg]_[normal|focus]
--- theme.menu_[height|width|border_color|border_width]
--- }}}
--- }}}
-
-
--- {{{ Icons
---
--- {{{ Taglist icons
-theme.taglist_squares_sel   = theme.confdir .. "/icons/taglist/squarefz.png"
-theme.taglist_squares_unsel = theme.confdir .. "/icons/taglist/squareza.png"
---theme.taglist_squares_resize = "false"
--- }}}
-
--- {{{ Misc icons
---theme.awesome_icon           = theme.confdir .. "/icons/awesome.png"
---theme.menu_submenu_icon      = "/usr/share/awesome/themes/default/submenu.png"
---theme.tasklist_floating_icon = "/usr/share/awesome/themes/default/tasklist/floatingw.png"
--- }}}
-
--- {{{ Layout icons
-theme.layout_tile       = theme.confdir .. "/icons/layouts/tile.png"
-theme.layout_tileleft   = theme.confdir .. "/icons/layouts/tileleft.png"
-theme.layout_tilebottom = theme.confdir .. "/icons/layouts/tilebottom.png"
-theme.layout_tiletop    = theme.confdir .. "/icons/layouts/tiletop.png"
-theme.layout_fairv      = theme.confdir .. "/icons/layouts/fairv.png"
-theme.layout_fairh      = theme.confdir .. "/icons/layouts/fairh.png"
-theme.layout_spiral     = theme.confdir .. "/icons/layouts/spiral.png"
-theme.layout_dwindle    = theme.confdir .. "/icons/layouts/dwindle.png"
-theme.layout_max        = theme.confdir .. "/icons/layouts/max.png"
-theme.layout_fullscreen = theme.confdir .. "/icons/layouts/fullscreen.png"
-theme.layout_magnifier  = theme.confdir .. "/icons/layouts/magnifier.png"
-theme.layout_floating   = theme.confdir .. "/icons/layouts/floating.png"
--- }}}
-
--- {{{ Widget icons
-theme.widget_cpu    = theme.confdir .. "/icons/cpu.png"
-theme.widget_bat    = theme.confdir .. "/icons/bat.png"
-theme.widget_mem    = theme.confdir .. "/icons/mem.png"
-theme.widget_fs     = theme.confdir .. "/icons/disk.png"
-theme.widget_net    = theme.confdir .. "/icons/down.png"
-theme.widget_netup  = theme.confdir .. "/icons/up.png"
-theme.widget_mail   = theme.confdir .. "/icons/mail.png"
-theme.widget_vol    = theme.confdir .. "/icons/vol.png"
-theme.widget_org    = theme.confdir .. "/icons/cal.png"
-theme.widget_date   = theme.confdir .. "/icons/time.png"
-theme.widget_crypto = theme.confdir .. "/icons/crypto.png"
--- }}}
-
--- {{{ Titlebar icons
-theme.titlebar_close_button_focus  = theme.confdir .. "/icons/titlebar/close_focus.png"
-theme.titlebar_close_button_normal = theme.confdir .. "/icons/titlebar/close_normal.png"
-
-theme.titlebar_ontop_button_focus_active    = theme.confdir .. "/icons/titlebar/ontop_focus_active.png"
-theme.titlebar_ontop_button_normal_active   = theme.confdir .. "/icons/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_inactive  = theme.confdir .. "/icons/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_inactive = theme.confdir .. "/icons/titlebar/ontop_normal_inactive.png"
-
-theme.titlebar_sticky_button_focus_active    = theme.confdir .. "/icons/titlebar/sticky_focus_active.png"
-theme.titlebar_sticky_button_normal_active   = theme.confdir .. "/icons/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_inactive  = theme.confdir .. "/icons/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_inactive = theme.confdir .. "/icons/titlebar/sticky_normal_inactive.png"
-
-theme.titlebar_floating_button_focus_active    = theme.confdir .. "/icons/titlebar/floating_focus_active.png"
-theme.titlebar_floating_button_normal_active   = theme.confdir .. "/icons/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_inactive  = theme.confdir .. "/icons/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_inactive = theme.confdir .. "/icons/titlebar/floating_normal_inactive.png"
-
-theme.titlebar_maximized_button_focus_active    = theme.confdir .. "/icons/titlebar/maximized_focus_active.png"
-theme.titlebar_maximized_button_normal_active   = theme.confdir .. "/icons/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_inactive  = theme.confdir .. "/icons/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_inactive = theme.confdir .. "/icons/titlebar/maximized_normal_inactive.png"
--- }}}
--- }}}
-
-
-return theme

zenburn/theme.lua

@@ -15,18 +15,18 @@ theme.wallpaper_cmd = { "nitrogen --restore" }
 theme.font      = "sans 8"
 
 -- {{{ Colors
-theme.fg_normal = "#8888FF"
-theme.fg_focus  = "#000000"
-theme.fg_urgent = "#FF0000"
-theme.bg_normal = "#000000"
-theme.bg_focus  = "#8888FF"
-theme.bg_urgent = "#880000"
+theme.fg_normal = "#DCDCDC"
+theme.fg_focus  = "#F0DFAF"
+theme.fg_urgent = "#CC9393"
+theme.bg_normal = "#121212"
+theme.bg_focus  = "#3F3F3F"
+theme.bg_urgent = "#DA4E4E"
 -- }}}
 
 -- {{{ Borders
 theme.border_width  = "2"
-theme.border_normal = "#DDDDFF"
-theme.border_focus  = "#8888FF"
+theme.border_normal = "#3F3F3F"
+theme.border_focus  = "#6F6F6F"
 theme.border_marked = "#CC9393"
 -- }}}
 
@@ -83,12 +83,12 @@ theme.tasklist_floating_icon = "/usr/share/awesome/themes/default/tasklist/float
 -- }}}
 
 -- {{{ Layout
+theme.layout_tiletop       = "/usr/share/awesome/themes/zenburn/layouts/tile.png"
+theme.layout_tilebottom   = "/usr/share/awesome/themes/zenburn/layouts/tileleft.png"
 theme.layout_tile = "/usr/share/awesome/themes/zenburn/layouts/tilebottom.png"
 theme.layout_tileleft    = "/usr/share/awesome/themes/zenburn/layouts/tiletop.png"
-theme.layout_tilebottom = "/usr/share/awesome/themes/zenburn/layouts/tileleft.png"
-theme.layout_tiletop    = "/usr/share/awesome/themes/zenburn/layouts/tile.png"
-theme.layout_fairv      = "/usr/share/awesome/themes/zenburn/layouts/fairh.png"
 theme.layout_fairh      = "/usr/share/awesome/themes/zenburn/layouts/fairv.png"
+theme.layout_fairv      = "/usr/share/awesome/themes/zenburn/layouts/fairh.png"
 theme.layout_spiral     = "/usr/share/awesome/themes/zenburn/layouts/spiral.png"
 theme.layout_dwindle    = "/usr/share/awesome/themes/zenburn/layouts/dwindle.png"
 theme.layout_max        = "/usr/share/awesome/themes/zenburn/layouts/max.png"