themes: move theme icons to themes/

Signed-off-by: Julien Danjou <julien@danjou.info>

CMakeLists.txt

@@ -181,6 +181,8 @@ add_custom_target(generated_sources
             ${BUILD_DIR}/common/tokenize.c
             ${BUILD_DIR}/common/tokenize.h)
 
+# Default theme directory
+file(MAKE_DIRECTORY ${BUILD_DIR}/themes/default)
 add_dependencies(${PROJECT_AWE_NAME} generated_sources)
 add_dependencies(${PROJECT_AWECLIENT_NAME} generated_sources)
 # }}}
@@ -323,7 +325,9 @@ if(GENERATE_MANPAGES)
     install(FILES ${AWE_MAN5_FILES} DESTINATION ${AWESOME_MAN_PATH}/man5)
 endif()
 install(DIRECTORY ${AWE_ICON_DIR} DESTINATION ${AWESOME_DATA_PATH})
-install(FILES ${AWE_THEMES_DIR}/default-background.png ${BUILD_DIR}/themes/default DESTINATION ${AWESOME_THEMES_PATH})
+install(DIRECTORY ${BUILD_DIR}/themes DESTINATION ${AWESOME_DATA_PATH})
+install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH}
+    PATTERN "*.in" EXCLUDE)
 install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH})
 install(FILES "awesome.desktop" DESTINATION ${AWESOME_XSESSION_PATH})
 if(GENERATE_LUADOC)

awesomeConfig.cmake

@@ -272,7 +272,7 @@ set(AWESOME_CONFIGURE_FILES
     ${awesome_lua_configure_files}
     config.h.in
     awesomerc.lua.in
-    themes/default.in
+    themes/default/theme.in
     awesome-version-internal.h.in
     awesome.doxygen.in)
 

awesomerc.lua.in

@@ -4,7 +4,7 @@ require("beautiful")
 
 -- {{{ Variable definitions
 -- This is a file path to a theme file which will defines colors.
-theme_path = "@AWESOME_THEMES_PATH@/default"
+theme_path = "@AWESOME_THEMES_PATH@/default/theme"
 
 -- This is used later as the default terminal and editor to run.
 terminal = "xterm"

lib/awful/menu.lua.in

@@ -32,7 +32,7 @@ local function load_theme(custom)
     theme.fg_normal = custom.fg_normal or beautiful.menu_fg_normal or beautiful.fg_normal
     theme.bg_normal = custom.bg_normal or beautiful.menu_bg_normal or beautiful.bg_normal
 
-    theme.submenu_icon = custom.submenu_icon or beautiful.menu_submenu_icon or "@AWESOME_ICON_PATH@/submenu.png"
+    theme.submenu_icon = custom.submenu_icon or beautiful.menu_submenu_icon
 
     theme.menu_height = custom.height or beautiful.menu_height or 15
     theme.menu_width = custom.width or beautiful.menu_width or 100
@@ -142,7 +142,7 @@ local function add_item(data, num, item_info)
     local submenu
     if type(item_info[2]) == "table" then
         submenu = widget({ type = "imagebox", align = "right" })
-        submenu.image = image(data.theme.submenu_icon)
+        submenu.image = data.theme.submenu_icon and image(data.theme.submenu_icon)
         submenu:buttons(bindings)
 
         function submenu.mouse_enter() mouse_enter(item, data.theme) end

lib/awful/widget.lua.in

@@ -93,7 +93,6 @@ end
 -- fg_focus The foreground color for selected tag.
 -- bg_urgent The background color for urgent tags.
 -- fg_urgent The foreground color for urgent tags.
--- taglist_squares Optional: set "true" or nil to display the taglist squares.
 -- taglist_squares_sel Optional: an user provided image for selected squares.
 -- taglist_squares_unsel Optional: an user provided image for unselected squares.
 -- @return A string to print.
@@ -104,9 +103,8 @@ function taglist.label.all(t, args)
     local bg_focus = args.bg_focus or theme.taglist_bg_focus or theme.bg_focus
     local fg_urgent = args.fg_urgent or theme.taglist_fg_urgent or theme.fg_urgent
     local bg_urgent = args.bg_urgent or theme.taglist_bg_urgent or theme.bg_urgent
-    local taglist_squares = args.taglist_squares or theme.taglist_squares or "true"
-    local taglist_squares_sel = args.squares_sel or theme.squares_sel or "@AWESOME_ICON_PATH@/taglist/squarefw.png"
-    local taglist_squares_unsel = args.squares_unsel or theme.squares_unsel or "@AWESOME_ICON_PATH@/taglist/squarew.png"
+    local taglist_squares_sel = args.squares_sel or theme.taglist_squares_sel
+    local taglist_squares_unsel = args.squares_unsel or theme.taglist_squares_unsel
     local text
     local background = ""
     local sel = capi.client.focus
@@ -117,12 +115,12 @@ function taglist.label.all(t, args)
         fg_color = fg_focus
     end
     if sel and sel:tags()[t] then
-        if taglist_squares == "true" then
+        if taglist_squares_sel then
             background = "resize=\"true\" image=\"" .. taglist_squares_sel .. "\""
         end
     else
         local cls = t:clients()
-        if #cls > 0 and taglist_squares == "true" then
+        if #cls > 0 and taglist_squares_unsel then
             background = "resize=\"true\" image=\"" .. taglist_squares_unsel .. "\""
         end
         for k, c in pairs(cls) do
@@ -269,11 +267,12 @@ local function widget_tasklist_label_common(c, args)
     local bg_focus = args.bg_focus or theme.tasklist_bg_focus or theme.bg_focus
     local fg_urgent = args.fg_urgent or theme.tasklist_fg_urgent or theme.fg_urgent
     local bg_urgent = args.bg_urgent or theme.tasklist_bg_urgent or theme.bg_urgent
+    local floating_icon = args.floating_icon or theme.tasklist_floating_icon
     local bg = nil
     local text = "<margin left=\"2\" right=\"2\"/>"
     local name
-    if c.floating then
-        text = text.."<bg image=\"@AWESOME_ICON_PATH@/tasklist/floatingw.png\" align=\"right\"/>"
+    if c.floating and floating_icon then
+        text = text.."<bg image=\"" .. floating_icon .. "\" align=\"right\"/>"
     end
     if c.minimized then
         name = util.escape(c.icon_name) or ""

themes/default/theme.in

@@ -25,16 +25,19 @@ border_marked = #91231c
 # Example:
 #taglist_bg_focus = #ff0000
 
+# Display the taglist squares
+taglist_squares_sel = @AWESOME_THEMES_PATH@/default/taglist/squarefw.png
+taglist_squares_unsel = @AWESOME_THEMES_PATH@/default/taglist/squarew.png
+
+tasklist_floating_icon = @AWESOME_THEMES_PATH@/default/tasklist/floatingw.png
+
 # Variables set for theming menu
 # menu_[bg|fg]_[normal|focus]
 # menu_[border_color|border_width]
-# menu_submenu_icon = @AWESOME_ICON_PATH@/submenu.png
+menu_submenu_icon = @AWESOME_THEMES_PATH@/default/submenu.png
 menu_height   = 15
 menu_width    = 100
 
-# Display the taglist squares
-taglist_squares = true
-
 # You can add as many variables as
 # you wish and access them by using
 # beautiful.variable in your rc.lua
@@ -45,26 +48,26 @@ titlebar_close_button = true
 
 # Define the image to load
 @ (if titlebar_close_button_[normal|focus] these values are ignored)
-#titlebar_close_button_img_normal = @AWESOME_ICON_PATH@/titlebar/closea.png
-#titlebar_close_button_img_focus = @AWESOME_ICON_PATH@/titlebar/closera.png
+#titlebar_close_button_img_normal = @AWESOME_THEMES_PATH@/titlebar/closea.png
+#titlebar_close_button_img_focus = @AWESOME_THEMES_PATH@/titlebar/closera.png
 # Or create your own close button
 #titlebar_close_button_normal = <span>...</span>
 #titlebar_close_button_focus = <span>...</span>
 
 # You can use your own command to set your wallpaper
-wallpaper_cmd = awsetbg @AWESOME_THEMES_PATH@/default-background.png
+wallpaper_cmd = awsetbg @AWESOME_THEMES_PATH@/theme/background.png
 
 # You can use your own layout icons like this:
-layout_dwindle = @AWESOME_ICON_PATH@/layouts/dwindlew.png
-layout_fairh = @AWESOME_ICON_PATH@/layouts/fairhw.png
-layout_fairv = @AWESOME_ICON_PATH@/layouts/fairvw.png
-layout_floating = @AWESOME_ICON_PATH@/layouts/floatingw.png
-layout_magnifier = @AWESOME_ICON_PATH@/layouts/magnifierw.png
-layout_max = @AWESOME_ICON_PATH@/layouts/maxw.png
-layout_spiral = @AWESOME_ICON_PATH@/layouts/spiralw.png
-layout_tilebottom = @AWESOME_ICON_PATH@/layouts/tilebottomw.png
-layout_tileleft = @AWESOME_ICON_PATH@/layouts/tileleftw.png
-layout_tile = @AWESOME_ICON_PATH@/layouts/tilew.png
-layout_tiletop = @AWESOME_ICON_PATH@/layouts/tiletopw.png
+layout_dwindle = @AWESOME_THEMES_PATH@/default/layouts/dwindlew.png
+layout_fairh = @AWESOME_THEMES_PATH@/default/layouts/fairhw.png
+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_spiral = @AWESOME_THEMES_PATH@/default/layouts/spiralw.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