Release 0.14.2

Update ru.po

See merge request !25

.clang-format

@@ -63,4 +63,4 @@ SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard: Cpp11
 TabWidth: 4
-UseTab: ForIndentation
+UseTab: Never

.gitignore

@@ -1,2 +1,3 @@
 build
 *.user
+version.h

AUTHORS

@@ -22,6 +22,13 @@ Contributors:
   Xico Atelo : startup notifications
   Craig Oakes : WM flags, issue tracker organization
   Jeff Blake (https://gitlab.com/u/berkley4) : more mouse event handlers
+  Vladimir <vladimir-csp@yandex.ru> : translations, bug reports
+  Christophe D. <stophe72.d@gmail.com> : non-rectangular borders
+  Benoit Averty : taskbar enhancements
+  Justin Jacobs : tint2conf fixes
+  Oskari Rauta : separator plugin, gradients
+  Michael Messmore : Support for Path in .desktop files
+  Matthew Otnel : config option systray_name_filter
 
 Translations:
   Bosnian:

CMakeLists.txt

@@ -1,9 +1,9 @@
 project( tint2 )
-cmake_minimum_required( VERSION 2.6 )
+cmake_minimum_required( VERSION 2.8.5 )
 
 option( ENABLE_BATTERY "Enable battery status plugin" ON )
 option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme configurator for tint2" ON )
-option( ENABLE_EXAMPLES "Install additional tin2rc examples" ON )
+option( ENABLE_EXTRA_THEMES "Install additional tint2 themes" ON )
 option( ENABLE_RSVG "Rsvg support (launcher only)" ON )
 option( ENABLE_SN "Startup notification support" ON )
 option( ENABLE_ASAN "Build tint2 with AddressSanitizer" OFF )
@@ -13,6 +13,14 @@ if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
   option( ENABLE_UEVENT "Kernel event handling support" ON )
 endif( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
 
+include( GNUInstallDirs )
+if(NOT docdir)
+  set(docdir ${CMAKE_INSTALL_DOCDIR})
+endif()
+if(NOT htmldir)
+  set(htmldir ${docdir}/html)
+endif()
+
 include( FindPkgConfig )
 include( CheckLibraryExists )
 include( CheckCSourceCompiles )
@@ -74,7 +82,13 @@ if( NOT IMLIB_BUILD_WITH_X )
   message( FATAL_ERROR "Imlib is not built with X support" )
 endif( NOT IMLIB_BUILD_WITH_X )
 
-add_definitions( -D_GNU_SOURCE )
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  add_definitions( -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -D_DEFAULT_SOURCE )
+else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  add_definitions( -D_WITH_GETLINE )
+endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
 
 include_directories( ${PROJECT_BINARY_DIR}
                      src
@@ -85,8 +99,10 @@ include_directories( ${PROJECT_BINARY_DIR}
                      src/launcher
                      src/tooltip
                      src/util
-					 src/execplugin
+                     src/execplugin
+                     src/button
                      src/freespace
+                     src/separator
                      ${X11_INCLUDE_DIRS}
                      ${PANGOCAIRO_INCLUDE_DIRS}
                      ${PANGO_INCLUDE_DIRS}
@@ -112,12 +128,18 @@ set( SOURCES src/config.c
              src/taskbar/taskbar.c
              src/taskbar/taskbarname.c
              src/tooltip/tooltip.c
-			 src/execplugin/execplugin.c
+             src/execplugin/execplugin.c
+             src/button/button.c
              src/freespace/freespace.c
+             src/separator/separator.c
+             src/tint2rc.c
              src/util/area.c
              src/util/common.c
              src/util/strnatcmp.c
              src/util/timer.c
+             src/util/cache.c
+             src/util/color.c
+             src/util/gradient.c
              src/util/window.c )
 
 if( ENABLE_BATTERY )
@@ -189,17 +211,12 @@ endif( ENABLE_TINT2CONF )
 
 if( ENABLE_ASAN )
   SET(ASAN_C_FLAGS " -O0 -g3 -gdwarf-2 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic -Wshadow")
-  SET(ASAN_L_FLAGS " -O0 -g3 -gdwarf-2 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic ")
+  SET(ASAN_L_FLAGS " -O0 -g3 -gdwarf-2 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic -fuse-ld=gold ")
 else()
   SET(ASAN_C_FLAGS "")
   SET(ASAN_L_FLAGS "")
 endif()
 
-set( MANDIR share/man CACHE PATH "Directory for man pages" )
-set( DATADIR share CACHE PATH "Directory for shared data" )
-set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" )
-set( DOCDIR share/doc/tint2 CACHE PATH "Directory for documentation files" )
-
 add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" "\"${PROJECT_SOURCE_DIR}\"" )
 
 link_directories( ${X11_LIBRARY_DIRS}
@@ -238,14 +255,14 @@ set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fn
 set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS} ${BACKTRACE_L_FLAGS}" )
 
 install( TARGETS tint2 DESTINATION bin )
-install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
+install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
-install( FILES tint2.desktop DESTINATION ${DATADIR}/applications )
+install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
-install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
+install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
-install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
+install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
-install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
+install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
-install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
+install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
-install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
+install( DIRECTORY doc/images DESTINATION ${htmldir} )
-if( ENABLE_EXAMPLES )
+install( FILES doc/tint2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
-  file( GLOB SAMPLEFILES sample/*.tint2rc )
+if( ENABLE_EXTRA_THEMES )
-  install( FILES ${SAMPLEFILES} DESTINATION ${DATADIR}/tint2 )
+  add_subdirectory(themes)
-endif( ENABLE_EXAMPLES )
+endif( ENABLE_EXTRA_THEMES )

CONTRIBUTING.md

@@ -0,0 +1 @@
+Please read https://gitlab.com/o9000/tint2/wikis/Development

ChangeLog

@@ -1,3 +1,134 @@
+2017-04-23 0.14.2
+- Fixes:
+  - Make versioning more robust when building as package
+- Enhancements:
+  - Tint2conf: Open current tint2 config automatically when started from tint2
+
+2017-03-26 0.14.1
+- Fixes:
+  - Fixed tint2conf problem under FreeBSD (or generally any system using clang).
+
+2017-03-26 0.14
+- Enhancements:
+  - New plugin: button.
+
+2017-03-25 0.13.3
+- Fixes:
+  - Fixed autohide for non-bottom panels (issue #632)
+  - Translations updated (contributed by Vladimir)
+
+2017-03-19 0.13.2
+- Fixes:
+  - Fixed compilation under FreeBSD
+
+2017-03-12 0.13.1
+- Fixes:
+  - Fixed compilation with new glibc (issue #625)
+  - Fixed regression in distributing size between taskbars (issue #628)
+  - Create ~/.config dir if it does not exist (issue #629)
+- Enhancements:
+  - New config option systray_name_filter to hide hide specific apps from the system tray (contributed by Matthew Otnel)
+  - Tint2conf: minor improvements
+
+2017-03-04 0.13
+- Fixes:
+  - Ignore monitors with size 0, fixing crash (issue #618)
+  - Battery: support Asus Chromebook Flip C100PA (issue #616)
+  - Panel: do not change struts (available screen size) when shown in autohide mode (issue #619)
+  - tint2conf: executor tooltips are now correctly disabled when text config value is empty (contributed by Justin Jacobs)
+- Enhancements:
+  - Desktop files (shortcuts) used in launcher are reloaded on click, in case the file has changed
+  - New config option taskbar_hide_if_empty to hide an empty taskbar in multi_desktop mode (contributed by Benoit Averty)
+  - Gradient backgrounds (contributed by Oskari Rauta)
+  - New option: panel_shrink (fixes issue #333)
+  - Support for Path in .desktop files (contributed by Michael Messmore)
+  - Tint2conf start up is much faster
+- New plugin: separator (contributed by Oskari Rauta)
+
+2016-08-02 0.12.12
+- Fixes:
+  - Set task maximum height equal to width if not specified, instead of hardcoding 30 (issue #583; thanks @VastOne)
+  - tint2conf
+    - Process background selection events correctly (issue #582)
+	- Menus accessible with keyboard shortcuts (issue #590)
+- Enhancements:
+  - Borders can now be drawn on only some sides; configurable with the option border_sides (issue #580; thanks @stophe)
+  - Updated man page
+  - The geometry of panel items is printed to stderr if the environment variable DEBUG_GEOMETRY is set
+
+2016-05-14 0.12.11
+- Fixes:
+  - tint2conf:
+    - Fixed crash in tint2conf when adding background
+    - Add correct extension to file name in tint2conf for 'Save as'
+    - Changed main window title in tint2conf
+
+2016-05-07 0.12.10
+- Fixes:
+  - Fixed crash in systray with non-Latin languagess (thanks zcodes)
+  - Invalidate cached pixmaps on resize/move (issue #576)
+  - Battery: do not show negative durations when the sensors return garbage
+  - Proper workaround for issue #555
+
+2016-04-02 0.12.9
+- Fixes:
+  - Regression: Do not detect empty areas as clickable (issue #572)
+  - Regression: Position and resize task icon correctly (issue #575)
+  - Use imlib2 for taking screenshot; if it fails, use Xlib (issue #574)
+  - Battery: lower sample frequency when there is no support for reading current/power
+
+2016-03-25 0.12.8
+- Major changes (see details below):
+  - Icon cache and lazy icon theme loading to improve performance in tint2 and tint2conf
+  - Extra tint2rc themes are installed to /usr/share/tint2 and available in tint2conf
+  - Tint2conf GUI improvements
+- Config options with changed behavior:
+  - The launcher now also allows launcher_item_app entries without a full path.
+    In this case the .desktop file is searched in the standard application directories (issue #565).
+  - If the panel size is given as a percentage and a non-zero margin is also specified,
+    the size is now computed as a fraction of the available size (i.e. monitor size - margin).
+    Before it was computed as a fraction of the monitor size first, then the margin was subtracted from the value, which
+    was not intuitive (issue #559).
+- Fixes:
+  - Taskbar icons are now resized correctly for certain geometries (issue #560)
+  - Fix get_version.sh so that it returns the correct version when .git is missing
+  - Fix build on powerpc
+  - Temporary files are now created in /tmp
+  - The XDG paths are now used in the icon and application lookup in addition to the hardcoded defaults
+  - Brigtness adjustments no longer distort colors
+  - Fixed race in sorting systray icons by name
+  - Fixed desktop entry parsing (issue #570)
+  - tint2conf:
+    - Applications are now sorted correctly
+    - Avoid duplicate icon themes due to symlinks
+    - Avoid loading desktop files marked as NoDisplay
+- Enhancements:
+  - Launcher icon paths are now cached, which greatly improves loading time for tint2 and tint2conf.
+    The correct icon should be found even if you change the icon theme or install a new theme.
+    If this is not the case, delete the file ~/.cache/tint2/icon.cache, restart tint2 and please file a bug report
+    indicating the application name and the icon theme name.
+  - Fallback icon themes are loaded lazily to speed up tint2 and tint2conf startup
+  - A better Name and GenericName is used in the tint2 and tint2conf .desktop files
+  - tint2conf:
+    - Allows selection of themes from /usr/share
+    - Menu reorganization (thanks @Vladimir-csp for feedback)
+    - Icon themes are now sorted in the displayed list
+    - Updated ru translation (thanks @Vladimir-csp)
+
+2016-01-29 0.12.7
+- Fixes:
+  - Fix crash caused by race when reading inconsistent values for _NET_CURRENT_DESKTOP and _NET_NUMBER_OF_DESKTOPS
+  - Fix regression (all desktop tasks not working)
+  - Fix small memory leak in launcher
+
+2016-01-25 0.12.6
+- Fixes:
+  - Fix crash on 32-bit systems (issue #546)
+  - Fix compilation on Slackware (issue #547)
+  - Terminal color reset code moved to the same line to prevent interference with logging (issue #545)
+- Enhancements:
+  - Executor now sends click coordinates via environment variables (issue #544)
+
 2016-01-24 0.12.5
 - Fixes:
   - Fix rendering corruption triggered occasionally when the compositor is disabled (regression in 0.12.4)

INSTALL.txt

@@ -1,10 +0,0 @@
-To build and install tint2 you need CMake.
-These steps should be enough for building tint2:
-
-mkdir build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=/usr ../
-make
-sudo make install
-
-To see additional options you can set at the 'cmake' step, run 'cmake -L ../'

README.md

@@ -1,33 +1,37 @@
-# New stable release: 0.12.5
+# Latest stable release: 0.14.1
-Changes: https://gitlab.com/o9000/tint2/blob/0.12.5/ChangeLog
+Changes: https://gitlab.com/o9000/tint2/blob/0.14.1/ChangeLog
 
-Documentation: https://gitlab.com/o9000/tint2/wikis/Configure
+Documentation: [doc/tint2.md](doc/tint2.md)
+
+Compile it with (after you install the [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 
-Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 0.12.5
+git checkout 0.14.1
 mkdir build
 cd build
 cmake ..
 make -j4
-./tint2 &
-./src/tint2conf/tint2conf &
 ```
 
-To install from source, also run (as root):
+To install, run (as root):
+
 ```
 make install
+update-icon-caches /usr/local/share/icons/hicolor
+update-mime-database /usr/local/share/mime
 ```
 
+And then you can run the panel `tint2` and the configuration program `tint2conf`.
+
 Please report any problems to https://gitlab.com/o9000/tint2/issues. Your feedback is much appreciated.
 
 P.S. GitLab is now the official location of the tint2 project, migrated from Google Code, which is shutting down. In case you are wondering why not GitHub, BitBucket etc., we chose GitLab because it is open source, it is mature and works well, looks cool and has a very nice team.
 
 # What is tint2?
 
-tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm http://code.google.com/p/ttm/.
+tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm https://code.google.com/p/ttm/.
 
 # Features
 
@@ -50,15 +54,21 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
 # How do I ...
 
   * [Install](https://gitlab.com/o9000/tint2/wikis/Install)
-  * [Configure](https://gitlab.com/o9000/tint2/wikis/Configure)
+  * [Configure](https://gitlab.com/o9000/tint2/blob/master/doc/tint2.md)
   * [Add applet not supported by tint2](https://gitlab.com/o9000/tint2/wikis/ThirdPartyApplets)
   * [Other frequently asked questions](https://gitlab.com/o9000/tint2/wikis/FAQ)
   * [Obtain a stack trace when tint2 crashes](https://gitlab.com/o9000/tint2/wikis/Debug)
 
+# Known issues
+
+  * Graphic glitches on Intel graphics cards can be avoided by changing the acceleration method to UXA ([issue 595](https://gitlab.com/o9000/tint2/issues/595))
+  * Window managers that do not follow exactly the EWMH specification might not interact well with tint2 (known issues for [awesome](https://gitlab.com/o9000/tint2/issues/385), [bspwm](https://gitlab.com/o9000/tint2/issues/524). [openbox-multihead](https://gitlab.com/o9000/tint2/issues/456))
+  * Full transparency requires a compositor such as Compton (if not provided already by the window manager, as in Compiz/Unity, KDE or XFCE)
+
 # How can I help out?
 
   * Report bugs and ask questions on the [issue tracker](https://gitlab.com/o9000/tint2/issues);
-  * Contribute to the development by helping us fix bugs and suggesting new features.
+  * Contribute to the development by helping us fix bugs and suggesting new features. Please read the contribution guide: [CONTRIBUTING.md](CONTRIBUTING.md)
 
 # Links
   * Home page: https://gitlab.com/o9000/tint2
@@ -67,15 +77,19 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
   * Downloads: https://gitlab.com/o9000/tint2-archive/tree/master or https://code.google.com/p/tint2/downloads/list
   * Old project location (inactive): https://code.google.com/p/tint2
 
-# Releases
-  * Latest stable release: tint2 0.12.4 (January 2016)
-
 # Screenshots
 
-## Default config of the latest release:
+## Default config:
 
 ![Screenshot_2016-01-23_14-42-57](https://gitlab.com/o9000/tint2/uploads/948fa74eca60864352a033580350b4c3/Screenshot_2016-01-23_14-42-57.png)
 
-## Various configurations:
+## Various configs:
 
 ![screenshot](https://gitlab.com/o9000/tint2/wikis/screenshot.png)
+
+## Demos
+
+* [Compact panel, separator, color gradients](https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.0.gif)
+* [Executor](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.4.gif)
+* [Mouse over effects](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.3.gif)
+* [Distribute size between taskbars, freespace](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif)

README.source

@@ -1,3 +0,0 @@
-DEPENDENCIES:
-cairo (with X support), pango, glib2, libX11, libXinerama, libXrandr, libXrender, libXcomposite, libXdamage, imlib2 (with X support)
-you might need -dev packages on Debian

doc/footer.html

@@ -0,0 +1,2 @@
+</body>
+</html>

doc/generate-doc.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# You can install md2man with gem install md2man. You need gem and ruby-dev.
+
+set -e
+set -x
+
+md2man-roff tint2.md > tint2.1
+
+cat header.html > manual.html
+cat tint2.md | sed 's/^# TINT2 .*$/# TINT2/g' | md2man-html >> manual.html
+cat footer.html >> manual.html
+
+cat header.html > readme.html
+cat ../README.md | sed 's|doc/tint2.md|manual.html|g' | md2man-html >> readme.html
+cat footer.html >> readme.html

doc/header.html

@@ -0,0 +1,201 @@
+<!DOCTYPE html>
+<html>
+<head>
+<head>
+<style type="text/css">
+html,
+body {
+  color: #333;
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 1.6;
+  word-wrap: break-word;
+  max-width: 1000px;
+  margin: 0 auto;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin-top: 1em;
+  margin-bottom: 1rem;
+}
+
+h1 {
+  font-size: 1.8rem;
+  font-weight: normal;
+  font-style: normal;
+  border-bottom: 1px solid #eee;
+}
+
+h2 {
+  font-size: 1.5rem;
+  font-weight: normal;
+  font-style: normal;
+  border-bottom: 1px solid #eee;
+}
+
+h3 {
+  font-size: 1.2rem;
+  font-weight: bold;
+  font-style: normal;
+}
+
+h4 {
+  font-size: 1rem;
+  font-weight: bold;
+  font-style: normal;
+}
+
+h5 {
+  font-size: 1rem;
+  font-weight: bold;
+  font-style: italic;
+}
+
+h6 {
+  font-size: 1rem;
+  font-weight: normal;
+  font-style: italic;
+}
+
+
+code,
+kbd,
+pre {
+  font-family: monospace;
+  font-size: 1em;
+}
+
+table {
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+
+td,
+th {
+  padding: 0;
+}
+
+asdff {
+  box-sizing: border-box;
+}
+
+a {
+  color: #46c;
+  text-decoration: none;
+}
+
+a:hover,
+a:active {
+  text-decoration: underline;
+}
+
+a:not([href]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+hr {
+  box-sizing: content-box;
+  height: 0;
+  margin: 15px 0;
+  overflow: hidden;
+  background: transparent;
+  border: 0;
+  border-bottom: 1px solid #ddd;
+}
+
+hr::before {
+  display: table;
+  content: "";
+}
+
+hr::after {
+  display: table;
+  clear: both;
+  content: "";
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 0.7em;
+}
+
+blockquote {
+  margin: 0;
+}
+
+code {
+  font-family: "Liberation Mono", monospace;
+  font-size: 1em;
+}
+
+pre {
+  margin-top: 0;
+  margin-bottom: 0;
+  font: 1em "Liberation Mono", monospace;
+  overflow-x: auto;
+}
+
+blockquote {
+  padding: 0 15px;
+  color: #777;
+  border-left: 4px solid #ddd;
+}
+
+blockquote>:first-child {
+  margin-top: 0;
+}
+
+blockquote>:last-child {
+  margin-bottom: 0;
+}
+
+table {
+  display: block;
+  width: 100%;
+  overflow: auto;
+  word-break: normal;
+}
+
+table th {
+  font-weight: bold;
+}
+
+table th,
+table td {
+  padding: 6px 13px;
+  border: 1px solid #ddd;
+}
+
+table tr {
+  background-color: #fff;
+  border-top: 1px solid #ccc;
+}
+
+table tr:nth-child(2n) {
+  background-color: #f8f8f8;
+}
+
+code {
+  padding: 0.2em;
+  margin: 0;
+  font-size: 0.95em;
+  background-color: #eee;
+}
+
+pre {
+  word-wrap: normal;
+  background-color: #eee;
+  margin: 1em 0;
+  padding: 0.2em;
+}
+
+
+</style>
+</head>
+<body>

doc/manual.html

@@ -0,0 +1,688 @@
+<!DOCTYPE html>
+<html>
+<head>
+<head>
+<style type="text/css">
+html,
+body {
+  color: #333;
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 1.6;
+  word-wrap: break-word;
+  max-width: 1000px;
+  margin: 0 auto;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin-top: 1em;
+  margin-bottom: 1rem;
+}
+
+h1 {
+  font-size: 1.8rem;
+  font-weight: normal;
+  font-style: normal;
+  border-bottom: 1px solid #eee;
+}
+
+h2 {
+  font-size: 1.5rem;
+  font-weight: normal;
+  font-style: normal;
+  border-bottom: 1px solid #eee;
+}
+
+h3 {
+  font-size: 1.2rem;
+  font-weight: bold;
+  font-style: normal;
+}
+
+h4 {
+  font-size: 1rem;
+  font-weight: bold;
+  font-style: normal;
+}
+
+h5 {
+  font-size: 1rem;
+  font-weight: bold;
+  font-style: italic;
+}
+
+h6 {
+  font-size: 1rem;
+  font-weight: normal;
+  font-style: italic;
+}
+
+
+code,
+kbd,
+pre {
+  font-family: monospace;
+  font-size: 1em;
+}
+
+table {
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+
+td,
+th {
+  padding: 0;
+}
+
+asdff {
+  box-sizing: border-box;
+}
+
+a {
+  color: #46c;
+  text-decoration: none;
+}
+
+a:hover,
+a:active {
+  text-decoration: underline;
+}
+
+a:not([href]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+hr {
+  box-sizing: content-box;
+  height: 0;
+  margin: 15px 0;
+  overflow: hidden;
+  background: transparent;
+  border: 0;
+  border-bottom: 1px solid #ddd;
+}
+
+hr::before {
+  display: table;
+  content: "";
+}
+
+hr::after {
+  display: table;
+  clear: both;
+  content: "";
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 0.7em;
+}
+
+blockquote {
+  margin: 0;
+}
+
+code {
+  font-family: "Liberation Mono", monospace;
+  font-size: 1em;
+}
+
+pre {
+  margin-top: 0;
+  margin-bottom: 0;
+  font: 1em "Liberation Mono", monospace;
+  overflow-x: auto;
+}
+
+blockquote {
+  padding: 0 15px;
+  color: #777;
+  border-left: 4px solid #ddd;
+}
+
+blockquote>:first-child {
+  margin-top: 0;
+}
+
+blockquote>:last-child {
+  margin-bottom: 0;
+}
+
+table {
+  display: block;
+  width: 100%;
+  overflow: auto;
+  word-break: normal;
+}
+
+table th {
+  font-weight: bold;
+}
+
+table th,
+table td {
+  padding: 6px 13px;
+  border: 1px solid #ddd;
+}
+
+table tr {
+  background-color: #fff;
+  border-top: 1px solid #ccc;
+}
+
+table tr:nth-child(2n) {
+  background-color: #f8f8f8;
+}
+
+code {
+  padding: 0.2em;
+  margin: 0;
+  font-size: 0.95em;
+  background-color: #eee;
+}
+
+pre {
+  word-wrap: normal;
+  background-color: #eee;
+  margin: 1em 0;
+  padding: 0.2em;
+}
+
+
+</style>
+</head>
+<body>
+<h1 id="tint2"><span class="md2man-title">TINT2</span><a name="tint2" href="#tint2" class="md2man-permalink" title="permalink"></a></h1><h2 id="name">NAME<a name="name" href="#name" class="md2man-permalink" title="permalink"></a></h2><p>tint2 - lightweight panel/taskbar</p><h2 id="description">DESCRIPTION<a name="description" href="#description" class="md2man-permalink" title="permalink"></a></h2><p>tint2 is a simple panel/taskbar made for modern X window managers.
+It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.).</p><p>Features:</p>
+<ul>
+<li>Panel with taskbar, system tray, clock and launcher icons;</li>
+<li>Easy to customize: color/transparency on fonts, icons, borders and backgrounds;</li>
+<li>Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;</li>
+<li>Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;</li>
+<li>Customizable mouse events.</li>
+</ul>
+<p>Goals:</p>
+<ul>
+<li>Be unintrusive and light (in terms of memory, CPU and aesthetic);</li>
+<li>Follow the freedesktop.org specifications;</li>
+<li>Make certain workflows, such as multi-desktop and multi-monitor, easy to use.</li>
+</ul>
+<h2 id="synopsis">SYNOPSIS<a name="synopsis" href="#synopsis" class="md2man-permalink" title="permalink"></a></h2><p><code>tint2 [OPTION...]</code></p><h2 id="options">OPTIONS<a name="options" href="#options" class="md2man-permalink" title="permalink"></a></h2><dl><dt><code>-c path_to_config_file</code></dt><dd>Specifies which configuration file to use instead of the default.</dd></dl><dl><dt><code>-v, --version</code></dt><dd>Prints version information and exits.</dd></dl><dl><dt><code>-h, --help</code></dt><dd>Display this help and exits.</dd></dl><h2 id="configuration">CONFIGURATION<a name="configuration" href="#configuration" class="md2man-permalink" title="permalink"></a></h2><h3 id="table-of-contents">Table of contents<a name="table-of-contents" href="#table-of-contents" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><a href="#introduction">Introduction</a></p></li>
+<li><p><a href="#backgrounds-and-borders">Backgrounds and borders</a></p></li>
+<li><p><a href="#gradients">Gradients</a></p></li>
+<li><p><a href="#panel">Panel</a></p></li>
+<li><p><a href="#launcher">Launcher</a></p></li>
+<li><p><a href="#taskbar-pager">Taskbar/Pager</a></p></li>
+<li><p><a href="#taskbar-buttons">Taskbar buttons</a></p></li>
+<li><p><a href="#mouse-actions-for-taskbar-buttons">Mouse actions for taskbar buttons</a></p></li>
+<li><p><a href="#system-tray">System tray</a></p></li>
+<li><p><a href="#clock">Clock</a></p></li>
+<li><p><a href="#tooltip">Tooltip</a></p></li>
+<li><p><a href="#battery">Battery</a></p></li>
+<li><p><a href="#executor">Executor</a></p></li>
+<li><p><a href="#button">Button</a></p></li>
+<li><p><a href="#separator">Separator</a></p></li>
+<li><p><a href="#example-configuration">Example configuration</a></p></li>
+</ul>
+<h3 id="introduction">Introduction<a name="introduction" href="#introduction" class="md2man-permalink" title="permalink"></a></h3><p>These are instructions for configuring tint2 directly by editing its config file.
+You may also use instead the graphical interface <code>tint2conf</code>.</p><p>The first time you run tint2, it will create the config file in <code>$HOME/.config/tint2/tint2rc</code> (This applies if you have done a clean install. Running tint2 in the source directory without doing &#39;make install&#39; will not create the config file.)</p><p>You can also specify another file on the command line with the -c option, e.g.: <code>tint2 -c $HOME/tint2.conf</code>. This can be used to run multiple instances of tint2 that use different settings.</p><p>If you change the config file while tint2 is running, the command <code>killall -SIGUSR1 tint2</code> will force tint2 to reload it.</p><p>All the configuration options supported in the config file are listed below.
+Try to respect as much as possible the order of the options as given below.</p><h3 id="backgrounds-and-borders">Backgrounds and borders<a name="backgrounds-and-borders" href="#backgrounds-and-borders" class="md2man-permalink" title="permalink"></a></h3><p>The tint2 config file starts with the options defining background elements with borders:</p>
+<ul>
+<li><p><code>rounded = number_of_pixels</code> : the corner radius</p></li>
+<li><p><code>border_width = integer</code> : the border width in pixels</p></li>
+<li><p><code>border_sides = LRTB</code> : the sides to draw the border on (left, right, top, bottom). If not specified, all sides are used. <em>(since 0.12.12)</em></p></li>
+<li><p><code>background_color = color opacity</code></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz).</li>
+</ul></li>
+<li><p><code>border_color = color opacity</code></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
+</ul></li>
+<li><p><code>background_color_hover = color opacity</code> (default: same as <code>background_color</code>) <em>(since 0.12.3)</em></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)</li>
+</ul></li>
+<li><p><code>border_color_hover = color opacity</code> (default: same as <code>border_color</code>) <em>(since 0.12.3)</em></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
+</ul></li>
+<li><p><code>background_color_pressed = color opacity</code> (default: same as <code>background_color_hover</code>) <em>(since 0.12.3)</em></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)</li>
+</ul></li>
+<li><p><code>border_color_pressed = color opacity</code> (default: same as <code>border_color_hover</code>) <em>(since 0.12.3)</em></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
+</ul></li>
+</ul>
+<p>You can define as many backgrounds as you want. For example, the following config defines two backgrounds:</p><pre class="highlight plaintext"><code>rounded = 1
+border_width = 0
+background_color = #282828 100
+border_color = #000000 0
+
+rounded = 1
+border_width = 0
+background_color = #f6b655 90
+border_color = #cccccc 40
+</code></pre>
+<p>tint2 automatically identifies each background with a number starting from 1 (1, 2, ...).
+Afterwards, you can apply a background to objects (panel, taskbar, task, clock, systray) using the background id, for example:</p><pre class="highlight plaintext"><code>panel_background_id = 1
+taskbar_background_id = 0
+task_background_id = 0
+task_active_background_id = 2
+systray_background_id = 0
+clock_background_id = 0
+</code></pre>
+<p>Identifier 0 refers to a special background which is fully transparent, identifier 1 applies the first background defined in the config file etc.</p><h3 id="gradients">Gradients<a name="gradients" href="#gradients" class="md2man-permalink" title="permalink"></a></h3><p>(Available since 0.13.0)</p><p>Backgrounds also allow specifying gradient layers
+that are drawn on top of the solid color background.</p><p>First the user must define one or more gradients in the config file,
+each starting with <code>gradient = TYPE</code>. These must be added before backgrounds.</p><p>Then gradients can be added by index to backgrounds,
+using the <code>gradient_id = INDEX</code>, <code>gradient_id_hover = INDEX</code> and
+<code>gradient_id_pressed = INDEX</code>, where <code>INDEX</code> is
+the gradient index, starting from 1.</p><h4 id="gradient-types">Gradient types<a name="gradient-types" href="#gradient-types" class="md2man-permalink" title="permalink"></a></h4><p>Gradients vary the color between fixed control points:
+* vertical gradients: top-to-bottom;
+* horizontal gradients: left-to-right;
+* radial gradients: center-to-corners.</p><p>The user must specify the start and end colors, and can optionally add extra color stops in between
+using the <code>color_stop</code> option, as explained below.</p><h5 id="vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors">Vertical gradient, with color varying from the top edge to the bottom edge, two colors<a name="vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors" href="#vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>gradient = vertical
+start_color = #rrggbb opacity
+end_color = #rrggbb opacity
+</code></pre>
+<h5 id="horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors">Horizontal gradient, with color varying from the left edge to the right edge, two colors<a name="horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors" href="#horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>gradient = horizontal
+start_color = #rrggbb opacity
+end_color = #rrggbb opacity
+</code></pre>
+<h5 id="radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors">Radial gradient, with color varying from the center to the corner, two colors:<a name="radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors" href="#radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>gradient = radial
+start_color = #rrggbb opacity
+end_color = #rrggbb opacity
+</code></pre>
+<h5 id="adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points">Adding extra color stops (0% and 100% remain fixed, more colors at x% between the start and end control points)<a name="adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points" href="#adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>color_stop = percentage #rrggbb opacity
+</code></pre>
+<h4 id="gradient-examples">Gradient examples<a name="gradient-examples" href="#gradient-examples" class="md2man-permalink" title="permalink"></a></h4><pre class="highlight plaintext"><code># Gradient 1: thin film effect
+gradient = horizontal
+start_color = #111122 30
+end_color = #112211 30
+color_stop = 60 #221111 30
+
+# Gradient 2: radial glow
+gradient = radial
+start_color = #ffffff 20
+end_color = #ffffff 0
+
+# Gradient 3: elegant black
+gradient = vertical
+start_color = #444444 100
+end_color = #222222 100
+
+# Gradient 4: elegant black
+gradient = horizontal
+start_color = #111111 100
+end_color = #222222 100
+
+# Background 1: Active desktop name
+rounded = 2
+border_width = 1
+border_sides = TBLR
+background_color = #555555 10
+border_color = #ffffff 60
+background_color_hover = #555555 10
+border_color_hover = #ffffff 60
+background_color_pressed = #555555 10
+border_color_pressed = #ffffff 60
+gradient_id = 3
+gradient_id_hover = 4
+gradient_id_pressed = 2
+
+[...]
+</code></pre>
+<h3 id="panel">Panel<a name="panel" href="#panel" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>panel_items = LTSBC</code> defines the items tint2 will show and the order of those items. Each letter refers to an item, defined as:</p>
+<ul>
+<li><code>L</code> shows the Launcher</li>
+<li><code>T</code> shows the Taskbar</li>
+<li><code>S</code> shows the Systray (also called notification area)</li>
+<li><code>B</code> shows the Battery status</li>
+<li><code>C</code> shows the Clock</li>
+<li><code>F</code> adds an extensible spacer (freespace). You can specify more than one. Has no effect if <code>T</code> is also present. <em>(since 0.12)</em></li>
+<li><code>E</code> adds an executor plugin. You can specify more than one. <em>(since 0.12.4)</em></li>
+<li><code>P</code> adds a push button. You can specify more than one. <em>(since 0.14)</em></li>
+<li><code>:</code> adds a separator. You can specify more than one. <em>(since 0.13.0)</em></li>
+</ul>
+<p>For example, <code>panel_items = STC</code> will show the systray, the taskbar and the clock (from left to right).</p></li>
+<li><p><code>panel_monitor = monitor (all or 1 or 2 or ...)</code> : Which monitor tint2 draws the panel on</p>
+<ul>
+<li>The first monitor is <code>1</code></li>
+<li>Use <code>panel_monitor = all</code> to get a separate panel per monitor</li>
+</ul></li>
+<li><p><code>primary_monitor_first = boolean (0 or 1)</code> : Place the primary monitor before all the other monitors in the list. <em>(since 0.12.4)</em></p></li>
+</ul>
+<p><img src="images/panel_padding.jpg" alt=""></p>
+<ul>
+<li><p><code>panel_position = vertical_position horizontal_position orientation</code></p>
+<ul>
+<li><code>vertical_position</code> is one of: <code>bottom</code>, <code>top</code>, <code>center</code></li>
+<li><code>horizontal_position</code> is one of: <code>left</code>, <code>right</code>, <code>center</code></li>
+<li><code>orientation</code> is one of: <code>horizontal</code>, <code>vertical</code></li>
+</ul></li>
+<li><p><code>panel_size = width height</code></p>
+<ul>
+<li><code>width</code> and <code>height</code> can be specified without units (e.g. <code>123</code>) as pixels, or followed by <code>%</code> as percentages of the monitor size (e.g. <code>50%</code>). Use <code>100%</code> for full monitor width/height.
+Example:</li>
+</ul></li>
+</ul>
+<pre class="highlight plaintext"><code># The panel's width is 94% the size of the monitor, the height is 30 pixels:
+panel_size = 94% 30
+</code></pre>
+
+<ul>
+<li><p><code>panel_shrink = boolean (0 or 1)</code> : If set to 1, the panel will shrink to a compact size dynamically. <em>(since 0.13)</em></p></li>
+<li><p><code>panel_margin = horizontal_margin vertical_margin</code> : The margins define the distance between the panel and the horizontal/vertical monitor edge. Use <code>0</code> to obtain a panel with the same size as the edge of the monitor (no margin).</p></li>
+</ul>
+<p><img src="images/panel_size_margin.jpg" alt=""></p>
+<ul>
+<li><code>panel_padding = horizontal_padding vertical_padding spacing</code> : Please refer to the image below.</li>
+</ul>
+<p><img src="images/panel_padding.jpg" alt=""></p>
+<ul>
+<li><p><code>font_shadow = boolean (0 or 1)</code></p></li>
+<li><p><code>panel_background_id = integer</code> : Which background to use for the panel.</p></li>
+<li><p><code>wm_menu = boolean (0 or 1)</code> : Defines if tint2 forwards unhandled mouse events to your window manager. Useful for window managers such as openbox, which display the start menu if you right click on the desktop.</p></li>
+<li><p><code>panel_dock = boolean (0 or 1)</code> : Defines if tint2 is placed into the window manager&#39;s dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).</p></li>
+<li><p><code>panel_layer = bottom/normal/top</code> : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.</p></li>
+<li><p><code>strut_policy = follow_size/minimum/none</code> : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.</p>
+<ul>
+<li><code>follow_size</code> means that the maximized windows always resize to have a common edge with tint2.</li>
+<li><code>minimum</code> means that the maximized windows always expand to have a common edge with the hidden panel. This is useful if the <code>autohide</code> option is enabled.</li>
+<li><code>none</code> means that the maximized windows use the full screen size.</li>
+</ul></li>
+<li><p><code>panel_window_name = string</code> : Defines the name of the panel&#39;s window. Default: &#39;tint2&#39;. <em>(since 0.12)</em></p></li>
+<li><p><code>disable_transparency = boolean (0 or 1)</code> : Whether to disable transparency instead of detecting if it is supported. Useful on broken graphics stacks. <em>(since 0.12)</em></p></li>
+<li><p><code>mouse_effects = boolean (0 or 1)</code> : Whether to enable mouse hover effects for clickable items. <em>(since 0.12.3)</em></p></li>
+<li><p><code>mouse_hover_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency on mouse hover (works only when mouse_effects = 1).` <em>(since 0.12.3)</em></p></li>
+<li><p><code>mouse_pressed_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency on mouse press (works only when mouse_effects = 1).` <em>(since 0.12.3)</em></p></li>
+<li><p><code>autohide = boolean (0 or 1)</code> : Whether to enable panel hiding when the mouse cursor exists the panel.</p></li>
+<li><p><code>autohide_show_timeout = float</code> : Show timeout in seconds after the mouse cursor enters the panel. Use &#39;.&#39; as decimal separator.</p></li>
+<li><p><code>autohide_hide_timeout = float</code> : Hide timeout in seconds after the mouse cursor exits the panel. Use &#39;.&#39; as decimal separator.</p></li>
+<li><p><code>autohide_height = integer</code> : panel height (width for vertical panels) in hidden mode.</p></li>
+</ul>
+<h3 id="launcher">Launcher<a name="launcher" href="#launcher" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>launcher_item_app = path_to_application</code> : Each <code>launcher_item_app</code> must be a file path to a .desktop file following the freedesktop.org <a href="http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html">specification</a>. The paths may begin with <code>~</code>, which is expanded to the path of the user&#39;s home directory. If only a file name is specified, the file is search in the standard application directories (<code>$XDG_DATA_HOME/applications</code>, <code>~/.local/share/applications</code>, <code>$XDG_DATA_DIRS/applications</code>, <code>/usr/local/share/applications</code>, <code>/usr/share/applications</code>, <code>/opt/share/applications</code>).</p></li>
+<li><p><code>launcher_apps_dir = path_to_directory</code> : Specifies a path to a directory from which the launcher is loading all .desktop files (all subdirectories are explored recursively). Can be used multiple times. The path may begin with <code>~</code>, which is expanded to the path of the user&#39;s home directory. <em>(since 0.12)</em></p></li>
+<li><p><code>launcher_background_id = integer</code> : Defines which background to use.</p></li>
+<li><p><code>launcher_icon_background_id = integer</code> : Defines which background to use for icons.</p></li>
+<li><p><code>launcher_padding = horizontal_padding vertical_padding spacing</code></p></li>
+<li><p><code>launcher_icon_size = integer</code> : The launcher icon size, in pixels.</p></li>
+<li><p><code>launcher_icon_theme = name_of_theme</code> : (Optional) Uses the specified icon theme to display shortcut icons. Note that tint2 will detect and use the icon theme of your desktop if you have an XSETTINGS manager running (which you probably do), unless <code>launcher_icon_theme_override = 1</code>.</p></li>
+<li><p><code>launcher_icon_theme_override = boolean (0 or 1)</code> : Whether <code>launcher_icon_theme</code> overrides the value obtained from the XSETTINGS manager. <em>(since 0.12)</em></p></li>
+<li><p><code>launcher_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency.</p></li>
+<li><p><code>launcher_tooltip = boolean (0 or 1)</code> : Whether to show tooltips for the launcher icons.</p></li>
+<li><p><code>startup_notifications = boolean (0 or 1)</code> : Whether to show startup notifications when starting applications from the launcher. <em>(since 0.12)</em></p></li>
+</ul>
+<h3 id="taskbar-pager">Taskbar / Pager<a name="taskbar-pager" href="#taskbar-pager" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>taskbar_mode = single_desktop/multi_desktop</code></p>
+<ul>
+<li><code>single_desktop</code> : Shows a normal taskbar listing the tasks running on the current virtual desktop (also known as &#39;workspace&#39;);</li>
+<li><code>multi_desktop</code> : Pager like capability. Shows multiple taskbars, one per virtual desktop, with which:
+
+<ul>
+<li>You can drag-and-drop tasks between virtual desktops;</li>
+<li>You can switch between virtual desktops.</li>
+</ul></li>
+</ul></li>
+<li><p><code>taskbar_hide_if_empty = boolean (0 or 1)</code> : If enabled, in multi-desktop mode the taskbars corresponding to empty desktops different from the current desktop are hidden. <em>(since 0.13)</em></p></li>
+<li><p><code>taskbar_distribute_size = boolean (0 or 1)</code> : If enabled, in multi-desktop mode distributes between taskbars the available size proportionally to the number of tasks. Default: disabled. <em>(since 0.12)</em></p></li>
+<li><p><code>taskbar_padding = horizontal_padding vertical_padding spacing</code></p></li>
+</ul>
+<p><img src="images/taskbar_padding.jpg" alt=""></p>
+<ul>
+<li><p><code>taskbar_background_id = integer</code> : Which background to use</p></li>
+<li><p><code>taskbar_active_background_id = integer</code> : Which background to use for the taskbar of the current virtual desktop.</p></li>
+<li><p><code>taskbar_hide_inactive_tasks = boolean (0 or 1)</code> :  If enabled, the taskbar shows only the active task. <em>(since 0.12)</em></p></li>
+<li><p><code>taskbar_hide_different_monitor = boolean (0 or 1)</code> :  If enabled, the taskbar shows only the tasks from the current monitor. Useful when running different tint2 instances on different monitors, each one having its own config. <em>(since 0.12)</em></p></li>
+<li><p><code>taskbar_always_show_all_desktop_tasks = boolean (0 or 1)</code> :  Has effect only if <code>taskbar_mode = multi_desktop</code>. If enabled, tasks that appear on all desktops are shown on all taskbars. Otherwise, they are shown only on the taskbar of the current desktop. <em>(since 0.12.4)</em></p></li>
+<li><p><code>taskbar_sort_order = none/title/center</code> : Specifies the sort order of the tasks on the taskbar.  <em>(since 0.12)</em></p>
+<ul>
+<li><code>none</code> : No sorting. New tasks are simply appended at the end of the taskbar when they appear.</li>
+<li><code>title</code> : Sorts the tasks by title.</li>
+<li><code>center</code> : Sorts the tasks by their window centers.</li>
+<li><code>mru</code> : Shows the most recently used tasks first. <em>(since 0.12.4)</em></li>
+<li><code>lru</code> : Shows the most recently used tasks last. <em>(since 0.12.4)</em></li>
+</ul></li>
+<li><p><code>task_align = left/center/right</code> : Specifies the alignment of the tasks on the taskbar. Default: left.</p></li>
+<li><p><code>taskbar_name = boolean (0 or 1)</code> :  Whether to show the virtual desktop name in the taskbar.</p></li>
+<li><p><code>taskbar_name_padding = padding</code> :  Padding for the virtual desktop name.</p></li>
+<li><p><code>taskbar_name_background_id = integer</code> :  Which background to use for the desktop name.</p></li>
+<li><p><code>taskbar_name_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> :  Font configuration for the desktop name.</p></li>
+<li><p><code>taskbar_name_font_color = color opacity (0 to 100)</code> :  Font color for the desktop name.</p></li>
+<li><p><code>taskbar_name_active_background_id = integer</code> :  Which background to use for the name of the current desktop.</p></li>
+<li><p><code>taskbar_name_active_font_color = color opacity (0 to 100)</code> :  Font color for the name of the current desktop.</p></li>
+</ul>
+<h1 id="taskbar-buttons">Taskbar buttons<a name="taskbar-buttons" href="#taskbar-buttons" class="md2man-permalink" title="permalink"></a></h1><p>The following options configure the task buttons in the taskbar:</p>
+<ul>
+<li><p><code>task_icon = boolean (0 or 1)</code> : Whether to display the task icon. There is no explicit option to control the task icon size; it depends on the vertical padding set with <code>task_padding</code>.</p></li>
+<li><p><code>task_text = boolean (0 or 1)</code> : Whether to display the task text.</p></li>
+<li><p><code>task_centered = boolean (0 or 1)</code> : Whether the task text is centered.</p></li>
+<li><p><code>task_tooltip = boolean (0 or 1)</code> : Whether to show tooltips for tasks.</p></li>
+<li><p><code>task_maximum_size = width height</code></p>
+<ul>
+<li><code>width</code> is used with horizontal panels to limit the size of the tasks. Use <code>width = 0</code> to get full taskbar width.</li>
+<li><code>height</code> is used with vertical panels.</li>
+</ul></li>
+<li><p><code>task_padding = horizontal_padding vertical_padding spacing</code></p></li>
+<li><p><code>urgent_nb_of_blink = integer</code> : Number of blinks on &#39;get attention&#39; events.</p></li>
+</ul>
+<p><img src="images/task_padding.jpg" alt=""></p>
+<ul>
+<li><p><code>task_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+<li><p><code>task_font_color = color opacity (0 to 100)</code></p></li>
+<li><p><code>task_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjust the task icon&#39;s color and transparency.</p></li>
+<li><p><code>task_background_id = integer</code> : Which background to use for non selected tasks</p></li>
+</ul>
+<dl><dt>For the next 3 options STATUS can be <code>active</code> / <code>iconified</code>  / <code>urgent</code>:</dt><dd>* <code>task_STATUS_font_color = color opacity (0 to 100)</code></dd></dl>
+<ul>
+<li><p><code>task_STATUS_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the task icon&#39;s color and transparency.</p></li>
+<li><p><code>task_STATUS_background_id = integer</code> : Which background to use for the task.</p></li>
+</ul>
+<h3 id="mouse-actions-for-taskbar-buttons">Mouse actions for taskbar buttons<a name="mouse-actions-for-taskbar-buttons" href="#mouse-actions-for-taskbar-buttons" class="md2man-permalink" title="permalink"></a></h3><p>The possible mouse events are: <code>left, middle, right, scroll_up, scroll_down</code>.</p><p>The possible mouse actions are: <code>none, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task</code>.</p><p>Use <code>mouse_event = action</code> to customize mouse actions. Example:
+<code>
+  mouse_middle = none
+  mouse_right = close
+  mouse_scroll_up = toggle
+  mouse_scroll_down = iconify
+</code></p><dl><dt>The action semantics:</dt><dd>* <code>none</code> : If <code>wm_menu = 1</code> is set, the mouse event is forwarded to the window manager. Otherwise it is ignored.
+* <code>close</code> : close the task
+* <code>toggle</code> : toggle the task
+* <code>iconify</code> : iconify (minimize) the task
+* <code>toggle_iconify</code> : toggle or iconify the task
+* <code>maximize_restore</code> : maximized or minimized the task
+* <code>shade</code> : shades (collapses) the task
+* <code>desktop_left</code> : send the task to the desktop on the left
+* <code>desktop_right</code> : send the task to the desktop on the right
+* <code>next_task</code> : send the focus to next task
+* <code>prev_task</code> : send the focus to previous task</dd></dl><h3 id="system-tray">System Tray<a name="system-tray" href="#system-tray" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>systray_padding = horizontal_padding vertical_padding spacing</code></p></li>
+<li><p><code>systray_background_id = integer</code> : Which background to use.</p></li>
+<li><p><code>systray_sort = ascending/descending/left2right/right2left</code> : Specifies the sorting order for the icons in the systray: in ascending/descending alphabetical order of the icon title, or always add icons to the right/left (note that with <code>left2right</code> or <code>right2left</code> the order can be different on panel restart).</p></li>
+<li><p><code>systray_icon_size = max_icon_size</code> : Set the maximum system tray icon size to <code>number</code>. Set to <code>0</code> for automatic icon sizing.</p></li>
+<li><p><code>systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjust the systray icons color and transparency.</p></li>
+<li><p><code>systray_monitor = integer (1, 2, ...)</code> :  On which monitor to draw the systray. The first monitor is <code>1</code>. <em>(since 0.12)</em></p></li>
+<li><p><code>systray_name_filter = string</code> :  Regular expression to identify icon names to be hidden. For example, <code>^audacious$</code> will hide icons with the exact name <code>audacious</code>, while <code>aud</code> will hide any icons having <code>aud</code> in the name. <em>(since 0.13.1)</em></p></li>
+</ul>
+<h3 id="clock">Clock<a name="clock" href="#clock" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>time1_format = %H:%M</code> : The format used by the first line of the clock.</p>
+<ul>
+<li><code>time1_format</code>, <code>time2_format</code> and <code>clock_tooltip</code> use the &#39;strftime&#39; syntax. More info can be found here: <a href="http://www.manpagez.com/man/3/strftime/">http://www.manpagez.com/man/3/strftime/</a></li>
+<li>To hide the clock, comment <code>time1_format</code> and <code>time2_format</code>.</li>
+</ul></li>
+<li><p><code>time1_timezone = :US/Hawaii</code></p>
+<ul>
+<li><code>time1_timezone</code>, <code>time2_timezone</code> and <code>clock_tooltip_timezone</code> can be used to specify a timezone. If you do not specify a value the system-wide timezone is used. The timezones can usually be found in <code>/usr/share/zoneinfo</code>. If your timezones are in a different directory, you need to specify the absolute path, e.g. <code>time1_timezone = :/different/zoneinfo/dir/US/Hawaii</code> Always prepend the timezone with a &#39;:&#39;</li>
+</ul></li>
+<li><p><code>time1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+<li><p><code>time2_format = %A %d %B</code></p></li>
+<li><p><code>time2_timezone = :Europe/Berlin</code></p></li>
+<li><p><code>time2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+<li><p><code>clock_font_color = color opacity (0 to 100)</code></p></li>
+<li><p><code>clock_padding = horizontal_padding vertical_padding</code></p></li>
+<li><p><code>clock_background_id = integer</code> : Which background to use</p></li>
+<li><p><code>clock_tooltip = %a, %d. %b %Y</code> : Format for the clock&#39;s tooltip.</p></li>
+<li><p><code>clock_tooltip_timezone = :UTC</code></p></li>
+<li><p><code>clock_lclick_command = text</code> : Command to execute on left click.</p></li>
+<li><p><code>clock_rclick_command = text</code> : Command to execute on right click.</p></li>
+<li><p><code>clock_mclick_command = text</code> : Command to execute on middle click. <em>(since 0.12.1)</em></p></li>
+<li><p><code>clock_uwheel_command = text</code> : Command to execute on wheel scroll up. <em>(since 0.12.1)</em></p></li>
+<li><p><code>clock_dwheel_command = text</code> : Command to execute on wheel scroll down. <em>(since 0.12.1)</em></p></li>
+</ul>
+<h3 id="tooltip">Tooltip<a name="tooltip" href="#tooltip" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>tooltip_padding = horizontal_padding vertical_padding</code></p></li>
+<li><p><code>tooltip_show_timeout = float</code> : Delay to show the tooltip in seconds. Use <code>.</code> as decimal separator.</p></li>
+<li><p><code>tooltip_hide_timeout = float</code> : Delay to hide the tooltip in seconds. Use <code>.</code> as decimal separator.</p></li>
+<li><p><code>tooltip_background_id = integer</code> : Which background to use for tooltips. Note that with fake transparency the alpha channel and corner radius options are not respected.</p></li>
+<li><p><code>tooltip_font_color = color opacity  (0 to 100)</code></p></li>
+<li><p><code>tooltip_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+</ul>
+<h3 id="battery">Battery<a name="battery" href="#battery" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>battery_hide = never/integer (0 to 100)</code> : At what battery percentage the battery item is hidden.</p></li>
+<li><p><code>battery_low_status = integer</code>: At what battery percentage the low command is executed.</p></li>
+<li><p><code>battery_low_cmd = notify-send &quot;battery low&quot;</code> : Command to execute when the battery is low.</p></li>
+<li><p><code>bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+<li><p><code>bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+<li><p><code>battery_font_color = color opacity (0 to 100)</code></p></li>
+<li><p><code>battery_padding = horizontal_padding vertical_padding</code></p></li>
+<li><p><code>battery_background_id = integer</code> : Which background to use for the battery.</p></li>
+<li><p><code>battery_tooltip_enabled = boolean (0 or 1)</code> : Enable/disable battery tooltips. <em>(since 0.12.3)</em></p></li>
+<li><p><code>battery_lclick_command = text</code> : Command to execute on left click. <em>(since 0.12.1)</em></p></li>
+<li><p><code>battery_rclick_command = text</code> : Command to execute on right click. <em>(since 0.12.1)</em></p></li>
+<li><p><code>battery_mclick_command = text</code> : Command to execute on middle click. <em>(since 0.12.1)</em></p></li>
+<li><p><code>battery_uwheel_command = text</code> : Command to execute on wheel scroll up. <em>(since 0.12.1)</em></p></li>
+<li><p><code>battery_dwheel_command = text</code> : Command to execute on wheel scroll down. <em>(since 0.12.1)</em></p></li>
+<li><p><code>ac_connected_cmd = text</code> : Command to execute when the power adapter is plugged in. <em>(since 0.12.3)</em></p></li>
+<li><p><code>ac_disconnected_cmd = text</code> : Command to execute when the power adapter is unplugged. <em>(since 0.12.3)</em></p></li>
+</ul>
+<h3 id="executor">Executor<a name="executor" href="#executor" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>execp = new</code> : Begins the configuration of a new executor plugin. Multiple such plugins are supported; just use multiple <code>E</code>s in <code>panel_items</code>. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_command = text</code> : Command to execute. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_interval = integer</code> : The command is executed again after <code>execp_interval</code> seconds from the moment it exits. If zero, the command is executed only once. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_continuous = integer</code> : If non-zero, the last <code>execp_continuous</code> lines from the output of the command are displayed, every <code>execp_continuous</code> lines; this is useful for showing the output of commands that run indefinitely, such as <code>ping 127.0.0.1</code>. If zero, the output of the command is displayed after it finishes executing. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_has_icon = boolean (0 or 1)</code> : If <code>execp_has_icon = 1</code>, the first line printed by the command is interpreted as a path to an image file. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_cache_icon = boolean (0 or 1)</code> : If <code>execp_cache_icon = 0</code>, the image is reloaded each time the command is executed (useful if the image file is changed on disk by the program executed by <code>execp_command</code>). <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_icon_w = integer</code> : You can use <code>execp_icon_w</code> and <code>execp_icon_h</code> to resize the image. If one of them is zero/missing, the image is rescaled proportionally. If both of them are zero/missing, the image is not rescaled. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_icon_h = integer</code> : See <code>execp_icon_w</code>. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_tooltip = text</code> : The tooltip. Leave it empty to not display a tooltip. Not specifying this option leads to showing an automatically generated tooltip with information about when the command was last executed. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> : The font used to draw the text.  <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_font_color = color opacity</code> : The font color. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_markup = boolean (0 or 1)</code> : If non-zero, the output of the command is treated as Pango markup, which allows rich text formatting. The format is <a href="https://developer.gnome.org/pygtk/stable/pango-markup-language.html">documented here</a>. Note that using this with commands that print data downloaded from the Internet is a possible security risk. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_background_id = integer</code> : Which background to use. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_centered = boolean (0 or 1)</code> : Whether to center the text. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text</code> <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_lclick_command = text</code> : Command to execute on left click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_mclick_command = text</code> : Command to execute on right click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_rclick_command = text</code> : Command to execute on middle click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_uwheel_command = text</code> : Command to execute on wheel scroll up. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_dwheel_command = text</code> : Command to execute on wheel scroll down. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
+</ul>
+<h4 id="executor-samples">Executor samples<a name="executor-samples" href="#executor-samples" class="md2man-permalink" title="permalink"></a></h4><h5 id="print-the-hostname">Print the hostname<a name="print-the-hostname" href="#print-the-hostname" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = hostname
+execp_interval = 0
+</code></pre>
+<h5 id="print-disk-usage-for-the-root-partition-every-10-seconds">Print disk usage for the root partition every 10 seconds<a name="print-disk-usage-for-the-root-partition-every-10-seconds" href="#print-disk-usage-for-the-root-partition-every-10-seconds" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = df -h | awk '/\/$/ { print $6 ": " $2 " " $5}'
+execp_interval = 10
+</code></pre>
+<h5 id="button-with-icon-and-rich-text-executes-command-when-clicked">Button with icon and rich text, executes command when clicked<a name="button-with-icon-and-rich-text-executes-command-when-clicked" href="#button-with-icon-and-rich-text-executes-command-when-clicked" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = echo /usr/share/icons/elementary-xfce/emblems/24/emblem-colors-blue.png; echo '&lt;span foreground="#7f7"&gt;Click&lt;/span&gt; &lt;span foreground="#77f"&gt;me&lt;/span&gt; &lt;span foreground="#f77"&gt;pls&lt;/span&gt;'
+execp_has_icon = 1
+execp_interval = 0
+execp_centered = 1
+execp_font = sans 9
+execp_markup = 1
+execp_font_color = #aaffaa 100
+execp_padding = 2 0
+execp_tooltip = I will tell you a secret...
+execp_lclick_command = zenity --info "--text=$(uname -sr)"
+execp_background_id = 2
+</code></pre>
+<h5 id="desktop-pager-with-text">Desktop pager with text<a name="desktop-pager-with-text" href="#desktop-pager-with-text" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = xprop -root -spy | awk '/^_NET_CURRENT_DESKTOP/ { print "Workspace " ($3 + 1) ; fflush(); }'
+execp_interval = 1
+execp_continuous = 1
+</code></pre>
+<h5 id="desktop-pager-with-icon">Desktop pager with icon<a name="desktop-pager-with-icon" href="#desktop-pager-with-icon" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp_command = xprop -root -spy | awk -v home="$HOME" '/^_NET_CURRENT_DESKTOP/ { print home "/.config/myPager/" ($3 + 1) ".png\n" ; fflush(); }'
+execp_interval = 1
+execp_has_icon = 1
+execp_cache_icon = 1
+execp_continuous = 2
+</code></pre>
+<h5 id="round-trip-time-to-the-gateway-refreshed-every-second">Round-trip time to the gateway, refreshed every second<a name="round-trip-time-to-the-gateway-refreshed-every-second" href="#round-trip-time-to-the-gateway-refreshed-every-second" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = ping -i 1 -c 1 -W 1 -O -D -n $(ip route | grep default | grep via | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*') | awk '/no/ { print "&lt;span foreground=\"#faa\"&gt;timeout&lt;/span&gt;"; fflush(); }; /time=/ { gsub(/time=/, "", $8); printf "&lt;span foreground=\"#7af\"&gt;%3.0f %s&lt;/span&gt;\n", $8, $9; fflush(); } '
+execp_continuous = 0
+execp_interval = 1
+execp_markup = 1
+</code></pre>
+<h5 id="memory-usage">Memory usage<a name="memory-usage" href="#memory-usage" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = free | awk '/^-/ { printf "Mem: '$(free -h | awk '/^Mem:/ { print $2 }')' %.0f%%\n", 100*$3/($3+$4); fflush(stdout) }'
+execp_interval = 5
+execp_continuous = 0
+</code></pre>
+<h5 id="network-load">Network load<a name="network-load" href="#network-load" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code># Note the use of "stdbuf -oL" to force the program to flush the output line by line.
+execp = new
+execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }; fflush(stdout)'
+execp_continuous = 1
+execp_interval = 1
+</code></pre>
+<h3 id="button">Button<a name="button" href="#button" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>button = new</code> : Begins the configuration of a new button. Multiple such plugins are supported; just use multiple <code>P</code>s in <code>panel_items</code>. <em>(since 0.14)</em></p></li>
+<li><p><code>button_icon = text</code> : Name or path of icon (or empty). <em>(since 0.14)</em></p></li>
+<li><p><code>button_text = text</code> : Text to display (or empty). <em>(since 0.14)</em></p></li>
+<li><p><code>button_tooltip = text</code> : The tooltip (or empty). <em>(since 0.14)</em></p></li>
+<li><p><code>button_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> : The font used to draw the text.  <em>(since 0.14)</em></p></li>
+<li><p><code>button_font_color = color opacity</code> : The font color. <em>(since 0.14)</em></p></li>
+<li><p><code>button_background_id = integer</code> : Which background to use. <em>(since 0.14)</em></p></li>
+<li><p><code>button_centered = boolean (0 or 1)</code> : Whether to center the text. <em>(since 0.14)</em></p></li>
+<li><p><code>button_padding = horizontal_padding vertical_padding spacing_between_icon_and_text</code> <em>(since 0.14)</em></p></li>
+<li><p><code>button_max_icon_size = integer</code> : Sets a limit to the icon size. Otherwise, the icon will expand to the edges. <em>(since 0.14)</em></p></li>
+<li><p><code>button_lclick_command = text</code> : Command to execute on left click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.14)</em></p></li>
+<li><p><code>button_mclick_command = text</code> : Command to execute on right click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.14)</em></p></li>
+<li><p><code>button_rclick_command = text</code> : Command to execute on middle click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.14)</em></p></li>
+<li><p><code>button_uwheel_command = text</code> : Command to execute on wheel scroll up. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.14)</em></p></li>
+<li><p><code>button_dwheel_command = text</code> : Command to execute on wheel scroll down. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.14)</em></p></li>
+</ul>
+<h3 id="separator">Separator<a name="separator" href="#separator" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>separator = new</code> : Begins the configuration of a new separator. Multiple such plugins are supported; just use multiple <code>:</code>s in <code>panel_items</code>. <em>(since 0.13.0)</em></p></li>
+<li><p><code>separator_background_id = integer</code> : Which background to use. <em>(since 0.13.0)</em></p></li>
+<li><p><code>separator_color = color opacity</code> : The foreground color. <em>(since 0.13.0)</em></p></li>
+<li><p><code>separator_style = [empty | line | dots]</code> : The separator style. <em>(since 0.13.0)</em></p></li>
+<li><p><code>separator_size = integer</code> : The thickness of the separator. Does not include the border and padding. For example, if the style is <code>line</code>, this is the line thickness; if the style is <code>dots</code>, this is the dot&#39;s diameter. <em>(since 0.13.0)</em></p></li>
+<li><p><code>separator_padding = side_padding cap_padding</code> : The padding to add to the sides of the separator, in pixels. <em>(since 0.13.0)</em></p></li>
+</ul>
+<h3 id="example-configuration">Example configuration<a name="example-configuration" href="#example-configuration" class="md2man-permalink" title="permalink"></a></h3><p>See /etc/xdg/tint2/tint2rc.</p><h2 id="author">AUTHOR<a name="author" href="#author" class="md2man-permalink" title="permalink"></a></h2><p>tint2 was written by Thierry Lorthiois <a href="mailto:lorthiois@bbsoft.fr">lorthiois@bbsoft.fr</a>.
+It is based on ttm, originally written by Pål Staurland <a href="mailto:staura@gmail.com">staura@gmail.com</a>.</p><p>This manual page was originally written by Daniel Moerner <a href="mailto:dmoerner@gmail.com">dmoerner@gmail.com</a>, for the Debian project (but may be used by others).
+It was adopted from the tint2 docs.</p><h2 id="see-also">SEE ALSO<a name="see-also" href="#see-also" class="md2man-permalink" title="permalink"></a></h2><p>The main website <a href="https://gitlab.com/o9000/tint2">https://gitlab.com/o9000/tint2</a>
+and the wiki page at <a href="https://gitlab.com/o9000/tint2/wikis/home">https://gitlab.com/o9000/tint2/wikis/home</a>.</p><p>This documentation is also provided in HTML and Markdown format in the system&#39;s default location
+for documentation files, usually <code>/usr/share/doc/tint2</code> or <code>/usr/local/share/doc/tint2</code>.</p>
+</body>
+</html>

doc/readme.html

@@ -0,0 +1,267 @@
+<!DOCTYPE html>
+<html>
+<head>
+<head>
+<style type="text/css">
+html,
+body {
+  color: #333;
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 1.6;
+  word-wrap: break-word;
+  max-width: 1000px;
+  margin: 0 auto;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin-top: 1em;
+  margin-bottom: 1rem;
+}
+
+h1 {
+  font-size: 1.8rem;
+  font-weight: normal;
+  font-style: normal;
+  border-bottom: 1px solid #eee;
+}
+
+h2 {
+  font-size: 1.5rem;
+  font-weight: normal;
+  font-style: normal;
+  border-bottom: 1px solid #eee;
+}
+
+h3 {
+  font-size: 1.2rem;
+  font-weight: bold;
+  font-style: normal;
+}
+
+h4 {
+  font-size: 1rem;
+  font-weight: bold;
+  font-style: normal;
+}
+
+h5 {
+  font-size: 1rem;
+  font-weight: bold;
+  font-style: italic;
+}
+
+h6 {
+  font-size: 1rem;
+  font-weight: normal;
+  font-style: italic;
+}
+
+
+code,
+kbd,
+pre {
+  font-family: monospace;
+  font-size: 1em;
+}
+
+table {
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+
+td,
+th {
+  padding: 0;
+}
+
+asdff {
+  box-sizing: border-box;
+}
+
+a {
+  color: #46c;
+  text-decoration: none;
+}
+
+a:hover,
+a:active {
+  text-decoration: underline;
+}
+
+a:not([href]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+hr {
+  box-sizing: content-box;
+  height: 0;
+  margin: 15px 0;
+  overflow: hidden;
+  background: transparent;
+  border: 0;
+  border-bottom: 1px solid #ddd;
+}
+
+hr::before {
+  display: table;
+  content: "";
+}
+
+hr::after {
+  display: table;
+  clear: both;
+  content: "";
+}
+
+p {
+  margin-top: 0;
+  margin-bottom: 0.7em;
+}
+
+blockquote {
+  margin: 0;
+}
+
+code {
+  font-family: "Liberation Mono", monospace;
+  font-size: 1em;
+}
+
+pre {
+  margin-top: 0;
+  margin-bottom: 0;
+  font: 1em "Liberation Mono", monospace;
+  overflow-x: auto;
+}
+
+blockquote {
+  padding: 0 15px;
+  color: #777;
+  border-left: 4px solid #ddd;
+}
+
+blockquote>:first-child {
+  margin-top: 0;
+}
+
+blockquote>:last-child {
+  margin-bottom: 0;
+}
+
+table {
+  display: block;
+  width: 100%;
+  overflow: auto;
+  word-break: normal;
+}
+
+table th {
+  font-weight: bold;
+}
+
+table th,
+table td {
+  padding: 6px 13px;
+  border: 1px solid #ddd;
+}
+
+table tr {
+  background-color: #fff;
+  border-top: 1px solid #ccc;
+}
+
+table tr:nth-child(2n) {
+  background-color: #f8f8f8;
+}
+
+code {
+  padding: 0.2em;
+  margin: 0;
+  font-size: 0.95em;
+  background-color: #eee;
+}
+
+pre {
+  word-wrap: normal;
+  background-color: #eee;
+  margin: 1em 0;
+  padding: 0.2em;
+}
+
+
+</style>
+</head>
+<body>
+<h1 id="latest-stable-release-0-14-1"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">0.14.1</span><a name="latest-stable-release-0-14-1" href="#latest-stable-release-0-14-1" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/0.14.1/ChangeLog">https://gitlab.com/o9000/tint2/blob/0.14.1/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
+cd tint2
+git checkout 0.14.1
+mkdir build
+cd build
+cmake ..
+make -j4
+</code></pre>
+<p>To install, run (as root):</p><pre class="highlight plaintext"><code>make install
+update-icon-caches /usr/local/share/icons/hicolor
+update-mime-database /usr/local/share/mime
+</code></pre>
+<p>And then you can run the panel <code>tint2</code> and the configuration program <code>tint2conf</code>.</p><p>Please report any problems to <a href="https://gitlab.com/o9000/tint2/issues">https://gitlab.com/o9000/tint2/issues</a>. Your feedback is much appreciated.</p><p>P.S. GitLab is now the official location of the tint2 project, migrated from Google Code, which is shutting down. In case you are wondering why not GitHub, BitBucket etc., we chose GitLab because it is open source, it is mature and works well, looks cool and has a very nice team.</p><h1 id="what-is-tint2">What is tint2?<a name="what-is-tint2" href="#what-is-tint2" class="md2man-permalink" title="permalink"></a></h1><p>tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm <a href="https://code.google.com/p/ttm/">https://code.google.com/p/ttm/</a>.</p><h1 id="features">Features<a name="features" href="#features" class="md2man-permalink" title="permalink"></a></h1>
+<ul>
+<li>Panel with taskbar, system tray, clock and launcher icons;</li>
+<li>Easy to customize: color/transparency on fonts, icons, borders and backgrounds;</li>
+<li>Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;</li>
+<li>Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;</li>
+<li>Customizable mouse events.</li>
+</ul>
+<h1 id="goals">Goals<a name="goals" href="#goals" class="md2man-permalink" title="permalink"></a></h1>
+<ul>
+<li>Be unintrusive and light (in terms of memory, CPU and aesthetic);</li>
+<li>Follow the freedesktop.org specifications;</li>
+<li>Make certain workflows, such as multi-desktop and multi-monitor, easy to use.</li>
+</ul>
+<h1 id="i-want-it">I want it!<a name="i-want-it" href="#i-want-it" class="md2man-permalink" title="permalink"></a></h1>
+<ul>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/Install">Install tint2</a></li>
+</ul>
+<h1 id="how-do-i">How do I ...<a name="how-do-i" href="#how-do-i" class="md2man-permalink" title="permalink"></a></h1>
+<ul>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/Install">Install</a></li>
+<li><a href="https://gitlab.com/o9000/tint2/blob/master/manual.html">Configure</a></li>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/ThirdPartyApplets">Add applet not supported by tint2</a></li>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/FAQ">Other frequently asked questions</a></li>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/Debug">Obtain a stack trace when tint2 crashes</a></li>
+</ul>
+<h1 id="known-issues">Known issues<a name="known-issues" href="#known-issues" class="md2man-permalink" title="permalink"></a></h1>
+<ul>
+<li>Graphic glitches on Intel graphics cards can be avoided by changing the acceleration method to UXA (<a href="https://gitlab.com/o9000/tint2/issues/595">issue 595</a>)</li>
+<li>Window managers that do not follow exactly the EWMH specification might not interact well with tint2 (known issues for <a href="https://gitlab.com/o9000/tint2/issues/385">awesome</a>, <a href="https://gitlab.com/o9000/tint2/issues/524">bspwm</a>. <a href="https://gitlab.com/o9000/tint2/issues/456">openbox-multihead</a>)</li>
+<li>Full transparency requires a compositor such as Compton (if not provided already by the window manager, as in Compiz/Unity, KDE or XFCE)</li>
+</ul>
+<h1 id="how-can-i-help-out">How can I help out?<a name="how-can-i-help-out" href="#how-can-i-help-out" class="md2man-permalink" title="permalink"></a></h1>
+<ul>
+<li>Report bugs and ask questions on the <a href="https://gitlab.com/o9000/tint2/issues">issue tracker</a>;</li>
+<li>Contribute to the development by helping us fix bugs and suggesting new features. Please read the contribution guide: <a href="CONTRIBUTING.md">CONTRIBUTING.md</a></li>
+</ul>
+<h1 id="links">Links<a name="links" href="#links" class="md2man-permalink" title="permalink"></a></h1>
+<ul>
+<li>Home page: <a href="https://gitlab.com/o9000/tint2">https://gitlab.com/o9000/tint2</a></li>
+<li>Git repository: <a href="https://gitlab.com/o9000/tint2.git">https://gitlab.com/o9000/tint2.git</a></li>
+<li>Documentation: <a href="https://gitlab.com/o9000/tint2/wikis/home">https://gitlab.com/o9000/tint2/wikis/home</a></li>
+<li>Downloads: <a href="https://gitlab.com/o9000/tint2-archive/tree/master">https://gitlab.com/o9000/tint2-archive/tree/master</a> or <a href="https://code.google.com/p/tint2/downloads/list">https://code.google.com/p/tint2/downloads/list</a></li>
+<li>Old project location (inactive): <a href="https://code.google.com/p/tint2">https://code.google.com/p/tint2</a></li>
+</ul>
+<h1 id="screenshots">Screenshots<a name="screenshots" href="#screenshots" class="md2man-permalink" title="permalink"></a></h1><h2 id="default-config">Default config:<a name="default-config" href="#default-config" class="md2man-permalink" title="permalink"></a></h2><p><img src="https://gitlab.com/o9000/tint2/uploads/948fa74eca60864352a033580350b4c3/Screenshot_2016-01-23_14-42-57.png" alt="Screenshot_2016-01-23_14-42-57"></p><h2 id="various-configs">Various configs:<a name="various-configs" href="#various-configs" class="md2man-permalink" title="permalink"></a></h2><p><img src="https://gitlab.com/o9000/tint2/wikis/screenshot.png" alt="screenshot"></p><h2 id="demos">Demos<a name="demos" href="#demos" class="md2man-permalink" title="permalink"></a></h2>
+<ul>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.0.gif">Compact panel, separator, color gradients</a></li>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.4.gif">Executor</a></li>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.3.gif">Mouse over effects</a></li>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif">Distribute size between taskbars, freespace</a></li>
+</ul>
+</body>
+</html>

doc/tint2.1

@@ -1,51 +1,877 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
+.TH TINT2 1 "2017\-04\-23" 0.14.2
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH TINT2 1 "2015-07-05"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
 .SH NAME
+.PP
 tint2 \- lightweight panel/taskbar
-.SH SYNOPSIS
-.B tint2
-.br
-.B tint2
-.RI -c
-.IR /path_to_config_file 
 .SH DESCRIPTION
-This manual page documents briefly the
-.B tint2
-command.
 .PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+tint2 is a simple panel/taskbar made for modern X window managers.
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.).
-.\" respectively.
-\fBtint2\fP is a simple panel/taskbar intentionally made for openbox3, but 
-should also work with other window managers. It's based on ttm code. The goal is to keep a clean and unintrusive look with code lightweight and 
-compliance with freedesktop specifications.
 .PP
-On the first startup tint2 creates a config file in $HOME/.config/tint2/tint2rc.
+Features:
+.RS
+.IP \(bu 2
+Panel with taskbar, system tray, clock and launcher icons;
+.IP \(bu 2
+Easy to customize: color/transparency on fonts, icons, borders and backgrounds;
+.IP \(bu 2
+Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;
+.IP \(bu 2
+Multi\-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;
+.IP \(bu 2
+Customizable mouse events.
+.RE
 .PP
-See the wiki page at https://gitlab.com/o9000/tint2/wikis/home for more information.
+Goals:
+.RS
+.IP \(bu 2
+Be unintrusive and light (in terms of memory, CPU and aesthetic);
+.IP \(bu 2
+Follow the freedesktop.org specifications;
+.IP \(bu 2
+Make certain workflows, such as multi\-desktop and multi\-monitor, easy to use.
+.RE
+.SH SYNOPSIS
+.PP
+\fB\fCtint2 [OPTION...]\fR
 .SH OPTIONS
 .TP
-.B \-c config-file
+\fB\fC\-c path_to_config_file\fR
-Specify which configuration file to use instead of the default.
+Specifies which configuration file to use instead of the default.
-.SH AUTHOR
+.TP
-tint2 was written by Thierry Lorthiois <lorthiois@bbsoft.fr>.  It is based on
+\fB\fC\-v, \-\-version\fR
-ttm, originally written by Pål Staurland <staura@gmail.com>
+Prints version information and exits.
+.TP
+\fB\fC\-h, \-\-help\fR
+Display this help and exits.
+.SH CONFIGURATION
+.SS Table of contents
+.RS
+.IP \(bu 2
+Introduction \[la]#introduction\[ra]
+.IP \(bu 2
+Backgrounds and borders \[la]#backgrounds-and-borders\[ra]
+.IP \(bu 2
+Gradients \[la]#gradients\[ra]
+.IP \(bu 2
+Panel \[la]#panel\[ra]
+.IP \(bu 2
+Launcher \[la]#launcher\[ra]
+.IP \(bu 2
+Taskbar/Pager \[la]#taskbar-pager\[ra]
+.IP \(bu 2
+Taskbar buttons \[la]#taskbar-buttons\[ra]
+.IP \(bu 2
+Mouse actions for taskbar buttons \[la]#mouse-actions-for-taskbar-buttons\[ra]
+.IP \(bu 2
+System tray \[la]#system-tray\[ra]
+.IP \(bu 2
+Clock \[la]#clock\[ra]
+.IP \(bu 2
+Tooltip \[la]#tooltip\[ra]
+.IP \(bu 2
+Battery \[la]#battery\[ra]
+.IP \(bu 2
+Executor \[la]#executor\[ra]
+.IP \(bu 2
+Button \[la]#button\[ra]
+.IP \(bu 2
+Separator \[la]#separator\[ra]
+.IP \(bu 2
+Example configuration \[la]#example-configuration\[ra]
+.RE
+.SS Introduction
 .PP
-This manual page was written by Daniel Moerner <dmoerner@gmail.com>,
+These are instructions for configuring tint2 directly by editing its config file.
-for the Debian project (but may be used by others).  It was adopted from the
+You may also use instead the graphical interface \fB\fCtint2conf\fR\&.
-tint2 docs.
+.PP
+The first time you run tint2, it will create the config file in \fB\fC$HOME/.config/tint2/tint2rc\fR (This applies if you have done a clean install. Running tint2 in the source directory without doing 'make install' will not create the config file.)
+.PP
+You can also specify another file on the command line with the \-c option, e.g.: \fB\fCtint2 \-c $HOME/tint2.conf\fR\&. This can be used to run multiple instances of tint2 that use different settings.
+.PP
+If you change the config file while tint2 is running, the command \fB\fCkillall \-SIGUSR1 tint2\fR will force tint2 to reload it.
+.PP
+All the configuration options supported in the config file are listed below.
+Try to respect as much as possible the order of the options as given below.
+.SS Backgrounds and borders
+.PP
+The tint2 config file starts with the options defining background elements with borders:
+.RS
+.IP \(bu 2
+\fB\fCrounded = number_of_pixels\fR : the corner radius
+.IP \(bu 2
+\fB\fCborder_width = integer\fR : the border width in pixels
+.IP \(bu 2
+\fB\fCborder_sides = LRTB\fR : the sides to draw the border on (left, right, top, bottom). If not specified, all sides are used. \fI(since 0.12.12)\fP
+.IP \(bu 2
+\fB\fCbackground_color = color opacity\fR
+.RS
+.IP \(bu 2
+\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
+.IP \(bu 2
+\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz).
+.RE
+.IP \(bu 2
+\fB\fCborder_color = color opacity\fR
+.RS
+.IP \(bu 2
+\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
+.IP \(bu 2
+\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
+.RE
+.IP \(bu 2
+\fB\fCbackground_color_hover = color opacity\fR (default: same as \fB\fCbackground_color\fR) \fI(since 0.12.3)\fP
+.RS
+.IP \(bu 2
+\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
+.IP \(bu 2
+\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)
+.RE
+.IP \(bu 2
+\fB\fCborder_color_hover = color opacity\fR (default: same as \fB\fCborder_color\fR) \fI(since 0.12.3)\fP
+.RS
+.IP \(bu 2
+\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
+.IP \(bu 2
+\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
+.RE
+.IP \(bu 2
+\fB\fCbackground_color_pressed = color opacity\fR (default: same as \fB\fCbackground_color_hover\fR) \fI(since 0.12.3)\fP
+.RS
+.IP \(bu 2
+\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
+.IP \(bu 2
+\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)
+.RE
+.IP \(bu 2
+\fB\fCborder_color_pressed = color opacity\fR (default: same as \fB\fCborder_color_hover\fR) \fI(since 0.12.3)\fP
+.RS
+.IP \(bu 2
+\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
+.IP \(bu 2
+\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
+.RE
+.RE
+.PP
+You can define as many backgrounds as you want. For example, the following config defines two backgrounds:
+.PP
+.RS
+.nf
+rounded = 1
+border_width = 0
+background_color = #282828 100
+border_color = #000000 0
+
+rounded = 1
+border_width = 0
+background_color = #f6b655 90
+border_color = #cccccc 40
+.fi
+.RE
+.PP
+tint2 automatically identifies each background with a number starting from 1 (1, 2, ...).
+Afterwards, you can apply a background to objects (panel, taskbar, task, clock, systray) using the background id, for example:
+.PP
+.RS
+.nf
+panel_background_id = 1
+taskbar_background_id = 0
+task_background_id = 0
+task_active_background_id = 2
+systray_background_id = 0
+clock_background_id = 0
+.fi
+.RE
+.PP
+Identifier 0 refers to a special background which is fully transparent, identifier 1 applies the first background defined in the config file etc.
+.SS Gradients
+.PP
+(Available since 0.13.0)
+.PP
+Backgrounds also allow specifying gradient layers
+that are drawn on top of the solid color background.
+.PP
+First the user must define one or more gradients in the config file,
+each starting with \fB\fCgradient = TYPE\fR\&. These must be added before backgrounds.
+.PP
+Then gradients can be added by index to backgrounds,
+using the \fB\fCgradient_id = INDEX\fR, \fB\fCgradient_id_hover = INDEX\fR and
+\fB\fCgradient_id_pressed = INDEX\fR, where \fB\fCINDEX\fR is
+the gradient index, starting from 1.
+.SS Gradient types
+.PP
+Gradients vary the color between fixed control points:
+* vertical gradients: top\-to\-bottom;
+* horizontal gradients: left\-to\-right;
+* radial gradients: center\-to\-corners.
+.PP
+The user must specify the start and end colors, and can optionally add extra color stops in between
+using the \fB\fCcolor_stop\fR option, as explained below.
+.SS Vertical gradient, with color varying from the top edge to the bottom edge, two colors
+.PP
+.RS
+.nf
+gradient = vertical
+start_color = #rrggbb opacity
+end_color = #rrggbb opacity
+.fi
+.RE
+.SS Horizontal gradient, with color varying from the left edge to the right edge, two colors
+.PP
+.RS
+.nf
+gradient = horizontal
+start_color = #rrggbb opacity
+end_color = #rrggbb opacity
+.fi
+.RE
+.SS Radial gradient, with color varying from the center to the corner, two colors:
+.PP
+.RS
+.nf
+gradient = radial
+start_color = #rrggbb opacity
+end_color = #rrggbb opacity
+.fi
+.RE
+.SS Adding extra color stops (0% and 100% remain fixed, more colors at x% between the start and end control points)
+.PP
+.RS
+.nf
+color_stop = percentage #rrggbb opacity
+.fi
+.RE
+.SS Gradient examples
+.PP
+.RS
+.nf
+# Gradient 1: thin film effect
+gradient = horizontal
+start_color = #111122 30
+end_color = #112211 30
+color_stop = 60 #221111 30
+
+# Gradient 2: radial glow
+gradient = radial
+start_color = #ffffff 20
+end_color = #ffffff 0
+
+# Gradient 3: elegant black
+gradient = vertical
+start_color = #444444 100
+end_color = #222222 100
+
+# Gradient 4: elegant black
+gradient = horizontal
+start_color = #111111 100
+end_color = #222222 100
+
+# Background 1: Active desktop name
+rounded = 2
+border_width = 1
+border_sides = TBLR
+background_color = #555555 10
+border_color = #ffffff 60
+background_color_hover = #555555 10
+border_color_hover = #ffffff 60
+background_color_pressed = #555555 10
+border_color_pressed = #ffffff 60
+gradient_id = 3
+gradient_id_hover = 4
+gradient_id_pressed = 2
+
+[...]
+.fi
+.RE
+.SS Panel
+.RS
+.IP \(bu 2
+\fB\fCpanel_items = LTSBC\fR defines the items tint2 will show and the order of those items. Each letter refers to an item, defined as:
+.RS
+.IP \(bu 2
+\fB\fCL\fR shows the Launcher
+.IP \(bu 2
+\fB\fCT\fR shows the Taskbar
+.IP \(bu 2
+\fB\fCS\fR shows the Systray (also called notification area)
+.IP \(bu 2
+\fB\fCB\fR shows the Battery status
+.IP \(bu 2
+\fB\fCC\fR shows the Clock
+.IP \(bu 2
+\fB\fCF\fR adds an extensible spacer (freespace). You can specify more than one. Has no effect if \fB\fCT\fR is also present. \fI(since 0.12)\fP
+.IP \(bu 2
+\fB\fCE\fR adds an executor plugin. You can specify more than one. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCP\fR adds a push button. You can specify more than one. \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fC:\fR adds a separator. You can specify more than one. \fI(since 0.13.0)\fP
+.RE
+.PP
+For example, \fB\fCpanel_items = STC\fR will show the systray, the taskbar and the clock (from left to right).
+.IP \(bu 2
+\fB\fCpanel_monitor = monitor (all or 1 or 2 or ...)\fR : Which monitor tint2 draws the panel on
+.RS
+.IP \(bu 2
+The first monitor is \fB\fC1\fR
+.IP \(bu 2
+Use \fB\fCpanel_monitor = all\fR to get a separate panel per monitor
+.RE
+.IP \(bu 2
+\fB\fCprimary_monitor_first = boolean (0 or 1)\fR : Place the primary monitor before all the other monitors in the list. \fI(since 0.12.4)\fP
+.RE
+.PP
+[](images/panel_padding.jpg)
+.RS
+.IP \(bu 2
+\fB\fCpanel_position = vertical_position horizontal_position orientation\fR
+.RS
+.IP \(bu 2
+\fB\fCvertical_position\fR is one of: \fB\fCbottom\fR, \fB\fCtop\fR, \fB\fCcenter\fR
+.IP \(bu 2
+\fB\fChorizontal_position\fR is one of: \fB\fCleft\fR, \fB\fCright\fR, \fB\fCcenter\fR
+.IP \(bu 2
+\fB\fCorientation\fR is one of: \fB\fChorizontal\fR, \fB\fCvertical\fR
+.RE
+.IP \(bu 2
+\fB\fCpanel_size = width height\fR
+.RS
+.IP \(bu 2
+\fB\fCwidth\fR and \fB\fCheight\fR can be specified without units (e.g. \fB\fC123\fR) as pixels, or followed by \fB\fC%\fR as percentages of the monitor size (e.g. \fB\fC50%\fR). Use \fB\fC100%\fR for full monitor width/height.
+Example:
+.RE
+.RE
+.PP
+.RS
+.nf
+# The panel's width is 94% the size of the monitor, the height is 30 pixels:
+panel_size = 94% 30
+.fi
+.RE
+.RS
+.IP \(bu 2
+\fB\fCpanel_shrink = boolean (0 or 1)\fR : If set to 1, the panel will shrink to a compact size dynamically. \fI(since 0.13)\fP
+.IP \(bu 2
+\fB\fCpanel_margin = horizontal_margin vertical_margin\fR : The margins define the distance between the panel and the horizontal/vertical monitor edge. Use \fB\fC0\fR to obtain a panel with the same size as the edge of the monitor (no margin).
+.RE
+.PP
+[](images/panel\fIsize\fPmargin.jpg)
+.RS
+.IP \(bu 2
+\fB\fCpanel_padding = horizontal_padding vertical_padding spacing\fR : Please refer to the image below.
+.RE
+.PP
+[](images/panel_padding.jpg)
+.RS
+.IP \(bu 2
+\fB\fCfont_shadow = boolean (0 or 1)\fR
+.IP \(bu 2
+\fB\fCpanel_background_id = integer\fR : Which background to use for the panel.
+.IP \(bu 2
+\fB\fCwm_menu = boolean (0 or 1)\fR : Defines if tint2 forwards unhandled mouse events to your window manager. Useful for window managers such as openbox, which display the start menu if you right click on the desktop.
+.IP \(bu 2
+\fB\fCpanel_dock = boolean (0 or 1)\fR : Defines if tint2 is placed into the window manager's dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).
+.IP \(bu 2
+\fB\fCpanel_layer = bottom/normal/top\fR : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.
+.IP \(bu 2
+\fB\fCstrut_policy = follow_size/minimum/none\fR : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi\-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.
+.RS
+.IP \(bu 2
+\fB\fCfollow_size\fR means that the maximized windows always resize to have a common edge with tint2.
+.IP \(bu 2
+\fB\fCminimum\fR means that the maximized windows always expand to have a common edge with the hidden panel. This is useful if the \fB\fCautohide\fR option is enabled.
+.IP \(bu 2
+\fB\fCnone\fR means that the maximized windows use the full screen size.
+.RE
+.IP \(bu 2
+\fB\fCpanel_window_name = string\fR : Defines the name of the panel's window. Default: 'tint2'. \fI(since 0.12)\fP
+.IP \(bu 2
+\fB\fCdisable_transparency = boolean (0 or 1)\fR : Whether to disable transparency instead of detecting if it is supported. Useful on broken graphics stacks. \fI(since 0.12)\fP
+.IP \(bu 2
+\fB\fCmouse_effects = boolean (0 or 1)\fR : Whether to enable mouse hover effects for clickable items. \fI(since 0.12.3)\fP
+.IP \(bu 2
+\fB\fCmouse_hover_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjusts the icon color and transparency on mouse hover (works only when mouse_effects = 1).` \fI(since 0.12.3)\fP
+.IP \(bu 2
+\fB\fCmouse_pressed_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjusts the icon color and transparency on mouse press (works only when mouse_effects = 1).` \fI(since 0.12.3)\fP
+.IP \(bu 2
+\fB\fCautohide = boolean (0 or 1)\fR : Whether to enable panel hiding when the mouse cursor exists the panel.
+.IP \(bu 2
+\fB\fCautohide_show_timeout = float\fR : Show timeout in seconds after the mouse cursor enters the panel. Use '.' as decimal separator.
+.IP \(bu 2
+\fB\fCautohide_hide_timeout = float\fR : Hide timeout in seconds after the mouse cursor exits the panel. Use '.' as decimal separator.
+.IP \(bu 2
+\fB\fCautohide_height = integer\fR : panel height (width for vertical panels) in hidden mode.
+.RE
+.SS Launcher
+.RS
+.IP \(bu 2
+\fB\fClauncher_item_app = path_to_application\fR : Each \fB\fClauncher_item_app\fR must be a file path to a .desktop file following the freedesktop.org specification \[la]http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html\[ra]\&. The paths may begin with \fB\fC~\fR, which is expanded to the path of the user's home directory. If only a file name is specified, the file is search in the standard application directories (\fB\fC$XDG_DATA_HOME/applications\fR, \fB\fC~/.local/share/applications\fR, \fB\fC$XDG_DATA_DIRS/applications\fR, \fB\fC/usr/local/share/applications\fR, \fB\fC/usr/share/applications\fR, \fB\fC/opt/share/applications\fR).
+.IP \(bu 2
+\fB\fClauncher_apps_dir = path_to_directory\fR : Specifies a path to a directory from which the launcher is loading all .desktop files (all subdirectories are explored recursively). Can be used multiple times. The path may begin with \fB\fC~\fR, which is expanded to the path of the user's home directory. \fI(since 0.12)\fP
+.IP \(bu 2
+\fB\fClauncher_background_id = integer\fR : Defines which background to use.
+.IP \(bu 2
+\fB\fClauncher_icon_background_id = integer\fR : Defines which background to use for icons.
+.IP \(bu 2
+\fB\fClauncher_padding = horizontal_padding vertical_padding spacing\fR
+.IP \(bu 2
+\fB\fClauncher_icon_size = integer\fR : The launcher icon size, in pixels.
+.IP \(bu 2
+\fB\fClauncher_icon_theme = name_of_theme\fR : (Optional) Uses the specified icon theme to display shortcut icons. Note that tint2 will detect and use the icon theme of your desktop if you have an XSETTINGS manager running (which you probably do), unless \fB\fClauncher_icon_theme_override = 1\fR\&.
+.IP \(bu 2
+\fB\fClauncher_icon_theme_override = boolean (0 or 1)\fR : Whether \fB\fClauncher_icon_theme\fR overrides the value obtained from the XSETTINGS manager. \fI(since 0.12)\fP
+.IP \(bu 2
+\fB\fClauncher_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjusts the icon color and transparency.
+.IP \(bu 2
+\fB\fClauncher_tooltip = boolean (0 or 1)\fR : Whether to show tooltips for the launcher icons.
+.IP \(bu 2
+\fB\fCstartup_notifications = boolean (0 or 1)\fR : Whether to show startup notifications when starting applications from the launcher. \fI(since 0.12)\fP
+.RE
+.SS Taskbar / Pager
+.RS
+.IP \(bu 2
+\fB\fCtaskbar_mode = single_desktop/multi_desktop\fR
+.RS
+.IP \(bu 2
+\fB\fCsingle_desktop\fR : Shows a normal taskbar listing the tasks running on the current virtual desktop (also known as 'workspace');
+.IP \(bu 2
+\fB\fCmulti_desktop\fR : Pager like capability. Shows multiple taskbars, one per virtual desktop, with which:
+.RS
+.IP \(bu 2
+You can drag\-and\-drop tasks between virtual desktops;
+.IP \(bu 2
+You can switch between virtual desktops.
+.RE
+.RE
+.IP \(bu 2
+\fB\fCtaskbar_hide_if_empty = boolean (0 or 1)\fR : If enabled, in multi\-desktop mode the taskbars corresponding to empty desktops different from the current desktop are hidden. \fI(since 0.13)\fP
+.IP \(bu 2
+\fB\fCtaskbar_distribute_size = boolean (0 or 1)\fR : If enabled, in multi\-desktop mode distributes between taskbars the available size proportionally to the number of tasks. Default: disabled. \fI(since 0.12)\fP
+.IP \(bu 2
+\fB\fCtaskbar_padding = horizontal_padding vertical_padding spacing\fR
+.RE
+.PP
+[](images/taskbar_padding.jpg)
+.RS
+.IP \(bu 2
+\fB\fCtaskbar_background_id = integer\fR : Which background to use
+.IP \(bu 2
+\fB\fCtaskbar_active_background_id = integer\fR : Which background to use for the taskbar of the current virtual desktop.
+.IP \(bu 2
+\fB\fCtaskbar_hide_inactive_tasks = boolean (0 or 1)\fR :  If enabled, the taskbar shows only the active task. \fI(since 0.12)\fP
+.IP \(bu 2
+\fB\fCtaskbar_hide_different_monitor = boolean (0 or 1)\fR :  If enabled, the taskbar shows only the tasks from the current monitor. Useful when running different tint2 instances on different monitors, each one having its own config. \fI(since 0.12)\fP
+.IP \(bu 2
+\fB\fCtaskbar_always_show_all_desktop_tasks = boolean (0 or 1)\fR :  Has effect only if \fB\fCtaskbar_mode = multi_desktop\fR\&. If enabled, tasks that appear on all desktops are shown on all taskbars. Otherwise, they are shown only on the taskbar of the current desktop. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCtaskbar_sort_order = none/title/center\fR : Specifies the sort order of the tasks on the taskbar.  \fI(since 0.12)\fP
+.RS
+.IP \(bu 2
+\fB\fCnone\fR : No sorting. New tasks are simply appended at the end of the taskbar when they appear.
+.IP \(bu 2
+\fB\fCtitle\fR : Sorts the tasks by title.
+.IP \(bu 2
+\fB\fCcenter\fR : Sorts the tasks by their window centers.
+.IP \(bu 2
+\fB\fCmru\fR : Shows the most recently used tasks first. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fClru\fR : Shows the most recently used tasks last. \fI(since 0.12.4)\fP
+.RE
+.IP \(bu 2
+\fB\fCtask_align = left/center/right\fR : Specifies the alignment of the tasks on the taskbar. Default: left.
+.IP \(bu 2
+\fB\fCtaskbar_name = boolean (0 or 1)\fR :  Whether to show the virtual desktop name in the taskbar.
+.IP \(bu 2
+\fB\fCtaskbar_name_padding = padding\fR :  Padding for the virtual desktop name.
+.IP \(bu 2
+\fB\fCtaskbar_name_background_id = integer\fR :  Which background to use for the desktop name.
+.IP \(bu 2
+\fB\fCtaskbar_name_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR :  Font configuration for the desktop name.
+.IP \(bu 2
+\fB\fCtaskbar_name_font_color = color opacity (0 to 100)\fR :  Font color for the desktop name.
+.IP \(bu 2
+\fB\fCtaskbar_name_active_background_id = integer\fR :  Which background to use for the name of the current desktop.
+.IP \(bu 2
+\fB\fCtaskbar_name_active_font_color = color opacity (0 to 100)\fR :  Font color for the name of the current desktop.
+.RE
+.SH Taskbar buttons
+.PP
+The following options configure the task buttons in the taskbar:
+.RS
+.IP \(bu 2
+\fB\fCtask_icon = boolean (0 or 1)\fR : Whether to display the task icon. There is no explicit option to control the task icon size; it depends on the vertical padding set with \fB\fCtask_padding\fR\&.
+.IP \(bu 2
+\fB\fCtask_text = boolean (0 or 1)\fR : Whether to display the task text.
+.IP \(bu 2
+\fB\fCtask_centered = boolean (0 or 1)\fR : Whether the task text is centered.
+.IP \(bu 2
+\fB\fCtask_tooltip = boolean (0 or 1)\fR : Whether to show tooltips for tasks.
+.IP \(bu 2
+\fB\fCtask_maximum_size = width height\fR
+.RS
+.IP \(bu 2
+\fB\fCwidth\fR is used with horizontal panels to limit the size of the tasks. Use \fB\fCwidth = 0\fR to get full taskbar width.
+.IP \(bu 2
+\fB\fCheight\fR is used with vertical panels.
+.RE
+.IP \(bu 2
+\fB\fCtask_padding = horizontal_padding vertical_padding spacing\fR
+.IP \(bu 2
+\fB\fCurgent_nb_of_blink = integer\fR : Number of blinks on 'get attention' events.
+.RE
+.PP
+[](images/task_padding.jpg)
+.RS
+.IP \(bu 2
+\fB\fCtask_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
+.IP \(bu 2
+\fB\fCtask_font_color = color opacity (0 to 100)\fR
+.IP \(bu 2
+\fB\fCtask_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjust the task icon's color and transparency.
+.IP \(bu 2
+\fB\fCtask_background_id = integer\fR : Which background to use for non selected tasks
+.RE
+.TP
+For the next 3 options STATUS can be \fB\fCactive\fR / \fB\fCiconified\fR  / \fB\fCurgent\fR:
+* \fB\fCtask_STATUS_font_color = color opacity (0 to 100)\fR
+.RS
+.IP \(bu 2
+\fB\fCtask_STATUS_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjusts the task icon's color and transparency.
+.IP \(bu 2
+\fB\fCtask_STATUS_background_id = integer\fR : Which background to use for the task.
+.RE
+.SS Mouse actions for taskbar buttons
+.PP
+The possible mouse events are: \fB\fCleft, middle, right, scroll_up, scroll_down\fR\&.
+.PP
+The possible mouse actions are: \fB\fCnone, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task\fR\&.
+.PP
+Use \fB\fCmouse_event = action\fR to customize mouse actions. Example:
+\fB\fC
+  mouse_middle = none
+  mouse_right = close
+  mouse_scroll_up = toggle
+  mouse_scroll_down = iconify
+\fR
+.TP
+The action semantics:
+* \fB\fCnone\fR : If \fB\fCwm_menu = 1\fR is set, the mouse event is forwarded to the window manager. Otherwise it is ignored.
+* \fB\fCclose\fR : close the task
+* \fB\fCtoggle\fR : toggle the task
+* \fB\fCiconify\fR : iconify (minimize) the task
+* \fB\fCtoggle_iconify\fR : toggle or iconify the task
+* \fB\fCmaximize_restore\fR : maximized or minimized the task
+* \fB\fCshade\fR : shades (collapses) the task
+* \fB\fCdesktop_left\fR : send the task to the desktop on the left
+* \fB\fCdesktop_right\fR : send the task to the desktop on the right
+* \fB\fCnext_task\fR : send the focus to next task
+* \fB\fCprev_task\fR : send the focus to previous task
+.SS System Tray
+.RS
+.IP \(bu 2
+\fB\fCsystray_padding = horizontal_padding vertical_padding spacing\fR
+.IP \(bu 2
+\fB\fCsystray_background_id = integer\fR : Which background to use.
+.IP \(bu 2
+\fB\fCsystray_sort = ascending/descending/left2right/right2left\fR : Specifies the sorting order for the icons in the systray: in ascending/descending alphabetical order of the icon title, or always add icons to the right/left (note that with \fB\fCleft2right\fR or \fB\fCright2left\fR the order can be different on panel restart).
+.IP \(bu 2
+\fB\fCsystray_icon_size = max_icon_size\fR : Set the maximum system tray icon size to \fB\fCnumber\fR\&. Set to \fB\fC0\fR for automatic icon sizing.
+.IP \(bu 2
+\fB\fCsystray_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjust the systray icons color and transparency.
+.IP \(bu 2
+\fB\fCsystray_monitor = integer (1, 2, ...)\fR :  On which monitor to draw the systray. The first monitor is \fB\fC1\fR\&. \fI(since 0.12)\fP
+.IP \(bu 2
+\fB\fCsystray_name_filter = string\fR :  Regular expression to identify icon names to be hidden. For example, \fB\fC^audacious$\fR will hide icons with the exact name \fB\fCaudacious\fR, while \fB\fCaud\fR will hide any icons having \fB\fCaud\fR in the name. \fI(since 0.13.1)\fP
+.RE
+.SS Clock
+.RS
+.IP \(bu 2
+\fB\fCtime1_format = %H:%M\fR : The format used by the first line of the clock.
+.RS
+.IP \(bu 2
+\fB\fCtime1_format\fR, \fB\fCtime2_format\fR and \fB\fCclock_tooltip\fR use the 'strftime' syntax. More info can be found here: \[la]http://www.manpagez.com/man/3/strftime/\[ra]
+.IP \(bu 2
+To hide the clock, comment \fB\fCtime1_format\fR and \fB\fCtime2_format\fR\&.
+.RE
+.IP \(bu 2
+\fB\fCtime1_timezone = :US/Hawaii\fR
+.RS
+.IP \(bu 2
+\fB\fCtime1_timezone\fR, \fB\fCtime2_timezone\fR and \fB\fCclock_tooltip_timezone\fR can be used to specify a timezone. If you do not specify a value the system\-wide timezone is used. The timezones can usually be found in \fB\fC/usr/share/zoneinfo\fR\&. If your timezones are in a different directory, you need to specify the absolute path, e.g. \fB\fCtime1_timezone = :/different/zoneinfo/dir/US/Hawaii\fR Always prepend the timezone with a ':'
+.RE
+.IP \(bu 2
+\fB\fCtime1_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
+.IP \(bu 2
+\fB\fCtime2_format = %A %d %B\fR
+.IP \(bu 2
+\fB\fCtime2_timezone = :Europe/Berlin\fR
+.IP \(bu 2
+\fB\fCtime2_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
+.IP \(bu 2
+\fB\fCclock_font_color = color opacity (0 to 100)\fR
+.IP \(bu 2
+\fB\fCclock_padding = horizontal_padding vertical_padding\fR
+.IP \(bu 2
+\fB\fCclock_background_id = integer\fR : Which background to use
+.IP \(bu 2
+\fB\fCclock_tooltip = %a, %d. %b %Y\fR : Format for the clock's tooltip.
+.IP \(bu 2
+\fB\fCclock_tooltip_timezone = :UTC\fR
+.IP \(bu 2
+\fB\fCclock_lclick_command = text\fR : Command to execute on left click.
+.IP \(bu 2
+\fB\fCclock_rclick_command = text\fR : Command to execute on right click.
+.IP \(bu 2
+\fB\fCclock_mclick_command = text\fR : Command to execute on middle click. \fI(since 0.12.1)\fP
+.IP \(bu 2
+\fB\fCclock_uwheel_command = text\fR : Command to execute on wheel scroll up. \fI(since 0.12.1)\fP
+.IP \(bu 2
+\fB\fCclock_dwheel_command = text\fR : Command to execute on wheel scroll down. \fI(since 0.12.1)\fP
+.RE
+.SS Tooltip
+.RS
+.IP \(bu 2
+\fB\fCtooltip_padding = horizontal_padding vertical_padding\fR
+.IP \(bu 2
+\fB\fCtooltip_show_timeout = float\fR : Delay to show the tooltip in seconds. Use \fB\fC\&.\fR as decimal separator.
+.IP \(bu 2
+\fB\fCtooltip_hide_timeout = float\fR : Delay to hide the tooltip in seconds. Use \fB\fC\&.\fR as decimal separator.
+.IP \(bu 2
+\fB\fCtooltip_background_id = integer\fR : Which background to use for tooltips. Note that with fake transparency the alpha channel and corner radius options are not respected.
+.IP \(bu 2
+\fB\fCtooltip_font_color = color opacity  (0 to 100)\fR
+.IP \(bu 2
+\fB\fCtooltip_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
+.RE
+.SS Battery
+.RS
+.IP \(bu 2
+\fB\fCbattery_hide = never/integer (0 to 100)\fR : At what battery percentage the battery item is hidden.
+.IP \(bu 2
+\fB\fCbattery_low_status = integer\fR: At what battery percentage the low command is executed.
+.IP \(bu 2
+\fB\fCbattery_low_cmd = notify\-send "battery low"\fR : Command to execute when the battery is low.
+.IP \(bu 2
+\fB\fCbat1_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
+.IP \(bu 2
+\fB\fCbat2_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
+.IP \(bu 2
+\fB\fCbattery_font_color = color opacity (0 to 100)\fR
+.IP \(bu 2
+\fB\fCbattery_padding = horizontal_padding vertical_padding\fR
+.IP \(bu 2
+\fB\fCbattery_background_id = integer\fR : Which background to use for the battery.
+.IP \(bu 2
+\fB\fCbattery_tooltip_enabled = boolean (0 or 1)\fR : Enable/disable battery tooltips. \fI(since 0.12.3)\fP
+.IP \(bu 2
+\fB\fCbattery_lclick_command = text\fR : Command to execute on left click. \fI(since 0.12.1)\fP
+.IP \(bu 2
+\fB\fCbattery_rclick_command = text\fR : Command to execute on right click. \fI(since 0.12.1)\fP
+.IP \(bu 2
+\fB\fCbattery_mclick_command = text\fR : Command to execute on middle click. \fI(since 0.12.1)\fP
+.IP \(bu 2
+\fB\fCbattery_uwheel_command = text\fR : Command to execute on wheel scroll up. \fI(since 0.12.1)\fP
+.IP \(bu 2
+\fB\fCbattery_dwheel_command = text\fR : Command to execute on wheel scroll down. \fI(since 0.12.1)\fP
+.IP \(bu 2
+\fB\fCac_connected_cmd = text\fR : Command to execute when the power adapter is plugged in. \fI(since 0.12.3)\fP
+.IP \(bu 2
+\fB\fCac_disconnected_cmd = text\fR : Command to execute when the power adapter is unplugged. \fI(since 0.12.3)\fP
+.RE
+.SS Executor
+.RS
+.IP \(bu 2
+\fB\fCexecp = new\fR : Begins the configuration of a new executor plugin. Multiple such plugins are supported; just use multiple \fB\fCE\fRs in \fB\fCpanel_items\fR\&. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_command = text\fR : Command to execute. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_interval = integer\fR : The command is executed again after \fB\fCexecp_interval\fR seconds from the moment it exits. If zero, the command is executed only once. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_continuous = integer\fR : If non\-zero, the last \fB\fCexecp_continuous\fR lines from the output of the command are displayed, every \fB\fCexecp_continuous\fR lines; this is useful for showing the output of commands that run indefinitely, such as \fB\fCping 127.0.0.1\fR\&. If zero, the output of the command is displayed after it finishes executing. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_has_icon = boolean (0 or 1)\fR : If \fB\fCexecp_has_icon = 1\fR, the first line printed by the command is interpreted as a path to an image file. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_cache_icon = boolean (0 or 1)\fR : If \fB\fCexecp_cache_icon = 0\fR, the image is reloaded each time the command is executed (useful if the image file is changed on disk by the program executed by \fB\fCexecp_command\fR). \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_icon_w = integer\fR : You can use \fB\fCexecp_icon_w\fR and \fB\fCexecp_icon_h\fR to resize the image. If one of them is zero/missing, the image is rescaled proportionally. If both of them are zero/missing, the image is not rescaled. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_icon_h = integer\fR : See \fB\fCexecp_icon_w\fR\&. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_tooltip = text\fR : The tooltip. Leave it empty to not display a tooltip. Not specifying this option leads to showing an automatically generated tooltip with information about when the command was last executed. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR : The font used to draw the text.  \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_font_color = color opacity\fR : The font color. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_markup = boolean (0 or 1)\fR : If non\-zero, the output of the command is treated as Pango markup, which allows rich text formatting. The format is documented here \[la]https://developer.gnome.org/pygtk/stable/pango-markup-language.html\[ra]\&. Note that using this with commands that print data downloaded from the Internet is a possible security risk. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_background_id = integer\fR : Which background to use. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_centered = boolean (0 or 1)\fR : Whether to center the text. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text\fR \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_lclick_command = text\fR : Command to execute on left click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_mclick_command = text\fR : Command to execute on right click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_rclick_command = text\fR : Command to execute on middle click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_uwheel_command = text\fR : Command to execute on wheel scroll up. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
+.IP \(bu 2
+\fB\fCexecp_dwheel_command = text\fR : Command to execute on wheel scroll down. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
+.RE
+.SS Executor samples
+.SS Print the hostname
+.PP
+.RS
+.nf
+execp = new
+execp_command = hostname
+execp_interval = 0
+.fi
+.RE
+.SS Print disk usage for the root partition every 10 seconds
+.PP
+.RS
+.nf
+execp = new
+execp_command = df \-h | awk '/\\/$/ { print $6 ": " $2 " " $5}'
+execp_interval = 10
+.fi
+.RE
+.SS Button with icon and rich text, executes command when clicked
+.PP
+.RS
+.nf
+execp = new
+execp_command = echo /usr/share/icons/elementary\-xfce/emblems/24/emblem\-colors\-blue.png; echo '<span foreground="#7f7">Click</span> <span foreground="#77f">me</span> <span foreground="#f77">pls</span>'
+execp_has_icon = 1
+execp_interval = 0
+execp_centered = 1
+execp_font = sans 9
+execp_markup = 1
+execp_font_color = #aaffaa 100
+execp_padding = 2 0
+execp_tooltip = I will tell you a secret...
+execp_lclick_command = zenity \-\-info "\-\-text=$(uname \-sr)"
+execp_background_id = 2
+.fi
+.RE
+.SS Desktop pager with text
+.PP
+.RS
+.nf
+execp = new
+execp_command = xprop \-root \-spy | awk '/^_NET_CURRENT_DESKTOP/ { print "Workspace " ($3 + 1) ; fflush(); }'
+execp_interval = 1
+execp_continuous = 1
+.fi
+.RE
+.SS Desktop pager with icon
+.PP
+.RS
+.nf
+execp_command = xprop \-root \-spy | awk \-v home="$HOME" '/^_NET_CURRENT_DESKTOP/ { print home "/.config/myPager/" ($3 + 1) ".png\\n" ; fflush(); }'
+execp_interval = 1
+execp_has_icon = 1
+execp_cache_icon = 1
+execp_continuous = 2
+.fi
+.RE
+.SS Round\-trip time to the gateway, refreshed every second
+.PP
+.RS
+.nf
+execp = new
+execp_command = ping \-i 1 \-c 1 \-W 1 \-O \-D \-n $(ip route | grep default | grep via | grep \-o '[0\-9]*\\.[0\-9]*\\.[0\-9]*\\.[0\-9]*') | awk '/no/ { print "<span foreground=\\"#faa\\">timeout</span>"; fflush(); }; /time=/ { gsub(/time=/, "", $8); printf "<span foreground=\\"#7af\\">%3.0f %s</span>\\n", $8, $9; fflush(); } '
+execp_continuous = 0
+execp_interval = 1
+execp_markup = 1
+.fi
+.RE
+.SS Memory usage
+.PP
+.RS
+.nf
+execp = new
+execp_command = free | awk '/^\-/ { printf "Mem: '$(free \-h | awk '/^Mem:/ { print $2 }')' %.0f%%\\n", 100*$3/($3+$4); fflush(stdout) }'
+execp_interval = 5
+execp_continuous = 0
+.fi
+.RE
+.SS Network load
+.PP
+.RS
+.nf
+# Note the use of "stdbuf \-oL" to force the program to flush the output line by line.
+execp = new
+execp_command = stdbuf \-oL bwm\-ng \-o csv \-t 1000 | awk \-F ';' '/total/ { printf "Net: %.0f Mb/s\\n", ($5*8/1.0e6) }; fflush(stdout)'
+execp_continuous = 1
+execp_interval = 1
+.fi
+.RE
+.SS Button
+.RS
+.IP \(bu 2
+\fB\fCbutton = new\fR : Begins the configuration of a new button. Multiple such plugins are supported; just use multiple \fB\fCP\fRs in \fB\fCpanel_items\fR\&. \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_icon = text\fR : Name or path of icon (or empty). \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_text = text\fR : Text to display (or empty). \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_tooltip = text\fR : The tooltip (or empty). \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR : The font used to draw the text.  \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_font_color = color opacity\fR : The font color. \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_background_id = integer\fR : Which background to use. \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_centered = boolean (0 or 1)\fR : Whether to center the text. \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_padding = horizontal_padding vertical_padding spacing_between_icon_and_text\fR \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_max_icon_size = integer\fR : Sets a limit to the icon size. Otherwise, the icon will expand to the edges. \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_lclick_command = text\fR : Command to execute on left click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_mclick_command = text\fR : Command to execute on right click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_rclick_command = text\fR : Command to execute on middle click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_uwheel_command = text\fR : Command to execute on wheel scroll up. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.14)\fP
+.IP \(bu 2
+\fB\fCbutton_dwheel_command = text\fR : Command to execute on wheel scroll down. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.14)\fP
+.RE
+.SS Separator
+.RS
+.IP \(bu 2
+\fB\fCseparator = new\fR : Begins the configuration of a new separator. Multiple such plugins are supported; just use multiple \fB\fC:\fRs in \fB\fCpanel_items\fR\&. \fI(since 0.13.0)\fP
+.IP \(bu 2
+\fB\fCseparator_background_id = integer\fR : Which background to use. \fI(since 0.13.0)\fP
+.IP \(bu 2
+\fB\fCseparator_color = color opacity\fR : The foreground color. \fI(since 0.13.0)\fP
+.IP \(bu 2
+\fB\fCseparator_style = [empty | line | dots]\fR : The separator style. \fI(since 0.13.0)\fP
+.IP \(bu 2
+\fB\fCseparator_size = integer\fR : The thickness of the separator. Does not include the border and padding. For example, if the style is \fB\fCline\fR, this is the line thickness; if the style is \fB\fCdots\fR, this is the dot's diameter. \fI(since 0.13.0)\fP
+.IP \(bu 2
+\fB\fCseparator_padding = side_padding cap_padding\fR : The padding to add to the sides of the separator, in pixels. \fI(since 0.13.0)\fP
+.RE
+.SS Example configuration
+.PP
+See /etc/xdg/tint2/tint2rc.
+.SH AUTHOR
+.PP
+tint2 was written by Thierry Lorthiois \[la]lorthiois@bbsoft.fr\[ra]\&.
+It is based on ttm, originally written by Pål Staurland \[la]staura@gmail.com\[ra]\&.
+.PP
+This manual page was originally written by Daniel Moerner \[la]dmoerner@gmail.com\[ra], for the Debian project (but may be used by others).
+It was adopted from the tint2 docs.
+.SH SEE ALSO
+.PP
+The main website \[la]https://gitlab.com/o9000/tint2\[ra]
+and the wiki page at \[la]https://gitlab.com/o9000/tint2/wikis/home\[ra]\&.
+.PP
+This documentation is also provided in HTML and Markdown format in the system's default location
+for documentation files, usually \fB\fC/usr/share/doc/tint2\fR or \fB\fC/usr/local/share/doc/tint2\fR\&.

doc/tint2.html

@@ -0,0 +1,524 @@
+<h1 id="tint2-1-2016-05-22"><span class="md2man-title">TINT2</span> <span class="md2man-section">1</span> <span class="md2man-date">2016-05-22</span><a name="tint2-1-2016-05-22" href="#tint2-1-2016-05-22" class="md2man-permalink" title="permalink"></a></h1><h2 id="name">NAME<a name="name" href="#name" class="md2man-permalink" title="permalink"></a></h2><p>tint2 - lightweight panel/taskbar</p><h2 id="synopsis">SYNOPSIS<a name="synopsis" href="#synopsis" class="md2man-permalink" title="permalink"></a></h2><p><code>tint2 [-c path_to_config_file]</code></p><h2 id="description">DESCRIPTION<a name="description" href="#description" class="md2man-permalink" title="permalink"></a></h2><p>tint2 is a simple panel/taskbar made for modern X window managers.
+It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.).</p><p>Features:</p>
+<ul>
+<li>Panel with taskbar, system tray, clock and launcher icons;</li>
+<li>Easy to customize: color/transparency on fonts, icons, borders and backgrounds;</li>
+<li>Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;</li>
+<li>Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;</li>
+<li>Customizable mouse events.</li>
+</ul>
+<p>Goals:</p>
+<ul>
+<li>Be unintrusive and light (in terms of memory, CPU and aesthetic);</li>
+<li>Follow the freedesktop.org specifications;</li>
+<li>Make certain workflows, such as multi-desktop and multi-monitor, easy to use.</li>
+</ul>
+<h2 id="options">OPTIONS<a name="options" href="#options" class="md2man-permalink" title="permalink"></a></h2><dl><dt><code>-c path_to_config_file</code></dt><dd>Specifies which configuration file to use instead of the default.</dd></dl><h2 id="configuration">CONFIGURATION<a name="configuration" href="#configuration" class="md2man-permalink" title="permalink"></a></h2><h3 id="table-of-contents">Table of contents<a name="table-of-contents" href="#table-of-contents" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><a href="#introduction">Introduction</a></p></li>
+<li><p><a href="#backgrounds-and-borders">Backgrounds and borders</a></p></li>
+<li><p><a href="#panel">Panel</a></p></li>
+<li><p><a href="#launcher">Launcher</a></p></li>
+<li><p><a href="#taskbar-pager">Taskbar/Pager</a></p></li>
+<li><p><a href="#taskbar-buttons">Taskbar buttons</a></p></li>
+<li><p><a href="#mouse-actions-for-taskbar-buttons">Mouse actions for taskbar buttons</a></p></li>
+<li><p><a href="#system-tray">System tray</a></p></li>
+<li><p><a href="#clock">Clock</a></p></li>
+<li><p><a href="#tooltip">Tooltip</a></p></li>
+<li><p><a href="#battery">Battery</a></p></li>
+<li><p><a href="#executor">Executor</a></p></li>
+<li><p><a href="#example-configuration">Example configuration</a></p></li>
+</ul>
+<h3 id="introduction">Introduction<a name="introduction" href="#introduction" class="md2man-permalink" title="permalink"></a></h3><p>These are instructions for configuring tint2 directly by editing its config file.
+You may also use instead the graphical interface <code>tint2conf</code>.</p><p>The first time you run tint2, it will create the config file in <code>$HOME/.config/tint2/tint2rc</code> (This applies if you have done a clean install. Running tint2 in the source directory without doing &#39;make install&#39; will not create the config file.)</p><p>You can also specify another file on the command line with the -c option, e.g.: <code>tint2 -c $HOME/tint2.conf</code>. This can be used to run multiple instances of tint2 that use different settings.</p><p>If you change the config file while tint2 is running, the command <code>killall -SIGUSR1 tint2</code> will force tint2 to reload it.</p><p>All the configuration options supported in the config file are listed below.
+Try to respect as much as possible the order of the options as given below.</p><h3 id="backgrounds-and-borders">Backgrounds and borders<a name="backgrounds-and-borders" href="#backgrounds-and-borders" class="md2man-permalink" title="permalink"></a></h3><p>The tint2 config file starts with the options defining background elements with borders:</p>
+<ul>
+<li><p><code>rounded = number_of_pixels</code> : the corner radius</p></li>
+<li><p><code>border_width = integer</code> : the border width in pixels</p></li>
+<li><p><code>border_sides = LRTB</code> : the sides to draw the border on (left, right, top, bottom). If not specified, all sides are used.</p></li>
+<li><p><code>background_color = color opacity</code></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz).</li>
+</ul></li>
+<li><p><code>border_color = color opacity</code></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
+</ul></li>
+<li><p><code>background_color_hover = color opacity</code> (default: same as background_color) <em>(since 0.12.3)</em></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)</li>
+</ul></li>
+<li><p><code>border_color_hover = color opacity</code> (default: same as border_color) <em>(since 0.12.3)</em></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
+</ul></li>
+<li><p><code>background_color_pressed = color opacity</code> (default: same as background<em>color</em>hover) <em>(since 0.12.3)</em></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)</li>
+</ul></li>
+<li><p><code>border_color_pressed = color opacity</code> (default: same as border<em>color</em>hover) <em>(since 0.12.3)</em></p>
+<ul>
+<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
+<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
+</ul></li>
+</ul>
+<p>You can define as many backgrounds as you want. For example, the following config defines two backgrounds:</p><pre class="highlight plaintext"><code>rounded = 1
+border_width = 0
+background_color = #282828 100
+border_color = #000000 0
+
+rounded = 1
+border_width = 0
+background_color = #f6b655 90
+border_color = #cccccc 40
+</code></pre>
+<p>tint2 automatically identifies each background with a number starting from 1 (1, 2, ...).
+Afterwards, you can apply a background to objects (panel, taskbar, task, clock, systray) using the background id, for example:</p><pre class="highlight plaintext"><code>panel_background_id = 1
+taskbar_background_id = 0
+task_background_id = 0
+task_active_background_id = 2
+systray_background_id = 0
+clock_background_id = 0
+</code></pre>
+<p>Identifier 0 refers to a special background which is fully transparent, identifier 1 applies the first background defined in the config file etc.</p><h3 id="panel">Panel<a name="panel" href="#panel" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>panel_items = LTSBC</code> defines the items tint2 will show and the order of those items. Each letter refers to an item, defined as:</p>
+<ul>
+<li><code>L</code> shows the Launcher</li>
+<li><code>T</code> shows the Taskbar</li>
+<li><code>S</code> shows the Systray (also called notification area)</li>
+<li><code>B</code> shows the Battery status</li>
+<li><code>C</code> shows the Clock</li>
+<li><code>F</code> adds an extensible spacer (freespace). Has no effect if <code>T</code> is also present. <em>(since 0.12)</em></li>
+<li><code>E</code> adds an executor plugin. You can specify more than one. <em>(since 0.12.4)</em></li>
+</ul>
+<p>For example, <code>panel_items = STC</code> will show the systray, the taskbar and the clock (from left to right).</p></li>
+<li><p><code>panel_monitor = monitor (all or 1 or 2 or ...)</code> : Which monitor tint2 draws the panel on</p>
+<ul>
+<li>The first monitor is <code>1</code></li>
+<li>Use <code>panel_monitor = all</code> to get a separate panel per monitor</li>
+</ul></li>
+<li><p><code>primary_monitor_first = boolean (0 or 1)</code> : Place the primary monitor before all the other monitors in the list. <em>(since 0.12.4)</em></p></li>
+</ul>
+<p><img src="panel_padding.jpg" alt=""></p>
+<ul>
+<li><p><code>panel_position = vertical_position horizontal_position orientation</code></p>
+<ul>
+<li><code>vertical_position</code> is one of: <code>bottom</code>, <code>top</code>, <code>center</code></li>
+<li><code>horizontal_position</code> is one of: <code>left</code>, <code>right</code>, <code>center</code></li>
+<li><code>orientation</code> is one of: <code>horizontal</code>, <code>vertical</code></li>
+</ul></li>
+<li><p><code>panel_size = width height</code></p>
+<ul>
+<li><code>width</code> and <code>height</code> can be specified without units (e.g. <code>123</code>) as pixels, or followed by <code>%</code> as percentages of the monitor size (e.g. <code>50%</code>). Use <code>100%</code> for full monitor width/height.
+Example:</li>
+</ul></li>
+</ul>
+<pre class="highlight plaintext"><code># The panel's width is 94% the size of the monitor, the height is 30 pixels:
+panel_size = 94% 30
+</code></pre>
+
+<ul>
+<li><code>panel_margin = horizontal_margin vertical_margin</code> : The margins define the distance between the panel and the horizontal/vertical monitor edge. Use <code>0</code> to obtain a panel with the same size as the edge of the monitor (no margin).</li>
+</ul>
+<p><img src="panel_size_margin.jpg" alt=""></p>
+<ul>
+<li><code>panel_padding = horizontal_padding vertical_padding spacing</code> : Please refer to the image below.</li>
+</ul>
+<p><img src="panel_padding.jpg" alt=""></p>
+<ul>
+<li><p><code>font_shadow = boolean (0 or 1)</code></p></li>
+<li><p><code>panel_background_id = integer</code> : Which background to use for the panel.</p></li>
+<li><p><code>wm_menu = boolean (0 or 1)</code> : Defines if tint2 forwards unhandled mouse events to your window manager. Useful for window managers such as openbox, which display the start menu if you right click on the desktop.</p></li>
+<li><p><code>panel_dock = boolean (0 or 1)</code> : Defines if tint2 is placed into the window manager&#39;s dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).</p></li>
+<li><p><code>panel_layer = bottom/normal/top</code> : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.</p></li>
+<li><p><code>strut_policy = follow_size/minimum/none</code> : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.</p>
+<ul>
+<li><code>follow_size</code> means that the maximized windows always resize to have a common edge with tint2.</li>
+<li><code>minimum</code> means that the maximized windows always expand to have a common edge with the hidden panel. This is useful if the <code>autohide</code> option is enabled.</li>
+<li><code>none</code> means that the maximized windows use the full screen size.</li>
+</ul></li>
+<li><p><code>panel_window_name = string</code> : Defines the name of the panel&#39;s window. Default: &#39;tint2&#39;. <em>(since 0.12)</em></p></li>
+<li><p><code>disable_transparency = boolean (0 or 1)</code> : Whether to disable transparency instead of detecting if it is supported. Useful on broken graphics stacks. <em>(since 0.12)</em></p></li>
+<li><p><code>mouse_effects = boolean (0 or 1)</code> : Whether to enable mouse hover effects for clickable items. <em>(since 0.12.3)</em></p></li>
+<li><p><code>mouse_hover_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency on mouse hover (works only when mouse_effects = 1).` <em>(since 0.12.3)</em></p></li>
+<li><p><code>mouse_pressed_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency on mouse press (works only when mouse_effects = 1).` <em>(since 0.12.3)</em></p></li>
+<li><p><code>autohide = boolean (0 or 1)</code> : Whether to enable panel hiding when the mouse cursor exists the panel.</p></li>
+<li><p><code>autohide_show_timeout = float</code> : Show timeout in seconds after the mouse cursor enters the panel. Use &#39;.&#39; as decimal separator.</p></li>
+<li><p><code>autohide_hide_timeout = float</code> : Hide timeout in seconds after the mouse cursor exits the panel. Use &#39;.&#39; as decimal separator.</p></li>
+<li><p><code>autohide_height = integer</code> : panel height (width for vertical panels) in hidden mode.</p></li>
+</ul>
+<h3 id="launcher">Launcher<a name="launcher" href="#launcher" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>launcher_item_app = path_to_application</code> : Each <code>launcher_item_app</code> must be a file path to a .desktop file following the freedesktop.org <a href="http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html">specification</a>. The paths may begin with <code>~</code>, which is expanded to the path of the user&#39;s home directory. If only a file name is specified, the file is search in the standard application directories (<code>$XDG_DATA_HOME/applications</code>, <code>~/.local/share/applications</code>, <code>$XDG_DATA_DIRS/applications</code>, <code>/usr/local/share/applications</code>, <code>/usr/share/applications</code>, <code>/opt/share/applications</code>).</p></li>
+<li><p><code>launcher_apps_dir = path_to_directory</code> : Specifies a path to a directory from which the launcher is loading all .desktop files (all subdirectories are explored recursively). Can be used multiple times. The path may begin with <code>~</code>, which is expanded to the path of the user&#39;s home directory. <em>(since 0.12)</em></p></li>
+<li><p><code>launcher_background_id = integer</code> : Defines which background to use.</p></li>
+<li><p><code>launcher_icon_background_id = integer</code> : Defines which background to use for icons.</p></li>
+<li><p><code>launcher_padding = horizontal_padding vertical_padding spacing</code></p></li>
+<li><p><code>launcher_icon_size = integer</code> : The launcher icon size, in pixels.</p></li>
+<li><p><code>launcher_icon_theme = name_of_theme</code> : (Optional) Uses the specified icon theme to display shortcut icons. Note that tint2 will detect and use the icon theme of your desktop if you have an XSETTINGS manager running (which you probably do), unless <code>launcher_icon_theme_override = 1</code>.</p></li>
+<li><p><code>launcher_icon_theme_override = boolean (0 or 1)</code> : Whether <code>launcher_icon_theme</code> overrides the value obtained from the XSETTINGS manager. <em>(since 0.12)</em></p></li>
+<li><p><code>launcher_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency.</p></li>
+<li><p><code>launcher_tooltip = boolean (0 or 1)</code> : Whether to show tooltips for the launcher icons.</p></li>
+<li><p><code>startup_notifications = boolean (0 or 1)</code> : Whether to show startup notifications when starting applications from the launcher. <em>(since 0.12)</em></p></li>
+</ul>
+<h3 id="taskbar-pager">Taskbar / Pager<a name="taskbar-pager" href="#taskbar-pager" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>taskbar_mode = single_desktop/multi_desktop</code></p>
+<ul>
+<li><code>single_desktop</code> : Shows a normal taskbar listing the tasks running on the current virtual desktop (also known as &#39;workspace&#39;);</li>
+<li><code>multi_desktop</code> : Pager like capability. Shows multiple taskbars, one per virtual desktop, with which:
+
+<ul>
+<li>You can drag-and-drop tasks between virtual desktops;</li>
+<li>You can switch between virtual desktops.</li>
+</ul></li>
+</ul></li>
+<li><p><code>taskbar_distribute_size = boolean (0 or 1)</code> :  If enabled, in multi-desktop mode distributes between taskbars the available size proportionally to the number of tasks. Default: disabled. <em>(since 0.12)</em></p></li>
+<li><p><code>taskbar_padding = horizontal_padding vertical_padding spacing</code></p></li>
+</ul>
+<p><img src="taskbar_padding.jpg" alt=""></p>
+<ul>
+<li><p><code>taskbar_background_id = integer</code> : Which background to use</p></li>
+<li><p><code>taskbar_active_background_id = integer</code> : Which background to use for the taskbar of the current virtual desktop.</p></li>
+<li><p><code>taskbar_hide_inactive_tasks = boolean (0 or 1)</code> :  If enabled, the taskbar shows only the active task. <em>(since 0.12)</em></p></li>
+<li><p><code>taskbar_hide_different_monitor = boolean (0 or 1)</code> :  If enabled, the taskbar shows only the tasks from the current monitor. Useful when running different tint2 instances on different monitors, each one having its own config. <em>(since 0.12)</em></p></li>
+<li><p><code>taskbar_always_show_all_desktop_tasks = boolean (0 or 1)</code> :  Has effect only if <code>taskbar_mode = multi_desktop</code>. If enabled, tasks that appear on all desktops are shown on all taskbars. Otherwise, they are shown only on the taskbar of the current desktop. <em>(since 0.12.4)</em></p></li>
+<li><p><code>taskbar_sort_order = none/title/center</code> : Specifies the sort order of the tasks on the taskbar.  <em>(since 0.12)</em></p>
+<ul>
+<li><code>none</code> : No sorting. New tasks are simply appended at the end of the taskbar when they appear.</li>
+<li><code>title</code> : Sorts the tasks by title.</li>
+<li><code>center</code> : Sorts the tasks by their window centers.</li>
+<li><code>mru</code> : Shows the most recently used tasks first. <em>(since 0.12.4)</em></li>
+<li><code>lru</code> : Shows the most recently used tasks last. <em>(since 0.12.4)</em></li>
+</ul></li>
+<li><p><code>task_align = left/center/right</code> : Specifies the alignment of the tasks on the taskbar. Default: left.</p></li>
+<li><p><code>taskbar_name = boolean (0 or 1)</code> :  Whether to show the virtual desktop name in the taskbar.</p></li>
+<li><p><code>taskbar_name_padding = padding</code> :  Padding for the virtual desktop name.</p></li>
+<li><p><code>taskbar_name_background_id = integer</code> :  Which background to use for the desktop name.</p></li>
+<li><p><code>taskbar_name_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> :  Font configuration for the desktop name.</p></li>
+<li><p><code>taskbar_name_font_color = color opacity (0 to 100)</code> :  Font color for the desktop name.</p></li>
+<li><p><code>taskbar_name_active_background_id = integer</code> :  Which background to use for the name of the current desktop.</p></li>
+<li><p><code>taskbar_name_active_font_color = color opacity (0 to 100)</code> :  Font color for the name of the current desktop.</p></li>
+</ul>
+<h1 id="taskbar-buttons">Taskbar buttons<a name="taskbar-buttons" href="#taskbar-buttons" class="md2man-permalink" title="permalink"></a></h1><p>The following options configure the task buttons in the taskbar:</p>
+<ul>
+<li><p><code>task_icon = boolean (0 or 1)</code> : Whether to display the task icon.</p></li>
+<li><p><code>task_text = boolean (0 or 1)</code> : Whether to display the task text.</p></li>
+<li><p><code>task_centered = boolean (0 or 1)</code> : Whether the task text is centered.</p></li>
+<li><p><code>task_tooltip = boolean (0 or 1)</code> : Whether to show tooltips for tasks.</p></li>
+<li><p><code>task_maximum_size = width height</code></p>
+<ul>
+<li><code>width</code> is used with horizontal panels to limit the size of the tasks. Use <code>width = 0</code> to get full taskbar width.</li>
+<li><code>height</code> is used with vertical panels.</li>
+</ul></li>
+<li><p><code>task_padding = horizontal_padding vertical_padding spacing</code></p></li>
+<li><p><code>urgent_nb_of_blink = integer</code> : Number of blinks on &#39;get attention&#39; events.</p></li>
+</ul>
+<p><img src="task_padding.jpg" alt=""></p>
+<ul>
+<li><p><code>task_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+<li><p><code>task_font_color = color opacity (0 to 100)</code></p></li>
+<li><p><code>task_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjust the task icon&#39;s color and transparency.</p></li>
+<li><p><code>task_background_id = integer</code> : Which background to use for non selected tasks</p></li>
+</ul>
+<dl><dt>For the next 3 options STATUS can be <code>active</code> / <code>iconified</code>  / <code>urgent</code>:</dt><dd>* <code>task_STATUS_font_color = color opacity (0 to 100)</code></dd></dl>
+<ul>
+<li><p><code>task_STATUS_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the task icon&#39;s color and transparency.</p></li>
+<li><p><code>task_STATUS_background_id = integer</code> : Which background to use for the task.</p></li>
+</ul>
+<h3 id="mouse-actions-for-taskbar-buttons">Mouse actions for taskbar buttons<a name="mouse-actions-for-taskbar-buttons" href="#mouse-actions-for-taskbar-buttons" class="md2man-permalink" title="permalink"></a></h3><p>The possible mouse events are: <code>left, middle, right, scroll_up, scroll_down</code>.</p><p>The possible mouse actions are: <code>none, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task</code>.</p><p>Use <code>mouse_event = action</code> to customize mouse actions. Example:
+<code>
+  mouse_middle = none
+  mouse_right = close
+  mouse_scroll_up = toggle
+  mouse_scroll_down = iconify
+</code></p><dl><dt>The action semantics:</dt><dd>* <code>none</code> : If <code>wm_menu = 1</code> is set, the mouse event is forwarded to the window manager. Otherwise it is ignored.
+* <code>close</code> : close the task
+* <code>toggle</code> : toggle the task
+* <code>iconify</code> : iconify (minimize) the task
+* <code>toggle_iconify</code> : toggle or iconify the task
+* <code>maximize_restore</code> : maximized or minimized the task
+* <code>shade</code> : shades (collapses) the task
+* <code>desktop_left</code> : send the task to the desktop on the left
+* <code>desktop_right</code> : send the task to the desktop on the right
+* <code>next_task</code> : send the focus to next task
+* <code>prev_task</code> : send the focus to previous task</dd></dl><h3 id="system-tray">System Tray<a name="system-tray" href="#system-tray" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>systray_padding = horizontal_padding vertical_padding spacing</code></p></li>
+<li><p><code>systray_background_id = integer</code> : Which background to use.</p></li>
+<li><p><code>systray_sort = ascending/descending/left2right/right2left</code> : Specifies the sorting order for the icons in the systray: in ascending/descending alphabetical order of the icon title, or always add icons to the right/left (note that with <code>left2right</code> or <code>right2left</code> the order can be different on panel restart).</p></li>
+<li><p><code>systray_icon_size = max_icon_size</code> : Set the maximum system tray icon size to <code>number</code>. Set to <code>0</code> for automatic icon sizing.</p></li>
+<li><p><code>systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjust the systray icons color and transparency.</p></li>
+<li><p><code>systray_monitor = integer (1, 2, ...)</code> :  On which monitor to draw the systray. The first monitor is <code>1</code>. <em>(since 0.12)</em></p></li>
+</ul>
+<h3 id="clock">Clock<a name="clock" href="#clock" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>time1_format = %H:%M</code> : The format used by the first line of the clock.</p>
+<ul>
+<li><code>time1_format</code>, <code>time2_format</code> and <code>clock_tooltip</code> use the &#39;strftime&#39; syntax. More info can be found here: <a href="http://www.manpagez.com/man/3/strftime/">http://www.manpagez.com/man/3/strftime/</a></li>
+<li>To hide the clock, comment <code>time1_format</code> and <code>time2_format</code>.</li>
+</ul></li>
+<li><p><code>time1_timezone = :US/Hawaii</code></p>
+<ul>
+<li><code>time1_timezone</code>, <code>time2_timezone</code> and <code>clock_tooltip_timezone</code> can be used to specify a timezone. If you do not specify a value the system-wide timezone is used. The timezones can usually be found in <code>/usr/share/zoneinfo</code>. If your timezones are in a different directory, you need to specify the absolute path, e.g. <code>time1_timezone = :/different/zoneinfo/dir/US/Hawaii</code> Always prepend the timezone with a &#39;:&#39;</li>
+</ul></li>
+<li><p><code>time1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+<li><p><code>time2_format = %A %d %B</code></p></li>
+<li><p><code>time2_timezone = :Europe/Berlin</code></p></li>
+<li><p><code>time2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+<li><p><code>clock_font_color = color opacity (0 to 100)</code></p></li>
+<li><p><code>clock_padding = horizontal_padding vertical_padding</code></p></li>
+<li><p><code>clock_background_id = integer</code> : Which background to use</p></li>
+<li><p><code>clock_tooltip = %a, %d. %b %Y</code> : Format for the clock&#39;s tooltip.</p></li>
+<li><p><code>clock_tooltip_timezone = :UTC</code></p></li>
+<li><p><code>clock_lclick_command = text</code> : Command to execute on left click.</p></li>
+<li><p><code>clock_rclick_command = text</code> : Command to execute on right click.</p></li>
+<li><p><code>clock_mclick_command = text</code> : Command to execute on middle click. <em>(since 0.12.1)</em></p></li>
+<li><p><code>clock_uwheel_command = text</code> : Command to execute on wheel scroll up. <em>(since 0.12.1)</em></p></li>
+<li><p><code>clock_dwheel_command = text</code> : Command to execute on wheel scroll down. <em>(since 0.12.1)</em></p></li>
+</ul>
+<h3 id="tooltip">Tooltip<a name="tooltip" href="#tooltip" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>tooltip_padding = horizontal_padding vertical_padding</code></p></li>
+<li><p><code>tooltip_show_timeout = float</code> : Delay to show the tooltip in seconds. Use &#39;.&#39; as decimal separator.</p></li>
+<li><p><code>tooltip_hide_timeout = float</code> : Delay to hide the tooltip in seconds. Use &#39;.&#39; as decimal separator.</p></li>
+<li><p><code>tooltip_background_id = integer</code> : Which background to use for tooltips. Note that with fake transparency the alpha channel and corner radius options are not respected.</p></li>
+<li><p><code>tooltip_font_color = color opacity  (0 to 100)</code></p></li>
+<li><p><code>tooltip_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+</ul>
+<h3 id="battery">Battery<a name="battery" href="#battery" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>battery_hide = never/integer (0 to 100)</code> : At what battery percentage the battery item is hidden.</p></li>
+<li><p><code>battery_low_status = integer</code>: At what battery percentage the low command is executed.</p></li>
+<li><p><code>battery_low_cmd = notify-send &quot;battery low&quot;</code> : Command to execute when the battery is low.</p></li>
+<li><p><code>bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+<li><p><code>bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
+<li><p><code>battery_font_color = color opacity (0 to 100)</code></p></li>
+<li><p><code>battery_padding = horizontal_padding vertical_padding</code></p></li>
+<li><p><code>battery_background_id = integer</code> : Which background to use for the battery.</p></li>
+<li><p><code>battery_tooltip_enabled = boolean (0 or 1)</code> : Enable/disable battery tooltips. <em>(since 0.12.3)</em></p></li>
+<li><p><code>battery_lclick_command = text</code> : Command to execute on left click. <em>(since 0.12.1)</em></p></li>
+<li><p><code>battery_rclick_command = text</code> : Command to execute on right click. <em>(since 0.12.1)</em></p></li>
+<li><p><code>battery_mclick_command = text</code> : Command to execute on middle click. <em>(since 0.12.1)</em></p></li>
+<li><p><code>battery_uwheel_command = text</code> : Command to execute on wheel scroll up. <em>(since 0.12.1)</em></p></li>
+<li><p><code>battery_dwheel_command = text</code> : Command to execute on wheel scroll down. <em>(since 0.12.1)</em></p></li>
+<li><p><code>ac_connected_cmd = text</code> : Command to execute when the power adapter is plugged in. <em>(since 0.12.3)</em></p></li>
+<li><p><code>ac_disconnected_cmd = text</code> : Command to execute when the power adapter is unplugged. <em>(since 0.12.3)</em></p></li>
+</ul>
+<h3 id="executor">Executor<a name="executor" href="#executor" class="md2man-permalink" title="permalink"></a></h3>
+<ul>
+<li><p><code>execp = new</code> : Begins the configuration of a new executor plugin. Multiple such plugins are supported; just use multiple <code>E</code>s in <code>panel_items</code>. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_command = text</code> : Command to execute. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_interval = integer</code> : The command is executed again after <code>execp_interval</code> seconds from the moment it exits. If zero, the command is executed only once. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_continuous = integer</code> : If non-zero, the last <code>execp_continuous</code> lines from the output of the command are displayed, every <code>execp_continuous</code> lines; this is useful for showing the output of commands that run indefinitely, such as <code>ping 127.0.0.1</code>. If zero, the output of the command is displayed after it finishes executing. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_has_icon = boolean (0 or 1)</code> : If <code>execp_has_icon = 1</code>, the first line printed by the command is interpreted as a path to an image file. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_cache_icon = boolean (0 or 1)</code> : If execp<em>cache</em>icon = 0, the image is reloaded each time the command is executed (useful if the image file is changed on disk by the program executed by <code>execp_command</code>). <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_icon_w = integer</code> : You can use execp<em>icon</em>w and execp<em>icon</em>h to resize the image. If one of them is zero/missing, the image is rescaled proportionally. If both of them are zero/missing, the image is not rescaled. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_icon_h = integer</code> : See <code>execp_icon_w</code>. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_tooltip = text</code> : The tooltip. Leave it empty to not display a tooltip. Not specifying this option leads to showing an automatically generated tooltip with information about when the command was last executed. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> : The font used to draw the text.  <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_font_color = color opacity</code> : The font color. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_markup = boolean (0 or 1)</code> : If non-zero, the output of the command is treated as Pango markup, which allows rich text formatting. The format is <a href="https://developer.gnome.org/pygtk/stable/pango-markup-language.html">documented here</a>. Note that using this with commands that print data downloaded from the Internet is a possible security risk. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_background_id = integer</code> : Which background to use. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_centered = boolean (0 or 1)</code> : Whether to center the text. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text</code> <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_lclick_command = text</code> : Command to execute on left click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_mclick_command = text</code> : Command to execute on right click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_rclick_command = text</code> : Command to execute on middle click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_uwheel_command = text</code> : Command to execute on wheel scroll up. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
+<li><p><code>execp_dwheel_command = text</code> : Command to execute on wheel scroll down. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
+</ul>
+<h4 id="executor-samples">Executor samples<a name="executor-samples" href="#executor-samples" class="md2man-permalink" title="permalink"></a></h4><h5 id="print-the-hostname">Print the hostname<a name="print-the-hostname" href="#print-the-hostname" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = hostname
+execp_interval = 0
+</code></pre>
+<h5 id="print-disk-usage-for-the-root-partition-every-10-seconds">Print disk usage for the root partition every 10 seconds<a name="print-disk-usage-for-the-root-partition-every-10-seconds" href="#print-disk-usage-for-the-root-partition-every-10-seconds" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = df -h | awk '/\/$/ { print $6 ": " $2 " " $5}'
+execp_interval = 10
+</code></pre>
+<h5 id="button-with-icon-and-rich-text-executes-command-when-clicked">Button with icon and rich text, executes command when clicked<a name="button-with-icon-and-rich-text-executes-command-when-clicked" href="#button-with-icon-and-rich-text-executes-command-when-clicked" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = echo /usr/share/icons/elementary-xfce/emblems/24/emblem-colors-blue.png; echo '&lt;span foreground="#7f7"&gt;Click&lt;/span&gt; &lt;span foreground="#77f"&gt;me&lt;/span&gt; &lt;span foreground="#f77"&gt;pls&lt;/span&gt;'
+execp_has_icon = 1
+execp_interval = 0
+execp_centered = 1
+execp_font = sans 9
+execp_markup = 1
+execp_font_color = #aaffaa 100
+execp_padding = 2 0
+execp_tooltip = I will tell you a secret...
+execp_lclick_command = zenity --info "--text=$(uname -sr)"
+execp_background_id = 2
+</code></pre>
+<h5 id="desktop-pager-with-text">Desktop pager with text<a name="desktop-pager-with-text" href="#desktop-pager-with-text" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = xprop -root -spy | awk '/^_NET_CURRENT_DESKTOP/ { print "Workspace " ($3 + 1) ; fflush(); }'
+execp_interval = 1
+execp_continuous = 1
+</code></pre>
+<h5 id="desktop-pager-with-icon">Desktop pager with icon<a name="desktop-pager-with-icon" href="#desktop-pager-with-icon" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp_command = xprop -root -spy | awk -v home="$HOME" '/^_NET_CURRENT_DESKTOP/ { print home "/.config/myPager/" ($3 + 1) ".png\n" ; fflush(); }'
+execp_interval = 1
+execp_has_icon = 1
+execp_cache_icon = 1
+execp_continuous = 2
+</code></pre>
+<h5 id="round-trip-time-to-the-gateway-refreshed-every-second">Round-trip time to the gateway, refreshed every second<a name="round-trip-time-to-the-gateway-refreshed-every-second" href="#round-trip-time-to-the-gateway-refreshed-every-second" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = ping -i 1 -W 1 -O -D -n $(ip route | grep default | grep via | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*') | awk '/no/ { print "&lt;span foreground=\"#faa\"&gt;timeout&lt;/span&gt;"; fflush(); }; /time=/ { gsub(/time=/, "", $8); printf "&lt;span foreground=\"#7af\"&gt;%3.0f %s&lt;/span&gt;\n", $8, $9; fflush(); } '
+execp_continuous = 1
+execp_interval = 1
+execp_markup = 1
+</code></pre>
+<h5 id="memory-usage">Memory usage<a name="memory-usage" href="#memory-usage" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
+execp_command = free -s 2 | awk '/^-/ { printf "Mem: '$(free -h | awk '/^Mem:/ { print $2 }')' %.0f%\n", 100*$3/($3+$4); fflush(stdout) }'
+execp_interval = 1
+execp_continuous = 1
+</code></pre>
+<h5 id="network-load">Network load<a name="network-load" href="#network-load" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code># Note the use of "stdbuf -oL" to force the program to flush the output line by line.
+execp = new
+execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }; fflush(stdout)'
+execp_continuous = 1
+execp_interval = 1
+</code></pre>
+<h3 id="example-configuration">Example configuration<a name="example-configuration" href="#example-configuration" class="md2man-permalink" title="permalink"></a></h3><pre class="highlight plaintext"><code>#---------------------------------------------
+## TINT2 CONFIG FILE
+#---------------------------------------------
+
+#---------------------------------------------
+## BACKGROUND AND BORDER
+#---------------------------------------------
+rounded = 7
+border_width = 2
+background_color = #000000 60
+border_color = #ffffff 18
+
+rounded = 5
+border_width = 0
+background_color = #ffffff 40
+border_color = #ffffff 50
+
+rounded = 5
+border_width = 0
+background_color = #ffffff 18
+border_color = #ffffff 70
+
+#---------------------------------------------
+## PANEL
+#---------------------------------------------
+panel_monitor = all
+panel_position = bottom center
+panel_size = 94% 30
+panel_margin = 0 0
+panel_padding = 7 0
+font_shadow = 0
+panel_background_id = 1
+wm_menu = 0
+panel_dock = 0
+panel_layer = bottom
+
+#---------------------------------------------
+## TASKBAR
+#---------------------------------------------
+#taskbar_mode = multi_desktop
+taskbar_mode = single_desktop
+taskbar_padding = 2 3 2
+taskbar_background_id = 0
+#taskbar_active_background_id = 0
+
+#---------------------------------------------
+## TASKS
+#---------------------------------------------
+task_icon = 1
+task_text = 1
+task_maximum_size = 140 35
+task_centered = 1
+task_padding = 6 3
+task_font = sans 7
+task_font_color = #ffffff 70
+task_background_id = 3
+task_icon_asb = 100 0 0
+## replace STATUS by 'urgent', 'active' or 'iconfied'
+#task_STATUS_background_id = 2
+#task_STATUS_font_color = #ffffff 85
+#task_STATUS_icon_asb = 100 0 0
+## example:
+task_active_background_id = 2
+task_active_font_color = #ffffff 85
+task_active_icon_asb = 100 0 0
+urgent_nb_of_blink = 8
+
+#---------------------------------------------
+## SYSTRAYBAR
+#---------------------------------------------
+systray = 1
+systray_padding = 0 4 5
+systray_background_id = 0
+systray_sort = left2right
+systray_icon_size = 0
+systray_icon_asb = 100 0 0
+
+#---------------------------------------------
+## CLOCK
+#---------------------------------------------
+time1_format = %H:%M
+time1_font = sans 8
+time2_format = %A %d %B
+time2_font = sans 6
+clock_font_color = #ffffff 76
+clock_padding = 1 0
+clock_background_id = 0
+#clock_lclick_command = xclock
+clock_rclick_command = orage
+#clock_tooltip = %A %d %B
+#time1_timezone = :US/Hawaii
+#time2_timezone = :Europe/Berlin
+#clock_tooltip_timezone = :/usr/share/zoneinfo/Europe/Paris
+
+#---------------------------------------------
+## BATTERY
+#---------------------------------------------
+battery = 0
+battery_hide = 98
+battery_low_status = 10
+battery_low_cmd = notify-send "battery low"
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #ffffff 76
+battery_padding = 1 0
+battery_background_id = 0
+
+#---------------------------------------------
+## TOOLTIP
+#---------------------------------------------
+tooltip = 0
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font_color = #OOOOOO 80
+tooltip_font = sans 10
+
+#---------------------------------------------
+## MOUSE ACTION ON TASK
+#---------------------------------------------
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+#---------------------------------------------
+## AUTOHIDE OPTIONS
+#---------------------------------------------
+autohide = 0
+autohide_show_timeout = 0.3
+autohide_hide_timeout = 2
+autohide_height = 4
+strut_policy = minimum
+</code></pre>
+<h2 id="author">AUTHOR<a name="author" href="#author" class="md2man-permalink" title="permalink"></a></h2><p>tint2 was written by Thierry Lorthiois <a href="mailto:lorthiois@bbsoft.fr">lorthiois@bbsoft.fr</a>.
+It is based on ttm, originally written by Pål Staurland <a href="mailto:staura@gmail.com">staura@gmail.com</a>.</p><p>This manual page was written by Daniel Moerner <a href="mailto:dmoerner@gmail.com">dmoerner@gmail.com</a>, for the Debian project (but may be used by others).
+It was adopted from the tint2 docs.</p><h2 id="see-also">SEE ALSO<a name="see-also" href="#see-also" class="md2man-permalink" title="permalink"></a></h2><p>The main website <a href="https://gitlab.com/o9000/tint2">https://gitlab.com/o9000/tint2</a>
+and the wiki page at <a href="https://gitlab.com/o9000/tint2/wikis/home">https://gitlab.com/o9000/tint2/wikis/home</a>.</p>

doc/tint2.md

@@ -0,0 +1,741 @@
+# TINT2 1 "2017-04-23" 0.14.2
+
+## NAME
+tint2 - lightweight panel/taskbar
+
+## DESCRIPTION
+tint2 is a simple panel/taskbar made for modern X window managers.
+It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.).
+
+Features:
+
+  * Panel with taskbar, system tray, clock and launcher icons;
+  * Easy to customize: color/transparency on fonts, icons, borders and backgrounds;
+  * Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;
+  * Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;
+  * Customizable mouse events.
+
+Goals:
+
+  * Be unintrusive and light (in terms of memory, CPU and aesthetic);
+  * Follow the freedesktop.org specifications;
+  * Make certain workflows, such as multi-desktop and multi-monitor, easy to use.
+
+## SYNOPSIS
+`tint2 [OPTION...]`
+
+## OPTIONS
+`-c path_to_config_file`
+  Specifies which configuration file to use instead of the default.
+
+`-v, --version`
+  Prints version information and exits.
+
+`-h, --help`
+  Display this help and exits.
+
+
+## CONFIGURATION
+
+### Table of contents
+
+  * [Introduction](#introduction)
+
+  * [Backgrounds and borders](#backgrounds-and-borders)
+
+  * [Gradients](#gradients)
+
+  * [Panel](#panel)
+
+  * [Launcher](#launcher)
+
+  * [Taskbar/Pager](#taskbar-pager)
+
+  * [Taskbar buttons](#taskbar-buttons)
+
+  * [Mouse actions for taskbar buttons](#mouse-actions-for-taskbar-buttons)
+
+  * [System tray](#system-tray)
+
+  * [Clock](#clock)
+
+  * [Tooltip](#tooltip)
+
+  * [Battery](#battery)
+
+  * [Executor](#executor)
+
+  * [Button](#button)
+
+  * [Separator](#separator)
+
+  * [Example configuration](#example-configuration)
+
+### Introduction
+
+These are instructions for configuring tint2 directly by editing its config file.
+You may also use instead the graphical interface `tint2conf`.
+
+The first time you run tint2, it will create the config file in `$HOME/.config/tint2/tint2rc` (This applies if you have done a clean install. Running tint2 in the source directory without doing 'make install' will not create the config file.)
+
+You can also specify another file on the command line with the -c option, e.g.: `tint2 -c $HOME/tint2.conf`. This can be used to run multiple instances of tint2 that use different settings.
+
+If you change the config file while tint2 is running, the command `killall -SIGUSR1 tint2` will force tint2 to reload it.
+
+All the configuration options supported in the config file are listed below.
+Try to respect as much as possible the order of the options as given below.
+
+### Backgrounds and borders
+
+The tint2 config file starts with the options defining background elements with borders:
+
+  * `rounded = number_of_pixels` : the corner radius
+
+  * `border_width = integer` : the border width in pixels
+
+  * `border_sides = LRTB` : the sides to draw the border on (left, right, top, bottom). If not specified, all sides are used. *(since 0.12.12)*
+
+  * `background_color = color opacity`
+    * `color` is specified in hex RGB, e.g. #ff0000 is red
+    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz).
+
+  * `border_color = color opacity`
+    * `color` is specified in hex RGB, e.g. #ff0000 is red
+    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
+
+  * `background_color_hover = color opacity` (default: same as `background_color`) *(since 0.12.3)*
+    * `color` is specified in hex RGB, e.g. #ff0000 is red
+    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)
+
+  * `border_color_hover = color opacity` (default: same as `border_color`) *(since 0.12.3)*
+    * `color` is specified in hex RGB, e.g. #ff0000 is red
+    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
+
+  * `background_color_pressed = color opacity` (default: same as `background_color_hover`) *(since 0.12.3)*
+    * `color` is specified in hex RGB, e.g. #ff0000 is red
+    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)
+
+  * `border_color_pressed = color opacity` (default: same as `border_color_hover`) *(since 0.12.3)*
+    * `color` is specified in hex RGB, e.g. #ff0000 is red
+    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
+
+You can define as many backgrounds as you want. For example, the following config defines two backgrounds:
+
+```
+rounded = 1
+border_width = 0
+background_color = #282828 100
+border_color = #000000 0
+
+rounded = 1
+border_width = 0
+background_color = #f6b655 90
+border_color = #cccccc 40
+```
+
+tint2 automatically identifies each background with a number starting from 1 (1, 2, ...).
+Afterwards, you can apply a background to objects (panel, taskbar, task, clock, systray) using the background id, for example:
+
+```
+panel_background_id = 1
+taskbar_background_id = 0
+task_background_id = 0
+task_active_background_id = 2
+systray_background_id = 0
+clock_background_id = 0
+```
+
+Identifier 0 refers to a special background which is fully transparent, identifier 1 applies the first background defined in the config file etc.
+
+### Gradients
+
+(Available since 0.13.0)
+
+Backgrounds also allow specifying gradient layers
+that are drawn on top of the solid color background.
+
+First the user must define one or more gradients in the config file,
+each starting with `gradient = TYPE`. These must be added before backgrounds.
+
+Then gradients can be added by index to backgrounds,
+using the `gradient_id = INDEX`, `gradient_id_hover = INDEX` and
+`gradient_id_pressed = INDEX`, where `INDEX` is
+the gradient index, starting from 1.
+
+#### Gradient types
+
+Gradients vary the color between fixed control points:
+* vertical gradients: top-to-bottom;
+* horizontal gradients: left-to-right;
+* radial gradients: center-to-corners.
+
+The user must specify the start and end colors, and can optionally add extra color stops in between
+using the `color_stop` option, as explained below.
+
+##### Vertical gradient, with color varying from the top edge to the bottom edge, two colors
+
+```
+gradient = vertical
+start_color = #rrggbb opacity
+end_color = #rrggbb opacity
+```
+
+##### Horizontal gradient, with color varying from the left edge to the right edge, two colors
+
+```
+gradient = horizontal
+start_color = #rrggbb opacity
+end_color = #rrggbb opacity
+```
+
+##### Radial gradient, with color varying from the center to the corner, two colors:
+
+```
+gradient = radial
+start_color = #rrggbb opacity
+end_color = #rrggbb opacity
+```
+
+##### Adding extra color stops (0% and 100% remain fixed, more colors at x% between the start and end control points)
+
+```
+color_stop = percentage #rrggbb opacity
+```
+
+#### Gradient examples
+
+```
+# Gradient 1: thin film effect
+gradient = horizontal
+start_color = #111122 30
+end_color = #112211 30
+color_stop = 60 #221111 30
+
+# Gradient 2: radial glow
+gradient = radial
+start_color = #ffffff 20
+end_color = #ffffff 0
+
+# Gradient 3: elegant black
+gradient = vertical
+start_color = #444444 100
+end_color = #222222 100
+
+# Gradient 4: elegant black
+gradient = horizontal
+start_color = #111111 100
+end_color = #222222 100
+
+# Background 1: Active desktop name
+rounded = 2
+border_width = 1
+border_sides = TBLR
+background_color = #555555 10
+border_color = #ffffff 60
+background_color_hover = #555555 10
+border_color_hover = #ffffff 60
+background_color_pressed = #555555 10
+border_color_pressed = #ffffff 60
+gradient_id = 3
+gradient_id_hover = 4
+gradient_id_pressed = 2
+
+[...]
+```
+
+### Panel
+
+  * `panel_items = LTSBC` defines the items tint2 will show and the order of those items. Each letter refers to an item, defined as:
+    * `L` shows the Launcher
+    * `T` shows the Taskbar
+    * `S` shows the Systray (also called notification area)
+    * `B` shows the Battery status
+    * `C` shows the Clock
+    * `F` adds an extensible spacer (freespace). You can specify more than one. Has no effect if `T` is also present. *(since 0.12)*
+    * `E` adds an executor plugin. You can specify more than one. *(since 0.12.4)*
+    * `P` adds a push button. You can specify more than one. *(since 0.14)*
+    * `:` adds a separator. You can specify more than one. *(since 0.13.0)*
+
+    For example, `panel_items = STC` will show the systray, the taskbar and the clock (from left to right).
+
+  * `panel_monitor = monitor (all or 1 or 2 or ...)` : Which monitor tint2 draws the panel on
+    * The first monitor is `1`
+    * Use `panel_monitor = all` to get a separate panel per monitor
+
+  * `primary_monitor_first = boolean (0 or 1)` : Place the primary monitor before all the other monitors in the list. *(since 0.12.4)*
+
+![](images/panel_padding.jpg)
+
+  * `panel_position = vertical_position horizontal_position orientation`
+    * `vertical_position` is one of: `bottom`, `top`, `center`
+    * `horizontal_position` is one of: `left`, `right`, `center`
+    * `orientation` is one of: `horizontal`, `vertical`
+
+  * `panel_size = width height`
+    * `width` and `height` can be specified without units (e.g. `123`) as pixels, or followed by `%` as percentages of the monitor size (e.g. `50%`). Use `100%` for full monitor width/height.
+      Example:
+
+```
+# The panel's width is 94% the size of the monitor, the height is 30 pixels:
+panel_size = 94% 30
+```
+
+  * `panel_shrink = boolean (0 or 1)` : If set to 1, the panel will shrink to a compact size dynamically. *(since 0.13)*
+
+  * `panel_margin = horizontal_margin vertical_margin` : The margins define the distance between the panel and the horizontal/vertical monitor edge. Use `0` to obtain a panel with the same size as the edge of the monitor (no margin).
+
+![](images/panel_size_margin.jpg)
+
+  * `panel_padding = horizontal_padding vertical_padding spacing` : Please refer to the image below.
+
+![](images/panel_padding.jpg)
+
+  * `font_shadow = boolean (0 or 1)`
+
+  * `panel_background_id = integer` : Which background to use for the panel.
+
+  * `wm_menu = boolean (0 or 1)` : Defines if tint2 forwards unhandled mouse events to your window manager. Useful for window managers such as openbox, which display the start menu if you right click on the desktop.
+
+  * `panel_dock = boolean (0 or 1)` : Defines if tint2 is placed into the window manager's dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).
+
+  * `panel_layer = bottom/normal/top` : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.
+
+  * `strut_policy = follow_size/minimum/none` : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.
+    * `follow_size` means that the maximized windows always resize to have a common edge with tint2.
+    * `minimum` means that the maximized windows always expand to have a common edge with the hidden panel. This is useful if the `autohide` option is enabled.
+    * `none` means that the maximized windows use the full screen size.
+
+  * `panel_window_name = string` : Defines the name of the panel's window. Default: 'tint2'. *(since 0.12)*
+
+  * `disable_transparency = boolean (0 or 1)` : Whether to disable transparency instead of detecting if it is supported. Useful on broken graphics stacks. *(since 0.12)*
+
+  * `mouse_effects = boolean (0 or 1)` : Whether to enable mouse hover effects for clickable items. *(since 0.12.3)*
+
+  * `mouse_hover_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjusts the icon color and transparency on mouse hover (works only when mouse_effects = 1).` *(since 0.12.3)*
+
+  * `mouse_pressed_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjusts the icon color and transparency on mouse press (works only when mouse_effects = 1).` *(since 0.12.3)*
+
+  * `autohide = boolean (0 or 1)` : Whether to enable panel hiding when the mouse cursor exists the panel.
+
+  * `autohide_show_timeout = float` : Show timeout in seconds after the mouse cursor enters the panel. Use '.' as decimal separator.
+
+  * `autohide_hide_timeout = float` : Hide timeout in seconds after the mouse cursor exits the panel. Use '.' as decimal separator.
+
+  * `autohide_height = integer` : panel height (width for vertical panels) in hidden mode.
+
+### Launcher
+  * `launcher_item_app = path_to_application` : Each `launcher_item_app` must be a file path to a .desktop file following the freedesktop.org [specification](http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html). The paths may begin with `~`, which is expanded to the path of the user's home directory. If only a file name is specified, the file is search in the standard application directories (`$XDG_DATA_HOME/applications`, `~/.local/share/applications`, `$XDG_DATA_DIRS/applications`, `/usr/local/share/applications`, `/usr/share/applications`, `/opt/share/applications`).
+
+  * `launcher_apps_dir = path_to_directory` : Specifies a path to a directory from which the launcher is loading all .desktop files (all subdirectories are explored recursively). Can be used multiple times. The path may begin with `~`, which is expanded to the path of the user's home directory. *(since 0.12)*
+
+  * `launcher_background_id = integer` : Defines which background to use.
+
+  * `launcher_icon_background_id = integer` : Defines which background to use for icons.
+
+  * `launcher_padding = horizontal_padding vertical_padding spacing`
+
+  * `launcher_icon_size = integer` : The launcher icon size, in pixels.
+
+  * `launcher_icon_theme = name_of_theme` : (Optional) Uses the specified icon theme to display shortcut icons. Note that tint2 will detect and use the icon theme of your desktop if you have an XSETTINGS manager running (which you probably do), unless `launcher_icon_theme_override = 1`.
+
+  * `launcher_icon_theme_override = boolean (0 or 1)` : Whether `launcher_icon_theme` overrides the value obtained from the XSETTINGS manager. *(since 0.12)*
+
+  * `launcher_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjusts the icon color and transparency.
+
+  * `launcher_tooltip = boolean (0 or 1)` : Whether to show tooltips for the launcher icons.
+
+  * `startup_notifications = boolean (0 or 1)` : Whether to show startup notifications when starting applications from the launcher. *(since 0.12)*
+
+### Taskbar / Pager
+
+  * `taskbar_mode = single_desktop/multi_desktop`
+    * `single_desktop` : Shows a normal taskbar listing the tasks running on the current virtual desktop (also known as 'workspace');
+    * `multi_desktop` : Pager like capability. Shows multiple taskbars, one per virtual desktop, with which:
+      * You can drag-and-drop tasks between virtual desktops;
+      * You can switch between virtual desktops.
+
+  * `taskbar_hide_if_empty = boolean (0 or 1)` : If enabled, in multi-desktop mode the taskbars corresponding to empty desktops different from the current desktop are hidden. *(since 0.13)*
+
+  * `taskbar_distribute_size = boolean (0 or 1)` : If enabled, in multi-desktop mode distributes between taskbars the available size proportionally to the number of tasks. Default: disabled. *(since 0.12)*
+
+  * `taskbar_padding = horizontal_padding vertical_padding spacing`
+
+![](images/taskbar_padding.jpg)
+
+  * `taskbar_background_id = integer` : Which background to use
+
+  * `taskbar_active_background_id = integer` : Which background to use for the taskbar of the current virtual desktop.
+
+  * `taskbar_hide_inactive_tasks = boolean (0 or 1)` :  If enabled, the taskbar shows only the active task. *(since 0.12)*
+
+  * `taskbar_hide_different_monitor = boolean (0 or 1)` :  If enabled, the taskbar shows only the tasks from the current monitor. Useful when running different tint2 instances on different monitors, each one having its own config. *(since 0.12)*
+
+  * `taskbar_always_show_all_desktop_tasks = boolean (0 or 1)` :  Has effect only if `taskbar_mode = multi_desktop`. If enabled, tasks that appear on all desktops are shown on all taskbars. Otherwise, they are shown only on the taskbar of the current desktop. *(since 0.12.4)*
+
+  * `taskbar_sort_order = none/title/center` : Specifies the sort order of the tasks on the taskbar.  *(since 0.12)*
+    * `none` : No sorting. New tasks are simply appended at the end of the taskbar when they appear.
+    * `title` : Sorts the tasks by title.
+    * `center` : Sorts the tasks by their window centers.
+    * `mru` : Shows the most recently used tasks first. *(since 0.12.4)*
+    * `lru` : Shows the most recently used tasks last. *(since 0.12.4)*
+
+  * `task_align = left/center/right` : Specifies the alignment of the tasks on the taskbar. Default: left.
+
+  * `taskbar_name = boolean (0 or 1)` :  Whether to show the virtual desktop name in the taskbar.
+
+  * `taskbar_name_padding = padding` :  Padding for the virtual desktop name.
+
+  * `taskbar_name_background_id = integer` :  Which background to use for the desktop name.
+
+  * `taskbar_name_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]` :  Font configuration for the desktop name.
+
+  * `taskbar_name_font_color = color opacity (0 to 100)` :  Font color for the desktop name.
+
+  * `taskbar_name_active_background_id = integer` :  Which background to use for the name of the current desktop.
+
+  * `taskbar_name_active_font_color = color opacity (0 to 100)` :  Font color for the name of the current desktop.
+
+# Taskbar buttons
+
+The following options configure the task buttons in the taskbar:
+
+  * `task_icon = boolean (0 or 1)` : Whether to display the task icon. There is no explicit option to control the task icon size; it depends on the vertical padding set with `task_padding`.
+
+  * `task_text = boolean (0 or 1)` : Whether to display the task text.
+
+  * `task_centered = boolean (0 or 1)` : Whether the task text is centered.
+
+  * `task_tooltip = boolean (0 or 1)` : Whether to show tooltips for tasks.
+
+  * `task_maximum_size = width height`
+    * `width` is used with horizontal panels to limit the size of the tasks. Use `width = 0` to get full taskbar width.
+    * `height` is used with vertical panels.
+
+  * `task_padding = horizontal_padding vertical_padding spacing`
+
+  * `urgent_nb_of_blink = integer` : Number of blinks on 'get attention' events.
+
+![](images/task_padding.jpg)
+
+  * `task_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
+
+  * `task_font_color = color opacity (0 to 100)`
+
+  * `task_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjust the task icon's color and transparency.
+
+  * `task_background_id = integer` : Which background to use for non selected tasks
+
+For the next 3 options STATUS can be `active` / `iconified`  / `urgent`:
+  * `task_STATUS_font_color = color opacity (0 to 100)`
+
+  * `task_STATUS_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjusts the task icon's color and transparency.
+
+  * `task_STATUS_background_id = integer` : Which background to use for the task.
+
+### Mouse actions for taskbar buttons
+
+The possible mouse events are: `left, middle, right, scroll_up, scroll_down`.
+
+The possible mouse actions are: `none, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task`.
+
+Use `mouse_event = action` to customize mouse actions. Example:
+```
+  mouse_middle = none
+  mouse_right = close
+  mouse_scroll_up = toggle
+  mouse_scroll_down = iconify
+```
+
+The action semantics:
+  * `none` : If `wm_menu = 1` is set, the mouse event is forwarded to the window manager. Otherwise it is ignored.
+  * `close` : close the task
+  * `toggle` : toggle the task
+  * `iconify` : iconify (minimize) the task
+  * `toggle_iconify` : toggle or iconify the task
+  * `maximize_restore` : maximized or minimized the task
+  * `shade` : shades (collapses) the task
+  * `desktop_left` : send the task to the desktop on the left
+  * `desktop_right` : send the task to the desktop on the right
+  * `next_task` : send the focus to next task
+  * `prev_task` : send the focus to previous task
+
+### System Tray
+
+  * `systray_padding = horizontal_padding vertical_padding spacing`
+
+  * `systray_background_id = integer` : Which background to use.
+
+  * `systray_sort = ascending/descending/left2right/right2left` : Specifies the sorting order for the icons in the systray: in ascending/descending alphabetical order of the icon title, or always add icons to the right/left (note that with `left2right` or `right2left` the order can be different on panel restart).
+
+  * `systray_icon_size = max_icon_size` : Set the maximum system tray icon size to `number`. Set to `0` for automatic icon sizing.
+
+  * `systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjust the systray icons color and transparency.
+
+  * `systray_monitor = integer (1, 2, ...)` :  On which monitor to draw the systray. The first monitor is `1`. *(since 0.12)*
+
+  * `systray_name_filter = string` :  Regular expression to identify icon names to be hidden. For example, `^audacious$` will hide icons with the exact name `audacious`, while `aud` will hide any icons having `aud` in the name. *(since 0.13.1)*
+
+### Clock
+
+  * `time1_format = %H:%M` : The format used by the first line of the clock.
+    * `time1_format`, `time2_format` and `clock_tooltip` use the 'strftime' syntax. More info can be found here: http://www.manpagez.com/man/3/strftime/
+    * To hide the clock, comment `time1_format` and `time2_format`.
+
+  * `time1_timezone = :US/Hawaii`
+    * `time1_timezone`, `time2_timezone` and `clock_tooltip_timezone` can be used to specify a timezone. If you do not specify a value the system-wide timezone is used. The timezones can usually be found in `/usr/share/zoneinfo`. If your timezones are in a different directory, you need to specify the absolute path, e.g. `time1_timezone = :/different/zoneinfo/dir/US/Hawaii` Always prepend the timezone with a ':'
+
+  * `time1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
+
+  * `time2_format = %A %d %B`
+
+  * `time2_timezone = :Europe/Berlin`
+
+  * `time2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
+
+  * `clock_font_color = color opacity (0 to 100)`
+
+  * `clock_padding = horizontal_padding vertical_padding`
+
+  * `clock_background_id = integer` : Which background to use
+
+  * `clock_tooltip = %a, %d. %b %Y` : Format for the clock's tooltip.
+
+  * `clock_tooltip_timezone = :UTC`
+
+  * `clock_lclick_command = text` : Command to execute on left click.
+
+  * `clock_rclick_command = text` : Command to execute on right click.
+
+  * `clock_mclick_command = text` : Command to execute on middle click. *(since 0.12.1)*
+
+  * `clock_uwheel_command = text` : Command to execute on wheel scroll up. *(since 0.12.1)*
+
+  * `clock_dwheel_command = text` : Command to execute on wheel scroll down. *(since 0.12.1)*
+
+### Tooltip
+
+  * `tooltip_padding = horizontal_padding vertical_padding`
+
+  * `tooltip_show_timeout = float` : Delay to show the tooltip in seconds. Use `.` as decimal separator.
+
+  * `tooltip_hide_timeout = float` : Delay to hide the tooltip in seconds. Use `.` as decimal separator.
+
+  * `tooltip_background_id = integer` : Which background to use for tooltips. Note that with fake transparency the alpha channel and corner radius options are not respected.
+
+  * `tooltip_font_color = color opacity  (0 to 100)`
+
+  * `tooltip_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
+
+### Battery
+
+  * `battery_hide = never/integer (0 to 100)` : At what battery percentage the battery item is hidden.
+
+  * `battery_low_status = integer`: At what battery percentage the low command is executed.
+
+  * `battery_low_cmd = notify-send "battery low"` : Command to execute when the battery is low.
+
+  * `bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
+
+  * `bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
+
+  * `battery_font_color = color opacity (0 to 100)`
+
+  * `battery_padding = horizontal_padding vertical_padding`
+
+  * `battery_background_id = integer` : Which background to use for the battery.
+
+  * `battery_tooltip_enabled = boolean (0 or 1)` : Enable/disable battery tooltips. *(since 0.12.3)*
+
+  * `battery_lclick_command = text` : Command to execute on left click. *(since 0.12.1)*
+
+  * `battery_rclick_command = text` : Command to execute on right click. *(since 0.12.1)*
+
+  * `battery_mclick_command = text` : Command to execute on middle click. *(since 0.12.1)*
+
+  * `battery_uwheel_command = text` : Command to execute on wheel scroll up. *(since 0.12.1)*
+
+  * `battery_dwheel_command = text` : Command to execute on wheel scroll down. *(since 0.12.1)*
+
+  * `ac_connected_cmd = text` : Command to execute when the power adapter is plugged in. *(since 0.12.3)*
+
+  * `ac_disconnected_cmd = text` : Command to execute when the power adapter is unplugged. *(since 0.12.3)*
+
+### Executor
+
+  * `execp = new` : Begins the configuration of a new executor plugin. Multiple such plugins are supported; just use multiple `E`s in `panel_items`. *(since 0.12.4)*
+
+  * `execp_command = text` : Command to execute. *(since 0.12.4)*
+
+  * `execp_interval = integer` : The command is executed again after `execp_interval` seconds from the moment it exits. If zero, the command is executed only once. *(since 0.12.4)*
+
+  * `execp_continuous = integer` : If non-zero, the last `execp_continuous` lines from the output of the command are displayed, every `execp_continuous` lines; this is useful for showing the output of commands that run indefinitely, such as `ping 127.0.0.1`. If zero, the output of the command is displayed after it finishes executing. *(since 0.12.4)*
+
+  * `execp_has_icon = boolean (0 or 1)` : If `execp_has_icon = 1`, the first line printed by the command is interpreted as a path to an image file. *(since 0.12.4)*
+
+  * `execp_cache_icon = boolean (0 or 1)` : If `execp_cache_icon = 0`, the image is reloaded each time the command is executed (useful if the image file is changed on disk by the program executed by `execp_command`). *(since 0.12.4)*
+
+  * `execp_icon_w = integer` : You can use `execp_icon_w` and `execp_icon_h` to resize the image. If one of them is zero/missing, the image is rescaled proportionally. If both of them are zero/missing, the image is not rescaled. *(since 0.12.4)*
+
+  * `execp_icon_h = integer` : See `execp_icon_w`. *(since 0.12.4)*
+
+  * `execp_tooltip = text` : The tooltip. Leave it empty to not display a tooltip. Not specifying this option leads to showing an automatically generated tooltip with information about when the command was last executed. *(since 0.12.4)*
+
+  * `execp_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]` : The font used to draw the text.  *(since 0.12.4)*
+
+  * `execp_font_color = color opacity` : The font color. *(since 0.12.4)*
+
+  * `execp_markup = boolean (0 or 1)` : If non-zero, the output of the command is treated as Pango markup, which allows rich text formatting. The format is [documented here](https://developer.gnome.org/pygtk/stable/pango-markup-language.html). Note that using this with commands that print data downloaded from the Internet is a possible security risk. *(since 0.12.4)*
+
+  * `execp_background_id = integer` : Which background to use. *(since 0.12.4)*
+
+  * `execp_centered = boolean (0 or 1)` : Whether to center the text. *(since 0.12.4)*
+
+  * `execp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text` *(since 0.12.4)*
+
+  * `execp_lclick_command = text` : Command to execute on left click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.12.4)*
+  * `execp_mclick_command = text` : Command to execute on right click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.12.4)*
+  * `execp_rclick_command = text` : Command to execute on middle click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.12.4)*
+  * `execp_uwheel_command = text` : Command to execute on wheel scroll up. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.12.4)*
+  * `execp_dwheel_command = text` : Command to execute on wheel scroll down. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.12.4)*
+
+#### Executor samples
+
+##### Print the hostname
+
+```
+execp = new
+execp_command = hostname
+execp_interval = 0
+```
+
+##### Print disk usage for the root partition every 10 seconds
+
+```
+execp = new
+execp_command = df -h | awk '/\/$/ { print $6 ": " $2 " " $5}'
+execp_interval = 10
+```
+
+##### Button with icon and rich text, executes command when clicked
+
+```
+execp = new
+execp_command = echo /usr/share/icons/elementary-xfce/emblems/24/emblem-colors-blue.png; echo '<span foreground="#7f7">Click</span> <span foreground="#77f">me</span> <span foreground="#f77">pls</span>'
+execp_has_icon = 1
+execp_interval = 0
+execp_centered = 1
+execp_font = sans 9
+execp_markup = 1
+execp_font_color = #aaffaa 100
+execp_padding = 2 0
+execp_tooltip = I will tell you a secret...
+execp_lclick_command = zenity --info "--text=$(uname -sr)"
+execp_background_id = 2
+```
+
+##### Desktop pager with text
+
+```
+execp = new
+execp_command = xprop -root -spy | awk '/^_NET_CURRENT_DESKTOP/ { print "Workspace " ($3 + 1) ; fflush(); }'
+execp_interval = 1
+execp_continuous = 1
+```
+
+##### Desktop pager with icon
+
+```
+execp_command = xprop -root -spy | awk -v home="$HOME" '/^_NET_CURRENT_DESKTOP/ { print home "/.config/myPager/" ($3 + 1) ".png\n" ; fflush(); }'
+execp_interval = 1
+execp_has_icon = 1
+execp_cache_icon = 1
+execp_continuous = 2
+```
+
+##### Round-trip time to the gateway, refreshed every second
+
+```
+execp = new
+execp_command = ping -i 1 -c 1 -W 1 -O -D -n $(ip route | grep default | grep via | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*') | awk '/no/ { print "<span foreground=\"#faa\">timeout</span>"; fflush(); }; /time=/ { gsub(/time=/, "", $8); printf "<span foreground=\"#7af\">%3.0f %s</span>\n", $8, $9; fflush(); } '
+execp_continuous = 0
+execp_interval = 1
+execp_markup = 1
+```
+
+##### Memory usage
+
+```
+execp = new
+execp_command = free | awk '/^-/ { printf "Mem: '$(free -h | awk '/^Mem:/ { print $2 }')' %.0f%%\n", 100*$3/($3+$4); fflush(stdout) }'
+execp_interval = 5
+execp_continuous = 0
+```
+
+##### Network load
+
+```
+# Note the use of "stdbuf -oL" to force the program to flush the output line by line.
+execp = new
+execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }; fflush(stdout)'
+execp_continuous = 1
+execp_interval = 1
+```
+
+### Button
+
+  * `button = new` : Begins the configuration of a new button. Multiple such plugins are supported; just use multiple `P`s in `panel_items`. *(since 0.14)*
+
+  * `button_icon = text` : Name or path of icon (or empty). *(since 0.14)*
+
+  * `button_text = text` : Text to display (or empty). *(since 0.14)*
+
+  * `button_tooltip = text` : The tooltip (or empty). *(since 0.14)*
+
+  * `button_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]` : The font used to draw the text.  *(since 0.14)*
+
+  * `button_font_color = color opacity` : The font color. *(since 0.14)*
+
+  * `button_background_id = integer` : Which background to use. *(since 0.14)*
+
+  * `button_centered = boolean (0 or 1)` : Whether to center the text. *(since 0.14)*
+
+  * `button_padding = horizontal_padding vertical_padding spacing_between_icon_and_text` *(since 0.14)*
+  * `button_max_icon_size = integer` : Sets a limit to the icon size. Otherwise, the icon will expand to the edges. *(since 0.14)*
+
+  * `button_lclick_command = text` : Command to execute on left click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.14)*
+  * `button_mclick_command = text` : Command to execute on right click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.14)*
+  * `button_rclick_command = text` : Command to execute on middle click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.14)*
+  * `button_uwheel_command = text` : Command to execute on wheel scroll up. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.14)*
+  * `button_dwheel_command = text` : Command to execute on wheel scroll down. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.14)*
+
+### Separator
+
+  * `separator = new` : Begins the configuration of a new separator. Multiple such plugins are supported; just use multiple `:`s in `panel_items`. *(since 0.13.0)*
+
+  * `separator_background_id = integer` : Which background to use. *(since 0.13.0)*
+
+  * `separator_color = color opacity` : The foreground color. *(since 0.13.0)*
+
+  * `separator_style = [empty | line | dots]` : The separator style. *(since 0.13.0)*
+
+  * `separator_size = integer` : The thickness of the separator. Does not include the border and padding. For example, if the style is `line`, this is the line thickness; if the style is `dots`, this is the dot's diameter. *(since 0.13.0)*
+
+  * `separator_padding = side_padding cap_padding` : The padding to add to the sides of the separator, in pixels. *(since 0.13.0)*
+
+### Example configuration
+
+See /etc/xdg/tint2/tint2rc.
+
+## AUTHOR
+tint2 was written by Thierry Lorthiois <lorthiois@bbsoft.fr>.
+It is based on ttm, originally written by Pål Staurland <staura@gmail.com>.
+
+This manual page was originally written by Daniel Moerner <dmoerner@gmail.com>, for the Debian project (but may be used by others).
+It was adopted from the tint2 docs.
+
+## SEE ALSO
+The main website https://gitlab.com/o9000/tint2
+and the wiki page at https://gitlab.com/o9000/tint2/wikis/home.
+
+This documentation is also provided in HTML and Markdown format in the system's default location
+for documentation files, usually `/usr/share/doc/tint2` or `/usr/local/share/doc/tint2`.

format-code.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+find . '(' -name '*.h' -o -name '*.c' ')' -exec clang-format-3.7 -style=file -i '{}' \;

get_version.sh

@@ -1,36 +1,46 @@
 #!/bin/sh
 
-MAJOR=0.12
+MAJOR=0.14
 DIRTY=""
 
-git update-index -q --ignore-submodules --refresh
+if git status 1>/dev/null 2>/dev/null
-# Disallow unstaged changes in the working tree
-if ! git diff-files --quiet --ignore-submodules --
 then
-    if [ "$1" = "--strict" ]
+    git update-index -q --ignore-submodules --refresh
+    # Disallow unstaged changes in the working tree
+    if ! git diff-files --quiet --ignore-submodules --
     then
-        echo >&2 "Error: there are unstaged changes."
+        if [ "$1" = "--strict" ]
-        git diff-files --name-status -r --ignore-submodules -- >&2
+        then
-        exit 1
+            echo >&2 "Error: there are unstaged changes."
-    else
+            git diff-files --name-status -r --ignore-submodules -- >&2
-        DIRTY="-dirty"
+            exit 1
+        else
+            DIRTY="-dirty"
+        fi
+    fi
+
+    # Disallow uncommitted changes in the index
+    if ! git diff-index --cached --quiet HEAD --ignore-submodules --
+    then
+        if [ "$1" = "--strict" ]
+        then
+            echo >&2 "Error: there are uncommitted changes."
+            git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
+            exit 1
+        else
+            DIRTY="-dirty"
+        fi
+    fi
+    VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY
+else
+    VERSION=$(head -n 1 ChangeLog || head -n 1 ../ChangeLog | cut -d ' ' -f 2)
+    if [ $VERSION = "master" ]
+    then
+        VERSION=$VERSION-$(head -n 1 ChangeLog || head -n 1 ../ChangeLog | cut -d ' ' -f 1)
     fi
 fi
 
-# Disallow uncommitted changes in the index
-if ! git diff-index --cached --quiet HEAD --ignore-submodules --
-then
-    if [ "$1" = "--strict" ]
-    then
-        echo >&2 "Error: there are uncommitted changes."
-        git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
-        exit 1
-    else
-        DIRTY="-dirty"
-    fi
-fi
 
-VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')")$DIRTY
 VERSION=$(echo "$VERSION" | sed 's/^v//')
 
 echo '#define VERSION_STRING "'$VERSION'"' > version.h

make_release.sh

@@ -2,24 +2,6 @@
 
 # Usage: ./make_release.sh
 # Creates a tar.gz archive of the current tree.
-#
-# To bump the version number for the current commit (make sure you are in HEAD!), run manually:
-#
-# git tag -a v0.12 -m 'Version 0.12'
-#
-# To generate a release for an older tagged commit, first list the tags with:
-#
-# git tag
-#
-# then checkout the tagged commit with:
-#
-# git checkout tags/v0.1
-#
-# Finally, to revert to HEAD:
-#
-# git checkout master
-#
-# See more at https://gitlab.com/o9000/tint2/wikis/Development
 
 VERSION=$(./get_version.sh --strict)
 if [ ! $? -eq 0 ]
@@ -28,21 +10,10 @@ then
     exit 1
 fi
 
-DIR=tint2-$VERSION
+ARCHIVE=tint2-$VERSION.tar.gz
-ARCHIVE=$DIR.tar.gz
-echo "Making release $DIR"
-rm -rf $DIR $ARCHIVE
 
-git checkout-index --prefix=$DIR/ -a
+echo "Making release tint2-$VERSION"
-
+git archive --format=tar.gz --prefix=tint2-$VERSION/ v$VERSION >$ARCHIVE
-# Delete unneeded files
-rm -f $DIR/make_release.sh
-
-echo "echo \"#define VERSION_STRING \\\"$VERSION\\\"\" > version.h" > $DIR/get_version.sh
-
-# Create tarball and remove the exported directory
-tar -czf $ARCHIVE $DIR
-rm -rf $DIR
 
 sha1sum -b $ARCHIVE
 sha256sum -b $ARCHIVE

new-release.py

@@ -0,0 +1,240 @@
+#!/usr/bin/env python2
+
+import argparse
+import datetime
+import inspect
+import logging
+import os
+import re
+import subprocess
+import sys
+import time
+
+
+ansi_brown = "\x1b[0;33;40m"
+ansi_yello_bold = "\x1b[1;33;40m"
+ansi_lblue = "\x1b[0;36;40m"
+ansi_pinky = "\x1b[0;35;40m"
+ansi_reset = "\x1b[0m"
+
+
+log_ts = None
+def log_time():
+  global log_ts
+  if log_ts == None:
+    log_ts = time.time()
+  ts = time.time()
+  delta_ms = int((ts - log_ts) * 1000)
+  log_ts = ts
+  return "{0: >6}".format(delta_ms)
+
+
+def log_prefix():
+  line = inspect.stack()[2][2]
+  function = inspect.stack()[2][3]
+  return ansi_lblue + "{0} {1}:{2}".format(log_time(), function, line) + ansi_reset
+
+
+def debug(*args):
+  parts = [log_prefix()]
+  for s in args:
+    parts.append(str(s))
+  logging.debug(" ".join(parts))
+
+
+def info(*args):
+  parts = [log_prefix()]
+  for s in args:
+    parts.append(str(s))
+  logging.info(" ".join(parts))
+
+
+def cmd(s):
+  logging.debug(log_prefix() + " Executing: " + ansi_brown + s + ansi_reset)
+  return s
+
+
+def run(s):
+  proc = subprocess.Popen(cmd(s), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
+  ret = proc.wait()
+  out = proc.communicate()[0]
+  for line in out.split("\n"):
+    debug(ansi_pinky + line + ansi_reset)
+  debug(ansi_pinky + "Exit code: " + str(ret))
+  if ret != 0:
+    raise Exception("Command failed!")
+  return out
+
+
+def natsorted(ls):
+  dre = re.compile(r'(\d+)')
+  return sorted(ls, key=lambda l: [int(s) if s.isdigit() else s.lower() for s in re.split(dre, l)])
+
+
+def get_last_version():
+  tags = natsorted(run("git tag -l 'v*'").split("\n"))
+  return tags[-1]
+
+
+def inc_version(v, major=False, minor=False, rc=False):
+  if "-rc" in v:
+    # v4.0-rc7 -> v4.0-rc8 or v4.0
+    if minor:
+      return v.split("-rc")[0]
+    else:
+      parts = v.split("-rc")
+      parts[-1] = str(int(parts[-1]) + 1)
+      return "-rc".join(parts)
+  else:
+    # v4.11 = v4, 11, 0 -> v4.11.1 or v4.12 or v.4.12-rc1 or v5.0 or v5.0-rc1
+    # v4.11.7 = v4, 11, 7 -> ...
+    parts = v.split(".")
+    while len(parts) < 3:
+      parts.append("0")
+    assert len(parts) == 3
+    if major:
+      parts[-3] = "v" + str(int(parts[-3].replace("v", "")) + 1)
+      parts[-2] = "0"
+      if rc:
+        parts[-2] += "-rc1"
+      parts[-1] = ""
+    elif minor or rc:
+      parts[-2] = str(int(parts[-2]) + 1)
+      if rc:
+        parts[-2] += "-rc1"
+      parts[-1] = ""
+    else:
+      parts[-1] = str(int(parts[-1]) + 1)
+      assert not rc
+    return ".".join([s for s in parts if s])
+
+
+def assert_equal(a, b):
+  if a != b:
+    info(a, "!=", b)
+    assert(False)
+
+
+def test_inc_version():
+  # auto
+  assert_equal(inc_version("v1.0"), "v1.0.1")
+  assert_equal(inc_version("v1.0.1"), "v1.0.2")
+  assert_equal(inc_version("v1.0.2"), "v1.0.3")
+  assert_equal(inc_version("v1.0.10"), "v1.0.11")
+  assert_equal(inc_version("v1.1.10"), "v1.1.11")
+  assert_equal(inc_version("v1.1.10"), "v1.1.11")
+  # rc
+  assert_equal(inc_version("v1.0", False, False, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.1", False, False, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.2", False, False, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.10", False, False, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.1.10", False, False, True), "v1.2-rc1")
+  assert_equal(inc_version("v1.1.10", False, False, True), "v1.2-rc1")
+  # minor
+  assert_equal(inc_version("v1.0", False, True, False), "v1.1")
+  assert_equal(inc_version("v1.0.1", False, True, False), "v1.1")
+  assert_equal(inc_version("v1.0.2", False, True, False), "v1.1")
+  assert_equal(inc_version("v1.0.10", False, True, False), "v1.1")
+  assert_equal(inc_version("v1.1.10", False, True, False), "v1.2")
+  assert_equal(inc_version("v1.1.10", False, True, False), "v1.2")
+  # minor rc
+  assert_equal(inc_version("v1.0", False, True, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.1", False, True, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.2", False, True, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.10", False, True, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.1.10", False, True, True), "v1.2-rc1")
+  assert_equal(inc_version("v1.1.10", False, True, True), "v1.2-rc1")
+  # major rc
+  assert_equal(inc_version("v1.0", True, False, True), "v2.0-rc1")
+  assert_equal(inc_version("v1.0.1", True, False, True), "v2.0-rc1")
+  assert_equal(inc_version("v1.0.2", True, False, True), "v2.0-rc1")
+  assert_equal(inc_version("v1.0.10", True, False, True), "v2.0-rc1")
+  assert_equal(inc_version("v1.1.10", True, False, True), "v2.0-rc1")
+  assert_equal(inc_version("v1.1.10", True, False, True), "v2.0-rc1")
+  # major
+  assert_equal(inc_version("v1.0", True), "v2.0")
+  assert_equal(inc_version("v1.0.1", True), "v2.0")
+  assert_equal(inc_version("v1.0.2", True), "v2.0")
+  assert_equal(inc_version("v1.0.10", True), "v2.0")
+  assert_equal(inc_version("v1.1.10", True), "v2.0")
+  assert_equal(inc_version("v1.1.10", True), "v2.0")
+  # rc auto
+  assert_equal(inc_version("v1.0-rc1"), "v1.0-rc2")
+  assert_equal(inc_version("v1.1-rc2"), "v1.1-rc3")
+  # rc minor
+  assert_equal(inc_version("v1.0-rc1", False, True), "v1.0")
+  assert_equal(inc_version("v1.1-rc2", False, True), "v1.1")
+
+
+def replace_in_file(path, before, after):
+  with open(path, "r+") as f:
+    old = f.read()
+    new = old.replace(before, after)
+    f.seek(0)
+    f.write(new)
+
+
+def update_man(path, version, date):
+  with open(path, "r+") as f:
+    lines = f.read().split("\n")
+    # # TINT2 1 "2017-03-26" 0.14.1
+    parts = lines[0].split()
+    parts[-2] = '"' + date + '"'
+    parts[-1] = version
+    lines[0] = " ".join(parts)
+    f.seek(0)
+    f.write("\n".join(lines))
+  run("cd doc ; ./generate-doc.sh")
+
+
+def update_log(path, version, date):
+  with open(path, "r+") as f:
+    lines = f.read().split("\n")
+    f.seek(0)
+    assert lines[0].endswith("master")
+    lines[0] = date + " " + version
+    f.write("\n".join(lines))
+
+
+if __name__ == '__main__':
+  parser = argparse.ArgumentParser()
+  parser.add_argument("--major", action="store_true")
+  parser.add_argument("--minor", action="store_true")
+  parser.add_argument("--rc", action="store_true")
+  parser.add_argument("--undo", action="store_true")
+  args = parser.parse_args()
+  logging.basicConfig(format=ansi_lblue + "%(asctime)s %(pathname)s %(levelname)s" + ansi_reset + " %(message)s", level=logging.DEBUG)
+  test_inc_version()
+  # Read version from last tag and increment
+  old_version = get_last_version()
+  if args.undo:
+    info("Revering last commit...")
+    run("git tag -d %s" % old_version)
+    run("git tag -d %s" % old_version.replace("v", ""))
+    run("git reset --soft HEAD~")
+    run("git reset")
+    run("git stash")
+    os.system("git log -1")
+    sys.exit(0)
+  info("Old version:", old_version)
+  version = inc_version(old_version, args.major, args.minor, args.rc)
+  readable_version = version.replace("v", "")
+  date = datetime.datetime.now().strftime("%Y-%m-%d")
+  info("New version:", readable_version, version, date)
+  # Disallow unstaged changes in the working tree
+  run("git diff-files --quiet --ignore-submodules --")
+  # Disallow uncommitted changes in the index
+  run("git diff-index --cached --quiet HEAD --ignore-submodules --")
+  # Update version string
+  replace_in_file("README.md", old_version, readable_version)
+  update_man("doc/tint2.md", readable_version, date)
+  update_log("ChangeLog", readable_version, date)
+  run("git commit -am 'Release %s'" % readable_version)
+  run("git tag -a %s -m 'version %s'" % (version, readable_version))
+  run("git tag -a %s -m 'version %s'" % (readable_version, readable_version))
+  run("rm -rf tint2-%s* || true" % readable_version)
+  run("./make_release.sh")
+  run("tar -xzf tint2-%s.tar.gz" % readable_version)
+  run("cd tint2-%s ; mkdir build ; cd build ; cmake .. ; make" % readable_version)
+  assert_equal(run("./tint2-%s/build/tint2 -v" % readable_version).strip(), "tint2 version %s" % readable_version)
+  os.system("git log -p -1")

packaging/debian/changelog

@@ -0,0 +1,244 @@
+tint2 (0.12.12-3) unstable; urgency=medium
+
+  * Cherry pick upstream fix for use-after-free
+
+ -- Sebastian Reichel <sre@debian.org>  Sun, 29 Jan 2017 21:18:20 +0100
+
+tint2 (0.12.12-2) unstable; urgency=medium
+
+  * Cherry pick a few upstream fixes (Closes: #849228)
+
+ -- Sebastian Reichel <sre@debian.org>  Fri, 13 Jan 2017 22:01:29 +0100
+
+tint2 (0.12.12-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sebastian Reichel <sre@debian.org>  Sun, 21 Aug 2016 22:39:16 +0200
+
+tint2 (0.12.11-1) unstable; urgency=low
+
+  * New upstream release (Closes: #824568)
+  * Update Debian Standards Version to 3.9.8
+
+ -- Sebastian Reichel <sre@debian.org>  Wed, 01 Jun 2016 00:48:54 +0200
+
+tint2 (0.12.7-2) unstable; urgency=medium
+
+  * Add upstream patch to fix build on ppc
+  * Use https:// vcs urls
+
+ -- Sebastian Reichel <sre@debian.org>  Mon, 22 Feb 2016 03:23:51 +0100
+
+tint2 (0.12.7-1) unstable; urgency=medium
+
+  * New upstream release
+  * Update Debian Standards Version to 3.9.7
+  * Drop -dbg package (Debian will build -dbgsym package automatically)
+
+ -- Sebastian Reichel <sre@debian.org>  Wed, 10 Feb 2016 00:42:23 +0100
+
+tint2 (0.12.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix privacy-breach-generic in documentation
+
+ -- Sebastian Reichel <sre@debian.org>  Thu, 26 Nov 2015 22:49:26 +0100
+
+tint2 (0.12.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * Drop all patches (applied upstream)
+
+ -- Sebastian Reichel <sre@debian.org>  Fri, 11 Sep 2015 18:41:22 +0200
+
+tint2 (0.12.1-2) unstable; urgency=medium
+
+  * Import upstream patch fixing bug with blinking systray icon
+
+ -- Sebastian Reichel <sre@debian.org>  Tue, 04 Aug 2015 01:16:08 +0200
+
+tint2 (0.12.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sebastian Reichel <sre@debian.org>  Mon, 03 Aug 2015 17:03:13 +0200
+
+tint2 (0.12-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #793797)
+   - Drop 04-freespace.patch (applied upstream)
+   - Drop 05-task-align.patch (needs rework)
+
+ -- Sebastian Reichel <sre@debian.org>  Wed, 29 Jul 2015 18:53:03 +0200
+
+tint2 (0.11+svn20121014-3) unstable; urgency=low
+
+  * Add some patches from upstream's bug tracker. Those are already
+    used by the Debian based VSIDO distribution for some time.
+   - 03-launcher_apps_dir.patch
+     Add support for loading multiple launcher icons by specifing
+     the directory for their *.desktop files.
+   - 04-freespace.patch
+     Add support for a separator panel element.
+   - 05-task-align.patch, 06-sample-task-align.patch
+     Add support for task alignment.
+
+ -- Sebastian Reichel <sre@debian.org>  Thu, 05 Jun 2014 17:39:43 +0200
+
+tint2 (0.11+svn20121014-2) unstable; urgency=low
+
+  * Reintroduce tint2conf (Closes: #720200)
+  * Add patch fixing argv evaluation (Closes: #716390)
+  * Add patch fixing incorrect function declaration (Closes: #748171)
+  * Bump Debian Standards Version to 3.9.5
+
+ -- Sebastian Reichel <sre@debian.org>  Sun, 01 Jun 2014 17:13:06 +0200
+
+tint2 (0.11+svn20121014-1) unstable; urgency=low
+
+  * New upstream checkout (Closes: #678918)
+   - Fix for no task cycling if all windows are minimized
+   - Fix for incorrect task cycling when windows visible on
+     all desktops are present
+   - Adding startup-notification support
+   - Drag and drop support for launchers
+   - Localize launcher tooltips
+   - Launcher: add icon lookup in ~/.local and /usr/local
+   - Disable mouse hover events when the launcher tooltip
+     is disabled
+  * Do not install tint2conf (Closes: #672840)
+  * Add libstartup-notification dependency
+  * Bump Debian Standards Version to 3.9.4
+  * Bump compat level to 9
+
+ -- Sebastian Reichel <sre@debian.org>  Thu, 25 Oct 2012 13:35:15 +0200
+
+tint2 (0.11+svn20111022-3) unstable; urgency=low
+
+  * Update debian/copyright to conform with Debian copyright format 1.0
+  * Update Debian Standards Version to 3.9.3
+  * Add dump of tint2's FAQ and Configure wiki page as offline
+    documentation (Closes: #658226)
+
+ -- Sebastian Reichel <sre@debian.org>  Wed, 07 Mar 2012 10:09:20 +0100
+
+tint2 (0.11+svn20111022-2) unstable; urgency=low
+
+   * Add inform-about-unsupported-saving.patch (Closes: #646055)
+
+ -- Sebastian Reichel <sre@debian.org>  Sun, 23 Oct 2011 10:57:35 +0200
+
+tint2 (0.11+svn20111022-1) unstable; urgency=low
+
+  * New upstream checkout
+   - Fix double free of launcher configuration (Closes: #645208)
+
+ -- Sebastian Reichel <sre@debian.org>  Sat, 22 Oct 2011 08:17:18 +0200
+
+tint2 (0.11+svn20111011-2) unstable; urgency=low
+
+  * build debug symbols 
+
+ -- Sebastian Reichel <sre@debian.org>  Fri, 21 Oct 2011 16:30:50 +0200
+
+tint2 (0.11+svn20111011-1) unstable; urgency=low
+
+  * New upstream snapshot
+   - misc. fixes
+   - added alpha, saturation, brightness control for launcher icons
+   - launcher tooltips configurable, default off
+
+ -- Sebastian Reichel <sre@debian.org>  Wed, 19 Oct 2011 19:49:54 +0200
+
+tint2 (0.11+svn20110307-1) unstable; urgency=low
+
+  * New upstream snapshot (Closes: #624792)
+  * Remove power_now support patch (applied upstream)
+  * Do not install tintwizard (it does not support config of SVN snapshot)
+  * Also build a tint2-dbg package
+
+ -- Sebastian Reichel <sre@debian.org>  Sun, 01 May 2011 19:35:32 +0200
+
+tint2 (0.11-2) unstable; urgency=low
+
+  * Recommend python-gtk2 instead of python-gtk 
+
+ -- Sebastian Reichel <sre@debian.org>  Sun, 05 Dec 2010 05:05:46 +0100
+
+tint2 (0.11-1) unstable; urgency=low
+
+  * Make me the maintainer of this package (Closes: #598688)
+  * New Upstream Version (Closes: #591008)
+  * drop patch (applied upstream)
+  * Update watch file
+    + use googlecode.debian.net
+    + new files are release as tar.bz2
+  * Update Debian Standards Version to 3.9.1
+  * Use DEP5 for debian/copyright
+  * Added build dependencies: cmake, libgtk2.0-dev
+  * Add patch renaming tintwizard.py to tintwizard
+  * Add patch adding power_now support
+  * Recommend python (needed by tintwizard)
+
+ -- Sebastian Reichel <sre@debian.org>  Fri, 26 Nov 2010 22:01:43 +0100
+
+tint2 (0.9-2) unstable; urgency=low
+
+  * debian/patches/update-systray-clock-every-second.diff: Cherry-pick
+    patch from upstream to keep systray clock in sync with system time.
+    (Closes: #572227)
+
+ -- Daniel Moerner <dmoerner@gmail.com>  Wed, 03 Mar 2010 23:40:02 -0800
+
+tint2 (0.9-1) unstable; urgency=low
+
+  * New Upstream Version
+  * debian/watch: Upstream uses both _beta and -rc1 for version strings,
+    update uversionmangle to handle both.
+  * debian/control:
+    - Bump to Version 3.8.4, no changes.
+    - Add libxdamage-dev and libxcomposite-dev to Build-Depends.
+
+ -- Daniel Moerner <dmoerner@gmail.com>  Wed, 24 Feb 2010 10:21:01 -0800
+
+tint2 (0.8-1) unstable; urgency=low
+
+  * New Upstream Version
+  * debian/examples: Upstream has renamed the sample tint2rc files.
+  * debian/source: Switch to dpkg-source 3.0 (quilt) format.
+  * debian/copyright: Update with new upstream authors.
+
+ -- Daniel Moerner <dmoerner@gmail.com>  Tue, 12 Jan 2010 11:48:49 -0800
+
+tint2 (0.7.1-1) unstable; urgency=low
+
+  * New Upstream Version
+  * debian/watch: add uversionmangle line to ignore upstream's beta
+    releases.
+  * debian/control: Update to Debian Policy 3.8.3, fix description typo.
+
+ -- Daniel Moerner <dmoerner@gmail.com>  Sun, 06 Sep 2009 18:57:06 -0700
+
+tint2 (0.7-1) unstable; urgency=low
+
+  * New Upstream Version. (LP: #319436)
+    - Update watch file to point to tint2 instead of tint.
+    - Remove debian/tint.1: integrated upstream (Closes: #532307)
+    - Remove dpatch and patches/01-remove-strip-from-makefile.dpatch:
+      integrated upstream.
+    - Refresh debian/examples and remove debian/docs
+    - tint2 is now licensed under the GPL-2.
+  * Added Vcs-Git and Vcs-Browser fields to debian/control.
+  * Updated to Standards Version 3.8.2
+  * Switched to tiny dh 7 rules file with overrides.
+
+ -- Daniel Moerner <dmoerner@gmail.com>  Wed, 01 Jul 2009 02:01:27 -0700
+
+tint2 (0.6.0-1) unstable; urgency=low
+
+  * Initial release (closes: #491596)
+  * Wrote manpage from upstream docs
+  * 01-remove-strip-from-makefile.dpatch: dh_strip will strip the binary instead
+
+ -- Daniel Moerner <dmoerner@gmail.com>  Sat, 06 Sep 2008 07:54:24 -0700

packaging/debian/compat

@@ -0,0 +1 @@
+9

packaging/debian/control

@@ -0,0 +1,36 @@
+Source: tint2
+Section: x11
+Priority: optional
+Maintainer: Sebastian Reichel <sre@debian.org>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               libcairo2-dev,
+               libglib2.0-dev,
+               libgtk2.0-dev,
+               libimlib2-dev,
+               libpango1.0-dev,
+               librsvg2-dev,
+               libstartup-notification0-dev,
+               libxcomposite-dev,
+               libxdamage-dev,
+               libxinerama-dev,
+               libxrandr-dev
+Standards-Version: 3.9.7
+Vcs-Git: https://alioth.debian.org/anonscm/git/collab-maint/tint2.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/tint2.git
+Homepage: https://gitlab.com/o9000/tint2/
+
+Package: tint2
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: lightweight taskbar
+ Tint is a simple panel/taskbar intentionally made for openbox3, but should
+ also work with other window managers. The taskbar includes transparency and
+ color settings for the font, icons, border, and background. It also supports
+ multihead setups, customized mouse actions, and a built-in clock. Tint was
+ originally based on ttm code. Since then, support has also been added
+ for a battery monitor and system tray.
+ .
+ The goal is to keep a clean and unintrusive look with lightweight code and
+ compliance with freedesktop specification.

packaging/debian/copyright

@@ -0,0 +1,61 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://gitlab.com/o9000/tint2.git
+
+Files: *
+Copyright: 2007-2008 Pål Staurland <staura@gmail.com>
+           2008-2009 Thierry Lorthiois <lorthiois@bbsoft.fr>
+           2009 Andreas Fink <andreas.fink85@googlemail.com>
+           2011-2015 Ovidiu M <mrovi9000@gmail.com>
+License: GPL-2
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License version 2
+ as published by the Free Software Foundation, or (at your option) any
+ later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.
+ .
+ On Debian systems, the full text of the GNU General Public License 2
+ can be found in `/usr/share/common-licenses/GPL-2'.
+
+Files: src/battery/*
+Copyright: 2009 Sebastian Reichel <sre@debian.org>
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License version 2
+ as published by the Free Software Foundation, or (at your option) any
+ later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA  02110-1301, USA.
+ .
+ On Debian systems, the full text of the GNU General Public License 2
+ can be found in `/usr/share/common-licenses/GPL-2'.
+
+Files: debian/*
+Copyright: 2008-2010 Daniel Moerner <dmoerner@gmail.com>
+           2010-2012 Sebastian Reichel <sre@debian.org>
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

packaging/debian/examples

@@ -0,0 +1 @@
+sample/*.tint2rc

packaging/debian/rules

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+
+override_dh_auto_install:
+	dh_auto_install --destdir=$(CURDIR)/debian/tmp
+
+override_dh_installdocs:
+	dh_installdocs --link-doc=tint2

packaging/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

packaging/debian/tint2.install

@@ -0,0 +1,12 @@
+/usr/bin/tint2
+/usr/bin/tint2conf
+/etc/xdg/tint2/tint2rc
+/usr/share/applications/tint2.desktop
+/usr/share/applications/tint2conf.desktop
+/usr/share/man/man1/tint2.1
+/usr/share/doc/tint2/*
+/usr/share/icons/hicolor/scalable/apps/tint2.svg
+/usr/share/icons/hicolor/scalable/apps/tint2conf.svg
+/usr/share/locale/*
+/usr/share/tint2/*
+/usr/share/mime/packages/*

packaging/debian/tint2.manpages

@@ -0,0 +1 @@
+debian/tint2conf.1

packaging/debian/tint2conf.1

@@ -0,0 +1,15 @@
+.TH TINT2CONF 1 "April 25, 2011"
+.\" Please adjust this date whenever revising the manpage.
+.SH NAME
+tint2conf \- tint configuration manager
+.SH SYNOPSIS
+.B tint2conf
+.SH DESCRIPTION
+tint2conf is a GTK based configuration previewer for tint2.
+.SH OPTIONS
+tint2conf takes no parameters.
+.SH AUTHOR
+tint2conf was written by the tint2 team.
+.PP
+This manual page was written by Sebastian Reichel <sre@debian.org>,
+for the Debian project (but may be used by others).

packaging/debian/watch

@@ -0,0 +1,4 @@
+version=3
+
+opts=filenamemangle=s/.*\.tar\.gz\?ref=v?(\d\S*)/tint2-$1\.tar\.gz/g,uversionmangle=s/\-rc(\d)/\~rc$1/ \
+https://gitlab.com/o9000/tint2/tags .*archive\.tar\.gz\?ref=v?(\d\S*) 

packaging/make_ubuntu.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Requirements: devscripts
+
+set -x
+
+rm -rf tint2* 2>/dev/null || true
+
+if [ ! -z "$1" ]
+then
+    MINOR="$1"
+else
+    MINOR="1"
+fi
+
+# Get version (and check that the repository is clean)
+VERSION=$(../get_version.sh --strict)
+if [ ! $? -eq 0 ]
+then
+    echo >&2 "Error: get_version.sh failed!"
+    exit 1
+fi
+rm -f version.h
+VERSION=$(git describe --exact-match 2>/dev/null)
+if [ $? -eq 0 ]
+then
+    VERSION=$(echo "$VERSION" | sed 's/^v//')
+    REPO="tint2"
+else
+    VERSION="$(git show -s --pretty=format:%cI.%ct.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g').$MINOR"
+    REPO="tint2-git"
+fi
+
+set -e
+
+# Export repository contents to source directory
+DIR=tint2-$VERSION
+echo "Making release $DIR"
+
+pushd .
+cd ..
+git checkout-index --prefix=packaging/$DIR/ -a
+popd
+
+# Update version file in source directory
+rm -f $DIR/make_release.sh
+echo "echo \"#define VERSION_STRING \\\"$VERSION\\\"\" > version.h" > $DIR/get_version.sh
+
+# Copy the debian files into the source directory
+cp -r debian $DIR/debian
+
+for DISTRO in precise trusty xenial yakkety zesty
+do
+    # Cleanup from previous builds
+    rm -rf tint2_$VERSION-*
+
+    # Update debian package changelog if necessary
+    echo -e "tint2 ($VERSION-$DISTRO-1) $DISTRO; urgency=medium\n\n$(git log --pretty=format:'  * %h %an (%ci) %s %d')\n -- o9000 <mrovi9000@gmail.com>  $(date -R)\n" > $DIR/debian/changelog
+
+    # Create source tarball
+    ARCHIVE=tint2_$VERSION-$DISTRO.orig.tar.gz
+    rm -rf $ARCHIVE
+    tar -czf $ARCHIVE $DIR
+
+    # Build package
+    KEY=$(gpg --list-secret-keys | awk '/^sec/ { print $2 }' | cut -d / -f 2)
+
+    pushd .
+    cd $DIR
+    debuild -S -k$KEY
+    popd
+
+    # Upload package
+    dput ppa:o9000/$REPO tint2_$VERSION-$DISTRO-1_source.changes
+done
+
+# Cleanup
+rm -rf $DIR $ARCHIVE
+rm -rf tint2_$VERSION-*

src/battery/battery.c

@@ -56,356 +56,406 @@ char *battery_uwheel_command;
 char *battery_dwheel_command;
 gboolean battery_found;
 
+char *battery_sys_prefix = (char *)"";
+
 void battery_init_fonts();
 char *battery_get_tooltip(void *obj);
+int battery_compute_desired_size(void *obj);
+void battery_dump_geometry(void *obj, int indent);
 
 void default_battery()
 {
-	battery_enabled = FALSE;
+    battery_enabled = FALSE;
-	battery_tooltip_enabled = TRUE;
+    battery_tooltip_enabled = TRUE;
-	battery_found = FALSE;
+    battery_found = FALSE;
-	percentage_hide = 101;
+    percentage_hide = 101;
-	battery_low_cmd_sent = FALSE;
+    battery_low_cmd_sent = FALSE;
-	battery_timeout = NULL;
+    battery_timeout = NULL;
-	bat1_has_font = FALSE;
+    bat1_has_font = FALSE;
-	bat1_font_desc = NULL;
+    bat1_font_desc = NULL;
-	bat2_has_font = FALSE;
+    bat2_has_font = FALSE;
-	bat2_font_desc = NULL;
+    bat2_font_desc = NULL;
-	ac_connected_cmd = NULL;
+    ac_connected_cmd = NULL;
-	ac_disconnected_cmd = NULL;
+    ac_disconnected_cmd = NULL;
-	battery_low_cmd = NULL;
+    battery_low_cmd = NULL;
-	battery_lclick_command = NULL;
+    battery_lclick_command = NULL;
-	battery_mclick_command = NULL;
+    battery_mclick_command = NULL;
-	battery_rclick_command = NULL;
+    battery_rclick_command = NULL;
-	battery_uwheel_command = NULL;
+    battery_uwheel_command = NULL;
-	battery_dwheel_command = NULL;
+    battery_dwheel_command = NULL;
-	battery_state.percentage = 0;
+    battery_state.percentage = 0;
-	battery_state.time.hours = 0;
+    battery_state.time.hours = 0;
-	battery_state.time.minutes = 0;
+    battery_state.time.minutes = 0;
-	battery_state.time.seconds = 0;
+    battery_state.time.seconds = 0;
-	battery_state.state = BATTERY_UNKNOWN;
+    battery_state.state = BATTERY_UNKNOWN;
 }
 
 void cleanup_battery()
 {
-	pango_font_description_free(bat1_font_desc);
+    pango_font_description_free(bat1_font_desc);
-	bat1_font_desc = NULL;
+    bat1_font_desc = NULL;
-	pango_font_description_free(bat2_font_desc);
+    pango_font_description_free(bat2_font_desc);
-	bat2_font_desc = NULL;
+    bat2_font_desc = NULL;
-	free(battery_low_cmd);
+    free(battery_low_cmd);
-	battery_low_cmd = NULL;
+    battery_low_cmd = NULL;
-	free(battery_lclick_command);
+    free(battery_lclick_command);
-	battery_lclick_command = NULL;
+    battery_lclick_command = NULL;
-	free(battery_mclick_command);
+    free(battery_mclick_command);
-	battery_mclick_command = NULL;
+    battery_mclick_command = NULL;
-	free(battery_rclick_command);
+    free(battery_rclick_command);
-	battery_rclick_command = NULL;
+    battery_rclick_command = NULL;
-	free(battery_uwheel_command);
+    free(battery_uwheel_command);
-	battery_uwheel_command = NULL;
+    battery_uwheel_command = NULL;
-	free(battery_dwheel_command);
+    free(battery_dwheel_command);
-	battery_dwheel_command = NULL;
+    battery_dwheel_command = NULL;
-	free(ac_connected_cmd);
+    free(ac_connected_cmd);
-	ac_connected_cmd = NULL;
+    ac_connected_cmd = NULL;
-	free(ac_disconnected_cmd);
+    free(ac_disconnected_cmd);
-	ac_disconnected_cmd = NULL;
+    ac_disconnected_cmd = NULL;
-	stop_timeout(battery_timeout);
+    stop_timeout(battery_timeout);
-	battery_timeout = NULL;
+    battery_timeout = NULL;
-	battery_found = FALSE;
+    battery_found = FALSE;
 
-	battery_os_free();
+    battery_os_free();
 }
 
 void init_battery()
 {
-	if (!battery_enabled)
+    if (!battery_enabled)
-		return;
+        return;
 
-	battery_found = battery_os_init();
+    battery_found = battery_os_init();
 
-	if (!battery_timeout)
+    if (!battery_timeout)
-		battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
+        battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
 
-	update_battery();
+    update_battery();
 }
 
 void reinit_battery()
 {
-	battery_os_free();
+    battery_os_free();
-	battery_found = battery_os_init();
+    battery_found = battery_os_init();
-	update_battery();
+    update_battery();
 }
 
 void init_battery_panel(void *p)
 {
-	Panel *panel = (Panel *)p;
+    Panel *panel = (Panel *)p;
-	Battery *battery = &panel->battery;
+    Battery *battery = &panel->battery;
 
-	if (!battery_enabled)
+    if (!battery_enabled)
-		return;
+        return;
 
-	battery_init_fonts();
+    battery_init_fonts();
 
-	if (!battery->area.bg)
+    if (!battery->area.bg)
-		battery->area.bg = &g_array_index(backgrounds, Background, 0);
+        battery->area.bg = &g_array_index(backgrounds, Background, 0);
 
-	battery->area.parent = p;
+    battery->area.parent = p;
-	battery->area.panel = p;
+    battery->area.panel = p;
-	battery->area._draw_foreground = draw_battery;
+    snprintf(battery->area.name, sizeof(battery->area.name), "Battery");
-	battery->area.size_mode = LAYOUT_FIXED;
+    battery->area._draw_foreground = draw_battery;
-	battery->area._resize = resize_battery;
+    battery->area.size_mode = LAYOUT_FIXED;
-	battery->area.on_screen = TRUE;
+    battery->area._resize = resize_battery;
-	battery->area.resize_needed = 1;
+    battery->area._compute_desired_size = battery_compute_desired_size;
-	battery->area.has_mouse_over_effect = panel_config.mouse_effects &&
+    battery->area._is_under_mouse = full_width_area_is_under_mouse;
-										  (battery_lclick_command || battery_mclick_command || battery_rclick_command ||
+    battery->area.on_screen = TRUE;
-										   battery_uwheel_command || battery_dwheel_command);
+    battery->area.resize_needed = 1;
-	battery->area.has_mouse_press_effect = battery->area.has_mouse_over_effect;
+    battery->area.has_mouse_over_effect =
-	if (battery_tooltip_enabled)
+        panel_config.mouse_effects && (battery_lclick_command || battery_mclick_command || battery_rclick_command ||
-		battery->area._get_tooltip_text = battery_get_tooltip;
+                                       battery_uwheel_command || battery_dwheel_command);
+    battery->area.has_mouse_press_effect = battery->area.has_mouse_over_effect;
+    if (battery_tooltip_enabled)
+        battery->area._get_tooltip_text = battery_get_tooltip;
+    instantiate_area_gradients(&battery->area);
 }
 
 void battery_init_fonts()
 {
-	if (!bat1_font_desc) {
+    if (!bat1_font_desc) {
-		bat1_font_desc = pango_font_description_from_string(get_default_font());
+        bat1_font_desc = pango_font_description_from_string(get_default_font());
-		pango_font_description_set_size(bat1_font_desc,
+        pango_font_description_set_size(bat1_font_desc, pango_font_description_get_size(bat1_font_desc) - PANGO_SCALE);
-		                                pango_font_description_get_size(bat1_font_desc) - PANGO_SCALE);
+    }
-	}
+    if (!bat2_font_desc) {
-	if (!bat2_font_desc) {
+        bat2_font_desc = pango_font_description_from_string(get_default_font());
-		bat2_font_desc = pango_font_description_from_string(get_default_font());
+        pango_font_description_set_size(bat2_font_desc, pango_font_description_get_size(bat2_font_desc) - PANGO_SCALE);
-		pango_font_description_set_size(bat2_font_desc,
+    }
-		                                pango_font_description_get_size(bat2_font_desc) - PANGO_SCALE);
-	}
 }
 
 void battery_default_font_changed()
 {
-	if (!battery_enabled)
+    if (!battery_enabled)
-		return;
+        return;
-	if (bat1_has_font && bat2_has_font)
+    if (bat1_has_font && bat2_has_font)
-		return;
+        return;
-	if (!bat1_has_font) {
+    if (!bat1_has_font) {
-		pango_font_description_free(bat1_font_desc);
+        pango_font_description_free(bat1_font_desc);
-		bat1_font_desc = NULL;
+        bat1_font_desc = NULL;
-	}
+    }
-	if (!bat2_has_font) {
+    if (!bat2_has_font) {
-		pango_font_description_free(bat2_font_desc);
+        pango_font_description_free(bat2_font_desc);
-		bat2_font_desc = NULL;
+        bat2_font_desc = NULL;
-	}
+    }
-	battery_init_fonts();
+    battery_init_fonts();
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		panels[i].battery.area.resize_needed = TRUE;
+        panels[i].battery.area.resize_needed = TRUE;
-		schedule_redraw(&panels[i].battery.area);
+        schedule_redraw(&panels[i].battery.area);
-	}
+    }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 }
 
 void update_battery_tick(void *arg)
 {
-	if (!battery_enabled)
+    if (!battery_enabled)
-		return;
+        return;
 
-	gboolean old_found = battery_found;
+    gboolean old_found = battery_found;
-	int old_percentage = battery_state.percentage;
+    int old_percentage = battery_state.percentage;
-	gboolean old_ac_connected = battery_state.ac_connected;
+    gboolean old_ac_connected = battery_state.ac_connected;
-	int16_t old_hours = battery_state.time.hours;
+    int16_t old_hours = battery_state.time.hours;
-	int8_t old_minutes = battery_state.time.minutes;
+    int8_t old_minutes = battery_state.time.minutes;
 
-	if (!battery_found) {
+    if (!battery_found) {
-		init_battery();
+        init_battery();
-		old_ac_connected = battery_state.ac_connected;
+        old_ac_connected = battery_state.ac_connected;
-	}
+    }
-	if (update_battery() != 0) {
+    if (update_battery() != 0) {
-		// Try to reconfigure on failed update
+        // Try to reconfigure on failed update
-		init_battery();
+        init_battery();
-	}
+    }
 
-	if (old_ac_connected != battery_state.ac_connected) {
+    if (old_ac_connected != battery_state.ac_connected) {
-		if (battery_state.ac_connected)
+        if (battery_state.ac_connected)
-			tint_exec(ac_connected_cmd);
+            tint_exec_no_sn(ac_connected_cmd);
-		else
+        else
-			tint_exec(ac_disconnected_cmd);
+            tint_exec_no_sn(ac_disconnected_cmd);
-	}
+    }
 
-	if (battery_state.percentage < battery_low_status && battery_state.state == BATTERY_DISCHARGING &&
+    if (battery_state.percentage < battery_low_status && battery_state.state == BATTERY_DISCHARGING &&
-		!battery_low_cmd_sent) {
+        !battery_low_cmd_sent) {
-		tint_exec(battery_low_cmd);
+        tint_exec_no_sn(battery_low_cmd);
-		battery_low_cmd_sent = TRUE;
+        battery_low_cmd_sent = TRUE;
-	}
+    }
-	if (battery_state.percentage > battery_low_status && battery_state.state == BATTERY_CHARGING &&
+    if (battery_state.percentage > battery_low_status && battery_state.state == BATTERY_CHARGING &&
-		battery_low_cmd_sent) {
+        battery_low_cmd_sent) {
-		battery_low_cmd_sent = FALSE;
+        battery_low_cmd_sent = FALSE;
-	}
+    }
 
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		// Show/hide if needed
+        // Show/hide if needed
-		if (!battery_found) {
+        if (!battery_found) {
-			if (panels[i].battery.area.on_screen) {
+            hide(&panels[i].battery.area);
-				hide(&panels[i].battery.area);
+        } else {
-				panel_refresh = TRUE;
+            if (battery_state.percentage >= percentage_hide)
-			}
+                hide(&panels[i].battery.area);
-		} else {
+            else
-			if (battery_state.percentage >= percentage_hide) {
+                show(&panels[i].battery.area);
-				if (panels[i].battery.area.on_screen) {
+        }
-					hide(&panels[i].battery.area);
+        // Redraw if needed
-					panel_refresh = TRUE;
+        if (panels[i].battery.area.on_screen) {
-				}
+            if (old_found != battery_found || old_percentage != battery_state.percentage ||
-			} else {
+                old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) {
-				if (!panels[i].battery.area.on_screen) {
+                panels[i].battery.area.resize_needed = TRUE;
-					show(&panels[i].battery.area);
+                schedule_panel_redraw();
-					panel_refresh = TRUE;
+            }
-				}
+        }
-			}
+    }
-		}
-		// Redraw if needed
-		if (panels[i].battery.area.on_screen) {
-			if (old_found != battery_found || old_percentage != battery_state.percentage ||
-				old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) {
-				panels[i].battery.area.resize_needed = TRUE;
-				panel_refresh = TRUE;
-			}
-		}
-	}
 }
 
 int update_battery()
 {
-	// Reset
+    // Reset
-	battery_state.state = BATTERY_UNKNOWN;
+    battery_state.state = BATTERY_UNKNOWN;
-	battery_state.percentage = 0;
+    battery_state.percentage = 0;
-	battery_state.ac_connected = FALSE;
+    battery_state.ac_connected = FALSE;
-	battery_state_set_time(&battery_state, 0);
+    battery_state_set_time(&battery_state, 0);
 
-	int err = battery_os_update(&battery_state);
+    int err = battery_os_update(&battery_state);
 
-	// Clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
+    // Clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
-	if (battery_state.percentage > 100) {
+    if (battery_state.percentage > 100) {
-		battery_state.percentage = 100;
+        battery_state.percentage = 100;
-	}
+    }
 
-	return err;
+    return err;
+}
+
+int battery_compute_desired_size(void *obj)
+{
+    Battery *battery = (Battery *)obj;
+    Panel *panel = (Panel *)battery->area.panel;
+    int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
+    int bat_time_height, bat_time_width, bat_time_height_ink;
+
+    snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
+    if (battery_state.state == BATTERY_FULL) {
+        strcpy(buf_bat_time, "Full");
+    } else {
+        snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
+    }
+    get_text_size2(bat1_font_desc,
+                   &bat_percentage_height_ink,
+                   &bat_percentage_height,
+                   &bat_percentage_width,
+                   panel->area.height,
+                   panel->area.width,
+                   buf_bat_percentage,
+                   strlen(buf_bat_percentage),
+                   PANGO_WRAP_WORD_CHAR,
+                   PANGO_ELLIPSIZE_NONE,
+                   FALSE);
+    get_text_size2(bat2_font_desc,
+                   &bat_time_height_ink,
+                   &bat_time_height,
+                   &bat_time_width,
+                   panel->area.height,
+                   panel->area.width,
+                   buf_bat_time,
+                   strlen(buf_bat_time),
+                   PANGO_WRAP_WORD_CHAR,
+                   PANGO_ELLIPSIZE_NONE,
+                   FALSE);
+
+    if (panel_horizontal) {
+        int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
+        new_size += 2 * battery->area.paddingxlr + left_right_border_width(&battery->area);
+        return new_size;
+    } else {
+        int new_size = bat_percentage_height + bat_time_height + 2 * battery->area.paddingxlr +
+                       top_bottom_border_width(&battery->area);
+        return new_size;
+    }
 }
 
 gboolean resize_battery(void *obj)
 {
-	Battery *battery = obj;
+    Battery *battery = (Battery *)obj;
-	Panel *panel = battery->area.panel;
+    Panel *panel = (Panel *)battery->area.panel;
-	int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
+    int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
-	int bat_time_height, bat_time_width, bat_time_height_ink;
+    int bat_time_height, bat_time_width, bat_time_height_ink;
-	int ret = 0;
+    int ret = 0;
 
-	schedule_redraw(&battery->area);
+    snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
+    if (battery_state.state == BATTERY_FULL) {
+        strcpy(buf_bat_time, "Full");
+    } else {
+        snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
+    }
+    get_text_size2(bat1_font_desc,
+                   &bat_percentage_height_ink,
+                   &bat_percentage_height,
+                   &bat_percentage_width,
+                   panel->area.height,
+                   panel->area.width,
+                   buf_bat_percentage,
+                   strlen(buf_bat_percentage),
+                   PANGO_WRAP_WORD_CHAR,
+                   PANGO_ELLIPSIZE_NONE,
+                   FALSE);
+    get_text_size2(bat2_font_desc,
+                   &bat_time_height_ink,
+                   &bat_time_height,
+                   &bat_time_width,
+                   panel->area.height,
+                   panel->area.width,
+                   buf_bat_time,
+                   strlen(buf_bat_time),
+                   PANGO_WRAP_WORD_CHAR,
+                   PANGO_ELLIPSIZE_NONE,
+                   FALSE);
 
-	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
+    if (panel_horizontal) {
-	if (battery_state.state == BATTERY_FULL) {
+        int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
-		strcpy(buf_bat_time, "Full");
+        new_size += 2 * battery->area.paddingxlr + left_right_border_width(&battery->area);
-	} else {
+        if (new_size > battery->area.width || new_size < battery->area.width - 2) {
-		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
+            // we try to limit the number of resize
-	}
+            battery->area.width = new_size;
-	get_text_size2(bat1_font_desc,
+            battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height) / 2;
-				   &bat_percentage_height_ink,
+            battery->bat2_posy = battery->bat1_posy + bat_percentage_height;
-				   &bat_percentage_height,
+            ret = 1;
-				   &bat_percentage_width,
+        }
-				   panel->area.height,
+    } else {
-				   panel->area.width,
+        int new_size = bat_percentage_height + bat_time_height + 2 * battery->area.paddingxlr +
-				   buf_bat_percentage,
+                       top_bottom_border_width(&battery->area);
-				   strlen(buf_bat_percentage),
+        if (new_size > battery->area.height || new_size < battery->area.height - 2) {
-				   PANGO_WRAP_WORD_CHAR,
+            battery->area.height = new_size;
-				   PANGO_ELLIPSIZE_NONE,
+            battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2) / 2;
-				   FALSE);
+            battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
-	get_text_size2(bat2_font_desc,
+            ret = 1;
-				   &bat_time_height_ink,
+        }
-				   &bat_time_height,
+    }
-				   &bat_time_width,
-				   panel->area.height,
-				   panel->area.width,
-				   buf_bat_time,
-				   strlen(buf_bat_time),
-				   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE,
-				   FALSE);
 
-	if (panel_horizontal) {
+    schedule_redraw(&battery->area);
-		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
+    return ret;
-		new_size += 2 * battery->area.paddingxlr + 2 * battery->area.bg->border.width;
-		if (new_size > battery->area.width || new_size < battery->area.width - 2) {
-			// we try to limit the number of resize
-			battery->area.width = new_size;
-			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height) / 2;
-			battery->bat2_posy = battery->bat1_posy + bat_percentage_height;
-			ret = 1;
-		}
-	} else {
-		int new_size =
-		    bat_percentage_height + bat_time_height + (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
-		if (new_size > battery->area.height || new_size < battery->area.height - 2) {
-			battery->area.height = new_size;
-			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2) / 2;
-			battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
-			ret = 1;
-		}
-	}
-	return ret;
 }
 
 void draw_battery(void *obj, cairo_t *c)
 {
-	Battery *battery = obj;
+    Battery *battery = obj;
 
-	PangoLayout *layout = pango_cairo_create_layout(c);
+    PangoLayout *layout = pango_cairo_create_layout(c);
-	pango_layout_set_font_description(layout, bat1_font_desc);
+    pango_layout_set_font_description(layout, bat1_font_desc);
-	pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
+    pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
-	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+    pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
+    pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
 
-	cairo_set_source_rgba(c,
+    cairo_set_source_rgba(c,
-	                      battery->font_color.rgb[0],
+                          battery->font_color.rgb[0],
-	                      battery->font_color.rgb[1],
+                          battery->font_color.rgb[1],
-	                      battery->font_color.rgb[2],
+                          battery->font_color.rgb[2],
-	                      battery->font_color.alpha);
+                          battery->font_color.alpha);
 
-	pango_cairo_update_layout(c, layout);
+    pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, battery->bat1_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
+    draw_text(layout, c, 0, battery->bat1_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
 
-	pango_layout_set_font_description(layout, bat2_font_desc);
+    pango_layout_set_font_description(layout, bat2_font_desc);
-	pango_layout_set_indent(layout, 0);
+    pango_layout_set_indent(layout, 0);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	pango_layout_set_text(layout, buf_bat_time, strlen(buf_bat_time));
+    pango_layout_set_text(layout, buf_bat_time, strlen(buf_bat_time));
-	pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
+    pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
 
-	pango_cairo_update_layout(c, layout);
+    pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, battery->bat2_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
+    draw_text(layout, c, 0, battery->bat2_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
-	pango_cairo_show_layout(c, layout);
+    pango_cairo_show_layout(c, layout);
 
-	g_object_unref(layout);
+    g_object_unref(layout);
+}
+
+void battery_dump_geometry(void *obj, int indent)
+{
+    Battery *battery = obj;
+    fprintf(stderr, "%*sText 1: y = %d, text = %s\n", indent, "", battery->bat1_posy, buf_bat_percentage);
+    fprintf(stderr, "%*sText 2: y = %d, text = %s\n", indent, "", battery->bat2_posy, buf_bat_time);
 }
 
 char *battery_get_tooltip(void *obj)
 {
-	return battery_os_tooltip();
+    return battery_os_tooltip();
 }
 
-void battery_action(int button)
+void battery_action(int button, Time time)
 {
-	char *command = NULL;
+    char *command = NULL;
-	switch (button) {
+    switch (button) {
-	case 1:
+    case 1:
-		command = battery_lclick_command;
+        command = battery_lclick_command;
-		break;
+        break;
-	case 2:
+    case 2:
-		command = battery_mclick_command;
+        command = battery_mclick_command;
-		break;
+        break;
-	case 3:
+    case 3:
-		command = battery_rclick_command;
+        command = battery_rclick_command;
-		break;
+        break;
-	case 4:
+    case 4:
-		command = battery_uwheel_command;
+        command = battery_uwheel_command;
-		break;
+        break;
-	case 5:
+    case 5:
-		command = battery_dwheel_command;
+        command = battery_dwheel_command;
-		break;
+        break;
-	}
+    }
-	tint_exec(command);
+    tint_exec(command, NULL, NULL, time);
 }

src/battery/battery.h

@@ -17,30 +17,30 @@
 #include "area.h"
 
 typedef struct Battery {
-	Area area;
+    Area area;
-	Color font_color;
+    Color font_color;
-	int bat1_posy;
+    int bat1_posy;
-	int bat2_posy;
+    int bat2_posy;
 } Battery;
 
 typedef enum ChargeState {
-	BATTERY_UNKNOWN = 0,
+    BATTERY_UNKNOWN = 0,
-	BATTERY_CHARGING,
+    BATTERY_CHARGING,
-	BATTERY_DISCHARGING,
+    BATTERY_DISCHARGING,
-	BATTERY_FULL,
+    BATTERY_FULL,
 } ChargeState;
 
 typedef struct BatteryTime {
-	int16_t hours;
+    int16_t hours;
-	int8_t minutes;
+    int8_t minutes;
-	int8_t seconds;
+    int8_t seconds;
 } BatteryTime;
 
 typedef struct BatteryState {
-	int percentage;
+    int percentage;
-	BatteryTime time;
+    BatteryTime time;
-	ChargeState state;
+    ChargeState state;
-	gboolean ac_connected;
+    gboolean ac_connected;
 } BatteryState;
 
 extern struct BatteryState battery_state;
@@ -64,28 +64,30 @@ extern char *battery_rclick_command;
 extern char *battery_uwheel_command;
 extern char *battery_dwheel_command;
 
+extern char *battery_sys_prefix;
+
 static inline gchar *chargestate2str(ChargeState state)
 {
-	switch (state) {
+    switch (state) {
-	case BATTERY_CHARGING:
+    case BATTERY_CHARGING:
-		return "Charging";
+        return "Charging";
-	case BATTERY_DISCHARGING:
+    case BATTERY_DISCHARGING:
-		return "Discharging";
+        return "Discharging";
-	case BATTERY_FULL:
+    case BATTERY_FULL:
-		return "Full";
+        return "Full";
-	case BATTERY_UNKNOWN:
+    case BATTERY_UNKNOWN:
-	default:
+    default:
-		return "Unknown";
+        return "Unknown";
-	};
+    };
 }
 
 static inline void battery_state_set_time(BatteryState *state, int seconds)
 {
-	state->time.hours = seconds / 3600;
+    state->time.hours = seconds / 3600;
-	seconds -= 3600 * state->time.hours;
+    seconds -= 3600 * state->time.hours;
-	state->time.minutes = seconds / 60;
+    state->time.minutes = seconds / 60;
-	seconds -= 60 * state->time.minutes;
+    seconds -= 60 * state->time.minutes;
-	state->time.seconds = seconds;
+    state->time.seconds = seconds;
 }
 
 // default global data
@@ -106,7 +108,7 @@ void battery_default_font_changed();
 
 gboolean resize_battery(void *obj);
 
-void battery_action(int button);
+void battery_action(int button, Time time);
 
 /* operating system specific functions */
 gboolean battery_os_init();

src/battery/dummy.c

@@ -25,20 +25,20 @@
 
 gboolean battery_os_init()
 {
-	return FALSE;
+    return FALSE;
 }
 
 void battery_os_free()
 {
-	return;
+    return;
 }
 
 int battery_os_update(BatteryState *state)
 {
-	return -1;
+    return -1;
 }
 
 char *battery_os_tooltip()
 {
-	return strdup("Operating System not supported");
+    return strdup("Operating System not supported");
 }

src/battery/freebsd.c

@@ -26,77 +26,77 @@
 
 gboolean battery_os_init()
 {
-	int sysctl_out = 0;
+    int sysctl_out = 0;
-	size_t len = sizeof(sysctl_out);
+    size_t len = sizeof(sysctl_out);
 
-	return (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) ||
+    return (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) ||
-		   (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0) ||
+           (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0) ||
-		   (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
+           (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
 }
 
 void battery_os_free()
 {
-	return;
+    return;
 }
 
 int battery_os_update(BatteryState *state)
 {
-	int sysctl_out = 0;
+    int sysctl_out = 0;
-	size_t len = sizeof(sysctl_out);
+    size_t len = sizeof(sysctl_out);
-	gboolean err = 0;
+    gboolean err = 0;
 
-	if (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) {
+    if (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) {
-		switch (sysctl_out) {
+        switch (sysctl_out) {
-		case 1:
+        case 1:
-			state->state = BATTERY_DISCHARGING;
+            state->state = BATTERY_DISCHARGING;
-			break;
+            break;
-		case 2:
+        case 2:
-			state->state = BATTERY_CHARGING;
+            state->state = BATTERY_CHARGING;
-			break;
+            break;
-		default:
+        default:
-			state->state = BATTERY_FULL;
+            state->state = BATTERY_FULL;
-			break;
+            break;
-		}
+        }
-	} else {
+    } else {
-		fprintf(stderr, "power update: no such sysctl");
+        fprintf(stderr, "power update: no such sysctl");
-		err = -1;
+        err = -1;
-	}
+    }
 
-	if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0)
+    if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0)
-		battery_state_set_time(state, sysctl_out * 60);
+        battery_state_set_time(state, sysctl_out * 60);
-	else
+    else
-		err = -1;
+        err = -1;
 
-	if (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0)
+    if (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0)
-		state->percentage = sysctl_out;
+        state->percentage = sysctl_out;
-	else
+    else
-		err = -1;
+        err = -1;
 
-	if (sysctlbyname("hw.acpi.acline", &sysctl_out, &len, NULL, 0) == 0)
+    if (sysctlbyname("hw.acpi.acline", &sysctl_out, &len, NULL, 0) == 0)
-		state->ac_connected = sysctl_out;
+        state->ac_connected = sysctl_out;
 
-	return err;
+    return err;
 }
 
 char *battery_os_tooltip()
 {
-	GString *tooltip = g_string_new("");
+    GString *tooltip = g_string_new("");
-	gchar *result;
+    gchar *result;
 
-	g_string_append_printf(tooltip, "Battery\n");
+    g_string_append_printf(tooltip, "Battery\n");
 
-	gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
+    gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
 
-	g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
+    g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
 
-	g_string_append_c(tooltip, '\n');
+    g_string_append_c(tooltip, '\n');
-	g_string_append_printf(tooltip, "AC\n");
+    g_string_append_printf(tooltip, "AC\n");
-	g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
+    g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
 
-	result = tooltip->str;
+    result = tooltip->str;
-	g_string_free(tooltip, FALSE);
+    g_string_free(tooltip, FALSE);
 
-	return result;
+    return result;
 }
 
 #endif

src/battery/linux.c

@@ -17,7 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **************************************************************************/
 
-#ifdef __linux
+#ifdef __linux__
 
 #include <stdlib.h>
 
@@ -26,508 +26,514 @@
 #include "uevent.h"
 
 enum psy_type {
-	PSY_UNKNOWN,
+    PSY_UNKNOWN,
-	PSY_BATTERY,
+    PSY_BATTERY,
-	PSY_MAINS,
+    PSY_MAINS,
 };
 
 struct psy_battery {
-	/* generic properties */
+    /* generic properties */
-	gchar *name;
+    gchar *name;
-	/* monotonic time, in microseconds */
+    /* monotonic time, in microseconds */
-	gint64 timestamp;
+    gint64 timestamp;
-	/* sysfs files */
+    /* sysfs files */
-	gchar *path_present;
+    gchar *path_present;
-	gchar *path_energy_now;
+    gchar *path_level_now;
-	gchar *path_energy_full;
+    gchar *path_level_full;
-	gchar *path_power_now;
+    gchar *path_rate_now;
-	gchar *path_status;
+    gchar *path_status;
-	/* sysfs hints */
+    /* values */
-	gboolean energy_in_uamp;
+    gboolean present;
-	gboolean power_in_uamp;
+    gint level_now;
-	/* values */
+    gint level_full;
-	gboolean present;
+    gint rate_now;
-	gint energy_now;
+    gchar unit;
-	gint energy_full;
+    ChargeState status;
-	gint power_now;
-	ChargeState status;
 };
 
 struct psy_mains {
-	/* generic properties */
+    /* generic properties */
-	gchar *name;
+    gchar *name;
-	/* sysfs files */
+    /* sysfs files */
-	gchar *path_online;
+    gchar *path_online;
-	/* values */
+    /* values */
-	gboolean online;
+    gboolean online;
 };
 
 static void uevent_battery_update()
 {
-	update_battery_tick(NULL);
+    update_battery_tick(NULL);
 }
 static struct uevent_notify psy_change = {UEVENT_CHANGE, "power_supply", NULL, uevent_battery_update};
 
 static void uevent_battery_plug()
 {
-	printf("reinitialize batteries after HW change\n");
+    printf("reinitialize batteries after HW change\n");
-	reinit_battery();
+    reinit_battery();
 }
 static struct uevent_notify psy_plug = {UEVENT_ADD | UEVENT_REMOVE, "power_supply", NULL, uevent_battery_plug};
 
-#define RETURN_ON_ERROR(err) \
+#define RETURN_ON_ERROR(err)                                                 \
-	if (error) {             \
+    if (err) {                                                               \
-		g_error_free(err);   \
+        g_error_free(err);                                                   \
-		return FALSE;        \
+        fprintf(stderr, RED "%s:%d: errror" RESET "\n", __FILE__, __LINE__); \
-	}
+        return FALSE;                                                        \
+    }
 
 static GList *batteries = NULL;
 static GList *mains = NULL;
 
-static guint8 energy_to_percent(gint energy_now, gint energy_full)
+static guint8 level_to_percent(gint level_now, gint level_full)
 {
-	return 0.5 + ((energy_now <= energy_full ? energy_now : energy_full) * 100.0) / energy_full;
+    return 0.5 + ((level_now <= level_full ? level_now : level_full) * 100.0) / level_full;
 }
 
 static enum psy_type power_supply_get_type(const gchar *entryname)
 {
-	gchar *path_type = g_build_filename("/sys/class/power_supply", entryname, "type", NULL);
+    gchar *path_type = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "type", NULL);
-	GError *error = NULL;
+    GError *error = NULL;
-	gchar *type;
+    gchar *type;
-	gsize typelen;
+    gsize typelen;
 
-	g_file_get_contents(path_type, &type, &typelen, &error);
+    g_file_get_contents(path_type, &type, &typelen, &error);
-	g_free(path_type);
+    g_free(path_type);
-	if (error) {
+    if (error) {
-		g_error_free(error);
+        fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
-		return PSY_UNKNOWN;
+        g_error_free(error);
-	}
+        return PSY_UNKNOWN;
+    }
 
-	if (!g_strcmp0(type, "Battery\n")) {
+    if (!g_strcmp0(type, "Battery\n")) {
-		g_free(type);
+        g_free(type);
-		return PSY_BATTERY;
+        return PSY_BATTERY;
-	}
+    }
 
-	if (!g_strcmp0(type, "Mains\n")) {
+    if (!g_strcmp0(type, "Mains\n")) {
-		g_free(type);
+        g_free(type);
-		return PSY_MAINS;
+        return PSY_MAINS;
-	}
+    }
 
-	g_free(type);
+    g_free(type);
 
-	return PSY_UNKNOWN;
+    return PSY_UNKNOWN;
 }
 
 static gboolean init_linux_battery(struct psy_battery *bat)
 {
-	const gchar *entryname = bat->name;
+    const gchar *entryname = bat->name;
 
-	bat->energy_in_uamp = FALSE;
+    bat->path_present = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "present", NULL);
-	bat->power_in_uamp = FALSE;
+    if (!g_file_test(bat->path_present, G_FILE_TEST_EXISTS)) {
+        fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+        goto err0;
+    }
 
-	bat->path_present = g_build_filename("/sys/class/power_supply", entryname, "present", NULL);
+    bat->path_level_now =
-	if (!g_file_test(bat->path_present, G_FILE_TEST_EXISTS)) {
+        g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_now", NULL);
-		goto err0;
+    bat->path_level_full =
-	}
+        g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_full", NULL);
+    bat->path_rate_now = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "power_now", NULL);
+    bat->unit = 'W';
 
-	bat->path_energy_now = g_build_filename("/sys/class/power_supply", entryname, "energy_now", NULL);
+    if (!g_file_test(bat->path_level_now, G_FILE_TEST_EXISTS) ||
-	if (!g_file_test(bat->path_energy_now, G_FILE_TEST_EXISTS)) {
+        !g_file_test(bat->path_level_full, G_FILE_TEST_EXISTS) ||
-		g_free(bat->path_energy_now);
+        !g_file_test(bat->path_rate_now, G_FILE_TEST_EXISTS)) {
-		bat->path_energy_now = g_build_filename("/sys/class/power_supply", entryname, "charge_now", NULL);
+        g_free(bat->path_level_now);
-		bat->energy_in_uamp = TRUE;
+        g_free(bat->path_level_full);
-	}
+        g_free(bat->path_rate_now);
-	if (!g_file_test(bat->path_energy_now, G_FILE_TEST_EXISTS)) {
+        bat->path_level_now =
-		goto err1;
+            g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "charge_now", NULL);
-	}
+        bat->path_level_full =
+            g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "charge_full", NULL);
+        bat->path_rate_now =
+            g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "current_now", NULL);
+        bat->unit = 'A';
+    }
+    if (!g_file_test(bat->path_level_now, G_FILE_TEST_EXISTS) ||
+        !g_file_test(bat->path_level_full, G_FILE_TEST_EXISTS) ||
+        !g_file_test(bat->path_rate_now, G_FILE_TEST_EXISTS)) {
+        fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+        goto err1;
+    }
 
-	if (!bat->energy_in_uamp) {
+    bat->path_status = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "status", NULL);
-		bat->path_energy_full = g_build_filename("/sys/class/power_supply", entryname, "energy_full", NULL);
+    if (!g_file_test(bat->path_status, G_FILE_TEST_EXISTS)) {
-		if (!g_file_test(bat->path_energy_full, G_FILE_TEST_EXISTS))
+        fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
-			goto err2;
+        goto err2;
-	} else {
+    }
-		bat->path_energy_full = g_build_filename("/sys/class/power_supply", entryname, "charge_full", NULL);
-		if (!g_file_test(bat->path_energy_full, G_FILE_TEST_EXISTS))
-			goto err2;
-	}
 
-	bat->path_power_now = g_build_filename("/sys/class/power_supply", entryname, "power_now", NULL);
+    return TRUE;
-	if (!g_file_test(bat->path_power_now, G_FILE_TEST_EXISTS)) {
-		g_free(bat->path_power_now);
-		bat->path_power_now = g_build_filename("/sys/class/power_supply", entryname, "current_now", NULL);
-		bat->power_in_uamp = TRUE;
-	}
-	if (!g_file_test(bat->path_power_now, G_FILE_TEST_EXISTS)) {
-		goto err3;
-	}
 
-	bat->path_status = g_build_filename("/sys/class/power_supply", entryname, "status", NULL);
-	if (!g_file_test(bat->path_status, G_FILE_TEST_EXISTS)) {
-		goto err4;
-	}
-
-	return TRUE;
-
-err4:
-	g_free(bat->path_status);
-err3:
-	g_free(bat->path_power_now);
 err2:
-	g_free(bat->path_energy_full);
+    g_free(bat->path_status);
 err1:
-	g_free(bat->path_energy_now);
+    g_free(bat->path_level_now);
+    g_free(bat->path_level_full);
+    g_free(bat->path_rate_now);
 err0:
-	g_free(bat->path_present);
+    g_free(bat->path_present);
 
-	return FALSE;
+    return FALSE;
 }
 
 static gboolean init_linux_mains(struct psy_mains *ac)
 {
-	const gchar *entryname = ac->name;
+    const gchar *entryname = ac->name;
 
-	ac->path_online = g_build_filename("/sys/class/power_supply", entryname, "online", NULL);
+    ac->path_online = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "online", NULL);
-	if (!g_file_test(ac->path_online, G_FILE_TEST_EXISTS)) {
+    if (!g_file_test(ac->path_online, G_FILE_TEST_EXISTS)) {
-		g_free(ac->path_online);
+        fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
-		return FALSE;
+        g_free(ac->path_online);
-	}
+        return FALSE;
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 static void psy_battery_free(gpointer data)
 {
-	struct psy_battery *bat = data;
+    struct psy_battery *bat = data;
-	g_free(bat->name);
+    g_free(bat->name);
-	g_free(bat->path_status);
+    g_free(bat->path_status);
-	g_free(bat->path_power_now);
+    g_free(bat->path_rate_now);
-	g_free(bat->path_energy_full);
+    g_free(bat->path_level_full);
-	g_free(bat->path_energy_now);
+    g_free(bat->path_level_now);
-	g_free(bat->path_present);
+    g_free(bat->path_present);
-	g_free(bat);
+    g_free(bat);
 }
 
 static void psy_mains_free(gpointer data)
 {
-	struct psy_mains *ac = data;
+    struct psy_mains *ac = data;
-	g_free(ac->name);
+    g_free(ac->name);
-	g_free(ac->path_online);
+    g_free(ac->path_online);
-	g_free(ac);
+    g_free(ac);
 }
 
 void battery_os_free()
 {
-	uevent_unregister_notifier(&psy_change);
+    uevent_unregister_notifier(&psy_change);
-	uevent_unregister_notifier(&psy_plug);
+    uevent_unregister_notifier(&psy_plug);
 
-	g_list_free_full(batteries, psy_battery_free);
+    g_list_free_full(batteries, psy_battery_free);
-	batteries = NULL;
+    batteries = NULL;
-	g_list_free_full(mains, psy_mains_free);
+    g_list_free_full(mains, psy_mains_free);
-	mains = NULL;
+    mains = NULL;
 }
 
 static void add_battery(const char *entryname)
 {
-	struct psy_battery *bat = g_malloc0(sizeof(*bat));
+    struct psy_battery *bat = g_malloc0(sizeof(*bat));
-	bat->name = g_strdup(entryname);
+    bat->name = g_strdup(entryname);
 
-	if (init_linux_battery(bat)) {
+    if (init_linux_battery(bat)) {
-		batteries = g_list_append(batteries, bat);
+        batteries = g_list_append(batteries, bat);
-		fprintf(stdout, "found battery \"%s\"\n", bat->name);
+        fprintf(stdout, GREEN "Found battery \"%s\"" RESET "\n", bat->name);
-	} else {
+    } else {
-		g_free(bat);
+        g_free(bat);
-		fprintf(stderr, RED "failed to initialize battery \"%s\"\n" RESET, entryname);
+        fprintf(stderr, RED "Failed to initialize battery \"%s\"" RESET "\n", entryname);
-	}
+    }
 }
 
 static void add_mains(const char *entryname)
 {
-	struct psy_mains *ac = g_malloc0(sizeof(*ac));
+    struct psy_mains *ac = g_malloc0(sizeof(*ac));
-	ac->name = g_strdup(entryname);
+    ac->name = g_strdup(entryname);
 
-	if (init_linux_mains(ac)) {
+    if (init_linux_mains(ac)) {
-		mains = g_list_append(mains, ac);
+        mains = g_list_append(mains, ac);
-		fprintf(stdout, "found mains \"%s\"\n", ac->name);
+        fprintf(stdout, GREEN "Found mains \"%s\"" RESET "\n", ac->name);
-	} else {
+    } else {
-		g_free(ac);
+        g_free(ac);
-		fprintf(stderr, RED "failed to initialize mains \"%s\"\n" RESET, entryname);
+        fprintf(stderr, RED "Failed to initialize mains \"%s\"" RESET "\n", entryname);
-	}
+    }
 }
 
 gboolean battery_os_init()
 {
-	GDir *directory = 0;
+    GDir *directory = 0;
-	GError *error = NULL;
+    GError *error = NULL;
-	const char *entryname;
+    const char *entryname;
 
-	battery_os_free();
+    battery_os_free();
 
-	directory = g_dir_open("/sys/class/power_supply", 0, &error);
+    gchar *dir_path = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", NULL);
-	RETURN_ON_ERROR(error);
+    directory = g_dir_open(dir_path, 0, &error);
+    g_free(dir_path);
+    RETURN_ON_ERROR(error);
 
-	while ((entryname = g_dir_read_name(directory))) {
+    while ((entryname = g_dir_read_name(directory))) {
-		enum psy_type type = power_supply_get_type(entryname);
+        fprintf(stderr, GREEN "Found power device %s" RESET "\n", entryname);
+        enum psy_type type = power_supply_get_type(entryname);
 
-		switch (type) {
+        switch (type) {
-		case PSY_BATTERY:
+        case PSY_BATTERY:
-			add_battery(entryname);
+            add_battery(entryname);
-			break;
+            break;
-		case PSY_MAINS:
+        case PSY_MAINS:
-			add_mains(entryname);
+            add_mains(entryname);
-			break;
+            break;
-		default:
+        default:
-			break;
+            break;
-		}
+        }
-	}
+    }
 
-	g_dir_close(directory);
+    g_dir_close(directory);
 
-	uevent_register_notifier(&psy_change);
+    uevent_register_notifier(&psy_change);
-	uevent_register_notifier(&psy_plug);
+    uevent_register_notifier(&psy_plug);
 
-	return batteries != NULL;
+    return batteries != NULL;
 }
 
-static gint estimate_power_usage(struct psy_battery *bat, gint old_energy_now, gint64 old_timestamp)
+static gint estimate_rate_usage(struct psy_battery *bat, gint old_level_now, gint64 old_timestamp)
 {
-	gint64 diff_power = ABS(bat->energy_now - old_energy_now);
+    gint64 diff_level = ABS(bat->level_now - old_level_now);
-	gint64 diff_time = bat->timestamp - old_timestamp;
+    gint64 diff_time = bat->timestamp - old_timestamp;
 
-	/* µW = (µWh * 3600) / (µs / 1000000) */
+    /* µW = (µWh * 3600) / (µs / 1000000) */
-	gint power = diff_power * 3600 * 1000000 / MAX(1, diff_time);
+    gint rate = diff_level * 3600 * 1000000 / MAX(1, diff_time);
 
-	return power;
+    return rate;
 }
 
 static gboolean update_linux_battery(struct psy_battery *bat)
 {
-	GError *error = NULL;
+    GError *error = NULL;
-	gchar *data;
+    gchar *data;
-	gsize datalen;
+    gsize datalen;
 
-	gint64 old_timestamp = bat->timestamp;
+    gint64 old_timestamp = bat->timestamp;
-	int old_energy_now = bat->energy_now;
+    int old_level_now = bat->level_now;
+    gint old_rate_now = bat->rate_now;
 
-	/* reset values */
+    /* reset values */
-	bat->present = 0;
+    bat->present = 0;
-	bat->status = BATTERY_UNKNOWN;
+    bat->status = BATTERY_UNKNOWN;
-	bat->energy_now = 0;
+    bat->level_now = 0;
-	bat->energy_full = 0;
+    bat->level_full = 0;
-	bat->power_now = 0;
+    bat->rate_now = 0;
-	bat->timestamp = g_get_monotonic_time();
+    bat->timestamp = g_get_monotonic_time();
 
-	/* present */
+    /* present */
-	g_file_get_contents(bat->path_present, &data, &datalen, &error);
+    g_file_get_contents(bat->path_present, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
-	bat->present = (atoi(data) == 1);
+    bat->present = (atoi(data) == 1);
-	g_free(data);
+    g_free(data);
 
-	/* we are done, if battery is not present */
+    /* we are done, if battery is not present */
-	if (!bat->present)
+    if (!bat->present)
-		return TRUE;
+        return TRUE;
 
-	/* status */
+    /* status */
-	bat->status = BATTERY_UNKNOWN;
+    bat->status = BATTERY_UNKNOWN;
-	g_file_get_contents(bat->path_status, &data, &datalen, &error);
+    g_file_get_contents(bat->path_status, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
-	if (!g_strcmp0(data, "Charging\n")) {
+    if (!g_strcmp0(data, "Charging\n")) {
-		bat->status = BATTERY_CHARGING;
+        bat->status = BATTERY_CHARGING;
-	} else if (!g_strcmp0(data, "Discharging\n")) {
+    } else if (!g_strcmp0(data, "Discharging\n")) {
-		bat->status = BATTERY_DISCHARGING;
+        bat->status = BATTERY_DISCHARGING;
-	} else if (!g_strcmp0(data, "Full\n")) {
+    } else if (!g_strcmp0(data, "Full\n")) {
-		bat->status = BATTERY_FULL;
+        bat->status = BATTERY_FULL;
-	}
+    }
-	g_free(data);
+    g_free(data);
 
-	/* energy now */
+    /* level now */
-	g_file_get_contents(bat->path_energy_now, &data, &datalen, &error);
+    g_file_get_contents(bat->path_level_now, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
-	bat->energy_now = atoi(data);
+    bat->level_now = atoi(data);
-	g_free(data);
+    g_free(data);
 
-	/* energy full */
+    /* level full */
-	g_file_get_contents(bat->path_energy_full, &data, &datalen, &error);
+    g_file_get_contents(bat->path_level_full, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
-	bat->energy_full = atoi(data);
+    bat->level_full = atoi(data);
-	g_free(data);
+    g_free(data);
 
-	/* power now */
+    /* rate now */
-	g_file_get_contents(bat->path_power_now, &data, &datalen, &error);
+    g_file_get_contents(bat->path_rate_now, &data, &datalen, &error);
-	if (g_error_matches(error, G_FILE_ERROR, G_FILE_ERROR_NODEV)) {
+    if (g_error_matches(error, G_FILE_ERROR, G_FILE_ERROR_NODEV)) {
-		/* some hardware does not support reading current power consumption */
+        /* some hardware does not support reading current rate consumption */
-		g_error_free(error);
+        g_error_free(error);
-		bat->power_now = estimate_power_usage(bat, old_energy_now, old_timestamp);
+        bat->rate_now = estimate_rate_usage(bat, old_level_now, old_timestamp);
-	} else if (error) {
+        if (bat->rate_now == 0 && bat->status != BATTERY_FULL) {
-		g_error_free(error);
+            /* If the hardware updates the level slower than our sampling period,
-		return FALSE;
+             * we need to sample more rarely */
-	} else {
+            bat->rate_now = old_rate_now;
-		bat->power_now = atoi(data);
+            bat->timestamp = old_timestamp;
-		g_free(data);
+        }
-	}
+    } else if (error) {
+        g_error_free(error);
+        return FALSE;
+    } else {
+        bat->rate_now = atoi(data);
+        g_free(data);
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 static gboolean update_linux_mains(struct psy_mains *ac)
 {
-	GError *error = NULL;
+    GError *error = NULL;
-	gchar *data;
+    gchar *data;
-	gsize datalen;
+    gsize datalen;
-	ac->online = FALSE;
+    ac->online = FALSE;
 
-	/* online */
+    /* online */
-	g_file_get_contents(ac->path_online, &data, &datalen, &error);
+    g_file_get_contents(ac->path_online, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
-	ac->online = (atoi(data) == 1);
+    ac->online = (atoi(data) == 1);
-	g_free(data);
+    g_free(data);
 
-	return TRUE;
+    return TRUE;
 }
 
 int battery_os_update(BatteryState *state)
 {
-	GList *l;
+    GList *l;
 
-	gint64 total_energy_now = 0;
+    gint64 total_level_now = 0;
-	gint64 total_energy_full = 0;
+    gint64 total_level_full = 0;
-	gint64 total_power_now = 0;
+    gint64 total_rate_now = 0;
-	gint seconds = 0;
+    gint seconds = 0;
 
-	gboolean charging = FALSE;
+    gboolean charging = FALSE;
-	gboolean discharging = FALSE;
+    gboolean discharging = FALSE;
-	gboolean full = FALSE;
+    gboolean full = FALSE;
-	gboolean ac_connected = FALSE;
+    gboolean ac_connected = FALSE;
 
-	for (l = batteries; l != NULL; l = l->next) {
+    for (l = batteries; l != NULL; l = l->next) {
-		struct psy_battery *bat = l->data;
+        struct psy_battery *bat = l->data;
-		update_linux_battery(bat);
+        update_linux_battery(bat);
 
-		total_energy_now += bat->energy_now;
+        total_level_now += bat->level_now;
-		total_energy_full += bat->energy_full;
+        total_level_full += bat->level_full;
-		total_power_now += bat->power_now;
+        total_rate_now += bat->rate_now;
 
-		charging |= (bat->status == BATTERY_CHARGING);
+        charging |= (bat->status == BATTERY_CHARGING);
-		discharging |= (bat->status == BATTERY_DISCHARGING);
+        discharging |= (bat->status == BATTERY_DISCHARGING);
-		full |= (bat->status == BATTERY_FULL);
+        full |= (bat->status == BATTERY_FULL);
-	}
+    }
 
-	for (l = mains; l != NULL; l = l->next) {
+    for (l = mains; l != NULL; l = l->next) {
-		struct psy_mains *ac = l->data;
+        struct psy_mains *ac = l->data;
-		update_linux_mains(ac);
+        update_linux_mains(ac);
-		ac_connected |= (ac->online);
+        ac_connected |= (ac->online);
-	}
+    }
 
-	/* build global state */
+    /* build global state */
-	if (charging && !discharging)
+    if (charging && !discharging)
-		state->state = BATTERY_CHARGING;
+        state->state = BATTERY_CHARGING;
-	else if (!charging && discharging)
+    else if (!charging && discharging)
-		state->state = BATTERY_DISCHARGING;
+        state->state = BATTERY_DISCHARGING;
-	else if (!charging && !discharging && full)
+    else if (!charging && !discharging && full)
-		state->state = BATTERY_FULL;
+        state->state = BATTERY_FULL;
 
-	/* calculate seconds */
+    /* calculate seconds */
-	if (total_power_now > 0) {
+    if (total_rate_now > 0) {
-		if (state->state == BATTERY_CHARGING)
+        if (state->state == BATTERY_CHARGING)
-			seconds = 3600 * (total_energy_full - total_energy_now) / total_power_now;
+            seconds = 3600 * (total_level_full - total_level_now) / total_rate_now;
-		else if (state->state == BATTERY_DISCHARGING)
+        else if (state->state == BATTERY_DISCHARGING)
-			seconds = 3600 * total_energy_now / total_power_now;
+            seconds = 3600 * total_level_now / total_rate_now;
-	}
+        seconds = MAX(0, seconds);
-	battery_state_set_time(state, seconds);
+    }
+    battery_state_set_time(state, seconds);
 
-	/* calculate percentage */
+    /* calculate percentage */
-	state->percentage = energy_to_percent(total_energy_now, total_energy_full);
+    state->percentage = level_to_percent(total_level_now, total_level_full);
 
-	/* AC state */
+    /* AC state */
-	state->ac_connected = ac_connected;
+    state->ac_connected = ac_connected;
 
-	return 0;
+    return 0;
 }
 
-static gchar *energy_human_readable(struct psy_battery *bat)
+static gchar *level_human_readable(struct psy_battery *bat)
 {
-	gint now = bat->energy_now;
+    gint now = bat->level_now;
-	gint full = bat->energy_full;
+    gint full = bat->level_full;
-	gchar unit = bat->energy_in_uamp ? 'A' : 'W';
 
-	if (full >= 1000000) {
+    if (full >= 1000000) {
-		return g_strdup_printf("%d.%d / %d.%d %ch",
+        return g_strdup_printf("%d.%d / %d.%d %ch",
-							   now / 1000000,
+                               now / 1000000,
-							   (now % 1000000) / 100000,
+                               (now % 1000000) / 100000,
-							   full / 1000000,
+                               full / 1000000,
-							   (full % 1000000) / 100000,
+                               (full % 1000000) / 100000,
-							   unit);
+                               bat->unit);
-	} else if (full >= 1000) {
+    } else if (full >= 1000) {
-		return g_strdup_printf("%d.%d / %d.%d m%ch",
+        return g_strdup_printf("%d.%d / %d.%d m%ch",
-							   now / 1000,
+                               now / 1000,
-							   (now % 1000) / 100,
+                               (now % 1000) / 100,
-							   full / 1000,
+                               full / 1000,
-							   (full % 1000) / 100,
+                               (full % 1000) / 100,
-							   unit);
+                               bat->unit);
-	} else {
+    } else {
-		return g_strdup_printf("%d / %d µ%ch", now, full, unit);
+        return g_strdup_printf("%d / %d µ%ch", now, full, bat->unit);
-	}
+    }
 }
 
-static gchar *power_human_readable(struct psy_battery *bat)
+static gchar *rate_human_readable(struct psy_battery *bat)
 {
-	gint power = bat->power_now;
+    gint rate = bat->rate_now;
-	gchar unit = bat->power_in_uamp ? 'A' : 'W';
+    gchar unit = bat->unit;
 
-	if (power >= 1000000) {
+    if (rate >= 1000000) {
-		return g_strdup_printf("%d.%d %c", power / 1000000, (power % 1000000) / 100000, unit);
+        return g_strdup_printf("%d.%d %c", rate / 1000000, (rate % 1000000) / 100000, unit);
-	} else if (power >= 1000) {
+    } else if (rate >= 1000) {
-		return g_strdup_printf("%d.%d m%c", power / 1000, (power % 1000) / 100, unit);
+        return g_strdup_printf("%d.%d m%c", rate / 1000, (rate % 1000) / 100, unit);
-	} else if (power > 0) {
+    } else if (rate > 0) {
-		return g_strdup_printf("%d µ%c", power, unit);
+        return g_strdup_printf("%d µ%c", rate, unit);
-	} else {
+    } else {
-		return g_strdup_printf("0 %c", unit);
+        return g_strdup_printf("0 %c", unit);
-	}
+    }
 }
 
 char *battery_os_tooltip()
 {
-	GList *l;
+    GList *l;
-	GString *tooltip = g_string_new("");
+    GString *tooltip = g_string_new("");
-	gchar *result;
+    gchar *result;
 
-	for (l = batteries; l != NULL; l = l->next) {
+    for (l = batteries; l != NULL; l = l->next) {
-		struct psy_battery *bat = l->data;
+        struct psy_battery *bat = l->data;
 
-		if (tooltip->len)
+        if (tooltip->len)
-			g_string_append_c(tooltip, '\n');
+            g_string_append_c(tooltip, '\n');
 
-		g_string_append_printf(tooltip, "%s\n", bat->name);
+        g_string_append_printf(tooltip, "%s\n", bat->name);
 
-		if (!bat->present) {
+        if (!bat->present) {
-			g_string_append_printf(tooltip, "\tnot connected");
+            g_string_append_printf(tooltip, "\tnot connected");
-			continue;
+            continue;
-		}
+        }
 
-		gchar *power = power_human_readable(bat);
+        gchar *rate = rate_human_readable(bat);
-		gchar *energy = energy_human_readable(bat);
+        gchar *level = level_human_readable(bat);
-		gchar *state = (bat->status == BATTERY_UNKNOWN) ? "Level" : chargestate2str(bat->status);
+        gchar *state = (bat->status == BATTERY_UNKNOWN) ? "energy" : chargestate2str(bat->status);
 
-		guint8 percentage = energy_to_percent(bat->energy_now, bat->energy_full);
+        guint8 percentage = level_to_percent(bat->level_now, bat->level_full);
 
-		g_string_append_printf(tooltip, "\t%s: %s (%u %%)\n\tPower: %s", state, energy, percentage, power);
+        g_string_append_printf(tooltip, "\t%s: %s (%u %%)\n\trate: %s", state, level, percentage, rate);
 
-		g_free(power);
+        g_free(rate);
-		g_free(energy);
+        g_free(level);
-	}
+    }
 
-	for (l = mains; l != NULL; l = l->next) {
+    for (l = mains; l != NULL; l = l->next) {
-		struct psy_mains *ac = l->data;
+        struct psy_mains *ac = l->data;
 
-		if (tooltip->len)
+        if (tooltip->len)
-			g_string_append_c(tooltip, '\n');
+            g_string_append_c(tooltip, '\n');
 
-		g_string_append_printf(tooltip, "%s\n", ac->name);
+        g_string_append_printf(tooltip, "%s\n", ac->name);
-		g_string_append_printf(tooltip, ac->online ? "\tConnected" : "\tDisconnected");
+        g_string_append_printf(tooltip, ac->online ? "\tConnected" : "\tDisconnected");
-	}
+    }
 
-	result = tooltip->str;
+    result = tooltip->str;
-	g_string_free(tooltip, FALSE);
+    g_string_free(tooltip, FALSE);
 
-	return result;
+    return result;
 }
 
 #endif

src/battery/openbsd.c

@@ -31,78 +31,78 @@ int apm_fd = -1;
 
 gboolean battery_os_init()
 {
-	if (apm_fd > 0)
+    if (apm_fd > 0)
-		close(apm_fd);
+        close(apm_fd);
 
-	apm_fd = open("/dev/apm", O_RDONLY);
+    apm_fd = open("/dev/apm", O_RDONLY);
 
-	if (apm_fd < 0) {
+    if (apm_fd < 0) {
-		warn("ERROR: battery applet cannot open /dev/apm.");
+        warn("ERROR: battery applet cannot open /dev/apm.");
-		return FALSE;
+        return FALSE;
-	} else {
+    } else {
-		return TRUE;
+        return TRUE;
-	}
+    }
 }
 
 void battery_os_free()
 {
-	if ((apm_fd != -1) && (close(apm_fd) == -1))
+    if ((apm_fd != -1) && (close(apm_fd) == -1))
-		warn("cannot close /dev/apm");
+        warn("cannot close /dev/apm");
-	apm_fd = -1;
+    apm_fd = -1;
 }
 
 int battery_os_update(BatteryState *state)
 {
-	struct apm_power_info info;
+    struct apm_power_info info;
 
-	if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
+    if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
-		// best attempt at mapping to Linux battery states
+        // best attempt at mapping to Linux battery states
-		switch (info.battery_state) {
+        switch (info.battery_state) {
-		case APM_BATT_CHARGING:
+        case APM_BATT_CHARGING:
-			state->state = BATTERY_CHARGING;
+            state->state = BATTERY_CHARGING;
-			break;
+            break;
-		default:
+        default:
-			state->state = BATTERY_DISCHARGING;
+            state->state = BATTERY_DISCHARGING;
-			break;
+            break;
-		}
+        }
 
-		if (info.battery_life > 100)
+        if (info.battery_life > 100)
-			info.battery_life = 100;
+            info.battery_life = 100;
-		if (info.battery_life == 100)
+        if (info.battery_life == 100)
-			state->state = BATTERY_FULL;
+            state->state = BATTERY_FULL;
 
-		state->percentage = info.battery_life;
+        state->percentage = info.battery_life;
-		if (info.minutes_left != -1)
+        if (info.minutes_left != -1)
-			battery_state_set_time(state, info.minutes_left * 60);
+            battery_state_set_time(state, info.minutes_left * 60);
 
-		state->ac_connected = info.ac_state == APM_AC_ON;
+        state->ac_connected = info.ac_state == APM_AC_ON;
-	} else {
+    } else {
-		warn("power update: APM_IOC_GETPOWER");
+        warn("power update: APM_IOC_GETPOWER");
-		return -1;
+        return -1;
-	}
+    }
 
-	return 0;
+    return 0;
 }
 
 char *battery_os_tooltip()
 {
-	GString *tooltip = g_string_new("");
+    GString *tooltip = g_string_new("");
-	gchar *result;
+    gchar *result;
 
-	g_string_append_printf(tooltip, "Battery\n");
+    g_string_append_printf(tooltip, "Battery\n");
 
-	gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
+    gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
 
-	g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
+    g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
 
-	g_string_append_c(tooltip, '\n');
+    g_string_append_c(tooltip, '\n');
-	g_string_append_printf(tooltip, "AC\n");
+    g_string_append_printf(tooltip, "AC\n");
-	g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
+    g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
 
-	result = tooltip->str;
+    result = tooltip->str;
-	g_string_free(tooltip, FALSE);
+    g_string_free(tooltip, FALSE);
 
-	return result;
+    return result;
 }
 
 #endif

src/button/button.c

@@ -0,0 +1,641 @@
+#include "button.h"
+
+#include <string.h>
+#include <stdio.h>
+#include <cairo.h>
+#include <cairo-xlib.h>
+#include <math.h>
+#include <pango/pangocairo.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <time.h>
+#include <fcntl.h>
+
+#include "window.h"
+#include "server.h"
+#include "panel.h"
+#include "timer.h"
+#include "common.h"
+
+char *button_get_tooltip(void *obj);
+void button_init_fonts();
+int button_compute_desired_size(void *obj);
+void button_dump_geometry(void *obj, int indent);
+
+void default_button()
+{
+}
+
+Button *create_button()
+{
+    Button *button = calloc(1, sizeof(Button));
+    button->backend = calloc(1, sizeof(ButtonBackend));
+    button->backend->centered = TRUE;
+    button->backend->font_color.alpha = 0.5;
+    return button;
+}
+
+gpointer create_button_frontend(gconstpointer arg, gpointer data)
+{
+    Button *button_backend = (Button *)arg;
+
+    Button *button_frontend = calloc(1, sizeof(Button));
+    button_frontend->backend = button_backend->backend;
+    button_backend->backend->instances = g_list_append(button_backend->backend->instances, button_frontend);
+    button_frontend->frontend = calloc(1, sizeof(ButtonFrontend));
+    return button_frontend;
+}
+
+void destroy_button(void *obj)
+{
+    Button *button = (Button *)obj;
+    if (button->frontend) {
+        // This is a frontend element
+        if (button->frontend->icon) {
+            imlib_context_set_image(button->frontend->icon);
+            imlib_free_image();
+            button->frontend->icon = NULL;
+        }
+        button->backend->instances = g_list_remove_all(button->backend->instances, button);
+        free_and_null(button->frontend);
+        remove_area(&button->area);
+        free_area(&button->area);
+        free_and_null(button);
+    } else {
+        // This is a backend element
+        free_and_null(button->backend->text);
+        free_and_null(button->backend->icon_name);
+        free_and_null(button->backend->tooltip);
+
+        button->backend->bg = NULL;
+        pango_font_description_free(button->backend->font_desc);
+        button->backend->font_desc = NULL;
+        free_and_null(button->backend->lclick_command);
+        free_and_null(button->backend->mclick_command);
+        free_and_null(button->backend->rclick_command);
+        free_and_null(button->backend->dwheel_command);
+        free_and_null(button->backend->uwheel_command);
+
+        if (button->backend->instances) {
+            fprintf(stderr, "Error: Attempt to destroy backend while there are still frontend instances!\n");
+            exit(-1);
+        }
+        free(button->backend);
+        free(button);
+    }
+}
+
+void init_button()
+{
+    GList *to_remove = panel_config.button_list;
+    for (int k = 0; k < strlen(panel_items_order) && to_remove; k++) {
+        if (panel_items_order[k] == 'P') {
+            to_remove = to_remove->next;
+        }
+    }
+
+    if (to_remove) {
+        if (to_remove == panel_config.button_list) {
+            g_list_free_full(to_remove, destroy_button);
+            panel_config.button_list = NULL;
+        } else {
+            // Cut panel_config.button_list
+            if (to_remove->prev)
+                to_remove->prev->next = NULL;
+            to_remove->prev = NULL;
+            // Remove all elements of to_remove and to_remove itself
+            g_list_free_full(to_remove, destroy_button);
+        }
+    }
+
+    button_init_fonts();
+    for (GList *l = panel_config.button_list; l; l = l->next) {
+        Button *button = l->data;
+
+        // Set missing config options
+        if (!button->backend->bg)
+            button->backend->bg = &g_array_index(backgrounds, Background, 0);
+    }
+}
+
+void init_button_panel(void *p)
+{
+    Panel *panel = (Panel *)p;
+
+    // Make sure this is only done once if there are multiple items
+    if (panel->button_list && ((Button *)panel->button_list->data)->frontend)
+        return;
+
+    // panel->button_list is now a copy of the pointer panel_config.button_list
+    // We make it a deep copy
+    panel->button_list = g_list_copy_deep(panel_config.button_list, create_button_frontend, NULL);
+
+    load_icon_themes();
+
+    for (GList *l = panel->button_list; l; l = l->next) {
+        Button *button = l->data;
+        button->area.bg = button->backend->bg;
+        button->area.paddingx = button->backend->paddingx;
+        button->area.paddingy = button->backend->paddingy;
+        button->area.paddingxlr = button->backend->paddingxlr;
+        button->area.parent = panel;
+        button->area.panel = panel;
+        button->area._dump_geometry = button_dump_geometry;
+        button->area._compute_desired_size = button_compute_desired_size;
+        snprintf(button->area.name, sizeof(button->area.name), "Button");
+        button->area._draw_foreground = draw_button;
+        button->area.size_mode = LAYOUT_FIXED;
+        button->area._resize = resize_button;
+        button->area._get_tooltip_text = button_get_tooltip;
+        button->area._is_under_mouse = full_width_area_is_under_mouse;
+        button->area.has_mouse_press_effect =
+            panel_config.mouse_effects &&
+            (button->area.has_mouse_over_effect = button->backend->lclick_command || button->backend->mclick_command ||
+                                                  button->backend->rclick_command || button->backend->uwheel_command ||
+                                                  button->backend->dwheel_command);
+
+        button->area.resize_needed = TRUE;
+        button->area.on_screen = TRUE;
+        instantiate_area_gradients(&button->area);
+
+        button_reload_icon(button);
+    }
+}
+
+void button_init_fonts()
+{
+    for (GList *l = panel_config.button_list; l; l = l->next) {
+        Button *button = l->data;
+        if (!button->backend->font_desc)
+            button->backend->font_desc = pango_font_description_from_string(get_default_font());
+    }
+}
+
+void button_default_font_changed()
+{
+    gboolean needs_update = FALSE;
+    for (GList *l = panel_config.button_list; l; l = l->next) {
+        Button *button = l->data;
+
+        if (!button->backend->has_font) {
+            pango_font_description_free(button->backend->font_desc);
+            button->backend->font_desc = NULL;
+            needs_update = TRUE;
+        }
+    }
+    if (!needs_update)
+        return;
+
+    button_init_fonts();
+    for (int i = 0; i < num_panels; i++) {
+        for (GList *l = panels[i].button_list; l; l = l->next) {
+            Button *button = l->data;
+
+            if (!button->backend->has_font) {
+                button->area.resize_needed = TRUE;
+                schedule_redraw(&button->area);
+            }
+        }
+    }
+    schedule_panel_redraw();
+}
+
+void button_reload_icon(Button *button)
+{
+    free_icon(button->frontend->icon);
+    free_icon(button->frontend->icon_hover);
+    free_icon(button->frontend->icon_pressed);
+    button->frontend->icon = NULL;
+    button->frontend->icon_hover = NULL;
+    button->frontend->icon_pressed = NULL;
+
+    button->frontend->icon_load_size = button->frontend->iconw;
+
+    if (!button->backend->icon_name)
+        return;
+
+    char *new_icon_path = get_icon_path(icon_theme_wrapper, button->backend->icon_name, button->frontend->iconw, TRUE);
+    if (new_icon_path)
+        button->frontend->icon = load_image(new_icon_path, TRUE);
+    free(new_icon_path);
+    // On loading error, fallback to default
+    if (!button->frontend->icon) {
+        new_icon_path = get_icon_path(icon_theme_wrapper, DEFAULT_ICON, button->frontend->iconw, TRUE);
+        if (new_icon_path)
+            button->frontend->icon = load_image(new_icon_path, TRUE);
+        free(new_icon_path);
+    }
+    Imlib_Image original = button->frontend->icon;
+    button->frontend->icon = scale_icon(button->frontend->icon, button->frontend->iconw);
+    free_icon(original);
+
+    if (panel_config.mouse_effects) {
+        button->frontend->icon_hover = adjust_icon(button->frontend->icon,
+                                                   panel_config.mouse_over_alpha,
+                                                   panel_config.mouse_over_saturation,
+                                                   panel_config.mouse_over_brightness);
+        button->frontend->icon_pressed = adjust_icon(button->frontend->icon,
+                                                     panel_config.mouse_pressed_alpha,
+                                                     panel_config.mouse_pressed_saturation,
+                                                     panel_config.mouse_pressed_brightness);
+    }
+    schedule_redraw(&button->area);
+}
+
+void button_default_icon_theme_changed()
+{
+    for (int i = 0; i < num_panels; i++) {
+        for (GList *l = panels[i].button_list; l; l = l->next) {
+            Button *button = l->data;
+            button_reload_icon(button);
+        }
+    }
+    schedule_panel_redraw();
+}
+
+void cleanup_button()
+{
+    // Cleanup frontends
+    for (int i = 0; i < num_panels; i++) {
+        g_list_free_full(panels[i].button_list, destroy_button);
+        panels[i].button_list = NULL;
+    }
+
+    // Cleanup backends
+    g_list_free_full(panel_config.button_list, destroy_button);
+    panel_config.button_list = NULL;
+}
+
+int button_compute_desired_size(void *obj)
+{
+    Button *button = (Button *)obj;
+    Panel *panel = (Panel *)button->area.panel;
+    int horiz_padding = (panel_horizontal ? button->area.paddingxlr : button->area.paddingy);
+    int vert_padding = (panel_horizontal ? button->area.paddingy : button->area.paddingxlr);
+    int interior_padding = button->area.paddingx;
+
+    int icon_w, icon_h;
+    if (button->backend->icon_name) {
+        if (panel_horizontal)
+            icon_h = icon_w = button->area.height - top_bottom_border_width(&button->area) - 2 * vert_padding;
+        else
+            icon_h = icon_w = button->area.width - left_right_border_width(&button->area) - 2 * horiz_padding;
+        if (button->backend->max_icon_size) {
+            icon_w = MIN(icon_w, button->backend->max_icon_size);
+            icon_h = MIN(icon_h, button->backend->max_icon_size);
+        }
+    } else {
+        icon_h = icon_w = 0;
+    }
+
+    int txt_height_ink, txt_height, txt_width;
+    if (button->backend->text) {
+        if (panel_horizontal) {
+            get_text_size2(button->backend->font_desc,
+                           &txt_height_ink,
+                           &txt_height,
+                           &txt_width,
+                           panel->area.height,
+                           panel->area.width,
+                           button->backend->text,
+                           strlen(button->backend->text),
+                           PANGO_WRAP_WORD_CHAR,
+                           PANGO_ELLIPSIZE_NONE,
+                           FALSE);
+        } else {
+            get_text_size2(button->backend->font_desc,
+                           &txt_height_ink,
+                           &txt_height,
+                           &txt_width,
+                           panel->area.height,
+                           button->area.width - icon_w - (icon_w ? interior_padding : 0) - 2 * horiz_padding -
+                               left_right_border_width(&button->area),
+                           button->backend->text,
+                           strlen(button->backend->text),
+                           PANGO_WRAP_WORD_CHAR,
+                           PANGO_ELLIPSIZE_NONE,
+                           FALSE);
+        }
+    } else {
+        txt_height_ink = txt_height = txt_width = 0;
+    }
+
+    if (panel_horizontal) {
+        int new_size = txt_width + icon_w + (txt_width && icon_w ? interior_padding : 0);
+        new_size += 2 * horiz_padding + left_right_border_width(&button->area);
+        return new_size;
+    } else {
+        int new_size;
+        new_size = txt_height + 2 * vert_padding + top_bottom_border_width(&button->area);
+        new_size = MAX(new_size, icon_h + 2 * vert_padding + top_bottom_border_width(&button->area));
+        return new_size;
+    }
+}
+
+gboolean resize_button(void *obj)
+{
+    Button *button = (Button *)obj;
+    Panel *panel = (Panel *)button->area.panel;
+    int horiz_padding = (panel_horizontal ? button->area.paddingxlr : button->area.paddingy);
+    int vert_padding = (panel_horizontal ? button->area.paddingy : button->area.paddingxlr);
+    int interior_padding = button->area.paddingx;
+
+    int icon_w, icon_h;
+    if (button->backend->icon_name) {
+        if (panel_horizontal)
+            icon_h = icon_w = button->area.height - top_bottom_border_width(&button->area) - 2 * vert_padding;
+        else
+            icon_h = icon_w = button->area.width - left_right_border_width(&button->area) - 2 * horiz_padding;
+        if (button->backend->max_icon_size) {
+            icon_w = MIN(icon_w, button->backend->max_icon_size);
+            icon_h = MIN(icon_h, button->backend->max_icon_size);
+        }
+    } else {
+        icon_h = icon_w = 0;
+    }
+
+    button->frontend->iconw = icon_w;
+    button->frontend->iconh = icon_h;
+    if (button->frontend->icon_load_size != button->frontend->iconw)
+        button_reload_icon(button);
+
+    int txt_height_ink, txt_height, txt_width;
+    if (button->backend->text) {
+        if (panel_horizontal) {
+            get_text_size2(button->backend->font_desc,
+                           &txt_height_ink,
+                           &txt_height,
+                           &txt_width,
+                           panel->area.height,
+                           panel->area.width,
+                           button->backend->text,
+                           strlen(button->backend->text),
+                           PANGO_WRAP_WORD_CHAR,
+                           PANGO_ELLIPSIZE_NONE,
+                           FALSE);
+        } else {
+            get_text_size2(button->backend->font_desc,
+                           &txt_height_ink,
+                           &txt_height,
+                           &txt_width,
+                           panel->area.height,
+                           button->area.width - icon_w - (icon_w ? interior_padding : 0) - 2 * horiz_padding -
+                               left_right_border_width(&button->area),
+                           button->backend->text,
+                           strlen(button->backend->text),
+                           PANGO_WRAP_WORD_CHAR,
+                           PANGO_ELLIPSIZE_NONE,
+                           FALSE);
+        }
+    } else {
+        txt_height_ink = txt_height = txt_width = 0;
+    }
+
+    gboolean result = FALSE;
+    if (panel_horizontal) {
+        int new_size = txt_width + icon_w + (txt_width && icon_w ? interior_padding : 0);
+        new_size += 2 * horiz_padding + left_right_border_width(&button->area);
+        if (new_size != button->area.width) {
+            button->area.width = new_size;
+            result = TRUE;
+        }
+    } else {
+        int new_size;
+        new_size = txt_height + 2 * vert_padding + top_bottom_border_width(&button->area);
+        new_size = MAX(new_size, icon_h + 2 * vert_padding + top_bottom_border_width(&button->area));
+        if (new_size != button->area.height) {
+            button->area.height = new_size;
+            result = TRUE;
+        }
+    }
+    button->frontend->textw = txt_width;
+    button->frontend->texth = txt_height;
+    if (button->backend->centered) {
+        if (icon_w) {
+            button->frontend->icony = (button->area.height - icon_h) / 2;
+            button->frontend->iconx =
+                (button->area.width - txt_width - (txt_width ? interior_padding : 0) - icon_w) / 2;
+            button->frontend->texty = (button->area.height - txt_height) / 2;
+            button->frontend->textx = button->frontend->iconx + icon_w + interior_padding;
+        } else {
+            button->frontend->texty = (button->area.height - txt_height) / 2;
+            button->frontend->textx = (button->area.width - txt_width) / 2;
+        }
+    } else {
+        if (icon_w) {
+            button->frontend->icony = (button->area.height - icon_h) / 2;
+            button->frontend->iconx = left_border_width(&button->area) + horiz_padding;
+            button->frontend->texty = (button->area.height - txt_height) / 2;
+            button->frontend->textx = button->frontend->iconx + icon_w + interior_padding;
+        } else {
+            button->frontend->texty = (button->area.height - txt_height) / 2;
+            button->frontend->textx = left_border_width(&button->area) + horiz_padding;
+        }
+    }
+
+    schedule_redraw(&button->area);
+
+    return result;
+}
+
+void draw_button(void *obj, cairo_t *c)
+{
+    Button *button = obj;
+
+    if (button->frontend->icon) {
+        // Render icon
+        Imlib_Image image;
+        if (panel_config.mouse_effects) {
+            if (button->area.mouse_state == MOUSE_OVER)
+                image = button->frontend->icon_hover ? button->frontend->icon_hover : button->frontend->icon;
+            else if (button->area.mouse_state == MOUSE_DOWN)
+                image = button->frontend->icon_pressed ? button->frontend->icon_pressed : button->frontend->icon;
+            else
+                image = button->frontend->icon;
+        } else {
+            image = button->frontend->icon;
+        }
+
+        imlib_context_set_image(image);
+        render_image(button->area.pix, button->frontend->iconx, button->frontend->icony);
+    }
+
+    // Render text
+    if (button->backend->text) {
+        PangoLayout *layout = pango_cairo_create_layout(c);
+
+        pango_layout_set_font_description(layout, button->backend->font_desc);
+        pango_layout_set_width(layout, button->frontend->textw * PANGO_SCALE);
+        pango_layout_set_alignment(layout, button->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT);
+        pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+        pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
+        pango_layout_set_text(layout, button->backend->text, strlen(button->backend->text));
+
+        pango_cairo_update_layout(c, layout);
+        draw_text(layout,
+                  c,
+                  button->frontend->textx,
+                  button->frontend->texty,
+                  &button->backend->font_color,
+                  panel_config.font_shadow);
+
+        g_object_unref(layout);
+    }
+}
+
+void button_dump_geometry(void *obj, int indent)
+{
+    Button *button = obj;
+
+    if (button->frontend->icon) {
+        Imlib_Image tmp = imlib_context_get_image();
+        imlib_context_set_image(button->frontend->icon);
+        fprintf(stderr,
+                "%*sIcon: x = %d, y = %d, w = %d, h = %d\n",
+                indent,
+                "",
+                button->frontend->iconx,
+                button->frontend->icony,
+                imlib_image_get_width(),
+                imlib_image_get_height());
+        if (tmp)
+            imlib_context_set_image(tmp);
+    }
+    fprintf(stderr,
+            "%*sText: x = %d, y = %d, w = %d, align = %s, text = %s\n",
+            indent,
+            "",
+            button->frontend->textx,
+            button->frontend->texty,
+            button->frontend->textw,
+            button->backend->centered ? "center" : "left",
+            button->backend->text);
+}
+
+void button_action(void *obj, int mouse_button, int x, int y, Time time)
+{
+    Button *button = (Button *)obj;
+    Panel *panel = (Panel *)button->area.panel;
+    char *command = NULL;
+    switch (mouse_button) {
+    case 1:
+        command = button->backend->lclick_command;
+        break;
+    case 2:
+        command = button->backend->mclick_command;
+        break;
+    case 3:
+        command = button->backend->rclick_command;
+        break;
+    case 4:
+        command = button->backend->uwheel_command;
+        break;
+    case 5:
+        command = button->backend->dwheel_command;
+        break;
+    }
+    if (command) {
+        int aligned_x, aligned_y, aligned_x1, aligned_y1, aligned_x2, aligned_y2;
+        int panel_x1, panel_x2, panel_y1, panel_y2;
+        if (panel_horizontal) {
+            if (area_is_first(button))
+                aligned_x1 = panel->posx;
+            else
+                aligned_x1 = panel->posx + button->area.posx;
+
+            if (area_is_last(button))
+                aligned_x2 = panel->posx + panel->area.width;
+            else
+                aligned_x2 = panel->posx + button->area.posx + button->area.width;
+
+            if (area_is_first(button))
+                aligned_x = aligned_x1;
+            else if (area_is_last(button))
+                aligned_x = aligned_x2;
+            else
+                aligned_x = aligned_x1;
+
+            if (panel_position & BOTTOM)
+                aligned_y = panel->posy;
+            else
+                aligned_y = panel->posy + panel->area.height;
+
+            aligned_y1 = aligned_y2 = aligned_y;
+
+            panel_x1 = panel->posx;
+            panel_x2 = panel->posx + panel->area.width;
+            panel_y1 = panel_y2 = aligned_y;
+        } else {
+            if (area_is_first(button))
+                aligned_y1 = panel->posy;
+            else
+                aligned_y1 = panel->posy + button->area.posy;
+
+            if (area_is_last(button))
+                aligned_y2 = panel->posy + panel->area.height;
+            else
+                aligned_y2 = panel->posy + button->area.posy + button->area.height;
+
+            if (area_is_first(button))
+                aligned_y = aligned_y1;
+            else if (area_is_last(button))
+                aligned_y = aligned_y2;
+            else
+                aligned_y = aligned_y1;
+
+            if (panel_position & RIGHT)
+                aligned_x = panel->posx;
+            else
+                aligned_x = panel->posx + panel->area.width;
+
+            aligned_x1 = aligned_x2 = aligned_x;
+
+            panel_x1 = panel_x2 = aligned_x;
+            panel_y1 = panel->posy;
+            panel_y2 = panel->posy + panel->area.height;
+        }
+
+        char *full_cmd = g_strdup_printf("export TINT2_BUTTON_X=%d;"
+                                         "export TINT2_BUTTON_Y=%d;"
+                                         "export TINT2_BUTTON_W=%d;"
+                                         "export TINT2_BUTTON_H=%d;"
+                                         "export TINT2_BUTTON_ALIGNED_X=%d;"
+                                         "export TINT2_BUTTON_ALIGNED_Y=%d;"
+                                         "export TINT2_BUTTON_ALIGNED_X1=%d;"
+                                         "export TINT2_BUTTON_ALIGNED_Y1=%d;"
+                                         "export TINT2_BUTTON_ALIGNED_X2=%d;"
+                                         "export TINT2_BUTTON_ALIGNED_Y2=%d;"
+                                         "export TINT2_BUTTON_PANEL_X1=%d;"
+                                         "export TINT2_BUTTON_PANEL_Y1=%d;"
+                                         "export TINT2_BUTTON_PANEL_X2=%d;"
+                                         "export TINT2_BUTTON_PANEL_Y2=%d;"
+                                         "%s",
+                                         x,
+                                         y,
+                                         button->area.width,
+                                         button->area.height,
+                                         aligned_x,
+                                         aligned_y,
+                                         aligned_x1,
+                                         aligned_y1,
+                                         aligned_x2,
+                                         aligned_y2,
+                                         panel_x1,
+                                         panel_y1,
+                                         panel_x2,
+                                         panel_y2,
+                                         command);
+        tint_exec(full_cmd, NULL, NULL, time);
+        g_free(full_cmd);
+    }
+}
+
+char *button_get_tooltip(void *obj)
+{
+    Button *button = obj;
+
+    if (button->backend->tooltip && strlen(button->backend->tooltip) > 0)
+        return strdup(button->backend->tooltip);
+    return NULL;
+}

src/button/button.h

@@ -0,0 +1,113 @@
+#ifndef BUTTON_H
+#define BUTTON_H
+
+#include <sys/time.h>
+#include <pango/pangocairo.h>
+
+#include "area.h"
+#include "common.h"
+#include "timer.h"
+
+// Architecture:
+// Panel panel_config contains an array of Button, each storing all config options and all the state variables.
+// Only these run commands.
+//
+// Tint2 maintains an array of Panels, one for each monitor. Each stores an array of Button which was initially copied
+// from panel_config. Each works as a frontend to the corresponding Button in panel_config as backend, using the
+// backend's config and state variables.
+
+typedef struct ButtonBackend {
+    // Config:
+    char *icon_name;
+    char *text;
+    char *tooltip;
+    gboolean centered;
+    int max_icon_size;
+    gboolean has_font;
+    PangoFontDescription *font_desc;
+    Color font_color;
+    char *lclick_command;
+    char *mclick_command;
+    char *rclick_command;
+    char *uwheel_command;
+    char *dwheel_command;
+    // paddingxlr = horizontal padding left/right
+    // paddingx = horizontal padding between childs
+    int paddingxlr, paddingx, paddingy;
+    Background *bg;
+
+    // List of Button which are frontends for this backend, one for each panel
+    GList *instances;
+} ButtonBackend;
+
+typedef struct ButtonFrontend {
+    // Frontend state:
+    Imlib_Image icon;
+    Imlib_Image icon_hover;
+    Imlib_Image icon_pressed;
+    int icon_load_size;
+    int iconx;
+    int icony;
+    int iconw;
+    int iconh;
+    int textx;
+    int texty;
+    int textw;
+    int texth;
+} ButtonFrontend;
+
+typedef struct Button {
+    Area area;
+    // All elements have the backend pointer set. However only backend elements have ownership.
+    ButtonBackend *backend;
+    // Set only for frontend Button items.
+    ButtonFrontend *frontend;
+} Button;
+
+// Called before the config is read and panel_config/panels are created.
+// Afterwards, the config parsing code creates the array of Button in panel_config and populates the configuration
+// fields
+// in the backend.
+// Probably does nothing.
+void default_button();
+
+// Creates a new Button item with only the backend field set. The state is NOT initialized. The config is initialized to
+// the default values.
+// This will be used by the config code to populate its backedn config fields.
+Button *create_button();
+
+void destroy_button(void *obj);
+
+// Called after the config is read and panel_config is populated, but before panels are created.
+// Initializes the state of the backend items.
+// panel_config.panel_items is used to determine which backend items are enabled. The others should be destroyed and
+// removed from panel_config.button_list.
+void init_button();
+
+// Called after each on-screen panel is created, with a pointer to the panel.
+// Initializes the state of the frontend items. Also adds a pointer to it in backend->instances.
+// At this point the Area has not been added yet to the GUI tree, but it will be added right away.
+void init_button_panel(void *panel);
+
+// Called just before the panels are destroyed. Afterwards, tint2 exits or restarts and reads the config again.
+// Releases all frontends and then all the backends.
+// The frontend items are not freed by this function, only their members. The items are Areas which are freed in the
+// GUI element tree cleanup function (remove_area).
+void cleanup_button();
+
+// Called on draw, obj = pointer to the front-end Button item.
+void draw_button(void *obj, cairo_t *c);
+
+// Called on resize, obj = pointer to the front-end Button item.
+// Returns 1 if the new size is different than the previous size.
+gboolean resize_button(void *obj);
+
+// Called on mouse click event.
+void button_action(void *obj, int button, int x, int y, Time time);
+
+void button_default_font_changed();
+void button_default_icon_theme_changed();
+
+void button_reload_icon(Button *button);
+
+#endif // BUTTON_H

src/clock/clock.c

@@ -55,309 +55,363 @@ static timeout *clock_timeout;
 
 void clock_init_fonts();
 char *clock_get_tooltip(void *obj);
+int clock_compute_desired_size(void *obj);
+void clock_dump_geometry(void *obj, int indent);
 
 void default_clock()
 {
-	clock_enabled = 0;
+    clock_enabled = 0;
-	clock_timeout = NULL;
+    clock_timeout = NULL;
-	time1_format = NULL;
+    time1_format = NULL;
-	time1_timezone = NULL;
+    time1_timezone = NULL;
-	time2_format = NULL;
+    time2_format = NULL;
-	time2_timezone = NULL;
+    time2_timezone = NULL;
-	time_tooltip_format = NULL;
+    time_tooltip_format = NULL;
-	time_tooltip_timezone = NULL;
+    time_tooltip_timezone = NULL;
-	clock_lclick_command = NULL;
+    clock_lclick_command = NULL;
-	clock_mclick_command = NULL;
+    clock_mclick_command = NULL;
-	clock_rclick_command = NULL;
+    clock_rclick_command = NULL;
-	clock_uwheel_command = NULL;
+    clock_uwheel_command = NULL;
-	clock_dwheel_command = NULL;
+    clock_dwheel_command = NULL;
-	time1_has_font = FALSE;
+    time1_has_font = FALSE;
-	time1_font_desc = NULL;
+    time1_font_desc = NULL;
-	time2_has_font = FALSE;
+    time2_has_font = FALSE;
-	time2_font_desc = NULL;
+    time2_font_desc = NULL;
 }
 
 void cleanup_clock()
 {
-	pango_font_description_free(time1_font_desc);
+    pango_font_description_free(time1_font_desc);
-	time1_font_desc = NULL;
+    time1_font_desc = NULL;
-	pango_font_description_free(time2_font_desc);
+    pango_font_description_free(time2_font_desc);
-	time2_font_desc = NULL;
+    time2_font_desc = NULL;
-	free(time1_format);
+    free(time1_format);
-	time1_format = NULL;
+    time1_format = NULL;
-	free(time2_format);
+    free(time2_format);
-	time2_format = NULL;
+    time2_format = NULL;
-	free(time_tooltip_format);
+    free(time_tooltip_format);
-	time_tooltip_format = NULL;
+    time_tooltip_format = NULL;
-	free(time1_timezone);
+    free(time1_timezone);
-	time1_timezone = NULL;
+    time1_timezone = NULL;
-	free(time2_timezone);
+    free(time2_timezone);
-	time2_timezone = NULL;
+    time2_timezone = NULL;
-	free(time_tooltip_timezone);
+    free(time_tooltip_timezone);
-	time_tooltip_timezone = NULL;
+    time_tooltip_timezone = NULL;
-	free(clock_lclick_command);
+    free(clock_lclick_command);
-	clock_lclick_command = NULL;
+    clock_lclick_command = NULL;
-	free(clock_mclick_command);
+    free(clock_mclick_command);
-	clock_mclick_command = NULL;
+    clock_mclick_command = NULL;
-	free(clock_rclick_command);
+    free(clock_rclick_command);
-	clock_rclick_command = NULL;
+    clock_rclick_command = NULL;
-	free(clock_uwheel_command);
+    free(clock_uwheel_command);
-	clock_uwheel_command = NULL;
+    clock_uwheel_command = NULL;
-	free(clock_dwheel_command);
+    free(clock_dwheel_command);
-	clock_dwheel_command = NULL;
+    clock_dwheel_command = NULL;
-	stop_timeout(clock_timeout);
+    stop_timeout(clock_timeout);
-	clock_timeout = NULL;
+    clock_timeout = NULL;
 }
 
 void update_clocks_sec(void *arg)
 {
-	gettimeofday(&time_clock, 0);
+    gettimeofday(&time_clock, 0);
-	if (time1_format) {
+    if (time1_format) {
-		for (int i = 0; i < num_panels; i++)
+        for (int i = 0; i < num_panels; i++)
-			panels[i].clock.area.resize_needed = 1;
+            panels[i].clock.area.resize_needed = 1;
-	}
+    }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 }
 
 void update_clocks_min(void *arg)
 {
-	// remember old_sec because after suspend/hibernate the clock should be updated directly, and not
+    // remember old_sec because after suspend/hibernate the clock should be updated directly, and not
-	// on next minute change
+    // on next minute change
-	time_t old_sec = time_clock.tv_sec;
+    time_t old_sec = time_clock.tv_sec;
-	gettimeofday(&time_clock, 0);
+    gettimeofday(&time_clock, 0);
-	if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) {
+    if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) {
-		if (time1_format) {
+        if (time1_format) {
-			for (int i = 0; i < num_panels; i++)
+            for (int i = 0; i < num_panels; i++)
-				panels[i].clock.area.resize_needed = 1;
+                panels[i].clock.area.resize_needed = 1;
-		}
+        }
-		panel_refresh = TRUE;
+        schedule_panel_redraw();
-	}
+    }
 }
 
 struct tm *clock_gettime_for_tz(const char *timezone)
 {
-	if (timezone) {
+    if (timezone) {
-		const char *old_tz = getenv("TZ");
+        const char *old_tz = getenv("TZ");
-		setenv("TZ", timezone, 1);
+        setenv("TZ", timezone, 1);
-		struct tm *result = localtime(&time_clock.tv_sec);
+        struct tm *result = localtime(&time_clock.tv_sec);
-		if (old_tz)
+        if (old_tz)
-			setenv("TZ", old_tz, 1);
+            setenv("TZ", old_tz, 1);
-		else
+        else
-			unsetenv("TZ");
+            unsetenv("TZ");
-		return result;
+        return result;
-	} else {
+    } else {
-		return localtime(&time_clock.tv_sec);
+        return localtime(&time_clock.tv_sec);
-	}
+    }
 }
 
 gboolean time_format_needs_sec_ticks(char *time_format)
 {
-	if (!time_format)
+    if (!time_format)
-		return FALSE;
+        return FALSE;
-	if (strchr(time_format, 'S') || strchr(time_format, 'T') || strchr(time_format, 'r'))
+    if (strchr(time_format, 'S') || strchr(time_format, 'T') || strchr(time_format, 'r'))
-		return TRUE;
+        return TRUE;
-	return FALSE;
+    return FALSE;
 }
 
 void init_clock()
 {
-	if (!clock_timeout) {
-		if (time_format_needs_sec_ticks(time1_format) || time_format_needs_sec_ticks(time2_format)) {
-			clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0, &clock_timeout);
-		} else {
-			clock_timeout = add_timeout(10, 1000, update_clocks_min, 0, &clock_timeout);
-		}
-	}
 }
 
 void init_clock_panel(void *p)
 {
-	Panel *panel = (Panel *)p;
+    Panel *panel = (Panel *)p;
-	Clock *clock = &panel->clock;
+    Clock *clock = &panel->clock;
 
-	if (!clock->area.bg)
+    if (!clock_timeout) {
-		clock->area.bg = &g_array_index(backgrounds, Background, 0);
+        if (time_format_needs_sec_ticks(time1_format) || time_format_needs_sec_ticks(time2_format)) {
-	clock_init_fonts();
+            clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0, &clock_timeout);
-	clock->area.parent = p;
+        } else {
-	clock->area.panel = p;
+            clock_timeout = add_timeout(10, 1000, update_clocks_min, 0, &clock_timeout);
-	clock->area.has_mouse_press_effect = clock->area.has_mouse_over_effect =
+        }
-			panel_config.mouse_effects && (clock_lclick_command || clock_mclick_command || clock_rclick_command || clock_uwheel_command ||
+    }
-										   clock_dwheel_command);
-	clock->area._draw_foreground = draw_clock;
-	clock->area.size_mode = LAYOUT_FIXED;
-	clock->area._resize = resize_clock;
-	// check consistency
-	if (!time1_format)
-		return;
 
-	clock->area.resize_needed = 1;
+    if (!clock->area.bg)
-	clock->area.on_screen = TRUE;
+        clock->area.bg = &g_array_index(backgrounds, Background, 0);
+    clock_init_fonts();
+    clock->area.parent = p;
+    clock->area.panel = p;
+    snprintf(clock->area.name, sizeof(clock->area.name), "Clock");
+    clock->area._is_under_mouse = full_width_area_is_under_mouse;
+    clock->area.has_mouse_press_effect = clock->area.has_mouse_over_effect =
+        panel_config.mouse_effects && (clock_lclick_command || clock_mclick_command || clock_rclick_command ||
+                                       clock_uwheel_command || clock_dwheel_command);
+    clock->area._draw_foreground = draw_clock;
+    clock->area.size_mode = LAYOUT_FIXED;
+    clock->area._resize = resize_clock;
+    clock->area._compute_desired_size = clock_compute_desired_size;
+    clock->area._dump_geometry = clock_dump_geometry;
+    // check consistency
+    if (!time1_format)
+        return;
 
-	if (time_tooltip_format) {
+    clock->area.resize_needed = 1;
-		clock->area._get_tooltip_text = clock_get_tooltip;
+    clock->area.on_screen = TRUE;
-		strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
+    instantiate_area_gradients(&clock->area);
-	}
+
+    if (time_tooltip_format) {
+        clock->area._get_tooltip_text = clock_get_tooltip;
+        strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
+    }
 }
 
 void clock_init_fonts()
 {
-	if (!time1_font_desc) {
+    if (!time1_font_desc) {
-		time1_font_desc = pango_font_description_from_string(get_default_font());
+        time1_font_desc = pango_font_description_from_string(get_default_font());
-		pango_font_description_set_weight(time1_font_desc, PANGO_WEIGHT_BOLD);
+        pango_font_description_set_weight(time1_font_desc, PANGO_WEIGHT_BOLD);
-		pango_font_description_set_size(time1_font_desc,
+        pango_font_description_set_size(time1_font_desc, pango_font_description_get_size(time1_font_desc));
-		                                pango_font_description_get_size(time1_font_desc));
+    }
-	}
+    if (!time2_font_desc) {
-	if (!time2_font_desc) {
+        time2_font_desc = pango_font_description_from_string(get_default_font());
-		time2_font_desc = pango_font_description_from_string(get_default_font());
+        pango_font_description_set_size(time2_font_desc,
-		pango_font_description_set_size(time2_font_desc,
+                                        pango_font_description_get_size(time2_font_desc) - PANGO_SCALE);
-		                                pango_font_description_get_size(time2_font_desc) - PANGO_SCALE);
+    }
-	}
 }
 
 void clock_default_font_changed()
 {
-	if (!clock_enabled)
+    if (!clock_enabled)
-		return;
+        return;
-	if (time1_has_font && time2_has_font)
+    if (time1_has_font && time2_has_font)
-		return;
+        return;
-	if (!time1_has_font) {
+    if (!time1_has_font) {
-		pango_font_description_free(time1_font_desc);
+        pango_font_description_free(time1_font_desc);
-		time1_font_desc = NULL;
+        time1_font_desc = NULL;
-	}
+    }
-	if (!time2_has_font) {
+    if (!time2_has_font) {
-		pango_font_description_free(time2_font_desc);
+        pango_font_description_free(time2_font_desc);
-		time2_font_desc = NULL;
+        time2_font_desc = NULL;
-	}
+    }
-	clock_init_fonts();
+    clock_init_fonts();
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		panels[i].clock.area.resize_needed = TRUE;
+        panels[i].clock.area.resize_needed = TRUE;
-		schedule_redraw(&panels[i].clock.area);
+        schedule_redraw(&panels[i].clock.area);
-	}
+    }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
+}
+
+void clock_compute_text_geometry(Panel *panel,
+                                 int *time_height_ink,
+                                 int *time_height,
+                                 int *time_width,
+                                 int *date_height_ink,
+                                 int *date_height,
+                                 int *date_width)
+{
+    *date_height = *date_width = 0;
+    strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
+    get_text_size2(time1_font_desc,
+                   time_height_ink,
+                   time_height,
+                   time_width,
+                   panel->area.height,
+                   panel->area.width,
+                   buf_time,
+                   strlen(buf_time),
+                   PANGO_WRAP_WORD_CHAR,
+                   PANGO_ELLIPSIZE_NONE,
+                   FALSE);
+    if (time2_format) {
+        strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
+        get_text_size2(time2_font_desc,
+                       date_height_ink,
+                       date_height,
+                       date_width,
+                       panel->area.height,
+                       panel->area.width,
+                       buf_date,
+                       strlen(buf_date),
+                       PANGO_WRAP_WORD_CHAR,
+                       PANGO_ELLIPSIZE_NONE,
+                       FALSE);
+    }
+}
+
+int clock_compute_desired_size(void *obj)
+{
+    Clock *clock = (Clock *)obj;
+    Panel *panel = (Panel *)clock->area.panel;
+    int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
+    clock_compute_text_geometry(panel,
+                                &time_height_ink,
+                                &time_height,
+                                &time_width,
+                                &date_height_ink,
+                                &date_height,
+                                &date_width);
+
+    if (panel_horizontal) {
+        int new_size = (time_width > date_width) ? time_width : date_width;
+        new_size += 2 * clock->area.paddingxlr + left_right_border_width(&clock->area);
+        return new_size;
+    } else {
+        int new_size = time_height + date_height + 2 * clock->area.paddingxlr + top_bottom_border_width(&clock->area);
+        return new_size;
+    }
 }
 
 gboolean resize_clock(void *obj)
 {
-	Clock *clock = obj;
+    Clock *clock = (Clock *)obj;
-	Panel *panel = clock->area.panel;
+    Panel *panel = (Panel *)clock->area.panel;
-	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
+    gboolean result = FALSE;
-	gboolean result = FALSE;
 
-	schedule_redraw(&clock->area);
+    schedule_redraw(&clock->area);
 
-	date_height = date_width = 0;
+    int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
-	strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
+    clock_compute_text_geometry(panel,
-	get_text_size2(time1_font_desc,
+                                &time_height_ink,
-				   &time_height_ink,
+                                &time_height,
-				   &time_height,
+                                &time_width,
-				   &time_width,
+                                &date_height_ink,
-				   panel->area.height,
+                                &date_height,
-				   panel->area.width,
+                                &date_width);
-				   buf_time,
-				   strlen(buf_time),
-				   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE,
-				   FALSE);
-	if (time2_format) {
-		strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
-		get_text_size2(time2_font_desc,
-					   &date_height_ink,
-					   &date_height,
-					   &date_width,
-					   panel->area.height,
-					   panel->area.width,
-					   buf_date,
-					   strlen(buf_date),
-					   PANGO_WRAP_WORD_CHAR,
-					   PANGO_ELLIPSIZE_NONE,
-					   FALSE);
-	}
 
-	if (panel_horizontal) {
+    int new_size = clock_compute_desired_size(clock);
-		int new_size = (time_width > date_width) ? time_width : date_width;
+    if (panel_horizontal) {
-		new_size += (2 * clock->area.paddingxlr) + (2 * clock->area.bg->border.width);
+        if (new_size > clock->area.width || new_size < (clock->area.width - 6)) {
-		if (new_size > clock->area.width || new_size < (clock->area.width - 6)) {
+            // we try to limit the number of resizes
-			// we try to limit the number of resizes
+            clock->area.width = new_size + 1;
-			clock->area.width = new_size + 1;
+            clock->time1_posy = (clock->area.height - time_height) / 2;
-			clock->time1_posy = (clock->area.height - time_height) / 2;
+            if (time2_format) {
-			if (time2_format) {
+                clock->time1_posy -= (date_height) / 2;
-				clock->time1_posy -= (date_height) / 2;
+                clock->time2_posy = clock->time1_posy + time_height;
-				clock->time2_posy = clock->time1_posy + time_height;
+            }
-			}
+            result = TRUE;
-			result = TRUE;
+        }
-		}
+    } else {
-	} else {
+        if (new_size != clock->area.height) {
-		int new_size = time_height + date_height + (2 * (clock->area.paddingxlr + clock->area.bg->border.width));
+            // we try to limit the number of resizes
-		if (new_size != clock->area.height) {
+            clock->area.height = new_size;
-			// we try to limit the number of resizes
+            clock->time1_posy = (clock->area.height - time_height) / 2;
-			clock->area.height = new_size;
+            if (time2_format) {
-			clock->time1_posy = (clock->area.height - time_height) / 2;
+                clock->time1_posy -= (date_height) / 2;
-			if (time2_format) {
+                clock->time2_posy = clock->time1_posy + time_height;
-				clock->time1_posy -= (date_height) / 2;
+            }
-				clock->time2_posy = clock->time1_posy + time_height;
+            result = TRUE;
-			}
+        }
-			result = TRUE;
+    }
-		}
-	}
 
-	return result;
+    return result;
 }
 
 void draw_clock(void *obj, cairo_t *c)
 {
-	Clock *clock = obj;
+    Clock *clock = obj;
-	PangoLayout *layout = pango_cairo_create_layout(c);
+    PangoLayout *layout = pango_cairo_create_layout(c);
 
-	pango_layout_set_font_description(layout, time1_font_desc);
+    pango_layout_set_font_description(layout, time1_font_desc);
-	pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
+    pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
-	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+    pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	pango_layout_set_text(layout, buf_time, strlen(buf_time));
+    pango_layout_set_text(layout, buf_time, strlen(buf_time));
 
-	cairo_set_source_rgba(c, clock->font.rgb[0], clock->font.rgb[1], clock->font.rgb[2], clock->font.alpha);
+    cairo_set_source_rgba(c, clock->font.rgb[0], clock->font.rgb[1], clock->font.rgb[2], clock->font.alpha);
 
-	pango_cairo_update_layout(c, layout);
+    pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, clock->time1_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
+    draw_text(layout, c, 0, clock->time1_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
 
-	if (time2_format) {
+    if (time2_format) {
-		pango_layout_set_font_description(layout, time2_font_desc);
+        pango_layout_set_font_description(layout, time2_font_desc);
-		pango_layout_set_indent(layout, 0);
+        pango_layout_set_indent(layout, 0);
-		pango_layout_set_text(layout, buf_date, strlen(buf_date));
+        pango_layout_set_text(layout, buf_date, strlen(buf_date));
-		pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
+        pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
 
-		pango_cairo_update_layout(c, layout);
+        pango_cairo_update_layout(c, layout);
-		draw_text(layout, c, 0, clock->time2_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
+        draw_text(layout, c, 0, clock->time2_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
-	}
+    }
 
-	g_object_unref(layout);
+    g_object_unref(layout);
+}
+
+void clock_dump_geometry(void *obj, int indent)
+{
+    Clock *clock = (Clock *)obj;
+    fprintf(stderr, "%*sText 1: y = %d, text = %s\n", indent, "", clock->time1_posy, buf_time);
+    if (time2_format) {
+        fprintf(stderr, "%*sText 2: y = %d, text = %s\n", indent, "", clock->time2_posy, buf_date);
+    }
 }
 
 char *clock_get_tooltip(void *obj)
 {
-	strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
+    strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
-	return strdup(buf_tooltip);
+    return strdup(buf_tooltip);
 }
 
-void clock_action(int button)
+void clock_action(int button, Time time)
 {
-	char *command = NULL;
+    char *command = NULL;
-	switch (button) {
+    switch (button) {
-	case 1:
+    case 1:
-		command = clock_lclick_command;
+        command = clock_lclick_command;
-		break;
+        break;
-	case 2:
+    case 2:
-		command = clock_mclick_command;
+        command = clock_mclick_command;
-		break;
+        break;
-	case 3:
+    case 3:
-		command = clock_rclick_command;
+        command = clock_rclick_command;
-		break;
+        break;
-	case 4:
+    case 4:
-		command = clock_uwheel_command;
+        command = clock_uwheel_command;
-		break;
+        break;
-	case 5:
+    case 5:
-		command = clock_dwheel_command;
+        command = clock_dwheel_command;
-		break;
+        break;
-	}
+    }
-	tint_exec(command);
+    tint_exec(command, NULL, NULL, time);
 }

src/clock/clock.h

@@ -14,12 +14,12 @@
 #include "area.h"
 
 typedef struct Clock {
-	// always start with area
+    // always start with area
-	Area area;
+    Area area;
 
-	Color font;
+    Color font;
-	int time1_posy;
+    int time1_posy;
-	int time2_posy;
+    int time2_posy;
 } Clock;
 
 extern char *time1_format;
@@ -54,6 +54,6 @@ void draw_clock(void *obj, cairo_t *c);
 
 gboolean resize_clock(void *obj);
 
-void clock_action(int button);
+void clock_action(int button, Time time);
 
 #endif

src/execplugin/execplugin.h

@@ -17,80 +17,80 @@
 // backend's config and state variables.
 
 typedef struct ExecpBackend {
-	// Config:
+    // Config:
-	// Command to execute at a specified interval
+    // Command to execute at a specified interval
-	char *command;
+    char *command;
-	// Interval in seconds
+    // Interval in seconds
-	int interval;
+    int interval;
-	// 1 if first line of output is an icon path
+    // 1 if first line of output is an icon path
-	gboolean has_icon;
+    gboolean has_icon;
-	gboolean cache_icon;
+    gboolean cache_icon;
-	int icon_w;
+    int icon_w;
-	int icon_h;
+    int icon_h;
-	char *tooltip;
+    char *tooltip;
-	gboolean centered;
+    gboolean centered;
-	gboolean has_font;
+    gboolean has_font;
-	PangoFontDescription *font_desc;
+    PangoFontDescription *font_desc;
-	Color font_color;
+    Color font_color;
-	int continuous;
+    int continuous;
-	gboolean has_markup;
+    gboolean has_markup;
-	char *lclick_command;
+    char *lclick_command;
-	char *mclick_command;
+    char *mclick_command;
-	char *rclick_command;
+    char *rclick_command;
-	char *uwheel_command;
+    char *uwheel_command;
-	char *dwheel_command;
+    char *dwheel_command;
-	// paddingxlr = horizontal padding left/right
+    // paddingxlr = horizontal padding left/right
-	// paddingx = horizontal padding between childs
+    // paddingx = horizontal padding between childs
-	int paddingxlr, paddingx, paddingy;
+    int paddingxlr, paddingx, paddingy;
-	Background *bg;
+    Background *bg;
 
-	// Backend state:
+    // Backend state:
-	timeout *timer;
+    timeout *timer;
-	int child_pipe;
+    int child_pipe;
-	pid_t child;
+    pid_t child;
 
-	// Command output buffer
+    // Command output buffer
-	char *buf_output;
+    char *buf_output;
-	int buf_length;
+    int buf_length;
-	int buf_capacity;
+    int buf_capacity;
 
-	// Text extracted from the output buffer
+    // Text extracted from the output buffer
-	char *text;
+    char *text;
-	// Icon path extracted from the output buffer
+    // Icon path extracted from the output buffer
-	char *icon_path;
+    char *icon_path;
-	Imlib_Image icon;
+    Imlib_Image icon;
-	char tooltip_text[512];
+    char tooltip_text[512];
 
-	// The time the last command was started
+    // The time the last command was started
-	time_t last_update_start_time;
+    time_t last_update_start_time;
-	// The time the last output was obtained
+    // The time the last output was obtained
-	time_t last_update_finish_time;
+    time_t last_update_finish_time;
-	// The time it took to execute last command
+    // The time it took to execute last command
-	time_t last_update_duration;
+    time_t last_update_duration;
 
-	// List of Execp which are frontends for this backend, one for each panel
+    // List of Execp which are frontends for this backend, one for each panel
-	GList *instances;
+    GList *instances;
+    GTree *cmd_pids;
 } ExecpBackend;
 
 typedef struct ExecpFrontend {
-	// Frontend state:
+    // Frontend state:
-	int iconx;
+    int iconx;
-	int icony;
+    int icony;
-	int textx;
+    int textx;
-	int texty;
+    int texty;
-	int textw;
+    int textw;
-	int texth;
+    int texth;
 } ExecpFrontend;
 
 typedef struct Execp {
-	Area area;
+    Area area;
-	// All elements have the backend pointer set. However only backend elements have ownership.
+    // All elements have the backend pointer set. However only backend elements have ownership.
-	ExecpBackend *backend;
+    ExecpBackend *backend;
-	// Set only for frontend Execp items.
+    // Set only for frontend Execp items.
-	ExecpFrontend *frontend;
+    ExecpFrontend *frontend;
 } Execp;
 
-
 // Called before the config is read and panel_config/panels are created.
 // Afterwards, the config parsing code creates the array of Execp in panel_config and populates the configuration fields
 // in the backend.
@@ -121,7 +121,6 @@ void init_execp_panel(void *panel);
 // GUI element tree cleanup function (remove_area).
 void cleanup_execp();
 
-
 // Called on draw, obj = pointer to the front-end Execp item.
 void draw_execp(void *obj, cairo_t *c);
 
@@ -130,7 +129,9 @@ void draw_execp(void *obj, cairo_t *c);
 gboolean resize_execp(void *obj);
 
 // Called on mouse click event.
-void execp_action(void *obj, int button);
+void execp_action(void *obj, int button, int x, int y, Time time);
+
+void execp_cmd_completed(Execp *obj, pid_t pid);
 
 // Called to check if new output from the command can be read.
 // No command might be running.

src/freespace/freespace.c

@@ -30,64 +30,97 @@
 #include "freespace.h"
 #include "common.h"
 
+int freespace_area_compute_desired_size(void *obj);
+
 void init_freespace_panel(void *p)
 {
-	Panel *panel = (Panel *)p;
+    Panel *panel = (Panel *)p;
-	FreeSpace *freespace = &panel->freespace;
 
-	if (!freespace->area.bg)
+    // Make sure this is only done once if there are multiple items
-		freespace->area.bg = &g_array_index(backgrounds, Background, 0);
+    if (panel->freespace_list)
-	freespace->area.parent = p;
+        return;
-	freespace->area.panel = p;
+
-	freespace->area.size_mode = LAYOUT_FIXED;
+    for (size_t k = 0; k < strlen(panel_items_order); k++) {
-	freespace->area.resize_needed = 1;
+        if (panel_items_order[k] == 'F') {
-	freespace->area.on_screen = TRUE;
+            FreeSpace *freespace = (FreeSpace *)calloc(1, sizeof(FreeSpace));
-	freespace->area._resize = resize_freespace;
+            panel->freespace_list = g_list_append(panel->freespace_list, freespace);
+            if (!freespace->area.bg)
+                freespace->area.bg = &g_array_index(backgrounds, Background, 0);
+            freespace->area.parent = p;
+            freespace->area.panel = p;
+            snprintf(freespace->area.name, sizeof(freespace->area.name), "Freespace");
+            freespace->area.size_mode = LAYOUT_FIXED;
+            freespace->area.resize_needed = 1;
+            freespace->area.on_screen = TRUE;
+            freespace->area._resize = resize_freespace;
+            freespace->area._compute_desired_size = freespace_area_compute_desired_size;
+        }
+    }
+}
+
+void cleanup_freespace(Panel *panel)
+{
+    if (panel->freespace_list)
+        g_list_free_full(panel->freespace_list, free);
+    panel->freespace_list = NULL;
 }
 
 int freespace_get_max_size(Panel *p)
 {
-	// Get space used by every element except the freespace
+    if (panel_shrink)
-	int size = 0;
+        return 0;
-	for (GList *walk = p->area.children; walk; walk = g_list_next(walk)) {
+    // Get space used by every element except the freespace
-		Area *a = (Area *)walk->data;
+    int size = 0;
+    int spacers = 0;
+    for (GList *walk = p->area.children; walk; walk = g_list_next(walk)) {
+        Area *a = (Area *)walk->data;
 
-		if (a->_resize == resize_freespace || !a->on_screen)
+        if (!a->on_screen)
-			continue;
+            continue;
+        if (a->_resize == resize_freespace) {
+            spacers++;
+            continue;
+        }
 
-		if (panel_horizontal)
+        if (panel_horizontal)
-			size += a->width + (a->bg->border.width * 2) + p->area.paddingx;
+            size += a->width + p->area.paddingx;
-		else
+        else
-			size += a->height + (a->bg->border.width * 2) + p->area.paddingy;
+            size += a->height + p->area.paddingy;
-	}
+    }
 
-	if (panel_horizontal)
+    if (panel_horizontal)
-		size = p->area.width - size - (p->area.bg->border.width * 2) - p->area.paddingxlr;
+        size = p->area.width - size - left_right_border_width(&p->area) - p->area.paddingxlr;
-	else
+    else
-		size = p->area.height - size - (p->area.bg->border.width * 2) - p->area.paddingxlr;
+        size = p->area.height - size - top_bottom_border_width(&p->area) - p->area.paddingxlr;
 
-	return size;
+    return size / spacers;
+}
+
+int freespace_area_compute_desired_size(void *obj)
+{
+    FreeSpace *freespace = (FreeSpace *)obj;
+    return freespace_get_max_size((Panel *)freespace->area.panel);
 }
 
 gboolean resize_freespace(void *obj)
 {
-	FreeSpace *freespace = (FreeSpace *)obj;
+    FreeSpace *freespace = (FreeSpace *)obj;
-	Panel *panel = (Panel *)freespace->area.panel;
+    Panel *panel = (Panel *)freespace->area.panel;
-	if (!freespace->area.on_screen)
+    if (!freespace->area.on_screen)
-		return FALSE;
+        return FALSE;
 
-	int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
+    int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
-	int size = freespace_get_max_size(panel);
+    int size = freespace_get_max_size(panel);
-	if (old_size == size)
+    if (old_size == size)
-		return FALSE;
+        return FALSE;
 
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		freespace->area.width = size;
+        freespace->area.width = size;
-	} else {
+    } else {
-		freespace->area.height = size;
+        freespace->area.height = size;
-	}
+    }
 
-	schedule_redraw(&freespace->area);
+    schedule_redraw(&freespace->area);
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
-	return TRUE;
+    return TRUE;
 }

src/freespace/freespace.h

@@ -9,10 +9,12 @@
 #include "area.h"
 
 typedef struct FreeSpace {
-	Area area;
+    Area area;
 } FreeSpace;
 
-void cleanup_freespace();
+struct Panel;
+
+void cleanup_freespace(struct Panel *panel);
 void init_freespace_panel(void *panel);
 
 gboolean resize_freespace(void *obj);

src/launcher/apps-common.c

@@ -19,178 +19,291 @@
 /* http://standards.freedesktop.org/desktop-entry-spec/ */
 
 #include "apps-common.h"
+#include "common.h"
+#include "strnatcmp.h"
 
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
+
+static gint compare_strings(gconstpointer a, gconstpointer b)
+{
+    return strnatcasecmp((const char *)a, (const char *)b);
+}
 
 int parse_dektop_line(char *line, char **key, char **value)
 {
-	char *p;
+    char *p;
-	int found = 0;
+    int found = 0;
-	*key = line;
+    *key = line;
-	for (p = line; *p; p++) {
+    for (p = line; *p; p++) {
-		if (*p == '=') {
+        if (*p == '=') {
-			*value = p + 1;
+            *value = p + 1;
-			*p = 0;
+            *p = 0;
-			found = 1;
+            found = 1;
-			break;
+            break;
-		}
+        }
-	}
+    }
-	if (!found)
+    if (!found)
-		return 0;
+        return 0;
-	if (found && (strlen(*key) == 0 || strlen(*value) == 0))
+    if (found && (strlen(*key) == 0 || strlen(*value) == 0))
-		return 0;
+        return 0;
-	return 1;
+    return 1;
 }
 
 void expand_exec(DesktopEntry *entry, const char *path)
 {
-	// Expand % in exec
+    // Expand % in exec
-	// %i -> --icon Icon
+    // %i -> --icon Icon
-	// %c -> Name
+    // %c -> Name
-	// %k -> path
+    // %k -> path
-	if (entry->exec) {
+    if (entry->exec) {
-		char *exec2 = calloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) +
+        char *exec2 = calloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) +
-							 (entry->icon ? strlen(entry->icon) : 1) + 100,
+                                 (entry->icon ? strlen(entry->icon) : 1) + 100,
-							 1);
+                             1);
-		char *p, *q;
+        char *p, *q;
-		// p will never point to an escaped char
+        // p will never point to an escaped char
-		for (p = entry->exec, q = exec2; *p; p++, q++) {
+        for (p = entry->exec, q = exec2; *p; p++, q++) {
-			*q = *p; // Copy
+            *q = *p; // Copy
-			if (*p == '\\') {
+            if (*p == '\\') {
-				p++, q++;
+                p++, q++;
-				// Copy the escaped char
+                // Copy the escaped char
-				if (*p == '%') // For % we delete the backslash, i.e. write % over it
+                if (*p == '%') // For % we delete the backslash, i.e. write % over it
-					q--;
+                    q--;
-				*q = *p;
+                *q = *p;
-				if (!*p)
+                if (!*p)
-					break;
+                    break;
-				continue;
+                continue;
-			}
+            }
-			if (*p == '%') {
+            if (*p == '%') {
-				p++;
+                p++;
-				if (!*p)
+                if (!*p)
-					break;
+                    break;
-				if (*p == 'i' && entry->icon != NULL) {
+                if (*p == 'i' && entry->icon != NULL) {
-					sprintf(q, "--icon '%s'", entry->icon);
+                    sprintf(q, "--icon '%s'", entry->icon);
-					q += strlen("--icon ''");
+                    q += strlen("--icon ''");
-					q += strlen(entry->icon);
+                    q += strlen(entry->icon);
-					q--; // To balance the q++ in the for
+                    q--; // To balance the q++ in the for
-				} else if (*p == 'c' && entry->name != NULL) {
+                } else if (*p == 'c' && entry->name != NULL) {
-					sprintf(q, "'%s'", entry->name);
+                    sprintf(q, "'%s'", entry->name);
-					q += strlen("''");
+                    q += strlen("''");
-					q += strlen(entry->name);
+                    q += strlen(entry->name);
-					q--; // To balance the q++ in the for
+                    q--; // To balance the q++ in the for
-				} else if (*p == 'c') {
+                } else if (*p == 'c') {
-					sprintf(q, "'%s'", path);
+                    sprintf(q, "'%s'", path);
-					q += strlen("''");
+                    q += strlen("''");
-					q += strlen(path);
+                    q += strlen(path);
-					q--; // To balance the q++ in the for
+                    q--; // To balance the q++ in the for
-				} else {
+                } else {
-					// We don't care about other expansions
+                    // We don't care about other expansions
-					q--; // Delete the last % from q
+                    q--; // Delete the last % from q
-				}
+                }
-				continue;
+                continue;
-			}
+            }
-		}
+        }
-		*q = '\0';
+        *q = '\0';
-		free(entry->exec);
+        free(entry->exec);
-		entry->exec = exec2;
+        entry->exec = exec2;
-	}
+    }
 }
 
-int read_desktop_file(const char *path, DesktopEntry *entry)
+gboolean read_desktop_file_full_path(const char *path, DesktopEntry *entry)
 {
-	FILE *fp;
+    entry->name = entry->generic_name = entry->icon = entry->exec = entry->cwd = NULL;
-	char *line = NULL;
+    entry->hidden_from_menus = FALSE;
-	size_t line_size;
-	char *key, *value;
-	int i;
 
-	entry->path = strdup(path);
+    FILE *fp = fopen(path, "rt");
-	entry->name = entry->icon = entry->exec = NULL;
+    if (fp == NULL) {
+        fprintf(stderr, "Could not open file %s\n", path);
+        return FALSE;
+    }
 
-	if ((fp = fopen(path, "rt")) == NULL) {
+    const gchar **languages = (const gchar **)g_get_language_names();
-		fprintf(stderr, "Could not open file %s\n", path);
+    // lang_index is the index of the language for the best Name key in the language vector
-		return 0;
+    // lang_index_default is a constant that encodes the Name key without a language
-	}
+    int lang_index_default = 1;
-
-  const gchar **languages = (const gchar **)g_get_language_names();
-	// lang_index is the index of the language for the best Name key in the language vector
-	// lang_index_default is a constant that encodes the Name key without a language
-	int lang_index, lang_index_default;
 #define LANG_DBG 0
-	if (LANG_DBG)
+    if (LANG_DBG)
-		printf("Languages:");
+        printf("Languages:");
-	for (i = 0; languages[i]; i++) {
+    for (int i = 0; languages[i]; i++) {
-		if (LANG_DBG)
+        lang_index_default = i + 1;
-			printf(" %s", languages[i]);
+        if (LANG_DBG)
-	}
+            printf(" %s", languages[i]);
-	if (LANG_DBG)
+    }
-		printf("\n");
+    if (LANG_DBG)
-	lang_index_default = i;
+        printf("\n");
-	// we currently do not know about any Name key at all, so use an invalid index
+    // we currently do not know about any Name key at all, so use an invalid index
-	lang_index = lang_index_default + 1;
+    int lang_index_name = lang_index_default + 1;
+    int lang_index_generic_name = lang_index_default + 1;
 
-	int inside_desktop_entry = 0;
+    gboolean inside_desktop_entry = 0;
-	while (getline(&line, &line_size, fp) >= 0) {
+    char *line = NULL;
-		int len = strlen(line);
+    size_t line_size;
-		if (len == 0)
+    while (getline(&line, &line_size, fp) >= 0) {
-			continue;
+        int len = strlen(line);
-		line[len - 1] = '\0';
+        if (len == 0)
-		if (line[0] == '[') {
+            continue;
-			inside_desktop_entry = (strcmp(line, "[Desktop Entry]") == 0);
+        if (line[len - 1] == '\n')
-		}
+            line[len - 1] = '\0';
-		if (inside_desktop_entry && parse_dektop_line(line, &key, &value)) {
+        if (line[0] == '[') {
-			if (strstr(key, "Name") == key) {
+            inside_desktop_entry = (strcmp(line, "[Desktop Entry]") == 0);
-				if (strcmp(key, "Name") == 0 && lang_index > lang_index_default) {
+        }
-					entry->name = strdup(value);
+        char *key, *value;
-					lang_index = lang_index_default;
+        if (inside_desktop_entry && parse_dektop_line(line, &key, &value)) {
-				} else {
+            if (strstr(key, "Name") == key) {
-					for (i = 0; languages[i] && i < lang_index; i++) {
+                if (strcmp(key, "Name") == 0 && lang_index_name > lang_index_default) {
-						gchar *localized_key = g_strdup_printf("Name[%s]", languages[i]);
+                    entry->name = strdup(value);
-						if (strcmp(key, localized_key) == 0) {
+                    lang_index_name = lang_index_default;
-							if (entry->name)
+                } else {
-								free(entry->name);
+                    for (int i = 0; languages[i] && i < lang_index_name; i++) {
-							entry->name = strdup(value);
+                        gchar *localized_key = g_strdup_printf("Name[%s]", languages[i]);
-							lang_index = i;
+                        if (strcmp(key, localized_key) == 0) {
-						}
+                            if (entry->name)
-						g_free(localized_key);
+                                free(entry->name);
-					}
+                            entry->name = strdup(value);
-				}
+                            lang_index_name = i;
-			} else if (!entry->exec && strcmp(key, "Exec") == 0) {
+                        }
-				entry->exec = strdup(value);
+                        g_free(localized_key);
-			} else if (!entry->icon && strcmp(key, "Icon") == 0) {
+                    }
-				entry->icon = strdup(value);
+                }
-			}
+            } else if (strstr(key, "GenericName") == key) {
-		}
+                if (strcmp(key, "GenericName") == 0 && lang_index_generic_name > lang_index_default) {
-	}
+                    entry->generic_name = strdup(value);
-	fclose(fp);
+                    lang_index_generic_name = lang_index_default;
-	// From this point:
+                } else {
-	// entry->name, entry->icon, entry->exec will never be empty strings (can be NULL though)
+                    for (int i = 0; languages[i] && i < lang_index_generic_name; i++) {
+                        gchar *localized_key = g_strdup_printf("GenericName[%s]", languages[i]);
+                        if (strcmp(key, localized_key) == 0) {
+                            if (entry->generic_name)
+                                free(entry->generic_name);
+                            entry->generic_name = strdup(value);
+                            lang_index_generic_name = i;
+                        }
+                        g_free(localized_key);
+                    }
+                }
+            } else if (!entry->exec && strcmp(key, "Exec") == 0) {
+                entry->exec = strdup(value);
+            } else if (!entry->cwd && strcmp(key, "Path") == 0) {
+                entry->cwd = strdup(value);
+            } else if (!entry->icon && strcmp(key, "Icon") == 0) {
+                entry->icon = strdup(value);
+            } else if (strcmp(key, "NoDisplay") == 0) {
+                entry->hidden_from_menus = strcasecmp(value, "true") == 0;
+            }
+        }
+    }
+    fclose(fp);
+    // From this point:
+    // entry->name, entry->generic_name, entry->icon, entry->exec will never be empty strings (can be NULL though)
 
-	expand_exec(entry, path);
+    expand_exec(entry, entry->path);
 
-	free(line);
+    free(line);
-	return 1;
+    return entry->exec != NULL;
+}
+
+gboolean read_desktop_file_from_dir(const char *path, const char *file_name, DesktopEntry *entry)
+{
+    gchar *full_path = g_build_filename(path, file_name, NULL);
+    if (read_desktop_file_full_path(full_path, entry)) {
+        g_free(full_path);
+        return TRUE;
+    }
+    free_and_null(entry->name);
+    free_and_null(entry->generic_name);
+    free_and_null(entry->icon);
+    free_and_null(entry->exec);
+    free_and_null(entry->cwd);
+
+    GList *subdirs = NULL;
+
+    GDir *d = g_dir_open(path, 0, NULL);
+    if (d) {
+        const gchar *name;
+        while ((name = g_dir_read_name(d))) {
+            gchar *child = g_build_filename(path, name, NULL);
+            if (g_file_test(child, G_FILE_TEST_IS_DIR)) {
+                subdirs = g_list_append(subdirs, child);
+            } else {
+                g_free(child);
+            }
+        }
+        g_dir_close(d);
+    }
+
+    subdirs = g_list_sort(subdirs, compare_strings);
+    gboolean found = FALSE;
+    for (GList *l = subdirs; l; l = g_list_next(l)) {
+        if (read_desktop_file_from_dir(l->data, file_name, entry)) {
+            found = TRUE;
+            break;
+        }
+    }
+
+    for (GList *l = subdirs; l; l = g_list_next(l)) {
+        g_free(l->data);
+    }
+    g_list_free(subdirs);
+    g_free(full_path);
+
+    return found;
+}
+
+gboolean read_desktop_file(const char *path, DesktopEntry *entry)
+{
+    entry->path = strdup(path);
+    entry->name = entry->generic_name = entry->icon = entry->exec = entry->cwd = NULL;
+
+    if (strchr(path, '/'))
+        return read_desktop_file_full_path(path, entry);
+    for (const GSList *location = get_apps_locations(); location; location = g_slist_next(location)) {
+        if (read_desktop_file_from_dir(location->data, path, entry))
+            return TRUE;
+    }
+    return FALSE;
 }
 
 void free_desktop_entry(DesktopEntry *entry)
 {
-	free(entry->name);
+    free_and_null(entry->name);
-	free(entry->icon);
+    free_and_null(entry->generic_name);
-	free(entry->exec);
+    free_and_null(entry->icon);
-	free(entry->path);
+    free_and_null(entry->exec);
-	entry->name = entry->icon = entry->exec = entry->path = NULL;
+    free_and_null(entry->path);
+    free_and_null(entry->cwd);
 }
 
 void test_read_desktop_file()
 {
-	fprintf(stdout, "\033[1;33m");
+    fprintf(stdout, "\033[1;33m");
-	DesktopEntry entry;
+    DesktopEntry entry;
-	read_desktop_file("/usr/share/applications/firefox.desktop", &entry);
+    read_desktop_file("/usr/share/applications/firefox.desktop", &entry);
-	printf("Name:%s Icon:%s Exec:%s\n", entry.name, entry.icon, entry.exec);
+    printf("Name:%s GenericName:%s Icon:%s Exec:%s\n", entry.name, entry.generic_name, entry.icon, entry.exec);
-	fprintf(stdout, "\033[0m");
+    fprintf(stdout, "\033[0m");
+}
+
+GSList *apps_locations = NULL;
+// Do not free the result.
+const GSList *get_apps_locations()
+{
+    if (apps_locations)
+        return apps_locations;
+
+    apps_locations = load_locations_from_env(apps_locations, "XDG_DATA_HOME", "applications", NULL);
+
+    apps_locations =
+        g_slist_append(apps_locations, g_build_filename(g_get_home_dir(), ".local/share/applications", NULL));
+
+    apps_locations = load_locations_from_env(apps_locations, "XDG_DATA_DIRS", "applications", NULL);
+
+    apps_locations = g_slist_append(apps_locations, g_strdup("/usr/local/share/applications"));
+    apps_locations = g_slist_append(apps_locations, g_strdup("/usr/share/applications"));
+    apps_locations = g_slist_append(apps_locations, g_strdup("/opt/share/applications"));
+
+    apps_locations = slist_remove_duplicates(apps_locations, g_str_equal, g_free);
+
+    return apps_locations;
 }

src/launcher/apps-common.h

@@ -7,11 +7,16 @@
 #ifndef APPS_COMMON_H
 #define APPS_COMMON_H
 
+#include <glib.h>
+
 typedef struct DesktopEntry {
-	char *name;
+    char *name;
-	char *exec;
+    char *generic_name;
-	char *icon;
+    char *exec;
-	char *path;
+    char *icon;
+    char *path;
+    char *cwd;
+    gboolean hidden_from_menus;
 } DesktopEntry;
 
 // Parses a line of the form "key = value". Modifies the line.
@@ -22,9 +27,13 @@ int parse_dektop_line(char *line, char **key, char **value);
 // Reads the .desktop file from the given path into the DesktopEntry entry.
 // The DesktopEntry object must be initially empty.
 // Returns 1 if successful.
-int read_desktop_file(const char *path, DesktopEntry *entry);
+gboolean read_desktop_file(const char *path, DesktopEntry *entry);
 
 // Empties DesktopEntry: releases the memory of the *members* of entry.
 void free_desktop_entry(DesktopEntry *entry);
 
+// Returns a list of the directories used to store desktop files.
+// Do not free the result, it is cached.
+const GSList *get_apps_locations();
+
 #endif

src/launcher/icon-theme-common.h

@@ -7,18 +7,30 @@
 #define ICON_THEME_COMMON_H
 
 #include <glib.h>
+#include "cache.h"
 
 typedef struct IconThemeWrapper {
-	// List of IconTheme*
+    // The icon theme name for which this wrapper was created
-	GSList *themes;
+    char *icon_theme_name;
-	// List of IconTheme*
+    // List of IconTheme*
-	GSList *themes_fallback;
+    GSList *themes;
+    // Themes are loaded lazily when needed.
+    gboolean _themes_loaded;
+    // List of IconTheme*
+    GSList *themes_fallback;
+    // Fallback themes are loaded lazily when needed.
+    gboolean _fallback_loaded;
+    Cache _cache;
+    // List of icon theme names that have been queued for loading.
+    // Used to avoid loading the same theme twice, and to avoid cycles.
+    GSList *_queued;
 } IconThemeWrapper;
 
 typedef struct IconTheme {
-	char *name;
+    char *name;
-	GSList *list_inherits;    // each item is a char* (theme name)
+    char *description;
-	GSList *list_directories; // each item is an IconThemeDir*
+    GSList *list_inherits;    // each item is a char* (theme name)
+    GSList *list_directories; // each item is an IconThemeDir*
 } IconTheme;
 
 // Parses a line of the form "key = value". Modifies the line.
@@ -30,13 +42,16 @@ int parse_theme_line(char *line, char **key, char **value);
 // inherited themes, the hicolor theme and possibly fallback themes.
 IconThemeWrapper *load_themes(const char *icon_theme_name);
 
-void free_themes(IconThemeWrapper *themes);
+void save_icon_cache(IconThemeWrapper *wrapper);
+
+void free_themes(IconThemeWrapper *wrapper);
+void free_icon_theme(IconTheme *theme);
 
 #define DEFAULT_ICON "application-x-executable"
 
 // Returns the full path to an icon file (or NULL) given the list of icon themes to search and the icon name
 // Note: needs to be released with free().
-char *get_icon_path(IconThemeWrapper *theme, const char *icon_name, int size);
+char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size, gboolean use_fallbacks);
 
 // Returns a list of the directories used to store icons.
 // Do not free the result, it is cached.

src/launcher/launcher.c

@@ -30,7 +30,6 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <sys/types.h>
 
 #include "window.h"
@@ -51,25 +50,34 @@ int launcher_brightness;
 char *icon_theme_name_config;
 char *icon_theme_name_xsettings;
 int launcher_icon_theme_override;
-int startup_notifications;
 Background *launcher_icon_bg;
+GList *launcher_icon_gradients;
+
+IconThemeWrapper *icon_theme_wrapper;
 
 Imlib_Image scale_icon(Imlib_Image original, int icon_size);
 void free_icon(Imlib_Image icon);
+void launcher_icon_dump_geometry(void *obj, int indent);
+void launcher_reload_icon(Launcher *launcher, LauncherIcon *launcherIcon);
+void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon);
+void launcher_reload_hidden_icons(Launcher *launcher);
+void launcher_icon_on_change_layout(void *obj);
+int launcher_compute_desired_size(void *obj);
 
 void default_launcher()
 {
-	launcher_enabled = 0;
+    launcher_enabled = 0;
-	launcher_max_icon_size = 0;
+    launcher_max_icon_size = 0;
-	launcher_tooltip_enabled = 0;
+    launcher_tooltip_enabled = 0;
-	launcher_alpha = 100;
+    launcher_alpha = 100;
-	launcher_saturation = 0;
+    launcher_saturation = 0;
-	launcher_brightness = 0;
+    launcher_brightness = 0;
-	icon_theme_name_config = NULL;
+    icon_theme_name_config = NULL;
-	icon_theme_name_xsettings = NULL;
+    icon_theme_name_xsettings = NULL;
-	launcher_icon_theme_override = 0;
+    launcher_icon_theme_override = 0;
-	startup_notifications = 0;
+    startup_notifications = 0;
-	launcher_icon_bg = NULL;
+    launcher_icon_bg = NULL;
+    launcher_icon_gradients = NULL;
 }
 
 void init_launcher()
@@ -78,416 +86,485 @@ void init_launcher()
 
 void init_launcher_panel(void *p)
 {
-	Panel *panel = (Panel *)p;
+    Panel *panel = (Panel *)p;
-	Launcher *launcher = &panel->launcher;
+    Launcher *launcher = &panel->launcher;
 
-	launcher->area.parent = p;
+    launcher->area.parent = p;
-	launcher->area.panel = p;
+    launcher->area.panel = p;
-	launcher->area._draw_foreground = NULL;
+    snprintf(launcher->area.name, sizeof(launcher->area.name), "Launcher");
-	launcher->area.size_mode = LAYOUT_FIXED;
+    launcher->area._draw_foreground = NULL;
-	launcher->area._resize = resize_launcher;
+    launcher->area.size_mode = LAYOUT_FIXED;
-	launcher->area.resize_needed = 1;
+    launcher->area._resize = resize_launcher;
-	schedule_redraw(&launcher->area);
+    launcher->area._compute_desired_size = launcher_compute_desired_size;
-	if (!launcher->area.bg)
+    launcher->area.resize_needed = 1;
-		launcher->area.bg = &g_array_index(backgrounds, Background, 0);
+    schedule_redraw(&launcher->area);
+    if (!launcher->area.bg)
+        launcher->area.bg = &g_array_index(backgrounds, Background, 0);
 
-	if (!launcher_icon_bg)
+    if (!launcher_icon_bg)
-		launcher_icon_bg = &g_array_index(backgrounds, Background, 0);
+        launcher_icon_bg = &g_array_index(backgrounds, Background, 0);
 
-	// check consistency
+    // check consistency
-	if (launcher->list_apps == NULL)
+    if (launcher->list_apps == NULL)
-		return;
+        return;
 
-	launcher->area.on_screen = TRUE;
+    // This will be recomputed on resize, we just initialize to a non-zero value
-	panel_refresh = TRUE;
+    launcher->icon_size = launcher_max_icon_size > 0 ? launcher_max_icon_size : 24;
 
-	launcher_load_themes(launcher);
+    launcher->area.on_screen = TRUE;
-	launcher_load_icons(launcher);
+    schedule_panel_redraw();
+    instantiate_area_gradients(&launcher->area);
+
+    load_icon_themes();
+    launcher_load_icons(launcher);
+}
+
+void free_icon_themes()
+{
+    free_themes(icon_theme_wrapper);
+    icon_theme_wrapper = NULL;
 }
 
 void cleanup_launcher()
 {
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		Panel *panel = &panels[i];
+        Panel *panel = &panels[i];
-		Launcher *launcher = &panel->launcher;
+        Launcher *launcher = &panel->launcher;
-		cleanup_launcher_theme(launcher);
+        cleanup_launcher_theme(launcher);
-	}
+    }
 
-	for (GSList *l = panel_config.launcher.list_apps; l; l = l->next) {
+    for (GSList *l = panel_config.launcher.list_apps; l; l = l->next) {
-		free(l->data);
+        free(l->data);
-	}
+    }
-	g_slist_free(panel_config.launcher.list_apps);
+    g_slist_free(panel_config.launcher.list_apps);
-	panel_config.launcher.list_apps = NULL;
+    panel_config.launcher.list_apps = NULL;
 
-	free(icon_theme_name_config);
+    free(icon_theme_name_config);
-	icon_theme_name_config = NULL;
+    icon_theme_name_config = NULL;
 
-	free(icon_theme_name_xsettings);
+    free(icon_theme_name_xsettings);
-	icon_theme_name_xsettings = NULL;
+    icon_theme_name_xsettings = NULL;
 
-	launcher_enabled = FALSE;
+    launcher_enabled = FALSE;
 }
 
 void cleanup_launcher_theme(Launcher *launcher)
 {
-	free_area(&launcher->area);
+    free_area(&launcher->area);
-	for (GSList *l = launcher->list_icons; l; l = l->next) {
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (launcherIcon) {
+        if (launcherIcon) {
-			free_icon(launcherIcon->image);
+            free_icon(launcherIcon->image);
-			free_icon(launcherIcon->image_hover);
+            free_icon(launcherIcon->image_hover);
-			free_icon(launcherIcon->image_pressed);
+            free_icon(launcherIcon->image_pressed);
-			free(launcherIcon->icon_name);
+            free(launcherIcon->icon_name);
-			free(launcherIcon->icon_path);
+            free(launcherIcon->icon_path);
-			free(launcherIcon->cmd);
+            free(launcherIcon->cmd);
-			free(launcherIcon->icon_tooltip);
+            g_free(launcherIcon->icon_tooltip);
-		}
+            free(launcherIcon->config_path);
-		free(launcherIcon);
+        }
-	}
+        free(launcherIcon);
-	g_slist_free(launcher->list_icons);
+    }
-	launcher->list_icons = NULL;
+    g_slist_free(launcher->list_icons);
+    launcher->list_icons = NULL;
+}
 
-	free_themes(launcher->list_themes);
+int launcher_compute_icon_size(Launcher *launcher)
-	launcher->list_themes = NULL;
+{
+    int icon_size = panel_horizontal ? launcher->area.height : launcher->area.width;
+    icon_size = icon_size - MAX(left_right_border_width(&launcher->area), top_bottom_border_width(&launcher->area)) -
+                (2 * launcher->area.paddingy);
+    if (launcher_max_icon_size > 0 && icon_size > launcher_max_icon_size)
+        icon_size = launcher_max_icon_size;
+    return icon_size;
+}
+
+void launcher_compute_geometry(Launcher *launcher,
+                               int *size,
+                               int *icon_size,
+                               int *icons_per_column,
+                               int *icons_per_row,
+                               int *margin)
+{
+    int count = 0;
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        if (launcherIcon->area.on_screen)
+            count++;
+    }
+
+    *icon_size = launcher_compute_icon_size(launcher);
+    *icons_per_column = 1;
+    *icons_per_row = 1;
+    *margin = 0;
+    if (panel_horizontal) {
+        if (!count) {
+            *size = 0;
+        } else {
+            int height = launcher->area.height - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
+            // here icons_per_column always higher than 0
+            *icons_per_column = (height + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
+            *margin = height - (*icons_per_column - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
+            *icons_per_row = count / *icons_per_column + (count % *icons_per_column != 0);
+            *size = left_right_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
+                    (*icon_size * *icons_per_row) + ((*icons_per_row - 1) * launcher->area.paddingx);
+        }
+    } else {
+        if (!count) {
+            *size = 0;
+        } else {
+            int width = launcher->area.width - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
+            // here icons_per_row always higher than 0
+            *icons_per_row = (width + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
+            *margin = width - (*icons_per_row - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
+            *icons_per_column = count / *icons_per_row + (count % *icons_per_row != 0);
+            *size = top_bottom_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
+                    (*icon_size * *icons_per_column) + ((*icons_per_column - 1) * launcher->area.paddingx);
+        }
+    }
+}
+
+int launcher_compute_desired_size(void *obj)
+{
+    Launcher *launcher = (Launcher *)obj;
+
+    int size, icon_size, icons_per_column, icons_per_row, margin;
+    launcher_compute_geometry(launcher, &size, &icon_size, &icons_per_column, &icons_per_row, &margin);
+    return size;
 }
 
 gboolean resize_launcher(void *obj)
 {
-	Launcher *launcher = obj;
+    Launcher *launcher = (Launcher *)obj;
-	int icons_per_column = 1, icons_per_row = 1, margin = 0;
 
-	int icon_size;
+    int size, icons_per_column, icons_per_row, margin;
-	if (panel_horizontal) {
+    launcher_compute_geometry(launcher, &size, &launcher->icon_size, &icons_per_column, &icons_per_row, &margin);
-		icon_size = launcher->area.height;
-	} else {
-		icon_size = launcher->area.width;
-	}
-	icon_size = icon_size - (2 * launcher->area.bg->border.width) - (2 * launcher->area.paddingy);
-	if (launcher_max_icon_size > 0 && icon_size > launcher_max_icon_size)
-		icon_size = launcher_max_icon_size;
 
-	// Resize icons if necessary
+    // Resize icons if necessary
-	for (GSList *l = launcher->list_icons; l; l = l->next) {
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (launcherIcon->icon_size != icon_size || !launcherIcon->image) {
+        if (launcherIcon->icon_size != launcher->icon_size || !launcherIcon->image) {
-			launcherIcon->icon_size = icon_size;
+            launcherIcon->icon_size = launcher->icon_size;
-			launcherIcon->area.width = launcherIcon->icon_size;
+            launcherIcon->area.width = launcherIcon->icon_size;
-			launcherIcon->area.height = launcherIcon->icon_size;
+            launcherIcon->area.height = launcherIcon->icon_size;
+            launcher_reload_icon_image(launcher, launcherIcon);
+        }
+    }
+    save_icon_cache(icon_theme_wrapper);
 
-			// Get the path for an icon file with the new size
+    int count = 0;
-			char *new_icon_path =
+    gboolean needs_repositioning = FALSE;
-			get_icon_path(launcher->list_themes, launcherIcon->icon_name, launcherIcon->icon_size);
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
-			if (!new_icon_path) {
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-				// Draw a blank icon
+        if (launcherIcon->area.on_screen) {
-				free_icon(launcherIcon->image);
+            count++;
-				free_icon(launcherIcon->image_hover);
+            if (launcherIcon->area.posx < 0 || launcherIcon->area.posy < 0)
-				free_icon(launcherIcon->image_pressed);
+                needs_repositioning = TRUE;
-				launcherIcon->image = NULL;
+        }
-				continue;
+    }
-			}
 
-			// Free the old files
+    if (!needs_repositioning) {
-			free_icon(launcherIcon->image);
+        if (panel_horizontal) {
-			free_icon(launcherIcon->image_hover);
+            if (launcher->area.width == size)
-			free_icon(launcherIcon->image_pressed);
+                return FALSE;
-			// Load the new file
+            launcher->area.width = size;
-			launcherIcon->image = load_image(new_icon_path, 1);
+        } else {
-			// On loading error, fallback to default
+            if (launcher->area.height == size)
-			if (!launcherIcon->image) {
+                return FALSE;
-				free(new_icon_path);
+            launcher->area.height = size;
-				new_icon_path = get_icon_path(launcher->list_themes, DEFAULT_ICON, launcherIcon->icon_size);
+        }
-				if (new_icon_path)
+    }
-					launcherIcon->image = imlib_load_image_immediately(new_icon_path);
-			}
 
-			if (!launcherIcon->image) {
+    int posx, posy;
-				// Loading default icon failed, draw a blank icon
+    int start;
-				free(new_icon_path);
+    if (panel_horizontal) {
-			} else {
+        posy = start = top_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
-				// Loaded icon successfully, rescale it
+        posx = left_border_width(&launcher->area) + launcher->area.paddingxlr;
-				Imlib_Image original = launcherIcon->image;
+    } else {
-				launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);
+        posx = start = left_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
-				free_icon(original);
+        posy = top_border_width(&launcher->area) + launcher->area.paddingxlr;
-				free(launcherIcon->icon_path);
+    }
-				launcherIcon->icon_path = new_icon_path;
-				fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
-			}
-		}
 
-		if (panel_config.mouse_effects) {
+    int i = 0;
-			launcherIcon->image_hover = adjust_icon(launcherIcon->image,
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
-													panel_config.mouse_over_alpha,
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-													panel_config.mouse_over_saturation,
+        if (!launcherIcon->area.on_screen)
-													panel_config.mouse_over_brightness);
+            continue;
-			launcherIcon->image_pressed = adjust_icon(launcherIcon->image,
+        i++;
-													  panel_config.mouse_pressed_alpha,
+        launcherIcon->y = posy;
-													  panel_config.mouse_pressed_saturation,
+        launcherIcon->x = posx;
-													  panel_config.mouse_pressed_brightness);
+        launcher_icon_on_change_layout(launcherIcon);
-		}
+        // printf("launcher %d : %d,%d\n", i, posx, posy);
-	}
+        if (panel_horizontal) {
+            if (i % icons_per_column) {
+                posy += launcher->icon_size + launcher->area.paddingx;
+            } else {
+                posy = start;
+                posx += (launcher->icon_size + launcher->area.paddingx);
+            }
+        } else {
+            if (i % icons_per_row) {
+                posx += launcher->icon_size + launcher->area.paddingx;
+            } else {
+                posx = start;
+                posy += (launcher->icon_size + launcher->area.paddingx);
+            }
+        }
+    }
 
-	int count = g_slist_length(launcher->list_icons);
+    if ((panel_horizontal && icons_per_column == 1) || (!panel_horizontal && icons_per_row == 1)) {
+        launcher->area._is_under_mouse = full_width_area_is_under_mouse;
+        for (GSList *l = launcher->list_icons; l; l = l->next)
+            ((LauncherIcon *)l->data)->area._is_under_mouse = full_width_area_is_under_mouse;
+    } else {
+        launcher->area._is_under_mouse = NULL;
+        for (GSList *l = launcher->list_icons; l; l = l->next)
+            ((LauncherIcon *)l->data)->area._is_under_mouse = NULL;
+    }
 
-	if (panel_horizontal) {
+    return TRUE;
-		if (!count) {
-			launcher->area.width = 0;
-		} else {
-			int height = launcher->area.height - 2 * launcher->area.bg->border.width - 2 * launcher->area.paddingy;
-			// here icons_per_column always higher than 0
-			icons_per_column = (height + launcher->area.paddingx) / (icon_size + launcher->area.paddingx);
-			margin = height - (icons_per_column - 1) * (icon_size + launcher->area.paddingx) - icon_size;
-			icons_per_row = count / icons_per_column + (count % icons_per_column != 0);
-			launcher->area.width = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) +
-								   (icon_size * icons_per_row) + ((icons_per_row - 1) * launcher->area.paddingx);
-		}
-	} else {
-		if (!count) {
-			launcher->area.height = 0;
-		} else {
-			int width = launcher->area.width - 2 * launcher->area.bg->border.width - 2 * launcher->area.paddingy;
-			// here icons_per_row always higher than 0
-			icons_per_row = (width + launcher->area.paddingx) / (icon_size + launcher->area.paddingx);
-			margin = width - (icons_per_row - 1) * (icon_size + launcher->area.paddingx) - icon_size;
-			icons_per_column = count / icons_per_row + (count % icons_per_row != 0);
-			launcher->area.height = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) +
-									(icon_size * icons_per_column) + ((icons_per_column - 1) * launcher->area.paddingx);
-		}
-	}
-
-	int posx, posy;
-	int start = launcher->area.bg->border.width + launcher->area.paddingy + margin / 2;
-	if (panel_horizontal) {
-		posy = start;
-		posx = launcher->area.bg->border.width + launcher->area.paddingxlr;
-	} else {
-		posx = start;
-		posy = launcher->area.bg->border.width + launcher->area.paddingxlr;
-	}
-
-	int i;
-	GSList *l;
-	for (i = 1, l = launcher->list_icons; l; i++, l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-
-		launcherIcon->y = posy;
-		launcherIcon->x = posx;
-		launcherIcon->area.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
-		launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
-		launcherIcon->area.width = launcherIcon->icon_size;
-		launcherIcon->area.height = launcherIcon->icon_size;
-		// printf("launcher %d : %d,%d\n", i, posx, posy);
-		if (panel_horizontal) {
-			if (i % icons_per_column) {
-				posy += icon_size + launcher->area.paddingx;
-			} else {
-				posy = start;
-				posx += (icon_size + launcher->area.paddingx);
-			}
-		} else {
-			if (i % icons_per_row) {
-				posx += icon_size + launcher->area.paddingx;
-			} else {
-				posx = start;
-				posy += (icon_size + launcher->area.paddingx);
-			}
-		}
-	}
-
-	return TRUE;
 }
 
 // Here we override the default layout of the icons; normally Area layouts its children
 // in a stack; we need to layout them in a kind of table
 void launcher_icon_on_change_layout(void *obj)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
-	launcherIcon->area.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
+    launcherIcon->area.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
-	launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
+    launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
-	launcherIcon->area.width = launcherIcon->icon_size;
+    launcherIcon->area.width = launcherIcon->icon_size;
-	launcherIcon->area.height = launcherIcon->icon_size;
+    launcherIcon->area.height = launcherIcon->icon_size;
+}
+
+int launcher_icon_compute_desired_size(void *obj)
+{
+    LauncherIcon *icon = (LauncherIcon *)obj;
+    return icon->icon_size;
 }
 
 char *launcher_icon_get_tooltip_text(void *obj)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
-	return strdup(launcherIcon->icon_tooltip);
+    return strdup(launcherIcon->icon_tooltip);
 }
 
 void draw_launcher_icon(void *obj, cairo_t *c)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
 
-	Imlib_Image image;
+    Imlib_Image image;
-	// Render
+    // Render
-	if (panel_config.mouse_effects) {
+    if (panel_config.mouse_effects) {
-		if (launcherIcon->area.mouse_state == MOUSE_OVER)
+        if (launcherIcon->area.mouse_state == MOUSE_OVER)
-			image = launcherIcon->image_hover ? launcherIcon->image_hover : launcherIcon->image;
+            image = launcherIcon->image_hover ? launcherIcon->image_hover : launcherIcon->image;
-		else if (launcherIcon->area.mouse_state == MOUSE_DOWN)
+        else if (launcherIcon->area.mouse_state == MOUSE_DOWN)
-			image = launcherIcon->image_pressed ? launcherIcon->image_pressed : launcherIcon->image;
+            image = launcherIcon->image_pressed ? launcherIcon->image_pressed : launcherIcon->image;
-		else
+        else
-			image = launcherIcon->image;
+            image = launcherIcon->image;
-	} else {
+    } else {
-		image = launcherIcon->image;
+        image = launcherIcon->image;
-	}
+    }
-	imlib_context_set_image(image);
+    imlib_context_set_image(image);
-	render_image(launcherIcon->area.pix, 0, 0);
+    render_image(launcherIcon->area.pix, 0, 0);
+}
+
+void launcher_icon_dump_geometry(void *obj, int indent)
+{
+    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+    fprintf(stderr, "%*sIcon: w = h = %d, name = %s\n", indent, "", launcherIcon->icon_size, launcherIcon->icon_name);
 }
 
 Imlib_Image scale_icon(Imlib_Image original, int icon_size)
 {
-	Imlib_Image icon_scaled;
+    Imlib_Image icon_scaled;
-	if (original) {
+    if (original) {
-		imlib_context_set_image(original);
+        imlib_context_set_image(original);
-		icon_scaled =
+        icon_scaled = imlib_create_cropped_scaled_image(0,
-		imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), icon_size, icon_size);
+                                                        0,
+                                                        imlib_image_get_width(),
+                                                        imlib_image_get_height(),
+                                                        icon_size,
+                                                        icon_size);
 
-		imlib_context_set_image(icon_scaled);
+        imlib_context_set_image(icon_scaled);
-		imlib_image_set_has_alpha(1);
+        imlib_image_set_has_alpha(1);
-		DATA32 *data = imlib_image_get_data();
+        DATA32 *data = imlib_image_get_data();
-		adjust_asb(data,
+        adjust_asb(data,
-				   icon_size,
+                   icon_size,
-				   icon_size,
+                   icon_size,
-				   launcher_alpha,
+                   launcher_alpha / 100.0,
-				   (float)launcher_saturation / 100,
+                   launcher_saturation / 100.0,
-				   (float)launcher_brightness / 100);
+                   launcher_brightness / 100.0);
-		imlib_image_put_back_data(data);
+        imlib_image_put_back_data(data);
 
-		imlib_context_set_image(icon_scaled);
+        imlib_context_set_image(icon_scaled);
-	} else {
+    } else {
-		icon_scaled = imlib_create_image(icon_size, icon_size);
+        icon_scaled = imlib_create_image(icon_size, icon_size);
-		imlib_context_set_image(icon_scaled);
+        imlib_context_set_image(icon_scaled);
-		imlib_context_set_color(255, 255, 255, 255);
+        imlib_context_set_color(255, 255, 255, 255);
-		imlib_image_fill_rectangle(0, 0, icon_size, icon_size);
+        imlib_image_fill_rectangle(0, 0, icon_size, icon_size);
-	}
+    }
-	return icon_scaled;
+    return icon_scaled;
 }
 
 void free_icon(Imlib_Image icon)
 {
-	if (icon) {
+    if (icon) {
-		imlib_context_set_image(icon);
+        imlib_context_set_image(icon);
-		imlib_free_image();
+        imlib_free_image();
-	}
+    }
 }
 
 void launcher_action(LauncherIcon *icon, XEvent *evt)
 {
-	char *cmd = calloc(strlen(icon->cmd) + 10, 1);
+    launcher_reload_icon((Launcher *)icon->area.parent, icon);
-	sprintf(cmd, "(%s&)", icon->cmd);
+    launcher_reload_hidden_icons((Launcher *)icon->area.parent);
-#if HAVE_SN
+
-	SnLauncherContext *ctx = 0;
+    if (evt->type == ButtonPress || evt->type == ButtonRelease)
-	Time time;
+        tint_exec(icon->cmd, icon->cwd, icon->icon_tooltip, evt->xbutton.time);
-	if (startup_notifications) {
-		ctx = sn_launcher_context_new(server.sn_display, server.screen);
-		sn_launcher_context_set_name(ctx, icon->icon_tooltip);
-		sn_launcher_context_set_description(ctx, "Application launched from tint2");
-		sn_launcher_context_set_binary_name(ctx, icon->cmd);
-		// Get a timestamp from the X event
-		if (evt->type == ButtonPress || evt->type == ButtonRelease) {
-			time = evt->xbutton.time;
-		} else {
-			fprintf(stderr, "Unknown X event: %d\n", evt->type);
-			free(cmd);
-			return;
-		}
-		sn_launcher_context_initiate(ctx, "tint2", icon->cmd, time);
-	}
-#endif /* HAVE_SN */
-	pid_t pid;
-	pid = fork();
-	if (pid < 0) {
-		fprintf(stderr, "Could not fork\n");
-	} else if (pid == 0) {
-// Child process
-#if HAVE_SN
-		if (startup_notifications) {
-			sn_launcher_context_setup_child_process(ctx);
-		}
-#endif // HAVE_SN
-		// Allow children to exist after parent destruction
-		setsid();
-		// Run the command
-		execl("/bin/sh", "/bin/sh", "-c", icon->cmd, NULL);
-		fprintf(stderr, "Failed to execlp %s\n", icon->cmd);
-#if HAVE_SN
-		if (startup_notifications) {
-			sn_launcher_context_unref(ctx);
-		}
-#endif // HAVE_SN
-		exit(1);
-	} else {
-// Parent process
-#if HAVE_SN
-		if (startup_notifications) {
-			g_tree_insert(server.pids, GINT_TO_POINTER(pid), ctx);
-		}
-#endif // HAVE_SN
-	}
-	free(cmd);
 }
 
 // Populates the list_icons list from the list_apps list
 void launcher_load_icons(Launcher *launcher)
 {
-	// Load apps (.desktop style launcher items)
+    // Load apps (.desktop style launcher items)
-	GSList *app = launcher->list_apps;
+    GSList *app = launcher->list_apps;
-	while (app != NULL) {
+    int index = 0;
-		DesktopEntry entry;
+    while (app != NULL) {
-		read_desktop_file(app->data, &entry);
+        index++;
-		if (entry.exec) {
+        LauncherIcon *launcherIcon = (LauncherIcon *)calloc(1, sizeof(LauncherIcon));
-			LauncherIcon *launcherIcon = calloc(1, sizeof(LauncherIcon));
+        launcherIcon->area.panel = launcher->area.panel;
-			launcherIcon->area.panel = launcher->area.panel;
+        launcherIcon->area._draw_foreground = draw_launcher_icon;
-			launcherIcon->area._draw_foreground = draw_launcher_icon;
+        launcherIcon->area.size_mode = LAYOUT_FIXED;
-			launcherIcon->area.size_mode = LAYOUT_FIXED;
+        launcherIcon->area._resize = NULL;
-			launcherIcon->area._resize = NULL;
+        launcherIcon->area._compute_desired_size = launcher_icon_compute_desired_size;
-			launcherIcon->area.resize_needed = 0;
+        sprintf(launcherIcon->area.name, "LauncherIcon %d", index);
-			schedule_redraw(&launcherIcon->area);
+        launcherIcon->area.resize_needed = 0;
-			launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
+        launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
-			launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
+        launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
-			launcherIcon->area.bg = launcher_icon_bg;
+        launcherIcon->area.bg = launcher_icon_bg;
-			launcherIcon->area.on_screen = TRUE;
+        launcherIcon->area.on_screen = TRUE;
-			launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
+        launcherIcon->area.posx = -1;
-			if (launcher_tooltip_enabled) {
+        launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
-				launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
+        launcherIcon->area._dump_geometry = launcher_icon_dump_geometry;
-			} else {
+        if (launcher_tooltip_enabled) {
-				launcherIcon->area._get_tooltip_text = NULL;
+            launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
-			}
+        } else {
-			launcherIcon->is_app_desktop = 1;
+            launcherIcon->area._get_tooltip_text = NULL;
-			launcherIcon->cmd = strdup(entry.exec);
+        }
-			launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(DEFAULT_ICON);
+        launcherIcon->config_path = strdup(app->data);
-			launcherIcon->icon_size = 1;
+        add_area(&launcherIcon->area, (Area *)launcher);
-			launcherIcon->icon_tooltip = entry.name ? strdup(entry.name) : strdup(entry.exec);
+        launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
-			free_desktop_entry(&entry);
+        launcherIcon->icon_size = launcher->icon_size;
-			launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
+        launcher_reload_icon(launcher, launcherIcon);
-			add_area(&launcherIcon->area, (Area *)launcher);
+        instantiate_area_gradients(&launcherIcon->area);
-		}
+        app = g_slist_next(app);
-		app = g_slist_next(app);
+    }
-	}
 }
 
-// Populates the list_themes list
+void launcher_reload_icon(Launcher *launcher, LauncherIcon *launcherIcon)
-void launcher_load_themes(Launcher *launcher)
 {
-	launcher->list_themes =
+    DesktopEntry entry;
-	    load_themes(launcher_icon_theme_override
+    if (read_desktop_file(launcherIcon->config_path, &entry) && entry.exec) {
-	                    ? (icon_theme_name_config ? icon_theme_name_config
+        schedule_redraw(&launcherIcon->area);
-	                                              : icon_theme_name_xsettings ? icon_theme_name_xsettings : "hicolor")
+        if (launcherIcon->cmd)
-	                    : (icon_theme_name_xsettings ? icon_theme_name_xsettings
+            free(launcherIcon->cmd);
-	                                                 : icon_theme_name_config ? icon_theme_name_config : "hicolor"));
+        launcherIcon->cmd = strdup(entry.exec);
+        if (launcherIcon->cwd)
+            free(launcherIcon->cwd);
+        if (entry.cwd)
+            launcherIcon->cwd = strdup(entry.cwd);
+        else
+            launcherIcon->cwd = NULL;
+        if (launcherIcon->icon_name)
+            free(launcherIcon->icon_name);
+        launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(DEFAULT_ICON);
+        if (entry.name) {
+            if (entry.generic_name) {
+                launcherIcon->icon_tooltip = g_strdup_printf("%s (%s)", entry.name, entry.generic_name);
+            } else {
+                launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.name);
+            }
+        } else {
+            if (entry.generic_name) {
+                launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.generic_name);
+            } else if (entry.exec) {
+                launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.exec);
+            }
+        }
+        launcher_reload_icon_image(launcher, launcherIcon);
+        show(&launcherIcon->area);
+    } else {
+        hide(&launcherIcon->area);
+    }
+    free_desktop_entry(&entry);
+}
+
+void launcher_reload_hidden_icons(Launcher *launcher)
+{
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        if (!launcherIcon->area.on_screen)
+            launcher_reload_icon(launcher, launcherIcon);
+    }
+}
+
+void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon)
+{
+    free_icon(launcherIcon->image);
+    free_icon(launcherIcon->image_hover);
+    free_icon(launcherIcon->image_pressed);
+    launcherIcon->image = NULL;
+
+    char *new_icon_path = get_icon_path(icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size, TRUE);
+    if (new_icon_path)
+        launcherIcon->image = load_image(new_icon_path, TRUE);
+    // On loading error, fallback to default
+    if (!launcherIcon->image) {
+        free(new_icon_path);
+        new_icon_path = get_icon_path(icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size, TRUE);
+        if (new_icon_path)
+            launcherIcon->image = load_image(new_icon_path, TRUE);
+    }
+    Imlib_Image original = launcherIcon->image;
+    launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);
+    free_icon(original);
+    free(launcherIcon->icon_path);
+    launcherIcon->icon_path = new_icon_path;
+    // fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+
+    if (panel_config.mouse_effects) {
+        launcherIcon->image_hover = adjust_icon(launcherIcon->image,
+                                                panel_config.mouse_over_alpha,
+                                                panel_config.mouse_over_saturation,
+                                                panel_config.mouse_over_brightness);
+        launcherIcon->image_pressed = adjust_icon(launcherIcon->image,
+                                                  panel_config.mouse_pressed_alpha,
+                                                  panel_config.mouse_pressed_saturation,
+                                                  panel_config.mouse_pressed_brightness);
+    }
+    schedule_redraw(&launcherIcon->area);
+}
+
+void load_icon_themes()
+{
+    if (icon_theme_wrapper)
+        return;
+    icon_theme_wrapper =
+        load_themes(launcher_icon_theme_override
+                        ? (icon_theme_name_config ? icon_theme_name_config
+                                                  : icon_theme_name_xsettings ? icon_theme_name_xsettings : "hicolor")
+                        : (icon_theme_name_xsettings ? icon_theme_name_xsettings
+                                                     : icon_theme_name_config ? icon_theme_name_config : "hicolor"));
 }
 
 void launcher_default_icon_theme_changed()
 {
-	if (!launcher_enabled)
+    for (int i = 0; i < num_panels; i++) {
-		return;
+        Launcher *launcher = &panels[i].launcher;
-	if (launcher_icon_theme_override && icon_theme_name_config)
+        cleanup_launcher_theme(launcher);
-		return;
+        launcher_load_icons(launcher);
-	for (int i = 0; i < num_panels; i++) {
+        launcher->area.resize_needed = 1;
-		Launcher *launcher = &panels[i].launcher;
+    }
-		cleanup_launcher_theme(launcher);
+    schedule_panel_redraw();
-		launcher_load_themes(launcher);
-		launcher_load_icons(launcher);
-		launcher->area.resize_needed = 1;
-	}
-	panel_refresh = TRUE;
 }

src/launcher/launcher.h

@@ -12,27 +12,32 @@
 #include "xsettings-client.h"
 #include "icon-theme-common.h"
 
+extern IconThemeWrapper *icon_theme_wrapper;
+void load_icon_themes();
+void free_icon_themes();
+
 typedef struct Launcher {
-	// always start with area
+    // always start with area
-	Area area;
+    Area area;
-	GSList *list_apps;  // List of char*, each is a path to a app.desktop file
+    GSList *list_apps;  // List of char*, each is a path to a app.desktop file
-	GSList *list_icons; // List of LauncherIcon*
+    GSList *list_icons; // List of LauncherIcon*
-	IconThemeWrapper *list_themes;
+    int icon_size;
 } Launcher;
 
 typedef struct LauncherIcon {
-	// always start with area
+    // always start with area
-	Area area;
+    Area area;
-	Imlib_Image image;
+    char *config_path;
-	Imlib_Image image_hover;
+    Imlib_Image image;
-	Imlib_Image image_pressed;
+    Imlib_Image image_hover;
-	char *cmd;
+    Imlib_Image image_pressed;
-	char *icon_name;
+    char *cmd;
-	char *icon_path;
+    char *cwd;
-	char *icon_tooltip;
+    char *icon_name;
-	int icon_size;
+    char *icon_path;
-	int is_app_desktop;
+    char *icon_tooltip;
-	int x, y;
+    int icon_size;
+    int x, y;
 } LauncherIcon;
 
 extern gboolean launcher_enabled;
@@ -44,8 +49,8 @@ extern int launcher_brightness;
 extern char *icon_theme_name_xsettings; // theme name
 extern char *icon_theme_name_config;
 extern int launcher_icon_theme_override;
-extern int startup_notifications;
 extern Background *launcher_icon_bg;
+extern GList *launcher_icon_gradients;
 
 // default global data
 void default_launcher();
@@ -62,8 +67,6 @@ void launcher_default_icon_theme_changed();
 
 // Populates the list_icons list
 void launcher_load_icons(Launcher *launcher);
-// Populates the list_themes list
-void launcher_load_themes(Launcher *launcher);
 void launcher_action(LauncherIcon *icon, XEvent *e);
 
 void test_launcher_read_desktop_file();

src/launcher/xsettings-client.c

@@ -34,78 +34,78 @@
 #include "launcher.h"
 
 struct _XSettingsClient {
-	Display *display;
+    Display *display;
-	int screen;
+    int screen;
-	XSettingsNotifyFunc notify;
+    XSettingsNotifyFunc notify;
-	XSettingsWatchFunc watch;
+    XSettingsWatchFunc watch;
-	void *cb_data;
+    void *cb_data;
 
-	Window manager_window;
+    Window manager_window;
-	XSettingsList *settings;
+    XSettingsList *settings;
 };
 
 void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data)
 {
-	if ((action == XSETTINGS_ACTION_NEW || action == XSETTINGS_ACTION_CHANGED) && name != NULL && setting != NULL) {
+    if ((action == XSETTINGS_ACTION_NEW || action == XSETTINGS_ACTION_CHANGED) && name != NULL && setting != NULL) {
-		if (strcmp(name, "Net/IconThemeName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
+        if (strcmp(name, "Net/IconThemeName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
-			fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
+            fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
-			if (icon_theme_name_xsettings) {
+            if (icon_theme_name_xsettings) {
-				if (strcmp(icon_theme_name_xsettings, setting->data.v_string) == 0)
+                if (strcmp(icon_theme_name_xsettings, setting->data.v_string) == 0)
-					return;
+                    return;
-				free(icon_theme_name_xsettings);
+                free(icon_theme_name_xsettings);
-			}
+            }
-			icon_theme_name_xsettings = strdup(setting->data.v_string);
+            icon_theme_name_xsettings = strdup(setting->data.v_string);
-			default_icon_theme_changed();
+            default_icon_theme_changed();
-		} else if (strcmp(name, "Gtk/FontName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
+        } else if (strcmp(name, "Gtk/FontName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
-			fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
+            fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
-			if (default_font) {
+            if (default_font) {
-				if (strcmp(default_font, setting->data.v_string) == 0)
+                if (strcmp(default_font, setting->data.v_string) == 0)
-					return;
+                    return;
-				free(default_font);
+                free(default_font);
-			}
+            }
-			default_font = strdup(setting->data.v_string);
+            default_font = strdup(setting->data.v_string);
-			default_font_changed();
+            default_font_changed();
-		}
+        }
-	}
+    }
 }
 
 static void notify_changes(XSettingsClient *client, XSettingsList *old_list)
 {
-	XSettingsList *old_iter = old_list;
+    XSettingsList *old_iter = old_list;
-	XSettingsList *new_iter = client->settings;
+    XSettingsList *new_iter = client->settings;
 
-	if (!client->notify)
+    if (!client->notify)
-		return;
+        return;
 
-	while (old_iter || new_iter) {
+    while (old_iter || new_iter) {
-		int cmp;
+        int cmp;
 
-		if (old_iter && new_iter)
+        if (old_iter && new_iter)
-			cmp = strcmp(old_iter->setting->name, new_iter->setting->name);
+            cmp = strcmp(old_iter->setting->name, new_iter->setting->name);
-		else if (old_iter)
+        else if (old_iter)
-			cmp = -1;
+            cmp = -1;
-		else
+        else
-			cmp = 1;
+            cmp = 1;
 
-		if (cmp < 0) {
+        if (cmp < 0) {
-			client->notify(old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
+            client->notify(old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
-		} else if (cmp == 0) {
+        } else if (cmp == 0) {
-			if (!xsettings_setting_equal(old_iter->setting, new_iter->setting))
+            if (!xsettings_setting_equal(old_iter->setting, new_iter->setting))
-				client->notify(old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
+                client->notify(old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
-		} else {
+        } else {
-			client->notify(new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
+            client->notify(new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
-		}
+        }
 
-		if (old_iter)
+        if (old_iter)
-			old_iter = old_iter->next;
+            old_iter = old_iter->next;
-		if (new_iter)
+        if (new_iter)
-			new_iter = new_iter->next;
+            new_iter = new_iter->next;
-	}
+    }
 }
 
 static int ignore_errors(Display *display, XErrorEvent *event)
 {
-	return True;
+    return True;
 }
 
 static char local_byte_order = '\0';
@@ -114,364 +114,364 @@ static char local_byte_order = '\0';
 
 static XSettingsResult fetch_card16(XSettingsBuffer *buffer, CARD16 *result)
 {
-	CARD16 x;
+    CARD16 x;
 
-	if (BYTES_LEFT(buffer) < 2)
+    if (BYTES_LEFT(buffer) < 2)
-		return XSETTINGS_ACCESS;
+        return XSETTINGS_ACCESS;
 
-	x = *(CARD16 *)buffer->pos;
+    x = *(CARD16 *)buffer->pos;
-	buffer->pos += 2;
+    buffer->pos += 2;
 
-	if (buffer->byte_order == local_byte_order)
+    if (buffer->byte_order == local_byte_order)
-		*result = x;
+        *result = x;
-	else
+    else
-		*result = (x << 8) | (x >> 8);
+        *result = (x << 8) | (x >> 8);
 
-	return XSETTINGS_SUCCESS;
+    return XSETTINGS_SUCCESS;
 }
 
 static XSettingsResult fetch_ushort(XSettingsBuffer *buffer, unsigned short *result)
 {
-	CARD16 x;
+    CARD16 x;
-	XSettingsResult r;
+    XSettingsResult r;
 
-	r = fetch_card16(buffer, &x);
+    r = fetch_card16(buffer, &x);
-	if (r == XSETTINGS_SUCCESS)
+    if (r == XSETTINGS_SUCCESS)
-		*result = x;
+        *result = x;
 
-	return r;
+    return r;
 }
 
 static XSettingsResult fetch_card32(XSettingsBuffer *buffer, CARD32 *result)
 {
-	CARD32 x;
+    CARD32 x;
 
-	if (BYTES_LEFT(buffer) < 4)
+    if (BYTES_LEFT(buffer) < 4)
-		return XSETTINGS_ACCESS;
+        return XSETTINGS_ACCESS;
 
-	x = *(CARD32 *)buffer->pos;
+    x = *(CARD32 *)buffer->pos;
-	buffer->pos += 4;
+    buffer->pos += 4;
 
-	if (buffer->byte_order == local_byte_order)
+    if (buffer->byte_order == local_byte_order)
-		*result = x;
+        *result = x;
-	else
+    else
-		*result = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);
+        *result = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);
 
-	return XSETTINGS_SUCCESS;
+    return XSETTINGS_SUCCESS;
 }
 
 static XSettingsResult fetch_card8(XSettingsBuffer *buffer, CARD8 *result)
 {
-	if (BYTES_LEFT(buffer) < 1)
+    if (BYTES_LEFT(buffer) < 1)
-		return XSETTINGS_ACCESS;
+        return XSETTINGS_ACCESS;
 
-	*result = *(CARD8 *)buffer->pos;
+    *result = *(CARD8 *)buffer->pos;
-	buffer->pos += 1;
+    buffer->pos += 1;
 
-	return XSETTINGS_SUCCESS;
+    return XSETTINGS_SUCCESS;
 }
 
 #define XSETTINGS_PAD(n, m) ((n + m - 1) & (~(m - 1)))
 
 static XSettingsList *parse_settings(unsigned char *data, size_t len)
 {
-	XSettingsBuffer buffer;
+    XSettingsBuffer buffer;
-	XSettingsResult result = XSETTINGS_SUCCESS;
+    XSettingsResult result = XSETTINGS_SUCCESS;
-	XSettingsList *settings = NULL;
+    XSettingsList *settings = NULL;
-	CARD32 serial;
+    CARD32 serial;
-	CARD32 n_entries;
+    CARD32 n_entries;
-	CARD32 i;
+    CARD32 i;
-	XSettingsSetting *setting = NULL;
+    XSettingsSetting *setting = NULL;
 
-	local_byte_order = xsettings_byte_order();
+    local_byte_order = xsettings_byte_order();
 
-	buffer.byte_order = local_byte_order;
+    buffer.byte_order = local_byte_order;
-	buffer.pos = buffer.data = data;
+    buffer.pos = buffer.data = data;
-	buffer.len = len;
+    buffer.len = len;
 
-	result = fetch_card8(&buffer, (CARD8 *)&buffer.byte_order);
+    result = fetch_card8(&buffer, (CARD8 *)&buffer.byte_order);
-	if (buffer.byte_order != MSBFirst && buffer.byte_order != LSBFirst) {
+    if (buffer.byte_order != MSBFirst && buffer.byte_order != LSBFirst) {
-		fprintf(stderr, "Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
+        fprintf(stderr, "Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
-		result = XSETTINGS_FAILED;
+        result = XSETTINGS_FAILED;
-		goto out;
+        goto out;
-	}
+    }
 
-	buffer.pos += 3;
+    buffer.pos += 3;
 
-	result = fetch_card32(&buffer, &serial);
+    result = fetch_card32(&buffer, &serial);
-	if (result != XSETTINGS_SUCCESS)
+    if (result != XSETTINGS_SUCCESS)
-		goto out;
+        goto out;
 
-	result = fetch_card32(&buffer, &n_entries);
+    result = fetch_card32(&buffer, &n_entries);
-	if (result != XSETTINGS_SUCCESS)
+    if (result != XSETTINGS_SUCCESS)
-		goto out;
+        goto out;
 
-	for (i = 0; i < n_entries; i++) {
+    for (i = 0; i < n_entries; i++) {
-		CARD8 type;
+        CARD8 type;
-		CARD16 name_len;
+        CARD16 name_len;
-		CARD32 v_int;
+        CARD32 v_int;
-		size_t pad_len;
+        size_t pad_len;
 
-		result = fetch_card8(&buffer, &type);
+        result = fetch_card8(&buffer, &type);
-		if (result != XSETTINGS_SUCCESS)
+        if (result != XSETTINGS_SUCCESS)
-			goto out;
+            goto out;
 
-		buffer.pos += 1;
+        buffer.pos += 1;
 
-		result = fetch_card16(&buffer, &name_len);
+        result = fetch_card16(&buffer, &name_len);
-		if (result != XSETTINGS_SUCCESS)
+        if (result != XSETTINGS_SUCCESS)
-			goto out;
+            goto out;
 
-		pad_len = XSETTINGS_PAD(name_len, 4);
+        pad_len = XSETTINGS_PAD(name_len, 4);
-		if (BYTES_LEFT(&buffer) < pad_len) {
+        if (BYTES_LEFT(&buffer) < pad_len) {
-			result = XSETTINGS_ACCESS;
+            result = XSETTINGS_ACCESS;
-			goto out;
+            goto out;
-		}
+        }
 
-		setting = calloc(1, sizeof *setting);
+        setting = calloc(1, sizeof *setting);
-		if (!setting) {
+        if (!setting) {
-			result = XSETTINGS_NO_MEM;
+            result = XSETTINGS_NO_MEM;
-			goto out;
+            goto out;
-		}
+        }
-		setting->type = XSETTINGS_TYPE_INT; /* No allocated memory */
+        setting->type = XSETTINGS_TYPE_INT; /* No allocated memory */
 
-		setting->name = calloc(name_len + 1, 1);
+        setting->name = calloc(name_len + 1, 1);
-		if (!setting->name) {
+        if (!setting->name) {
-			result = XSETTINGS_NO_MEM;
+            result = XSETTINGS_NO_MEM;
-			goto out;
+            goto out;
-		}
+        }
 
-		memcpy(setting->name, buffer.pos, name_len);
+        memcpy(setting->name, buffer.pos, name_len);
-		setting->name[name_len] = '\0';
+        setting->name[name_len] = '\0';
-		buffer.pos += pad_len;
+        buffer.pos += pad_len;
 
-		result = fetch_card32(&buffer, &v_int);
+        result = fetch_card32(&buffer, &v_int);
-		if (result != XSETTINGS_SUCCESS)
+        if (result != XSETTINGS_SUCCESS)
-			goto out;
+            goto out;
-		setting->last_change_serial = v_int;
+        setting->last_change_serial = v_int;
 
-		switch (type) {
+        switch (type) {
-		case XSETTINGS_TYPE_INT:
+        case XSETTINGS_TYPE_INT:
-			result = fetch_card32(&buffer, &v_int);
+            result = fetch_card32(&buffer, &v_int);
-			if (result != XSETTINGS_SUCCESS)
+            if (result != XSETTINGS_SUCCESS)
-				goto out;
+                goto out;
-			setting->data.v_int = (INT32)v_int;
+            setting->data.v_int = (INT32)v_int;
-			break;
+            break;
-		case XSETTINGS_TYPE_STRING:
+        case XSETTINGS_TYPE_STRING:
-			result = fetch_card32(&buffer, &v_int);
+            result = fetch_card32(&buffer, &v_int);
-			if (result != XSETTINGS_SUCCESS)
+            if (result != XSETTINGS_SUCCESS)
-				goto out;
+                goto out;
 
-			pad_len = XSETTINGS_PAD(v_int, 4);
+            pad_len = XSETTINGS_PAD(v_int, 4);
-			if (v_int + 1 == 0 || /* Guard against wrap-around */
+            if (v_int + 1 == 0 || /* Guard against wrap-around */
-				BYTES_LEFT(&buffer) < pad_len) {
+                BYTES_LEFT(&buffer) < pad_len) {
-				result = XSETTINGS_ACCESS;
+                result = XSETTINGS_ACCESS;
-				goto out;
+                goto out;
-			}
+            }
 
-			setting->data.v_string = calloc(v_int + 1, 1);
+            setting->data.v_string = calloc(v_int + 1, 1);
-			if (!setting->data.v_string) {
+            if (!setting->data.v_string) {
-				result = XSETTINGS_NO_MEM;
+                result = XSETTINGS_NO_MEM;
-				goto out;
+                goto out;
-			}
+            }
 
-			memcpy(setting->data.v_string, buffer.pos, v_int);
+            memcpy(setting->data.v_string, buffer.pos, v_int);
-			setting->data.v_string[v_int] = '\0';
+            setting->data.v_string[v_int] = '\0';
-			buffer.pos += pad_len;
+            buffer.pos += pad_len;
-			break;
+            break;
-		case XSETTINGS_TYPE_COLOR:
+        case XSETTINGS_TYPE_COLOR:
-			result = fetch_ushort(&buffer, &setting->data.v_color.red);
+            result = fetch_ushort(&buffer, &setting->data.v_color.red);
-			if (result != XSETTINGS_SUCCESS)
+            if (result != XSETTINGS_SUCCESS)
-				goto out;
+                goto out;
-			result = fetch_ushort(&buffer, &setting->data.v_color.green);
+            result = fetch_ushort(&buffer, &setting->data.v_color.green);
-			if (result != XSETTINGS_SUCCESS)
+            if (result != XSETTINGS_SUCCESS)
-				goto out;
+                goto out;
-			result = fetch_ushort(&buffer, &setting->data.v_color.blue);
+            result = fetch_ushort(&buffer, &setting->data.v_color.blue);
-			if (result != XSETTINGS_SUCCESS)
+            if (result != XSETTINGS_SUCCESS)
-				goto out;
+                goto out;
-			result = fetch_ushort(&buffer, &setting->data.v_color.alpha);
+            result = fetch_ushort(&buffer, &setting->data.v_color.alpha);
-			if (result != XSETTINGS_SUCCESS)
+            if (result != XSETTINGS_SUCCESS)
-				goto out;
+                goto out;
-			break;
+            break;
-		default:
+        default:
-			/* Quietly ignore unknown types */
+            /* Quietly ignore unknown types */
-			break;
+            break;
-		}
+        }
 
-		setting->type = type;
+        setting->type = type;
 
-		result = xsettings_list_insert(&settings, setting);
+        result = xsettings_list_insert(&settings, setting);
-		if (result != XSETTINGS_SUCCESS)
+        if (result != XSETTINGS_SUCCESS)
-			goto out;
+            goto out;
 
-		setting = NULL;
+        setting = NULL;
-	}
+    }
 
 out:
 
-	if (result != XSETTINGS_SUCCESS) {
+    if (result != XSETTINGS_SUCCESS) {
-		switch (result) {
+        switch (result) {
-		case XSETTINGS_NO_MEM:
+        case XSETTINGS_NO_MEM:
-			fprintf(stderr, "Out of memory reading XSETTINGS property\n");
+            fprintf(stderr, "Out of memory reading XSETTINGS property\n");
-			break;
+            break;
-		case XSETTINGS_ACCESS:
+        case XSETTINGS_ACCESS:
-			fprintf(stderr, "Invalid XSETTINGS property (read off end)\n");
+            fprintf(stderr, "Invalid XSETTINGS property (read off end)\n");
-			break;
+            break;
-		case XSETTINGS_DUPLICATE_ENTRY:
+        case XSETTINGS_DUPLICATE_ENTRY:
-			fprintf(stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
+            fprintf(stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
-		case XSETTINGS_FAILED:
+        case XSETTINGS_FAILED:
-		case XSETTINGS_SUCCESS:
+        case XSETTINGS_SUCCESS:
-		case XSETTINGS_NO_ENTRY:
+        case XSETTINGS_NO_ENTRY:
-			break;
+            break;
-		}
+        }
 
-		if (setting)
+        if (setting)
-			xsettings_setting_free(setting);
+            xsettings_setting_free(setting);
 
-		xsettings_list_free(settings);
+        xsettings_list_free(settings);
-		settings = NULL;
+        settings = NULL;
-	}
+    }
 
-	return settings;
+    return settings;
 }
 
 static void read_settings(XSettingsClient *client)
 {
-	Atom type;
+    Atom type;
-	int format;
+    int format;
-	unsigned long n_items;
+    unsigned long n_items;
-	unsigned long bytes_after;
+    unsigned long bytes_after;
-	unsigned char *data;
+    unsigned char *data;
 
-	int (*old_handler)(Display *, XErrorEvent *);
+    int (*old_handler)(Display *, XErrorEvent *);
 
-	XSettingsList *old_list = client->settings;
+    XSettingsList *old_list = client->settings;
-	client->settings = NULL;
+    client->settings = NULL;
 
-	old_handler = XSetErrorHandler(ignore_errors);
+    old_handler = XSetErrorHandler(ignore_errors);
-	int result = XGetWindowProperty(client->display,
+    int result = XGetWindowProperty(client->display,
-								client->manager_window,
+                                    client->manager_window,
-								server.atom._XSETTINGS_SETTINGS,
+                                    server.atom._XSETTINGS_SETTINGS,
-								0,
+                                    0,
-								LONG_MAX,
+                                    LONG_MAX,
-								False,
+                                    False,
-								server.atom._XSETTINGS_SETTINGS,
+                                    server.atom._XSETTINGS_SETTINGS,
-								&type,
+                                    &type,
-								&format,
+                                    &format,
-								&n_items,
+                                    &n_items,
-								&bytes_after,
+                                    &bytes_after,
-								&data);
+                                    &data);
-	XSetErrorHandler(old_handler);
+    XSetErrorHandler(old_handler);
 
-	if (result == Success && type == server.atom._XSETTINGS_SETTINGS) {
+    if (result == Success && type == server.atom._XSETTINGS_SETTINGS) {
-		if (format != 8) {
+        if (format != 8) {
-			fprintf(stderr, "Invalid format for XSETTINGS property %d", format);
+            fprintf(stderr, "Invalid format for XSETTINGS property %d", format);
-		} else
+        } else
-			client->settings = parse_settings(data, n_items);
+            client->settings = parse_settings(data, n_items);
-		XFree(data);
+        XFree(data);
-	}
+    }
 
-	notify_changes(client, old_list);
+    notify_changes(client, old_list);
-	xsettings_list_free(old_list);
+    xsettings_list_free(old_list);
 }
 
 static void check_manager_window(XSettingsClient *client)
 {
-	if (client->manager_window && client->watch)
+    if (client->manager_window && client->watch)
-		client->watch(client->manager_window, False, 0, client->cb_data);
+        client->watch(client->manager_window, False, 0, client->cb_data);
 
-	XGrabServer(client->display);
+    XGrabServer(client->display);
 
-	client->manager_window = XGetSelectionOwner(server.display, server.atom._XSETTINGS_SCREEN);
+    client->manager_window = XGetSelectionOwner(server.display, server.atom._XSETTINGS_SCREEN);
-	if (client->manager_window)
+    if (client->manager_window)
-		XSelectInput(server.display, client->manager_window, PropertyChangeMask | StructureNotifyMask);
+        XSelectInput(server.display, client->manager_window, PropertyChangeMask | StructureNotifyMask);
 
-	XUngrabServer(client->display);
+    XUngrabServer(client->display);
-	XFlush(client->display);
+    XFlush(client->display);
 
-	if (client->manager_window && client->watch)
+    if (client->manager_window && client->watch)
-		client->watch(client->manager_window, True, PropertyChangeMask | StructureNotifyMask, client->cb_data);
+        client->watch(client->manager_window, True, PropertyChangeMask | StructureNotifyMask, client->cb_data);
 
-	read_settings(client);
+    read_settings(client);
 }
 
 XSettingsClient *xsettings_client_new(Display *display,
-									  int screen,
+                                      int screen,
-									  XSettingsNotifyFunc notify,
+                                      XSettingsNotifyFunc notify,
-									  XSettingsWatchFunc watch,
+                                      XSettingsWatchFunc watch,
-									  void *cb_data)
+                                      void *cb_data)
 {
-	XSettingsClient *client = calloc(1, sizeof *client);
+    XSettingsClient *client = calloc(1, sizeof *client);
-	if (!client)
+    if (!client)
-		return NULL;
+        return NULL;
 
-	client->display = display;
+    client->display = display;
-	client->screen = screen;
+    client->screen = screen;
-	client->notify = notify;
+    client->notify = notify;
-	client->watch = watch;
+    client->watch = watch;
-	client->cb_data = cb_data;
+    client->cb_data = cb_data;
 
-	client->manager_window = None;
+    client->manager_window = None;
-	client->settings = NULL;
+    client->settings = NULL;
 
-	if (client->watch)
+    if (client->watch)
-		client->watch(RootWindow(display, screen), True, StructureNotifyMask, client->cb_data);
+        client->watch(RootWindow(display, screen), True, StructureNotifyMask, client->cb_data);
 
-	check_manager_window(client);
+    check_manager_window(client);
 
-	if (client->manager_window == None) {
+    if (client->manager_window == None) {
-		printf("No XSETTINGS manager, tint2 uses config option 'launcher_icon_theme'.\n");
+        printf("No XSETTINGS manager, tint2 uses config option 'launcher_icon_theme'.\n");
-		free(client);
+        free(client);
-		return NULL;
+        return NULL;
-	} else {
+    } else {
-		return client;
+        return client;
-	}
+    }
 }
 
 void xsettings_client_destroy(XSettingsClient *client)
 {
-	if (!client)
+    if (!client)
-		return;
+        return;
-	if (client->watch)
+    if (client->watch)
-		client->watch(RootWindow(client->display, client->screen), False, 0, client->cb_data);
+        client->watch(RootWindow(client->display, client->screen), False, 0, client->cb_data);
-	if (client->manager_window && client->watch)
+    if (client->manager_window && client->watch)
-		client->watch(client->manager_window, False, 0, client->cb_data);
+        client->watch(client->manager_window, False, 0, client->cb_data);
 
-	xsettings_list_free(client->settings);
+    xsettings_list_free(client->settings);
-	free(client);
+    free(client);
 }
 
 XSettingsResult xsettings_client_get_setting(XSettingsClient *client, const char *name, XSettingsSetting **setting)
 {
-	XSettingsSetting *search = xsettings_list_lookup(client->settings, name);
+    XSettingsSetting *search = xsettings_list_lookup(client->settings, name);
-	if (search) {
+    if (search) {
-		*setting = xsettings_setting_copy(search);
+        *setting = xsettings_setting_copy(search);
-		return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM;
+        return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM;
-	} else
+    } else
-		return XSETTINGS_NO_ENTRY;
+        return XSETTINGS_NO_ENTRY;
 }
 
 Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev)
 {
-	/* The checks here will not unlikely cause us to reread
+    /* The checks here will not unlikely cause us to reread
-	* the properties from the manager window a number of
+    * the properties from the manager window a number of
-	* times when the manager changes from A->B. But manager changes
+    * times when the manager changes from A->B. But manager changes
-	* are going to be pretty rare.
+    * are going to be pretty rare.
-	*/
+    */
-	if (xev->xany.window == RootWindow(server.display, server.screen)) {
+    if (xev->xany.window == RootWindow(server.display, server.screen)) {
-		if (xev->xany.type == ClientMessage && xev->xclient.message_type == server.atom.MANAGER) {
+        if (xev->xany.type == ClientMessage && xev->xclient.message_type == server.atom.MANAGER) {
-			check_manager_window(client);
+            check_manager_window(client);
-			return True;
+            return True;
-		}
+        }
-	} else if (xev->xany.window == client->manager_window) {
+    } else if (xev->xany.window == client->manager_window) {
-		if (xev->xany.type == DestroyNotify) {
+        if (xev->xany.type == DestroyNotify) {
-			check_manager_window(client);
+            check_manager_window(client);
-			return True;
+            return True;
-		} else if (xev->xany.type == PropertyNotify) {
+        } else if (xev->xany.type == PropertyNotify) {
-			read_settings(client);
+            read_settings(client);
-			return True;
+            return True;
-		}
+        }
-	}
+    }
 
-	return False;
+    return False;
 }

src/launcher/xsettings-client.h

@@ -38,10 +38,10 @@ typedef void (*XSettingsNotifyFunc)(const char *name, XSettingsAction action, XS
 typedef void (*XSettingsWatchFunc)(Window window, Bool is_start, long mask, void *cb_data);
 
 XSettingsClient *xsettings_client_new(Display *display,
-									  int screen,
+                                      int screen,
-									  XSettingsNotifyFunc notify,
+                                      XSettingsNotifyFunc notify,
-									  XSettingsWatchFunc watch,
+                                      XSettingsWatchFunc watch,
-									  void *cb_data);
+                                      void *cb_data);
 void xsettings_client_destroy(XSettingsClient *client);
 Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev);
 

src/launcher/xsettings-common.c

@@ -30,216 +30,216 @@
 
 XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting)
 {
-	XSettingsSetting *result;
+    XSettingsSetting *result;
-	size_t str_len;
+    size_t str_len;
 
-	result = calloc(1, sizeof *result);
+    result = calloc(1, sizeof *result);
-	if (!result)
+    if (!result)
-		return NULL;
+        return NULL;
 
-	str_len = strlen(setting->name);
+    str_len = strlen(setting->name);
-	result->name = calloc(str_len + 1, 1);
+    result->name = calloc(str_len + 1, 1);
-	if (!result->name)
+    if (!result->name)
-		goto err;
+        goto err;
 
-	memcpy(result->name, setting->name, str_len + 1);
+    memcpy(result->name, setting->name, str_len + 1);
 
-	result->type = setting->type;
+    result->type = setting->type;
 
-	switch (setting->type) {
+    switch (setting->type) {
-	case XSETTINGS_TYPE_INT:
+    case XSETTINGS_TYPE_INT:
-		result->data.v_int = setting->data.v_int;
+        result->data.v_int = setting->data.v_int;
-		break;
+        break;
-	case XSETTINGS_TYPE_COLOR:
+    case XSETTINGS_TYPE_COLOR:
-		result->data.v_color = setting->data.v_color;
+        result->data.v_color = setting->data.v_color;
-		break;
+        break;
-	case XSETTINGS_TYPE_STRING:
+    case XSETTINGS_TYPE_STRING:
-		str_len = strlen(setting->data.v_string);
+        str_len = strlen(setting->data.v_string);
-		result->data.v_string = calloc(str_len + 1, 1);
+        result->data.v_string = calloc(str_len + 1, 1);
-		if (!result->data.v_string)
+        if (!result->data.v_string)
-			goto err;
+            goto err;
 
-		memcpy(result->data.v_string, setting->data.v_string, str_len + 1);
+        memcpy(result->data.v_string, setting->data.v_string, str_len + 1);
-		break;
+        break;
-	default:
+    default:
-		break;
+        break;
-	}
+    }
 
-	result->last_change_serial = setting->last_change_serial;
+    result->last_change_serial = setting->last_change_serial;
 
-	return result;
+    return result;
 
 err:
-	if (result->name)
+    if (result->name)
-		free(result->name);
+        free(result->name);
-	free(result);
+    free(result);
 
-	return NULL;
+    return NULL;
 }
 
 XSettingsList *xsettings_list_copy(XSettingsList *list)
 {
-	XSettingsList *new = NULL;
+    XSettingsList *new = NULL;
-	XSettingsList *old_iter = list;
+    XSettingsList *old_iter = list;
-	XSettingsList *new_iter = NULL;
+    XSettingsList *new_iter = NULL;
 
-	while (old_iter) {
+    while (old_iter) {
-		XSettingsList *new_node;
+        XSettingsList *new_node;
 
-		new_node = calloc(1, sizeof *new_node);
+        new_node = calloc(1, sizeof *new_node);
-		if (!new_node)
+        if (!new_node)
-			goto error;
+            goto error;
 
-		new_node->setting = xsettings_setting_copy(old_iter->setting);
+        new_node->setting = xsettings_setting_copy(old_iter->setting);
-		if (!new_node->setting) {
+        if (!new_node->setting) {
-			free(new_node);
+            free(new_node);
-			goto error;
+            goto error;
-		}
+        }
 
-		if (new_iter)
+        if (new_iter)
-			new_iter->next = new_node;
+            new_iter->next = new_node;
-		else
+        else
-			new = new_node;
+            new = new_node;
 
-		new_iter = new_node;
+        new_iter = new_node;
 
-		old_iter = old_iter->next;
+        old_iter = old_iter->next;
-	}
+    }
 
-	return new;
+    return new;
 
 error:
-	xsettings_list_free(new);
+    xsettings_list_free(new);
-	return NULL;
+    return NULL;
 }
 
 int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b)
 {
-	if (setting_a->type != setting_b->type)
+    if (setting_a->type != setting_b->type)
-		return 0;
+        return 0;
 
-	if (strcmp(setting_a->name, setting_b->name) != 0)
+    if (strcmp(setting_a->name, setting_b->name) != 0)
-		return 0;
+        return 0;
 
-	switch (setting_a->type) {
+    switch (setting_a->type) {
-	case XSETTINGS_TYPE_INT:
+    case XSETTINGS_TYPE_INT:
-		return setting_a->data.v_int == setting_b->data.v_int;
+        return setting_a->data.v_int == setting_b->data.v_int;
-	case XSETTINGS_TYPE_COLOR:
+    case XSETTINGS_TYPE_COLOR:
-		return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
+        return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
-				setting_a->data.v_color.green == setting_b->data.v_color.green &&
+                setting_a->data.v_color.green == setting_b->data.v_color.green &&
-				setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
+                setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
-				setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
+                setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
-	case XSETTINGS_TYPE_STRING:
+    case XSETTINGS_TYPE_STRING:
-		return strcmp(setting_a->data.v_string, setting_b->data.v_string) == 0;
+        return strcmp(setting_a->data.v_string, setting_b->data.v_string) == 0;
-	default:
+    default:
-		break;
+        break;
-	}
+    }
 
-	return 0;
+    return 0;
 }
 
 void xsettings_setting_free(XSettingsSetting *setting)
 {
-	if (setting->type == XSETTINGS_TYPE_STRING)
+    if (setting->type == XSETTINGS_TYPE_STRING)
-		free(setting->data.v_string);
+        free(setting->data.v_string);
 
-	if (setting->name)
+    if (setting->name)
-		free(setting->name);
+        free(setting->name);
 
-	free(setting);
+    free(setting);
 }
 
 void xsettings_list_free(XSettingsList *list)
 {
-	while (list) {
+    while (list) {
-		XSettingsList *next = list->next;
+        XSettingsList *next = list->next;
 
-		xsettings_setting_free(list->setting);
+        xsettings_setting_free(list->setting);
-		free(list);
+        free(list);
 
-		list = next;
+        list = next;
-	}
+    }
 }
 
 XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting)
 {
-	XSettingsList *node;
+    XSettingsList *node;
-	XSettingsList *iter;
+    XSettingsList *iter;
-	XSettingsList *last = NULL;
+    XSettingsList *last = NULL;
 
-	node = calloc(1, sizeof *node);
+    node = calloc(1, sizeof *node);
-	if (!node)
+    if (!node)
-		return XSETTINGS_NO_MEM;
+        return XSETTINGS_NO_MEM;
-	node->setting = setting;
+    node->setting = setting;
 
-	iter = *list;
+    iter = *list;
-	while (iter) {
+    while (iter) {
-		int cmp = strcmp(setting->name, iter->setting->name);
+        int cmp = strcmp(setting->name, iter->setting->name);
 
-		if (cmp < 0)
+        if (cmp < 0)
-			break;
+            break;
-		else if (cmp == 0) {
+        else if (cmp == 0) {
-			free(node);
+            free(node);
-			return XSETTINGS_DUPLICATE_ENTRY;
+            return XSETTINGS_DUPLICATE_ENTRY;
-		}
+        }
 
-		last = iter;
+        last = iter;
-		iter = iter->next;
+        iter = iter->next;
-	}
+    }
 
-	if (last)
+    if (last)
-		last->next = node;
+        last->next = node;
-	else
+    else
-		*list = node;
+        *list = node;
 
-	node->next = iter;
+    node->next = iter;
 
-	return XSETTINGS_SUCCESS;
+    return XSETTINGS_SUCCESS;
 }
 
 XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name)
 {
-	XSettingsList *iter;
+    XSettingsList *iter;
-	XSettingsList *last = NULL;
+    XSettingsList *last = NULL;
 
-	iter = *list;
+    iter = *list;
-	while (iter) {
+    while (iter) {
-		if (strcmp(name, iter->setting->name) == 0) {
+        if (strcmp(name, iter->setting->name) == 0) {
-			if (last)
+            if (last)
-				last->next = iter->next;
+                last->next = iter->next;
-			else
+            else
-				*list = iter->next;
+                *list = iter->next;
 
-			xsettings_setting_free(iter->setting);
+            xsettings_setting_free(iter->setting);
-			free(iter);
+            free(iter);
 
-			return XSETTINGS_SUCCESS;
+            return XSETTINGS_SUCCESS;
-		}
+        }
 
-		last = iter;
+        last = iter;
-		iter = iter->next;
+        iter = iter->next;
-	}
+    }
 
-	return XSETTINGS_FAILED;
+    return XSETTINGS_FAILED;
 }
 
 XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name)
 {
-	XSettingsList *iter;
+    XSettingsList *iter;
 
-	iter = list;
+    iter = list;
-	while (iter) {
+    while (iter) {
-		if (strcmp(name, iter->setting->name) == 0)
+        if (strcmp(name, iter->setting->name) == 0)
-			return iter->setting;
+            return iter->setting;
 
-		iter = iter->next;
+        iter = iter->next;
-	}
+    }
 
-	return NULL;
+    return NULL;
 }
 
 char xsettings_byte_order(void)
 {
-	CARD32 myint = 0x01020304;
+    CARD32 myint = 0x01020304;
-	return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;
+    return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;
 }

src/launcher/xsettings-common.h

@@ -36,48 +36,48 @@ typedef struct _XSettingsSetting XSettingsSetting;
  * protocol values.
  */
 typedef enum {
-	XSETTINGS_TYPE_INT = 0,
+    XSETTINGS_TYPE_INT = 0,
-	XSETTINGS_TYPE_STRING = 1,
+    XSETTINGS_TYPE_STRING = 1,
-	XSETTINGS_TYPE_COLOR = 2,
+    XSETTINGS_TYPE_COLOR = 2,
-	XSETTINGS_TYPE_NONE = 0xff
+    XSETTINGS_TYPE_NONE = 0xff
 } XSettingsType;
 
 typedef enum {
-	XSETTINGS_SUCCESS,
+    XSETTINGS_SUCCESS,
-	XSETTINGS_NO_MEM,
+    XSETTINGS_NO_MEM,
-	XSETTINGS_ACCESS,
+    XSETTINGS_ACCESS,
-	XSETTINGS_FAILED,
+    XSETTINGS_FAILED,
-	XSETTINGS_NO_ENTRY,
+    XSETTINGS_NO_ENTRY,
-	XSETTINGS_DUPLICATE_ENTRY
+    XSETTINGS_DUPLICATE_ENTRY
 } XSettingsResult;
 
 struct _XSettingsBuffer {
-	char byte_order;
+    char byte_order;
-	size_t len;
+    size_t len;
-	unsigned char *data;
+    unsigned char *data;
-	unsigned char *pos;
+    unsigned char *pos;
 };
 
 struct _XSettingsColor {
-	unsigned short red, green, blue, alpha;
+    unsigned short red, green, blue, alpha;
 };
 
 struct _XSettingsList {
-	XSettingsSetting *setting;
+    XSettingsSetting *setting;
-	XSettingsList *next;
+    XSettingsList *next;
 };
 
 struct _XSettingsSetting {
-	char *name;
+    char *name;
-	XSettingsType type;
+    XSettingsType type;
 
-	union {
+    union {
-		int v_int;
+        int v_int;
-		char *v_string;
+        char *v_string;
-		XSettingsColor v_color;
+        XSettingsColor v_color;
-	} data;
+    } data;
 
-	unsigned long last_change_serial;
+    unsigned long last_change_serial;
 };
 
 XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting);

src/panel.h

@@ -22,6 +22,8 @@
 #include "launcher.h"
 #include "freespace.h"
 #include "execplugin.h"
+#include "separator.h"
+#include "button.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
@@ -40,29 +42,29 @@ extern MouseAction mouse_tilt_right;
 
 // panel mode
 typedef enum TaskbarMode {
-	SINGLE_DESKTOP = 0,
+    SINGLE_DESKTOP = 0,
-	MULTI_DESKTOP,
+    MULTI_DESKTOP,
 } TaskbarMode;
 
 typedef enum Layer {
-	BOTTOM_LAYER,
+    BOTTOM_LAYER,
-	NORMAL_LAYER,
+    NORMAL_LAYER,
-	TOP_LAYER,
+    TOP_LAYER,
 } Layer;
 
 // panel position
 typedef enum PanelPosition {
-	LEFT = 0x01,
+    LEFT = 0x01,
-	RIGHT = 0x02,
+    RIGHT = 0x02,
-	CENTER = 0X04,
+    CENTER = 0X04,
-	TOP = 0X08,
+    TOP = 0X08,
-	BOTTOM = 0x10,
+    BOTTOM = 0x10,
 } PanelPosition;
 
 typedef enum Strut {
-	STRUT_MINIMUM,
+    STRUT_MINIMUM,
-	STRUT_FOLLOW_SIZE,
+    STRUT_FOLLOW_SIZE,
-	STRUT_NONE,
+    STRUT_NONE,
 } Strut;
 
 extern TaskbarMode taskbar_mode;
@@ -78,61 +80,70 @@ extern gboolean panel_autohide;
 extern int panel_autohide_show_timeout;
 extern int panel_autohide_hide_timeout;
 extern int panel_autohide_height; // for vertical panels this is of course the width
+extern gboolean panel_shrink;
 extern Strut panel_strut_policy;
 extern char *panel_items_order;
 extern int max_tick_urgent;
 extern GArray *backgrounds;
+extern GArray *gradients;
 extern Imlib_Image default_icon;
 #define DEFAULT_FONT "sans 10"
 extern char *default_font;
 extern XSettingsClient *xsettings_client;
+extern gboolean startup_notifications;
+extern gboolean debug_geometry;
+extern gboolean debug_fps;
+extern gboolean debug_frames;
 
 typedef struct Panel {
-	Area area;
+    Area area;
 
-	Window main_win;
+    Window main_win;
-	Pixmap temp_pmap;
+    Pixmap temp_pmap;
 
-	// position relative to root window
+    // position relative to root window
-	int posx, posy;
+    int posx, posy;
-	int marginx, marginy;
+    int marginx, marginy;
-	int fractional_width, fractional_height;
+    gboolean fractional_width, fractional_height;
-	int monitor;
+    int max_size;
-	int font_shadow;
+    int monitor;
-	gboolean mouse_effects;
+    int font_shadow;
-	// Mouse effects for icons
+    gboolean mouse_effects;
-	int mouse_over_alpha;
+    // Mouse effects for icons
-	int mouse_over_saturation;
+    int mouse_over_alpha;
-	int mouse_over_brightness;
+    int mouse_over_saturation;
-	int mouse_pressed_alpha;
+    int mouse_over_brightness;
-	int mouse_pressed_saturation;
+    int mouse_pressed_alpha;
-	int mouse_pressed_brightness;
+    int mouse_pressed_saturation;
+    int mouse_pressed_brightness;
 
-	// Per-panel parameters and states for Taskbar and Task
+    // Per-panel parameters and states for Taskbar and Task
-	GlobalTaskbar g_taskbar;
+    GlobalTaskbar g_taskbar;
-	GlobalTask g_task;
+    GlobalTask g_task;
 
-	// Array of Taskbar, with num_desktops items
+    // Array of Taskbar, with num_desktops items
-	Taskbar *taskbar;
+    Taskbar *taskbar;
-	int num_desktops;
+    int num_desktops;
-	gboolean taskbarname_has_font;
+    gboolean taskbarname_has_font;
-	PangoFontDescription *taskbarname_font_desc;
+    PangoFontDescription *taskbarname_font_desc;
 
-	Clock clock;
+    Clock clock;
 
 #ifdef ENABLE_BATTERY
-	Battery battery;
+    Battery battery;
 #endif
 
-	Launcher launcher;
+    Launcher launcher;
-	FreeSpace freespace;
+    GList *freespace_list;
-	GList *execp_list;
+    GList *separator_list;
+    GList *execp_list;
+    GList *button_list;
 
-	// Autohide
+    // Autohide
-	gboolean is_hidden;
+    gboolean is_hidden;
-	int hidden_width, hidden_height;
+    int hidden_width, hidden_height;
-	Pixmap hidden_pixmap;
+    Pixmap hidden_pixmap;
-	timeout *autohide_timeout;
+    timeout *autohide_timeout;
 } Panel;
 
 extern Panel panel_config;
@@ -152,9 +163,16 @@ void init_panel();
 void init_panel_size_and_position(Panel *panel);
 gboolean resize_panel(void *obj);
 void render_panel(Panel *panel);
+void shrink_panel(Panel *panel);
+void _schedule_panel_redraw(const char *file, const char *function, const int line);
+#define schedule_panel_redraw() _schedule_panel_redraw(__FILE__, __FUNCTION__, __LINE__)
 
 void set_panel_items_order(Panel *p);
+void place_panel_all_desktops(Panel *p);
+void replace_panel_all_desktops(Panel *p);
 void set_panel_properties(Panel *p);
+void set_panel_window_geometry(Panel *panel);
+void set_panel_layer(Panel *p, Layer layer);
 
 // draw background panel
 void set_panel_background(Panel *p);
@@ -166,15 +184,15 @@ Taskbar *click_taskbar(Panel *panel, int x, int y);
 Task *click_task(Panel *panel, int x, int y);
 Launcher *click_launcher(Panel *panel, int x, int y);
 LauncherIcon *click_launcher_icon(Panel *panel, int x, int y);
-gboolean click_padding(Panel *panel, int x, int y);
+Clock *click_clock(Panel *panel, int x, int y);
-gboolean click_clock(Panel *panel, int x, int y);
 
 #ifdef ENABLE_BATTERY
-gboolean click_battery(Panel *panel, int x, int y);
+Battery *click_battery(Panel *panel, int x, int y);
 #endif
 
 Area *click_area(Panel *panel, int x, int y);
 Execp *click_execp(Panel *panel, int x, int y);
+Button *click_button(Panel *panel, int x, int y);
 
 void autohide_show(void *p);
 void autohide_hide(void *p);
@@ -186,4 +204,7 @@ const char *get_default_font();
 void default_icon_theme_changed();
 void default_font_changed();
 
+void free_icon(Imlib_Image icon);
+Imlib_Image scale_icon(Imlib_Image original, int icon_size);
+
 #endif

src/separator/separator.c

@@ -0,0 +1,231 @@
+// Tint2 : Separator plugin
+// Author: Oskari Rauta
+
+#include <string.h>
+#include <stdio.h>
+#include <cairo.h>
+#include <cairo-xlib.h>
+#include <pango/pangocairo.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include "window.h"
+#include "server.h"
+#include "panel.h"
+#include "common.h"
+#include "separator.h"
+
+int separator_compute_desired_size(void *obj);
+
+Separator *create_separator()
+{
+    Separator *separator = (Separator *)calloc(1, sizeof(Separator));
+    separator->color.rgb[0] = 0.5;
+    separator->color.rgb[1] = 0.5;
+    separator->color.rgb[2] = 0.5;
+    separator->color.alpha = 0.9;
+    separator->style = SEPARATOR_DOTS;
+    separator->thickness = 3;
+    separator->area.paddingxlr = 1;
+    return separator;
+}
+
+void destroy_separator(void *obj)
+{
+    Separator *separator = (Separator *)obj;
+    remove_area(&separator->area);
+    free_area(&separator->area);
+    free_and_null(separator);
+}
+
+gpointer copy_separator(gconstpointer arg, gpointer data)
+{
+    Separator *old = (Separator *)arg;
+    Separator *copy = (Separator *)calloc(1, sizeof(Separator));
+    memcpy(copy, old, sizeof(Separator));
+    return copy;
+}
+
+void init_separator()
+{
+    GList *to_remove = panel_config.separator_list;
+    for (int k = 0; k < strlen(panel_items_order) && to_remove; k++) {
+        if (panel_items_order[k] == ':') {
+            to_remove = to_remove->next;
+        }
+    }
+
+    if (to_remove) {
+        if (to_remove == panel_config.separator_list) {
+            g_list_free_full(to_remove, destroy_separator);
+            panel_config.separator_list = NULL;
+        } else {
+            // Cut panel_config.separator_list
+            if (to_remove->prev)
+                to_remove->prev->next = NULL;
+            to_remove->prev = NULL;
+            // Remove all elements of to_remove and to_remove itself
+            g_list_free_full(to_remove, destroy_separator);
+        }
+    }
+}
+
+void init_separator_panel(void *p)
+{
+    Panel *panel = (Panel *)p;
+
+    // Make sure this is only done once if there are multiple items
+    if (panel->separator_list)
+        return;
+
+    // panel->separator_list is now a copy of the pointer panel_config.separator_list
+    // We make it a deep copy
+    panel->separator_list = g_list_copy_deep(panel_config.separator_list, copy_separator, NULL);
+
+    for (GList *l = panel->separator_list; l; l = l->next) {
+        Separator *separator = (Separator *)l->data;
+        if (!separator->area.bg)
+            separator->area.bg = &g_array_index(backgrounds, Background, 0);
+        separator->area.parent = p;
+        separator->area.panel = p;
+        snprintf(separator->area.name, sizeof(separator->area.name), "separator");
+        separator->area.size_mode = LAYOUT_FIXED;
+        separator->area.resize_needed = 1;
+        separator->area.on_screen = TRUE;
+        separator->area._resize = resize_separator;
+        separator->area._compute_desired_size = separator_compute_desired_size;
+        separator->area._draw_foreground = draw_separator;
+        instantiate_area_gradients(&separator->area);
+    }
+}
+
+void cleanup_separator()
+{
+    // Cleanup frontends
+    for (int i = 0; i < num_panels; i++) {
+        g_list_free_full(panels[i].separator_list, destroy_separator);
+        panels[i].separator_list = NULL;
+    }
+
+    // Cleanup backends
+    g_list_free_full(panel_config.separator_list, destroy_separator);
+    panel_config.separator_list = NULL;
+}
+
+int separator_compute_desired_size(void *obj)
+{
+    Separator *separator = (Separator *)obj;
+    if (!separator->area.on_screen)
+        return 0;
+
+    if (panel_horizontal)
+        return separator->thickness + 2 * separator->area.paddingxlr + left_right_border_width(&separator->area);
+    else
+        return separator->thickness + 2 * separator->area.paddingxlr + top_bottom_border_width(&separator->area);
+}
+
+gboolean resize_separator(void *obj)
+{
+    Separator *separator = (Separator *)obj;
+    if (!separator->area.on_screen)
+        return FALSE;
+
+    if (panel_horizontal) {
+        separator->area.width =
+            separator->thickness + 2 * separator->area.paddingxlr + left_right_border_width(&separator->area);
+        separator->length =
+            separator->area.height - 2 * separator->area.paddingy - top_bottom_border_width(&separator->area);
+    } else {
+        separator->area.height =
+            separator->thickness + 2 * separator->area.paddingxlr + top_bottom_border_width(&separator->area);
+        separator->length =
+            separator->area.width - 2 * separator->area.paddingy - left_right_border_width(&separator->area);
+    }
+
+    schedule_redraw(&separator->area);
+    schedule_panel_redraw();
+    return TRUE;
+}
+
+void draw_separator_line(void *obj, cairo_t *c);
+void draw_separator_dots(void *obj, cairo_t *c);
+
+void draw_separator(void *obj, cairo_t *c)
+{
+    Separator *separator = (Separator *)obj;
+
+    if (separator->style == SEPARATOR_EMPTY)
+        return;
+    else if (separator->style == SEPARATOR_LINE)
+        draw_separator_line(separator, c);
+    else if (separator->style == SEPARATOR_DOTS)
+        draw_separator_dots(separator, c);
+}
+
+void draw_separator_line(void *obj, cairo_t *c)
+{
+    Separator *separator = (Separator *)obj;
+
+    if (separator->thickness <= 0)
+        return;
+
+    cairo_set_source_rgba(c,
+                          separator->color.rgb[0],
+                          separator->color.rgb[1],
+                          separator->color.rgb[2],
+                          separator->color.alpha);
+    cairo_set_line_width(c, separator->thickness);
+    cairo_set_line_cap(c, CAIRO_LINE_CAP_ROUND);
+    if (panel_horizontal) {
+        cairo_move_to(c, separator->area.width / 2.0, separator->area.height / 2.0 - separator->length / 2.0);
+        cairo_line_to(c, separator->area.width / 2.0, separator->area.height / 2.0 + separator->length / 2.0);
+    } else {
+        cairo_move_to(c, separator->area.width / 2.0 - separator->length / 2.0, separator->area.height / 2.0);
+        cairo_line_to(c, separator->area.width / 2.0 + separator->length / 2.0, separator->area.height / 2.0);
+    }
+    cairo_stroke(c);
+}
+
+void draw_separator_dots(void *obj, cairo_t *c)
+{
+    const double PI = 3.14159265359;
+    Separator *separator = (Separator *)obj;
+    if (separator->thickness <= 0)
+        return;
+
+    cairo_set_source_rgba(c,
+                          separator->color.rgb[0],
+                          separator->color.rgb[1],
+                          separator->color.rgb[2],
+                          separator->color.alpha);
+    cairo_set_line_width(c, 0);
+
+    int num_circles = separator->length / (1.618 * separator->thickness - 1);
+    double spacing = (separator->length - num_circles * separator->thickness) / MAX(1.0, num_circles - 1.0);
+    if (spacing > separator->thickness)
+        num_circles++;
+    spacing = (separator->length - num_circles * separator->thickness) / MAX(1.0, num_circles - 1.0);
+    double offset = (panel_horizontal ? separator->area.height : separator->area.width) / 2.0 - separator->length / 2.0;
+    if (num_circles == 1)
+        offset += spacing / 2.0;
+    for (int i = 0; i < num_circles; i++) {
+        if (panel_horizontal) {
+            cairo_arc(c,
+                      separator->area.width / 2.0,
+                      offset + separator->thickness / 2.0,
+                      separator->thickness / 2.0,
+                      0,
+                      2 * PI);
+        } else {
+            cairo_arc(c,
+                      offset + separator->thickness / 2.0,
+                      separator->area.height / 2.0,
+                      separator->thickness / 2.0,
+                      0,
+                      2 * PI);
+        }
+        cairo_stroke_preserve(c);
+        cairo_fill(c);
+        offset += separator->thickness + spacing;
+    }
+}

src/separator/separator.h

@@ -0,0 +1,28 @@
+// Tint2 : Separator
+// Author: Oskari Rauta <oskari.rauta@gmail.com>
+
+#ifndef SEPARATOR_H
+#define SEPARATOR_H
+
+#include "common.h"
+#include "area.h"
+
+typedef enum SeparatorStyle { SEPARATOR_EMPTY = 0, SEPARATOR_LINE, SEPARATOR_DOTS } SeparatorStyle;
+
+typedef struct Separator {
+    Area area;
+    SeparatorStyle style;
+    Color color;
+    int thickness;
+    int length;
+} Separator;
+
+Separator *create_separator();
+void destroy_separator(void *obj);
+void init_separator();
+void init_separator_panel(void *p);
+void cleanup_separator();
+gboolean resize_separator(void *obj);
+void draw_separator(void *obj, cairo_t *c);
+
+#endif

src/server.h

@@ -21,123 +21,123 @@
 extern gboolean primary_monitor_first;
 
 typedef struct Global_atom {
-	Atom _XROOTPMAP_ID;
+    Atom _XROOTPMAP_ID;
-	Atom _XROOTMAP_ID;
+    Atom _XROOTMAP_ID;
-	Atom _NET_CURRENT_DESKTOP;
+    Atom _NET_CURRENT_DESKTOP;
-	Atom _NET_NUMBER_OF_DESKTOPS;
+    Atom _NET_NUMBER_OF_DESKTOPS;
-	Atom _NET_DESKTOP_NAMES;
+    Atom _NET_DESKTOP_NAMES;
-	Atom _NET_DESKTOP_GEOMETRY;
+    Atom _NET_DESKTOP_GEOMETRY;
-	Atom _NET_DESKTOP_VIEWPORT;
+    Atom _NET_DESKTOP_VIEWPORT;
-	Atom _NET_WORKAREA;
+    Atom _NET_WORKAREA;
-	Atom _NET_ACTIVE_WINDOW;
+    Atom _NET_ACTIVE_WINDOW;
-	Atom _NET_WM_WINDOW_TYPE;
+    Atom _NET_WM_WINDOW_TYPE;
-	Atom _NET_WM_STATE_SKIP_PAGER;
+    Atom _NET_WM_STATE_SKIP_PAGER;
-	Atom _NET_WM_STATE_SKIP_TASKBAR;
+    Atom _NET_WM_STATE_SKIP_TASKBAR;
-	Atom _NET_WM_STATE_STICKY;
+    Atom _NET_WM_STATE_STICKY;
-	Atom _NET_WM_STATE_DEMANDS_ATTENTION;
+    Atom _NET_WM_STATE_DEMANDS_ATTENTION;
-	Atom _NET_WM_WINDOW_TYPE_DOCK;
+    Atom _NET_WM_WINDOW_TYPE_DOCK;
-	Atom _NET_WM_WINDOW_TYPE_DESKTOP;
+    Atom _NET_WM_WINDOW_TYPE_DESKTOP;
-	Atom _NET_WM_WINDOW_TYPE_TOOLBAR;
+    Atom _NET_WM_WINDOW_TYPE_TOOLBAR;
-	Atom _NET_WM_WINDOW_TYPE_MENU;
+    Atom _NET_WM_WINDOW_TYPE_MENU;
-	Atom _NET_WM_WINDOW_TYPE_SPLASH;
+    Atom _NET_WM_WINDOW_TYPE_SPLASH;
-	Atom _NET_WM_WINDOW_TYPE_DIALOG;
+    Atom _NET_WM_WINDOW_TYPE_DIALOG;
-	Atom _NET_WM_WINDOW_TYPE_NORMAL;
+    Atom _NET_WM_WINDOW_TYPE_NORMAL;
-	Atom _NET_WM_DESKTOP;
+    Atom _NET_WM_DESKTOP;
-	Atom WM_STATE;
+    Atom WM_STATE;
-	Atom _NET_WM_STATE;
+    Atom _NET_WM_STATE;
-	Atom _NET_WM_STATE_MAXIMIZED_VERT;
+    Atom _NET_WM_STATE_MAXIMIZED_VERT;
-	Atom _NET_WM_STATE_MAXIMIZED_HORZ;
+    Atom _NET_WM_STATE_MAXIMIZED_HORZ;
-	Atom _NET_WM_STATE_SHADED;
+    Atom _NET_WM_STATE_SHADED;
-	Atom _NET_WM_STATE_HIDDEN;
+    Atom _NET_WM_STATE_HIDDEN;
-	Atom _NET_WM_STATE_BELOW;
+    Atom _NET_WM_STATE_BELOW;
-	Atom _NET_WM_STATE_ABOVE;
+    Atom _NET_WM_STATE_ABOVE;
-	Atom _NET_WM_STATE_MODAL;
+    Atom _NET_WM_STATE_MODAL;
-	Atom _NET_CLIENT_LIST;
+    Atom _NET_CLIENT_LIST;
-	Atom _NET_WM_NAME;
+    Atom _NET_WM_NAME;
-	Atom _NET_WM_VISIBLE_NAME;
+    Atom _NET_WM_VISIBLE_NAME;
-	Atom _NET_WM_STRUT;
+    Atom _NET_WM_STRUT;
-	Atom _NET_WM_ICON;
+    Atom _NET_WM_ICON;
-	Atom _NET_WM_ICON_GEOMETRY;
+    Atom _NET_WM_ICON_GEOMETRY;
-	Atom _NET_WM_ICON_NAME;
+    Atom _NET_WM_ICON_NAME;
-	Atom _NET_CLOSE_WINDOW;
+    Atom _NET_CLOSE_WINDOW;
-	Atom UTF8_STRING;
+    Atom UTF8_STRING;
-	Atom _NET_SUPPORTING_WM_CHECK;
+    Atom _NET_SUPPORTING_WM_CHECK;
-	Atom _NET_WM_CM_S0;
+    Atom _NET_WM_CM_S0;
-	Atom _NET_WM_STRUT_PARTIAL;
+    Atom _NET_WM_STRUT_PARTIAL;
-	Atom WM_NAME;
+    Atom WM_NAME;
-	Atom __SWM_VROOT;
+    Atom __SWM_VROOT;
-	Atom _MOTIF_WM_HINTS;
+    Atom _MOTIF_WM_HINTS;
-	Atom WM_HINTS;
+    Atom WM_HINTS;
-	Atom _NET_SYSTEM_TRAY_SCREEN;
+    Atom _NET_SYSTEM_TRAY_SCREEN;
-	Atom _NET_SYSTEM_TRAY_OPCODE;
+    Atom _NET_SYSTEM_TRAY_OPCODE;
-	Atom MANAGER;
+    Atom MANAGER;
-	Atom _NET_SYSTEM_TRAY_MESSAGE_DATA;
+    Atom _NET_SYSTEM_TRAY_MESSAGE_DATA;
-	Atom _NET_SYSTEM_TRAY_ORIENTATION;
+    Atom _NET_SYSTEM_TRAY_ORIENTATION;
-	Atom _NET_SYSTEM_TRAY_ICON_SIZE;
+    Atom _NET_SYSTEM_TRAY_ICON_SIZE;
-	Atom _NET_SYSTEM_TRAY_PADDING;
+    Atom _NET_SYSTEM_TRAY_PADDING;
-	Atom _XEMBED;
+    Atom _XEMBED;
-	Atom _XEMBED_INFO;
+    Atom _XEMBED_INFO;
-	Atom _NET_WM_PID;
+    Atom _NET_WM_PID;
-	Atom _XSETTINGS_SCREEN;
+    Atom _XSETTINGS_SCREEN;
-	Atom _XSETTINGS_SETTINGS;
+    Atom _XSETTINGS_SETTINGS;
-	Atom XdndAware;
+    Atom XdndAware;
-	Atom XdndEnter;
+    Atom XdndEnter;
-	Atom XdndPosition;
+    Atom XdndPosition;
-	Atom XdndStatus;
+    Atom XdndStatus;
-	Atom XdndDrop;
+    Atom XdndDrop;
-	Atom XdndLeave;
+    Atom XdndLeave;
-	Atom XdndSelection;
+    Atom XdndSelection;
-	Atom XdndTypeList;
+    Atom XdndTypeList;
-	Atom XdndActionCopy;
+    Atom XdndActionCopy;
-	Atom XdndFinished;
+    Atom XdndFinished;
-	Atom TARGETS;
+    Atom TARGETS;
 } Global_atom;
 
 typedef struct Monitor {
-	int x;
+    int x;
-	int y;
+    int y;
-	int width;
+    int width;
-	int height;
+    int height;
-	gboolean primary;
+    gboolean primary;
-	gchar **names;
+    gchar **names;
 } Monitor;
 
 typedef struct Viewport {
-	int x;
+    int x;
-	int y;
+    int y;
-	int width;
+    int width;
-	int height;
+    int height;
 } Viewport;
 
 typedef struct Server {
-	Display *display;
+    Display *display;
-	Window root_win;
+    Window root_win;
-	Window composite_manager;
+    Window composite_manager;
-	gboolean real_transparency;
+    gboolean real_transparency;
-	gboolean disable_transparency;
+    gboolean disable_transparency;
-	// current desktop
+    // current desktop
-	int desktop;
+    int desktop;
-	int screen;
+    int screen;
-	int depth;
+    int depth;
-	int num_desktops;
+    int num_desktops;
-	// number of monitor (without monitor included into another one)
+    // number of monitor (without monitor included into another one)
-	int num_monitors;
+    int num_monitors;
-	// Non-null only if WM uses viewports (compiz) and number of viewports > 1.
+    // Non-null only if WM uses viewports (compiz) and number of viewports > 1.
-	// In that case there are num_desktops viewports.
+    // In that case there are num_desktops viewports.
-	Viewport *viewports;
+    Viewport *viewports;
-	Monitor *monitors;
+    Monitor *monitors;
-	gboolean got_root_win;
+    gboolean got_root_win;
-	Visual *visual;
+    Visual *visual;
-	Visual *visual32;
+    Visual *visual32;
-	// root background
+    // root background
-	Pixmap root_pmap;
+    Pixmap root_pmap;
-	GC gc;
+    GC gc;
-	Colormap colormap;
+    Colormap colormap;
-	Colormap colormap32;
+    Colormap colormap32;
-	Global_atom atom;
+    Global_atom atom;
 #ifdef HAVE_SN
-	SnDisplay *sn_display;
+    SnDisplay *sn_display;
-	GTree *pids;
+    GTree *pids;
 #endif // HAVE_SN
 } Server;
 
@@ -159,6 +159,7 @@ void get_root_pixmap();
 
 // detect monitors and desktops
 void get_monitors();
+void sort_monitors();
 void print_monitors();
 void get_desktops();
 void server_get_number_of_desktops();
@@ -166,5 +167,4 @@ GSList *get_desktop_names();
 int get_current_desktop();
 void change_desktop(int desktop);
 
-
 #endif

src/systray/systraybar.h

@@ -21,54 +21,61 @@
 #define XEMBED_MAPPED (1 << 0)
 
 typedef enum SystraySortMethod {
-	SYSTRAY_SORT_ASCENDING = 0,
+    SYSTRAY_SORT_ASCENDING = 0,
-	SYSTRAY_SORT_DESCENDING,
+    SYSTRAY_SORT_DESCENDING,
-	SYSTRAY_SORT_LEFT2RIGHT,
+    SYSTRAY_SORT_LEFT2RIGHT,
-	SYSTRAY_SORT_RIGHT2LEFT,
+    SYSTRAY_SORT_RIGHT2LEFT,
 } SystraySortMethod;
 
 typedef struct {
-	// always start with area
+    // always start with area
-	Area area;
+    Area area;
 
-	GSList *list_icons;
+    GSList *list_icons;
-	SystraySortMethod sort;
+    SystraySortMethod sort;
-	int alpha, saturation, brightness;
+    int alpha, saturation, brightness;
-	int icon_size, icons_per_column, icons_per_row, margin;
+    int icon_size, icons_per_column, icons_per_row, margin;
-} Systraybar;
+} Systray;
 
 typedef struct {
-	Window parent;
+    // The actual tray icon window (created by the application)
-	Window win;
+    Window win;
-	int x, y;
+    // The parent window created by tint2 to embed the icon
-	int width, height;
+    Window parent;
-	// TODO: manage icon's show/hide
+    int x, y;
-	gboolean hide;
+    int width, height;
-	int depth;
+    int depth;
-	Damage damage;
+    gboolean reparented;
-	timeout *render_timeout;
+    gboolean embedded;
-	gboolean empty;
+    // Process PID or zero.
-	int pid;
+    int pid;
-	int chrono;
+    // A number that is incremented for each new icon, used to sort them by the order in which they were created.
-	struct timespec time_last_render;
+    int chrono;
-	int num_fast_renders;
+    // Name of the tray icon window.
-	gboolean reparented;
+    char *name;
-	gboolean embedded;
+    // Members used for rendering
-	int bad_size_counter;
+    struct timespec time_last_render;
-	timeout *resize_timeout;
+    int num_fast_renders;
-	struct timespec time_last_resize;
+    timeout *render_timeout;
-	char *name;
+    // Members used for resizing
-	Imlib_Image image;
+    int bad_size_counter;
+    struct timespec time_last_resize;
+    timeout *resize_timeout;
+    // Icon contents if we are compositing the icon, otherwise null
+    Imlib_Image image;
+    // XDamage
+    Damage damage;
 } TrayWindow;
 
 // net_sel_win != None when protocol started
 extern Window net_sel_win;
-extern Systraybar systray;
+extern Systray systray;
 extern gboolean refresh_systray;
 extern gboolean systray_enabled;
 extern int systray_max_icon_size;
 extern int systray_monitor;
 extern gboolean systray_profile;
+extern char *systray_hide_name_filter;
 
 // default global data
 void default_systray();
@@ -83,7 +90,7 @@ void init_systray_panel(void *p);
 void draw_systray(void *obj, cairo_t *c);
 gboolean resize_systray(void *obj);
 void on_change_systray(void *obj);
-gboolean systray_on_monitor(int i_monitor, int num_panelss);
+gboolean systray_on_monitor(int i_monitor, int num_panels);
 
 // systray protocol
 // many tray icon doesn't manage stop/restart of the systray manager

src/taskbar/task.h

@@ -14,59 +14,65 @@
 #include "timer.h"
 
 typedef enum TaskState {
-	TASK_NORMAL = 0,
+    TASK_NORMAL = 0,
-	TASK_ACTIVE,
+    TASK_ACTIVE,
-	TASK_ICONIFIED,
+    TASK_ICONIFIED,
-	TASK_URGENT,
+    TASK_URGENT,
-	TASK_UNDEFINED,
+    TASK_UNDEFINED,
-	TASK_STATE_COUNT,
+    TASK_STATE_COUNT,
 } TaskState;
 
 typedef struct GlobalTask {
-	Area area;
+    Area area;
-	gboolean has_text;
+    gboolean has_text;
-	gboolean has_icon;
+    gboolean has_icon;
-	gboolean centered;
+    gboolean centered;
-	int icon_posy;
+    int icon_posy;
-	int icon_size1;
+    int icon_size1;
-	int maximum_width;
+    int maximum_width;
-	int maximum_height;
+    int maximum_height;
-	int alpha[TASK_STATE_COUNT];
+    int alpha[TASK_STATE_COUNT];
-	int saturation[TASK_STATE_COUNT];
+    int saturation[TASK_STATE_COUNT];
-	int brightness[TASK_STATE_COUNT];
+    int brightness[TASK_STATE_COUNT];
-	int config_asb_mask;
+    int config_asb_mask;
-	Background *background[TASK_STATE_COUNT];
+    Background *background[TASK_STATE_COUNT];
-	int config_background_mask;
+    GList *gradient[TASK_STATE_COUNT];
-	// starting position for text ~ task_padding + task_border + icon_size
+    int config_background_mask;
-	double text_posx, text_height;
+    // starting position for text ~ task_padding + task_border + icon_size
-	gboolean has_font;
+    double text_posx, text_height;
-	PangoFontDescription *font_desc;
+    gboolean has_font;
-	Color font[TASK_STATE_COUNT];
+    PangoFontDescription *font_desc;
-	int config_font_mask;
+    Color font[TASK_STATE_COUNT];
-	gboolean tooltip_enabled;
+    int config_font_mask;
+    gboolean tooltip_enabled;
 } GlobalTask;
 
 // Stores information about a task.
 // Warning: any dynamically allocated members are shared between the Task instances created for the same window
 // (if the task appears on all desktops, there will be a different instance on each desktop's taskbar).
 typedef struct Task {
-	Area area;
+    Area area;
-	Window win;
+    Window win;
-	int desktop;
+    int desktop;
-	TaskState current_state;
+    TaskState current_state;
-	Imlib_Image icon[TASK_STATE_COUNT];
+    Imlib_Image icon[TASK_STATE_COUNT];
-	Imlib_Image icon_hover[TASK_STATE_COUNT];
+    Imlib_Image icon_hover[TASK_STATE_COUNT];
-	Imlib_Image icon_press[TASK_STATE_COUNT];
+    Imlib_Image icon_press[TASK_STATE_COUNT];
-	unsigned int icon_width;
+    unsigned int icon_width;
-	unsigned int icon_height;
+    unsigned int icon_height;
-	char *title;
+    char *title;
-	int urgent_tick;
+    int urgent_tick;
-	// These may not be up-to-date
+    // These may not be up-to-date
-	int win_x;
+    int win_x;
-	int win_y;
+    int win_y;
-	int win_w;
+    int win_w;
-	int win_h;
+    int win_h;
-	struct timespec last_activation_time;
+    struct timespec last_activation_time;
+    int _text_width;
+    int _text_height;
+    double _text_posy;
+    int _icon_x;
+    int _icon_y;
 } Task;
 
 extern timeout *urgent_timeout;

src/taskbar/taskbar.h

@@ -12,43 +12,46 @@
 #include "taskbarname.h"
 
 typedef enum TaskbarState {
-	TASKBAR_NORMAL = 0,
+    TASKBAR_NORMAL = 0,
-	TASKBAR_ACTIVE,
+    TASKBAR_ACTIVE,
-	TASKBAR_STATE_COUNT,
+    TASKBAR_STATE_COUNT,
 } TaskbarState;
 
 typedef enum TaskbarSortMethod {
-	TASKBAR_NOSORT = 0,
+    TASKBAR_NOSORT = 0,
-	TASKBAR_SORT_CENTER,
+    TASKBAR_SORT_CENTER,
-	TASKBAR_SORT_TITLE,
+    TASKBAR_SORT_TITLE,
-	TASKBAR_SORT_LRU,
+    TASKBAR_SORT_LRU,
-	TASKBAR_SORT_MRU,
+    TASKBAR_SORT_MRU,
 } TaskbarSortMethod;
 
 typedef struct {
-	Area area;
+    Area area;
-	gchar *name;
+    gchar *name;
-	int posy;
+    int posy;
 } TaskbarName;
 
 typedef struct {
-	Area area;
+    Area area;
-	int desktop;
+    int desktop;
-	TaskbarName bar_name;
+    TaskbarName bar_name;
-	int text_width;
+    int text_width;
 } Taskbar;
 
 typedef struct GlobalTaskbar {
-	Area area;
+    Area area;
-	Area area_name;
+    Area area_name;
-	Background *background[TASKBAR_STATE_COUNT];
+    Background *background[TASKBAR_STATE_COUNT];
-	Background *background_name[TASKBAR_STATE_COUNT];
+    Background *background_name[TASKBAR_STATE_COUNT];
+    GList *gradient[TASKBAR_STATE_COUNT];
+    GList *gradient_name[TASKBAR_STATE_COUNT];
 } GlobalTaskbar;
 
 extern gboolean taskbar_enabled;
 extern gboolean taskbar_distribute_size;
 extern gboolean hide_inactive_tasks;
 extern gboolean hide_task_diff_monitor;
+extern gboolean hide_taskbar_if_empty;
 extern gboolean always_show_all_desktop_tasks;
 extern TaskbarSortMethod taskbar_sort_method;
 extern Alignment taskbar_alignment;
@@ -79,14 +82,19 @@ Task *get_task(Window win);
 // However for windows shown on all desktops, there are multiple buttons, one for each taskbar.
 GPtrArray *get_task_buttons(Window win);
 
+// Change state of a taskbar (ACTIVE or NORMAL)
 void set_taskbar_state(Taskbar *taskbar, TaskbarState state);
 
-// Updates the visibility of each taskbar when the current desktop changes.
+// Updates the visibility of all taskbars
-void update_taskbar_visibility(void *p);
+void update_all_taskbars_visibility();
+
+void update_minimized_icon_positions(void *p);
 
 // Sorts the taskbar(s) on which the window is present.
 void sort_taskbar_for_win(Window win);
 
 void sort_tasks(Taskbar *taskbar);
 
+gboolean taskbar_is_under_mouse(void *obj, int x, int y);
+
 #endif

src/taskbar/taskbarname.c

@@ -37,152 +37,180 @@ Color taskbarname_font;
 Color taskbarname_active_font;
 
 void taskbarname_init_fonts();
+int taskbarname_compute_desired_size(void *obj);
 
 void default_taskbarname()
 {
-	taskbarname_enabled = FALSE;
+    taskbarname_enabled = FALSE;
 }
 
 void init_taskbarname_panel(void *p)
 {
-	if (!taskbarname_enabled)
+    if (!taskbarname_enabled)
-		return;
+        return;
 
-	Panel *panel = (Panel *)p;
+    Panel *panel = (Panel *)p;
 
-	taskbarname_init_fonts();
+    taskbarname_init_fonts();
 
-	GSList *list = get_desktop_names();
+    GSList *list = get_desktop_names();
-	GSList *l = list;
+    GSList *l = list;
-	for (int j = 0; j < panel->num_desktops; j++) {
+    for (int j = 0; j < panel->num_desktops; j++) {
-		Taskbar *taskbar = &panel->taskbar[j];
+        Taskbar *taskbar = &panel->taskbar[j];
-		memcpy(&taskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
+        memcpy(&taskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
-		taskbar->bar_name.area.parent = taskbar;
+        taskbar->bar_name.area.parent = taskbar;
-		taskbar->bar_name.area.has_mouse_over_effect = panel_config.mouse_effects;
+        taskbar->bar_name.area.has_mouse_over_effect = panel_config.mouse_effects;
-		taskbar->bar_name.area.has_mouse_press_effect = panel_config.mouse_effects;
+        taskbar->bar_name.area.has_mouse_press_effect = panel_config.mouse_effects;
-		if (j == server.desktop)
+        taskbar->bar_name.area._compute_desired_size = taskbarname_compute_desired_size;
-			taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
+        if (j == server.desktop) {
-		else
+            taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
-			taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
+        } else {
+            taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
+        }
 
-		// use desktop number if name is missing
+        // use desktop number if name is missing
-		if (l) {
+        if (l) {
-			taskbar->bar_name.name = g_strdup(l->data);
+            taskbar->bar_name.name = g_strdup(l->data);
-			l = l->next;
+            l = l->next;
-		} else {
+        } else {
-			taskbar->bar_name.name = g_strdup_printf("%d", j + 1);
+            taskbar->bar_name.name = g_strdup_printf("%d", j + 1);
-		}
+        }
 
-		// append the name at the beginning of taskbar
+        // append the name at the beginning of taskbar
-		taskbar->area.children = g_list_append(taskbar->area.children, &taskbar->bar_name);
+        taskbar->area.children = g_list_append(taskbar->area.children, &taskbar->bar_name);
-	}
+        instantiate_area_gradients(&taskbar->bar_name.area);
+    }
 
-	for (l = list; l; l = l->next)
+    for (l = list; l; l = l->next)
-		g_free(l->data);
+        g_free(l->data);
-	g_slist_free(list);
+    g_slist_free(list);
 }
 
 void taskbarname_init_fonts()
 {
-	if (!panel_config.taskbarname_font_desc) {
+    if (!panel_config.taskbarname_font_desc) {
-		panel_config.taskbarname_font_desc = pango_font_description_from_string(get_default_font());
+        panel_config.taskbarname_font_desc = pango_font_description_from_string(get_default_font());
-		pango_font_description_set_weight(panel_config.taskbarname_font_desc, PANGO_WEIGHT_BOLD);
+        pango_font_description_set_weight(panel_config.taskbarname_font_desc, PANGO_WEIGHT_BOLD);
-	}
+    }
 }
 
 void taskbarname_default_font_changed()
 {
-	if (!taskbar_enabled)
+    if (!taskbar_enabled)
-		return;
+        return;
-	if (!taskbarname_enabled)
+    if (!taskbarname_enabled)
-		return;
+        return;
-	if (panel_config.taskbarname_has_font)
+    if (panel_config.taskbarname_has_font)
-		return;
+        return;
 
-	pango_font_description_free(panel_config.taskbarname_font_desc);
+    pango_font_description_free(panel_config.taskbarname_font_desc);
-	panel_config.taskbarname_font_desc = NULL;
+    panel_config.taskbarname_font_desc = NULL;
-	taskbarname_init_fonts();
+    taskbarname_init_fonts();
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		for (int j = 0; j < panels[i].num_desktops; j++) {
+        for (int j = 0; j < panels[i].num_desktops; j++) {
-			Taskbar *taskbar = &panels[i].taskbar[j];
+            Taskbar *taskbar = &panels[i].taskbar[j];
-			taskbar->bar_name.area.resize_needed = TRUE;
+            taskbar->bar_name.area.resize_needed = TRUE;
-			schedule_redraw(&taskbar->bar_name.area);
+            schedule_redraw(&taskbar->bar_name.area);
-		}
+        }
-	}
+    }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 }
 
 void cleanup_taskbarname()
 {
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		Panel *panel = &panels[i];
+        Panel *panel = &panels[i];
-		for (int j = 0; j < panel->num_desktops; j++) {
+        for (int j = 0; j < panel->num_desktops; j++) {
-			Taskbar *taskbar = &panel->taskbar[j];
+            Taskbar *taskbar = &panel->taskbar[j];
-			g_free(taskbar->bar_name.name);
+            g_free(taskbar->bar_name.name);
-			taskbar->bar_name.name = NULL;
+            taskbar->bar_name.name = NULL;
-			free_area(&taskbar->bar_name.area);
+            free_area(&taskbar->bar_name.area);
-			remove_area((Area *)&taskbar->bar_name);
+            remove_area((Area *)&taskbar->bar_name);
-		}
+        }
-	}
+    }
+}
+
+int taskbarname_compute_desired_size(void *obj)
+{
+    TaskbarName *taskbar_name = (TaskbarName *)obj;
+    Panel *panel = (Panel *)taskbar_name->area.panel;
+    int name_height, name_width, name_height_ink;
+    get_text_size2(panel_config.taskbarname_font_desc,
+                   &name_height_ink,
+                   &name_height,
+                   &name_width,
+                   panel->area.height,
+                   panel->area.width,
+                   taskbar_name->name,
+                   strlen(taskbar_name->name),
+                   PANGO_WRAP_WORD_CHAR,
+                   PANGO_ELLIPSIZE_NONE,
+                   FALSE);
+
+    if (panel_horizontal) {
+        return name_width + 2 * taskbar_name->area.paddingxlr + left_right_border_width(&taskbar_name->area);
+    } else {
+        return name_height + 2 * taskbar_name->area.paddingxlr + top_bottom_border_width(&taskbar_name->area);
+    }
 }
 
 gboolean resize_taskbarname(void *obj)
 {
-	TaskbarName *taskbar_name = obj;
+    TaskbarName *taskbar_name = (TaskbarName *)obj;
-	Panel *panel = taskbar_name->area.panel;
+    Panel *panel = (Panel *)taskbar_name->area.panel;
-	int name_height, name_width, name_height_ink;
-	gboolean result = FALSE;
 
-	schedule_redraw(&taskbar_name->area);
+    schedule_redraw(&taskbar_name->area);
-	get_text_size2(panel_config.taskbarname_font_desc,
-				   &name_height_ink,
-				   &name_height,
-				   &name_width,
-				   panel->area.height,
-				   panel->area.width,
-				   taskbar_name->name,
-				   strlen(taskbar_name->name),
-				   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE,
-				   FALSE);
 
-	if (panel_horizontal) {
+    int name_height, name_width, name_height_ink;
-		int new_size = name_width + (2 * (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
+    get_text_size2(panel_config.taskbarname_font_desc,
-		if (new_size != taskbar_name->area.width) {
+                   &name_height_ink,
-			taskbar_name->area.width = new_size;
+                   &name_height,
-			taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
+                   &name_width,
-			result = TRUE;
+                   panel->area.height,
-		}
+                   panel->area.width,
-	} else {
+                   taskbar_name->name,
-		int new_size = name_height + (2 * (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
+                   strlen(taskbar_name->name),
-		if (new_size != taskbar_name->area.height) {
+                   PANGO_WRAP_WORD_CHAR,
-			taskbar_name->area.height = new_size;
+                   PANGO_ELLIPSIZE_NONE,
-			taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
+                   FALSE);
-			result = TRUE;
+
-		}
+    gboolean result = FALSE;
-	}
+    int new_size = taskbarname_compute_desired_size(obj);
-	return result;
+    if (panel_horizontal) {
+        if (new_size != taskbar_name->area.width) {
+            taskbar_name->area.width = new_size;
+            taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
+            result = TRUE;
+        }
+    } else {
+        if (new_size != taskbar_name->area.height) {
+            taskbar_name->area.height = new_size;
+            taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
+            result = TRUE;
+        }
+    }
+    return result;
 }
 
 void draw_taskbarname(void *obj, cairo_t *c)
 {
-	TaskbarName *taskbar_name = obj;
+    TaskbarName *taskbar_name = obj;
-	Taskbar *taskbar = taskbar_name->area.parent;
+    Taskbar *taskbar = taskbar_name->area.parent;
-	Color *config_text = (taskbar->desktop == server.desktop) ? &taskbarname_active_font : &taskbarname_font;
+    Color *config_text = (taskbar->desktop == server.desktop) ? &taskbarname_active_font : &taskbarname_font;
 
-	// draw content
+    // draw content
-	PangoLayout *layout = pango_cairo_create_layout(c);
+    PangoLayout *layout = pango_cairo_create_layout(c);
-	pango_layout_set_font_description(layout, panel_config.taskbarname_font_desc);
+    pango_layout_set_font_description(layout, panel_config.taskbarname_font_desc);
-	pango_layout_set_width(layout, taskbar_name->area.width * PANGO_SCALE);
+    pango_layout_set_width(layout, taskbar_name->area.width * PANGO_SCALE);
-	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+    pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	pango_layout_set_text(layout, taskbar_name->name, strlen(taskbar_name->name));
+    pango_layout_set_text(layout, taskbar_name->name, strlen(taskbar_name->name));
 
-	cairo_set_source_rgba(c, config_text->rgb[0], config_text->rgb[1], config_text->rgb[2], config_text->alpha);
+    cairo_set_source_rgba(c, config_text->rgb[0], config_text->rgb[1], config_text->rgb[2], config_text->alpha);
 
-	pango_cairo_update_layout(c, layout);
+    pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, taskbar_name->posy, config_text, ((Panel *)taskbar_name->area.panel)->font_shadow);
+    draw_text(layout, c, 0, taskbar_name->posy, config_text, ((Panel *)taskbar_name->area.panel)->font_shadow);
 
-	g_object_unref(layout);
+    g_object_unref(layout);
 }

src/tint2conf/CMakeLists.txt

@@ -20,15 +20,19 @@ include_directories( ../util
                      ${RSVG_INCLUDE_DIRS} )
 
 set(SOURCES ../util/common.c
-			../util/strnatcmp.c
+            ../util/strnatcmp.c
-			../config.c
+            ../util/cache.c
+            ../config.c
             ../server.c
             ../launcher/apps-common.c
             ../launcher/icon-theme-common.c
+            md4.c
             main.c
             properties.c
             properties_rw.c
-            theme_view.c )
+            theme_view.c
+            background_gui.c
+            gradient_gui.c )
 
 add_definitions( -DTINT2CONF )
 
@@ -56,12 +60,8 @@ target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}
                                  ${GTK2_LIBRARIES}
                                  ${RSVG_LIBRARIES} )
 
-if ( NOT DATADIR )
-  set(DATADIR share)
-endif( NOT DATADIR )
-
 add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
-add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale\" )
+add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_FULL_LOCALEDIR}\" )
 add_definitions( -DGETTEXT_PACKAGE=\"tint2conf\" )
 set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread -std=c99" )
 set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )
@@ -69,6 +69,6 @@ set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )
 add_subdirectory(po)
 
 install( TARGETS tint2conf DESTINATION bin )
-install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
+install( FILES tint2conf.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
-install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
+install( FILES tint2conf.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
-install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
+install( FILES tint2conf.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages )

src/tint2conf/background_gui.h

@@ -0,0 +1,15 @@
+#ifndef BACKGROUND_GUI_H
+#define BACKGROUND_GUI_H
+
+#include "gui.h"
+
+void create_background(GtkWidget *parent);
+void background_duplicate(GtkWidget *widget, gpointer data);
+void background_delete(GtkWidget *widget, gpointer data);
+void background_update_image(int index);
+void background_update(GtkWidget *widget, gpointer data);
+void current_background_changed(GtkWidget *widget, gpointer data);
+void background_combo_changed(GtkWidget *widget, gpointer data);
+GtkWidget *create_background_combo(const char *label);
+
+#endif

src/tint2conf/gradient_gui.c

@@ -0,0 +1,611 @@
+#include "gradient_gui.h"
+
+#include <math.h>
+
+GtkListStore *gradient_ids, *gradient_stop_ids;
+GList *gradients;
+GtkWidget *current_gradient, *gradient_combo_type, *gradient_start_color, *gradient_end_color, *current_gradient_stop,
+    *gradient_stop_color, *gradient_stop_offset;
+
+int gradient_index_safe(int index)
+{
+    if (index <= 0)
+        index = 0;
+    if (index >= get_model_length(GTK_TREE_MODEL(gradient_ids)))
+        index = 0;
+    return index;
+}
+
+GtkWidget *create_gradient_combo()
+{
+    GtkWidget *combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(gradient_ids));
+    GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new();
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, FALSE);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer, "pixbuf", grColPixbuf, NULL);
+    renderer = gtk_cell_renderer_text_new();
+    g_object_set(renderer, "wrap-mode", PANGO_WRAP_WORD, NULL);
+    g_object_set(renderer, "wrap-width", 300, NULL);
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, FALSE);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer, "text", grColText, NULL);
+    return combo;
+}
+
+void create_gradient(GtkWidget *parent)
+{
+    gradient_ids = gtk_list_store_new(grNumCols, GDK_TYPE_PIXBUF, GTK_TYPE_INT, GTK_TYPE_STRING);
+    gradients = NULL;
+
+    gradient_stop_ids = gtk_list_store_new(grStopNumCols, GDK_TYPE_PIXBUF);
+
+    GtkWidget *table, *label, *button;
+    int row, col;
+    // GtkTooltips *tooltips = gtk_tooltips_new();
+
+    table = gtk_table_new(1, 4, FALSE);
+    gtk_widget_show(table);
+    gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 0);
+    gtk_table_set_row_spacings(GTK_TABLE(table), ROW_SPACING);
+    gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING);
+
+    row = 0, col = 0;
+    label = gtk_label_new(_("<b>Gradient</b>"));
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+    gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+    gtk_widget_show(label);
+    gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    current_gradient = create_gradient_combo();
+    gtk_widget_show(current_gradient);
+    gtk_table_attach(GTK_TABLE(table), current_gradient, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    button = gtk_button_new_from_stock("gtk-add");
+    gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_duplicate), NULL);
+    gtk_widget_show(button);
+    gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    button = gtk_button_new_from_stock("gtk-remove");
+    gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_delete), NULL);
+    gtk_widget_show(button);
+    gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    table = gtk_table_new(3, 4, FALSE);
+    gtk_widget_show(table);
+    gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 0);
+    gtk_table_set_row_spacings(GTK_TABLE(table), ROW_SPACING);
+    gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING);
+
+    row = 0, col = 2;
+    label = gtk_label_new(_("Type"));
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+    gtk_widget_show(label);
+    gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    gradient_combo_type = gtk_combo_box_new_text();
+    gtk_widget_show(gradient_combo_type);
+    gtk_table_attach(GTK_TABLE(table), gradient_combo_type, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+    gtk_combo_box_append_text(GTK_COMBO_BOX(gradient_combo_type), _("Vertical"));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(gradient_combo_type), _("Horizontal"));
+    gtk_combo_box_append_text(GTK_COMBO_BOX(gradient_combo_type), _("Radial"));
+    gtk_combo_box_set_active(GTK_COMBO_BOX(gradient_combo_type), 0);
+
+    row++, col = 2;
+    label = gtk_label_new(_("Start color"));
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+    gtk_widget_show(label);
+    gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    gradient_start_color = gtk_color_button_new();
+    gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(gradient_start_color), TRUE);
+    gtk_widget_show(gradient_start_color);
+    gtk_table_attach(GTK_TABLE(table), gradient_start_color, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    row++, col = 2;
+    label = gtk_label_new(_("End color"));
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+    gtk_widget_show(label);
+    gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    gradient_end_color = gtk_color_button_new();
+    gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(gradient_end_color), TRUE);
+    gtk_widget_show(gradient_end_color);
+    gtk_table_attach(GTK_TABLE(table), gradient_end_color, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    change_paragraph(parent);
+
+    table = gtk_table_new(1, 4, FALSE);
+    gtk_widget_show(table);
+    gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 0);
+    gtk_table_set_row_spacings(GTK_TABLE(table), ROW_SPACING);
+    gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING);
+
+    row = 0, col = 0;
+    label = gtk_label_new(_("<b>Color stop</b>"));
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+    gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+    gtk_widget_show(label);
+    gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    current_gradient_stop = create_gradient_stop_combo(NULL);
+    gtk_widget_show(current_gradient_stop);
+    gtk_table_attach(GTK_TABLE(table), current_gradient_stop, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    button = gtk_button_new_from_stock("gtk-add");
+    gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_duplicate), NULL);
+    gtk_widget_show(button);
+    gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    button = gtk_button_new_from_stock("gtk-remove");
+    gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_delete), NULL);
+    gtk_widget_show(button);
+    gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    table = gtk_table_new(3, 4, FALSE);
+    gtk_widget_show(table);
+    gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 0);
+    gtk_table_set_row_spacings(GTK_TABLE(table), ROW_SPACING);
+    gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING);
+
+    row = 0, col = 2;
+    label = gtk_label_new(_("Color"));
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+    gtk_widget_show(label);
+    gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    gradient_stop_color = gtk_color_button_new();
+    gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(gradient_stop_color), TRUE);
+    gtk_widget_show(gradient_stop_color);
+    gtk_table_attach(GTK_TABLE(table), gradient_stop_color, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    row++, col = 2;
+    label = gtk_label_new(_("Position"));
+    gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+    gtk_widget_show(label);
+    gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    gradient_stop_offset = gtk_spin_button_new_with_range(0, 100, 1);
+    gtk_widget_show(gradient_stop_offset);
+    gtk_table_attach(GTK_TABLE(table), gradient_stop_offset, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+
+    g_signal_connect(G_OBJECT(current_gradient), "changed", G_CALLBACK(current_gradient_changed), NULL);
+    g_signal_connect(G_OBJECT(gradient_combo_type), "changed", G_CALLBACK(gradient_update), NULL);
+    g_signal_connect(G_OBJECT(gradient_start_color), "color-set", G_CALLBACK(gradient_update), NULL);
+    g_signal_connect(G_OBJECT(gradient_end_color), "color-set", G_CALLBACK(gradient_update), NULL);
+
+    g_signal_connect(G_OBJECT(current_gradient_stop), "changed", G_CALLBACK(current_gradient_stop_changed), NULL);
+    g_signal_connect(G_OBJECT(gradient_stop_color), "color-set", G_CALLBACK(gradient_stop_update), NULL);
+    g_signal_connect(G_OBJECT(gradient_stop_offset), "value-changed", G_CALLBACK(gradient_stop_update), NULL);
+
+    change_paragraph(parent);
+}
+
+void gradient_create_new(GradientConfigType t)
+{
+    int index = get_model_length(GTK_TREE_MODEL(gradient_ids));
+
+    GradientConfig *g = (GradientConfig *)calloc(1, sizeof(GradientConfig));
+    g->type = t;
+    gradients = g_list_append(gradients, g);
+    GtkTreeIter iter;
+    gtk_list_store_append(gradient_ids, &iter);
+    gtk_list_store_set(gradient_ids,
+                       &iter,
+                       grColPixbuf,
+                       NULL,
+                       grColId,
+                       &index,
+                       grColText,
+                       index == 0 ? _("None") : "",
+                       -1);
+
+    gradient_update_image(index);
+    gtk_combo_box_set_active(GTK_COMBO_BOX(current_gradient), index);
+    current_gradient_changed(0, 0);
+}
+
+gpointer copy_GradientConfigColorStop(gconstpointer arg, gpointer data)
+{
+    GradientConfigColorStop *old = (GradientConfigColorStop *)arg;
+
+    GradientConfigColorStop *copy = (GradientConfigColorStop *)calloc(1, sizeof(GradientConfigColorStop));
+    memcpy(copy, old, sizeof(GradientConfigColorStop));
+    return copy;
+}
+
+void gradient_duplicate(GtkWidget *widget, gpointer data)
+{
+    int old_index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient));
+    if (old_index < 0) {
+        gradient_create_new(GRADIENT_CONFIG_VERTICAL);
+        return;
+    }
+
+    GradientConfig *g_old = (GradientConfig *)g_list_nth(gradients, (guint)old_index)->data;
+
+    int index = get_model_length(GTK_TREE_MODEL(gradient_ids));
+
+    GradientConfig *g = (GradientConfig *)calloc(1, sizeof(GradientConfig));
+    g->type = g_old->type;
+    g->start_color = g_old->start_color;
+    g->end_color = g_old->end_color;
+    g->extra_color_stops = g_list_copy_deep(g->extra_color_stops, copy_GradientConfigColorStop, NULL);
+    gradients = g_list_append(gradients, g);
+    GtkTreeIter iter;
+    gtk_list_store_append(gradient_ids, &iter);
+    gtk_list_store_set(gradient_ids, &iter, grColPixbuf, NULL, grColId, &index, grColText, "", -1);
+
+    gradient_update_image(index);
+    gtk_combo_box_set_active(GTK_COMBO_BOX(current_gradient), index);
+    current_gradient_changed(0, 0);
+}
+
+void gradient_delete(GtkWidget *widget, gpointer data)
+{
+    int index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient));
+    if (index < 0)
+        return;
+
+    if (get_model_length(GTK_TREE_MODEL(gradient_ids)) <= 1)
+        return;
+
+    GtkTreePath *path;
+    GtkTreeIter iter;
+
+    path = gtk_tree_path_new_from_indices(index, -1);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(gradient_ids), &iter, path);
+    gtk_tree_path_free(path);
+
+    gradients = g_list_remove(gradients, g_list_nth(gradients, (guint)index)->data);
+    gtk_list_store_remove(gradient_ids, &iter);
+
+    background_update_for_gradient(index);
+
+    if (index >= get_model_length(GTK_TREE_MODEL(gradient_ids)))
+        index--;
+    gtk_combo_box_set_active(GTK_COMBO_BOX(current_gradient), index);
+}
+
+void gradient_draw(cairo_t *c, GradientConfig *g, int w, int h, gboolean preserve)
+{
+    cairo_pattern_t *gpat;
+    if (g->type == GRADIENT_CONFIG_VERTICAL)
+        gpat = cairo_pattern_create_linear(0, 0, 0, h);
+    else if (g->type == GRADIENT_CONFIG_HORIZONTAL)
+        gpat = cairo_pattern_create_linear(0, 0, w, 0);
+    else
+        gpat = cairo_pattern_create_radial(w / 2, h / 2, 0, w / 2, h / 2, sqrt(w * w + h * h) / 2);
+    cairo_pattern_add_color_stop_rgba(gpat,
+                                      0.0,
+                                      g->start_color.color.rgb[0],
+                                      g->start_color.color.rgb[1],
+                                      g->start_color.color.rgb[2],
+                                      g->start_color.color.alpha);
+    for (GList *l = g->extra_color_stops; l; l = l->next) {
+        GradientConfigColorStop *stop = (GradientConfigColorStop *)l->data;
+        cairo_pattern_add_color_stop_rgba(gpat,
+                                          stop->offset,
+                                          stop->color.rgb[0],
+                                          stop->color.rgb[1],
+                                          stop->color.rgb[2],
+                                          stop->color.alpha);
+    }
+    cairo_pattern_add_color_stop_rgba(gpat,
+                                      1.0,
+                                      g->end_color.color.rgb[0],
+                                      g->end_color.color.rgb[1],
+                                      g->end_color.color.rgb[2],
+                                      g->end_color.color.alpha);
+    cairo_set_source(c, gpat);
+    cairo_rectangle(c, 0, 0, w, h);
+    if (preserve)
+        cairo_fill_preserve(c);
+    else
+        cairo_fill(c);
+    cairo_pattern_destroy(gpat);
+}
+
+void gradient_update_image(int index)
+{
+    GradientConfig *g = (GradientConfig *)g_list_nth(gradients, (guint)index)->data;
+
+    int w = 70;
+    int h = 30;
+    GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24);
+
+    cairo_t *cr = gdk_cairo_create(pixmap);
+    cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
+    cairo_rectangle(cr, 0, 0, w, h);
+    cairo_fill(cr);
+
+    gradient_draw(cr, g, w, h, FALSE);
+
+    GdkPixbuf *pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, gdk_colormap_get_system(), 0, 0, 0, 0, w, h);
+    if (pixmap)
+        g_object_unref(pixmap);
+
+    GtkTreePath *path;
+    GtkTreeIter iter;
+
+    path = gtk_tree_path_new_from_indices(index, -1);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(gradient_ids), &iter, path);
+    gtk_tree_path_free(path);
+
+    gtk_list_store_set(gradient_ids, &iter, grColPixbuf, pixbuf, -1);
+    if (pixbuf)
+        g_object_unref(pixbuf);
+}
+
+void gradient_force_update()
+{
+    gradient_update(NULL, NULL);
+}
+
+static gboolean gradient_updates_disabled = FALSE;
+void gradient_update(GtkWidget *widget, gpointer data)
+{
+    if (gradient_updates_disabled)
+        return;
+    int index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient));
+    if (index <= 0)
+        return;
+
+    GtkTreePath *path;
+    GtkTreeIter iter;
+
+    path = gtk_tree_path_new_from_indices(index, -1);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(gradient_ids), &iter, path);
+    gtk_tree_path_free(path);
+
+    GradientConfig *g = (GradientConfig *)g_list_nth(gradients, (guint)index)->data;
+
+    g->type = (GradientConfigType)MAX(0, gtk_combo_box_get_active(GTK_COMBO_BOX(gradient_combo_type)));
+
+    GdkColor color;
+    int opacity;
+
+    gtk_color_button_get_color(GTK_COLOR_BUTTON(gradient_start_color), &color);
+    opacity = MIN(100, 0.5 + gtk_color_button_get_alpha(GTK_COLOR_BUTTON(gradient_start_color)) * 100.0 / 0xffff);
+    gdkColor2CairoColor(color, &g->start_color.color.rgb[0], &g->start_color.color.rgb[1], &g->start_color.color.rgb[2]);
+    g->start_color.color.alpha = opacity / 100.0;
+
+    gtk_color_button_get_color(GTK_COLOR_BUTTON(gradient_end_color), &color);
+    opacity = MIN(100, 0.5 + gtk_color_button_get_alpha(GTK_COLOR_BUTTON(gradient_end_color)) * 100.0 / 0xffff);
+    gdkColor2CairoColor(color, &g->end_color.color.rgb[0], &g->end_color.color.rgb[1], &g->end_color.color.rgb[2]);
+    g->end_color.color.alpha = opacity / 100.0;
+
+    gtk_list_store_set(gradient_ids, &iter, grColPixbuf, NULL, grColId, &index, grColText, "", -1);
+    gradient_update_image(index);
+    background_update_for_gradient(index);
+}
+
+void current_gradient_changed(GtkWidget *widget, gpointer data)
+{
+    int index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient));
+    if (index < 0)
+        return;
+
+    gtk_widget_set_sensitive(gradient_combo_type, index > 0);
+    gtk_widget_set_sensitive(gradient_start_color, index > 0);
+    gtk_widget_set_sensitive(gradient_end_color, index > 0);
+    gtk_widget_set_sensitive(current_gradient_stop, index > 0);
+    gtk_widget_set_sensitive(gradient_stop_color, index > 0);
+    gtk_widget_set_sensitive(gradient_stop_offset, index > 0);
+
+    gradient_updates_disabled = TRUE;
+
+    GradientConfig *g = (GradientConfig *)g_list_nth(gradients, (guint)index)->data;
+
+    gtk_combo_box_set_active(GTK_COMBO_BOX(gradient_combo_type), g->type);
+
+    GdkColor color;
+    int opacity;
+
+    cairoColor2GdkColor(g->start_color.color.rgb[0], g->start_color.color.rgb[1], g->start_color.color.rgb[2], &color);
+    opacity = g->start_color.color.alpha * 65535;
+    gtk_color_button_set_color(GTK_COLOR_BUTTON(gradient_start_color), &color);
+    gtk_color_button_set_alpha(GTK_COLOR_BUTTON(gradient_start_color), opacity);
+
+    cairoColor2GdkColor(g->end_color.color.rgb[0], g->end_color.color.rgb[1], g->end_color.color.rgb[2], &color);
+    opacity = g->end_color.color.alpha * 65535;
+    gtk_color_button_set_color(GTK_COLOR_BUTTON(gradient_end_color), &color);
+    gtk_color_button_set_alpha(GTK_COLOR_BUTTON(gradient_end_color), opacity);
+
+    int old_stop_index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient_stop));
+    gtk_list_store_clear(gradient_stop_ids);
+    int stop_index = 0;
+    for (GList *l = g->extra_color_stops; l; l = l->next, stop_index++) {
+        GtkTreeIter iter;
+        gtk_list_store_append(gradient_stop_ids, &iter);
+        gtk_list_store_set(gradient_stop_ids, &iter, grStopColPixbuf, NULL, -1);
+        gradient_stop_update_image(stop_index);
+    }
+    if (old_stop_index >= 0 && old_stop_index < stop_index)
+        gtk_combo_box_set_active(GTK_COMBO_BOX(current_gradient_stop), old_stop_index);
+    else
+        gtk_combo_box_set_active(GTK_COMBO_BOX(current_gradient_stop), stop_index - 1);
+
+    gradient_updates_disabled = FALSE;
+    gradient_update_image(index);
+}
+
+//////// Gradient stops
+
+GtkWidget *create_gradient_stop_combo()
+{
+    GtkWidget *combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(gradient_stop_ids));
+    GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new();
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, FALSE);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer, "pixbuf", grStopColPixbuf, NULL);
+    return combo;
+}
+
+void gradient_stop_create_new()
+{
+    int g_index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient));
+    if (g_index < 0)
+        return;
+
+    GradientConfig *g = (GradientConfig *)g_list_nth(gradients, (guint)g_index)->data;
+    GradientConfigColorStop *stop = (GradientConfigColorStop *)calloc(1, sizeof(GradientConfigColorStop));
+    if (g->extra_color_stops)
+        memcpy(stop, g_list_last(g->extra_color_stops)->data, sizeof(GradientConfigColorStop));
+    else
+        memcpy(stop, &g->start_color, sizeof(GradientConfigColorStop));
+    g->extra_color_stops = g_list_append(g->extra_color_stops, stop);
+    GtkTreeIter iter;
+    gtk_list_store_append(gradient_stop_ids, &iter);
+    gtk_list_store_set(gradient_stop_ids, &iter, grStopColPixbuf, NULL, -1);
+
+    int stop_index = g_list_length(g->extra_color_stops) - 1;
+    gradient_stop_update_image(stop_index);
+    gtk_combo_box_set_active(GTK_COMBO_BOX(current_gradient_stop), stop_index);
+    current_gradient_stop_changed(0, 0);
+    gradient_update_image(g_index);
+    background_update_for_gradient(g_index);
+}
+
+void gradient_stop_duplicate(GtkWidget *widget, gpointer data)
+{
+    gradient_stop_create_new();
+}
+
+void gradient_stop_delete(GtkWidget *widget, gpointer data)
+{
+    int g_index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient));
+    if (g_index < 0)
+        return;
+
+    GradientConfig *g = (GradientConfig *)g_list_nth(gradients, (guint)g_index)->data;
+    if (!g->extra_color_stops)
+        return;
+
+    int index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient_stop));
+    if (index < 0)
+        return;
+
+    GtkTreePath *path;
+    GtkTreeIter iter;
+
+    path = gtk_tree_path_new_from_indices(index, -1);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(gradient_stop_ids), &iter, path);
+    gtk_tree_path_free(path);
+
+    g->extra_color_stops = g_list_remove(g->extra_color_stops, g_list_nth(g->extra_color_stops, (guint)index)->data);
+    gtk_list_store_remove(gradient_stop_ids, &iter);
+
+    if (index >= get_model_length(GTK_TREE_MODEL(gradient_stop_ids)))
+        index--;
+    gtk_combo_box_set_active(GTK_COMBO_BOX(current_gradient_stop), index);
+
+    gradient_update_image(g_index);
+    background_update_for_gradient(g_index);
+}
+
+void gradient_stop_update_image(int index)
+{
+    int g_index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient));
+    if (g_index < 0)
+        return;
+    GradientConfig *g = (GradientConfig *)g_list_nth(gradients, (guint)g_index)->data;
+    GradientConfigColorStop *stop = (GradientConfigColorStop *)g_list_nth(g->extra_color_stops, (guint)index)->data;
+
+    int w = 70;
+    int h = 30;
+    GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24);
+
+    cairo_t *cr = gdk_cairo_create(pixmap);
+    cairo_set_source_rgba(cr, stop->color.rgb[0], stop->color.rgb[1], stop->color.rgb[2], stop->color.alpha);
+    cairo_rectangle(cr, 0, 0, w, h);
+    cairo_fill(cr);
+
+    GdkPixbuf *pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, gdk_colormap_get_system(), 0, 0, 0, 0, w, h);
+    if (pixmap)
+        g_object_unref(pixmap);
+
+    GtkTreePath *path;
+    GtkTreeIter iter;
+
+    path = gtk_tree_path_new_from_indices(index, -1);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(gradient_stop_ids), &iter, path);
+    gtk_tree_path_free(path);
+
+    gtk_list_store_set(gradient_stop_ids, &iter, grStopColPixbuf, pixbuf, -1);
+    if (pixbuf)
+        g_object_unref(pixbuf);
+}
+
+void current_gradient_stop_changed(GtkWidget *widget, gpointer data)
+{
+    int g_index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient));
+    if (g_index < 0)
+        return;
+    GradientConfig *g = (GradientConfig *)g_list_nth(gradients, (guint)g_index)->data;
+
+    int index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient_stop));
+    if (index < 0)
+        return;
+
+    GradientConfigColorStop *stop = (GradientConfigColorStop *)g_list_nth(g->extra_color_stops, (guint)index)->data;
+
+    gradient_updates_disabled = TRUE;
+
+    GdkColor color;
+    int opacity;
+
+    cairoColor2GdkColor(stop->color.rgb[0], stop->color.rgb[1], stop->color.rgb[2], &color);
+    opacity = stop->color.alpha * 65535;
+    gtk_color_button_set_color(GTK_COLOR_BUTTON(gradient_stop_color), &color);
+    gtk_color_button_set_alpha(GTK_COLOR_BUTTON(gradient_stop_color), opacity);
+
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(gradient_stop_offset), stop->offset * 100);
+
+    gradient_updates_disabled = FALSE;
+}
+
+void gradient_stop_update(GtkWidget *widget, gpointer data)
+{
+    if (gradient_updates_disabled)
+        return;
+
+    int g_index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient));
+    if (g_index < 0)
+        return;
+    GradientConfig *g = (GradientConfig *)g_list_nth(gradients, (guint)g_index)->data;
+
+    int index = gtk_combo_box_get_active(GTK_COMBO_BOX(current_gradient_stop));
+    if (index < 0)
+        return;
+
+    GradientConfigColorStop *stop = (GradientConfigColorStop *)g_list_nth(g->extra_color_stops, (guint)index)->data;
+
+    GdkColor color;
+    int opacity;
+
+    gtk_color_button_get_color(GTK_COLOR_BUTTON(gradient_stop_color), &color);
+    opacity = MIN(100, 0.5 + gtk_color_button_get_alpha(GTK_COLOR_BUTTON(gradient_stop_color)) * 100.0 / 0xffff);
+    gdkColor2CairoColor(color, &stop->color.rgb[0], &stop->color.rgb[1], &stop->color.rgb[2]);
+    stop->color.alpha = opacity / 100.0;
+
+    stop->offset = gtk_spin_button_get_value(GTK_SPIN_BUTTON(gradient_stop_offset)) / 100.;
+
+    gradient_stop_update_image(index);
+    gradient_update_image(g_index);
+    background_update_for_gradient(g_index);
+}

src/tint2conf/gradient_gui.h

@@ -0,0 +1,47 @@
+#ifndef GRADIENT_GUI_H
+#define GRADIENT_GUI_H
+
+#include "gui.h"
+
+int gradient_index_safe(int index);
+void create_gradient(GtkWidget *parent);
+GtkWidget *create_gradient_combo();
+void gradient_duplicate(GtkWidget *widget, gpointer data);
+void gradient_delete(GtkWidget *widget, gpointer data);
+void gradient_update_image(int index);
+void gradient_update(GtkWidget *widget, gpointer data);
+void gradient_force_update();
+void current_gradient_changed(GtkWidget *widget, gpointer data);
+void background_update_for_gradient(int gradient_id);
+
+GtkWidget *create_gradient_stop_combo();
+void gradient_stop_duplicate(GtkWidget *widget, gpointer data);
+void gradient_stop_delete(GtkWidget *widget, gpointer data);
+void gradient_stop_update(GtkWidget *widget, gpointer data);
+void gradient_stop_update_image(int index);
+void current_gradient_stop_changed(GtkWidget *widget, gpointer data);
+
+typedef enum GradientConfigType {
+    GRADIENT_CONFIG_VERTICAL = 0,
+    GRADIENT_CONFIG_HORIZONTAL,
+    GRADIENT_CONFIG_RADIAL
+} GradientConfigType;
+
+typedef struct GradientConfigColorStop {
+    Color color;
+    // offset in 0-1
+    double offset;
+} GradientConfigColorStop;
+
+typedef struct GradientConfig {
+    GradientConfigType type;
+    GradientConfigColorStop start_color;
+    GradientConfigColorStop end_color;
+    // Each element is a GradientConfigColorStop
+    GList *extra_color_stops;
+} GradientConfig;
+
+void gradient_create_new(GradientConfigType t);
+void gradient_draw(cairo_t *c, GradientConfig *g, int w, int h, gboolean preserve);
+
+#endif

src/tint2conf/gui.h

@@ -0,0 +1,20 @@
+#include <limits.h>
+#include <stdlib.h>
+
+#include "main.h"
+#include "properties.h"
+#include "properties_rw.h"
+#include "../launcher/apps-common.h"
+#include "../launcher/icon-theme-common.h"
+#include "../util/common.h"
+#include "strnatcmp.h"
+
+#define ROW_SPACING 10
+#define COL_SPACING 8
+#define DEFAULT_HOR_SPACING 5
+
+gint compare_strings(gconstpointer a, gconstpointer b);
+void change_paragraph(GtkWidget *widget);
+int get_model_length(GtkTreeModel *model);
+void gdkColor2CairoColor(GdkColor color, double *red, double *green, double *blue);
+void cairoColor2GdkColor(double red, double green, double blue, GdkColor *color);

src/tint2conf/main.h

@@ -15,5 +15,7 @@
 #endif
 
 #define SNAPSHOT_TICK 190
-gboolean update_snapshot();
+gboolean update_snapshot(gpointer ignored);
-void menuApply();
+void menuApply();
+void refresh_current_theme();
+extern GtkWidget *g_window;

src/tint2conf/md4.c

@@ -0,0 +1,271 @@
+/*
+ * Cryptographic API.
+ *
+ * MD4 Message Digest Algorithm (RFC1320).
+ *
+ * Implementation derived from Andrew Tridgell and Steve French's
+ * CIFS MD4 implementation, and the cryptoapi implementation
+ * originally based on the public domain implementation written
+ * by Colin Plumb in 1993.
+ *
+ * Copyright (c) Andrew Tridgell 1997-1998.
+ * Modified by Steve French (sfrench@us.ibm.com) 2002
+ * Copyright (c) Cryptoapi developers.
+ * Copyright (c) 2002 David S. Miller (davem@redhat.com)
+ * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+
+#include <arpa/inet.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+typedef u_int8_t u8;
+typedef u_int32_t u32;
+typedef u_int64_t u64;
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+
+#define shash_desc md4_ctx
+#define shash_desc_ctx(x) (x)
+
+#define MD4_DIGEST_SIZE 16
+#define MD4_HMAC_BLOCK_SIZE 64
+#define MD4_BLOCK_WORDS 16
+#define MD4_HASH_WORDS 4
+
+struct md4_ctx {
+    u32 hash[MD4_HASH_WORDS];
+    u32 block[MD4_BLOCK_WORDS];
+    u64 byte_count;
+};
+
+static inline u32 lshift(u32 x, unsigned int s)
+{
+    x &= 0xFFFFFFFF;
+    return ((x << s) & 0xFFFFFFFF) | (x >> (32 - s));
+}
+
+static inline u32 F(u32 x, u32 y, u32 z)
+{
+    return (x & y) | ((~x) & z);
+}
+
+static inline u32 G(u32 x, u32 y, u32 z)
+{
+    return (x & y) | (x & z) | (y & z);
+}
+
+static inline u32 H(u32 x, u32 y, u32 z)
+{
+    return x ^ y ^ z;
+}
+
+#define ROUND1(a, b, c, d, k, s) (a = lshift(a + F(b, c, d) + k, s))
+#define ROUND2(a, b, c, d, k, s) (a = lshift(a + G(b, c, d) + k + (u32)0x5A827999, s))
+#define ROUND3(a, b, c, d, k, s) (a = lshift(a + H(b, c, d) + k + (u32)0x6ED9EBA1, s))
+
+/* XXX: this stuff can be optimized */
+static inline void le32_to_cpu_array(u32 *buf, unsigned int words)
+{
+    while (words--) {
+        *buf = ntohl(*buf);
+        buf++;
+    }
+}
+
+static inline void cpu_to_le32_array(u32 *buf, unsigned int words)
+{
+    while (words--) {
+        *buf = htonl(*buf);
+        buf++;
+    }
+}
+
+static void md4_transform(u32 *hash, u32 const *in)
+{
+    u32 a, b, c, d;
+
+    a = hash[0];
+    b = hash[1];
+    c = hash[2];
+    d = hash[3];
+
+    ROUND1(a, b, c, d, in[0], 3);
+    ROUND1(d, a, b, c, in[1], 7);
+    ROUND1(c, d, a, b, in[2], 11);
+    ROUND1(b, c, d, a, in[3], 19);
+    ROUND1(a, b, c, d, in[4], 3);
+    ROUND1(d, a, b, c, in[5], 7);
+    ROUND1(c, d, a, b, in[6], 11);
+    ROUND1(b, c, d, a, in[7], 19);
+    ROUND1(a, b, c, d, in[8], 3);
+    ROUND1(d, a, b, c, in[9], 7);
+    ROUND1(c, d, a, b, in[10], 11);
+    ROUND1(b, c, d, a, in[11], 19);
+    ROUND1(a, b, c, d, in[12], 3);
+    ROUND1(d, a, b, c, in[13], 7);
+    ROUND1(c, d, a, b, in[14], 11);
+    ROUND1(b, c, d, a, in[15], 19);
+
+    ROUND2(a, b, c, d, in[0], 3);
+    ROUND2(d, a, b, c, in[4], 5);
+    ROUND2(c, d, a, b, in[8], 9);
+    ROUND2(b, c, d, a, in[12], 13);
+    ROUND2(a, b, c, d, in[1], 3);
+    ROUND2(d, a, b, c, in[5], 5);
+    ROUND2(c, d, a, b, in[9], 9);
+    ROUND2(b, c, d, a, in[13], 13);
+    ROUND2(a, b, c, d, in[2], 3);
+    ROUND2(d, a, b, c, in[6], 5);
+    ROUND2(c, d, a, b, in[10], 9);
+    ROUND2(b, c, d, a, in[14], 13);
+    ROUND2(a, b, c, d, in[3], 3);
+    ROUND2(d, a, b, c, in[7], 5);
+    ROUND2(c, d, a, b, in[11], 9);
+    ROUND2(b, c, d, a, in[15], 13);
+
+    ROUND3(a, b, c, d, in[0], 3);
+    ROUND3(d, a, b, c, in[8], 9);
+    ROUND3(c, d, a, b, in[4], 11);
+    ROUND3(b, c, d, a, in[12], 15);
+    ROUND3(a, b, c, d, in[2], 3);
+    ROUND3(d, a, b, c, in[10], 9);
+    ROUND3(c, d, a, b, in[6], 11);
+    ROUND3(b, c, d, a, in[14], 15);
+    ROUND3(a, b, c, d, in[1], 3);
+    ROUND3(d, a, b, c, in[9], 9);
+    ROUND3(c, d, a, b, in[5], 11);
+    ROUND3(b, c, d, a, in[13], 15);
+    ROUND3(a, b, c, d, in[3], 3);
+    ROUND3(d, a, b, c, in[11], 9);
+    ROUND3(c, d, a, b, in[7], 11);
+    ROUND3(b, c, d, a, in[15], 15);
+
+    hash[0] += a;
+    hash[1] += b;
+    hash[2] += c;
+    hash[3] += d;
+}
+
+static inline void md4_transform_helper(struct md4_ctx *ctx)
+{
+    le32_to_cpu_array(ctx->block, ARRAY_SIZE(ctx->block));
+    md4_transform(ctx->hash, ctx->block);
+}
+
+static int md4_init(struct shash_desc *desc)
+{
+    struct md4_ctx *mctx = shash_desc_ctx(desc);
+
+    mctx->hash[0] = 0x67452301;
+    mctx->hash[1] = 0xefcdab89;
+    mctx->hash[2] = 0x98badcfe;
+    mctx->hash[3] = 0x10325476;
+    mctx->byte_count = 0;
+
+    return 0;
+}
+
+static int md4_update(struct shash_desc *desc, const u8 *data, unsigned int len)
+{
+    struct md4_ctx *mctx = shash_desc_ctx(desc);
+    const u32 avail = sizeof(mctx->block) - (mctx->byte_count & 0x3f);
+
+    mctx->byte_count += len;
+
+    if (avail > len) {
+        memcpy((char *)mctx->block + (sizeof(mctx->block) - avail), data, len);
+        return 0;
+    }
+
+    memcpy((char *)mctx->block + (sizeof(mctx->block) - avail), data, avail);
+
+    md4_transform_helper(mctx);
+    data += avail;
+    len -= avail;
+
+    while (len >= sizeof(mctx->block)) {
+        memcpy(mctx->block, data, sizeof(mctx->block));
+        md4_transform_helper(mctx);
+        data += sizeof(mctx->block);
+        len -= sizeof(mctx->block);
+    }
+
+    memcpy(mctx->block, data, len);
+
+    return 0;
+}
+
+static int md4_final(struct shash_desc *desc, u8 *out)
+{
+    struct md4_ctx *mctx = shash_desc_ctx(desc);
+    const unsigned int offset = mctx->byte_count & 0x3f;
+    char *p = (char *)mctx->block + offset;
+    int padding = 56 - (offset + 1);
+
+    *p++ = 0x80;
+    if (padding < 0) {
+        memset(p, 0x00, padding + sizeof(u64));
+        md4_transform_helper(mctx);
+        p = (char *)mctx->block;
+        padding = 56;
+    }
+
+    memset(p, 0, padding);
+    mctx->block[14] = mctx->byte_count << 3;
+    mctx->block[15] = mctx->byte_count >> 29;
+    le32_to_cpu_array(mctx->block, (sizeof(mctx->block) - sizeof(u64)) / sizeof(u32));
+    md4_transform(mctx->hash, mctx->block);
+    cpu_to_le32_array(mctx->hash, ARRAY_SIZE(mctx->hash));
+    memcpy(out, mctx->hash, sizeof(mctx->hash));
+    memset(mctx, 0, sizeof(*mctx));
+
+    return 0;
+}
+
+static char to_hex(u8 v)
+{
+    v = v & 0xf;
+    if (v < 0xa)
+        return '0' + v;
+    return 'a' + v - 0xa;
+}
+
+void md4hexf(const char *path, char *hash)
+{
+    struct md4_ctx mctx;
+    md4_init(&mctx);
+
+    int fd = open(path, O_RDONLY);
+    if (fd >= 0) {
+        u8 buffer[MD4_HMAC_BLOCK_SIZE];
+        while (1) {
+            ssize_t count = read(fd, buffer, sizeof(buffer));
+            if (count <= 0)
+                break;
+            md4_update(&mctx, buffer, (unsigned)count);
+        }
+        close(fd);
+    }
+
+    u8 out[MD4_DIGEST_SIZE];
+    md4_final(&mctx, out);
+
+    for (int i = 0; i < MD4_DIGEST_SIZE; i++) {
+        hash[2 * i + 0] = to_hex(out[i] >> 4);
+        hash[2 * i + 1] = to_hex(out[i] & 0xf);
+    }
+    hash[2 * MD4_DIGEST_SIZE] = 0;
+}

src/tint2conf/md4.h

@@ -0,0 +1,7 @@
+#ifndef MD4_H
+#define MD4_H
+
+#define MD4_HEX_SIZE 33
+void md4hexf(const char *path, char *hash);
+
+#endif

src/tint2conf/po/CMakeLists.txt

@@ -11,7 +11,7 @@ if (GETTEXT_FOUND)
         foreach(LANG ${LANGUAGES})
             GETTEXT_PROCESS_PO_FILES(${LANG} ALL PO_FILES ${LANG}.po)
             install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo"
-                    DESTINATION "${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale/${LANG}/LC_MESSAGES"
+                    DESTINATION "${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES"
                     RENAME "${GETTEXT_PACKAGE}.mo")
             endforeach ()
     endif()

src/tint2conf/properties.h

@@ -8,22 +8,20 @@
 
 #include "../launcher/icon-theme-common.h"
 
-
 // panel
-extern GtkWidget *panel_width, *panel_height, *panel_margin_x, *panel_margin_y, *panel_padding_x, *panel_padding_y, *panel_spacing;
+extern GtkWidget *panel_width, *panel_height, *panel_margin_x, *panel_margin_y, *panel_padding_x, *panel_padding_y,
-extern GtkWidget *panel_wm_menu, *panel_dock, *panel_autohide, *panel_autohide_show_time, *panel_autohide_hide_time, *panel_autohide_size;
+    *panel_spacing;
-extern GtkWidget *panel_combo_strut_policy, *panel_combo_layer, *panel_combo_width_type, *panel_combo_height_type, *panel_combo_monitor;
+extern GtkWidget *panel_wm_menu, *panel_dock, *panel_autohide, *panel_autohide_show_time, *panel_autohide_hide_time,
+    *panel_autohide_size;
+extern GtkWidget *panel_combo_strut_policy, *panel_combo_layer, *panel_combo_width_type, *panel_combo_height_type,
+    *panel_combo_monitor;
 extern GtkWidget *panel_window_name, *disable_transparency;
 extern GtkWidget *panel_mouse_effects;
 extern GtkWidget *mouse_hover_icon_opacity, *mouse_hover_icon_saturation, *mouse_hover_icon_brightness;
 extern GtkWidget *mouse_pressed_icon_opacity, *mouse_pressed_icon_saturation, *mouse_pressed_icon_brightness;
-extern GtkWidget *panel_primary_monitor_first;
+extern GtkWidget *panel_primary_monitor_first, *panel_shrink;
 
-enum {
+enum { itemsColName = 0, itemsColValue, itemsNumCols };
-	itemsColName = 0,
-	itemsColValue,
-	itemsNumCols
-};
 extern GtkListStore *panel_items, *all_items;
 extern GtkWidget *panel_items_view, *all_items_view;
 char *get_panel_items();
@@ -52,43 +50,34 @@ extern GtkWidget *panel_background;
 // taskbar
 extern GtkWidget *taskbar_show_desktop, *taskbar_show_name, *taskbar_padding_x, *taskbar_padding_y, *taskbar_spacing;
 extern GtkWidget *taskbar_hide_inactive_tasks, *taskbar_hide_diff_monitor;
-extern GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color, *taskbar_name_active_color;
+extern GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color,
+    *taskbar_name_active_color;
 extern GtkWidget *taskbar_name_font, *taskbar_name_font_set;
 extern GtkWidget *taskbar_active_background, *taskbar_inactive_background;
 extern GtkWidget *taskbar_name_active_background, *taskbar_name_inactive_background;
-extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment, *taskbar_always_show_all_desktop_tasks;
+extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment,
+    *taskbar_always_show_all_desktop_tasks;
+extern GtkWidget *taskbar_hide_empty;
 
 // task
-extern GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down;
+extern GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up,
+    *task_mouse_scroll_down;
 extern GtkWidget *task_show_icon, *task_show_text, *task_align_center, *font_shadow;
 extern GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_spacing;
 extern GtkWidget *task_font, *task_font_set;
-extern GtkWidget *task_default_color, *task_default_color_set,
+extern GtkWidget *task_default_color, *task_default_color_set, *task_default_icon_opacity, *task_default_icon_osb_set,
-		  *task_default_icon_opacity, *task_default_icon_osb_set,
+    *task_default_icon_saturation, *task_default_icon_brightness, *task_default_background,
-		  *task_default_icon_saturation,
+    *task_default_background_set;
-		  *task_default_icon_brightness,
+extern GtkWidget *task_normal_color, *task_normal_color_set, *task_normal_icon_opacity, *task_normal_icon_osb_set,
-		  *task_default_background, *task_default_background_set;
+    *task_normal_icon_saturation, *task_normal_icon_brightness, *task_normal_background, *task_normal_background_set;
-extern GtkWidget *task_normal_color, *task_normal_color_set,
+extern GtkWidget *task_active_color, *task_active_color_set, *task_active_icon_opacity, *task_active_icon_osb_set,
-		  *task_normal_icon_opacity, *task_normal_icon_osb_set,
+    *task_active_icon_saturation, *task_active_icon_brightness, *task_active_background, *task_active_background_set;
-		  *task_normal_icon_saturation,
+extern GtkWidget *task_urgent_color, *task_urgent_color_set, *task_urgent_icon_opacity, *task_urgent_icon_osb_set,
-		  *task_normal_icon_brightness,
+    *task_urgent_icon_saturation, *task_urgent_icon_brightness, *task_urgent_background, *task_urgent_background_set;
-		  *task_normal_background, *task_normal_background_set;
-extern GtkWidget *task_active_color, *task_active_color_set,
-		  *task_active_icon_opacity, *task_active_icon_osb_set,
-		  *task_active_icon_saturation,
-		  *task_active_icon_brightness,
-		  *task_active_background, *task_active_background_set;
-extern GtkWidget *task_urgent_color, *task_urgent_color_set,
-		  *task_urgent_icon_opacity, *task_urgent_icon_osb_set,
-		  *task_urgent_icon_saturation,
-		  *task_urgent_icon_brightness,
-		  *task_urgent_background, *task_urgent_background_set;
 extern GtkWidget *task_urgent_blinks;
-extern GtkWidget *task_iconified_color, *task_iconified_color_set,
+extern GtkWidget *task_iconified_color, *task_iconified_color_set, *task_iconified_icon_opacity,
-		  *task_iconified_icon_opacity, *task_iconified_icon_osb_set,
+    *task_iconified_icon_osb_set, *task_iconified_icon_saturation, *task_iconified_icon_brightness,
-		  *task_iconified_icon_saturation,
+    *task_iconified_background, *task_iconified_background_set;
-		  *task_iconified_icon_brightness,
-		  *task_iconified_background, *task_iconified_background_set;
 
 // clock
 extern GtkWidget *clock_format_line1, *clock_format_line2, *clock_tmz_line1, *clock_tmz_line2;
@@ -101,16 +90,18 @@ extern GtkWidget *clock_background;
 // battery
 extern GtkWidget *battery_hide_if_higher, *battery_alert_if_lower, *battery_alert_cmd;
 extern GtkWidget *battery_padding_x, *battery_padding_y;
-extern GtkWidget *battery_font_line1, *battery_font_line1_set, *battery_font_line2, *battery_font_line2_set, *battery_font_color;
+extern GtkWidget *battery_font_line1, *battery_font_line1_set, *battery_font_line2, *battery_font_line2_set,
+    *battery_font_color;
 extern GtkWidget *battery_background;
 extern GtkWidget *battery_tooltip;
-extern GtkWidget *battery_left_command, *battery_mclick_command, *battery_right_command, *battery_uwheel_command, *battery_dwheel_command;
+extern GtkWidget *battery_left_command, *battery_mclick_command, *battery_right_command, *battery_uwheel_command,
+    *battery_dwheel_command;
 extern GtkWidget *ac_connected_cmd, *ac_disconnected_cmd;
 
 // systray
 extern GtkWidget *systray_icon_order, *systray_padding_x, *systray_padding_y, *systray_spacing;
 extern GtkWidget *systray_icon_size, *systray_icon_opacity, *systray_icon_saturation, *systray_icon_brightness;
-extern GtkWidget *systray_background, *systray_monitor;
+extern GtkWidget *systray_background, *systray_monitor, *systray_name_filter;
 
 // tooltip
 extern GtkWidget *tooltip_padding_x, *tooltip_padding_y, *tooltip_font, *tooltip_font_set, *tooltip_font_color;
@@ -118,31 +109,57 @@ extern GtkWidget *tooltip_task_show, *tooltip_show_after, *tooltip_hide_after;
 extern GtkWidget *clock_format_tooltip, *clock_tmz_tooltip;
 extern GtkWidget *tooltip_background;
 
+// Separator
+typedef struct Separator {
+    char name[256];
+    GtkWidget *container;
+    GtkWidget *page_separator;
+    GtkWidget *page_label;
+    GtkWidget *separator_background;
+    GtkWidget *separator_color;
+    GtkWidget *separator_style;
+    GtkWidget *separator_size;
+    GtkWidget *separator_padding_x;
+    GtkWidget *separator_padding_y;
+} Separator;
+
+extern GArray *separators;
+
 // Executor
 typedef struct Executor {
-	char name[256];
+    char name[256];
-	GtkWidget *container;
+    GtkWidget *container;
-	GtkWidget *page_execp;
+    GtkWidget *page_execp;
-	GtkWidget *page_label;
+    GtkWidget *page_label;
-	GtkWidget *execp_command, *execp_interval, *execp_has_icon, *execp_cache_icon, *execp_show_tooltip;
+    GtkWidget *execp_command, *execp_interval, *execp_has_icon, *execp_cache_icon, *execp_show_tooltip;
-	GtkWidget *execp_continuous, *execp_markup, *execp_tooltip;
+    GtkWidget *execp_continuous, *execp_markup, *execp_tooltip;
-	GtkWidget *execp_left_command, *execp_right_command;
+    GtkWidget *execp_left_command, *execp_right_command;
-	GtkWidget *execp_mclick_command, *execp_rclick_command, *execp_uwheel_command, *execp_dwheel_command;
+    GtkWidget *execp_mclick_command, *execp_rclick_command, *execp_uwheel_command, *execp_dwheel_command;
-	GtkWidget *execp_font, *execp_font_set, *execp_font_color, *execp_padding_x, *execp_padding_y, *execp_centered;
+    GtkWidget *execp_font, *execp_font_set, *execp_font_color, *execp_padding_x, *execp_padding_y, *execp_centered;
-	GtkWidget *execp_background, *execp_icon_w, *execp_icon_h;
+    GtkWidget *execp_background, *execp_icon_w, *execp_icon_h;
 } Executor;
 
 extern GArray *executors;
 
+// Button
+typedef struct Button {
+    char name[256];
+    GtkWidget *container;
+    GtkWidget *page_button;
+    GtkWidget *page_label;
+    GtkWidget *button_icon, *button_text, *button_tooltip;
+    GtkWidget *button_left_command, *button_right_command;
+    GtkWidget *button_mclick_command, *button_rclick_command, *button_uwheel_command, *button_dwheel_command;
+    GtkWidget *button_font, *button_font_set, *button_font_color, *button_padding_x, *button_padding_y,
+        *button_centered;
+    GtkWidget *button_background, *button_max_icon_size;
+} Button;
+
+extern GArray *buttons;
+
 // launcher
 
-enum {
+enum { appsColIcon = 0, appsColIconName, appsColText, appsColPath, appsNumCols };
-	appsColIcon = 0,
-	appsColIconName,
-	appsColText,
-	appsColPath,
-	appsNumCols
-};
 
 extern GtkListStore *launcher_apps, *all_apps;
 extern GtkWidget *launcher_apps_view, *all_apps_view;
@@ -163,35 +180,49 @@ gchar *get_current_icon_theme();
 
 // background
 enum {
-	bgColPixbuf = 0,
+    bgColPixbuf = 0,
-	bgColFillColor,
+    bgColFillColor,
-	bgColFillOpacity,
+    bgColFillOpacity,
-	bgColBorderColor,
+    bgColBorderColor,
-	bgColBorderOpacity,
+    bgColBorderOpacity,
-	bgColBorderWidth,
+    bgColGradientId,
-	bgColCornerRadius,
+    bgColBorderWidth,
-	bgColText,
+    bgColCornerRadius,
-	bgColFillColorOver,
+    bgColText,
-	bgColFillOpacityOver,
+    bgColFillColorOver,
-	bgColBorderColorOver,
+    bgColFillOpacityOver,
-	bgColBorderOpacityOver,
+    bgColBorderColorOver,
-	bgColFillColorPress,
+    bgColBorderOpacityOver,
-	bgColFillOpacityPress,
+    bgColGradientIdOver,
-	bgColBorderColorPress,
+    bgColFillColorPress,
-	bgColBorderOpacityPress,
+    bgColFillOpacityPress,
-	bgNumCols
+    bgColBorderColorPress,
+    bgColBorderOpacityPress,
+    bgColGradientIdPress,
+    bgColBorderSidesTop,
+    bgColBorderSidesBottom,
+    bgColBorderSidesLeft,
+    bgColBorderSidesRight,
+    bgNumCols
 };
 
 extern GtkListStore *backgrounds;
-extern GtkWidget *current_background,
+extern GtkWidget *current_background, *background_fill_color, *background_border_color, *background_gradient,
-		  *background_fill_color,
+    *background_fill_color_over, *background_border_color_over, *background_gradient_over, *background_fill_color_press,
-		  *background_border_color,
+    *background_border_color_press, *background_gradient_press, *background_border_width, *background_border_sides_top,
-		  *background_fill_color_over,
+    *background_border_sides_bottom, *background_border_sides_left, *background_border_sides_right,
-		  *background_border_color_over,
+    *background_corner_radius;
-		  *background_fill_color_press,
+
-		  *background_border_color_press,
+// gradients
-		  *background_border_width,
+enum { grColPixbuf = 0, grColId, grColText, grNumCols };
-		  *background_corner_radius;
+
+// gradient color stops
+enum { grStopColPixbuf = 0, grStopNumCols };
+extern GtkListStore *gradient_ids, *gradient_stop_ids;
+extern GList *gradients;
+
+extern GtkWidget *current_gradient, *gradient_combo_type, *gradient_start_color, *gradient_end_color,
+    *current_gradient_stop, *gradient_stop_color, *gradient_stop_offset;
 
 void background_create_new();
 void background_force_update();
@@ -199,9 +230,25 @@ int background_index_safe(int index);
 
 GtkWidget *create_properties();
 
+void separator_create_new();
+Separator *separator_get_last();
+void separator_remove(int i);
+void separator_update_indices();
+
 void execp_create_new();
 Executor *execp_get_last();
 void execp_remove(int i);
 void execp_update_indices();
 
+void button_create_new();
+Button *button_get_last();
+void button_remove(int i);
+void button_update_indices();
+
+void create_please_wait(GtkWindow *parent);
+void process_events();
+void destroy_please_wait();
+
+void hex2gdk(char *hex, GdkColor *color);
+
 #endif

src/tint2conf/properties_rw.h

@@ -3,9 +3,9 @@
 
 #include <gtk/gtk.h>
 
-char *get_current_theme_file_name();
+char *get_current_theme_path();
 gboolean config_is_manual(const char *path);
-void config_read_file (const char *path);
+void config_read_file(const char *path);
 void config_save_file(const char *path);
 
 #endif

src/tint2conf/theme_view.c

@@ -17,163 +17,233 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **************************************************************************/
 
-
 #include "main.h"
+#include "properties.h"
 #include "strnatcmp.h"
 #include "theme_view.h"
+#include "common.h"
+#include "md4.h"
 
 // The data columns that we export via the tree model interface
 GtkWidget *g_theme_view;
-GtkListStore *g_store;
+GtkListStore *theme_list_store;
 int g_width_list, g_height_list;
 GtkCellRenderer *g_renderer;
 
-gint theme_name_compare(GtkTreeModel *model,
+gint theme_name_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data);
-						GtkTreeIter *a,
-						GtkTreeIter *b,
-						gpointer user_data);
 
 GtkWidget *create_view()
 {
-	GtkTreeViewColumn *col;
+    GtkTreeViewColumn *col;
-	GtkCellRenderer *renderer;
+    GtkCellRenderer *renderer;
-	GtkWidget  *view;
 
-	g_store = gtk_list_store_new(NB_COL, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF);
+    theme_list_store = gtk_list_store_new(NB_COL,
+                                          G_TYPE_STRING,
+                                          G_TYPE_STRING,
+                                          GDK_TYPE_PIXBUF,
+                                          G_TYPE_INT,
+                                          G_TYPE_INT,
+                                          G_TYPE_BOOLEAN);
 
-	view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(g_store));
+    GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(theme_list_store));
-	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
+    gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
-	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
 
-	g_object_unref(g_store); // destroy store automatically with view
+    g_object_unref(theme_list_store); // destroy store automatically with view
 
-	renderer = gtk_cell_renderer_text_new();
+    renderer = gtk_cell_renderer_text_new();
-	col = gtk_tree_view_column_new();
+    col = gtk_tree_view_column_new();
-	gtk_tree_view_column_pack_start(col, renderer, TRUE);
+    gtk_tree_view_column_pack_start(col, renderer, TRUE);
-	gtk_tree_view_column_add_attribute(col, renderer, "text", COL_THEME_FILE);
+    gtk_tree_view_column_add_attribute(col, renderer, "text", COL_THEME_FILE);
-	gtk_tree_view_column_set_visible(col, FALSE);
+    gtk_tree_view_column_set_visible(col, FALSE);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(view),col);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
 
-	renderer = gtk_cell_renderer_text_new();
+    renderer = gtk_cell_renderer_text_new();
-	col = gtk_tree_view_column_new();
+    col = gtk_tree_view_column_new();
-	gtk_tree_view_column_pack_start(col, renderer, TRUE);
+    gtk_tree_view_column_pack_start(col, renderer, TRUE);
-	gtk_tree_view_column_add_attribute(col, renderer, "text", COL_THEME_NAME);
+    gtk_tree_view_column_add_attribute(col, renderer, "text", COL_THEME_NAME);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(view),col);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
 
-	g_width_list = 200;
+    g_renderer = gtk_cell_renderer_pixbuf_new();
-	g_height_list = 30;
+    g_object_set(g_renderer, "xalign", 0.0, NULL);
-	g_renderer = gtk_cell_renderer_pixbuf_new();
+    gtk_cell_renderer_set_fixed_size(g_renderer, 200, 30);
-	g_object_set(g_renderer, "xalign", 0.0, NULL);
+    col = gtk_tree_view_column_new();
-	gtk_cell_renderer_set_fixed_size(g_renderer, g_width_list, g_height_list);
+    gtk_tree_view_column_pack_start(col, g_renderer, TRUE);
-	// specific to gtk-2.18 or higher
+    gtk_tree_view_column_add_attribute(col, g_renderer, "pixbuf", COL_SNAPSHOT);
-	//gtk_cell_renderer_set_padding(g_renderer, 5, 5);
+    gtk_tree_view_column_add_attribute(col, g_renderer, "width", COL_WIDTH);
-	col = gtk_tree_view_column_new();
+    gtk_tree_view_column_add_attribute(col, g_renderer, "height", COL_HEIGHT);
-	gtk_tree_view_column_pack_start(col, g_renderer, TRUE);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
-	gtk_tree_view_column_add_attribute(col, g_renderer, "pixbuf", COL_SNAPSHOT);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(view),col);
 
-	GtkTreeSortable *sortable;
+    GtkTreeSortable *sortable = GTK_TREE_SORTABLE(theme_list_store);
-	sortable = GTK_TREE_SORTABLE(g_store);
+    gtk_tree_sortable_set_sort_column_id(sortable, COL_THEME_FILE, GTK_SORT_ASCENDING);
-	gtk_tree_sortable_set_sort_column_id(sortable, COL_THEME_FILE, GTK_SORT_ASCENDING);
+    gtk_tree_sortable_set_sort_func(sortable, COL_THEME_FILE, theme_name_compare, NULL, NULL);
-	gtk_tree_sortable_set_sort_func(sortable, COL_THEME_FILE, theme_name_compare, NULL, NULL);
+    return view;
-	return view;
 }
 
-gint theme_name_compare(GtkTreeModel *model,
+gint theme_name_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data)
-						GtkTreeIter *a,
-						GtkTreeIter *b,
-						gpointer user_data)
 {
-	gchar *path_a, *path_b;
+    gchar *path_a, *path_b;
-	gtk_tree_model_get(model, a, COL_THEME_FILE, &path_a, -1);
+    gtk_tree_model_get(model, a, COL_THEME_FILE, &path_a, -1);
-	gtk_tree_model_get(model, b, COL_THEME_FILE, &path_b, -1);
+    gtk_tree_model_get(model, b, COL_THEME_FILE, &path_b, -1);
-	gchar *name_a = path_a;
+
-	gchar *p;
+    gboolean home_a = strstr(path_a, g_get_user_config_dir()) == path_a;
-	for (p = name_a; *p; p++) {
+    gboolean home_b = strstr(path_b, g_get_user_config_dir()) == path_b;
-		if (*p == '/')
+
-			name_a = p + 1;
+    if (home_a && !home_b)
-	}
+        return -1;
-	gchar *name_b = path_b;
+    if (!home_a && home_b)
-	for (p = name_b; *p; p++) {
+        return 1;
-		if (*p == '/')
+
-			name_b = p + 1;
+    gchar *name_a = path_a;
-	}
+    gchar *p;
-	if (g_str_equal(name_a, name_b))
+    for (p = name_a; *p; p++) {
-		return 0;
+        if (*p == '/')
-	if (g_str_equal(name_a, "tint2rc"))
+            name_a = p + 1;
-		return -1;
+    }
-	if (g_str_equal(name_b, "tint2rc"))
+    gchar *name_b = path_b;
-		return 1;
+    for (p = name_b; *p; p++) {
-	gint result = strnatcasecmp(name_a, name_b);
+        if (*p == '/')
-	g_free(path_a);
+            name_b = p + 1;
-	g_free(path_b);
+    }
-	return result;
+    if (g_str_equal(name_a, name_b))
+        return 0;
+    if (g_str_equal(name_a, "tint2rc"))
+        return -1;
+    if (g_str_equal(name_b, "tint2rc"))
+        return 1;
+    gint result = strnatcasecmp(name_a, name_b);
+    g_free(path_a);
+    g_free(path_b);
+    return result;
 }
 
-void custom_list_append(const gchar *path)
+gboolean theme_list_contains(const char *given_path)
 {
-	GtkTreeIter  iter;
+    GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+    GtkTreeIter iter;
 
-	gtk_list_store_append(g_store, &iter);
+    gboolean have_iter = gtk_tree_model_get_iter_first(model, &iter);
-	gtk_list_store_set(g_store, &iter, COL_THEME_FILE, path, -1);
+    while (have_iter) {
-
+        gchar *filepath;
-	gchar *name = g_strdup(strrchr(path, '/') + 1);
+        gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filepath, -1);
-	gtk_list_store_set(g_store, &iter, COL_THEME_NAME, name, -1);
+        if (g_str_equal(filepath, given_path)) {
+            gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
+            g_free(filepath);
+            return TRUE;
+        }
+        g_free(filepath);
+        have_iter = gtk_tree_model_iter_next(model, &iter);
+    }
+    return FALSE;
 }
 
-
+void theme_list_append(const gchar *path)
-gboolean update_snapshot()
 {
-	GtkTreeModel *model;
+    if (theme_list_contains(path))
-	GtkTreeIter iter;
+        return;
-	GdkPixbuf *icon;
-	gboolean have_iter;
 
-	gint pixWidth = 200, pixHeight = 30;
+    GtkTreeIter iter;
+    gtk_list_store_append(theme_list_store, &iter);
 
-	model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+    gchar *name = strrchr(path, '/') + 1;
-	have_iter = gtk_tree_model_get_iter_first(model, &iter);
-	while (have_iter) {
-		gtk_tree_model_get(model, &iter, COL_SNAPSHOT, &icon, -1);
-		if (icon != NULL) {
-			g_object_unref(icon);
-		}
 
-		// build panel's snapshot
+    gchar *dir = g_strdup(path);
-		GdkPixbuf *pixbuf = NULL;
+    strrchr(dir, '/')[0] = 0;
-		gchar *name, *snap, *cmd;
+    char *suffix = contract_tilde(dir);
+    g_free(dir);
 
-		snap = g_build_filename(g_get_user_config_dir(), "tint2", "snap.jpg", NULL);
+    gchar *display_name = g_strdup_printf("%s\n(%s)", name, suffix);
-		g_remove(snap);
+    gtk_list_store_set(theme_list_store,
-
+                       &iter,
-		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &name, -1);
+                       COL_THEME_FILE,
-		cmd = g_strdup_printf("tint2 -c \'%s\' -s \'%s\'", name, snap);
+                       path,
-		if (system(cmd) == 0) {
+                       COL_THEME_NAME,
-			// load
+                       display_name,
-			pixbuf = gdk_pixbuf_new_from_file(snap, NULL);
+                       COL_FORCE_REFRESH,
-			if (pixbuf == NULL) {
+                       FALSE,
-				printf("snapshot NULL : %s\n", cmd);
+                       -1);
-			}
+    g_free(display_name);
-		}
+    g_free(suffix);
-		g_free(snap);
-		g_free(cmd);
-		g_free(name);
-
-		gint w, h;
-		w = gdk_pixbuf_get_width(pixbuf);
-		h = gdk_pixbuf_get_height(pixbuf);
-		pixWidth = w > pixWidth ? w : pixWidth;
-		pixHeight = h > pixHeight ? h : pixHeight;
-
-		gtk_list_store_set(g_store, &iter, COL_SNAPSHOT, pixbuf, -1);
-
-		have_iter = gtk_tree_model_iter_next(model, &iter);
-	}
-
-	gtk_cell_renderer_set_fixed_size(g_renderer, pixWidth + 30, pixHeight + 30);
-
-	return FALSE;
 }
 
+gboolean update_snapshot(gpointer ignored)
+{
+    {
+        gchar *tint2_cache_dir = g_build_filename(g_get_user_cache_dir(), "tint2", NULL);
+        if (!g_file_test(tint2_cache_dir, G_FILE_TEST_IS_DIR))
+            g_mkdir(tint2_cache_dir, 0700);
+        g_free(tint2_cache_dir);
+    }
 
+    const gint PADDING = 20;
 
+    GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+
+    GtkTreeIter iter;
+    gboolean have_iter;
+
+    int num_updates = 0;
+    gboolean need_pls_wait = FALSE;
+
+    have_iter = gtk_tree_model_get_iter_first(model, &iter);
+    while (have_iter) {
+        GdkPixbuf *pixbuf;
+        gtk_tree_model_get(model, &iter, COL_SNAPSHOT, &pixbuf, -1);
+        if (pixbuf) {
+            g_object_unref(pixbuf);
+            have_iter = gtk_tree_model_iter_next(model, &iter);
+            continue;
+        }
+
+        gchar *path;
+        gboolean force_refresh;
+        gtk_tree_model_get(model, &iter, COL_THEME_FILE, &path, COL_FORCE_REFRESH, &force_refresh, -1);
+
+        char hash[MD4_HEX_SIZE + 4];
+        md4hexf(path, hash);
+        strcat(hash, ".png");
+
+        gchar *snap = g_build_filename(g_get_user_cache_dir(), "tint2", hash, NULL);
+        pixbuf = force_refresh ? NULL : gdk_pixbuf_new_from_file(snap, NULL);
+        if (!pixbuf) {
+            gchar *cmd = g_strdup_printf("tint2 -c \'%s\' -s \'%s\' 1>/dev/null 2>/dev/null", path, snap);
+            num_updates++;
+            if (num_updates > 3 && !need_pls_wait) {
+                need_pls_wait = TRUE;
+                create_please_wait(GTK_WINDOW(g_window));
+            }
+            if (system(cmd) == 0) {
+                // load
+                pixbuf = gdk_pixbuf_new_from_file(snap, NULL);
+            }
+            g_free(cmd);
+        }
+
+        g_free(snap);
+        g_free(path);
+
+        gtk_list_store_set(theme_list_store,
+                           &iter,
+                           COL_SNAPSHOT,
+                           pixbuf,
+                           COL_WIDTH,
+                           gdk_pixbuf_get_width(pixbuf) + PADDING,
+                           COL_HEIGHT,
+                           gdk_pixbuf_get_height(pixbuf) + PADDING,
+                           COL_FORCE_REFRESH,
+                           FALSE,
+                           -1);
+        if (pixbuf)
+            g_object_unref(pixbuf);
+
+        if (need_pls_wait)
+            process_events();
+
+        have_iter = gtk_tree_model_iter_next(model, &iter);
+    }
+
+    if (need_pls_wait)
+        destroy_please_wait();
+
+    return FALSE;
+}