Update src/systray/systraybar.c

https://pastebin.com/UxDTv4ML

.clang-format

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

.gitignore

@@ -1,3 +1,7 @@
 build
 *.user
 version.h
+*.pyc
+*.todo
+packaging/make_ubuntu2.sh
+test_*.log

.gitlab-ci.yml

@@ -0,0 +1,34 @@
+stages:
+  - build
+  - test
+  - release
+
+variables:
+  DEBIAN_FRONTEND: 'noninteractive'
+
+job-build:
+  stage: build
+  image: ubuntu:rolling
+  script:
+    - sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list
+    - apt-get update
+    - apt-get build-dep -y tint2
+    - apt-get install -y libgtk-3-dev git
+    - git clean -ffdx
+    - mkdir build
+    - cd build
+    - cmake ..
+    - make -j
+
+job-release:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $CI_COMMIT_TAG =~ /^v.*/
+  script:
+    - echo 'running release_job'
+  release:
+    name: 'Release $CI_COMMIT_TAG'
+    description: 'Release $CI_COMMIT_TAG / $CI_COMMIT_SHA'
+    tag_name: '$CI_COMMIT_TAG'
+    ref: '$CI_COMMIT_SHA'

AUTHORS

@@ -6,6 +6,7 @@ tint2 is developped by :
 - Ovidiu M <mrovi9000 at gmail.com> : launcher, bug fixes
 - Mishael A Sibiryakov (death@junki.org) : freespace
 - Sebastian Reichel <sre@ring0.de> : battery, various fixes, debian package maintainer
+- Chris Lee <chrlee at protonmail> : bug fixes, maintainer starting with v16.3
 
 tint2 is based on the ttm source code (http://code.google.com/p/ttm/)
 - 2007-2008 Pål Staurland <staura@gmail.com>
@@ -29,6 +30,12 @@ Contributors:
   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
+  heisenbug (https://gitlab.com/heisenbugh) : taskbar button tinting with icon color
+  Fabian Carlström : taskbar sort order by app name
+  Chris Billington (https://gitlab.com/chrisjbillington) : panel struts pivoting
+  Arash Rohani <rohani.arash@pm.me> : helped with execp refresh
 
 Translations:
   Bosnian:
@@ -43,3 +50,5 @@ Translations:
     Daniel Napora <napcok@gmail.com>
   Serbian:
     Dino Duratović <dinomol@mail.com>
+  Spanish:
+    Vic <vicmz@yandex.com>

CMakeLists.txt

@@ -6,6 +6,7 @@ option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme configurator for
 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 )
@@ -24,7 +25,7 @@ endif()
 include( FindPkgConfig )
 include( CheckLibraryExists )
 include( CheckCSourceCompiles )
-pkg_check_modules( X11 REQUIRED x11 xcomposite xdamage xinerama xrender xrandr>=1.3 )
+pkg_check_modules( X11 REQUIRED x11 xcomposite xdamage xinerama xext xrender xrandr>=1.3 )
 pkg_check_modules( PANGOCAIRO REQUIRED pangocairo )
 pkg_check_modules( PANGO REQUIRED pango )
 pkg_check_modules( CAIRO REQUIRED cairo )
@@ -61,6 +62,17 @@ else()
 	set(BACKTRACE_L_FLAGS "")
 endif()
 
+check_c_source_compiles(
+    "#define print(x) _Generic((x), default : print_unknown)(x) \n void print_unknown(){} \n int main () { print(0); }"
+    HAS_GENERIC)
+
+if(HAS_GENERIC)
+    add_definitions(-DHAS_GENERIC)
+    set(CSTD "c11")
+else()
+    set(CSTD "c99")
+endif(HAS_GENERIC)
+
 if( ENABLE_RSVG )
 pkg_check_modules( RSVG librsvg-2.0>=2.14.0 )
 endif( ENABLE_RSVG )
@@ -82,7 +94,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_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -D_DEFAULT_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
@@ -94,6 +112,7 @@ include_directories( ${PROJECT_BINARY_DIR}
                      src/tooltip
                      src/util
                      src/execplugin
+                     src/button
                      src/freespace
                      src/separator
                      ${X11_INCLUDE_DIRS}
@@ -108,8 +127,14 @@ include_directories( ${PROJECT_BINARY_DIR}
 
 set( SOURCES src/config.c
              src/panel.c
-             src/server.c
-             src/tint.c
+             src/util/server.c
+             src/main.c
+             src/init.c
+             src/util/signals.c
+             src/util/tracing.c
+             src/mouse_actions.c
+             src/drag_and_drop.c
+             src/default_icon.c
              src/clock/clock.c
              src/systray/systraybar.c
              src/launcher/launcher.c
@@ -122,16 +147,23 @@ 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/bt.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/strlcat.c
+             src/util/print.c
              src/util/gradient.c
+             src/util/test.c
+             src/util/uevent.c
              src/util/window.c )
 
 if( ENABLE_BATTERY )
@@ -172,7 +204,6 @@ endif( ENABLE_SN)
 
 if( ENABLE_UEVENT )
   add_definitions( -DENABLE_UEVENT )
-  set( SOURCES ${SOURCES} src/util/uevent.c)
 endif( ENABLE_UEVENT )
 
 if(ENABLE_BACKTRACE)
@@ -202,14 +233,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 -fuse-ld=gold ")
+  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()
 
-add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" "\"${PROJECT_SOURCE_DIR}\"" )
+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" )
 
 link_directories( ${X11_LIBRARY_DIRS}
                   ${PANGOCAIRO_LIBRARY_DIRS}
@@ -243,10 +283,14 @@ 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=${CSTD} ${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}" )
+
+add_executable(tint2-send src/tint2-send/tint2-send.c)
+target_link_libraries(tint2-send ${X11_LIBRARIES})
 
 install( TARGETS tint2 DESTINATION bin )
+install( TARGETS tint2-send DESTINATION bin )
 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 ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )

ChangeLog

@@ -1,3 +1,182 @@
+2021-12-11 master
+- Enhancements:
+  - Added command to refresh executors (issue #747)
+2021-12-04 17.0.2
+- Fixes:
+  - On dual monitor, when minimizing Chrome window it minimizes on the wrong monitor panel (issue #818)
+2021-05-29 17.0.1
+- Fixes:
+  - Crash on panel cleanup in single-monitor execp (issue #801)
+2021-04-18 17.0
+- Fixes:
+  - Crash when a window icon is large (issue #786) (santouits)
+  - Minute clock doesn't update (issue #786)
+  - Scrollbars in tint2conf (issue #796)
+  - Preserve item order when skipping executors (issue #799)
+  - Image memory leak (issues #704, #721) (Adam M. Trofa)
+  - Incorrect timeout microsecond computation leading to high CPU usage (issue #800)
+- Enhancements:
+  - Port tint2conf to gtk3 (issue #380)
+  - execp_monitor config (issue #799)
+  - Improved executor examples (Nikita Zlobin)
+2019-07-14 16.7
+- Fixes:
+  - Fix spacing around icons in executor without text in vertical panels (issue #716)
+  - Fix Bug: Clock Only Updates Every Minute With Format %s (issue #724)
+  - Fix markup drawing when font shadow enabled (issue #709)
+  - Struts pivoting: workaround for panel positioning between monitors in mutter (Chris Billington)
+- Enhancements:
+  - Blink battery when discharging and low (issue #723)
+  - Add support for battery percentage without % sign (issue #730)
+  - Expand leading ~ in icon paths
+
+2018-08-05 16.6.1
+- Fix packaging regression for debian (issue #715)
+
+2018-08-04 16.6
+- Fix regression in task icon brightness (issue #714)
+
+2018-08-04 16.5
+- Add new build script
+- Add option to sort taskbar by application name
+- Fix regression in image loading
+
+2018-05-03 16.4
+- Update AUTHORS
+- Fixes:
+  - Fix leak in image loading (issue #704)
+  - Executors no longer log unless env var DEBUG_EXECUTORS is set
+
+2018-04-17 16.3
+- Fixes:
+  - Layout in executor (issue #695)
+  - Other small issues
+
+2018-01-21 16.2
+- Fixes:
+  - Proper fix for issue #688
+  - Fix bad word wrapping (issue #693)
+- Enhancements:
+  - Preliminary high DPI support
+
+2017-12-30 16.1
+- Fixes:
+  - Fixed several use-after-free errors in the timer code
+  - Merged patches and fixed other warnings on OpenBSD
+  - Task, Button, Executor: add a bit of slack in the pango text layout,
+    to avoid wrapping due to rounding errors
+
+2017-12-20 16.0
+- Fixes:
+  - Taskbar: `taskbar_distribute_size = 1` now playes well with `task_align = center` and
+    `task_align = right` (issue #688)
+- Enhancements:
+  - Added Spanish translation (contributed by Vicmz)
+  - Executor: updated tooltip documentation (issue #676)
+  - Systray: warn on duplicate config option systray_name_filter (issue #652)
+  - Taskbar: thumbnail support in tooltips
+  - Use C11 if possible to support generic printing for unit tests (should fall back to C99)
+
+2017-11-05 15.3
+- Fixes:
+  - Launcher: Reset signal mask before executing commands (issue #674)
+  - cmake: Do not hardcode path to /etc
+
+2017-10-01 15.2
+- Fixes:
+  - Battery info is now again displayed even when current sensor is missing (https://github.com/jmc-88/tint3/issues/34)
+  - Text elements compute their size correctly (issue #671)
+  - Window order persists on panel restart (issue #615)
+
+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)
@@ -861,3 +1040,16 @@ 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'.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.

README.md

@@ -1,5 +1,9 @@
-# Latest stable release: 0.13.1
-Changes: https://gitlab.com/o9000/tint2/blob/0.13.1/ChangeLog
+# Latest stable release: 17.0.2
+
+The final release of tint2 is 17.0.2.
+The code is frozen and no more feature requests are accepted.
+
+Changes: https://gitlab.com/o9000/tint2/blob/17.0.2/ChangeLog
 
 Documentation: [doc/tint2.md](doc/tint2.md)
 
@@ -8,7 +12,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 0.13.1
+git checkout 17.0.2
 mkdir build
 cd build
 cmake ..
@@ -19,6 +23,8 @@ 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`.
@@ -59,9 +65,9 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
 
 # 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)
+  * Graphical 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 ([issue 627](https://gitlab.com/o9000/tint2/issues/627)).
+  * 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?
 
@@ -83,11 +89,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
 
-* 0.13.1: [Compact panel, separator, color gradients](https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.1.0.gif)
-* 0.12.4: [Executor](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.4.gif)
-* 0.12.3: [Mouse over effects](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.3.gif)
-* 0.12: [Distribute size between taskbars, freespace](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif)
+* [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)

doc/generate-doc.sh

@@ -2,6 +2,9 @@
 
 # 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

doc/manual.html

@@ -199,7 +199,7 @@ pre {
 </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="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.
+<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>
@@ -214,7 +214,7 @@ It was specifically made for Openbox but it should also work with other window m
 <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>
+<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>
@@ -229,6 +229,7 @@ It was specifically made for Openbox but it should also work with other window m
 <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>
@@ -269,8 +270,10 @@ Try to respect as much as possible the order of the options as given below.</p><
 <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>border_content_tint_weight = integer</code> : Mixes the border color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). <em>(since 16.0)</em></p></li>
+<li><p><code>background_content_tint_weight = integer</code> : Mixes the background color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). <em>(since 16.0)</em></p></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
+<p>You can define as many backgrounds as you want. For example, the following config defines two backgrounds:</p><div class="highlight"><pre class="highlight plaintext"><code>rounded = 1
 border_width = 0
 background_color = #282828 100
 border_color = #000000 0
@@ -279,16 +282,14 @@ 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
+</code></pre></div><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><div class="highlight"><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
+</code></pre></div><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
@@ -297,21 +298,17 @@ the gradient index, starting from 1.</p><h4 id="gradient-types">Gradient types<a
 * 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
+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><div class="highlight"><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
+</code></pre></div><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><div class="highlight"><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
+</code></pre></div><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><div class="highlight"><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
+</code></pre></div><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><div class="highlight"><pre class="highlight plaintext"><code>color_stop = percentage #rrggbb opacity
+</code></pre></div><h4 id="gradient-examples">Gradient examples<a name="gradient-examples" href="#gradient-examples" class="md2man-permalink" title="permalink"></a></h4><div class="highlight"><pre class="highlight plaintext"><code># Gradient 1: thin film effect
 gradient = horizontal
 start_color = #111122 30
 end_color = #112211 30
@@ -347,8 +344,7 @@ 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>
+</code></pre></div><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>
@@ -359,15 +355,16 @@ gradient_id_pressed = 2
 <li><code>C</code> shows the Clock</li>
 <li><code>F</code> adds an extensible spacer (freespace). You can specify more than one. Has no effect if <code>T</code> is also present. <em>(since 0.12)</em></li>
 <li><code>E</code> adds an executor plugin. You can specify more than one. <em>(since 0.12.4)</em></li>
+<li><code>P</code> adds a push button. You can specify more than one. <em>(since 0.14)</em></li>
 <li><code>:</code> adds a separator. You can specify more than one. <em>(since 0.13.0)</em></li>
 </ul>
 <p>For example, <code>panel_items = STC</code> will show the systray, the taskbar and the clock (from left to right).</p></li>
-<li><p><code>panel_monitor = monitor (all or 1 or 2 or ...)</code> : Which monitor tint2 draws the panel on</p>
+<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)</em></p></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>
@@ -382,11 +379,12 @@ gradient_id_pressed = 2
 <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>
+<li><p><code>scale_relative_to_dpi = integer</code> : If set to a non-zero value, HiDPI scaling is enabled. Each panel is visible on a different monitor. Thus each panel has a specific scaling factor. The scaling factor is computed as the ratio between the monitor DPI (obtained from the dimensions in pixels and millimeters from RandR) and a configured reference DPI - this is the DPI for which exising user configs looked normal, for backward compatibility.</p></li>
+<li><p><code>scale_relative_to_screen_height = integer</code> : Similar to <code>scale_relative_to_dpi</code>, except the scaling factor is computed as the ratio between the monitor height and <code>scale_relative_to_screen_height</code>. The effect is cumulative with <code>scale_relative_to_dpi</code>, i.e. if both options are present, the factors are multiplied.</p></li>
 </ul>
-<pre class="highlight plaintext"><code># The panel's width is 94% the size of the monitor, the height is 30 pixels:
+<div class="highlight"><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>
-
+</code></pre></div>
 <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>
@@ -401,8 +399,9 @@ panel_size = 94% 30
 <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_pivot_struts = boolean (0 or 1)</code> : Defines if tint2 lies to the window manager about its orientation (horizontal vs vertical) when requesting reserved space with STRUTs (see <code>strut_policy</code> below). On some window managers, this allows placing a panel in the middle of the virtual screen, e.g. on the bottom edge of the top monitor in a vertical dual-monitor setup. </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>
+<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 generally must be placed at the edge (not in the middle) of the virtual screen for this to work correctly (though on some window managers, setting <code>panel_pivot_struts</code> may work around this limitation). </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>
@@ -454,11 +453,13 @@ panel_size = 94% 30
 <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>application</code> : Sorts the tasks by application name. <em>(since 16.3)</em></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>
@@ -478,6 +479,8 @@ panel_size = 94% 30
 <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_thumbnail = boolean (0 or 1)</code> : Whether to show thumbnail tooltips for tasks. <em>(since 16.0)</em></p></li>
+<li><p><code>task_thumbnail_size = width</code> : Thumbnail size. <em>(since 16.0)</em></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>
@@ -521,7 +524,7 @@ panel_size = 94% 30
 <li><p><code>systray_sort = ascending/descending/left2right/right2left</code> : Specifies the sorting order for the icons in the systray: in ascending/descending alphabetical order of the icon title, or always add icons to the right/left (note that with <code>left2right</code> or <code>right2left</code> the order can be different on panel restart).</p></li>
 <li><p><code>systray_icon_size = max_icon_size</code> : Set the maximum system tray icon size to <code>number</code>. Set to <code>0</code> for automatic icon sizing.</p></li>
 <li><p><code>systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjust the systray icons color and transparency.</p></li>
-<li><p><code>systray_monitor = integer (1, 2, ...)</code> :  On which monitor to draw the systray. The first monitor is <code>1</code>. <em>(since 0.12)</em></p></li>
+<li><p><code>systray_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>
@@ -563,10 +566,21 @@ panel_size = 94% 30
 <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_low_cmd = xmessage &#39;tint2: Battery low!&#39;</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>
+<li>%P: Percentage. Without 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>
@@ -581,6 +595,7 @@ panel_size = 94% 30
 <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_name = text</code> : A name that can be used with <code>tint2-send refresh-execp</code> to re-execute the command.</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>
@@ -588,28 +603,27 @@ panel_size = 94% 30
 <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_tooltip = text</code> : The tooltip. If left empty, no tooltip is displayed. If missing, the standard error of the command is shown as a tooltip (an ANSI clear screen sequence can reset the contents, bash: <code>printf &#39;\e[2J&#39;</code>, C: <code>printf(&quot;\x1b[2J&quot;);</code>). If the standard error is empty, the tooltip will show information about the time 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_monitor = integer (1, 2, ...), primary or all</code> :  On which monitor to draw the executor. The first monitor is <code>1</code>. <em>(since 17.0)</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
+<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><div class="highlight"><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
+</code></pre></div><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><div class="highlight"><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
+</code></pre></div><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><div class="highlight"><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
@@ -621,35 +635,47 @@ 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
+</code></pre></div><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><div class="highlight"><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(); }'
+</code></pre></div><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><div class="highlight"><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
+</code></pre></div><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><div class="highlight"><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.
+</code></pre></div><h5 id="memory-usage">Memory usage<a name="memory-usage" href="#memory-usage" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><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_command = free -b -s1 | stdbuf -oL awk '/^Mem:/ { printf "Mem: %s %.0f%%\n", $2, 100 * ($2 - $7) / $2 }' | stdbuf -oL numfmt --to=iec-i --field=2 -d' '
+execp_interval = 1
+execp_continuous = 1
+</code></pre></div><h5 id="network-load">Network load<a name="network-load" href="#network-load" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>execp = new
+execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | stdbuf -oL awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }'
 execp_continuous = 1
 execp_interval = 1
-</code></pre>
+</code></pre></div><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>
@@ -659,145 +685,12 @@ execp_interval = 1
 <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><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 'iconified'
-#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>.
+<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>
+for documentation files, usually <code>/usr/share/doc/tint2</code> or <code>/usr/local/share/doc/tint2</code>.
+.
+.</p>
 </body>
 </html>

doc/readme.html

@@ -199,17 +199,17 @@ pre {
 </style>
 </head>
 <body>
-<h1 id="latest-stable-release-0-13-1"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">0.13.1</span><a name="latest-stable-release-0-13-1" href="#latest-stable-release-0-13-1" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/0.13.1/ChangeLog">https://gitlab.com/o9000/tint2/blob/0.13.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
+<h1 id="latest-stable-release-17-0-2"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">17.0.2</span><a name="latest-stable-release-17-0-2" href="#latest-stable-release-17-0-2" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/17.0.2/ChangeLog">https://gitlab.com/o9000/tint2/blob/17.0.2/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><div class="highlight"><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 0.13.1
+git checkout 17.0.2
 mkdir build
 cd build
 cmake ..
 make -j4
-</code></pre>
-<p>To install, run (as root):</p><pre class="highlight plaintext"><code>make install
-</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>
+</code></pre></div><p>To install, run (as root):</p><div class="highlight"><pre class="highlight plaintext"><code>make install
+update-icon-caches /usr/local/share/icons/hicolor
+update-mime-database /usr/local/share/mime
+</code></pre></div><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>
@@ -237,9 +237,9 @@ make -j4
 </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>
+<li>Graphical 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 (<a href="https://gitlab.com/o9000/tint2/issues/627">issue 627</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>
@@ -254,12 +254,21 @@ make -j4
 <li>Downloads: <a href="https://gitlab.com/o9000/tint2-archive/tree/master">https://gitlab.com/o9000/tint2-archive/tree/master</a> or <a href="https://code.google.com/p/tint2/downloads/list">https://code.google.com/p/tint2/downloads/list</a></li>
 <li>Old project location (inactive): <a href="https://code.google.com/p/tint2">https://code.google.com/p/tint2</a></li>
 </ul>
-<h1 id="screenshots">Screenshots<a name="screenshots" href="#screenshots" class="md2man-permalink" title="permalink"></a></h1><h2 id="default-config">Default config:<a name="default-config" href="#default-config" class="md2man-permalink" title="permalink"></a></h2><p><img src="https://gitlab.com/o9000/tint2/uploads/948fa74eca60864352a033580350b4c3/Screenshot_2016-01-23_14-42-57.png" alt="Screenshot_2016-01-23_14-42-57"></p><h2 id="various-configs">Various configs:<a name="various-configs" href="#various-configs" class="md2man-permalink" title="permalink"></a></h2><p><img src="https://gitlab.com/o9000/tint2/wikis/screenshot.png" alt="screenshot"></p><h2 id="demos">Demos<a name="demos" href="#demos" class="md2man-permalink" title="permalink"></a></h2>
+<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>0.13.1: <a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.1.0.gif">Compact panel, separator, color gradients</a></li>
-<li>0.12.4: <a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.4.gif">Executor</a></li>
-<li>0.12.3: <a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.3.gif">Mouse over effects</a></li>
-<li>0.12: <a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif">Distribute size between taskbars, freespace</a></li>
+<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,10 +1,7 @@
-.TH TINT2 1 "2017\-03\-12"
+.TH TINT2 1 "2021\-12\-04" 17.0.2
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
-.SH SYNOPSIS
-.PP
-\fB\fCtint2 [\-c path_to_config_file]\fR
 .SH DESCRIPTION
 .PP
 tint2 is a simple panel/taskbar made for modern X window managers.
@@ -33,10 +30,19 @@ 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
 \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
@@ -67,6 +73,8 @@ 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]
@@ -142,6 +150,10 @@ The tint2 config file starts with the options defining background elements with
 .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\fCborder_content_tint_weight = integer\fR : Mixes the border color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). \fI(since 16.0)\fP
+.IP \(bu 2
+\fB\fCbackground_content_tint_weight = integer\fR : Mixes the background color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). \fI(since 16.0)\fP
 .RE
 .PP
 You can define as many backgrounds as you want. For example, the following config defines two backgrounds:
@@ -294,12 +306,14 @@ gradient_id_pressed = 2
 .IP \(bu 2
 \fB\fCE\fR adds an executor plugin. You can specify more than one. \fI(since 0.12.4)\fP
 .IP \(bu 2
+\fB\fCP\fR adds a push button. You can specify more than one. \fI(since 0.14)\fP
+.IP \(bu 2
 \fB\fC:\fR adds a separator. You can specify more than one. \fI(since 0.13.0)\fP
 .RE
 .PP
 For example, \fB\fCpanel_items = STC\fR will show the systray, the taskbar and the clock (from left to right).
 .IP \(bu 2
-\fB\fCpanel_monitor = monitor (all or 1 or 2 or ...)\fR : Which monitor tint2 draws the panel on
+\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
@@ -307,7 +321,7 @@ The first monitor is \fB\fC1\fR
 Use \fB\fCpanel_monitor = all\fR to get a separate panel per monitor
 .RE
 .IP \(bu 2
-\fB\fCprimary_monitor_first = boolean (0 or 1)\fR : Place the primary monitor before all the other monitors in the list. \fI(since 0.12.4)\fP
+\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)
@@ -329,6 +343,10 @@ Use \fB\fCpanel_monitor = all\fR to get a separate panel per monitor
 \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
+.IP \(bu 2
+\fB\fCscale_relative_to_dpi = integer\fR : If set to a non\-zero value, HiDPI scaling is enabled. Each panel is visible on a different monitor. Thus each panel has a specific scaling factor. The scaling factor is computed as the ratio between the monitor DPI (obtained from the dimensions in pixels and millimeters from RandR) and a configured reference DPI \- this is the DPI for which exising user configs looked normal, for backward compatibility.
+.IP \(bu 2
+\fB\fCscale_relative_to_screen_height = integer\fR : Similar to \fB\fCscale_relative_to_dpi\fR, except the scaling factor is computed as the ratio between the monitor height and \fB\fCscale_relative_to_screen_height\fR\&. The effect is cumulative with \fB\fCscale_relative_to_dpi\fR, i.e. if both options are present, the factors are multiplied.
 .RE
 .PP
 .RS
@@ -361,9 +379,11 @@ panel_size = 94% 30
 .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_pivot_struts = boolean (0 or 1)\fR : Defines if tint2 lies to the window manager about its orientation (horizontal vs vertical) when requesting reserved space with STRUTs (see \fB\fCstrut_policy\fR below). On some window managers, this allows placing a panel in the middle of the virtual screen, e.g. on the bottom edge of the top monitor in a vertical dual\-monitor setup. 
+.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.
+\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 generally must be placed at the edge (not in the middle) of the virtual screen for this to work correctly (though on some window managers, setting \fB\fCpanel_pivot_struts\fR may work around this limitation). 
 .RS
 .IP \(bu 2
 \fB\fCfollow_size\fR means that the maximized windows always resize to have a common edge with tint2.
@@ -451,6 +471,8 @@ You can switch between virtual desktops.
 .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
@@ -460,6 +482,8 @@ You can switch between virtual desktops.
 .IP \(bu 2
 \fB\fCtitle\fR : Sorts the tasks by title.
 .IP \(bu 2
+\fB\fCapplication\fR : Sorts the tasks by application name. \fI(since 16.3)\fP
+.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
@@ -496,6 +520,10 @@ The following options configure the task buttons in the taskbar:
 .IP \(bu 2
 \fB\fCtask_tooltip = boolean (0 or 1)\fR : Whether to show tooltips for tasks.
 .IP \(bu 2
+\fB\fCtask_thumbnail = boolean (0 or 1)\fR : Whether to show thumbnail tooltips for tasks. \fI(since 16.0)\fP
+.IP \(bu 2
+\fB\fCtask_thumbnail_size = width\fR : Thumbnail size. \fI(since 16.0)\fP
+.IP \(bu 2
 \fB\fCtask_maximum_size = width height\fR
 .RS
 .IP \(bu 2
@@ -568,7 +596,7 @@ The action semantics:
 .IP \(bu 2
 \fB\fCsystray_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjust the systray icons color and transparency.
 .IP \(bu 2
-\fB\fCsystray_monitor = integer (1, 2, ...)\fR :  On which monitor to draw the systray. The first monitor is \fB\fC1\fR\&. \fI(since 0.12)\fP
+\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
@@ -639,7 +667,9 @@ To hide the clock, comment \fB\fCtime1_format\fR and \fB\fCtime2_format\fR\&.
 .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.
+\fB\fCbattery_low_cmd = xmessage 'tint2: 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
@@ -647,6 +677,24 @@ To hide the clock, comment \fB\fCtime1_format\fR and \fB\fCtime2_format\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.
+.IP \(bu 2
+%P: Percentage. Without 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.
@@ -672,6 +720,8 @@ To hide the clock, comment \fB\fCtime1_format\fR and \fB\fCtime2_format\fR\&.
 .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_name = text\fR : A name that can be used with \fB\fCtint2\-send refresh\-execp\fR to re\-execute the command.
+.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
@@ -686,7 +736,7 @@ To hide the clock, comment \fB\fCtime1_format\fR and \fB\fCtime2_format\fR\&.
 .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
+\fB\fCexecp_tooltip = text\fR : The tooltip. If left empty, no tooltip is displayed. If missing, the standard error of the command is shown as a tooltip (an ANSI clear screen sequence can reset the contents, bash: \fB\fCprintf '\\e[2J'\fR, C: \fB\fCprintf("\\x1b[2J");\fR). If the standard error is empty, the tooltip will show information about the time 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
@@ -700,6 +750,8 @@ To hide the clock, comment \fB\fCtime1_format\fR and \fB\fCtime2_format\fR\&.
 .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_monitor = integer (1, 2, ...), primary or all\fR :  On which monitor to draw the executor. The first monitor is \fB\fC1\fR\&. \fI(since 17.0)\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
@@ -783,23 +835,56 @@ execp_markup = 1
 .PP
 .RS
 .nf
+# Note the use of "stdbuf \-oL" to force the program to flush the output line by line.
 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
+execp_command = free \-b \-s1 | stdbuf \-oL awk '/^Mem:/ { printf "Mem: %s %.0f%%\\n", $2, 100 * ($2 \- $7) / $2 }' | stdbuf \-oL numfmt \-\-to=iec\-i \-\-field=2 \-d' '
+execp_interval = 1
+execp_continuous = 1
 .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_command = stdbuf \-oL bwm\-ng \-o csv \-t 1000 | stdbuf \-oL awk \-F ';' '/total/ { printf "Net: %.0f Mb/s\\n", ($5*8/1.0e6) }'
 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
@@ -817,144 +902,7 @@ execp_interval = 1
 .RE
 .SS Example configuration
 .PP
-.RS
-.nf
-#\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
-## 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 'iconified'
-#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
-.fi
-.RE
+See /etc/xdg/tint2/tint2rc.
 .SH AUTHOR
 .PP
 tint2 was written by Thierry Lorthiois \[la]lorthiois@bbsoft.fr\[ra]\&.
@@ -969,3 +917,5 @@ 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

@@ -314,6 +314,7 @@ panel_size = 94% 30
 <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_name = text</code> : A name that can be used with <code>tint2-send refresh-execp</code> to re-execute the command.</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>
@@ -372,14 +373,14 @@ 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) }'
+<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># Note the use of "stdbuf -oL" to force the program to flush the output line by line.
+execp = new
+execp_command = free -b -s1 | stdbuf -oL awk '/^Mem:/ { printf "Mem: %s %.0f%%\n", $2, 100 * ($2 - $7) / $2 }' | stdbuf -oL numfmt --to=iec-i --field=2 -d' '
 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)'
+<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>execp = new
+execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | stdbuf -oL awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }'
 execp_continuous = 1
 execp_interval = 1
 </code></pre>

doc/tint2.md

@@ -1,11 +1,8 @@
-# TINT2 1 "2017-03-12"
+# TINT2 1 "2021-12-04" 17.0.2
 
 ## NAME
 tint2 - lightweight panel/taskbar
 
-## SYNOPSIS
-`tint2 [-c path_to_config_file]`
-
 ## 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.).
@@ -24,10 +21,20 @@ Goals:
   * 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
@@ -58,6 +65,8 @@ Goals:
 
   * [Executor](#executor)
 
+  * [Button](#button)
+
   * [Separator](#separator)
 
   * [Example configuration](#example-configuration)
@@ -110,6 +119,10 @@ The tint2 config file starts with the options defining background elements with
     * `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
 
+  * `border_content_tint_weight = integer` : Mixes the border color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). *(since 16.0)*
+
+  * `background_content_tint_weight = integer` : Mixes the background color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). *(since 16.0)*
+
 You can define as many backgrounds as you want. For example, the following config defines two backgrounds:
 
 ```
@@ -244,15 +257,16 @@ gradient_id_pressed = 2
     * `C` shows the Clock
     * `F` adds an extensible spacer (freespace). You can specify more than one. Has no effect if `T` is also present. *(since 0.12)*
     * `E` adds an executor plugin. You can specify more than one. *(since 0.12.4)*
+    * `P` adds a push button. You can specify more than one. *(since 0.14)*
     * `:` adds a separator. You can specify more than one. *(since 0.13.0)*
 
     For example, `panel_items = STC` will show the systray, the taskbar and the clock (from left to right).
 
-  * `panel_monitor = monitor (all or 1 or 2 or ...)` : Which monitor tint2 draws the panel on
+  * `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)*
+  * `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)
 
@@ -265,6 +279,10 @@ gradient_id_pressed = 2
     * `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:
 
+  * `scale_relative_to_dpi = integer` : If set to a non-zero value, HiDPI scaling is enabled. Each panel is visible on a different monitor. Thus each panel has a specific scaling factor. The scaling factor is computed as the ratio between the monitor DPI (obtained from the dimensions in pixels and millimeters from RandR) and a configured reference DPI - this is the DPI for which exising user configs looked normal, for backward compatibility.
+
+  * `scale_relative_to_screen_height = integer` : Similar to `scale_relative_to_dpi`, except the scaling factor is computed as the ratio between the monitor height and `scale_relative_to_screen_height`. The effect is cumulative with `scale_relative_to_dpi`, i.e. if both options are present, the factors are multiplied.
+
 ```
 # The panel's width is 94% the size of the monitor, the height is 30 pixels:
 panel_size = 94% 30
@@ -288,9 +306,11 @@ panel_size = 94% 30
 
   * `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_pivot_struts = boolean (0 or 1)` : Defines if tint2 lies to the window manager about its orientation (horizontal vs vertical) when requesting reserved space with STRUTs (see `strut_policy` below). On some window managers, this allows placing a panel in the middle of the virtual screen, e.g. on the bottom edge of the top monitor in a vertical dual-monitor setup. 
+
   * `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.
+  * `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 generally must be placed at the edge (not in the middle) of the virtual screen for this to work correctly (though on some window managers, setting `panel_pivot_struts` may work around this limitation). 
     * `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.
@@ -360,11 +380,14 @@ panel_size = 94% 30
 
   * `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.
+    * `application` : Sorts the tasks by application name. *(since 16.3)*
     * `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)*
@@ -397,6 +420,10 @@ The following options configure the task buttons in the taskbar:
 
   * `task_tooltip = boolean (0 or 1)` : Whether to show tooltips for tasks.
 
+  * `task_thumbnail = boolean (0 or 1)` : Whether to show thumbnail tooltips for tasks. *(since 16.0)*
+
+  * `task_thumbnail_size = width` : Thumbnail size. *(since 16.0)*
+
   * `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.
@@ -461,7 +488,7 @@ The action semantics:
 
   * `systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjust the systray icons color and transparency.
 
-  * `systray_monitor = integer (1, 2, ...)` :  On which monitor to draw the systray. The first monitor is `1`. *(since 0.12)*
+  * `systray_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)*
 
@@ -522,7 +549,9 @@ The action semantics:
 
   * `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_low_cmd = xmessage 'tint2: 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]`
 
@@ -530,6 +559,16 @@ The action semantics:
 
   * `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.
+    * %P: Percentage. Without 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.
@@ -554,6 +593,8 @@ The action semantics:
 
   * `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_name = text` : A name that can be used with `tint2-send refresh-execp` to re-execute the command.
+
   * `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)*
@@ -568,7 +609,7 @@ The action semantics:
 
   * `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_tooltip = text` : The tooltip. If left empty, no tooltip is displayed. If missing, the standard error of the command is shown as a tooltip (an ANSI clear screen sequence can reset the contents, bash: `printf '\e[2J'`, C: `printf("\x1b[2J");`). If the standard error is empty, the tooltip will show information about the time 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)*
 
@@ -582,6 +623,8 @@ The action semantics:
 
   * `execp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text` *(since 0.12.4)*
 
+  * `execp_monitor = integer (1, 2, ...), primary or all` :  On which monitor to draw the executor. The first monitor is `1`. *(since 17.0)*
+
   * `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)*
@@ -655,22 +698,49 @@ execp_markup = 1
 ##### Memory usage
 
 ```
+# Note the use of "stdbuf -oL" to force the program to flush the output line by line.
 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
+execp_command = free -b -s1 | stdbuf -oL awk '/^Mem:/ { printf "Mem: %s %.0f%%\n", $2, 100 * ($2 - $7) / $2 }' | stdbuf -oL numfmt --to=iec-i --field=2 -d' '
+execp_interval = 1
+execp_continuous = 1
 ```
 
 ##### 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_command = stdbuf -oL bwm-ng -o csv -t 1000 | stdbuf -oL awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }'
 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)*
@@ -687,142 +757,7 @@ execp_interval = 1
 
 ### Example configuration
 
-```
-#---------------------------------------------
-## 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 'iconified'
-#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
-```
+See /etc/xdg/tint2/tint2rc.
 
 ## AUTHOR
 tint2 was written by Thierry Lorthiois <lorthiois@bbsoft.fr>.
@@ -837,3 +772,5 @@ 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,9 +1,13 @@
 #!/bin/sh
 
-MAJOR=0.13
+SCRIPT_DIR=$(dirname "$0")
 DIRTY=""
+VERSION=""
 
-if git status 1>/dev/null 2>/dev/null
+OLD_DIR=$(pwd)
+cd ${SCRIPT_DIR}
+
+if [ -d .git ] && git status 1>/dev/null 2>/dev/null
 then
     git update-index -q --ignore-submodules --refresh
     # Disallow unstaged changes in the working tree
@@ -31,14 +35,31 @@ then
             DIRTY="-dirty"
         fi
     fi
-    VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY
-else
-    VERSION=$(head -n 1 ChangeLog | cut -d ' ' -f 2)
-    if [ $VERSION = "master" ]
+    if git describe 1>/dev/null 2>/dev/null
     then
-        VERSION=$VERSION-$(head -n 1 ChangeLog | cut -d ' ' -f 1)
+        VERSION=$(git describe 2>/dev/null)$DIRTY
+    elif git log -n 1 1>/dev/null 2>/dev/null
+    then
+        VERSION=$(head -n 1 "ChangeLog" | cut -d ' ' -f 2)
+        if [ "$VERSION" = "master" ]
+        then
+            PREVIOUS=$(grep '^2' "ChangeLog" | head -n 2 | tail -n 1 | cut -d ' ' -f 2)
+            HASH=$(git log -n 1 --pretty=format:%cI.%ct.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g' 2>/dev/null)
+            VERSION=$PREVIOUS-next-$HASH
         fi
     fi
+fi
+
+if [ -z "$VERSION" ]
+then
+    VERSION=$(head -n 1 "ChangeLog" | cut -d ' ' -f 2)
+    if [ "$VERSION" = "master" ]
+    then
+        VERSION=$VERSION-$(head -n 1 "ChangeLog" | cut -d ' ' -f 1)
+    fi
+fi
+
+cd "${OLD_DIR}"
 
 VERSION=$(echo "$VERSION" | sed 's/^v//')
 

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,198 @@
+#!/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.PIPE, close_fds=True)
+  ret = proc.wait()
+  out, err = proc.communicate()
+  for line in out.split("\n"):
+    debug(ansi_pinky + line + ansi_reset)
+  debug(ansi_pinky + "Exit code: " + str(ret))
+  if ret != 0:
+    print(err)
+    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, tiny=False):
+  if v.startswith("v0."):
+    assert v == "v0.14.6"
+    return "v15.0"
+  # v4.11 -> v4.12 or v5.0 or v4.11.1
+  parts = v.split(".")
+  while len(parts) < 3:
+    parts.append("0")
+  assert len(parts) == 3
+  if feature:
+    del parts[-1]
+    parts[-2] = "v" + str(int(parts[-2].replace("v", "")) + 1)
+    parts[-1] = "0"
+  elif tiny:
+    parts[-1] = str(int(parts[-1]) + 1)
+  else:
+    del parts[-1]
+    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("--tiny", 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()
+  info("Old version:", old_version)
+  version = inc_version(old_version, args.feature, args.tiny)
+  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")
+  print "Does this look correct? [y/n]"
+  choice = raw_input().lower()
+  if choice != "y":
+    run("git reset --hard HEAD~ ; git tag -d %s ; git tag -d %s" % (version, readable_version))
+    sys.exit(1)
+  print "Publish? [y/n]"
+  choice = raw_input().lower()
+  if choice != "y":
+    sys.exit(1)
+  run("git push origin master && git push --tags origin master")

packaging/compile-deps.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+PS4='\e[99;33m${BASH_SOURCE}:$LINENO\e[0m '
+set -e
+set -x
+
+sudo apt-get install ninja-build python2.7 wget
+sudo apt-get build-dep libx11-6 libxrender1 libcairo2 libglib2.0-0 libpango-1.0-0 libimlib2 librsvg2-2
+
+export PKG_CONFIG_PATH=""
+
+DEPS=$HOME/tint2-deps
+X11=$(pkg-config --modversion x11)
+XRENDER=$(pkg-config --modversion xrender)
+XCOMPOSITE=$(pkg-config --modversion xcomposite)
+XDAMAGE=$(pkg-config --modversion xdamage)
+XEXT=$(pkg-config --modversion xext)
+XRANDR=$(pkg-config --modversion xrandr)
+XINERAMA=$(pkg-config --modversion xinerama)
+IMLIB=$(pkg-config --modversion imlib2)
+GLIB=$(pkg-config --modversion glib-2.0)
+CAIRO=$(pkg-config --modversion cairo)
+PANGO=$(pkg-config --modversion pango)
+PIXBUF=$(pkg-config --modversion gdk-pixbuf-2.0)
+RSVG=$(pkg-config --modversion librsvg-2.0)
+
+mkdir -p $DEPS/src
+
+function two_digits() {
+    echo "$@" | cut -d. -f 1-2
+}
+
+function download_and_build() {
+    URL="$1"
+    shift
+    CFGARGS="$@"
+    ARCHIVE="$(basename "$URL")"
+    NAME="$(echo "$ARCHIVE" | sed s/\.tar.*$//g)"
+
+    cd "$DEPS/src"
+    rm -rf "$ARCHIVE"
+    rm -rf "$NAME"
+    wget "$URL" -O "$ARCHIVE"
+    tar xf "$ARCHIVE"
+    cd "$NAME"
+    export PKG_CONFIG_PATH="$DEPS/lib/pkgconfig"
+    export PATH="$DEPS/bin:$PATH"
+    export CFLAGS="-O0 -fno-common -fno-omit-frame-pointer -rdynamic -fsanitize=address -g"
+    export LDFLAGS="-Wl,--no-as-needed -Wl,-z,defs -O0 -fno-common -fno-omit-frame-pointer -rdynamic -fsanitize=address -fuse-ld=gold -g -ldl -lasan"
+    if [[ -x ./configure ]]
+    then
+        ./configure "--prefix=$DEPS" "$@"
+        make -j
+        make install
+    elif [[ -f meson.build ]]
+    then
+        mkdir build
+        cd build
+        meson "--prefix=$DEPS" "$@" ..
+        ninja install
+    else
+        echo "unknown build method"
+        exit 1
+    fi
+}
+
+download_and_build "https://www.x.org/archive/individual/lib/libX11-$X11.tar.gz" --enable-static=no
+download_and_build "https://www.x.org/archive//individual/lib/libXrender-$XRENDER.tar.gz" --enable-static=no
+download_and_build "https://www.x.org/archive//individual/lib/libXcomposite-$XCOMPOSITE.tar.gz" --enable-static=no
+download_and_build "https://www.x.org/archive//individual/lib/libXdamage-$XDAMAGE.tar.gz" --enable-static=no
+download_and_build "https://www.x.org/archive//individual/lib/libXext-$XEXT.tar.gz" --enable-static=no
+download_and_build "https://www.x.org/archive//individual/lib/libXrandr-$XRANDR.tar.gz" --enable-static=no
+download_and_build "https://www.x.org/archive//individual/lib/libXinerama-$XINERAMA.tar.gz" --enable-static=no
+download_and_build "https://downloads.sourceforge.net/enlightenment/imlib2-$IMLIB.tar.bz2" --enable-static=no
+download_and_build "https://ftp.gnome.org/pub/gnome/sources/glib/$(two_digits "$GLIB")/glib-$GLIB.tar.xz" --enable-debug=yes
+download_and_build "https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(two_digits "$PIXBUF")/gdk-pixbuf-$PIXBUF.tar.xz"
+download_and_build "https://cairographics.org/snapshots/cairo-$CAIRO.tar.xz"
+download_and_build "https://ftp.gnome.org/pub/gnome/sources/pango/$(two_digits "$PANGO")/pango-$PANGO.tar.xz"
+download_and_build "https://ftp.gnome.org/pub/gnome/sources/librsvg/$(two_digits "$RSVG")/librsvg-$RSVG.tar.xz" --enable-pixbuf-loader

packaging/configure

@@ -0,0 +1,556 @@
+#!/usr/bin/env python2.7
+
+from __future__ import print_function
+
+import argparse
+import errno
+import os
+import shlex
+import subprocess
+import sys
+import tempfile
+
+
+def check_c_compiles(cmd, code):
+    with tempfile.NamedTemporaryFile(suffix='.c') as f:
+        f.write(code)
+        f.flush()
+        cmd += [f.name, '-o', '/dev/null']
+        proc = subprocess.Popen(
+                  cmd,
+                  stdout=subprocess.PIPE,
+                  stderr=subprocess.PIPE)
+        out, err = proc.communicate()
+        ret = proc.returncode
+        return ret == 0
+
+
+def makedirs(path):
+    try:
+        os.makedirs(path)
+    except OSError as e:
+        if e.errno == errno.EEXIST and os.path.isdir(path):
+            pass
+        else:
+            raise
+
+
+def pkg_config(lib):
+    def _pkgconfig(lib, query):
+        lib = lib.replace('>=', ' >= ')
+        cmd = 'pkg-config {} {}'.format(query, lib).split()
+        popen = subprocess.Popen(cmd,
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.PIPE)
+        out, err = popen.communicate()
+        if popen.returncode != 0:
+            print(cmd)
+            print(err)
+            raise ValueError("Could not find library: {}".format(lib))
+        return out.split()
+
+    lf = _pkgconfig(lib, '--libs-only-l')
+    cf = _pkgconfig(lib, '--cflags')
+    ldf = _pkgconfig(lib, '--libs-only-L')
+    print("Found", lib, "in:", ldf)
+    return (lf, cf, ldf)
+
+
+def ninja_escape(s):
+    s = s.replace(' ', '$ ')
+    s = s.replace('\n', '$\n')
+    return s
+
+
+def ninja_join(words):
+    indent = '        '
+    if len(words) > 1:
+        prefix = '$\n' + indent
+    else:
+        prefix = ''
+    spacer = ' $\n' + indent
+    return prefix + spacer.join(ninja_escape(s) for s in words)
+
+
+def ninja_write_vars(f, **kwargs):
+    for k, v in kwargs.items():
+        f.write('{} = {}\n'.format(k, v))
+    f.write('\n')
+
+
+def ninja_write_rule(f, name, **kwargs):
+    f.write('rule {}\n'.format(name))
+    for k, v in kwargs.items():
+        f.write('  {} = {}\n'.format(k, v))
+    f.write('\n')
+
+
+def remove_prefix(s, prefix):
+    while prefix and s.startswith(prefix):
+        s = s[len(prefix):]
+    return s
+
+
+def install(prefix, suffix, dest_dir, dest_suffix=''):
+    src_path = os.path.join(prefix, suffix) if suffix else prefix
+    fname = os.path.basename(src_path)
+    if dest_suffix:
+        dest_dir = os.path.join(dest_dir, dest_suffix)
+    dst_path = os.path.join(dest_dir, fname)
+    return [(src_path, dst_path)]
+
+
+def install_dir(prefix, suffix, dest_dir, dest_suffix=''):
+    result = []
+    src_path = os.path.join(prefix, suffix)
+    for root, dirs, files in os.walk(src_path):
+        for f in files:
+            fname = os.path.join(root, f)
+            fsuffix = remove_prefix(remove_prefix(fname, prefix), '/')
+            result += install(prefix, fsuffix, dest_dir, os.path.join(dest_suffix, os.path.dirname(fsuffix)))
+    return result
+
+
+def remove_duplicates(ls):
+    result = []
+    for x in ls:
+        if x not in result:
+            result.append(x)
+    return result
+
+
+class Executable(object):
+    def __init__(self, name):
+        self.name = name
+        self.cc = 'cc'
+        self.cflags = []
+        self.lflags = []
+        self.libs = []
+        self.sources = []
+        self.pos = []
+        self.install_exec = []
+        self.install_data = []
+
+    def write_ninja(self, f):
+        f.write('# Executable: {}\n'.format(self.name))
+        ninja_write_vars(f, **{
+            'cc_' + self.name: self.cc,
+            'cflags_' + self.name: ninja_join(remove_duplicates(self.cflags)),
+            'lflags_' + self.name: ninja_join(remove_duplicates(self.lflags)),
+            'libs_' + self.name: ninja_join(remove_duplicates(self.libs))})
+        ninja_write_rule(f, 'cc_' + self.name,
+            command='$cc_{} -MMD -MT $out -MF $out.d $cflags_{} -c $in -o $out'.format(self.name, self.name),
+            description='CC $out',
+            depfile='$out.d',
+            deps='gcc')
+        ninja_write_rule(f, 'link_' + self.name,
+            command='$cc_{} $lflags_{} -o $out $in $libs_{}'.format(self.name, self.name, self.name),
+            description='LINK $out')
+        ninja_write_rule(f, 'po2mo_' + self.name,
+            command='msgfmt -o $out $in',
+            description='GEN $out')
+        f.write('# Compilation\n')
+        for src in self.sources:
+            f.write('build $build_dir/{}.{}.o: cc_{} $source_dir/{}\n'.format(src, self.name, self.name, src))
+        f.write('# Translation\n')
+        for po in self.pos:
+            f.write('build $build_dir/{}.mo: po2mo_{} $source_dir/{}\n'.format(os.path.splitext(po)[0], self.name, po))
+        f.write('# Linking\n')
+        f.write('build $build_dir/{}: link_{} '.format(self.name, self.name))
+        f.write(ninja_join(['$build_dir/{}.{}.o'.format(src, self.name) for src in self.sources]))
+        f.write('\n')
+        f.write('# Installation\n')
+        for fin, fout in self.install_exec:
+            f.write('build {}: install_exec {}\n'.format(fout, fin))
+        for fin, fout in self.install_data:
+            f.write('build {}: install_data {}\n'.format(fout, fin))
+        f.write('build install_{}: phony '.format(self.name))
+        f.write(ninja_join([fout for fin, fout in self.install_exec + self.install_data]))
+        f.write('\n')
+        f.write('# Uninstallation\n')
+        for fin, fout in self.install_exec + self.install_data:
+            f.write('build uninstall_{}: uninstall {}\n'.format(fout, fout))
+        f.write('build uninstall_{}: phony '.format(self.name))
+        f.write(ninja_join(['uninstall_{}'.format(fout) for fin, fout in self.install_exec + self.install_data]))
+        f.write('\n')
+        f.write('\n')
+
+
+
+def generate_ninja(targets, source_dir, build_dir):
+    ninja_file_name = os.path.join(build_dir, 'build.ninja')
+    f = open(ninja_file_name, 'w')
+    # `deps` was introduced in ninja 1.3.
+    ninja_write_vars(f, ninja_required_version='1.3')
+    ninja_write_vars(f, **{
+        'source_dir':source_dir,
+        'build_dir':build_dir
+    })
+    ninja_write_rule(f, 'install_exec',
+        command='install -D -m0755 $in $out',
+        description='INSTALL $out')
+    ninja_write_rule(f, 'install_data',
+        command='install -D -m0644 $in $out',
+        description='INSTALL $out')
+    ninja_write_rule(f, 'uninstall',
+        command='rm -f $in',
+        description='RM $in')
+    for t in targets:
+        t.write_ninja(f)
+    f.write('# Targets\n')
+    f.write('build all: phony ')
+    f.write(ninja_join(['$build_dir/{}'.format(t.name) for t in targets]))
+    f.write('\n')
+    installs = sum([(t.install_exec + t.install_data) for t in targets], [])
+    if installs:
+        f.write('build install: phony ')
+        f.write(ninja_join(['install_{}'.format(t.name) for t in targets]))
+        f.write('\n')
+        f.write('build uninstall: phony ')
+        f.write(ninja_join(['uninstall_{}'.format(t.name) for t in targets]))
+        f.write('\n')
+    f.write('\n')
+    f.write('default all\n')
+    f.close()
+    print('Wrote {}.'.format(ninja_file_name))
+    print('Run `ninja -v -C {} all` to compile.'.format(build_dir))
+    print('Run `ninja -v -C {} install` to install.'.format(build_dir))
+
+
+# Parse CLI options
+parser = argparse.ArgumentParser()
+parser.add_argument('--uevent', dest='uevent', action='store_true',
+                    help='Enable uevent support. Default: on under Linux')
+parser.add_argument('--debug', dest='debug', action='store_true',
+                    help='Enable debug build. Default: off')
+parser.add_argument('--asan', dest='asan', action='store_true',
+                    help='Enable AddressSanitizer. Default: off')
+parser.add_argument('--tracing', dest='tracing', action='store_true',
+                    help='Enable tracing. Default: off')
+parser.add_argument('--memory-tracing', dest='memory_tracing', action='store_true',
+                    help='Enable memory allocation tracing. Default: off')
+parser.add_argument('--prefix', help='Prefix for constructing the file installation paths. Default: /usr/local', default=None)
+parser.add_argument('--exec_prefix', help='Prefix for binary paths. Default: $prefix', default=None)
+parser.add_argument('--bindir', help='Path where executables must be installed. Default: $exec_prefix/bin', default=None)
+parser.add_argument('--sysconfdir', help='Path where config files must be installed. Default: /etc', default=None)
+parser.add_argument('--datarootdir', help='Path where data files must be installed. Default: $prefix/share', default=None)
+parser.add_argument('--localedir', help='Path where locale files must be installed. Default: $datarootdir/locale', default=None)
+parser.add_argument('--docdir', help='Path where documentation files must be installed. Default: $datarootdir/doc/tint2', default=None)
+parser.add_argument('--htmldir', help='Path where documentation files must be installed. Default: $docdir/html', default=None)
+parser.add_argument('--mandir', help='Path where man files must be installed. Default: $datarootdir/man', default=None)
+parser.add_argument('--home', dest='home', action='store_true',
+                    help='Install to $HOME (sets all paths accordingly). Default: off')
+args = parser.parse_args()
+
+# Get relevant environment variables
+CC = os.environ.get('CC', 'cc')
+CFLAGS = shlex.split(os.environ.get('CFLAGS', ''))
+LFLAGS = shlex.split(os.environ.get('LDFLAGS', ''))
+LIBS = []
+
+# Get paths
+source_dir = os.path.realpath(os.path.dirname(os.path.realpath(__file__)) + '/..')
+build_dir = os.path.join(os.getcwd(), 'build')
+if not args.home:
+    prefix = args.prefix or '/usr/local'
+    exec_prefix = args.exec_prefix or prefix
+    bindir = args.bindir or os.path.join(exec_prefix, 'bin')
+    datarootdir = args.datarootdir or os.path.join(prefix, 'share')
+    sysconfdir = args.sysconfdir or '/etc'
+    docdir = args.docdir or os.path.join(datarootdir, 'doc/tint2')
+    htmldir = args.htmldir or os.path.join(docdir, 'html')
+    localedir = args.localedir or os.path.join(datarootdir, 'locale')
+    mandir = args.mandir or os.path.join(datarootdir, 'man')
+else:
+    prefix = args.prefix or os.path.expanduser("~")
+    exec_prefix = args.exec_prefix or prefix
+    bindir = args.bindir or os.path.join(exec_prefix, 'bin')
+    datarootdir = args.datarootdir or os.path.join(prefix, '.local/share')
+    sysconfdir = args.sysconfdir or os.path.expanduser("~/.config/tint2")
+    docdir = args.docdir or os.path.join(datarootdir, 'doc/tint2')
+    htmldir = args.htmldir or os.path.join(docdir, 'html')
+    localedir = args.localedir or os.path.join(datarootdir, 'locale')
+    mandir = args.mandir or os.path.join(datarootdir, 'man')
+
+
+# Check if C11 is supported by the compiler, fall back to C99
+if check_c_compiles([CC],
+                    '''#define print(x) _Generic((x), default : print_unknown)(x)
+                    void print_unknown() {
+                    }
+                    int main () {
+                        print(0);
+                    }'''):
+    CFLAGS += ['-std=c11', '-DHAS_GENERIC']
+else:
+    print("No C11 support.")
+    CFLAGS += ['-std=c99']
+
+# Set mandatory flags
+CFLAGS += ['-g',
+           '-Wall',
+           '-Wextra',
+           '-Wshadow',
+           '-Wpointer-arith',
+           '-Wno-deprecated',
+           '-Wno-missing-field-initializers',
+           '-Wno-unused-parameter',
+           '-Wno-sign-compare',
+           '-fno-strict-aliasing',
+           '-pthread',
+           '-D_BSD_SOURCE',
+           '-D_DEFAULT_SOURCE',
+           '-D_WITH_GETLINE',
+           '-DENABLE_BATTERY']
+LFLAGS += ['-fno-strict-aliasing',
+           '-pthread']
+LFLAGS += ['-L' + build_dir]
+
+# Set platform dependent C flags
+if sys.platform.startswith('linux'):
+    CFLAGS += ['-D_POSIX_C_SOURCE=200809L']
+
+if sys.platform.startswith('freebsd') or sys.platform.startswith('openbsd') or sys.platform.startswith('dragonfly'):
+    CFLAGS += ['-I/usr/local/include']
+    LFLAGS += ['-L/usr/local/lib']
+
+if sys.platform.startswith('linux') or args.uevent:
+    CFLAGS += ['-DENABLE_UEVENT']
+
+# Turn on color messages if supported
+if check_c_compiles([CC, '-fdiagnostics-color', '-c', '-x', 'c'], ''):
+    CFLAGS += ['-fdiagnostics-color=always']
+
+# Set project-specific include dirs
+CFLAGS += ['-I.']
+for inc in ['src',
+            'src/battery',
+            'src/clock',
+            'src/systray',
+            'src/taskbar',
+            'src/launcher',
+            'src/tooltip',
+            'src/util',
+            'src/execplugin',
+            'src/button',
+            'src/freespace',
+            'src/separator']:
+    CFLAGS += ['-I' + os.path.join(source_dir, inc)]
+
+# Add mandatory library dependencies
+LIBS += ['-lm', '-lrt']
+
+# Add mandatory libray dependencies detected with pkg-config
+for dep in ['x11',
+            'xcomposite',
+            'xdamage',
+            'xinerama',
+            'xext',
+            'xrender',
+            'xrandr>=1.3',
+            'gmodule-2.0',
+            'gio-2.0',
+            'glib-2.0',
+            'gobject-2.0',
+            'pangocairo',
+            'pango',
+            'cairo',
+            'imlib2>=1.4.2']:
+    lib, cf, lf = pkg_config(dep)
+    LIBS += lib
+    CFLAGS += cf
+    LFLAGS += lf
+
+# Add optional library dependencies detected with pkg-config
+try:
+    lib, cf, lf = pkg_config('librsvg-2.0>=2.14.0')
+    LIBS += lib
+    CFLAGS += cf + ['-DHAVE_RSVG']
+    LFLAGS += lf
+except:
+    print("No SVG support.")
+
+try:
+    lib, cf, lf = pkg_config('libstartup-notification-1.0>=0.12')
+    LIBS += lib
+    CFLAGS += cf + ['-DHAVE_SN', '-DSN_API_NOT_YET_FROZEN']
+    LFLAGS += lf
+except:
+    print("No startup notification support.")
+
+# Add library dependencies detected with using successful compilation test
+bt = False
+if not bt:
+    try:
+        lib, cf, lf = pkg_config('libunwind')
+        LIBS += lib
+        CFLAGS += cf + ['-DHAS_LIBUNWIND']
+        LFLAGS += lf
+        bt = True
+        print("Backtrace support via libunwind.")
+    except:
+        print("No backtrace support via libunwind.")
+if not bt:
+    if check_c_compiles([CC, '-lbacktrace'], '''#include <backtrace.h>
+            int main() {
+                return 0;
+            }'''):
+        CFLAGS += ['-DHAS_BACKTRACE']
+        LIBS += ['-lbacktrace']
+        bt = True
+        print("Backtrace support via libbacktrace.")
+    else:
+        print("No backtrace support via libbacktrace.")
+
+# Add option-dependent flags
+if not args.debug:
+    CFLAGS += ['-O2']
+
+if args.asan:
+    asan_flags = ['-fsanitize=address']
+    CFLAGS += asan_flags
+    LFLAGS += asan_flags
+
+if args.tracing:
+    CFLAGS += ['-finstrument-functions',
+               '-finstrument-functions-exclude-file-list=tracing.c',
+               '-finstrument-functions-exclude-function-list=get_time,gettime']
+
+if args.asan or args.memory_tracing or args.tracing:
+    trace_flags = ['-O0',
+                   '-fno-common',
+                   '-fno-omit-frame-pointer',
+                   '-rdynamic',
+                   '-DUSE_REAL_MALLOC']
+    CFLAGS += trace_flags
+    LFLAGS += trace_flags + ['-fuse-ld=gold']
+
+if args.memory_tracing:
+    LIBS += ['-ldl']
+
+# Define targets
+tint2 = Executable('tint2')
+tint2.cflags += CFLAGS
+tint2.lflags += LFLAGS
+tint2.libs += LIBS
+tint2.sources = ['src/config.c',
+                 'src/panel.c',
+                 'src/util/server.c',
+                 'src/main.c',
+                 'src/init.c',
+                 'src/util/signals.c',
+                 'src/util/tracing.c',
+                 'src/mouse_actions.c',
+                 'src/drag_and_drop.c',
+                 'src/default_icon.c',
+                 'src/clock/clock.c',
+                 'src/systray/systraybar.c',
+                 'src/launcher/launcher.c',
+                 'src/launcher/apps-common.c',
+                 'src/launcher/icon-theme-common.c',
+                 'src/launcher/xsettings-client.c',
+                 'src/launcher/xsettings-common.c',
+                 'src/taskbar/task.c',
+                 'src/taskbar/taskbar.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/bt.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/strlcat.c',
+                 'src/util/print.c',
+                 'src/util/gradient.c',
+                 'src/util/test.c',
+                 'src/util/uevent.c',
+                 'src/util/window.c',
+                 'src/battery/battery.c']
+
+# Battery implementation is platform-specific
+if sys.platform.startswith('linux'):
+    tint2.sources += ['src/battery/linux.c']
+elif sys.platform.startswith('freebsd') or \
+     sys.platform.startswith('dragonfly') or \
+     sys.platform.startswith('gnukfreebsd'):
+    tint2.sources += ['src/battery/freebsd.c']
+elif sys.platform.startswith('openbsd') or \
+     sys.platform.startswith('netbsd'):
+    tint2.sources += ['src/battery/openbsd.c']
+else:
+    print("No battery support for platform:", sys.platform)
+    tint2.sources += ['src/battery/dummy.c']
+
+if args.memory_tracing:
+    tint2.sources += ['src/util/mem.c']
+
+tint2.install_exec = install(build_dir, 'tint2', bindir)
+tint2.install_data = (install(source_dir, 'tint2.svg', datarootdir, 'icons/hicolor/scalable/apps') +
+                      install(source_dir, 'tint2.desktop', datarootdir, 'applications') +
+                      install(source_dir, 'themes/tint2rc', sysconfdir, 'xdg/tint2') +
+                      install(source_dir, 'default_icon.png', datarootdir, 'tint2') +
+                      install(source_dir, 'AUTHORS', docdir) +
+                      install(source_dir, 'ChangeLog', docdir) +
+                      install(source_dir, 'README.md', docdir) +
+                      install(source_dir, 'doc/tint2.md', docdir) +
+                      install(source_dir, 'doc/manual.html', htmldir) +
+                      install(source_dir, 'doc/readme.html', htmldir) +
+                      install_dir(source_dir, 'doc/images', htmldir) +
+                      install(source_dir, 'doc/tint2.1', mandir, 'man1'))
+
+tint2conf = Executable('tint2conf')
+tint2conf.cflags += CFLAGS
+tint2conf.lflags += LFLAGS
+tint2conf.libs += LIBS
+
+for dep in ['gthread-2.0',
+            'gtk+-x11-2.0']:
+    lib, cf, lf = pkg_config(dep)
+    tint2conf.libs += lib
+    tint2conf.cflags += cf
+    tint2conf.lflags += lf
+
+tint2conf.cflags += ['-DTINT2CONF',
+                     '-DINSTALL_PREFIX=\\"{}\\"'.format(prefix),
+                     '-DLOCALEDIR=\\"{}\\"'.format(localedir),
+                     '-DGETTEXT_PACKAGE=\\"tint2conf\\"',
+                     '-DHAVE_VERSION_H',
+                     '-Wno-shadow']
+
+tint2conf.sources = ['src/util/bt.c',
+                     'src/util/common.c',
+                     'src/util/strnatcmp.c',
+                     'src/util/cache.c',
+                     'src/util/timer.c',
+                     'src/util/test.c',
+                     'src/util/print.c',
+                     'src/util/signals.c',
+                     'src/config.c',
+                     'src/util/server.c',
+                     'src/util/strlcat.c',
+                     'src/launcher/apps-common.c',
+                     'src/launcher/icon-theme-common.c',
+                     'src/tint2conf/md4.c',
+                     'src/tint2conf/main.c',
+                     'src/tint2conf/properties.c',
+                     'src/tint2conf/properties_rw.c',
+                     'src/tint2conf/theme_view.c',
+                     'src/tint2conf/background_gui.c',
+                     'src/tint2conf/gradient_gui.c']
+tint2conf.pos = [os.path.join('src/tint2conf/po', f) for f in os.listdir('src/tint2conf/po') if f.endswith('.po')]
+tint2conf.install_exec = install(build_dir, 'tint2conf', bindir)
+tint2conf.install_data = (install(source_dir, 'src/tint2conf/tint2conf.svg', datarootdir, 'icons/hicolor/scalable/apps') +
+                          install(source_dir, 'src/tint2conf/tint2conf.desktop', datarootdir, 'applications') +
+                          install(source_dir, 'src/tint2conf/tint2conf.xml', datarootdir, 'mime/packages'))
+
+makedirs(build_dir)
+assert 0 == os.system('cd {}; {}/get_version.sh'.format(build_dir, source_dir))
+generate_ninja([tint2, tint2conf], source_dir, build_dir)

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,12 +1,12 @@
 Source: tint2
 Section: x11
 Priority: optional
-Maintainer: o9000 <mrovi9000@gmail.com>
+Maintainer: Sebastian Reichel <sre@debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
                libcairo2-dev,
                libglib2.0-dev,
-               libgtk2.0-dev,
+               libgtk-3-dev,
                libimlib2-dev,
                libpango1.0-dev,
                librsvg2-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

@@ -4,11 +4,10 @@
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_SYSCONFDIR=/etc
 
 override_dh_auto_install:
 	dh_auto_install --destdir=$(CURDIR)/debian/tmp
 
 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
@@ -19,7 +21,7 @@ then
     exit 1
 fi
 rm -f version.h
-VERSION=$(git describe --exact-match 2>/dev/null)
+VERSION=$(false 2>/dev/null)
 if [ $? -eq 0 ]
 then
     VERSION=$(echo "$VERSION" | sed 's/^v//')
@@ -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 artful bionic
 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/update_version_status.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+export PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
+
+set -e
+set -x
+
+[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en "$0" "$0" "$@" || :
+
+exec > ~/tint2.runner-version.log
+exec 2>&1
+
+cd ~/tint2.wiki
+git reset --hard
+git pull
+
+
+timeout -k 10 600 ~/tint2/packaging/version_status.py > packaging.tmp.md
+cat packaging.tmp.md > packaging.md
+rm packaging.tmp.md
+
+git commit -am 'Update packaging info'
+git push origin master

packaging/version_status.py

@@ -0,0 +1,422 @@
+#!/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():
+  print >> sys.stderr, "Debian ..."
+  return "Debian", "debian", [get_debian_release_version(release) for release in ["stable", "testing", "unstable", "experimental"]]
+
+
+# Ubuntu
+
+def get_ubuntu_versions():
+  print >> sys.stderr, "Ubuntu ..."
+  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():
+  print >> sys.stderr, "BunsenLabs ..."
+  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():
+  print >> sys.stderr, "Arch ..."
+  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():
+  print >> sys.stderr, "Fedora ..."
+  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():
+  print >> sys.stderr, "RedHat ..."
+  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():
+  print >> sys.stderr, "Suse ..."
+  ftp = ftplib.FTP("mirror.switch.ch")
+  ftp.login()
+  releases, _ = ftp_list_dir(ftp, "/mirror/opensuse/opensuse/ports/update/leap/")
+  versions = []
+  for release in releases:
+    root = "/mirror/opensuse/opensuse/ports/update/leap/{0}/oss/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():
+  print >> sys.stderr, "Gentoo ..."
+  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():
+  print >> sys.stderr, "Void ..."
+  template = http_download_txt("https://raw.githubusercontent.com/void-linux/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():
+  print >> sys.stderr, "Alpine ..."
+  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():
+  print >> sys.stderr, "Slackware ..."
+  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():
+  print >> sys.stderr, "FreeBSD ..."
+  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():
+  print >> sys.stderr, "OpenBSD ..."
+  makefile = http_download_txt("http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/x11/tint2/Makefile?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():
+  print >> sys.stderr, "Upstream ..."
+  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,26 +35,34 @@ 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 Timer battery_timer;
+static Timer battery_blink_timer;
 
-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;
 char *battery_uwheel_command;
 char *battery_dwheel_command;
 gboolean battery_found;
+gboolean battery_warn;
+gboolean battery_warn_red;
 
 char *battery_sys_prefix = (char *)"";
 
@@ -70,14 +78,21 @@ void default_battery()
     battery_found = FALSE;
     percentage_hide = 101;
     battery_low_cmd_sent = FALSE;
-	battery_timeout = NULL;
+    battery_full_cmd_sent = FALSE;
+    INIT_TIMER(battery_timer);
+    INIT_TIMER(battery_blink_timer);
+    battery_warn = FALSE;
+    battery_warn_red = FALSE;
     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;
@@ -98,6 +113,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);
@@ -112,13 +133,103 @@ void cleanup_battery()
     ac_connected_cmd = NULL;
     free(ac_disconnected_cmd);
     ac_disconnected_cmd = NULL;
-	stop_timeout(battery_timeout);
-	battery_timeout = NULL;
+    destroy_timer(&battery_timer);
+    destroy_timer(&battery_blink_timer);
     battery_found = FALSE;
 
     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.
+        // %P :	Percentage left without 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 '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 if (battery_state.time.hours > 0 && battery_state.time.minutes > 0) {
+                    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)
@@ -126,8 +237,8 @@ void init_battery()
 
     battery_found = battery_os_init();
 
-	if (!battery_timeout)
-		battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
+    if (!battery_timer.enabled_)
+        change_timer(&battery_timer, true, 30000, 30000, update_battery_tick, 0);
 
     update_battery();
 }
@@ -169,6 +280,12 @@ void init_battery_panel(void *p)
     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");
+    }
+    update_battery_tick(NULL);
 }
 
 void battery_init_fonts()
@@ -205,6 +322,18 @@ void battery_default_font_changed()
     schedule_panel_redraw();
 }
 
+void blink_battery(void *arg)
+{
+    if (!battery_enabled)
+        return;
+    battery_warn_red = battery_warn ? !battery_warn_red : FALSE;
+    for (int i = 0; i < num_panels; i++) {
+        if (panels[i].battery.area.on_screen) {
+            schedule_redraw(&panels[i].battery.area);
+        }
+    }
+}
+
 void update_battery_tick(void *arg)
 {
     if (!battery_enabled)
@@ -215,6 +344,7 @@ void update_battery_tick(void *arg)
     gboolean old_ac_connected = battery_state.ac_connected;
     int16_t old_hours = battery_state.time.hours;
     int8_t old_minutes = battery_state.time.minutes;
+    gboolean old_warn = battery_warn;
 
     if (!battery_found) {
         init_battery();
@@ -227,14 +357,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 &&
@@ -242,6 +372,30 @@ 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;
+    }
+
+    if (!battery_blink_timer.enabled_) {
+        if ((battery_state.percentage < battery_low_status &&
+            battery_state.state == BATTERY_DISCHARGING) || debug_blink) {
+            change_timer(&battery_blink_timer, true, 10, 1000, blink_battery, 0);
+            battery_warn = TRUE;
+        }
+    } else {
+        if (battery_state.percentage > battery_low_status ||
+            battery_state.state != BATTERY_DISCHARGING) {
+            stop_timer(&battery_blink_timer);
+            battery_warn = FALSE;
+        }
+    }
+
     for (int i = 0; i < num_panels; i++) {
         // Show/hide if needed
         if (!battery_found) {
@@ -255,8 +409,11 @@ void update_battery_tick(void *arg)
         // 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) {
+                old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes ||
+                old_warn != battery_warn) {
                 panels[i].battery.area.resize_needed = TRUE;
+                if (!battery_warn)
+                    panels[i].battery.area.bg = panel_config.battery.area.bg;
                 schedule_panel_redraw();
             }
         }
@@ -278,168 +435,59 @@ 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;
-	Panel *panel = (Panel *)battery->area.panel;
-	int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
-	int bat_time_height, bat_time_width, bat_time_height_ink;
-
-	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
-	if (battery_state.state == BATTERY_FULL) {
-		strcpy(buf_bat_time, "Full");
-	} else {
-		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
-	}
-	get_text_size2(bat1_font_desc,
-				   &bat_percentage_height_ink,
-				   &bat_percentage_height,
-				   &bat_percentage_width,
-				   panel->area.height,
-				   panel->area.width,
-				   buf_bat_percentage,
-				   strlen(buf_bat_percentage),
-				   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE,
-				   FALSE);
-	get_text_size2(bat2_font_desc,
-				   &bat_time_height_ink,
-				   &bat_time_height,
-				   &bat_time_width,
-				   panel->area.height,
-				   panel->area.width,
-				   buf_bat_time,
-				   strlen(buf_bat_time),
-				   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE,
-				   FALSE);
-
-	if (panel_horizontal) {
-		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
-		new_size += 2 * battery->area.paddingxlr + left_right_border_width(&battery->area);
-		return new_size;
-	} else {
-		int new_size = bat_percentage_height + bat_time_height + 2 * battery->area.paddingxlr +
-					   top_bottom_border_width(&battery->area);
-		return new_size;
-	}
+    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 = (Battery *)obj;
-	Panel *panel = (Panel *)battery->area.panel;
-	int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
-	int bat_time_height, bat_time_width, bat_time_height_ink;
-	int ret = 0;
-
-	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
-	if (battery_state.state == BATTERY_FULL) {
-		strcpy(buf_bat_time, "Full");
-	} else {
-		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
-	}
-	get_text_size2(bat1_font_desc,
-	               &bat_percentage_height_ink,
-	               &bat_percentage_height,
-	               &bat_percentage_width,
-	               panel->area.height,
-	               panel->area.width,
-	               buf_bat_percentage,
-	               strlen(buf_bat_percentage),
-	               PANGO_WRAP_WORD_CHAR,
-	               PANGO_ELLIPSIZE_NONE,
-	               FALSE);
-	get_text_size2(bat2_font_desc,
-	               &bat_time_height_ink,
-	               &bat_time_height,
-	               &bat_time_width,
-	               panel->area.height,
-	               panel->area.width,
-	               buf_bat_time,
-	               strlen(buf_bat_time),
-	               PANGO_WRAP_WORD_CHAR,
-	               PANGO_ELLIPSIZE_NONE,
-	               FALSE);
-
-	if (panel_horizontal) {
-		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
-		new_size += 2 * battery->area.paddingxlr + left_right_border_width(&battery->area);
-		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 +
-		               top_bottom_border_width(&battery->area);
-		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;
-		}
-	}
-
-	schedule_redraw(&battery->area);
-	return ret;
+    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;
-
-	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);
+    Battery *battery = (Battery *)obj;
+    Panel *panel = (Panel *)battery->area.panel;
+    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,
+                   panel->scale);
+    if (battery_warn && battery_warn_red) {
+        cairo_set_source_rgba(c, 1, 0, 0, 1);
+        cairo_set_line_width(c, 0);
+        cairo_rectangle(c, 0, 0, battery->area.width, battery->area.height);
+        cairo_fill(c);
+    }
 }
 
 void battery_dump_geometry(void *obj, int indent)
 {
-	Battery *battery = obj;
-	fprintf(stderr,
-			"%*sText 1: y = %d, text = %s\n",
-			indent,
-			"",
-			battery->bat1_posy,
-			buf_bat_percentage);
-	fprintf(stderr,
-		"%*sText 2: y = %d, text = %s\n",
-		indent,
-		"",
-		battery->bat2_posy,
-		buf_bat_time);
+    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)
@@ -447,7 +495,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) {
@@ -467,5 +515,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;
@@ -108,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

@@ -60,6 +60,20 @@ struct psy_mains {
     gboolean online;
 };
 
+static gboolean is_file_non_empty(const char *path)
+{
+    FILE *f = fopen(path, "r");
+    if (!f)
+        return FALSE;
+    char buffer[1024];
+    size_t count = fread(buffer, 1, sizeof(buffer), f);
+    fclose(f);
+    if (count > 0)
+        return TRUE;
+    else
+        return FALSE;
+}
+
 static void uevent_battery_update()
 {
     update_battery_tick(NULL);
@@ -68,7 +82,7 @@ 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};
@@ -76,7 +90,7 @@ static struct uevent_notify psy_plug = {UEVENT_ADD | UEVENT_REMOVE, "power_suppl
 #define RETURN_ON_ERROR(err)                                                        \
     if (err) {                                                                      \
         g_error_free(err);                                                          \
-		fprintf(stderr, RED "%s:%d: errror" RESET "\n", __FILE__, __LINE__); \
+        fprintf(stderr, RED "tint2: %s:%d: errror" RESET "\n", __FILE__, __LINE__); \
         return FALSE;                                                               \
     }
 
@@ -96,12 +110,13 @@ static enum psy_type power_supply_get_type(const gchar *entryname)
     gsize typelen;
 
     g_file_get_contents(path_type, &type, &typelen, &error);
-	g_free(path_type);
     if (error) {
-		fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, path_type);
+        g_free(path_type);
         g_error_free(error);
         return PSY_UNKNOWN;
     }
+    g_free(path_type);
 
     if (!g_strcmp0(type, "Battery\n")) {
         g_free(type);
@@ -123,20 +138,20 @@ static gboolean init_linux_battery(struct psy_battery *bat)
     const gchar *entryname = bat->name;
 
     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 "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+    if (!is_file_non_empty(bat->path_present)) {
+        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, bat->path_present);
         goto err0;
     }
 
-	bat->path_level_now = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_now", NULL);
+    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)) {
+    if (!is_file_non_empty(bat->path_level_now) ||
+        !is_file_non_empty(bat->path_level_full)) {
         g_free(bat->path_level_now);
         g_free(bat->path_level_full);
         g_free(bat->path_rate_now);
@@ -148,16 +163,18 @@ static gboolean init_linux_battery(struct psy_battery *bat)
             g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "current_now", NULL);
         bat->unit = 'A';
     }
-	if (!g_file_test(bat->path_level_now, G_FILE_TEST_EXISTS) ||
-	    !g_file_test(bat->path_level_full, G_FILE_TEST_EXISTS) ||
-	    !g_file_test(bat->path_rate_now, G_FILE_TEST_EXISTS)) {
-		fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+    if (!is_file_non_empty(bat->path_level_now)) {
+        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, bat->path_level_now);
+        goto err1;
+    }
+    if (!is_file_non_empty(bat->path_level_full)) {
+        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, bat->path_level_full);
         goto err1;
     }
 
     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)) {
-		fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+    if (!is_file_non_empty(bat->path_status)) {
+        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, bat->path_status);
         goto err2;
     }
 
@@ -180,8 +197,8 @@ static gboolean init_linux_mains(struct psy_mains *ac)
     const gchar *entryname = ac->name;
 
     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 "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+    if (!is_file_non_empty(ac->path_online)) {
+        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, ac->path_online);
         g_free(ac->path_online);
         return FALSE;
     }
@@ -227,10 +244,10 @@ static void add_battery(const char *entryname)
 
     if (init_linux_battery(bat)) {
         batteries = g_list_append(batteries, bat);
-		fprintf(stdout, GREEN "Found battery \"%s\"" RESET "\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);
     }
 }
 
@@ -241,10 +258,10 @@ static void add_mains(const char *entryname)
 
     if (init_linux_mains(ac)) {
         mains = g_list_append(mains, ac);
-		fprintf(stdout, GREEN "Found mains \"%s\"" RESET "\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);
     }
 }
 
@@ -262,7 +279,7 @@ gboolean battery_os_init()
     RETURN_ON_ERROR(error);
 
     while ((entryname = g_dir_read_name(directory))) {
-		fprintf(stderr, GREEN "Found power device %s" RESET "\n", entryname);
+        fprintf(stderr, GREEN "tint2: Found power device %s" RESET "\n", entryname);
         enum psy_type type = power_supply_get_type(entryname);
 
         switch (type) {
@@ -445,6 +462,17 @@ int battery_os_update(BatteryState *state)
     /* 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;
 }
 

src/button/button.c

@@ -0,0 +1,548 @@
+#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
+        free_icon(button->frontend->icon);
+        free_icon(button->frontend->icon_hover);
+        free_icon(button->frontend->icon_pressed);
+        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(EXIT_FAILURE);
+        }
+        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) * panel->scale;
+    int vert_padding = (panel_horizontal ? button->area.paddingy : button->area.paddingxlr) * panel->scale;
+    int interior_padding = button->area.paddingx * panel->scale;
+
+    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 * panel->scale);
+            icon_h = MIN(icon_h, button->backend->max_icon_size * panel->scale);
+        }
+    } else {
+        icon_h = icon_w = 0;
+    }
+
+    int txt_height, txt_width;
+    if (button->backend->text) {
+        if (panel_horizontal) {
+            get_text_size2(button->backend->font_desc,
+                           &txt_height,
+                           &txt_width,
+                           panel->area.height,
+                           panel->area.width,
+                           button->backend->text,
+                           strlen(button->backend->text),
+                           PANGO_WRAP_WORD_CHAR,
+                           PANGO_ELLIPSIZE_NONE,
+                           button->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT,
+                           FALSE,
+                           panel->scale);
+        } else {
+            get_text_size2(button->backend->font_desc,
+                           &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,
+                           button->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT,
+                           FALSE,
+                           panel->scale);
+        }
+    } else {
+        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) * panel->scale;
+    int vert_padding = (panel_horizontal ? button->area.paddingy : button->area.paddingxlr) * panel->scale;
+    int interior_padding = button->area.paddingx * panel->scale;
+
+    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 * panel->scale);
+            icon_h = MIN(icon_h, button->backend->max_icon_size * panel->scale);
+        }
+    } 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, txt_width;
+    if (button->backend->text) {
+        get_text_size2(button->backend->font_desc,
+                       &txt_height,
+                       &txt_width,
+                       available_h,
+                       available_w,
+                       button->backend->text,
+                       strlen(button->backend->text),
+                       PANGO_WRAP_WORD_CHAR,
+                       PANGO_ELLIPSIZE_NONE,
+                       button->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT,
+                       FALSE,
+                       panel->scale);
+    } else {
+        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;
+    Panel *panel = (Panel *)button->area.panel;
+
+    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) {
+        PangoContext *context = pango_cairo_create_context(c);
+        pango_cairo_context_set_resolution(context, 96 * panel->scale);
+        PangoLayout *layout = pango_layout_new(context);
+
+        pango_layout_set_font_description(layout, button->backend->font_desc);
+        pango_layout_set_width(layout, (button->frontend->textw + TINT2_PANGO_SLACK) * 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 ? layout : NULL);
+
+        g_object_unref(layout);
+        g_object_unref(context);
+    }
+}
+
+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,
+                "tint2: %*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,
+            "tint2: %*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

@@ -51,7 +51,7 @@ static char buf_time[256];
 static char buf_date[256];
 static char buf_tooltip[512];
 int clock_enabled;
-static timeout *clock_timeout;
+static Timer clock_timer;
 
 void clock_init_fonts();
 char *clock_get_tooltip(void *obj);
@@ -61,11 +61,11 @@ void clock_dump_geometry(void *obj, int indent);
 void default_clock()
 {
     clock_enabled = 0;
-	clock_timeout = NULL;
     time1_format = NULL;
     time1_timezone = NULL;
     time2_format = NULL;
     time2_timezone = NULL;
+    INIT_TIMER(clock_timer);
     time_tooltip_format = NULL;
     time_tooltip_timezone = NULL;
     clock_lclick_command = NULL;
@@ -77,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()
@@ -107,33 +110,7 @@ void cleanup_clock()
     clock_uwheel_command = NULL;
     free(clock_dwheel_command);
     clock_dwheel_command = NULL;
-	stop_timeout(clock_timeout);
-	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;
-	}
-	schedule_panel_redraw();
-}
-
-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;
-		}
-		schedule_panel_redraw();
-	}
+    destroy_timer(&clock_timer);
 }
 
 struct tm *clock_gettime_for_tz(const char *timezone)
@@ -152,13 +129,43 @@ struct tm *clock_gettime_for_tz(const char *timezone)
     }
 }
 
-gboolean time_format_needs_sec_ticks(char *time_format)
+void update_clock_text(char *dst, size_t size, const char *format,
+                       const char *timezone, bool *changed)
 {
-	if (!time_format)
-		return FALSE;
-	if (strchr(time_format, 'S') || strchr(time_format, 'T') || strchr(time_format, 'r'))
-		return TRUE;
-	return FALSE;
+    if (!dst || !format) {
+        return;
+    }
+    char tmp[256] = "";
+    strncpy(tmp, dst, sizeof(tmp) - 1);
+    strftime(dst, size, format, clock_gettime_for_tz(timezone));
+    *changed = *changed || strcmp(dst, tmp) != 0;
+}
+
+void update_clocks()
+{
+    bool changed = false;
+    update_clock_text(buf_time, sizeof(buf_time), time1_format, time1_timezone, &changed);
+    update_clock_text(buf_date, sizeof(buf_date), time2_format, time2_timezone, &changed);
+    if (changed) {
+        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();
+    change_timer(&clock_timer, true, ms_until_second_change(&time_clock), 0, update_clocks_sec, 0);
 }
 
 void init_clock()
@@ -170,14 +177,6 @@ void init_clock_panel(void *p)
     Panel *panel = (Panel *)p;
     Clock *clock = &panel->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);
-		}
-	}
-
     if (!clock->area.bg)
         clock->area.bg = &g_array_index(backgrounds, Background, 0);
     clock_init_fonts();
@@ -205,6 +204,10 @@ void init_clock_panel(void *p)
         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_timer.enabled_) {
+        update_clocks_sec(NULL);
+    }
 }
 
 void clock_init_fonts()
@@ -243,147 +246,67 @@ void clock_default_font_changed()
     schedule_panel_redraw();
 }
 
-void clock_compute_text_geometry(Panel *panel,
-                                 int *time_height_ink,
+void clock_compute_text_geometry(Clock *clock,
                                  int *time_height,
                                  int *time_width,
-                                 int *date_height_ink,
                                  int *date_height,
                                  int *date_width)
 {
-	*date_height = *date_width = 0;
-	strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
-	get_text_size2(time1_font_desc,
-	               time_height_ink,
+    area_compute_text_geometry(&clock->area,
+                               buf_time,
+                               time2_format ? buf_date : NULL,
+                               time1_font_desc,
+                               time2_font_desc,
                                time_height,
                                time_width,
-	               panel->area.height,
-	               panel->area.width,
-	               buf_time,
-	               strlen(buf_time),
-	               PANGO_WRAP_WORD_CHAR,
-	               PANGO_ELLIPSIZE_NONE,
-	               FALSE);
-	if (time2_format) {
-		strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
-		get_text_size2(time2_font_desc,
-		               date_height_ink,
                                date_height,
-		               date_width,
-		               panel->area.height,
-		               panel->area.width,
-		               buf_date,
-		               strlen(buf_date),
-		               PANGO_WRAP_WORD_CHAR,
-		               PANGO_ELLIPSIZE_NONE,
-		               FALSE);
-	}
+                               date_width);
 }
 
 int clock_compute_desired_size(void *obj)
 {
     Clock *clock = (Clock *)obj;
-	Panel *panel = (Panel *)clock->area.panel;
-	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
-	clock_compute_text_geometry(panel,
-	                            &time_height_ink,
-	                            &time_height,
-	                            &time_width,
-	                            &date_height_ink,
-	                            &date_height,
-	                            &date_width);
-
-	if (panel_horizontal) {
-		int new_size = (time_width > date_width) ? time_width : date_width;
-		new_size += 2 * clock->area.paddingxlr + left_right_border_width(&clock->area);
-		return new_size;
-	} else {
-		int new_size = time_height + date_height + 2 * clock->area.paddingxlr + top_bottom_border_width(&clock->area);
-		return new_size;
-	}
+    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 = (Clock *)obj;
-	Panel *panel = (Panel *)clock->area.panel;
-	gboolean result = FALSE;
-
-	schedule_redraw(&clock->area);
-
-	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
-	clock_compute_text_geometry(panel,
-	                            &time_height_ink,
-	                            &time_height,
-	                            &time_width,
-	                            &date_height_ink,
-	                            &date_height,
-	                            &date_width);
-
-	int new_size = clock_compute_desired_size(clock);
-	if (panel_horizontal) {
-		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 {
-		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;
+    return resize_text_area(&clock->area,
+                            buf_time,
+                            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);
-
-	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);
-	}
-
-	g_object_unref(layout);
+    Clock *clock = (Clock *)obj;
+    Panel *panel = (Panel *)clock->area.panel;
+    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,
+                   panel->scale);
 }
 
 void clock_dump_geometry(void *obj, int indent)
 {
     Clock *clock = (Clock *)obj;
-	fprintf(stderr, "%*sText 1: y = %d, text = %s\n", indent, "", clock->time1_posy, buf_time);
+    fprintf(stderr, "tint2: %*sText 1: y = %d, text = %s\n", indent, "", clock->time1_posy, buf_time);
     if (time2_format) {
-		fprintf(stderr, "%*sText 2: y = %d, text = %s\n", indent, "", clock->time2_posy, buf_date);
+        fprintf(stderr, "tint2: %*sText 2: y = %d, text = %s\n", indent, "", clock->time2_posy, buf_date);
     }
 }
 
@@ -393,7 +316,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) {
@@ -413,5 +336,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

@@ -62,8 +62,8 @@
 #endif
 
 // global path
-char *config_path;
-char *snapshot_path;
+char *config_path = NULL;
+char *snapshot_path = NULL;
 
 #ifndef TINT2CONF
 
@@ -119,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)
@@ -135,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)
@@ -154,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;
 }
 
@@ -206,7 +215,7 @@ void load_launcher_app_dir(const char *path)
 Separator *get_or_create_last_separator()
 {
     if (!panel_config.separator_list) {
-		fprintf(stderr, "Warning: separator items should shart with 'separator = new'\n");
+        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;
@@ -215,18 +224,31 @@ Separator *get_or_create_last_separator()
 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;
 
     /* Background and border */
-	if (strcmp(key, "rounded") == 0) {
+    if (strcmp(key, "scale_relative_to_dpi") == 0) {
+        ui_scale_dpi_ref = atof(value);
+    } else if (strcmp(key, "scale_relative_to_screen_height") == 0) {
+        ui_scale_monitor_size_ref = atof(value);
+    } else if (strcmp(key, "rounded") == 0) {
         // 'rounded' is the first parameter => alloc a new background
         if (backgrounds->len > 0) {
             Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
@@ -332,6 +354,12 @@ void add_entry(char *key, char *value)
         id = (id < gradients->len && id >= 0) ? id : -1;
         if (id >= 0)
             bg->gradients[MOUSE_DOWN] = &g_array_index(gradients, GradientClass, id);
+    } else if (strcmp(key, "border_content_tint_weight") == 0) {
+        Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
+        bg->border_content_tint_weight = MAX(0.0, MIN(1.0, atoi(value) / 100.));
+    } else if (strcmp(key, "background_content_tint_weight") == 0) {
+        Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
+        bg->fill_content_tint_weight = MAX(0.0, MIN(1.0, atoi(value) / 100.));
     }
 
     /* Gradients */
@@ -372,8 +400,6 @@ void add_entry(char *key, char *value)
     /* 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) {
@@ -399,6 +425,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;
@@ -416,7 +443,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') {
@@ -481,6 +508,8 @@ void add_entry(char *key, char *value)
         wm_menu = atoi(value);
     else if (strcmp(key, "panel_dock") == 0)
         panel_dock = atoi(value);
+    else if (strcmp(key, "panel_pivot_struts") == 0)
+        panel_pivot_struts = atoi(value);
     else if (strcmp(key, "urgent_nb_of_blink") == 0)
         max_tick_urgent = atoi(value);
     else if (strcmp(key, "panel_layer") == 0) {
@@ -535,6 +564,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
@@ -555,6 +589,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
@@ -617,7 +666,7 @@ void add_entry(char *key, char *value)
         else if (g_str_equal(value, "dots"))
             separator->style = SEPARATOR_DOTS;
         else
-			fprintf(stderr, RED "Invalid separator_style value: %s" RESET "\n", value);
+            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);
@@ -634,6 +683,14 @@ void add_entry(char *key, char *value)
     /* Execp */
     else if (strcmp(key, "execp") == 0) {
         panel_config.execp_list = g_list_append(panel_config.execp_list, create_execp());
+    } else if (strcmp(key, "execp_name") == 0) {
+        Execp *execp = get_or_create_last_execp();
+        execp->backend->name[0] = 0;
+        if (strlen(value) > sizeof(execp->backend->name) - 1)
+            fprintf(stderr, RED "tint2: execp_name cannot be more than %ld bytes: '%s'" RESET "\n",
+                    sizeof(execp->backend->name) - 1, value);
+        else if (strlen(value) > 0)
+            snprintf(execp->backend->name, sizeof(execp->backend->name), value);
     } else if (strcmp(key, "execp_command") == 0) {
         Execp *execp = get_or_create_last_execp();
         free_and_null(execp->backend->command);
@@ -643,11 +700,14 @@ 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;
         }
+    } else if (strcmp(key, "execp_monitor") == 0) {
+        Execp *execp = get_or_create_last_execp();
+        execp->backend->monitor = config_get_monitor(value);
     } else if (strcmp(key, "execp_has_icon") == 0) {
         Execp *execp = get_or_create_last_execp();
         execp->backend->has_icon = atoi(value);
@@ -664,6 +724,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);
@@ -699,7 +760,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;
         }
@@ -707,7 +768,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;
         }
@@ -738,6 +799,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 = expand_tilde(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) {
@@ -875,6 +1018,8 @@ 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) {
@@ -884,6 +1029,8 @@ void add_entry(char *key, char *value)
             taskbar_sort_method = TASKBAR_SORT_CENTER;
         } else if (strcmp(value, "title") == 0) {
             taskbar_sort_method = TASKBAR_SORT_TITLE;
+        } else if (strcmp(value, "application") == 0) {
+            taskbar_sort_method = TASKBAR_SORT_APPLICATION;
         } else if (strcmp(value, "lru") == 0) {
             taskbar_sort_method = TASKBAR_SORT_LRU;
         } else if (strcmp(value, "mru") == 0) {
@@ -964,11 +1111,18 @@ void add_entry(char *key, char *value)
             panel_config.g_task.config_background_mask |= (1 << status);
             if (status == TASK_NORMAL)
                 panel_config.g_task.area.bg = panel_config.g_task.background[TASK_NORMAL];
+            if (panel_config.g_task.background[status]->border_content_tint_weight > 0 ||
+                panel_config.g_task.background[status]->fill_content_tint_weight > 0)
+                panel_config.g_task.has_content_tint = TRUE;
         }
     }
     // "tooltip" is deprecated but here for backwards compatibility
     else if (strcmp(key, "task_tooltip") == 0 || strcmp(key, "tooltip") == 0)
         panel_config.g_task.tooltip_enabled = atoi(value);
+    else if (strcmp(key, "task_thumbnail") == 0)
+        panel_config.g_task.thumbnail_enabled = atoi(value);
+    else if (strcmp(key, "task_thumbnail_size") == 0)
+        panel_config.g_task.thumbnail_width = MAX(8, atoi(value));
 
     /* Systray */
     else if (strcmp(key, "systray_padding") == 0) {
@@ -1009,10 +1163,13 @@ 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)
+        if (systray_hide_name_filter) {
+            fprintf(stderr, "tint2: Error: duplicate option 'systray_name_filter'. Please use it only once. See "
+                            "https://gitlab.com/o9000/tint2/issues/652\n");
             free(systray_hide_name_filter);
+        }
         systray_hide_name_filter = strdup(value);
     }
 
@@ -1165,7 +1322,12 @@ void add_entry(char *key, char *value)
         }
     }
 #endif
-	else
+    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)
@@ -1178,20 +1340,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) {
@@ -1245,11 +1410,12 @@ gboolean config_read_default_path()
 
     // copy tint2rc from system directory to user directory
 
-	fprintf(stderr, "tint2 warning: 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)
+    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(g_get_user_config_dir(), 0700);
+        g_mkdir_with_parents(g_get_user_config_dir(), 0700);
 
     gchar *path2 = 0;
     system_dirs = g_get_system_config_dirs();
@@ -1266,7 +1432,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);
@@ -1282,7 +1448,7 @@ gboolean config_read_default_path()
     // 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);

src/default_icon.h

@@ -0,0 +1,10 @@
+#ifndef default_icon_h
+#define default_icon_h
+
+#include <Imlib2.h>
+
+extern int default_icon_width;
+extern int default_icon_height;
+extern DATA32 default_icon_data[];
+
+#endif

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.h

@@ -8,6 +8,8 @@
 #include "common.h"
 #include "timer.h"
 
+extern bool debug_executors;
+
 // Architecture:
 // Panel panel_config contains an array of Execp, each storing all config options and all the state variables.
 // Only these run commands.
@@ -18,15 +20,18 @@
 
 typedef struct ExecpBackend {
     // Config:
+    char name[21];
     // Command to execute at a specified interval
     char *command;
     // Interval in seconds
     int interval;
+    int monitor;
     // 1 if first line of output is an icon path
     gboolean has_icon;
     gboolean cache_icon;
     int icon_w;
     int icon_h;
+    gboolean has_user_tooltip;
     char *tooltip;
     gboolean centered;
     gboolean has_font;
@@ -45,21 +50,25 @@ typedef struct ExecpBackend {
     Background *bg;
 
     // Backend state:
-	timeout *timer;
-	int child_pipe;
+    Timer timer;
+    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;
@@ -89,6 +98,7 @@ typedef struct Execp {
     ExecpBackend *backend;
     // Set only for frontend Execp items.
     ExecpFrontend *frontend;
+    bool dummy;
 } Execp;
 
 // Called before the config is read and panel_config/panels are created.
@@ -129,7 +139,7 @@ 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);
 
@@ -138,6 +148,13 @@ void execp_cmd_completed(Execp *obj, pid_t pid);
 // 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();
+
+void execp_force_update(Execp *execp);
+
 #endif // EXECPLUGIN_H

src/freespace/freespace.c

@@ -65,14 +65,14 @@ void cleanup_freespace(Panel *panel)
     panel->freespace_list = NULL;
 }
 
-int freespace_get_max_size(Panel *p)
+int freespace_get_max_size(Panel *panel)
 {
     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)) {
+    for (GList *walk = panel->area.children; walk; walk = g_list_next(walk)) {
         Area *a = (Area *)walk->data;
 
         if (!a->on_screen)
@@ -83,15 +83,15 @@ int freespace_get_max_size(Panel *p)
         }
 
         if (panel_horizontal)
-			size += a->width + p->area.paddingx;
+            size += a->width + panel->area.paddingx * panel->scale;
         else
-			size += a->height + p->area.paddingy;
+            size += a->height + panel->area.paddingy * panel->scale;
     }
 
     if (panel_horizontal)
-		size = p->area.width - size - left_right_border_width(&p->area) - p->area.paddingxlr;
+        size = panel->area.width - size - left_right_border_width(&panel->area) - panel->area.paddingxlr * panel->scale;
     else
-		size = p->area.height - size - top_bottom_border_width(&p->area) - p->area.paddingxlr;
+        size = panel->area.height - size - top_bottom_border_width(&panel->area) - panel->area.paddingxlr * panel->scale;
 
     return size / spacers;
 }

src/init.c

@@ -0,0 +1,314 @@
+#include "init.h"
+
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <X11/extensions/XShm.h>
+
+#include "config.h"
+#include "default_icon.h"
+#include "drag_and_drop.h"
+#include "fps_distribution.h"
+#include "panel.h"
+#include "server.h"
+#include "signals.h"
+#include "test.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], "--test") == 0) {
+            run_all_tests(false);
+            exit(0);
+        } else if (strcmp(argv[i], "--test-verbose") == 0) {
+            run_all_tests(true);
+            exit(0);
+        } else if (strcmp(argv[i], "--dump-image-data") == 0) {
+            dump_image_data(argv[i+1], argv[i+2]);
+            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(EXIT_FAILURE);
+        }
+    }
+}
+
+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;
+    debug_thumbnails = getenv("DEBUG_THUMBNAILS") != NULL;
+    debug_timers = getenv("DEBUG_TIMERS") != NULL;
+    debug_executors = getenv("DEBUG_EXECUTORS") != NULL;
+    debug_blink = getenv("DEBUG_BLINK") != NULL;
+    thumb_use_shm = getenv("TINT2_THUMBNAIL_SHM") != 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 Timer detect_compositor_timer = DEFAULT_TIMER;
+static int detect_compositor_timer_counter = 0;
+
+void detect_compositor(void *arg)
+{
+    if (server.composite_manager) {
+        stop_timer(&detect_compositor_timer);
+        return;
+    }
+
+    detect_compositor_timer_counter--;
+    if (detect_compositor_timer_counter < 0) {
+        stop_timer(&detect_compositor_timer);
+        return;
+    }
+
+    // No compositor, check for one
+    if (XGetSelectionOwner(server.display, server.atom._NET_WM_CM_S0) != None) {
+        stop_timer(&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;
+
+    // Check every 0.5 seconds for up to 30 seconds
+    detect_compositor_timer_counter = 60;
+    INIT_TIMER(detect_compositor_timer);
+    change_timer(&detect_compositor_timer, true, 500, 500, detect_compositor, 0);
+}
+
+void create_default_elements()
+{
+    default_timers();
+    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 load_default_task_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) {
+        default_icon = imlib_create_image_using_data(default_icon_width,
+                                                     default_icon_height,
+                                                     default_icon_data);
+    }
+}
+
+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_task_icon();
+
+    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(EXIT_FAILURE);
+    }
+    server.x11_fd = ConnectionNumber(server.display);
+    XSetErrorHandler(server_catch_error);
+    XSetIOErrorHandler(x11_io_error);
+    server_init_atoms();
+    server.screen = DefaultScreen(server.display);
+    server.root_win = RootWindow(server.display, server.screen);
+    server.desktop = get_current_desktop();
+    server.has_shm = XShmQueryExtension(server.display);
+
+    // 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_env_vars();
+    handle_cli_arguments(argc, argv);
+    create_default_elements();
+    init_signals();
+
+    init_X11_pre_config();
+    if (!config_read()) {
+        fprintf(stderr, "tint2: Could not read config file.\n");
+        print_usage();
+        warnings_for_timers = false;
+        cleanup();
+        exit(EXIT_FAILURE);
+    }
+
+    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_separator();
+    cleanup_taskbar();
+    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_timers();
+
+    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)
 {
@@ -59,9 +60,9 @@ void expand_exec(DesktopEntry *entry, const char *path)
     // %c -> Name
     // %k -> path
     if (entry->exec) {
-		char *exec2 = calloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) +
-		                         (entry->icon ? strlen(entry->icon) : 1) + 100,
-		                     1);
+        size_t buf_size = strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) +
+                (entry->icon ? strlen(entry->icon) : 1) + 100;
+        char *exec2 = calloc(buf_size, 1);
         char *p, *q;
         // p will never point to an escaped char
         for (p = entry->exec, q = exec2; *p; p++, q++) {
@@ -81,19 +82,30 @@ void expand_exec(DesktopEntry *entry, const char *path)
                 if (!*p)
                     break;
                 if (*p == 'i' && entry->icon != NULL) {
-					sprintf(q, "--icon '%s'", entry->icon);
+                    snprintf(q, buf_size, "--icon '%s'", entry->icon);
+                    char *old = q;
                     q += strlen("--icon ''");
                     q += strlen(entry->icon);
+                    buf_size -= (size_t)(q - old);
                     q--; // To balance the q++ in the for
                 } else if (*p == 'c' && entry->name != NULL) {
-					sprintf(q, "'%s'", entry->name);
+                    snprintf(q, buf_size, "'%s'", entry->name);
+                    char *old = q;
                     q += strlen("''");
                     q += strlen(entry->name);
+                    buf_size -= (size_t)(q - old);
                     q--; // To balance the q++ in the for
                 } else if (*p == 'c') {
-					sprintf(q, "'%s'", path);
+                    snprintf(q, buf_size, "'%s'", path);
+                    char *old = q;
                     q += strlen("''");
                     q += strlen(path);
+                    buf_size -= (size_t)(q - old);
+                    q--; // To balance the q++ in the for
+                } else if (*p == 'f' || *p == 'F') {
+                    snprintf(q, buf_size, "%c%c", '%', *p);
+                    q += 2;
+                    buf_size -= 2;
                     q--; // To balance the q++ in the for
                 } else {
                     // We don't care about other expansions
@@ -112,10 +124,12 @@ gboolean read_desktop_file_full_path(const char *path, DesktopEntry *entry)
 {
     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 +139,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;
@@ -191,6 +205,10 @@ gboolean read_desktop_file_full_path(const char *path, DesktopEntry *entry)
                 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;
             }
         }
     }
@@ -277,11 +295,11 @@ void free_desktop_entry(DesktopEntry *entry)
 
 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

@@ -17,6 +17,8 @@ typedef struct DesktopEntry {
     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
@@ -46,7 +48,7 @@ int parse_theme_line(char *line, char **key, char **value)
     return parse_dektop_line(line, key, value);
 }
 
-GSList *icon_locations = NULL;
+static GSList *icon_locations = NULL;
 // Do not free the result.
 const GSList *get_icon_locations()
 {
@@ -72,6 +74,21 @@ const GSList *get_icon_locations()
     return icon_locations;
 }
 
+static GSList *icon_extensions = NULL;
+const GSList *get_icon_extensions()
+{
+    if (icon_extensions)
+        return icon_extensions;
+
+    icon_extensions = g_slist_append(icon_extensions, ".png");
+    icon_extensions = g_slist_append(icon_extensions, ".xpm");
+#ifdef HAVE_RSVG
+    icon_extensions = g_slist_append(icon_extensions, ".svg");
+#endif
+    icon_extensions = g_slist_append(icon_extensions, "");
+    return icon_extensions;
+}
+
 IconTheme *make_theme(const char *name)
 {
     IconTheme *theme = calloc(1, sizeof(IconTheme));
@@ -90,7 +107,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;
     }
 
@@ -325,22 +342,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,
@@ -352,7 +369,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)
@@ -379,7 +396,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);
@@ -399,7 +416,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;
@@ -413,7 +430,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);
@@ -426,7 +443,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;
@@ -459,7 +476,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);
@@ -471,7 +488,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);
@@ -482,7 +499,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";
     }
 
@@ -533,42 +550,46 @@ 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
+Bool is_full_path(const char *s)
+{
+    if (!s)
+        return FALSE;
+    return s[0] == '/';
+}
+
+Bool file_exists(const char *path)
+{
+    return g_file_test(path, G_FILE_TEST_EXISTS);
+}
+
+char *icon_path_from_full_path(const char *s)
+{
+    if (is_full_path(s) && file_exists(s))
+        return strdup(s);
+    char *expanded = expand_tilde(s);
+    if (is_full_path(expanded) && file_exists(expanded))
+        return expanded;
+    free(expanded);
+    return NULL;
+}
+
 char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 {
-	if (icon_name == NULL)
+    if (!icon_name)
         return NULL;
 
-	// If the icon_name is already a path and the file exists, return it
-	if (strstr(icon_name, "/") == icon_name) {
-		if (g_file_test(icon_name, G_FILE_TEST_EXISTS))
-			return strdup(icon_name);
-		else
-			return NULL;
-	}
+    char *result = icon_path_from_full_path(icon_name);
+    if (result)
+        return result;
 
     const GSList *basenames = get_icon_locations();
-	GSList *extensions = NULL;
-	extensions = g_slist_append(extensions, ".png");
-	extensions = g_slist_append(extensions, ".xpm");
-#ifdef HAVE_RSVG
-	extensions = g_slist_append(extensions, ".svg");
-#endif
-	// if the icon name already contains one of the extensions (e.g. vlc.png instead of vlc) add a special entry
-	for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
-		char *extension = (char *)ext->data;
-		if (strlen(icon_name) > strlen(extension) &&
-			strcmp(extension, icon_name + strlen(icon_name) - strlen(extension)) == 0) {
-			extensions = g_slist_append(extensions, "");
-			break;
-		}
-	}
+    const GSList *extensions = get_icon_extensions();
 
     GSList *theme;
 
     // Best size match
     // Contrary to the freedesktop spec, we are not choosing the closest icon in size, but the next larger icon
-	// otherwise the quality is usually crap (for size 22, if you can choose 16 or 32, you're better with 32)
+    // otherwise the quality is worse when scaling up (for size 22, if you can choose 16 or 32, you're better with 32)
     // We do fallback to the closest size if we cannot find a larger or equal icon
 
     // These 3 variables are used for keeping the closest size match
@@ -581,10 +602,12 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
     char *next_larger = NULL;
     GSList *next_larger_theme = NULL;
 
-	int file_name_size = 4096;
+    size_t file_name_size = 4096;
     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,
@@ -600,9 +623,11 @@ 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)) {
+                for (const GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
                     char *base_name = (char *)base->data;
                     char *theme_name = ((IconTheme *)theme->data)->name;
                     char *dir_name = ((IconThemeDir *)dir->data)->name;
@@ -616,12 +641,12 @@ 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);
+                    snprintf(file_name, (size_t)file_name_size, "%s/%s/%s/%s%s", base_name, theme_name, dir_name, icon_name, extension);
+                    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)) {
@@ -632,8 +657,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 &&
@@ -646,8 +671,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);
                         }
                     }
                 }
@@ -657,28 +682,30 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
     free(file_name);
     file_name = NULL;
     if (next_larger) {
-		g_slist_free(extensions);
         free(best_file_name);
         return next_larger;
     }
     if (best_file_name) {
-		g_slist_free(extensions);
         return best_file_name;
     }
 
     // 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)) {
+            for (const GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
                 char *base_name = (char *)base->data;
                 char *extension = (char *)ext->data;
-				file_name = calloc(strlen(base_name) + strlen(icon_name) + strlen(extension) + 100, 1);
+                size_t file_name_size2 = strlen(base_name) + strlen(icon_name) + strlen(extension) + 100;
+                file_name = calloc(file_name_size2, 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);
+                snprintf(file_name, file_name_size2, "%s/%s%s", base_name, icon_name, extension);
+                if (debug_icons)
+                    fprintf(stderr, "tint2: Checking %s\n", file_name);
                 if (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
-					g_slist_free(extensions);
+                    if (debug_icons)
+                        fprintf(stderr, "tint2: Found %s\n", file_name);
                     return file_name;
                 } else {
                     free(file_name);
@@ -688,7 +715,6 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
         }
     }
 
-	g_slist_free(extensions);
     return NULL;
 }
 
@@ -715,7 +741,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);
@@ -740,28 +766,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);
@@ -771,7 +815,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

@@ -50,10 +50,11 @@ 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);
@@ -63,6 +64,8 @@ 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()
 {
     launcher_enabled = 0;
@@ -94,6 +97,7 @@ 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);
@@ -108,16 +112,22 @@ void init_launcher_panel(void *p)
         return;
 
     // 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->icon_size = launcher_max_icon_size > 0 ? launcher_max_icon_size * panel->scale : 24;
 
     launcher->area.on_screen = TRUE;
     schedule_panel_redraw();
     instantiate_area_gradients(&launcher->area);
 
-	launcher_load_themes(launcher);
+    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++) {
@@ -160,18 +170,16 @@ void cleanup_launcher_theme(Launcher *launcher)
     }
     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)
 {
+    Panel *panel = launcher->area.panel;
     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;
+                (2 * launcher->area.paddingy * panel->scale);
+    if (launcher_max_icon_size)
+        icon_size = MIN(icon_size, launcher_max_icon_size * panel->scale);
     return icon_size;
 }
 
@@ -182,6 +190,7 @@ void launcher_compute_geometry(Launcher *launcher,
                                int *icons_per_row,
                                int *margin)
 {
+    Panel *panel = (Panel*)launcher->area.panel;
     int count = 0;
     for (GSList *l = launcher->list_icons; l; l = l->next) {
         LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
@@ -197,25 +206,25 @@ void launcher_compute_geometry(Launcher *launcher,
         if (!count) {
             *size = 0;
         } else {
-			int height = launcher->area.height - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
+            int height = launcher->area.height - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy * panel->scale;
             // 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_column = (height + launcher->area.paddingx * panel->scale) / (*icon_size + launcher->area.paddingx * panel->scale);
+            *margin = height - (*icons_per_column - 1) * (*icon_size + launcher->area.paddingx * panel->scale) - *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);
+            *size = left_right_border_width(&launcher->area) + 2 * launcher->area.paddingxlr * panel->scale +
+                    (*icon_size * *icons_per_row) + ((*icons_per_row - 1) * launcher->area.paddingx * panel->scale);
         }
     } else {
         if (!count) {
             *size = 0;
         } else {
-			int width = launcher->area.width - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
+            int width = launcher->area.width - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy * panel->scale;
             // 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_row = (width + launcher->area.paddingx * panel->scale) / (*icon_size + launcher->area.paddingx * panel->scale);
+            *margin = width - (*icons_per_row - 1) * (*icon_size + launcher->area.paddingx * panel->scale) - *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);
+            *size = top_bottom_border_width(&launcher->area) + 2 * launcher->area.paddingxlr * panel->scale +
+                    (*icon_size * *icons_per_column) + ((*icons_per_column - 1) * launcher->area.paddingx * panel->scale);
         }
     }
 }
@@ -232,6 +241,7 @@ int launcher_compute_desired_size(void *obj)
 gboolean resize_launcher(void *obj)
 {
     Launcher *launcher = (Launcher *)obj;
+    Panel *panel = (Panel*)launcher->area.panel;
 
     int size, icons_per_column, icons_per_row, margin;
     launcher_compute_geometry(launcher, &size, &launcher->icon_size, &icons_per_column, &icons_per_row, &margin);
@@ -246,7 +256,7 @@ gboolean resize_launcher(void *obj)
             launcher_reload_icon_image(launcher, launcherIcon);
         }
     }
-	save_icon_cache(launcher->icon_theme_wrapper);
+    save_icon_cache(icon_theme_wrapper);
 
     int count = 0;
     gboolean needs_repositioning = FALSE;
@@ -274,11 +284,11 @@ gboolean resize_launcher(void *obj)
     int posx, posy;
     int start;
     if (panel_horizontal) {
-		posy = start = top_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
-		posx = left_border_width(&launcher->area) + launcher->area.paddingxlr;
+        posy = start = top_border_width(&launcher->area) + launcher->area.paddingy * panel->scale + margin / 2;
+        posx = left_border_width(&launcher->area) + launcher->area.paddingxlr * panel->scale;
     } else {
-		posx = start = left_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
-		posy = top_border_width(&launcher->area) + launcher->area.paddingxlr;
+        posx = start = left_border_width(&launcher->area) + launcher->area.paddingy * panel->scale + margin / 2;
+        posy = top_border_width(&launcher->area) + launcher->area.paddingxlr * panel->scale;
     }
 
     int i = 0;
@@ -290,20 +300,20 @@ gboolean resize_launcher(void *obj)
         launcherIcon->y = posy;
         launcherIcon->x = posx;
         launcher_icon_on_change_layout(launcherIcon);
-		// printf("launcher %d : %d,%d\n", i, posx, posy);
+        // fprintf(stderr, "tint2: launcher %d : %d,%d\n", i, posx, posy);
         if (panel_horizontal) {
             if (i % icons_per_column) {
-				posy += launcher->icon_size + launcher->area.paddingx;
+                posy += launcher->icon_size + launcher->area.paddingx * panel->scale;
             } else {
                 posy = start;
-				posx += (launcher->icon_size + launcher->area.paddingx);
+                posx += (launcher->icon_size + launcher->area.paddingx * panel->scale);
             }
         } else {
             if (i % icons_per_row) {
-				posx += launcher->icon_size + launcher->area.paddingx;
+                posx += launcher->icon_size + launcher->area.paddingx * panel->scale;
             } else {
                 posx = start;
-				posy += (launcher->icon_size + launcher->area.paddingx);
+                posy += (launcher->icon_size + launcher->area.paddingx * panel->scale);
             }
         }
     }
@@ -321,6 +331,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)
@@ -367,13 +388,23 @@ void draw_launcher_icon(void *obj, cairo_t *c)
 void launcher_icon_dump_geometry(void *obj, int indent)
 {
     LauncherIcon *launcherIcon = (LauncherIcon *)obj;
-	fprintf(stderr, "%*sIcon: w = h = %d, name = %s\n", indent, "", launcherIcon->icon_size, launcherIcon->icon_name);
+    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;
-	if (original) {
+    if (!icon_size) {
+        icon_scaled = imlib_create_image(1, 1);
+        imlib_context_set_image(icon_scaled);
+        imlib_context_set_color(255, 255, 255, 255);
+        imlib_image_fill_rectangle(0, 0, icon_size, icon_size);
+    } else if (original) {
         imlib_context_set_image(original);
         icon_scaled = imlib_create_cropped_scaled_image(0,
                                                         0,
@@ -411,67 +442,27 @@ void free_icon(Imlib_Image icon)
     }
 }
 
-void launcher_action(LauncherIcon *icon, XEvent *evt)
+void launcher_action(LauncherIcon *icon, XEvent *evt, int x, int y)
 {
     launcher_reload_icon((Launcher *)icon->area.parent, icon);
     launcher_reload_hidden_icons((Launcher *)icon->area.parent);
-	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
+
     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
-		if (icon->cwd)
-			chdir(icon->cwd);
-		execl("/bin/sh", "/bin/sh", "-c", icon->cmd, NULL);
-		fprintf(stderr, "Failed to execlp %s\n", icon->cmd);
-#if HAVE_SN
-		if (startup_notifications) {
-			sn_launcher_context_unref(ctx);
-		}
-#endif // HAVE_SN
-		exit(1);
-	} else {
-// Parent process
-#if HAVE_SN
-		if (startup_notifications) {
-			g_tree_insert(server.pids, GINT_TO_POINTER(pid), ctx);
-		}
-#endif // HAVE_SN
-	}
-	free(cmd);
-}
-
-
 
 // Populates the list_icons list from the list_apps list
 void launcher_load_icons(Launcher *launcher)
@@ -487,7 +478,7 @@ void launcher_load_icons(Launcher *launcher)
         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);
+        snprintf(launcherIcon->area.name, sizeof(launcherIcon->area.name), "LauncherIcon %d", index);
         launcherIcon->area.resize_needed = 0;
         launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
         launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
@@ -525,6 +516,8 @@ void launcher_reload_icon(Launcher *launcher, LauncherIcon *launcherIcon)
             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);
@@ -565,22 +558,22 @@ void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon)
     free_icon(launcherIcon->image_pressed);
     launcherIcon->image = NULL;
 
-	char *new_icon_path = get_icon_path(launcher->icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size);
+    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, 1);
+        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(launcher->icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size);
+        new_icon_path = get_icon_path(icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size, TRUE);
         if (new_icon_path)
-			launcherIcon->image = imlib_load_image_immediately(new_icon_path);
+            launcherIcon->image = load_image(new_icon_path, TRUE);
     }
     Imlib_Image original = launcherIcon->image;
     launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);
     free_icon(original);
     free(launcherIcon->icon_path);
     launcherIcon->icon_path = new_icon_path;
-	// fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+    // 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,
@@ -595,10 +588,11 @@ void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon)
     schedule_redraw(&launcherIcon->area);
 }
 
-// Populates the icon_theme_wrapper list
-void launcher_load_themes(Launcher *launcher)
+void load_icon_themes()
 {
-	launcher->icon_theme_wrapper =
+    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")
@@ -608,14 +602,9 @@ 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;
     }

src/launcher/launcher.h

@@ -12,12 +12,15 @@
 #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;
 
@@ -30,6 +33,8 @@ typedef struct LauncherIcon {
     Imlib_Image image_pressed;
     char *cmd;
     char *cwd;
+    gboolean start_in_terminal;
+    gboolean startup_notification;
     char *icon_name;
     char *icon_path;
     char *icon_tooltip;
@@ -46,7 +51,6 @@ 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;
 
@@ -65,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,829 @@
+/**************************************************************************
+*
+* 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 <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", __func__, __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", __func__, __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", __func__, __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", __func__, __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", __func__, __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",
+                    __func__,
+                    __LINE__,
+                    win,
+                    task ? (task->title ? task->title : "??") : "null",
+                    atom_name);
+            XFree(atom_name);
+        }
+        if (!task) {
+            if (debug)
+                fprintf(stderr, "tint2: %s %d\n", __func__, __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_update_contents_for((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", __func__, __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, e->xany.send_event);
+        else if (e->type == LeaveNotify)
+            autohide_trigger_hide(panel, e->xany.send_event);
+        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);
+        } else if (e->xclient.message_type == server.atom.TINT2_REFRESH_EXECP &&
+            e->xclient.format == 8) {
+            char name[sizeof(e->xclient.data.b) + 1] = {};
+            memcpy(name, e->xclient.data.b, sizeof(e->xclient.data.b));
+            for (GList *l = panel_config.execp_list; l; l = l->next) {
+                Execp *execp = (Execp *)l->data;
+                if (strncmp(name, execp->backend->name, sizeof(execp->backend->name) - 1) == 0) {
+                    fprintf(stderr, "tint2: Refreshing executor: %s\n", name);
+                    execp_force_update(execp);
+                }
+            }
+        }
+        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];
+            snprintf(path, sizeof(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_duration_to_next_timer_expiration()) >= 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)
+{
+#ifdef USE_REAL_MALLOC
+    if (!getenv("G_SLICE") && setenv("G_SLICE", "always-malloc", 1) == 0) {
+        fprintf(stderr,
+                YELLOW "tint2: reexecuting tint2 without glib slice allocator..." RESET "\n");
+        execvp(argv[0], argv);
+        fprintf(stderr, RED "tint2: %s %d: execvp failed! carrying on..." RESET "\n",
+                __FILE__, __LINE__);
+    }
+#else
+    fprintf(stderr, "tint2: Using glib slice allocator (default). "
+                    "Run tint2 with environment variable G_SLICE=always-malloc "
+                    "in case of strange behavior or crashes\n");
+#endif
+    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;
@@ -49,6 +49,7 @@ MouseAction mouse_tilt_right;
 TaskbarMode taskbar_mode;
 gboolean wm_menu;
 gboolean panel_dock;
+gboolean panel_pivot_struts;
 Layer panel_layer;
 PanelPosition panel_position;
 gboolean panel_horizontal;
@@ -57,7 +58,9 @@ gboolean task_dragged;
 char *panel_window_name = NULL;
 gboolean debug_geometry;
 gboolean debug_gradients;
-
+gboolean startup_notifications;
+gboolean debug_thumbnails;
+gboolean debug_blink;
 gboolean panel_autohide;
 int panel_autohide_show_timeout;
 int panel_autohide_hide_timeout;
@@ -77,11 +80,16 @@ int num_panels;
 GArray *backgrounds;
 GArray *gradients;
 
+double ui_scale_dpi_ref;
+double ui_scale_monitor_size_ref;
+
 Imlib_Image default_icon;
 char *default_font = NULL;
 
 void default_panel()
 {
+    ui_scale_dpi_ref = 0;
+    ui_scale_monitor_size_ref = 0;
     panels = NULL;
     num_panels = 0;
     default_icon = NULL;
@@ -96,6 +104,7 @@ void default_panel()
     panel_shrink = FALSE;
     panel_strut_policy = STRUT_FOLLOW_SIZE;
     panel_dock = FALSE;         // default not in the dock
+    panel_pivot_struts = FALSE;
     panel_layer = BOTTOM_LAYER; // default is bottom layer
     panel_window_name = strdup("tint2");
     wm_menu = FALSE;
@@ -128,8 +137,6 @@ void cleanup_panel()
     if (!panels)
         return;
 
-	cleanup_taskbar();
-
     for (int i = 0; i < num_panels; i++) {
         Panel *p = &panels[i];
 
@@ -143,10 +150,12 @@ void cleanup_panel()
         if (p->main_win)
             XDestroyWindow(server.display, p->main_win);
         p->main_win = 0;
-		stop_timeout(p->autohide_timeout);
+        destroy_timer(&p->autohide_timer);
         cleanup_freespace(p);
     }
 
+    free_icon_themes();
+
     free(panel_items_order);
     panel_items_order = NULL;
     free(panel_window_name);
@@ -174,11 +183,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();
@@ -190,6 +201,7 @@ void init_panel()
     init_taskbar();
     init_separator();
     init_execp();
+    init_button();
 
     // number of panels (one monitor or 'all' monitors)
     if (panel_config.monitor >= 0)
@@ -200,10 +212,11 @@ void init_panel()
     panels = calloc(num_panels, sizeof(Panel));
     for (int i = 0; i < num_panels; i++) {
         memcpy(&panels[i], &panel_config, sizeof(Panel));
+        INIT_TIMER(panels[i].autohide_timer);
     }
 
     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);
@@ -212,6 +225,17 @@ void init_panel()
 
         if (panel_config.monitor < 0)
             p->monitor = i;
+        if (ui_scale_dpi_ref > 0 && server.monitors[p->monitor].dpi > 0)
+            p->scale = server.monitors[p->monitor].dpi / ui_scale_dpi_ref;
+        else
+            p->scale = 1;
+        if (ui_scale_monitor_size_ref > 0)
+            p->scale *= server.monitors[p->monitor].height / ui_scale_monitor_size_ref;
+        if (p->scale > 8 || p->scale < 1./8) {
+            fprintf(stderr, RED "tint2: panel %d having scale %g outside bounds, resetting to 1.0" RESET "\n", i + 1, p->scale);
+            p->scale = 1;
+        }
+        fprintf(stderr, BLUE "tint2: panel %d uses scale %g " RESET "\n", i + 1, p->scale);
         if (!p->area.bg)
             p->area.bg = &g_array_index(backgrounds, Background, 0);
         p->area.parent = p;
@@ -245,9 +269,12 @@ void init_panel()
                 init_freespace_panel(p);
             if (panel_items_order[k] == ':')
                 init_separator_panel(p);
-			if (panel_items_order[k] == 'E')
+            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);
 
         // catch some events
@@ -281,7 +308,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) {
@@ -290,7 +317,7 @@ void init_panel()
         }
 
         if (panel_autohide)
-			autohide_trigger_hide(p);
+            autohide_trigger_hide(p, false);
     }
 
     taskbar_refresh_tasklist();
@@ -314,7 +341,7 @@ void panel_compute_size(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;
@@ -340,13 +367,26 @@ void panel_compute_size(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;
         }
     }
 
+    if (!panel->fractional_width) {
+        if (panel_horizontal)
+            panel->area.width *= panel->scale;
+        else
+            panel->area.height *= panel->scale;
+    }
+    if (!panel->fractional_height) {
+        if (panel_horizontal)
+            panel->area.height *= panel->scale;
+        else
+            panel->area.width *= panel->scale;
+    }
+
     if (panel->area.width + panel->marginx > server.monitors[panel->monitor].width)
         panel->area.width = server.monitors[panel->monitor].width - panel->marginx;
     if (panel->area.height + panel->marginy > server.monitors[panel->monitor].height)
@@ -393,7 +433,7 @@ void panel_compute_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);
 }
 
@@ -408,7 +448,7 @@ 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;
@@ -441,9 +481,9 @@ gboolean resize_panel(void *obj)
             if (!taskbar->area.on_screen)
                 continue;
             if (panel_horizontal)
-				taskbar->area.width = 2 * taskbar->area.paddingxlr;
+                taskbar->area.width = 2 * taskbar->area.paddingxlr * panel->scale;
             else
-				taskbar->area.height = 2 * taskbar->area.paddingxlr;
+                taskbar->area.height = 2 * taskbar->area.paddingxlr * panel->scale;
             if (taskbarname_enabled && taskbar->area.children) {
                 Area *name = (Area *)taskbar->area.children->data;
                 if (name->on_screen) {
@@ -460,9 +500,9 @@ gboolean resize_panel(void *obj)
                     continue;
                 if (!first_child) {
                     if (panel_horizontal)
-						taskbar->area.width += taskbar->area.paddingx;
+                        taskbar->area.width += taskbar->area.paddingx * panel->scale;
                     else
-						taskbar->area.height += taskbar->area.paddingy;
+                        taskbar->area.height += taskbar->area.paddingy * panel->scale;
                 }
                 first_child = FALSE;
             }
@@ -485,9 +525,11 @@ gboolean resize_panel(void *obj)
             }
         }
 
-		// Distribute the remaining size between tasks
+        // Distribute the remaining size between taskbars
         if (num_tasks > 0) {
             int task_size = total_size / num_tasks;
+            if (taskbar_alignment != ALIGN_LEFT)
+                task_size = MIN(task_size, panel_horizontal ? panel_config.g_task.maximum_width : panel_config.g_task.maximum_height);
             for (int i = 0; i < panel->num_desktops; i++) {
                 Taskbar *taskbar = &panel->taskbar[i];
                 if (!taskbar->area.on_screen)
@@ -504,6 +546,49 @@ gboolean resize_panel(void *obj)
                         taskbar->area.height += task_size;
                 }
             }
+            int slack = total_size - task_size * num_tasks;
+            if (taskbar_alignment == ALIGN_RIGHT) {
+                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 += slack;
+                    else
+                        taskbar->area.height += slack;
+                    break;
+                }
+            } else if (taskbar_alignment == ALIGN_CENTER) {
+                slack /= 2;
+                Taskbar *left_taskbar = NULL;
+                Taskbar *right_taskbar = NULL;
+                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 += slack;
+                    else
+                        taskbar->area.height += slack;
+                    taskbar->area.alignment = ALIGN_RIGHT;
+                    left_taskbar = taskbar;
+                    break;
+                }
+                for (int i = panel->num_desktops - 1; i >= 0; i--) {
+                    Taskbar *taskbar = &panel->taskbar[i];
+                    if (!taskbar->area.on_screen)
+                        continue;
+                    if (panel_horizontal)
+                        taskbar->area.width += slack;
+                    else
+                        taskbar->area.height += slack;
+                    taskbar->area.alignment = ALIGN_LEFT;
+                    right_taskbar = taskbar;
+                    break;
+                }
+                if (left_taskbar == right_taskbar)
+                    left_taskbar->area.alignment = ALIGN_CENTER;
+            }
         } else {
             // No tasks => expand the first visible taskbar
             for (int i = 0; i < panel->num_desktops; i++) {
@@ -528,6 +613,21 @@ gboolean resize_panel(void *obj)
     return FALSE;
 }
 
+#define STRUT_LEFT      0
+#define STRUT_RIGHT     1
+#define STRUT_TOP       2
+#define STRUT_BOTTOM    3
+#define STRUT_LEFT_Y1   4
+#define STRUT_LEFT_Y2   5
+#define STRUT_RIGHT_Y1  6
+#define STRUT_RIGHT_Y2  7
+#define STRUT_TOP_X1    8
+#define STRUT_TOP_X2    9
+#define STRUT_BOTTOM_X1 10
+#define STRUT_BOTTOM_X2 11
+#define STRUT_COUNT     12
+#define STRUT_COUNT_OLD 4
+
 void update_strut(Panel *p)
 {
     if (panel_strut_policy == STRUT_NONE) {
@@ -542,36 +642,36 @@ void update_strut(Panel *p)
     int d3;
     XGetGeometry(server.display, server.root_win, &d2, &d3, &d3, &screen_width, &screen_height, &d1, &d1);
     Monitor monitor = server.monitors[p->monitor];
-	long struts[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-	if (panel_horizontal) {
+    long struts[STRUT_COUNT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    if (panel_horizontal ^ panel_pivot_struts) {
         int height = p->area.height + p->marginy;
-		if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && panel_autohide))
+        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;
-			struts[8] = p->posx;
+            struts[STRUT_TOP] = height + monitor.y;
+            struts[STRUT_TOP_X1] = p->posx;
             // p->area.width - 1 allowed full screen on monitor 2
-			struts[9] = p->posx + p->area.width - 1;
+            struts[STRUT_TOP_X2] = p->posx + p->area.width - 1;
         } else {
-			struts[3] = height + screen_height - monitor.y - monitor.height;
-			struts[10] = p->posx;
+            struts[STRUT_BOTTOM] = height + screen_height - monitor.y - monitor.height;
+            struts[STRUT_BOTTOM_X1] = p->posx;
             // p->area.width - 1 allowed full screen on monitor 2
-			struts[11] = p->posx + p->area.width - 1;
+            struts[STRUT_BOTTOM_X2] = p->posx + p->area.width - 1;
         }
     } else {
         int width = p->area.width + p->marginx;
-		if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && panel_autohide))
+        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;
-			struts[4] = p->posy;
+            struts[STRUT_LEFT] = width + monitor.x;
+            struts[STRUT_LEFT_Y1] = p->posy;
             // p->area.width - 1 allowed full screen on monitor 2
-			struts[5] = p->posy + p->area.height - 1;
+            struts[STRUT_LEFT_Y2] = p->posy + p->area.height - 1;
         } else {
-			struts[1] = width + screen_width - monitor.x - monitor.width;
-			struts[6] = p->posy;
+            struts[STRUT_RIGHT] = width + screen_width - monitor.x - monitor.width;
+            struts[STRUT_RIGHT_Y1] = p->posy;
             // p->area.width - 1 allowed full screen on monitor 2
-			struts[7] = p->posy + p->area.height - 1;
+            struts[STRUT_RIGHT_Y2] = p->posy + p->area.height - 1;
         }
     }
     // Old specification : fluxbox need _NET_WM_STRUT.
@@ -582,7 +682,7 @@ void update_strut(Panel *p)
                     32,
                     PropModeReplace,
                     (unsigned char *)&struts,
-	                4);
+                    STRUT_COUNT_OLD);
     XChangeProperty(server.display,
                     p->main_win,
                     server.atom._NET_WM_STRUT_PARTIAL,
@@ -590,7 +690,7 @@ void update_strut(Panel *p)
                     32,
                     PropModeReplace,
                     (unsigned char *)&struts,
-	                12);
+                    STRUT_COUNT);
 }
 
 void set_panel_items_order(Panel *p)
@@ -603,6 +703,7 @@ 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);
@@ -640,6 +741,12 @@ void set_panel_items_order(Panel *p)
             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);
 }
@@ -708,6 +815,14 @@ void set_panel_window_geometry(Panel *panel)
 
     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,
@@ -715,6 +830,14 @@ void set_panel_window_geometry(Panel *panel)
                                   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,
@@ -725,6 +848,14 @@ void set_panel_window_geometry(Panel *panel)
     } 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,
@@ -732,6 +863,14 @@ void set_panel_window_geometry(Panel *panel)
                                   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,
@@ -769,15 +908,24 @@ 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);
@@ -954,15 +1102,25 @@ Execp *click_execp(Panel *panel, int x, int y)
     return NULL;
 }
 
-void stop_autohide_timeout(Panel *p)
+Button *click_button(Panel *panel, int x, int y)
 {
-	stop_timeout(p->autohide_timeout);
+    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_timer(Panel *p)
+{
+    stop_timer(&p->autohide_timer);
 }
 
 void autohide_show(void *p)
 {
     Panel *panel = (Panel *)p;
-	stop_autohide_timeout(panel);
+    stop_autohide_timer(panel);
     panel->is_hidden = 0;
     XMapSubwindows(server.display, panel->main_win); // systray windows
     set_panel_window_geometry(panel);
@@ -974,7 +1132,7 @@ void autohide_show(void *p)
 void autohide_hide(void *p)
 {
     Panel *panel = (Panel *)p;
-	stop_autohide_timeout(panel);
+    stop_autohide_timer(panel);
     set_panel_layer(panel, panel_layer);
     panel->is_hidden = TRUE;
     XUnmapSubwindows(server.display, panel->main_win); // systray windows
@@ -982,26 +1140,27 @@ void autohide_hide(void *p)
     schedule_panel_redraw();
 }
 
-void autohide_trigger_show(Panel *p)
+void autohide_trigger_show(Panel *p, bool forced)
 {
     if (!p)
         return;
-	change_timeout(&p->autohide_timeout, panel_autohide_show_timeout, 0, autohide_show, p);
+    change_timer(&p->autohide_timer, true, forced ? 0 : panel_autohide_show_timeout, 0, autohide_show, p);
 }
 
-void autohide_trigger_hide(Panel *p)
+void autohide_trigger_hide(Panel *p, bool forced)
 {
     if (!p)
         return;
 
+    if (!forced) {
         Window root, child;
         int xr, yr, xw, yw;
         unsigned int mask;
         if (XQueryPointer(server.display, p->main_win, &root, &child, &xr, &yr, &xw, &yw, &mask))
             if (child)
                 return; // mouse over one of the system tray icons
-
-	change_timeout(&p->autohide_timeout, panel_autohide_hide_timeout, 0, autohide_hide, p);
+    }
+    change_timer(&p->autohide_timer, true, forced ? 0 : panel_autohide_hide_timeout, 0, autohide_hide, p);
 }
 
 void shrink_panel(Panel *panel)
@@ -1029,6 +1188,7 @@ void shrink_panel(Panel *panel)
         systray.area.resize_needed = TRUE;
         schedule_redraw(&systray.area);
         refresh_systray = TRUE;
+        update_minimized_icon_positions(panel);
     }
 }
 
@@ -1050,7 +1210,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()
@@ -1060,6 +1229,7 @@ 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();
@@ -1069,6 +1239,63 @@ void _schedule_panel_redraw(const char *file, const char *function, const int li
 {
     panel_refresh = TRUE;
     if (debug_fps) {
-		fprintf(stderr, YELLOW "%s %s %d: triggering panel redraw" RESET "\n", file, function, line);
+        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

@@ -23,12 +23,12 @@
 #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;
@@ -69,6 +69,7 @@ typedef enum Strut {
 extern TaskbarMode taskbar_mode;
 extern gboolean wm_menu;
 extern gboolean panel_dock;
+extern gboolean panel_pivot_struts;
 extern Layer panel_layer;
 extern char *panel_window_name;
 extern PanelPosition panel_position;
@@ -89,9 +90,16 @@ 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;
+extern gboolean debug_thumbnails;
+extern double ui_scale_dpi_ref;
+extern double ui_scale_monitor_size_ref;
+extern gboolean thumb_use_shm;
+extern gboolean debug_blink;
 
 typedef struct Panel {
     Area area;
@@ -114,6 +122,7 @@ typedef struct Panel {
     int mouse_pressed_alpha;
     int mouse_pressed_saturation;
     int mouse_pressed_brightness;
+    double scale;
 
     // Per-panel parameters and states for Taskbar and Task
     GlobalTaskbar g_taskbar;
@@ -135,12 +144,13 @@ typedef struct Panel {
     GList *freespace_list;
     GList *separator_list;
     GList *execp_list;
+    GList *button_list;
 
     // Autohide
     gboolean is_hidden;
     int hidden_width, hidden_height;
     Pixmap hidden_pixmap;
-	timeout *autohide_timeout;
+    Timer autohide_timer;
 } Panel;
 
 extern Panel panel_config;
@@ -162,7 +172,7 @@ 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__)
+#define schedule_panel_redraw() _schedule_panel_redraw(__FILE__, __func__, __LINE__)
 
 void set_panel_items_order(Panel *p);
 void place_panel_all_desktops(Panel *p);
@@ -189,15 +199,22 @@ 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);
-void autohide_trigger_show(Panel *p);
-void autohide_trigger_hide(Panel *p);
+void autohide_trigger_show(Panel *p, bool forced);
+void autohide_trigger_hide(Panel *p, bool forced);
 
 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

@@ -115,31 +115,33 @@ void cleanup_separator()
 int separator_compute_desired_size(void *obj)
 {
     Separator *separator = (Separator *)obj;
+    Panel *panel = (Panel*)separator->area.panel;
     if (!separator->area.on_screen)
         return 0;
 
     if (panel_horizontal)
-		return separator->thickness + 2 * separator->area.paddingxlr + left_right_border_width(&separator->area);
+        return separator->thickness + 2 * separator->area.paddingxlr * panel->scale + left_right_border_width(&separator->area);
     else
-		return separator->thickness + 2 * separator->area.paddingxlr + top_bottom_border_width(&separator->area);
+        return separator->thickness + 2 * separator->area.paddingxlr * panel->scale + top_bottom_border_width(&separator->area);
 }
 
 gboolean resize_separator(void *obj)
 {
     Separator *separator = (Separator *)obj;
+    Panel *panel = (Panel*)separator->area.panel;
     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->thickness + 2 * separator->area.paddingxlr * panel->scale + left_right_border_width(&separator->area);
         separator->length =
-		    separator->area.height - 2 * separator->area.paddingy - top_bottom_border_width(&separator->area);
+            separator->area.height - 2 * separator->area.paddingy * panel->scale - top_bottom_border_width(&separator->area);
     } else {
         separator->area.height =
-		    separator->thickness + 2 * separator->area.paddingxlr + top_bottom_border_width(&separator->area);
+            separator->thickness + 2 * separator->area.paddingxlr * panel->scale + top_bottom_border_width(&separator->area);
         separator->length =
-		    separator->area.width - 2 * separator->area.paddingy - left_right_border_width(&separator->area);
+            separator->area.width - 2 * separator->area.paddingy * panel->scale - left_right_border_width(&separator->area);
     }
 
     schedule_redraw(&separator->area);

src/separator/separator.h

@@ -7,11 +7,7 @@
 #include "common.h"
 #include "area.h"
 
-typedef enum SeparatorStyle {
-	SEPARATOR_EMPTY = 0,
-	SEPARATOR_LINE,
-	SEPARATOR_DOTS
-} SeparatorStyle;
+typedef enum SeparatorStyle { SEPARATOR_EMPTY = 0, SEPARATOR_LINE, SEPARATOR_DOTS } SeparatorStyle;
 
 typedef struct Separator {
     Area area;

src/server.c

@@ -1,608 +0,0 @@
-/**************************************************************************
-*
-* Tint2 panel
-*
-* Copyright (C) 2007 Pål Staurland (staura@gmail.com)
-* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
-*
-* 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 <X11/extensions/Xrender.h>
-#include <X11/extensions/Xrandr.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "server.h"
-#include "config.h"
-#include "window.h"
-
-Server server;
-
-gboolean primary_monitor_first = FALSE;
-
-void server_catch_error(Display *d, XErrorEvent *ev)
-{
-}
-
-void server_init_atoms()
-{
-	server.atom._XROOTPMAP_ID = XInternAtom(server.display, "_XROOTPMAP_ID", False);
-	server.atom._XROOTMAP_ID = XInternAtom(server.display, "_XROOTMAP_ID", False);
-	server.atom._NET_CURRENT_DESKTOP = XInternAtom(server.display, "_NET_CURRENT_DESKTOP", False);
-	server.atom._NET_NUMBER_OF_DESKTOPS = XInternAtom(server.display, "_NET_NUMBER_OF_DESKTOPS", False);
-	server.atom._NET_DESKTOP_NAMES = XInternAtom(server.display, "_NET_DESKTOP_NAMES", False);
-	server.atom._NET_DESKTOP_GEOMETRY = XInternAtom(server.display, "_NET_DESKTOP_GEOMETRY", False);
-	server.atom._NET_DESKTOP_VIEWPORT = XInternAtom(server.display, "_NET_DESKTOP_VIEWPORT", False);
-	server.atom._NET_WORKAREA = XInternAtom(server.display, "_NET_WORKAREA", False);
-	server.atom._NET_ACTIVE_WINDOW = XInternAtom(server.display, "_NET_ACTIVE_WINDOW", False);
-	server.atom._NET_WM_WINDOW_TYPE = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE", False);
-	server.atom._NET_WM_STATE_SKIP_PAGER = XInternAtom(server.display, "_NET_WM_STATE_SKIP_PAGER", False);
-	server.atom._NET_WM_STATE_SKIP_TASKBAR = XInternAtom(server.display, "_NET_WM_STATE_SKIP_TASKBAR", False);
-	server.atom._NET_WM_STATE_STICKY = XInternAtom(server.display, "_NET_WM_STATE_STICKY", False);
-	server.atom._NET_WM_STATE_DEMANDS_ATTENTION = XInternAtom(server.display, "_NET_WM_STATE_DEMANDS_ATTENTION", False);
-	server.atom._NET_WM_WINDOW_TYPE_DOCK = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_DOCK", False);
-	server.atom._NET_WM_WINDOW_TYPE_DESKTOP = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_DESKTOP", False);
-	server.atom._NET_WM_WINDOW_TYPE_TOOLBAR = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_TOOLBAR", False);
-	server.atom._NET_WM_WINDOW_TYPE_MENU = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_MENU", False);
-	server.atom._NET_WM_WINDOW_TYPE_SPLASH = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_SPLASH", False);
-	server.atom._NET_WM_WINDOW_TYPE_DIALOG = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_DIALOG", False);
-	server.atom._NET_WM_WINDOW_TYPE_NORMAL = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_NORMAL", False);
-	server.atom._NET_WM_DESKTOP = XInternAtom(server.display, "_NET_WM_DESKTOP", False);
-	server.atom.WM_STATE = XInternAtom(server.display, "WM_STATE", False);
-	server.atom._NET_WM_STATE = XInternAtom(server.display, "_NET_WM_STATE", False);
-	server.atom._NET_WM_STATE_MAXIMIZED_VERT = XInternAtom(server.display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
-	server.atom._NET_WM_STATE_MAXIMIZED_HORZ = XInternAtom(server.display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
-	server.atom._NET_WM_STATE_SHADED = XInternAtom(server.display, "_NET_WM_STATE_SHADED", False);
-	server.atom._NET_WM_STATE_HIDDEN = XInternAtom(server.display, "_NET_WM_STATE_HIDDEN", False);
-	server.atom._NET_WM_STATE_BELOW = XInternAtom(server.display, "_NET_WM_STATE_BELOW", False);
-	server.atom._NET_WM_STATE_ABOVE = XInternAtom(server.display, "_NET_WM_STATE_ABOVE", False);
-	server.atom._NET_WM_STATE_MODAL = XInternAtom(server.display, "_NET_WM_STATE_MODAL", False);
-	server.atom._NET_CLIENT_LIST = XInternAtom(server.display, "_NET_CLIENT_LIST", False);
-	server.atom._NET_WM_VISIBLE_NAME = XInternAtom(server.display, "_NET_WM_VISIBLE_NAME", False);
-	server.atom._NET_WM_NAME = XInternAtom(server.display, "_NET_WM_NAME", False);
-	server.atom._NET_WM_STRUT = XInternAtom(server.display, "_NET_WM_STRUT", False);
-	server.atom._NET_WM_ICON = XInternAtom(server.display, "_NET_WM_ICON", False);
-	server.atom._NET_WM_ICON_GEOMETRY = XInternAtom(server.display, "_NET_WM_ICON_GEOMETRY", False);
-	server.atom._NET_WM_ICON_NAME = XInternAtom(server.display, "_NET_WM_ICON_NAME", False);
-	server.atom._NET_CLOSE_WINDOW = XInternAtom(server.display, "_NET_CLOSE_WINDOW", False);
-	server.atom.UTF8_STRING = XInternAtom(server.display, "UTF8_STRING", False);
-	server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom(server.display, "_NET_SUPPORTING_WM_CHECK", False);
-	server.atom._NET_WM_CM_S0 = XInternAtom(server.display, "_NET_WM_CM_S0", False);
-	server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom(server.display, "_NET_WM_NAME", False);
-	server.atom._NET_WM_STRUT_PARTIAL = XInternAtom(server.display, "_NET_WM_STRUT_PARTIAL", False);
-	server.atom.WM_NAME = XInternAtom(server.display, "WM_NAME", False);
-	server.atom.__SWM_VROOT = XInternAtom(server.display, "__SWM_VROOT", False);
-	server.atom._MOTIF_WM_HINTS = XInternAtom(server.display, "_MOTIF_WM_HINTS", False);
-	server.atom.WM_HINTS = XInternAtom(server.display, "WM_HINTS", False);
-	gchar *name = g_strdup_printf("_XSETTINGS_S%d", DefaultScreen(server.display));
-	server.atom._XSETTINGS_SCREEN = XInternAtom(server.display, name, False);
-	g_free(name);
-	server.atom._XSETTINGS_SETTINGS = XInternAtom(server.display, "_XSETTINGS_SETTINGS", False);
-
-	// systray protocol
-	name = g_strdup_printf("_NET_SYSTEM_TRAY_S%d", DefaultScreen(server.display));
-	server.atom._NET_SYSTEM_TRAY_SCREEN = XInternAtom(server.display, name, False);
-	g_free(name);
-	server.atom._NET_SYSTEM_TRAY_OPCODE = XInternAtom(server.display, "_NET_SYSTEM_TRAY_OPCODE", False);
-	server.atom.MANAGER = XInternAtom(server.display, "MANAGER", False);
-	server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA = XInternAtom(server.display, "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
-	server.atom._NET_SYSTEM_TRAY_ORIENTATION = XInternAtom(server.display, "_NET_SYSTEM_TRAY_ORIENTATION", False);
-	server.atom._NET_SYSTEM_TRAY_ICON_SIZE = XInternAtom(server.display, "_NET_SYSTEM_TRAY_ICON_SIZE", False);
-	server.atom._NET_SYSTEM_TRAY_PADDING = XInternAtom(server.display, "_NET_SYSTEM_TRAY_PADDING", False);
-	server.atom._XEMBED = XInternAtom(server.display, "_XEMBED", False);
-	server.atom._XEMBED_INFO = XInternAtom(server.display, "_XEMBED_INFO", False);
-	server.atom._NET_WM_PID = XInternAtom(server.display, "_NET_WM_PID", True);
-
-	// drag 'n' drop
-	server.atom.XdndAware = XInternAtom(server.display, "XdndAware", False);
-	server.atom.XdndEnter = XInternAtom(server.display, "XdndEnter", False);
-	server.atom.XdndPosition = XInternAtom(server.display, "XdndPosition", False);
-	server.atom.XdndStatus = XInternAtom(server.display, "XdndStatus", False);
-	server.atom.XdndDrop = XInternAtom(server.display, "XdndDrop", False);
-	server.atom.XdndLeave = XInternAtom(server.display, "XdndLeave", False);
-	server.atom.XdndSelection = XInternAtom(server.display, "XdndSelection", False);
-	server.atom.XdndTypeList = XInternAtom(server.display, "XdndTypeList", False);
-	server.atom.XdndActionCopy = XInternAtom(server.display, "XdndActionCopy", False);
-	server.atom.XdndFinished = XInternAtom(server.display, "XdndFinished", False);
-	server.atom.TARGETS = XInternAtom(server.display, "TARGETS", False);
-}
-
-void cleanup_server()
-{
-	if (server.colormap)
-		XFreeColormap(server.display, server.colormap);
-	server.colormap = 0;
-	if (server.colormap32)
-		XFreeColormap(server.display, server.colormap32);
-	server.colormap32 = 0;
-	if (server.monitors) {
-		for (int i = 0; i < server.num_monitors; ++i) {
-			g_strfreev(server.monitors[i].names);
-			server.monitors[i].names = NULL;
-		}
-		free(server.monitors);
-		server.monitors = NULL;
-	}
-	if (server.gc)
-		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)
-{
-	XEvent event;
-
-	event.xclient.type = ClientMessage;
-	event.xclient.serial = 0;
-	event.xclient.send_event = True;
-	event.xclient.display = server.display;
-	event.xclient.window = win;
-	event.xclient.message_type = at;
-
-	event.xclient.format = 32;
-	event.xclient.data.l[0] = data1;
-	event.xclient.data.l[1] = data2;
-	event.xclient.data.l[2] = data3;
-	event.xclient.data.l[3] = 0;
-	event.xclient.data.l[4] = 0;
-
-	XSendEvent(server.display, server.root_win, False, SubstructureRedirectMask | SubstructureNotifyMask, &event);
-}
-
-int get_property32(Window win, Atom at, Atom type)
-{
-	Atom type_ret;
-	int format_ret = 0, data = 0;
-	unsigned long nitems_ret = 0;
-	unsigned long bafter_ret = 0;
-	unsigned char *prop_value = 0;
-	int result;
-
-	if (!win)
-		return 0;
-
-	result = XGetWindowProperty(server.display,
-								win,
-								at,
-								0,
-								0x7fffffff,
-								False,
-								type,
-								&type_ret,
-								&format_ret,
-								&nitems_ret,
-								&bafter_ret,
-								&prop_value);
-
-	if (result == Success && prop_value) {
-		data = ((gulong *)prop_value)[0];
-		XFree(prop_value);
-	}
-	return data;
-}
-
-void *server_get_property(Window win, Atom at, Atom type, int *num_results)
-{
-	Atom type_ret;
-	int format_ret = 0;
-	unsigned long nitems_ret = 0;
-	unsigned long bafter_ret = 0;
-	unsigned char *prop_value;
-
-	if (!win)
-		return NULL;
-
-	int result = XGetWindowProperty(server.display,
-									win,
-									at,
-									0,
-									0x7fffffff,
-									False,
-									type,
-									&type_ret,
-									&format_ret,
-									&nitems_ret,
-									&bafter_ret,
-									&prop_value);
-
-	// Send fill_color resultcount
-	if (num_results)
-		*num_results = (int)nitems_ret;
-
-	if (result == Success && prop_value)
-		return prop_value;
-	else
-		return NULL;
-}
-
-void get_root_pixmap()
-{
-	Pixmap ret = None;
-
-	Atom pixmap_atoms[] = {server.atom._XROOTPMAP_ID, server.atom._XROOTMAP_ID};
-	for (int i = 0; i < sizeof(pixmap_atoms) / sizeof(Atom); ++i) {
-		unsigned long *res = (unsigned long *)server_get_property(server.root_win, pixmap_atoms[i], XA_PIXMAP, NULL);
-		if (res) {
-			ret = *((Pixmap *)res);
-			XFree(res);
-			break;
-		}
-	}
-	server.root_pmap = ret;
-
-	if (server.root_pmap == None) {
-		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;
-		unsigned mask = GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle | GCTile;
-
-		gcv.tile = server.root_pmap;
-		XChangeGC(server.display, server.gc, mask, &gcv);
-	}
-}
-
-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) {
-		return 1;
-	} else if (m1->y < m2->y) {
-		return -1;
-	} else if (m1->y > m2->y) {
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
-int monitor_includes_monitor(const void *monitor1, const void *monitor2)
-{
-	const Monitor *m1 = (const Monitor *)monitor1;
-	const Monitor *m2 = (const Monitor *)monitor2;
-
-	if (m1->x >= m2->x && m1->y >= m2->y && (m1->x + m1->width) <= (m2->x + m2->width) &&
-		(m1->y + m1->height) <= (m2->y + m2->height)) {
-		// m1 included inside m2
-		return 1;
-	} else {
-		return -1;
-	}
-}
-
-void sort_monitors()
-{
-	qsort(server.monitors, server.num_monitors, sizeof(Monitor), compare_monitor_pos);
-}
-
-void get_monitors()
-{
-	if (XineramaIsActive(server.display)) {
-		int num_monitors;
-		XineramaScreenInfo *info = XineramaQueryScreens(server.display, &num_monitors);
-		XRRScreenResources *res = XRRGetScreenResourcesCurrent(server.display, server.root_win);
-		RROutput primary_output = XRRGetOutputPrimary(server.display, server.root_win);
-
-		if (res && res->ncrtc >= num_monitors) {
-			// use xrandr to identify monitors (does not work with proprietery nvidia drivers)
-			printf("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]);
-				// Ignore empty crtc
-				if (!crtc_info->width || !crtc_info->height) {
-					printf("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_monitor].names[j] = g_strdup(output_info->name);
-					XRRFreeOutputInfo(output_info);
-					server.monitors[i_monitor].primary = crtc_info->outputs[j] == primary_output;
-				}
-				server.monitors[i_monitor].names[crtc_info->noutput] = NULL;
-				XRRFreeCrtcInfo(crtc_info);
-			}
-		} else if (info && num_monitors > 0) {
-			server.monitors = calloc(num_monitors, sizeof(Monitor));
-			for (int i = 0; i < num_monitors; i++) {
-				server.monitors[i].x = info[i].x_org;
-				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 = NULL;
-			}
-		}
-
-		// Sort monitors by inclusion
-		qsort(server.monitors, num_monitors, sizeof(Monitor), monitor_includes_monitor);
-
-		// Remove monitors included in other ones
-		int i = 0;
-		while (i < num_monitors) {
-			for (int j = 0; j < i; j++) {
-				if (monitor_includes_monitor(&server.monitors[i], &server.monitors[j]) > 0) {
-					goto next;
-				}
-			}
-			i++;
-		}
-	next:
-		for (int j = i; j < num_monitors; ++j)
-			if (server.monitors[j].names)
-				g_strfreev(server.monitors[j].names);
-		server.num_monitors = i;
-		server.monitors = realloc(server.monitors, server.num_monitors * sizeof(Monitor));
-		qsort(server.monitors, server.num_monitors, sizeof(Monitor), compare_monitor_pos);
-
-		if (res)
-			XRRFreeScreenResources(res);
-		XFree(info);
-	}
-
-	if (!server.num_monitors) {
-		server.num_monitors = 1;
-		server.monitors = calloc(1, sizeof(Monitor));
-		server.monitors[0].x = server.monitors[0].y = 0;
-		server.monitors[0].width = DisplayWidth(server.display, server.screen);
-		server.monitors[0].height = DisplayHeight(server.display, server.screen);
-		server.monitors[0].names = 0;
-	}
-}
-
-void print_monitors()
-{
-	fprintf(stderr, "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",
-				i + 1,
-				server.monitors[i].x,
-				server.monitors[i].y,
-				server.monitors[i].width,
-				server.monitors[i].height);
-	}
-}
-
-void server_get_number_of_desktops()
-{
-	if (server.viewports) {
-		free(server.viewports);
-		server.viewports = NULL;
-	}
-
-	server.num_desktops = get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);
-	if (server.num_desktops > 1)
-		return;
-
-	int num_results;
-	long *work_area_size = server_get_property(server.root_win, server.atom._NET_WORKAREA, XA_CARDINAL, &num_results);
-	if (!work_area_size)
-		return;
-	int work_area_width = work_area_size[0] + work_area_size[2];
-	int work_area_height = work_area_size[1] + work_area_size[3];
-	XFree(work_area_size);
-
-	long *x_screen_size =
-		server_get_property(server.root_win, server.atom._NET_DESKTOP_GEOMETRY, XA_CARDINAL, &num_results);
-	if (!x_screen_size)
-		return;
-	int x_screen_width = x_screen_size[0];
-	int x_screen_height = x_screen_size[1];
-	XFree(x_screen_size);
-
-	int num_viewports = MAX(x_screen_width / work_area_width, 1) * MAX(x_screen_height / work_area_height, 1);
-	if (num_viewports <= 1) {
-		server.num_desktops = 1;
-		return;
-	}
-
-	server.viewports = calloc(num_viewports, sizeof(Viewport));
-	int k = 0;
-	for (int i = 0; i < MAX(x_screen_height / work_area_height, 1); i++) {
-		for (int j = 0; j < MAX(x_screen_width / work_area_width, 1); j++) {
-			server.viewports[k].x = j * work_area_width;
-			server.viewports[k].y = i * work_area_height;
-			server.viewports[k].width = work_area_width;
-			server.viewports[k].height = work_area_height;
-			k++;
-		}
-	}
-
-	server.num_desktops = num_viewports;
-}
-
-GSList *get_desktop_names()
-{
-	if (server.viewports) {
-		GSList *list = NULL;
-		for (int j = 0; j < server.num_desktops; j++) {
-			list = g_slist_append(list, g_strdup_printf("%d", j + 1));
-		}
-		return list;
-	}
-
-	int count;
-	GSList *list = NULL;
-	gchar *data_ptr =
-		server_get_property(server.root_win, server.atom._NET_DESKTOP_NAMES, server.atom.UTF8_STRING, &count);
-	if (data_ptr) {
-		list = g_slist_append(list, g_strdup(data_ptr));
-		for (int j = 0; j < count - 1; j++) {
-			if (*(data_ptr + j) == '\0') {
-				gchar *ptr = (gchar *)data_ptr + j + 1;
-				list = g_slist_append(list, g_strdup(ptr));
-			}
-		}
-		XFree(data_ptr);
-	}
-	return list;
-}
-
-int get_current_desktop()
-{
-	if (!server.viewports) {
-		return MAX(0,
-				   MIN(server.num_desktops - 1,
-					   get_property32(server.root_win, server.atom._NET_CURRENT_DESKTOP, XA_CARDINAL)));
-	}
-
-	int num_results;
-	long *work_area_size = server_get_property(server.root_win, server.atom._NET_WORKAREA, XA_CARDINAL, &num_results);
-	if (!work_area_size)
-		return 0;
-	int work_area_width = work_area_size[0] + work_area_size[2];
-	int work_area_height = work_area_size[1] + work_area_size[3];
-	XFree(work_area_size);
-
-	if (work_area_width <= 0 || work_area_height <= 0)
-		return 0;
-
-	long *viewport = server_get_property(server.root_win, server.atom._NET_DESKTOP_VIEWPORT, XA_CARDINAL, &num_results);
-	if (!viewport)
-		return 0;
-	int viewport_x = viewport[0];
-	int viewport_y = viewport[1];
-	XFree(viewport);
-
-	long *x_screen_size =
-		server_get_property(server.root_win, server.atom._NET_DESKTOP_GEOMETRY, XA_CARDINAL, &num_results);
-	if (!x_screen_size)
-		return 0;
-	int x_screen_width = x_screen_size[0];
-	XFree(x_screen_size);
-
-	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);
-
-	int result = (viewport_y / work_area_height) * ncols + viewport_x / work_area_width;
-	return MAX(0, MIN(server.num_desktops - 1, result));
-}
-
-void change_desktop(int desktop)
-{
-	if (!server.viewports) {
-		send_event32(server.root_win, server.atom._NET_CURRENT_DESKTOP, desktop, 0, 0);
-	} else {
-		send_event32(server.root_win,
-					 server.atom._NET_DESKTOP_VIEWPORT,
-					 server.viewports[desktop].x,
-					 server.viewports[desktop].y,
-					 0);
-	}
-}
-
-void get_desktops()
-{
-	// detect number of desktops
-	// wait 15s to leave some time for window manager startup
-	for (int i = 0; i < 15; i++) {
-		server_get_number_of_desktops();
-		if (server.num_desktops > 0)
-			break;
-		sleep(1);
-	}
-	if (server.num_desktops == 0) {
-		server.num_desktops = 1;
-		fprintf(stderr, "warning : WM doesn't respect NETWM specs. tint2 default to 1 desktop.\n");
-	}
-}
-
-void server_init_visual()
-{
-	// inspired by freedesktops fdclock ;)
-	XVisualInfo templ = {.screen = server.screen, .depth = 32, .class = TrueColor};
-	int nvi;
-	XVisualInfo *xvi =
-		XGetVisualInfo(server.display, VisualScreenMask | VisualDepthMask | VisualClassMask, &templ, &nvi);
-
-	Visual *visual = NULL;
-	if (xvi) {
-		XRenderPictFormat *format;
-		for (int i = 0; i < nvi; i++) {
-			format = XRenderFindVisualFormat(server.display, xvi[i].visual);
-			if (format->type == PictTypeDirect && format->direct.alphaMask) {
-				visual = xvi[i].visual;
-				break;
-			}
-		}
-	}
-	XFree(xvi);
-
-	// check composite manager
-	server.composite_manager = XGetSelectionOwner(server.display, server.atom._NET_WM_CM_S0);
-	if (server.colormap)
-		XFreeColormap(server.display, server.colormap);
-	if (server.colormap32)
-		XFreeColormap(server.display, server.colormap32);
-
-	if (visual) {
-		server.visual32 = visual;
-		server.colormap32 = XCreateColormap(server.display, server.root_win, visual, AllocNone);
-	}
-
-	if (!server.disable_transparency && visual && server.composite_manager != None && !snapshot_path) {
-		XSetWindowAttributes attrs;
-		attrs.event_mask = StructureNotifyMask;
-		XChangeWindowAttributes(server.display, server.composite_manager, CWEventMask, &attrs);
-
-		server.real_transparency = TRUE;
-		server.depth = 32;
-		printf("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);
-		server.colormap = DefaultColormap(server.display, server.screen);
-		server.visual = DefaultVisual(server.display, server.screen);
-	}
-}

src/server.h

@@ -1,170 +0,0 @@
-/**************************************************************************
-* server :
-* -
-*
-* Check COPYING file for Copyright
-*
-**************************************************************************/
-
-#ifndef SERVER_H
-#define SERVER_H
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/extensions/Xinerama.h>
-
-#ifdef HAVE_SN
-#include <libsn/sn.h>
-#endif
-#include <glib.h>
-
-extern gboolean primary_monitor_first;
-
-typedef struct Global_atom {
-	Atom _XROOTPMAP_ID;
-	Atom _XROOTMAP_ID;
-	Atom _NET_CURRENT_DESKTOP;
-	Atom _NET_NUMBER_OF_DESKTOPS;
-	Atom _NET_DESKTOP_NAMES;
-	Atom _NET_DESKTOP_GEOMETRY;
-	Atom _NET_DESKTOP_VIEWPORT;
-	Atom _NET_WORKAREA;
-	Atom _NET_ACTIVE_WINDOW;
-	Atom _NET_WM_WINDOW_TYPE;
-	Atom _NET_WM_STATE_SKIP_PAGER;
-	Atom _NET_WM_STATE_SKIP_TASKBAR;
-	Atom _NET_WM_STATE_STICKY;
-	Atom _NET_WM_STATE_DEMANDS_ATTENTION;
-	Atom _NET_WM_WINDOW_TYPE_DOCK;
-	Atom _NET_WM_WINDOW_TYPE_DESKTOP;
-	Atom _NET_WM_WINDOW_TYPE_TOOLBAR;
-	Atom _NET_WM_WINDOW_TYPE_MENU;
-	Atom _NET_WM_WINDOW_TYPE_SPLASH;
-	Atom _NET_WM_WINDOW_TYPE_DIALOG;
-	Atom _NET_WM_WINDOW_TYPE_NORMAL;
-	Atom _NET_WM_DESKTOP;
-	Atom WM_STATE;
-	Atom _NET_WM_STATE;
-	Atom _NET_WM_STATE_MAXIMIZED_VERT;
-	Atom _NET_WM_STATE_MAXIMIZED_HORZ;
-	Atom _NET_WM_STATE_SHADED;
-	Atom _NET_WM_STATE_HIDDEN;
-	Atom _NET_WM_STATE_BELOW;
-	Atom _NET_WM_STATE_ABOVE;
-	Atom _NET_WM_STATE_MODAL;
-	Atom _NET_CLIENT_LIST;
-	Atom _NET_WM_NAME;
-	Atom _NET_WM_VISIBLE_NAME;
-	Atom _NET_WM_STRUT;
-	Atom _NET_WM_ICON;
-	Atom _NET_WM_ICON_GEOMETRY;
-	Atom _NET_WM_ICON_NAME;
-	Atom _NET_CLOSE_WINDOW;
-	Atom UTF8_STRING;
-	Atom _NET_SUPPORTING_WM_CHECK;
-	Atom _NET_WM_CM_S0;
-	Atom _NET_WM_STRUT_PARTIAL;
-	Atom WM_NAME;
-	Atom __SWM_VROOT;
-	Atom _MOTIF_WM_HINTS;
-	Atom WM_HINTS;
-	Atom _NET_SYSTEM_TRAY_SCREEN;
-	Atom _NET_SYSTEM_TRAY_OPCODE;
-	Atom MANAGER;
-	Atom _NET_SYSTEM_TRAY_MESSAGE_DATA;
-	Atom _NET_SYSTEM_TRAY_ORIENTATION;
-	Atom _NET_SYSTEM_TRAY_ICON_SIZE;
-	Atom _NET_SYSTEM_TRAY_PADDING;
-	Atom _XEMBED;
-	Atom _XEMBED_INFO;
-	Atom _NET_WM_PID;
-	Atom _XSETTINGS_SCREEN;
-	Atom _XSETTINGS_SETTINGS;
-	Atom XdndAware;
-	Atom XdndEnter;
-	Atom XdndPosition;
-	Atom XdndStatus;
-	Atom XdndDrop;
-	Atom XdndLeave;
-	Atom XdndSelection;
-	Atom XdndTypeList;
-	Atom XdndActionCopy;
-	Atom XdndFinished;
-	Atom TARGETS;
-} Global_atom;
-
-typedef struct Monitor {
-	int x;
-	int y;
-	int width;
-	int height;
-	gboolean primary;
-	gchar **names;
-} Monitor;
-
-typedef struct Viewport {
-	int x;
-	int y;
-	int width;
-	int height;
-} Viewport;
-
-typedef struct Server {
-	Display *display;
-	Window root_win;
-	Window composite_manager;
-	gboolean real_transparency;
-	gboolean disable_transparency;
-	// current desktop
-	int desktop;
-	int screen;
-	int depth;
-	int num_desktops;
-	// number of monitor (without monitor included into another one)
-	int num_monitors;
-	// Non-null only if WM uses viewports (compiz) and number of viewports > 1.
-	// In that case there are num_desktops viewports.
-	Viewport *viewports;
-	Monitor *monitors;
-	gboolean got_root_win;
-	Visual *visual;
-	Visual *visual32;
-	// root background
-	Pixmap root_pmap;
-	GC gc;
-	Colormap colormap;
-	Colormap colormap32;
-	Global_atom atom;
-#ifdef HAVE_SN
-	SnDisplay *sn_display;
-	GTree *pids;
-#endif // HAVE_SN
-} Server;
-
-extern Server server;
-
-// freed memory
-void cleanup_server();
-
-void send_event32(Window win, Atom at, long data1, long data2, long data3);
-int get_property32(Window win, Atom at, Atom type);
-void *server_get_property(Window win, Atom at, Atom type, int *num_results);
-Atom server_get_atom(char *atom_name);
-void server_catch_error(Display *d, XErrorEvent *ev);
-void server_init_atoms();
-void server_init_visual();
-
-// 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();
-GSList *get_desktop_names();
-int get_current_desktop();
-void change_desktop(int desktop);
-
-#endif

src/systray/systraybar.c

@@ -114,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;
     }
@@ -141,11 +141,12 @@ void init_systray_panel(void *p)
 
 void systray_compute_geometry(int *size)
 {
+    Panel *panel = (Panel*)systray.area.panel;
     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;
+    systray.icon_size -=
+        MAX(left_right_border_width(&systray.area), top_bottom_border_width(&systray.area)) + 2 * systray.area.paddingy * panel->scale;
     if (systray_max_icon_size > 0)
-		systray.icon_size = MIN(systray.icon_size, systray_max_icon_size);
+        systray.icon_size = MIN(systray.icon_size, systray_max_icon_size * panel->scale);
 
     int count = 0;
     for (GSList *l = systray.list_icons; l; l = l->next) {
@@ -153,25 +154,24 @@ void systray_compute_geometry(int *size)
     }
 
     if (panel_horizontal) {
-		int height = systray.area.height - top_bottom_border_width(&systray.area) - 2 * systray.area.paddingy;
+        int height = systray.area.height - top_bottom_border_width(&systray.area) - 2 * systray.area.paddingy * panel->scale;
         // here icons_per_column always higher than 0
-		systray.icons_per_column = (height + systray.area.paddingx) / (systray.icon_size + systray.area.paddingx);
+        systray.icons_per_column = (height + systray.area.paddingx * panel->scale) / (systray.icon_size + systray.area.paddingx * panel->scale);
         systray.margin =
-			height - (systray.icons_per_column - 1) * (systray.icon_size + systray.area.paddingx) - systray.icon_size;
+            height - (systray.icons_per_column - 1) * (systray.icon_size + systray.area.paddingx * panel->scale) - 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);
+        *size = left_right_border_width(&systray.area) + 2 * systray.area.paddingxlr * panel->scale +
+                (systray.icon_size * systray.icons_per_row) + ((systray.icons_per_row - 1) * systray.area.paddingx * panel->scale);
     } else {
-		int width = systray.area.width - left_right_border_width(&systray.area) - 2 * systray.area.paddingy;
+        int width = systray.area.width - left_right_border_width(&systray.area) - 2 * systray.area.paddingy * panel->scale;
         // here icons_per_row always higher than 0
-		systray.icons_per_row = (width + systray.area.paddingx) / (systray.icon_size + systray.area.paddingx);
+        systray.icons_per_row = (width + systray.area.paddingx * panel->scale) / (systray.icon_size + systray.area.paddingx * panel->scale);
         systray.margin =
-			width - (systray.icons_per_row - 1) * (systray.icon_size + systray.area.paddingx) - systray.icon_size;
+            width - (systray.icons_per_row - 1) * (systray.icon_size + systray.area.paddingx * panel->scale) - 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) +
+        *size = top_bottom_border_width(&systray.area) + (2 * systray.area.paddingxlr * panel->scale) +
                 (systray.icon_size * systray.icons_per_column) +
-							  ((systray.icons_per_column - 1) * systray.area.paddingx);
+                ((systray.icons_per_column - 1) * systray.area.paddingx * panel->scale);
     }
 }
 
@@ -185,7 +185,7 @@ int systray_compute_desired_size(void *obj)
 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(), __func__, __LINE__);
 
     int size;
     systray_compute_geometry(&size);
@@ -228,7 +228,7 @@ gboolean resize_systray(void *obj)
 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(), __func__, __LINE__);
     if (systray_composited) {
         if (render_background)
             XFreePixmap(server.display, render_background);
@@ -253,15 +253,12 @@ void systray_dump_geometry(void *obj, int indent)
 {
     Systray *tray = (Systray *)obj;
 
-	fprintf(stderr,
-			"%*sIcons:\n",
-			indent,
-			"");
+    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",
+                "tint2: %*sIcon: x = %d, y = %d, w = %d, h = %d, name = %s\n",
                 indent,
                 "",
                 traywin->x,
@@ -275,7 +272,7 @@ void systray_dump_geometry(void *obj, int indent)
 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(), __func__, __LINE__);
     if (systray.icons_per_column == 0 || systray.icons_per_row == 0)
         return;
 
@@ -285,19 +282,20 @@ void on_change_systray(void *obj)
     int posx, posy;
     int start;
     if (panel_horizontal) {
-		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;
+        posy = start = top_border_width(&panel->area) + panel->area.paddingy * panel->scale + top_border_width(&systray.area) +
+                       systray.area.paddingy * panel->scale + systray.margin / 2;
+        posx = systray.area.posx + left_border_width(&systray.area) + systray.area.paddingxlr * panel->scale;
     } else {
-		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;
+        posx = start = left_border_width(&panel->area) + panel->area.paddingy * panel->scale + left_border_width(&systray.area) +
+                       systray.area.paddingy * panel->scale + systray.margin / 2;
+        posy = systray.area.posy + top_border_width(&systray.area) + systray.area.paddingxlr * panel->scale;
     }
 
     TrayWindow *traywin;
-	GSList *l;
+    GSList *l, *next;
     int i;
-	for (i = 1, l = systray.list_icons; l; i++, l = l->next) {
+    for (i = 1, l = systray.list_icons; l; i++, l = next) {
+        next = l->next;
         traywin = (TrayWindow *)l->data;
 
         traywin->y = posy;
@@ -305,7 +303,7 @@ void on_change_systray(void *obj)
         if (systray_profile)
             fprintf(stderr,
                     "%s:%d win = %lu (%s), parent = %lu, x = %d, y = %d\n",
-			        __FUNCTION__,
+                    __func__,
                     __LINE__,
                     traywin->win,
                     traywin->name,
@@ -316,17 +314,17 @@ void on_change_systray(void *obj)
         traywin->height = systray.icon_size;
         if (panel_horizontal) {
             if (i % systray.icons_per_column) {
-				posy += systray.icon_size + systray.area.paddingx;
+                posy += systray.icon_size + systray.area.paddingx * panel->scale;
             } else {
                 posy = start;
-				posx += (systray.icon_size + systray.area.paddingx);
+                posx += (systray.icon_size + systray.area.paddingx * panel->scale);
             }
         } else {
             if (i % systray.icons_per_row) {
-				posx += systray.icon_size + systray.area.paddingx;
+                posx += systray.icon_size + systray.area.paddingx * panel->scale;
             } else {
                 posx = start;
-				posy += (systray.icon_size + systray.area.paddingx);
+                posy += (systray.icon_size + systray.area.paddingx * panel->scale);
             }
         }
 
@@ -336,7 +334,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)
@@ -362,7 +360,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(), __func__, __LINE__);
     if (net_sel_win) {
         // protocol already started
         if (!systray_enabled)
@@ -399,11 +397,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;
@@ -411,7 +409,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.
@@ -462,13 +460,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");
     if (systray_profile)
-		fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
+        fprintf(stderr, "tint2: [%f] %s:%d\n", profiling_get_time(), __func__, __LINE__);
     XClientMessageEvent ev;
     ev.type = ClientMessage;
     ev.window = server.root_win;
@@ -482,10 +480,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(), __func__, __LINE__);
 
     Window win;
     unsigned long opcode = e->data.l[1];
@@ -503,9 +501,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;
     }
 }
@@ -513,7 +511,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(), __func__, __LINE__);
     if (systray.list_icons) {
         // remove_icon change systray.list_icons
         while (systray.list_icons)
@@ -533,10 +531,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(), __func__, __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;
 }
@@ -568,18 +566,18 @@ 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);
         }
     }
 }
@@ -590,14 +588,14 @@ gboolean reject_icon(Window win)
         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 "Could not compile regex %s" RESET "\n", systray_hide_name_filter);
+                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 "Filtering out systray icon '%s'" RESET "\n", name);
+            fprintf(stderr, GREEN "tint2: Filtering out systray icon '%s'" RESET "\n", name);
             return TRUE;
         }
     }
@@ -627,7 +625,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(), __func__, __LINE__, win, name);
     Panel *panel = systray.area.panel;
 
     // Get the process ID of the application that created the window
@@ -659,7 +657,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);
@@ -683,7 +681,7 @@ gboolean add_icon(Window win)
             win,
             name,
             pid,
-	        attr.visual,
+            (void*)attr.visual,
             attr.colormap,
             attr.depth,
             attr.width,
@@ -710,7 +708,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,
@@ -734,6 +732,8 @@ gboolean add_icon(Window win)
     traywin->pid = pid;
     traywin->name = name;
     traywin->chrono = chrono;
+    INIT_TIMER(traywin->render_timer);
+    INIT_TIMER(traywin->resize_timer);
     chrono++;
 
     show(&systray.area);
@@ -747,19 +747,19 @@ 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(), __func__, __LINE__);
 
     // Resize and redraw the systray
     if (systray_profile)
         fprintf(stderr,
                 BLUE "[%f] %s:%d trigger resize & redraw" RESET "\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__);
     systray.area.resize_needed = TRUE;
     panel->area.resize_needed = TRUE;
@@ -774,7 +774,7 @@ gboolean reparent_icon(TrayWindow *traywin)
         fprintf(stderr,
                 "[%f] %s:%d win = %lu (%s)\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__,
                 traywin->win,
                 traywin->name);
@@ -812,7 +812,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);
     }
 
@@ -836,7 +836,7 @@ gboolean reparent_icon(TrayWindow *traywin)
         fprintf(stderr,
                 "[%f] %s:%d win = %lu (%s)\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__,
                 traywin->win,
                 traywin->name);
@@ -850,7 +850,7 @@ gboolean embed_icon(TrayWindow *traywin)
         fprintf(stderr,
                 "[%f] %s:%d win = %lu (%s)\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__,
                 traywin->win,
                 traywin->name);
@@ -863,62 +863,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);
     }
 
@@ -926,16 +877,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) {
@@ -956,7 +907,7 @@ gboolean embed_icon(TrayWindow *traywin)
         fprintf(stderr,
                 "[%f] %s:%d win = %lu (%s)\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__,
                 traywin->win,
                 traywin->name);
@@ -970,7 +921,7 @@ void remove_icon(TrayWindow *traywin)
         fprintf(stderr,
                 "[%f] %s:%d win = %lu (%s)\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__,
                 traywin->win,
                 traywin->name);
@@ -978,7 +929,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)
@@ -993,8 +944,8 @@ void remove_icon(TrayWindow *traywin)
     XDestroyWindow(server.display, traywin->parent);
     XSync(server.display, False);
     XSetErrorHandler(old);
-	stop_timeout(traywin->render_timeout);
-	stop_timeout(traywin->resize_timeout);
+    destroy_timer(&traywin->render_timer);
+    destroy_timer(&traywin->resize_timer);
     free(traywin->name);
     if (traywin->image) {
         imlib_context_set_image(traywin->image);
@@ -1016,7 +967,7 @@ void remove_icon(TrayWindow *traywin)
         fprintf(stderr,
                 BLUE "[%f] %s:%d trigger resize & redraw" RESET "\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__);
     systray.area.resize_needed = TRUE;
     panel->area.resize_needed = TRUE;
@@ -1108,9 +1059,8 @@ void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
             if (traywin->bad_size_counter < min_bad_resize_events) {
                 systray_resize_icon(traywin);
             } else {
-				if (!traywin->resize_timeout)
-					traywin->resize_timeout =
-					    add_timeout(fast_resize_period, 0, systray_resize_icon, traywin, &traywin->resize_timeout);
+                if (!traywin->resize_timer.enabled_)
+                    change_timer(&traywin->resize_timer, true, fast_resize_period, 0, systray_resize_icon, traywin);
             }
         } else {
             if (traywin->bad_size_counter == max_bad_resize_events) {
@@ -1124,14 +1074,13 @@ void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
             // FIXME Normally we should force the icon to resize fill_color to the size we resized it to when we
             // embedded it.
             // However this triggers a resize loop in new versions of GTK, which we must avoid.
-			if (!traywin->resize_timeout)
-				traywin->resize_timeout =
-				    add_timeout(slow_resize_period, 0, systray_resize_icon, traywin, &traywin->resize_timeout);
+            if (!traywin->resize_timer.enabled_)
+                change_timer(&traywin->resize_timer, true, slow_resize_period, 0, systray_resize_icon, traywin);
             return;
         }
     } else {
         // Correct size
-		stop_timeout(traywin->resize_timeout);
+        stop_timer(&traywin->resize_timer);
     }
 
     // Resize and redraw the systray
@@ -1139,7 +1088,7 @@ void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
         fprintf(stderr,
                 BLUE "[%f] %s:%d trigger resize & redraw" RESET "\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__);
     schedule_panel_redraw();
     refresh_systray = TRUE;
@@ -1188,9 +1137,8 @@ void systray_resize_request_event(TrayWindow *traywin, XEvent *e)
             if (traywin->bad_size_counter < min_bad_resize_events) {
                 systray_resize_icon(traywin);
             } else {
-				if (!traywin->resize_timeout)
-					traywin->resize_timeout =
-					    add_timeout(fast_resize_period, 0, systray_resize_icon, traywin, &traywin->resize_timeout);
+                if (!traywin->resize_timer.enabled_)
+                    change_timer(&traywin->resize_timer, true, fast_resize_period, 0, systray_resize_icon, traywin);
             }
         } else {
             if (traywin->bad_size_counter == max_bad_resize_events) {
@@ -1203,14 +1151,13 @@ void systray_resize_request_event(TrayWindow *traywin, XEvent *e)
             // Delayed resize
             // FIXME Normally we should force the icon to resize to the size we resized it to when we embedded it.
             // However this triggers a resize loop in some versions of GTK, which we must avoid.
-			if (!traywin->resize_timeout)
-				traywin->resize_timeout =
-				    add_timeout(slow_resize_period, 0, systray_resize_icon, traywin, &traywin->resize_timeout);
+            if (!traywin->resize_timer.enabled_)
+                    change_timer(&traywin->resize_timer, true, slow_resize_period, 0, systray_resize_icon, traywin);
             return;
         }
     } else {
         // Correct size
-		stop_timeout(traywin->resize_timeout);
+        stop_timer(&traywin->resize_timer);
     }
 
     // Resize and redraw the systray
@@ -1218,7 +1165,7 @@ void systray_resize_request_event(TrayWindow *traywin, XEvent *e)
         fprintf(stderr,
                 BLUE "[%f] %s:%d trigger resize & redraw" RESET "\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__);
     schedule_panel_redraw();
     refresh_systray = TRUE;
@@ -1230,7 +1177,7 @@ void systray_destroy_event(TrayWindow *traywin)
         fprintf(stderr,
                 "[%f] %s:%d win = %lu (%s)\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__,
                 traywin->win,
                 traywin->name);
@@ -1265,7 +1212,7 @@ void systray_render_icon_composited(void *t)
         fprintf(stderr,
                 "[%f] %s:%d win = %lu (%s)\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__,
                 traywin->win,
                 traywin->name);
@@ -1277,13 +1224,12 @@ void systray_render_icon_composited(void *t)
     if (compare_timespecs(&earliest_render, &now) > 0) {
         traywin->num_fast_renders++;
         if (traywin->num_fast_renders > max_fast_refreshes) {
-			traywin->render_timeout =
-			    add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
+            change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon_composited, traywin);
             if (systray_profile)
                 fprintf(stderr,
                         YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
                         profiling_get_time(),
-				        __FUNCTION__,
+                        __func__,
                         __LINE__,
                         traywin->win,
                         traywin->name);
@@ -1297,23 +1243,19 @@ void systray_render_icon_composited(void *t)
 
     if (traywin->width == 0 || traywin->height == 0) {
         // reschedule rendering since the geometry information has not yet been processed (can happen on slow cpu)
-		traywin->render_timeout =
-		    add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
+        change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon_composited, traywin);
         if (systray_profile)
             fprintf(stderr,
                     YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
                     profiling_get_time(),
-			        __FUNCTION__,
+                    __func__,
                     __LINE__,
                     traywin->win,
                     traywin->name);
         return;
     }
 
-	if (traywin->render_timeout) {
-		stop_timeout(traywin->render_timeout);
-		traywin->render_timeout = NULL;
-	}
+    stop_timer(&traywin->render_timer);
 
     // good systray icons support 32 bit depth, but some icons are still 24 bit.
     // We create a heuristic mask for these icons, i.e. we get the rgb value in the top left corner, and
@@ -1332,7 +1274,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;
     }
@@ -1434,7 +1376,7 @@ void systray_render_icon_composited(void *t)
         fprintf(stderr,
                 "[%f] %s:%d win = %lu (%s)\n",
                 profiling_get_time(),
-		        __FUNCTION__,
+                __func__,
                 __LINE__,
                 traywin->win,
                 traywin->name);
@@ -1472,13 +1414,11 @@ void systray_render_icon(void *t)
         //			fprintf(stderr,
         //			        YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
         //			        profiling_get_time(),
-//			        __FUNCTION__,
+        //			        __func__,
         //			        __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);
+        change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon, traywin);
         return;
     }
 
@@ -1486,12 +1426,11 @@ void systray_render_icon(void *t)
         fprintf(stderr,
                 "[%f] %s:%d win = %lu (%s)\n",
                 profiling_get_time(),
-				__FUNCTION__,
+                __func__,
                 __LINE__,
                 traywin->win,
                 traywin->name);
 
-
     if (systray_composited) {
         XSync(server.display, False);
         error = FALSE;
@@ -1502,25 +1441,19 @@ void systray_render_icon(void *t)
         unsigned int width, height, depth;
         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)
-				traywin->render_timeout =
-				    add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
+            change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon, traywin);
             systray_render_icon_from_image(traywin);
             XSetErrorHandler(old);
             return;
         } else {
             if (xpos != 0 || ypos != 0 || width != traywin->width || height != traywin->height) {
-				stop_timeout(traywin->render_timeout);
-				if (!traywin->resize_timeout)
-					traywin->render_timeout =
-					    add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
+                change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon, traywin);
                 systray_render_icon_from_image(traywin);
                 if (systray_profile)
                     fprintf(stderr,
                             YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
                             profiling_get_time(),
-					        __FUNCTION__,
+                            __func__,
                             __LINE__,
                             traywin->win,
                             traywin->name);
@@ -1532,7 +1465,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);
@@ -1554,7 +1487,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(), __func__, __LINE__);
     TrayWindow *traywin;
     GSList *l;
     for (l = systray.list_icons; l; l = l->next) {

src/systray/systraybar.h

@@ -56,11 +56,11 @@ typedef struct {
     // Members used for rendering
     struct timespec time_last_render;
     int num_fast_renders;
-	timeout *render_timeout;
+    Timer render_timer;
     // Members used for resizing
     int bad_size_counter;
     struct timespec time_last_resize;
-	timeout *resize_timeout;
+    Timer resize_timer;
     // Icon contents if we are compositing the icon, otherwise null
     Imlib_Image image;
     // XDamage
@@ -96,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

@@ -35,11 +35,13 @@
 #include "tooltip.h"
 #include "window.h"
 
-timeout *urgent_timeout;
+Timer urgent_timer;
 GSList *urgent_list;
 
 void task_dump_geometry(void *obj, int indent);
 int task_compute_desired_size(void *obj);
+void task_refresh_thumbnail(Task *task);
+void task_get_content_color(void *obj, Color *color);
 
 char *task_get_tooltip(void *obj)
 {
@@ -47,6 +49,17 @@ char *task_get_tooltip(void *obj)
     return strdup(t->title);
 }
 
+cairo_surface_t *task_get_thumbnail(void *obj)
+{
+    if (!panel_config.g_task.thumbnail_enabled)
+        return NULL;
+    Task *t = (Task *)obj;
+    if (!t->thumbnail)
+        task_refresh_thumbnail(t);
+    taskbar_start_thumbnail_timer(THUMB_MODE_TOOLTIP_WINDOW);
+    return t->thumbnail;
+}
+
 Task *add_task(Window win)
 {
     if (!win)
@@ -73,6 +86,7 @@ Task *add_task(Window win)
     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.area._get_content_color = task_get_content_color;
     task_template.win = win;
     task_template.desktop = get_window_desktop(win);
     task_template.area.panel = &panels[monitor];
@@ -93,9 +107,20 @@ Task *add_task(Window win)
              (int)win,
              task_template.title ? task_template.title : "null");
 
-	// fprintf(stderr, "%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);
+    // get application name
+    // use res_class property of WM_CLASS as res_name is easily overridable by user
+    XClassHint *classhint = XAllocClassHint();
+    if (classhint && XGetClassHint(server.display, win, classhint))
+        task_template.application = strdup(classhint->res_class);
+    else
+        task_template.application = strdup("Untitled");
+    if (classhint) {
+        if (classhint->res_name)
+            XFree(classhint->res_name);
+        if (classhint->res_class)
+            XFree(classhint->res_class);
+        XFree(classhint);
+    }
 
     GPtrArray *task_buttons = g_ptr_array_new();
     for (int j = 0; j < panels[monitor].num_desktops; j++) {
@@ -110,6 +135,7 @@ Task *add_task(Window win)
         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->area._get_content_color = task_get_content_color;
         task_instance->win = task_template.win;
         task_instance->desktop = task_template.desktop;
         task_instance->win_x = task_template.win_x;
@@ -118,12 +144,17 @@ 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);
             task_instance->area.on_screen = always_show_all_desktop_tasks;
         }
         task_instance->title = task_template.title;
-		if (panels[monitor].g_task.tooltip_enabled)
+        task_instance->application = task_template.application;
+        if (panels[monitor].g_task.tooltip_enabled) {
             task_instance->area._get_tooltip_text = task_get_tooltip;
+            task_instance->area._get_tooltip_image = task_get_thumbnail;
+        }
+        task_instance->icon_color = task_template.icon_color;
+        task_instance->icon_color_hover = task_template.icon_color_hover;
+        task_instance->icon_color_press = task_template.icon_color_press;
         for (int k = 0; k < TASK_STATE_COUNT; ++k) {
             task_instance->icon[k] = task_template.icon[k];
             task_instance->icon_hover[k] = task_template.icon_hover[k];
@@ -158,26 +189,10 @@ Task *add_task(Window win)
     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]);
@@ -195,6 +210,29 @@ void remove_task(Task *task)
             task->icon_press[k] = 0;
         }
     }
+}
+
+void remove_task(Task *task)
+{
+    if (!task)
+        return;
+
+    if (taskbar_mode == MULTI_DESKTOP) {
+        Panel *panel = task->area.panel;
+        panel->area.resize_needed = 1;
+    }
+
+    Window win = task->win;
+
+    // free title, icon and application name just for the first task
+    // even with task_on_all_desktop and with task_on_all_panel
+    if (task->title)
+        free(task->title);
+    if (task->thumbnail)
+        cairo_surface_destroy(task->thumbnail);
+    if (task->application)
+        free(task->application);
+    task_remove_icon(task);
 
     GPtrArray *task_buttons = g_hash_table_lookup(win_to_task, &win);
     for (int i = 0; i < task_buttons->len; ++i) {
@@ -205,6 +243,8 @@ void remove_task(Task *task)
             task_drag = 0;
         if (g_slist_find(urgent_list, task2))
             del_urgent(task2);
+        if (g_tooltip.area == &task2->area)
+            tooltip_hide(NULL);
         remove_area((Area *)task2);
         free(task2);
     }
@@ -259,43 +299,37 @@ gboolean task_update_title(Task *task)
     return TRUE;
 }
 
-void task_update_icon(Task *task)
+Imlib_Image task_get_icon(Window win, int icon_size)
 {
-	Panel *panel = task->area.panel;
-	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;
-		}
-	}
-
     Imlib_Image img = NULL;
 
     if (!img) {
-		int i;
-		gulong *data = server_get_property(task->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
+        int len;
+        gulong *data = server_get_property(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);
-			DATA32 icon_data[w * h];
-			for (int j = 0; j < w * h; ++j)
+                gulong *tmp_data = get_best_icon(data, get_icon_count(data, len), len, &w, &h, icon_size);
+                if (tmp_data) {
+                    int array_size = w * h;
+                    // imlib needs the array in DATA32 type
+                    // using malloc for the array to protect from stack overflow
+                    DATA32 *icon_data = (DATA32*) g_try_malloc(sizeof(*icon_data) * array_size);
+                    if (icon_data) {
+                        for (int j = 0; j < array_size; ++j)
                             icon_data[j] = tmp_data[j];
                         img = imlib_create_image_using_copied_data(w, h, icon_data);
-			if (img)
-				fprintf(stderr, "%s: Got %dx%d icon via _NET_WM_ICON for %s\n", __FUNCTION__, w, h, task->title ? task->title : "task");
+                        g_free(icon_data);
+                    }
+                }
+            }
             XFree(data);
         }
     }
 
     if (!img) {
-		XWMHints *hints = XGetWMHints(server.display, task->win);
+        XWMHints *hints = XGetWMHints(server.display, win);
         if (hints) {
             if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) {
                 // get width, height and depth for the pixmap
@@ -307,8 +341,6 @@ void task_update_icon(Task *task)
                 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 (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);
         }
@@ -317,9 +349,46 @@ void task_update_icon(Task *task)
     if (img == NULL) {
         imlib_context_set_image(default_icon);
         img = imlib_clone_image();
-		fprintf(stderr, "%s: Using default icon for %s\n", __FUNCTION__, task->title ? task->title : "task");
     }
 
+    return img;
+}
+
+void task_set_icon_color(Task *task, Imlib_Image icon)
+{
+    get_image_mean_color(icon, &task->icon_color);
+    if (panel_config.mouse_effects) {
+        task->icon_color_hover = task->icon_color;
+        adjust_color(&task->icon_color_hover,
+                     panel_config.mouse_over_alpha,
+                     panel_config.mouse_over_saturation,
+                     panel_config.mouse_over_brightness);
+        task->icon_color_press = task->icon_color;
+        adjust_color(&task->icon_color_press,
+                     panel_config.mouse_pressed_alpha,
+                     panel_config.mouse_pressed_saturation,
+                     panel_config.mouse_pressed_brightness);
+    }
+}
+
+void task_update_icon(Task *task)
+{
+    Panel *panel = task->area.panel;
+    if (!panel->g_task.has_icon) {
+        if (panel_config.g_task.has_content_tint) {
+            Imlib_Image img = task_get_icon(task->win, panel->g_task.icon_size1);
+            task_set_icon_color(task, img);
+            imlib_context_set_image(img);
+            imlib_free_image();
+        }
+        return;
+    }
+
+    task_remove_icon(task);
+
+    Imlib_Image img = task_get_icon(task->win, panel->g_task.icon_size1);
+    task_set_icon_color(task, img);
+
     // transform icons
     imlib_context_set_image(img);
     imlib_image_set_has_alpha(1);
@@ -333,20 +402,10 @@ void task_update_icon(Task *task)
     task->icon_width = imlib_image_get_width();
     task->icon_height = imlib_image_get_height();
     for (int k = 0; k < TASK_STATE_COUNT; ++k) {
-		imlib_context_set_image(orig_image);
-		task->icon[k] = imlib_clone_image();
-		imlib_context_set_image(task->icon[k]);
-		DATA32 *data32;
-		if (panel->g_task.alpha[k] != 100 || panel->g_task.saturation[k] != 0 || panel->g_task.brightness[k] != 0) {
-			data32 = imlib_image_get_data();
-			adjust_asb(data32,
-			           task->icon_width,
-			           task->icon_height,
-			           panel->g_task.alpha[k] / 100.0,
-			           panel->g_task.saturation[k] / 100.0,
-			           panel->g_task.brightness[k] / 100.0);
-			imlib_image_put_back_data(data32);
-		}
+        task->icon[k] = adjust_icon(orig_image,
+                                    panel->g_task.alpha[k],
+                                    panel->g_task.saturation[k],
+                                    panel->g_task.brightness[k]);
         if (panel_config.mouse_effects) {
             task->icon_hover[k] = adjust_icon(task->icon[k],
                                               panel_config.mouse_over_alpha,
@@ -364,9 +423,12 @@ void task_update_icon(Task *task)
     GPtrArray *task_buttons = get_task_buttons(task->win);
     if (task_buttons) {
         for (int i = 0; i < task_buttons->len; ++i) {
-			Task *task2 = g_ptr_array_index(task_buttons, i);
+            Task *task2 = (Task *)g_ptr_array_index(task_buttons, i);
             task2->icon_width = task->icon_width;
             task2->icon_height = task->icon_height;
+            task2->icon_color = task->icon_color;
+            task2->icon_color_hover = task->icon_color_hover;
+            task2->icon_color_press = task->icon_color_press;
             for (int k = 0; k < TASK_STATE_COUNT; ++k) {
                 task2->icon[k] = task->icon[k];
                 task2->icon_hover[k] = task->icon_hover[k];
@@ -391,7 +453,7 @@ void draw_task_icon(Task *task, int text_width)
         else
             task->_icon_x = (task->area.width - panel->g_task.icon_size1) / 2;
     } else {
-		task->_icon_x = left_border_width(&task->area) + task->area.paddingxlr;
+        task->_icon_x = left_border_width(&task->area) + task->area.paddingxlr * panel->scale;
     }
 
     // Render
@@ -421,11 +483,13 @@ void draw_task(void *obj, cairo_t *c)
 
     task->_text_width = 0;
     if (panel->g_task.has_text) {
-		PangoLayout *layout = pango_cairo_create_layout(c);
+        PangoContext *context = pango_cairo_create_context(c);
+        pango_cairo_context_set_resolution(context, 96 * panel->scale);
+        PangoLayout *layout = pango_layout_new(context);
         pango_layout_set_font_description(layout, panel->g_task.font_desc);
         pango_layout_set_text(layout, task->title, -1);
 
-		pango_layout_set_width(layout, ((Taskbar *)task->area.parent)->text_width * PANGO_SCALE);
+        pango_layout_set_width(layout, (((Taskbar *)task->area.parent)->text_width + TINT2_PANGO_SLACK) * PANGO_SCALE);
         pango_layout_set_height(layout, panel->g_task.text_height * PANGO_SCALE);
         pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
         pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
@@ -439,9 +503,10 @@ void draw_task(void *obj, cairo_t *c)
         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, task->_text_posy, config_text, panel->font_shadow);
+        draw_text(layout, c, panel->g_task.text_posx, task->_text_posy, config_text, panel->font_shadow ? layout : NULL);
 
         g_object_unref(layout);
+        g_object_unref(context);
     }
 
     if (panel->g_task.has_icon)
@@ -454,7 +519,7 @@ void task_dump_geometry(void *obj, int indent)
     Panel *panel = (Panel *)task->area.panel;
 
     fprintf(stderr,
-			"%*sText: x = %d, y = %d, w = %d, h = %d, align = %s, text = %s\n",
+            "tint2: %*sText: x = %d, y = %d, w = %d, h = %d, align = %s, text = %s\n",
             indent,
             "",
             (int)panel->g_task.text_posx,
@@ -464,7 +529,7 @@ void task_dump_geometry(void *obj, int indent)
             panel->g_task.centered ? "center" : "left",
             task->title);
     fprintf(stderr,
-			"%*sIcon: x = %d, y = %d, w = h = %d\n",
+            "tint2: %*sIcon: x = %d, y = %d, w = h = %d\n",
             indent,
             "",
             task->_icon_x,
@@ -472,11 +537,29 @@ void task_dump_geometry(void *obj, int indent)
             panel->g_task.icon_size1);
 }
 
+void task_get_content_color(void *obj, Color *color)
+{
+    Task *task = (Task *)obj;
+    Color *content_color = NULL;
+    if (panel_config.mouse_effects) {
+        if (task->area.mouse_state == MOUSE_OVER)
+            content_color = &task->icon_color_hover;
+        else if (task->area.mouse_state == MOUSE_DOWN)
+            content_color = &task->icon_color_press;
+        else
+            content_color = &task->icon_color;
+    } else {
+        content_color = &task->icon_color;
+    }
+    if (content_color)
+        *color = *content_color;
+}
+
 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;
+    int size = (panel_horizontal ? panel->g_task.maximum_width : panel->g_task.maximum_height) * panel->scale;
     return size;
 }
 
@@ -485,7 +568,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,
@@ -494,6 +581,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)
@@ -572,7 +662,6 @@ void reset_active_task()
     }
 
     Window w1 = get_active_window();
-	// printf("Change active task %ld\n", w1);
 
     if (w1) {
         if (!get_task_buttons(w1)) {
@@ -584,11 +673,50 @@ void reset_active_task()
     }
 }
 
+void task_refresh_thumbnail(Task *task)
+{
+    if (!panel_config.g_task.thumbnail_enabled)
+        return;
+    if (task->current_state == TASK_ICONIFIED)
+        return;
+    Panel *panel = (Panel*)task->area.panel;
+    double now = get_time();
+    if (now - task->thumbnail_last_update < 0.1)
+        return;
+    if (debug_thumbnails)
+        fprintf(stderr, "tint2: thumbnail for window: %s" RESET "\n", task->title ? task->title : "");
+    cairo_surface_t *thumbnail = get_window_thumbnail(task->win, panel_config.g_task.thumbnail_width * panel->scale);
+    if (!thumbnail)
+        return;
+    if (task->thumbnail)
+        cairo_surface_destroy(task->thumbnail);
+    task->thumbnail = thumbnail;
+    task->thumbnail_last_update = get_time();
+    if (debug_thumbnails)
+        fprintf(stderr,
+                YELLOW "tint2: %s took %f ms (window: %s)" RESET "\n",
+                __func__,
+                1000 * (task->thumbnail_last_update - now),
+                task->title ? task->title : "");
+    if (g_tooltip.mapped && (g_tooltip.area == &task->area)) {
+        tooltip_update_contents_for(&task->area);
+        tooltip_update();
+    }
+}
+
 void set_task_state(Task *task, TaskState state)
 {
     if (!task || state == TASK_UNDEFINED || state >= TASK_STATE_COUNT)
         return;
 
+    if (!task->thumbnail)
+        task_refresh_thumbnail(task);
+    if (state == TASK_ACTIVE) {
+        // For active windows, we get the thumbnail twice with a small delay in between.
+        // This is because they sometimes redraw their windows slowly.
+        taskbar_start_thumbnail_timer(THUMB_MODE_ACTIVE_WINDOW);
+    }
+
     if (state == TASK_ACTIVE && task->current_state != state) {
         clock_gettime(CLOCK_MONOTONIC, &task->last_activation_time);
         if (taskbar_sort_method == TASKBAR_SORT_LRU || taskbar_sort_method == TASKBAR_SORT_MRU) {
@@ -603,7 +731,7 @@ 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) {
@@ -627,6 +755,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;
@@ -650,8 +782,8 @@ void blink_urgent(void *arg)
     GSList *urgent_task = urgent_list;
     while (urgent_task) {
         Task *t = urgent_task->data;
-		if (t->urgent_tick < max_tick_urgent) {
-			if (t->urgent_tick++ % 2)
+        if (t->urgent_tick <= max_tick_urgent) {
+            if (++t->urgent_tick % 2)
                 set_task_state(t, TASK_URGENT);
             else
                 set_task_state(t, window_is_iconified(t->win) ? TASK_ICONIFIED : TASK_NORMAL);
@@ -678,8 +810,8 @@ void add_urgent(Task *task)
     // not yet in the list, so we have to add it
     urgent_list = g_slist_prepend(urgent_list, task);
 
-	if (!urgent_timeout)
-		urgent_timeout = add_timeout(10, 1000, blink_urgent, 0, &urgent_timeout);
+    if (!urgent_timer.enabled_)
+        change_timer(&urgent_timer, true, 10, 1000, blink_urgent, 0);
 
     Panel *panel = task->area.panel;
     if (panel->is_hidden)
@@ -689,8 +821,78 @@ void add_urgent(Task *task)
 void del_urgent(Task *task)
 {
     urgent_list = g_slist_remove(urgent_list, task);
-	if (!urgent_list) {
-		stop_timeout(urgent_timeout);
-		urgent_timeout = NULL;
+    if (!urgent_list)
+        stop_timer(&urgent_timer);
+}
+
+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)
+{
+    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"
 
@@ -41,10 +42,13 @@ typedef struct GlobalTask {
     // starting position for text ~ task_padding + task_border + icon_size
     double text_posx, text_height;
     gboolean has_font;
+    gboolean has_content_tint;
     PangoFontDescription *font_desc;
     Color font[TASK_STATE_COUNT];
     int config_font_mask;
     gboolean tooltip_enabled;
+    gboolean thumbnail_enabled;
+    int thumbnail_width;
 } GlobalTask;
 
 // Stores information about a task.
@@ -60,7 +64,11 @@ typedef struct Task {
     Imlib_Image icon_press[TASK_STATE_COUNT];
     unsigned int icon_width;
     unsigned int icon_height;
+    Color icon_color;
+    Color icon_color_hover;
+    Color icon_color_press;
     char *title;
+    char *application;
     int urgent_tick;
     // These may not be up-to-date
     int win_x;
@@ -73,9 +81,11 @@ typedef struct Task {
     double _text_posy;
     int _icon_x;
     int _icon_y;
+    cairo_surface_t *thumbnail;
+    double thumbnail_last_update;
 } Task;
 
-extern timeout *urgent_timeout;
+extern Timer urgent_timer;
 extern GSList *urgent_list;
 
 Task *add_task(Window win);
@@ -85,9 +95,12 @@ 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);
+void task_refresh_thumbnail(Task *task);
 
 // 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

@@ -32,6 +32,7 @@
 #include "window.h"
 #include "panel.h"
 #include "strnatcmp.h"
+#include "tooltip.h"
 
 GHashTable *win_to_task;
 
@@ -39,12 +40,19 @@ 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;
+static Timer thumbnail_update_timer_all;
+static Timer thumbnail_update_timer_active;
+static Timer thumbnail_update_timer_tooltip;
+
+static GList *taskbar_task_orderings = NULL;
+static GList *taskbar_thumbnail_jobs_done = NULL;
 
 void taskbar_init_fonts();
 int taskbar_compute_desired_size(void *obj);
@@ -52,6 +60,8 @@ int taskbar_compute_desired_size(void *obj);
 // Removes the task with &win = key. The other args are ignored.
 void taskbar_remove_task(Window *win);
 
+void taskbar_update_thumbnails(void *arg);
+
 guint win_hash(gconstpointer key)
 {
     return *((const Window *)key);
@@ -70,21 +80,61 @@ void free_ptr_array(gpointer data)
 void default_taskbar()
 {
     win_to_task = NULL;
-	urgent_timeout = NULL;
     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_thumbnail_jobs_done = NULL;
     taskbar_sort_method = TASKBAR_NOSORT;
     taskbar_alignment = ALIGN_LEFT;
     default_taskbarname();
 }
 
+void taskbar_clear_orderings()
+{
+    if (!taskbar_task_orderings)
+        return;
+    for (GList *order = taskbar_task_orderings; order; order = order->next) {
+        g_list_free_full((GList *)order->data, free);
+    }
+    g_list_free(taskbar_task_orderings);
+    taskbar_task_orderings = NULL;
+}
+
+void taskbar_save_orderings()
+{
+    taskbar_clear_orderings();
+    taskbar_task_orderings = NULL;
+    for (int i = 0; i < num_panels; i++) {
+        Panel *panel = &panels[i];
+        for (int j = 0; j < panel->num_desktops; j++) {
+            Taskbar *taskbar = &panel->taskbar[j];
+            GList *task_order = NULL;
+            for (GList *c = (taskbar->area.children && taskbarname_enabled) ? taskbar->area.children->next
+                                                                            : taskbar->area.children;
+                 c;
+                 c = c->next) {
+                Task *t = (Task *)c->data;
+                Window *window = calloc(1, sizeof(Window));
+                *window = t->win;
+                task_order = g_list_append(task_order, window);
+            }
+            taskbar_task_orderings = g_list_append(taskbar_task_orderings, task_order);
+        }
+    }
+}
+
 void cleanup_taskbar()
 {
+    destroy_timer(&thumbnail_update_timer_all);
+    destroy_timer(&thumbnail_update_timer_active);
+    destroy_timer(&thumbnail_update_timer_tooltip);
+    g_list_free(taskbar_thumbnail_jobs_done);
+    taskbar_save_orderings();
     if (win_to_task) {
         while (g_hash_table_size(win_to_task)) {
             GHashTableIter iter;
@@ -116,7 +166,7 @@ void cleanup_taskbar()
     g_slist_free(urgent_list);
     urgent_list = NULL;
 
-	stop_timeout(urgent_timeout);
+    destroy_timer(&urgent_timer);
 
     for (int state = 0; state < TASK_STATE_COUNT; state++) {
         g_list_free(panel_config.g_task.gradient[state]);
@@ -130,10 +180,18 @@ void cleanup_taskbar()
 
 void init_taskbar()
 {
+    INIT_TIMER(urgent_timer);
+    INIT_TIMER(thumbnail_update_timer_all);
+    INIT_TIMER(thumbnail_update_timer_active);
+    INIT_TIMER(thumbnail_update_timer_tooltip);
+
     if (!panel_config.g_task.has_text && !panel_config.g_task.has_icon) {
         panel_config.g_task.has_text = panel_config.g_task.has_icon = 1;
     }
 
+    if (panel_config.g_task.thumbnail_width < 8)
+        panel_config.g_task.thumbnail_width = 210;
+
     if (!win_to_task)
         win_to_task = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array);
 
@@ -180,15 +238,15 @@ void init_taskbar_panel(void *p)
     panel->g_taskbar.area.resize_needed = 1;
     panel->g_taskbar.area.on_screen = TRUE;
     if (panel_horizontal) {
-		panel->g_taskbar.area.posy = top_border_width(&panel->area) + panel->area.paddingy;
+        panel->g_taskbar.area.posy = top_border_width(&panel->area) + panel->area.paddingy * panel->scale;
         panel->g_taskbar.area.height =
-		    panel->area.height - top_bottom_border_width(&panel->area) - 2 * panel->area.paddingy;
+            panel->area.height - top_bottom_border_width(&panel->area) - 2 * panel->area.paddingy * panel->scale;
         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 = left_border_width(&panel->area) + panel->area.paddingy;
+        panel->g_taskbar.area.posx = left_border_width(&panel->area) + panel->area.paddingy * panel->scale;
         panel->g_taskbar.area.width =
-		    panel->area.width - left_right_border_width(&panel->area) - 2 * panel->area.paddingy;
+            panel->area.width - left_right_border_width(&panel->area) - 2 * panel->area.paddingy * panel->scale;
         panel->g_taskbar.area_name.posx = panel->g_taskbar.area.posx;
         panel->g_taskbar.area_name.width = panel->g_taskbar.area.width;
     }
@@ -238,34 +296,35 @@ 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 +
                                   top_bg_border_width(panel->g_taskbar.background[TASKBAR_NORMAL]) +
-		                          panel->g_taskbar.area.paddingy;
+                                  panel->g_taskbar.area.paddingy * panel->scale;
         panel->g_task.area.width = panel->g_task.maximum_width;
         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;
+                                    2 * panel->g_taskbar.area.paddingy * panel->scale;
     } else {
         panel->g_task.area.posx = panel->g_taskbar.area.posx +
                                   left_bg_border_width(panel->g_taskbar.background[TASKBAR_NORMAL]) +
-		                          panel->g_taskbar.area.paddingy;
+                                  panel->g_taskbar.area.paddingy * panel->scale;
         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;
+                                   2 * panel->g_taskbar.area.paddingy * panel->scale;
+        panel->g_task.area.height = panel->g_task.maximum_height * panel->scale;
     }
 
     for (int j = 0; j < TASK_STATE_COUNT; ++j) {
         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);
@@ -274,9 +333,8 @@ void init_taskbar_panel(void *p)
     }
 
     // compute vertical position : text and icon
-	int height_ink, height, width;
+    int height, width;
     get_text_size2(panel->g_task.font_desc,
-	               &height_ink,
                    &height,
                    &width,
                    panel->area.height,
@@ -285,27 +343,20 @@ void init_taskbar_panel(void *p)
                    5,
                    PANGO_WRAP_WORD_CHAR,
                    PANGO_ELLIPSIZE_END,
-	               FALSE);
+                   panel->g_task.centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT,
+                   FALSE,
+                   panel->scale);
 
-	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);
+    panel->g_task.text_posx = left_bg_border_width(panel->g_task.background[0]) + panel->g_task.area.paddingxlr * panel->scale;
+    panel->g_task.text_height =
+        panel->g_task.area.height - (2 * panel->g_task.area.paddingy * panel->scale) - 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->scale, panel->g_task.maximum_height * panel->scale),
                                        MIN(panel->g_task.area.width, panel->g_task.area.height)) -
-		                           2 * panel->g_task.area.paddingy - MAX(left_right_border_width(&panel->g_task.area),
+                                   2 * panel->g_task.area.paddingy * panel->scale - 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.text_posx += panel->g_task.icon_size1 + panel->g_task.area.paddingx * panel->scale;
         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;
@@ -324,9 +375,24 @@ void init_taskbar_panel(void *p)
             free_area_gradient_instances(&taskbar->area);
             instantiate_area_gradients(&taskbar->area);
         }
-
     }
     init_taskbarname_panel(panel);
+    taskbar_start_thumbnail_timer(THUMB_MODE_ALL);
+}
+
+void taskbar_start_thumbnail_timer(ThumbnailUpdateMode mode)
+{
+    if (!panel_config.g_task.thumbnail_enabled)
+        return;
+    if (debug_thumbnails)
+        fprintf(stderr, BLUE "tint2: taskbar_start_thumbnail_timer %s" RESET "\n", mode == THUMB_MODE_ACTIVE_WINDOW ? "active" : mode == THUMB_MODE_TOOLTIP_WINDOW ? "tooltip" : "all");
+    change_timer(mode == THUMB_MODE_ALL ? &thumbnail_update_timer_all :
+                                            mode == THUMB_MODE_ACTIVE_WINDOW ? &thumbnail_update_timer_active : &thumbnail_update_timer_tooltip,
+                 true,
+                 mode == THUMB_MODE_TOOLTIP_WINDOW ? 1000 : 500,
+                 mode == THUMB_MODE_ALL ? 10 * 1000 : 0,
+                 taskbar_update_thumbnails,
+                 (void *)(long)mode);
 }
 
 void taskbar_init_fonts()
@@ -389,14 +455,67 @@ GPtrArray *get_task_buttons(Window win)
     return NULL;
 }
 
+static Window *sort_windows = NULL;
+
+int compare_windows(const void *a, const void *b)
+{
+    if (!sort_windows)
+        return 0;
+
+    int ia = *(int *)a;
+    int ib = *(int *)b;
+
+    Window wina = sort_windows[ia];
+    Window winb = sort_windows[ib];
+
+    for (GList *order = taskbar_task_orderings; order; order = order->next) {
+        int posa = -1;
+        int posb = -1;
+        int pos = 0;
+        for (GList *item = (GList *)order->data; item; item = item->next, pos++) {
+            Window win = *(Window *)item->data;
+            if (win == wina)
+                posa = pos;
+            if (win == winb)
+                posb = pos;
+        }
+        if (posa >= 0 && posb >= 0) {
+            return posa - posb;
+        }
+    }
+
+    return ia - ib;
+}
+
+void sort_win_list(Window *windows, int count)
+{
+    int *indices = (int *)calloc(count, sizeof(int));
+    for (int i = 0; i < count; i++)
+        indices[i] = i;
+    sort_windows = windows;
+    qsort(indices, count, sizeof(int), compare_windows);
+    Window *result = (Window *)calloc(count, sizeof(Window));
+    for (int i = 0; i < count; i++)
+        result[i] = windows[indices[i]];
+    memcpy(windows, result, count * sizeof(Window));
+    free(result);
+    free(indices);
+    sort_windows = NULL;
+}
+
 void taskbar_refresh_tasklist()
 {
     if (!taskbar_enabled)
         return;
-	// fprintf(stderr, "%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);
+    Window *sorted = (Window *)calloc(num_results, sizeof(Window));
+    memcpy(sorted, win, num_results * sizeof(Window));
+    if (taskbar_task_orderings) {
+        sort_win_list(sorted, num_results);
+        taskbar_clear_orderings();
+    }
     if (!win)
         return;
 
@@ -404,7 +523,7 @@ void taskbar_refresh_tasklist()
     for (GList *it = win_list; it; it = it->next) {
         int i;
         for (i = 0; i < num_results; i++)
-			if (*((Window *)it->data) == win[i])
+            if (*((Window *)it->data) == sorted[i])
                 break;
         if (i == num_results)
             taskbar_remove_task(it->data);
@@ -413,10 +532,11 @@ void taskbar_refresh_tasklist()
 
     // Add any new
     for (int i = 0; i < num_results; i++)
-		if (!get_task(win[i]))
-			add_task(win[i]);
+        if (!get_task(sorted[i]))
+            add_task(sorted[i]);
 
     XFree(win);
+    free(sorted);
 }
 
 int taskbar_compute_desired_size(void *obj)
@@ -440,7 +560,6 @@ 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);
     if (panel_horizontal) {
         relayout_with_constraint(&taskbar->area, panel->g_task.maximum_width);
 
@@ -455,12 +574,12 @@ gboolean resize_taskbar(void *obj)
             }
         }
         taskbar->text_width = text_width - panel->g_task.text_posx - right_border_width(&panel->g_task.area) -
-		                      panel->g_task.area.paddingxlr;
+                              panel->g_task.area.paddingxlr * panel->scale;
     } else {
-		relayout_with_constraint(&taskbar->area, panel->g_task.maximum_height);
+        relayout_with_constraint(&taskbar->area, panel->g_task.maximum_height * panel->scale);
 
-		taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx -
-		                      right_border_width(&panel->g_task.area) - panel->g_task.area.paddingxlr;
+        taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy * panel->scale) - panel->g_task.text_posx -
+                              right_border_width(&panel->g_task.area) - panel->g_task.area.paddingxlr * panel->scale;
     }
     return FALSE;
 }
@@ -535,6 +654,15 @@ void set_taskbar_state(Taskbar *taskbar, TaskbarState state)
             for (; l; l = l->next)
                 schedule_redraw((Area *)l->data);
         }
+        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);
+            }
+        }
     }
     schedule_panel_redraw();
 }
@@ -607,6 +735,14 @@ gint compare_task_titles(Task *a, Task *b, Taskbar *taskbar)
     return strnatcasecmp(a->title ? a->title : "", b->title ? b->title : "");
 }
 
+gint compare_task_applications(Task *a, Task *b, Taskbar *taskbar)
+{
+    int trivial = compare_tasks_trivial(a, b, taskbar);
+    if (trivial != NONTRIVIAL)
+        return trivial;
+    return strnatcasecmp(a->application ? a->application : "", b->application ? b->application : "");
+}
+
 gint compare_tasks(Task *a, Task *b, Taskbar *taskbar)
 {
     int trivial = compare_tasks_trivial(a, b, taskbar);
@@ -618,6 +754,8 @@ gint compare_tasks(Task *a, Task *b, Taskbar *taskbar)
         return compare_task_centers(a, b, taskbar);
     } else if (taskbar_sort_method == TASKBAR_SORT_TITLE) {
         return compare_task_titles(a, b, taskbar);
+    } else if (taskbar_sort_method == TASKBAR_SORT_APPLICATION) {
+        return compare_task_applications(a, b, taskbar);
     } else if (taskbar_sort_method == TASKBAR_SORT_LRU) {
         return compare_timespecs(&a->last_activation_time, &b->last_activation_time);
     } else if (taskbar_sort_method == TASKBAR_SORT_MRU) {
@@ -674,3 +812,64 @@ 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);
+        }
+    }
+}
+
+void taskbar_update_thumbnails(void *arg)
+{
+    if (!panel_config.g_task.thumbnail_enabled)
+        return;
+    ThumbnailUpdateMode mode = (ThumbnailUpdateMode)(long)arg;
+    if (debug_thumbnails)
+        fprintf(stderr, BLUE "tint2: taskbar_update_thumbnails %s" RESET "\n", mode == THUMB_MODE_ACTIVE_WINDOW ? "active" : mode == THUMB_MODE_TOOLTIP_WINDOW ? "tooltip" : "all");
+    double start_time = get_time();
+    for (int i = 0; i < num_panels; i++) {
+        Panel *panel = &panels[i];
+        for (int j = 0; j < panel->num_desktops; j++) {
+            Taskbar *taskbar = &panel->taskbar[j];
+            for (GList *c = (taskbar->area.children && taskbarname_enabled) ? taskbar->area.children->next
+                                                                            : taskbar->area.children;
+                 c;
+                 c = c->next) {
+                Task *t = (Task *)c->data;
+                if ((mode == THUMB_MODE_ALL && t->current_state == TASK_ACTIVE && !g_list_find(taskbar_thumbnail_jobs_done, t)) ||
+                    (mode == THUMB_MODE_ACTIVE_WINDOW && t->current_state == TASK_ACTIVE) ||
+                    (mode == THUMB_MODE_TOOLTIP_WINDOW && g_tooltip.mapped && g_tooltip.area == &t->area)) {
+                    task_refresh_thumbnail(t);
+                    if (mode == THUMB_MODE_ALL)
+                        taskbar_thumbnail_jobs_done = g_list_append(taskbar_thumbnail_jobs_done, t);
+                    if (t->thumbnail && mode == THUMB_MODE_TOOLTIP_WINDOW) {
+                        taskbar_start_thumbnail_timer(THUMB_MODE_TOOLTIP_WINDOW);
+                    }
+                }
+                if (mode == THUMB_MODE_ALL) {
+                    double now = get_time();
+                    if (now - start_time > 0.030) {
+                        change_timer(&thumbnail_update_timer_all, true, 50, 10 * 1000, taskbar_update_thumbnails, arg);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+    if (mode == THUMB_MODE_ALL) {
+        if (taskbar_thumbnail_jobs_done) {
+            g_list_free(taskbar_thumbnail_jobs_done);
+            taskbar_thumbnail_jobs_done = NULL;
+            change_timer(&thumbnail_update_timer_all, true, 10 * 1000, 10 * 1000, taskbar_update_thumbnails, arg);
+        }
+    }
+}

src/taskbar/taskbar.h

@@ -21,10 +21,17 @@ typedef enum TaskbarSortMethod {
     TASKBAR_NOSORT = 0,
     TASKBAR_SORT_CENTER,
     TASKBAR_SORT_TITLE,
+    TASKBAR_SORT_APPLICATION,
     TASKBAR_SORT_LRU,
     TASKBAR_SORT_MRU,
 } TaskbarSortMethod;
 
+typedef enum ThumbnailUpdateMode {
+    THUMB_MODE_ACTIVE_WINDOW = 0,
+    THUMB_MODE_TOOLTIP_WINDOW,
+    THUMB_MODE_ALL
+} ThumbnailUpdateMode;
+
 typedef struct {
     Area area;
     gchar *name;
@@ -49,6 +56,7 @@ typedef struct 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;
@@ -71,6 +79,7 @@ void init_taskbar_panel(void *p);
 
 gboolean resize_taskbar(void *obj);
 void taskbar_default_font_changed();
+void taskbar_start_thumbnail_timer(ThumbnailUpdateMode mode);
 
 // Reloads the entire list of tasks from the window manager and recreates the task buttons.
 void taskbar_refresh_tasklist();
@@ -88,6 +97,8 @@ void set_taskbar_state(Taskbar *taskbar, TaskbarState state);
 // 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

@@ -134,9 +134,8 @@ int taskbarname_compute_desired_size(void *obj)
 {
     TaskbarName *taskbar_name = (TaskbarName *)obj;
     Panel *panel = (Panel *)taskbar_name->area.panel;
-	int name_height, name_width, name_height_ink;
+    int name_height, name_width;
     get_text_size2(panel_config.taskbarname_font_desc,
-				   &name_height_ink,
                    &name_height,
                    &name_width,
                    panel->area.height,
@@ -145,12 +144,14 @@ int taskbarname_compute_desired_size(void *obj)
                    strlen(taskbar_name->name),
                    PANGO_WRAP_WORD_CHAR,
                    PANGO_ELLIPSIZE_NONE,
-				   FALSE);
+                   PANGO_ALIGN_CENTER,
+                   FALSE,
+                   panel->scale);
 
     if (panel_horizontal) {
-		return name_width + 2 * taskbar_name->area.paddingxlr + left_right_border_width(&taskbar_name->area);
+        return name_width + 2 * taskbar_name->area.paddingxlr * panel->scale + left_right_border_width(&taskbar_name->area);
     } else {
-		return name_height + 2 * taskbar_name->area.paddingxlr + top_bottom_border_width(&taskbar_name->area);
+        return name_height + 2 * taskbar_name->area.paddingxlr * panel->scale + top_bottom_border_width(&taskbar_name->area);
     }
 }
 
@@ -161,9 +162,8 @@ gboolean resize_taskbarname(void *obj)
 
     schedule_redraw(&taskbar_name->area);
 
-	int name_height, name_width, name_height_ink;
+    int name_height, name_width;
     get_text_size2(panel_config.taskbarname_font_desc,
-				   &name_height_ink,
                    &name_height,
                    &name_width,
                    panel->area.height,
@@ -172,7 +172,9 @@ gboolean resize_taskbarname(void *obj)
                    strlen(taskbar_name->name),
                    PANGO_WRAP_WORD_CHAR,
                    PANGO_ELLIPSIZE_NONE,
-				   FALSE);
+                   PANGO_ALIGN_CENTER,
+                   FALSE,
+                   panel->scale);
 
     gboolean result = FALSE;
     int new_size = taskbarname_compute_desired_size(obj);
@@ -195,11 +197,14 @@ gboolean resize_taskbarname(void *obj)
 void draw_taskbarname(void *obj, cairo_t *c)
 {
     TaskbarName *taskbar_name = obj;
+    Panel *panel = (Panel *)taskbar_name->area.panel;
     Taskbar *taskbar = taskbar_name->area.parent;
     Color *config_text = (taskbar->desktop == server.desktop) ? &taskbarname_active_font : &taskbarname_font;
 
     // draw content
-	PangoLayout *layout = pango_cairo_create_layout(c);
+    PangoContext *context = pango_cairo_create_context(c);
+    pango_cairo_context_set_resolution(context, 96 * panel->scale);
+    PangoLayout *layout = pango_layout_new(context);
     pango_layout_set_font_description(layout, panel_config.taskbarname_font_desc);
     pango_layout_set_width(layout, taskbar_name->area.width * PANGO_SCALE);
     pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
@@ -210,7 +215,40 @@ void draw_taskbarname(void *obj, cairo_t *c)
     cairo_set_source_rgba(c, config_text->rgb[0], config_text->rgb[1], config_text->rgb[2], config_text->alpha);
 
     pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, taskbar_name->posy, config_text, ((Panel *)taskbar_name->area.panel)->font_shadow);
+    draw_text(layout, c, 0, taskbar_name->posy, config_text, ((Panel *)taskbar_name->area.panel)->font_shadow ? layout : NULL);
 
     g_object_unref(layout);
+    g_object_unref(context);
+}
+
+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/tint2-send/tint2-send.c

@@ -0,0 +1,152 @@
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static Display *display = 0;
+
+/* From wmctrl */
+char *get_property(Window window, Atom xa_prop_type, const char *prop_name) {
+    Atom xa_prop_name = XInternAtom(display, prop_name, False);
+
+    Atom xa_ret_type;
+    int ret_format;
+    unsigned long ret_nitems;
+    unsigned long ret_bytes_after;
+    unsigned long tmp_size;
+    unsigned char *ret_prop;
+    if (XGetWindowProperty(display, window, xa_prop_name, 0, 1024,
+                           False, xa_prop_type, &xa_ret_type, &ret_format,
+                           &ret_nitems, &ret_bytes_after, &ret_prop) != Success) {
+        return NULL;
+    }
+
+    if (xa_ret_type != xa_prop_type) {
+        XFree(ret_prop);
+        return NULL;
+    }
+
+    /* Correct 64 Architecture implementation of 32 bit data */
+    tmp_size = (ret_format / 8) * ret_nitems;
+    if (ret_format == 32)
+        tmp_size *= sizeof(long) / 4;
+
+    char *ret = (char *)calloc(1, tmp_size + 1);
+    memcpy(ret, ret_prop, tmp_size);
+
+    XFree(ret_prop);
+    return ret;
+}
+
+int is_tint2(Window window)
+{
+    XWindowAttributes attr = {};
+    if (!XGetWindowAttributes(display, window, &attr))
+        return 0;
+    // if (attr.map_state != IsViewable)
+    //     return 0;
+
+    char *wm_class = get_property(window, XA_STRING, "WM_NAME");
+    if (!wm_class) {
+        return 0;
+    }
+    int class_match = 0;
+    if (strcmp(wm_class, "tint2") == 0) {
+        class_match = 1;
+    }
+    free(wm_class);
+    return class_match;
+}
+
+void handle_tint2_window(Window window, char *action, char **args)
+{
+    if (!is_tint2(window))
+        return;
+    if (strcmp(action, "show") == 0) {
+        fprintf(stderr, "Showing tint2 window: %lx\n", window);
+        XEvent event = {};
+        event.xcrossing.type = EnterNotify;
+        event.xcrossing.window = window;
+        event.xcrossing.mode = NotifyNormal;
+        event.xcrossing.detail = NotifyVirtual;
+        event.xcrossing.same_screen = True;
+        XSendEvent(display, window, False, 0, &event);
+        XFlush(display);
+    } else if (strcmp(action, "hide") == 0) {
+        fprintf(stderr, "Hiding tint2 window: %lx\n", window);
+        XEvent event = {};
+        event.xcrossing.type = LeaveNotify;
+        event.xcrossing.window = window;
+        event.xcrossing.mode = NotifyNormal;
+        event.xcrossing.detail = NotifyVirtual;
+        event.xcrossing.same_screen = True;
+        XSendEvent(display, window, False, 0, &event);
+        XFlush(display);
+    } else if (strcmp(action, "refresh-execp") == 0) {
+        XEvent event = {};
+        char *name = args[0];
+        if (!name) {
+            fprintf(stderr, "Error: missing execp name\n");
+            return;
+        }
+        if (!name[0]) {
+            fprintf(stderr, "Error: empty execp name\n");
+            return;
+        }
+        if (strlen(name) > sizeof(event.xclient.data.b)) {
+            fprintf(stderr, "Error: execp name bigger than %ld bytes\n", sizeof(event.xclient.data.b));
+            return;
+        }
+        fprintf(stderr, "Refreshing execp '%s' for window: %lx\n", name, window);
+        event.xclient.type = ClientMessage;
+        event.xclient.window = window;
+        event.xclient.send_event = True;
+        event.xclient.message_type = XInternAtom(display, "_TINT2_REFRESH_EXECP", False);
+        event.xclient.format = 8;
+        strncpy(event.xclient.data.b, name, sizeof(event.xclient.data.b));
+        XSendEvent(display, window, False, 0, &event);
+        XFlush(display);
+    } else {
+        fprintf(stderr, "Error: unknown action %s\n", action);
+    }
+}
+
+typedef void window_callback_t(Window window, char *action, char **args);
+
+void walk_windows(Window node, window_callback_t *callback, char *action, char **args)
+{
+    callback(node, action, args);
+    Window root = 0;
+    Window parent = 0;
+    Window *children = 0;
+    unsigned int nchildren = 0;
+    if (!XQueryTree(display, node,
+                    &root, &parent, &children, &nchildren)) {
+        return;
+    }
+    for (unsigned int i = 0; i < nchildren; i++) {
+        walk_windows(children[i], callback, action, args);
+    }
+}
+
+int main(int argc, char **argv)
+{
+    display = XOpenDisplay(NULL);
+    if (!display ) {
+        fprintf(stderr, "Failed to open X11 connection\n");
+        exit(1);
+    }
+
+    argc--, argv++;
+    if (!argc) {
+        fprintf(stderr, "Usage: tint2-send [show|hide|refresh-execp]\n");
+        exit(1);
+    }
+    char *action = argv[0];
+    char **args = argv + 1;
+    walk_windows(DefaultRootWindow(display), handle_tint2_window, action, args);
+
+    return 0;
+}

src/tint2conf/CMakeLists.txt

@@ -7,7 +7,7 @@ pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
 pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )
 pkg_check_modules( IMLIB2 REQUIRED imlib2 )
 pkg_check_modules( GTHREAD2 REQUIRED gthread-2.0 )
-pkg_check_modules( GTK2 REQUIRED gtk+-x11-2.0 )
+pkg_check_modules( GTK3 REQUIRED gtk+-x11-3.0 )
 pkg_check_modules( RSVG librsvg-2.0>=2.36.0 )
 
 include_directories( ../util
@@ -16,14 +16,20 @@ include_directories( ../util
                      ${GOBJECT2_INCLUDE_DIRS}
                      ${IMLIB2_INCLUDE_DIRS}
                      ${GTHREAD2_INCLUDE_DIRS}
-                     ${GTK2_INCLUDE_DIRS}
+                     ${GTK3_INCLUDE_DIRS}
                      ${RSVG_INCLUDE_DIRS} )
 
 set(SOURCES ../util/common.c
+            ../util/bt.c
             ../util/strnatcmp.c
             ../util/cache.c
+            ../util/timer.c
+            ../util/test.c
+            ../util/print.c
+            ../util/signals.c
             ../config.c
-            ../server.c
+            ../util/server.c
+            ../util/strlcat.c
             ../launcher/apps-common.c
             ../launcher/icon-theme-common.c
             md4.c
@@ -49,7 +55,7 @@ link_directories( ${X11_T2C_LIBRARY_DIRS}
                   ${GOBJECT2_LIBRARY_DIRS}
                   ${IMLIB2_LIBRARY_DIRS}
                   ${GTHREAD2_LIBRARY_DIRS}
-                  ${GTK2_LIBRARY_DIRS}
+                  ${GTK3_LIBRARY_DIRS}
                   ${RSVG_LIBRARY_DIRS} )
 add_executable( tint2conf ${SOURCES} )
 target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}
@@ -57,13 +63,14 @@ target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}
                                  ${GOBJECT2_LIBRARIES}
                                  ${IMLIB2_LIBRARIES}
                                  ${GTHREAD2_LIBRARIES}
-                                 ${GTK2_LIBRARIES}
+                                 ${GTK3_LIBRARIES}
                                  ${RSVG_LIBRARIES} )
 
 add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
 add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_FULL_LOCALEDIR}\" )
 add_definitions( -DGETTEXT_PACKAGE=\"tint2conf\" )
-set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread -std=c99" )
+add_definitions( -DDGLIB_DISABLE_DEPRECATION_WARNINGS=1 )
+set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=c99 -Werror-implicit-function-declaration -Wno-deprecated -Wno-deprecated-declarations" )
 set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )
 
 add_subdirectory(po)
@@ -71,3 +78,4 @@ add_subdirectory(po)
 install( TARGETS tint2conf DESTINATION bin )
 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.c

@@ -6,7 +6,7 @@ GtkWidget *current_background, *background_fill_color, *background_border_color,
     *background_fill_color_over, *background_border_color_over, *background_gradient_over, *background_fill_color_press,
     *background_border_color_press, *background_gradient_press, *background_border_width, *background_corner_radius,
     *background_border_sides_top, *background_border_sides_bottom, *background_border_sides_left,
-    *background_border_sides_right;
+    *background_border_sides_right, *background_border_content_tint_weight, *background_fill_content_tint_weight;
 
 GtkWidget *create_background_combo(const char *label)
 {
@@ -95,7 +95,7 @@ void create_background(GtkWidget *parent)
     backgrounds = gtk_list_store_new(bgNumCols,
                                      GDK_TYPE_PIXBUF,
                                      GDK_TYPE_COLOR,
-	                                 GTK_TYPE_INT,
+                                     GTK_TYPE_SHADOW_TYPE,
                                      GDK_TYPE_COLOR,
                                      GTK_TYPE_INT,
                                      GTK_TYPE_INT,
@@ -115,11 +115,12 @@ void create_background(GtkWidget *parent)
                                      GTK_TYPE_BOOL,
                                      GTK_TYPE_BOOL,
                                      GTK_TYPE_BOOL,
-	                                 GTK_TYPE_BOOL);
+                                     GTK_TYPE_BOOL,
+                                     GTK_TYPE_DOUBLE,
+                                     GTK_TYPE_DOUBLE);
 
     GtkWidget *table, *label, *button;
     int row, col;
-	GtkTooltips *tooltips = gtk_tooltips_new();
 
     table = gtk_table_new(1, 4, FALSE);
     gtk_widget_show(table);
@@ -139,21 +140,21 @@ void create_background(GtkWidget *parent)
     gtk_widget_show(current_background);
     gtk_table_attach(GTK_TABLE(table), current_background, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
     col++;
-	gtk_tooltips_set_tip(tooltips, current_background, _("Selects the background you would like to modify"), NULL);
+    gtk_widget_set_tooltip_text(current_background, _("Selects the background you would like to modify"));
 
     button = gtk_button_new_from_stock("gtk-add");
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(background_duplicate), NULL);
+    g_signal_connect(button, "clicked", G_CALLBACK(background_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++;
-	gtk_tooltips_set_tip(tooltips, button, _("Creates a copy of the current background"), NULL);
+    gtk_widget_set_tooltip_text(button, _("Creates a copy of the current background"));
 
     button = gtk_button_new_from_stock("gtk-remove");
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(background_delete), NULL);
+    g_signal_connect(button, "clicked", G_CALLBACK(background_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++;
-	gtk_tooltips_set_tip(tooltips, button, _("Deletes the current background"), NULL);
+    gtk_widget_set_tooltip_text(button, _("Deletes the current background"));
 
     table = gtk_table_new(4, 4, FALSE);
     gtk_widget_show(table);
@@ -173,7 +174,20 @@ void create_background(GtkWidget *parent)
     gtk_widget_show(background_fill_color);
     gtk_table_attach(GTK_TABLE(table), background_fill_color, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
     col++;
-	gtk_tooltips_set_tip(tooltips, background_fill_color, _("The fill color of the current background"), NULL);
+    gtk_widget_set_tooltip_text(background_fill_color, _("The fill color of the current background"));
+
+    row++, col = 2;
+    label = gtk_label_new(_("Fill tint"));
+    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++;
+
+    background_fill_content_tint_weight = gtk_spin_button_new_with_range(0, 100, 1);
+    gtk_widget_show(background_fill_content_tint_weight);
+    gtk_table_attach(GTK_TABLE(table), background_fill_content_tint_weight, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+    gtk_widget_set_tooltip_text(background_fill_content_tint_weight, _("How much the border color should be tinted with the content color"));
 
     row++, col = 2;
     label = gtk_label_new(_("Border color"));
@@ -187,7 +201,20 @@ void create_background(GtkWidget *parent)
     gtk_widget_show(background_border_color);
     gtk_table_attach(GTK_TABLE(table), background_border_color, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
     col++;
-	gtk_tooltips_set_tip(tooltips, background_border_color, _("The border color of the current background"), NULL);
+    gtk_widget_set_tooltip_text(background_border_color, _("The border color of the current background"));
+
+    row++, col = 2;
+    label = gtk_label_new(_("Border tint"));
+    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++;
+
+    background_border_content_tint_weight = gtk_spin_button_new_with_range(0, 100, 1);
+    gtk_widget_show(background_border_content_tint_weight);
+    gtk_table_attach(GTK_TABLE(table), background_border_content_tint_weight, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
+    col++;
+    gtk_widget_set_tooltip_text(background_border_content_tint_weight, _("How much the border color should be tinted with the content color"));
 
     row++, col = 2;
     label = gtk_label_new(_("Gradient"));
@@ -213,10 +240,8 @@ void create_background(GtkWidget *parent)
     gtk_widget_show(background_fill_color_over);
     gtk_table_attach(GTK_TABLE(table), background_fill_color_over, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
     col++;
-	gtk_tooltips_set_tip(tooltips,
-	                     background_fill_color_over,
-	                     _("The fill color of the current background on mouse over"),
-	                     NULL);
+    gtk_widget_set_tooltip_text(background_fill_color_over,
+                         _("The fill color of the current background on mouse over"));
 
     row++, col = 2;
     label = gtk_label_new(_("Border color (mouse over)"));
@@ -230,10 +255,9 @@ void create_background(GtkWidget *parent)
     gtk_widget_show(background_border_color_over);
     gtk_table_attach(GTK_TABLE(table), background_border_color_over, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
     col++;
-	gtk_tooltips_set_tip(tooltips,
+    gtk_widget_set_tooltip_text(
                          background_border_color_over,
-	                     _("The border color of the current background on mouse over"),
-	                     NULL);
+                         _("The border color of the current background on mouse over"));
 
     row++, col = 2;
     label = gtk_label_new(_("Gradient (mouse over)"));
@@ -259,10 +283,8 @@ void create_background(GtkWidget *parent)
     gtk_widget_show(background_fill_color_press);
     gtk_table_attach(GTK_TABLE(table), background_fill_color_press, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
     col++;
-	gtk_tooltips_set_tip(tooltips,
-	                     background_fill_color_press,
-	                     _("The fill color of the current background on mouse button press"),
-	                     NULL);
+    gtk_widget_set_tooltip_text(background_fill_color_press,
+                         _("The fill color of the current background on mouse button press"));
 
     row++, col = 2;
     label = gtk_label_new(_("Border color (pressed)"));
@@ -276,10 +298,8 @@ void create_background(GtkWidget *parent)
     gtk_widget_show(background_border_color_press);
     gtk_table_attach(GTK_TABLE(table), background_border_color_press, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
     col++;
-	gtk_tooltips_set_tip(tooltips,
-	                     background_border_color_press,
-	                     _("The border color of the current background on mouse button press"),
-	                     NULL);
+    gtk_widget_set_tooltip_text(background_border_color_press,
+                         _("The border color of the current background on mouse button press"));
 
     row++, col = 2;
     label = gtk_label_new(_("Gradient (pressed)"));
@@ -304,10 +324,8 @@ void create_background(GtkWidget *parent)
     gtk_widget_show(background_border_width);
     gtk_table_attach(GTK_TABLE(table), background_border_width, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
     col++;
-	gtk_tooltips_set_tip(tooltips,
-	                     background_border_width,
-	                     _("The width of the border of the current background, in pixels"),
-	                     NULL);
+    gtk_widget_set_tooltip_text(background_border_width,
+                         _("The width of the border of the current background, in pixels"));
 
     row++, col = 2;
     label = gtk_label_new(_("Corner radius"));
@@ -320,7 +338,7 @@ void create_background(GtkWidget *parent)
     gtk_widget_show(background_corner_radius);
     gtk_table_attach(GTK_TABLE(table), background_corner_radius, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
     col++;
-	gtk_tooltips_set_tip(tooltips, background_corner_radius, _("The corner radius of the current background"), NULL);
+    gtk_widget_set_tooltip_text(background_corner_radius, _("The corner radius of the current background"));
 
     row++;
     col = 2;
@@ -366,6 +384,8 @@ void create_background(GtkWidget *parent)
     g_signal_connect(G_OBJECT(background_border_sides_bottom), "toggled", G_CALLBACK(background_update), NULL);
     g_signal_connect(G_OBJECT(background_border_sides_left), "toggled", G_CALLBACK(background_update), NULL);
     g_signal_connect(G_OBJECT(background_border_sides_right), "toggled", G_CALLBACK(background_update), NULL);
+    g_signal_connect(G_OBJECT(background_border_content_tint_weight), "value-changed", G_CALLBACK(background_update), NULL);
+    g_signal_connect(G_OBJECT(background_fill_content_tint_weight), "value-changed", G_CALLBACK(background_update), NULL);
 
     change_paragraph(parent);
 }
@@ -682,9 +702,8 @@ void background_update_image(int index)
     g_boxed_free(GDK_TYPE_COLOR, fillColor);
     g_boxed_free(GDK_TYPE_COLOR, borderColor);
 
-	GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24);
-
-	cairo_t *cr = gdk_cairo_create(pixmap);
+    cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h);
+    cairo_t *cr = cairo_create(s);
     cairo_set_line_width(cr, b);
 
     cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
@@ -714,13 +733,12 @@ void background_update_image(int index)
     cairo_destroy(cr);
     cr = NULL;
 
-	pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, gdk_colormap_get_system(), 0, 0, 0, 0, w, h);
-	if (pixmap)
-		g_object_unref(pixmap);
+    pixbuf = gdk_pixbuf_get_from_surface(s, 0, 0, w, h);
 
     gtk_list_store_set(backgrounds, &iter, bgColPixbuf, pixbuf, -1);
     if (pixbuf)
         g_object_unref(pixbuf);
+    cairo_surface_destroy(s);
 }
 
 void background_force_update()
@@ -750,6 +768,9 @@ void background_update(GtkWidget *widget, gpointer data)
     r = gtk_spin_button_get_value(GTK_SPIN_BUTTON(background_corner_radius));
     b = gtk_spin_button_get_value(GTK_SPIN_BUTTON(background_border_width));
 
+    double fill_weight = gtk_spin_button_get_value(GTK_SPIN_BUTTON(background_fill_content_tint_weight));
+    double border_weight = gtk_spin_button_get_value(GTK_SPIN_BUTTON(background_border_content_tint_weight));
+
     gboolean sideTop = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(background_border_sides_top));
     gboolean sideBottom = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(background_border_sides_bottom));
     gboolean sideLeft = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(background_border_sides_left));
@@ -836,6 +857,10 @@ void background_update(GtkWidget *widget, gpointer data)
                        sideLeft,
                        bgColBorderSidesRight,
                        sideRight,
+                       bgColFillWeight,
+                       fill_weight,
+                       bgColBorderWeight,
+                       border_weight,
                        -1);
     background_update_image(index);
 }
@@ -862,6 +887,8 @@ void current_background_changed(GtkWidget *widget, gpointer data)
     gtk_widget_set_sensitive(background_border_sides_left, index > 0);
     gtk_widget_set_sensitive(background_border_sides_right, index > 0);
     gtk_widget_set_sensitive(background_corner_radius, index > 0);
+    gtk_widget_set_sensitive(background_border_content_tint_weight, index > 0);
+    gtk_widget_set_sensitive(background_fill_content_tint_weight, index > 0);
 
     background_updates_disabled = TRUE;
 
@@ -875,6 +902,9 @@ void current_background_changed(GtkWidget *widget, gpointer data)
     int r;
     int b;
 
+    double fill_weight;
+    double border_weight;
+
     gboolean sideTop;
     gboolean sideBottom;
     gboolean sideLeft;
@@ -938,6 +968,10 @@ void current_background_changed(GtkWidget *widget, gpointer data)
                        &sideLeft,
                        bgColBorderSidesRight,
                        &sideRight,
+                       bgColFillWeight,
+                       &fill_weight,
+                       bgColBorderWeight,
+                       &border_weight,
                        -1);
 
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(background_border_sides_top), sideTop);
@@ -968,6 +1002,9 @@ void current_background_changed(GtkWidget *widget, gpointer data)
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(background_border_width), b);
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(background_corner_radius), r);
 
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(background_fill_content_tint_weight), fill_weight);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(background_border_content_tint_weight), border_weight);
+
     g_boxed_free(GDK_TYPE_COLOR, fillColor);
     g_boxed_free(GDK_TYPE_COLOR, borderColor);
     g_boxed_free(GDK_TYPE_COLOR, fillColorOver);

src/tint2conf/gradient_gui.c

@@ -32,7 +32,7 @@ GtkWidget *create_gradient_combo()
 
 void create_gradient(GtkWidget *parent)
 {
-	gradient_ids = gtk_list_store_new(grNumCols, GDK_TYPE_PIXBUF, GTK_TYPE_INT, GTK_TYPE_STRING);
+    gradient_ids = gtk_list_store_new(grNumCols, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_STRING);
     gradients = NULL;
 
     gradient_stop_ids = gtk_list_store_new(grStopNumCols, GDK_TYPE_PIXBUF);
@@ -61,13 +61,13 @@ void create_gradient(GtkWidget *parent)
     col++;
 
     button = gtk_button_new_from_stock("gtk-add");
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_duplicate), NULL);
+    g_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);
+    g_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++;
@@ -85,13 +85,13 @@ void create_gradient(GtkWidget *parent)
     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();
+    gradient_combo_type = gtk_combo_box_text_new();
     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_text_append_text(GTK_COMBO_BOX_TEXT(gradient_combo_type), _("Vertical"));
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gradient_combo_type), _("Horizontal"));
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gradient_combo_type), _("Radial"));
     gtk_combo_box_set_active(GTK_COMBO_BOX(gradient_combo_type), 0);
 
     row++, col = 2;
@@ -142,13 +142,13 @@ void create_gradient(GtkWidget *parent)
     col++;
 
     button = gtk_button_new_from_stock("gtk-add");
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_duplicate), NULL);
+    g_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);
+    g_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++;
@@ -205,10 +205,14 @@ void gradient_create_new(GradientConfigType 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") : "",
+    gtk_list_store_set(gradient_ids,
+                       &iter,
+                       grColPixbuf,
+                       NULL,
+                       grColId,
+                       &index,
+                       grColText,
+                       index == 0 ? _("None") : "",
                        -1);
 
     gradient_update_image(index);
@@ -245,11 +249,7 @@ void gradient_duplicate(GtkWidget *widget, gpointer data)
     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);
+    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);
@@ -289,8 +289,14 @@ void gradient_draw(cairo_t *c, GradientConfig *g, int w, int h, gboolean preserv
         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);
+    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,
@@ -300,7 +306,12 @@ void gradient_draw(cairo_t *c, GradientConfig *g, int w, int h, gboolean preserv
                                           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_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)
@@ -316,18 +327,17 @@ void gradient_update_image(int index)
 
     int w = 70;
     int h = 30;
-	GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24);
+    cairo_surface_t *pixmap = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h);
 
-	cairo_t *cr = gdk_cairo_create(pixmap);
+    cairo_t *cr = 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);
+    GdkPixbuf *pixbuf = gdk_pixbuf_get_from_surface(pixmap, 0, 0, w, h);
+    cairo_surface_destroy(pixmap);
 
     GtkTreePath *path;
     GtkTreeIter iter;
@@ -336,9 +346,7 @@ void gradient_update_image(int index)
     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);
+    gtk_list_store_set(gradient_ids, &iter, grColPixbuf, pixbuf, -1);
     if (pixbuf)
         g_object_unref(pixbuf);
 }
@@ -381,11 +389,7 @@ void gradient_update(GtkWidget *widget, gpointer data)
     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);
+    gtk_list_store_set(gradient_ids, &iter, grColPixbuf, NULL, grColId, &index, grColText, "", -1);
     gradient_update_image(index);
     background_update_for_gradient(index);
 }
@@ -428,9 +432,7 @@ void current_gradient_changed(GtkWidget *widget, gpointer data)
     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);
+        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)
@@ -468,9 +470,7 @@ void gradient_stop_create_new()
     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);
+    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);
@@ -527,16 +527,14 @@ void gradient_stop_update_image(int index)
 
     int w = 70;
     int h = 30;
-	GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24);
-
-	cairo_t *cr = gdk_cairo_create(pixmap);
+    cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h);
+    cairo_t *cr = cairo_create(s);
     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);
+    GdkPixbuf *pixbuf = gdk_pixbuf_get_from_surface(s, 0, 0, w, h);
+    cairo_surface_destroy(s);
 
     GtkTreePath *path;
     GtkTreeIter iter;
@@ -545,9 +543,7 @@ void gradient_stop_update_image(int index)
     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);
+    gtk_list_store_set(gradient_stop_ids, &iter, grStopColPixbuf, pixbuf, -1);
     if (pixbuf)
         g_object_unref(pixbuf);
 }

src/tint2conf/main.c

@@ -74,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.
@@ -100,7 +100,7 @@ char *file_name_from_path(const char *filepath)
 
 void make_backup(const char *filepath)
 {
-	gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, time(NULL));
+    gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long long)time(NULL));
     copy_file(filepath, backup_path);
     g_free(backup_path);
 }
@@ -119,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;
@@ -138,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;
@@ -158,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);
@@ -227,7 +227,7 @@ 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, 0700);
+            g_mkdir_with_parents(tint2_config_dir, 0700);
         g_free(tint2_config_dir);
     }
 
@@ -250,13 +250,43 @@ 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)},
+         {"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)},
+         {"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},
@@ -309,7 +339,11 @@ int main(int argc, char **argv)
     argc--, argv++;
     if (argc > 0) {
         load_specific_themes(argv, argc);
-		g_timeout_add(SNAPSHOT_TICK, (GSourceFunc)edit_theme, NULL);
+        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);
@@ -349,6 +383,11 @@ static void menuAbout()
 
 // ====== Theme import/copy/delete ======
 
+static void free_data(gpointer data, gpointer userdata)
+{
+    g_free(data);
+}
+
 // Shows open dialog and copies the selected files to ~ without overwrite.
 static void menuImportFile()
 {
@@ -373,7 +412,7 @@ static void menuImportFile()
         gchar *newpath = import_no_overwrite(l->data);
         g_free(newpath);
     }
-	g_slist_foreach(list, (GFunc)g_free, NULL);
+    g_slist_foreach(list, free_data, NULL);
     g_slist_free(list);
     gtk_widget_destroy(dialog);
 }
@@ -409,7 +448,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()
 {
@@ -643,11 +683,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) {
@@ -665,6 +705,8 @@ static void edit_theme()
     g_free(filepath);
 
     destroy_please_wait();
+
+    return FALSE;
 }
 
 static void make_selected_theme_default()
@@ -680,7 +722,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,
@@ -702,7 +745,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 ======
@@ -834,7 +877,7 @@ 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);
     }
 }
 
@@ -865,7 +908,7 @@ static void reload_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);
     }
 }
 
@@ -899,7 +942,7 @@ static void load_specific_themes(char **paths, int count)
             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);
     }
 }
 
@@ -910,7 +953,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);
     }
 }
 
@@ -925,7 +968,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

@@ -14,8 +14,29 @@
 #define GETTEXT_PACKAGE "tint2conf"
 #endif
 
+#ifndef GTK_TYPE_INT
+#define GTK_TYPE_INT G_TYPE_INT
+#endif
+
+#ifndef GTK_TYPE_STRING
+#define GTK_TYPE_STRING G_TYPE_STRING
+#endif
+
+#ifndef GTK_TYPE_BOOL
+#define GTK_TYPE_BOOL G_TYPE_BOOLEAN
+#endif
+
+#ifndef GTK_TYPE_DOUBLE
+#define GTK_TYPE_DOUBLE G_TYPE_DOUBLE
+#endif
+
+#define gtk_tooltips_set_tip(t, widget, txt, arg) gtk_widget_set_tooltip_text(widget, txt)
+
+#define GTK_OBJECT(x) (x)
+#define GTK_SIGNAL_FUNC G_CALLBACK
+
 #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

@@ -186,13 +186,11 @@ static int md4_update(struct shash_desc *desc, const u8 *data, unsigned int len)
     mctx->byte_count += len;
 
     if (avail > len) {
-		memcpy((char *)mctx->block + (sizeof(mctx->block) - avail),
-			   data, len);
+        memcpy((char *)mctx->block + (sizeof(mctx->block) - avail), data, len);
         return 0;
     }
 
-	memcpy((char *)mctx->block + (sizeof(mctx->block) - avail),
-		   data, avail);
+    memcpy((char *)mctx->block + (sizeof(mctx->block) - avail), data, avail);
 
     md4_transform_helper(mctx);
     data += avail;
@@ -228,8 +226,7 @@ static int md4_final(struct shash_desc *desc, u8 *out)
     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));
+    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));