Release 15.1

update clock at the beginning of seconds

See merge request !27

.clang-format

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

AUTHORS

@@ -23,6 +23,14 @@ Contributors:
   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
+  Ryan Gray, Jeff Blake (https://gitlab.com/berkley4) : battery format
+  aaaz (https://gitlab.com/aaaz) : clock fixes
 
 Translations:
   Bosnian:

CMakeLists.txt

@@ -1,11 +1,12 @@
 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_EXTRA_THEMES "Install additional tint2 themes" ON )
 option( ENABLE_RSVG "Rsvg support (launcher only)" ON )
 option( ENABLE_SN "Startup notification support" ON )
+option( ENABLE_TRACING "Build tint2 with tracing instrumentation" OFF )
 option( ENABLE_ASAN "Build tint2 with AddressSanitizer" OFF )
 option( ENABLE_BACKTRACE "Dump a backtrace in case of fatal errors (e.g. X11 I/O error)" OFF )
 option( ENABLE_BACKTRACE_ON_SIGNAL "Dump a backtrace also when receiving signals such as SIGSEGV" OFF )
@@ -13,6 +14,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 +83,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 )
+
+add_definitions( -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_WITH_GETLINE )
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  add_definitions( -D_POSIX_C_SOURCE=200809L )
+endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
 
 include_directories( ${PROJECT_BINARY_DIR}
                      src
@@ -86,7 +101,9 @@ include_directories( ${PROJECT_BINARY_DIR}
                      src/tooltip
                      src/util
                      src/execplugin
+                     src/button
                      src/freespace
+                     src/separator
                      ${X11_INCLUDE_DIRS}
                      ${PANGOCAIRO_INCLUDE_DIRS}
                      ${PANGO_INCLUDE_DIRS}
@@ -100,7 +117,12 @@ include_directories( ${PROJECT_BINARY_DIR}
 set( SOURCES src/config.c
              src/panel.c
              src/server.c
-             src/tint.c
+             src/main.c
+             src/init.c
+             src/signals.c
+             src/tracing.c
+             src/mouse_actions.c
+             src/drag_and_drop.c
              src/clock/clock.c
              src/systray/systraybar.c
              src/launcher/launcher.c
@@ -113,12 +135,19 @@ set( SOURCES src/config.c
              src/taskbar/taskbarname.c
              src/tooltip/tooltip.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/fps_distribution.c
              src/util/strnatcmp.c
              src/util/timer.c
              src/util/cache.c
+             src/util/color.c
+             src/util/gradient.c
+             src/util/uevent.c
              src/util/window.c )
 
 if( ENABLE_BATTERY )
@@ -189,19 +218,23 @@ if( ENABLE_TINT2CONF )
 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_C_FLAGS " -O0 -g3 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic -Wshadow")
+  SET(ASAN_L_FLAGS " -O0 -g3 -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" )
+if( ENABLE_TRACING )
+  add_definitions( -DHAVE_TRACING )
+  SET(TRACING_C_FLAGS " -finstrument-functions -finstrument-functions-exclude-file-list=tracing.c -finstrument-functions-exclude-function-list=get_time,gettime -O0 -g3 -fno-common -fno-omit-frame-pointer -rdynamic")
+  SET(TRACING_L_FLAGS " -O0 -g3 -fno-common -fno-omit-frame-pointer -rdynamic")
+else()
+  SET(TRACING_C_FLAGS "")
+  SET(TRACING_L_FLAGS "")
+endif()
 
-add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" "\"${PROJECT_SOURCE_DIR}\"" )
+add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" -- "\"${PROJECT_SOURCE_DIR}/\"" )
 
 link_directories( ${X11_LIBRARY_DIRS}
                   ${PANGOCAIRO_LIBRARY_DIRS}
@@ -235,17 +268,18 @@ endif( RT_LIBRARY )
 target_link_libraries( tint2 m )
 
 add_dependencies( tint2 version )
-set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=c99 ${ASAN_C_FLAGS}" )
-set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS} ${BACKTRACE_L_FLAGS}" )
+set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=c99 ${ASAN_C_FLAGS} ${TRACING_C_FLAGS}" )
+set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS} ${BACKTRACE_L_FLAGS}  ${TRACING_L_FLAGS}" )
 
 install( TARGETS tint2 DESTINATION bin )
-install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
-install( FILES tint2.desktop DESTINATION ${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 ${SYSCONFDIR}/xdg/tint2 )
-install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
-install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
-install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
+install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
+install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
+install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
+install( DIRECTORY doc/images DESTINATION ${htmldir} )
+install( FILES doc/tint2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
 if( ENABLE_EXTRA_THEMES )
   add_subdirectory(themes)
 endif( ENABLE_EXTRA_THEMES )

CONTRIBUTING.md

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

ChangeLog

@@ -1,3 +1,134 @@
+2017-09-08 15.1
+- Fixes:
+  - Fixed build on non-Linux and non-x86 systems
+
+2017-09-02 15.0
+- Fixes:
+  - Clock, executors and other timers fire correctly after waking up from suspend
+  - One-shot timers are restarted correctly from their own callbacks
+  - Clock is refreshed with better accuracy (thanks @aaaz)
+  - Panel: by popular demand, the old struts behavior with autohide has been restored (issue #619);
+    if you encounter applications that interact poorly with it,
+	you might have better luck with strut_policy = minimum,
+	if that does not work, you will have to turn off autohide.
+- Enhancements:
+  - Panel:
+    - _NET_WM_PID is set correctly, so now tint2 can be interacted with more easily from wmctrl and similar apps
+  - Taskbar: new config option taskbar_hide_different_desktop
+  - Battery:
+    - New config option bat1_format and bat2_format
+	- New config option battery_full_cmd
+	- Better "Unknown" state handling
+  - Executor:
+    - Hide if output is empty
+    - If no user tooltip is set, displays the script standard error as tooltip.
+      Tooltip is multiline, can be cleared with the VT100 clear screen sequence, in shell: (>&2 echo -en "\033[2J").
+      Long tooltips are truncated to 4096 characters.
+  - Launcher:
+    - Drag and drop now handles correctly text/uri-list
+    - Support for Terminal=true
+    - Support for %f and %F
+- Configuration changes:
+  - Removed primary_monitor_first as it was conflicting with taskbar behavior; use *_monitor = primary instead.
+- Other:
+  - Major code refactoring
+- Dropping "0." from the version number and no longer using semver ("Breaking.Feature.Fix").
+  - Tint2 will always strive to be backwards compatible with respect to the configuration format.
+  - Very few configurations changes have been broken between 2010 (0.10) - 2017 (0.14);
+    in all cases they were minor options that caused incorrect behavior,
+    and the changes were described better by "Feature" or "Fix".
+  - Practically all releases starting from 0.10 have been very stable,
+    so there is no point in staying in "0." anymore.
+  - But I don't want the project to get stuck in "1." forever.
+  - The new versioning scheme is the following:
+    - Version numbers will have the format "Feature.Fix", where:
+      - "Feature" is increased when significant new features are added.
+      - "Fix" is increased for bugfixes or minor changes.
+    - 0.14.6 will be followed by 15.0.
+
+2017-06-11 0.14.6
+- Fixes:
+  - Take into account border width when computing text height
+  - Taskbar: Fix task icon size limits
+  - Executor: Do not output last line if it is not terminated by newline
+- Enhancements:
+  - Re-execute tint2 on SIGUSR2.
+    This is useful for preserving config options and environment when updating tint2.
+
+2017-05-21 0.14.5
+- Fixes:
+  - Fixed a couple of memory leaks
+
+2017-04-29 0.14.4
+- Fixes:
+  - Fix regression in executor (issue #639)
+  - Fix crash when _NET_WM_ICON is set but empty (https://github.com/jmc-88/tint3/issues/21)
+
+2017-04-23 0.14.3
+- 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)
@@ -819,3 +950,5 @@ released tint-0.2
 2008-04-22
 - fork ttm projet from p://code.google.com/p/ttm/ (by Pål Staurland staura@gmail.com)
   while the projet is no longer in developpement, have not changed the name of 'tint'.
+.
+.

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,13 +1,14 @@
-# Latest stable release: 0.12.10
-Changes: https://gitlab.com/o9000/tint2/blob/0.12.10/ChangeLog
+# Latest stable release: 15.1
+Changes: https://gitlab.com/o9000/tint2/blob/15.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)):
 
-Compile it 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.10
+git checkout 15.1
 mkdir build
 cd build
 cmake ..
@@ -15,8 +16,11 @@ make -j4
 ```
 
 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`.
@@ -27,7 +31,7 @@ P.S. GitLab is now the official location of the tint2 project, migrated from Goo
 
 # 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
@@ -75,4 +85,16 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
 
 ## Various configs:
 
-![screenshot](https://gitlab.com/o9000/tint2/wikis/screenshot.png)
+* [Screenshots](https://gitlab.com/o9000/tint2/wikis/screenshots)
+
+## 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)
+
+## More
+
+* [Tint2 wiki](https://gitlab.com/o9000/tint2/wikis/Home)
+Home)

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,700 @@
+<!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 primary 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; removed in 1.0, use <code>primary</code> instead)</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_hide_different_desktop = boolean (0 or 1)</code> :  If enabled, the taskbar shows only the tasks from the current desktop. Useful to make multi-desktop taskbars more compact, but still allow desktop switching with mouse click. <em>(since 1.0)</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, ...) or primary</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>battery_full_cmd = notify-send &quot;battery full&quot;</code> : Command to execute when the battery is full.</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>bat1_format = FORMAT_STRING</code> : Format for battery line 1. Default: %p. <em>(since 1.0)</em> Format specification:</p>
+<ul>
+<li>%s: State (charging, discharging, full, unknown).</li>
+<li>%m: Minutes left until completely charged/discharged (estimated).</li>
+<li>%h: Hours left until completely charged/discharged (estimated).</li>
+<li>%t: Time left. Shows &quot;hrs:mins&quot; when charging/discharging, or &quot;Ful\&quot; when full.</li>
+<li>%p: Percentage. Includes the % sign.</li>
+</ul></li>
+<li><p><code>bat2_format = FORMAT_STRING</code> : Format for battery line 2. Default: %t. <em>(since 1.0)</em></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,276 @@
+<!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-15-1"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">15.1</span><a name="latest-stable-release-15-1" href="#latest-stable-release-15-1" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/15.1/ChangeLog">https://gitlab.com/o9000/tint2/blob/15.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 15.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>
+<ul>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/screenshots">Screenshots</a></li>
+</ul>
+<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>
+<h2 id="more">More<a name="more" href="#more" class="md2man-permalink" title="permalink"></a></h2>
+<ul>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/Home">Tint2 wiki</a>
+Home)</li>
+</ul>
+</body>
+</html>

doc/tint2.1

@@ -1,51 +1,898 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" 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)
+.TH TINT2 1 "2017\-09\-08" 15.1
 .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
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" 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.
+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.).
 .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
-Specify which configuration file to use instead of the default.
-.SH AUTHOR
-tint2 was written by Thierry Lorthiois <lorthiois@bbsoft.fr>.  It is based on
-ttm, originally written by Pål Staurland <staura@gmail.com>
+\fB\fC\-c path_to_config_file\fR
+Specifies which configuration file to use instead of the default.
+.TP
+\fB\fC\-v, \-\-version\fR
+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>,
-for the Debian project (but may be used by others).  It was adopted from the
-tint2 docs.
+These are instructions for configuring tint2 directly by editing its config file.
+You may also use instead the graphical interface \fB\fCtint2conf\fR\&.
+.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 primary 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; removed in 1.0, use \fB\fCprimary\fR instead)\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_hide_different_desktop = boolean (0 or 1)\fR :  If enabled, the taskbar shows only the tasks from the current desktop. Useful to make multi\-desktop taskbars more compact, but still allow desktop switching with mouse click. \fI(since 1.0)\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, ...) or primary\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\fCbattery_full_cmd = notify\-send "battery full"\fR : Command to execute when the battery is full.
+.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\fCbat1_format = FORMAT_STRING\fR : Format for battery line 1. Default: %p. \fI(since 1.0)\fP Format specification:
+.RS
+.IP \(bu 2
+%s: State (charging, discharging, full, unknown).
+.IP \(bu 2
+%m: Minutes left until completely charged/discharged (estimated).
+.IP \(bu 2
+%h: Hours left until completely charged/discharged (estimated).
+.IP \(bu 2
+%t: Time left. Shows "hrs:mins" when charging/discharging, or "Ful\[rs]" when full.
+.IP \(bu 2
+%p: Percentage. Includes the % sign.
+.RE
+.IP \(bu 2
+\fB\fCbat2_format = FORMAT_STRING\fR : Format for battery line 2. Default: %t. \fI(since 1.0)\fP
+.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,755 @@
+# TINT2 1 "2017-09-08" 15.1
+
+## 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 primary 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; removed in 1.0, use `primary` instead)*
+
+![](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_hide_different_desktop = boolean (0 or 1)` :  If enabled, the taskbar shows only the tasks from the current desktop. Useful to make multi-desktop taskbars more compact, but still allow desktop switching with mouse click. *(since 1.0)*
+
+  * `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, ...) or primary` :  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.
+
+  * `battery_full_cmd = notify-send "battery full"` : Command to execute when the battery is full.
+
+  * `bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
+
+  * `bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
+
+  * `battery_font_color = color opacity (0 to 100)`
+
+  * `bat1_format = FORMAT_STRING` : Format for battery line 1. Default: %p. *(since 1.0)* Format specification:
+    * %s: State (charging, discharging, full, unknown).
+    * %m: Minutes left until completely charged/discharged (estimated).
+    * %h: Hours left until completely charged/discharged (estimated).
+    * %t: Time left. Shows "hrs:mins" when charging/discharging, or "Ful\" when full.
+    * %p: Percentage. Includes the % sign.
+
+  * `bat2_format = FORMAT_STRING` : Format for battery line 2. Default: %t. *(since 1.0)*
+
+  * `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,6 +1,6 @@
 #!/bin/sh
 
-MAJOR=0.12
+MAJOR=0.14
 DIRTY=""
 
 if git status 1>/dev/null 2>/dev/null
@@ -33,13 +33,15 @@ then
     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 | cut -d ' ' -f 2)
-    if [ $VERSION = "master" ]
+    SCRIPT_DIR=$(dirname "$0")
+    VERSION=$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 2)
+    if [ "$VERSION" = "master" ]
     then
-        VERSION=$VERSION-$(head -n 1 ChangeLog | cut -d ' ' -f 1)
+        VERSION=$VERSION-$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 1)
     fi
 fi
 
+
 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=$DIR.tar.gz
-echo "Making release $DIR"
-rm -rf $DIR $ARCHIVE
+ARCHIVE=tint2-$VERSION.tar.gz
 
-git checkout-index --prefix=$DIR/ -a
-
-# 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
+echo "Making release tint2-$VERSION"
+git archive --format=tar.gz --prefix=tint2-$VERSION/ v$VERSION >$ARCHIVE
 
 sha1sum -b $ARCHIVE
 sha256sum -b $ARCHIVE

new-release.py

@@ -0,0 +1,192 @@
+#!/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, feature=False):
+  if v.startswith("v0."):
+    assert v == "v0.14.6"
+    return "v15.0"
+  # v4.11 -> v4.12 or v5.0
+  parts = v.split(".")
+  while len(parts) < 2:
+    parts.append("0")
+  assert len(parts) == 2
+  if feature:
+    parts[-2] = "v" + str(int(parts[-2].replace("v", "")) + 1)
+    parts[-1] = "0"
+  else:
+    parts[-1] = str(int(parts[-1]) + 1)
+  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("v0.14.6"), "v15.0")
+  assert_equal(inc_version("v15"), "v15.1")
+  assert_equal(inc_version("v15.0"), "v15.1")
+  assert_equal(inc_version("v16.1"), "v16.2")
+  assert_equal(inc_version("v16.10"), "v16.11")
+  # fix
+  assert_equal(inc_version("v0.14.6", False), "v15.0")
+  assert_equal(inc_version("v15", False), "v15.1")
+  assert_equal(inc_version("v15.0", False), "v15.1")
+  assert_equal(inc_version("v16.1", False), "v16.2")
+  assert_equal(inc_version("v16.10", False), "v16.11")
+  # feature
+  assert_equal(inc_version("v15", True), "v16.0")
+  assert_equal(inc_version("v15.0", True), "v16.0")
+  assert_equal(inc_version("v15.1", True), "v16.0")
+  assert_equal(inc_version("v15.2", True), "v16.0")
+  assert_equal(inc_version("v15.10", True), "v16.0")
+
+
+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("--feature", 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.feature)
+  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.replace("v", ""), 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 --word-diff")

packaging/debian/changelog

@@ -1,3 +1,35 @@
+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

packaging/debian/control

@@ -1,7 +1,7 @@
 Source: tint2
 Section: x11
 Priority: optional
-Maintainer: o9000 <mrovi9000@gmail.com>
+Maintainer: Sebastian Reichel <sre@debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
                libcairo2-dev,
@@ -16,14 +16,15 @@ Build-Depends: cmake,
                libxinerama-dev,
                libxrandr-dev
 Standards-Version: 3.9.7
-Vcs-Git: git://anonscm.debian.org/collab-maint/tint2.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/tint2.git
+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}
+         ${misc:Depends},
+         procps
 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

packaging/debian/copyright

@@ -7,6 +7,22 @@ Copyright: 2007-2008 Pål Staurland <staura@gmail.com>
            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>
@@ -43,24 +59,3 @@ License: ISC
  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.
-
-Files: debian/wiki/*
-Copyright: 2009-2012 Andreas Fink <andreas.fink85@googlemail.com>
-License: GPL-2
-
-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.
- .
- 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'.

packaging/debian/postinst

@@ -0,0 +1,2 @@
+pkill -SIGUSR2 tint2 || true
+

packaging/debian/rules

@@ -11,4 +11,3 @@ override_dh_auto_install:
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=tint2
-	cp -r debian/wiki debian/tint2/usr/share/doc/tint2/html

packaging/debian/tint2.install

@@ -4,9 +4,9 @@
 /usr/share/applications/tint2.desktop
 /usr/share/applications/tint2conf.desktop
 /usr/share/man/man1/tint2.1
-/usr/share/doc/tint2/AUTHORS
-/usr/share/doc/tint2/README.md
+/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/make_ubuntu.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Requirements: devscripts
+
 set -x
 
 rm -rf tint2* 2>/dev/null || true
@@ -29,6 +31,8 @@ else
     REPO="tint2-git"
 fi
 
+set -e
+
 # Export repository contents to source directory
 DIR=tint2-$VERSION
 echo "Making release $DIR"
@@ -43,9 +47,9 @@ 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 ubuntu $DIR/debian
+cp -r debian $DIR/debian
 
-for DISTRO in precise trusty wily xenial
+for DISTRO in trusty xenial zesty artful
 do
     # Cleanup from previous builds
     rm -rf tint2_$VERSION-*

packaging/ubuntu/source/include-binaries

@@ -1,4 +0,0 @@
-debian/wiki/3265475271_81e8ed56e0.jpg
-debian/wiki/3265475337_262799ded3.jpg
-debian/wiki/3266303192_476a188196.jpg
-debian/wiki/3266303292_14d9b6b623.jpg

packaging/ubuntu/wiki/Configure.html

@@ -1,405 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>tint2 - Configure</title>
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-</head>
-
-<body class="t6">
-
-<table class="st" width="100%" cellpadding="0" cellspacing="0" align="center" border="0">
- <tbody><tr>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <td class="bevel-right" valign="top" align="right"></td>
- </tr>
-</tbody></table>
-
-
-
-<div id="maincol" style="padding: 0pt 3px 3px 0pt; margin: 0pt;">
-
- 
-<!-- IE -->
-
-
-
-
-
-
- 
-
-
-
-
- 
-
-<div id="wikipage">
-<table>
- <tbody><tr>
- 
- 
- 
- 
- <td style="vertical-align: top; padding-left: 5px;">
- 
- 
- 
- <div id="wikicontent">
- <div class="vt" id="wikimaincol">
-
- <h1>tint2 - Configure</h1>
-
- <p></p><ul><li><a href="#Background_and_border">Background and border</a></li><li><a href="#Panel">Panel</a></li><li><a href="#Launcher_SVN_Only">Launcher SVN Only</a></li><li><a href="#Taskbar_%28pager_like_capability%29">Taskbar (pager like capability)</a></li><li><a href="#Task">Task</a></li><li><a href="#System_Tray">System Tray</a></li><li><a href="#Clock">Clock</a></li><li><a href="#Tooltip">Tooltip</a></li><li><a href="#Battery">Battery</a></li><li><a href="#Mouse_action_on_task">Mouse action on task</a></li><li><a href="#Panel_autohide">Panel autohide</a></li><li><a href="#An_example_tint2rc">An example tint2rc</a></li></ul> <p></p><p>The first time you run tint2, it will create the config file in <tt>$HOME/.config/tint2/tint2rc</tt> . (this is true if you have done a clean install. running tint2 in the source directory without doing 'make install' will not create the config file.) </p><p>You can specify another file on the command line with -c option. eg. : <tt>tint2 -c $HOME/tint2.conf</tt> </p><p>When you change the config file, the command line 'killall -SIGUSR1 tint2' will force tint2 to reload it. </p><p>Configuration marked as <tt>SVN ONLY</tt> are not yet supported and could change in the next stable release. </p><h1><a name="Background_and_border"></a>Background and border<a href="#Background_and_border" class="section_anchor"></a></h1><blockquote>tint2rc config file starts with background option. 
-</blockquote><p>         </p><ul><li><tt>rounded = number_of_pixels</tt> : How rounded the borders are </li></ul><p></p><ul><li><tt>background_color = color opacity</tt> </li><ul><li><tt>opacity = 0</tt> to get background transparency </li></ul></ul><p>         </p><ul><li><tt>border_width = width</tt> </li></ul><p></p><ul><li><tt>border_color = color opacity (0 to 100)</tt> </li><ul><li><tt>opacity = 0</tt> to get border transparency </li></ul></ul><blockquote>you are free to put 1, 2, 3... background 
-<pre class="prettyprint">      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</pre>tint2 automatically identifies each background with a number (1, 2, ...). 
-then you can applied background on objects (panel, taskbar, task, clock, systray) with 
-<pre class="prettyprint">      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</pre>identifier 0 applied full transparency, identifer 1 applied the first background...   
-</blockquote><h1><a name="Panel"></a>Panel<a href="#Panel" class="section_anchor"></a></h1><ul><li><tt>panel_monitor = monitor (all, 1, 2, ...)</tt> Which monitor tint2 draws the panel on </li><ul><li>the first monitor is <tt>1</tt> </li><li>use <tt>panel_monitor = all</tt> to get one panel per monitor (unless it's included into another one) </li></ul></ul><p>   </p><blockquote><img src="3265475271_81e8ed56e0.jpg"> 
-</blockquote><p></p><p>     </p><ul><li><tt>panel_position = vertical_position horizontal_position orientation</tt> </li><ul><li><tt>value for vertical_position : bottom, top, center</tt> </li><li><tt>value for horizontal_position : left, right, center</tt> </li><li><tt>value for orientation : horizontal, vertical</tt> </li></ul></ul>   <ul><li><tt>panel_size = width height</tt> </li><ul><li><tt>width = 0</tt> to get full monitor width </li><li>Use <tt>%</tt> to adjust the panel size to monitor size. </li></ul></ul>     <blockquote>Example: 
-<p></p><pre class="prettyprint">      #The panel's width is 94% the size of the monitor
-      panel_size = 94% 30</pre></blockquote><ul><li><tt>panel_items = LTSBC</tt> define the items tint2 will show and the order of those items. panel_items = STC will show the Systray, the taskbar and the clock (from left to right). SVN ONLY. </li><ul><li>L to show Launcher </li><li>T to show Taskbar </li><li>S to show Systray (also called notification area) </li><li>B to show Battery status </li><li>C to show Clock </li></ul></ul><ul><li><tt>panel_margin = horizontal_margin vertical_margin</tt> </li><ul><li><tt>horizontal_margin = 0</tt> to get full monitor width </li></ul></ul><blockquote><img src="3266303192_476a188196.jpg"> 
-</blockquote><p>     </p><ul><li><tt>panel_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt> </li></ul><p></p><ul><li><tt>font_shadow = boolean (0 or 1)</tt> </li></ul><ul><li><tt>panel_background_id = integer</tt> : Which background to use </li></ul><ul><li><tt>wm_menu = boolean (0 or 1)</tt>               : Allow tint2 to forward mouse event to your Window Manager. </li></ul><ul><li><tt>panel_dock = boolean (0 or 1)</tt>            : Put tint2 into the window managers dock. For the openbox window manager I can advise to use also a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml). </li></ul><p>  </p><ul><li><tt>panel_layer = bottom,normal,top</tt> : Puts tint2 into the bottom/normal/top layer. Default is the bottom layer, but for real transparency normal or top layer may be a nice alternative. </li></ul><p></p><ul><li><tt>strut_policy = follow_size/minimum/none</tt> : STRUTs are used by the window manager to decide the size of maximized windows. Should the 'maximized windows' follow tint2 size (follow_size) or use the minimum size (minimum), or use the screen size (none). <tt>minimum</tt> option is interresting when used with <tt>autohide_height</tt> parameter. </li></ul><h1><a name="Launcher_SVN_Only"></a>Launcher SVN Only<a href="#Launcher_SVN_Only" class="section_anchor"></a></h1><ul><li><tt>launcher_icon_theme = name_of_theme</tt> tint2 will follow the theme of your desktop when you have an XSETTINGS manager running. Otherwise, <tt>launcher_icon_theme</tt> parameter is used. </li><li><tt>launcher_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt> </li><li><tt>launcher_background_id = integer</tt> : Which background to use </li><li><tt>launcher_icon_size = number</tt> : Set the launcher icon size to <tt>number</tt>. </li><li><tt>launcher_item_app = path_to_application</tt> : Each launcher_item_app must be a full path to a .desktop file. </li></ul><h1><a name="Taskbar_(pager_like_capability)"></a>Taskbar (pager like capability)<a href="#Taskbar_%28pager_like_capability%29" class="section_anchor"></a></h1><ul><li><tt>taskbar_mode = single_desktop or multi_desktop</tt> </li><ul><li><tt>taskbar_mode = single_desktop</tt> : Show one(1) taskbar (current desktop) </li><li><tt>taskbar_mode = multi_desktop</tt> : Pager like capability. Show one(1) taskbar per desktop </li><ul><li>You can drag-and-drop task between desktops` </li><li>And also click on an empty taskbar to switch desktops` </li></ul></ul></ul><p>   </p><ul><li><tt>taskbar_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt> </li></ul><p></p><ul><li><tt>taskbar_background_id = integer</tt> : Which background to use </li></ul><ul><li><tt>taskbar_active_background_id = integer</tt> : Which background to use for current desktop. </li></ul><blockquote><img src="3266303292_14d9b6b623.jpg"> 
-</blockquote><ul><li><tt>taskbar_name = boolean (0 or 1)</tt> :  SVN Only enabled(=1) or disabled(=0) desktop name in taskbar </li></ul><ul><li><tt>taskbar_name_padding = left_right_padding</tt>  SVN Only </li></ul><ul><li><tt>taskbar_name_background_id = integer</tt> : SVN Only Which background to use </li></ul><ul><li><tt>taskbar_name_active_background_id = integer</tt> : SVN Only Which background to use for current desktop. </li></ul><ul><li><tt>taskbar_name_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt>  SVN Only </li></ul><ul><li><tt>taskbar_name_font_color = color opacity (0 to 100)</tt>  SVN Only </li></ul><ul><li><tt>taskbar_name_active_font_color = color opacity (0 to 100)</tt> </li></ul><h1><a name="Task"></a>Task<a href="#Task" class="section_anchor"></a></h1><ul><li><tt>urgent_nb_of_blink = integer</tt>               : Number of blink on 'get attention' event </li></ul><ul><li><tt>task_icon = boolean (0 or 1)</tt>               : Display task icon or not </li></ul><ul><li><tt>task_text = boolean (0 or 1)</tt>               : Display task text or not </li></ul><ul><li><tt>task_centered = boolean (0 or 1)</tt>           : Task name centered  or not </li></ul><ul><li><tt>task_maximum_size = width height</tt>                  </li><ul><li><tt>width is used with horizontal panel. width = 0 to get full taskbar width</tt> </li><li><tt>height is used with vertical panel</tt> </li></ul></ul><p>  </p><ul><li><tt>task_padding = horizontal_padding vertical_padding</tt>    </li></ul><p></p><ul><li><tt>task_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt>               </li></ul><ul><li><tt>task_font_color = color opacity (0 to 100)</tt> </li></ul><p>                                                        </p><ul><li><tt>task_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</tt> : adjust icon's color and transparency for task. </li></ul><p></p><ul><li><tt>task_background_id = integer</tt> : Which background to use for non selected tasks </li></ul><blockquote>For the next 3 options STATUS can be <tt>active</tt> / <tt>iconified</tt>  / <tt>urgent</tt>. 
-</blockquote><ul><li><tt>task_STATUS_font_color = color opacity (0 to 100)</tt>  </li></ul><ul><li><tt>task_STATUS_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</tt> : adjust icon's color and transparency for active task </li></ul><ul><li><tt>task_STATUS_background_id = integer</tt> : Which background to use when task is selected </li></ul><ul><li><tt>task_tooltip = boolean (0 or 1)</tt>               : enabled(=1) or disabled(=0) tooltip on task </li></ul><blockquote><img src="3265475337_262799ded3.jpg"> 
-</blockquote><h1><a name="System_Tray"></a>System Tray<a href="#System_Tray" class="section_anchor"></a></h1><ul><li><tt>systray = boolean (0 or 1)</tt> : enabled(=1) or disabled(=0) systray </li></ul><ul><li><tt>systray_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt>  </li></ul><ul><li><tt>systray_background_id = integer</tt> : Which background to use for non selected tasks </li></ul><ul><li> <tt>systray_sort = ascending/descending/left2right/right2left</tt> : Sorting order for icon's systray (if left2right or right2left the order can be different on restart) </li></ul><ul><li> <tt>systray_icon_size = max_icon_size</tt>  : Set the maximum system tray icon size to <tt>number</tt>. Set to <tt>0</tt> for automatic icon size </li></ul><ul><li><tt>systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</tt> : adjust icon's color and transparency for system tray icons </li></ul><h1><a name="Clock"></a>Clock<a href="#Clock" class="section_anchor"></a></h1><ul><li><tt>time1_format = %H:%M</tt> </li><ul><li>time1_format, time2_format and clock_tooltip use 'strftime' syntax. more info on parameters on <a href="http://www.manpagez.com/man/3/strftime/" rel="nofollow">http://www.manpagez.com/man/3/strftime/</a> </li><li>comment time1_format and time2_format to hide clock </li></ul></ul><p>   </p><ul><li><tt>time1_timezone = :US/Hawaii</tt> </li><ul><li>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, i.e. time1_timezone = :/different/zoneinfo/dir/US/Hawaii (always prepend with a ':') </li></ul></ul><p></p><ul><li><tt>time1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>time2_format = %A %d %B</tt> </li></ul><ul><li><tt>time2_timezone = :Europe/Berlin</tt> </li></ul><ul><li><tt>time2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>clock_font_color = color opacity (0 to 100)</tt> </li></ul><ul><li><tt>clock_padding = horizontal_padding vertical_padding</tt> </li></ul><ul><li><tt>clock_background_id = integer</tt> : Which background to use </li></ul><ul><li><tt>clock_tooltip = %a, %d. %b %Y : clock tooltip text</tt> </li></ul><ul><li><tt>clock_tooltip_timezone = :UTC</tt> </li></ul><ul><li><tt>clock_lclick_command = text</tt> : Which command to execute on left click </li></ul><ul><li><tt>clock_rclick_command = text</tt> : Which command to execute on right click </li></ul><h1><a name="Tooltip"></a>Tooltip<a href="#Tooltip" class="section_anchor"></a></h1><ul><li><tt>tooltip_padding = horizontal_padding vertical_padding</tt> </li></ul><ul><li><tt>tooltip_show_timeout = float</tt> : delay to show tooltip in second. Use '.' as decimal separator. </li></ul><ul><li><tt>tooltip_hide_timeout = float</tt> : delay to close tooltip in second. Use '.' as decimal separator. </li></ul><ul><li><tt>tooltip_background_id = integer</tt> : Which background to use (in fake transparency the alpha channel and rounded are not respected) </li></ul><ul><li><tt>tooltip_font_color = color opacity  (0 to 100)</tt> </li></ul><ul><li><tt>tooltip_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><h1><a name="Battery"></a>Battery<a href="#Battery" class="section_anchor"></a></h1><ul><li><tt>battery = boolean (0 or 1)</tt>               : enabled(=1) or disabled(=0) battery applet </li></ul><ul><li><tt>battery_hide = never or an integer (0 to 100)</tt>: At what battery percent does the battery hide </li></ul><ul><li><tt>battery_low_status = integer</tt>: At what battery percent does the icon show battery low command </li></ul><ul><li><tt>battery_low_cmd = notify-send "battery low"</tt> :What to do when battery is low </li></ul><ul><li><tt>bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>battery_font_color = color opacity  (0 to 100)</tt> </li></ul><ul><li><tt>battery_padding = horizontal_padding vertical_padding</tt> </li></ul><ul><li><tt>battery_background_id = integer</tt> : Which background to use </li></ul><h1><a name="Mouse_action_on_task"></a>Mouse action on task<a href="#Mouse_action_on_task" class="section_anchor"></a></h1><blockquote>Customize mouse action with : <tt>none, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task</tt>. 
-</blockquote><blockquote>Sample format: 
-<pre class="prettyprint">  mouse_middle = none
-  mouse_right = close
-  mouse_scroll_up = toggle
-  mouse_scroll_down = iconify</pre></blockquote><pre class="prettyprint">  close : close the task
-  toggle : toggle the task
-  iconify : iconify the task
-  toggle_iconify : toggle or iconify the task
-  maximize_restore : maximized or minimized 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</pre><p>If a mouse action is set to <tt>none</tt> and <tt>wm_menu = 1</tt> is set, the mouse click is forwarded to the window manager </p><h1><a name="Panel_autohide"></a>Panel autohide<a href="#Panel_autohide" class="section_anchor"></a></h1><ul><li><tt>autohide = boolean (0 or 1)</tt> : enable(=1) or disable(=0) autohiding </li></ul><ul><li><tt>autohide_show_timeout = float</tt> : show timeout in seconds. Use '.' as decimal separator. </li></ul><ul><li><tt>autohide_hide_timeout = float</tt> : hide timeout in seconds. Use '.' as decimal separator. </li></ul><ul><li><tt>autohide_height = integer</tt> : panel height (width for vertical panels) in hidden mode </li></ul><h1><a name="An_example_tint2rc"></a>An example tint2rc<a href="#An_example_tint2rc" class="section_anchor"></a></h1><pre class="prettyprint">#---------------------------------------------
-# 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</pre>
- </div>
- </div>
- </td></tr><tr>
-</tr></tbody></table>
- </div>
-
-
- 
- <div id="wikicommentcol">
- 
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
-<div class="collapse">
-
-
- 
-
-
-<div id="commentlist">
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
-</div>
-</div>
-
- 
-
-
- 
-
-
- </div>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
-
- 
-
-
- 
- 
-
-
-
-
-
-
-  
- 
- 
- 
- 
- 
- 
- 
- 
-</div> 
-
- <div class="hostedBy" style="margin-top: -20px;">
- 
- </div>
- 
- 
-
-
- 
- 
-
-
-
-
-
-</body></html>

packaging/ubuntu/wiki/FAQ.html

@@ -1,217 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>tint2 - FAQ</title>
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-</head>
-
-<body class="t6">
-
-<table class="st" width="100%" cellpadding="0" cellspacing="0" align="center" border="0">
- <tbody><tr>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <td class="bevel-right" valign="top" align="right"></td>
- </tr>
-</tbody></table>
-
-
-
-<div id="maincol" style="padding: 0pt 3px 3px 0pt; margin: 0pt;">
-
-<!-- IE -->
-
-
-
-
-
-
- 
-
-
-
-
- 
-
-<div id="wikipage">
-<table>
- <tbody><tr>
- 
- 
- 
- 
- <td style="vertical-align: top; padding-left: 5px;">
- 
- 
- 
- <div id="wikicontent">
- <div class="vt" id="wikimaincol">
-
- <h1>tint2 - FAQ</h1>
-
- <p></p><ul><li><a href="#What_is_tint2?">What is tint2?</a></li><li><a href="#Who_is_the_developer_of_tint2_?">Who is the developer of tint2 ?</a></li><li><a href="#Does_tint2_have_a_system_tray/notification_area?">Does tint2 have a system tray/notification area?</a></li><li><a href="#I_have_the_latest_build_of_tint2_but_still_no_system_tray">I have the latest build of tint2 but still no system tray</a></li><li><a href="#tint2_doesn%27t_show_the_systray/notification">tint2 doesn't show the systray/notification</a></li><li><a href="#Why_did_some_systray_icons_disappear_from_the_panel?">Why did some systray icons disappear from the panel?</a></li><li><a href="#Why_don%27t_some_systray_icons_appear_when_you_run_tint2_in_a">Why don't some systray icons appear when you run tint2 in a KDE session?</a></li><li><a href="#I_want_to_disable_the_tint2_systray">I want to disable the tint2 systray</a></li><li><a href="#How_to_configure_real_transparency">How to configure real transparency</a></li><li><a href="#Tint2_doesn%27t_work_on_compiz_correctly?">Tint2 doesn't work on compiz correctly?</a></li><li><a href="#I_want_to_disable_compiz_shadow_on_Tint2">I want to disable compiz shadow on Tint2</a></li><li><a href="#Adding_a_%27show_desktop%27_button">Adding a 'show desktop' button</a></li><li><a href="#Task_list_is_limited">Task list is limited</a></li><li><a href="#How_can_I_get_%27pager_like_capability%27_?">How can I get 'pager like capability' ?</a></li><li><a href="#I_want_to_hide_some_tasks_from_the_panel_?">I want to hide some tasks from the panel ?</a></li><li><a href="#The_tint2_panel_is_blank">The tint2 panel is blank</a></li><li><a href="#How_to_maximize_window_over_tint2">How to maximize window over tint2</a></li><li><a href="#I_get_errors_when_I_try_to_compile_tint2_on_my_own">I get errors when I try to compile tint2 on my own</a></li><li><a href="#I_upgraded_to_tint2_and_I_still_have_the_old_panel_with_its_bugs">I upgraded to tint2 and I still have the old panel with its bugs</a></li><li><a href="#Tint2_doesn%27t_show_in_Pekwm">Tint2 doesn't show in Pekwm</a></li><li><a href="#Is_there_an_IRC_channel?">Is there an IRC channel?</a></li></ul> <p></p><p>Frequently asked questions. Please add any extra tips to the comments. </p><h1><a name="What_is_tint2?"></a>What is tint2?<a href="#What_is_tint2?" class="section_anchor"></a></h1><ul><li>Tint2 is a panel/taskbar for modern x window managers like GNOME, KDE, XFCE, openbox, pekwm,etc.. </li></ul><h1><a name="Who_is_the_developer_of_tint2_?"></a>Who is the developer of tint2 ?<a href="#Who_is_the_developer_of_tint2_?" class="section_anchor"></a></h1><ul><li>Main developers of tint2 are Thierry Lorthiois and Andreas Fink </li></ul><h1><a name="Does_tint2_have_a_system_tray/notification_area?"></a>Does tint2 have a system tray/notification area?<a href="#Does_tint2_have_a_system_tray/notification_area?" class="section_anchor"></a></h1><ul><li>YES! Tint2 finally has system tray/notification area. Please <a href="https://code.google.com/p/tint2/wiki/Install">install</a> the latest build if your current build doesn't have it. </li></ul><h1><a name="I_have_the_latest_build_of_tint2_but_still_no_system_tray"></a>I have the latest build of tint2 but still no system tray<a href="#I_have_the_latest_build_of_tint2_but_still_no_system_tray" class="section_anchor"></a></h1><ul><li>Check your tint2rc to see if you have the systray option configured and the options are not commented out. </li><li>The systray section looks like this  </li><pre class="prettyprint">#---------------------------------------------
-# SYSTRAYBAR
-#---------------------------------------------
-systray = 1
-systray_padding = 0 3 3
-systray_background_id = 0
-systray_sort = left2right</pre></ul><h1><a name="tint2_doesn't_show_the_systray/notification"></a>tint2 doesn't show the systray/notification<a href="#tint2_doesn%27t_show_the_systray/notification" class="section_anchor"></a></h1><ul><li>Check your tint2rc to see if you have 'systray = 1' </li><li>run tint2 in a terminal. if you get 'tint2 : another systray is running' it's because you have another systray/notification and you can't run more than one at a time.  </li><ul><li>In gnome, remove the systray/notification with a right clic on the separator before your systray/notification -&gt; remove </li></ul></ul><h1><a name="Why_did_some_systray_icons_disappear_from_the_panel?"></a>Why did some systray icons disappear from the panel?<a href="#Why_did_some_systray_icons_disappear_from_the_panel?" class="section_anchor"></a></h1><ul><li>tint2 stops/restarts the systray protocol on some events (like switching theme with tint2conf). But some systray icons do not implement the stop/restart of the manager and so disappear from the panel. You can report the problem to us and also to the systray icon developer. </li></ul><h1><a name="Why_don't_some_systray_icons_appear_when_you_run_tint2_in_a"></a>Why don't some systray icons appear when you run tint2 in a KDE session?<a href="#Why_don%27t_some_systray_icons_appear_when_you_run_tint2_in_a" class="section_anchor"></a></h1><ul><li>Some KDE applications use the KDE status notifier service to show system tray icons. If you disable this service (systemsettings -&gt; Startup and Shutdown -&gt; Service Manager -&gt; uncheck "Status Notifier Manager") all the icons should appear normally in tint2. </li></ul><h1><a name="I_want_to_disable_the_tint2_systray"></a>I want to disable the tint2 systray<a href="#I_want_to_disable_the_tint2_systray" class="section_anchor"></a></h1><ul><li>To disable the systray, just put <tt>systray = 0</tt> in your tint2rc </li><li>Example: </li><pre class="prettyprint">systray = 0
-systray_padding = 0 3 3
-systray_background_id = 0</pre></ul><h1><a name="How_to_configure_real_transparency"></a>How to configure real transparency<a href="#How_to_configure_real_transparency" class="section_anchor"></a></h1><ul><li>tint2 autodetects your composite manager and uses real transparency when possible. However, xcompmgr have a little bug which prevents tint2 from detecting it.  </li><li>If you want autodetect with xcompmgr, download and apply xcompmgr's patch (in bug report). See <a href="http://bugs.freedesktop.org/show_bug.cgi?id=26090" rel="nofollow">xcompmgr patch</a> </li></ul><h1><a name="Tint2_doesn't_work_on_compiz_correctly?"></a>Tint2 doesn't work on compiz correctly?<a href="#Tint2_doesn%27t_work_on_compiz_correctly?" class="section_anchor"></a></h1><ul><li>All my tasks are on one desktop in compiz? </li><ul><li>This is a known issue in compiz. Compiz doesn't support 'Virtual desktop' specification (or you have to disabled visual effect).<br>I look like 'Desktop number' use Viewport instead of 'Virtual desktop'. So pager capabilities are not supported. <br>See <a href="https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/153322" rel="nofollow">https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/153322</a> <br>or <a href="http://forum.compiz.org/viewtopic.php?f=86&amp;t=11943" rel="nofollow">http://forum.compiz.org/viewtopic.php?f=86&amp;t=11943</a> <br>or  <a href="https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/150690" rel="nofollow">https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/150690</a>  </li></ul><li>Tint is being decorated with a window/ has a shadow /is not fully transparent </li><ul><li>Open CompizConfig Settings manager -&gt; Window Decorations Plugin    </li><ul><li>In the box for Decoration windows, put  <tt>any &amp; !type=dock</tt> </li><li>In the box for Shadow windows, put  <tt>any &amp; !type=dock</tt>   </li></ul></ul><blockquote>
-</blockquote><li>Tint has ugly white streaks </li><ul><li>Set a background for your desktop </li></ul></ul><h1><a name="I_want_to_disable_compiz_shadow_on_Tint2"></a>I want to disable compiz shadow on Tint2<a href="#I_want_to_disable_compiz_shadow_on_Tint2" class="section_anchor"></a></h1><ul><li>Run ccsm the compiz configuration tool. Go to Window Decorations. For both decoration and shadow windows, replace 'any' with 'any &amp; !name=tint2'. </li></ul><h1><a name="Adding_a_'show_desktop'_button"></a>Adding a 'show desktop' button<a href="#Adding_a_%27show_desktop%27_button" class="section_anchor"></a></h1><ul><li>tint2 doesn't implement 'show desktop' button. But here a way to get it. <br> </li></ul><p>Create a file with following text </p><pre class="prettyprint">#!/bin/sh
-if wmctrl -m | grep "mode: ON"; then
-exec wmctrl -k off
-else
-exec wmctrl -k on
-fi</pre><p>Save it in /usr/bin/show_desktop.sh and make it executable.<br> Install the package 'wmctrl'. And call the script in tint2rc config file. </p><pre class="prettyprint">time1_format = %H:%M
-time1_font = sans 8
-time2_format = %A %d %B
-time2_font = sans 6
-clock_font_color = #ffffff 76
-clock_padding = 4 4
-clock_background_id = 0
-clock_lclick_command = show_desktop.sh</pre><p>Then left click on the clock will do it. </p><h1><a name="Task_list_is_limited"></a>Task list is limited<a href="#Task_list_is_limited" class="section_anchor"></a></h1><ul><li>In your tint2rc file, check the value of <tt>taskbar_mode</tt>. If it's <tt>multi_desktop</tt>, tint2 show one taskbar per desktop. Change the value to <tt>single_desktop</tt> if you want just one taskbar. </li></ul><h1><a name="How_can_I_get_'pager_like_capability'_?"></a>How can I get 'pager like capability' ?<a href="#How_can_I_get_%27pager_like_capability%27_?" class="section_anchor"></a></h1><ul><li>In your tint2rc file, change the value of <tt>taskbar_mode</tt> to <tt>multi_desktop</tt>. This option will show one taskbar per desktop. So you can detect on witch desktop is an application and witch desktop is empty (or full). You can close an application whithout switching to the desktop. You can drag n drop application between desktop.   </li></ul><h1><a name="I_want_to_hide_some_tasks_from_the_panel_?"></a>I want to hide some tasks from the panel ?<a href="#I_want_to_hide_some_tasks_from_the_panel_?" class="section_anchor"></a></h1><ul><li>In Openbox config file 'rc.xml' you can assign the property 'skip_taskbar' to your window </li></ul><h1><a name="The_tint2_panel_is_blank"></a>The tint2 panel is blank<a href="#The_tint2_panel_is_blank" class="section_anchor"></a></h1><ul><li>A new option, called  <tt>panel_items</tt> has been added to the config file. This option defines the items tint2 will show and the order of those items(from left to right). Please define that in your tint2rc file. The format is shown below. The options are <tt>L</tt> for <tt>Launcher</tt>, <tt>S</tt> for the <tt>Systray</tt>, <tt>T</tt> for the <tt>taskbar</tt>, <tt>C</tt> for the <tt>clock</tt> and <tt>B</tt> for the <tt>battery</tt>. </li><pre class="prettyprint">panel_items = LTSBC </pre></ul><h1><a name="How_to_maximize_window_over_tint2"></a>How to maximize window over tint2<a href="#How_to_maximize_window_over_tint2" class="section_anchor"></a></h1><ul><li>You can manage interaction between tint2 and window with : </li><pre class="prettyprint">panel_layer = bottom,normal,top
-strut_policy = follow_size/minimum/none
-autohide_height = integer</pre></ul><blockquote>If you want maximized window never cover tint2: 
-<pre class="prettyprint">panel_layer = top
-strut_policy = follow_size</pre>If you want maximized window behind tint2: 
-<pre class="prettyprint">panel_layer = top
-strut_policy = none</pre>If you want maximized window behind tint2, but 2 pixels free so you can use desktop action (right click, ...): 
-<pre class="prettyprint">panel_layer = top
-strut_policy = minimum
-autohide_height = 2</pre></blockquote><h1><a name="I_get_errors_when_I_try_to_compile_tint2_on_my_own"></a>I get errors when I try to compile tint2 on my own<a href="#I_get_errors_when_I_try_to_compile_tint2_on_my_own" class="section_anchor"></a></h1><ul><li>Do you have all the dependencies installed? Please check <a href="https://code.google.com/p/tint2/wiki/Install#Dependencies">here</a> </li></ul><h1><a name="I_upgraded_to_tint2_and_I_still_have_the_old_panel_with_its_bugs"></a>I upgraded to tint2 and I still have the old panel with its bugs<a href="#I_upgraded_to_tint2_and_I_still_have_the_old_panel_with_its_bugs" class="section_anchor"></a></h1><ul><li>The tint binary was renamed tint2 to avoid a conflict with another package.So your new tint2 startup command is <strong>tint2</strong> </li><li>Since a new stable release hasn't been released yet, both the old tint and the new tint2 binaries will be on your system when you upgrade just incase you run into some problems and want to fall back on the old binary. </li></ul><h1><a name="Tint2_doesn't_show_in_Pekwm"></a>Tint2 doesn't show in Pekwm<a href="#Tint2_doesn%27t_show_in_Pekwm" class="section_anchor"></a></h1><ul><li>The problem is that pekwm defines by default edge borders, and doesn't allow a panel to get inside these edge borders. The config option is in <tt>~/.pekwm/config</tt> under <tt>Screen/EdgeSize</tt>. You can either disable the edge borders or set tint2 to a size where it doesn't enter these borders (i.e. play with <tt>panel_size</tt> and <tt>panel_margin</tt>) </li><li>Setting the margin to one pixel made it appear on my screen. With horizontal panel: </li><pre class="prettyprint">panel_size = 95% height
-panel_margin = 0 1</pre><li>With vertical panel: </li><pre class="prettyprint">panel_size = width 95%
-panel_margin = 1 0</pre></ul><h1><a name="Is_there_an_IRC_channel?"></a>Is there an IRC channel?<a href="#Is_there_an_IRC_channel?" class="section_anchor"></a></h1><ul><li>Yes. There is now an irc channel, <strong>#tint2</strong> on <a href="irc://irc.freenode.net" rel="nofollow">irc.freenode.net</a>. </li><li>Just ask your question and stay there, because we are not always watching the channel ;) </li></ul>
- </div>
- </div>
- </td></tr><tr>
-</tr></tbody></table>
- </div>
-
-
- 
- <div id="wikicommentcol">
- 
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
-<div class="collapse">
-
-
- 
-
-
-
-</div>
-
- 
-
-
- 
-
-
- </div>
- 
- 
- 
- 
- 
- <div id="commentform">
- 
- </div>
- 
- 
- 
- 
- 
-
-
- 
-
-
- 
- 
-
-
-
-
-
-
-  
- 
- 
- 
- 
- 
- 
- 
- 
-</div> 
-
- <div class="hostedBy" style="margin-top: -20px;">
- 
- </div>
- 
- 
-
-
- 
- 
-
-
-
-
-
-</body></html>

packaging/version_status.py

@@ -0,0 +1,408 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+
+import sys
+reload(sys)
+sys.setdefaultencoding('utf8')
+import datetime
+import xml.etree.ElementTree as ET
+import ftplib
+import gzip
+import json
+import re
+from StringIO import StringIO
+import urllib2
+
+
+# Returns true if `value` is an integer represented as a string.
+def is_int(value):
+  # type: (str) -> bool
+  try:
+    value = int(value)
+  except ValueError:
+    return False
+  return True
+
+
+# Returns a new string with all instances of multiple whitespace
+# replaced with a single space.
+def collapse_multiple_spaces(line):
+  # type: (str) -> str
+  return " ".join(line.split())
+
+
+# Extracts the file name from a line of an FTP listing.
+# The input must be a valid directory entry (starting with "-" or "d").
+def ftp_file_name_from_listing(line):
+  # type: (str) -> str
+  line = collapse_multiple_spaces(line)
+  return line.split(" ", 8)[-1]
+
+
+# Extracts a list of the directories and a list of the files
+# from an FTP listing.
+def ftp_list_dir_process_listing(lines):
+  # type: (List[str]) -> List[str], List[str]
+  dirs = []
+  files = []
+  for line in lines:
+    if line.startswith("d"):
+      dirs.append(ftp_file_name_from_listing(line))
+    elif line.startswith("-"):
+      files.append(ftp_file_name_from_listing(line))
+  return dirs, files
+
+
+# Lists the remote FTP directory located at `path`.
+# Returns a list of the directories and a list of the files.
+def ftp_list_dir(ftp, path):
+  # type: (ftplib.FTP, str) -> List[str], List[str]
+  ftp.cwd(path)
+  lines = []
+  ftp.retrlines("LIST", lines.append)
+  return ftp_list_dir_process_listing(lines)
+
+
+# Downloads a binary file to a string.
+# Returns the string.
+def ftp_download(ftp, path):
+  # type: (ftplib.FTP, str) -> str
+  blocks = []
+  ftp.retrbinary("RETR {0}".format(path), blocks.append)
+  return "".join(blocks)
+
+
+# Extracts the list of links from an HTML string.
+def http_links_from_listing(html):
+  # type: (str) -> List[str]
+  pattern = re.compile(r"""href=['"]+([^'"]+)['"]+""")
+  return re.findall(pattern, html)
+
+
+# Extracts the list of paths (relative links, except to ../*) from an HTML string.
+def http_paths_from_listing(html):
+  # type: (str) -> List[str]
+  paths = []
+  for link in http_links_from_listing(html):
+    if link.startswith(".."):
+      continue
+    if link == "./" or link == "/":
+      continue
+    if "://" in link:
+      continue
+    paths.append(link)
+  return paths
+
+
+# Downloads a file as string from an URL. Decodes correctly.
+def http_download_txt(url):
+  # type: (str) -> str
+  try:
+    r = urllib2.urlopen(url)
+    encoding = r.headers.getparam("charset")
+    if not encoding:
+      encoding = "utf-8"
+    return r.read().decode(encoding)
+  except:
+    raise
+
+
+# Extracts the list of paths (relative links, except to ../*) from the HTML code
+# located at `url`.
+def http_list_dir(url):
+  # type: (str) -> List[str]
+  try:
+    html = http_download_txt(url)
+  except:
+    return []
+  return http_paths_from_listing(html)
+
+
+# Extracts the version and maintainer info for a package, from a Debian repository Packages file.
+def deb_packages_extract_version(packages, name):
+  # type: (str, str) -> str, str
+  inside = False
+  version = None
+  maintainer = None
+  for line in packages.split("\n"):
+    if line == "Package: " + name:
+      inside = True
+    elif not line:
+      if inside:
+        break
+    else:
+      if inside:
+        if line.startswith("Version:"):
+          version = line.split(":", 1)[-1].strip()
+        elif line.startswith("Maintainer:"):
+          maintainer = line.split(":", 1)[-1].strip()
+  return version, maintainer
+
+# Extracts the version and maintainer info for a package, from an Arch PKGBUILD file.
+def arch_pkgbuild_extract_version(pkgbuild):
+  # type: (str) -> str, str
+  version = None
+  maintainer = None
+  for line in pkgbuild.split("\n"):
+    if line.startswith("# Maintainer:"):
+      maintainer = line.split(":", 1)[-1].strip()
+    elif line.startswith("pkgver="):
+      version = line.split("=", 1)[-1].strip()
+  return version, maintainer
+
+
+# Debian
+
+def get_debian_release_version(release):
+  data = http_download_txt("http://metadata.ftp-master.debian.org/changelogs/main/t/tint2/{0}_changelog".format(release))
+  version = data.split("\n", 1)[0].split("(", 1)[-1].split(")", 1)[0].strip()
+  maintainer = [line.split("--", 1)[-1] for line in data.split("\n") if line.startswith(" --")][0].split("  ")[0].strip()
+  return release, version, maintainer
+
+
+def get_debian_versions():
+  return "Debian", "debian", [get_debian_release_version(release) for release in ["stable", "testing", "unstable", "experimental"]]
+
+
+# Ubuntu
+
+def get_ubuntu_versions():
+  data = http_download_txt("https://api.launchpad.net/1.0/ubuntu/+archive/primary?ws.op=getPublishedSources&source_name=tint2&exact_match=true")
+  data = json.loads(data)["entries"]
+  data.reverse()
+  versions = []
+  for package in data:
+    if package["status"] == "Published":
+      version = package["source_package_version"]
+      release = package["distro_series_link"].split("/")[-1]
+      maintainer = package["package_maintainer_link"]
+      versions.append((release, version, maintainer))
+  return "Ubuntu", "ubuntu", versions
+
+
+# BunsenLabs
+
+def get_bunsenlabs_versions():
+  dirs = http_list_dir("https://eu.pkg.bunsenlabs.org/debian/dists/")
+  versions = []
+  for d in dirs:
+    if d.endswith("/") and "/" not in d[:-1]:
+      release = d.replace("/", "")
+      packages = http_download_txt("https://eu.pkg.bunsenlabs.org/debian/dists/{0}/main/binary-amd64/Packages".format(release))
+      version, maintainer = deb_packages_extract_version(packages, "tint2")
+      if version:
+        versions.append((release, version, maintainer))
+  return "BunsenLabs", "bunsenlabs", versions
+
+
+# Arch
+
+def get_arch_versions():
+  pkgbuild = http_download_txt("https://git.archlinux.org/svntogit/community.git/plain/trunk/PKGBUILD?h=packages/tint2")
+  version, maintainer = arch_pkgbuild_extract_version(pkgbuild)
+  return "Arch Linux", "archlinux", [("Community", version, maintainer)]
+
+
+# Fedora
+
+def get_fedora_versions():
+  dirs = http_list_dir("http://mirror.switch.ch/ftp/mirror/fedora/linux/development/")
+  versions = []
+  for d in dirs:
+    if d.endswith("/") and "/" not in d[:-1]:
+      release = d.replace("/", "")
+      packages = http_list_dir("http://mirror.switch.ch/ftp/mirror/fedora/linux/development/{0}/Everything/source/tree/Packages/t/".format(release))
+      for p in packages:
+        if p.startswith("tint2-"):
+          version = p.split("-", 1)[-1].split(".fc")[0]
+          v = (release, version, "")
+          if v not in versions:
+            versions.append(v)
+  return "Fedora", "fedora", versions
+
+
+# Red Hat (EPEL)
+
+def get_redhat_epel_versions():
+  dirs = http_list_dir("http://mirror.switch.ch/ftp/mirror/epel/")
+  versions = []
+  for d in dirs:
+    if d.endswith("/") and "/" not in d[:-1] and is_int(d[:-1]):
+      release = d.replace("/", "")
+      packages = http_list_dir("http://mirror.switch.ch/ftp/mirror/epel/{0}/SRPMS/t/".format(release))
+      for p in packages:
+        if p.startswith("tint2-"):
+          version = p.split("-", 1)[-1].split(".el")[0]
+          v = (release, version, "")
+          if v not in versions:
+            versions.append(v)
+  return "RedHat (EPEL)", "rhel", versions
+
+
+# SUSE
+
+def get_suse_versions():
+  ftp = ftplib.FTP("mirror.switch.ch")
+  ftp.login()
+  releases, _ = ftp_list_dir(ftp, "/mirror/opensuse/opensuse/distribution/leap/")
+  versions = []
+  for release in releases:
+    root = "/mirror/opensuse/opensuse/distribution/leap/{0}/repo/oss/suse/repodata/".format(release)
+    _, files = ftp_list_dir(ftp, root)
+    for fname in files:
+      if fname.endswith("-primary.xml.gz"):
+        data = ftp_download(ftp, "{0}/{1}".format(root, fname))
+        xml = gzip.GzipFile(fileobj=StringIO(data)).read()
+        root = ET.fromstring(xml)
+        for package in root.findall("{http://linux.duke.edu/metadata/common}package"):
+          name = package.find("{http://linux.duke.edu/metadata/common}name").text
+          if name == "tint2":
+            version = package.find("{http://linux.duke.edu/metadata/common}version").get("ver")
+            versions.append((release, version, ""))
+  ftp.quit()
+  return "OpenSUSE", "opensuse", versions
+
+
+# Gentoo
+
+def get_gentoo_versions():
+  files = http_list_dir("https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-misc/tint2")
+  versions = []
+  for f in files:
+    if "tint2" in f and f.endswith(".ebuild"):
+      version = f.split("tint2-")[-1].split(".ebuild")[0]
+      v = ("", version, "")
+      if v not in versions:
+        versions.append(v)
+  return "Gentoo", "gentoo", versions
+
+
+# Void
+
+def get_void_versions():
+  template = http_download_txt("https://raw.githubusercontent.com/voidlinux/void-packages/master/srcpkgs/tint2/template")
+  versions = []
+  version = None
+  maintainer = None
+  for line in template.split("\n"):
+    if line.startswith("version="):
+      version = line.split("=", 1)[-1].replace('"', "").strip()
+    elif line.startswith("maintainer="):
+      maintainer = line.split("=", 1)[-1].replace('"', "").strip()
+  if version:
+    versions.append(("", version, maintainer))
+  return "Void Linux", "void", versions
+
+
+# Alpine
+
+def get_alpine_versions():
+  apkbuild = http_download_txt("https://git.alpinelinux.org/cgit/aports/plain/community/tint2/APKBUILD")
+  versions = []
+  version = None
+  maintainer = None
+  for line in apkbuild.split("\n"):
+    if line.startswith("pkgver="):
+      version = line.split("=", 1)[-1].replace('"', "").strip()
+    elif line.startswith("# Maintainer:"):
+      maintainer = line.split(":", 1)[-1].replace('"', "").strip()
+  if version:
+    versions.append(("", version, maintainer))
+  return "Alpine Linux", "alpine", versions
+
+
+# Slackware
+
+def get_slack_versions():
+  dirs = http_list_dir("https://slackbuilds.org/slackbuilds/")
+  versions = []
+  for d in dirs:
+    if d.endswith("/") and "/" not in d[:-1]:
+      release = d.replace("/", "")
+      try:
+        info = http_download_txt("https://slackbuilds.org/slackbuilds/{0}/desktop/tint2/tint2.info".format(release))
+      except:
+        continue
+      version = None
+      maintainer = None
+      for line in info.split("\n"):
+        if line.startswith("VERSION="):
+          version = line.split("=", 1)[-1].replace('"', "").strip()
+        elif line.startswith("MAINTAINER="):
+          maintainer = line.split("=", 1)[-1].replace('"', "").strip()
+      if version:
+        versions.append((release, version, maintainer))
+  return "Slackware", "slackware", versions
+
+# FreeBSD
+
+def get_freebsd_versions():
+  makefile = http_download_txt("https://svnweb.freebsd.org/ports/head/x11/tint/Makefile?view=co")
+  versions = []
+  version = None
+  maintainer = None
+  for line in makefile.split("\n"):
+    if line.startswith("PORTVERSION="):
+      version = line.split("=", 1)[-1].strip()
+    elif line.startswith("MAINTAINER="):
+      maintainer = line.split("=", 1)[-1].strip()
+  if version:
+    versions.append(("", version, maintainer))
+  return "FreeBSD", "freebsd", versions
+
+
+# OpenBSD
+
+def get_openbsd_versions():
+  makefile = http_download_txt("http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/x11/tint2/Makefile?rev=1.5&content-type=text/plain")
+  versions = []
+  version = None
+  for line in makefile.split("\n"):
+    if line.startswith("V="):
+      version = line.split("=", 1)[-1].strip()
+  if version:
+    versions.append(("", version, ""))
+  return "OpenBSD", "openbsd", versions
+
+
+# Upstream
+
+def get_tint2_version():
+  readme = http_download_txt("https://gitlab.com/o9000/tint2/raw/master/README.md")
+  version = readme.split("\n", 1)[0].split(":", 1)[-1].strip()
+  return version
+
+
+def main():
+  latest = get_tint2_version()
+  distros = []
+  distros.append(get_debian_versions())
+  distros.append(get_bunsenlabs_versions())
+  distros.append(get_ubuntu_versions())
+  distros.append(get_fedora_versions())
+  distros.append(get_redhat_epel_versions())
+  distros.append(get_suse_versions())
+  distros.append(get_alpine_versions())
+  distros.append(get_slack_versions())
+  distros.append(get_arch_versions())
+  distros.append(get_void_versions())
+  distros.append(get_gentoo_versions())
+  distros.append(get_freebsd_versions())
+  distros.append(get_openbsd_versions())
+  print "| Distribution | Release | Version | Status |"
+  print "| ------------ | ------- | ------- | ------ |"
+  for dist, dcode, releases in distros:
+    icon = "![](numix-icons/distributor-logo-{0}.svg.png)".format(dcode)
+    for r in releases:
+      if r[1].split("-", 1)[0] == latest:
+        status = ":white_check_mark: Latest"
+      else:
+        status = ":warning: Out of date"
+      print "| {0} {1} | {2} | {3} | {4} |".format(icon, dist, r[0], r[1], status)
+  utc_datetime = datetime.datetime.utcnow()
+  print ""
+  print "Last updated:", utc_datetime.strftime("%Y-%m-%d %H:%M UTC")
+
+
+if __name__ == "__main__":
+  main()

packaging/version_status_test.py

@@ -0,0 +1,208 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+
+import unittest
+from version_status import *
+
+
+class TestStringFunctions(unittest.TestCase):
+  def test_collapse_multiple_spaces(self):
+    self.assertEqual(collapse_multiple_spaces("asdf"), "asdf")
+    self.assertEqual(collapse_multiple_spaces("as df"), "as df")
+    self.assertEqual(collapse_multiple_spaces("as  df"), "as df")
+    self.assertEqual(collapse_multiple_spaces("a  s    d f"), "a s d f")
+
+
+class TestFtpFunctions(unittest.TestCase):
+  def test_ftp_file_name_from_listing(self):
+    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18 README"), "README")
+    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18:12 README"), "README")
+    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18 READ ME"), "READ ME")
+    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18:12 READ ME"), "READ ME")
+    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18 README"), "README")
+    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18:12 README.txt"), "README.txt")
+    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18:12 READ ME.txt"), "READ ME.txt")
+
+  def test_ftp_list_dir_process_listing(self):
+    lines = [ "-rw-rw-r--    1 1176     1176         1063 Jun 15 10:18 README",
+              "-rw-rw-r--    1 1176     1176         1063 Jun 15 10:18:11 READ ME.txt",
+              "drwxr-sr-x    5 1176     1176         4096 Dec 19  2000 pool",
+              "drwxr-sr-x    4 1176     1176         4096 Nov 17  2008 project",
+              "drwxr-xr-x    3 1176     1176         4096 Oct 10  2012 tools"]
+    dirs_check = ["pool", "project", "tools"]
+    files_check = ["README", "READ ME.txt"]
+    dirs, files = ftp_list_dir_process_listing(lines)
+    dirs.sort()
+    dirs_check.sort()
+    files.sort()
+    files_check.sort()
+    self.assertEqual(dirs, dirs_check)
+    self.assertEqual(files, files_check)
+
+
+class TestHttpFunctions(unittest.TestCase):
+  def test_http_links_from_listing(self):
+    html = """<html>
+              <head><title>Index of /debian/dists/</title></head>
+              <body bgcolor="white">
+              <a href="http://google.com">google/</a>
+              <h1>Index of /debian/dists/</h1><hr><pre><a href="../">../</a>
+              <a href="bunsen-hydrogen/">bunsen-hydrogen/</a>                                   08-May-2017 20:31       -
+              <a href="jessie-backports/">jessie-backports/</a>                                  01-Jul-2017 15:58       -
+              <a href="unstable/">unstable/</a>                                          12-Aug-2017 19:32       -
+              </pre><hr></body>
+              </html>"""
+    links_check = ["../", "bunsen-hydrogen/", "jessie-backports/", "unstable/", "http://google.com"]
+    links = http_links_from_listing(html)
+    links.sort()
+    links_check.sort()
+    self.assertEqual(links, links_check)
+
+  def test_http_paths_from_listing(self):
+    html = """<html>
+              <head><title>Index of /debian/dists/</title></head>
+              <body bgcolor="white">
+              <h1>Index of /debian/dists/</h1><hr><pre><a href="../">../</a>
+              <a href="bunsen-hydrogen/">bunsen-hydrogen/</a>                                   08-May-2017 20:31       -
+              <a href="jessie-backports/">jessie-backports/</a>                                  01-Jul-2017 15:58       -
+              <a href="unstable/">unstable/</a>                                          12-Aug-2017 19:32       -
+              </pre><hr></body>
+              </html>"""
+    paths_check = ["bunsen-hydrogen/", "jessie-backports/", "unstable/"]
+    paths = http_paths_from_listing(html)
+    paths.sort()
+    paths_check.sort()
+    self.assertEqual(paths, paths_check)
+
+
+class TestPackageFunctions(unittest.TestCase):
+  def test_deb_packages_extract_version(self):
+    packages = """Package: sendmailanalyzer
+Version: 9.2-1.1
+Architecture: all
+Maintainer: Dominique Fournier <dominique@fournier38.fr>
+Installed-Size: 749
+Pre-Depends: perl
+Depends: apache2
+Homepage: http://sareport.darold.net/
+Priority: optional
+Section: mail
+Filename: pool/main/s/sendmailanalyzer/sendmailanalyzer_9.2-1.1_all.deb
+Size: 143576
+SHA256: 0edcbde19a23333c8c894e27af32447582b38e3ccd84122ac07720fdaab8fa0c
+SHA1: a7f4dcf42e850acf2c201bc4594cb6b765dced20
+MD5sum: adb39196fc33a826b24e9d0e440cba25
+Description: Perl Sendmail/Postfix log analyser
+ SendmailAnalyzer continuously read your mail log file to generate
+ periodical HTML and graph reports. All reports are shown through
+ a CGI web interface.
+ It reports all you ever wanted to know about email trafic on your network.
+ You can also use it in ISP environment with per domain report.
+
+Package: tint2
+Version: 0.14.6-1
+Architecture: amd64
+Maintainer: Jens John <dev@2ion.de>
+Installed-Size: 1230
+Depends: libatk1.0-0 (>= 1.12.4), libc6 (>= 2.15), libcairo2 (>= 1.2.4), libfontconfig1 (>= 2.11), libfreetype6 (>= 2.2.1), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.9), libgtk2.0-0 (>= 2.14.0), libimlib2 (>= 1.4.5), libpango-1.0-0 (>= 1.20.0), libpangocairo-1.0-0 (>= 1.14.0), libpangoft2-1.0-0 (>= 1.14.0), librsvg2-2 (>= 2.14.4), libstartup-notification0 (>= 0.4), libx11-6, libxcomposite1 (>= 1:0.3-1), libxdamage1 (>= 1:1.1), libxfixes3, libxinerama1, libxrandr2 (>= 2:1.2.99.3), libxrender1
+Homepage: https://gitlab.com/o9000/tint2/
+Priority: optional
+Section: x11
+Filename: pool/main/t/tint2/tint2_0.14.6-1_amd64.deb
+Size: 279638
+SHA256: c96e745425a97828952e9e0277176fe68e2512056915560ac968a66c88a0a8b7
+SHA1: 82edd60429a494bb127e6d8a10434fca0ee60f61
+MD5sum: 65455638fb41503361560b25a70b33b7
+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.
+
+Package: xfce4-power-manager
+Version: 1.4.4-4~bpo8+1
+Architecture: amd64
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
+Installed-Size: 541
+Depends: libc6 (>= 2.4), libcairo2 (>= 1.2.4), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>= 0.88), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.41.1), libgtk2.0-0 (>= 2.24.0), libnotify4 (>= 0.7.0), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libupower-glib3 (>= 0.99.0), libx11-6, libxext6, libxfce4ui-1-0 (>= 4.9.0), libxfce4util6 (>= 4.9.0), libxfconf-0-2 (>= 4.6.0), libxrandr2 (>= 2:1.2.99.2), upower (>= 0.99), xfce4-power-manager-data (= 1.4.4-4~bpo8+1)
+Recommends: libpam-systemd, xfce4-power-manager-plugins
+Homepage: http://goodies.xfce.org/projects/applications/xfce4-power-manager
+Priority: optional
+Section: xfce
+Filename: pool/main/x/xfce4-power-manager/xfce4-power-manager_1.4.4-4~bpo8+1_amd64.deb
+Size: 214122
+SHA256: 992b606afe5e9934bce19a1df2b8d7067c98b9d64e23a9b63dbd0c4cf28b4ac9
+SHA1: 6bfcd77071f31577a37abab063bf21a34f4d616c
+MD5sum: fb777aecbbfe39742649b768eb22c697
+Description: power manager for Xfce desktop
+ This power manager for the Xfce desktop enables laptop users to set up
+ a power profile for two different modes "on battery power" and "on ac
+ power" while still allowing desktop users to at least change the DPMS
+ settings and CPU frequency using the settings dialogue..
+ .
+ It features:
+   * battery monitoring
+   * cpu frequency settings
+   * monitor DPMS settings
+   * suspend/Hibernate
+   * LCD brightness control
+   * Lid, sleep and power switches control"""
+    version, maintainer = deb_packages_extract_version(packages, "tint2")
+    self.assertEqual(version, "0.14.6-1")
+    self.assertEqual(maintainer, "Jens John <dev@2ion.de>")
+    version, maintainer = deb_packages_extract_version(packages, "asdf")
+    self.assertEqual(version, None)
+    self.assertEqual(maintainer, None)
+
+  def test_arch_packages_extract_version(self):
+    pkgbuild = """# $Id$
+# Maintainer: Alexander F Rødseth <xyproto@archlinux.org>
+# Contributor: Blue Peppers <bluepeppers@archlinux.us>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Yannick LM <LMyannicklm1337@gmail.com>
+
+pkgname=tint2
+pkgver=0.14.6
+pkgrel=2
+pkgdesc='Basic, good-looking task manager for WMs'
+arch=('x86_64' 'i686')
+url='https://gitlab.com/o9000/tint2'
+license=('GPL2')
+depends=('gtk2' 'imlib2' 'startup-notification')
+makedepends=('cmake' 'startup-notification' 'git' 'ninja' 'setconf')
+source=("$pkgname-$pkgver.tar.bz2::https://gitlab.com/o9000/tint2/repository/archive.tar.bz2?ref=$pkgver")
+sha256sums=('b40079fb187aa248cd3b6957076f138d040c723b309e1b254ac0c8ec9826a451')
+
+prepare() {
+  mv "$pkgname-$pkgver-"* "$pkgname"
+  setconf "$pkgname/get_version.sh" VERSION "$pkgver"
+}
+
+build() {
+  mkdir -p build
+  cd build
+  cmake "../$pkgname" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_TINT2CONF=1 \
+    -GNinja
+  ninja
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+}
+
+# getver: gitlab.com/o9000/tint2/blob/master/README.md
+# vim: ts=2 sw=2 et:"""
+    version, maintainer = arch_pkgbuild_extract_version(pkgbuild)
+    self.assertEqual(version, "0.14.6")
+    self.assertEqual(maintainer, "Alexander F Rødseth <xyproto@archlinux.org>")
+
+
+if __name__ == '__main__':
+  unittest.main()

src/battery/battery.c

@@ -35,20 +35,25 @@ gboolean bat1_has_font;
 PangoFontDescription *bat1_font_desc;
 gboolean bat2_has_font;
 PangoFontDescription *bat2_font_desc;
+char *bat1_format;
+char *bat2_format;
 struct BatteryState battery_state;
 gboolean battery_enabled;
 gboolean battery_tooltip_enabled;
 int percentage_hide;
 static timeout *battery_timeout;
 
-static char buf_bat_percentage[10];
-static char buf_bat_time[20];
+#define BATTERY_BUF_SIZE 256
+static char buf_bat_line1[BATTERY_BUF_SIZE];
+static char buf_bat_line2[BATTERY_BUF_SIZE];
 
 int8_t battery_low_status;
 gboolean battery_low_cmd_sent;
+gboolean battery_full_cmd_sent;
 char *ac_connected_cmd;
 char *ac_disconnected_cmd;
 char *battery_low_cmd;
+char *battery_full_cmd;
 char *battery_lclick_command;
 char *battery_mclick_command;
 char *battery_rclick_command;
@@ -56,8 +61,12 @@ 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()
 {
@@ -66,14 +75,18 @@ void default_battery()
     battery_found = FALSE;
     percentage_hide = 101;
     battery_low_cmd_sent = FALSE;
+    battery_full_cmd_sent = FALSE;
     battery_timeout = NULL;
     bat1_has_font = FALSE;
     bat1_font_desc = NULL;
+    bat1_format = NULL;
     bat2_has_font = FALSE;
     bat2_font_desc = NULL;
+    bat2_format = NULL;
     ac_connected_cmd = NULL;
     ac_disconnected_cmd = NULL;
     battery_low_cmd = NULL;
+    battery_full_cmd = NULL;
     battery_lclick_command = NULL;
     battery_mclick_command = NULL;
     battery_rclick_command = NULL;
@@ -94,6 +107,12 @@ void cleanup_battery()
     bat2_font_desc = NULL;
     free(battery_low_cmd);
     battery_low_cmd = NULL;
+    free(battery_full_cmd);
+    battery_full_cmd = NULL;
+    free(bat1_format);
+    bat1_format = NULL;
+    free(bat2_format);
+    bat2_format = NULL;
     free(battery_lclick_command);
     battery_lclick_command = NULL;
     free(battery_mclick_command);
@@ -115,6 +134,91 @@ void cleanup_battery()
     battery_os_free();
 }
 
+// Appends addendum to dest, and does not allow dest to grow over limit (including NULL terminator).
+char *strnappend(char *dest, const char *addendum, size_t limit)
+{
+    char *tmp = strdup(dest);
+
+    // Actually concatenate them.
+    snprintf(dest, limit, "%s%s", tmp, addendum);
+
+    free(tmp);
+    return dest;
+}
+
+void battery_update_text(char *dest, char *format)
+{
+    if (!battery_enabled || !dest || !format)
+        return;
+    // We want to loop over the format specifier, replacing any known symbols with our battery data.
+    // First, erase anything already stored in the buffer.
+    // This ensures the string will always be null-terminated.
+    bzero(dest, BATTERY_BUF_SIZE);
+
+    for (size_t o = 0; o < strlen(format); o++) {
+        char buf[BATTERY_BUF_SIZE];
+        bzero(buf, BATTERY_BUF_SIZE);
+        char *c = &format[o];
+        // Format specification:
+        // %s :	State (charging, discharging, full, unknown)
+        // %m :	Minutes left (estimated).
+        // %h : Hours left (estimated).
+        // %t :	Time left. This is equivalent to the old behaviour; i.e. "(plugged in)" or "hrs:mins" otherwise.
+        // %p :	Percentage left. Includes the % sign.
+        if (*c == '%') {
+            c++;
+            o++; // Skip the format control character.
+            switch (*c) {
+            case 's':
+                // Append the appropriate status message to the string.
+                strnappend(dest,
+                        (battery_state.state == BATTERY_CHARGING)
+                            ? "Charging"
+                            : (battery_state.state == BATTERY_DISCHARGING)
+                                  ? "Discharging"
+                                  : (battery_state.state == BATTERY_FULL)
+                                        ? "Full"
+                                        : "Unknown",
+                        BATTERY_BUF_SIZE);
+                break;
+            case 'm':
+                snprintf(buf, sizeof(buf), "%02d", battery_state.time.minutes);
+                strnappend(dest, buf, BATTERY_BUF_SIZE);
+                break;
+            case 'h':
+                snprintf(buf, sizeof(buf), "%02d", battery_state.time.hours);
+                strnappend(dest, buf, BATTERY_BUF_SIZE);
+                break;
+            case 'p':
+                snprintf(buf, sizeof(buf), "%d%%", battery_state.percentage);
+                strnappend(dest, buf, BATTERY_BUF_SIZE);
+                break;
+            case 't':
+                if (battery_state.state == BATTERY_FULL) {
+                    snprintf(buf, sizeof(buf), "Full");
+                    strnappend(dest, buf, BATTERY_BUF_SIZE);
+                } else {
+                    snprintf(buf, sizeof(buf), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
+                    strnappend(dest, buf, BATTERY_BUF_SIZE);
+                }
+                break;
+
+            case '%':
+            case '\0':
+                strnappend(dest, "%", BATTERY_BUF_SIZE);
+                break;
+            default:
+                fprintf(stderr, "tint2: Battery: unrecognised format specifier '%%%c'.\n", *c);
+                buf[0] = *c;
+                strnappend(dest, buf, BATTERY_BUF_SIZE);
+            }
+        } else {
+            buf[0] = *c;
+            strnappend(dest, buf, BATTERY_BUF_SIZE);
+        }
+    }
+}
+
 void init_battery()
 {
     if (!battery_enabled)
@@ -122,7 +226,6 @@ void init_battery()
 
     battery_found = battery_os_init();
 
-	if (!battery_timeout)
     battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
 
     update_battery();
@@ -154,6 +257,7 @@ void init_battery_panel(void *p)
     battery->area._draw_foreground = draw_battery;
     battery->area.size_mode = LAYOUT_FIXED;
     battery->area._resize = resize_battery;
+    battery->area._compute_desired_size = battery_compute_desired_size;
     battery->area._is_under_mouse = full_width_area_is_under_mouse;
     battery->area.on_screen = TRUE;
     battery->area.resize_needed = 1;
@@ -163,6 +267,12 @@ void init_battery_panel(void *p)
     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);
+
+    if (!bat1_format && !bat2_format) {
+        bat1_format = strdup("%p");
+        bat2_format = strdup("%t");
+    }
 }
 
 void battery_init_fonts()
@@ -196,7 +306,7 @@ void battery_default_font_changed()
         panels[i].battery.area.resize_needed = TRUE;
         schedule_redraw(&panels[i].battery.area);
     }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 }
 
 void update_battery_tick(void *arg)
@@ -221,14 +331,14 @@ void update_battery_tick(void *arg)
 
     if (old_ac_connected != battery_state.ac_connected) {
         if (battery_state.ac_connected)
-			tint_exec(ac_connected_cmd);
+            tint_exec_no_sn(ac_connected_cmd);
         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 &&
         !battery_low_cmd_sent) {
-		tint_exec(battery_low_cmd);
+        tint_exec_no_sn(battery_low_cmd);
         battery_low_cmd_sent = TRUE;
     }
     if (battery_state.percentage > battery_low_status && battery_state.state == BATTERY_CHARGING &&
@@ -236,32 +346,32 @@ void update_battery_tick(void *arg)
         battery_low_cmd_sent = FALSE;
     }
 
+    if ((battery_state.percentage >= 100 || battery_state.state == BATTERY_FULL) &&
+        !battery_full_cmd_sent) {
+        tint_exec_no_sn(battery_full_cmd);
+        battery_full_cmd_sent = TRUE;
+    }
+    if (battery_state.percentage < 100 && battery_state.state != BATTERY_FULL &&
+        battery_full_cmd_sent) {
+        battery_full_cmd_sent = FALSE;
+    }
+
     for (int i = 0; i < num_panels; i++) {
         // Show/hide if needed
         if (!battery_found) {
-			if (panels[i].battery.area.on_screen) {
             hide(&panels[i].battery.area);
-				panel_refresh = TRUE;
-			}
         } else {
-			if (battery_state.percentage >= percentage_hide) {
-				if (panels[i].battery.area.on_screen) {
+            if (battery_state.percentage >= percentage_hide)
                 hide(&panels[i].battery.area);
-					panel_refresh = TRUE;
-				}
-			} else {
-				if (!panels[i].battery.area.on_screen) {
+            else
                 show(&panels[i].battery.area);
-					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;
+                schedule_panel_redraw();
             }
         }
     }
@@ -282,104 +392,51 @@ int update_battery()
         battery_state.percentage = 100;
     }
 
+    battery_update_text(buf_bat_line1, bat1_format);
+    if (bat2_format != 0) {
+        battery_update_text(buf_bat_line2, bat2_format);
+    }
+
     return err;
 }
 
+int battery_compute_desired_size(void *obj)
+{
+    Battery *battery = (Battery *)obj;
+    return text_area_compute_desired_size(&battery->area, buf_bat_line1, buf_bat_line2, bat1_font_desc, bat2_font_desc);
+}
+
 gboolean resize_battery(void *obj)
 {
-	Battery *battery = obj;
-	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;
-	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);
-
-	if (panel_horizontal) {
-		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
-		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;
+    Battery *battery = (Battery *)obj;
+    return resize_text_area(&battery->area,
+                            buf_bat_line1,
+                            buf_bat_line2,
+                            bat1_font_desc,
+                            bat2_font_desc,
+                            &battery->bat1_posy,
+                            &battery->bat2_posy);
 }
 
 void draw_battery(void *obj, cairo_t *c)
 {
-	Battery *battery = obj;
+    Battery *battery = (Battery *)obj;
+    draw_text_area(&battery->area,
+                   c,
+                   buf_bat_line1,
+                   buf_bat_line2,
+                   bat1_font_desc,
+                   bat2_font_desc,
+                   battery->bat1_posy,
+                   battery->bat2_posy,
+                   &battery->font_color);
+}
 
-	PangoLayout *layout = pango_cairo_create_layout(c);
-	pango_layout_set_font_description(layout, bat1_font_desc);
-	pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
-	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
-
-	cairo_set_source_rgba(c,
-	                      battery->font_color.rgb[0],
-	                      battery->font_color.rgb[1],
-	                      battery->font_color.rgb[2],
-	                      battery->font_color.alpha);
-
-	pango_cairo_update_layout(c, layout);
-	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_indent(layout, 0);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	pango_layout_set_text(layout, buf_bat_time, strlen(buf_bat_time));
-	pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
-
-	pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, battery->bat2_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
-	pango_cairo_show_layout(c, layout);
-
-	g_object_unref(layout);
+void battery_dump_geometry(void *obj, int indent)
+{
+    Battery *battery = (Battery *)obj;
+    fprintf(stderr, "tint2: %*sText 1: y = %d, text = %s\n", indent, "", battery->bat1_posy, buf_bat_line1);
+    fprintf(stderr, "tint2: %*sText 2: y = %d, text = %s\n", indent, "", battery->bat2_posy, buf_bat_line2);
 }
 
 char *battery_get_tooltip(void *obj)
@@ -387,7 +444,7 @@ char *battery_get_tooltip(void *obj)
     return battery_os_tooltip();
 }
 
-void battery_action(int button)
+void battery_action(void *obj, int button, int x, int y, Time time)
 {
     char *command = NULL;
     switch (button) {
@@ -407,5 +464,5 @@ void battery_action(int button)
         command = battery_dwheel_command;
         break;
     }
-	tint_exec(command);
+    tint_exec(command, NULL, NULL, time, obj, x, y, FALSE, TRUE);
 }

src/battery/battery.h

@@ -48,12 +48,15 @@ extern gboolean bat1_has_font;
 extern PangoFontDescription *bat1_font_desc;
 extern gboolean bat2_has_font;
 extern PangoFontDescription *bat2_font_desc;
+extern char *bat1_format;
+extern char *bat2_format;
 extern gboolean battery_enabled;
 extern gboolean battery_tooltip_enabled;
 extern int percentage_hide;
 
 extern int8_t battery_low_status;
 extern char *battery_low_cmd;
+extern char *battery_full_cmd;
 
 extern char *ac_connected_cmd;
 extern char *ac_disconnected_cmd;
@@ -64,6 +67,8 @@ 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) {
@@ -106,7 +111,7 @@ void battery_default_font_changed();
 
 gboolean resize_battery(void *obj);
 
-void battery_action(int button);
+void battery_action(void *obj, int button, int x, int y, Time time);
 
 /* operating system specific functions */
 gboolean battery_os_init();

src/battery/freebsd.c

@@ -58,7 +58,7 @@ int battery_os_update(BatteryState *state)
             break;
         }
     } else {
-		fprintf(stderr, "power update: no such sysctl");
+        fprintf(stderr, "tint2: power update: no such sysctl");
         err = -1;
     }
 

src/battery/linux.c

@@ -38,18 +38,16 @@ struct psy_battery {
     gint64 timestamp;
     /* sysfs files */
     gchar *path_present;
-	gchar *path_energy_now;
-	gchar *path_energy_full;
-	gchar *path_power_now;
+    gchar *path_level_now;
+    gchar *path_level_full;
+    gchar *path_rate_now;
     gchar *path_status;
-	/* sysfs hints */
-	gboolean energy_in_uamp;
-	gboolean power_in_uamp;
     /* values */
     gboolean present;
-	gint energy_now;
-	gint energy_full;
-	gint power_now;
+    gint level_now;
+    gint level_full;
+    gint rate_now;
+    gchar unit;
     ChargeState status;
 };
 
@@ -70,28 +68,29 @@ static struct uevent_notify psy_change = {UEVENT_CHANGE, "power_supply", NULL, u
 
 static void uevent_battery_plug()
 {
-	printf("reinitialize batteries after HW change\n");
+    fprintf(stderr, "tint2: reinitialize batteries after HW change\n");
     reinit_battery();
 }
 static struct uevent_notify psy_plug = {UEVENT_ADD | UEVENT_REMOVE, "power_supply", NULL, uevent_battery_plug};
 
 #define RETURN_ON_ERROR(err)                                                 \
-	if (error) {             \
+    if (err) {                                                               \
         g_error_free(err);                                                   \
+        fprintf(stderr, RED "tint2: %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;
     gchar *type;
     gsize typelen;
@@ -99,6 +98,7 @@ static enum psy_type power_supply_get_type(const gchar *entryname)
     g_file_get_contents(path_type, &type, &typelen, &error);
     g_free(path_type);
     if (error) {
+        fprintf(stderr, RED "tint2: %s:%d: read failed" RESET "\n", __FILE__, __LINE__);
         g_error_free(error);
         return PSY_UNKNOWN;
     }
@@ -122,59 +122,54 @@ static gboolean init_linux_battery(struct psy_battery *bat)
 {
     const gchar *entryname = bat->name;
 
-	bat->energy_in_uamp = FALSE;
-	bat->power_in_uamp = FALSE;
-
-	bat->path_present = g_build_filename("/sys/class/power_supply", entryname, "present", NULL);
+    bat->path_present = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "present", NULL);
     if (!g_file_test(bat->path_present, G_FILE_TEST_EXISTS)) {
+        fprintf(stderr, RED "tint2: %s:%d: read failed" RESET "\n", __FILE__, __LINE__);
         goto err0;
     }
 
-	bat->path_energy_now = g_build_filename("/sys/class/power_supply", entryname, "energy_now", NULL);
-	if (!g_file_test(bat->path_energy_now, G_FILE_TEST_EXISTS)) {
-		g_free(bat->path_energy_now);
-		bat->path_energy_now = g_build_filename("/sys/class/power_supply", entryname, "charge_now", NULL);
-		bat->energy_in_uamp = TRUE;
+    bat->path_level_now =
+        g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_now", NULL);
+    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';
+
+    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)) {
+        g_free(bat->path_level_now);
+        g_free(bat->path_level_full);
+        g_free(bat->path_rate_now);
+        bat->path_level_now =
+            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_energy_now, G_FILE_TEST_EXISTS)) {
+    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 "tint2: %s:%d: read failed" RESET "\n", __FILE__, __LINE__);
         goto err1;
     }
 
-	if (!bat->energy_in_uamp) {
-		bat->path_energy_full = g_build_filename("/sys/class/power_supply", entryname, "energy_full", NULL);
-		if (!g_file_test(bat->path_energy_full, G_FILE_TEST_EXISTS))
-			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);
-	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);
+    bat->path_status = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "status", NULL);
     if (!g_file_test(bat->path_status, G_FILE_TEST_EXISTS)) {
-		goto err4;
+        fprintf(stderr, RED "tint2: %s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+        goto err2;
     }
 
     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);
 
@@ -185,8 +180,9 @@ static gboolean init_linux_mains(struct psy_mains *ac)
 {
     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)) {
+        fprintf(stderr, RED "tint2: %s:%d: read failed" RESET "\n", __FILE__, __LINE__);
         g_free(ac->path_online);
         return FALSE;
     }
@@ -199,9 +195,9 @@ static void psy_battery_free(gpointer data)
     struct psy_battery *bat = data;
     g_free(bat->name);
     g_free(bat->path_status);
-	g_free(bat->path_power_now);
-	g_free(bat->path_energy_full);
-	g_free(bat->path_energy_now);
+    g_free(bat->path_rate_now);
+    g_free(bat->path_level_full);
+    g_free(bat->path_level_now);
     g_free(bat->path_present);
     g_free(bat);
 }
@@ -232,10 +228,10 @@ static void add_battery(const char *entryname)
 
     if (init_linux_battery(bat)) {
         batteries = g_list_append(batteries, bat);
-		fprintf(stdout, "found battery \"%s\"\n", bat->name);
+        fprintf(stderr, GREEN "Found battery \"%s\"" RESET "\n", bat->name);
     } else {
         g_free(bat);
-		fprintf(stderr, RED "failed to initialize battery \"%s\"" RESET "\n", entryname);
+        fprintf(stderr, RED "tint2: Failed to initialize battery \"%s\"" RESET "\n", entryname);
     }
 }
 
@@ -246,10 +242,10 @@ static void add_mains(const char *entryname)
 
     if (init_linux_mains(ac)) {
         mains = g_list_append(mains, ac);
-		fprintf(stdout, "found mains \"%s\"\n", ac->name);
+        fprintf(stderr, GREEN "Found mains \"%s\"" RESET "\n", ac->name);
     } else {
         g_free(ac);
-		fprintf(stderr, RED "failed to initialize mains \"%s\"" RESET "\n", entryname);
+        fprintf(stderr, RED "tint2: Failed to initialize mains \"%s\"" RESET "\n", entryname);
     }
 }
 
@@ -261,10 +257,13 @@ gboolean battery_os_init()
 
     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);
+    directory = g_dir_open(dir_path, 0, &error);
+    g_free(dir_path);
     RETURN_ON_ERROR(error);
 
     while ((entryname = g_dir_read_name(directory))) {
+        fprintf(stderr, GREEN "tint2: Found power device %s" RESET "\n", entryname);
         enum psy_type type = power_supply_get_type(entryname);
 
         switch (type) {
@@ -287,15 +286,15 @@ gboolean battery_os_init()
     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;
 
     /* µ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)
@@ -305,15 +304,15 @@ static gboolean update_linux_battery(struct psy_battery *bat)
     gsize datalen;
 
     gint64 old_timestamp = bat->timestamp;
-	int old_energy_now = bat->energy_now;
-	gint old_power_now = bat->power_now;
+    int old_level_now = bat->level_now;
+    gint old_rate_now = bat->rate_now;
 
     /* reset values */
     bat->present = 0;
     bat->status = BATTERY_UNKNOWN;
-	bat->energy_now = 0;
-	bat->energy_full = 0;
-	bat->power_now = 0;
+    bat->level_now = 0;
+    bat->level_full = 0;
+    bat->rate_now = 0;
     bat->timestamp = g_get_monotonic_time();
 
     /* present */
@@ -339,35 +338,35 @@ static gboolean update_linux_battery(struct psy_battery *bat)
     }
     g_free(data);
 
-	/* energy now */
-	g_file_get_contents(bat->path_energy_now, &data, &datalen, &error);
+    /* level now */
+    g_file_get_contents(bat->path_level_now, &data, &datalen, &error);
     RETURN_ON_ERROR(error);
-	bat->energy_now = atoi(data);
+    bat->level_now = atoi(data);
     g_free(data);
 
-	/* energy full */
-	g_file_get_contents(bat->path_energy_full, &data, &datalen, &error);
+    /* level full */
+    g_file_get_contents(bat->path_level_full, &data, &datalen, &error);
     RETURN_ON_ERROR(error);
-	bat->energy_full = atoi(data);
+    bat->level_full = atoi(data);
     g_free(data);
 
-	/* power now */
-	g_file_get_contents(bat->path_power_now, &data, &datalen, &error);
+    /* rate now */
+    g_file_get_contents(bat->path_rate_now, &data, &datalen, &error);
     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);
-		bat->power_now = estimate_power_usage(bat, old_energy_now, old_timestamp);
-		if (bat->power_now == 0 && bat->status != BATTERY_FULL) {
+        bat->rate_now = estimate_rate_usage(bat, old_level_now, old_timestamp);
+        if (bat->rate_now == 0 && bat->status != BATTERY_FULL) {
             /* If the hardware updates the level slower than our sampling period,
              * we need to sample more rarely */
-			bat->power_now = old_power_now;
+            bat->rate_now = old_rate_now;
             bat->timestamp = old_timestamp;
         }
     } else if (error) {
         g_error_free(error);
         return FALSE;
     } else {
-		bat->power_now = atoi(data);
+        bat->rate_now = atoi(data);
         g_free(data);
     }
 
@@ -394,9 +393,9 @@ int battery_os_update(BatteryState *state)
 {
     GList *l;
 
-	gint64 total_energy_now = 0;
-	gint64 total_energy_full = 0;
-	gint64 total_power_now = 0;
+    gint64 total_level_now = 0;
+    gint64 total_level_full = 0;
+    gint64 total_rate_now = 0;
     gint seconds = 0;
 
     gboolean charging = FALSE;
@@ -408,9 +407,9 @@ int battery_os_update(BatteryState *state)
         struct psy_battery *bat = l->data;
         update_linux_battery(bat);
 
-		total_energy_now += bat->energy_now;
-		total_energy_full += bat->energy_full;
-		total_power_now += bat->power_now;
+        total_level_now += bat->level_now;
+        total_level_full += bat->level_full;
+        total_rate_now += bat->rate_now;
 
         charging |= (bat->status == BATTERY_CHARGING);
         discharging |= (bat->status == BATTERY_DISCHARGING);
@@ -432,29 +431,39 @@ int battery_os_update(BatteryState *state)
         state->state = BATTERY_FULL;
 
     /* calculate seconds */
-	if (total_power_now > 0) {
+    if (total_rate_now > 0) {
         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)
-			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);
 
     /* 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 */
     state->ac_connected = ac_connected;
 
+    if (state->state == BATTERY_UNKNOWN) {
+        if (ac_connected) {
+            if (total_rate_now == 0 && state->percentage >= 90)
+                state->state = BATTERY_FULL;
+            else
+                state->state = BATTERY_CHARGING;
+        } else {
+            state->state = BATTERY_DISCHARGING;
+        }
+    }
+
     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 full = bat->energy_full;
-	gchar unit = bat->energy_in_uamp ? 'A' : 'W';
+    gint now = bat->level_now;
+    gint full = bat->level_full;
 
     if (full >= 1000000) {
         return g_strdup_printf("%d.%d / %d.%d %ch",
@@ -462,30 +471,30 @@ static gchar *energy_human_readable(struct psy_battery *bat)
                                (now % 1000000) / 100000,
                                full / 1000000,
                                (full % 1000000) / 100000,
-							   unit);
+                               bat->unit);
     } else if (full >= 1000) {
         return g_strdup_printf("%d.%d / %d.%d m%ch",
                                now / 1000,
                                (now % 1000) / 100,
                                full / 1000,
                                (full % 1000) / 100,
-							   unit);
+                               bat->unit);
     } 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;
-	gchar unit = bat->power_in_uamp ? 'A' : 'W';
+    gint rate = bat->rate_now;
+    gchar unit = bat->unit;
 
-	if (power >= 1000000) {
-		return g_strdup_printf("%d.%d %c", power / 1000000, (power % 1000000) / 100000, unit);
-	} else if (power >= 1000) {
-		return g_strdup_printf("%d.%d m%c", power / 1000, (power % 1000) / 100, unit);
-	} else if (power > 0) {
-		return g_strdup_printf("%d µ%c", power, unit);
+    if (rate >= 1000000) {
+        return g_strdup_printf("%d.%d %c", rate / 1000000, (rate % 1000000) / 100000, unit);
+    } else if (rate >= 1000) {
+        return g_strdup_printf("%d.%d m%c", rate / 1000, (rate % 1000) / 100, unit);
+    } else if (rate > 0) {
+        return g_strdup_printf("%d µ%c", rate, unit);
     } else {
         return g_strdup_printf("0 %c", unit);
     }
@@ -510,16 +519,16 @@ char *battery_os_tooltip()
             continue;
         }
 
-		gchar *power = power_human_readable(bat);
-		gchar *energy = energy_human_readable(bat);
-		gchar *state = (bat->status == BATTERY_UNKNOWN) ? "Level" : chargestate2str(bat->status);
+        gchar *rate = rate_human_readable(bat);
+        gchar *level = level_human_readable(bat);
+        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(energy);
+        g_free(rate);
+        g_free(level);
     }
 
     for (l = mains; l != NULL; l = l->next) {

src/button/button.c

@@ -0,0 +1,543 @@
+#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, "tint2: 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;
+    Area *area = &button->area;
+    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 available_w, available_h;
+    if (panel_horizontal) {
+        available_w = panel->area.width;
+        available_h = area->height - 2 * area->paddingy - left_right_border_width(area);
+    } else {
+        available_w =
+            area->width - icon_w - (icon_w ? interior_padding : 0) - 2 * horiz_padding - left_right_border_width(area);
+        available_h = panel->area.height;
+    }
+
+    int txt_height_ink, txt_height, txt_width;
+    if (button->backend->text) {
+        get_text_size2(button->backend->font_desc,
+                       &txt_height_ink,
+                       &txt_height,
+                       &txt_width,
+                       available_h,
+                       available_w,
+                       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;
+    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;
+    }
+    tint_exec(command, NULL, NULL, time, obj, x, y, FALSE, TRUE);
+}
+
+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,6 +55,8 @@ 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()
 {
@@ -75,6 +77,9 @@ void default_clock()
     time1_font_desc = NULL;
     time2_has_font = FALSE;
     time2_font_desc = NULL;
+    buf_time[0] = 0;
+    buf_date[0] = 0;
+    buf_tooltip[0] = 0;
 }
 
 void cleanup_clock()
@@ -109,31 +114,6 @@ void cleanup_clock()
     clock_timeout = NULL;
 }
 
-void update_clocks_sec(void *arg)
-{
-	gettimeofday(&time_clock, 0);
-	if (time1_format) {
-		for (int i = 0; i < num_panels; i++)
-			panels[i].clock.area.resize_needed = 1;
-	}
-	panel_refresh = TRUE;
-}
-
-void update_clocks_min(void *arg)
-{
-	// remember old_sec because after suspend/hibernate the clock should be updated directly, and not
-	// on next minute change
-	time_t old_sec = time_clock.tv_sec;
-	gettimeofday(&time_clock, 0);
-	if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) {
-		if (time1_format) {
-			for (int i = 0; i < num_panels; i++)
-				panels[i].clock.area.resize_needed = 1;
-		}
-		panel_refresh = TRUE;
-	}
-}
-
 struct tm *clock_gettime_for_tz(const char *timezone)
 {
     if (timezone) {
@@ -150,6 +130,46 @@ struct tm *clock_gettime_for_tz(const char *timezone)
     }
 }
 
+void update_clocks()
+{
+    if (time1_format)
+        strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
+    if (time2_format)
+        strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
+    if (time1_format || time2_format) {
+        for (int i = 0; i < num_panels; i++)
+            panels[i].clock.area.resize_needed = 1;
+    }
+    schedule_panel_redraw();
+}
+
+int ms_until_second_change(struct timeval* tm)
+{
+    long us_until_change = 1000000 - tm->tv_usec;
+    // compute ms, rounding up so we don't ask to wait too short
+    int ms = (us_until_change+999)/1000;
+    return ms;
+}
+
+void update_clocks_sec(void *arg)
+{
+    gettimeofday(&time_clock, 0);
+    update_clocks();
+    clock_timeout = add_timeout(ms_until_second_change(&time_clock), 0, update_clocks_sec, 0, &clock_timeout);
+}
+
+void update_clocks_min(void *arg)
+{
+    // remember old_sec because after suspend/hibernate the clock should be updated directly, and not
+    // on next minute change
+    static time_t old_sec = 0;
+    gettimeofday(&time_clock, 0);
+    if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60 || (time1_format && !buf_time[0]) || (time2_format && !buf_date[0]))
+        update_clocks();
+    old_sec = time_clock.tv_sec;
+    clock_timeout = add_timeout(ms_until_second_change(&time_clock), 0, update_clocks_min, 0, &clock_timeout);
+}
+
 gboolean time_format_needs_sec_ticks(char *time_format)
 {
     if (!time_format)
@@ -161,13 +181,6 @@ gboolean time_format_needs_sec_ticks(char *time_format)
 
 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)
@@ -188,17 +201,28 @@ void init_clock_panel(void *p)
     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;
 
     clock->area.resize_needed = 1;
     clock->area.on_screen = TRUE;
+    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));
     }
+
+    if (!clock_timeout) {
+        if (time_format_needs_sec_ticks(time1_format) || time_format_needs_sec_ticks(time2_format)) {
+            update_clocks_sec(NULL);
+        } else {
+            update_clocks_min(NULL);
+        }
+    }
 }
 
 void clock_init_fonts()
@@ -234,104 +258,73 @@ void clock_default_font_changed()
         panels[i].clock.area.resize_needed = TRUE;
         schedule_redraw(&panels[i].clock.area);
     }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
+}
+
+void clock_compute_text_geometry(Clock *clock,
+                                 int *time_height_ink,
+                                 int *time_height,
+                                 int *time_width,
+                                 int *date_height_ink,
+                                 int *date_height,
+                                 int *date_width)
+{
+    area_compute_text_geometry(&clock->area,
+                               buf_time,
+                               time2_format ? buf_date : NULL,
+                               time1_font_desc,
+                               time2_font_desc,
+                               time_height_ink,
+                               time_height,
+                               time_width,
+                               date_height_ink,
+                               date_height,
+                               date_width);
+}
+
+int clock_compute_desired_size(void *obj)
+{
+    Clock *clock = (Clock *)obj;
+    return text_area_compute_desired_size(&clock->area,
+                                          buf_time,
+                                          time2_format ? buf_date : NULL,
+                                          time1_font_desc,
+                                          time2_font_desc);
 }
 
 gboolean resize_clock(void *obj)
 {
-	Clock *clock = obj;
-	Panel *panel = clock->area.panel;
-	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
-	gboolean result = FALSE;
-
-	schedule_redraw(&clock->area);
-
-	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,
+    Clock *clock = (Clock *)obj;
+    return resize_text_area(&clock->area,
                             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 = (time_width > date_width) ? time_width : date_width;
-		new_size += (2 * clock->area.paddingxlr) + (2 * clock->area.bg->border.width);
-		if (new_size > clock->area.width || new_size < (clock->area.width - 6)) {
-			// we try to limit the number of resizes
-			clock->area.width = new_size + 1;
-			clock->time1_posy = (clock->area.height - time_height) / 2;
-			if (time2_format) {
-				clock->time1_posy -= (date_height) / 2;
-				clock->time2_posy = clock->time1_posy + time_height;
-			}
-			result = TRUE;
-		}
-	} else {
-		int new_size = time_height + date_height + (2 * (clock->area.paddingxlr + clock->area.bg->border.width));
-		if (new_size != clock->area.height) {
-			// we try to limit the number of resizes
-			clock->area.height = new_size;
-			clock->time1_posy = (clock->area.height - time_height) / 2;
-			if (time2_format) {
-				clock->time1_posy -= (date_height) / 2;
-				clock->time2_posy = clock->time1_posy + time_height;
-			}
-			result = TRUE;
-		}
-	}
-
-	return result;
+                            time2_format ? buf_date : NULL,
+                            time1_font_desc,
+                            time2_font_desc,
+                            &clock->time1_posy,
+                            &clock->time2_posy);
 }
 
 void draw_clock(void *obj, cairo_t *c)
 {
-	Clock *clock = obj;
-	PangoLayout *layout = pango_cairo_create_layout(c);
-
-	pango_layout_set_font_description(layout, time1_font_desc);
-	pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
-	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	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);
-
-	pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, clock->time1_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
+    Clock *clock = (Clock *)obj;
+    draw_text_area(&clock->area,
+                   c,
+                   buf_time,
+                   time2_format ? buf_date : NULL,
+                   time1_font_desc,
+                   time2_font_desc,
+                   clock->time1_posy,
+                   clock->time2_posy,
+                   &clock->font);
+}
 
+void clock_dump_geometry(void *obj, int indent)
+{
+    Clock *clock = (Clock *)obj;
+    fprintf(stderr, "tint2: %*sText 1: y = %d, text = %s\n", indent, "", clock->time1_posy, buf_time);
     if (time2_format) {
-		pango_layout_set_font_description(layout, time2_font_desc);
-		pango_layout_set_indent(layout, 0);
-		pango_layout_set_text(layout, buf_date, strlen(buf_date));
-		pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
-
-		pango_cairo_update_layout(c, layout);
-		draw_text(layout, c, 0, clock->time2_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
+        fprintf(stderr, "tint2: %*sText 2: y = %d, text = %s\n", indent, "", clock->time2_posy, buf_date);
     }
-
-	g_object_unref(layout);
 }
 
 char *clock_get_tooltip(void *obj)
@@ -340,7 +333,7 @@ char *clock_get_tooltip(void *obj)
     return strdup(buf_tooltip);
 }
 
-void clock_action(int button)
+void clock_action(void *obj, int button, int x, int y, Time time)
 {
     char *command = NULL;
     switch (button) {
@@ -360,5 +353,5 @@ void clock_action(int button)
         command = clock_dwheel_command;
         break;
     }
-	tint_exec(command);
+    tint_exec(command, NULL, NULL, time, obj, x, y, FALSE, TRUE);
 }

src/clock/clock.h

@@ -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(void *obj, int button, int x, int y, Time time);
 
 #endif

src/config.c

@@ -31,14 +31,14 @@
 #include <string.h>
 #include <ctype.h>
 #include <glib/gstdio.h>
-#include <pango/pangocairo.h>
-#include <pango/pangoxft.h>
+#include <pango/pango-font.h>
 #include <Imlib2.h>
 
 #include "config.h"
 
 #ifndef TINT2CONF
 
+#include "tint2rc.h"
 #include "common.h"
 #include "server.h"
 #include "strnatcmp.h"
@@ -52,6 +52,7 @@
 #include "window.h"
 #include "tooltip.h"
 #include "timer.h"
+#include "separator.h"
 #include "execplugin.h"
 
 #ifdef ENABLE_BATTERY
@@ -61,8 +62,8 @@
 #endif
 
 // global path
-char *config_path;
-char *snapshot_path;
+char *config_path = NULL;
+char *snapshot_path = NULL;
 
 #ifndef TINT2CONF
 
@@ -118,7 +119,7 @@ void get_action(char *event, MouseAction *action)
     else if (strcmp(event, "prev_task") == 0)
         *action = PREV_TASK;
     else
-		fprintf(stderr, "Error: unrecognized action '%s'. Please fix your config file.\n", event);
+        fprintf(stderr, "tint2: Error: unrecognized action '%s'. Please fix your config file.\n", event);
 }
 
 int get_task_status(char *status)
@@ -134,7 +135,16 @@ int get_task_status(char *status)
 
 int config_get_monitor(char *monitor)
 {
-	if (strcmp(monitor, "all") != 0) {
+    if (strcmp(monitor, "primary") == 0) {
+        for (int i = 0; i < server.num_monitors; ++i) {
+            if (server.monitors[i].primary)
+                return i;
+        }
+        return 0;
+    }
+    if (strcmp(monitor, "all") == 0) {
+        return -1;
+    }
     char *endptr;
     int ret_int = strtol(monitor, &endptr, 10);
     if (*endptr == 0)
@@ -153,8 +163,8 @@ int config_get_monitor(char *monitor)
             }
         }
     }
-	}
-	// monitor == "all" or monitor not found or xrandr can't identify monitors
+
+    // monitor not found or xrandr can't identify monitors => all
     return -1;
 }
 
@@ -202,15 +212,33 @@ void load_launcher_app_dir(const char *path)
     g_list_free(files);
 }
 
+Separator *get_or_create_last_separator()
+{
+    if (!panel_config.separator_list) {
+        fprintf(stderr, "tint2: Warning: separator items should shart with 'separator = new'\n");
+        panel_config.separator_list = g_list_append(panel_config.separator_list, create_separator());
+    }
+    return (Separator *)g_list_last(panel_config.separator_list)->data;
+}
+
 Execp *get_or_create_last_execp()
 {
     if (!panel_config.execp_list) {
-		fprintf(stderr, "Warning: execp items should start with 'execp = new'\n");
+        fprintf(stderr, "tint2: Warning: execp items should start with 'execp = new'\n");
         panel_config.execp_list = g_list_append(panel_config.execp_list, create_execp());
     }
     return (Execp *)g_list_last(panel_config.execp_list)->data;
 }
 
+Button *get_or_create_last_button()
+{
+    if (!panel_config.button_list) {
+        fprintf(stderr, "tint2: Warning: button items should start with 'button = new'\n");
+        panel_config.button_list = g_list_append(panel_config.button_list, create_button());
+    }
+    return (Button *)g_list_last(panel_config.button_list)->data;
+}
+
 void add_entry(char *key, char *value)
 {
     char *value1 = 0, *value2 = 0, *value3 = 0;
@@ -233,12 +261,25 @@ void add_entry(char *key, char *value)
         init_background(&bg);
         bg.border.radius = atoi(value);
         g_array_append_val(backgrounds, bg);
-		read_bg_color_hover = 0;
-		read_border_color_hover = 0;
-		read_bg_color_press = 0;
-		read_border_color_press = 0;
+        read_bg_color_hover = FALSE;
+        read_border_color_hover = FALSE;
+        read_bg_color_press = FALSE;
+        read_border_color_press = FALSE;
     } else if (strcmp(key, "border_width") == 0) {
         g_array_index(backgrounds, Background, backgrounds->len - 1).border.width = atoi(value);
+    } else if (strcmp(key, "border_sides") == 0) {
+        Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
+        bg->border.mask = 0;
+        if (strchr(value, 'l') || strchr(value, 'L'))
+            bg->border.mask |= BORDER_LEFT;
+        if (strchr(value, 'r') || strchr(value, 'R'))
+            bg->border.mask |= BORDER_RIGHT;
+        if (strchr(value, 't') || strchr(value, 'T'))
+            bg->border.mask |= BORDER_TOP;
+        if (strchr(value, 'b') || strchr(value, 'B'))
+            bg->border.mask |= BORDER_BOTTOM;
+        if (!bg->border.mask)
+            bg->border.width = 0;
     } else if (strcmp(key, "background_color") == 0) {
         Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
         extract_values(value, &value1, &value2, &value3);
@@ -291,13 +332,66 @@ void add_entry(char *key, char *value)
         else
             bg->border_color_pressed.alpha = 0.5;
         read_border_color_press = 1;
+    } else if (strcmp(key, "gradient_id") == 0) {
+        Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
+        int id = atoi(value);
+        id = (id < gradients->len && id >= 0) ? id : -1;
+        if (id >= 0)
+            bg->gradients[MOUSE_NORMAL] = &g_array_index(gradients, GradientClass, id);
+    } else if (strcmp(key, "gradient_id_hover") == 0 || strcmp(key, "hover_gradient_id") == 0) {
+        Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
+        int id = atoi(value);
+        id = (id < gradients->len && id >= 0) ? id : -1;
+        if (id >= 0)
+            bg->gradients[MOUSE_OVER] = &g_array_index(gradients, GradientClass, id);
+    } else if (strcmp(key, "gradient_id_pressed") == 0 || strcmp(key, "pressed_gradient_id") == 0) {
+        Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
+        int id = atoi(value);
+        id = (id < gradients->len && id >= 0) ? id : -1;
+        if (id >= 0)
+            bg->gradients[MOUSE_DOWN] = &g_array_index(gradients, GradientClass, id);
+    }
+
+    /* Gradients */
+    else if (strcmp(key, "gradient") == 0) {
+        // Create a new gradient
+        GradientClass g;
+        init_gradient(&g, gradient_type_from_string(value));
+        g_array_append_val(gradients, g);
+    } else if (strcmp(key, "start_color") == 0) {
+        GradientClass *g = &g_array_index(gradients, GradientClass, gradients->len - 1);
+        extract_values(value, &value1, &value2, &value3);
+        get_color(value1, g->start_color.rgb);
+        if (value2)
+            g->start_color.alpha = (atoi(value2) / 100.0);
+        else
+            g->start_color.alpha = 0.5;
+    } else if (strcmp(key, "end_color") == 0) {
+        GradientClass *g = &g_array_index(gradients, GradientClass, gradients->len - 1);
+        extract_values(value, &value1, &value2, &value3);
+        get_color(value1, g->end_color.rgb);
+        if (value2)
+            g->end_color.alpha = (atoi(value2) / 100.0);
+        else
+            g->end_color.alpha = 0.5;
+    } else if (strcmp(key, "color_stop") == 0) {
+        GradientClass *g = &g_array_index(gradients, GradientClass, gradients->len - 1);
+        extract_values(value, &value1, &value2, &value3);
+        ColorStop *color_stop = (ColorStop *)calloc(1, sizeof(ColorStop));
+        color_stop->offset = atof(value1) / 100.0;
+        get_color(value2, color_stop->color.rgb);
+        if (value3)
+            color_stop->color.alpha = (atoi(value3) / 100.0);
+        else
+            color_stop->color.alpha = 0.5;
+        g->extra_color_stops = g_list_append(g->extra_color_stops, color_stop);
     }
 
     /* Panel */
     else if (strcmp(key, "panel_monitor") == 0) {
         panel_config.monitor = config_get_monitor(value);
-	} else if (strcmp(key, "primary_monitor_first") == 0) {
-		primary_monitor_first = atoi(value);
+    } else if (strcmp(key, "panel_shrink") == 0) {
+        panel_shrink = atoi(value);
     } else if (strcmp(key, "panel_size") == 0) {
         extract_values(value, &value1, &value2, &value3);
 
@@ -321,6 +415,7 @@ void add_entry(char *key, char *value)
         }
     } else if (strcmp(key, "panel_items") == 0) {
         new_config_file = TRUE;
+        free_and_null(panel_items_order);
         panel_items_order = strdup(value);
         systray_enabled = 0;
         launcher_enabled = 0;
@@ -338,7 +433,7 @@ void add_entry(char *key, char *value)
 #ifdef ENABLE_BATTERY
                 battery_enabled = 1;
 #else
-				fprintf(stderr, "tint2 is build without battery support\n");
+                fprintf(stderr, "tint2: tint2 has been compiled without battery support\n");
 #endif
             }
             if (panel_items_order[j] == 'S') {
@@ -457,6 +552,11 @@ void add_entry(char *key, char *value)
 #ifdef ENABLE_BATTERY
         if (strlen(value) > 0)
             battery_low_cmd = strdup(value);
+#endif
+    } else if (strcmp(key, "battery_full_cmd") == 0) {
+#ifdef ENABLE_BATTERY
+        if (strlen(value) > 0)
+            battery_full_cmd = strdup(value);
 #endif
     } else if (strcmp(key, "ac_connected_cmd") == 0) {
 #ifdef ENABLE_BATTERY
@@ -477,6 +577,21 @@ void add_entry(char *key, char *value)
 #ifdef ENABLE_BATTERY
         bat2_font_desc = pango_font_description_from_string(value);
         bat2_has_font = TRUE;
+#endif
+    } else if (strcmp(key, "bat1_format") == 0) {
+#ifdef ENABLE_BATTERY
+        if (strlen(value) > 0) {
+            free(bat1_format);
+            bat1_format = strdup(value);
+            battery_enabled = 1;
+        }
+#endif
+    } else if (strcmp(key, "bat2_format") == 0) {
+#ifdef ENABLE_BATTERY
+        if (strlen(value) > 0) {
+            free(bat2_format);
+            bat2_format = strdup(value);
+        }
 #endif
     } else if (strcmp(key, "battery_font_color") == 0) {
 #ifdef ENABLE_BATTERY
@@ -514,6 +629,45 @@ void add_entry(char *key, char *value)
 #endif
     }
 
+    /* Separator */
+    else if (strcmp(key, "separator") == 0) {
+        panel_config.separator_list = g_list_append(panel_config.separator_list, create_separator());
+    } else if (strcmp(key, "separator_background_id") == 0) {
+        Separator *separator = get_or_create_last_separator();
+        int id = atoi(value);
+        id = (id < backgrounds->len && id >= 0) ? id : 0;
+        separator->area.bg = &g_array_index(backgrounds, Background, id);
+    } else if (strcmp(key, "separator_color") == 0) {
+        Separator *separator = get_or_create_last_separator();
+        extract_values(value, &value1, &value2, &value3);
+        get_color(value1, separator->color.rgb);
+        if (value2)
+            separator->color.alpha = (atoi(value2) / 100.0);
+        else
+            separator->color.alpha = 0.5;
+    } else if (strcmp(key, "separator_style") == 0) {
+        Separator *separator = get_or_create_last_separator();
+        if (g_str_equal(value, "empty"))
+            separator->style = SEPARATOR_EMPTY;
+        else if (g_str_equal(value, "line"))
+            separator->style = SEPARATOR_LINE;
+        else if (g_str_equal(value, "dots"))
+            separator->style = SEPARATOR_DOTS;
+        else
+            fprintf(stderr, RED "tint2: Invalid separator_style value: %s" RESET "\n", value);
+    } else if (strcmp(key, "separator_size") == 0) {
+        Separator *separator = get_or_create_last_separator();
+        separator->thickness = atoi(value);
+    } else if (strcmp(key, "separator_padding") == 0) {
+        Separator *separator = get_or_create_last_separator();
+        extract_values(value, &value1, &value2, &value3);
+        separator->area.paddingxlr = separator->area.paddingx = atoi(value1);
+        if (value2)
+            separator->area.paddingy = atoi(value2);
+        if (value3)
+            separator->area.paddingx = atoi(value3);
+    }
+
     /* Execp */
     else if (strcmp(key, "execp") == 0) {
         panel_config.execp_list = g_list_append(panel_config.execp_list, create_execp());
@@ -526,8 +680,8 @@ void add_entry(char *key, char *value)
         Execp *execp = get_or_create_last_execp();
         execp->backend->interval = 0;
         int v = atoi(value);
-		if (v < 1) {
-			fprintf(stderr, "execp_interval must be an integer >= 1\n");
+        if (v < 0) {
+            fprintf(stderr, "tint2: execp_interval must be an integer >= 0\n");
         } else {
             execp->backend->interval = v;
         }
@@ -547,6 +701,7 @@ void add_entry(char *key, char *value)
         Execp *execp = get_or_create_last_execp();
         free_and_null(execp->backend->tooltip);
         execp->backend->tooltip = strdup(value);
+        execp->backend->has_user_tooltip = TRUE;
     } else if (strcmp(key, "execp_font") == 0) {
         Execp *execp = get_or_create_last_execp();
         pango_font_description_free(execp->backend->font_desc);
@@ -582,7 +737,7 @@ void add_entry(char *key, char *value)
         Execp *execp = get_or_create_last_execp();
         int v = atoi(value);
         if (v < 0) {
-			fprintf(stderr, "execp_icon_w must be an integer >= 0\n");
+            fprintf(stderr, "tint2: execp_icon_w must be an integer >= 0\n");
         } else {
             execp->backend->icon_w = v;
         }
@@ -590,7 +745,7 @@ void add_entry(char *key, char *value)
         Execp *execp = get_or_create_last_execp();
         int v = atoi(value);
         if (v < 0) {
-			fprintf(stderr, "execp_icon_h must be an integer >= 0\n");
+            fprintf(stderr, "tint2: execp_icon_h must be an integer >= 0\n");
         } else {
             execp->backend->icon_h = v;
         }
@@ -621,6 +776,88 @@ void add_entry(char *key, char *value)
             execp->backend->dwheel_command = strdup(value);
     }
 
+    /* Button */
+    else if (strcmp(key, "button") == 0) {
+        panel_config.button_list = g_list_append(panel_config.button_list, create_button());
+    } else if (strcmp(key, "button_icon") == 0) {
+        if (strlen(value)) {
+            Button *button = get_or_create_last_button();
+            button->backend->icon_name = strdup(value);
+        }
+    } else if (strcmp(key, "button_text") == 0) {
+        if (strlen(value)) {
+            Button *button = get_or_create_last_button();
+            free_and_null(button->backend->text);
+            button->backend->text = strdup(value);
+        }
+    } else if (strcmp(key, "button_tooltip") == 0) {
+        if (strlen(value)) {
+            Button *button = get_or_create_last_button();
+            free_and_null(button->backend->tooltip);
+            button->backend->tooltip = strdup(value);
+        }
+    } else if (strcmp(key, "button_font") == 0) {
+        Button *button = get_or_create_last_button();
+        pango_font_description_free(button->backend->font_desc);
+        button->backend->font_desc = pango_font_description_from_string(value);
+        button->backend->has_font = TRUE;
+    } else if (strcmp(key, "button_font_color") == 0) {
+        Button *button = get_or_create_last_button();
+        extract_values(value, &value1, &value2, &value3);
+        get_color(value1, button->backend->font_color.rgb);
+        if (value2)
+            button->backend->font_color.alpha = atoi(value2) / 100.0;
+        else
+            button->backend->font_color.alpha = 0.5;
+    } else if (strcmp(key, "button_padding") == 0) {
+        Button *button = get_or_create_last_button();
+        extract_values(value, &value1, &value2, &value3);
+        button->backend->paddingxlr = button->backend->paddingx = atoi(value1);
+        if (value2)
+            button->backend->paddingy = atoi(value2);
+        else
+            button->backend->paddingy = 0;
+        if (value3)
+            button->backend->paddingx = atoi(value3);
+    } else if (strcmp(key, "button_max_icon_size") == 0) {
+        Button *button = get_or_create_last_button();
+        extract_values(value, &value1, &value2, &value3);
+        button->backend->max_icon_size = MAX(0, atoi(value));
+    } else if (strcmp(key, "button_background_id") == 0) {
+        Button *button = get_or_create_last_button();
+        int id = atoi(value);
+        id = (id < backgrounds->len && id >= 0) ? id : 0;
+        button->backend->bg = &g_array_index(backgrounds, Background, id);
+    } else if (strcmp(key, "button_centered") == 0) {
+        Button *button = get_or_create_last_button();
+        button->backend->centered = atoi(value);
+    } else if (strcmp(key, "button_lclick_command") == 0) {
+        Button *button = get_or_create_last_button();
+        free_and_null(button->backend->lclick_command);
+        if (strlen(value) > 0)
+            button->backend->lclick_command = strdup(value);
+    } else if (strcmp(key, "button_mclick_command") == 0) {
+        Button *button = get_or_create_last_button();
+        free_and_null(button->backend->mclick_command);
+        if (strlen(value) > 0)
+            button->backend->mclick_command = strdup(value);
+    } else if (strcmp(key, "button_rclick_command") == 0) {
+        Button *button = get_or_create_last_button();
+        free_and_null(button->backend->rclick_command);
+        if (strlen(value) > 0)
+            button->backend->rclick_command = strdup(value);
+    } else if (strcmp(key, "button_uwheel_command") == 0) {
+        Button *button = get_or_create_last_button();
+        free_and_null(button->backend->uwheel_command);
+        if (strlen(value) > 0)
+            button->backend->uwheel_command = strdup(value);
+    } else if (strcmp(key, "button_dwheel_command") == 0) {
+        Button *button = get_or_create_last_button();
+        free_and_null(button->backend->dwheel_command);
+        if (strlen(value) > 0)
+            button->backend->dwheel_command = strdup(value);
+    }
+
     /* Clock */
     else if (strcmp(key, "time1_format") == 0) {
         if (!new_config_file) {
@@ -758,6 +995,10 @@ void add_entry(char *key, char *value)
         hide_inactive_tasks = atoi(value);
     } else if (strcmp(key, "taskbar_hide_different_monitor") == 0) {
         hide_task_diff_monitor = atoi(value);
+    } else if (strcmp(key, "taskbar_hide_different_desktop") == 0) {
+        hide_task_diff_desktop = atoi(value);
+    } else if (strcmp(key, "taskbar_hide_if_empty") == 0) {
+        hide_taskbar_if_empty = atoi(value);
     } else if (strcmp(key, "taskbar_always_show_all_desktop_tasks") == 0) {
         always_show_all_desktop_tasks = atoi(value);
     } else if (strcmp(key, "taskbar_sort_order") == 0) {
@@ -796,9 +1037,10 @@ void add_entry(char *key, char *value)
     } else if (strcmp(key, "task_maximum_size") == 0) {
         extract_values(value, &value1, &value2, &value3);
         panel_config.g_task.maximum_width = atoi(value1);
-		panel_config.g_task.maximum_height = 30;
         if (value2)
             panel_config.g_task.maximum_height = atoi(value2);
+        else
+            panel_config.g_task.maximum_height = panel_config.g_task.maximum_width;
     } else if (strcmp(key, "task_padding") == 0) {
         extract_values(value, &value1, &value2, &value3);
         panel_config.g_task.area.paddingxlr = panel_config.g_task.area.paddingx = atoi(value1);
@@ -889,7 +1131,11 @@ void add_entry(char *key, char *value)
         systray.saturation = atoi(value2);
         systray.brightness = atoi(value3);
     } else if (strcmp(key, "systray_monitor") == 0) {
-		systray_monitor = atoi(value) - 1;
+        systray_monitor = MAX(0, config_get_monitor(value));
+    } else if (strcmp(key, "systray_name_filter") == 0) {
+        if (systray_hide_name_filter)
+            free(systray_hide_name_filter);
+        systray_hide_name_filter = strdup(value);
     }
 
     /* Launcher */
@@ -1041,8 +1287,13 @@ void add_entry(char *key, char *value)
         }
     }
 #endif
-	else
-		fprintf(stderr, "tint2 : invalid option \"%s\",\n  upgrade tint2 or correct your config file\n", key);
+    else if (strcmp(key, "primary_monitor_first") == 0) {
+        fprintf(stderr,
+                "tint2: deprecated config option \"%s\"\n"
+                "       Please see the documentation regarding the alternatives.\n",
+                key);
+    } else
+        fprintf(stderr, "tint2: invalid option \"%s\",\n  upgrade tint2 or correct your config file\n", key);
 
     if (value1)
         free(value1);
@@ -1054,20 +1305,23 @@ void add_entry(char *key, char *value)
 
 gboolean config_read_file(const char *path)
 {
-	FILE *fp;
-	char line[512];
-	char *key, *value;
+    fprintf(stderr, "tint2: Loading config file: %s\n", path);
 
-	if ((fp = fopen(path, "r")) == NULL)
+    FILE *fp = fopen(path, "r");
+    if (!fp)
         return FALSE;
 
-	while (fgets(line, sizeof(line), fp) != NULL) {
+    char *line = NULL;
+    size_t line_size = 0;
+    while (getline(&line, &line_size, fp) >= 0) {
+        char *key, *value;
         if (parse_line(line, &key, &value)) {
             add_entry(key, value);
             free(key);
             free(value);
         }
     }
+    free(line);
     fclose(fp);
 
     if (!read_panel_position) {
@@ -1120,6 +1374,14 @@ gboolean config_read_default_path()
     g_free(path1);
 
     // copy tint2rc from system directory to user directory
+
+    fprintf(stderr, "tint2: could not find a config file! Creating a default one.\n");
+    // According to the XDG Base Directory Specification
+    // (https://specifications.freedesktop.org/basedir-spec/basedir-spec-0.6.html)
+    // if the user's config directory does not exist, we should create it with permissions set to 0700.
+    if (!g_file_test(g_get_user_config_dir(), G_FILE_TEST_IS_DIR))
+        g_mkdir_with_parents(g_get_user_config_dir(), 0700);
+
     gchar *path2 = 0;
     system_dirs = g_get_system_config_dirs();
     for (int i = 0; system_dirs[i]; i++) {
@@ -1135,7 +1397,7 @@ gboolean config_read_default_path()
         // copy file in user directory (path1)
         gchar *dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL);
         if (!g_file_test(dir, G_FILE_TEST_IS_DIR))
-			g_mkdir(dir, 0700);
+            g_mkdir_with_parents(dir, 0700);
         g_free(dir);
 
         path1 = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
@@ -1148,15 +1410,18 @@ gboolean config_read_default_path()
         return result;
     }
 
-	// generate empty config file
-	fprintf(stderr, "tint2 warning: could not find a config file!\n");
+    // generate config file
     gchar *dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL);
     if (!g_file_test(dir, G_FILE_TEST_IS_DIR))
-		g_mkdir(dir, 0700);
+        g_mkdir_with_parents(dir, 0700);
     g_free(dir);
 
     path1 = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
-	copy_file("/dev/null", path1);
+    FILE *f = fopen(path1, "w");
+    if (f) {
+        fwrite(themes_tint2rc, 1, themes_tint2rc_len, f);
+        fclose(f);
+    }
 
     gboolean result = config_read_file(path1);
     config_path = strdup(path1);

src/drag_and_drop.c

@@ -0,0 +1,444 @@
+/**************************************************************************
+* Copyright (C) 2017 tint2 authors
+*
+* 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.
+*
+* 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.
+**************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "drag_and_drop.h"
+#include "panel.h"
+#include "server.h"
+#include "task.h"
+
+// Drag and Drop state variables
+static Window dnd_source_window;
+static Window dnd_target_window;
+static int dnd_version;
+static Atom dnd_selection;
+static Atom dnd_atom;
+static int dnd_sent_request;
+static LauncherIcon *dnd_launcher_icon;
+gboolean debug_dnd = FALSE;
+
+gboolean hidden_panel_shown_for_dnd;
+
+// This fetches all the data from a property
+struct Property dnd_read_property(Display *disp, Window w, Atom property)
+{
+    Atom actual_type;
+    int actual_format;
+    unsigned long nitems;
+    unsigned long bytes_after;
+    unsigned char *ret = 0;
+
+    int read_bytes = 1024;
+
+    // Keep trying to read the property until there are no
+    // bytes unread.
+    do {
+        if (ret != 0)
+            XFree(ret);
+        XGetWindowProperty(disp,
+                           w,
+                           property,
+                           0,
+                           read_bytes,
+                           False,
+                           AnyPropertyType,
+                           &actual_type,
+                           &actual_format,
+                           &nitems,
+                           &bytes_after,
+                           &ret);
+        read_bytes *= 2;
+    } while (bytes_after != 0);
+
+    if (debug_dnd)
+        fprintf(stderr, "tint2: DnD %s:%d: Property:\n", __FILE__, __LINE__);
+    fprintf(stderr, "tint2: DnD %s:%d: Actual type: %s\n", __FILE__, __LINE__, GetAtomName(disp, actual_type));
+    fprintf(stderr, "tint2: DnD %s:%d: Actual format: %d\n", __FILE__, __LINE__, actual_format);
+    fprintf(stderr, "tint2: DnD %s:%d: Number of items: %lu\n", __FILE__, __LINE__, nitems);
+
+    Property p;
+    p.data = ret;
+    p.format = actual_format;
+    p.nitems = nitems;
+    p.type = actual_type;
+
+    return p;
+}
+
+// This function takes a list of targets which can be converted to (atom_list, nitems)
+// and a list of acceptable targets with prioritees (datatypes). It returns the highest
+// entry in datatypes which is also in atom_list: ie it finds the best match.
+Atom dnd_pick_target_from_list(Display *disp, Atom *atom_list, int nitems)
+{
+    Atom to_be_requested = None;
+    int i;
+    for (i = 0; i < nitems; i++) {
+        const char *atom_name = GetAtomName(disp, atom_list[i]);
+        fprintf(stderr, "tint2: DnD %s:%d: Type %d = %s\n", __FILE__, __LINE__, i, atom_name);
+
+        // See if this data type is allowed and of higher priority (closer to zero)
+        // than the present one.
+        if (strcasecmp(atom_name, "STRING") == 0) {
+            to_be_requested = atom_list[i];
+        } else if (strcasecmp(atom_name, "text/uri-list") == 0 && !to_be_requested) {
+            to_be_requested = atom_list[i];
+        }
+    }
+
+    fprintf(stderr,
+            "tint2: DnD %s:%d: Accepting: Type %s\n",
+            __FILE__,
+            __LINE__,
+            GetAtomName(server.display, to_be_requested));
+
+    return to_be_requested;
+}
+
+// Finds the best target given up to three atoms provided (any can be None).
+// Useful for part of the Xdnd protocol.
+Atom dnd_pick_target_from_atoms(Display *disp, Atom t1, Atom t2, Atom t3)
+{
+    Atom atoms[3];
+    int n = 0;
+
+    if (t1 != None)
+        atoms[n++] = t1;
+
+    if (t2 != None)
+        atoms[n++] = t2;
+
+    if (t3 != None)
+        atoms[n++] = t3;
+
+    return dnd_pick_target_from_list(disp, atoms, n);
+}
+
+// Finds the best target given a local copy of a property.
+Atom dnd_pick_target_from_targets(Display *disp, Property p)
+{
+    // The list of targets is a list of atoms, so it should have type XA_ATOM
+    // but it may have the type TARGETS instead.
+
+    if ((p.type != XA_ATOM && p.type != server.atom.TARGETS) || p.format != 32) {
+        // This would be really broken. Targets have to be an atom list
+        // and applications should support this. Nevertheless, some
+        // seem broken (MATLAB 7, for instance), so ask for STRING
+        // next instead as the lowest common denominator
+        return XA_STRING;
+    } else {
+        Atom *atom_list = (Atom *)p.data;
+
+        return dnd_pick_target_from_list(disp, atom_list, p.nitems);
+    }
+}
+
+void dnd_init()
+{
+    dnd_source_window = 0;
+    dnd_target_window = 0;
+    dnd_version = 0;
+    dnd_selection = XInternAtom(server.display, "PRIMARY", 0);
+    dnd_atom = None;
+    dnd_sent_request = 0;
+    dnd_launcher_icon = NULL;
+    hidden_panel_shown_for_dnd = FALSE;
+}
+
+void handle_dnd_enter(XClientMessageEvent *e)
+{
+    dnd_atom = None;
+    int more_than_3 = e->data.l[1] & 1;
+    dnd_source_window = e->data.l[0];
+    dnd_version = (e->data.l[1] >> 24);
+
+    if (debug_dnd) {
+        fprintf(stderr, "tint2: DnD %s:%d: DnDEnter\n", __FILE__, __LINE__);
+        fprintf(stderr,
+                "DnD %s:%d: DnDEnter. Supports > 3 types = %s\n",
+                __FILE__,
+                __LINE__,
+                more_than_3 ? "yes" : "no");
+        fprintf(stderr, "tint2: DnD %s:%d: Protocol version = %d\n", __FILE__, __LINE__, dnd_version);
+        fprintf(stderr,
+                "tint2: DnD %s:%d: Type 1 = %s\n",
+                __FILE__,
+                __LINE__,
+                GetAtomName(server.display, e->data.l[2]));
+        fprintf(stderr,
+                "tint2: DnD %s:%d: Type 2 = %s\n",
+                __FILE__,
+                __LINE__,
+                GetAtomName(server.display, e->data.l[3]));
+        fprintf(stderr,
+                "tint2: DnD %s:%d: Type 3 = %s\n",
+                __FILE__,
+                __LINE__,
+                GetAtomName(server.display, e->data.l[4]));
+    }
+
+    // Query which conversions are available and pick the best
+    if (more_than_3) {
+        // Fetch the list of possible conversions
+        // Notice the similarity to TARGETS with paste.
+        Property p = dnd_read_property(server.display, dnd_source_window, server.atom.XdndTypeList);
+        dnd_atom = dnd_pick_target_from_targets(server.display, p);
+        XFree(p.data);
+    } else {
+        // Use the available list
+        dnd_atom = dnd_pick_target_from_atoms(server.display, e->data.l[2], e->data.l[3], e->data.l[4]);
+    }
+
+    if (debug_dnd)
+        fprintf(stderr,
+                "tint2: DnD %s:%d: Requested type = %s\n",
+                __FILE__,
+                __LINE__,
+                GetAtomName(server.display, dnd_atom));
+}
+
+void handle_dnd_position(XClientMessageEvent *e)
+{
+    dnd_target_window = e->window;
+    int accept = 0;
+    Panel *panel = get_panel(e->window);
+    int x, y, mapX, mapY;
+    Window child;
+    x = (e->data.l[2] >> 16) & 0xFFFF;
+    y = e->data.l[2] & 0xFFFF;
+    XTranslateCoordinates(server.display, server.root_win, e->window, x, y, &mapX, &mapY, &child);
+    Task *task = click_task(panel, mapX, mapY);
+    if (task) {
+        if (task->desktop != server.desktop)
+            change_desktop(task->desktop);
+        task_handle_mouse_event(task, TOGGLE);
+    } else {
+        LauncherIcon *icon = click_launcher_icon(panel, mapX, mapY);
+        if (icon) {
+            accept = 1;
+            dnd_launcher_icon = icon;
+        } else {
+            dnd_launcher_icon = NULL;
+        }
+    }
+
+    // send XdndStatus event to get more XdndPosition events
+    XClientMessageEvent se;
+    se.type = ClientMessage;
+    se.window = e->data.l[0];
+    se.message_type = server.atom.XdndStatus;
+    se.format = 32;
+    se.data.l[0] = e->window;      // XID of the target window
+    se.data.l[1] = accept ? 1 : 0; // bit 0: accept drop    bit 1: send XdndPosition events if inside rectangle
+    se.data.l[2] = 0;              // Rectangle x,y for which no more XdndPosition events
+    se.data.l[3] = (1 << 16) | 1;  // Rectangle w,h for which no more XdndPosition events
+    if (accept) {
+        se.data.l[4] = server.atom.XdndActionCopy;
+    } else {
+        se.data.l[4] = None; // None = drop will not be accepted
+    }
+
+    if (debug_dnd)
+        fprintf(stderr,
+                "tint2: DnD %s:%d: Accepted: %s\n",
+                __FILE__,
+                __LINE__,
+                accept ? GetAtomName(server.display, (Atom)se.data.l[4]) : "no");
+
+    XSendEvent(server.display, e->data.l[0], False, NoEventMask, (XEvent *)&se);
+}
+
+void handle_dnd_drop(XClientMessageEvent *e)
+{
+    if (dnd_target_window && dnd_launcher_icon) {
+        if (dnd_version >= 1) {
+            XConvertSelection(server.display,
+                              server.atom.XdndSelection,
+                              dnd_atom,
+                              dnd_selection,
+                              dnd_target_window,
+                              e->data.l[2]);
+        } else {
+            XConvertSelection(server.display,
+                              server.atom.XdndSelection,
+                              dnd_atom,
+                              dnd_selection,
+                              dnd_target_window,
+                              CurrentTime);
+        }
+    } else {
+        // The source is sending anyway, despite instructions to the contrary.
+        // So reply that we're not interested.
+        XClientMessageEvent m;
+        memset(&m, 0, sizeof(m));
+        m.type = ClientMessage;
+        m.display = e->display;
+        m.window = e->data.l[0];
+        m.message_type = server.atom.XdndFinished;
+        m.format = 32;
+        m.data.l[0] = dnd_target_window;
+        m.data.l[1] = 0;
+        m.data.l[2] = None; // Failed.
+        XSendEvent(server.display, e->data.l[0], False, NoEventMask, (XEvent *)&m);
+    }
+}
+
+void handle_dnd_selection_notify(XSelectionEvent *e)
+{
+    Atom target = e->target;
+
+    if (debug_dnd) {
+        fprintf(stderr, "tint2: DnD %s:%d: A selection notify has arrived!\n", __FILE__, __LINE__);
+        fprintf(stderr,
+                "DnD %s:%d: Selection atom = %s\n",
+                __FILE__,
+                __LINE__,
+                GetAtomName(server.display, e->selection));
+        fprintf(stderr, "tint2: DnD %s:%d: Target atom = %s\n", __FILE__, __LINE__, GetAtomName(server.display, target));
+        fprintf(stderr,
+                "DnD %s:%d: Property atom  = %s\n",
+                __FILE__,
+                __LINE__,
+                GetAtomName(server.display, e->property));
+    }
+
+    if (dnd_launcher_icon) {
+        Property prop = dnd_read_property(server.display, dnd_target_window, dnd_selection);
+
+        if (prop.data) {
+            // If we're being given a list of targets (possible conversions)
+            if (target == server.atom.TARGETS && !dnd_sent_request) {
+                dnd_sent_request = 1;
+                dnd_atom = dnd_pick_target_from_targets(server.display, prop);
+
+                if (dnd_atom == None) {
+                    if (debug_dnd)
+                        fprintf(stderr, "tint2: No matching datatypes.\n");
+                } else {
+                    // Request the data type we are able to select
+                    if (debug_dnd)
+                        fprintf(stderr, "tint2: Now requsting type %s", GetAtomName(server.display, dnd_atom));
+                    XConvertSelection(server.display,
+                                      dnd_selection,
+                                      dnd_atom,
+                                      dnd_selection,
+                                      dnd_target_window,
+                                      CurrentTime);
+                }
+            } else if (target == dnd_atom) {
+                // Dump the binary data
+                if (debug_dnd) {
+                    fprintf(stderr, "tint2: DnD %s:%d: Received data:\n", __FILE__, __LINE__);
+                    fprintf(stderr, "tint2: --------\n");
+                    for (int i = 0; i < prop.nitems * prop.format / 8; i++)
+                        fprintf(stderr, "%c", ((char *)prop.data)[i]);
+                    fprintf(stderr, "tint2: --------\n");
+                }
+
+                // https://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables
+                GString *cmd = g_string_new(dnd_launcher_icon->cmd);
+
+                const char *atom_name = GetAtomName(server.display, prop.type);
+                if (strcasecmp(atom_name, "STRING") == 0 || strcasecmp(atom_name, "text/uri-list") == 0) {
+                    GString *url = g_string_new("");
+                    GString *prev_url = g_string_new("");
+                    gboolean must_unescape = strcasecmp(atom_name, "text/uri-list") == 0;
+                    for (int i = 0; i < prop.nitems * prop.format / 8; i++) {
+                        char c = ((char *)prop.data)[i];
+                        if (c == '\n') {
+                            if (must_unescape) {
+                                char *raw = g_uri_unescape_string(url->str, NULL);
+                                if (raw) {
+                                    g_string_assign(url, raw);
+                                }
+                                free(raw);
+                            }
+                            // Many programs cannot handle this prefix
+                            tint2_g_string_replace(url, "file://", "");
+                            // Some programs put duplicates in the list, we remove them
+                            if (strcmp(url->str, prev_url->str) != 0) {
+                                if (strstr(cmd->str, "%F")) {
+                                    GString *piece = g_string_new("");
+                                    g_string_append(piece, " \"");
+                                    g_string_append(piece, url->str);
+                                    g_string_append(piece, "\"");
+                                    g_string_append(piece, " %F");
+                                    tint2_g_string_replace(cmd, "%F", piece->str);
+                                    g_string_free(piece, TRUE);
+                                } else if (strstr(cmd->str, "%f")) {
+                                    GString *piece = g_string_new("");
+                                    g_string_append(piece, " \"");
+                                    g_string_append(piece, url->str);
+                                    g_string_append(piece, "\"");
+                                    tint2_g_string_replace(cmd, "%f", piece->str);
+                                    g_string_free(piece, TRUE);
+                                    break;
+                                } else {
+                                    g_string_append(cmd, " \"");
+                                    g_string_append(cmd, url->str);
+                                    g_string_append(cmd, "\"");
+                                }
+                            }
+                            g_string_assign(prev_url, url->str);
+                            g_string_assign(url, "");
+                        } else if (c == '\r') {
+                            // Nothing to do
+                        } else {
+                            if (c == '`' || c == '$' || c == '\\') {
+                                g_string_append(url, "\\");
+                            }
+                            g_string_append_c(url, c);
+                        }
+                    }
+                    g_string_free(url, TRUE);
+                    g_string_free(prev_url, TRUE);
+                }
+                tint2_g_string_replace(cmd, "%F", "");
+                tint2_g_string_replace(cmd, "%f", "");
+                if (debug_dnd)
+                    fprintf(stderr, "tint2: DnD %s:%d: Running command: %s\n", __FILE__, __LINE__, cmd->str);
+                tint_exec(cmd->str,
+                          NULL,
+                          NULL,
+                          e->time,
+                          NULL,
+                          0,
+                          0,
+                          dnd_launcher_icon->start_in_terminal,
+                          dnd_launcher_icon->startup_notification);
+                g_string_free(cmd, TRUE);
+
+                // Reply OK.
+                XClientMessageEvent m;
+                memset(&m, 0, sizeof(m));
+                m.type = ClientMessage;
+                m.display = server.display;
+                m.window = dnd_source_window;
+                m.message_type = server.atom.XdndFinished;
+                m.format = 32;
+                m.data.l[0] = dnd_target_window;
+                m.data.l[1] = 1;
+                m.data.l[2] = server.atom.XdndActionCopy; // We only ever copy.
+                XSendEvent(server.display, dnd_source_window, False, NoEventMask, (XEvent *)&m);
+                XSync(server.display, False);
+            }
+
+            XFree(prop.data);
+        }
+    }
+}

src/drag_and_drop.h

@@ -0,0 +1,22 @@
+/**************************************************************************
+ * Copyright (C) 2017 tint2 authors
+ *
+ **************************************************************************/
+
+#ifndef DRAG_AND_DROP_H
+#define DRAG_AND_DROP_H
+
+#include <X11/Xlib.h>
+#include <glib.h>
+
+extern gboolean hidden_panel_shown_for_dnd;
+extern gboolean debug_dnd;
+
+void dnd_init();
+
+void handle_dnd_enter(XClientMessageEvent *e);
+void handle_dnd_position(XClientMessageEvent *e);
+void handle_dnd_drop(XClientMessageEvent *e);
+void handle_dnd_selection_notify(XSelectionEvent *e);
+
+#endif

src/execplugin/execplugin.c

@@ -18,9 +18,13 @@
 #include "timer.h"
 #include "common.h"
 
+#define MAX_TOOLTIP_LEN 4096
+
 void execp_timer_callback(void *arg);
 char *execp_get_tooltip(void *obj);
 void execp_init_fonts();
+int execp_compute_desired_size(void *obj);
+void execp_dump_geometry(void *obj, int indent);
 
 void default_execp()
 {
@@ -28,15 +32,15 @@ void default_execp()
 
 Execp *create_execp()
 {
-	Execp *execp = calloc(1, sizeof(Execp));
-	execp->backend = calloc(1, sizeof(ExecpBackend));
-	execp->backend->child_pipe = -1;
-
+    Execp *execp = (Execp *)calloc(1, sizeof(Execp));
+    execp->backend = (ExecpBackend *)calloc(1, sizeof(ExecpBackend));
+    execp->backend->child_pipe_stdout = -1;
+    execp->backend->child_pipe_stderr = -1;
+    execp->backend->cmd_pids = g_tree_new(cmp_ptr);
     execp->backend->interval = 30;
     execp->backend->cache_icon = TRUE;
     execp->backend->centered = TRUE;
     execp->backend->font_color.alpha = 0.5;
-
     return execp;
 }
 
@@ -44,10 +48,10 @@ gpointer create_execp_frontend(gconstpointer arg, gpointer data)
 {
     Execp *execp_backend = (Execp *)arg;
 
-	Execp *execp_frontend = calloc(1, sizeof(Execp));
+    Execp *execp_frontend = (Execp *)calloc(1, sizeof(Execp));
     execp_frontend->backend = execp_backend->backend;
     execp_backend->backend->instances = g_list_append(execp_backend->backend->instances, execp_frontend);
-	execp_frontend->frontend = calloc(1, sizeof(ExecpFrontend));
+    execp_frontend->frontend = (ExecpFrontend *)calloc(1, sizeof(ExecpFrontend));
     return execp_frontend;
 }
 
@@ -58,6 +62,9 @@ void destroy_execp(void *obj)
         // This is a frontend element
         execp->backend->instances = g_list_remove_all(execp->backend->instances, execp);
         free_and_null(execp->frontend);
+        remove_area(&execp->area);
+        free_area(&execp->area);
+        free_and_null(execp);
     } else {
         // This is a backend element
         stop_timeout(execp->backend->timer);
@@ -68,16 +75,25 @@ void destroy_execp(void *obj)
             imlib_free_image();
             execp->backend->icon = NULL;
         }
-		free_and_null(execp->backend->buf_output);
+        free_and_null(execp->backend->buf_stdout);
+        free_and_null(execp->backend->buf_stderr);
         free_and_null(execp->backend->text);
         free_and_null(execp->backend->icon_path);
         if (execp->backend->child) {
             kill(-execp->backend->child, SIGHUP);
             execp->backend->child = 0;
         }
-		if (execp->backend->child_pipe >= 0) {
-			close(execp->backend->child_pipe);
-			execp->backend->child_pipe = -1;
+        if (execp->backend->child_pipe_stdout >= 0) {
+            close(execp->backend->child_pipe_stdout);
+            execp->backend->child_pipe_stdout = -1;
+        }
+        if (execp->backend->child_pipe_stderr >= 0) {
+            close(execp->backend->child_pipe_stderr);
+            execp->backend->child_pipe_stderr = -1;
+        }
+        if (execp->backend->cmd_pids) {
+            g_tree_destroy(execp->backend->cmd_pids);
+            execp->backend->cmd_pids = NULL;
         }
 
         execp->backend->bg = NULL;
@@ -92,7 +108,7 @@ void destroy_execp(void *obj)
         free_and_null(execp->backend->uwheel_command);
 
         if (execp->backend->instances) {
-			fprintf(stderr, "Error: Attempt to destroy backend while there are still frontend instances!\n");
+            fprintf(stderr, "tint2: Error: Attempt to destroy backend while there are still frontend instances!\n");
             exit(-1);
         }
         free(execp->backend);
@@ -130,9 +146,11 @@ void init_execp()
         // Set missing config options
         if (!execp->backend->bg)
             execp->backend->bg = &g_array_index(backgrounds, Background, 0);
-		execp->backend->buf_capacity = 1024;
-		execp->backend->buf_output = calloc(execp->backend->buf_capacity, 1);
-		execp->backend->text = strdup(" ");
+        execp->backend->buf_stdout_capacity = 1024;
+        execp->backend->buf_stdout = calloc(execp->backend->buf_stdout_capacity, 1);
+        execp->backend->buf_stderr_capacity = 1024;
+        execp->backend->buf_stderr = calloc(execp->backend->buf_stderr_capacity, 1);
+        execp->backend->text = strdup("");
         execp->backend->icon_path = NULL;
     }
 }
@@ -157,7 +175,12 @@ void init_execp_panel(void *p)
         execp->area.paddingxlr = execp->backend->paddingxlr;
         execp->area.parent = panel;
         execp->area.panel = panel;
-		snprintf(execp->area.name, sizeof(execp->area.name), "Execp %s", execp->backend->command ? execp->backend->command : "null");
+        execp->area._dump_geometry = execp_dump_geometry;
+        execp->area._compute_desired_size = execp_compute_desired_size;
+        snprintf(execp->area.name,
+                 sizeof(execp->area.name),
+                 "Execp %s",
+                 execp->backend->command ? execp->backend->command : "null");
         execp->area._draw_foreground = draw_execp;
         execp->area.size_mode = LAYOUT_FIXED;
         execp->area._resize = resize_execp;
@@ -171,9 +194,11 @@ void init_execp_panel(void *p)
 
         execp->area.resize_needed = TRUE;
         execp->area.on_screen = TRUE;
+        instantiate_area_gradients(&execp->area);
 
-		if (!execp->backend->timer)
         execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
+
+        execp_update_post_read(execp);
     }
 }
 
@@ -212,7 +237,7 @@ void execp_default_font_changed()
             }
         }
     }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 }
 
 void cleanup_execp()
@@ -276,87 +301,140 @@ gboolean reload_icon(Execp *execp)
     return FALSE;
 }
 
-gboolean resize_execp(void *obj)
+void execp_compute_icon_text_geometry(Execp *execp,
+                                      int *horiz_padding,
+                                      int *vert_padding,
+                                      int *interior_padding,
+                                      int *icon_w,
+                                      int *icon_h,
+                                      gboolean *text_next_line,
+                                      int *txt_height_ink,
+                                      int *txt_height,
+                                      int *txt_width,
+                                      int *new_size,
+                                      gboolean *resized)
 {
-	Execp *execp = obj;
-	Panel *panel = execp->area.panel;
-	int horiz_padding = (panel_horizontal ? execp->area.paddingxlr : execp->area.paddingy);
-	int vert_padding = (panel_horizontal ? execp->area.paddingy : execp->area.paddingxlr);
-	int interior_padding = execp->area.paddingx;
+    Panel *panel = (Panel *)execp->area.panel;
+    Area *area = &execp->area;
+    *horiz_padding = (panel_horizontal ? area->paddingxlr : area->paddingy);
+    *vert_padding = (panel_horizontal ? area->paddingy : area->paddingxlr);
+    *interior_padding = area->paddingx;
 
-	schedule_redraw(&execp->area);
-
-	int icon_w, icon_h;
     if (reload_icon(execp)) {
         if (execp->backend->icon) {
             imlib_context_set_image(execp->backend->icon);
-			icon_w = imlib_image_get_width();
-			icon_h = imlib_image_get_height();
+            *icon_w = imlib_image_get_width();
+            *icon_h = imlib_image_get_height();
         } else {
-			icon_w = icon_h = 0;
+            *icon_w = *icon_h = 0;
         }
     } else {
-		icon_w = icon_h = 0;
+        *icon_w = *icon_h = 0;
     }
 
-	int text_next_line = !panel_horizontal && icon_w > execp->area.width / 2;
+    *text_next_line = !panel_horizontal && *icon_w > area->width / 2;
 
+    int available_w, available_h;
+    if (panel_horizontal) {
+        available_w = panel->area.width;
+        available_h = area->height - 2 * area->paddingy - left_right_border_width(area);
+    } else {
+        available_w = !text_next_line
+                          ? area->width - *icon_w - (*icon_w ? *interior_padding : 0) - 2 * *horiz_padding -
+                                left_right_border_width(area)
+                          : area->width - 2 * *horiz_padding - left_right_border_width(area);
+        available_h = panel->area.height;
+    }
+    get_text_size2(execp->backend->font_desc,
+                   txt_height_ink,
+                   txt_height,
+                   txt_width,
+                   available_h,
+                   available_w,
+                   execp->backend->text,
+                   strlen(execp->backend->text),
+                   PANGO_WRAP_WORD_CHAR,
+                   PANGO_ELLIPSIZE_NONE,
+                   execp->backend->has_markup);
+
+    *resized = FALSE;
+    if (panel_horizontal) {
+        *new_size = *txt_width;
+        if (*icon_w)
+            *new_size += *interior_padding + *icon_w;
+        *new_size += 2 * *horiz_padding + left_right_border_width(area);
+        if (*new_size < area->width && abs(*new_size - area->width) < 6) {
+            // we try to limit the number of resizes
+            *new_size = area->width;
+            *resized = TRUE;
+        } else {
+            *resized = *new_size != area->width;
+        }
+    } else {
+        if (!*text_next_line) {
+            *new_size = *txt_height + 2 * *vert_padding + top_bottom_border_width(area);
+            *new_size = MAX(*new_size, *icon_h + 2 * *vert_padding + top_bottom_border_width(area));
+        } else {
+            *new_size = *icon_h + *interior_padding + *txt_height + 2 * *vert_padding + top_bottom_border_width(area);
+        }
+        if (*new_size != area->height) {
+            *resized = TRUE;
+        }
+    }
+}
+
+int execp_compute_desired_size(void *obj)
+{
+    Execp *execp = (Execp *)obj;
+    int horiz_padding, vert_padding, interior_padding;
+    int icon_w, icon_h;
+    gboolean text_next_line;
     int txt_height_ink, txt_height, txt_width;
-	if (panel_horizontal) {
-		get_text_size2(execp->backend->font_desc,
-					   &txt_height_ink,
-					   &txt_height,
-					   &txt_width,
-					   panel->area.height,
-					   panel->area.width,
-					   execp->backend->text,
-					   strlen(execp->backend->text),
-					   PANGO_WRAP_WORD_CHAR,
-					   PANGO_ELLIPSIZE_NONE,
-					   execp->backend->has_markup);
-	} else {
-		get_text_size2(execp->backend->font_desc,
-					   &txt_height_ink,
-					   &txt_height,
-					   &txt_width,
-					   panel->area.height,
-					   !text_next_line
-						   ? execp->area.width - icon_w - (icon_w ? interior_padding : 0) -
-								 2 * (horiz_padding + execp->area.bg->border.width)
-						   : execp->area.width - 2 * (horiz_padding + execp->area.bg->border.width),
-					   execp->backend->text,
-					   strlen(execp->backend->text),
-					   PANGO_WRAP_WORD_CHAR,
-					   PANGO_ELLIPSIZE_NONE,
-					   execp->backend->has_markup);
-	}
-
-	gboolean result = FALSE;
-	if (panel_horizontal) {
-		int new_size = txt_width;
-		if (icon_w)
-			new_size += interior_padding + icon_w;
-		new_size += 2 * (horiz_padding + execp->area.bg->border.width);
-		if (new_size > execp->area.width || new_size < (execp->area.width - 6)) {
-			// we try to limit the number of resize
-			execp->area.width = new_size + 1;
-			result = TRUE;
-		}
-	} else {
     int new_size;
-		if (!text_next_line) {
-			new_size = txt_height + (2 * (vert_padding + execp->area.bg->border.width));
-			if (new_size < icon_h + (2 * (vert_padding + execp->area.bg->border.width))) {
-				new_size = icon_h + (2 * (vert_padding + execp->area.bg->border.width));
-			}
-		} else {
-			new_size = icon_h + interior_padding + txt_height + (2 * (vert_padding + execp->area.bg->border.width));
-		}
-		if (new_size != execp->area.height) {
+    gboolean resized;
+    execp_compute_icon_text_geometry(execp,
+                                     &horiz_padding,
+                                     &vert_padding,
+                                     &interior_padding,
+                                     &icon_w,
+                                     &icon_h,
+                                     &text_next_line,
+                                     &txt_height_ink,
+                                     &txt_height,
+                                     &txt_width,
+                                     &new_size,
+                                     &resized);
+
+    return new_size;
+}
+
+gboolean resize_execp(void *obj)
+{
+    Execp *execp = (Execp *)obj;
+    int horiz_padding, vert_padding, interior_padding;
+    int icon_w, icon_h;
+    gboolean text_next_line;
+    int txt_height_ink, txt_height, txt_width;
+    int new_size;
+    gboolean resized;
+    execp_compute_icon_text_geometry(execp,
+                                     &horiz_padding,
+                                     &vert_padding,
+                                     &interior_padding,
+                                     &icon_w,
+                                     &icon_h,
+                                     &text_next_line,
+                                     &txt_height_ink,
+                                     &txt_height,
+                                     &txt_width,
+                                     &new_size,
+                                     &resized);
+
+    if (panel_horizontal)
+        execp->area.width = new_size;
+    else
         execp->area.height = new_size;
-			result = TRUE;
-		}
-	}
+
     execp->frontend->textw = txt_width;
     execp->frontend->texth = txt_height;
     if (execp->backend->centered) {
@@ -380,27 +458,28 @@ gboolean resize_execp(void *obj)
         if (icon_w) {
             if (!text_next_line) {
                 execp->frontend->icony = (execp->area.height - icon_h) / 2;
-				execp->frontend->iconx = execp->area.bg->border.width + horiz_padding;
+                execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
                 execp->frontend->texty = (execp->area.height - txt_height) / 2;
                 execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
             } else {
                 execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
-				execp->frontend->iconx = execp->area.bg->border.width + horiz_padding;
+                execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
                 execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
                 execp->frontend->textx = execp->frontend->iconx;
             }
         } else {
             execp->frontend->texty = (execp->area.height - txt_height) / 2;
-			execp->frontend->textx = execp->area.bg->border.width + horiz_padding;
+            execp->frontend->textx = left_border_width(&execp->area) + horiz_padding;
         }
     }
 
-	return result;
+    schedule_redraw(&execp->area);
+    return resized;
 }
 
 void draw_execp(void *obj, cairo_t *c)
 {
-	Execp *execp = obj;
+    Execp *execp = (Execp *)obj;
     PangoLayout *layout = pango_cairo_create_layout(c);
 
     if (execp->backend->has_icon && execp->backend->icon) {
@@ -431,9 +510,50 @@ void draw_execp(void *obj, cairo_t *c)
     g_object_unref(layout);
 }
 
-void execp_action(void *obj, int button, int x, int y)
+void execp_dump_geometry(void *obj, int indent)
 {
-	Execp *execp = obj;
+    Execp *execp = (Execp *)obj;
+
+    if (execp->backend->has_icon && execp->backend->icon) {
+        Imlib_Image tmp = imlib_context_get_image();
+        imlib_context_set_image(execp->backend->icon);
+        fprintf(stderr,
+                "%*sIcon: x = %d, y = %d, w = %d, h = %d\n",
+                indent,
+                "",
+                execp->frontend->iconx,
+                execp->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,
+            "",
+            execp->frontend->textx,
+            execp->frontend->texty,
+            execp->frontend->textw,
+            execp->backend->centered ? "center" : "left",
+            execp->backend->text);
+}
+
+void execp_force_update(Execp *execp)
+{
+    if (execp->backend->child_pipe_stdout > 0) {
+        // Command currently running, nothing to do
+    } else {
+        if (execp->backend->timer)
+            stop_timeout(execp->backend->timer);
+        // Run command right away
+        execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
+    }
+}
+
+void execp_action(void *obj, int button, int x, int y, Time time)
+{
+    Execp *execp = (Execp *)obj;
     char *command = NULL;
     switch (button) {
     case 1:
@@ -453,102 +573,117 @@ void execp_action(void *obj, int button, int x, int y)
         break;
     }
     if (command) {
-		char *full_cmd = g_strdup_printf("export EXECP_X=%d;"
-		                                 "export EXECP_Y=%d;"
-		                                 "export EXECP_W=%d;"
-		                                 "export EXECP_H=%d; %s",
-		                                 x,
-		                                 y,
-		                                 execp->area.width,
-		                                 execp->area.height,
-		                                 command);
-		tint_exec(full_cmd);
-		g_free(full_cmd);
+        setenvd("EXECP_X", x);
+        setenvd("EXECP_Y", y);
+        setenvd("EXECP_W", execp->area.width);
+        setenvd("EXECP_H", execp->area.height);
+        pid_t pid = tint_exec(command, NULL, NULL, time, obj, x, y, FALSE, TRUE);
+        unsetenv("EXECP_X");
+        unsetenv("EXECP_Y");
+        unsetenv("EXECP_W");
+        unsetenv("EXECP_H");
+        if (pid > 0)
+            g_tree_insert(execp->backend->cmd_pids, GINT_TO_POINTER(pid), GINT_TO_POINTER(1));
     } else {
-		if (execp->backend->child_pipe > 0) {
-			// Command currently running, nothing to do
-		} else {
-			if (execp->backend->timer)
-				stop_timeout(execp->backend->timer);
-			// Run command right away
-			execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
-		}
+        execp_force_update(execp);
     }
 }
 
+void execp_cmd_completed(Execp *execp, pid_t pid)
+{
+    g_tree_remove(execp->backend->cmd_pids, GINT_TO_POINTER(pid));
+    execp_force_update(execp);
+}
+
 void execp_timer_callback(void *arg)
 {
-	Execp *execp = arg;
+    Execp *execp = (Execp *)arg;
 
     if (!execp->backend->command)
         return;
 
     // Still running!
-	if (execp->backend->child_pipe > 0)
+    if (execp->backend->child_pipe_stdout > 0)
         return;
 
-	int pipe_fd[2];
-	if (pipe(pipe_fd)) {
+    int pipe_fd_stdout[2];
+    if (pipe(pipe_fd_stdout)) {
         // TODO maybe write this in tooltip, but if this happens we're screwed anyways
-		fprintf(stderr, "Execp: Creating pipe failed!\n");
+        fprintf(stderr, "tint2: Execp: Creating pipe failed!\n");
         return;
     }
 
-	fcntl(pipe_fd[0], F_SETFL, O_NONBLOCK | fcntl(pipe_fd[0], F_GETFL));
+    fcntl(pipe_fd_stdout[0], F_SETFL, O_NONBLOCK | fcntl(pipe_fd_stdout[0], F_GETFL));
+
+    int pipe_fd_stderr[2];
+    if (pipe(pipe_fd_stderr)) {
+        close(pipe_fd_stdout[1]);
+        close(pipe_fd_stdout[0]);
+        // TODO maybe write this in tooltip, but if this happens we're screwed anyways
+        fprintf(stderr, "tint2: Execp: Creating pipe failed!\n");
+        return;
+    }
+
+    fcntl(pipe_fd_stderr[0], F_SETFL, O_NONBLOCK | fcntl(pipe_fd_stderr[0], F_GETFL));
 
     // Fork and run command, capturing stdout in pipe
     pid_t child = fork();
     if (child == -1) {
         // TODO maybe write this in tooltip, but if this happens we're screwed anyways
-		fprintf(stderr, "Fork failed.\n");
-		close(pipe_fd[1]);
-		close(pipe_fd[0]);
+        fprintf(stderr, "tint2: Fork failed.\n");
+        close(pipe_fd_stdout[1]);
+        close(pipe_fd_stdout[0]);
+        close(pipe_fd_stderr[1]);
+        close(pipe_fd_stderr[0]);
         return;
     } else if (child == 0) {
+        fprintf(stderr, "tint2: Executing: %s\n", execp->backend->command);
         // We are in the child
-		close(pipe_fd[0]);
-		dup2(pipe_fd[1], 1); // 1 is stdout
-		close(pipe_fd[1]);
+        close(pipe_fd_stdout[0]);
+        dup2(pipe_fd_stdout[1], 1); // 1 is stdout
+        close(pipe_fd_stdout[1]);
+        close(pipe_fd_stderr[0]);
+        dup2(pipe_fd_stderr[1], 2); // 2 is stderr
+        close(pipe_fd_stderr[1]);
+        close_all_fds();
         setpgid(0, 0);
         execl("/bin/sh", "/bin/sh", "-c", execp->backend->command, NULL);
         // This should never happen!
-		fprintf(stdout, "execl() failed\nexecl() failed\n");
-		fflush(stdout);
+        fprintf(stderr, "execl() failed\nexecl() failed\n");
         exit(0);
     }
-	close(pipe_fd[1]);
+    close(pipe_fd_stdout[1]);
+    close(pipe_fd_stderr[1]);
     execp->backend->child = child;
-	execp->backend->child_pipe = pipe_fd[0];
-	execp->backend->buf_length = 0;
-	execp->backend->buf_output[execp->backend->buf_length] = '\0';
+    execp->backend->child_pipe_stdout = pipe_fd_stdout[0];
+    execp->backend->child_pipe_stderr = pipe_fd_stderr[0];
+    execp->backend->buf_stdout_length = 0;
+    execp->backend->buf_stdout[execp->backend->buf_stdout_length] = '\0';
+    execp->backend->buf_stderr_length = 0;
+    execp->backend->buf_stderr[execp->backend->buf_stderr_length] = '\0';
     execp->backend->last_update_start_time = time(NULL);
 }
 
-gboolean read_execp(void *obj)
+void read_from_pipe(int fd, char **buffer, ssize_t *buffer_length, ssize_t *buffer_capacity, gboolean *eof)
 {
-	Execp *execp = (Execp *)obj;
-
-	if (execp->backend->child_pipe < 0)
-		return FALSE;
-
-	gboolean command_finished = FALSE;
+    *eof = FALSE;
     while (1) {
         // Make sure there is free space in the buffer
-		if (execp->backend->buf_capacity - execp->backend->buf_length < 1024) {
-			execp->backend->buf_capacity *= 2;
-			execp->backend->buf_output = realloc(execp->backend->buf_output, execp->backend->buf_capacity);
+        if (*buffer_capacity - *buffer_length < 1024) {
+            *buffer_capacity *= 2;
+            *buffer = (char *)realloc(*buffer, *buffer_capacity);
         }
-		ssize_t count = read(execp->backend->child_pipe,
-							 execp->backend->buf_output + execp->backend->buf_length,
-							 execp->backend->buf_capacity - execp->backend->buf_length - 1);
+        ssize_t count = read(fd,
+                             *buffer + *buffer_length,
+                             *buffer_capacity - *buffer_length - 1);
         if (count > 0) {
             // Successful read
-			execp->backend->buf_length += count;
-			execp->backend->buf_output[execp->backend->buf_length] = '\0';
+            *buffer_length += count;
+            (*buffer)[*buffer_length] = '\0';
             continue;
         } else if (count == 0) {
             // End of file
-			command_finished = TRUE;
+            *eof = TRUE;
             break;
         } else if (errno == EAGAIN || errno == EWOULDBLOCK) {
             // No more data available at the moment
@@ -558,28 +693,87 @@ gboolean read_execp(void *obj)
             continue;
         } else {
             // Error
-			command_finished = TRUE;
+            *eof = TRUE;
             break;
         }
         break;
     }
+}
+
+gboolean starts_with(char *s, char *prefix)
+{
+    char *p, *q;
+    for (p = s, q = prefix; *p && *q; p++, q++) {
+        if (*p != *q)
+            return FALSE;
+    }
+    return *q == '\0';
+}
+
+char *last_substring(char *s, char *sub)
+{
+    char *result = NULL;
+    for (char *p = s; *p; p++) {
+        if (starts_with(p, sub))
+            result = p;
+    }
+    return result;
+}
+
+void rstrip(char *s)
+{
+    size_t len = strlen(s);
+    while (len > 0) {
+        if (s[len-1] == ' ' || s[len-1] == '\n') {
+            s[len-1] = 0;
+            len--;
+        } else {
+            break;
+        }
+    }
+}
+
+gboolean read_execp(void *obj)
+{
+    Execp *execp = (Execp *)obj;
+
+    if (execp->backend->child_pipe_stdout < 0)
+        return FALSE;
+
+    gboolean stdout_eof, stderr_eof;
+    read_from_pipe(execp->backend->child_pipe_stdout,
+                   &execp->backend->buf_stdout,
+                   &execp->backend->buf_stdout_length,
+                   &execp->backend->buf_stdout_capacity,
+                   &stdout_eof);
+    read_from_pipe(execp->backend->child_pipe_stderr,
+                   &execp->backend->buf_stderr,
+                   &execp->backend->buf_stderr_length,
+                   &execp->backend->buf_stderr_capacity,
+                   &stderr_eof);
+
+    gboolean command_finished = stdout_eof && stderr_eof;
 
     if (command_finished) {
         execp->backend->child = 0;
-		close(execp->backend->child_pipe);
-		execp->backend->child_pipe = -1;
+        close(execp->backend->child_pipe_stdout);
+        execp->backend->child_pipe_stdout = -1;
+        close(execp->backend->child_pipe_stderr);
+        execp->backend->child_pipe_stderr = -1;
         if (execp->backend->interval)
             execp->backend->timer =
                 add_timeout(execp->backend->interval * 1000, 0, execp_timer_callback, execp, &execp->backend->timer);
     }
 
+    char *ansi_clear_screen = (char*)"\x1b[2J";
     if (!execp->backend->continuous && command_finished) {
+        // Handle stdout
         free_and_null(execp->backend->text);
         free_and_null(execp->backend->icon_path);
         if (!execp->backend->has_icon) {
-			execp->backend->text = strdup(execp->backend->buf_output);
+            execp->backend->text = strdup(execp->backend->buf_stdout);
         } else {
-			char *text = strchr(execp->backend->buf_output, '\n');
+            char *text = strchr(execp->backend->buf_stdout, '\n');
             if (text) {
                 *text = '\0';
                 text++;
@@ -587,41 +781,75 @@ gboolean read_execp(void *obj)
             } else {
                 execp->backend->text = strdup("");
             }
-			execp->backend->icon_path = strdup(execp->backend->buf_output);
+            execp->backend->icon_path = strdup(execp->backend->buf_stdout);
         }
         int len = strlen(execp->backend->text);
         if (len > 0 && execp->backend->text[len - 1] == '\n')
             execp->backend->text[len - 1] = '\0';
-		execp->backend->buf_length = 0;
-		execp->backend->buf_output[execp->backend->buf_length] = '\0';
+        execp->backend->buf_stdout_length = 0;
+        execp->backend->buf_stdout[execp->backend->buf_stdout_length] = '\0';
+        // Handle stderr
+        if (!execp->backend->has_user_tooltip) {
+            free_and_null(execp->backend->tooltip);
+            char *start = last_substring(execp->backend->buf_stderr, ansi_clear_screen);
+            if (start)
+                start += strlen(ansi_clear_screen);
+            else
+                start = execp->backend->buf_stderr;
+            if (*start) {
+                execp->backend->tooltip = strdup(start);
+                rstrip(execp->backend->tooltip);
+                if (strlen(execp->backend->tooltip) > MAX_TOOLTIP_LEN)
+                    execp->backend->tooltip[MAX_TOOLTIP_LEN] = '\0';
+            }
+        }
+        execp->backend->buf_stderr_length = 0;
+        execp->backend->buf_stderr[execp->backend->buf_stderr_length] = '\0';
+        //
         execp->backend->last_update_finish_time = time(NULL);
         execp->backend->last_update_duration =
             execp->backend->last_update_finish_time - execp->backend->last_update_start_time;
         return TRUE;
     } else if (execp->backend->continuous > 0) {
+        // Handle stderr
+        if (!execp->backend->has_user_tooltip) {
+            free_and_null(execp->backend->tooltip);
+            char *start = last_substring(execp->backend->buf_stderr, ansi_clear_screen);
+            if (start) {
+                start += strlen(ansi_clear_screen);
+                memmove(execp->backend->buf_stderr, start, strlen(start) + 1);
+                execp->backend->buf_stderr_length = (ssize_t)strlen(execp->backend->buf_stderr);
+            }
+            if (execp->backend->buf_stderr_length > MAX_TOOLTIP_LEN) {
+                execp->backend->buf_stderr_length = MAX_TOOLTIP_LEN;
+                execp->backend->buf_stderr[execp->backend->buf_stderr_length] = '\0';
+            }
+            execp->backend->tooltip = strdup(execp->backend->buf_stderr);
+            rstrip(execp->backend->tooltip);
+        } else {
+            execp->backend->buf_stderr_length = 0;
+            execp->backend->buf_stderr[execp->backend->buf_stderr_length] = '\0';
+        }
+        // Handle stdout
         // Count lines in buffer
         int num_lines = 0;
-		char *last = execp->backend->buf_output;
         char *end = NULL;
-		for (char *c = execp->backend->buf_output; *c; c++) {
+        for (char *c = execp->backend->buf_stdout; *c; c++) {
             if (*c == '\n') {
                 num_lines++;
                 if (num_lines == execp->backend->continuous)
                     end = c;
             }
-			last = c;
         }
-		if (*last && *last != '\n')
-			num_lines++;
         if (num_lines >= execp->backend->continuous) {
             if (end)
                 *end = '\0';
             free_and_null(execp->backend->text);
             free_and_null(execp->backend->icon_path);
             if (!execp->backend->has_icon) {
-				execp->backend->text = strdup(execp->backend->buf_output);
+                execp->backend->text = strdup(execp->backend->buf_stdout);
             } else {
-				char *text = strchr(execp->backend->buf_output, '\n');
+                char *text = strchr(execp->backend->buf_stdout, '\n');
                 if (text) {
                     *text = '\0';
                     text++;
@@ -629,23 +857,23 @@ gboolean read_execp(void *obj)
                 } else {
                     execp->backend->text = strdup("");
                 }
-				execp->backend->icon_path = strdup(execp->backend->buf_output);
+                execp->backend->icon_path = strdup(execp->backend->buf_stdout);
             }
-			int len = strlen(execp->backend->text);
+            size_t len = strlen(execp->backend->text);
             if (len > 0 && execp->backend->text[len - 1] == '\n')
                 execp->backend->text[len - 1] = '\0';
 
             if (end) {
                 char *next = end + 1;
-				int copied = next - execp->backend->buf_output;
-				int remaining = execp->backend->buf_length - copied;
+                ssize_t copied = next - execp->backend->buf_stdout;
+                ssize_t remaining = execp->backend->buf_stdout_length - copied;
                 if (remaining > 0) {
-					memmove(execp->backend->buf_output, next, remaining);
-					execp->backend->buf_length = remaining;
-					execp->backend->buf_output[execp->backend->buf_length] = '\0';
+                    memmove(execp->backend->buf_stdout, next, (size_t)remaining);
+                    execp->backend->buf_stdout_length = remaining;
+                    execp->backend->buf_stdout[execp->backend->buf_stdout_length] = '\0';
                 } else {
-					execp->backend->buf_length = 0;
-					execp->backend->buf_output[execp->backend->buf_length] = '\0';
+                    execp->backend->buf_stdout_length = 0;
+                    execp->backend->buf_stdout[execp->backend->buf_stdout_length] = '\0';
                 }
             }
 
@@ -680,7 +908,7 @@ const char *time_to_string(int seconds, char *buffer)
 
 char *execp_get_tooltip(void *obj)
 {
-	Execp *execp = obj;
+    Execp *execp = (Execp *)obj;
 
     if (execp->backend->tooltip) {
         if (strlen(execp->backend->tooltip) > 0)
@@ -694,7 +922,7 @@ char *execp_get_tooltip(void *obj)
     char tmp_buf1[256];
     char tmp_buf2[256];
     char tmp_buf3[256];
-	if (execp->backend->child_pipe < 0) {
+    if (execp->backend->child_pipe_stdout < 0) {
         // Not executing command
         if (execp->backend->last_update_finish_time) {
             // We updated at least once
@@ -732,3 +960,44 @@ char *execp_get_tooltip(void *obj)
     }
     return strdup(execp->backend->tooltip_text);
 }
+
+void execp_update_post_read(Execp *execp)
+{
+    int icon_h, icon_w;
+    if (reload_icon(execp)) {
+        if (execp->backend->icon) {
+            imlib_context_set_image(execp->backend->icon);
+            icon_w = imlib_image_get_width();
+            icon_h = imlib_image_get_height();
+        } else {
+            icon_w = icon_h = 0;
+        }
+    } else {
+        icon_w = icon_h = 0;
+    }
+
+    if ((icon_h == 0 || icon_w == 0) && execp->backend->text[0] == 0) {
+        // Easy to test with bash -c 'R=$(( RANDOM % 2 )); [ $R -eq 0 ] && echo HELLO $R'
+        if (execp->area.on_screen)
+            hide(&execp->area);
+    } else {
+        if (!execp->area.on_screen)
+            show(&execp->area);
+        execp->area.resize_needed = TRUE;
+        schedule_panel_redraw();
+    }
+}
+
+void handle_execp_events()
+{
+    for (GList *l = panel_config.execp_list; l; l = l->next) {
+        Execp *execp = (Execp *)l->data;
+        if (read_execp(execp)) {
+            GList *l_instance;
+            for (l_instance = execp->backend->instances; l_instance; l_instance = l_instance->next) {
+                Execp *instance = (Execp *)l_instance->data;
+                execp_update_post_read(instance);
+            }
+        }
+    }
+}

src/execplugin/execplugin.h

@@ -27,6 +27,7 @@ typedef struct ExecpBackend {
     gboolean cache_icon;
     int icon_w;
     int icon_h;
+    gboolean has_user_tooltip;
     char *tooltip;
     gboolean centered;
     gboolean has_font;
@@ -46,20 +47,24 @@ typedef struct ExecpBackend {
 
     // Backend state:
     timeout *timer;
-	int child_pipe;
+    int child_pipe_stdout;
+    int child_pipe_stderr;
     pid_t child;
 
     // Command output buffer
-	char *buf_output;
-	int buf_length;
-	int buf_capacity;
+    char *buf_stdout;
+    ssize_t buf_stdout_length;
+    ssize_t buf_stdout_capacity;
+    char *buf_stderr;
+    ssize_t buf_stderr_length;
+    ssize_t buf_stderr_capacity;
 
     // Text extracted from the output buffer
     char *text;
     // Icon path extracted from the output buffer
     char *icon_path;
     Imlib_Image icon;
-	char tooltip_text[512];
+    gchar tooltip_text[512];
 
     // The time the last command was started
     time_t last_update_start_time;
@@ -70,6 +75,7 @@ typedef struct ExecpBackend {
 
     // List of Execp which are frontends for this backend, one for each panel
     GList *instances;
+    GTree *cmd_pids;
 } ExecpBackend;
 
 typedef struct ExecpFrontend {
@@ -128,13 +134,20 @@ 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, int x, int y);
+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.
 // Returns 1 if the output has been updated and a redraw is needed.
 gboolean read_execp(void *obj);
 
+// Called for Execp front elements when the command output has changed.
+void execp_update_post_read(Execp *execp);
+
 void execp_default_font_changed();
 
+void handle_execp_events();
+
 #endif // EXECPLUGIN_H

src/freespace/freespace.c

@@ -30,11 +30,20 @@
 #include "freespace.h"
 #include "common.h"
 
+int freespace_area_compute_desired_size(void *obj);
+
 void init_freespace_panel(void *p)
 {
     Panel *panel = (Panel *)p;
-	FreeSpace *freespace = &panel->freespace;
 
+    // Make sure this is only done once if there are multiple items
+    if (panel->freespace_list)
+        return;
+
+    for (size_t k = 0; k < strlen(panel_items_order); k++) {
+        if (panel_items_order[k] == 'F') {
+            FreeSpace *freespace = (FreeSpace *)calloc(1, sizeof(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;
@@ -44,30 +53,53 @@ void init_freespace_panel(void *p)
             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)
 {
+    if (panel_shrink)
+        return 0;
     // Get space used by every element except the freespace
     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;
+        if (a->_resize == resize_freespace) {
+            spacers++;
             continue;
-
-		if (panel_horizontal)
-			size += a->width + (a->bg->border.width * 2) + p->area.paddingx;
-		else
-			size += a->height + (a->bg->border.width * 2) + p->area.paddingy;
         }
 
         if (panel_horizontal)
-		size = p->area.width - size - (p->area.bg->border.width * 2) - p->area.paddingxlr;
+            size += a->width + p->area.paddingx;
         else
-		size = p->area.height - size - (p->area.bg->border.width * 2) - p->area.paddingxlr;
+            size += a->height + p->area.paddingy;
+    }
 
-	return size;
+    if (panel_horizontal)
+        size = p->area.width - size - left_right_border_width(&p->area) - p->area.paddingxlr;
+    else
+        size = p->area.height - size - top_bottom_border_width(&p->area) - p->area.paddingxlr;
+
+    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)
@@ -89,6 +121,6 @@ gboolean resize_freespace(void *obj)
     }
 
     schedule_redraw(&freespace->area);
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
     return TRUE;
 }

src/freespace/freespace.h

@@ -12,7 +12,9 @@ typedef struct FreeSpace {
     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/init.c

@@ -0,0 +1,286 @@
+#include "init.h"
+
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "config.h"
+#include "drag_and_drop.h"
+#include "fps_distribution.h"
+#include "panel.h"
+#include "server.h"
+#include "signals.h"
+#include "tooltip.h"
+#include "tracing.h"
+#include "uevent.h"
+#include "version.h"
+
+void print_usage()
+{
+    fprintf(stdout,
+            "Usage: tint2 [OPTION...]\n"
+            "\n"
+            "Options:\n"
+            "  -c path_to_config_file   Loads the configuration file from a\n"
+            "                           custom location.\n"
+            "  -v, --version            Prints version information and exits.\n"
+            "  -h, --help               Display this help and exits.\n"
+            "\n"
+            "For more information, run `man tint2` or visit the project page\n"
+            "<https://gitlab.com/o9000/tint2>.\n");
+}
+
+void handle_cli_arguments(int argc, char **argv)
+{
+    // Read command line arguments
+    for (int i = 1; i < argc; ++i) {
+        gboolean error = FALSE;
+        if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+            print_usage();
+            exit(0);
+        } else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--version") == 0) {
+            fprintf(stdout, "tint2 version %s\n", VERSION_STRING);
+            exit(0);
+        } else if (strcmp(argv[i], "-c") == 0) {
+            if (i + 1 < argc) {
+                i++;
+                config_path = strdup(argv[i]);
+            } else {
+                error = TRUE;
+            }
+        } else if (strcmp(argv[i], "-s") == 0) {
+            if (i + 1 < argc) {
+                i++;
+                snapshot_path = strdup(argv[i]);
+            } else {
+                error = TRUE;
+            }
+        } else if (i + 1 == argc) {
+            config_path = strdup(argv[i]);
+        }
+#ifdef ENABLE_BATTERY
+        else if (strcmp(argv[i], "--battery-sys-prefix") == 0) {
+            if (i + 1 < argc) {
+                i++;
+                battery_sys_prefix = strdup(argv[i]);
+            } else {
+                error = TRUE;
+            }
+        }
+#endif
+        else {
+            error = TRUE;
+        }
+        if (error) {
+            print_usage();
+            exit(1);
+        }
+    }
+}
+
+void handle_env_vars()
+{
+    debug_geometry = getenv("DEBUG_GEOMETRY") != NULL;
+    debug_gradients = getenv("DEBUG_GRADIENTS") != NULL;
+    debug_icons = getenv("DEBUG_ICONS") != NULL;
+    debug_fps = getenv("DEBUG_FPS") != NULL;
+    debug_frames = getenv("DEBUG_FRAMES") != NULL;
+    debug_dnd = getenv("DEBUG_DND") != NULL;
+    if (debug_fps) {
+        init_fps_distribution();
+        char *s = getenv("TRACING_FPS_THRESHOLD");
+        if (!s || sscanf(s, "%lf", &tracing_fps_threshold) != 1) {
+            tracing_fps_threshold = 60;
+        }
+    }
+}
+
+static timeout *detect_compositor_timer = NULL;
+static int detect_compositor_timer_counter = 0;
+
+void detect_compositor(void *arg)
+{
+    if (server.composite_manager) {
+        stop_timeout(detect_compositor_timer);
+        return;
+    }
+
+    detect_compositor_timer_counter--;
+    if (detect_compositor_timer_counter < 0) {
+        stop_timeout(detect_compositor_timer);
+        return;
+    }
+
+    // No compositor, check for one
+    if (XGetSelectionOwner(server.display, server.atom._NET_WM_CM_S0) != None) {
+        stop_timeout(detect_compositor_timer);
+        // Restart tint2
+        fprintf(stderr, "tint2: Detected compositor, restarting tint2...\n");
+        kill(getpid(), SIGUSR1);
+    }
+}
+
+void start_detect_compositor()
+{
+    // Already have a compositor, nothing to do
+    if (server.composite_manager)
+        return;
+
+    stop_timeout(detect_compositor_timer);
+    // Check every 0.5 seconds for up to 30 seconds
+    detect_compositor_timer_counter = 60;
+    detect_compositor_timer = add_timeout(500, 500, detect_compositor, 0, &detect_compositor_timer);
+}
+
+void create_default_elements()
+{
+    default_timeout();
+    default_systray();
+    memset(&server, 0, sizeof(server));
+#ifdef ENABLE_BATTERY
+    default_battery();
+#endif
+    default_clock();
+    default_launcher();
+    default_taskbar();
+    default_tooltip();
+    default_execp();
+    default_button();
+    default_panel();
+}
+
+void init_post_config()
+{
+    server_init_visual();
+    server_init_xdamage();
+
+    imlib_context_set_display(server.display);
+    imlib_context_set_visual(server.visual);
+    imlib_context_set_colormap(server.colormap);
+
+    init_signals_postconfig();
+
+    // load default icon
+    const gchar *const *data_dirs = g_get_system_data_dirs();
+    for (int i = 0; data_dirs[i] != NULL; i++) {
+        gchar *path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
+        if (g_file_test(path, G_FILE_TEST_EXISTS))
+            default_icon = load_image(path, TRUE);
+        g_free(path);
+    }
+    if (!default_icon) {
+        fprintf(stderr,
+                RED "Could not load default_icon.png. Please check that tint2 has been installed correctly!" RESET
+                    "\n");
+    }
+
+    XSync(server.display, False);
+}
+
+void init_X11_pre_config()
+{
+    server.display = XOpenDisplay(NULL);
+    if (!server.display) {
+        fprintf(stderr, "tint2: could not open display!\n");
+        exit(1);
+    }
+    server.x11_fd = ConnectionNumber(server.display);
+    XSetErrorHandler((XErrorHandler)server_catch_error);
+    XSetIOErrorHandler((XIOErrorHandler)x11_io_error);
+    server_init_atoms();
+    server.screen = DefaultScreen(server.display);
+    server.root_win = RootWindow(server.display, server.screen);
+    server.desktop = get_current_desktop();
+
+    // Needed since the config file uses '.' as decimal separator
+    setlocale(LC_ALL, "");
+    setlocale(LC_NUMERIC, "POSIX");
+
+    /* Catch events */
+    XSelectInput(server.display, server.root_win, PropertyChangeMask | StructureNotifyMask);
+
+    // get monitor and desktop config
+    get_monitors();
+    get_desktops();
+
+    server.disable_transparency = 0;
+
+    xsettings_client = xsettings_client_new(server.display, server.screen, xsettings_notify_cb, NULL, NULL);
+}
+
+void init(int argc, char **argv)
+{
+    setlinebuf(stdout);
+    setlinebuf(stderr);
+    default_config();
+    handle_cli_arguments(argc, argv);
+    create_default_elements();
+    init_signals();
+    handle_env_vars();
+
+    init_X11_pre_config();
+    if (!config_read()) {
+        fprintf(stderr, "tint2: Could not read config file.\n");
+        print_usage();
+        cleanup();
+        return;
+    }
+
+    init_post_config();
+    start_detect_compositor();
+    init_panel();
+}
+
+void cleanup()
+{
+#ifdef HAVE_SN
+    if (startup_notifications) {
+        sn_display_unref(server.sn_display);
+        server.sn_display = NULL;
+    }
+#endif // HAVE_SN
+
+    cleanup_button();
+    cleanup_execp();
+    cleanup_systray();
+    cleanup_tooltip();
+    cleanup_clock();
+    cleanup_launcher();
+#ifdef ENABLE_BATTERY
+    cleanup_battery();
+#endif
+    cleanup_panel();
+    cleanup_config();
+
+    if (default_icon) {
+        imlib_context_set_image(default_icon);
+        imlib_free_image();
+        default_icon = NULL;
+    }
+    imlib_context_disconnect_display();
+
+    xsettings_client_destroy(xsettings_client);
+    xsettings_client = NULL;
+
+    cleanup_server();
+    cleanup_timeout();
+
+    if (server.display)
+        XCloseDisplay(server.display);
+    server.display = NULL;
+
+    if (sigchild_pipe_valid) {
+        sigchild_pipe_valid = FALSE;
+        close(sigchild_pipe[1]);
+        close(sigchild_pipe[0]);
+    }
+
+    uevent_cleanup();
+    cleanup_fps_distribution();
+
+#ifdef HAVE_TRACING
+    cleanup_tracing();
+#endif
+}

src/init.h

@@ -0,0 +1,7 @@
+#ifndef INIT_H
+#define INIT_H
+
+void init(int argc, char **argv);
+void cleanup();
+
+#endif

src/launcher/apps-common.c

@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 static gint compare_strings(gconstpointer a, gconstpointer b)
 {
@@ -95,6 +96,10 @@ void expand_exec(DesktopEntry *entry, const char *path)
                     q += strlen("''");
                     q += strlen(path);
                     q--; // To balance the q++ in the for
+                } else if (*p == 'f' || *p == 'F') {
+                    sprintf(q, "%c%c", '%', *p);
+                    q += 2;
+                    q--; // To balance the q++ in the for
                 } else {
                     // We don't care about other expansions
                     q--; // Delete the last % from q
@@ -110,12 +115,14 @@ void expand_exec(DesktopEntry *entry, const char *path)
 
 gboolean read_desktop_file_full_path(const char *path, DesktopEntry *entry)
 {
-	entry->name = entry->generic_name = entry->icon = entry->exec = NULL;
+    entry->name = entry->generic_name = entry->icon = entry->exec = entry->cwd = NULL;
     entry->hidden_from_menus = FALSE;
+    entry->start_in_terminal = FALSE;
+    entry->startup_notification = TRUE;
 
     FILE *fp = fopen(path, "rt");
     if (fp == NULL) {
-		fprintf(stderr, "Could not open file %s\n", path);
+        fprintf(stderr, "tint2: Could not open file %s\n", path);
         return FALSE;
     }
 
@@ -125,14 +132,14 @@ gboolean read_desktop_file_full_path(const char *path, DesktopEntry *entry)
     int lang_index_default = 1;
 #define LANG_DBG 0
     if (LANG_DBG)
-		printf("Languages:");
+        fprintf(stderr, "tint2: Languages:");
     for (int i = 0; languages[i]; i++) {
         lang_index_default = i + 1;
         if (LANG_DBG)
-			printf(" %s", languages[i]);
+            fprintf(stderr, "tint2:  %s", languages[i]);
     }
     if (LANG_DBG)
-		printf("\n");
+        fprintf(stderr, "tint2: \n");
     // we currently do not know about any Name key at all, so use an invalid index
     int lang_index_name = lang_index_default + 1;
     int lang_index_generic_name = lang_index_default + 1;
@@ -185,10 +192,16 @@ gboolean read_desktop_file_full_path(const char *path, DesktopEntry *entry)
                 }
             } 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;
+            } else if (strcmp(key, "Terminal") == 0) {
+                entry->start_in_terminal = strcasecmp(value, "true") == 0;
+            } else if (strcmp(key, "StartupNotify") == 0) {
+                entry->startup_notification = strcasecmp(value, "true") == 0;
             }
         }
     }
@@ -209,11 +222,11 @@ gboolean read_desktop_file_from_dir(const char *path, const char *file_name, Des
         g_free(full_path);
         return TRUE;
     }
-	free(entry->name);
-	free(entry->generic_name);
-	free(entry->icon);
-	free(entry->exec);
-	entry->name = entry->generic_name = entry->icon = entry->exec = NULL;
+    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;
 
@@ -252,7 +265,7 @@ gboolean read_desktop_file_from_dir(const char *path, const char *file_name, Des
 gboolean read_desktop_file(const char *path, DesktopEntry *entry)
 {
     entry->path = strdup(path);
-	entry->name = entry->generic_name = entry->icon = entry->exec = NULL;
+    entry->name = entry->generic_name = entry->icon = entry->exec = entry->cwd = NULL;
 
     if (strchr(path, '/'))
         return read_desktop_file_full_path(path, entry);
@@ -265,21 +278,21 @@ gboolean read_desktop_file(const char *path, DesktopEntry *entry)
 
 void free_desktop_entry(DesktopEntry *entry)
 {
-	free(entry->name);
-	free(entry->generic_name);
-	free(entry->icon);
-	free(entry->exec);
-	free(entry->path);
-	entry->name = entry->generic_name = entry->icon = entry->exec = entry->path = NULL;
+    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->path);
+    free_and_null(entry->cwd);
 }
 
 void test_read_desktop_file()
 {
-	fprintf(stdout, "\033[1;33m");
+    fprintf(stderr, YELLOW);
     DesktopEntry entry;
     read_desktop_file("/usr/share/applications/firefox.desktop", &entry);
-	printf("Name:%s GenericName:%s Icon:%s Exec:%s\n", entry.name, entry.generic_name, entry.icon, entry.exec);
-	fprintf(stdout, "\033[0m");
+    fprintf(stderr, "tint2: Name:%s GenericName:%s Icon:%s Exec:%s\n", entry.name, entry.generic_name, entry.icon, entry.exec);
+    fprintf(stderr, RESET);
 }
 
 GSList *apps_locations = NULL;

src/launcher/apps-common.h

@@ -15,7 +15,10 @@ typedef struct DesktopEntry {
     char *exec;
     char *icon;
     char *path;
+    char *cwd;
     gboolean hidden_from_menus;
+    gboolean start_in_terminal;
+    gboolean startup_notification;
 } DesktopEntry;
 
 // Parses a line of the form "key = value". Modifies the line.

src/launcher/icon-theme-common.c

@@ -29,6 +29,8 @@
 #include "common.h"
 #include "cache.h"
 
+gboolean debug_icons = FALSE;
+
 #define ICON_DIR_TYPE_SCALABLE 0
 #define ICON_DIR_TYPE_FIXED 1
 #define ICON_DIR_TYPE_THRESHOLD 2
@@ -90,7 +92,7 @@ IconTheme *load_theme_from_index(const char *file_name, const char *name)
     size_t line_size;
 
     if ((f = fopen(file_name, "rt")) == NULL) {
-		fprintf(stderr, "Could not open theme '%s'\n", file_name);
+        fprintf(stderr, "tint2: Could not open theme '%s'\n", file_name);
         return NULL;
     }
 
@@ -305,6 +307,7 @@ void free_themes(IconThemeWrapper *wrapper)
 {
     if (!wrapper)
         return;
+    free(wrapper->icon_theme_name);
     for (GSList *l = wrapper->themes; l; l = l->next) {
         IconTheme *theme = (IconTheme *)l->data;
         free_icon_theme(theme);
@@ -324,22 +327,22 @@ void free_themes(IconThemeWrapper *wrapper)
 
 void test_launcher_read_theme_file()
 {
-	fprintf(stdout, "\033[1;33m");
+    fprintf(stdout, YELLOW);
     IconTheme *theme = load_theme("oxygen");
     if (!theme) {
-		printf("Could not load theme\n");
+        fprintf(stderr, "tint2: Could not load theme\n");
         return;
     }
-	printf("Loaded theme: %s\n", theme->name);
+    fprintf(stderr, "tint2: Loaded theme: %s\n", theme->name);
     GSList *item = theme->list_inherits;
     while (item != NULL) {
-		printf("Inherits:%s\n", (char *)item->data);
+        fprintf(stderr, "tint2: Inherits:%s\n", (char *)item->data);
         item = g_slist_next(item);
     }
     item = theme->list_directories;
     while (item != NULL) {
         IconThemeDir *dir = item->data;
-		printf("Dir:%s Size=%d MinSize=%d MaxSize=%d Threshold=%d Type=%s\n",
+        fprintf(stderr, "tint2: Dir:%s Size=%d MinSize=%d MaxSize=%d Threshold=%d Type=%s\n",
                dir->name,
                dir->size,
                dir->min_size,
@@ -351,7 +354,7 @@ void test_launcher_read_theme_file()
                                                                                                        : "?????");
         item = g_slist_next(item);
     }
-	fprintf(stdout, "\033[0m");
+    fprintf(stdout, RESET);
 }
 
 gboolean str_list_contains(const GSList *list, const char *value)
@@ -378,7 +381,7 @@ void load_themes_helper(const char *name, GSList **themes, GSList **queued)
         char *queued_name = queue->data;
         queue = g_slist_remove(queue, queued_name);
 
-		fprintf(stderr, " '%s',", queued_name);
+        fprintf(stderr, "tint2:  '%s',", queued_name);
         IconTheme *theme = load_theme(queued_name);
         if (theme != NULL) {
             *themes = g_slist_append(*themes, theme);
@@ -398,7 +401,7 @@ void load_themes_helper(const char *name, GSList **themes, GSList **queued)
 
         free(queued_name);
     }
-	fprintf(stderr, "\n");
+    fprintf(stderr, "tint2: \n");
 
     // Free the queue
     GSList *l;
@@ -412,7 +415,7 @@ void load_default_theme(IconThemeWrapper *wrapper)
     if (wrapper->_themes_loaded)
         return;
 
-	fprintf(stderr, GREEN "Loading icon theme %s:" RESET "\n", wrapper->icon_theme_name);
+    fprintf(stderr, GREEN "tint2: Loading icon theme %s:" RESET "\n", wrapper->icon_theme_name);
 
     load_themes_helper(wrapper->icon_theme_name, &wrapper->themes, &wrapper->_queued);
     load_themes_helper("hicolor", &wrapper->themes, &wrapper->_queued);
@@ -425,7 +428,7 @@ void load_fallbacks(IconThemeWrapper *wrapper)
     if (wrapper->_fallback_loaded)
         return;
 
-	fprintf(stderr, RED "Loading additional icon themes (this means your icon theme is incomplete)..." RESET "\n");
+    fprintf(stderr, RED "tint2: Loading additional icon themes (this means your icon theme is incomplete)..." RESET "\n");
 
     // Load wrapper->themes_fallback
     const GSList *location;
@@ -458,7 +461,7 @@ void load_icon_cache(IconThemeWrapper *wrapper)
     if (wrapper->_cache.loaded)
         return;
 
-	fprintf(stderr, GREEN "Loading icon theme cache..." RESET "\n");
+    fprintf(stderr, GREEN "tint2: Loading icon theme cache..." RESET "\n");
 
     gchar *cache_path = get_icon_cache_path();
     load_cache(&wrapper->_cache, cache_path);
@@ -470,7 +473,7 @@ void save_icon_cache(IconThemeWrapper *wrapper)
     if (!wrapper || !wrapper->_cache.dirty)
         return;
 
-	fprintf(stderr, GREEN "Saving icon theme cache..." RESET "\n");
+    fprintf(stderr, GREEN "tint2: Saving icon theme cache..." RESET "\n");
     gchar *cache_path = get_icon_cache_path();
     save_cache(&wrapper->_cache, cache_path);
     g_free(cache_path);
@@ -481,7 +484,7 @@ IconThemeWrapper *load_themes(const char *icon_theme_name)
     IconThemeWrapper *wrapper = calloc(1, sizeof(IconThemeWrapper));
 
     if (!icon_theme_name) {
-		fprintf(stderr, "Missing icon_theme_name theme, default to 'hicolor'.\n");
+        fprintf(stderr, "tint2: Missing icon_theme_name theme, default to 'hicolor'.\n");
         icon_theme_name = "hicolor";
     }
 
@@ -532,7 +535,6 @@ gint compare_theme_directories(gconstpointer a, gconstpointer b, gpointer size_q
     return abs(da->size - size) - abs(db->size - size);
 }
 
-#define DEBUG_ICON_SEARCH 0
 char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 {
     if (icon_name == NULL)
@@ -584,6 +586,8 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
     char *file_name = calloc(file_name_size, 1);
 
     for (theme = themes; theme; theme = g_slist_next(theme)) {
+        if (debug_icons)
+            fprintf(stderr, "tint2: Searching theme: %s\n", ((IconTheme *)theme->data)->name);
         ((IconTheme *)theme->data)->list_directories =
             g_slist_sort_with_data(((IconTheme *)theme->data)->list_directories,
                                    compare_theme_directories,
@@ -599,6 +603,8 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
                                     (!next_larger_theme ? 1 : theme == next_larger_theme));
             if (!possible)
                 continue;
+            if (debug_icons)
+                fprintf(stderr, "tint2: Searching directory: %s\n", ((IconThemeDir *)dir->data)->name);
             const GSList *base;
             for (base = basenames; base; base = g_slist_next(base)) {
                 for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
@@ -616,11 +622,11 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
                     file_name[0] = 0;
                     // filename = directory/$(themename)/subdirectory/iconname.extension
                     sprintf(file_name, "%s/%s/%s/%s%s", base_name, theme_name, dir_name, icon_name, extension);
-					if (DEBUG_ICON_SEARCH)
-						printf("checking %s\n", file_name);
+                    if (debug_icons)
+                        fprintf(stderr, "tint2: Checking %s\n", file_name);
                     if (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
-						if (DEBUG_ICON_SEARCH)
-							printf("found: %s\n", file_name);
+                        if (debug_icons)
+                            fprintf(stderr, "tint2: Found potential match: %s\n", file_name);
                         // Closest match
                         if (directory_size_distance((IconThemeDir *)dir->data, size) < minimal_size &&
                             (!best_file_theme ? 1 : theme == best_file_theme)) {
@@ -631,8 +637,8 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
                             best_file_name = strdup(file_name);
                             minimal_size = directory_size_distance((IconThemeDir *)dir->data, size);
                             best_file_theme = theme;
-							if (DEBUG_ICON_SEARCH)
-								printf("best_file_name = %s; minimal_size = %d\n", best_file_name, minimal_size);
+                            if (debug_icons)
+                                fprintf(stderr, "tint2: best_file_name = %s; minimal_size = %d\n", best_file_name, minimal_size);
                         }
                         // Next larger match
                         if (((IconThemeDir *)dir->data)->size >= size &&
@@ -645,8 +651,8 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
                             next_larger = strdup(file_name);
                             next_larger_size = ((IconThemeDir *)dir->data)->size;
                             next_larger_theme = theme;
-							if (DEBUG_ICON_SEARCH)
-								printf("next_larger = %s; next_larger_size = %d\n", next_larger, next_larger_size);
+                            if (debug_icons)
+                                fprintf(stderr, "tint2: next_larger = %s; next_larger_size = %d\n", next_larger, next_larger_size);
                         }
                     }
                 }
@@ -667,6 +673,8 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 
     // Look in unthemed icons
     {
+        if (debug_icons)
+            fprintf(stderr, "tint2: Searching unthemed icons\n");
         for (const GSList *base = basenames; base; base = g_slist_next(base)) {
             for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
                 char *base_name = (char *)base->data;
@@ -674,9 +682,11 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
                 file_name = calloc(strlen(base_name) + strlen(icon_name) + strlen(extension) + 100, 1);
                 // filename = directory/iconname.extension
                 sprintf(file_name, "%s/%s%s", base_name, icon_name, extension);
-				if (DEBUG_ICON_SEARCH)
-					printf("checking %s\n", file_name);
+                if (debug_icons)
+                    fprintf(stderr, "tint2: Checking %s\n", file_name);
                 if (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
+                    if (debug_icons)
+                        fprintf(stderr, "tint2: Found %s\n", file_name);
                     g_slist_free(extensions);
                     return file_name;
                 } else {
@@ -714,7 +724,7 @@ char *get_icon_path_from_cache(IconThemeWrapper *wrapper, const char *icon_name,
     if (!g_file_test(value, G_FILE_TEST_EXISTS))
         return NULL;
 
-	// fprintf(stderr, "Icon path found in cache: theme = %s, icon = %s, size = %d, path = %s\n",
+    // fprintf(stderr, "tint2: Icon path found in cache: theme = %s, icon = %s, size = %d, path = %s\n",
     // wrapper->icon_theme_name, icon_name, size, value);
 
     return strdup(value);
@@ -739,28 +749,46 @@ void add_icon_path_to_cache(IconThemeWrapper *wrapper, const char *icon_name, in
     g_free(key);
 }
 
-char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size)
+char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size, gboolean use_fallbacks)
 {
-	if (!wrapper)
+    if (debug_icons)
+        fprintf(stderr,
+                "Searching for icon %s with size %d, fallbacks %sallowed\n",
+                icon_name,
+                size,
+                use_fallbacks ? "" : "not ");
+    if (!wrapper) {
+        if (debug_icons)
+            fprintf(stderr,
+                    "Icon search aborted, themes not loaded\n");
         return NULL;
+    }
 
     if (!icon_name || strlen(icon_name) == 0)
         goto notfound;
 
     char *path = get_icon_path_from_cache(wrapper, icon_name, size);
-	if (path)
+    if (path) {
+        if (debug_icons)
+            fprintf(stderr,
+                    "Icon found in cache: %s\n", path);
         return path;
+    }
 
     load_default_theme(wrapper);
 
     icon_name = icon_name ? icon_name : DEFAULT_ICON;
     path = get_icon_path_helper(wrapper->themes, icon_name, size);
     if (path) {
+        if (debug_icons)
+            fprintf(stderr, "tint2: Icon found: %s\n", path);
         add_icon_path_to_cache(wrapper, icon_name, size, path);
         return path;
     }
 
-	fprintf(stderr, YELLOW "Icon not found in default theme: %s" RESET "\n", icon_name);
+    if (!use_fallbacks)
+        goto notfound;
+    fprintf(stderr, YELLOW "tint2: Icon not found in default theme: %s" RESET "\n", icon_name);
     load_fallbacks(wrapper);
 
     path = get_icon_path_helper(wrapper->themes_fallback, icon_name, size);
@@ -770,7 +798,7 @@ char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size)
     }
 
 notfound:
-	fprintf(stderr, RED "Could not find icon '%s', using default." RESET "\n", icon_name);
+    fprintf(stderr, RED "tint2: Could not find icon '%s', using default." RESET "\n", icon_name);
     path = get_icon_path_helper(wrapper->themes, DEFAULT_ICON, size);
     if (path)
         return path;

src/launcher/icon-theme-common.h

@@ -51,10 +51,12 @@ void free_icon_theme(IconTheme *theme);
 
 // 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 *wrapper, 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.
 const GSList *get_icon_locations();
 
+extern gboolean debug_icons;
+
 #endif

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,11 +50,21 @@ 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 relayout_launcher();
 
 void default_launcher()
 {
@@ -70,6 +79,7 @@ void default_launcher()
     launcher_icon_theme_override = 0;
     startup_notifications = 0;
     launcher_icon_bg = NULL;
+    launcher_icon_gradients = NULL;
 }
 
 void init_launcher()
@@ -87,6 +97,8 @@ void init_launcher_panel(void *p)
     launcher->area._draw_foreground = NULL;
     launcher->area.size_mode = LAYOUT_FIXED;
     launcher->area._resize = resize_launcher;
+    launcher->area._on_change_layout = relayout_launcher;
+    launcher->area._compute_desired_size = launcher_compute_desired_size;
     launcher->area.resize_needed = 1;
     schedule_redraw(&launcher->area);
     if (!launcher->area.bg)
@@ -99,13 +111,23 @@ void init_launcher_panel(void *p)
     if (launcher->list_apps == NULL)
         return;
 
-	launcher->area.on_screen = TRUE;
-	panel_refresh = TRUE;
+    // This will be recomputed on resize, we just initialize to a non-zero value
+    launcher->icon_size = launcher_max_icon_size > 0 ? launcher_max_icon_size : 24;
 
-	launcher_load_themes(launcher);
+    launcher->area.on_screen = TRUE;
+    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++) {
@@ -142,155 +164,153 @@ void cleanup_launcher_theme(Launcher *launcher)
             free(launcherIcon->icon_path);
             free(launcherIcon->cmd);
             g_free(launcherIcon->icon_tooltip);
+            free(launcherIcon->config_path);
         }
         free(launcherIcon);
     }
     g_slist_free(launcher->list_icons);
     launcher->list_icons = NULL;
+}
 
-	free_themes(launcher->icon_theme_wrapper);
-	launcher->icon_theme_wrapper = NULL;
+int launcher_compute_icon_size(Launcher *launcher)
+{
+    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;
-	int icons_per_column = 1, icons_per_row = 1, margin = 0;
+    Launcher *launcher = (Launcher *)obj;
 
-	int icon_size;
-	if (panel_horizontal) {
-		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;
+    int size, icons_per_column, icons_per_row, margin;
+    launcher_compute_geometry(launcher, &size, &launcher->icon_size, &icons_per_column, &icons_per_row, &margin);
 
     // Resize icons if necessary
     for (GSList *l = launcher->list_icons; l; l = l->next) {
         LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (launcherIcon->icon_size != icon_size || !launcherIcon->image) {
-			launcherIcon->icon_size = icon_size;
+        if (launcherIcon->icon_size != launcher->icon_size || !launcherIcon->image) {
+            launcherIcon->icon_size = launcher->icon_size;
             launcherIcon->area.width = launcherIcon->icon_size;
             launcherIcon->area.height = launcherIcon->icon_size;
-
-			// Get the path for an icon file with the new size
-			char *new_icon_path =
-				get_icon_path(launcher->icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size);
-			if (!new_icon_path) {
-				// Draw a blank icon
-				free_icon(launcherIcon->image);
-				free_icon(launcherIcon->image_hover);
-				free_icon(launcherIcon->image_pressed);
-				launcherIcon->image = NULL;
-				continue;
+            launcher_reload_icon_image(launcher, launcherIcon);
         }
-
-			// Free the old files
-			free_icon(launcherIcon->image);
-			free_icon(launcherIcon->image_hover);
-			free_icon(launcherIcon->image_pressed);
-			// Load the new file
-			launcherIcon->image = load_image(new_icon_path, 1);
-			// On loading error, fallback to default
-			if (!launcherIcon->image) {
-				free(new_icon_path);
-				new_icon_path = get_icon_path(launcher->icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size);
-				if (new_icon_path)
-					launcherIcon->image = imlib_load_image_immediately(new_icon_path);
     }
+    save_icon_cache(icon_theme_wrapper);
 
-			if (!launcherIcon->image) {
-				// Loading default icon failed, draw a blank icon
-				free(new_icon_path);
-			} else {
-				// Loaded icon successfully, rescale it
-				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);
+    int count = 0;
+    gboolean needs_repositioning = FALSE;
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        if (launcherIcon->area.on_screen) {
+            count++;
+            if (launcherIcon->area.posx < 0 || launcherIcon->area.posy < 0)
+                needs_repositioning = TRUE;
         }
     }
 
-		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);
-		}
-	}
-	save_icon_cache(launcher->icon_theme_wrapper);
-
-	int count = g_slist_length(launcher->list_icons);
-
+    if (!needs_repositioning) {
         if (panel_horizontal) {
-		if (!count) {
-			launcher->area.width = 0;
+            if (launcher->area.width == size)
+                return FALSE;
+            launcher->area.width = size;
         } 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);
+            if (launcher->area.height == size)
+                return FALSE;
+            launcher->area.height = size;
         }
     }
 
     int posx, posy;
-	int start = launcher->area.bg->border.width + launcher->area.paddingy + margin / 2;
+    int start;
     if (panel_horizontal) {
-		posy = start;
-		posx = launcher->area.bg->border.width + launcher->area.paddingxlr;
+        posy = start = top_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
+        posx = left_border_width(&launcher->area) + launcher->area.paddingxlr;
     } else {
-		posx = start;
-		posy = launcher->area.bg->border.width + launcher->area.paddingxlr;
+        posx = start = left_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
+        posy = top_border_width(&launcher->area) + launcher->area.paddingxlr;
     }
 
-	int i;
-	GSList *l;
-	for (i = 1, l = launcher->list_icons; l; i++, l = l->next) {
+    int i = 0;
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
         LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-
+        if (!launcherIcon->area.on_screen)
+            continue;
+        i++;
         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);
+        launcher_icon_on_change_layout(launcherIcon);
+        // fprintf(stderr, "tint2: launcher %d : %d,%d\n", i, posx, posy);
         if (panel_horizontal) {
             if (i % icons_per_column) {
-				posy += icon_size + launcher->area.paddingx;
+                posy += launcher->icon_size + launcher->area.paddingx;
             } else {
                 posy = start;
-				posx += (icon_size + launcher->area.paddingx);
+                posx += (launcher->icon_size + launcher->area.paddingx);
             }
         } else {
             if (i % icons_per_row) {
-				posx += icon_size + launcher->area.paddingx;
+                posx += launcher->icon_size + launcher->area.paddingx;
             } else {
                 posx = start;
-				posy += (icon_size + launcher->area.paddingx);
+                posy += (launcher->icon_size + launcher->area.paddingx);
             }
         }
     }
@@ -308,6 +328,17 @@ gboolean resize_launcher(void *obj)
     return TRUE;
 }
 
+void relayout_launcher(void *obj)
+{
+    Launcher *launcher = (Launcher *)obj;
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        if (!launcherIcon->area.on_screen)
+            continue;
+        launcher_icon_on_change_layout(launcherIcon);
+    }
+}
+
 // 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)
@@ -319,6 +350,12 @@ void launcher_icon_on_change_layout(void *obj)
     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;
@@ -345,6 +382,17 @@ void draw_launcher_icon(void *obj, cairo_t *c)
     render_image(launcherIcon->area.pix, 0, 0);
 }
 
+void launcher_icon_dump_geometry(void *obj, int indent)
+{
+    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+    fprintf(stderr,
+            "tint2: %*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;
@@ -386,60 +434,26 @@ void free_icon(Imlib_Image icon)
     }
 }
 
-void launcher_action(LauncherIcon *icon, XEvent *evt)
+void launcher_action(LauncherIcon *icon, XEvent *evt, int x, int y)
 {
-	char *cmd = calloc(strlen(icon->cmd) + 10, 1);
-	sprintf(cmd, "(%s&)", icon->cmd);
-#if HAVE_SN
-	SnLauncherContext *ctx = 0;
-	Time 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
+    launcher_reload_icon((Launcher *)icon->area.parent, icon);
+    launcher_reload_hidden_icons((Launcher *)icon->area.parent);
+
     if (evt->type == ButtonPress || evt->type == ButtonRelease) {
-			time = evt->xbutton.time;
-		} else {
-			fprintf(stderr, "Unknown X event: %d\n", evt->type);
-			free(cmd);
-			return;
+        GString *cmd = g_string_new(icon->cmd);
+        tint2_g_string_replace(cmd, "%f", "");
+        tint2_g_string_replace(cmd, "%F", "");
+        tint_exec(cmd->str,
+                  icon->cwd,
+                  icon->icon_tooltip,
+                  evt->xbutton.time,
+                  &icon->area,
+                  x,
+                  y,
+                  icon->start_in_terminal,
+                  icon->startup_notification);
+        g_string_free(cmd, TRUE);
     }
-		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
@@ -447,32 +461,58 @@ void launcher_load_icons(Launcher *launcher)
 {
     // Load apps (.desktop style launcher items)
     GSList *app = launcher->list_apps;
+    int index = 0;
     while (app != NULL) {
-		DesktopEntry entry;
-		read_desktop_file(app->data, &entry);
-		if (entry.exec) {
-			LauncherIcon *launcherIcon = calloc(1, sizeof(LauncherIcon));
+        index++;
+        LauncherIcon *launcherIcon = (LauncherIcon *)calloc(1, sizeof(LauncherIcon));
         launcherIcon->area.panel = launcher->area.panel;
-			snprintf(launcherIcon->area.name, sizeof(launcherIcon->area.name), "LauncherIcon %s", entry.name ? entry.name : "null");
         launcherIcon->area._draw_foreground = draw_launcher_icon;
         launcherIcon->area.size_mode = LAYOUT_FIXED;
         launcherIcon->area._resize = NULL;
+        launcherIcon->area._compute_desired_size = launcher_icon_compute_desired_size;
+        sprintf(launcherIcon->area.name, "LauncherIcon %d", index);
         launcherIcon->area.resize_needed = 0;
-			schedule_redraw(&launcherIcon->area);
         launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
         launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
         launcherIcon->area.bg = launcher_icon_bg;
         launcherIcon->area.on_screen = TRUE;
+        launcherIcon->area.posx = -1;
         launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
+        launcherIcon->area._dump_geometry = launcher_icon_dump_geometry;
         if (launcher_tooltip_enabled) {
             launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
         } else {
             launcherIcon->area._get_tooltip_text = NULL;
         }
-			launcherIcon->is_app_desktop = 1;
+        launcherIcon->config_path = strdup(app->data);
+        add_area(&launcherIcon->area, (Area *)launcher);
+        launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
+        launcherIcon->icon_size = launcher->icon_size;
+        launcher_reload_icon(launcher, launcherIcon);
+        instantiate_area_gradients(&launcherIcon->area);
+        app = g_slist_next(app);
+    }
+}
+
+void launcher_reload_icon(Launcher *launcher, LauncherIcon *launcherIcon)
+{
+    DesktopEntry entry;
+    if (read_desktop_file(launcherIcon->config_path, &entry) && entry.exec) {
+        schedule_redraw(&launcherIcon->area);
+        if (launcherIcon->cmd)
+            free(launcherIcon->cmd);
         launcherIcon->cmd = strdup(entry.exec);
+        if (launcherIcon->cwd)
+            free(launcherIcon->cwd);
+        if (entry.cwd)
+            launcherIcon->cwd = strdup(entry.cwd);
+        else
+            launcherIcon->cwd = NULL;
+        launcherIcon->start_in_terminal = entry.start_in_terminal;
+        launcherIcon->startup_notification = entry.startup_notification;
+        if (launcherIcon->icon_name)
+            free(launcherIcon->icon_name);
         launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(DEFAULT_ICON);
-			launcherIcon->icon_size = 1;
         if (entry.name) {
             if (entry.generic_name) {
                 launcherIcon->icon_tooltip = g_strdup_printf("%s (%s)", entry.name, entry.generic_name);
@@ -486,18 +526,65 @@ void launcher_load_icons(Launcher *launcher)
                 launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.exec);
             }
         }
-			launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
-			add_area(&launcherIcon->area, (Area *)launcher);
+        launcher_reload_icon_image(launcher, launcherIcon);
+        show(&launcherIcon->area);
+    } else {
+        hide(&launcherIcon->area);
     }
     free_desktop_entry(&entry);
-		app = g_slist_next(app);
+}
+
+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);
     }
 }
 
-// Populates the icon_theme_wrapper list
-void launcher_load_themes(Launcher *launcher)
+void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon)
 {
-	launcher->icon_theme_wrapper =
+    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, "tint2: 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")
@@ -507,16 +594,11 @@ void launcher_load_themes(Launcher *launcher)
 
 void launcher_default_icon_theme_changed()
 {
-	if (!launcher_enabled)
-		return;
-	if (launcher_icon_theme_override && icon_theme_name_config)
-		return;
     for (int i = 0; i < num_panels; i++) {
         Launcher *launcher = &panels[i].launcher;
         cleanup_launcher_theme(launcher);
-		launcher_load_themes(launcher);
         launcher_load_icons(launcher);
         launcher->area.resize_needed = 1;
     }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 }

src/launcher/launcher.h

@@ -12,26 +12,33 @@
 #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
     Area area;
     GSList *list_apps;  // List of char*, each is a path to a app.desktop file
     GSList *list_icons; // List of LauncherIcon*
-	IconThemeWrapper *icon_theme_wrapper;
+    int icon_size;
 } Launcher;
 
 typedef struct LauncherIcon {
     // always start with area
     Area area;
+    char *config_path;
     Imlib_Image image;
     Imlib_Image image_hover;
     Imlib_Image image_pressed;
     char *cmd;
+    char *cwd;
+    gboolean start_in_terminal;
+    gboolean startup_notification;
     char *icon_name;
     char *icon_path;
     char *icon_tooltip;
     int icon_size;
-	int is_app_desktop;
     int x, y;
 } LauncherIcon;
 
@@ -44,8 +51,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,9 +69,7 @@ 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 launcher_action(LauncherIcon *icon, XEvent *e, int x, int y);
 
 void test_launcher_read_desktop_file();
 void test_launcher_read_theme_file();

src/launcher/xsettings-client.c

@@ -48,7 +48,7 @@ void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSett
 {
     if ((action == XSETTINGS_ACTION_NEW || action == XSETTINGS_ACTION_CHANGED) && name != NULL && setting != NULL) {
         if (strcmp(name, "Net/IconThemeName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
-			fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
+            fprintf(stderr, "tint2: xsettings: %s = %s\n", name, setting->data.v_string);
             if (icon_theme_name_xsettings) {
                 if (strcmp(icon_theme_name_xsettings, setting->data.v_string) == 0)
                     return;
@@ -57,7 +57,7 @@ void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSett
             icon_theme_name_xsettings = strdup(setting->data.v_string);
             default_icon_theme_changed();
         } 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, "tint2: xsettings: %s = %s\n", name, setting->data.v_string);
             if (default_font) {
                 if (strcmp(default_font, setting->data.v_string) == 0)
                     return;
@@ -191,7 +191,7 @@ static XSettingsList *parse_settings(unsigned char *data, size_t len)
 
     result = fetch_card8(&buffer, (CARD8 *)&buffer.byte_order);
     if (buffer.byte_order != MSBFirst && buffer.byte_order != LSBFirst) {
-		fprintf(stderr, "Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
+        fprintf(stderr, "tint2: Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
         result = XSETTINGS_FAILED;
         goto out;
     }
@@ -312,13 +312,13 @@ out:
     if (result != XSETTINGS_SUCCESS) {
         switch (result) {
         case XSETTINGS_NO_MEM:
-			fprintf(stderr, "Out of memory reading XSETTINGS property\n");
+            fprintf(stderr, "tint2: Out of memory reading XSETTINGS property\n");
             break;
         case XSETTINGS_ACCESS:
-			fprintf(stderr, "Invalid XSETTINGS property (read off end)\n");
+            fprintf(stderr, "tint2: Invalid XSETTINGS property (read off end)\n");
             break;
         case XSETTINGS_DUPLICATE_ENTRY:
-			fprintf(stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
+            fprintf(stderr, "tint2: Duplicate XSETTINGS entry for '%s'\n", setting->name);
         case XSETTINGS_FAILED:
         case XSETTINGS_SUCCESS:
         case XSETTINGS_NO_ENTRY:
@@ -365,7 +365,7 @@ static void read_settings(XSettingsClient *client)
 
     if (result == Success && type == server.atom._XSETTINGS_SETTINGS) {
         if (format != 8) {
-			fprintf(stderr, "Invalid format for XSETTINGS property %d", format);
+            fprintf(stderr, "tint2: Invalid format for XSETTINGS property %d", format);
         } else
             client->settings = parse_settings(data, n_items);
         XFree(data);
@@ -420,7 +420,7 @@ XSettingsClient *xsettings_client_new(Display *display,
     check_manager_window(client);
 
     if (client->manager_window == None) {
-		printf("No XSETTINGS manager, tint2 uses config option 'launcher_icon_theme'.\n");
+        fprintf(stderr, "tint2: No XSETTINGS manager, tint2 uses config option 'launcher_icon_theme'.\n");
         free(client);
         return NULL;
     } else {

src/main.c

@@ -0,0 +1,806 @@
+/**************************************************************************
+*
+* Tint2 panel
+*
+* Copyright (C) 2007 Pål Staurland (staura@gmail.com)
+* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
+*
+* 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.
+*
+* 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.
+**************************************************************************/
+
+#include <errno.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <X11/Xlocale.h>
+#include <X11/extensions/Xdamage.h>
+#include <Imlib2.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <pwd.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#ifdef HAVE_SN
+#include <libsn/sn.h>
+#endif
+
+#include "config.h"
+#include "drag_and_drop.h"
+#include "fps_distribution.h"
+#include "init.h"
+#include "launcher.h"
+#include "mouse_actions.h"
+#include "panel.h"
+#include "server.h"
+#include "signals.h"
+#include "systraybar.h"
+#include "task.h"
+#include "taskbar.h"
+#include "tooltip.h"
+#include "timer.h"
+#include "tracing.h"
+#include "uevent.h"
+#include "version.h"
+#include "window.h"
+#include "xsettings-client.h"
+
+// Global process state variables
+
+XSettingsClient *xsettings_client = NULL;
+
+gboolean debug_fps = FALSE;
+gboolean debug_frames = FALSE;
+static int frame = 0;
+double tracing_fps_threshold = 60;
+static double ts_event_read;
+static double ts_event_processed;
+static double ts_render_finished;
+static double ts_flush_finished;
+
+static gboolean first_render;
+
+void handle_event_property_notify(XEvent *e)
+{
+    gboolean debug = FALSE;
+
+    Window win = e->xproperty.window;
+    Atom at = e->xproperty.atom;
+
+    if (xsettings_client)
+        xsettings_client_process_event(xsettings_client, e);
+    for (int i = 0; i < num_panels; i++) {
+        Panel *p = &panels[i];
+        if (win == p->main_win) {
+            if (at == server.atom._NET_WM_DESKTOP && get_window_desktop(p->main_win) != ALL_DESKTOPS)
+                replace_panel_all_desktops(p);
+            return;
+        }
+    }
+    if (win == server.root_win) {
+        if (!server.got_root_win) {
+            XSelectInput(server.display, server.root_win, PropertyChangeMask | StructureNotifyMask);
+            server.got_root_win = TRUE;
+        }
+
+        // Change name of desktops
+        else if (at == server.atom._NET_DESKTOP_NAMES) {
+            if (debug)
+                fprintf(stderr, "tint2: %s %d: win = root, atom = _NET_DESKTOP_NAMES\n", __FUNCTION__, __LINE__);
+            update_desktop_names();
+        }
+        // Change desktops
+        else if (at == server.atom._NET_NUMBER_OF_DESKTOPS || at == server.atom._NET_DESKTOP_GEOMETRY ||
+                 at == server.atom._NET_DESKTOP_VIEWPORT || at == server.atom._NET_WORKAREA ||
+                 at == server.atom._NET_CURRENT_DESKTOP) {
+            if (debug)
+                fprintf(stderr, "tint2: %s %d: win = root, atom = ?? desktops changed\n", __FUNCTION__, __LINE__);
+            if (!taskbar_enabled)
+                return;
+            int old_num_desktops = server.num_desktops;
+            int old_desktop = server.desktop;
+            server_get_number_of_desktops();
+            server.desktop = get_current_desktop();
+            if (old_num_desktops != server.num_desktops) { // If number of desktop changed
+                if (server.num_desktops <= server.desktop) {
+                    server.desktop = server.num_desktops - 1;
+                }
+                cleanup_taskbar();
+                init_taskbar();
+                for (int i = 0; i < num_panels; i++) {
+                    init_taskbar_panel(&panels[i]);
+                    set_panel_items_order(&panels[i]);
+                    panels[i].area.resize_needed = 1;
+                }
+                taskbar_refresh_tasklist();
+                reset_active_task();
+                update_all_taskbars_visibility();
+                if (old_desktop != server.desktop)
+                    tooltip_trigger_hide();
+                schedule_panel_redraw();
+            } else if (old_desktop != server.desktop) {
+                tooltip_trigger_hide();
+                for (int i = 0; i < num_panels; i++) {
+                    Panel *panel = &panels[i];
+                    set_taskbar_state(&panel->taskbar[old_desktop], TASKBAR_NORMAL);
+                    set_taskbar_state(&panel->taskbar[server.desktop], TASKBAR_ACTIVE);
+                    // check ALL_DESKTOPS task => resize taskbar
+                    Taskbar *taskbar;
+                    if (server.num_desktops > old_desktop) {
+                        taskbar = &panel->taskbar[old_desktop];
+                        GList *l = taskbar->area.children;
+                        if (taskbarname_enabled)
+                            l = l->next;
+                        for (; l; l = l->next) {
+                            Task *task = l->data;
+                            if (task->desktop == ALL_DESKTOPS) {
+                                task->area.on_screen = always_show_all_desktop_tasks;
+                                taskbar->area.resize_needed = 1;
+                                schedule_panel_redraw();
+                                if (taskbar_mode == MULTI_DESKTOP)
+                                    panel->area.resize_needed = 1;
+                            }
+                        }
+                    }
+                    taskbar = &panel->taskbar[server.desktop];
+                    GList *l = taskbar->area.children;
+                    if (taskbarname_enabled)
+                        l = l->next;
+                    for (; l; l = l->next) {
+                        Task *task = l->data;
+                        if (task->desktop == ALL_DESKTOPS) {
+                            task->area.on_screen = TRUE;
+                            taskbar->area.resize_needed = 1;
+                            if (taskbar_mode == MULTI_DESKTOP)
+                                panel->area.resize_needed = 1;
+                        }
+                    }
+
+                    if (server.viewports) {
+                        GList *need_update = NULL;
+
+                        GHashTableIter iter;
+                        gpointer key, value;
+
+                        g_hash_table_iter_init(&iter, win_to_task);
+                        while (g_hash_table_iter_next(&iter, &key, &value)) {
+                            Window task_win = *(Window *)key;
+                            Task *task = get_task(task_win);
+                            if (task) {
+                                int desktop = get_window_desktop(task_win);
+                                if (desktop != task->desktop) {
+                                    need_update = g_list_append(need_update, task);
+                                }
+                            }
+                        }
+                        for (l = need_update; l; l = l->next) {
+                            Task *task = l->data;
+                            task_update_desktop(task);
+                        }
+                    }
+                }
+            }
+        }
+        // Window list
+        else if (at == server.atom._NET_CLIENT_LIST) {
+            if (debug)
+                fprintf(stderr, "tint2: %s %d: win = root, atom = _NET_CLIENT_LIST\n", __FUNCTION__, __LINE__);
+            taskbar_refresh_tasklist();
+            update_all_taskbars_visibility();
+            schedule_panel_redraw();
+        }
+        // Change active
+        else if (at == server.atom._NET_ACTIVE_WINDOW) {
+            if (debug)
+                fprintf(stderr, "tint2: %s %d: win = root, atom = _NET_ACTIVE_WINDOW\n", __FUNCTION__, __LINE__);
+            reset_active_task();
+            schedule_panel_redraw();
+        } else if (at == server.atom._XROOTPMAP_ID || at == server.atom._XROOTMAP_ID) {
+            if (debug)
+                fprintf(stderr, "tint2: %s %d: win = root, atom = _XROOTPMAP_ID\n", __FUNCTION__, __LINE__);
+            // change Wallpaper
+            for (int i = 0; i < num_panels; i++) {
+                set_panel_background(&panels[i]);
+            }
+            schedule_panel_redraw();
+        }
+    } else {
+        TrayWindow *traywin = systray_find_icon(win);
+        if (traywin) {
+            systray_property_notify(traywin, e);
+            return;
+        }
+
+        Task *task = get_task(win);
+        if (debug) {
+            char *atom_name = XGetAtomName(server.display, at);
+            fprintf(stderr,
+                    "%s %d: win = %ld, task = %s, atom = %s\n",
+                    __FUNCTION__,
+                    __LINE__,
+                    win,
+                    task ? (task->title ? task->title : "??") : "null",
+                    atom_name);
+            XFree(atom_name);
+        }
+        if (!task) {
+            if (debug)
+                fprintf(stderr, "tint2: %s %d\n", __FUNCTION__, __LINE__);
+            if (at == server.atom._NET_WM_STATE) {
+                // xfce4 sends _NET_WM_STATE after minimized to tray, so we need to check if window is mapped
+                // if it is mapped and not set as skip_taskbar, we must add it to our task list
+                XWindowAttributes wa;
+                XGetWindowAttributes(server.display, win, &wa);
+                if (wa.map_state == IsViewable && !window_is_skip_taskbar(win)) {
+                    if ((task = add_task(win)))
+                        schedule_panel_redraw();
+                }
+            }
+            return;
+        }
+        // fprintf(stderr, "tint2: atom root_win = %s, %s\n", XGetAtomName(server.display, at), task->title);
+
+        // Window title changed
+        if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
+            if (task_update_title(task)) {
+                if (g_tooltip.mapped && (g_tooltip.area == (Area *)task)) {
+                    tooltip_copy_text((Area *)task);
+                    tooltip_update();
+                }
+                if (taskbar_sort_method == TASKBAR_SORT_TITLE)
+                    sort_taskbar_for_win(win);
+                schedule_panel_redraw();
+            }
+        }
+        // Demand attention
+        else if (at == server.atom._NET_WM_STATE) {
+            if (debug) {
+                int count;
+                Atom *atom_state = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+                for (int j = 0; j < count; j++) {
+                    char *atom_state_name = XGetAtomName(server.display, atom_state[j]);
+                    fprintf(stderr, "tint2: %s %d: _NET_WM_STATE = %s\n", __FUNCTION__, __LINE__, atom_state_name);
+                    XFree(atom_state_name);
+                }
+                XFree(atom_state);
+            }
+            if (window_is_urgent(win)) {
+                add_urgent(task);
+            }
+            if (window_is_skip_taskbar(win)) {
+                remove_task(task);
+                schedule_panel_redraw();
+            }
+        } else if (at == server.atom.WM_STATE) {
+            // Iconic state
+            TaskState state = (active_task && task->win == active_task->win ? TASK_ACTIVE : TASK_NORMAL);
+            if (window_is_iconified(win))
+                state = TASK_ICONIFIED;
+            set_task_state(task, state);
+            schedule_panel_redraw();
+        }
+        // Window icon changed
+        else if (at == server.atom._NET_WM_ICON) {
+            task_update_icon(task);
+            schedule_panel_redraw();
+        }
+        // Window desktop changed
+        else if (at == server.atom._NET_WM_DESKTOP) {
+            int desktop = get_window_desktop(win);
+            // fprintf(stderr, "tint2:   Window desktop changed %d, %d\n", task->desktop, desktop);
+            // bug in windowmaker : send unecessary 'desktop changed' when focus changed
+            if (desktop != task->desktop) {
+                task_update_desktop(task);
+            }
+        } else if (at == server.atom.WM_HINTS) {
+            XWMHints *wmhints = XGetWMHints(server.display, win);
+            if (wmhints && wmhints->flags & XUrgencyHint) {
+                add_urgent(task);
+            }
+            XFree(wmhints);
+            task_update_icon(task);
+            schedule_panel_redraw();
+        }
+
+        if (!server.got_root_win)
+            server.root_win = RootWindow(server.display, server.screen);
+    }
+}
+
+void handle_event_expose(XEvent *e)
+{
+    Panel *panel;
+    panel = get_panel(e->xany.window);
+    if (!panel)
+        return;
+    // TODO : one panel_refresh per panel ?
+    schedule_panel_redraw();
+}
+
+void handle_event_configure_notify(XEvent *e)
+{
+    Window win = e->xconfigure.window;
+
+    // change in root window (xrandr)
+    if (win == server.root_win) {
+        emit_self_restart("configuration change in the root window");
+        return;
+    }
+
+    TrayWindow *traywin = systray_find_icon(win);
+    if (traywin) {
+        systray_reconfigure_event(traywin, e);
+        return;
+    }
+
+    // 'win' move in another monitor
+    if (num_panels > 1 || hide_task_diff_monitor) {
+        Task *task = get_task(win);
+        if (task) {
+            Panel *p = task->area.panel;
+            int monitor = get_window_monitor(win);
+            if ((hide_task_diff_monitor && p->monitor != monitor && task->area.on_screen) ||
+                (hide_task_diff_monitor && p->monitor == monitor && !task->area.on_screen) ||
+                (p->monitor != monitor && num_panels > 1)) {
+                remove_task(task);
+                task = add_task(win);
+                if (win == get_active_window()) {
+                    set_task_state(task, TASK_ACTIVE);
+                    active_task = task;
+                }
+                schedule_panel_redraw();
+            }
+        }
+    }
+
+    if (server.viewports) {
+        Task *task = get_task(win);
+        if (task) {
+            int desktop = get_window_desktop(win);
+            if (task->desktop != desktop) {
+                task_update_desktop(task);
+            }
+        }
+    }
+
+    sort_taskbar_for_win(win);
+}
+
+gboolean handle_x_event_autohide(XEvent *e)
+{
+    Panel *panel = get_panel(e->xany.window);
+    if (panel && panel_autohide) {
+        if (e->type == EnterNotify)
+            autohide_trigger_show(panel);
+        else if (e->type == LeaveNotify)
+            autohide_trigger_hide(panel);
+        if (panel->is_hidden) {
+            if (e->type == ClientMessage && e->xclient.message_type == server.atom.XdndPosition) {
+                hidden_panel_shown_for_dnd = TRUE;
+                autohide_show(panel);
+            } else {
+                // discard further processing of this event because the panel is not visible yet
+                return TRUE;
+            }
+        } else if (hidden_panel_shown_for_dnd && e->type == ClientMessage &&
+                   e->xclient.message_type == server.atom.XdndLeave) {
+            hidden_panel_shown_for_dnd = FALSE;
+            autohide_hide(panel);
+        }
+    }
+    return FALSE;
+}
+
+void handle_x_event(XEvent *e)
+{
+#if HAVE_SN
+    if (startup_notifications)
+        sn_display_process_event(server.sn_display, e);
+#endif // HAVE_SN
+
+    if (handle_x_event_autohide(e))
+        return;
+
+    Panel *panel = get_panel(e->xany.window);
+    switch (e->type) {
+    case ButtonPress: {
+        tooltip_hide(0);
+        handle_mouse_press_event(e);
+        Area *area = find_area_under_mouse(panel, e->xbutton.x, e->xbutton.y);
+        if (panel_config.mouse_effects)
+            mouse_over(area, TRUE);
+        break;
+    }
+
+    case ButtonRelease: {
+        handle_mouse_release_event(e);
+        Area *area = find_area_under_mouse(panel, e->xbutton.x, e->xbutton.y);
+        if (panel_config.mouse_effects)
+            mouse_over(area, FALSE);
+        break;
+    }
+
+    case MotionNotify: {
+        unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
+        if (e->xmotion.state & button_mask)
+            handle_mouse_move_event(e);
+
+        Area *area = find_area_under_mouse(panel, e->xmotion.x, e->xmotion.y);
+        if (area->_get_tooltip_text)
+            tooltip_trigger_show(area, panel, e);
+        else
+            tooltip_trigger_hide();
+        if (panel_config.mouse_effects)
+            mouse_over(area, e->xmotion.state & button_mask);
+        break;
+    }
+
+    case LeaveNotify: {
+        tooltip_trigger_hide();
+        if (panel_config.mouse_effects)
+            mouse_out();
+        break;
+    }
+
+    case Expose:
+        handle_event_expose(e);
+        break;
+
+    case PropertyNotify:
+        handle_event_property_notify(e);
+        break;
+
+    case ConfigureNotify:
+        handle_event_configure_notify(e);
+        break;
+
+    case ConfigureRequest: {
+        TrayWindow *traywin = systray_find_icon(e->xany.window);
+        if (traywin)
+            systray_reconfigure_event(traywin, e);
+        break;
+    }
+
+    case ResizeRequest: {
+        TrayWindow *traywin = systray_find_icon(e->xany.window);
+        if (traywin)
+            systray_resize_request_event(traywin, e);
+        break;
+    }
+
+    case ReparentNotify: {
+        if (!systray_enabled)
+            break;
+        Panel *systray_panel = (Panel *)systray.area.panel;
+        if (e->xany.window == systray_panel->main_win) // don't care
+            break;
+        TrayWindow *traywin = systray_find_icon(e->xreparent.window);
+        if (traywin) {
+            if (traywin->win == e->xreparent.window) {
+                if (traywin->parent == e->xreparent.parent) {
+                    embed_icon(traywin);
+                } else {
+                    remove_icon(traywin);
+                }
+                break;
+            }
+        }
+        break;
+    }
+
+    case UnmapNotify:
+        break;
+
+    case DestroyNotify:
+        if (e->xany.window == server.composite_manager) {
+            // Stop real_transparency
+            emit_self_restart("compositor shutdown");
+            break;
+        }
+        if (e->xany.window == g_tooltip.window || !systray_enabled)
+            break;
+        for (GSList *it = systray.list_icons; it; it = g_slist_next(it)) {
+            if (((TrayWindow *)it->data)->win == e->xany.window) {
+                systray_destroy_event((TrayWindow *)it->data);
+                break;
+            }
+        }
+        break;
+
+    case ClientMessage: {
+        XClientMessageEvent *ev = &e->xclient;
+        if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
+            if (ev->data.l[2] == None) {
+                // Stop real_transparency
+                emit_self_restart("compositor changed");
+            } else {
+                // Start real_transparency
+                emit_self_restart("compositor changed");
+            }
+        }
+        if (systray_enabled && e->xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE &&
+            e->xclient.format == 32 && e->xclient.window == net_sel_win) {
+            handle_systray_event(&e->xclient);
+        } else if (e->xclient.message_type == server.atom.XdndEnter) {
+            handle_dnd_enter(&e->xclient);
+        } else if (e->xclient.message_type == server.atom.XdndPosition) {
+            handle_dnd_position(&e->xclient);
+        } else if (e->xclient.message_type == server.atom.XdndDrop) {
+            handle_dnd_drop(&e->xclient);
+        }
+        break;
+    }
+
+    case SelectionNotify: {
+        handle_dnd_selection_notify(&e->xselection);
+        break;
+    }
+
+    default:
+        if (e->type == server.xdamage_event_type) {
+            XDamageNotifyEvent *de = (XDamageNotifyEvent *)e;
+            TrayWindow *traywin = systray_find_icon(de->drawable);
+            if (traywin)
+                systray_render_icon(traywin);
+        }
+    }
+}
+
+void handle_x_events()
+{
+    if (XPending(server.display) > 0) {
+        XEvent e;
+        XNextEvent(server.display, &e);
+        if (debug_fps)
+            ts_event_read = get_time();
+
+        handle_x_event(&e);
+    }
+}
+
+void prepare_fd_set(fd_set *set, int *max_fd)
+{
+    FD_ZERO(set);
+    FD_SET(server.x11_fd, set);
+    *max_fd = server.x11_fd;
+    if (sigchild_pipe_valid) {
+        FD_SET(sigchild_pipe[0], set);
+        *max_fd = MAX(*max_fd, sigchild_pipe[0]);
+    }
+    for (GList *l = panel_config.execp_list; l; l = l->next) {
+        Execp *execp = (Execp *)l->data;
+        int fd = execp->backend->child_pipe_stdout;
+        if (fd > 0) {
+            FD_SET(fd, set);
+            *max_fd = MAX(*max_fd, fd);
+        }
+        fd = execp->backend->child_pipe_stderr;
+        if (fd > 0) {
+            FD_SET(fd, set);
+            *max_fd = MAX(*max_fd, fd);
+        }
+    }
+    if (uevent_fd > 0) {
+        FD_SET(uevent_fd, set);
+        *max_fd = MAX(*max_fd, uevent_fd);
+    }
+}
+
+void handle_panel_refresh()
+{
+    if (debug_fps)
+        ts_event_processed = get_time();
+    panel_refresh = FALSE;
+
+    for (int i = 0; i < num_panels; i++) {
+        Panel *panel = &panels[i];
+        if (!first_render)
+            shrink_panel(panel);
+
+        if (!panel->is_hidden || panel->area.resize_needed) {
+            if (panel->temp_pmap)
+                XFreePixmap(server.display, panel->temp_pmap);
+            panel->temp_pmap = XCreatePixmap(server.display,
+                                             server.root_win,
+                                             panel->area.width,
+                                             panel->area.height,
+                                             server.depth);
+            render_panel(panel);
+        }
+
+        if (panel->is_hidden) {
+            if (!panel->hidden_pixmap) {
+                panel->hidden_pixmap = XCreatePixmap(server.display,
+                                                     server.root_win,
+                                                     panel->hidden_width,
+                                                     panel->hidden_height,
+                                                     server.depth);
+                int xoff = 0, yoff = 0;
+                if (panel_horizontal && panel_position & BOTTOM)
+                    yoff = panel->area.height - panel->hidden_height;
+                else if (!panel_horizontal && panel_position & RIGHT)
+                    xoff = panel->area.width - panel->hidden_width;
+                XCopyArea(server.display,
+                          panel->area.pix,
+                          panel->hidden_pixmap,
+                          server.gc,
+                          xoff,
+                          yoff,
+                          panel->hidden_width,
+                          panel->hidden_height,
+                          0,
+                          0);
+            }
+            XCopyArea(server.display,
+                      panel->hidden_pixmap,
+                      panel->main_win,
+                      server.gc,
+                      0,
+                      0,
+                      panel->hidden_width,
+                      panel->hidden_height,
+                      0,
+                      0);
+            XSetWindowBackgroundPixmap(server.display, panel->main_win, panel->hidden_pixmap);
+        } else {
+            XCopyArea(server.display,
+                      panel->temp_pmap,
+                      panel->main_win,
+                      server.gc,
+                      0,
+                      0,
+                      panel->area.width,
+                      panel->area.height,
+                      0,
+                      0);
+            if (panel == (Panel *)systray.area.panel) {
+                if (refresh_systray && panel && !panel->is_hidden) {
+                    refresh_systray = FALSE;
+                    XSetWindowBackgroundPixmap(server.display, panel->main_win, panel->temp_pmap);
+                    refresh_systray_icons();
+                }
+            }
+        }
+    }
+    if (first_render) {
+        first_render = FALSE;
+        if (panel_shrink)
+            schedule_panel_redraw();
+    }
+
+    if (debug_fps)
+        ts_render_finished = get_time();
+    XFlush(server.display);
+
+    if (debug_fps && ts_event_read > 0) {
+        ts_flush_finished = get_time();
+        double period = ts_flush_finished - ts_event_read;
+        double fps = 1.0 / period;
+        sample_fps(fps);
+        double proc_ratio = (ts_event_processed - ts_event_read) / period;
+        double render_ratio = (ts_render_finished - ts_event_processed) / period;
+        double flush_ratio = (ts_flush_finished - ts_render_finished) / period;
+        double fps_low, fps_median, fps_high, fps_samples;
+        fps_compute_stats(&fps_low, &fps_median, &fps_high, &fps_samples);
+        fprintf(stderr,
+                BLUE "frame %d: fps = %.0f (low %.0f, med %.0f, high %.0f, samples %.0f) : processing %.0f%%, "
+                     "rendering %.0f%%, "
+                     "flushing %.0f%%" RESET "\n",
+                frame,
+                fps,
+                fps_low,
+                fps_median,
+                fps_high,
+                fps_samples,
+                proc_ratio * 100,
+                render_ratio * 100,
+                flush_ratio * 100);
+#ifdef HAVE_TRACING
+        stop_tracing();
+        if (fps <= tracing_fps_threshold) {
+            print_tracing_events();
+        }
+#endif
+    }
+    if (debug_frames) {
+        for (int i = 0; i < num_panels; i++) {
+            char path[256];
+            sprintf(path, "tint2-%d-panel-%d-frame-%d.png", getpid(), i, frame);
+            save_panel_screenshot(&panels[i], path);
+        }
+    }
+    frame++;
+}
+
+void run_tint2_event_loop()
+{
+    ts_event_read = 0;
+    ts_event_processed = 0;
+    ts_render_finished = 0;
+    ts_flush_finished = 0;
+    first_render = TRUE;
+
+    while (!get_signal_pending()) {
+        if (panel_refresh)
+            handle_panel_refresh();
+
+        fd_set fds;
+        int max_fd;
+        prepare_fd_set(&fds, &max_fd);
+
+        // Wait for an event and handle it
+        ts_event_read = 0;
+        if (XPending(server.display) > 0 || select(max_fd + 1, &fds, 0, 0, get_next_timeout()) >= 0) {
+#ifdef HAVE_TRACING
+            start_tracing((void*)run_tint2_event_loop);
+#endif
+            uevent_handler();
+            handle_sigchld_events();
+            handle_execp_events();
+            handle_x_events();
+        }
+
+        handle_expired_timers();
+    }
+}
+
+void tint2(int argc, char **argv, gboolean *restart)
+{
+    init(argc, argv);
+
+    if (snapshot_path) {
+        save_screenshot(snapshot_path);
+        cleanup();
+        return;
+    }
+
+    dnd_init();
+    uevent_init();
+    run_tint2_event_loop();
+
+    if (get_signal_pending()) {
+        cleanup();
+        if (get_signal_pending() == SIGUSR1) {
+            fprintf(stderr, YELLOW "tint2: %s %d: restarting tint2..." RESET "\n", __FILE__, __LINE__);
+            *restart = TRUE;
+            return;
+        } else if (get_signal_pending() == SIGUSR2) {
+            fprintf(stderr, YELLOW "tint2: %s %d: reexecuting tint2..." RESET "\n", __FILE__, __LINE__);
+            if (execvp(argv[0], argv) == -1) {
+                fprintf(stderr, RED "tint2: %s %d: failed!" RESET "\n", __FILE__, __LINE__);
+                return;
+            }
+        } else {
+            // SIGINT, SIGTERM, SIGHUP etc.
+            return;
+        }
+    }
+}
+
+int main(int argc, char **argv)
+{
+    gboolean restart;
+    do {
+        restart = FALSE;
+        tint2(argc, argv, &restart);
+    } while(restart);
+    return 0;
+}

src/mouse_actions.c

@@ -0,0 +1,287 @@
+/**************************************************************************
+* Copyright (C) 2017 tint2 authors
+*
+* 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.
+*
+* 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.
+**************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "drag_and_drop.h"
+#include "panel.h"
+#include "server.h"
+#include "task.h"
+#include "window.h"
+
+gboolean tint2_handles_click(Panel *panel, XButtonEvent *e)
+{
+    Task *task = click_task(panel, e->x, e->y);
+    if (task) {
+        if ((e->button == 1 && mouse_left != 0) || (e->button == 2 && mouse_middle != 0) ||
+            (e->button == 3 && mouse_right != 0) || (e->button == 4 && mouse_scroll_up != 0) ||
+            (e->button == 5 && mouse_scroll_down != 0)) {
+            return TRUE;
+        } else
+            return FALSE;
+    }
+    LauncherIcon *icon = click_launcher_icon(panel, e->x, e->y);
+    if (icon) {
+        if (e->button == 1) {
+            return TRUE;
+        } else {
+            return FALSE;
+        }
+    }
+    // no launcher/task clicked --> check if taskbar clicked
+    Taskbar *taskbar = click_taskbar(panel, e->x, e->y);
+    if (taskbar && e->button == 1 && taskbar_mode == MULTI_DESKTOP)
+        return TRUE;
+    if (click_clock(panel, e->x, e->y)) {
+        if ((e->button == 1 && clock_lclick_command) || (e->button == 2 && clock_mclick_command) ||
+            (e->button == 3 && clock_rclick_command) || (e->button == 4 && clock_uwheel_command) ||
+            (e->button == 5 && clock_dwheel_command))
+            return TRUE;
+        else
+            return FALSE;
+    }
+#ifdef ENABLE_BATTERY
+    if (click_battery(panel, e->x, e->y)) {
+        if ((e->button == 1 && battery_lclick_command) || (e->button == 2 && battery_mclick_command) ||
+            (e->button == 3 && battery_rclick_command) || (e->button == 4 && battery_uwheel_command) ||
+            (e->button == 5 && battery_dwheel_command))
+            return TRUE;
+        else
+            return FALSE;
+    }
+#endif
+    if (click_execp(panel, e->x, e->y))
+        return TRUE;
+    if (click_button(panel, e->x, e->y))
+        return TRUE;
+    return FALSE;
+}
+
+void handle_mouse_press_event(XEvent *e)
+{
+    Panel *panel = get_panel(e->xany.window);
+    if (!panel)
+        return;
+
+    if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) {
+        forward_click(e);
+        return;
+    }
+    task_drag = click_task(panel, e->xbutton.x, e->xbutton.y);
+
+    if (panel_layer == BOTTOM_LAYER)
+        XLowerWindow(server.display, panel->main_win);
+}
+
+void handle_mouse_move_event(XEvent *e)
+{
+    Panel *panel = get_panel(e->xany.window);
+    if (!panel || !task_drag)
+        return;
+
+    // Find the taskbar on the event's location
+    Taskbar *event_taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y);
+    if (event_taskbar == NULL)
+        return;
+
+    // Find the task on the event's location
+    Task *event_task = click_task(panel, e->xbutton.x, e->xbutton.y);
+
+    // If the event takes place on the same taskbar as the task being dragged
+    if (&event_taskbar->area == task_drag->area.parent) {
+        if (taskbar_sort_method != TASKBAR_NOSORT) {
+            sort_tasks(event_taskbar);
+        } else {
+            // Swap the task_drag with the task on the event's location (if they differ)
+            if (event_task && event_task != task_drag) {
+                GList *drag_iter = g_list_find(event_taskbar->area.children, task_drag);
+                GList *task_iter = g_list_find(event_taskbar->area.children, event_task);
+                if (drag_iter && task_iter) {
+                    gpointer temp = task_iter->data;
+                    task_iter->data = drag_iter->data;
+                    drag_iter->data = temp;
+                    event_taskbar->area.resize_needed = 1;
+                    schedule_panel_redraw();
+                    task_dragged = 1;
+                }
+            }
+        }
+    } else { // The event is on another taskbar than the task being dragged
+        if (task_drag->desktop == ALL_DESKTOPS || taskbar_mode != MULTI_DESKTOP)
+            return;
+
+        Taskbar *drag_taskbar = (Taskbar *)task_drag->area.parent;
+        remove_area((Area *)task_drag);
+
+        if (event_taskbar->area.posx > drag_taskbar->area.posx || event_taskbar->area.posy > drag_taskbar->area.posy) {
+            int i = (taskbarname_enabled) ? 1 : 0;
+            event_taskbar->area.children = g_list_insert(event_taskbar->area.children, task_drag, i);
+        } else
+            event_taskbar->area.children = g_list_append(event_taskbar->area.children, task_drag);
+
+        // Move task to other desktop (but avoid the 'Window desktop changed' code in 'event_property_notify')
+        task_drag->area.parent = &event_taskbar->area;
+        task_drag->desktop = event_taskbar->desktop;
+
+        change_window_desktop(task_drag->win, event_taskbar->desktop);
+        if (hide_task_diff_desktop)
+            change_desktop(event_taskbar->desktop);
+
+        if (taskbar_sort_method != TASKBAR_NOSORT) {
+            sort_tasks(event_taskbar);
+        }
+
+        event_taskbar->area.resize_needed = 1;
+        drag_taskbar->area.resize_needed = 1;
+        task_dragged = 1;
+        schedule_panel_redraw();
+        panel->area.resize_needed = 1;
+    }
+}
+
+void handle_mouse_release_event(XEvent *e)
+{
+    Panel *panel = get_panel(e->xany.window);
+    if (!panel)
+        return;
+
+    if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) {
+        forward_click(e);
+        if (panel_layer == BOTTOM_LAYER)
+            XLowerWindow(server.display, panel->main_win);
+        task_drag = 0;
+        return;
+    }
+
+    MouseAction action = TOGGLE_ICONIFY;
+    switch (e->xbutton.button) {
+    case 1:
+        action = mouse_left;
+        break;
+    case 2:
+        action = mouse_middle;
+        break;
+    case 3:
+        action = mouse_right;
+        break;
+    case 4:
+        action = mouse_scroll_up;
+        break;
+    case 5:
+        action = mouse_scroll_down;
+        break;
+    case 6:
+        action = mouse_tilt_left;
+        break;
+    case 7:
+        action = mouse_tilt_right;
+        break;
+    }
+
+    Clock *clock = click_clock(panel, e->xbutton.x, e->xbutton.y);
+    if (clock) {
+        clock_action(clock, e->xbutton.button, e->xbutton.x - clock->area.posx, e->xbutton.y - clock->area.posy, e->xbutton.time);
+        if (panel_layer == BOTTOM_LAYER)
+            XLowerWindow(server.display, panel->main_win);
+        task_drag = 0;
+        return;
+    }
+
+#ifdef ENABLE_BATTERY
+    Battery *battery = click_battery(panel, e->xbutton.x, e->xbutton.y);
+    if (battery) {
+        battery_action(battery, e->xbutton.button, e->xbutton.x - battery->area.posx, e->xbutton.y - battery->area.posy, e->xbutton.time);
+        if (panel_layer == BOTTOM_LAYER)
+            XLowerWindow(server.display, panel->main_win);
+        task_drag = 0;
+        return;
+    }
+#endif
+
+    Execp *execp = click_execp(panel, e->xbutton.x, e->xbutton.y);
+    if (execp) {
+        execp_action(execp, e->xbutton.button, e->xbutton.x - execp->area.posx, e->xbutton.y - execp->area.posy, e->xbutton.time);
+        if (panel_layer == BOTTOM_LAYER)
+            XLowerWindow(server.display, panel->main_win);
+        task_drag = 0;
+        return;
+    }
+
+    Button *button = click_button(panel, e->xbutton.x, e->xbutton.y);
+    if (button) {
+        button_action(button, e->xbutton.button, e->xbutton.x - button->area.posx, e->xbutton.y - button->area.posy, e->xbutton.time);
+        if (panel_layer == BOTTOM_LAYER)
+            XLowerWindow(server.display, panel->main_win);
+        task_drag = 0;
+        return;
+    }
+
+    if (e->xbutton.button == 1 && click_launcher(panel, e->xbutton.x, e->xbutton.y)) {
+        LauncherIcon *icon = click_launcher_icon(panel, e->xbutton.x, e->xbutton.y);
+        if (icon) {
+            launcher_action(icon, e, e->xbutton.x - icon->area.posx, e->xbutton.y - icon->area.posy);
+        }
+        task_drag = 0;
+        return;
+    }
+
+    Taskbar *taskbar;
+    if (!(taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y))) {
+        // TODO: check better solution to keep window below
+        if (panel_layer == BOTTOM_LAYER)
+            XLowerWindow(server.display, panel->main_win);
+        task_drag = 0;
+        return;
+    }
+
+    // drag and drop task
+    if (task_dragged) {
+        task_drag = 0;
+        task_dragged = 0;
+        return;
+    }
+
+    // switch desktop
+    if (taskbar_mode == MULTI_DESKTOP) {
+        gboolean diff_desktop = FALSE;
+        if (taskbar->desktop != server.desktop && action != CLOSE && action != DESKTOP_LEFT &&
+            action != DESKTOP_RIGHT) {
+            diff_desktop = TRUE;
+            change_desktop(taskbar->desktop);
+        }
+        Task *task = click_task(panel, e->xbutton.x, e->xbutton.y);
+        if (task) {
+            if (diff_desktop) {
+                if (action == TOGGLE_ICONIFY) {
+                    if (!window_is_active(task->win))
+                        activate_window(task->win);
+                } else {
+                    task_handle_mouse_event(task, action);
+                }
+            } else {
+                task_handle_mouse_event(task, action);
+            }
+        }
+    } else {
+        task_handle_mouse_event(click_task(panel, e->xbutton.x, e->xbutton.y), action);
+    }
+
+    // to keep window below
+    if (panel_layer == BOTTOM_LAYER)
+        XLowerWindow(server.display, panel->main_win);
+}

src/mouse_actions.h

@@ -0,0 +1,12 @@
+#ifndef MOUSE_ACTIONS_H
+#define MOUSE_ACTIONS_H
+
+#include "panel.h"
+
+gboolean tint2_handles_click(Panel *panel, XButtonEvent *e);
+
+void handle_mouse_press_event(XEvent *e);
+void handle_mouse_move_event(XEvent *e);
+void handle_mouse_release_event(XEvent *e);
+
+#endif

src/panel.c

@@ -20,6 +20,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
@@ -36,8 +38,6 @@
 
 void panel_clear_background(void *obj);
 
-int signal_pending;
-
 MouseAction mouse_left;
 MouseAction mouse_middle;
 MouseAction mouse_right;
@@ -55,11 +55,15 @@ gboolean panel_horizontal;
 gboolean panel_refresh;
 gboolean task_dragged;
 char *panel_window_name = NULL;
+gboolean debug_geometry;
+gboolean debug_gradients;
+gboolean startup_notifications;
 
 gboolean panel_autohide;
 int panel_autohide_show_timeout;
 int panel_autohide_hide_timeout;
 int panel_autohide_height;
+gboolean panel_shrink;
 Strut panel_strut_policy;
 char *panel_items_order;
 
@@ -72,6 +76,7 @@ Panel *panels;
 int num_panels;
 
 GArray *backgrounds;
+GArray *gradients;
 
 Imlib_Image default_icon;
 char *default_font = NULL;
@@ -89,6 +94,7 @@ void default_panel()
     panel_autohide_show_timeout = 0;
     panel_autohide_hide_timeout = 0;
     panel_autohide_height = 5; // for vertical panels this is of course the width
+    panel_shrink = FALSE;
     panel_strut_policy = STRUT_FOLLOW_SIZE;
     panel_dock = FALSE;         // default not in the dock
     panel_layer = BOTTOM_LAYER; // default is bottom layer
@@ -97,6 +103,7 @@ void default_panel()
     max_tick_urgent = 14;
     mouse_left = TOGGLE_ICONIFY;
     backgrounds = g_array_new(0, 0, sizeof(Background));
+    gradients = g_array_new(0, 0, sizeof(GradientClass));
 
     memset(&panel_config, 0, sizeof(Panel));
     snprintf(panel_config.area.name, sizeof(panel_config.area.name), "Panel");
@@ -112,6 +119,9 @@ void default_panel()
     Background transparent_bg;
     init_background(&transparent_bg);
     g_array_append_val(backgrounds, transparent_bg);
+    GradientClass transparent_gradient;
+    init_gradient(&transparent_gradient, GRADIENT_VERTICAL);
+    g_array_append_val(gradients, transparent_gradient);
 }
 
 void cleanup_panel()
@@ -135,17 +145,28 @@ void cleanup_panel()
             XDestroyWindow(server.display, p->main_win);
         p->main_win = 0;
         stop_timeout(p->autohide_timeout);
+        cleanup_freespace(p);
     }
 
+    free_icon_themes();
+
     free(panel_items_order);
     panel_items_order = NULL;
     free(panel_window_name);
     panel_window_name = NULL;
     free(panels);
     panels = NULL;
-	if (backgrounds)
-		g_array_free(backgrounds, 1);
+
+    free_area(&panel_config.area);
+
+    g_array_free(backgrounds, TRUE);
     backgrounds = NULL;
+    if (gradients) {
+        for (guint i = 0; i < gradients->len; i++)
+            cleanup_gradient(&g_array_index(gradients, GradientClass, i));
+        g_array_free(gradients, TRUE);
+    }
+    gradients = NULL;
     pango_font_description_free(panel_config.g_task.font_desc);
     panel_config.g_task.font_desc = NULL;
     pango_font_description_free(panel_config.taskbarname_font_desc);
@@ -156,11 +177,13 @@ void init_panel()
 {
     if (panel_config.monitor > (server.num_monitors - 1)) {
         // server.num_monitors minimum value is 1 (see get_monitors())
-		fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n");
+        fprintf(stderr, "tint2: warning : monitor not found. tint2 default to all monitors.\n");
         panel_config.monitor = 0;
     }
 
-	fprintf(stderr, "panel items: %s\n", panel_items_order);
+    fprintf(stderr, "tint2: panel items: %s\n", panel_items_order);
+
+    icon_theme_wrapper = NULL;
 
     init_tooltip();
     init_systray();
@@ -170,7 +193,9 @@ void init_panel()
     init_battery();
 #endif
     init_taskbar();
+    init_separator();
     init_execp();
+    init_button();
 
     // number of panels (one monitor or 'all' monitors)
     if (panel_config.monitor >= 0)
@@ -184,7 +209,7 @@ void init_panel()
     }
 
     fprintf(stderr,
-			"tint2 : nb monitor %d, nb monitor used %d, nb desktop %d\n",
+            "tint2: nb monitors %d, nb monitors used %d, nb desktops %d\n",
             server.num_monitors,
             num_panels,
             server.num_desktops);
@@ -203,7 +228,9 @@ void init_panel()
         p->area.size_mode = LAYOUT_DYNAMIC;
         p->area._resize = resize_panel;
         p->area._clear = panel_clear_background;
+        p->separator_list = NULL;
         init_panel_size_and_position(p);
+        instantiate_area_gradients(&p->area);
         // add children according to panel_items
         for (int k = 0; k < strlen(panel_items_order); k++) {
             if (panel_items_order[k] == 'L')
@@ -222,8 +249,12 @@ void init_panel()
                 init_clock_panel(p);
             if (panel_items_order[k] == 'F' && !strstr(panel_items_order, "T"))
                 init_freespace_panel(p);
+            if (panel_items_order[k] == ':')
+                init_separator_panel(p);
             if (panel_items_order[k] == 'E')
                 init_execp_panel(p);
+            if (panel_items_order[k] == 'P')
+                init_button_panel(p);
         }
         set_panel_items_order(p);
 
@@ -258,7 +289,7 @@ void init_panel()
             XGCValues gcv;
             server.gc = XCreateGC(server.display, p->main_win, 0, &gcv);
         }
-		// printf("panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height);
+        // fprintf(stderr, "tint2: panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height);
         set_panel_properties(p);
         set_panel_background(p);
         if (!snapshot_path) {
@@ -268,17 +299,15 @@ void init_panel()
 
         if (panel_autohide)
             autohide_trigger_hide(p);
-
-		update_taskbar_visibility(p);
     }
 
     taskbar_refresh_tasklist();
     reset_active_task();
+    update_all_taskbars_visibility();
 }
 
-void init_panel_size_and_position(Panel *panel)
+void panel_compute_size(Panel *panel)
 {
-	// detect panel size
     if (panel_horizontal) {
         if (panel->area.width == 0) {
             panel->fractional_width = TRUE;
@@ -293,7 +322,7 @@ void init_panel_size_and_position(Panel *panel)
         if (panel->fractional_height)
             panel->area.height = (server.monitors[panel->monitor].height - panel->marginy) * panel->area.height / 100;
         if (panel->area.bg->border.radius > panel->area.height / 2) {
-			printf("panel_background_id rounded is too big... please fix your tint2rc\n");
+            fprintf(stderr, "tint2: panel_background_id rounded is too big... please fix your tint2rc\n");
             g_array_append_val(backgrounds, *panel->area.bg);
             panel->area.bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
             panel->area.bg->border.radius = panel->area.height / 2;
@@ -319,7 +348,7 @@ void init_panel_size_and_position(Panel *panel)
             panel->area.width = old_panel_height;
 
         if (panel->area.bg->border.radius > panel->area.width / 2) {
-			printf("panel_background_id rounded is too big... please fix your tint2rc\n");
+            fprintf(stderr, "tint2: panel_background_id rounded is too big... please fix your tint2rc\n");
             g_array_append_val(backgrounds, *panel->area.bg);
             panel->area.bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
             panel->area.bg->border.radius = panel->area.width / 2;
@@ -331,6 +360,11 @@ void init_panel_size_and_position(Panel *panel)
     if (panel->area.height + panel->marginy > server.monitors[panel->monitor].height)
         panel->area.height = server.monitors[panel->monitor].height - panel->marginy;
 
+    panel->max_size = panel_horizontal ? panel->area.width : panel->area.height;
+}
+
+void panel_compute_position(Panel *panel)
+{
     // panel position determined here
     if (panel_position & LEFT) {
         panel->posx = server.monitors[panel->monitor].x + panel->marginx;
@@ -367,107 +401,138 @@ void init_panel_size_and_position(Panel *panel)
         panel->hidden_width = panel->area.width - diff;
         panel->hidden_height = panel->area.height;
     }
-	// printf("panel : posx %d, posy %d, width %d, height %d\n", panel->posx, panel->posy, panel->area.width,
+    // fprintf(stderr, "tint2: panel : posx %d, posy %d, width %d, height %d\n", panel->posx, panel->posy, panel->area.width,
     // panel->area.height);
 }
 
+void init_panel_size_and_position(Panel *panel)
+{
+    panel_compute_size(panel);
+    panel_compute_position(panel);
+}
+
 gboolean resize_panel(void *obj)
 {
     Panel *panel = (Panel *)obj;
     relayout_with_constraint(&panel->area, 0);
 
-	// printf("resize_panel\n");
+    // fprintf(stderr, "tint2: resize_panel\n");
     if (taskbar_mode != MULTI_DESKTOP && taskbar_enabled) {
         // propagate width/height on hidden taskbar
         int width = panel->taskbar[server.desktop].area.width;
         int height = panel->taskbar[server.desktop].area.height;
         for (int i = 0; i < panel->num_desktops; i++) {
+            panel->taskbar[i].area.resize_needed =
+                panel->taskbar[i].area.width != width || panel->taskbar[i].area.height != height;
             panel->taskbar[i].area.width = width;
             panel->taskbar[i].area.height = height;
-			panel->taskbar[i].area.resize_needed = 1;
         }
+    } else if (taskbar_mode == MULTI_DESKTOP && taskbar_enabled && taskbar_distribute_size) {
+        for (int i = 0; i < panel->num_desktops; i++) {
+            Taskbar *taskbar = &panel->taskbar[i];
+            taskbar->area.old_width = taskbar->area.width;
+            taskbar->area.old_height = taskbar->area.height;
         }
-	if (taskbar_mode == MULTI_DESKTOP && taskbar_enabled && taskbar_distribute_size) {
-		// Distribute the available space between taskbars
 
-		// Compute the total available size, and the total size requested by the taskbars
+        // The total available size
         int total_size = 0;
-		int total_name_size = 0;
-		int total_items = 0;
         for (int i = 0; i < panel->num_desktops; i++) {
-			if (panel_horizontal) {
-				total_size += panel->taskbar[i].area.width;
-			} else {
-				total_size += panel->taskbar[i].area.height;
+            Taskbar *taskbar = &panel->taskbar[i];
+            if (!taskbar->area.on_screen)
+                continue;
+            total_size += panel_horizontal ? taskbar->area.width : taskbar->area.height;
         }
 
+        // Reserve size for padding, taskbarname and spacings
+        for (int i = 0; i < panel->num_desktops; i++) {
             Taskbar *taskbar = &panel->taskbar[i];
-			GList *l;
-			for (l = taskbar->area.children; l; l = l->next) {
-				Area *child = (Area *)l->data;
-				if (!child->on_screen)
+            if (!taskbar->area.on_screen)
                 continue;
-				total_items++;
-			}
-			if (taskbarname_enabled) {
-				if (taskbar->area.children) {
-					total_items--;
+            if (panel_horizontal)
+                taskbar->area.width = 2 * taskbar->area.paddingxlr;
+            else
+                taskbar->area.height = 2 * taskbar->area.paddingxlr;
+            if (taskbarname_enabled && taskbar->area.children) {
                 Area *name = (Area *)taskbar->area.children->data;
-					if (panel_horizontal) {
-						total_name_size += name->width;
-					} else {
-						total_name_size += name->height;
+                if (name->on_screen) {
+                    if (panel_horizontal)
+                        taskbar->area.width += name->width;
+                    else
+                        taskbar->area.height += name->height;
                 }
             }
-			}
-		}
-		// Distribute the space proportionally to the requested size (that is, to the
-		// number of tasks in each taskbar)
-		if (total_items) {
-			int actual_name_size;
-			if (total_name_size <= total_size) {
-				actual_name_size = total_name_size / panel->num_desktops;
-			} else {
-				actual_name_size = total_size / panel->num_desktops;
-			}
-			total_size -= total_name_size;
-
-			for (int i = 0; i < panel->num_desktops; i++) {
-				Taskbar *taskbar = &panel->taskbar[i];
-
-				int requested_size = (2 * taskbar->area.bg->border.width) + (2 * taskbar->area.paddingxlr);
-				int items = 0;
-				GList *l = taskbar->area.children;
-				if (taskbarname_enabled)
-					l = l->next;
-				for (; l; l = l->next) {
+            gboolean first_child = TRUE;
+            for (GList *l = taskbar->area.children; l; l = l->next) {
                 Area *child = (Area *)l->data;
                 if (!child->on_screen)
                     continue;
-					items++;
-					if (panel_horizontal) {
-						requested_size += child->width + taskbar->area.paddingy;
-					} else {
-						requested_size += child->height + taskbar->area.paddingx;
+                if (!first_child) {
+                    if (panel_horizontal)
+                        taskbar->area.width += taskbar->area.paddingx;
+                    else
+                        taskbar->area.height += taskbar->area.paddingy;
                 }
+                first_child = FALSE;
             }
-				if (panel_horizontal) {
-					requested_size -= taskbar->area.paddingy;
-				} else {
-					requested_size -= taskbar->area.paddingx;
+            total_size -= panel_horizontal ? taskbar->area.width : taskbar->area.height;
         }
 
-				if (panel_horizontal) {
-					taskbar->area.width = actual_name_size + items / (float)total_items * total_size;
+        // Compute the total number of tasks
+        int num_tasks = 0;
+        for (int i = 0; i < panel->num_desktops; i++) {
+            Taskbar *taskbar = &panel->taskbar[i];
+            if (!taskbar->area.on_screen)
+                continue;
+            for (GList *l = taskbar->area.children; l; l = l->next) {
+                Area *child = (Area *)l->data;
+                if (!child->on_screen)
+                    continue;
+                if (taskbarname_enabled && l == taskbar->area.children)
+                    continue;
+                num_tasks++;
+            }
+        }
+
+        // Distribute the remaining size between tasks
+        if (num_tasks > 0) {
+            int task_size = total_size / num_tasks;
+            for (int i = 0; i < panel->num_desktops; i++) {
+                Taskbar *taskbar = &panel->taskbar[i];
+                if (!taskbar->area.on_screen)
+                    continue;
+                for (GList *l = taskbar->area.children; l; l = l->next) {
+                    Area *child = (Area *)l->data;
+                    if (!child->on_screen)
+                        continue;
+                    if (taskbarname_enabled && l == taskbar->area.children)
+                        continue;
+                    if (panel_horizontal)
+                        taskbar->area.width += task_size;
+                    else
+                        taskbar->area.height += task_size;
+                }
+            }
         } else {
-					taskbar->area.height = actual_name_size + items / (float)total_items * total_size;
-				}
-				taskbar->area.resize_needed = 1;
+            // No tasks => expand the first visible taskbar
+            for (int i = 0; i < panel->num_desktops; i++) {
+                Taskbar *taskbar = &panel->taskbar[i];
+                if (!taskbar->area.on_screen)
+                    continue;
+                if (panel_horizontal)
+                    taskbar->area.width += total_size;
+                else
+                    taskbar->area.height += total_size;
+                break;
             }
         }
+        for (int i = 0; i < panel->num_desktops; i++) {
+            Taskbar *taskbar = &panel->taskbar[i];
+            taskbar->area.resize_needed =
+                taskbar->area.old_width != taskbar->area.width || taskbar->area.old_height != taskbar->area.height;
         }
-	if (panel->freespace.area.on_screen)
-		resize_freespace(&panel->freespace);
+    }
+    for (GList *l = panel->freespace_list; l; l = g_list_next(l))
+        resize_freespace(l->data);
     return FALSE;
 }
 
@@ -488,7 +553,7 @@ void update_strut(Panel *p)
     long struts[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     if (panel_horizontal) {
         int height = p->area.height + p->marginy;
-		if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden))
+        if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && panel_autohide && p->is_hidden))
             height = p->hidden_height;
         if (panel_position & TOP) {
             struts[2] = height + monitor.y;
@@ -503,7 +568,7 @@ void update_strut(Panel *p)
         }
     } else {
         int width = p->area.width + p->marginx;
-		if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden))
+        if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && panel_autohide && p->is_hidden))
             width = p->hidden_width;
         if (panel_position & LEFT) {
             struts[0] = width + monitor.x;
@@ -544,6 +609,9 @@ void set_panel_items_order(Panel *p)
     }
 
     int i_execp = 0;
+    int i_separator = 0;
+    int i_freespace = 0;
+    int i_button = 0;
     for (int k = 0; k < strlen(panel_items_order); k++) {
         if (panel_items_order[k] == 'L') {
             p->area.children = g_list_append(p->area.children, &p->launcher);
@@ -563,14 +631,30 @@ void set_panel_items_order(Panel *p)
         }
         if (panel_items_order[k] == 'C')
             p->area.children = g_list_append(p->area.children, &p->clock);
-		if (panel_items_order[k] == 'F')
-			p->area.children = g_list_append(p->area.children, &p->freespace);
+        if (panel_items_order[k] == 'F') {
+            GList *item = g_list_nth(p->freespace_list, i_freespace);
+            i_freespace++;
+            if (item)
+                p->area.children = g_list_append(p->area.children, (Area *)item->data);
+        }
+        if (panel_items_order[k] == ':') {
+            GList *item = g_list_nth(p->separator_list, i_separator);
+            i_separator++;
+            if (item)
+                p->area.children = g_list_append(p->area.children, (Area *)item->data);
+        }
         if (panel_items_order[k] == 'E') {
             GList *item = g_list_nth(p->execp_list, i_execp);
             i_execp++;
             if (item)
                 p->area.children = g_list_append(p->area.children, (Area *)item->data);
         }
+        if (panel_items_order[k] == 'P') {
+            GList *item = g_list_nth(p->button_list, i_button);
+            i_button++;
+            if (item)
+                p->area.children = g_list_append(p->area.children, (Area *)item->data);
+        }
     }
     initialize_positions(&p->area, 0);
 }
@@ -586,13 +670,16 @@ void place_panel_all_desktops(Panel *p)
                     PropModeReplace,
                     (unsigned char *)&val,
                     1);
+}
 
+void set_panel_layer(Panel *p, Layer layer)
+{
     Atom state[4];
     state[0] = server.atom._NET_WM_STATE_SKIP_PAGER;
     state[1] = server.atom._NET_WM_STATE_SKIP_TASKBAR;
     state[2] = server.atom._NET_WM_STATE_STICKY;
-	state[3] = panel_layer == BOTTOM_LAYER ? server.atom._NET_WM_STATE_BELOW : server.atom._NET_WM_STATE_ABOVE;
-	int num_atoms = panel_layer == NORMAL_LAYER ? 3 : 4;
+    state[3] = layer == BOTTOM_LAYER ? server.atom._NET_WM_STATE_BELOW : server.atom._NET_WM_STATE_ABOVE;
+    int num_atoms = layer == NORMAL_LAYER ? 3 : 4;
     XChangeProperty(server.display,
                     p->main_win,
                     server.atom._NET_WM_STATE,
@@ -618,6 +705,90 @@ void replace_panel_all_desktops(Panel *p)
     XSync(server.display, False);
 }
 
+void set_panel_window_geometry(Panel *panel)
+{
+    update_strut(panel);
+
+    // Fixed position and non-resizable window
+    // Allow panel move and resize when tint2 reload config file
+    int minwidth = panel_autohide ? panel->hidden_width : panel->area.width;
+    int minheight = panel_autohide ? panel->hidden_height : panel->area.height;
+    XSizeHints size_hints;
+    size_hints.flags = PPosition | PMinSize | PMaxSize;
+    size_hints.min_width = minwidth;
+    size_hints.max_width = panel->area.width;
+    size_hints.min_height = minheight;
+    size_hints.max_height = panel->area.height;
+    XSetWMNormalHints(server.display, panel->main_win, &size_hints);
+
+    if (!panel->is_hidden) {
+        if (panel_horizontal) {
+            if (panel_position & TOP)
+                XMoveResizeWindow(server.display,
+                                  panel->main_win,
+                                  panel->posx,
+                                  panel->posy,
+                                  panel->area.width,
+                                  panel->area.height);
+            else
+                XMoveResizeWindow(server.display,
+                                  panel->main_win,
+                                  panel->posx,
+                                  panel->posy,
+                                  panel->area.width,
+                                  panel->area.height);
+        } else {
+            if (panel_position & LEFT)
+                XMoveResizeWindow(server.display,
+                                  panel->main_win,
+                                  panel->posx,
+                                  panel->posy,
+                                  panel->area.width,
+                                  panel->area.height);
+            else
+                XMoveResizeWindow(server.display,
+                                  panel->main_win,
+                                  panel->posx,
+                                  panel->posy,
+                                  panel->area.width,
+                                  panel->area.height);
+        }
+    } else {
+        int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height;
+        if (panel_horizontal) {
+            if (panel_position & TOP)
+                XMoveResizeWindow(server.display,
+                                  panel->main_win,
+                                  panel->posx,
+                                  panel->posy,
+                                  panel->hidden_width,
+                                  panel->hidden_height);
+            else
+                XMoveResizeWindow(server.display,
+                                  panel->main_win,
+                                  panel->posx,
+                                  panel->posy + diff,
+                                  panel->hidden_width,
+                                  panel->hidden_height);
+        } else {
+            if (panel_position & LEFT)
+                XMoveResizeWindow(server.display,
+                                  panel->main_win,
+                                  panel->posx,
+                                  panel->posy,
+                                  panel->hidden_width,
+                                  panel->hidden_height);
+            else
+                XMoveResizeWindow(server.display,
+                                  panel->main_win,
+                                  panel->posx + diff,
+                                  panel->posy,
+                                  panel->hidden_width,
+                                  panel->hidden_height);
+        }
+    }
+}
+
 void set_panel_properties(Panel *p)
 {
     XStoreName(server.display, p->main_win, panel_window_name);
@@ -645,18 +816,28 @@ void set_panel_properties(Panel *p)
         g_free(name);
     }
 
+    long pid = getpid();
+    XChangeProperty(server.display,
+                    p->main_win,
+                    server.atom._NET_WM_PID,
+                    XA_CARDINAL,
+                    32,
+                    PropModeReplace,
+                    (unsigned char *)&pid,
+                    1);
+
     // Dock
-	long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
     XChangeProperty(server.display,
                     p->main_win,
                     server.atom._NET_WM_WINDOW_TYPE,
                     XA_ATOM,
                     32,
                     PropModeReplace,
-					(unsigned char *)&val,
+                    (unsigned char *)&server.atom._NET_WM_WINDOW_TYPE_DOCK,
                     1);
 
     place_panel_all_desktops(p);
+    set_panel_layer(p, panel_layer);
 
     XWMHints wmhints;
     memset(&wmhints, 0, sizeof(wmhints));
@@ -694,26 +875,14 @@ void set_panel_properties(Panel *p)
                     (unsigned char *)&version,
                     1);
 
-	update_strut(p);
-
-	// Fixed position and non-resizable window
-	// Allow panel move and resize when tint2 reload config file
-	int minwidth = panel_autohide ? p->hidden_width : p->area.width;
-	int minheight = panel_autohide ? p->hidden_height : p->area.height;
-	XSizeHints size_hints;
-	size_hints.flags = PPosition | PMinSize | PMaxSize;
-	size_hints.min_width = minwidth;
-	size_hints.max_width = p->area.width;
-	size_hints.min_height = minheight;
-	size_hints.max_height = p->area.height;
-	XSetWMNormalHints(server.display, p->main_win, &size_hints);
-
     // Set WM_CLASS
     XClassHint *classhint = XAllocClassHint();
     classhint->res_name = (char *)"tint2";
     classhint->res_class = (char *)"Tint2";
     XSetClassHint(server.display, p->main_win, classhint);
     XFree(classhint);
+
+    set_panel_window_geometry(p);
 }
 
 void panel_clear_background(void *obj)
@@ -841,6 +1010,16 @@ Execp *click_execp(Panel *panel, int x, int y)
     return NULL;
 }
 
+Button *click_button(Panel *panel, int x, int y)
+{
+    for (GList *l = panel->button_list; l; l = l->next) {
+        Button *button = (Button *)l->data;
+        if (area_is_under_mouse(button, x, y))
+            return button;
+    }
+    return NULL;
+}
+
 void stop_autohide_timeout(Panel *p)
 {
     stop_timeout(p->autohide_timeout);
@@ -851,68 +1030,22 @@ void autohide_show(void *p)
     Panel *panel = (Panel *)p;
     stop_autohide_timeout(panel);
     panel->is_hidden = 0;
-
     XMapSubwindows(server.display, panel->main_win); // systray windows
-	if (panel_horizontal) {
-		if (panel_position & TOP)
-			XResizeWindow(server.display, panel->main_win, panel->area.width, panel->area.height);
-		else
-			XMoveResizeWindow(server.display,
-							  panel->main_win,
-							  panel->posx,
-							  panel->posy,
-							  panel->area.width,
-							  panel->area.height);
-	} else {
-		if (panel_position & LEFT)
-			XResizeWindow(server.display, panel->main_win, panel->area.width, panel->area.height);
-		else
-			XMoveResizeWindow(server.display,
-							  panel->main_win,
-							  panel->posx,
-							  panel->posy,
-							  panel->area.width,
-							  panel->area.height);
-	}
-	if (panel_strut_policy == STRUT_FOLLOW_SIZE)
-		update_strut(panel);
+    set_panel_window_geometry(panel);
+    set_panel_layer(panel, TOP_LAYER);
     refresh_systray = TRUE; // ugly hack, because we actually only need to call XSetBackgroundPixmap
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 }
 
 void autohide_hide(void *p)
 {
     Panel *panel = (Panel *)p;
     stop_autohide_timeout(panel);
+    set_panel_layer(panel, panel_layer);
     panel->is_hidden = TRUE;
-	if (panel_strut_policy == STRUT_FOLLOW_SIZE)
-		update_strut(panel);
-
     XUnmapSubwindows(server.display, panel->main_win); // systray windows
-	int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height;
-	// printf("autohide_hide : diff %d, w %d, h %d\n", diff, panel->hidden_width, panel->hidden_height);
-	if (panel_horizontal) {
-		if (panel_position & TOP)
-			XResizeWindow(server.display, panel->main_win, panel->hidden_width, panel->hidden_height);
-		else
-			XMoveResizeWindow(server.display,
-							  panel->main_win,
-							  panel->posx,
-							  panel->posy + diff,
-							  panel->hidden_width,
-							  panel->hidden_height);
-	} else {
-		if (panel_position & LEFT)
-			XResizeWindow(server.display, panel->main_win, panel->hidden_width, panel->hidden_height);
-		else
-			XMoveResizeWindow(server.display,
-							  panel->main_win,
-							  panel->posx + diff,
-							  panel->posy,
-							  panel->hidden_width,
-							  panel->hidden_height);
-	}
-	panel_refresh = TRUE;
+    set_panel_window_geometry(panel);
+    schedule_panel_redraw();
 }
 
 void autohide_trigger_show(Panel *p)
@@ -937,9 +1070,41 @@ void autohide_trigger_hide(Panel *p)
     change_timeout(&p->autohide_timeout, panel_autohide_hide_timeout, 0, autohide_hide, p);
 }
 
+void shrink_panel(Panel *panel)
+{
+    if (!panel_shrink)
+        return;
+    int size = MIN(compute_desired_size(&panel->area), panel->max_size);
+    gboolean update = FALSE;
+    if (panel_horizontal) {
+        if (panel->area.width != size) {
+            panel->area.width = size;
+            update = TRUE;
+        }
+    } else {
+        if (panel->area.height != size) {
+            panel->area.height = size;
+            update = TRUE;
+        }
+    }
+    if (update) {
+        panel_compute_position(panel);
+        set_panel_window_geometry(panel);
+        set_panel_background(panel);
+        panel->area.resize_needed = TRUE;
+        systray.area.resize_needed = TRUE;
+        schedule_redraw(&systray.area);
+        refresh_systray = TRUE;
+        update_minimized_icon_positions(panel);
+    }
+}
+
 void render_panel(Panel *panel)
 {
     relayout(&panel->area);
+    if (debug_geometry)
+        area_dump_geometry(&panel->area, 0);
+    update_dependent_gradients(&panel->area);
     draw_tree(&panel->area);
 }
 
@@ -952,7 +1117,16 @@ const char *get_default_font()
 
 void default_icon_theme_changed()
 {
+    if (!launcher_enabled && !panel_config.button_list)
+        return;
+    if (launcher_icon_theme_override && icon_theme_name_config)
+        return;
+
+    free_icon_themes();
+    load_icon_themes();
+
     launcher_default_icon_theme_changed();
+    button_default_icon_theme_changed();
 }
 
 void default_font_changed()
@@ -962,7 +1136,73 @@ void default_font_changed()
 #endif
     clock_default_font_changed();
     execp_default_font_changed();
+    button_default_font_changed();
     taskbar_default_font_changed();
     taskbarname_default_font_changed();
     tooltip_default_font_changed();
 }
+
+void _schedule_panel_redraw(const char *file, const char *function, const int line)
+{
+    panel_refresh = TRUE;
+    if (debug_fps) {
+        fprintf(stderr, YELLOW "tint2: %s %s %d: triggering panel redraw" RESET "\n", file, function, line);
+    }
+}
+
+void save_panel_screenshot(const Panel *panel, const char *path)
+{
+    imlib_context_set_drawable(panel->temp_pmap);
+    Imlib_Image img = imlib_create_image_from_drawable(0, 0, 0, panel->area.width, panel->area.height, 1);
+
+    if (!img) {
+        XImage *ximg =
+            XGetImage(server.display, panel->temp_pmap, 0, 0, panel->area.width, panel->area.height, AllPlanes, ZPixmap);
+
+        if (ximg) {
+            DATA32 *pixels = (DATA32 *)calloc(panel->area.width * panel->area.height, sizeof(DATA32));
+            for (int x = 0; x < panel->area.width; x++) {
+                for (int y = 0; y < panel->area.height; y++) {
+                    DATA32 xpixel = XGetPixel(ximg, x, y);
+
+                    DATA32 r = (xpixel >> 16) & 0xff;
+                    DATA32 g = (xpixel >> 8) & 0xff;
+                    DATA32 b = (xpixel >> 0) & 0xff;
+                    DATA32 a = 0x0;
+
+                    DATA32 argb = (a << 24) | (r << 16) | (g << 8) | b;
+                    pixels[y * panel->area.width + x] = argb;
+                }
+            }
+            XDestroyImage(ximg);
+            img = imlib_create_image_using_data(panel->area.width, panel->area.height, pixels);
+        }
+    }
+
+    if (img) {
+        imlib_context_set_image(img);
+        if (!panel_horizontal) {
+            // rotate 90° vertical panel
+            imlib_image_flip_horizontal();
+            imlib_image_flip_diagonal();
+        }
+        imlib_save_image(path);
+        imlib_free_image();
+    }
+}
+
+void save_screenshot(const char *path)
+{
+    Panel *panel = &panels[0];
+
+    if (panel->area.width > server.monitors[0].width)
+        panel->area.width = server.monitors[0].width;
+
+    panel->temp_pmap =
+        XCreatePixmap(server.display, server.root_win, panel->area.width, panel->area.height, server.depth);
+    render_panel(panel);
+
+    XSync(server.display, False);
+
+    save_panel_screenshot(panel, path);
+}

src/panel.h

@@ -22,12 +22,13 @@
 #include "launcher.h"
 #include "freespace.h"
 #include "execplugin.h"
+#include "separator.h"
+#include "button.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
 #endif
 
-extern int signal_pending;
 // --------------------------------------------------
 // mouse events
 extern MouseAction mouse_left;
@@ -78,14 +79,21 @@ 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 double tracing_fps_threshold;
+extern gboolean debug_frames;
 
 typedef struct Panel {
     Area area;
@@ -97,6 +105,7 @@ typedef struct Panel {
     int posx, posy;
     int marginx, marginy;
     gboolean fractional_width, fractional_height;
+    int max_size;
     int monitor;
     int font_shadow;
     gboolean mouse_effects;
@@ -125,8 +134,10 @@ typedef struct Panel {
 #endif
 
     Launcher launcher;
-	FreeSpace freespace;
+    GList *freespace_list;
+    GList *separator_list;
     GList *execp_list;
+    GList *button_list;
 
     // Autohide
     gboolean is_hidden;
@@ -152,11 +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);
@@ -176,6 +192,7 @@ Battery *click_battery(Panel *panel, int x, int y);
 
 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);
@@ -187,4 +204,10 @@ 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);
+
+void save_screenshot(const char *path);
+void save_panel_screenshot(const Panel *panel, const char *path);
+
 #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.c

@@ -18,21 +18,24 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **************************************************************************/
 
+#include <X11/extensions/Xdamage.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/Xrandr.h>
 
 #include <stdio.h>
+#include <fcntl.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
-#include "server.h"
+#include "common.h"
 #include "config.h"
+#include "server.h"
+#include "signals.h"
 #include "window.h"
 
 Server server;
 
-gboolean primary_monitor_first = FALSE;
-
 void server_catch_error(Display *d, XErrorEvent *ev)
 {
 }
@@ -120,6 +123,14 @@ void server_init_atoms()
     server.atom.TARGETS = XInternAtom(server.display, "TARGETS", False);
 }
 
+const char *GetAtomName(Display *disp, Atom a)
+{
+    if (a == None)
+        return "None";
+    else
+        return XGetAtomName(disp, a);
+}
+
 void cleanup_server()
 {
     if (server.colormap)
@@ -140,6 +151,11 @@ void cleanup_server()
         XFreeGC(server.display, server.gc);
     server.gc = NULL;
     server.disable_transparency = FALSE;
+#ifdef HAVE_SN
+    if (server.pids)
+        g_tree_destroy(server.pids);
+    server.pids = NULL;
+#endif
 }
 
 void send_event32(Window win, Atom at, long data1, long data2, long data3)
@@ -245,13 +261,13 @@ void get_root_pixmap()
     server.root_pmap = ret;
 
     if (server.root_pmap == None) {
-		fprintf(stderr, "tint2 : pixmap background detection failed\n");
+        fprintf(stderr, "tint2: pixmap background detection failed\n");
     } else {
         XGCValues gcv;
         gcv.ts_x_origin = 0;
         gcv.ts_y_origin = 0;
         gcv.fill_style = FillTiled;
-		uint mask = GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle | GCTile;
+        unsigned mask = GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle | GCTile;
 
         gcv.tile = server.root_pmap;
         XChangeGC(server.display, server.gc, mask, &gcv);
@@ -263,13 +279,6 @@ int compare_monitor_pos(const void *monitor1, const void *monitor2)
     const Monitor *m1 = (const Monitor *)monitor1;
     const Monitor *m2 = (const Monitor *)monitor2;
 
-	if (primary_monitor_first) {
-		if (m1->primary && !m2->primary)
-			return -1;
-		if (!m1->primary && m2->primary)
-			return 1;
-	}
-
     if (m1->x < m2->x) {
         return -1;
     } else if (m1->x > m2->x) {
@@ -297,6 +306,11 @@ int monitor_includes_monitor(const void *monitor1, const void *monitor2)
     }
 }
 
+void sort_monitors()
+{
+    qsort(server.monitors, server.num_monitors, sizeof(Monitor), compare_monitor_pos);
+}
+
 void get_monitors()
 {
     if (XineramaIsActive(server.display)) {
@@ -307,38 +321,34 @@ void get_monitors()
 
         if (res && res->ncrtc >= num_monitors) {
             // use xrandr to identify monitors (does not work with proprietery nvidia drivers)
-
-			// Workaround for issue https://gitlab.com/o9000/tint2/issues/353
-			// on some recent configs, XRRGetScreenResourcesCurrent returns a fantom monitor at last position
-			{
-				int i = res->ncrtc - 1;
-				XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(server.display, res, res->crtcs[i]);
-				if (!(crtc_info->x || crtc_info->y || crtc_info->width || crtc_info->height)) {
-					res->ncrtc -= 1;
-				}
-				XRRFreeCrtcInfo(crtc_info);
-			}
-
-			printf("xRandr: Found crtc's: %d\n", res->ncrtc);
+            fprintf(stderr, "tint2: xRandr: Found crtc's: %d\n", res->ncrtc);
             server.monitors = calloc(res->ncrtc, sizeof(Monitor));
+            num_monitors = 0;
             for (int i = 0; i < res->ncrtc; ++i) {
                 XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(server.display, res, res->crtcs[i]);
-				server.monitors[i].x = crtc_info->x;
-				server.monitors[i].y = crtc_info->y;
-				server.monitors[i].width = crtc_info->width;
-				server.monitors[i].height = crtc_info->height;
-				server.monitors[i].names = calloc((crtc_info->noutput + 1), sizeof(gchar *));
+                // Ignore empty crtc
+                if (!crtc_info->width || !crtc_info->height) {
+                    fprintf(stderr, "tint2: xRandr: crtc %d seems disabled\n", i);
+                    XRRFreeCrtcInfo(crtc_info);
+                    continue;
+                }
+                int i_monitor = num_monitors;
+                num_monitors++;
+                server.monitors[i_monitor].x = crtc_info->x;
+                server.monitors[i_monitor].y = crtc_info->y;
+                server.monitors[i_monitor].width = crtc_info->width;
+                server.monitors[i_monitor].height = crtc_info->height;
+                server.monitors[i_monitor].names = calloc((crtc_info->noutput + 1), sizeof(gchar *));
                 for (int j = 0; j < crtc_info->noutput; ++j) {
                     XRROutputInfo *output_info = XRRGetOutputInfo(server.display, res, crtc_info->outputs[j]);
-					printf("xRandr: Linking output %s with crtc %d\n", output_info->name, i);
-					server.monitors[i].names[j] = g_strdup(output_info->name);
+                    fprintf(stderr, "tint2: xRandr: Linking output %s with crtc %d\n", output_info->name, i);
+                    server.monitors[i_monitor].names[j] = g_strdup(output_info->name);
                     XRRFreeOutputInfo(output_info);
-					server.monitors[i].primary = crtc_info->outputs[j] == primary_output;
+                    server.monitors[i_monitor].primary = crtc_info->outputs[j] == primary_output;
                 }
-				server.monitors[i].names[crtc_info->noutput] = NULL;
+                server.monitors[i_monitor].names[crtc_info->noutput] = NULL;
                 XRRFreeCrtcInfo(crtc_info);
             }
-			num_monitors = res->ncrtc;
         } else if (info && num_monitors > 0) {
             server.monitors = calloc(num_monitors, sizeof(Monitor));
             for (int i = 0; i < num_monitors; i++) {
@@ -346,7 +356,7 @@ void get_monitors()
                 server.monitors[i].y = info[i].y_org;
                 server.monitors[i].width = info[i].width;
                 server.monitors[i].height = info[i].height;
-				server.monitors[i].names = 0;
+                server.monitors[i].names = NULL;
             }
         }
 
@@ -388,7 +398,7 @@ void get_monitors()
 
 void print_monitors()
 {
-	fprintf(stderr, "Number of monitors: %d\n", server.num_monitors);
+    fprintf(stderr, "tint2: Number of monitors: %d\n", server.num_monitors);
     for (int i = 0; i < server.num_monitors; i++) {
         fprintf(stderr,
                 "Monitor %d: x = %d, y = %d, w = %d, h = %d\n",
@@ -510,10 +520,10 @@ int get_current_desktop()
 
     int ncols = x_screen_width / work_area_width;
 
-	//	fprintf(stderr, "\n");
-	//	fprintf(stderr, "Work area size: %d x %d\n", work_area_width, work_area_height);
-	//	fprintf(stderr, "Viewport pos: %d x %d\n", viewport_x, viewport_y);
-	//	fprintf(stderr, "Viewport i: %d\n", (viewport_y / work_area_height) * ncols + viewport_x / work_area_width);
+    //	fprintf(stderr, "tint2: \n");
+    //	fprintf(stderr, "tint2: Work area size: %d x %d\n", work_area_width, work_area_height);
+    //	fprintf(stderr, "tint2: Viewport pos: %d x %d\n", viewport_x, viewport_y);
+    //	fprintf(stderr, "tint2: Viewport i: %d\n", (viewport_y / work_area_height) * ncols + viewport_x / work_area_width);
 
     int result = (viewport_y / work_area_height) * ncols + viewport_x / work_area_width;
     return MAX(0, MIN(server.num_desktops - 1, result));
@@ -544,7 +554,7 @@ void get_desktops()
     }
     if (server.num_desktops == 0) {
         server.num_desktops = 1;
-		fprintf(stderr, "warning : WM doesn't respect NETWM specs. tint2 default to 1 desktop.\n");
+        fprintf(stderr, "tint2: warning : WM doesn't respect NETWM specs. tint2 default to 1 desktop.\n");
     }
 }
 
@@ -588,15 +598,77 @@ void server_init_visual()
 
         server.real_transparency = TRUE;
         server.depth = 32;
-		printf("real transparency on... depth: %d\n", server.depth);
+        fprintf(stderr, "tint2: real transparency on... depth: %d\n", server.depth);
         server.colormap = XCreateColormap(server.display, server.root_win, visual, AllocNone);
         server.visual = visual;
     } else {
         // no composite manager or snapshot mode => fake transparency
         server.real_transparency = FALSE;
         server.depth = DefaultDepth(server.display, server.screen);
-		printf("real transparency off.... depth: %d\n", server.depth);
+        fprintf(stderr, "tint2: real transparency off.... depth: %d\n", server.depth);
         server.colormap = DefaultColormap(server.display, server.screen);
         server.visual = DefaultVisual(server.display, server.screen);
     }
 }
+
+void server_init_xdamage()
+{
+    XDamageQueryExtension(server.display, &server.xdamage_event_type, &server.xdamage_event_error_type);
+    server.xdamage_event_type += XDamageNotify;
+    server.xdamage_event_error_type += XDamageNotify;
+}
+
+// Forward mouse click to the desktop window
+void forward_click(XEvent *e)
+{
+    // forward the click to the desktop window (thanks conky)
+    XUngrabPointer(server.display, e->xbutton.time);
+    e->xbutton.window = server.root_win;
+    // icewm doesn't open under the mouse.
+    // and xfce doesn't open at all.
+    e->xbutton.x = e->xbutton.x_root;
+    e->xbutton.y = e->xbutton.y_root;
+    // fprintf(stderr, "tint2: **** %d, %d\n", e->xbutton.x, e->xbutton.y);
+    // XSetInputFocus(server.display, e->xbutton.window, RevertToParent, e->xbutton.time);
+    XSendEvent(server.display, e->xbutton.window, False, ButtonPressMask, e);
+}
+
+void handle_crash(const char *reason)
+{
+#ifndef DISABLE_BACKTRACE
+    char path[4096];
+    sprintf(path, "%s/.tint2-crash.log", get_home_dir());
+    int log_fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+    log_string(log_fd, RED "tint2: crashed, reason: ");
+    log_string(log_fd, reason);
+    log_string(log_fd, RESET "\n");
+    dump_backtrace(log_fd);
+    log_string(log_fd, RED "Please create a bug report with this log output." RESET "\n");
+    close(log_fd);
+#endif
+}
+
+void x11_io_error(Display *display)
+{
+    handle_crash("X11 I/O error");
+}
+
+#ifdef HAVE_SN
+static int error_trap_depth = 0;
+
+void error_trap_push(SnDisplay *display, Display *xdisplay)
+{
+    ++error_trap_depth;
+}
+
+void error_trap_pop(SnDisplay *display, Display *xdisplay)
+{
+    if (error_trap_depth == 0) {
+        fprintf(stderr, "tint2: Error trap underflow!\n");
+        return;
+    }
+
+    XSync(xdisplay, False); /* get all errors out of the queue */
+    --error_trap_depth;
+}
+#endif // HAVE_SN

src/server.h

@@ -93,6 +93,15 @@ typedef struct Global_atom {
     Atom TARGETS;
 } Global_atom;
 
+typedef struct Property {
+    unsigned char *data;
+    int format, nitems;
+    Atom type;
+} Property;
+
+// Returns the name of an Atom as string. Do not free the string.
+const char *GetAtomName(Display *disp, Atom a);
+
 typedef struct Monitor {
     int x;
     int y;
@@ -111,6 +120,7 @@ typedef struct Viewport {
 
 typedef struct Server {
     Display *display;
+    int x11_fd;
     Window root_win;
     Window composite_manager;
     gboolean real_transparency;
@@ -135,6 +145,8 @@ typedef struct Server {
     Colormap colormap;
     Colormap colormap32;
     Global_atom atom;
+    int xdamage_event_type;
+    int xdamage_event_error_type;
 #ifdef HAVE_SN
     SnDisplay *sn_display;
     GTree *pids;
@@ -153,12 +165,17 @@ Atom server_get_atom(char *atom_name);
 void server_catch_error(Display *d, XErrorEvent *ev);
 void server_init_atoms();
 void server_init_visual();
+void server_init_xdamage();
+
+void x11_io_error(Display *display);
+void handle_crash(const char *reason);
 
 // detect root background
 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,4 +183,12 @@ GSList *get_desktop_names();
 int get_current_desktop();
 void change_desktop(int desktop);
 
+// Forward mouse click to the desktop window
+void forward_click(XEvent *e);
+
+#ifdef HAVE_SN
+void error_trap_push(SnDisplay *display, Display *xdisplay);
+void error_trap_pop(SnDisplay *display, Display *xdisplay);
+#endif
+
 #endif

src/signals.c

@@ -0,0 +1,154 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <glib.h>
+#ifdef HAVE_SN
+#include <libsn/sn.h>
+#endif
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "common.h"
+#include "panel.h"
+#include "launcher.h"
+#include "server.h"
+#include "signals.h"
+
+static sig_atomic_t signal_pending;
+
+void signal_handler(int sig)
+{
+    // signal handler is light as it should be
+    signal_pending = sig;
+}
+
+void init_signals()
+{
+    // Set signal handlers
+    signal_pending = 0;
+
+    struct sigaction sa_chld = {.sa_handler = SIG_IGN};
+    sigaction(SIGCHLD, &sa_chld, 0);
+
+    struct sigaction sa = {.sa_handler = signal_handler, .sa_flags = SA_RESTART};
+    sigaction(SIGUSR1, &sa, 0);
+    sigaction(SIGUSR2, &sa, 0);
+    sigaction(SIGINT, &sa, 0);
+    sigaction(SIGTERM, &sa, 0);
+    sigaction(SIGHUP, &sa, 0);
+
+#ifdef BACKTRACE_ON_SIGNAL
+    struct sigaction sa_crash = {.sa_handler = crash_handler};
+    sigaction(SIGSEGV, &sa_crash, 0);
+    sigaction(SIGFPE, &sa_crash, 0);
+    sigaction(SIGPIPE, &sa_crash, 0);
+    sigaction(SIGBUS, &sa_crash, 0);
+    sigaction(SIGABRT, &sa_crash, 0);
+    sigaction(SIGSYS, &sa_crash, 0);
+#endif
+}
+
+#ifdef BACKTRACE_ON_SIGNAL
+void crash_handler(int sig)
+{
+    handle_crash(signal_name(sig));
+    struct sigaction sa = {.sa_handler = SIG_DFL};
+    sigaction(sig, &sa, 0);
+    raise(sig);
+}
+#endif
+
+int sigchild_pipe_valid = FALSE;
+int sigchild_pipe[2];
+
+static void sigchld_handler(int sig)
+{
+    if (!sigchild_pipe_valid)
+        return;
+    int savedErrno = errno;
+    ssize_t unused = write(sigchild_pipe[1], "x", 1);
+    (void)unused;
+    fsync(sigchild_pipe[1]);
+    errno = savedErrno;
+}
+
+void sigchld_handler_async()
+{
+    // Wait for all dead processes
+    pid_t pid;
+    int status;
+    while ((pid = waitpid(-1, &status, WNOHANG)) != -1 && pid != 0) {
+#ifdef HAVE_SN
+        if (startup_notifications) {
+            SnLauncherContext *ctx = (SnLauncherContext *)g_tree_lookup(server.pids, GINT_TO_POINTER(pid));
+            if (ctx) {
+                g_tree_remove(server.pids, GINT_TO_POINTER(pid));
+                sn_launcher_context_complete(ctx);
+                sn_launcher_context_unref(ctx);
+            }
+        }
+#endif
+        for (GList *l = panel_config.execp_list; l; l = l->next) {
+            Execp *execp = (Execp *)l->data;
+            if (g_tree_lookup(execp->backend->cmd_pids, GINT_TO_POINTER(pid)))
+                execp_cmd_completed(execp, pid);
+        }
+    }
+}
+
+void handle_sigchld_events()
+{
+    if (sigchild_pipe_valid) {
+        char buffer[1];
+        while (read(sigchild_pipe[0], buffer, sizeof(buffer)) > 0) {
+            sigchld_handler_async();
+        }
+    }
+}
+
+void init_signals_postconfig()
+{
+    gboolean need_sigchld = FALSE;
+#ifdef HAVE_SN
+    // Initialize startup-notification
+    if (startup_notifications) {
+        server.sn_display = sn_display_new(server.display, error_trap_push, error_trap_pop);
+        server.pids = g_tree_new(cmp_ptr);
+        need_sigchld = TRUE;
+    }
+#endif // HAVE_SN
+    if (panel_config.execp_list)
+        need_sigchld = TRUE;
+
+    if (need_sigchld) {
+        // Setup a handler for child termination
+        if (pipe(sigchild_pipe) != 0) {
+            fprintf(stderr, "tint2: Creating pipe failed.\n");
+        } else {
+            fcntl(sigchild_pipe[0], F_SETFL, O_NONBLOCK | fcntl(sigchild_pipe[0], F_GETFL));
+            fcntl(sigchild_pipe[1], F_SETFL, O_NONBLOCK | fcntl(sigchild_pipe[1], F_GETFL));
+            sigchild_pipe_valid = 1;
+            struct sigaction act = {.sa_handler = sigchld_handler, .sa_flags = SA_RESTART};
+            if (sigaction(SIGCHLD, &act, 0)) {
+                perror("sigaction");
+            }
+        }
+    }
+}
+
+void emit_self_restart(const char *reason)
+{
+    fprintf(stderr,
+            YELLOW "%s %d: triggering tint2 restart, reason: %s" RESET "\n",
+            __FILE__,
+            __LINE__,
+            reason);
+    signal_pending = SIGUSR1;
+}
+
+int get_signal_pending()
+{
+    return signal_pending;
+}

src/signals.h

@@ -0,0 +1,14 @@
+#ifndef SIGNALS_H
+#define SIGNALS_H
+
+void init_signals();
+void init_signals_postconfig();
+void emit_self_restart(const char *reason);
+int get_signal_pending();
+
+void handle_sigchld_events();
+
+extern int sigchild_pipe_valid;
+extern int sigchild_pipe[2];
+
+#endif

src/systray/systraybar.c

@@ -20,6 +20,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
+#include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -54,6 +55,8 @@ int systray_monitor;
 int chrono;
 int systray_composited;
 int systray_profile;
+char *systray_hide_name_filter;
+regex_t *systray_hide_name_regex;
 // background pixmap if we render ourselves the icons
 static Pixmap render_background;
 
@@ -65,6 +68,9 @@ const int slow_resize_period = 5000;
 const int min_bad_resize_events = 3;
 const int max_bad_resize_events = 10;
 
+int systray_compute_desired_size(void *obj);
+void systray_dump_geometry(void *obj, int indent);
+
 void default_systray()
 {
     systray_enabled = 0;
@@ -78,6 +84,8 @@ void default_systray()
     systray.area.size_mode = LAYOUT_FIXED;
     systray.area._resize = resize_systray;
     systray_profile = getenv("SYSTRAY_PROFILING") != NULL;
+    systray_hide_name_filter = NULL;
+    systray_hide_name_regex = NULL;
 }
 
 void cleanup_systray()
@@ -92,6 +100,12 @@ void cleanup_systray()
         XFreePixmap(server.display, render_background);
         render_background = 0;
     }
+    if (systray_hide_name_regex) {
+        regfree(systray_hide_name_regex);
+        free_and_null(systray_hide_name_regex);
+    }
+    if (systray_hide_name_filter)
+        free_and_null(systray_hide_name_filter);
 }
 
 void init_systray()
@@ -100,10 +114,10 @@ void init_systray()
         return;
 
     systray_composited = !server.disable_transparency && server.visual32 && server.colormap32;
-	fprintf(stderr, "Systray composited rendering %s\n", systray_composited ? "on" : "off");
+    fprintf(stderr, "tint2: Systray composited rendering %s\n", systray_composited ? "on" : "off");
 
     if (!systray_composited) {
-		fprintf(stderr, "systray_asb forced to 100 0 0\n");
+        fprintf(stderr, "tint2: systray_asb forced to 100 0 0\n");
         systray.alpha = 100;
         systray.brightness = systray.saturation = 0;
     }
@@ -114,26 +128,66 @@ void init_systray_panel(void *p)
     Panel *panel = (Panel *)p;
     systray.area.parent = panel;
     systray.area.panel = panel;
+    systray.area._dump_geometry = systray_dump_geometry;
+    systray.area._compute_desired_size = systray_compute_desired_size;
     snprintf(systray.area.name, sizeof(systray.area.name), "Systray");
     if (!systray.area.bg)
         systray.area.bg = &g_array_index(backgrounds, Background, 0);
     show(&systray.area);
     schedule_redraw(&systray.area);
     refresh_systray = TRUE;
+    instantiate_area_gradients(&systray.area);
+}
+
+void systray_compute_geometry(int *size)
+{
+    systray.icon_size = panel_horizontal ? systray.area.height : systray.area.width;
+    systray.icon_size -=
+        MAX(left_right_border_width(&systray.area), top_bottom_border_width(&systray.area)) + 2 * systray.area.paddingy;
+    if (systray_max_icon_size > 0)
+        systray.icon_size = MIN(systray.icon_size, systray_max_icon_size);
+
+    int count = 0;
+    for (GSList *l = systray.list_icons; l; l = l->next) {
+        count++;
+    }
+
+    if (panel_horizontal) {
+        int height = systray.area.height - top_bottom_border_width(&systray.area) - 2 * systray.area.paddingy;
+        // here icons_per_column always higher than 0
+        systray.icons_per_column = (height + systray.area.paddingx) / (systray.icon_size + systray.area.paddingx);
+        systray.margin =
+            height - (systray.icons_per_column - 1) * (systray.icon_size + systray.area.paddingx) - systray.icon_size;
+        systray.icons_per_row = count / systray.icons_per_column + (count % systray.icons_per_column != 0);
+        *size = left_right_border_width(&systray.area) + 2 * systray.area.paddingxlr +
+                (systray.icon_size * systray.icons_per_row) + ((systray.icons_per_row - 1) * systray.area.paddingx);
+    } else {
+        int width = systray.area.width - left_right_border_width(&systray.area) - 2 * systray.area.paddingy;
+        // here icons_per_row always higher than 0
+        systray.icons_per_row = (width + systray.area.paddingx) / (systray.icon_size + systray.area.paddingx);
+        systray.margin =
+            width - (systray.icons_per_row - 1) * (systray.icon_size + systray.area.paddingx) - systray.icon_size;
+        systray.icons_per_column = count / systray.icons_per_row + (count % systray.icons_per_row != 0);
+        *size = top_bottom_border_width(&systray.area) + (2 * systray.area.paddingxlr) +
+                (systray.icon_size * systray.icons_per_column) +
+                ((systray.icons_per_column - 1) * systray.area.paddingx);
+    }
+}
+
+int systray_compute_desired_size(void *obj)
+{
+    int size;
+    systray_compute_geometry(&size);
+    return size;
 }
 
 gboolean resize_systray(void *obj)
 {
     if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, "tint2: [%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
 
-	if (panel_horizontal)
-		systray.icon_size = systray.area.height;
-	else
-		systray.icon_size = systray.area.width;
-	systray.icon_size -= (2 * systray.area.bg->border.width) + (2 * systray.area.paddingy);
-	if (systray_max_icon_size > 0)
-		systray.icon_size = MIN(systray.icon_size, systray_max_icon_size);
+    int size;
+    systray_compute_geometry(&size);
 
     if (systray.icon_size > 0) {
         long icon_size = systray.icon_size;
@@ -147,46 +201,33 @@ gboolean resize_systray(void *obj)
                         1);
     }
 
-	int count = 0;
-	for (GSList *l = systray.list_icons; l; l = l->next) {
-		count++;
-	}
-	if (systray_profile)
-		fprintf(stderr, BLUE "%s:%d number of icons = %d" RESET "\n", __FUNCTION__, __LINE__, count);
-
-	if (panel_horizontal) {
-		int height = systray.area.height - 2 * systray.area.bg->border.width - 2 * systray.area.paddingy;
-		// here icons_per_column always higher than 0
-		systray.icons_per_column = (height + systray.area.paddingx) / (systray.icon_size + systray.area.paddingx);
-		systray.margin =
-			height - (systray.icons_per_column - 1) * (systray.icon_size + systray.area.paddingx) - systray.icon_size;
-		systray.icons_per_row = count / systray.icons_per_column + (count % systray.icons_per_column != 0);
-		systray.area.width = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) +
-							 (systray.icon_size * systray.icons_per_row) +
-							 ((systray.icons_per_row - 1) * systray.area.paddingx);
-	} else {
-		int width = systray.area.width - 2 * systray.area.bg->border.width - 2 * systray.area.paddingy;
-		// here icons_per_row always higher than 0
-		systray.icons_per_row = (width + systray.area.paddingx) / (systray.icon_size + systray.area.paddingx);
-		systray.margin =
-			width - (systray.icons_per_row - 1) * (systray.icon_size + systray.area.paddingx) - systray.icon_size;
-		systray.icons_per_column = count / systray.icons_per_row + (count % systray.icons_per_row != 0);
-		systray.area.height = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) +
-							  (systray.icon_size * systray.icons_per_column) +
-							  ((systray.icons_per_column - 1) * systray.area.paddingx);
-	}
-
+    gboolean result = refresh_systray;
     if (net_sel_win == None) {
         start_net();
+        result = TRUE;
     }
 
-	return TRUE;
+    if (panel_horizontal) {
+        if (systray.area.width != size) {
+            systray.area.width = size;
+            result = TRUE;
+        }
+    } else {
+        if (systray.area.height != size) {
+            systray.area.height = size;
+            result = TRUE;
+        }
+    }
+
+    on_change_systray(&systray.area);
+
+    return result;
 }
 
 void draw_systray(void *obj, cairo_t *c)
 {
     if (systray_profile)
-		fprintf(stderr, BLUE "[%f] %s:%d" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, BLUE "tint2: [%f] %s:%d" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
     if (systray_composited) {
         if (render_background)
             XFreePixmap(server.display, render_background);
@@ -207,10 +248,30 @@ void draw_systray(void *obj, cairo_t *c)
     refresh_systray = TRUE;
 }
 
+void systray_dump_geometry(void *obj, int indent)
+{
+    Systray *tray = (Systray *)obj;
+
+    fprintf(stderr, "tint2: %*sIcons:\n", indent, "");
+    indent += 2;
+    for (GSList *l = tray->list_icons; l; l = l->next) {
+        TrayWindow *traywin = (TrayWindow *)l->data;
+        fprintf(stderr,
+                "%*sIcon: x = %d, y = %d, w = %d, h = %d, name = %s\n",
+                indent,
+                "",
+                traywin->x,
+                traywin->y,
+                traywin->width,
+                traywin->height,
+                traywin->name);
+    }
+}
+
 void on_change_systray(void *obj)
 {
     if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, "tint2: [%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
     if (systray.icons_per_column == 0 || systray.icons_per_row == 0)
         return;
 
@@ -218,14 +279,15 @@ void on_change_systray(void *obj)
     // Based on this we calculate the positions of the tray icons.
     Panel *panel = systray.area.panel;
     int posx, posy;
-	int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width +
-				systray.area.paddingy + systray.margin / 2;
+    int start;
     if (panel_horizontal) {
-		posy = start;
-		posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr;
+        posy = start = top_border_width(&panel->area) + panel->area.paddingy + top_border_width(&systray.area) +
+                       systray.area.paddingy + systray.margin / 2;
+        posx = systray.area.posx + left_border_width(&systray.area) + systray.area.paddingxlr;
     } else {
-		posx = start;
-		posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr;
+        posx = start = left_border_width(&panel->area) + panel->area.paddingy + left_border_width(&systray.area) +
+                       systray.area.paddingy + systray.margin / 2;
+        posy = systray.area.posy + top_border_width(&systray.area) + systray.area.paddingxlr;
     }
 
     TrayWindow *traywin;
@@ -270,7 +332,7 @@ void on_change_systray(void *obj)
         unsigned int width, height, depth;
         Window root;
         if (!XGetGeometry(server.display, traywin->parent, &root, &xpos, &ypos, &width, &height, &border_width, &depth)) {
-			fprintf(stderr, RED "Couldn't get geometry of window!" RESET "\n");
+            fprintf(stderr, RED "tint2: Couldn't get geometry of window!" RESET "\n");
         }
         if (width != traywin->width || height != traywin->height || xpos != traywin->x || ypos != traywin->y) {
             if (systray_profile)
@@ -296,7 +358,7 @@ void on_change_systray(void *obj)
 void start_net()
 {
     if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, "tint2: [%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
     if (net_sel_win) {
         // protocol already started
         if (!systray_enabled)
@@ -333,11 +395,11 @@ void start_net()
                                      &bytes_after,
                                      &prop);
 
-		fprintf(stderr, RED "tint2 : another systray is running" RESET);
+        fprintf(stderr, RED "tint2: another systray is running, cannot use systray" RESET);
         if (ret == Success && prop) {
             pid = prop[1] * 256;
             pid += prop[0];
-			fprintf(stderr, " pid=%d", pid);
+            fprintf(stderr, "tint2:  pid=%d", pid);
         }
         fprintf(stderr, RESET "\n");
         return;
@@ -345,7 +407,7 @@ void start_net()
 
     // init systray protocol
     net_sel_win = XCreateSimpleWindow(server.display, server.root_win, -1, -1, 1, 1, 0, 0, 0);
-	fprintf(stderr, "systray window %ld\n", net_sel_win);
+    fprintf(stderr, "tint2: systray window %ld\n", net_sel_win);
 
     // v0.3 trayer specification. tint2 always horizontal.
     // Vertical panel will draw the systray horizontal.
@@ -396,13 +458,13 @@ void start_net()
     XSetSelectionOwner(server.display, server.atom._NET_SYSTEM_TRAY_SCREEN, net_sel_win, CurrentTime);
     if (XGetSelectionOwner(server.display, server.atom._NET_SYSTEM_TRAY_SCREEN) != net_sel_win) {
         stop_net();
-		fprintf(stderr, RED "tint2 : can't get systray manager" RESET "\n");
+        fprintf(stderr, RED "tint2: cannot find systray manager" RESET "\n");
         return;
     }
 
-	fprintf(stderr, GREEN "tint2 : systray started" RESET "\n");
+    fprintf(stderr, GREEN "tint2: systray started" RESET "\n");
     if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, "tint2: [%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
     XClientMessageEvent ev;
     ev.type = ClientMessage;
     ev.window = server.root_win;
@@ -416,10 +478,10 @@ void start_net()
     XSendEvent(server.display, server.root_win, False, StructureNotifyMask, (XEvent *)&ev);
 }
 
-void net_message(XClientMessageEvent *e)
+void handle_systray_event(XClientMessageEvent *e)
 {
     if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, "tint2: [%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
 
     Window win;
     unsigned long opcode = e->data.l[1];
@@ -437,9 +499,9 @@ void net_message(XClientMessageEvent *e)
 
     default:
         if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA)
-			fprintf(stderr, "message from dockapp: %s\n", e->data.b);
+            fprintf(stderr, "tint2: message from dockapp: %s\n", e->data.b);
         else
-			fprintf(stderr, RED "SYSTEM_TRAY : unknown message type" RESET "\n");
+            fprintf(stderr, RED "tint2: SYSTEM_TRAY : unknown message type" RESET "\n");
         break;
     }
 }
@@ -447,7 +509,7 @@ void net_message(XClientMessageEvent *e)
 void stop_net()
 {
     if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, "tint2: [%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
     if (systray.list_icons) {
         // remove_icon change systray.list_icons
         while (systray.list_icons)
@@ -467,10 +529,10 @@ gboolean error;
 int window_error_handler(Display *d, XErrorEvent *e)
 {
     if (systray_profile)
-		fprintf(stderr, RED "[%f] %s:%d" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, RED "tint2: [%f] %s:%d" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
     error = TRUE;
     if (e->error_code != BadWindow) {
-		fprintf(stderr, RED "systray: error code %d" RESET "\n", e->error_code);
+        fprintf(stderr, RED "tint2: systray: error code %d" RESET "\n", e->error_code);
     }
     return 0;
 }
@@ -502,22 +564,42 @@ static gint compare_traywindows(gconstpointer a, gconstpointer b)
 
 void print_icons()
 {
-	fprintf(stderr, "systray.list_icons: \n");
+    fprintf(stderr, "tint2: systray.list_icons: \n");
     for (GSList *l = systray.list_icons; l; l = l->next) {
         TrayWindow *t = l->data;
-		fprintf(stderr, "%s\n", t->name);
+        fprintf(stderr, "tint2: %s\n", t->name);
     }
-	fprintf(stderr, "systray.list_icons order: \n");
+    fprintf(stderr, "tint2: systray.list_icons order: \n");
     for (GSList *l = systray.list_icons; l; l = l->next) {
         if (l->next) {
             TrayWindow *t = l->data;
             TrayWindow *u = l->next->data;
             int cmp = compare_traywindows(t, u);
-			fprintf(stderr, "%s %s %s\n", t->name, cmp < 0 ? "<" : cmp == 0 ? "=" : ">", u->name);
+            fprintf(stderr, "tint2: %s %s %s\n", t->name, cmp < 0 ? "<" : cmp == 0 ? "=" : ">", u->name);
         }
     }
 }
 
+gboolean reject_icon(Window win)
+{
+    if (systray_hide_name_filter && strlen(systray_hide_name_filter)) {
+        if (!systray_hide_name_regex) {
+            systray_hide_name_regex = (regex_t *)calloc(1, sizeof(*systray_hide_name_regex));
+            if (regcomp(systray_hide_name_regex, systray_hide_name_filter, 0) != 0) {
+                fprintf(stderr, RED "tint2: Could not compile regex %s" RESET "\n", systray_hide_name_filter);
+                free_and_null(systray_hide_name_regex);
+                return FALSE;
+            }
+        }
+        char *name = get_window_name(win);
+        if (regexec(systray_hide_name_regex, name, 0, NULL, 0) == 0) {
+            fprintf(stderr, GREEN "tint2: Filtering out systray icon '%s'" RESET "\n", name);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
 gboolean add_icon(Window win)
 {
     // Avoid duplicates
@@ -528,6 +610,10 @@ gboolean add_icon(Window win)
         }
     }
 
+    // Filter out systray_hide_by_icon_name
+    if (reject_icon(win))
+        return FALSE;
+
     // Dangerous actions begin
     XSync(server.display, False);
     error = FALSE;
@@ -537,7 +623,7 @@ gboolean add_icon(Window win)
 
     char *name = get_window_name(win);
     if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, win, name);
+        fprintf(stderr, "tint2: [%f] %s:%d win = %lu (%s)\n", profiling_get_time(), __FUNCTION__, __LINE__, win, name);
     Panel *panel = systray.area.panel;
 
     // Get the process ID of the application that created the window
@@ -569,7 +655,7 @@ gboolean add_icon(Window win)
     // Create the parent window that will embed the icon
     XWindowAttributes attr;
     if (systray_profile)
-		fprintf(stderr, "XGetWindowAttributes(server.display, win = %ld, &attr)\n", win);
+        fprintf(stderr, "tint2: XGetWindowAttributes(server.display, win = %ld, &attr)\n", win);
     if (XGetWindowAttributes(server.display, win, &attr) == False) {
         free(name);
         XSelectInput(server.display, win, NoEventMask);
@@ -620,7 +706,7 @@ gboolean add_icon(Window win)
     }
 
     if (systray_profile)
-		fprintf(stderr, "XCreateWindow(...)\n");
+        fprintf(stderr, "tint2: XCreateWindow(...)\n");
     Window parent = XCreateWindow(server.display,
                                   panel->main_win,
                                   0,
@@ -646,7 +732,6 @@ gboolean add_icon(Window win)
     traywin->chrono = chrono;
     chrono++;
 
-	if (!systray.area.on_screen)
     show(&systray.area);
 
     if (systray.sort == SYSTRAY_SORT_RIGHT2LEFT)
@@ -658,12 +743,12 @@ gboolean add_icon(Window win)
 
     if (!panel->is_hidden) {
         if (systray_profile)
-			fprintf(stderr, "XMapRaised(server.display, traywin->parent)\n");
+            fprintf(stderr, "tint2: XMapRaised(server.display, traywin->parent)\n");
         XMapRaised(server.display, traywin->parent);
     }
 
     if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, "tint2: [%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
 
     // Resize and redraw the systray
     if (systray_profile)
@@ -723,7 +808,7 @@ gboolean reparent_icon(TrayWindow *traywin)
         e.xclient.data.l[3] = traywin->parent;
         e.xclient.data.l[4] = 0;
         if (systray_profile)
-			fprintf(stderr, "XSendEvent(server.display, traywin->win, False, NoEventMask, &e)\n");
+            fprintf(stderr, "tint2: XSendEvent(server.display, traywin->win, False, NoEventMask, &e)\n");
         XSendEvent(server.display, traywin->win, False, NoEventMask, &e);
     }
 
@@ -774,62 +859,13 @@ gboolean embed_icon(TrayWindow *traywin)
     error = FALSE;
     XErrorHandler old = XSetErrorHandler(window_error_handler);
 
-	if (0) {
-		Atom acttype;
-		int actfmt;
-		unsigned long nbitem, bytes;
-		unsigned long *data = 0;
-		int ret;
-
-		if (systray_profile)
-			fprintf(stderr,
-					"XGetWindowProperty(server.display, traywin->win, server.atom._XEMBED_INFO, 0, 2, False, "
-			        "server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data)\n");
-		ret = XGetWindowProperty(server.display,
-		                         traywin->win,
-		                         server.atom._XEMBED_INFO,
-		                         0,
-		                         2,
-		                         False,
-		                         server.atom._XEMBED_INFO,
-		                         &acttype,
-		                         &actfmt,
-		                         &nbitem,
-		                         &bytes,
-		                         (unsigned char **)&data);
-		if (ret == Success) {
-			if (data) {
-				if (nbitem >= 2) {
-					int hide = ((data[1] & XEMBED_MAPPED) == 0);
-					if (hide) {
-						// In theory we have to check the embedding with this and remove icons that refuse embedding.
-						// In practice we have no idea when the other application processes the event and accepts the
-						// embed so we cannot check now without a race.
-						// Race can be triggered with PyGtk(2) apps.
-						// We could defer this for later (if we set PropertyChangeMask in XSelectInput we get notified)
-						// but for some reason it breaks transparency for Qt icons. So we don't.
-						// fprintf(stderr, RED "tint2: window refused embedding" RESET "\n");
-						// remove_icon(traywin);
-						// XFree(data);
-						// return FALSE;
-					}
-				}
-				XFree(data);
-			}
-		} else {
-			fprintf(stderr, RED "tint2 : xembed error" RESET "\n");
-			remove_icon(traywin);
-			return FALSE;
-		}
-	}
-
     // Redirect rendering when using compositing
     if (systray_composited) {
         if (systray_profile)
-			fprintf(stderr, "XDamageCreate(server.display, traywin->parent, XDamageReportRawRectangles)\n");
+            fprintf(stderr, "tint2: XDamageCreate(server.display, traywin->parent, XDamageReportRawRectangles)\n");
         traywin->damage = XDamageCreate(server.display, traywin->parent, XDamageReportRawRectangles);
         if (systray_profile)
-			fprintf(stderr, "XCompositeRedirectWindow(server.display, traywin->parent, CompositeRedirectManual)\n");
+            fprintf(stderr, "tint2: XCompositeRedirectWindow(server.display, traywin->parent, CompositeRedirectManual)\n");
         XCompositeRedirectWindow(server.display, traywin->parent, CompositeRedirectManual);
     }
 
@@ -837,16 +873,16 @@ gboolean embed_icon(TrayWindow *traywin)
 
     // Make the icon visible
     if (systray_profile)
-		fprintf(stderr, "XMapWindow(server.display, traywin->win)\n");
+        fprintf(stderr, "tint2: XMapWindow(server.display, traywin->win)\n");
     XMapWindow(server.display, traywin->win);
     if (!panel->is_hidden) {
         if (systray_profile)
-			fprintf(stderr, "XMapRaised(server.display, traywin->parent)\n");
+            fprintf(stderr, "tint2: XMapRaised(server.display, traywin->parent)\n");
         XMapRaised(server.display, traywin->parent);
     }
 
     if (systray_profile)
-		fprintf(stderr, "XSync(server.display, False)\n");
+        fprintf(stderr, "tint2: XSync(server.display, False)\n");
     XSync(server.display, False);
     XSetErrorHandler(old);
     if (error != FALSE) {
@@ -889,7 +925,7 @@ void remove_icon(TrayWindow *traywin)
 
     // remove from our list
     systray.list_icons = g_slist_remove(systray.list_icons, traywin);
-	fprintf(stderr, YELLOW "remove_icon: %lu (%s)" RESET "\n", traywin->win, traywin->name);
+    fprintf(stderr, YELLOW "tint2: remove_icon: %lu (%s)" RESET "\n", traywin->win, traywin->name);
 
     XSelectInput(server.display, traywin->win, NoEventMask);
     if (traywin->damage)
@@ -1052,7 +1088,7 @@ void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
                 profiling_get_time(),
                 __FUNCTION__,
                 __LINE__);
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
     refresh_systray = TRUE;
 }
 
@@ -1131,7 +1167,7 @@ void systray_resize_request_event(TrayWindow *traywin, XEvent *e)
                 profiling_get_time(),
                 __FUNCTION__,
                 __LINE__);
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
     refresh_systray = TRUE;
 }
 
@@ -1243,7 +1279,7 @@ void systray_render_icon_composited(void *t)
     } else if (traywin->depth == 32) {
         f = XRenderFindStandardFormat(server.display, PictStandardARGB32);
     } else {
-		fprintf(stderr, RED "Strange tray icon found with depth: %d" RESET "\n", traywin->depth);
+        fprintf(stderr, RED "tint2: Strange tray icon found with depth: %d" RESET "\n", traywin->depth);
         XFreePixmap(server.display, tmp_pmap);
         return;
     }
@@ -1339,7 +1375,7 @@ void systray_render_icon_composited(void *t)
     if (error)
         goto on_error;
 
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 
     if (systray_profile)
         fprintf(stderr,
@@ -1378,6 +1414,21 @@ on_systray_error:
 void systray_render_icon(void *t)
 {
     TrayWindow *traywin = t;
+    if (!traywin->reparented || !traywin->embedded) {
+        //		if (systray_profile)
+        //			fprintf(stderr,
+        //			        YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
+        //			        profiling_get_time(),
+        //			        __FUNCTION__,
+        //			        __LINE__,
+        //			        traywin->win,
+        //			        traywin->name);
+        stop_timeout(traywin->render_timeout);
+        traywin->render_timeout =
+            add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
+        return;
+    }
+
     if (systray_profile)
         fprintf(stderr,
                 "[%f] %s:%d win = %lu (%s)\n",
@@ -1386,20 +1437,6 @@ void systray_render_icon(void *t)
                 __LINE__,
                 traywin->win,
                 traywin->name);
-	if (!traywin->reparented || !traywin->embedded) {
-		if (systray_profile)
-			fprintf(stderr,
-			        YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
-			        profiling_get_time(),
-			        __FUNCTION__,
-			        __LINE__,
-			        traywin->win,
-			        traywin->name);
-		stop_timeout(traywin->render_timeout);
-		traywin->render_timeout =
-		    add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
-		return;
-	}
 
     if (systray_composited) {
         XSync(server.display, False);
@@ -1412,7 +1449,7 @@ void systray_render_icon(void *t)
         Window root;
         if (!XGetGeometry(server.display, traywin->win, &root, &xpos, &ypos, &width, &height, &border_width, &depth)) {
             stop_timeout(traywin->render_timeout);
-			if (!traywin->resize_timeout)
+            if (!traywin->render_timeout)
                 traywin->render_timeout =
                     add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
             systray_render_icon_from_image(traywin);
@@ -1421,7 +1458,7 @@ void systray_render_icon(void *t)
         } else {
             if (xpos != 0 || ypos != 0 || width != traywin->width || height != traywin->height) {
                 stop_timeout(traywin->render_timeout);
-				if (!traywin->resize_timeout)
+                if (!traywin->render_timeout)
                     traywin->render_timeout =
                         add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
                 systray_render_icon_from_image(traywin);
@@ -1441,7 +1478,7 @@ void systray_render_icon(void *t)
     }
 
     if (systray_profile)
-		fprintf(stderr, "rendering tray icon\n");
+        fprintf(stderr, "tint2: rendering tray icon\n");
 
     if (systray_composited) {
         systray_render_icon_composited(traywin);
@@ -1463,7 +1500,7 @@ void systray_render_icon(void *t)
 void refresh_systray_icons()
 {
     if (systray_profile)
-		fprintf(stderr, BLUE "[%f] %s:%d" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, BLUE "tint2: [%f] %s:%d" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
     TrayWindow *traywin;
     GSList *l;
     for (l = systray.list_icons; l; l = l->next) {
@@ -1472,9 +1509,9 @@ void refresh_systray_icons()
     }
 }
 
-gboolean systray_on_monitor(int i_monitor, int num_panels)
+gboolean systray_on_monitor(int i_monitor, int n_panels)
 {
-	return (i_monitor == systray_monitor) || (i_monitor == 0 && (systray_monitor >= num_panels || systray_monitor < 0));
+    return (i_monitor == systray_monitor) || (i_monitor == 0 && (systray_monitor >= n_panels || systray_monitor < 0));
 }
 
 TrayWindow *systray_find_icon(Window win)

src/systray/systraybar.h

@@ -75,6 +75,7 @@ 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();
@@ -95,7 +96,7 @@ gboolean systray_on_monitor(int i_monitor, int num_panels);
 // many tray icon doesn't manage stop/restart of the systray manager
 void start_net();
 void stop_net();
-void net_message(XClientMessageEvent *e);
+void handle_systray_event(XClientMessageEvent *e);
 
 gboolean add_icon(Window id);
 gboolean reparent_icon(TrayWindow *traywin);

src/taskbar/task.c

@@ -38,6 +38,9 @@
 timeout *urgent_timeout;
 GSList *urgent_list;
 
+void task_dump_geometry(void *obj, int indent);
+int task_compute_desired_size(void *obj);
+
 char *task_get_tooltip(void *obj)
 {
     Task *t = (Task *)obj;
@@ -68,6 +71,7 @@ Task *add_task(Window win)
     snprintf(task_template.area.name, sizeof(task_template.area.name), "Task %d", (int)win);
     task_template.area.has_mouse_over_effect = panel_config.mouse_effects;
     task_template.area.has_mouse_press_effect = panel_config.mouse_effects;
+    task_template.area._dump_geometry = task_dump_geometry;
     task_template.area._is_under_mouse = full_width_area_is_under_mouse;
     task_template.win = win;
     task_template.desktop = get_window_desktop(win);
@@ -83,11 +87,15 @@ Task *add_task(Window win)
     }
     task_update_title(&task_template);
     task_update_icon(&task_template);
-	snprintf(task_template.area.name, sizeof(task_template.area.name), "Task %d %s", (int)win, task_template.title ? task_template.title : "null");
+    snprintf(task_template.area.name,
+             sizeof(task_template.area.name),
+             "Task %d %s",
+             (int)win,
+             task_template.title ? task_template.title : "null");
 
-	// fprintf(stderr, "%s %d: win = %ld, task = %s\n", __FUNCTION__, __LINE__, win, task_template.title ?
+    // fprintf(stderr, "tint2: %s %d: win = %ld, task = %s\n", __FUNCTION__, __LINE__, win, task_template.title ?
     // task_template.title : "??");
-	// fprintf(stderr, "new task %s win %u: desktop %d, monitor %d\n", new_task.title, win, new_task.desktop, monitor);
+    // fprintf(stderr, "tint2: new task %s win %u: desktop %d, monitor %d\n", new_task.title, win, new_task.desktop, monitor);
 
     GPtrArray *task_buttons = g_ptr_array_new();
     for (int j = 0; j < panels[monitor].num_desktops; j++) {
@@ -99,7 +107,9 @@ Task *add_task(Window win)
         memcpy(&task_instance->area, &panels[monitor].g_task.area, sizeof(Area));
         task_instance->area.has_mouse_over_effect = panel_config.mouse_effects;
         task_instance->area.has_mouse_press_effect = panel_config.mouse_effects;
+        task_instance->area._dump_geometry = task_dump_geometry;
         task_instance->area._is_under_mouse = full_width_area_is_under_mouse;
+        task_instance->area._compute_desired_size = task_compute_desired_size;
         task_instance->win = task_template.win;
         task_instance->desktop = task_template.desktop;
         task_instance->win_x = task_template.win_x;
@@ -108,7 +118,7 @@ Task *add_task(Window win)
         task_instance->win_h = task_template.win_h;
         task_instance->current_state = TASK_UNDEFINED; // to update the current state later in set_task_state...
         if (task_instance->desktop == ALL_DESKTOPS && server.desktop != j) {
-			// fprintf(stderr, "%s %d: win = %ld hiding task: another desktop\n", __FUNCTION__, __LINE__, win);
+            // fprintf(stderr, "tint2: %s %d: win = %ld hiding task: another desktop\n", __FUNCTION__, __LINE__, win);
             task_instance->area.on_screen = always_show_all_desktop_tasks;
         }
         task_instance->title = task_template.title;
@@ -142,29 +152,16 @@ Task *add_task(Window win)
         add_urgent((Task *)g_ptr_array_index(task_buttons, 0));
     }
 
+    if (hide_taskbar_if_empty)
+        update_all_taskbars_visibility();
+
     return (Task *)g_ptr_array_index(task_buttons, 0);
 }
 
-void remove_task(Task *task)
+void task_remove_icon(Task *task)
 {
     if (!task)
         return;
-
-	// fprintf(stderr, "%s %d: win = %ld, task = %s\n", __FUNCTION__, __LINE__, task->win, task->title ? task->title :
-	// "??");
-
-	if (taskbar_mode == MULTI_DESKTOP) {
-		Panel *panel = task->area.panel;
-		panel->area.resize_needed = 1;
-	}
-
-	Window win = task->win;
-
-	// free title and icon just for the first task
-	// even with task_on_all_desktop and with task_on_all_panel
-	// printf("remove_task %s %d\n", task->title, task->desktop);
-	if (task->title)
-		free(task->title);
     for (int k = 0; k < TASK_STATE_COUNT; ++k) {
         if (task->icon[k]) {
             imlib_context_set_image(task->icon[k]);
@@ -182,6 +179,29 @@ void remove_task(Task *task)
             task->icon_press[k] = 0;
         }
     }
+}
+
+void remove_task(Task *task)
+{
+    if (!task)
+        return;
+
+    // fprintf(stderr, "tint2: %s %d: win = %ld, task = %s\n", __FUNCTION__, __LINE__, task->win, task->title ? task->title :
+    // "??");
+
+    if (taskbar_mode == MULTI_DESKTOP) {
+        Panel *panel = task->area.panel;
+        panel->area.resize_needed = 1;
+    }
+
+    Window win = task->win;
+
+    // free title and icon just for the first task
+    // even with task_on_all_desktop and with task_on_all_panel
+    // fprintf(stderr, "tint2: remove_task %s %d\n", task->title, task->desktop);
+    if (task->title)
+        free(task->title);
+    task_remove_icon(task);
 
     GPtrArray *task_buttons = g_hash_table_lookup(win_to_task, &win);
     for (int i = 0; i < task_buttons->len; ++i) {
@@ -196,6 +216,8 @@ void remove_task(Task *task)
         free(task2);
     }
     g_hash_table_remove(win_to_task, &win);
+    if (hide_taskbar_if_empty)
+        update_all_taskbars_visibility();
 }
 
 gboolean task_update_title(Task *task)
@@ -250,48 +272,61 @@ void task_update_icon(Task *task)
     if (!panel->g_task.has_icon)
         return;
 
-	for (int k = 0; k < TASK_STATE_COUNT; ++k) {
-		if (task->icon[k]) {
-			imlib_context_set_image(task->icon[k]);
-			imlib_free_image();
-			task->icon[k] = 0;
-		}
-	}
+    task_remove_icon(task);
 
     Imlib_Image img = NULL;
 
-	int i;
-	gulong *data = server_get_property(task->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
+    if (!img) {
+        int len;
+        gulong *data = server_get_property(task->win, server.atom._NET_WM_ICON, XA_CARDINAL, &len);
         if (data) {
+            if (len > 0) {
                 // get ARGB icon
                 int w, h;
-		gulong *tmp_data;
-
-		tmp_data = get_best_icon(data, get_icon_count(data, i), i, &w, &h, panel->g_task.icon_size1);
+                gulong *tmp_data = get_best_icon(data, get_icon_count(data, len), len, &w, &h, panel->g_task.icon_size1);
+                if (tmp_data) {
                     DATA32 icon_data[w * h];
                     for (int j = 0; j < w * h; ++j)
                         icon_data[j] = tmp_data[j];
                     img = imlib_create_image_using_copied_data(w, h, icon_data);
+                    if (0 && img)
+                        fprintf(stderr,
+                                "%s: Got %dx%d icon via _NET_WM_ICON for %s\n",
+                                __FUNCTION__,
+                                w,
+                                h,
+                                task->title ? task->title : "task");
+                }
+            }
             XFree(data);
-	} else {
-		// get Pixmap icon
+        }
+    }
+
+    if (!img) {
         XWMHints *hints = XGetWMHints(server.display, task->win);
         if (hints) {
             if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) {
                 // get width, height and depth for the pixmap
                 Window root;
                 int icon_x, icon_y;
-				uint border_width, bpp;
-				uint w, h;
+                unsigned border_width, bpp;
+                unsigned w, h;
 
-				// printf("  get pixmap\n");
                 XGetGeometry(server.display, hints->icon_pixmap, &root, &icon_x, &icon_y, &w, &h, &border_width, &bpp);
                 imlib_context_set_drawable(hints->icon_pixmap);
                 img = imlib_create_image_from_drawable(hints->icon_mask, 0, 0, w, h, 0);
+                if (0 && img)
+                    fprintf(stderr,
+                            "%s: Got %dx%d pixmap icon via WM_HINTS for %s\n",
+                            __FUNCTION__,
+                            w,
+                            h,
+                            task->title ? task->title : "task");
             }
             XFree(hints);
         }
     }
+
     if (img == NULL) {
         imlib_context_set_image(default_icon);
         img = imlib_clone_image();
@@ -340,7 +375,7 @@ void task_update_icon(Task *task)
 
     GPtrArray *task_buttons = get_task_buttons(task->win);
     if (task_buttons) {
-		for (i = 0; i < task_buttons->len; ++i) {
+        for (int i = 0; i < task_buttons->len; ++i) {
             Task *task2 = g_ptr_array_index(task_buttons, i);
             task2->icon_width = task->icon_width;
             task2->icon_height = task->icon_height;
@@ -361,15 +396,14 @@ void draw_task_icon(Task *task, int text_width)
         return;
 
     // Find pos
-	int pos_x;
     Panel *panel = (Panel *)task->area.panel;
     if (panel->g_task.centered) {
         if (panel->g_task.has_text)
-			pos_x = (task->area.width - text_width - panel->g_task.icon_size1) / 2;
+            task->_icon_x = (task->area.width - text_width - panel->g_task.icon_size1) / 2;
         else
-			pos_x = (task->area.width - panel->g_task.icon_size1) / 2;
+            task->_icon_x = (task->area.width - panel->g_task.icon_size1) / 2;
     } else {
-		pos_x = task->area.bg->border.width + task->area.paddingxlr;
+        task->_icon_x = left_border_width(&task->area) + task->area.paddingxlr;
     }
 
     // Render
@@ -388,14 +422,8 @@ void draw_task_icon(Task *task, int text_width)
     }
 
     imlib_context_set_image(image);
-	render_image(task->area.pix, pos_x, (task->area.height - panel->g_task.icon_size1) / 2);
-	if (0) {
-		fprintf(stderr, "Task icon size: %d %d pos %d %d\n", imlib_image_get_width(), imlib_image_get_height(), pos_x, panel->g_task.icon_posy);
-		fprintf(stderr, "Task max size : %d %d\n", panel->g_task.maximum_width, panel->g_task.maximum_height);
-		fprintf(stderr, "Task area size: %d %d\n", task->area.width, task->area.height);
-		fprintf(stderr, "Task border   : %d\n", task->area.bg->border.width);
-		fprintf(stderr, "\n");
-	}
+    task->_icon_y = (task->area.height - panel->g_task.icon_size1) / 2;
+    render_image(task->area.pix, task->_icon_x, task->_icon_y);
 }
 
 void draw_task(void *obj, cairo_t *c)
@@ -403,7 +431,7 @@ void draw_task(void *obj, cairo_t *c)
     Task *task = (Task *)obj;
     Panel *panel = (Panel *)task->area.panel;
 
-	int text_width = 0;
+    task->_text_width = 0;
     if (panel->g_task.has_text) {
         PangoLayout *layout = pango_cairo_create_layout(c);
         pango_layout_set_font_description(layout, panel->g_task.font_desc);
@@ -419,18 +447,49 @@ void draw_task(void *obj, cairo_t *c)
         else
             pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
 
-		int text_height;
-		pango_layout_get_pixel_size(layout, &text_width, &text_height);
-		double text_posy = (panel->g_task.area.height - text_height) / 2.0;
+        pango_layout_get_pixel_size(layout, &task->_text_width, &task->_text_height);
+        task->_text_posy = (panel->g_task.area.height - task->_text_height) / 2.0;
 
         Color *config_text = &panel->g_task.font[task->current_state];
-		draw_text(layout, c, panel->g_task.text_posx, text_posy, config_text, panel->font_shadow);
+        draw_text(layout, c, panel->g_task.text_posx, task->_text_posy, config_text, panel->font_shadow);
 
         g_object_unref(layout);
     }
 
     if (panel->g_task.has_icon)
-		draw_task_icon(task, text_width);
+        draw_task_icon(task, task->_text_width);
+}
+
+void task_dump_geometry(void *obj, int indent)
+{
+    Task *task = (Task *)obj;
+    Panel *panel = (Panel *)task->area.panel;
+
+    fprintf(stderr,
+            "%*sText: x = %d, y = %d, w = %d, h = %d, align = %s, text = %s\n",
+            indent,
+            "",
+            (int)panel->g_task.text_posx,
+            (int)task->_text_posy,
+            task->_text_width,
+            task->_text_height,
+            panel->g_task.centered ? "center" : "left",
+            task->title);
+    fprintf(stderr,
+            "%*sIcon: x = %d, y = %d, w = h = %d\n",
+            indent,
+            "",
+            task->_icon_x,
+            task->_icon_y,
+            panel->g_task.icon_size1);
+}
+
+int task_compute_desired_size(void *obj)
+{
+    Task *task = (Task *)obj;
+    Panel *panel = (Panel *)task->area.panel;
+    int size = panel_horizontal ? panel->g_task.maximum_width : panel->g_task.maximum_height;
+    return size;
 }
 
 void on_change_task(void *obj)
@@ -438,7 +497,11 @@ void on_change_task(void *obj)
     Task *task = (Task *)obj;
     Panel *panel = (Panel *)task->area.panel;
 
-	long value[] = {panel->posx + task->area.posx, panel->posy + task->area.posy, task->area.width, task->area.height};
+    if (task->area.on_screen) {
+        long value[] = {panel->posx + task->area.posx,
+                        panel->posy + task->area.posy,
+                        task->area.width,
+                        task->area.height};
         XChangeProperty(server.display,
                         task->win,
                         server.atom._NET_WM_ICON_GEOMETRY,
@@ -447,6 +510,9 @@ void on_change_task(void *obj)
                         PropModeReplace,
                         (unsigned char *)value,
                         4);
+    } else {
+        XDeleteProperty(server.display, task->win, server.atom._NET_WM_ICON_GEOMETRY);
+    }
 }
 
 Task *find_active_task(Task *current_task)
@@ -525,7 +591,7 @@ void reset_active_task()
     }
 
     Window w1 = get_active_window();
-	// printf("Change active task %ld\n", w1);
+    // fprintf(stderr, "tint2: Change active task %ld\n", w1);
 
     if (w1) {
         if (!get_task_buttons(w1)) {
@@ -556,13 +622,15 @@ void set_task_state(Task *task, TaskState state)
         }
     }
 
-	if (task->current_state != state || hide_task_diff_monitor) {
+    if (task->current_state != state || hide_task_diff_monitor || hide_task_diff_desktop) {
         GPtrArray *task_buttons = get_task_buttons(task->win);
         if (task_buttons) {
             for (int i = 0; i < task_buttons->len; ++i) {
                 Task *task1 = g_ptr_array_index(task_buttons, i);
                 task1->current_state = state;
                 task1->area.bg = panels[0].g_task.background[state];
+                free_area_gradient_instances(&task1->area);
+                instantiate_area_gradients(&task1->area);
                 schedule_redraw(&task1->area);
                 if (state == TASK_ACTIVE && g_slist_find(urgent_list, task1))
                     del_urgent(task1);
@@ -578,6 +646,10 @@ void set_task_state(Task *task, TaskState state)
                         hide = TRUE;
                     }
                 }
+                if (hide_task_diff_desktop) {
+                    if (taskbar->desktop != server.desktop)
+                        hide = TRUE;
+                }
                 if (get_window_monitor(task->win) != ((Panel *)task->area.panel)->monitor &&
                     (hide_task_diff_monitor || num_panels > 1)) {
                     hide = TRUE;
@@ -591,7 +663,7 @@ void set_task_state(Task *task, TaskState state)
                     p->area.resize_needed = TRUE;
                 }
             }
-			panel_refresh = TRUE;
+            schedule_panel_redraw();
         }
     }
 }
@@ -609,7 +681,7 @@ void blink_urgent(void *arg)
         }
         urgent_task = urgent_task->next;
     }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 }
 
 void add_urgent(Task *task)
@@ -645,3 +717,76 @@ void del_urgent(Task *task)
         urgent_timeout = NULL;
     }
 }
+
+void task_handle_mouse_event(Task *task, MouseAction action)
+{
+    if (!task)
+        return;
+    switch (action) {
+    case NONE:
+        break;
+    case CLOSE:
+        close_window(task->win);
+        break;
+    case TOGGLE:
+        activate_window(task->win);
+        break;
+    case ICONIFY:
+        XIconifyWindow(server.display, task->win, server.screen);
+        break;
+    case TOGGLE_ICONIFY:
+        if (active_task && task->win == active_task->win)
+            XIconifyWindow(server.display, task->win, server.screen);
+        else
+            activate_window(task->win);
+        break;
+    case SHADE:
+        toggle_window_shade(task->win);
+        break;
+    case MAXIMIZE_RESTORE:
+        toggle_window_maximized(task->win);
+        break;
+    case MAXIMIZE:
+        toggle_window_maximized(task->win);
+        break;
+    case RESTORE:
+        toggle_window_maximized(task->win);
+        break;
+    case DESKTOP_LEFT: {
+        if (task->desktop == 0)
+            break;
+        int desktop = task->desktop - 1;
+        change_window_desktop(task->win, desktop);
+        if (desktop == server.desktop)
+            activate_window(task->win);
+        break;
+    }
+    case DESKTOP_RIGHT: {
+        if (task->desktop == server.num_desktops)
+            break;
+        int desktop = task->desktop + 1;
+        change_window_desktop(task->win, desktop);
+        if (desktop == server.desktop)
+            activate_window(task->win);
+        break;
+    }
+    case NEXT_TASK: {
+        Task *task1 = next_task(find_active_task(task));
+        activate_window(task1->win);
+    } break;
+    case PREV_TASK: {
+        Task *task1 = prev_task(find_active_task(task));
+        activate_window(task1->win);
+    }
+    }
+}
+
+void task_update_desktop(Task *task)
+{
+    // fprintf(stderr, "tint2: %s %d:\n", __FUNCTION__, __LINE__);
+    Window win = task->win;
+    remove_task(task);
+    task = add_task(win);
+    reset_active_task();
+    schedule_panel_redraw();
+}

src/taskbar/task.h

@@ -10,6 +10,7 @@
 #include <X11/Xlib.h>
 #include <pango/pangocairo.h>
 #include <Imlib2.h>
+
 #include "common.h"
 #include "timer.h"
 
@@ -36,6 +37,7 @@ typedef struct GlobalTask {
     int brightness[TASK_STATE_COUNT];
     int config_asb_mask;
     Background *background[TASK_STATE_COUNT];
+    GList *gradient[TASK_STATE_COUNT];
     int config_background_mask;
     // starting position for text ~ task_padding + task_border + icon_size
     double text_posx, text_height;
@@ -67,6 +69,11 @@ typedef struct Task {
     int win_w;
     int win_h;
     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;
@@ -79,9 +86,11 @@ void draw_task(void *obj, cairo_t *c);
 void on_change_task(void *obj);
 
 void task_update_icon(Task *task);
+void task_update_desktop(Task *task);
 gboolean task_update_title(Task *task);
 void reset_active_task();
 void set_task_state(Task *task, TaskState state);
+void task_handle_mouse_event(Task *task, MouseAction action);
 
 // Given a pointer to the task that is currently under the mouse (current_task),
 // returns a pointer to the Task for the active window on the same taskbar.

src/taskbar/taskbar.c

@@ -39,13 +39,16 @@ Task *active_task;
 Task *task_drag;
 gboolean taskbar_enabled;
 gboolean taskbar_distribute_size;
+gboolean hide_task_diff_desktop;
 gboolean hide_inactive_tasks;
 gboolean hide_task_diff_monitor;
+gboolean hide_taskbar_if_empty;
 gboolean always_show_all_desktop_tasks;
 TaskbarSortMethod taskbar_sort_method;
 Alignment taskbar_alignment;
 
 void taskbar_init_fonts();
+int taskbar_compute_desired_size(void *obj);
 
 // Removes the task with &win = key. The other args are ignored.
 void taskbar_remove_task(Window *win);
@@ -72,8 +75,10 @@ void default_taskbar()
     urgent_list = NULL;
     taskbar_enabled = FALSE;
     taskbar_distribute_size = FALSE;
+    hide_task_diff_desktop = FALSE;
     hide_inactive_tasks = FALSE;
     hide_task_diff_monitor = FALSE;
+    hide_taskbar_if_empty = FALSE;
     always_show_all_desktop_tasks = FALSE;
     taskbar_sort_method = TASKBAR_NOSORT;
     taskbar_alignment = ALIGN_LEFT;
@@ -82,7 +87,6 @@ void default_taskbar()
 
 void cleanup_taskbar()
 {
-	cleanup_taskbarname();
     if (win_to_task) {
         while (g_hash_table_size(win_to_task)) {
             GHashTableIter iter;
@@ -96,6 +100,7 @@ void cleanup_taskbar()
         g_hash_table_destroy(win_to_task);
         win_to_task = NULL;
     }
+    cleanup_taskbarname();
     for (int i = 0; i < num_panels; i++) {
         Panel *panel = &panels[i];
         for (int j = 0; j < panel->num_desktops; j++) {
@@ -114,6 +119,15 @@ void cleanup_taskbar()
     urgent_list = NULL;
 
     stop_timeout(urgent_timeout);
+
+    for (int state = 0; state < TASK_STATE_COUNT; state++) {
+        g_list_free(panel_config.g_task.gradient[state]);
+    }
+
+    for (int state = 0; state < TASKBAR_STATE_COUNT; state++) {
+        g_list_free(panel_config.g_taskbar.gradient[state]);
+        g_list_free(panel_config.g_taskbar.gradient_name[state]);
+    }
 }
 
 void init_taskbar()
@@ -163,17 +177,20 @@ void init_taskbar_panel(void *p)
     panel->g_taskbar.area.size_mode = LAYOUT_DYNAMIC;
     panel->g_taskbar.area.alignment = taskbar_alignment;
     panel->g_taskbar.area._resize = resize_taskbar;
+    panel->g_taskbar.area._compute_desired_size = taskbar_compute_desired_size;
     panel->g_taskbar.area._is_under_mouse = full_width_area_is_under_mouse;
     panel->g_taskbar.area.resize_needed = 1;
     panel->g_taskbar.area.on_screen = TRUE;
     if (panel_horizontal) {
-		panel->g_taskbar.area.posy = panel->area.bg->border.width + panel->area.paddingy;
-		panel->g_taskbar.area.height = panel->area.height - (2 * panel->g_taskbar.area.posy);
+        panel->g_taskbar.area.posy = top_border_width(&panel->area) + panel->area.paddingy;
+        panel->g_taskbar.area.height =
+            panel->area.height - top_bottom_border_width(&panel->area) - 2 * panel->area.paddingy;
         panel->g_taskbar.area_name.posy = panel->g_taskbar.area.posy;
         panel->g_taskbar.area_name.height = panel->g_taskbar.area.height;
     } else {
-		panel->g_taskbar.area.posx = panel->area.bg->border.width + panel->area.paddingy;
-		panel->g_taskbar.area.width = panel->area.width - (2 * panel->g_taskbar.area.posx);
+        panel->g_taskbar.area.posx = left_border_width(&panel->area) + panel->area.paddingy;
+        panel->g_taskbar.area.width =
+            panel->area.width - left_right_border_width(&panel->area) - 2 * panel->area.paddingy;
         panel->g_taskbar.area_name.posx = panel->g_taskbar.area.posx;
         panel->g_taskbar.area_name.width = panel->g_taskbar.area.width;
     }
@@ -223,22 +240,26 @@ void init_taskbar_panel(void *p)
     if ((panel->g_task.config_background_mask & (1 << TASK_URGENT)) == 0)
         panel->g_task.background[TASK_URGENT] = panel->g_task.background[TASK_ACTIVE];
 
-	if (!panel->g_task.maximum_width)
+    if (!panel->g_task.maximum_width || !panel_horizontal)
         panel->g_task.maximum_width = server.monitors[panel->monitor].width;
-	if (!panel->g_task.maximum_height)
+    if (!panel->g_task.maximum_height || panel_horizontal)
         panel->g_task.maximum_height = server.monitors[panel->monitor].height;
 
     if (panel_horizontal) {
         panel->g_task.area.posy = panel->g_taskbar.area.posy +
-								  panel->g_taskbar.background[TASKBAR_NORMAL]->border.width +
+                                  top_bg_border_width(panel->g_taskbar.background[TASKBAR_NORMAL]) +
                                   panel->g_taskbar.area.paddingy;
         panel->g_task.area.width = panel->g_task.maximum_width;
-		panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy);
+        panel->g_task.area.height = panel->g_taskbar.area.height -
+                                    top_bottom_bg_border_width(panel->g_taskbar.background[TASKBAR_NORMAL]) -
+                                    2 * panel->g_taskbar.area.paddingy;
     } else {
         panel->g_task.area.posx = panel->g_taskbar.area.posx +
-								  panel->g_taskbar.background[TASKBAR_NORMAL]->border.width +
+                                  left_bg_border_width(panel->g_taskbar.background[TASKBAR_NORMAL]) +
                                   panel->g_taskbar.area.paddingy;
-		panel->g_task.area.width = panel->area.width - (2 * panel->g_task.area.posx);
+        panel->g_task.area.width = panel->g_taskbar.area.width -
+                                   left_right_bg_border_width(panel->g_taskbar.background[TASKBAR_NORMAL]) -
+                                   2 * panel->g_taskbar.area.paddingy;
         panel->g_task.area.height = panel->g_task.maximum_height;
     }
 
@@ -246,7 +267,7 @@ void init_taskbar_panel(void *p)
         if (!panel->g_task.background[j])
             panel->g_task.background[j] = &g_array_index(backgrounds, Background, 0);
         if (panel->g_task.background[j]->border.radius > panel->g_task.area.height / 2) {
-			printf("task%sbackground_id has a too large rounded value. Please fix your tint2rc\n",
+            fprintf(stderr, "tint2: task%sbackground_id has a too large rounded value. Please fix your tint2rc\n",
                    j == 0 ? "_" : j == 1 ? "_active_" : j == 2 ? "_iconified_" : "_urgent_");
             g_array_append_val(backgrounds, *panel->g_task.background[j]);
             panel->g_task.background[j] = &g_array_index(backgrounds, Background, backgrounds->len - 1);
@@ -268,25 +289,16 @@ void init_taskbar_panel(void *p)
                    PANGO_ELLIPSIZE_END,
                    FALSE);
 
-	panel->g_task.text_posx = panel->g_task.background[0]->border.width + panel->g_task.area.paddingxlr;
-	panel->g_task.text_height = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
+    panel->g_task.text_posx = left_bg_border_width(panel->g_task.background[0]) + panel->g_task.area.paddingxlr;
+    panel->g_task.text_height =
+        panel->g_task.area.height - (2 * panel->g_task.area.paddingy) - top_bottom_border_width(&panel->g_task.area);
     if (panel->g_task.has_icon) {
-		panel->g_task.icon_size1 =
-			MIN(MIN(panel->g_task.maximum_width, panel->g_task.maximum_height),
+        panel->g_task.icon_size1 = MIN(MIN(panel->g_task.maximum_width, panel->g_task.maximum_height),
                                        MIN(panel->g_task.area.width, panel->g_task.area.height)) -
-			(2 * panel->g_task.area.paddingy) - 2 * panel->g_task.area.bg->border.width;
+                                   2 * panel->g_task.area.paddingy - MAX(left_right_border_width(&panel->g_task.area),
+                                                                         top_bottom_border_width(&panel->g_task.area));
         panel->g_task.text_posx += panel->g_task.icon_size1 + panel->g_task.area.paddingx;
         panel->g_task.icon_posy = (panel->g_task.area.height - panel->g_task.icon_size1) / 2;
-		if (0)
-			printf("task: icon_size = %d, textx = %f, texth = %f, icony = %d, w = %d, h = %d, maxw = %d, maxh = %d\n",
-				   panel->g_task.icon_size1,
-				   panel->g_task.text_posx,
-				   panel->g_task.text_height,
-				   panel->g_task.icon_posy,
-				   panel->g_task.area.width,
-				   panel->g_task.area.height,
-				   panel->g_task.maximum_width,
-				   panel->g_task.maximum_height);
     }
 
     Taskbar *taskbar;
@@ -296,10 +308,15 @@ void init_taskbar_panel(void *p)
         taskbar = &panel->taskbar[j];
         memcpy(&taskbar->area, &panel->g_taskbar.area, sizeof(Area));
         taskbar->desktop = j;
-		if (j == server.desktop)
+        if (j == server.desktop) {
             taskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
-		else
+            free_area_gradient_instances(&taskbar->area);
+            instantiate_area_gradients(&taskbar->area);
+        } else {
             taskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
+            free_area_gradient_instances(&taskbar->area);
+            instantiate_area_gradients(&taskbar->area);
+        }
     }
     init_taskbarname_panel(panel);
 }
@@ -341,7 +358,7 @@ void taskbar_default_font_changed()
             }
         }
     }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 }
 
 void taskbar_remove_task(Window *win)
@@ -368,7 +385,7 @@ void taskbar_refresh_tasklist()
 {
     if (!taskbar_enabled)
         return;
-	// fprintf(stderr, "%s %d:\n", __FUNCTION__, __LINE__);
+    // fprintf(stderr, "tint2: %s %d:\n", __FUNCTION__, __LINE__);
 
     int num_results;
     Window *win = server_get_property(server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
@@ -394,12 +411,28 @@ void taskbar_refresh_tasklist()
     XFree(win);
 }
 
+int taskbar_compute_desired_size(void *obj)
+{
+    Taskbar *taskbar = (Taskbar *)obj;
+    Panel *panel = (Panel *)taskbar->area.panel;
+
+    if (taskbar_mode == MULTI_DESKTOP && !taskbar_distribute_size) {
+        int result = 0;
+        for (int i = 0; i < panel->num_desktops; i++) {
+            Taskbar *t = &panel->taskbar[i];
+            result = MAX(result, container_compute_desired_size(&t->area));
+        }
+        return result;
+    }
+    return container_compute_desired_size(&taskbar->area);
+}
+
 gboolean resize_taskbar(void *obj)
 {
     Taskbar *taskbar = (Taskbar *)obj;
     Panel *panel = (Panel *)taskbar->area.panel;
 
-	// printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
+    // fprintf(stderr, "tint2: resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
     if (panel_horizontal) {
         relayout_with_constraint(&taskbar->area, panel->g_task.maximum_width);
 
@@ -413,29 +446,74 @@ gboolean resize_taskbar(void *obj)
                 break;
             }
         }
-		taskbar->text_width =
-			text_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingxlr;
+        taskbar->text_width = text_width - panel->g_task.text_posx - right_border_width(&panel->g_task.area) -
+                              panel->g_task.area.paddingxlr;
     } else {
         relayout_with_constraint(&taskbar->area, panel->g_task.maximum_height);
 
         taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx -
-							  panel->g_task.area.bg->border.width - panel->g_task.area.paddingxlr;
+                              right_border_width(&panel->g_task.area) - panel->g_task.area.paddingxlr;
     }
     return FALSE;
 }
 
+gboolean taskbar_is_empty(Taskbar *taskbar)
+{
+    GList *l = taskbar->area.children;
+    if (taskbarname_enabled)
+        l = l->next;
+    for (; l != NULL; l = l->next) {
+        if (((Task *)l->data)->area.on_screen) {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+void update_taskbar_visibility(Taskbar *taskbar)
+{
+    if (taskbar->desktop == server.desktop) {
+        // Taskbar for current desktop is always shown
+        show(&taskbar->area);
+    } else if (taskbar_mode == MULTI_DESKTOP) {
+        if (hide_taskbar_if_empty) {
+            if (taskbar_is_empty(taskbar)) {
+                hide(&taskbar->area);
+            } else {
+                show(&taskbar->area);
+            }
+        } else {
+            show(&taskbar->area);
+        }
+    } else {
+        hide(&taskbar->area);
+    }
+}
+
+void update_all_taskbars_visibility()
+{
+    for (int i = 0; i < num_panels; i++) {
+        Panel *panel = &panels[i];
+        for (int j = 0; j < panel->num_desktops; j++) {
+            update_taskbar_visibility(&panel->taskbar[j]);
+        }
+    }
+}
+
 void set_taskbar_state(Taskbar *taskbar, TaskbarState state)
 {
     taskbar->area.bg = panels[0].g_taskbar.background[state];
+    free_area_gradient_instances(&taskbar->area);
+    instantiate_area_gradients(&taskbar->area);
+
     if (taskbarname_enabled) {
         taskbar->bar_name.area.bg = panels[0].g_taskbar.background_name[state];
+        free_area_gradient_instances(&taskbar->bar_name.area);
+        instantiate_area_gradients(&taskbar->bar_name.area);
     }
-	if (taskbar_mode != MULTI_DESKTOP) {
-		if (state == TASKBAR_NORMAL)
-			taskbar->area.on_screen = FALSE;
-		else
-			taskbar->area.on_screen = TRUE;
-	}
+
+    update_taskbar_visibility(taskbar);
+
     if (taskbar->area.on_screen) {
         schedule_redraw(&taskbar->area);
         if (taskbarname_enabled) {
@@ -449,24 +527,17 @@ void set_taskbar_state(Taskbar *taskbar, TaskbarState state)
             for (; l; l = l->next)
                 schedule_redraw((Area *)l->data);
         }
-	}
-	panel_refresh = TRUE;
-}
-
-void update_taskbar_visibility(void *p)
-{
-	Panel *panel = (Panel *)p;
-
-	for (int j = 0; j < panel->num_desktops; j++) {
-		Taskbar *taskbar = &panel->taskbar[j];
-		if (taskbar_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
-			// SINGLE_DESKTOP and not current desktop
-			taskbar->area.on_screen = FALSE;
-		} else {
-			taskbar->area.on_screen = TRUE;
+        if (taskbar_mode == MULTI_DESKTOP && hide_task_diff_desktop) {
+            GList *l = taskbar->area.children;
+            if (taskbarname_enabled)
+                l = l->next;
+            for (; l; l = l->next) {
+                Task *task = (Task *)l->data;
+                set_task_state(task, task->current_state);
             }
         }
-	panel_refresh = TRUE;
+    }
+    schedule_panel_redraw();
 }
 
 #define NONTRIVIAL 2
@@ -579,7 +650,7 @@ void sort_tasks(Taskbar *taskbar)
 
     taskbar->area.children = g_list_sort_with_data(taskbar->area.children, (GCompareDataFunc)compare_tasks, taskbar);
     taskbar->area.resize_needed = TRUE;
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
     ((Panel *)taskbar->area.panel)->area.resize_needed = TRUE;
 }
 
@@ -604,3 +675,18 @@ void sort_taskbar_for_win(Window win)
         }
     }
 }
+
+void update_minimized_icon_positions(void *p)
+{
+    Panel *panel = (Panel *)p;
+    for (int i = 0; i < panel->num_desktops; i++) {
+        Taskbar *taskbar = &panel->taskbar[i];
+        if (!taskbar->area.on_screen)
+            continue;
+        for (GList *c = taskbar->area.children; c; c = c->next) {
+            Area *area = (Area *)c->data;
+            if (area->_on_change_layout)
+                area->_on_change_layout(area);
+        }
+    }
+}

src/taskbar/taskbar.h

@@ -43,12 +43,16 @@ typedef struct GlobalTaskbar {
     Area area_name;
     Background *background[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_task_diff_desktop;
 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,10 +83,13 @@ 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.
-void update_taskbar_visibility(void *p);
+// Updates the visibility of all taskbars
+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);

src/taskbar/taskbarname.c

@@ -37,6 +37,7 @@ Color taskbarname_font;
 Color taskbarname_active_font;
 
 void taskbarname_init_fonts();
+int taskbarname_compute_desired_size(void *obj);
 
 void default_taskbarname()
 {
@@ -60,10 +61,12 @@ void init_taskbarname_panel(void *p)
         taskbar->bar_name.area.parent = taskbar;
         taskbar->bar_name.area.has_mouse_over_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;
+        if (j == server.desktop) {
             taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
-		else
+        } else {
             taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
+        }
 
         // use desktop number if name is missing
         if (l) {
@@ -75,6 +78,7 @@ void init_taskbarname_panel(void *p)
 
         // append the name at the beginning of taskbar
         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)
@@ -109,7 +113,7 @@ void taskbarname_default_font_changed()
             schedule_redraw(&taskbar->bar_name.area);
         }
     }
-	panel_refresh = TRUE;
+    schedule_panel_redraw();
 }
 
 void cleanup_taskbarname()
@@ -126,14 +130,11 @@ void cleanup_taskbarname()
     }
 }
 
-gboolean resize_taskbarname(void *obj)
+int taskbarname_compute_desired_size(void *obj)
 {
-	TaskbarName *taskbar_name = obj;
-	Panel *panel = taskbar_name->area.panel;
+    TaskbarName *taskbar_name = (TaskbarName *)obj;
+    Panel *panel = (Panel *)taskbar_name->area.panel;
     int name_height, name_width, name_height_ink;
-	gboolean result = FALSE;
-
-	schedule_redraw(&taskbar_name->area);
     get_text_size2(panel_config.taskbarname_font_desc,
                    &name_height_ink,
                    &name_height,
@@ -147,14 +148,41 @@ gboolean resize_taskbarname(void *obj)
                    FALSE);
 
     if (panel_horizontal) {
-		int new_size = name_width + (2 * (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
+        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 = (TaskbarName *)obj;
+    Panel *panel = (Panel *)taskbar_name->area.panel;
+
+    schedule_redraw(&taskbar_name->area);
+
+    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);
+
+    gboolean result = FALSE;
+    int new_size = taskbarname_compute_desired_size(obj);
+    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 {
-		int new_size = name_height + (2 * (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
         if (new_size != taskbar_name->area.height) {
             taskbar_name->area.height = new_size;
             taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
@@ -186,3 +214,35 @@ void draw_taskbarname(void *obj, cairo_t *c)
 
     g_object_unref(layout);
 }
+
+void update_desktop_names()
+{
+    if (!taskbarname_enabled)
+        return;
+    GSList *list = get_desktop_names();
+    for (int i = 0; i < num_panels; i++) {
+        int j;
+        GSList *l;
+        for (j = 0, l = list; j < panels[i].num_desktops; j++) {
+            gchar *name;
+            if (l) {
+                name = g_strdup(l->data);
+                l = l->next;
+            } else {
+                name = g_strdup_printf("%d", j + 1);
+            }
+            Taskbar *taskbar = &panels[i].taskbar[j];
+            if (strcmp(name, taskbar->bar_name.name) != 0) {
+                g_free(taskbar->bar_name.name);
+                taskbar->bar_name.name = name;
+                taskbar->bar_name.area.resize_needed = 1;
+            } else {
+                g_free(name);
+            }
+        }
+    }
+    for (GSList *l = list; l; l = l->next)
+        g_free(l->data);
+    g_slist_free(list);
+    schedule_panel_redraw();
+}

src/taskbar/taskbarname.h

@@ -23,4 +23,6 @@ gboolean resize_taskbarname(void *obj);
 
 void taskbarname_default_font_changed();
 
+void update_desktop_names();
+
 #endif

src/tint2conf/CMakeLists.txt

@@ -22,14 +22,18 @@ include_directories( ../util
 set(SOURCES ../util/common.c
             ../util/strnatcmp.c
             ../util/cache.c
+            ../util/timer.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 )
 
@@ -57,12 +61,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" )
@@ -70,6 +70,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.desktop DESTINATION ${DATADIR}/applications )
-install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
+install( FILES tint2conf.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+install( FILES tint2conf.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
+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.c

@@ -34,6 +34,7 @@ void refresh_theme(const char *given_path);
 void remove_theme(const char *given_path);
 static void theme_selection_changed(GtkWidget *treeview, gpointer userdata);
 static gchar *find_theme_in_system_dirs(const gchar *given_name);
+static void load_specific_themes(char **paths, int count);
 
 // ====== Utilities ======
 
@@ -73,7 +74,7 @@ gboolean endswith(const char *str, const char *suffix)
 // Returns TRUE if the theme file is in ~/.config.
 gboolean theme_is_editable(const char *filepath)
 {
-	return startswith(filepath, g_get_user_config_dir());
+    return access(filepath, W_OK) == 0;
 }
 
 // Returns TRUE if the theme file is ~/.config/tint2/tint2rc.
@@ -118,7 +119,7 @@ gchar *import_no_overwrite(const char *filepath)
     if (!g_file_test(newpath, G_FILE_TEST_EXISTS)) {
         copy_file(filepath, newpath);
         theme_list_append(newpath);
-		g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+        g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
     }
 
     return newpath;
@@ -137,7 +138,7 @@ void import_with_overwrite(const char *filepath, const char *newpath)
     if (theme_is_editable(newpath)) {
         if (!theme_existed) {
             theme_list_append(newpath);
-			g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+            g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
         } else {
             int unused = system("killall -SIGUSR1 tint2 || pkill -SIGUSR1 -x tint2");
             (void)unused;
@@ -157,7 +158,7 @@ static void menuImportFile();
 static void menuSaveAs();
 static void menuDelete();
 static void menuReset();
-static void edit_theme();
+static gboolean edit_theme(gpointer ignored);
 static void make_selected_theme_default();
 static void menuAbout();
 static gboolean view_onPopupMenu(GtkWidget *treeview, gpointer userdata);
@@ -166,6 +167,7 @@ static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeV
 
 static void select_first_theme();
 static void load_all_themes();
+static void reload_all_themes();
 
 // ====== Globals ======
 
@@ -225,19 +227,19 @@ int main(int argc, char **argv)
     {
         gchar *tint2_config_dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL);
         if (!g_file_test(tint2_config_dir, G_FILE_TEST_IS_DIR))
-			g_mkdir(tint2_config_dir, 0777);
+            g_mkdir_with_parents(tint2_config_dir, 0700);
         g_free(tint2_config_dir);
     }
 
     g_set_application_name(_("tint2conf"));
-	gtk_window_set_default_icon_name("taskbar");
+    gtk_window_set_default_icon_name("tint2conf");
 
     // config file uses '.' as decimal separator
     setlocale(LC_NUMERIC, "POSIX");
 
     // define main layout : container, menubar, toolbar
     g_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_title(GTK_WINDOW(g_window), _("Panel theming"));
+    gtk_window_set_title(GTK_WINDOW(g_window), _("Tint2 panel themes"));
     gtk_window_resize(GTK_WINDOW(g_window), 920, 600);
     g_signal_connect(G_OBJECT(g_window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
     vBox = gtk_vbox_new(FALSE, 0);
@@ -247,22 +249,53 @@ int main(int argc, char **argv)
 
     // Menubar and toolbar entries
     GtkActionEntry entries[] =
-		{{"ThemeMenu", NULL, _("Theme"), NULL, NULL, NULL},
-		 {"ThemeImportFile", GTK_STOCK_ADD, _("_Import theme..."), "<Control>N", _("Import theme(s) from file system"), G_CALLBACK(menuImportFile)},
-		 {"ThemeSaveAs", GTK_STOCK_SAVE_AS, _("_Save as..."), NULL, _("Save the theme with a new name"), G_CALLBACK(menuSaveAs)},
+        {{"ThemeMenu", NULL, _("_Theme"), NULL, NULL, NULL},
+         {"ThemeImportFile",
+          GTK_STOCK_ADD,
+          _("_Import theme..."),
+          "<Control>N",
+          _("Import theme(s) from file system"),
+          G_CALLBACK(menuImportFile)},
+         {"ThemeSaveAs",
+          GTK_STOCK_SAVE_AS,
+          _("_Save as..."),
+          NULL,
+          _("Save the theme with a new name"),
+          G_CALLBACK(menuSaveAs)},
          {"ThemeDelete", GTK_STOCK_DELETE, _("_Delete"), NULL, _("Delete the selected theme"), G_CALLBACK(menuDelete)},
-		 {"ThemeReset", GTK_STOCK_REVERT_TO_SAVED, _("_Reset"), NULL, _("Reset the selected theme to default"), G_CALLBACK(menuReset)},
-		 {"ThemeEdit", GTK_STOCK_PROPERTIES, _("_Edit theme..."), NULL, _("Edit the selected theme"), G_CALLBACK(edit_theme)},
-		 {"ThemeMakeDefault", GTK_STOCK_APPLY, _("_Make default"), NULL, _("Replace the default theme with the selected one"), G_CALLBACK(make_selected_theme_default)},
-		 {"ThemeRefresh", GTK_STOCK_REFRESH, _("Refresh"), NULL, _("Redraw the selected theme"), G_CALLBACK(refresh_current_theme)},
-		 {"RefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Redraw all themes"), G_CALLBACK(load_all_themes)},
+         {"ThemeReset",
+          GTK_STOCK_REVERT_TO_SAVED,
+          _("_Reset"),
+          NULL,
+          _("Reset the selected theme to default"),
+          G_CALLBACK(menuReset)},
+         {"ThemeEdit",
+          GTK_STOCK_PROPERTIES,
+          _("_Edit theme..."),
+          NULL,
+          _("Edit the selected theme"),
+          G_CALLBACK(edit_theme)},
+         {"ThemeMakeDefault",
+          GTK_STOCK_APPLY,
+          _("_Make default"),
+          NULL,
+          _("Replace the default theme with the selected one"),
+          G_CALLBACK(make_selected_theme_default)},
+         {"ThemeRefresh",
+          GTK_STOCK_REFRESH,
+          _("Refresh"),
+          NULL,
+          _("Redraw the selected theme"),
+          G_CALLBACK(refresh_current_theme)},
+         {"RefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Redraw all themes"), G_CALLBACK(reload_all_themes)},
          {"Quit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", _("Quit"), G_CALLBACK(gtk_main_quit)},
-		 {"HelpMenu", NULL, _("Help"), NULL, NULL, NULL},
+         {"HelpMenu", NULL, _("_Help"), NULL, NULL, NULL},
          {"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "<Control>A", _("About"), G_CALLBACK(menuAbout)}};
 
     gtk_action_group_add_actions(actionGroup, entries, G_N_ELEMENTS(entries), NULL);
     globalUIManager = gtk_ui_manager_new();
     gtk_ui_manager_insert_action_group(globalUIManager, actionGroup, 0);
+    gtk_window_add_accel_group(GTK_WINDOW(g_window), gtk_ui_manager_get_accel_group(globalUIManager));
     gtk_ui_manager_add_ui_from_string(globalUIManager, global_ui, -1, (NULL));
     g_signal_connect(globalUIManager, "add_widget", G_CALLBACK(menuAddWidget), vBox);
     gtk_ui_manager_ensure_update(globalUIManager);
@@ -303,9 +336,19 @@ int main(int argc, char **argv)
 
     // load themes
     load_all_themes();
+    argc--, argv++;
+    if (argc > 0) {
+        load_specific_themes(argv, argc);
+        g_timeout_add(SNAPSHOT_TICK, edit_theme, NULL);
+    } else if (getenv("TINT2_CONFIG")) {
+        char *themes[2] = {getenv("TINT2_CONFIG"), NULL};
+        load_specific_themes(themes, 1);
+        g_timeout_add(SNAPSHOT_TICK, edit_theme, NULL);
+    }
 
     gtk_widget_show_all(g_window);
     gtk_main();
+
     return 0;
 }
 
@@ -325,10 +368,10 @@ static void menuAbout()
                           "version",
                           VERSION_STRING,
                           "copyright",
-						  _("Copyright 2009-2015 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU "
+                          _("Copyright 2009-2017 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU "
                             "GPL version 3"),
                           "logo-icon-name",
-						  "taskbar",
+                          "tint2conf",
                           "authors",
                           authors,
                           /* Translators: translate "translator-credits" as your name to have it appear in the credits
@@ -400,7 +443,8 @@ gchar *get_selected_theme_or_warn()
     return filepath;
 }
 
-// For the selected theme, shows save dialog (with overwrite confirmation) and copies to the selected file with overwrite.
+// For the selected theme, shows save dialog (with overwrite confirmation) and copies to the selected file with
+// overwrite.
 // Shows error box if no theme is selected.
 static void menuSaveAs()
 {
@@ -418,13 +462,38 @@ static void menuSaveAs()
                                                     GTK_RESPONSE_ACCEPT,
                                                     NULL);
     GtkFileChooser *chooser = GTK_FILE_CHOOSER(dialog);
-	gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
+    gtk_file_chooser_set_do_overwrite_confirmation(chooser, FALSE);
     gchar *config_dir = g_build_filename(g_get_home_dir(), ".config", "tint2", NULL);
     gtk_file_chooser_set_current_folder(chooser, config_dir);
     g_free(config_dir);
+    GtkFileFilter *filter = gtk_file_filter_new();
+    gtk_file_filter_add_pattern(filter, "*.tint2rc");
+    gtk_file_filter_add_pattern(filter, "tint2rc");
+    gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
     gtk_file_chooser_set_current_name(chooser, filename);
     if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
         gchar *newpath = gtk_file_chooser_get_filename(chooser);
+        if (!endswith(newpath, ".tint2rc") && !endswith(newpath, "/tint2rc")) {
+            gchar *proper_path = g_strdup_printf("%s.tint2rc", newpath);
+            g_free(newpath);
+            newpath = proper_path;
+        }
+        if (g_file_test(newpath, G_FILE_TEST_EXISTS)) {
+            GtkWidget *w = gtk_message_dialog_new(GTK_WINDOW(g_window),
+                                                  GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                  GTK_MESSAGE_QUESTION,
+                                                  GTK_BUTTONS_YES_NO,
+                                                  _("A file named \"%s\" already exists.  Do you want to replace it?"),
+                                                  newpath);
+            gint response = gtk_dialog_run(GTK_DIALOG(w));
+            gtk_widget_destroy(w);
+            if (response != GTK_RESPONSE_YES) {
+                g_free(newpath);
+                gtk_widget_destroy(dialog);
+                g_free(filepath);
+                return;
+            }
+        }
         import_with_overwrite(filepath, newpath);
         g_free(newpath);
     }
@@ -609,11 +678,11 @@ void select_theme(const char *given_path)
 }
 
 // Edits the selected theme. If it is read-only, it copies first to ~.
-static void edit_theme()
+static gboolean edit_theme(gpointer ignored)
 {
     gchar *filepath = get_selected_theme_or_warn();
     if (!filepath)
-		return;
+        return FALSE;
 
     gboolean editable = theme_is_editable(filepath);
     if (!editable) {
@@ -631,6 +700,8 @@ static void edit_theme()
     g_free(filepath);
 
     destroy_please_wait();
+
+    return FALSE;
 }
 
 static void make_selected_theme_default()
@@ -646,7 +717,8 @@ static void make_selected_theme_default()
         return;
     }
 
-	GtkWidget *w = gtk_message_dialog_new(GTK_WINDOW(g_window),
+    GtkWidget *w =
+        gtk_message_dialog_new(GTK_WINDOW(g_window),
                                GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                GTK_MESSAGE_QUESTION,
                                GTK_BUTTONS_YES_NO,
@@ -668,7 +740,7 @@ static void make_selected_theme_default()
 
 static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
 {
-	edit_theme();
+    edit_theme(NULL);
 }
 
 // ====== Theme load/reload ======
@@ -800,7 +872,72 @@ static void load_all_themes()
             have_iter = gtk_tree_model_iter_next(model, &iter);
         }
 
-		g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+        g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
+    }
+}
+
+static void reload_all_themes()
+{
+    ensure_default_theme_exists();
+
+    gtk_list_store_clear(GTK_LIST_STORE(theme_list_store));
+    theme_selection_changed(NULL, NULL);
+
+    gboolean found_themes = FALSE;
+    if (load_user_themes())
+        found_themes = TRUE;
+    if (load_system_themes())
+        found_themes = TRUE;
+
+    if (found_themes) {
+        select_first_theme();
+
+        GtkTreeIter iter;
+        GtkTreeModel *model;
+        gboolean have_iter;
+
+        model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+        have_iter = gtk_tree_model_get_iter_first(model, &iter);
+        while (have_iter) {
+            gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, COL_FORCE_REFRESH, TRUE, -1);
+            have_iter = gtk_tree_model_iter_next(model, &iter);
+        }
+
+        g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
+    }
+}
+
+static void load_specific_themes(char **paths, int count)
+{
+    ensure_default_theme_exists();
+
+    gboolean found_themes = FALSE;
+    while (count > 0) {
+        // Load configs
+        const char *file_name = paths[0];
+        paths++, count--;
+        if (g_file_test(file_name, G_FILE_TEST_IS_REGULAR) || g_file_test(file_name, G_FILE_TEST_IS_SYMLINK)) {
+            theme_list_append(file_name);
+            if (!found_themes) {
+                select_theme(file_name);
+                found_themes = TRUE;
+            }
+        }
+    }
+
+    if (found_themes) {
+        GtkTreeIter iter;
+        GtkTreeModel *model;
+        gboolean have_iter;
+
+        model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+        have_iter = gtk_tree_model_get_iter_first(model, &iter);
+        while (have_iter) {
+            gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
+            have_iter = gtk_tree_model_iter_next(model, &iter);
+        }
+
+        g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
     }
 }
 
@@ -811,7 +948,7 @@ void refresh_current_theme()
     GtkTreeModel *model;
     if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) {
         gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
-		g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+        g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
     }
 }
 
@@ -826,7 +963,7 @@ void refresh_theme(const char *given_path)
         gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filepath, -1);
         if (g_str_equal(filepath, given_path)) {
             gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
-			g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)update_snapshot, NULL);
+            g_timeout_add(SNAPSHOT_TICK, update_snapshot, NULL);
             g_free(filepath);
             break;
         }

src/tint2conf/main.h

@@ -15,7 +15,7 @@
 #endif
 
 #define SNAPSHOT_TICK 190
-gboolean update_snapshot();
+gboolean update_snapshot(gpointer ignored);
 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()