Release 0.13.3

Update ru.po

See merge request !25

.clang-format

@@ -0,0 +1,66 @@
+# works with clang-format-3.7
+#
+# Most controversial fields are UseTab, IndentWidth, ContinuationIndentWidth, ColumnLimit, BreakBeforeBraces
+
+#BasedOnStyle: Google
+AccessModifierOffset: 0
+AlignAfterOpenBracket: true
+AlignConsecutiveAssignments: false
+#AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: true
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Linux
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit: 120
+CommentPragmas: ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 0
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DerivePointerBinding: false
+DisableFormat: false
+ForEachMacros: ['foreach']
+IndentCaseLabels: false
+IndentFunctionDeclarationAfterType: false
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+Language: Cpp
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 1000
+PenaltyBreakComment: 100
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakString: 100
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 2000
+PointerAlignment: Right
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Cpp11
+TabWidth: 4
+UseTab: ForIndentation

.gitignore

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

AUTHORS

@@ -1,4 +1,3 @@
-
 tint2 is developped by :
 - Thierry Lorthiois <lorthiois@bbsoft.fr> from Omega distribution
 - Andreas Fink <andreas.fink85@googlemail.com>
@@ -6,11 +5,11 @@ tint2 is developped by :
 - Christian Ruppert <Spooky85@gmail.com> (autotools build system)
 - 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
 
-tint2 is based on ttm source code (http://code.google.com/p/ttm/)
+tint2 is based on the ttm source code (http://code.google.com/p/ttm/)
 - 2007-2008 Pål Staurland <staura@gmail.com>
 
-
 Contributors:
   Kwaku Yeboah <kwakuyeboah@gmail.com> : wiki page
   Daniel Moerner <dmoerner@gmail.com> : man page and debian package
@@ -23,4 +22,24 @@ Contributors:
   Xico Atelo : startup notifications
   Craig Oakes : WM flags, issue tracker organization
   Jeff Blake (https://gitlab.com/u/berkley4) : more mouse event handlers
+  Vladimir <vladimir-csp@yandex.ru> : translations, bug reports
+  Christophe D. <stophe72.d@gmail.com> : non-rectangular borders
+  Benoit Averty : taskbar enhancements
+  Justin Jacobs : tint2conf fixes
+  Oskari Rauta : separator plugin, gradients
+  Michael Messmore : Support for Path in .desktop files
+  Matthew Otnel : config option systray_name_filter
 
+Translations:
+  Bosnian:
+    Dino Duratović <dinomol@mail.com>
+  Croatian:
+    Dino Duratović <dinomol@mail.com>
+  French:
+    Jocelyn <anechampenois@solydxk.com>
+    The Bento team <meets@gmx.fr>
+    Wagner <https://gitlab.com/u/wagmic>
+  Polish:
+    Daniel Napora <napcok@gmail.com>
+  Serbian:
+    Dino Duratović <dinomol@mail.com>

CMakeLists.txt

@@ -1,15 +1,29 @@
 project( tint2 )
-cmake_minimum_required( VERSION 2.6 )
+cmake_minimum_required( VERSION 2.8.5 )
 
 option( ENABLE_BATTERY "Enable battery status plugin" ON )
 option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme configurator for tint2" ON )
-option( ENABLE_EXAMPLES "Install additional tin2rc examples" ON )
+option( ENABLE_EXTRA_THEMES "Install additional tint2 themes" ON )
 option( ENABLE_RSVG "Rsvg support (launcher only)" ON )
 option( ENABLE_SN "Startup notification support" ON )
 option( ENABLE_ASAN "Build tint2 with AddressSanitizer" OFF )
+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 )
+if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
+  option( ENABLE_UEVENT "Kernel event handling support" ON )
+endif( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
+
+include( GNUInstallDirs )
+if(NOT docdir)
+  set(docdir ${CMAKE_INSTALL_DOCDIR})
+endif()
+if(NOT htmldir)
+  set(htmldir ${docdir}/html)
+endif()
 
 include( FindPkgConfig )
 include( CheckLibraryExists )
+include( CheckCSourceCompiles )
 pkg_check_modules( X11 REQUIRED x11 xcomposite xdamage xinerama xrender xrandr>=1.3 )
 pkg_check_modules( PANGOCAIRO REQUIRED pangocairo )
 pkg_check_modules( PANGO REQUIRED pango )
@@ -17,8 +31,43 @@ pkg_check_modules( CAIRO REQUIRED cairo )
 pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
 pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )
 pkg_check_modules( IMLIB2 REQUIRED imlib2>=1.4.2 )
+
+if(ENABLE_BACKTRACE)
+	check_c_source_compiles(
+		"#include <stdlib.h>\n#include <execinfo.h>\nint main () { backtrace(NULL, 0); }"
+		BACKTRACE_LIBC)
+
+	if(BACKTRACE_LIBC)
+		set(BACKTRACE_LIBC_FOUND TRUE)
+		set(BACKTRACE_L_FLAGS "-rdynamic")
+	else()
+		pkg_check_modules( UNWIND libunwind )
+		find_library(EXECINFO_LIBRARIES NAMES execinfo)
+		if(EXECINFO_LIBRARIES OR EXECINFO_LIBRARIES_FOUND)
+			set(EXECINFO_FOUND TRUE)
+			set(EXECINFO_LIBRARIES "-lexecinfo")
+			set(BACKTRACE_L_FLAGS "-rdynamic")
+		else()
+			set(EXECINFO_LIBRARIES "")
+			set(BACKTRACE_L_FLAGS "")
+		endif()
+	endif()
+
+	if( NOT BACKTRACE_LIBC_FOUND AND NOT UNWIND_FOUND AND NOT EXECINFO_FOUND )
+	  message( WARNING "Backtrace support not available. You can enable it by installing libexecinfo or libunwind." )
+	endif()
+else()
+	set(EXECINFO_LIBRARIES "")
+	set(BACKTRACE_L_FLAGS "")
+endif()
+
+if( ENABLE_RSVG )
 pkg_check_modules( RSVG librsvg-2.0>=2.14.0 )
+endif( ENABLE_RSVG )
+
+if( ENABLE_SN )
 pkg_check_modules( SN libstartup-notification-1.0>=0.12 )
+endif(ENABLE_SN)
 
 find_library( RT_LIBRARY rt )
 
@@ -33,7 +82,13 @@ if( NOT IMLIB_BUILD_WITH_X )
   message( FATAL_ERROR "Imlib is not built with X support" )
 endif( NOT IMLIB_BUILD_WITH_X )
 
-add_definitions( -D_GNU_SOURCE )
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  add_definitions( -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -D_DEFAULT_SOURCE )
+else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  add_definitions( -D_WITH_GETLINE )
+endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
 
 include_directories( ${PROJECT_BINARY_DIR}
                      src
@@ -44,7 +99,9 @@ include_directories( ${PROJECT_BINARY_DIR}
                      src/launcher
                      src/tooltip
                      src/util
+                     src/execplugin
                      src/freespace
+                     src/separator
                      ${X11_INCLUDE_DIRS}
                      ${PANGOCAIRO_INCLUDE_DIRS}
                      ${PANGO_INCLUDE_DIRS}
@@ -70,15 +127,36 @@ set( SOURCES src/config.c
              src/taskbar/taskbar.c
              src/taskbar/taskbarname.c
              src/tooltip/tooltip.c
+             src/execplugin/execplugin.c
              src/freespace/freespace.c
+             src/separator/separator.c
+             src/tint2rc.c
              src/util/area.c
              src/util/common.c
              src/util/strnatcmp.c
              src/util/timer.c
+             src/util/cache.c
+             src/util/color.c
+             src/util/gradient.c
              src/util/window.c )
 
 if( ENABLE_BATTERY )
-  set( SOURCES ${SOURCES} src/battery/battery.c )
+  set( SOURCES ${SOURCES} src/battery/battery.c)
+
+  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set( SOURCES ${SOURCES} src/battery/linux.c)
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "DragonFly")
+    set( SOURCES ${SOURCES} src/battery/freebsd.c)
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    set( SOURCES ${SOURCES} src/battery/freebsd.c)
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+    set( SOURCES ${SOURCES} src/battery/openbsd.c)
+  elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
+    set( SOURCES ${SOURCES} src/battery/openbsd.c)
+  else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set( SOURCES ${SOURCES} src/battery/dummy.c)
+  endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
   add_definitions( -DENABLE_BATTERY )
 endif( ENABLE_BATTERY )
 
@@ -98,6 +176,31 @@ if( ENABLE_SN )
   endif( SN_FOUND )
 endif( ENABLE_SN)
 
+if( ENABLE_UEVENT )
+  add_definitions( -DENABLE_UEVENT )
+  set( SOURCES ${SOURCES} src/util/uevent.c)
+endif( ENABLE_UEVENT )
+
+if(ENABLE_BACKTRACE)
+	if(BACKTRACE_LIBC_FOUND)
+	  add_definitions( -DENABLE_EXECINFO )
+	endif()
+
+	if( UNWIND_FOUND )
+	  add_definitions( -DENABLE_LIBUNWIND )
+	endif( UNWIND_FOUND )
+
+	if( EXECINFO_FOUND )
+	  add_definitions( -DENABLE_EXECINFO )
+	endif( EXECINFO_FOUND )
+
+	if(ENABLE_BACKTRACE_ON_SIGNAL)
+		add_definitions( -DBACKTRACE_ON_SIGNAL )
+	endif()
+else()
+	add_definitions( -DDISABLE_BACKTRACE )
+endif()
+
 if( ENABLE_TINT2CONF )
   add_definitions( -DHAVE_VERSION_H )
   add_subdirectory( src/tint2conf )
@@ -105,18 +208,13 @@ 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 ")
-  SET(ASAN_L_FLAGS " -O0 -g3 -gdwarf-2 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic ")
+  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 ")
 else()
   SET(ASAN_C_FLAGS "")
   SET(ASAN_L_FLAGS "")
 endif()
 
-set( MANDIR share/man CACHE PATH "Directory for man pages" )
-set( DATADIR share CACHE PATH "Directory for shared data" )
-set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" )
-set( DOCDIR share/doc/tint2 CACHE PATH "Directory for documentation files" )
-
 add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" "\"${PROJECT_SOURCE_DIR}\"" )
 
 link_directories( ${X11_LIBRARY_DIRS}
@@ -135,9 +233,15 @@ target_link_libraries( tint2 ${X11_LIBRARIES}
                              ${CAIRO_LIBRARIES}
                              ${GLIB2_LIBRARIES}
                              ${GOBJECT2_LIBRARIES}
-                             ${IMLIB2_LIBRARIES}
-                             ${RSVG_LIBRARIES}
-                             ${SN_LIBRARIES} )
+							 ${IMLIB2_LIBRARIES}
+							 ${UNWIND_LIBRARIES}
+							 ${EXECINFO_LIBRARIES} )
+if( ENABLE_RSVG )
+  target_link_libraries( tint2 ${RSVG_LIBRARIES} )
+endif( ENABLE_RSVG )
+if( ENABLE_SN )
+  target_link_libraries( tint2 ${SN_LIBRARIES} )
+endif( ENABLE_SN )
 if( RT_LIBRARY )
   target_link_libraries( tint2 ${RT_LIBRARY} )
 endif( RT_LIBRARY )
@@ -145,18 +249,18 @@ endif( RT_LIBRARY )
 target_link_libraries( tint2 m )
 
 add_dependencies( tint2 version )
-set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -fno-strict-aliasing -pthread ${ASAN_C_FLAGS}" )
-set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS}" )
+set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=c11 ${ASAN_C_FLAGS}" )
+set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS} ${BACKTRACE_L_FLAGS}" )
 
 install( TARGETS tint2 DESTINATION bin )
-install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
-install( FILES tint2.desktop DESTINATION ${DATADIR}/applications )
-install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
-install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
-install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
-install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
-install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
-if( ENABLE_EXAMPLES )
-  file( GLOB SAMPLEFILES sample/*.tint2rc )
-  install( FILES ${SAMPLEFILES} DESTINATION ${DATADIR}/tint2 )
-endif( ENABLE_EXAMPLES )
+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 )
+install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
+install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
+install( DIRECTORY doc/images DESTINATION ${htmldir} )
+install( FILES doc/tint2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
+if( ENABLE_EXTRA_THEMES )
+  add_subdirectory(themes)
+endif( ENABLE_EXTRA_THEMES )

CONTRIBUTING.md

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

ChangeLog

@@ -1,3 +1,183 @@
+2017-03-25 0.13.3
+- Fixes:
+  - Fixed autohide for non-bottom panels (issue #632)
+  - Translations updated (contributed by Vladimir)
+
+2017-03-19 0.13.2
+- Fixes:
+  - Fixed compilation under FreeBSD
+
+2017-03-12 0.13.1
+- Fixes:
+  - Fixed compilation with new glibc (issue #625)
+  - Fixed regression in distributing size between taskbars (issue #628)
+  - Create ~/.config dir if it does not exist (issue #629)
+- Enhancements:
+  - New config option systray_name_filter to hide hide specific apps from the system tray (contributed by Matthew Otnel)
+  - Tint2conf: minor improvements
+
+2017-03-04 0.13
+- Fixes:
+  - Ignore monitors with size 0, fixing crash (issue #618)
+  - Battery: support Asus Chromebook Flip C100PA (issue #616)
+  - Panel: do not change struts (available screen size) when shown in autohide mode (issue #619)
+  - tint2conf: executor tooltips are now correctly disabled when text config value is empty (contributed by Justin Jacobs)
+- Enhancements:
+  - Desktop files (shortcuts) used in launcher are reloaded on click, in case the file has changed
+  - New config option taskbar_hide_if_empty to hide an empty taskbar in multi_desktop mode (contributed by Benoit Averty)
+  - Gradient backgrounds (contributed by Oskari Rauta)
+  - New option: panel_shrink (fixes issue #333)
+  - Support for Path in .desktop files (contributed by Michael Messmore)
+  - Tint2conf start up is much faster
+- New plugin: separator (contributed by Oskari Rauta)
+
+2016-08-02 0.12.12
+- Fixes:
+  - Set task maximum height equal to width if not specified, instead of hardcoding 30 (issue #583; thanks @VastOne)
+  - tint2conf
+    - Process background selection events correctly (issue #582)
+	- Menus accessible with keyboard shortcuts (issue #590)
+- Enhancements:
+  - Borders can now be drawn on only some sides; configurable with the option border_sides (issue #580; thanks @stophe)
+  - Updated man page
+  - The geometry of panel items is printed to stderr if the environment variable DEBUG_GEOMETRY is set
+
+2016-05-14 0.12.11
+- Fixes:
+  - tint2conf:
+    - Fixed crash in tint2conf when adding background
+    - Add correct extension to file name in tint2conf for 'Save as'
+    - Changed main window title in tint2conf
+
+2016-05-07 0.12.10
+- Fixes:
+  - Fixed crash in systray with non-Latin languagess (thanks zcodes)
+  - Invalidate cached pixmaps on resize/move (issue #576)
+  - Battery: do not show negative durations when the sensors return garbage
+  - Proper workaround for issue #555
+
+2016-04-02 0.12.9
+- Fixes:
+  - Regression: Do not detect empty areas as clickable (issue #572)
+  - Regression: Position and resize task icon correctly (issue #575)
+  - Use imlib2 for taking screenshot; if it fails, use Xlib (issue #574)
+  - Battery: lower sample frequency when there is no support for reading current/power
+
+2016-03-25 0.12.8
+- Major changes (see details below):
+  - Icon cache and lazy icon theme loading to improve performance in tint2 and tint2conf
+  - Extra tint2rc themes are installed to /usr/share/tint2 and available in tint2conf
+  - Tint2conf GUI improvements
+- Config options with changed behavior:
+  - The launcher now also allows launcher_item_app entries without a full path.
+    In this case the .desktop file is searched in the standard application directories (issue #565).
+  - If the panel size is given as a percentage and a non-zero margin is also specified,
+    the size is now computed as a fraction of the available size (i.e. monitor size - margin).
+    Before it was computed as a fraction of the monitor size first, then the margin was subtracted from the value, which
+    was not intuitive (issue #559).
+- Fixes:
+  - Taskbar icons are now resized correctly for certain geometries (issue #560)
+  - Fix get_version.sh so that it returns the correct version when .git is missing
+  - Fix build on powerpc
+  - Temporary files are now created in /tmp
+  - The XDG paths are now used in the icon and application lookup in addition to the hardcoded defaults
+  - Brigtness adjustments no longer distort colors
+  - Fixed race in sorting systray icons by name
+  - Fixed desktop entry parsing (issue #570)
+  - tint2conf:
+    - Applications are now sorted correctly
+    - Avoid duplicate icon themes due to symlinks
+    - Avoid loading desktop files marked as NoDisplay
+- Enhancements:
+  - Launcher icon paths are now cached, which greatly improves loading time for tint2 and tint2conf.
+    The correct icon should be found even if you change the icon theme or install a new theme.
+    If this is not the case, delete the file ~/.cache/tint2/icon.cache, restart tint2 and please file a bug report
+    indicating the application name and the icon theme name.
+  - Fallback icon themes are loaded lazily to speed up tint2 and tint2conf startup
+  - A better Name and GenericName is used in the tint2 and tint2conf .desktop files
+  - tint2conf:
+    - Allows selection of themes from /usr/share
+    - Menu reorganization (thanks @Vladimir-csp for feedback)
+    - Icon themes are now sorted in the displayed list
+    - Updated ru translation (thanks @Vladimir-csp)
+
+2016-01-29 0.12.7
+- Fixes:
+  - Fix crash caused by race when reading inconsistent values for _NET_CURRENT_DESKTOP and _NET_NUMBER_OF_DESKTOPS
+  - Fix regression (all desktop tasks not working)
+  - Fix small memory leak in launcher
+
+2016-01-25 0.12.6
+- Fixes:
+  - Fix crash on 32-bit systems (issue #546)
+  - Fix compilation on Slackware (issue #547)
+  - Terminal color reset code moved to the same line to prevent interference with logging (issue #545)
+- Enhancements:
+  - Executor now sends click coordinates via environment variables (issue #544)
+
+2016-01-24 0.12.5
+- Fixes:
+  - Fix rendering corruption triggered occasionally when the compositor is disabled (regression in 0.12.4)
+
+2016-01-23 0.12.4
+- Enhancements:
+  - Support for NETWM viewports (as used by Compiz or Unity) (issue #94)
+  - The default desktop font (Gtk/FontName from XSettings) is used when a font is not specified in the config file
+  - When no fonts are specified in the config, tint2 picks up the default font of the desktop environment via XSettings
+  - Tint2 is now able to dump a stack trace to stderr and ~/.tint2-crash.log in case of a crash.
+    If the cmake flag ENABLE_BACKTRACE is set, stack traces are dumped on X11 I/O errors.
+    If the cmake flag ENABLE_BACKTRACE_ON_SIGNAL is set, stack traces are dumped also on signals such as SIGSEGV.
+    Both ENABLE_BACKTRACE and ENABLE_BACKTRACE_ON_SIGNAL are disabled by default.
+  - Pixmaps are cached instead of always redrawn between different button states when mouse effects are enabled,
+    to improve performance
+  - Tooltips are no longer very wide
+  - Default config looks nicer
+- New config options:
+  - Executor: new plugin that displays the output of a command in the panel (issue #161)
+  - New taskbar sort order options: least-recently-used (lru), most-recently-used (mru) (issue #532)
+  - Place the primary monitor before all the other monitors (primary_monitor_first, issue #538)
+  - taskbar_always_show_all_desktop_tasks (issue #279)
+- Config options with changed behavior:
+  - Mouse effects are enabled by default
+- Fixes:
+  - Battery changes visibility correctly (issue #531)
+  - Fixed rendering corruption (issue #543)
+  - Reverted the window flags back to the value in 0.11 to make sure the window manager detects that tint2 is a panel
+    (affected kwin, bspwm; fixes issue #537, breaks issue #455)
+  - Fixed a rare crash caused by the system tray code
+  - The system tray now reorders icons correctly when the icon name changes and the sorting order is configured as
+    ascending or descending (affected GTK icons, which sometimes set their name late after creating the icon)
+  - Tint2conf no longer copies sample themes to ~/.config
+- New optional dependencies:
+  - libexecinfo on the *BSDs (only if the cmake flag ENABLE_BACKTRACE is set)
+
+2015-11-12 0.12.3
+- Enhancements:
+  - Battery: Multiple batteries are now supported under Linux (issue #139;
+    thanks to Sebastian Reichel)
+  - Battery: The time left for charging/discharging the battery is now estimated
+    when the system is not able to read current data from sensors (issue #522;
+    thanks to Sebastian Reichel)
+  - Battery: Reacts to plug/unplug events (thanks to Sebastian Reichel)
+  - tint2conf: Backgrounds now have a text label showing which panel component
+    uses them, to make them easier to identify; the label is saved as a comment
+    in the config file (issue #521)
+- New config options:
+  - Mouse over effects (mouse_effects, background_color_hover, border_color_hover)
+  - Launcher icon background (launcher_icon_background_id)
+  - Enable/disable battery tooltips (battery_tooltip_enabled)
+- Fixes:
+  - Updated French translation
+  - The correct icon is now used in tint2.desktop (issue #523)
+  - The font setting for the desktop name is no longer lost on tint2 restart
+
+2015-08-11 0.12.2
+- Fixes:
+  - Systray: do not move empty icons to the side, as it breaks GTK2 StatusIcon blinking (issue #515)
+  - tint2conf: Fix read of panel_monitor (issue #520)
+  - Fix command line argument processing (issue #516)
+  - Fix battery option parsing
+
 2015-08-01 0.12.1
 - Fixes:
   - Config:
@@ -14,6 +194,7 @@
 	- Bad read of option panel_margin
 - New config options:
   - Battery mouse actions and clock middle click and wheel actions (thanks to Jeff Blake)
+
 2015-07-12 0.12
 - Note: the changes listed here are based on the previous release tint2 0.11, however some distributions (e.g. Debian)
   offered packages using newer commits and/or patches; thus from the user's perspective some of these features are
@@ -688,4 +869,4 @@ 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'.
+  while the projet is no longer in developpement, have not changed the name of 'tint'.

INSTALL.txt

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

README.md

@@ -1,38 +1,37 @@
-### New stable release: 0.12.1
-Changes: https://gitlab.com/o9000/tint2/blob/master/ChangeLog
+# Latest stable release: 0.13.3
+Changes: https://gitlab.com/o9000/tint2/blob/0.13.3/ChangeLog
 
-Documentation: https://gitlab.com/o9000/tint2/wikis/home
+Documentation: [doc/tint2.md](doc/tint2.md)
+
+Compile it with (after you install the [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 
-Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout v0.12.1
+git checkout 0.13.3
 mkdir build
 cd build
 cmake ..
 make -j4
-./tint2 &
-./src/tint2conf/tint2conf &
 ```
 
-To install from source, also run (as root):
+To install, run (as root):
+
 ```
 make install
 ```
 
-Please report any problems to https://gitlab.com/o9000/tint2/issues. Your feedback is much appreciated.
+And then you can run the panel `tint2` and the configuration program `tint2conf`.
 
-Known issues:
-* [System tray resize loop with GTK applications](https://gitlab.com/o9000/tint2/issues/509), see also the [GTK bug report](https://bugzilla.gnome.org/show_bug.cgi?id=710375). Fix landed in 0.12.1, if there are still problems please let me know.
+Please report any problems to https://gitlab.com/o9000/tint2/issues. Your feedback is much appreciated.
 
 P.S. GitLab is now the official location of the tint2 project, migrated from Google Code, which is shutting down. In case you are wondering why not GitHub, BitBucket etc., we chose GitLab because it is open source, it is mature and works well, looks cool and has a very nice team.
 
-### What is tint2?
+# What is tint2?
 
-tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm http://code.google.com/p/ttm/.
+tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm https://code.google.com/p/ttm/.
 
-### Features
+# Features
 
   * Panel with taskbar, system tray, clock and launcher icons;
   * Easy to customize: color/transparency on fonts, icons, borders and backgrounds;
@@ -40,38 +39,55 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
   * Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;
   * Customizable mouse events.
 
-### Goals
+# Goals
 
   * Be unintrusive and light (in terms of memory, CPU and aesthetic);
   * Follow the freedesktop.org specifications;
   * Make certain workflows, such as multi-desktop and multi-monitor, easy to use.
 
-### I want it!
+# I want it!
 
   * [Install tint2](https://gitlab.com/o9000/tint2/wikis/Install)
 
-### How do I ...
+# How do I ...
 
   * [Install](https://gitlab.com/o9000/tint2/wikis/Install)
-  * [Configure](https://gitlab.com/o9000/tint2/wikis/Configure)
+  * [Configure](https://gitlab.com/o9000/tint2/blob/master/doc/tint2.md)
   * [Add applet not supported by tint2](https://gitlab.com/o9000/tint2/wikis/ThirdPartyApplets)
   * [Other frequently asked questions](https://gitlab.com/o9000/tint2/wikis/FAQ)
-  * [Debug](https://gitlab.com/o9000/tint2/wikis/Debug)  
+  * [Obtain a stack trace when tint2 crashes](https://gitlab.com/o9000/tint2/wikis/Debug)
 
-### How can I help out?
+# Known issues
+
+  * Graphic glitches on Intel graphics cards can be avoided by changing the acceleration method to UXA ([issue 595](https://gitlab.com/o9000/tint2/issues/595))
+  * Window managers that do not follow exactly the EWMH specification might not interact well with tint2 (known issues for [awesome](https://gitlab.com/o9000/tint2/issues/385), [bspwm](https://gitlab.com/o9000/tint2/issues/524). [openbox-multihead](https://gitlab.com/o9000/tint2/issues/456))
+  * Full transparency requires a compositor such as Compton (if not provided already by the window manager, as in Compiz/Unity, KDE or XFCE)
+
+# How can I help out?
 
   * Report bugs and ask questions on the [issue tracker](https://gitlab.com/o9000/tint2/issues);
-  * Contribute to the development by helping us fix bugs and suggesting new features.
+  * Contribute to the development by helping us fix bugs and suggesting new features. Please read the contribution guide: [CONTRIBUTING.md](CONTRIBUTING.md)
 
-### Links
+# Links
   * Home page: https://gitlab.com/o9000/tint2
   * Git repository: https://gitlab.com/o9000/tint2.git
   * Documentation: https://gitlab.com/o9000/tint2/wikis/home
   * Downloads: https://gitlab.com/o9000/tint2-archive/tree/master or https://code.google.com/p/tint2/downloads/list
   * Old project location (inactive): https://code.google.com/p/tint2
 
-### Releases
-  * Latest stable release: tint2 0.12 (July 2015)
+# Screenshots
 
-### Screenshots
-![screenshot](https://gitlab.com/o9000/tint2/wikis/screenshot.png)
+## Default config:
+
+![Screenshot_2016-01-23_14-42-57](https://gitlab.com/o9000/tint2/uploads/948fa74eca60864352a033580350b4c3/Screenshot_2016-01-23_14-42-57.png)
+
+## Various configs:
+
+![screenshot](https://gitlab.com/o9000/tint2/wikis/screenshot.png)
+
+## Demos
+
+* [Compact panel, separator, color gradients](https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.0.gif)
+* [Executor](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.4.gif)
+* [Mouse over effects](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.3.gif)
+* [Distribute size between taskbars, freespace](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif)

README.source

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

doc/footer.html

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

doc/generate-doc.sh

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

doc/header.html

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

doc/manual.html

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

doc/readme.html

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

doc/tint2.html

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

doc/tint2.md

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

get_version.sh

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

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

packaging/make_ubuntu.sh

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

packaging/ubuntu/changelog

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

packaging/ubuntu/compat

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

packaging/ubuntu/control

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

packaging/ubuntu/copyright

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

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

packaging/ubuntu/rules

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

packaging/ubuntu/source/format

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

packaging/ubuntu/source/include-binaries

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

packaging/ubuntu/tint2.install

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

packaging/ubuntu/tint2.manpages

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

packaging/ubuntu/tint2conf.1

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

packaging/ubuntu/watch

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

packaging/ubuntu/wiki/Configure.html

@@ -0,0 +1,405 @@
+<!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

@@ -0,0 +1,217 @@
+<!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>

sample/tint2rc

@@ -1,143 +0,0 @@
-# Tint2 sample config file
-# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
-
-# Background definitions
-# Background 1: panel
-rounded = 7
-border_width = 1
-background_color = #000000 60
-border_color = #FFFFFF 16
-
-# Background 2: normal/iconified tasks
-rounded = 5
-border_width = 0
-background_color = #777777 20
-border_color = #777777 30
-
-# Background 3: active tasks
-rounded = 5
-border_width = 1
-background_color = #777777 20
-border_color = #ffffff 40
-
-# Background 4: urgent tasks
-rounded = 5
-border_width = 1
-background_color = #aa4400 100
-border_color = #aa7733 100
-
-# Background 5: tooltips
-rounded = 2
-border_width = 1
-background_color = #ffffaa 100
-border_color = #999999 100
-
-# Panel
-panel_items = LTSC
-panel_monitor = all
-panel_position = bottom center horizontal
-panel_size = 85% 30
-panel_margin = 0 0
-panel_padding = 7 0 7
-panel_dock = 0
-wm_menu = 1
-panel_layer = top
-panel_background_id = 1
-font_shadow = 0
-
-# Panel Autohide
-autohide = 0
-autohide_show_timeout = 0
-autohide_hide_timeout = 0.5
-autohide_height = 2
-strut_policy = follow_size
-
-# Launcher
-launcher_padding = 2 4 2
-launcher_background_id = 0
-launcher_icon_size = 18
-launcher_icon_asb = 100 0 0
-launcher_tooltip = 1
-startup_notifications = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
-
-# Taskbar
-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_centered = 1
-task_maximum_size = 140 35
-task_padding = 6 2
-task_background_id = 2
-task_active_background_id = 3
-task_urgent_background_id = 4
-task_iconified_background_id = 2
-task_tooltip = 1
-urgent_nb_of_blink = 100000
-
-# Task Icons
-task_icon_asb = 100 0 0
-task_active_icon_asb = 100 0 0
-task_urgent_icon_asb = 100 0 0
-task_iconified_icon_asb = 100 0 0
-
-# Fonts
-task_font = sans 8
-task_font_color = #FFFFFF 90
-task_active_font_color = #FFFFFF 90
-task_urgent_font_color = #FFFFFF 90
-task_iconified_font_color = #FFFFFF 90
-
-# Mouse
-mouse_left = toggle_iconify
-mouse_middle = none
-mouse_right = close
-mouse_scroll_up = toggle
-mouse_scroll_down = iconify
-
-# System Tray
-systray_padding = 0 4 5
-systray_sort = ascending
-systray_background_id = 0
-systray_icon_size = 22
-systray_icon_asb = 70 0 0
-
-# Clock
-time1_format = %H:%M
-time1_font = sans 8
-time2_format = %A %d %B
-time2_font = sans 7
-clock_font_color = #FFFFFF 100
-clock_padding = 1 0
-clock_background_id = 0
-clock_rclick_command = orage
-
-# Tooltips
-tooltip_padding = 2 2
-tooltip_show_timeout = 0.5
-tooltip_hide_timeout = 0.1
-tooltip_background_id = 5
-tooltip_font = sans 9
-tooltip_font_color = #222222 100
-
-# Battery
-battery_low_status = 10
-battery_low_cmd = notify-send "battery low"
-battery_hide = 101
-bat1_font = sans 8
-bat2_font = sans 6
-battery_font_color = #FFFFFF 100
-battery_padding = 1 0
-battery_background_id = 0
-
-# End of config

src/battery/battery.c

@@ -1,8 +1,8 @@
 /**************************************************************************
 *
-* Tint2 : battery
+* Tint2 : Generic battery
 *
-* Copyright (C) 2009 Sebastian Reichel <elektranox@gmail.com>
+* Copyright (C) 2009-2015 Sebastian Reichel <sre@ring0.de>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -24,18 +24,6 @@
 #include <cairo-xlib.h>
 #include <pango/pangocairo.h>
 
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-#include <machine/apmvar.h>
-#include <err.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#endif
-
-#if defined(__FreeBSD__)
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#endif
-
 #include "window.h"
 #include "server.h"
 #include "panel.h"
@@ -43,126 +31,63 @@
 #include "timer.h"
 #include "common.h"
 
+gboolean bat1_has_font;
 PangoFontDescription *bat1_font_desc;
+gboolean bat2_has_font;
 PangoFontDescription *bat2_font_desc;
-struct batstate battery_state;
-int battery_enabled;
+struct BatteryState battery_state;
+gboolean battery_enabled;
+gboolean battery_tooltip_enabled;
 int percentage_hide;
-static timeout* battery_timeout;
+static timeout *battery_timeout;
 
 static char buf_bat_percentage[10];
 static char buf_bat_time[20];
 
 int8_t battery_low_status;
-unsigned char battery_low_cmd_sent;
+gboolean battery_low_cmd_sent;
+char *ac_connected_cmd;
+char *ac_disconnected_cmd;
 char *battery_low_cmd;
 char *battery_lclick_command;
 char *battery_mclick_command;
 char *battery_rclick_command;
 char *battery_uwheel_command;
 char *battery_dwheel_command;
-gchar *path_energy_now;
-gchar *path_energy_full;
-gchar *path_current_now;
-gchar *path_status;
-int battery_found;
+gboolean battery_found;
 
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-int apm_fd;
-#endif
+char *battery_sys_prefix = (char*)"";
 
-void update_battery_tick(void* arg)
-{
-	if (!battery_enabled)
-		return;
-
-	int old_found = battery_found;
-	int old_percentage = battery_state.percentage;
-	int16_t old_hours = battery_state.time.hours;
-	int8_t old_minutes = battery_state.time.minutes;
-	
-	if (!battery_found) {
-		init_battery();
-	}
-	if (update_battery() != 0) {
-		// Reconfigure
-		init_battery();
-		// Try again
-		update_battery();
-	}
-	if (old_found == battery_found &&
-		old_percentage == battery_state.percentage &&
-		old_hours == battery_state.time.hours &&
-		old_minutes == battery_state.time.minutes) {
-		return;
-	}
-
-	if (battery_state.percentage < battery_low_status &&
-		battery_state.state == BATTERY_DISCHARGING &&
-		!battery_low_cmd_sent) {
-		tint_exec(battery_low_cmd);
-		battery_low_cmd_sent = 1;
-	}
-	if (battery_state.percentage > battery_low_status &&
-		battery_state.state == BATTERY_CHARGING &&
-		battery_low_cmd_sent) {
-		battery_low_cmd_sent = 0;
-	}
-
-	int i;
-	for (i = 0; i < nb_panel; i++) {
-		if (!battery_found) {
-			if (panel1[i].battery.area.on_screen == 1) {
-				hide(&panel1[i].battery.area);
-				panel_refresh = 1;
-			}
-		} else {
-			if (battery_state.percentage >= percentage_hide) {
-				if (panel1[i].battery.area.on_screen == 1) {
-					hide(&panel1[i].battery.area);
-					panel_refresh = 1;
-				}
-			} else {
-				if (panel1[i].battery.area.on_screen == 0) {
-					show(&panel1[i].battery.area);
-					panel_refresh = 1;
-				}
-			}
-		}
-		if (panel1[i].battery.area.on_screen == 1) {
-			panel1[i].battery.area.resize = 1;
-			panel_refresh = 1;
-		}
-	}
-}
+void battery_init_fonts();
+char *battery_get_tooltip(void *obj);
+int battery_compute_desired_size(void *obj);
+void battery_dump_geometry(void *obj, int indent);
 
 void default_battery()
 {
-	battery_enabled = 0;
-	battery_found = 0;
+	battery_enabled = FALSE;
+	battery_tooltip_enabled = TRUE;
+	battery_found = FALSE;
 	percentage_hide = 101;
-	battery_low_cmd_sent = 0;
+	battery_low_cmd_sent = FALSE;
 	battery_timeout = NULL;
+	bat1_has_font = FALSE;
 	bat1_font_desc = NULL;
+	bat2_has_font = FALSE;
 	bat2_font_desc = NULL;
+	ac_connected_cmd = NULL;
+	ac_disconnected_cmd = NULL;
 	battery_low_cmd = NULL;
 	battery_lclick_command = NULL;
 	battery_mclick_command = NULL;
 	battery_rclick_command = NULL;
 	battery_uwheel_command = NULL;
 	battery_dwheel_command = NULL;
-	path_energy_now = NULL;
-	path_energy_full = NULL;
-	path_current_now = NULL;
-	path_status = NULL;
 	battery_state.percentage = 0;
 	battery_state.time.hours = 0;
 	battery_state.time.minutes = 0;
 	battery_state.time.seconds = 0;
 	battery_state.state = BATTERY_UNKNOWN;
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-	apm_fd = -1;
-#endif
 }
 
 void cleanup_battery()
@@ -171,14 +96,6 @@ void cleanup_battery()
 	bat1_font_desc = NULL;
 	pango_font_description_free(bat2_font_desc);
 	bat2_font_desc = NULL;
-	g_free(path_energy_now);
-	path_energy_now = NULL;
-	g_free(path_energy_full);
-	path_energy_full = NULL;
-	g_free(path_current_now);
-	path_current_now = NULL;
-	g_free(path_status);
-	path_status = NULL;
 	free(battery_low_cmd);
 	battery_low_cmd = NULL;
 	free(battery_lclick_command);
@@ -191,390 +108,267 @@ void cleanup_battery()
 	battery_uwheel_command = NULL;
 	free(battery_dwheel_command);
 	battery_dwheel_command = NULL;
+	free(ac_connected_cmd);
+	ac_connected_cmd = NULL;
+	free(ac_disconnected_cmd);
+	ac_disconnected_cmd = NULL;
 	stop_timeout(battery_timeout);
 	battery_timeout = NULL;
-	battery_found = 0;
+	battery_found = FALSE;
 
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-	if ((apm_fd != -1) && (close(apm_fd) == -1))
-		warn("cannot close /dev/apm");
-	apm_fd = -1;
-#endif
+	battery_os_free();
 }
 
 void init_battery()
 {
 	if (!battery_enabled)
 		return;
-	battery_found = 0;
 
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-	if (apm_fd > 0)
-		close(apm_fd);
-	apm_fd = open("/dev/apm", O_RDONLY);
-	if (apm_fd < 0) {
-		warn("ERROR: battery applet cannot open /dev/apm.");
-		battery_found = 0;
-	} else {
-		battery_found = 1;
-	}
-#elif defined(__FreeBSD__)
-	int sysctl_out = 0;
-	size_t len = sizeof(sysctl_out);
-	battery_found = (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) ||
-					(sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0) ||
-					(sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
-#else // Linux
-	GDir *directory = 0;
-	GError *error = NULL;
-	const char *entryname;
-	gchar *battery_dir = 0;
-
-	directory = g_dir_open("/sys/class/power_supply", 0, &error);
-	if (error) {
-		g_error_free(error);
-	} else {
-		while ((entryname = g_dir_read_name(directory))) {
-			if (strncmp(entryname, "AC", 2) == 0)
-				continue;
-
-			gchar *path1 = g_build_filename("/sys/class/power_supply", entryname, "present", NULL);
-			if (g_file_test(path1, G_FILE_TEST_EXISTS)) {
-				g_free(path1);
-				battery_dir = g_build_filename("/sys/class/power_supply", entryname, NULL);
-				break;
-			}
-			g_free(path1);
-		}
-	}
-	if (directory)
-		g_dir_close(directory);
-	if (!battery_dir) {
-		fprintf(stderr, "ERROR: battery applet cannot find any battery\n");
-		battery_found = 0;
-	} else {
-		battery_found = 1;
-
-		g_free(path_energy_now);
-		path_energy_now = g_build_filename(battery_dir, "energy_now", NULL);
-		if (!g_file_test(path_energy_now, G_FILE_TEST_EXISTS)) {
-			g_free(path_energy_now);
-			path_energy_now = g_build_filename(battery_dir, "charge_now", NULL);
-		}
-		if (!g_file_test(path_energy_now, G_FILE_TEST_EXISTS)) {
-			fprintf(stderr, "ERROR: battery applet cannot find energy_now nor charge_now\n");
-			g_free(path_energy_now);
-			path_energy_now = NULL;
-		}
-
-		g_free(path_energy_full);
-		path_energy_full = g_build_filename(battery_dir, "energy_full", NULL);
-		if (!g_file_test(path_energy_full, G_FILE_TEST_EXISTS)) {
-			g_free(path_energy_full);
-			path_energy_full = g_build_filename(battery_dir, "charge_full", NULL);
-		}
-		if (!g_file_test(path_energy_full, G_FILE_TEST_EXISTS)) {
-			fprintf(stderr, "ERROR: battery applet cannot find energy_now nor charge_now\n");
-			g_free(path_energy_full);
-			path_energy_full = NULL;
-		}
-
-		g_free(path_current_now);
-		path_current_now = g_build_filename(battery_dir, "power_now", NULL);
-		if (!g_file_test(path_current_now, G_FILE_TEST_EXISTS)) {
-			g_free(path_current_now);
-			path_current_now = g_build_filename(battery_dir, "current_now", NULL);
-		}
-		if (!g_file_test(path_current_now, G_FILE_TEST_EXISTS)) {
-			fprintf(stderr, "ERROR: battery applet cannot find power_now nor current_now\n");
-			g_free(path_current_now);
-			path_current_now = NULL;
-		}
-
-		g_free(path_status);
-		path_status = g_build_filename(battery_dir, "status", NULL);
-		if (!g_file_test(path_status, G_FILE_TEST_EXISTS)) {
-			fprintf(stderr, "ERROR: battery applet cannot find battery status\n");
-			g_free(path_status);
-			path_status = NULL;
-		}
-
-		g_free(battery_dir);
-		battery_dir = NULL;
-	}
-
-	if (!path_status) {
-		battery_found = 0;
-		fprintf(stderr, "ERROR: battery applet cannot find any batteries\n");
-	}
-#endif
+	battery_found = battery_os_init();
 
 	if (!battery_timeout)
 		battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
+
+	update_battery();
 }
 
+void reinit_battery()
+{
+	battery_os_free();
+	battery_found = battery_os_init();
+	update_battery();
+}
 
 void init_battery_panel(void *p)
 {
-	Panel *panel = (Panel*)p;
+	Panel *panel = (Panel *)p;
 	Battery *battery = &panel->battery;
 
 	if (!battery_enabled)
 		return;
 
-	if (!bat1_font_desc)
-		bat1_font_desc = pango_font_description_from_string(DEFAULT_FONT);
-	if (!bat2_font_desc)
-		bat2_font_desc = pango_font_description_from_string(DEFAULT_FONT);
+	battery_init_fonts();
 
-	if (battery->area.bg == 0)
+	if (!battery->area.bg)
 		battery->area.bg = &g_array_index(backgrounds, Background, 0);
 
 	battery->area.parent = p;
 	battery->area.panel = p;
+	snprintf(battery->area.name, sizeof(battery->area.name), "Battery");
 	battery->area._draw_foreground = draw_battery;
-	battery->area.size_mode = SIZE_BY_CONTENT;
+	battery->area.size_mode = LAYOUT_FIXED;
 	battery->area._resize = resize_battery;
-	battery->area.on_screen = 1;
-	battery->area.resize = 1;
+	battery->area._compute_desired_size = battery_compute_desired_size;
+	battery->area._is_under_mouse = full_width_area_is_under_mouse;
+	battery->area.on_screen = TRUE;
+	battery->area.resize_needed = 1;
+	battery->area.has_mouse_over_effect =
+	    panel_config.mouse_effects && (battery_lclick_command || battery_mclick_command || battery_rclick_command ||
+	                                   battery_uwheel_command || battery_dwheel_command);
+	battery->area.has_mouse_press_effect = battery->area.has_mouse_over_effect;
+	if (battery_tooltip_enabled)
+		battery->area._get_tooltip_text = battery_get_tooltip;
+	instantiate_area_gradients(&battery->area);
 }
 
+void battery_init_fonts()
+{
+	if (!bat1_font_desc) {
+		bat1_font_desc = pango_font_description_from_string(get_default_font());
+		pango_font_description_set_size(bat1_font_desc, pango_font_description_get_size(bat1_font_desc) - PANGO_SCALE);
+	}
+	if (!bat2_font_desc) {
+		bat2_font_desc = pango_font_description_from_string(get_default_font());
+		pango_font_description_set_size(bat2_font_desc, pango_font_description_get_size(bat2_font_desc) - PANGO_SCALE);
+	}
+}
 
-int update_battery() {
-	int64_t energy_now = 0,
-			energy_full = 0;
-	int seconds = 0;
-	int8_t new_percentage = 0;
-	int errors = 0;
+void battery_default_font_changed()
+{
+	if (!battery_enabled)
+		return;
+	if (bat1_has_font && bat2_has_font)
+		return;
+	if (!bat1_has_font) {
+		pango_font_description_free(bat1_font_desc);
+		bat1_font_desc = NULL;
+	}
+	if (!bat2_has_font) {
+		pango_font_description_free(bat2_font_desc);
+		bat2_font_desc = NULL;
+	}
+	battery_init_fonts();
+	for (int i = 0; i < num_panels; i++) {
+		panels[i].battery.area.resize_needed = TRUE;
+		schedule_redraw(&panels[i].battery.area);
+	}
+	schedule_panel_redraw();
+}
 
-	battery_state.state = BATTERY_UNKNOWN;
+void update_battery_tick(void *arg)
+{
+	if (!battery_enabled)
+		return;
 
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-	struct apm_power_info info;
-	if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
-		// best attempt at mapping to Linux battery states
-		switch (info.battery_state) {
-		case APM_BATT_CHARGING:
-			battery_state.state = BATTERY_CHARGING;
-			break;
-		default:
-			battery_state.state = BATTERY_DISCHARGING;
-			break;
-		}
+	gboolean old_found = battery_found;
+	int old_percentage = battery_state.percentage;
+	gboolean old_ac_connected = battery_state.ac_connected;
+	int16_t old_hours = battery_state.time.hours;
+	int8_t old_minutes = battery_state.time.minutes;
 
-		if (info.battery_life == 100)
-			battery_state.state = BATTERY_FULL;
+	if (!battery_found) {
+		init_battery();
+		old_ac_connected = battery_state.ac_connected;
+	}
+	if (update_battery() != 0) {
+		// Try to reconfigure on failed update
+		init_battery();
+	}
 
-		// no mapping for openbsd really
-		energy_full = 0;
-		energy_now = 0;
-
-		if (info.minutes_left != -1)
-			seconds = info.minutes_left * 60;
+	if (old_ac_connected != battery_state.ac_connected) {
+		if (battery_state.ac_connected)
+			tint_exec(ac_connected_cmd);
 		else
-			seconds = -1;
-
-		new_percentage = info.battery_life;
-	} else {
-		warn("power update: APM_IOC_GETPOWER");
-		errors = 1;
+			tint_exec(ac_disconnected_cmd);
 	}
-#elif defined(__FreeBSD__)
-	int sysctl_out = 0;
-	size_t len = sizeof(sysctl_out);
 
-	if (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) {
-		// attemp to map the battery state to Linux
-		battery_state.state = BATTERY_UNKNOWN;
-		switch(sysctl_out) {
-		case 1:
-			battery_state.state = BATTERY_DISCHARGING;
-			break;
-		case 2:
-			battery_state.state = BATTERY_CHARGING;
-			break;
-		default:
-			battery_state.state = BATTERY_FULL;
-			break;
+	if (battery_state.percentage < battery_low_status && battery_state.state == BATTERY_DISCHARGING &&
+	    !battery_low_cmd_sent) {
+		tint_exec(battery_low_cmd);
+		battery_low_cmd_sent = TRUE;
+	}
+	if (battery_state.percentage > battery_low_status && battery_state.state == BATTERY_CHARGING &&
+	    battery_low_cmd_sent) {
+		battery_low_cmd_sent = FALSE;
+	}
+
+	for (int i = 0; i < num_panels; i++) {
+		// Show/hide if needed
+		if (!battery_found) {
+			hide(&panels[i].battery.area);
+		} else {
+			if (battery_state.percentage >= percentage_hide)
+				hide(&panels[i].battery.area);
+			else
+				show(&panels[i].battery.area);
 		}
-	} else {
-		fprintf(stderr, "power update: no such sysctl");
-		errors = 1;
-	}
-
-	// no mapping for freebsd
-	energy_full = 0;
-	energy_now = 0;
-
-	if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) != 0)
-		seconds = -1;
-	else
-		seconds = sysctl_out * 60;
-
-	// charging or error
-	if (seconds < 0)
-		seconds = 0;
-
-	if (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) != 0)
-		new_percentage = -1;
-	else
-		new_percentage = sysctl_out;
-#else
-	FILE *fp = NULL;
-	char tmp[25] = "";
-	int64_t current_now = 0;
-	if (path_status) {
-		fp = fopen(path_status, "r");
-		if (fp != NULL) {
-			if (fgets(tmp, sizeof(tmp), fp)) {
-				if (strcasecmp(tmp, "Charging\n") == 0)
-					battery_state.state = BATTERY_CHARGING;
-				if (strcasecmp(tmp, "Discharging\n") == 0)
-					battery_state.state = BATTERY_DISCHARGING;
-				if (strcasecmp(tmp, "Full\n") == 0)
-					battery_state.state = BATTERY_FULL;
+		// Redraw if needed
+		if (panels[i].battery.area.on_screen) {
+			if (old_found != battery_found || old_percentage != battery_state.percentage ||
+			    old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) {
+				panels[i].battery.area.resize_needed = TRUE;
+				schedule_panel_redraw();
 			}
-			fclose(fp);
-		} else {
-			errors = 1;
 		}
-	} else {
-		errors = 1;
 	}
+}
 
-	if (path_energy_now) {
-		fp = fopen(path_energy_now, "r");
-		if (fp != NULL) {
-			if (fgets(tmp, sizeof tmp, fp))
-				energy_now = atoi(tmp);
-			fclose(fp);
-		} else {
-			errors = 1;
-		}
-	} else {
-		errors = 1;
-	}
+int update_battery()
+{
+	// Reset
+	battery_state.state = BATTERY_UNKNOWN;
+	battery_state.percentage = 0;
+	battery_state.ac_connected = FALSE;
+	battery_state_set_time(&battery_state, 0);
 
-	if (path_energy_full) {
-		fp = fopen(path_energy_full, "r");
-		if (fp != NULL) {
-			if (fgets(tmp, sizeof tmp, fp))
-				energy_full = atoi(tmp);
-			fclose(fp);
-		} else {
-			errors = 1;
-		}
-	} else {
-		errors = 1;
-	}
+	int err = battery_os_update(&battery_state);
 
-	if (path_current_now) {
-		fp = fopen(path_current_now, "r");
-		if (fp != NULL) {
-			if (fgets(tmp, sizeof tmp, fp))
-				current_now = atoi(tmp);
-			fclose(fp);
-		} else {
-			errors = 1;
-		}
-	} else {
-		errors = 1;
-	}
-
-	if (current_now > 0) {
-		switch (battery_state.state) {
-		case BATTERY_CHARGING:
-			seconds = 3600 * (energy_full - energy_now) / current_now;
-			break;
-		case BATTERY_DISCHARGING:
-			seconds = 3600 * energy_now / current_now;
-			break;
-		default:
-			seconds = 0;
-			break;
-		}
-	} else {
-		seconds = 0;
-	}
-#endif
-
-	battery_state.time.hours = seconds / 3600;
-	seconds -= 3600 * battery_state.time.hours;
-	battery_state.time.minutes = seconds / 60;
-	seconds -= 60 * battery_state.time.minutes;
-	battery_state.time.seconds = seconds;
-
-	if (energy_full > 0)
-		new_percentage = 0.5 + ((energy_now <= energy_full ? energy_now : energy_full) * 100.0) / energy_full;
-
-	battery_state.percentage = new_percentage;
-
-	// clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
+	// Clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
 	if (battery_state.percentage > 100) {
 		battery_state.percentage = 100;
 	}
 
-	return errors;
+	return err;
 }
 
-
-void draw_battery (void *obj, cairo_t *c)
+int battery_compute_desired_size(void *obj)
 {
-	Battery *battery = obj;
-	PangoLayout *layout;
-
-	layout = pango_cairo_create_layout (c);
-
-	// draw layout
-	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_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
-
-	cairo_set_source_rgba(c, battery->font.color[0], battery->font.color[1], battery->font.color[2], battery->font.alpha);
-
-	pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, battery->bat1_posy, &battery->font, ((Panel*)battery->area.panel)->font_shadow);
-
-	pango_layout_set_font_description(layout, bat2_font_desc);
-	pango_layout_set_indent(layout, 0);
-	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, ((Panel*)battery->area.panel)->font_shadow);
-	pango_cairo_show_layout(c, layout);
-
-	g_object_unref(layout);
-}
-
-
-int resize_battery(void *obj)
-{
-	Battery *battery = obj;
-	Panel *panel = battery->area.panel;
+	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;
 
-	battery->area.redraw = 1;
-	
 	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));
-	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));
+	get_text_size2(bat1_font_desc,
+				   &bat_percentage_height_ink,
+				   &bat_percentage_height,
+				   &bat_percentage_width,
+				   panel->area.height,
+				   panel->area.width,
+				   buf_bat_percentage,
+				   strlen(buf_bat_percentage),
+				   PANGO_WRAP_WORD_CHAR,
+				   PANGO_ELLIPSIZE_NONE,
+				   FALSE);
+	get_text_size2(bat2_font_desc,
+				   &bat_time_height_ink,
+				   &bat_time_height,
+				   &bat_time_width,
+				   panel->area.height,
+				   panel->area.width,
+				   buf_bat_time,
+				   strlen(buf_bat_time),
+				   PANGO_WRAP_WORD_CHAR,
+				   PANGO_ELLIPSIZE_NONE,
+				   FALSE);
 
 	if (panel_horizontal) {
 		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
-		new_size += 2 * battery->area.paddingxlr + 2 * battery->area.bg->border.width;
-		if (new_size > battery->area.width ||
-			new_size < battery->area.width - 2) {
+		new_size += 2 * battery->area.paddingxlr + left_right_border_width(&battery->area);
+		return new_size;
+	} else {
+		int new_size = bat_percentage_height + bat_time_height + 2 * battery->area.paddingxlr +
+					   top_bottom_border_width(&battery->area);
+		return new_size;
+	}
+}
+
+gboolean resize_battery(void *obj)
+{
+	Battery *battery = (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;
@@ -582,38 +376,96 @@ int resize_battery(void *obj)
 			ret = 1;
 		}
 	} else {
-		int new_size = bat_percentage_height + bat_time_height +
-					   (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
-		if (new_size > battery->area.height ||
-			new_size < battery->area.height - 2) {
-			battery->area.height =  new_size;
+		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;
 }
 
+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);
+}
+
+void battery_dump_geometry(void *obj, int indent)
+{
+	Battery *battery = obj;
+	fprintf(stderr,
+			"%*sText 1: y = %d, text = %s\n",
+			indent,
+			"",
+			battery->bat1_posy,
+			buf_bat_percentage);
+	fprintf(stderr,
+		"%*sText 2: y = %d, text = %s\n",
+		indent,
+		"",
+		battery->bat2_posy,
+		buf_bat_time);
+}
+
+char *battery_get_tooltip(void *obj)
+{
+	return battery_os_tooltip();
+}
+
 void battery_action(int button)
 {
-	char *command = 0;
+	char *command = NULL;
 	switch (button) {
-		case 1:
+	case 1:
 		command = battery_lclick_command;
 		break;
-		case 2:
+	case 2:
 		command = battery_mclick_command;
 		break;
-		case 3:
+	case 3:
 		command = battery_rclick_command;
 		break;
-		case 4:
+	case 4:
 		command = battery_uwheel_command;
 		break;
-		case 5:
+	case 5:
 		command = battery_dwheel_command;
 		break;
 	}
 	tint_exec(command);
-}
+}

src/battery/battery.h

@@ -1,9 +1,8 @@
 /**************************************************************************
-* Copyright (C) 2009 Sebastian Reichel <elektranox@gmail.com>
+* Copyright (C) 2009-2015 Sebastian Reichel <sre@ring0.de>
 *
 * Battery with functional data (percentage, time to life) and drawing data
 * (area, font, ...). Each panel use his own drawing data.
-* Need kernel > 2.6.23.
 *
 **************************************************************************/
 
@@ -17,66 +16,104 @@
 #include "common.h"
 #include "area.h"
 
-
-// battery drawing parameter (per panel)
 typedef struct Battery {
-	// always start with area
 	Area area;
-
-	Color font;
+	Color font_color;
 	int bat1_posy;
 	int bat2_posy;
 } Battery;
 
-enum chargestate {
-	BATTERY_UNKNOWN,
+typedef enum ChargeState {
+	BATTERY_UNKNOWN = 0,
 	BATTERY_CHARGING,
 	BATTERY_DISCHARGING,
-	BATTERY_FULL
-};
+	BATTERY_FULL,
+} ChargeState;
 
-typedef struct battime {
+typedef struct BatteryTime {
 	int16_t hours;
 	int8_t minutes;
 	int8_t seconds;
-} battime;
+} BatteryTime;
 
-typedef struct batstate {
+typedef struct BatteryState {
 	int percentage;
-	struct battime time;
-	enum chargestate state;
-} batstate;
+	BatteryTime time;
+	ChargeState state;
+	gboolean ac_connected;
+} BatteryState;
 
-extern struct batstate battery_state;
+extern struct BatteryState battery_state;
+extern gboolean bat1_has_font;
 extern PangoFontDescription *bat1_font_desc;
+extern gboolean bat2_has_font;
 extern PangoFontDescription *bat2_font_desc;
-extern int battery_enabled;
+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 *ac_connected_cmd;
+extern char *ac_disconnected_cmd;
+
 extern char *battery_lclick_command;
 extern char *battery_mclick_command;
 extern char *battery_rclick_command;
 extern char *battery_uwheel_command;
 extern char *battery_dwheel_command;
 
+extern char *battery_sys_prefix;
+
+static inline gchar *chargestate2str(ChargeState state)
+{
+	switch (state) {
+	case BATTERY_CHARGING:
+		return "Charging";
+	case BATTERY_DISCHARGING:
+		return "Discharging";
+	case BATTERY_FULL:
+		return "Full";
+	case BATTERY_UNKNOWN:
+	default:
+		return "Unknown";
+	};
+}
+
+static inline void battery_state_set_time(BatteryState *state, int seconds)
+{
+	state->time.hours = seconds / 3600;
+	seconds -= 3600 * state->time.hours;
+	state->time.minutes = seconds / 60;
+	seconds -= 60 * state->time.minutes;
+	state->time.seconds = seconds;
+}
+
 // default global data
 void default_battery();
 
 // freed memory
 void cleanup_battery();
 
+void update_battery_tick(void *arg);
 int update_battery();
 
 void init_battery();
 void init_battery_panel(void *panel);
 
+void reinit_battery();
 void draw_battery(void *obj, cairo_t *c);
+void battery_default_font_changed();
 
-int  resize_battery(void *obj);
+gboolean resize_battery(void *obj);
 
 void battery_action(int button);
 
+/* operating system specific functions */
+gboolean battery_os_init();
+void battery_os_free();
+int battery_os_update(BatteryState *state);
+char *battery_os_tooltip();
+
 #endif

src/battery/dummy.c

@@ -0,0 +1,44 @@
+/**************************************************************************
+*
+* Tint2 : Dummy battery (non-functional)
+*
+* Copyright (C) 2015 Sebastian Reichel <sre@ring0.de>
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License version 2
+* or any later version 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 <string.h>
+#include "common.h"
+#include "battery.h"
+
+#warning tint2 has no battery support for this operating system!
+
+gboolean battery_os_init()
+{
+	return FALSE;
+}
+
+void battery_os_free()
+{
+	return;
+}
+
+int battery_os_update(BatteryState *state)
+{
+	return -1;
+}
+
+char *battery_os_tooltip()
+{
+	return strdup("Operating System not supported");
+}

src/battery/freebsd.c

@@ -0,0 +1,102 @@
+/**************************************************************************
+*
+* Tint2 : FreeBSD battery
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License version 2
+* or any later version 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.
+**************************************************************************/
+
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <string.h>
+
+#include "common.h"
+#include "battery.h"
+
+gboolean battery_os_init()
+{
+	int sysctl_out = 0;
+	size_t len = sizeof(sysctl_out);
+
+	return (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) ||
+		   (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0) ||
+		   (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
+}
+
+void battery_os_free()
+{
+	return;
+}
+
+int battery_os_update(BatteryState *state)
+{
+	int sysctl_out = 0;
+	size_t len = sizeof(sysctl_out);
+	gboolean err = 0;
+
+	if (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) {
+		switch (sysctl_out) {
+		case 1:
+			state->state = BATTERY_DISCHARGING;
+			break;
+		case 2:
+			state->state = BATTERY_CHARGING;
+			break;
+		default:
+			state->state = BATTERY_FULL;
+			break;
+		}
+	} else {
+		fprintf(stderr, "power update: no such sysctl");
+		err = -1;
+	}
+
+	if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0)
+		battery_state_set_time(state, sysctl_out * 60);
+	else
+		err = -1;
+
+	if (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0)
+		state->percentage = sysctl_out;
+	else
+		err = -1;
+
+	if (sysctlbyname("hw.acpi.acline", &sysctl_out, &len, NULL, 0) == 0)
+		state->ac_connected = sysctl_out;
+
+	return err;
+}
+
+char *battery_os_tooltip()
+{
+	GString *tooltip = g_string_new("");
+	gchar *result;
+
+	g_string_append_printf(tooltip, "Battery\n");
+
+	gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
+
+	g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
+
+	g_string_append_c(tooltip, '\n');
+	g_string_append_printf(tooltip, "AC\n");
+	g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
+
+	result = tooltip->str;
+	g_string_free(tooltip, FALSE);
+
+	return result;
+}
+
+#endif

src/battery/linux.c

@@ -0,0 +1,538 @@
+/**************************************************************************
+*
+* Tint2 : Linux battery
+*
+* Copyright (C) 2015 Sebastian Reichel <sre@ring0.de>
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License version 2
+* or any later version 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.
+**************************************************************************/
+
+#ifdef __linux__
+
+#include <stdlib.h>
+
+#include "common.h"
+#include "battery.h"
+#include "uevent.h"
+
+enum psy_type {
+	PSY_UNKNOWN,
+	PSY_BATTERY,
+	PSY_MAINS,
+};
+
+struct psy_battery {
+	/* generic properties */
+	gchar *name;
+	/* monotonic time, in microseconds */
+	gint64 timestamp;
+	/* sysfs files */
+	gchar *path_present;
+	gchar *path_level_now;
+	gchar *path_level_full;
+	gchar *path_rate_now;
+	gchar *path_status;
+	/* values */
+	gboolean present;
+	gint level_now;
+	gint level_full;
+	gint rate_now;
+	gchar unit;
+	ChargeState status;
+};
+
+struct psy_mains {
+	/* generic properties */
+	gchar *name;
+	/* sysfs files */
+	gchar *path_online;
+	/* values */
+	gboolean online;
+};
+
+static void uevent_battery_update()
+{
+	update_battery_tick(NULL);
+}
+static struct uevent_notify psy_change = {UEVENT_CHANGE, "power_supply", NULL, uevent_battery_update};
+
+static void uevent_battery_plug()
+{
+	printf("reinitialize batteries after HW change\n");
+	reinit_battery();
+}
+static struct uevent_notify psy_plug = {UEVENT_ADD | UEVENT_REMOVE, "power_supply", NULL, uevent_battery_plug};
+
+#define RETURN_ON_ERROR(err) \
+	if (err) {             \
+		g_error_free(err);   \
+		fprintf(stderr, RED "%s:%d: errror" RESET "\n", __FILE__, __LINE__); \
+		return FALSE;        \
+	}
+
+static GList *batteries = NULL;
+static GList *mains = NULL;
+
+static guint8 level_to_percent(gint level_now, gint level_full)
+{
+	return 0.5 + ((level_now <= level_full ? level_now : level_full) * 100.0) / level_full;
+}
+
+static enum psy_type power_supply_get_type(const gchar *entryname)
+{
+	gchar *path_type = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "type", NULL);
+	GError *error = NULL;
+	gchar *type;
+	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__);
+		g_error_free(error);
+		return PSY_UNKNOWN;
+	}
+
+	if (!g_strcmp0(type, "Battery\n")) {
+		g_free(type);
+		return PSY_BATTERY;
+	}
+
+	if (!g_strcmp0(type, "Mains\n")) {
+		g_free(type);
+		return PSY_MAINS;
+	}
+
+	g_free(type);
+
+	return PSY_UNKNOWN;
+}
+
+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__);
+		goto err0;
+	}
+
+	bat->path_level_now = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_now", NULL);
+	bat->path_level_full =
+		g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_full", NULL);
+	bat->path_rate_now = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "power_now", NULL);
+	bat->unit = 'W';
+
+	if (!g_file_test(bat->path_level_now, G_FILE_TEST_EXISTS) ||
+	    !g_file_test(bat->path_level_full, G_FILE_TEST_EXISTS) ||
+	    !g_file_test(bat->path_rate_now, G_FILE_TEST_EXISTS)) {
+		g_free(bat->path_level_now);
+		g_free(bat->path_level_full);
+		g_free(bat->path_rate_now);
+		bat->path_level_now =
+			g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "charge_now", NULL);
+		bat->path_level_full =
+			g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "charge_full", NULL);
+		bat->path_rate_now =
+			g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "current_now", NULL);
+		bat->unit = 'A';
+	}
+	if (!g_file_test(bat->path_level_now, G_FILE_TEST_EXISTS) ||
+	    !g_file_test(bat->path_level_full, G_FILE_TEST_EXISTS) ||
+	    !g_file_test(bat->path_rate_now, G_FILE_TEST_EXISTS)) {
+		fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+		goto err1;
+	}
+
+	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__);
+		goto err2;
+	}
+
+	return TRUE;
+
+err2:
+	g_free(bat->path_status);
+err1:
+	g_free(bat->path_level_now);
+	g_free(bat->path_level_full);
+	g_free(bat->path_rate_now);
+err0:
+	g_free(bat->path_present);
+
+	return FALSE;
+}
+
+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__);
+		g_free(ac->path_online);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static void psy_battery_free(gpointer data)
+{
+	struct psy_battery *bat = data;
+	g_free(bat->name);
+	g_free(bat->path_status);
+	g_free(bat->path_rate_now);
+	g_free(bat->path_level_full);
+	g_free(bat->path_level_now);
+	g_free(bat->path_present);
+	g_free(bat);
+}
+
+static void psy_mains_free(gpointer data)
+{
+	struct psy_mains *ac = data;
+	g_free(ac->name);
+	g_free(ac->path_online);
+	g_free(ac);
+}
+
+void battery_os_free()
+{
+	uevent_unregister_notifier(&psy_change);
+	uevent_unregister_notifier(&psy_plug);
+
+	g_list_free_full(batteries, psy_battery_free);
+	batteries = NULL;
+	g_list_free_full(mains, psy_mains_free);
+	mains = NULL;
+}
+
+static void add_battery(const char *entryname)
+{
+	struct psy_battery *bat = g_malloc0(sizeof(*bat));
+	bat->name = g_strdup(entryname);
+
+	if (init_linux_battery(bat)) {
+		batteries = g_list_append(batteries, bat);
+		fprintf(stdout, GREEN "Found battery \"%s\"" RESET "\n", bat->name);
+	} else {
+		g_free(bat);
+		fprintf(stderr, RED "Failed to initialize battery \"%s\"" RESET "\n", entryname);
+	}
+}
+
+static void add_mains(const char *entryname)
+{
+	struct psy_mains *ac = g_malloc0(sizeof(*ac));
+	ac->name = g_strdup(entryname);
+
+	if (init_linux_mains(ac)) {
+		mains = g_list_append(mains, ac);
+		fprintf(stdout, GREEN "Found mains \"%s\"" RESET "\n", ac->name);
+	} else {
+		g_free(ac);
+		fprintf(stderr, RED "Failed to initialize mains \"%s\"" RESET "\n", entryname);
+	}
+}
+
+gboolean battery_os_init()
+{
+	GDir *directory = 0;
+	GError *error = NULL;
+	const char *entryname;
+
+	battery_os_free();
+
+	gchar *dir_path = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", NULL);
+	directory = g_dir_open(dir_path, 0, &error);
+	g_free(dir_path);
+	RETURN_ON_ERROR(error);
+
+	while ((entryname = g_dir_read_name(directory))) {
+		fprintf(stderr, GREEN "Found power device %s" RESET "\n", entryname);
+		enum psy_type type = power_supply_get_type(entryname);
+
+		switch (type) {
+		case PSY_BATTERY:
+			add_battery(entryname);
+			break;
+		case PSY_MAINS:
+			add_mains(entryname);
+			break;
+		default:
+			break;
+		}
+	}
+
+	g_dir_close(directory);
+
+	uevent_register_notifier(&psy_change);
+	uevent_register_notifier(&psy_plug);
+
+	return batteries != NULL;
+}
+
+static gint estimate_rate_usage(struct psy_battery *bat, gint old_level_now, gint64 old_timestamp)
+{
+	gint64 diff_level = ABS(bat->level_now - old_level_now);
+	gint64 diff_time = bat->timestamp - old_timestamp;
+
+	/* µW = (µWh * 3600) / (µs / 1000000) */
+	gint rate = diff_level * 3600 * 1000000 / MAX(1, diff_time);
+
+	return rate;
+}
+
+static gboolean update_linux_battery(struct psy_battery *bat)
+{
+	GError *error = NULL;
+	gchar *data;
+	gsize datalen;
+
+	gint64 old_timestamp = bat->timestamp;
+	int old_level_now = bat->level_now;
+	gint old_rate_now = bat->rate_now;
+
+	/* reset values */
+	bat->present = 0;
+	bat->status = BATTERY_UNKNOWN;
+	bat->level_now = 0;
+	bat->level_full = 0;
+	bat->rate_now = 0;
+	bat->timestamp = g_get_monotonic_time();
+
+	/* present */
+	g_file_get_contents(bat->path_present, &data, &datalen, &error);
+	RETURN_ON_ERROR(error);
+	bat->present = (atoi(data) == 1);
+	g_free(data);
+
+	/* we are done, if battery is not present */
+	if (!bat->present)
+		return TRUE;
+
+	/* status */
+	bat->status = BATTERY_UNKNOWN;
+	g_file_get_contents(bat->path_status, &data, &datalen, &error);
+	RETURN_ON_ERROR(error);
+	if (!g_strcmp0(data, "Charging\n")) {
+		bat->status = BATTERY_CHARGING;
+	} else if (!g_strcmp0(data, "Discharging\n")) {
+		bat->status = BATTERY_DISCHARGING;
+	} else if (!g_strcmp0(data, "Full\n")) {
+		bat->status = BATTERY_FULL;
+	}
+	g_free(data);
+
+	/* level now */
+	g_file_get_contents(bat->path_level_now, &data, &datalen, &error);
+	RETURN_ON_ERROR(error);
+	bat->level_now = atoi(data);
+	g_free(data);
+
+	/* level full */
+	g_file_get_contents(bat->path_level_full, &data, &datalen, &error);
+	RETURN_ON_ERROR(error);
+	bat->level_full = atoi(data);
+	g_free(data);
+
+	/* rate now */
+	g_file_get_contents(bat->path_rate_now, &data, &datalen, &error);
+	if (g_error_matches(error, G_FILE_ERROR, G_FILE_ERROR_NODEV)) {
+		/* some hardware does not support reading current rate consumption */
+		g_error_free(error);
+		bat->rate_now = estimate_rate_usage(bat, old_level_now, old_timestamp);
+		if (bat->rate_now == 0 && bat->status != BATTERY_FULL) {
+			/* If the hardware updates the level slower than our sampling period,
+			 * we need to sample more rarely */
+			bat->rate_now = old_rate_now;
+			bat->timestamp = old_timestamp;
+		}
+	} else if (error) {
+		g_error_free(error);
+		return FALSE;
+	} else {
+		bat->rate_now = atoi(data);
+		g_free(data);
+	}
+
+	return TRUE;
+}
+
+static gboolean update_linux_mains(struct psy_mains *ac)
+{
+	GError *error = NULL;
+	gchar *data;
+	gsize datalen;
+	ac->online = FALSE;
+
+	/* online */
+	g_file_get_contents(ac->path_online, &data, &datalen, &error);
+	RETURN_ON_ERROR(error);
+	ac->online = (atoi(data) == 1);
+	g_free(data);
+
+	return TRUE;
+}
+
+int battery_os_update(BatteryState *state)
+{
+	GList *l;
+
+	gint64 total_level_now = 0;
+	gint64 total_level_full = 0;
+	gint64 total_rate_now = 0;
+	gint seconds = 0;
+
+	gboolean charging = FALSE;
+	gboolean discharging = FALSE;
+	gboolean full = FALSE;
+	gboolean ac_connected = FALSE;
+
+	for (l = batteries; l != NULL; l = l->next) {
+		struct psy_battery *bat = l->data;
+		update_linux_battery(bat);
+
+		total_level_now += bat->level_now;
+		total_level_full += bat->level_full;
+		total_rate_now += bat->rate_now;
+
+		charging |= (bat->status == BATTERY_CHARGING);
+		discharging |= (bat->status == BATTERY_DISCHARGING);
+		full |= (bat->status == BATTERY_FULL);
+	}
+
+	for (l = mains; l != NULL; l = l->next) {
+		struct psy_mains *ac = l->data;
+		update_linux_mains(ac);
+		ac_connected |= (ac->online);
+	}
+
+	/* build global state */
+	if (charging && !discharging)
+		state->state = BATTERY_CHARGING;
+	else if (!charging && discharging)
+		state->state = BATTERY_DISCHARGING;
+	else if (!charging && !discharging && full)
+		state->state = BATTERY_FULL;
+
+	/* calculate seconds */
+	if (total_rate_now > 0) {
+		if (state->state == BATTERY_CHARGING)
+			seconds = 3600 * (total_level_full - total_level_now) / total_rate_now;
+		else if (state->state == BATTERY_DISCHARGING)
+			seconds = 3600 * total_level_now / total_rate_now;
+		seconds = MAX(0, seconds);
+	}
+	battery_state_set_time(state, seconds);
+
+	/* calculate percentage */
+	state->percentage = level_to_percent(total_level_now, total_level_full);
+
+	/* AC state */
+	state->ac_connected = ac_connected;
+
+	return 0;
+}
+
+static gchar *level_human_readable(struct psy_battery *bat)
+{
+	gint now = bat->level_now;
+	gint full = bat->level_full;
+
+	if (full >= 1000000) {
+		return g_strdup_printf("%d.%d / %d.%d %ch",
+		                       now / 1000000,
+		                       (now % 1000000) / 100000,
+		                       full / 1000000,
+		                       (full % 1000000) / 100000,
+							   bat->unit);
+	} else if (full >= 1000) {
+		return g_strdup_printf("%d.%d / %d.%d m%ch",
+		                       now / 1000,
+		                       (now % 1000) / 100,
+		                       full / 1000,
+		                       (full % 1000) / 100,
+							   bat->unit);
+	} else {
+		return g_strdup_printf("%d / %d µ%ch", now, full, bat->unit);
+	}
+}
+
+static gchar *rate_human_readable(struct psy_battery *bat)
+{
+	gint rate = bat->rate_now;
+	gchar unit = bat->unit;
+
+	if (rate >= 1000000) {
+		return g_strdup_printf("%d.%d %c", rate / 1000000, (rate % 1000000) / 100000, unit);
+	} else if (rate >= 1000) {
+		return g_strdup_printf("%d.%d m%c", rate / 1000, (rate % 1000) / 100, unit);
+	} else if (rate > 0) {
+		return g_strdup_printf("%d µ%c", rate, unit);
+	} else {
+		return g_strdup_printf("0 %c", unit);
+	}
+}
+
+char *battery_os_tooltip()
+{
+	GList *l;
+	GString *tooltip = g_string_new("");
+	gchar *result;
+
+	for (l = batteries; l != NULL; l = l->next) {
+		struct psy_battery *bat = l->data;
+
+		if (tooltip->len)
+			g_string_append_c(tooltip, '\n');
+
+		g_string_append_printf(tooltip, "%s\n", bat->name);
+
+		if (!bat->present) {
+			g_string_append_printf(tooltip, "\tnot connected");
+			continue;
+		}
+
+		gchar *rate = rate_human_readable(bat);
+		gchar *level = level_human_readable(bat);
+		gchar *state = (bat->status == BATTERY_UNKNOWN) ? "energy" : chargestate2str(bat->status);
+
+		guint8 percentage = level_to_percent(bat->level_now, bat->level_full);
+
+		g_string_append_printf(tooltip, "\t%s: %s (%u %%)\n\trate: %s", state, level, percentage, rate);
+
+		g_free(rate);
+		g_free(level);
+	}
+
+	for (l = mains; l != NULL; l = l->next) {
+		struct psy_mains *ac = l->data;
+
+		if (tooltip->len)
+			g_string_append_c(tooltip, '\n');
+
+		g_string_append_printf(tooltip, "%s\n", ac->name);
+		g_string_append_printf(tooltip, ac->online ? "\tConnected" : "\tDisconnected");
+	}
+
+	result = tooltip->str;
+	g_string_free(tooltip, FALSE);
+
+	return result;
+}
+
+#endif

src/battery/openbsd.c

@@ -0,0 +1,108 @@
+/**************************************************************************
+*
+* Tint2 : OpenBSD & NetBSD battery
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License version 2
+* or any later version 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.
+**************************************************************************/
+
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+
+#include <stdint.h>
+#include <err.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <string.h>
+#include <machine/apmvar.h>
+
+#include "common.h"
+#include "battery.h"
+
+int apm_fd = -1;
+
+gboolean battery_os_init()
+{
+	if (apm_fd > 0)
+		close(apm_fd);
+
+	apm_fd = open("/dev/apm", O_RDONLY);
+
+	if (apm_fd < 0) {
+		warn("ERROR: battery applet cannot open /dev/apm.");
+		return FALSE;
+	} else {
+		return TRUE;
+	}
+}
+
+void battery_os_free()
+{
+	if ((apm_fd != -1) && (close(apm_fd) == -1))
+		warn("cannot close /dev/apm");
+	apm_fd = -1;
+}
+
+int battery_os_update(BatteryState *state)
+{
+	struct apm_power_info info;
+
+	if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
+		// best attempt at mapping to Linux battery states
+		switch (info.battery_state) {
+		case APM_BATT_CHARGING:
+			state->state = BATTERY_CHARGING;
+			break;
+		default:
+			state->state = BATTERY_DISCHARGING;
+			break;
+		}
+
+		if (info.battery_life > 100)
+			info.battery_life = 100;
+		if (info.battery_life == 100)
+			state->state = BATTERY_FULL;
+
+		state->percentage = info.battery_life;
+		if (info.minutes_left != -1)
+			battery_state_set_time(state, info.minutes_left * 60);
+
+		state->ac_connected = info.ac_state == APM_AC_ON;
+	} else {
+		warn("power update: APM_IOC_GETPOWER");
+		return -1;
+	}
+
+	return 0;
+}
+
+char *battery_os_tooltip()
+{
+	GString *tooltip = g_string_new("");
+	gchar *result;
+
+	g_string_append_printf(tooltip, "Battery\n");
+
+	gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
+
+	g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
+
+	g_string_append_c(tooltip, '\n');
+	g_string_append_printf(tooltip, "AC\n");
+	g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
+
+	result = tooltip->str;
+	g_string_free(tooltip, FALSE);
+
+	return result;
+}
+
+#endif

src/clock/clock.c

@@ -31,7 +31,6 @@
 #include "timer.h"
 #include "common.h"
 
-
 char *time1_format;
 char *time1_timezone;
 char *time2_format;
@@ -44,14 +43,20 @@ char *clock_rclick_command;
 char *clock_uwheel_command;
 char *clock_dwheel_command;
 struct timeval time_clock;
+gboolean time1_has_font;
 PangoFontDescription *time1_font_desc;
+gboolean time2_has_font;
 PangoFontDescription *time2_font_desc;
 static char buf_time[256];
 static char buf_date[256];
 static char buf_tooltip[512];
 int clock_enabled;
-static timeout* clock_timeout;
+static timeout *clock_timeout;
 
+void clock_init_fonts();
+char *clock_get_tooltip(void *obj);
+int clock_compute_desired_size(void *obj);
+void clock_dump_geometry(void *obj, int indent);
 
 void default_clock()
 {
@@ -68,7 +73,9 @@ void default_clock()
 	clock_rclick_command = NULL;
 	clock_uwheel_command = NULL;
 	clock_dwheel_command = NULL;
+	time1_has_font = FALSE;
 	time1_font_desc = NULL;
+	time2_has_font = FALSE;
 	time2_font_desc = NULL;
 }
 
@@ -104,96 +111,95 @@ void cleanup_clock()
 	clock_timeout = NULL;
 }
 
-
-void update_clocks_sec(void* arg)
+void update_clocks_sec(void *arg)
 {
 	gettimeofday(&time_clock, 0);
-	int i;
 	if (time1_format) {
-		for (i=0 ; i < nb_panel ; i++)
-			panel1[i].clock.area.resize = 1;
+		for (int i = 0; i < num_panels; i++)
+			panels[i].clock.area.resize_needed = 1;
 	}
-	panel_refresh = 1;
+	schedule_panel_redraw();
 }
 
-void update_clocks_min(void* arg)
+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) {
-		int i;
 		if (time1_format) {
-			for (i=0 ; i < nb_panel ; i++)
-				panel1[i].clock.area.resize = 1;
+			for (int i = 0; i < num_panels; i++)
+				panels[i].clock.area.resize_needed = 1;
 		}
-		panel_refresh = 1;
+		schedule_panel_redraw();
 	}
 }
 
-struct tm* clock_gettime_for_tz(const char* timezone) {
-	if (timezone) {
-		const char* old_tz = getenv("TZ");
-		setenv("TZ", timezone, 1);
-		struct tm* result = localtime(&time_clock.tv_sec);
-		if (old_tz) setenv("TZ", old_tz, 1);
-		else unsetenv("TZ");
-		return result;
-	}
-	else return localtime(&time_clock.tv_sec);
-}
-
-const char* clock_get_tooltip(void* obj)
+struct tm *clock_gettime_for_tz(const char *timezone)
 {
-	strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
-	return buf_tooltip;
+	if (timezone) {
+		const char *old_tz = getenv("TZ");
+		setenv("TZ", timezone, 1);
+		struct tm *result = localtime(&time_clock.tv_sec);
+		if (old_tz)
+			setenv("TZ", old_tz, 1);
+		else
+			unsetenv("TZ");
+		return result;
+	} else {
+		return localtime(&time_clock.tv_sec);
+	}
 }
 
-int time_format_needs_sec_ticks(char *time_format)
+gboolean time_format_needs_sec_ticks(char *time_format)
 {
 	if (!time_format)
-		return 0;
+		return FALSE;
 	if (strchr(time_format, 'S') || strchr(time_format, 'T') || strchr(time_format, 'r'))
-		return 1;
-	return 0;
+		return TRUE;
+	return FALSE;
 }
 
 void init_clock()
 {
+}
+
+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)) {
+		if (time_format_needs_sec_ticks(time1_format) || time_format_needs_sec_ticks(time2_format)) {
 			clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0, &clock_timeout);
 		} else {
 			clock_timeout = add_timeout(10, 1000, update_clocks_min, 0, &clock_timeout);
 		}
 	}
-}
 
-
-void init_clock_panel(void *p)
-{
-	Panel *panel =(Panel*)p;
-	Clock *clock = &panel->clock;
-	
-	if (!time1_font_desc)
-		time1_font_desc = pango_font_description_from_string(DEFAULT_FONT);
-	if (!time2_font_desc)
-		time2_font_desc = pango_font_description_from_string(DEFAULT_FONT);
 	if (!clock->area.bg)
 		clock->area.bg = &g_array_index(backgrounds, Background, 0);
+	clock_init_fonts();
 	clock->area.parent = p;
 	clock->area.panel = p;
+	snprintf(clock->area.name, sizeof(clock->area.name), "Clock");
+	clock->area._is_under_mouse = full_width_area_is_under_mouse;
+	clock->area.has_mouse_press_effect = clock->area.has_mouse_over_effect =
+	    panel_config.mouse_effects && (clock_lclick_command || clock_mclick_command || clock_rclick_command ||
+	                                   clock_uwheel_command || clock_dwheel_command);
 	clock->area._draw_foreground = draw_clock;
-	clock->area.size_mode = SIZE_BY_CONTENT;
+	clock->area.size_mode = LAYOUT_FIXED;
 	clock->area._resize = resize_clock;
+	clock->area._compute_desired_size = clock_compute_desired_size;
+	clock->area._dump_geometry = clock_dump_geometry;
 	// check consistency
 	if (!time1_format)
 		return;
 
-	clock->area.resize = 1;
-	clock->area.on_screen = 1;
+	clock->area.resize_needed = 1;
+	clock->area.on_screen = TRUE;
+	instantiate_area_gradients(&clock->area);
 
 	if (time_tooltip_format) {
 		clock->area._get_tooltip_text = clock_get_tooltip;
@@ -201,107 +207,211 @@ void init_clock_panel(void *p)
 	}
 }
 
-
-void draw_clock (void *obj, cairo_t *c)
+void clock_init_fonts()
 {
-	Clock *clock = obj;
-	PangoLayout *layout;
-
-	layout = pango_cairo_create_layout (c);
-
-	// draw layout
-	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_text (layout, buf_time, strlen(buf_time));
-
-	cairo_set_source_rgba (c, clock->font.color[0], clock->font.color[1], clock->font.color[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);
+	if (!time1_font_desc) {
+		time1_font_desc = pango_font_description_from_string(get_default_font());
+		pango_font_description_set_weight(time1_font_desc, PANGO_WEIGHT_BOLD);
+		pango_font_description_set_size(time1_font_desc, pango_font_description_get_size(time1_font_desc));
+	}
+	if (!time2_font_desc) {
+		time2_font_desc = pango_font_description_from_string(get_default_font());
+		pango_font_description_set_size(time2_font_desc,
+		                                pango_font_description_get_size(time2_font_desc) - PANGO_SCALE);
 	}
-
-	g_object_unref (layout);
 }
 
-
-int resize_clock (void *obj)
+void clock_default_font_changed()
 {
-	Clock *clock = obj;
-	Panel *panel = clock->area.panel;
-	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width, ret = 0;
+	if (!clock_enabled)
+		return;
+	if (time1_has_font && time2_has_font)
+		return;
+	if (!time1_has_font) {
+		pango_font_description_free(time1_font_desc);
+		time1_font_desc = NULL;
+	}
+	if (!time2_has_font) {
+		pango_font_description_free(time2_font_desc);
+		time2_font_desc = NULL;
+	}
+	clock_init_fonts();
+	for (int i = 0; i < num_panels; i++) {
+		panels[i].clock.area.resize_needed = TRUE;
+		schedule_redraw(&panels[i].clock.area);
+	}
+	schedule_panel_redraw();
+}
 
-	clock->area.redraw = 1;
-	
-	date_height = date_width = 0;
+void clock_compute_text_geometry(Panel *panel,
+                                 int *time_height_ink,
+                                 int *time_height,
+                                 int *time_width,
+                                 int *date_height_ink,
+                                 int *date_height,
+                                 int *date_width)
+{
+	*date_height = *date_width = 0;
 	strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
-	get_text_size2(time1_font_desc, &time_height_ink, &time_height, &time_width, panel->area.height, panel->area.width, buf_time, strlen(buf_time));
+	get_text_size2(time1_font_desc,
+	               time_height_ink,
+	               time_height,
+	               time_width,
+	               panel->area.height,
+	               panel->area.width,
+	               buf_time,
+	               strlen(buf_time),
+	               PANGO_WRAP_WORD_CHAR,
+	               PANGO_ELLIPSIZE_NONE,
+	               FALSE);
 	if (time2_format) {
 		strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
-		get_text_size2(time2_font_desc, &date_height_ink, &date_height, &date_width, panel->area.height, panel->area.width, buf_date, strlen(buf_date));
+		get_text_size2(time2_font_desc,
+		               date_height_ink,
+		               date_height,
+		               date_width,
+		               panel->area.height,
+		               panel->area.width,
+		               buf_date,
+		               strlen(buf_date),
+		               PANGO_WRAP_WORD_CHAR,
+		               PANGO_ELLIPSIZE_NONE,
+		               FALSE);
 	}
+}
+
+int clock_compute_desired_size(void *obj)
+{
+	Clock *clock = (Clock *)obj;
+	Panel *panel = (Panel *)clock->area.panel;
+	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
+	clock_compute_text_geometry(panel,
+	                            &time_height_ink,
+	                            &time_height,
+	                            &time_width,
+	                            &date_height_ink,
+	                            &date_height,
+	                            &date_width);
 
 	if (panel_horizontal) {
 		int new_size = (time_width > date_width) ? time_width : date_width;
-		new_size += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
-		if (new_size > clock->area.width || new_size < (clock->area.width-6)) {
-			// we try to limit the number of resize
+		new_size += 2 * clock->area.paddingxlr + left_right_border_width(&clock->area);
+		return new_size;
+	} else {
+		int new_size = time_height + date_height + 2 * clock->area.paddingxlr + top_bottom_border_width(&clock->area);
+		return new_size;
+	}
+}
+
+gboolean resize_clock(void *obj)
+{
+	Clock *clock = (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->time1_posy -= (date_height) / 2;
 				clock->time2_posy = clock->time1_posy + time_height;
 			}
-			ret = 1;
+			result = TRUE;
 		}
-	}
-	else {
-		int new_size = time_height + date_height + (2 * (clock->area.paddingxlr + clock->area.bg->border.width));
+	} else {
 		if (new_size != clock->area.height) {
-			// we try to limit the number of resize
-			clock->area.height =  new_size;
+			// 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->time1_posy -= (date_height) / 2;
 				clock->time2_posy = clock->time1_posy + time_height;
 			}
-			ret = 1;
+			result = TRUE;
 		}
 	}
 
-	return ret;
+	return result;
 }
 
+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);
+}
+
+void clock_dump_geometry(void *obj, int indent)
+{
+	Clock *clock = (Clock *)obj;
+	fprintf(stderr, "%*sText 1: y = %d, text = %s\n", indent, "", clock->time1_posy, buf_time);
+	if (time2_format) {
+		fprintf(stderr, "%*sText 2: y = %d, text = %s\n", indent, "", clock->time2_posy, buf_date);
+	}
+}
+
+char *clock_get_tooltip(void *obj)
+{
+	strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
+	return strdup(buf_tooltip);
+}
 
 void clock_action(int button)
 {
-	char *command = 0;
+	char *command = NULL;
 	switch (button) {
-		case 1:
+	case 1:
 		command = clock_lclick_command;
 		break;
-		case 2:
+	case 2:
 		command = clock_mclick_command;
 		break;
-		case 3:
+	case 3:
 		command = clock_rclick_command;
 		break;
-		case 4:
+	case 4:
 		command = clock_uwheel_command;
 		break;
-		case 5:
+	case 5:
 		command = clock_dwheel_command;
 		break;
 	}
 	tint_exec(command);
 }
-

src/clock/clock.h

@@ -13,7 +13,6 @@
 #include "common.h"
 #include "area.h"
 
-
 typedef struct Clock {
 	// always start with area
 	Area area;
@@ -23,22 +22,22 @@ typedef struct Clock {
 	int time2_posy;
 } Clock;
 
-
 extern char *time1_format;
 extern char *time1_timezone;
 extern char *time2_format;
 extern char *time2_timezone;
 extern char *time_tooltip_format;
 extern char *time_tooltip_timezone;
+extern gboolean time1_has_font;
 extern PangoFontDescription *time1_font_desc;
+extern gboolean time2_has_font;
 extern PangoFontDescription *time2_font_desc;
 extern char *clock_lclick_command;
 extern char *clock_mclick_command;
 extern char *clock_rclick_command;
 extern char *clock_uwheel_command;
 extern char *clock_dwheel_command;
-extern int clock_enabled;
-
+extern gboolean clock_enabled;
 
 // default global data
 void default_clock();
@@ -49,10 +48,11 @@ void cleanup_clock();
 // initialize clock : y position, precision, ...
 void init_clock();
 void init_clock_panel(void *panel);
+void clock_default_font_changed();
 
-void draw_clock (void *obj, cairo_t *c);
+void draw_clock(void *obj, cairo_t *c);
 
-int  resize_clock (void *obj);
+gboolean resize_clock(void *obj);
 
 void clock_action(int button);
 

src/config.h

@@ -9,6 +9,8 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#include <glib.h>
+
 extern char *config_path;
 extern char *snapshot_path;
 
@@ -18,8 +20,6 @@ void default_config();
 // freed memory
 void cleanup_config();
 
-int  config_read_file (const char *path);
-int  config_read ();
+gboolean config_read();
 
 #endif
-

src/execplugin/execplugin.c

@@ -0,0 +1,873 @@
+#include "execplugin.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"
+
+void execp_timer_callback(void *arg);
+char *execp_get_tooltip(void *obj);
+void execp_init_fonts();
+int execp_compute_desired_size(void *obj);
+void execp_dump_geometry(void *obj, int indent);
+
+void default_execp()
+{
+}
+
+Execp *create_execp()
+{
+	Execp *execp = calloc(1, sizeof(Execp));
+	execp->backend = calloc(1, sizeof(ExecpBackend));
+	execp->backend->child_pipe = -1;
+	execp->backend->cmd_pids = g_tree_new(cmp_ptr);
+	execp->backend->interval = 30;
+	execp->backend->cache_icon = TRUE;
+	execp->backend->centered = TRUE;
+	execp->backend->font_color.alpha = 0.5;
+	return execp;
+}
+
+gpointer create_execp_frontend(gconstpointer arg, gpointer data)
+{
+	Execp *execp_backend = (Execp *)arg;
+
+	Execp *execp_frontend = calloc(1, sizeof(Execp));
+	execp_frontend->backend = execp_backend->backend;
+	execp_backend->backend->instances = g_list_append(execp_backend->backend->instances, execp_frontend);
+	execp_frontend->frontend = calloc(1, sizeof(ExecpFrontend));
+	return execp_frontend;
+}
+
+void destroy_execp(void *obj)
+{
+	Execp *execp = (Execp *)obj;
+	if (execp->frontend) {
+		// This is a frontend element
+		execp->backend->instances = g_list_remove_all(execp->backend->instances, execp);
+		free_and_null(execp->frontend);
+		remove_area(&execp->area);
+		free_area(&execp->area);
+		free_and_null(execp);
+	} else {
+		// This is a backend element
+		stop_timeout(execp->backend->timer);
+		execp->backend->timer = NULL;
+
+		if (execp->backend->icon) {
+			imlib_context_set_image(execp->backend->icon);
+			imlib_free_image();
+			execp->backend->icon = NULL;
+		}
+		free_and_null(execp->backend->buf_output);
+		free_and_null(execp->backend->text);
+		free_and_null(execp->backend->icon_path);
+		if (execp->backend->child) {
+			kill(-execp->backend->child, SIGHUP);
+			execp->backend->child = 0;
+		}
+		if (execp->backend->child_pipe >= 0) {
+			close(execp->backend->child_pipe);
+			execp->backend->child_pipe = -1;
+		}
+		if (execp->backend->cmd_pids) {
+			g_tree_destroy(execp->backend->cmd_pids);
+			execp->backend->cmd_pids = NULL;
+		}
+
+		execp->backend->bg = NULL;
+		pango_font_description_free(execp->backend->font_desc);
+		execp->backend->font_desc = NULL;
+		free_and_null(execp->backend->command);
+		free_and_null(execp->backend->tooltip);
+		free_and_null(execp->backend->lclick_command);
+		free_and_null(execp->backend->mclick_command);
+		free_and_null(execp->backend->rclick_command);
+		free_and_null(execp->backend->dwheel_command);
+		free_and_null(execp->backend->uwheel_command);
+
+		if (execp->backend->instances) {
+			fprintf(stderr, "Error: Attempt to destroy backend while there are still frontend instances!\n");
+			exit(-1);
+		}
+		free(execp->backend);
+		free(execp);
+	}
+}
+
+void init_execp()
+{
+	GList *to_remove = panel_config.execp_list;
+	for (int k = 0; k < strlen(panel_items_order) && to_remove; k++) {
+		if (panel_items_order[k] == 'E') {
+			to_remove = to_remove->next;
+		}
+	}
+
+	if (to_remove) {
+		if (to_remove == panel_config.execp_list) {
+			g_list_free_full(to_remove, destroy_execp);
+			panel_config.execp_list = NULL;
+		} else {
+			// Cut panel_config.execp_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_execp);
+		}
+	}
+
+	execp_init_fonts();
+	for (GList *l = panel_config.execp_list; l; l = l->next) {
+		Execp *execp = l->data;
+
+		// Set missing config options
+		if (!execp->backend->bg)
+			execp->backend->bg = &g_array_index(backgrounds, Background, 0);
+		execp->backend->buf_capacity = 1024;
+		execp->backend->buf_output = calloc(execp->backend->buf_capacity, 1);
+		execp->backend->text = strdup(" ");
+		execp->backend->icon_path = NULL;
+	}
+}
+
+void init_execp_panel(void *p)
+{
+	Panel *panel = (Panel *)p;
+
+	// Make sure this is only done once if there are multiple items
+	if (panel->execp_list && ((Execp *)panel->execp_list->data)->frontend)
+		return;
+
+	// panel->execp_list is now a copy of the pointer panel_config.execp_list
+	// We make it a deep copy
+	panel->execp_list = g_list_copy_deep(panel_config.execp_list, create_execp_frontend, NULL);
+
+	for (GList *l = panel->execp_list; l; l = l->next) {
+		Execp *execp = l->data;
+		execp->area.bg = execp->backend->bg;
+		execp->area.paddingx = execp->backend->paddingx;
+		execp->area.paddingy = execp->backend->paddingy;
+		execp->area.paddingxlr = execp->backend->paddingxlr;
+		execp->area.parent = panel;
+		execp->area.panel = panel;
+		execp->area._dump_geometry = execp_dump_geometry;
+		execp->area._compute_desired_size = execp_compute_desired_size;
+		snprintf(execp->area.name,
+		         sizeof(execp->area.name),
+		         "Execp %s",
+		         execp->backend->command ? execp->backend->command : "null");
+		execp->area._draw_foreground = draw_execp;
+		execp->area.size_mode = LAYOUT_FIXED;
+		execp->area._resize = resize_execp;
+		execp->area._get_tooltip_text = execp_get_tooltip;
+		execp->area._is_under_mouse = full_width_area_is_under_mouse;
+		execp->area.has_mouse_press_effect =
+		    panel_config.mouse_effects &&
+		    (execp->area.has_mouse_over_effect = execp->backend->lclick_command || execp->backend->mclick_command ||
+		                                         execp->backend->rclick_command || execp->backend->uwheel_command ||
+		                                         execp->backend->dwheel_command);
+
+		execp->area.resize_needed = TRUE;
+		execp->area.on_screen = TRUE;
+		instantiate_area_gradients(&execp->area);
+
+		if (!execp->backend->timer)
+			execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
+	}
+}
+
+void execp_init_fonts()
+{
+	for (GList *l = panel_config.execp_list; l; l = l->next) {
+		Execp *execp = l->data;
+		if (!execp->backend->font_desc)
+			execp->backend->font_desc = pango_font_description_from_string(get_default_font());
+	}
+}
+
+void execp_default_font_changed()
+{
+	gboolean needs_update = FALSE;
+	for (GList *l = panel_config.execp_list; l; l = l->next) {
+		Execp *execp = l->data;
+
+		if (!execp->backend->has_font) {
+			pango_font_description_free(execp->backend->font_desc);
+			execp->backend->font_desc = NULL;
+			needs_update = TRUE;
+		}
+	}
+	if (!needs_update)
+		return;
+
+	execp_init_fonts();
+	for (int i = 0; i < num_panels; i++) {
+		for (GList *l = panels[i].execp_list; l; l = l->next) {
+			Execp *execp = l->data;
+
+			if (!execp->backend->has_font) {
+				execp->area.resize_needed = TRUE;
+				schedule_redraw(&execp->area);
+			}
+		}
+	}
+	schedule_panel_redraw();
+}
+
+void cleanup_execp()
+{
+	// Cleanup frontends
+	for (int i = 0; i < num_panels; i++) {
+		g_list_free_full(panels[i].execp_list, destroy_execp);
+		panels[i].execp_list = NULL;
+	}
+
+	// Cleanup backends
+	g_list_free_full(panel_config.execp_list, destroy_execp);
+	panel_config.execp_list = NULL;
+}
+
+// Called from backend functions.
+gboolean reload_icon(Execp *execp)
+{
+	char *icon_path = execp->backend->icon_path;
+
+	if (execp->backend->has_icon && icon_path) {
+		if (execp->backend->icon) {
+			imlib_context_set_image(execp->backend->icon);
+			imlib_free_image();
+		}
+		execp->backend->icon = load_image(icon_path, execp->backend->cache_icon);
+		if (execp->backend->icon) {
+			imlib_context_set_image(execp->backend->icon);
+			int w = imlib_image_get_width();
+			int h = imlib_image_get_height();
+			if (w && h) {
+				if (execp->backend->icon_w) {
+					if (!execp->backend->icon_h) {
+						h = (int)(0.5 + h * execp->backend->icon_w / (float)(w));
+						w = execp->backend->icon_w;
+					} else {
+						w = execp->backend->icon_w;
+						h = execp->backend->icon_h;
+					}
+				} else {
+					if (execp->backend->icon_h) {
+						w = (int)(0.5 + w * execp->backend->icon_h / (float)(h));
+						h = execp->backend->icon_h;
+					}
+				}
+				if (w < 1)
+					w = 1;
+				if (h < 1)
+					h = 1;
+			}
+			if (w != imlib_image_get_width() || h != imlib_image_get_height()) {
+				Imlib_Image icon_scaled =
+				    imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), w, h);
+				imlib_context_set_image(execp->backend->icon);
+				imlib_free_image();
+				execp->backend->icon = icon_scaled;
+			}
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+int execp_compute_desired_size(void *obj)
+{
+	Execp *execp = (Execp *)obj;
+	Panel *panel = (Panel *)execp->area.panel;
+	int horiz_padding = (panel_horizontal ? execp->area.paddingxlr : execp->area.paddingy);
+	int vert_padding = (panel_horizontal ? execp->area.paddingy : execp->area.paddingxlr);
+	int interior_padding = execp->area.paddingx;
+
+	int icon_w, icon_h;
+	if (reload_icon(execp)) {
+		if (execp->backend->icon) {
+			imlib_context_set_image(execp->backend->icon);
+			icon_w = imlib_image_get_width();
+			icon_h = imlib_image_get_height();
+		} else {
+			icon_w = icon_h = 0;
+		}
+	} else {
+		icon_w = icon_h = 0;
+	}
+
+	int text_next_line = !panel_horizontal && icon_w > execp->area.width / 2;
+
+	int txt_height_ink, txt_height, txt_width;
+	if (panel_horizontal) {
+		get_text_size2(execp->backend->font_desc,
+					   &txt_height_ink,
+					   &txt_height,
+					   &txt_width,
+					   panel->area.height,
+					   panel->area.width,
+					   execp->backend->text,
+					   strlen(execp->backend->text),
+					   PANGO_WRAP_WORD_CHAR,
+					   PANGO_ELLIPSIZE_NONE,
+					   execp->backend->has_markup);
+	} else {
+		get_text_size2(execp->backend->font_desc,
+					   &txt_height_ink,
+					   &txt_height,
+					   &txt_width,
+					   panel->area.height,
+					   !text_next_line
+						   ? execp->area.width - icon_w - (icon_w ? interior_padding : 0) - 2 * horiz_padding -
+								 left_right_border_width(&execp->area)
+						   : execp->area.width - 2 * horiz_padding - left_right_border_width(&execp->area),
+					   execp->backend->text,
+					   strlen(execp->backend->text),
+					   PANGO_WRAP_WORD_CHAR,
+					   PANGO_ELLIPSIZE_NONE,
+					   execp->backend->has_markup);
+	}
+
+	if (panel_horizontal) {
+		int new_size = txt_width;
+		if (icon_w)
+			new_size += interior_padding + icon_w;
+		new_size += 2 * horiz_padding + left_right_border_width(&execp->area);
+		return new_size;
+	} else {
+		int new_size;
+		if (!text_next_line) {
+			new_size = txt_height + 2 * vert_padding + top_bottom_border_width(&execp->area);
+			new_size = MAX(new_size, icon_h + 2 * vert_padding + top_bottom_border_width(&execp->area));
+		} else {
+			new_size =
+				icon_h + interior_padding + txt_height + 2 * vert_padding + top_bottom_border_width(&execp->area);
+		}
+		return new_size;
+	}
+}
+
+gboolean resize_execp(void *obj)
+{
+	Execp *execp = (Execp *)obj;
+	Panel *panel = (Panel *)execp->area.panel;
+	int horiz_padding = (panel_horizontal ? execp->area.paddingxlr : execp->area.paddingy);
+	int vert_padding = (panel_horizontal ? execp->area.paddingy : execp->area.paddingxlr);
+	int interior_padding = execp->area.paddingx;
+
+	int icon_w, icon_h;
+	if (reload_icon(execp)) {
+		if (execp->backend->icon) {
+			imlib_context_set_image(execp->backend->icon);
+			icon_w = imlib_image_get_width();
+			icon_h = imlib_image_get_height();
+		} else {
+			icon_w = icon_h = 0;
+		}
+	} else {
+		icon_w = icon_h = 0;
+	}
+
+	int text_next_line = !panel_horizontal && icon_w > execp->area.width / 2;
+
+	int txt_height_ink, txt_height, txt_width;
+	if (panel_horizontal) {
+		get_text_size2(execp->backend->font_desc,
+		               &txt_height_ink,
+		               &txt_height,
+		               &txt_width,
+		               panel->area.height,
+		               panel->area.width,
+		               execp->backend->text,
+		               strlen(execp->backend->text),
+		               PANGO_WRAP_WORD_CHAR,
+		               PANGO_ELLIPSIZE_NONE,
+		               execp->backend->has_markup);
+	} else {
+		get_text_size2(execp->backend->font_desc,
+		               &txt_height_ink,
+		               &txt_height,
+		               &txt_width,
+		               panel->area.height,
+		               !text_next_line
+		                   ? execp->area.width - icon_w - (icon_w ? interior_padding : 0) - 2 * horiz_padding -
+		                         left_right_border_width(&execp->area)
+		                   : execp->area.width - 2 * horiz_padding - left_right_border_width(&execp->area),
+		               execp->backend->text,
+		               strlen(execp->backend->text),
+		               PANGO_WRAP_WORD_CHAR,
+		               PANGO_ELLIPSIZE_NONE,
+		               execp->backend->has_markup);
+	}
+
+	gboolean result = FALSE;
+	if (panel_horizontal) {
+		int new_size = txt_width;
+		if (icon_w)
+			new_size += interior_padding + icon_w;
+		new_size += 2 * horiz_padding + left_right_border_width(&execp->area);
+		if (new_size > execp->area.width || new_size < (execp->area.width - 6)) {
+			// we try to limit the number of resize
+			execp->area.width = new_size + 1;
+			result = TRUE;
+		}
+	} else {
+		int new_size;
+		if (!text_next_line) {
+			new_size = txt_height + 2 * vert_padding + top_bottom_border_width(&execp->area);
+			new_size = MAX(new_size, icon_h + 2 * vert_padding + top_bottom_border_width(&execp->area));
+		} else {
+			new_size =
+			    icon_h + interior_padding + txt_height + 2 * vert_padding + top_bottom_border_width(&execp->area);
+		}
+		if (new_size != execp->area.height) {
+			execp->area.height = new_size;
+			result = TRUE;
+		}
+	}
+	execp->frontend->textw = txt_width;
+	execp->frontend->texth = txt_height;
+	if (execp->backend->centered) {
+		if (icon_w) {
+			if (!text_next_line) {
+				execp->frontend->icony = (execp->area.height - icon_h) / 2;
+				execp->frontend->iconx = (execp->area.width - txt_width - interior_padding - icon_w) / 2;
+				execp->frontend->texty = (execp->area.height - txt_height) / 2;
+				execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
+			} else {
+				execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
+				execp->frontend->iconx = (execp->area.width - icon_w) / 2;
+				execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
+				execp->frontend->textx = (execp->area.width - txt_width) / 2;
+			}
+		} else {
+			execp->frontend->texty = (execp->area.height - txt_height) / 2;
+			execp->frontend->textx = (execp->area.width - txt_width) / 2;
+		}
+	} else {
+		if (icon_w) {
+			if (!text_next_line) {
+				execp->frontend->icony = (execp->area.height - icon_h) / 2;
+				execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
+				execp->frontend->texty = (execp->area.height - txt_height) / 2;
+				execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
+			} else {
+				execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
+				execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
+				execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
+				execp->frontend->textx = execp->frontend->iconx;
+			}
+		} else {
+			execp->frontend->texty = (execp->area.height - txt_height) / 2;
+			execp->frontend->textx = left_border_width(&execp->area) + horiz_padding;
+		}
+	}
+
+	schedule_redraw(&execp->area);
+
+	return result;
+}
+
+void draw_execp(void *obj, cairo_t *c)
+{
+	Execp *execp = obj;
+	PangoLayout *layout = pango_cairo_create_layout(c);
+
+	if (execp->backend->has_icon && execp->backend->icon) {
+		imlib_context_set_image(execp->backend->icon);
+		// Render icon
+		render_image(execp->area.pix, execp->frontend->iconx, execp->frontend->icony);
+	}
+
+	// draw layout
+	pango_layout_set_font_description(layout, execp->backend->font_desc);
+	pango_layout_set_width(layout, execp->frontend->textw * PANGO_SCALE);
+	pango_layout_set_alignment(layout, execp->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);
+	if (!execp->backend->has_markup)
+		pango_layout_set_text(layout, execp->backend->text, strlen(execp->backend->text));
+	else
+		pango_layout_set_markup(layout, execp->backend->text, strlen(execp->backend->text));
+
+	pango_cairo_update_layout(c, layout);
+	draw_text(layout,
+	          c,
+	          execp->frontend->textx,
+	          execp->frontend->texty,
+	          &execp->backend->font_color,
+	          panel_config.font_shadow);
+
+	g_object_unref(layout);
+}
+
+void execp_dump_geometry(void *obj, int indent)
+{
+	Execp *execp = obj;
+
+	if (execp->backend->has_icon && execp->backend->icon) {
+		Imlib_Image tmp = imlib_context_get_image();
+		imlib_context_set_image(execp->backend->icon);
+		fprintf(stderr,
+		        "%*sIcon: x = %d, y = %d, w = %d, h = %d\n",
+		        indent,
+		        "",
+		        execp->frontend->iconx,
+		        execp->frontend->icony,
+		        imlib_image_get_width(),
+		        imlib_image_get_height());
+		if (tmp)
+			imlib_context_set_image(tmp);
+	}
+	fprintf(stderr,
+	        "%*sText: x = %d, y = %d, w = %d, align = %s, text = %s\n",
+	        indent,
+	        "",
+	        execp->frontend->textx,
+	        execp->frontend->texty,
+	        execp->frontend->textw,
+	        execp->backend->centered ? "center" : "left",
+	        execp->backend->text);
+}
+
+void execp_force_update(Execp *execp)
+{
+	if (execp->backend->child_pipe > 0) {
+		// Command currently running, nothing to do
+	} else {
+		if (execp->backend->timer)
+			stop_timeout(execp->backend->timer);
+		// Run command right away
+		execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
+	}
+}
+
+void execp_action(void *obj, int button, int x, int y)
+{
+	Execp *execp = obj;
+	char *command = NULL;
+	switch (button) {
+	case 1:
+		command = execp->backend->lclick_command;
+		break;
+	case 2:
+		command = execp->backend->mclick_command;
+		break;
+	case 3:
+		command = execp->backend->rclick_command;
+		break;
+	case 4:
+		command = execp->backend->uwheel_command;
+		break;
+	case 5:
+		command = execp->backend->dwheel_command;
+		break;
+	}
+	if (command) {
+		char *full_cmd = g_strdup_printf("export EXECP_X=%d;"
+		                                 "export EXECP_Y=%d;"
+		                                 "export EXECP_W=%d;"
+		                                 "export EXECP_H=%d; %s",
+		                                 x,
+		                                 y,
+		                                 execp->area.width,
+		                                 execp->area.height,
+		                                 command);
+		pid_t pid = fork();
+		if (pid < 0) {
+			fprintf(stderr, "Could not fork\n");
+		} else if (pid == 0) {
+			// Child process
+			// Allow children to exist after parent destruction
+			setsid();
+			// Run the command
+			execl("/bin/sh", "/bin/sh", "-c", full_cmd, NULL);
+			fprintf(stderr, "Failed to execlp %s\n", full_cmd);
+			exit(1);
+		}
+		// Parent process
+		g_tree_insert(execp->backend->cmd_pids, GINT_TO_POINTER(pid), GINT_TO_POINTER(1));
+		g_free(full_cmd);
+	} else {
+		execp_force_update(execp);
+	}
+}
+
+void execp_cmd_completed(Execp *execp, pid_t pid)
+{
+	g_tree_remove(execp->backend->cmd_pids, GINT_TO_POINTER(pid));
+	execp_force_update(execp);
+}
+
+void execp_timer_callback(void *arg)
+{
+	Execp *execp = arg;
+
+	if (!execp->backend->command)
+		return;
+
+	// Still running!
+	if (execp->backend->child_pipe > 0)
+		return;
+
+	int pipe_fd[2];
+	if (pipe(pipe_fd)) {
+		// TODO maybe write this in tooltip, but if this happens we're screwed anyways
+		fprintf(stderr, "Execp: Creating pipe failed!\n");
+		return;
+	}
+
+	fcntl(pipe_fd[0], F_SETFL, O_NONBLOCK | fcntl(pipe_fd[0], F_GETFL));
+
+	// Fork and run command, capturing stdout in pipe
+	pid_t child = fork();
+	if (child == -1) {
+		// TODO maybe write this in tooltip, but if this happens we're screwed anyways
+		fprintf(stderr, "Fork failed.\n");
+		close(pipe_fd[1]);
+		close(pipe_fd[0]);
+		return;
+	} else if (child == 0) {
+		fprintf(stderr, "Executing: %s\n", execp->backend->command);
+		// We are in the child
+		close(pipe_fd[0]);
+		dup2(pipe_fd[1], 1); // 1 is stdout
+		close(pipe_fd[1]);
+		setpgid(0, 0);
+		execl("/bin/sh", "/bin/sh", "-c", execp->backend->command, NULL);
+		// This should never happen!
+		fprintf(stdout, "execl() failed\nexecl() failed\n");
+		fflush(stdout);
+		exit(0);
+	}
+	close(pipe_fd[1]);
+	execp->backend->child = child;
+	execp->backend->child_pipe = pipe_fd[0];
+	execp->backend->buf_length = 0;
+	execp->backend->buf_output[execp->backend->buf_length] = '\0';
+	execp->backend->last_update_start_time = time(NULL);
+}
+
+gboolean read_execp(void *obj)
+{
+	Execp *execp = (Execp *)obj;
+
+	if (execp->backend->child_pipe < 0)
+		return FALSE;
+
+	gboolean command_finished = FALSE;
+	while (1) {
+		// Make sure there is free space in the buffer
+		if (execp->backend->buf_capacity - execp->backend->buf_length < 1024) {
+			execp->backend->buf_capacity *= 2;
+			execp->backend->buf_output = realloc(execp->backend->buf_output, execp->backend->buf_capacity);
+		}
+		ssize_t count = read(execp->backend->child_pipe,
+		                     execp->backend->buf_output + execp->backend->buf_length,
+		                     execp->backend->buf_capacity - execp->backend->buf_length - 1);
+		if (count > 0) {
+			// Successful read
+			execp->backend->buf_length += count;
+			execp->backend->buf_output[execp->backend->buf_length] = '\0';
+			continue;
+		} else if (count == 0) {
+			// End of file
+			command_finished = TRUE;
+			break;
+		} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
+			// No more data available at the moment
+			break;
+		} else if (errno == EINTR) {
+			// Harmless interruption by signal
+			continue;
+		} else {
+			// Error
+			command_finished = TRUE;
+			break;
+		}
+		break;
+	}
+
+	if (command_finished) {
+		execp->backend->child = 0;
+		close(execp->backend->child_pipe);
+		execp->backend->child_pipe = -1;
+		if (execp->backend->interval)
+			execp->backend->timer =
+			    add_timeout(execp->backend->interval * 1000, 0, execp_timer_callback, execp, &execp->backend->timer);
+	}
+
+	if (!execp->backend->continuous && command_finished) {
+		free_and_null(execp->backend->text);
+		free_and_null(execp->backend->icon_path);
+		if (!execp->backend->has_icon) {
+			execp->backend->text = strdup(execp->backend->buf_output);
+		} else {
+			char *text = strchr(execp->backend->buf_output, '\n');
+			if (text) {
+				*text = '\0';
+				text++;
+				execp->backend->text = strdup(text);
+			} else {
+				execp->backend->text = strdup("");
+			}
+			execp->backend->icon_path = strdup(execp->backend->buf_output);
+		}
+		int len = strlen(execp->backend->text);
+		if (len > 0 && execp->backend->text[len - 1] == '\n')
+			execp->backend->text[len - 1] = '\0';
+		execp->backend->buf_length = 0;
+		execp->backend->buf_output[execp->backend->buf_length] = '\0';
+		execp->backend->last_update_finish_time = time(NULL);
+		execp->backend->last_update_duration =
+		    execp->backend->last_update_finish_time - execp->backend->last_update_start_time;
+		return TRUE;
+	} else if (execp->backend->continuous > 0) {
+		// Count lines in buffer
+		int num_lines = 0;
+		char *last = execp->backend->buf_output;
+		char *end = NULL;
+		for (char *c = execp->backend->buf_output; *c; c++) {
+			if (*c == '\n') {
+				num_lines++;
+				if (num_lines == execp->backend->continuous)
+					end = c;
+			}
+			last = c;
+		}
+		if (*last && *last != '\n')
+			num_lines++;
+		if (num_lines >= execp->backend->continuous) {
+			if (end)
+				*end = '\0';
+			free_and_null(execp->backend->text);
+			free_and_null(execp->backend->icon_path);
+			if (!execp->backend->has_icon) {
+				execp->backend->text = strdup(execp->backend->buf_output);
+			} else {
+				char *text = strchr(execp->backend->buf_output, '\n');
+				if (text) {
+					*text = '\0';
+					text++;
+					execp->backend->text = strdup(text);
+				} else {
+					execp->backend->text = strdup("");
+				}
+				execp->backend->icon_path = strdup(execp->backend->buf_output);
+			}
+			int len = strlen(execp->backend->text);
+			if (len > 0 && execp->backend->text[len - 1] == '\n')
+				execp->backend->text[len - 1] = '\0';
+
+			if (end) {
+				char *next = end + 1;
+				int copied = next - execp->backend->buf_output;
+				int remaining = execp->backend->buf_length - copied;
+				if (remaining > 0) {
+					memmove(execp->backend->buf_output, next, remaining);
+					execp->backend->buf_length = remaining;
+					execp->backend->buf_output[execp->backend->buf_length] = '\0';
+				} else {
+					execp->backend->buf_length = 0;
+					execp->backend->buf_output[execp->backend->buf_length] = '\0';
+				}
+			}
+
+			execp->backend->last_update_finish_time = time(NULL);
+			execp->backend->last_update_duration =
+			    execp->backend->last_update_finish_time - execp->backend->last_update_start_time;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+const char *time_to_string(int seconds, char *buffer)
+{
+	if (seconds < 60) {
+		sprintf(buffer, "%ds", seconds);
+	} else if (seconds < 60 * 60) {
+		int m = seconds / 60;
+		seconds = seconds % 60;
+		int s = seconds;
+		sprintf(buffer, "%d:%ds", m, s);
+	} else {
+		int h = seconds / (60 * 60);
+		seconds = seconds % (60 * 60);
+		int m = seconds / 60;
+		seconds = seconds % 60;
+		int s = seconds;
+		sprintf(buffer, "%d:%d:%ds", h, m, s);
+	}
+	return buffer;
+}
+
+char *execp_get_tooltip(void *obj)
+{
+	Execp *execp = obj;
+
+	if (execp->backend->tooltip) {
+		if (strlen(execp->backend->tooltip) > 0)
+			return strdup(execp->backend->tooltip);
+		else
+			return NULL;
+	}
+
+	time_t now = time(NULL);
+
+	char tmp_buf1[256];
+	char tmp_buf2[256];
+	char tmp_buf3[256];
+	if (execp->backend->child_pipe < 0) {
+		// Not executing command
+		if (execp->backend->last_update_finish_time) {
+			// We updated at least once
+			if (execp->backend->interval > 0) {
+				sprintf(execp->backend->tooltip_text,
+				        "Last update finished %s ago (took %s). Next update starting in %s.",
+				        time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
+				        time_to_string((int)execp->backend->last_update_duration, tmp_buf2),
+				        time_to_string((int)(execp->backend->interval - (now - execp->backend->last_update_finish_time)),
+				                       tmp_buf3));
+			} else {
+				sprintf(execp->backend->tooltip_text,
+				        "Last update finished %s ago (took %s).",
+				        time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
+				        time_to_string((int)execp->backend->last_update_duration, tmp_buf2));
+			}
+		} else {
+			// we never requested an update
+			sprintf(execp->backend->tooltip_text, "Never updated. No update scheduled.");
+		}
+	} else {
+		// Currently executing command
+		if (execp->backend->last_update_finish_time) {
+			// we finished updating at least once
+			sprintf(execp->backend->tooltip_text,
+			        "Last update finished %s ago. Update in progress (started %s ago).",
+			        time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
+			        time_to_string((int)(now - execp->backend->last_update_start_time), tmp_buf3));
+		} else {
+			// we never finished an update
+			sprintf(execp->backend->tooltip_text,
+			        "First update in progress (started %s seconds ago).",
+			        time_to_string((int)(now - execp->backend->last_update_start_time), tmp_buf1));
+		}
+	}
+	return strdup(execp->backend->tooltip_text);
+}

src/execplugin/execplugin.h

@@ -0,0 +1,143 @@
+#ifndef EXECPLUGIN_H
+#define EXECPLUGIN_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 Execp, 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 Execp which was initially copied
+// from panel_config. Each works as a frontend to the corresponding Execp in panel_config as backend, using the
+// backend's config and state variables.
+
+typedef struct ExecpBackend {
+	// Config:
+	// Command to execute at a specified interval
+	char *command;
+	// Interval in seconds
+	int interval;
+	// 1 if first line of output is an icon path
+	gboolean has_icon;
+	gboolean cache_icon;
+	int icon_w;
+	int icon_h;
+	char *tooltip;
+	gboolean centered;
+	gboolean has_font;
+	PangoFontDescription *font_desc;
+	Color font_color;
+	int continuous;
+	gboolean has_markup;
+	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;
+
+	// Backend state:
+	timeout *timer;
+	int child_pipe;
+	pid_t child;
+
+	// Command output buffer
+	char *buf_output;
+	int buf_length;
+	int buf_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];
+
+	// The time the last command was started
+	time_t last_update_start_time;
+	// The time the last output was obtained
+	time_t last_update_finish_time;
+	// The time it took to execute last command
+	time_t last_update_duration;
+
+	// List of Execp which are frontends for this backend, one for each panel
+	GList *instances;
+	GTree *cmd_pids;
+} ExecpBackend;
+
+typedef struct ExecpFrontend {
+	// Frontend state:
+	int iconx;
+	int icony;
+	int textx;
+	int texty;
+	int textw;
+	int texth;
+} ExecpFrontend;
+
+typedef struct Execp {
+	Area area;
+	// All elements have the backend pointer set. However only backend elements have ownership.
+	ExecpBackend *backend;
+	// Set only for frontend Execp items.
+	ExecpFrontend *frontend;
+} Execp;
+
+// Called before the config is read and panel_config/panels are created.
+// Afterwards, the config parsing code creates the array of Execp in panel_config and populates the configuration fields
+// in the backend.
+// Probably does nothing.
+void default_execp();
+
+// Creates a new Execp 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.
+Execp *create_execp();
+
+void destroy_execp(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.execp_list.
+void init_execp();
+
+// 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_execp_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_execp();
+
+// Called on draw, obj = pointer to the front-end Execp item.
+void draw_execp(void *obj, cairo_t *c);
+
+// Called on resize, obj = pointer to the front-end Execp item.
+// Returns 1 if the new size is different than the previous size.
+gboolean resize_execp(void *obj);
+
+// Called on mouse click event.
+void execp_action(void *obj, int button, int x, int y);
+
+void execp_cmd_completed(Execp *obj, pid_t pid);
+
+// Called to check if new output from the command can be read.
+// No command might be running.
+// Returns 1 if the output has been updated and a redraw is needed.
+gboolean read_execp(void *obj);
+
+void execp_default_font_changed();
+
+#endif // EXECPLUGIN_H

src/freespace/freespace.c

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

src/freespace/freespace.h

@@ -12,9 +12,11 @@ typedef struct FreeSpace {
 	Area area;
 } FreeSpace;
 
-void cleanup_freespace();
+struct Panel;
+
+void cleanup_freespace(struct Panel *panel);
 void init_freespace_panel(void *panel);
 
-int resize_freespace(void *obj);
+gboolean resize_freespace(void *obj);
 
 #endif

src/launcher/apps-common.c

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

src/launcher/apps-common.h

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

src/launcher/icon-theme-common.c

@@ -20,11 +20,14 @@
 
 #include "icon-theme-common.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "apps-common.h"
+#include "common.h"
+#include "cache.h"
 
 #define ICON_DIR_TYPE_SCALABLE 0
 #define ICON_DIR_TYPE_FIXED 1
@@ -38,7 +41,6 @@ typedef struct IconThemeDir {
 	int threshold;
 } IconThemeDir;
 
-
 int parse_theme_line(char *line, char **key, char **value)
 {
 	return parse_dektop_line(line, key, value);
@@ -51,23 +53,26 @@ const GSList *get_icon_locations()
 	if (icon_locations)
 		return icon_locations;
 
-	gchar *path;
-	path = g_build_filename(g_get_home_dir(), ".icons", NULL);
-	icon_locations = g_slist_append(icon_locations, g_strdup(path));
-	g_free(path);
-	path = g_build_filename(g_get_home_dir(), ".local/share/icons", NULL);
-	icon_locations = g_slist_append(icon_locations, g_strdup(path));
-	g_free(path);
+	icon_locations = load_locations_from_env(icon_locations, "XDG_DATA_HOME", ".icons", NULL);
+
+	icon_locations = g_slist_append(icon_locations, g_build_filename(g_get_home_dir(), ".icons", NULL));
+	icon_locations = g_slist_append(icon_locations, g_build_filename(g_get_home_dir(), ".local/share/icons", NULL));
+
+	icon_locations = load_locations_from_env(icon_locations, "XDG_DATA_DIRS", ".icons", ".pixmaps", NULL);
+
 	icon_locations = g_slist_append(icon_locations, g_strdup("/usr/local/share/icons"));
 	icon_locations = g_slist_append(icon_locations, g_strdup("/usr/local/share/pixmaps"));
 	icon_locations = g_slist_append(icon_locations, g_strdup("/usr/share/icons"));
 	icon_locations = g_slist_append(icon_locations, g_strdup("/usr/share/pixmaps"));
 	icon_locations = g_slist_append(icon_locations, g_strdup("/opt/share/icons"));
 	icon_locations = g_slist_append(icon_locations, g_strdup("/opt/share/pixmaps"));
+
+	icon_locations = slist_remove_duplicates(icon_locations, g_str_equal, g_free);
+
 	return icon_locations;
 }
 
-IconTheme *make_theme(char *name)
+IconTheme *make_theme(const char *name)
 {
 	IconTheme *theme = calloc(1, sizeof(IconTheme));
 	theme->name = strdup(name);
@@ -76,8 +81,8 @@ IconTheme *make_theme(char *name)
 	return theme;
 }
 
-//TODO Use UTF8 when parsing the file
-IconTheme *load_theme_from_index(char *file_name, char *name)
+// TODO Use UTF8 when parsing the file
+IconTheme *load_theme_from_index(const char *file_name, const char *name)
 {
 	IconTheme *theme;
 	FILE *f;
@@ -168,9 +173,8 @@ IconTheme *load_theme_from_index(char *file_name, char *name)
 			current_dir = NULL;
 			line[line_len - 1] = '\0';
 			char *dir_name = line + 1;
-			GSList* dir_item = theme->list_directories;
-			while (dir_item != NULL)
-			{
+			GSList *dir_item = theme->list_directories;
+			while (dir_item != NULL) {
 				IconThemeDir *dir = dir_item->data;
 				if (strcmp(dir->name, dir_name) == 0) {
 					current_dir = dir;
@@ -186,7 +190,7 @@ IconTheme *load_theme_from_index(char *file_name, char *name)
 	return theme;
 }
 
-void load_theme_from_fs_dir(IconTheme *theme, char *dir_name)
+void load_theme_from_fs_dir(IconTheme *theme, const char *dir_name)
 {
 	gchar *file_name = g_build_filename(dir_name, "index.theme", NULL);
 	if (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
@@ -226,12 +230,11 @@ void load_theme_from_fs_dir(IconTheme *theme, char *dir_name)
 	}
 }
 
-IconTheme *load_theme_from_fs(char *name, IconTheme *theme)
+IconTheme *load_theme_from_fs(const char *name, IconTheme *theme)
 {
 	gchar *dir_name = NULL;
-	const GSList *location;
-	for (location = get_icon_locations(); location; location = g_slist_next(location)) {
-		gchar *path = (gchar*) location->data;
+	for (const GSList *location = get_icon_locations(); location; location = g_slist_next(location)) {
+		gchar *path = (gchar *)location->data;
 		dir_name = g_build_filename(path, name, NULL);
 		if (g_file_test(dir_name, G_FILE_TEST_IS_DIR)) {
 			if (!theme) {
@@ -246,7 +249,7 @@ IconTheme *load_theme_from_fs(char *name, IconTheme *theme)
 	return theme;
 }
 
-IconTheme *load_theme(char *name)
+IconTheme *load_theme(const char *name)
 {
 	// Look for name/index.theme in $HOME/.icons, /usr/share/icons, /usr/share/pixmaps (stop at the first found)
 	// Parse index.theme -> list of IconThemeDir with attributes
@@ -256,9 +259,8 @@ IconTheme *load_theme(char *name)
 		return NULL;
 
 	gchar *file_name = NULL;
-	const GSList *location;
-	for (location = get_icon_locations(); location; location = g_slist_next(location)) {
-		gchar *path = (gchar*) location->data;
+	for (const GSList *location = get_icon_locations(); location; location = g_slist_next(location)) {
+		gchar *path = (gchar *)location->data;
 		file_name = g_build_filename(path, name, "index.theme", NULL);
 		if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) {
 			g_free(file_name);
@@ -283,14 +285,14 @@ void free_icon_theme(IconTheme *theme)
 		return;
 	free(theme->name);
 	theme->name = NULL;
-	GSList *l_inherits;
-	for (l_inherits = theme->list_inherits; l_inherits ; l_inherits = l_inherits->next) {
+	free(theme->description);
+	theme->description = NULL;
+	for (GSList *l_inherits = theme->list_inherits; l_inherits; l_inherits = l_inherits->next) {
 		free(l_inherits->data);
 	}
 	g_slist_free(theme->list_inherits);
 	theme->list_inherits = NULL;
-	GSList *l_dir;
-	for (l_dir = theme->list_directories; l_dir ; l_dir = l_dir->next) {
+	for (GSList *l_dir = theme->list_directories; l_dir; l_dir = l_dir->next) {
 		IconThemeDir *dir = (IconThemeDir *)l_dir->data;
 		free(dir->name);
 		free(l_dir->data);
@@ -299,24 +301,26 @@ void free_icon_theme(IconTheme *theme)
 	theme->list_directories = NULL;
 }
 
-void free_themes(IconThemeWrapper *themes)
+void free_themes(IconThemeWrapper *wrapper)
 {
-	if (!themes)
+	if (!wrapper)
 		return;
-	GSList *l;
-	for (l = themes->themes; l ; l = l->next) {
-		IconTheme *theme = (IconTheme*) l->data;
+	free(wrapper->icon_theme_name);
+	for (GSList *l = wrapper->themes; l; l = l->next) {
+		IconTheme *theme = (IconTheme *)l->data;
 		free_icon_theme(theme);
 		free(theme);
 	}
-	g_slist_free(themes->themes);
-	for (l = themes->themes_fallback; l ; l = l->next) {
-		IconTheme *theme = (IconTheme*) l->data;
+	g_slist_free(wrapper->themes);
+	for (GSList *l = wrapper->themes_fallback; l; l = l->next) {
+		IconTheme *theme = (IconTheme *)l->data;
 		free_icon_theme(theme);
 		free(theme);
 	}
-	g_slist_free(themes->themes_fallback);
-	free(themes);
+	g_slist_free(wrapper->themes_fallback);
+	g_slist_free_full(wrapper->_queued, free);
+	free_cache(&wrapper->_cache);
+	free(wrapper);
 }
 
 void test_launcher_read_theme_file()
@@ -328,21 +332,24 @@ void test_launcher_read_theme_file()
 		return;
 	}
 	printf("Loaded theme: %s\n", theme->name);
-	GSList* item = theme->list_inherits;
-	while (item != NULL)
-	{
-		printf("Inherits:%s\n", (char*)item->data);
+	GSList *item = theme->list_inherits;
+	while (item != NULL) {
+		printf("Inherits:%s\n", (char *)item->data);
 		item = g_slist_next(item);
 	}
 	item = theme->list_directories;
-	while (item != NULL)
-	{
+	while (item != NULL) {
 		IconThemeDir *dir = item->data;
 		printf("Dir:%s Size=%d MinSize=%d MaxSize=%d Threshold=%d Type=%s\n",
-			   dir->name, dir->size, dir->min_size, dir->max_size, dir->threshold,
-			   dir->type == ICON_DIR_TYPE_FIXED ? "Fixed" :
-			   dir->type == ICON_DIR_TYPE_SCALABLE ? "Scalable" :
-			   dir->type == ICON_DIR_TYPE_THRESHOLD ? "Threshold" : "?????");
+			   dir->name,
+			   dir->size,
+			   dir->min_size,
+			   dir->max_size,
+			   dir->threshold,
+			   dir->type == ICON_DIR_TYPE_FIXED ? "Fixed" : dir->type == ICON_DIR_TYPE_SCALABLE
+																? "Scalable"
+																: dir->type == ICON_DIR_TYPE_THRESHOLD ? "Threshold"
+																									   : "?????");
 		item = g_slist_next(item);
 	}
 	fprintf(stdout, "\033[0m");
@@ -350,7 +357,7 @@ void test_launcher_read_theme_file()
 
 gboolean str_list_contains(const GSList *list, const char *value)
 {
-	const GSList* item = list;
+	const GSList *item = list;
 	while (item != NULL) {
 		if (g_str_equal(item->data, value)) {
 			return TRUE;
@@ -369,18 +376,17 @@ void load_themes_helper(const char *name, GSList **themes, GSList **queued)
 
 	// Load wrapper->themes
 	while (queue) {
-		char *name = queue->data;
-		queue = g_slist_remove(queue, name);
+		char *queued_name = queue->data;
+		queue = g_slist_remove(queue, queued_name);
 
-		fprintf(stderr, " '%s',", name);
-		IconTheme *theme = load_theme(name);
+		fprintf(stderr, " '%s',", queued_name);
+		IconTheme *theme = load_theme(queued_name);
 		if (theme != NULL) {
 			*themes = g_slist_append(*themes, theme);
 
-			GSList* item = theme->list_inherits;
+			GSList *item = theme->list_inherits;
 			int pos = 0;
-			while (item != NULL)
-			{
+			while (item != NULL) {
 				char *parent = item->data;
 				if (!str_list_contains(*queued, parent)) {
 					queue = g_slist_insert(queue, strdup(parent), pos);
@@ -391,17 +397,86 @@ void load_themes_helper(const char *name, GSList **themes, GSList **queued)
 			}
 		}
 
-		free(name);
+		free(queued_name);
 	}
 	fprintf(stderr, "\n");
 
 	// Free the queue
 	GSList *l;
-	for (l = queue; l ; l = l->next)
+	for (l = queue; l; l = l->next)
 		free(l->data);
 	g_slist_free(queue);
 }
 
+void load_default_theme(IconThemeWrapper *wrapper)
+{
+	if (wrapper->_themes_loaded)
+		return;
+
+	fprintf(stderr, GREEN "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);
+
+	wrapper->_themes_loaded = TRUE;
+}
+
+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");
+
+	// Load wrapper->themes_fallback
+	const GSList *location;
+	for (location = get_icon_locations(); location; location = g_slist_next(location)) {
+		gchar *path = (gchar *)location->data;
+		GDir *d = g_dir_open(path, 0, NULL);
+		if (d) {
+			const gchar *name;
+			while ((name = g_dir_read_name(d))) {
+				gchar *file_name = g_build_filename(path, name, "index.theme", NULL);
+				if (g_file_test(file_name, G_FILE_TEST_EXISTS) && !g_file_test(file_name, G_FILE_TEST_IS_DIR)) {
+					load_themes_helper(name, &wrapper->themes_fallback, &wrapper->_queued);
+				}
+				g_free(file_name);
+			}
+			g_dir_close(d);
+		}
+	}
+
+	wrapper->_fallback_loaded = TRUE;
+}
+
+gchar *get_icon_cache_path()
+{
+	return g_build_filename(g_get_user_cache_dir(), "tint2", "icon.cache", NULL);
+}
+
+void load_icon_cache(IconThemeWrapper *wrapper)
+{
+	if (wrapper->_cache.loaded)
+		return;
+
+	fprintf(stderr, GREEN "Loading icon theme cache..." RESET "\n");
+
+	gchar *cache_path = get_icon_cache_path();
+	load_cache(&wrapper->_cache, cache_path);
+	g_free(cache_path);
+}
+
+void save_icon_cache(IconThemeWrapper *wrapper)
+{
+	if (!wrapper || !wrapper->_cache.dirty)
+		return;
+
+	fprintf(stderr, GREEN "Saving icon theme cache..." RESET "\n");
+	gchar *cache_path = get_icon_cache_path();
+	save_cache(&wrapper->_cache, cache_path);
+	g_free(cache_path);
+}
+
 IconThemeWrapper *load_themes(const char *icon_theme_name)
 {
 	IconThemeWrapper *wrapper = calloc(1, sizeof(IconThemeWrapper));
@@ -409,38 +484,9 @@ IconThemeWrapper *load_themes(const char *icon_theme_name)
 	if (!icon_theme_name) {
 		fprintf(stderr, "Missing icon_theme_name theme, default to 'hicolor'.\n");
 		icon_theme_name = "hicolor";
-	} else {
-		fprintf(stderr, "Loading %s. Icon theme :", icon_theme_name);
 	}
 
-	GSList *queued = NULL;
-	load_themes_helper(icon_theme_name, &wrapper->themes, &queued);
-	load_themes_helper("hicolor", &wrapper->themes, &queued);
-
-	// Load wrapper->themes_fallback
-	const GSList *location;
-	for (location = get_icon_locations(); location; location = g_slist_next(location)) {
-		gchar *path = (gchar*) location->data;
-		GDir *d = g_dir_open(path, 0, NULL);
-		if (d) {
-			const gchar *name;
-			while ((name = g_dir_read_name(d))) {
-				gchar *file_name = g_build_filename(path, name, "index.theme", NULL);
-				if (g_file_test(file_name, G_FILE_TEST_EXISTS) &&
-					!g_file_test(file_name, G_FILE_TEST_IS_DIR)) {
-					load_themes_helper(name, &wrapper->themes_fallback, &queued);
-				}
-				g_free(file_name);
-			}
-			g_dir_close(d);
-		}
-	}
-
-	// Free the queued list
-	GSList *l;
-	for (l = queued; l ; l = l->next)
-		free(l->data);
-	g_slist_free(queued);
+	wrapper->icon_theme_name = strdup(icon_theme_name);
 
 	return wrapper;
 }
@@ -482,8 +528,8 @@ int directory_size_distance(IconThemeDir *dir, int size)
 gint compare_theme_directories(gconstpointer a, gconstpointer b, gpointer size_query)
 {
 	int size = GPOINTER_TO_INT(size_query);
-	const IconThemeDir *da = (const IconThemeDir*)a;
-	const IconThemeDir *db = (const IconThemeDir*)b;
+	const IconThemeDir *da = (const IconThemeDir *)a;
+	const IconThemeDir *db = (const IconThemeDir *)b;
 	return abs(da->size - size) - abs(db->size - size);
 }
 
@@ -509,9 +555,8 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 	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
-	GSList *ext;
-	for (ext = extensions; ext; ext = g_slist_next(ext)) {
-		char *extension = (char*) ext->data;
+	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, "");
@@ -540,33 +585,33 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 	char *file_name = calloc(file_name_size, 1);
 
 	for (theme = themes; theme; theme = g_slist_next(theme)) {
-		((IconTheme*)theme->data)->list_directories = g_slist_sort_with_data(((IconTheme*)theme->data)->list_directories,
-																			 compare_theme_directories,
-																			 GINT_TO_POINTER(size));
+		((IconTheme *)theme->data)->list_directories =
+			g_slist_sort_with_data(((IconTheme *)theme->data)->list_directories,
+								   compare_theme_directories,
+								   GINT_TO_POINTER(size));
 		GSList *dir;
-		for (dir = ((IconTheme*)theme->data)->list_directories; dir; dir = g_slist_next(dir)) {
+		for (dir = ((IconTheme *)theme->data)->list_directories; dir; dir = g_slist_next(dir)) {
 			// Closest match
-			gboolean possible = directory_size_distance((IconThemeDir*)dir->data, size) < minimal_size &&
+			gboolean possible = directory_size_distance((IconThemeDir *)dir->data, size) < minimal_size &&
 								(!best_file_theme ? TRUE : theme == best_file_theme);
 			// Next larger match
-			possible = possible ||
-					   (((IconThemeDir*)dir->data)->size >= size &&
-						(next_larger_size == -1 || ((IconThemeDir*)dir->data)->size < next_larger_size) &&
-						(!next_larger_theme ? 1 : theme == next_larger_theme));
+			possible = possible || (((IconThemeDir *)dir->data)->size >= size &&
+									(next_larger_size == -1 || ((IconThemeDir *)dir->data)->size < next_larger_size) &&
+									(!next_larger_theme ? 1 : theme == next_larger_theme));
 			if (!possible)
 				continue;
 			const GSList *base;
 			for (base = basenames; base; base = g_slist_next(base)) {
-				GSList *ext;
-				for (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;
-					char *extension = (char*) ext->data;
-					if (strlen(base_name) + strlen(theme_name) +
-						strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100 > file_name_size) {
-						file_name_size = strlen(base_name) + strlen(theme_name) +
-										 strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100;
+				for (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;
+					char *extension = (char *)ext->data;
+					if (strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) +
+							strlen(extension) + 100 >
+						file_name_size) {
+						file_name_size = strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) +
+										 strlen(extension) + 100;
 						file_name = realloc(file_name, file_name_size);
 					}
 					file_name[0] = 0;
@@ -578,27 +623,28 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 						if (DEBUG_ICON_SEARCH)
 							printf("found: %s\n", file_name);
 						// Closest match
-						if (directory_size_distance((IconThemeDir*)dir->data, size) < minimal_size && (!best_file_theme ? 1 : theme == best_file_theme)) {
+						if (directory_size_distance((IconThemeDir *)dir->data, size) < minimal_size &&
+							(!best_file_theme ? 1 : theme == best_file_theme)) {
 							if (best_file_name) {
 								free(best_file_name);
 								best_file_name = NULL;
 							}
 							best_file_name = strdup(file_name);
-							minimal_size = directory_size_distance((IconThemeDir*)dir->data, size);
+							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);
 						}
 						// Next larger match
-						if (((IconThemeDir*)dir->data)->size >= size &&
-							(next_larger_size == -1 || ((IconThemeDir*)dir->data)->size < next_larger_size) &&
+						if (((IconThemeDir *)dir->data)->size >= size &&
+							(next_larger_size == -1 || ((IconThemeDir *)dir->data)->size < next_larger_size) &&
 							(!next_larger_theme ? 1 : theme == next_larger_theme)) {
 							if (next_larger) {
 								free(next_larger);
 								next_larger = NULL;
 							}
 							next_larger = strdup(file_name);
-							next_larger_size = ((IconThemeDir*)dir->data)->size;
+							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);
@@ -622,14 +668,11 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 
 	// Look in unthemed icons
 	{
-		const GSList *base;
-		for (base = basenames; base; base = g_slist_next(base)) {
-			GSList *ext;
-			for (ext = extensions; ext; ext = g_slist_next(ext)) {
-				char *base_name = (char*) base->data;
-				char *extension = (char*) ext->data;
-				char *file_name = calloc(strlen(base_name) + strlen(icon_name) +
-										 strlen(extension) + 100, 1);
+		for (const GSList *base = basenames; base; base = g_slist_next(base)) {
+			for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
+				char *base_name = (char *)base->data;
+				char *extension = (char *)ext->data;
+				file_name = calloc(strlen(base_name) + strlen(icon_name) + strlen(extension) + 100, 1);
 				// filename = directory/iconname.extension
 				sprintf(file_name, "%s/%s%s", base_name, icon_name, extension);
 				if (DEBUG_ICON_SEARCH)
@@ -649,21 +692,91 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 	return NULL;
 }
 
-char *get_icon_path(IconThemeWrapper *theme, const char *icon_name, int size)
+char *get_icon_path_from_cache(IconThemeWrapper *wrapper, const char *icon_name, int size)
 {
-	if (!theme)
+	if (!wrapper || !icon_name || strlen(icon_name) == 0)
 		return NULL;
+
+	load_icon_cache(wrapper);
+
+	gchar *key = g_strdup_printf("%s\t%s\t%d", wrapper->icon_theme_name, icon_name, size);
+	const gchar *value = get_from_cache(&wrapper->_cache, key);
+	g_free(key);
+
+	if (!value) {
+		fprintf(stderr,
+		        YELLOW "Icon path not found in cache: theme = %s, icon = %s, size = %d" RESET "\n",
+		        wrapper->icon_theme_name,
+		        icon_name,
+		        size);
+		return NULL;
+	}
+
+	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",
+	// wrapper->icon_theme_name, icon_name, size, value);
+
+	return strdup(value);
+}
+
+void add_icon_path_to_cache(IconThemeWrapper *wrapper, const char *icon_name, int size, const char *path)
+{
+	if (!wrapper || !icon_name || strlen(icon_name) == 0 || !path || strlen(path) == 0)
+		return;
+
+	fprintf(stderr,
+			"Adding icon path to cache: theme = %s, icon = %s, size = %d, path = %s\n",
+			wrapper->icon_theme_name,
+			icon_name,
+			size,
+			path);
+
+	load_icon_cache(wrapper);
+
+	gchar *key = g_strdup_printf("%s\t%s\t%d", wrapper->icon_theme_name, icon_name, size);
+	add_to_cache(&wrapper->_cache, key, path);
+	g_free(key);
+}
+
+char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size, gboolean use_fallbacks)
+{
+	if (!wrapper)
+		return NULL;
+
+	if (!icon_name || strlen(icon_name) == 0)
+		goto notfound;
+
+	char *path = get_icon_path_from_cache(wrapper, icon_name, size);
+	if (path)
+		return path;
+
+	load_default_theme(wrapper);
+
 	icon_name = icon_name ? icon_name : DEFAULT_ICON;
-	char *path = get_icon_path_helper(theme->themes, icon_name, size);
-	if (!path) {
-		path = get_icon_path_helper(theme->themes_fallback, icon_name, size);
+	path = get_icon_path_helper(wrapper->themes, icon_name, size);
+	if (path) {
+		add_icon_path_to_cache(wrapper, icon_name, size, path);
+		return path;
 	}
-	if (!path) {
-		fprintf(stderr, "Could not find icon %s\n", icon_name);
-		path = get_icon_path_helper(theme->themes, DEFAULT_ICON, size);
-	}
-	if (!path) {
-		path = get_icon_path_helper(theme->themes_fallback, DEFAULT_ICON, size);
+
+	if (!use_fallbacks)
+		goto notfound;
+	fprintf(stderr, YELLOW "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);
+	if (path) {
+		add_icon_path_to_cache(wrapper, icon_name, size, path);
+		return path;
 	}
+
+notfound:
+	fprintf(stderr, RED "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;
+	path = get_icon_path_helper(wrapper->themes_fallback, DEFAULT_ICON, size);
 	return path;
 }

src/launcher/icon-theme-common.h

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

src/launcher/launcher.c

@@ -30,13 +30,7 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <sys/types.h>
-#include <sys/wait.h>
-
-#ifdef HAVE_RSVG
-#include <librsvg/rsvg.h>
-#endif
 
 #include "window.h"
 #include "server.h"
@@ -56,11 +50,18 @@ int launcher_brightness;
 char *icon_theme_name_config;
 char *icon_theme_name_xsettings;
 int launcher_icon_theme_override;
-XSettingsClient *xsettings_client;
 int startup_notifications;
+Background *launcher_icon_bg;
+GList *launcher_icon_gradients;
 
 Imlib_Image scale_icon(Imlib_Image original, int icon_size);
 void free_icon(Imlib_Image icon);
+void launcher_icon_dump_geometry(void *obj, int indent);
+void launcher_reload_icon(Launcher *launcher, LauncherIcon *launcherIcon);
+void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon);
+void launcher_reload_hidden_icons(Launcher *launcher);
+void launcher_icon_on_change_layout(void *obj);
+int launcher_compute_desired_size(void *obj);
 
 void default_launcher()
 {
@@ -73,63 +74,59 @@ void default_launcher()
 	icon_theme_name_config = NULL;
 	icon_theme_name_xsettings = NULL;
 	launcher_icon_theme_override = 0;
-	xsettings_client = NULL;
 	startup_notifications = 0;
+	launcher_icon_bg = NULL;
+	launcher_icon_gradients = NULL;
 }
 
-
 void init_launcher()
 {
-	if (launcher_enabled) {
-		// if XSETTINGS manager running, tint2 read the icon_theme_name.
-		xsettings_client = xsettings_client_new(server.dsp, server.screen, xsettings_notify_cb, NULL, NULL);
-	}
 }
 
-
 void init_launcher_panel(void *p)
 {
-	Panel *panel =(Panel*)p;
+	Panel *panel = (Panel *)p;
 	Launcher *launcher = &panel->launcher;
 
 	launcher->area.parent = p;
 	launcher->area.panel = p;
+	snprintf(launcher->area.name, sizeof(launcher->area.name), "Launcher");
 	launcher->area._draw_foreground = NULL;
-	launcher->area.size_mode = SIZE_BY_CONTENT;
+	launcher->area.size_mode = LAYOUT_FIXED;
 	launcher->area._resize = resize_launcher;
-	launcher->area.resize = 1;
-	launcher->area.redraw = 1;
+	launcher->area._compute_desired_size = launcher_compute_desired_size;
+	launcher->area.resize_needed = 1;
+	schedule_redraw(&launcher->area);
 	if (!launcher->area.bg)
 		launcher->area.bg = &g_array_index(backgrounds, Background, 0);
 
+	if (!launcher_icon_bg)
+		launcher_icon_bg = &g_array_index(backgrounds, Background, 0);
+
 	// check consistency
 	if (launcher->list_apps == NULL)
 		return;
 
-	launcher->area.on_screen = 1;
-	panel_refresh = 1;
+	// 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->area.on_screen = TRUE;
+	schedule_panel_redraw();
+	instantiate_area_gradients(&launcher->area);
 
 	launcher_load_themes(launcher);
 	launcher_load_icons(launcher);
 }
 
-
 void cleanup_launcher()
 {
-	int i;
-	GSList *l;
-
-	if (xsettings_client)
-		xsettings_client_destroy(xsettings_client);
-	xsettings_client = NULL;
-
-	for (i = 0; i < nb_panel; i++) {
-		Panel *panel = &panel1[i];
+	for (int i = 0; i < num_panels; i++) {
+		Panel *panel = &panels[i];
 		Launcher *launcher = &panel->launcher;
 		cleanup_launcher_theme(launcher);
 	}
 
-	for (l = panel_config.launcher.list_apps; l ; l = l->next) {
+	for (GSList *l = panel_config.launcher.list_apps; l; l = l->next) {
 		free(l->data);
 	}
 	g_slist_free(panel_config.launcher.list_apps);
@@ -141,244 +138,265 @@ void cleanup_launcher()
 	free(icon_theme_name_xsettings);
 	icon_theme_name_xsettings = NULL;
 
-	launcher_enabled = 0;
+	launcher_enabled = FALSE;
 }
 
-
 void cleanup_launcher_theme(Launcher *launcher)
 {
 	free_area(&launcher->area);
-	GSList *l;
-	for (l = launcher->list_icons; l ; l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
+	for (GSList *l = launcher->list_icons; l; l = l->next) {
+		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
 		if (launcherIcon) {
 			free_icon(launcherIcon->image);
+			free_icon(launcherIcon->image_hover);
+			free_icon(launcherIcon->image_pressed);
 			free(launcherIcon->icon_name);
 			free(launcherIcon->icon_path);
 			free(launcherIcon->cmd);
-			free(launcherIcon->icon_tooltip);
+			g_free(launcherIcon->icon_tooltip);
+			free(launcherIcon->config_path);
 		}
 		free(launcherIcon);
 	}
 	g_slist_free(launcher->list_icons);
 	launcher->list_icons = NULL;
 
-	free_themes(launcher->list_themes);
-	launcher->list_themes = NULL;
+	free_themes(launcher->icon_theme_wrapper);
+	launcher->icon_theme_wrapper = NULL;
 }
 
-
-int resize_launcher(void *obj)
+int launcher_compute_icon_size(Launcher *launcher)
 {
-	Launcher *launcher = obj;
-	GSList *l;
-	int count, icon_size;
-	int icons_per_column=1, icons_per_row=1, marging=0;
-
-	if (panel_horizontal) {
-		icon_size = launcher->area.height;
-	} else {
-		icon_size = launcher->area.width;
-	}
-	icon_size = icon_size - (2 * launcher->area.bg->border.width) - (2 * launcher->area.paddingy);
+	int icon_size = panel_horizontal ? launcher->area.height : launcher->area.width;
+	icon_size = icon_size - MAX(left_right_border_width(&launcher->area), top_bottom_border_width(&launcher->area)) -
+	            (2 * launcher->area.paddingy);
 	if (launcher_max_icon_size > 0 && icon_size > launcher_max_icon_size)
 		icon_size = launcher_max_icon_size;
+	return icon_size;
+}
+
+void launcher_compute_geometry(Launcher *launcher,
+                               int *size,
+                               int *icon_size,
+                               int *icons_per_column,
+                               int *icons_per_row,
+                               int *margin)
+{
+	int count = 0;
+	for (GSList *l = launcher->list_icons; l; l = l->next) {
+		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+		if (launcherIcon->area.on_screen)
+			count++;
+	}
+
+	*icon_size = launcher_compute_icon_size(launcher);
+	*icons_per_column = 1;
+	*icons_per_row = 1;
+	*margin = 0;
+	if (panel_horizontal) {
+		if (!count) {
+			*size = 0;
+		} else {
+			int height = launcher->area.height - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
+			// here icons_per_column always higher than 0
+			*icons_per_column = (height + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
+			*margin = height - (*icons_per_column - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
+			*icons_per_row = count / *icons_per_column + (count % *icons_per_column != 0);
+			*size = left_right_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
+			        (*icon_size * *icons_per_row) + ((*icons_per_row - 1) * launcher->area.paddingx);
+		}
+	} else {
+		if (!count) {
+			*size = 0;
+		} else {
+			int width = launcher->area.width - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
+			// here icons_per_row always higher than 0
+			*icons_per_row = (width + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
+			*margin = width - (*icons_per_row - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
+			*icons_per_column = count / *icons_per_row + (count % *icons_per_row != 0);
+			*size = top_bottom_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
+			        (*icon_size * *icons_per_column) + ((*icons_per_column - 1) * launcher->area.paddingx);
+		}
+	}
+}
+
+int launcher_compute_desired_size(void *obj)
+{
+	Launcher *launcher = (Launcher *)obj;
+
+	int size, icon_size, icons_per_column, icons_per_row, margin;
+	launcher_compute_geometry(launcher, &size, &icon_size, &icons_per_column, &icons_per_row, &margin);
+	return size;
+}
+
+gboolean resize_launcher(void *obj)
+{
+	Launcher *launcher = (Launcher *)obj;
+
+	int size, icons_per_column, icons_per_row, margin;
+	launcher_compute_geometry(launcher, &size, &launcher->icon_size, &icons_per_column, &icons_per_row, &margin);
 
 	// Resize icons if necessary
-	for (l = launcher->list_icons; l ; l = l->next) {
+	for (GSList *l = launcher->list_icons; l; l = l->next) {
 		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (launcherIcon->icon_size != icon_size || !launcherIcon->image) {
-			launcherIcon->icon_size = icon_size;
+		if (launcherIcon->icon_size != launcher->icon_size || !launcherIcon->image) {
+			launcherIcon->icon_size = launcher->icon_size;
 			launcherIcon->area.width = launcherIcon->icon_size;
 			launcherIcon->area.height = launcherIcon->icon_size;
-
-			// Get the path for an icon file with the new size
-			char *new_icon_path = get_icon_path(launcher->list_themes, launcherIcon->icon_name, launcherIcon->icon_size);
-			if (!new_icon_path) {
-				// Draw a blank icon
-				free_icon(launcherIcon->image);
-				launcherIcon->image = NULL;
-				continue;
-			}
-
-			// Free the old files
-			free_icon(launcherIcon->image);
-			launcherIcon->image = NULL;
-			// Load the new file and scale
-			launcherIcon->image = imlib_load_image_immediately(new_icon_path);
-#ifdef HAVE_RSVG
-			if (!launcherIcon->image && g_str_has_suffix(new_icon_path, ".svg")) {
-				char suffix[128];
-				sprintf(suffix, "tmpicon-%d.png", getpid());
-				// We fork here because librsvg allocates memory like crazy
-				pid_t pid = fork();
-				if (pid == 0) {
-					// Child
-					GError* err = NULL;
-					RsvgHandle* svg = rsvg_handle_new_from_file(new_icon_path, &err);
-
-					if (err != NULL) {
-						fprintf(stderr, "Could not load svg image!: %s", err->message);
-						g_error_free(err);
-						launcherIcon->image = NULL;
-					} else {
-						gchar *name = g_build_filename(g_get_user_config_dir(), "tint2", suffix, NULL);
-						GdkPixbuf *pixbuf = rsvg_handle_get_pixbuf(svg);
-						gdk_pixbuf_save(pixbuf, name, "png", NULL, NULL);
-					}
-					exit(0);
-				} else {
-					// Parent
-					waitpid(pid, 0, 0);
-					gchar *name = g_build_filename(g_get_user_config_dir(), "tint2", suffix, NULL);
-					launcherIcon->image = imlib_load_image_immediately_without_cache(name);
-					g_remove(name);
-					g_free(name);
-				}
-			} else
-#endif
-			{
-				launcherIcon->image = imlib_load_image_immediately(new_icon_path);
-			}
-			// On loading error, fallback to default
-			if (!launcherIcon->image) {
-				free(new_icon_path);
-				new_icon_path = get_icon_path(launcher->list_themes, DEFAULT_ICON, launcherIcon->icon_size);
-				if (new_icon_path)
-					launcherIcon->image = imlib_load_image_immediately(new_icon_path);
-			}
-
-			if (!launcherIcon->image) {
-				// Loading default icon failed, draw a blank icon
-				free(new_icon_path);
-			} else {
-				// Loaded icon successfully
-				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);
-			}
+			launcher_reload_icon_image(launcher, launcherIcon);
 		}
 	}
-	
-	count = g_slist_length(launcher->list_icons);
+	save_icon_cache(launcher->icon_theme_wrapper);
 
-	if (panel_horizontal) {
-		if (!count) {
-			launcher->area.width = 0;
+	int count = 0;
+	gboolean needs_repositioning = FALSE;
+	for (GSList *l = launcher->list_icons; l; l = l->next) {
+		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+		if (launcherIcon->area.on_screen) {
+			count++;
+			if (launcherIcon->area.posx < 0 || launcherIcon->area.posy < 0)
+				needs_repositioning = TRUE;
+		}
+	}
+
+	if (!needs_repositioning) {
+		if (panel_horizontal) {
+			if (launcher->area.width == size)
+				return FALSE;
+			launcher->area.width = size;
 		} else {
-			int height = launcher->area.height - 2*launcher->area.bg->border.width - 2*launcher->area.paddingy;
-			// here icons_per_column always higher than 0
-			icons_per_column = (height+launcher->area.paddingx) / (icon_size+launcher->area.paddingx);
-			marging = height - (icons_per_column-1)*(icon_size+launcher->area.paddingx) - icon_size;
-			icons_per_row = count / icons_per_column + (count%icons_per_column != 0);
-			launcher->area.width = (2 * launcher->area.bg->border.width) +
-								   (2 * launcher->area.paddingxlr) +
-								   (icon_size * icons_per_row) +
-								   ((icons_per_row-1) * launcher->area.paddingx);
-		}
-	}
-	else {
-		if (!count) {
-			launcher->area.height = 0;
-		} else {
-			int width = launcher->area.width - 2*launcher->area.bg->border.width - 2*launcher->area.paddingy;
-			// here icons_per_row always higher than 0
-			icons_per_row = (width+launcher->area.paddingx) / (icon_size+launcher->area.paddingx);
-			marging = width - (icons_per_row-1)*(icon_size+launcher->area.paddingx) - icon_size;
-			icons_per_column = count / icons_per_row+ (count%icons_per_row != 0);
-			launcher->area.height = (2 * launcher->area.bg->border.width) +
-									(2 * launcher->area.paddingxlr) +
-									(icon_size * icons_per_column) +
-									((icons_per_column-1) * launcher->area.paddingx);
+			if (launcher->area.height == size)
+				return FALSE;
+			launcher->area.height = size;
 		}
 	}
 
-	int i, posx, posy;
-	int start = launcher->area.bg->border.width + launcher->area.paddingy + marging/2;
+	int posx, posy;
+	int start;
 	if (panel_horizontal) {
-		posy = start;
-		posx = launcher->area.bg->border.width + launcher->area.paddingxlr;
+		posy = start = top_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
+		posx = left_border_width(&launcher->area) + launcher->area.paddingxlr;
 	} else {
-		posx = start;
-		posy = launcher->area.bg->border.width + launcher->area.paddingxlr;
+		posx = start = left_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
+		posy = top_border_width(&launcher->area) + launcher->area.paddingxlr;
 	}
 
-	for (i=1, l = launcher->list_icons; l ; i++, l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
-		
+	int i = 0;
+	for (GSList *l = launcher->list_icons; l; l = l->next) {
+		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+		if (!launcherIcon->area.on_screen)
+			continue;
+		i++;
 		launcherIcon->y = posy;
 		launcherIcon->x = posx;
-		launcherIcon->area.posy = ((Area*)launcherIcon->area.parent)->posy + launcherIcon->y;
-		launcherIcon->area.posx = ((Area*)launcherIcon->area.parent)->posx + launcherIcon->x;
-		launcherIcon->area.width = launcherIcon->icon_size;
-		launcherIcon->area.height = launcherIcon->icon_size;
-		//printf("launcher %d : %d,%d\n", i, posx, posy);
+		launcher_icon_on_change_layout(launcherIcon);
+		// printf("launcher %d : %d,%d\n", i, posx, posy);
 		if (panel_horizontal) {
 			if (i % icons_per_column) {
-				posy += icon_size + launcher->area.paddingx;
+				posy += launcher->icon_size + launcher->area.paddingx;
 			} else {
 				posy = start;
-				posx += (icon_size + launcher->area.paddingx);
+				posx += (launcher->icon_size + launcher->area.paddingx);
 			}
 		} else {
 			if (i % icons_per_row) {
-				posx += icon_size + launcher->area.paddingx;
+				posx += launcher->icon_size + launcher->area.paddingx;
 			} else {
 				posx = start;
-				posy += (icon_size + launcher->area.paddingx);
+				posy += (launcher->icon_size + launcher->area.paddingx);
 			}
 		}
 	}
 
-	return 1;
+	if ((panel_horizontal && icons_per_column == 1) || (!panel_horizontal && icons_per_row == 1)) {
+		launcher->area._is_under_mouse = full_width_area_is_under_mouse;
+		for (GSList *l = launcher->list_icons; l; l = l->next)
+			((LauncherIcon *)l->data)->area._is_under_mouse = full_width_area_is_under_mouse;
+	} else {
+		launcher->area._is_under_mouse = NULL;
+		for (GSList *l = launcher->list_icons; l; l = l->next)
+			((LauncherIcon *)l->data)->area._is_under_mouse = NULL;
+	}
+
+	return TRUE;
 }
 
 // Here we override the default layout of the icons; normally Area layouts its children
 // in a stack; we need to layout them in a kind of table
 void launcher_icon_on_change_layout(void *obj)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
-	launcherIcon->area.posy = ((Area*)launcherIcon->area.parent)->posy + launcherIcon->y;
-	launcherIcon->area.posx = ((Area*)launcherIcon->area.parent)->posx + launcherIcon->x;
+	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+	launcherIcon->area.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
+	launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
 	launcherIcon->area.width = launcherIcon->icon_size;
 	launcherIcon->area.height = launcherIcon->icon_size;
 }
 
-const char* launcher_icon_get_tooltip_text(void *obj)
+int launcher_icon_compute_desired_size(void *obj)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
-	return launcherIcon->icon_tooltip;
+	LauncherIcon *icon = (LauncherIcon *)obj;
+	return icon->icon_size;
+}
+
+char *launcher_icon_get_tooltip_text(void *obj)
+{
+	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+	return strdup(launcherIcon->icon_tooltip);
 }
 
 void draw_launcher_icon(void *obj, cairo_t *c)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
+	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
 
+	Imlib_Image image;
 	// Render
-	imlib_context_set_image(launcherIcon->image);
+	if (panel_config.mouse_effects) {
+		if (launcherIcon->area.mouse_state == MOUSE_OVER)
+			image = launcherIcon->image_hover ? launcherIcon->image_hover : launcherIcon->image;
+		else if (launcherIcon->area.mouse_state == MOUSE_DOWN)
+			image = launcherIcon->image_pressed ? launcherIcon->image_pressed : launcherIcon->image;
+		else
+			image = launcherIcon->image;
+	} else {
+		image = launcherIcon->image;
+	}
+	imlib_context_set_image(image);
 	render_image(launcherIcon->area.pix, 0, 0);
 }
 
+void launcher_icon_dump_geometry(void *obj, int indent)
+{
+	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+	fprintf(stderr, "%*sIcon: w = h = %d, name = %s\n", indent, "", launcherIcon->icon_size, launcherIcon->icon_name);
+}
+
 Imlib_Image scale_icon(Imlib_Image original, int icon_size)
 {
 	Imlib_Image icon_scaled;
 	if (original) {
-		imlib_context_set_image (original);
-		icon_scaled = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), icon_size, icon_size);
+		imlib_context_set_image(original);
+		icon_scaled = imlib_create_cropped_scaled_image(0,
+		                                                0,
+		                                                imlib_image_get_width(),
+		                                                imlib_image_get_height(),
+		                                                icon_size,
+		                                                icon_size);
 
-		imlib_context_set_image (icon_scaled);
+		imlib_context_set_image(icon_scaled);
 		imlib_image_set_has_alpha(1);
-		DATA32* data = imlib_image_get_data();
-		adjust_asb(data, icon_size, icon_size, launcher_alpha, (float)launcher_saturation/100, (float)launcher_brightness/100);
+		DATA32 *data = imlib_image_get_data();
+		adjust_asb(data,
+		           icon_size,
+		           icon_size,
+		           launcher_alpha / 100.0,
+		           launcher_saturation / 100.0,
+		           launcher_brightness / 100.0);
 		imlib_image_put_back_data(data);
 
-		imlib_context_set_image (icon_scaled);
+		imlib_context_set_image(icon_scaled);
 	} else {
 		icon_scaled = imlib_create_image(icon_size, icon_size);
-		imlib_context_set_image (icon_scaled);
+		imlib_context_set_image(icon_scaled);
 		imlib_context_set_color(255, 255, 255, 255);
 		imlib_image_fill_rectangle(0, 0, icon_size, icon_size);
 	}
@@ -393,18 +411,20 @@ void free_icon(Imlib_Image icon)
 	}
 }
 
-void launcher_action(LauncherIcon *icon, XEvent* evt)
+void launcher_action(LauncherIcon *icon, XEvent *evt)
 {
+	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;
+	SnLauncherContext *ctx = 0;
 	Time time;
 	if (startup_notifications) {
-		ctx = sn_launcher_context_new(server.sn_dsp, server.screen);
+		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);
+		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;
@@ -421,7 +441,7 @@ void launcher_action(LauncherIcon *icon, XEvent* evt)
 	if (pid < 0) {
 		fprintf(stderr, "Could not fork\n");
 	} else if (pid == 0) {
-		// Child process
+// Child process
 #if HAVE_SN
 		if (startup_notifications) {
 			sn_launcher_context_setup_child_process(ctx);
@@ -430,6 +450,8 @@ void launcher_action(LauncherIcon *icon, XEvent* evt)
 		// 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
@@ -439,67 +461,163 @@ void launcher_action(LauncherIcon *icon, XEvent* evt)
 #endif // HAVE_SN
 		exit(1);
 	} else {
-		// Parent process
+// Parent process
 #if HAVE_SN
 		if (startup_notifications) {
-			g_tree_insert(server.pids, GINT_TO_POINTER (pid), ctx);
+			g_tree_insert(server.pids, GINT_TO_POINTER(pid), ctx);
 		}
 #endif // HAVE_SN
 	}
 	free(cmd);
 }
 
+
+
 // Populates the list_icons list from the list_apps list
 void launcher_load_icons(Launcher *launcher)
 {
 	// Load apps (.desktop style launcher items)
-	GSList* app = launcher->list_apps;
+	GSList *app = launcher->list_apps;
+	int index = 0;
 	while (app != NULL) {
-		DesktopEntry entry;
-		read_desktop_file(app->data, &entry);
-		if (entry.exec) {
-			LauncherIcon *launcherIcon = calloc(1, sizeof(LauncherIcon));
-			launcherIcon->area.parent = launcher;
-			launcherIcon->area.panel = launcher->area.panel;
-			launcherIcon->area._draw_foreground = draw_launcher_icon;
-			launcherIcon->area.size_mode = SIZE_BY_CONTENT;
-			launcherIcon->area._resize = NULL;
-			launcherIcon->area.resize = 0;
-			launcherIcon->area.redraw = 1;
-			launcherIcon->area.bg = &g_array_index(backgrounds, Background, 0);
-			launcherIcon->area.on_screen = 1;
-			launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
-			if (launcher_tooltip_enabled) {
-				launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
-			} else {
-				launcherIcon->area._get_tooltip_text = NULL;
-			}
-			launcherIcon->is_app_desktop = 1;
-			launcherIcon->cmd = strdup(entry.exec);
-			launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(DEFAULT_ICON);
-			launcherIcon->icon_size = 1;
-			launcherIcon->icon_tooltip = entry.name ? strdup(entry.name) : strdup(entry.exec);
-			free_desktop_entry(&entry);
-			launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
-			add_area(&launcherIcon->area);
+		index++;
+		LauncherIcon *launcherIcon = (LauncherIcon *)calloc(1, sizeof(LauncherIcon));
+		launcherIcon->area.panel = launcher->area.panel;
+		launcherIcon->area._draw_foreground = draw_launcher_icon;
+		launcherIcon->area.size_mode = LAYOUT_FIXED;
+		launcherIcon->area._resize = NULL;
+		launcherIcon->area._compute_desired_size = launcher_icon_compute_desired_size;
+		sprintf(launcherIcon->area.name, "LauncherIcon %d", index);
+		launcherIcon->area.resize_needed = 0;
+		launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
+		launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
+		launcherIcon->area.bg = launcher_icon_bg;
+		launcherIcon->area.on_screen = TRUE;
+		launcherIcon->area.posx = -1;
+		launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
+		launcherIcon->area._dump_geometry = launcher_icon_dump_geometry;
+		if (launcher_tooltip_enabled) {
+			launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
+		} else {
+			launcherIcon->area._get_tooltip_text = NULL;
 		}
+		launcherIcon->config_path = strdup(app->data);
+		add_area(&launcherIcon->area, (Area *)launcher);
+		launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
+		launcherIcon->icon_size = launcher->icon_size;
+		launcher_reload_icon(launcher, launcherIcon);
+		instantiate_area_gradients(&launcherIcon->area);
 		app = g_slist_next(app);
 	}
 }
 
+void launcher_reload_icon(Launcher *launcher, LauncherIcon *launcherIcon)
+{
+	DesktopEntry entry;
+	if (read_desktop_file(launcherIcon->config_path, &entry) && entry.exec) {
+		schedule_redraw(&launcherIcon->area);
+		if (launcherIcon->cmd)
+			free(launcherIcon->cmd);
+		launcherIcon->cmd = strdup(entry.exec);
+		if (launcherIcon->cwd) 
+			free(launcherIcon->cwd);
+		if (entry.cwd)
+			launcherIcon->cwd = strdup(entry.cwd);
+		else
+			launcherIcon->cwd = NULL;
+		if (launcherIcon->icon_name)
+			free(launcherIcon->icon_name);
+		launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(DEFAULT_ICON);
+		if (entry.name) {
+			if (entry.generic_name) {
+				launcherIcon->icon_tooltip = g_strdup_printf("%s (%s)", entry.name, entry.generic_name);
+			} else {
+				launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.name);
+			}
+		} else {
+			if (entry.generic_name) {
+				launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.generic_name);
+			} else if (entry.exec) {
+				launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.exec);
+			}
+		}
+		launcher_reload_icon_image(launcher, launcherIcon);
+		show(&launcherIcon->area);
+	} else {
+		hide(&launcherIcon->area);
+	}
+	free_desktop_entry(&entry);
+}
 
-// Populates the list_themes list
+void launcher_reload_hidden_icons(Launcher *launcher)
+{
+	for (GSList *l = launcher->list_icons; l; l = l->next) {
+		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+		if (!launcherIcon->area.on_screen)
+			launcher_reload_icon(launcher, launcherIcon);
+	}
+}
+
+void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon)
+{
+	free_icon(launcherIcon->image);
+	free_icon(launcherIcon->image_hover);
+	free_icon(launcherIcon->image_pressed);
+	launcherIcon->image = NULL;
+
+	char *new_icon_path = get_icon_path(launcher->icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size, TRUE);
+	if (new_icon_path)
+		launcherIcon->image = load_image(new_icon_path, 1);
+	// On loading error, fallback to default
+	if (!launcherIcon->image) {
+		free(new_icon_path);
+		new_icon_path = get_icon_path(launcher->icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size, TRUE);
+		if (new_icon_path)
+			launcherIcon->image = imlib_load_image_immediately(new_icon_path);
+	}
+	Imlib_Image original = launcherIcon->image;
+	launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);
+	free_icon(original);
+	free(launcherIcon->icon_path);
+	launcherIcon->icon_path = new_icon_path;
+	// fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+
+	if (panel_config.mouse_effects) {
+		launcherIcon->image_hover = adjust_icon(launcherIcon->image,
+		                                        panel_config.mouse_over_alpha,
+		                                        panel_config.mouse_over_saturation,
+		                                        panel_config.mouse_over_brightness);
+		launcherIcon->image_pressed = adjust_icon(launcherIcon->image,
+		                                          panel_config.mouse_pressed_alpha,
+		                                          panel_config.mouse_pressed_saturation,
+		                                          panel_config.mouse_pressed_brightness);
+	}
+	schedule_redraw(&launcherIcon->area);
+}
+
+// Populates the icon_theme_wrapper list
 void launcher_load_themes(Launcher *launcher)
 {
-	launcher->list_themes = load_themes(launcher_icon_theme_override
-										? (icon_theme_name_config
-										   ? icon_theme_name_config
-										   : icon_theme_name_xsettings
-											 ? icon_theme_name_xsettings
-											 : "hicolor")
-										: (icon_theme_name_xsettings
-										   ? icon_theme_name_xsettings
-										   : icon_theme_name_config
-											 ? icon_theme_name_config
-											 : "hicolor"));
+	launcher->icon_theme_wrapper =
+	    load_themes(launcher_icon_theme_override
+	                    ? (icon_theme_name_config ? icon_theme_name_config
+	                                              : icon_theme_name_xsettings ? icon_theme_name_xsettings : "hicolor")
+	                    : (icon_theme_name_xsettings ? icon_theme_name_xsettings
+	                                                 : icon_theme_name_config ? icon_theme_name_config : "hicolor"));
+}
+
+void launcher_default_icon_theme_changed()
+{
+	if (!launcher_enabled)
+		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;
+	}
+	schedule_panel_redraw();
 }

src/launcher/launcher.h

@@ -15,35 +15,40 @@
 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 *list_themes;
+	GSList *list_apps;  // List of char*, each is a path to a app.desktop file
+	GSList *list_icons; // List of LauncherIcon*
+	IconThemeWrapper *icon_theme_wrapper;
+	int icon_size;
 } Launcher;
 
 typedef struct LauncherIcon {
 	// always start with area
 	Area area;
+	char *config_path;
 	Imlib_Image image;
+	Imlib_Image image_hover;
+	Imlib_Image image_pressed;
 	char *cmd;
+	char *cwd;
 	char *icon_name;
 	char *icon_path;
 	char *icon_tooltip;
 	int icon_size;
-	int is_app_desktop;
 	int x, y;
 } LauncherIcon;
 
-extern int launcher_enabled;
+extern gboolean launcher_enabled;
 extern int launcher_max_icon_size;
 extern int launcher_tooltip_enabled;
 extern int launcher_alpha;
 extern int launcher_saturation;
 extern int launcher_brightness;
-extern char *icon_theme_name_xsettings; 	// theme name
+extern char *icon_theme_name_xsettings; // theme name
 extern char *icon_theme_name_config;
 extern int launcher_icon_theme_override;
-extern XSettingsClient *xsettings_client;
 extern int startup_notifications;
+extern Background *launcher_icon_bg;
+extern GList *launcher_icon_gradients;
 
 // default global data
 void default_launcher();
@@ -54,14 +59,15 @@ void init_launcher_panel(void *panel);
 void cleanup_launcher();
 void cleanup_launcher_theme(Launcher *launcher);
 
-int  resize_launcher(void *obj);
-void draw_launcher (void *obj, cairo_t *c);
+gboolean resize_launcher(void *obj);
+void draw_launcher(void *obj, cairo_t *c);
+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);
 
 void test_launcher_read_desktop_file();
 void test_launcher_read_theme_file();

src/launcher/xsettings-client.c

@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Owen Taylor, Red Hat, Inc.
@@ -26,15 +26,14 @@
 #include <string.h>
 
 #include <X11/Xlib.h>
-#include <X11/Xmd.h>		/* For CARD16 */
+#include <X11/Xmd.h> /* For CARD16 */
 
 #include "xsettings-client.h"
 #include "server.h"
 #include "panel.h"
 #include "launcher.h"
 
-struct _XSettingsClient
-{
+struct _XSettingsClient {
 	Display *display;
 	int screen;
 	XSettingsNotifyFunc notify;
@@ -45,33 +44,32 @@ struct _XSettingsClient
 	XSettingsList *settings;
 };
 
-
-void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSetting *setting, void *data)
+void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data)
 {
-	//printf("xsettings_notify_cb\n");
 	if ((action == XSETTINGS_ACTION_NEW || action == XSETTINGS_ACTION_CHANGED) && name != NULL && setting != NULL) {
-		if (!strcmp(name, "Net/IconThemeName") && setting->type == XSETTINGS_TYPE_STRING) {
+		if (strcmp(name, "Net/IconThemeName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
+			fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
 			if (icon_theme_name_xsettings) {
 				if (strcmp(icon_theme_name_xsettings, setting->data.v_string) == 0)
 					return;
 				free(icon_theme_name_xsettings);
 			}
 			icon_theme_name_xsettings = strdup(setting->data.v_string);
-			
-			int i;
-			for (i = 0 ; i < nb_panel ; i++) {
-				Launcher *launcher = &panel1[i].launcher;
-				cleanup_launcher_theme(launcher);
-				launcher_load_themes(launcher);
-				launcher_load_icons(launcher);
-				launcher->area.resize = 1;
+			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);
+			if (default_font) {
+				if (strcmp(default_font, setting->data.v_string) == 0)
+					return;
+				free(default_font);
 			}
+			default_font = strdup(setting->data.v_string);
+			default_font_changed();
 		}
 	}
 }
 
-
-static void notify_changes (XSettingsClient *client, XSettingsList *old_list)
+static void notify_changes(XSettingsClient *client, XSettingsList *old_list)
 {
 	XSettingsList *old_iter = old_list;
 	XSettingsList *new_iter = client->settings;
@@ -83,21 +81,19 @@ static void notify_changes (XSettingsClient *client, XSettingsList *old_list)
 		int cmp;
 
 		if (old_iter && new_iter)
-			cmp = strcmp (old_iter->setting->name, new_iter->setting->name);
+			cmp = strcmp(old_iter->setting->name, new_iter->setting->name);
 		else if (old_iter)
 			cmp = -1;
 		else
 			cmp = 1;
 
 		if (cmp < 0) {
-			client->notify (old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
-		}
-		else if (cmp == 0) {
-			if (!xsettings_setting_equal (old_iter->setting, new_iter->setting))
-				client->notify (old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
-		}
-		else {
-			client->notify (new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
+			client->notify(old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
+		} else if (cmp == 0) {
+			if (!xsettings_setting_equal(old_iter->setting, new_iter->setting))
+				client->notify(old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
+		} else {
+			client->notify(new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
 		}
 
 		if (old_iter)
@@ -107,8 +103,7 @@ static void notify_changes (XSettingsClient *client, XSettingsList *old_list)
 	}
 }
 
-
-static int ignore_errors (Display *display, XErrorEvent *event)
+static int ignore_errors(Display *display, XErrorEvent *event)
 {
 	return True;
 }
@@ -117,11 +112,11 @@ static char local_byte_order = '\0';
 
 #define BYTES_LEFT(buffer) ((buffer)->data + (buffer)->len - (buffer)->pos)
 
-static XSettingsResult fetch_card16 (XSettingsBuffer *buffer, CARD16 *result)
+static XSettingsResult fetch_card16(XSettingsBuffer *buffer, CARD16 *result)
 {
 	CARD16 x;
 
-	if (BYTES_LEFT (buffer) < 2)
+	if (BYTES_LEFT(buffer) < 2)
 		return XSETTINGS_ACCESS;
 
 	x = *(CARD16 *)buffer->pos;
@@ -135,25 +130,23 @@ static XSettingsResult fetch_card16 (XSettingsBuffer *buffer, CARD16 *result)
 	return XSETTINGS_SUCCESS;
 }
 
-
-static XSettingsResult fetch_ushort (XSettingsBuffer *buffer, unsigned short  *result) 
+static XSettingsResult fetch_ushort(XSettingsBuffer *buffer, unsigned short *result)
 {
 	CARD16 x;
-	XSettingsResult r;  
+	XSettingsResult r;
 
-	r = fetch_card16 (buffer, &x);
+	r = fetch_card16(buffer, &x);
 	if (r == XSETTINGS_SUCCESS)
 		*result = x;
 
 	return r;
 }
 
-
-static XSettingsResult fetch_card32 (XSettingsBuffer *buffer, CARD32 *result)
+static XSettingsResult fetch_card32(XSettingsBuffer *buffer, CARD32 *result)
 {
 	CARD32 x;
 
-	if (BYTES_LEFT (buffer) < 4)
+	if (BYTES_LEFT(buffer) < 4)
 		return XSETTINGS_ACCESS;
 
 	x = *(CARD32 *)buffer->pos;
@@ -167,9 +160,9 @@ static XSettingsResult fetch_card32 (XSettingsBuffer *buffer, CARD32 *result)
 	return XSETTINGS_SUCCESS;
 }
 
-static XSettingsResult fetch_card8 (XSettingsBuffer *buffer, CARD8 *result)
+static XSettingsResult fetch_card8(XSettingsBuffer *buffer, CARD8 *result)
 {
-	if (BYTES_LEFT (buffer) < 1)
+	if (BYTES_LEFT(buffer) < 1)
 		return XSETTINGS_ACCESS;
 
 	*result = *(CARD8 *)buffer->pos;
@@ -178,9 +171,9 @@ static XSettingsResult fetch_card8 (XSettingsBuffer *buffer, CARD8 *result)
 	return XSETTINGS_SUCCESS;
 }
 
-#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
+#define XSETTINGS_PAD(n, m) ((n + m - 1) & (~(m - 1)))
 
-static XSettingsList *parse_settings (unsigned char *data, size_t len)
+static XSettingsList *parse_settings(unsigned char *data, size_t len)
 {
 	XSettingsBuffer buffer;
 	XSettingsResult result = XSETTINGS_SUCCESS;
@@ -190,26 +183,26 @@ static XSettingsList *parse_settings (unsigned char *data, size_t len)
 	CARD32 i;
 	XSettingsSetting *setting = NULL;
 
-	local_byte_order = xsettings_byte_order ();
+	local_byte_order = xsettings_byte_order();
 
 	buffer.byte_order = local_byte_order;
 	buffer.pos = buffer.data = data;
 	buffer.len = len;
 
-	result = fetch_card8 (&buffer, (CARD8*)&buffer.byte_order);
+	result = fetch_card8(&buffer, (CARD8 *)&buffer.byte_order);
 	if (buffer.byte_order != MSBFirst && buffer.byte_order != LSBFirst) {
-		fprintf (stderr, "Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
+		fprintf(stderr, "Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
 		result = XSETTINGS_FAILED;
 		goto out;
 	}
 
 	buffer.pos += 3;
 
-	result = fetch_card32 (&buffer, &serial);
+	result = fetch_card32(&buffer, &serial);
 	if (result != XSETTINGS_SUCCESS)
 		goto out;
 
-	result = fetch_card32 (&buffer, &n_entries);
+	result = fetch_card32(&buffer, &n_entries);
 	if (result != XSETTINGS_SUCCESS)
 		goto out;
 
@@ -219,188 +212,196 @@ static XSettingsList *parse_settings (unsigned char *data, size_t len)
 		CARD32 v_int;
 		size_t pad_len;
 
-		result = fetch_card8 (&buffer, &type);
+		result = fetch_card8(&buffer, &type);
 		if (result != XSETTINGS_SUCCESS)
 			goto out;
 
 		buffer.pos += 1;
 
-		result = fetch_card16 (&buffer, &name_len);
+		result = fetch_card16(&buffer, &name_len);
 		if (result != XSETTINGS_SUCCESS)
 			goto out;
 
 		pad_len = XSETTINGS_PAD(name_len, 4);
-		if (BYTES_LEFT (&buffer) < pad_len) {
+		if (BYTES_LEFT(&buffer) < pad_len) {
 			result = XSETTINGS_ACCESS;
 			goto out;
 		}
 
-		setting = calloc (1, sizeof *setting);
+		setting = calloc(1, sizeof *setting);
 		if (!setting) {
 			result = XSETTINGS_NO_MEM;
 			goto out;
 		}
 		setting->type = XSETTINGS_TYPE_INT; /* No allocated memory */
 
-		setting->name = calloc (name_len + 1, 1);
+		setting->name = calloc(name_len + 1, 1);
 		if (!setting->name) {
 			result = XSETTINGS_NO_MEM;
 			goto out;
 		}
 
-		memcpy (setting->name, buffer.pos, name_len);
+		memcpy(setting->name, buffer.pos, name_len);
 		setting->name[name_len] = '\0';
 		buffer.pos += pad_len;
 
-		result = fetch_card32 (&buffer, &v_int);
+		result = fetch_card32(&buffer, &v_int);
 		if (result != XSETTINGS_SUCCESS)
 			goto out;
 		setting->last_change_serial = v_int;
 
 		switch (type) {
-			case XSETTINGS_TYPE_INT:
-			result = fetch_card32 (&buffer, &v_int);
+		case XSETTINGS_TYPE_INT:
+			result = fetch_card32(&buffer, &v_int);
 			if (result != XSETTINGS_SUCCESS)
 				goto out;
 			setting->data.v_int = (INT32)v_int;
 			break;
-			case XSETTINGS_TYPE_STRING:
-			result = fetch_card32 (&buffer, &v_int);
+		case XSETTINGS_TYPE_STRING:
+			result = fetch_card32(&buffer, &v_int);
 			if (result != XSETTINGS_SUCCESS)
 				goto out;
 
-			pad_len = XSETTINGS_PAD (v_int, 4);
+			pad_len = XSETTINGS_PAD(v_int, 4);
 			if (v_int + 1 == 0 || /* Guard against wrap-around */
-			BYTES_LEFT (&buffer) < pad_len) {
+				BYTES_LEFT(&buffer) < pad_len) {
 				result = XSETTINGS_ACCESS;
 				goto out;
 			}
 
-			setting->data.v_string = calloc (v_int + 1, 1);
+			setting->data.v_string = calloc(v_int + 1, 1);
 			if (!setting->data.v_string) {
 				result = XSETTINGS_NO_MEM;
 				goto out;
 			}
 
-			memcpy (setting->data.v_string, buffer.pos, v_int);
+			memcpy(setting->data.v_string, buffer.pos, v_int);
 			setting->data.v_string[v_int] = '\0';
 			buffer.pos += pad_len;
 			break;
-			case XSETTINGS_TYPE_COLOR:
-			result = fetch_ushort (&buffer, &setting->data.v_color.red);
+		case XSETTINGS_TYPE_COLOR:
+			result = fetch_ushort(&buffer, &setting->data.v_color.red);
 			if (result != XSETTINGS_SUCCESS)
 				goto out;
-			result = fetch_ushort (&buffer, &setting->data.v_color.green);
+			result = fetch_ushort(&buffer, &setting->data.v_color.green);
 			if (result != XSETTINGS_SUCCESS)
 				goto out;
-			result = fetch_ushort (&buffer, &setting->data.v_color.blue);
+			result = fetch_ushort(&buffer, &setting->data.v_color.blue);
 			if (result != XSETTINGS_SUCCESS)
 				goto out;
-			result = fetch_ushort (&buffer, &setting->data.v_color.alpha);
+			result = fetch_ushort(&buffer, &setting->data.v_color.alpha);
 			if (result != XSETTINGS_SUCCESS)
 				goto out;
 			break;
-			default:
+		default:
 			/* Quietly ignore unknown types */
 			break;
 		}
 
 		setting->type = type;
 
-		result = xsettings_list_insert (&settings, setting);
+		result = xsettings_list_insert(&settings, setting);
 		if (result != XSETTINGS_SUCCESS)
-		goto out;
+			goto out;
 
 		setting = NULL;
 	}
 
-	out:
+out:
 
 	if (result != XSETTINGS_SUCCESS) {
 		switch (result) {
-			case XSETTINGS_NO_MEM:
+		case XSETTINGS_NO_MEM:
 			fprintf(stderr, "Out of memory reading XSETTINGS property\n");
 			break;
-			case XSETTINGS_ACCESS:
+		case XSETTINGS_ACCESS:
 			fprintf(stderr, "Invalid XSETTINGS property (read off end)\n");
 			break;
-			case XSETTINGS_DUPLICATE_ENTRY:
-			fprintf (stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
-			case XSETTINGS_FAILED:
-			case XSETTINGS_SUCCESS:
-			case XSETTINGS_NO_ENTRY:
+		case XSETTINGS_DUPLICATE_ENTRY:
+			fprintf(stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
+		case XSETTINGS_FAILED:
+		case XSETTINGS_SUCCESS:
+		case XSETTINGS_NO_ENTRY:
 			break;
 		}
 
 		if (setting)
-			xsettings_setting_free (setting);
+			xsettings_setting_free(setting);
 
-		xsettings_list_free (settings);
+		xsettings_list_free(settings);
 		settings = NULL;
 	}
 
 	return settings;
 }
 
-
-static void read_settings (XSettingsClient *client)
+static void read_settings(XSettingsClient *client)
 {
 	Atom type;
 	int format;
 	unsigned long n_items;
 	unsigned long bytes_after;
 	unsigned char *data;
-	int result;
 
-	int (*old_handler) (Display *, XErrorEvent *);
+	int (*old_handler)(Display *, XErrorEvent *);
 
 	XSettingsList *old_list = client->settings;
 	client->settings = NULL;
 
-	old_handler = XSetErrorHandler (ignore_errors);
-	result = XGetWindowProperty (client->display, client->manager_window, server.atom._XSETTINGS_SETTINGS, 0, LONG_MAX, False, server.atom._XSETTINGS_SETTINGS, &type, &format, &n_items, &bytes_after, &data);
-	XSetErrorHandler (old_handler);
+	old_handler = XSetErrorHandler(ignore_errors);
+	int result = XGetWindowProperty(client->display,
+									client->manager_window,
+									server.atom._XSETTINGS_SETTINGS,
+									0,
+									LONG_MAX,
+									False,
+									server.atom._XSETTINGS_SETTINGS,
+									&type,
+									&format,
+									&n_items,
+									&bytes_after,
+									&data);
+	XSetErrorHandler(old_handler);
 
 	if (result == Success && type == server.atom._XSETTINGS_SETTINGS) {
 		if (format != 8) {
-			fprintf (stderr, "Invalid format for XSETTINGS property %d", format);
-		}
-		else
-			client->settings = parse_settings (data, n_items);
-		XFree (data);
+			fprintf(stderr, "Invalid format for XSETTINGS property %d", format);
+		} else
+			client->settings = parse_settings(data, n_items);
+		XFree(data);
 	}
 
-	notify_changes (client, old_list);
-	xsettings_list_free (old_list);
+	notify_changes(client, old_list);
+	xsettings_list_free(old_list);
 }
 
-
-static void check_manager_window (XSettingsClient *client)
+static void check_manager_window(XSettingsClient *client)
 {
 	if (client->manager_window && client->watch)
-		client->watch (client->manager_window, False, 0, client->cb_data);
+		client->watch(client->manager_window, False, 0, client->cb_data);
 
-	XGrabServer (client->display);
+	XGrabServer(client->display);
 
-	client->manager_window = XGetSelectionOwner (server.dsp, server.atom._XSETTINGS_SCREEN);
+	client->manager_window = XGetSelectionOwner(server.display, server.atom._XSETTINGS_SCREEN);
 	if (client->manager_window)
-		XSelectInput (server.dsp, client->manager_window, PropertyChangeMask | StructureNotifyMask);
+		XSelectInput(server.display, client->manager_window, PropertyChangeMask | StructureNotifyMask);
 
-	XUngrabServer (client->display);
-	XFlush (client->display);
+	XUngrabServer(client->display);
+	XFlush(client->display);
 
 	if (client->manager_window && client->watch)
-		client->watch (client->manager_window, True, PropertyChangeMask | StructureNotifyMask, client->cb_data);
+		client->watch(client->manager_window, True, PropertyChangeMask | StructureNotifyMask, client->cb_data);
 
-	read_settings (client);
+	read_settings(client);
 }
 
-
-XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNotifyFunc notify, XSettingsWatchFunc watch, void *cb_data) 
+XSettingsClient *xsettings_client_new(Display *display,
+									  int screen,
+									  XSettingsNotifyFunc notify,
+									  XSettingsWatchFunc watch,
+									  void *cb_data)
 {
-	XSettingsClient *client;
-
-	client = calloc (1, sizeof *client);
+	XSettingsClient *client = calloc(1, sizeof *client);
 	if (!client)
 		return NULL;
 
@@ -414,68 +415,63 @@ XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNo
 	client->settings = NULL;
 
 	if (client->watch)
-		client->watch (RootWindow (display, screen), True, StructureNotifyMask,	client->cb_data);
+		client->watch(RootWindow(display, screen), True, StructureNotifyMask, client->cb_data);
 
-	check_manager_window (client);
+	check_manager_window(client);
 
 	if (client->manager_window == None) {
-		printf("NO XSETTINGS manager, tint2 use config 'launcher_icon_theme'.\n");
-		free (client);
+		printf("No XSETTINGS manager, tint2 uses config option 'launcher_icon_theme'.\n");
+		free(client);
 		return NULL;
-	}
-	else
+	} else {
 		return client;
-}
-
-
-void xsettings_client_destroy (XSettingsClient *client)
-{
-	if (client->watch)
-		client->watch (RootWindow (client->display, client->screen), False, 0, client->cb_data);
-	if (client->manager_window && client->watch)
-		client->watch (client->manager_window, False, 0, client->cb_data);
-
-	xsettings_list_free (client->settings);
-	free (client);
-}
-
-
-XSettingsResult xsettings_client_get_setting (XSettingsClient *client, const char *name, XSettingsSetting **setting)
-{
-	XSettingsSetting *search = xsettings_list_lookup (client->settings, name);
-	if (search) {
-		*setting = xsettings_setting_copy (search);
-		return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM;
 	}
-	else
+}
+
+void xsettings_client_destroy(XSettingsClient *client)
+{
+	if (!client)
+		return;
+	if (client->watch)
+		client->watch(RootWindow(client->display, client->screen), False, 0, client->cb_data);
+	if (client->manager_window && client->watch)
+		client->watch(client->manager_window, False, 0, client->cb_data);
+
+	xsettings_list_free(client->settings);
+	free(client);
+}
+
+XSettingsResult xsettings_client_get_setting(XSettingsClient *client, const char *name, XSettingsSetting **setting)
+{
+	XSettingsSetting *search = xsettings_list_lookup(client->settings, name);
+	if (search) {
+		*setting = xsettings_setting_copy(search);
+		return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM;
+	} else
 		return XSETTINGS_NO_ENTRY;
 }
 
-
-Bool xsettings_client_process_event (XSettingsClient *client, XEvent *xev)
+Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev)
 {
 	/* The checks here will not unlikely cause us to reread
 	* the properties from the manager window a number of
 	* times when the manager changes from A->B. But manager changes
 	* are going to be pretty rare.
 	*/
-	if (xev->xany.window == RootWindow (server.dsp, server.screen)) {
+	if (xev->xany.window == RootWindow(server.display, server.screen)) {
 		if (xev->xany.type == ClientMessage && xev->xclient.message_type == server.atom.MANAGER) {
-			check_manager_window (client);
+			check_manager_window(client);
 			return True;
 		}
-	}
-	else if (xev->xany.window == client->manager_window) {
+	} else if (xev->xany.window == client->manager_window) {
 		if (xev->xany.type == DestroyNotify) {
-			check_manager_window (client);
+			check_manager_window(client);
 			return True;
-		}
-		else if (xev->xany.type == PropertyNotify) {
-			read_settings (client);
+		} else if (xev->xany.type == PropertyNotify) {
+			read_settings(client);
 			return True;
 		}
 	}
 
 	return False;
 }
-

src/launcher/xsettings-client.h

@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Owen Taylor, Red Hat, Inc.
@@ -32,23 +32,22 @@ extern "C" {
 
 typedef struct _XSettingsClient XSettingsClient;
 
-typedef enum 
-{
-  XSETTINGS_ACTION_NEW,
-  XSETTINGS_ACTION_CHANGED,
-  XSETTINGS_ACTION_DELETED
-} XSettingsAction;
+typedef enum { XSETTINGS_ACTION_NEW, XSETTINGS_ACTION_CHANGED, XSETTINGS_ACTION_DELETED } XSettingsAction;
 
-typedef void (*XSettingsNotifyFunc) (const char *name, XSettingsAction action, XSettingsSetting *setting, void *cb_data);
-typedef void (*XSettingsWatchFunc) (Window window, Bool is_start, long mask, void *cb_data);
+typedef void (*XSettingsNotifyFunc)(const char *name, XSettingsAction action, XSettingsSetting *setting, void *cb_data);
+typedef void (*XSettingsWatchFunc)(Window window, Bool is_start, long mask, void *cb_data);
 
-XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNotifyFunc notify, XSettingsWatchFunc watch, void *cb_data);
-void xsettings_client_destroy (XSettingsClient *client);
-Bool xsettings_client_process_event (XSettingsClient *client, XEvent *xev);
+XSettingsClient *xsettings_client_new(Display *display,
+									  int screen,
+									  XSettingsNotifyFunc notify,
+									  XSettingsWatchFunc watch,
+									  void *cb_data);
+void xsettings_client_destroy(XSettingsClient *client);
+Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev);
 
-void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSetting *setting, void *data);
+void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data);
 
-XSettingsResult xsettings_client_get_setting (XSettingsClient *client, const char *name, XSettingsSetting **setting);
+XSettingsResult xsettings_client_get_setting(XSettingsClient *client, const char *name, XSettingsSetting **setting);
 
 #ifdef __cplusplus
 }

src/launcher/xsettings-common.c

@@ -24,31 +24,29 @@
 #include "stdlib.h"
 
 #include <X11/Xlib.h>
-#include <X11/Xmd.h>		/* For CARD32 */
+#include <X11/Xmd.h> /* For CARD32 */
 
 #include "xsettings-common.h"
 
-XSettingsSetting *
-xsettings_setting_copy (XSettingsSetting *setting)
+XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting)
 {
 	XSettingsSetting *result;
 	size_t str_len;
 
-	result = calloc (1, sizeof *result);
+	result = calloc(1, sizeof *result);
 	if (!result)
 		return NULL;
 
-	str_len = strlen (setting->name);
-	result->name = calloc (str_len + 1, 1);
+	str_len = strlen(setting->name);
+	result->name = calloc(str_len + 1, 1);
 	if (!result->name)
 		goto err;
 
-	memcpy (result->name, setting->name, str_len + 1);
+	memcpy(result->name, setting->name, str_len + 1);
 
 	result->type = setting->type;
 
-	switch (setting->type)
-	{
+	switch (setting->type) {
 	case XSETTINGS_TYPE_INT:
 		result->data.v_int = setting->data.v_int;
 		break;
@@ -56,12 +54,12 @@ xsettings_setting_copy (XSettingsSetting *setting)
 		result->data.v_color = setting->data.v_color;
 		break;
 	case XSETTINGS_TYPE_STRING:
-		str_len = strlen (setting->data.v_string);
-		result->data.v_string = calloc (str_len + 1, 1);
+		str_len = strlen(setting->data.v_string);
+		result->data.v_string = calloc(str_len + 1, 1);
 		if (!result->data.v_string)
 			goto err;
 
-		memcpy (result->data.v_string, setting->data.v_string, str_len + 1);
+		memcpy(result->data.v_string, setting->data.v_string, str_len + 1);
 		break;
 	default:
 		break;
@@ -73,31 +71,28 @@ xsettings_setting_copy (XSettingsSetting *setting)
 
 err:
 	if (result->name)
-		free (result->name);
-	free (result);
+		free(result->name);
+	free(result);
 
 	return NULL;
 }
 
-XSettingsList *
-xsettings_list_copy (XSettingsList *list)
+XSettingsList *xsettings_list_copy(XSettingsList *list)
 {
 	XSettingsList *new = NULL;
 	XSettingsList *old_iter = list;
 	XSettingsList *new_iter = NULL;
 
-	while (old_iter)
-	{
+	while (old_iter) {
 		XSettingsList *new_node;
 
-		new_node = calloc (1, sizeof *new_node);
+		new_node = calloc(1, sizeof *new_node);
 		if (!new_node)
 			goto error;
 
-		new_node->setting = xsettings_setting_copy (old_iter->setting);
-		if (!new_node->setting)
-		{
-			free (new_node);
+		new_node->setting = xsettings_setting_copy(old_iter->setting);
+		if (!new_node->setting) {
+			free(new_node);
 			goto error;
 		}
 
@@ -114,22 +109,19 @@ xsettings_list_copy (XSettingsList *list)
 	return new;
 
 error:
-	xsettings_list_free (new);
+	xsettings_list_free(new);
 	return NULL;
 }
 
-int
-xsettings_setting_equal (XSettingsSetting *setting_a,
-						 XSettingsSetting *setting_b)
+int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b)
 {
 	if (setting_a->type != setting_b->type)
 		return 0;
 
-	if (strcmp (setting_a->name, setting_b->name) != 0)
+	if (strcmp(setting_a->name, setting_b->name) != 0)
 		return 0;
 
-	switch (setting_a->type)
-	{
+	switch (setting_a->type) {
 	case XSETTINGS_TYPE_INT:
 		return setting_a->data.v_int == setting_b->data.v_int;
 	case XSETTINGS_TYPE_COLOR:
@@ -138,7 +130,7 @@ xsettings_setting_equal (XSettingsSetting *setting_a,
 				setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
 				setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
 	case XSETTINGS_TYPE_STRING:
-		return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0;
+		return strcmp(setting_a->data.v_string, setting_b->data.v_string) == 0;
 	default:
 		break;
 	}
@@ -146,55 +138,48 @@ xsettings_setting_equal (XSettingsSetting *setting_a,
 	return 0;
 }
 
-void
-xsettings_setting_free (XSettingsSetting *setting)
+void xsettings_setting_free(XSettingsSetting *setting)
 {
 	if (setting->type == XSETTINGS_TYPE_STRING)
-		free (setting->data.v_string);
+		free(setting->data.v_string);
 
 	if (setting->name)
-		free (setting->name);
+		free(setting->name);
 
-	free (setting);
+	free(setting);
 }
 
-void
-xsettings_list_free (XSettingsList *list)
+void xsettings_list_free(XSettingsList *list)
 {
-	while (list)
-	{
+	while (list) {
 		XSettingsList *next = list->next;
 
-		xsettings_setting_free (list->setting);
-		free (list);
+		xsettings_setting_free(list->setting);
+		free(list);
 
 		list = next;
 	}
 }
 
-XSettingsResult
-xsettings_list_insert (XSettingsList    **list,
-					   XSettingsSetting  *setting)
+XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting)
 {
 	XSettingsList *node;
 	XSettingsList *iter;
 	XSettingsList *last = NULL;
 
-	node = calloc (1, sizeof *node);
+	node = calloc(1, sizeof *node);
 	if (!node)
 		return XSETTINGS_NO_MEM;
 	node->setting = setting;
 
 	iter = *list;
-	while (iter)
-	{
-		int cmp = strcmp (setting->name, iter->setting->name);
+	while (iter) {
+		int cmp = strcmp(setting->name, iter->setting->name);
 
 		if (cmp < 0)
 			break;
-		else if (cmp == 0)
-		{
-			free (node);
+		else if (cmp == 0) {
+			free(node);
 			return XSETTINGS_DUPLICATE_ENTRY;
 		}
 
@@ -212,25 +197,21 @@ xsettings_list_insert (XSettingsList    **list,
 	return XSETTINGS_SUCCESS;
 }
 
-XSettingsResult
-xsettings_list_delete (XSettingsList **list,
-					   const char     *name)
+XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name)
 {
 	XSettingsList *iter;
 	XSettingsList *last = NULL;
 
 	iter = *list;
-	while (iter)
-	{
-		if (strcmp (name, iter->setting->name) == 0)
-		{
+	while (iter) {
+		if (strcmp(name, iter->setting->name) == 0) {
 			if (last)
 				last->next = iter->next;
 			else
 				*list = iter->next;
 
-			xsettings_setting_free (iter->setting);
-			free (iter);
+			xsettings_setting_free(iter->setting);
+			free(iter);
 
 			return XSETTINGS_SUCCESS;
 		}
@@ -242,16 +223,13 @@ xsettings_list_delete (XSettingsList **list,
 	return XSETTINGS_FAILED;
 }
 
-XSettingsSetting *
-xsettings_list_lookup (XSettingsList *list,
-					   const char    *name)
+XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name)
 {
 	XSettingsList *iter;
 
 	iter = list;
-	while (iter)
-	{
-		if (strcmp (name, iter->setting->name) == 0)
+	while (iter) {
+		if (strcmp(name, iter->setting->name) == 0)
 			return iter->setting;
 
 		iter = iter->next;
@@ -260,8 +238,7 @@ xsettings_list_lookup (XSettingsList *list,
 	return NULL;
 }
 
-char
-xsettings_byte_order (void)
+char xsettings_byte_order(void)
 {
 	CARD32 myint = 0x01020304;
 	return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;

src/launcher/xsettings-common.h

@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Owen Taylor, Red Hat, Inc.
@@ -27,82 +27,72 @@
 extern "C" {
 #endif /* __cplusplus */
 
-typedef struct _XSettingsBuffer  XSettingsBuffer;
-typedef struct _XSettingsColor   XSettingsColor;
-typedef struct _XSettingsList    XSettingsList;
+typedef struct _XSettingsBuffer XSettingsBuffer;
+typedef struct _XSettingsColor XSettingsColor;
+typedef struct _XSettingsList XSettingsList;
 typedef struct _XSettingsSetting XSettingsSetting;
 
 /* Types of settings possible. Enum values correspond to
  * protocol values.
  */
-typedef enum 
-{
-  XSETTINGS_TYPE_INT     = 0,
-  XSETTINGS_TYPE_STRING  = 1,
-  XSETTINGS_TYPE_COLOR   = 2,
-  XSETTINGS_TYPE_NONE    = 0xff
+typedef enum {
+	XSETTINGS_TYPE_INT = 0,
+	XSETTINGS_TYPE_STRING = 1,
+	XSETTINGS_TYPE_COLOR = 2,
+	XSETTINGS_TYPE_NONE = 0xff
 } XSettingsType;
 
-typedef enum
-{
-  XSETTINGS_SUCCESS,
-  XSETTINGS_NO_MEM,
-  XSETTINGS_ACCESS,
-  XSETTINGS_FAILED,
-  XSETTINGS_NO_ENTRY,
-  XSETTINGS_DUPLICATE_ENTRY
+typedef enum {
+	XSETTINGS_SUCCESS,
+	XSETTINGS_NO_MEM,
+	XSETTINGS_ACCESS,
+	XSETTINGS_FAILED,
+	XSETTINGS_NO_ENTRY,
+	XSETTINGS_DUPLICATE_ENTRY
 } XSettingsResult;
 
-struct _XSettingsBuffer
-{
-  char byte_order;
-  size_t len;
-  unsigned char *data;
-  unsigned char *pos;
+struct _XSettingsBuffer {
+	char byte_order;
+	size_t len;
+	unsigned char *data;
+	unsigned char *pos;
 };
 
-struct _XSettingsColor
-{
-  unsigned short red, green, blue, alpha;
+struct _XSettingsColor {
+	unsigned short red, green, blue, alpha;
 };
 
-struct _XSettingsList
-{
-  XSettingsSetting *setting;
-  XSettingsList *next;
+struct _XSettingsList {
+	XSettingsSetting *setting;
+	XSettingsList *next;
 };
 
-struct _XSettingsSetting
-{
-  char *name;
-  XSettingsType type;
-  
-  union {
-    int v_int;
-    char *v_string;
-    XSettingsColor v_color;
-  } data;
+struct _XSettingsSetting {
+	char *name;
+	XSettingsType type;
 
-  unsigned long last_change_serial;
+	union {
+		int v_int;
+		char *v_string;
+		XSettingsColor v_color;
+	} data;
+
+	unsigned long last_change_serial;
 };
 
-XSettingsSetting *xsettings_setting_copy  (XSettingsSetting *setting);
-void              xsettings_setting_free  (XSettingsSetting *setting);
-int               xsettings_setting_equal (XSettingsSetting *setting_a,
-					   XSettingsSetting *setting_b);
+XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting);
+void xsettings_setting_free(XSettingsSetting *setting);
+int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b);
 
-void              xsettings_list_free   (XSettingsList     *list);
-XSettingsList    *xsettings_list_copy   (XSettingsList     *list);
-XSettingsResult   xsettings_list_insert (XSettingsList    **list,
-					 XSettingsSetting  *setting);
-XSettingsSetting *xsettings_list_lookup (XSettingsList     *list,
-					 const char        *name);
-XSettingsResult   xsettings_list_delete (XSettingsList    **list,
-					 const char        *name);
+void xsettings_list_free(XSettingsList *list);
+XSettingsList *xsettings_list_copy(XSettingsList *list);
+XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting);
+XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name);
+XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name);
 
-char xsettings_byte_order (void);
+char xsettings_byte_order(void);
 
-#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
+#define XSETTINGS_PAD(n, m) ((n + m - 1) & (~(m - 1)))
 
 #ifdef __cplusplus
 }

src/panel.h

@@ -21,116 +21,131 @@
 #include "systraybar.h"
 #include "launcher.h"
 #include "freespace.h"
+#include "execplugin.h"
+#include "separator.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
 #endif
 
-
 extern int signal_pending;
 // --------------------------------------------------
 // mouse events
-extern int mouse_left;
-extern int mouse_middle;
-extern int mouse_right;
-extern int mouse_scroll_up;
-extern int mouse_scroll_down;
-extern int mouse_tilt_left;
-extern int mouse_tilt_right;
+extern MouseAction mouse_left;
+extern MouseAction mouse_middle;
+extern MouseAction mouse_right;
+extern MouseAction mouse_scroll_up;
+extern MouseAction mouse_scroll_down;
+extern MouseAction mouse_tilt_left;
+extern MouseAction mouse_tilt_right;
 
-//panel mode
-enum { SINGLE_DESKTOP=0, MULTI_DESKTOP };
-enum { BOTTOM_LAYER, NORMAL_LAYER, TOP_LAYER };
-extern int panel_mode;
-extern int wm_menu;
-extern int panel_dock;
-extern int panel_layer;
+// panel mode
+typedef enum TaskbarMode {
+	SINGLE_DESKTOP = 0,
+	MULTI_DESKTOP,
+} TaskbarMode;
+
+typedef enum Layer {
+	BOTTOM_LAYER,
+	NORMAL_LAYER,
+	TOP_LAYER,
+} Layer;
+
+// panel position
+typedef enum PanelPosition {
+	LEFT = 0x01,
+	RIGHT = 0x02,
+	CENTER = 0X04,
+	TOP = 0X08,
+	BOTTOM = 0x10,
+} PanelPosition;
+
+typedef enum Strut {
+	STRUT_MINIMUM,
+	STRUT_FOLLOW_SIZE,
+	STRUT_NONE,
+} Strut;
+
+extern TaskbarMode taskbar_mode;
+extern gboolean wm_menu;
+extern gboolean panel_dock;
+extern Layer panel_layer;
 extern char *panel_window_name;
-
-//panel position
-enum { LEFT=0x01, RIGHT=0x02, CENTER=0X04, TOP=0X08, BOTTOM=0x10 };
-extern int panel_position;
-extern int panel_horizontal;
-
-extern int panel_refresh;
-extern int task_dragged;
-
-//panel autohide
-enum { STRUT_MINIMUM, STRUT_FOLLOW_SIZE, STRUT_NONE };
-extern int panel_autohide;
+extern PanelPosition panel_position;
+extern gboolean panel_horizontal;
+extern gboolean panel_refresh;
+extern gboolean task_dragged;
+extern gboolean panel_autohide;
 extern int panel_autohide_show_timeout;
 extern int panel_autohide_hide_timeout;
-extern int panel_autohide_height;  // for vertical panels this is of course the width
-extern int panel_strut_policy;
+extern int panel_autohide_height; // for vertical panels this is of course the width
+extern gboolean panel_shrink;
+extern Strut panel_strut_policy;
 extern char *panel_items_order;
-
-extern int  max_tick_urgent;
-
-extern GArray* backgrounds;
-
+extern int max_tick_urgent;
+extern GArray *backgrounds;
+extern GArray *gradients;
 extern Imlib_Image default_icon;
-// TODO maybe this should be a config option
 #define DEFAULT_FONT "sans 10"
+extern char *default_font;
+extern XSettingsClient *xsettings_client;
+extern gboolean debug_geometry;
+extern gboolean debug_fps;
+extern gboolean debug_frames;
 
-
-// tint2 use one panel per monitor and one taskbar per desktop.
-typedef struct {
-	// always start with area
-	// area.list own all objects of the panel according to config file
+typedef struct Panel {
 	Area area;
 
-	// --------------------------------------------------
-	// panel
 	Window main_win;
 	Pixmap temp_pmap;
 
 	// position relative to root window
 	int posx, posy;
 	int marginx, marginy;
-	int pourcentx, pourcenty;
-	// location of the panel (monitor number)
+	gboolean fractional_width, fractional_height;
+	int max_size;
 	int monitor;
 	int font_shadow;
+	gboolean mouse_effects;
+	// Mouse effects for icons
+	int mouse_over_alpha;
+	int mouse_over_saturation;
+	int mouse_over_brightness;
+	int mouse_pressed_alpha;
+	int mouse_pressed_saturation;
+	int mouse_pressed_brightness;
 
-	// --------------------------------------------------
-	// task and taskbar parameter per panel
-	Global_taskbar g_taskbar;
-	Global_task g_task;
+	// Per-panel parameters and states for Taskbar and Task
+	GlobalTaskbar g_taskbar;
+	GlobalTask g_task;
 
-	// --------------------------------------------------
-	// taskbar point to the first taskbar in panel.area.list.
-	// number of tasbar == nb_desktop. taskbar[i] is for desktop(i).
-	// taskbar[i] is used to loop over taskbar,
-	// while panel->area.list is used to loop over all panel's objects
+	// Array of Taskbar, with num_desktops items
 	Taskbar *taskbar;
-	int  nb_desktop;
+	int num_desktops;
+	gboolean taskbarname_has_font;
+	PangoFontDescription *taskbarname_font_desc;
 
-	// --------------------------------------------------
-	// clock
 	Clock clock;
 
-	// --------------------------------------------------
-	// battery
 #ifdef ENABLE_BATTERY
 	Battery battery;
 #endif
 
 	Launcher launcher;
+	GList *freespace_list;
+	GList *separator_list;
+	GList *execp_list;
 
-	FreeSpace freespace;
-
-	// autohide
-	int is_hidden;
+	// Autohide
+	gboolean is_hidden;
 	int hidden_width, hidden_height;
 	Pixmap hidden_pixmap;
-	timeout* autohide_timeout;
+	timeout *autohide_timeout;
 } Panel;
 
-
 extern Panel panel_config;
-extern Panel *panel1;
-extern int  nb_panel;
-
+extern Panel *panels;
+extern int num_panels;
 
 // default global data
 void default_panel();
@@ -143,10 +158,18 @@ void cleanup_panel();
 void init_panel();
 
 void init_panel_size_and_position(Panel *panel);
-int  resize_panel(void *obj);
+gboolean resize_panel(void *obj);
+void render_panel(Panel *panel);
+void shrink_panel(Panel *panel);
+void _schedule_panel_redraw(const char *file, const char *function, const int line);
+#define schedule_panel_redraw() _schedule_panel_redraw(__FILE__, __FUNCTION__, __LINE__)
 
 void set_panel_items_order(Panel *p);
+void place_panel_all_desktops(Panel *p);
+void replace_panel_all_desktops(Panel *p);
 void set_panel_properties(Panel *p);
+void set_panel_window_geometry(Panel *panel);
+void set_panel_layer(Panel *p, Layer layer);
 
 // draw background panel
 void set_panel_background(Panel *p);
@@ -154,22 +177,27 @@ void set_panel_background(Panel *p);
 // detect witch panel
 Panel *get_panel(Window win);
 
-Taskbar *click_taskbar (Panel *panel, int x, int y);
-Task *click_task (Panel *panel, int x, int y);
-Launcher *click_launcher (Panel *panel, int x, int y);
-LauncherIcon *click_launcher_icon (Panel *panel, int x, int y);
-int click_padding(Panel *panel, int x, int y);
-int click_clock(Panel *panel, int x, int y);
+Taskbar *click_taskbar(Panel *panel, int x, int y);
+Task *click_task(Panel *panel, int x, int y);
+Launcher *click_launcher(Panel *panel, int x, int y);
+LauncherIcon *click_launcher_icon(Panel *panel, int x, int y);
+Clock *click_clock(Panel *panel, int x, int y);
 
 #ifdef ENABLE_BATTERY
-int click_battery(Panel *panel, int x, int y);
+Battery *click_battery(Panel *panel, int x, int y);
 #endif
 
-Area* click_area(Panel *panel, int x, int y);
+Area *click_area(Panel *panel, int x, int y);
+Execp *click_execp(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_show(void *p);
+void autohide_hide(void *p);
+void autohide_trigger_show(Panel *p);
+void autohide_trigger_hide(Panel *p);
+
+const char *get_default_font();
+
+void default_icon_theme_changed();
+void default_font_changed();
 
 #endif

src/separator/separator.c

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

src/separator/separator.h

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

src/server.c

@@ -21,7 +21,6 @@
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/Xrandr.h>
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -30,125 +29,132 @@
 #include "config.h"
 #include "window.h"
 
-Server_global server;
+Server server;
 
-void server_catch_error (Display *d, XErrorEvent *ev){}
+gboolean primary_monitor_first = FALSE;
 
-void server_init_atoms ()
+void server_catch_error(Display *d, XErrorEvent *ev)
 {
-	server.atom._XROOTPMAP_ID = XInternAtom (server.dsp, "_XROOTPMAP_ID", False);
-	server.atom._XROOTMAP_ID = XInternAtom (server.dsp, "_XROOTMAP_ID", False);
-	server.atom._NET_CURRENT_DESKTOP = XInternAtom (server.dsp, "_NET_CURRENT_DESKTOP", False);
-	server.atom._NET_NUMBER_OF_DESKTOPS = XInternAtom (server.dsp, "_NET_NUMBER_OF_DESKTOPS", False);
-	server.atom._NET_DESKTOP_NAMES = XInternAtom (server.dsp, "_NET_DESKTOP_NAMES", False);
-	server.atom._NET_DESKTOP_GEOMETRY = XInternAtom (server.dsp, "_NET_DESKTOP_GEOMETRY", False);
-	server.atom._NET_DESKTOP_VIEWPORT = XInternAtom (server.dsp, "_NET_DESKTOP_VIEWPORT", False);
-	server.atom._NET_ACTIVE_WINDOW = XInternAtom (server.dsp, "_NET_ACTIVE_WINDOW", False);
-	server.atom._NET_WM_WINDOW_TYPE = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE", False);
-	server.atom._NET_WM_STATE_SKIP_PAGER = XInternAtom (server.dsp, "_NET_WM_STATE_SKIP_PAGER", False);
-	server.atom._NET_WM_STATE_SKIP_TASKBAR = XInternAtom (server.dsp, "_NET_WM_STATE_SKIP_TASKBAR", False);
-	server.atom._NET_WM_STATE_STICKY = XInternAtom (server.dsp, "_NET_WM_STATE_STICKY", False);
-	server.atom._NET_WM_STATE_DEMANDS_ATTENTION = XInternAtom (server.dsp, "_NET_WM_STATE_DEMANDS_ATTENTION", False);
-	server.atom._NET_WM_WINDOW_TYPE_DOCK = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_DOCK", False);
-	server.atom._NET_WM_WINDOW_TYPE_DESKTOP = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_DESKTOP", False);
-	server.atom._NET_WM_WINDOW_TYPE_TOOLBAR = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_TOOLBAR", False);
-	server.atom._NET_WM_WINDOW_TYPE_MENU = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_MENU", False);
-	server.atom._NET_WM_WINDOW_TYPE_SPLASH = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_SPLASH", False);
-	server.atom._NET_WM_WINDOW_TYPE_DIALOG = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_DIALOG", False);
-	server.atom._NET_WM_WINDOW_TYPE_NORMAL = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_NORMAL", False);
-	server.atom._NET_WM_DESKTOP = XInternAtom (server.dsp, "_NET_WM_DESKTOP", False);
-	server.atom.WM_STATE = XInternAtom (server.dsp, "WM_STATE", False);
-	server.atom._NET_WM_STATE = XInternAtom (server.dsp, "_NET_WM_STATE", False);
-	server.atom._NET_WM_STATE_MAXIMIZED_VERT = XInternAtom (server.dsp, "_NET_WM_STATE_MAXIMIZED_VERT", False);
-	server.atom._NET_WM_STATE_MAXIMIZED_HORZ = XInternAtom (server.dsp, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
-	server.atom._NET_WM_STATE_SHADED = XInternAtom (server.dsp, "_NET_WM_STATE_SHADED", False);
-	server.atom._NET_WM_STATE_HIDDEN = XInternAtom (server.dsp, "_NET_WM_STATE_HIDDEN", False);
-	server.atom._NET_WM_STATE_BELOW = XInternAtom (server.dsp, "_NET_WM_STATE_BELOW", False);
-	server.atom._NET_WM_STATE_ABOVE = XInternAtom (server.dsp, "_NET_WM_STATE_ABOVE", False);
-	server.atom._NET_WM_STATE_MODAL = XInternAtom (server.dsp, "_NET_WM_STATE_MODAL", False);
-	server.atom._NET_CLIENT_LIST = XInternAtom (server.dsp, "_NET_CLIENT_LIST", False);
-	server.atom._NET_WM_VISIBLE_NAME = XInternAtom (server.dsp, "_NET_WM_VISIBLE_NAME", False);
-	server.atom._NET_WM_NAME = XInternAtom (server.dsp, "_NET_WM_NAME", False);
-	server.atom._NET_WM_STRUT = XInternAtom (server.dsp, "_NET_WM_STRUT", False);
-	server.atom._NET_WM_ICON = XInternAtom (server.dsp, "_NET_WM_ICON", False);
-	server.atom._NET_WM_ICON_GEOMETRY = XInternAtom(server.dsp, "_NET_WM_ICON_GEOMETRY", False );
-	server.atom._NET_WM_ICON_NAME = XInternAtom(server.dsp, "_NET_WM_ICON_NAME", False );
-	server.atom._NET_CLOSE_WINDOW = XInternAtom (server.dsp, "_NET_CLOSE_WINDOW", False);
-	server.atom.UTF8_STRING = XInternAtom (server.dsp, "UTF8_STRING", False);
-	server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom (server.dsp, "_NET_SUPPORTING_WM_CHECK", False);
-	server.atom._NET_WM_CM_S0 = XInternAtom (server.dsp, "_NET_WM_CM_S0", False);
-	server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom (server.dsp, "_NET_WM_NAME", False);
-	server.atom._NET_WM_STRUT_PARTIAL = XInternAtom (server.dsp, "_NET_WM_STRUT_PARTIAL", False);
-	server.atom.WM_NAME = XInternAtom(server.dsp, "WM_NAME", False);
-	server.atom.__SWM_VROOT = XInternAtom(server.dsp, "__SWM_VROOT", False);
-	server.atom._MOTIF_WM_HINTS = XInternAtom(server.dsp, "_MOTIF_WM_HINTS", False);
-	server.atom.WM_HINTS = XInternAtom(server.dsp, "WM_HINTS", False);
-	gchar *name = g_strdup_printf("_XSETTINGS_S%d", DefaultScreen(server.dsp));
-	server.atom._XSETTINGS_SCREEN = XInternAtom(server.dsp, name, False);
-	g_free(name);
-	server.atom._XSETTINGS_SETTINGS = XInternAtom(server.dsp, "_XSETTINGS_SETTINGS", False);
-
-	// systray protocol
-	name = g_strdup_printf("_NET_SYSTEM_TRAY_S%d", DefaultScreen(server.dsp));
-	server.atom._NET_SYSTEM_TRAY_SCREEN = XInternAtom(server.dsp, name, False);
-	g_free(name);
-	server.atom._NET_SYSTEM_TRAY_OPCODE = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_OPCODE", False);
-	server.atom.MANAGER = XInternAtom(server.dsp, "MANAGER", False);
-	server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
-	server.atom._NET_SYSTEM_TRAY_ORIENTATION = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_ORIENTATION", False);
-	server.atom._NET_SYSTEM_TRAY_ICON_SIZE = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_ICON_SIZE", False);
-	server.atom._NET_SYSTEM_TRAY_PADDING = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_PADDING", False);
-	server.atom._XEMBED = XInternAtom(server.dsp, "_XEMBED", False);
-	server.atom._XEMBED_INFO = XInternAtom(server.dsp, "_XEMBED_INFO", False);
-	server.atom._NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);
-
-	// drag 'n' drop
-	server.atom.XdndAware = XInternAtom(server.dsp, "XdndAware", False);
-	server.atom.XdndEnter = XInternAtom(server.dsp, "XdndEnter", False);
-	server.atom.XdndPosition = XInternAtom(server.dsp, "XdndPosition", False);
-	server.atom.XdndStatus = XInternAtom(server.dsp, "XdndStatus", False);
-	server.atom.XdndDrop = XInternAtom(server.dsp, "XdndDrop", False);
-	server.atom.XdndLeave = XInternAtom(server.dsp, "XdndLeave", False);
-	server.atom.XdndSelection = XInternAtom(server.dsp, "XdndSelection", False);
-	server.atom.XdndTypeList = XInternAtom(server.dsp, "XdndTypeList", False);
-	server.atom.XdndActionCopy = XInternAtom(server.dsp, "XdndActionCopy", False);
-	server.atom.XdndFinished = XInternAtom(server.dsp, "XdndFinished", False);
-	server.atom.TARGETS = XInternAtom(server.dsp, "TARGETS", False);
 }
 
+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.dsp, server.colormap);
+		XFreeColormap(server.display, server.colormap);
 	server.colormap = 0;
 	if (server.colormap32)
-		XFreeColormap(server.dsp, server.colormap32);
+		XFreeColormap(server.display, server.colormap32);
 	server.colormap32 = 0;
-	if (server.monitor) {
-		int i;
-		for (i = 0; i < server.nb_monitor; ++i) {
-			g_strfreev(server.monitor[i].names);
-			server.monitor[i].names = NULL;
+	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.monitor);
-		server.monitor = NULL;
+		free(server.monitors);
+		server.monitors = NULL;
 	}
 	if (server.gc)
-		XFreeGC(server.dsp, server.gc);
+		XFreeGC(server.display, server.gc);
 	server.gc = NULL;
-	server.disable_transparency = 0;
+	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)
+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.dsp;
+	event.xclient.display = server.display;
 	event.xclient.window = win;
 	event.xclient.message_type = at;
 
@@ -159,11 +165,10 @@ void send_event32 (Window win, Atom at, long data1, long data2, long data3)
 	event.xclient.data.l[3] = 0;
 	event.xclient.data.l[4] = 0;
 
-	XSendEvent(server.dsp, server.root_win, False, SubstructureRedirectMask|SubstructureNotifyMask, &event);
+	XSendEvent(server.display, server.root_win, False, SubstructureRedirectMask | SubstructureNotifyMask, &event);
 }
 
-
-int get_property32 (Window win, Atom at, Atom type)
+int get_property32(Window win, Atom at, Atom type)
 {
 	Atom type_ret;
 	int format_ret = 0, data = 0;
@@ -172,286 +177,432 @@ int get_property32 (Window win, Atom at, Atom type)
 	unsigned char *prop_value = 0;
 	int result;
 
-	if (!win) return 0;
+	if (!win)
+		return 0;
 
-	result = XGetWindowProperty(server.dsp, win, at, 0, 0x7fffffff, False, type, &type_ret, &format_ret, &nitems_ret, &bafter_ret, &prop_value);
+	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);
+		data = ((gulong *)prop_value)[0];
+		XFree(prop_value);
 	}
 	return data;
 }
 
-
-void *server_get_property (Window win, Atom at, Atom type, int *num_results)
+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;
-	int result;
 
-	if (!win) return 0;
+	if (!win)
+		return NULL;
 
-	result = XGetWindowProperty(server.dsp, win, at, 0, 0x7fffffff, False, type, &type_ret, &format_ret, &nitems_ret, &bafter_ret, &prop_value);
+	int result = XGetWindowProperty(server.display,
+									win,
+									at,
+									0,
+									0x7fffffff,
+									False,
+									type,
+									&type_ret,
+									&format_ret,
+									&nitems_ret,
+									&bafter_ret,
+									&prop_value);
 
-	// Send back resultcount
-	if (num_results) *num_results = (int)nitems_ret;
+	// Send fill_color resultcount
+	if (num_results)
+		*num_results = (int)nitems_ret;
 
-	if (result == Success && prop_value) return prop_value;
-	else return 0;
+	if (result == Success && prop_value)
+		return prop_value;
+	else
+		return NULL;
 }
 
-
 void get_root_pixmap()
 {
 	Pixmap ret = None;
 
-	unsigned long *res;
-	Atom pixmap_atoms[] = { server.atom._XROOTPMAP_ID, server.atom._XROOTMAP_ID };
-	int i;
-
-	for (i=0; i<sizeof(pixmap_atoms)/sizeof(Atom); ++i) {
-		res = server_get_property (server.root_win, pixmap_atoms[i], XA_PIXMAP, 0);
+	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);
+			ret = *((Pixmap *)res);
 			XFree(res);
 			break;
 		}
 	}
 	server.root_pmap = ret;
 
-	if (server.root_pmap == None)
+	if (server.root_pmap == None) {
 		fprintf(stderr, "tint2 : pixmap background detection failed\n");
-	else {
-		XGCValues  gcv;
+	} else {
+		XGCValues gcv;
 		gcv.ts_x_origin = 0;
 		gcv.ts_y_origin = 0;
 		gcv.fill_style = FillTiled;
-		uint mask = GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle | GCTile;
+		unsigned mask = GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle | GCTile;
 
 		gcv.tile = server.root_pmap;
-		XChangeGC(server.dsp, server.gc, mask, &gcv);
+		XChangeGC(server.display, server.gc, mask, &gcv);
 	}
 }
 
-
-int compareMonitorPos(const void *monitor1, const void *monitor2)
+int compare_monitor_pos(const void *monitor1, const void *monitor2)
 {
-	Monitor *m1 = (Monitor*)monitor1;
-	Monitor *m2 = (Monitor*)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) {
+	} else if (m1->x > m2->x) {
 		return 1;
-	}
-	else if (m1->y < m2->y) {
+	} else if (m1->y < m2->y) {
 		return -1;
-	}
-	else if (m1->y > m2->y) {
+	} else if (m1->y > m2->y) {
 		return 1;
-	}
-	else {
+	} else {
 		return 0;
 	}
 }
 
-
-int compareMonitorIncluded(const void *monitor1, const void *monitor2)
+int monitor_includes_monitor(const void *monitor1, const void *monitor2)
 {
-	Monitor *m1 = (Monitor*)monitor1;
-	Monitor *m2 = (Monitor*)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)) {
+	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 {
+	} else {
 		return -1;
 	}
 }
 
+void sort_monitors()
+{
+	qsort(server.monitors, server.num_monitors, sizeof(Monitor), compare_monitor_pos);
+}
 
 void get_monitors()
 {
-	int i, j, nbmonitor;
-	if (XineramaIsActive(server.dsp)) {
-		XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nbmonitor);
-		XRRScreenResources *res = XRRGetScreenResourcesCurrent(server.dsp, server.root_win);
+	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 >= nbmonitor) {
+		if (res && res->ncrtc >= num_monitors) {
 			// use xrandr to identify monitors (does not work with proprietery nvidia drivers)
-
-			// Workaround for issue https://gitlab.com/o9000/tint2/issues/353
-			// on some recent configs, XRRGetScreenResourcesCurrent returns a fantom monitor at last position
-			{
-				int i = res->ncrtc - 1;
-				XRRCrtcInfo* crtc_info = XRRGetCrtcInfo(server.dsp, res, res->crtcs[i]);
-				if (!(crtc_info->x || crtc_info->y || crtc_info->width || crtc_info->height)) {
-					res->ncrtc -= 1;
+			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;
 				}
-				XRRFreeCrtcInfo(crtc_info);
-			}
-
-			printf("xRandr: Found crtc's: %d\n", res->ncrtc );
-			server.monitor = calloc(res->ncrtc, sizeof(Monitor));
-			for (i=0; i<res->ncrtc; ++i) {
-				XRRCrtcInfo* crtc_info = XRRGetCrtcInfo(server.dsp, res, res->crtcs[i]);
-				server.monitor[i].x = crtc_info->x;
-				server.monitor[i].y = crtc_info->y;
-				server.monitor[i].width = crtc_info->width;
-				server.monitor[i].height = crtc_info->height;
-				server.monitor[i].names = calloc((crtc_info->noutput+1), sizeof(gchar*));
-				for (j=0; j<crtc_info->noutput; ++j) {
-					XRROutputInfo* output_info = XRRGetOutputInfo(server.dsp, res, crtc_info->outputs[j]);
+				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.monitor[i].names[j] = g_strdup(output_info->name);
+					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.monitor[i].names[j] = 0;
+				server.monitors[i_monitor].names[crtc_info->noutput] = NULL;
 				XRRFreeCrtcInfo(crtc_info);
 			}
-			nbmonitor = res->ncrtc;
-		}
-		else if (info && nbmonitor > 0) {
-			server.monitor = calloc(nbmonitor, sizeof(Monitor));
-			for (i=0 ; i < nbmonitor ; i++) {
-				server.monitor[i].x = info[i].x_org;
-				server.monitor[i].y = info[i].y_org;
-				server.monitor[i].width = info[i].width;
-				server.monitor[i].height = info[i].height;
-				server.monitor[i].names = 0;
+		} 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;
 			}
 		}
 
-		// ordered monitor
-		qsort(server.monitor, nbmonitor, sizeof(Monitor), compareMonitorIncluded);
+		// Sort monitors by inclusion
+		qsort(server.monitors, num_monitors, sizeof(Monitor), monitor_includes_monitor);
 
-		// remove monitor included into another one
-		i = 0;
-		while (i < nbmonitor) {
-			for (j=0; j < i ; j++) {
-				if (compareMonitorIncluded(&server.monitor[i], &server.monitor[j]) > 0) {
+		// 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 (j=i; j<nbmonitor; ++j)
-			if (server.monitor[j].names)
-				g_strfreev(server.monitor[j].names);
-		server.nb_monitor = i;
-		server.monitor = realloc(server.monitor, server.nb_monitor * sizeof(Monitor));
-		qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitorPos);
+	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.nb_monitor) {
-		server.nb_monitor = 1;
-		server.monitor = calloc(1, sizeof(Monitor));
-		server.monitor[0].x = server.monitor[0].y = 0;
-		server.monitor[0].width = DisplayWidth (server.dsp, server.screen);
-		server.monitor[0].height = DisplayHeight (server.dsp, server.screen);
-		server.monitor[0].names = 0;
+	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.nb_monitor);
-	int i;
-	for (i = 0; i < server.nb_monitor; i++) {
-		fprintf(stderr, "Monitor %d: x = %d, y = %d, w = %d, h = %d\n",
-				i+1,
-				server.monitor[i].x,
-				server.monitor[i].y,
-				server.monitor[i].width,
-				server.monitor[i].height);
+	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);
 	}
 }
 
-int server_get_number_of_desktops()
+void server_get_number_of_desktops()
 {
-	return get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);
+	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()
 {
-	int i;
-
 	// detect number of desktops
 	// wait 15s to leave some time for window manager startup
-	for (i=0 ; i < 15 ; i++) {
-		server.nb_desktop = server_get_number_of_desktops();
-		if (server.nb_desktop > 0) break;
+	for (int i = 0; i < 15; i++) {
+		server_get_number_of_desktops();
+		if (server.num_desktops > 0)
+			break;
 		sleep(1);
 	}
-	if (server.nb_desktop == 0) {
-		server.nb_desktop = 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 *xvi;
-	XVisualInfo templ = { .screen=server.screen, .depth=32, .class=TrueColor };
+	XVisualInfo templ = {.screen = server.screen, .depth = 32, .class = TrueColor};
 	int nvi;
-	xvi = XGetVisualInfo(server.dsp, VisualScreenMask|VisualDepthMask|VisualClassMask, &templ, &nvi);
+	XVisualInfo *xvi =
+		XGetVisualInfo(server.display, VisualScreenMask | VisualDepthMask | VisualClassMask, &templ, &nvi);
 
-	Visual *visual = 0;
+	Visual *visual = NULL;
 	if (xvi) {
-		int i;
 		XRenderPictFormat *format;
-		for (i = 0; i < nvi; i++) {
-			format = XRenderFindVisualFormat(server.dsp, xvi[i].visual);
+		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);
+	XFree(xvi);
 
 	// check composite manager
-	server.composite_manager = XGetSelectionOwner(server.dsp, server.atom._NET_WM_CM_S0);
+	server.composite_manager = XGetSelectionOwner(server.display, server.atom._NET_WM_CM_S0);
 	if (server.colormap)
-		XFreeColormap(server.dsp, server.colormap);
+		XFreeColormap(server.display, server.colormap);
 	if (server.colormap32)
-		XFreeColormap(server.dsp, server.colormap32);
+		XFreeColormap(server.display, server.colormap32);
 
 	if (visual) {
 		server.visual32 = visual;
-		server.colormap32 = XCreateColormap(server.dsp, server.root_win, visual, AllocNone);
+		server.colormap32 = XCreateColormap(server.display, server.root_win, visual, AllocNone);
 	}
 
-	if (!server.disable_transparency && visual && server.composite_manager != None && snapshot_path == 0) {
+	if (!server.disable_transparency && visual && server.composite_manager != None && !snapshot_path) {
 		XSetWindowAttributes attrs;
 		attrs.event_mask = StructureNotifyMask;
-		XChangeWindowAttributes (server.dsp, server.composite_manager, CWEventMask, &attrs);
+		XChangeWindowAttributes(server.display, server.composite_manager, CWEventMask, &attrs);
 
-		server.real_transparency = 1;
+		server.real_transparency = TRUE;
 		server.depth = 32;
 		printf("real transparency on... depth: %d\n", server.depth);
-		server.colormap = XCreateColormap(server.dsp, server.root_win, visual, AllocNone);
+		server.colormap = XCreateColormap(server.display, server.root_win, visual, AllocNone);
 		server.visual = visual;
-	}
-	else {
+	} else {
 		// no composite manager or snapshot mode => fake transparency
-		server.real_transparency = 0;
-		server.depth = DefaultDepth(server.dsp, server.screen);
+		server.real_transparency = FALSE;
+		server.depth = DefaultDepth(server.display, server.screen);
 		printf("real transparency off.... depth: %d\n", server.depth);
-		server.colormap = DefaultColormap(server.dsp, server.screen);
-		server.visual = DefaultVisual(server.dsp, server.screen);
+		server.colormap = DefaultColormap(server.display, server.screen);
+		server.visual = DefaultVisual(server.display, server.screen);
 	}
 }

src/server.h

@@ -18,8 +18,9 @@
 #endif
 #include <glib.h>
 
-typedef struct Global_atom
-{
+extern gboolean primary_monitor_first;
+
+typedef struct Global_atom {
 	Atom _XROOTPMAP_ID;
 	Atom _XROOTMAP_ID;
 	Atom _NET_CURRENT_DESKTOP;
@@ -27,6 +28,7 @@ typedef struct Global_atom
 	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;
@@ -91,34 +93,40 @@ typedef struct Global_atom
 	Atom TARGETS;
 } Global_atom;
 
-
-
-typedef struct Monitor
-{
+typedef struct Monitor {
 	int x;
 	int y;
 	int width;
 	int height;
-	gchar** names;
+	gboolean primary;
+	gchar **names;
 } Monitor;
 
+typedef struct Viewport {
+	int x;
+	int y;
+	int width;
+	int height;
+} Viewport;
 
-typedef struct
-{
-	Display *dsp;
+typedef struct Server {
+	Display *display;
 	Window root_win;
 	Window composite_manager;
-	int real_transparency;
-	int disable_transparency;
+	gboolean real_transparency;
+	gboolean disable_transparency;
 	// current desktop
 	int desktop;
 	int screen;
 	int depth;
-	int nb_desktop;
+	int num_desktops;
 	// number of monitor (without monitor included into another one)
-	int nb_monitor;
-	Monitor *monitor;
-	int got_root_win;
+	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
@@ -128,24 +136,22 @@ typedef struct
 	Colormap colormap32;
 	Global_atom atom;
 #ifdef HAVE_SN
-	SnDisplay *sn_dsp;
+	SnDisplay *sn_display;
 	GTree *pids;
 #endif // HAVE_SN
-} Server_global;
-
-
-extern Server_global server;
+} 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 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
@@ -153,8 +159,12 @@ void get_root_pixmap();
 
 // detect monitors and desktops
 void get_monitors();
+void sort_monitors();
 void print_monitors();
 void get_desktops();
-int server_get_number_of_desktops();
+void server_get_number_of_desktops();
+GSList *get_desktop_names();
+int get_current_desktop();
+void change_desktop(int desktop);
 
 #endif

src/systray/systraybar.h

@@ -16,57 +16,66 @@
 #include <X11/extensions/Xdamage.h>
 
 // XEMBED messages
-#define XEMBED_EMBEDDED_NOTIFY		0
+#define XEMBED_EMBEDDED_NOTIFY 0
 // Flags for _XEMBED_INFO
-#define XEMBED_MAPPED		(1 << 0)
+#define XEMBED_MAPPED (1 << 0)
 
-enum { SYSTRAY_SORT_ASCENDING, SYSTRAY_SORT_DESCENDING, SYSTRAY_SORT_LEFT2RIGHT, SYSTRAY_SORT_RIGHT2LEFT };
+typedef enum SystraySortMethod {
+	SYSTRAY_SORT_ASCENDING = 0,
+	SYSTRAY_SORT_DESCENDING,
+	SYSTRAY_SORT_LEFT2RIGHT,
+	SYSTRAY_SORT_RIGHT2LEFT,
+} SystraySortMethod;
 
 typedef struct {
 	// always start with area
 	Area area;
 
 	GSList *list_icons;
-	int sort;
+	SystraySortMethod sort;
 	int alpha, saturation, brightness;
-	int icon_size, icons_per_column, icons_per_row, marging;
-} Systraybar;
+	int icon_size, icons_per_column, icons_per_row, margin;
+} Systray;
 
-
-typedef struct
-{
-	Window parent;
+typedef struct {
+	// The actual tray icon window (created by the application)
 	Window win;
+	// The parent window created by tint2 to embed the icon
+	Window parent;
 	int x, y;
 	int width, height;
-	// TODO: manage icon's show/hide
-	int hide;
 	int depth;
-	Damage damage;
-	timeout* render_timeout;
-	int empty;
+	gboolean reparented;
+	gboolean embedded;
+	// Process PID or zero.
 	int pid;
+	// A number that is incremented for each new icon, used to sort them by the order in which they were created.
 	int chrono;
-    struct timespec time_last_render;
-	int num_fast_renders;
-	int reparented;
-	int embedded;
-	int bad_size_counter;
-	timeout* resize_timeout;
-	struct timespec time_last_resize;
+	// Name of the tray icon window.
 	char *name;
+	// Members used for rendering
+	struct timespec time_last_render;
+	int num_fast_renders;
+	timeout *render_timeout;
+	// Members used for resizing
+	int bad_size_counter;
+	struct timespec time_last_resize;
+	timeout *resize_timeout;
+	// Icon contents if we are compositing the icon, otherwise null
 	Imlib_Image image;
+	// XDamage
+	Damage damage;
 } TrayWindow;
 
-
 // net_sel_win != None when protocol started
 extern Window net_sel_win;
-extern Systraybar systray;
-extern int refresh_systray;
-extern int systray_enabled;
+extern Systray systray;
+extern gboolean refresh_systray;
+extern gboolean systray_enabled;
 extern int systray_max_icon_size;
 extern int systray_monitor;
-extern int systray_profile;
+extern gboolean systray_profile;
+extern char *systray_hide_name_filter;
 
 // default global data
 void default_systray();
@@ -79,9 +88,9 @@ void init_systray();
 void init_systray_panel(void *p);
 
 void draw_systray(void *obj, cairo_t *c);
-int  resize_systray(void *obj);
+gboolean resize_systray(void *obj);
 void on_change_systray(void *obj);
-int systray_on_monitor(int i_monitor, int nb_panels);
+gboolean systray_on_monitor(int i_monitor, int num_panels);
 
 // systray protocol
 // many tray icon doesn't manage stop/restart of the systray manager
@@ -100,8 +109,10 @@ gboolean request_embed_icon(TrayWindow *traywin);
 void systray_resize_request_event(TrayWindow *traywin, XEvent *e);
 gboolean request_embed_icon(TrayWindow *traywin);
 void systray_reconfigure_event(TrayWindow *traywin, XEvent *e);
+void systray_property_notify(TrayWindow *traywin, XEvent *e);
 void systray_destroy_event(TrayWindow *traywin);
 void kde_update_icons();
 
-#endif
+TrayWindow *systray_find_icon(Window win);
 
+#endif

src/taskbar/task.h

@@ -13,20 +13,20 @@
 #include "common.h"
 #include "timer.h"
 
+typedef enum TaskState {
+	TASK_NORMAL = 0,
+	TASK_ACTIVE,
+	TASK_ICONIFIED,
+	TASK_URGENT,
+	TASK_UNDEFINED,
+	TASK_STATE_COUNT,
+} TaskState;
 
-enum { TASK_NORMAL, TASK_ACTIVE, TASK_ICONIFIED, TASK_URGENT, TASK_STATE_COUNT };
-extern timeout* urgent_timeout;
-extern GSList* urgent_list;
-
-// --------------------------------------------------
-// global task parameter
-typedef struct {
+typedef struct GlobalTask {
 	Area area;
-
-	int text;
-	int icon;
-	int centered;
-
+	gboolean has_text;
+	gboolean has_icon;
+	gboolean centered;
 	int icon_posy;
 	int icon_size1;
 	int maximum_width;
@@ -35,29 +35,29 @@ typedef struct {
 	int saturation[TASK_STATE_COUNT];
 	int brightness[TASK_STATE_COUNT];
 	int config_asb_mask;
-	Background* background[TASK_STATE_COUNT];
+	Background *background[TASK_STATE_COUNT];
+	GList *gradient[TASK_STATE_COUNT];
 	int config_background_mask;
 	// starting position for text ~ task_padding + task_border + icon_size
 	double text_posx, text_height;
-
+	gboolean has_font;
 	PangoFontDescription *font_desc;
 	Color font[TASK_STATE_COUNT];
 	int config_font_mask;
-	int tooltip_enabled;
-} Global_task;
+	gboolean tooltip_enabled;
+} GlobalTask;
 
-
-
-typedef struct {
-	// always start with area
+// Stores information about a task.
+// Warning: any dynamically allocated members are shared between the Task instances created for the same window
+// (if the task appears on all desktops, there will be a different instance on each desktop's taskbar).
+typedef struct Task {
 	Area area;
-
-	// TODO: group task with list of windows here
 	Window win;
-	int  desktop;
-	int current_state;
+	int desktop;
+	TaskState current_state;
 	Imlib_Image icon[TASK_STATE_COUNT];
-	Pixmap state_pix[TASK_STATE_COUNT];
+	Imlib_Image icon_hover[TASK_STATE_COUNT];
+	Imlib_Image icon_press[TASK_STATE_COUNT];
 	unsigned int icon_width;
 	unsigned int icon_height;
 	char *title;
@@ -67,27 +67,37 @@ typedef struct {
 	int win_y;
 	int win_w;
 	int win_h;
+	struct timespec last_activation_time;
+	int _text_width;
+	int _text_height;
+	double _text_posy;
+	int _icon_x;
+	int _icon_y;
 } Task;
 
+extern timeout *urgent_timeout;
+extern GSList *urgent_list;
 
-Task *add_task (Window win);
-void remove_task (Task *tsk);
+Task *add_task(Window win);
+void remove_task(Task *task);
 
-void draw_task (void *obj, cairo_t *c);
-void on_change_task (void *obj);
+void draw_task(void *obj, cairo_t *c);
+void on_change_task(void *obj);
 
-void get_icon (Task *tsk);
-int  get_title(Task *tsk);
-void active_task();
-void set_task_state(Task* tsk, int state);
-void set_task_redraw(Task* tsk);
+void task_update_icon(Task *task);
+gboolean task_update_title(Task *task);
+void reset_active_task();
+void set_task_state(Task *task, TaskState state);
 
-Task *find_active_task(Task *current_task, Task *active_task);
-Task *next_task (Task *tsk);
-Task *prev_task (Task *tsk);
+// 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.
+// If not found, returns the current task.
+Task *find_active_task(Task *current_task);
 
-void add_urgent(Task *tsk);
-void del_urgent(Task *tsk);
+Task *next_task(Task *task);
+Task *prev_task(Task *task);
+
+void add_urgent(Task *task);
+void del_urgent(Task *task);
 
 #endif
-

src/taskbar/taskbar.c

@@ -33,36 +33,51 @@
 #include "panel.h"
 #include "strnatcmp.h"
 
+GHashTable *win_to_task;
 
-/* win_to_task_table holds for every Window an array of tasks. Usually the array contains only one
-   element. However for omnipresent windows (windows which are visible in every taskbar) the array
-   contains to every Task* on each panel a pointer (i.e. GPtrArray.len == server.nb_desktop)
-*/
-GHashTable* win_to_task_table;
-
-Task *task_active;
+Task *active_task;
 Task *task_drag;
-int taskbar_enabled;
-int taskbar_distribute_size;
-int hide_inactive_tasks;
-int hide_task_diff_monitor;
-int taskbar_sort_method;
-int taskbar_alignment;
+gboolean taskbar_enabled;
+gboolean taskbar_distribute_size;
+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;
 
-guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
-gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
-void free_ptr_array(gpointer data) { g_ptr_array_free(data, 1); }
+void taskbar_init_fonts();
+int taskbar_compute_desired_size(void *obj);
 
+// Removes the task with &win = key. The other args are ignored.
+void taskbar_remove_task(Window *win);
+
+guint win_hash(gconstpointer key)
+{
+	return *((const Window *)key);
+}
+
+gboolean win_compare(gconstpointer a, gconstpointer b)
+{
+	return (*((const Window *)a) == *((const Window *)b));
+}
+
+void free_ptr_array(gpointer data)
+{
+	g_ptr_array_free(data, 1);
+}
 
 void default_taskbar()
 {
-	win_to_task_table = NULL;
+	win_to_task = NULL;
 	urgent_timeout = NULL;
 	urgent_list = NULL;
-	taskbar_enabled = 0;
-	taskbar_distribute_size = 0;
-	hide_inactive_tasks = 0;
-	hide_task_diff_monitor = 0;
+	taskbar_enabled = FALSE;
+	taskbar_distribute_size = FALSE;
+	hide_inactive_tasks = FALSE;
+	hide_task_diff_monitor = FALSE;
+	hide_taskbar_if_empty = FALSE;
+	always_show_all_desktop_tasks = FALSE;
 	taskbar_sort_method = TASKBAR_NOSORT;
 	taskbar_alignment = ALIGN_LEFT;
 	default_taskbarname();
@@ -70,36 +85,27 @@ void default_taskbar()
 
 void cleanup_taskbar()
 {
-	Panel *panel;
-	Taskbar *tskbar;
-	int i, j, k;
-
-	cleanup_taskbarname();
-	if (win_to_task_table) {
-		while (g_hash_table_size(win_to_task_table)) {
+	if (win_to_task) {
+		while (g_hash_table_size(win_to_task)) {
 			GHashTableIter iter;
 			gpointer key, value;
 
-			g_hash_table_iter_init(&iter, win_to_task_table);
+			g_hash_table_iter_init(&iter, win_to_task);
 			if (g_hash_table_iter_next(&iter, &key, &value)) {
-				taskbar_remove_task(key, 0, 0);
+				taskbar_remove_task(key);
 			}
 		}
-		g_hash_table_destroy(win_to_task_table);
-		win_to_task_table = NULL;
+		g_hash_table_destroy(win_to_task);
+		win_to_task = NULL;
 	}
-	for (i = 0 ; i < nb_panel; i++) {
-		panel = &panel1[i];
-		for (j = 0; j < panel->nb_desktop; j++) {
-			tskbar = &panel->taskbar[j];
-			for (k = 0; k < TASKBAR_STATE_COUNT; ++k) {
-				if (tskbar->state_pix[k])
-					XFreePixmap(server.dsp, tskbar->state_pix[k]);
-				tskbar->state_pix[k] = 0;
-			}
-			free_area(&tskbar->area);
+	cleanup_taskbarname();
+	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];
+			free_area(&taskbar->area);
 			// remove taskbar from the panel
-			panel->area.list = g_list_remove(panel->area.list, tskbar);
+			remove_area((Area *)taskbar);
 		}
 		if (panel->taskbar) {
 			free(panel->taskbar);
@@ -111,313 +117,426 @@ void cleanup_taskbar()
 	urgent_list = NULL;
 
 	stop_timeout(urgent_timeout);
-}
 
+	for (int state = 0; state < TASK_STATE_COUNT; state++) {
+		g_list_free(panel_config.g_task.gradient[state]);
+	}
+
+	for (int state = 0; state < TASKBAR_STATE_COUNT; state++) {
+		g_list_free(panel_config.g_taskbar.gradient[state]);
+		g_list_free(panel_config.g_taskbar.gradient_name[state]);
+	}
+}
 
 void init_taskbar()
 {
-	if (win_to_task_table == 0)
-		win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array);
+	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;
+	}
 
-	task_active = 0;
+	if (!win_to_task)
+		win_to_task = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array);
+
+	active_task = 0;
 	task_drag = 0;
 }
 
-
 void init_taskbar_panel(void *p)
 {
-	Panel *panel =(Panel*)p;
-	int j;
+	Panel *panel = (Panel *)p;
 
-	if (panel->g_taskbar.background[TASKBAR_NORMAL] == 0) {
+	if (!panel->g_taskbar.background[TASKBAR_NORMAL]) {
 		panel->g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, 0);
 		panel->g_taskbar.background[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, 0);
 	}
-	if (panel->g_taskbar.background_name[TASKBAR_NORMAL] == 0) {
+	if (!panel->g_taskbar.background_name[TASKBAR_NORMAL]) {
 		panel->g_taskbar.background_name[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, 0);
 		panel->g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, 0);
 	}
-	if (!panel->g_task.font_desc)
-		panel->g_task.font_desc = pango_font_description_from_string(DEFAULT_FONT);
-	if (panel->g_task.area.bg == 0)
+	if (!panel->g_task.area.bg)
 		panel->g_task.area.bg = &g_array_index(backgrounds, Background, 0);
+	taskbar_init_fonts();
 
 	// taskbar name
 	panel->g_taskbar.area_name.panel = panel;
-	panel->g_taskbar.area_name.size_mode = SIZE_BY_CONTENT;
+	snprintf(panel->g_taskbar.area_name.name, sizeof(panel->g_taskbar.area_name.name), "Taskbarname");
+	panel->g_taskbar.area_name.size_mode = LAYOUT_FIXED;
 	panel->g_taskbar.area_name._resize = resize_taskbarname;
+	panel->g_taskbar.area_name._is_under_mouse = full_width_area_is_under_mouse;
 	panel->g_taskbar.area_name._draw_foreground = draw_taskbarname;
 	panel->g_taskbar.area_name._on_change_layout = 0;
-	panel->g_taskbar.area_name.resize = 1;
-	panel->g_taskbar.area_name.on_screen = 1;
+	panel->g_taskbar.area_name.resize_needed = 1;
+	panel->g_taskbar.area_name.on_screen = TRUE;
 
 	// taskbar
 	panel->g_taskbar.area.parent = panel;
 	panel->g_taskbar.area.panel = panel;
-	panel->g_taskbar.area.size_mode = SIZE_BY_LAYOUT;
+	snprintf(panel->g_taskbar.area.name, sizeof(panel->g_taskbar.area.name), "Taskbar");
+	panel->g_taskbar.area.size_mode = LAYOUT_DYNAMIC;
 	panel->g_taskbar.area.alignment = taskbar_alignment;
 	panel->g_taskbar.area._resize = resize_taskbar;
-	panel->g_taskbar.area._draw_foreground = draw_taskbar;
-	panel->g_taskbar.area._on_change_layout = on_change_taskbar;
-	panel->g_taskbar.area.resize = 1;
-	panel->g_taskbar.area.on_screen = 1;
+	panel->g_taskbar.area._compute_desired_size = taskbar_compute_desired_size;
+	panel->g_taskbar.area._is_under_mouse = full_width_area_is_under_mouse;
+	panel->g_taskbar.area.resize_needed = 1;
+	panel->g_taskbar.area.on_screen = TRUE;
 	if (panel_horizontal) {
-		panel->g_taskbar.area.posy = panel->area.bg->border.width + panel->area.paddingy;
-		panel->g_taskbar.area.height = panel->area.height - (2 * panel->g_taskbar.area.posy);
+		panel->g_taskbar.area.posy = top_border_width(&panel->area) + panel->area.paddingy;
+		panel->g_taskbar.area.height =
+		    panel->area.height - top_bottom_border_width(&panel->area) - 2 * panel->area.paddingy;
 		panel->g_taskbar.area_name.posy = panel->g_taskbar.area.posy;
 		panel->g_taskbar.area_name.height = panel->g_taskbar.area.height;
-	}
-	else {
-		panel->g_taskbar.area.posx = panel->area.bg->border.width + panel->area.paddingy;
-		panel->g_taskbar.area.width = panel->area.width - (2 * panel->g_taskbar.area.posx);
+	} else {
+		panel->g_taskbar.area.posx = left_border_width(&panel->area) + panel->area.paddingy;
+		panel->g_taskbar.area.width =
+		    panel->area.width - left_right_border_width(&panel->area) - 2 * panel->area.paddingy;
 		panel->g_taskbar.area_name.posx = panel->g_taskbar.area.posx;
 		panel->g_taskbar.area_name.width = panel->g_taskbar.area.width;
 	}
 
 	// task
 	panel->g_task.area.panel = panel;
-	panel->g_task.area.size_mode = SIZE_BY_LAYOUT;
+	snprintf(panel->g_task.area.name, sizeof(panel->g_task.area.name), "Task");
+	panel->g_task.area.size_mode = LAYOUT_DYNAMIC;
 	panel->g_task.area._draw_foreground = draw_task;
 	panel->g_task.area._on_change_layout = on_change_task;
-	panel->g_task.area.resize = 1;
-	panel->g_task.area.on_screen = 1;
-	if ((panel->g_task.config_asb_mask & (1<<TASK_NORMAL)) == 0) {
+	panel->g_task.area.resize_needed = 1;
+	panel->g_task.area.on_screen = TRUE;
+	if ((panel->g_task.config_asb_mask & (1 << TASK_NORMAL)) == 0) {
 		panel->g_task.alpha[TASK_NORMAL] = 100;
 		panel->g_task.saturation[TASK_NORMAL] = 0;
 		panel->g_task.brightness[TASK_NORMAL] = 0;
 	}
-	if ((panel->g_task.config_asb_mask & (1<<TASK_ACTIVE)) == 0) {
+	if ((panel->g_task.config_asb_mask & (1 << TASK_ACTIVE)) == 0) {
 		panel->g_task.alpha[TASK_ACTIVE] = panel->g_task.alpha[TASK_NORMAL];
 		panel->g_task.saturation[TASK_ACTIVE] = panel->g_task.saturation[TASK_NORMAL];
 		panel->g_task.brightness[TASK_ACTIVE] = panel->g_task.brightness[TASK_NORMAL];
 	}
-	if ((panel->g_task.config_asb_mask & (1<<TASK_ICONIFIED)) == 0) {
+	if ((panel->g_task.config_asb_mask & (1 << TASK_ICONIFIED)) == 0) {
 		panel->g_task.alpha[TASK_ICONIFIED] = panel->g_task.alpha[TASK_NORMAL];
 		panel->g_task.saturation[TASK_ICONIFIED] = panel->g_task.saturation[TASK_NORMAL];
 		panel->g_task.brightness[TASK_ICONIFIED] = panel->g_task.brightness[TASK_NORMAL];
 	}
-	if ((panel->g_task.config_asb_mask & (1<<TASK_URGENT)) == 0) {
+	if ((panel->g_task.config_asb_mask & (1 << TASK_URGENT)) == 0) {
 		panel->g_task.alpha[TASK_URGENT] = panel->g_task.alpha[TASK_ACTIVE];
 		panel->g_task.saturation[TASK_URGENT] = panel->g_task.saturation[TASK_ACTIVE];
 		panel->g_task.brightness[TASK_URGENT] = panel->g_task.brightness[TASK_ACTIVE];
 	}
-	if ((panel->g_task.config_font_mask & (1<<TASK_NORMAL)) == 0) panel->g_task.font[TASK_NORMAL] = (Color){{0, 0, 0}, 0};
-	if ((panel->g_task.config_font_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL];
-	if ((panel->g_task.config_font_mask & (1<<TASK_ICONIFIED)) == 0) panel->g_task.font[TASK_ICONIFIED] = panel->g_task.font[TASK_NORMAL];
-	if ((panel->g_task.config_font_mask & (1<<TASK_URGENT)) == 0) panel->g_task.font[TASK_URGENT] = panel->g_task.font[TASK_ACTIVE];
-	if ((panel->g_task.config_background_mask & (1<<TASK_NORMAL)) == 0) panel->g_task.background[TASK_NORMAL] = &g_array_index(backgrounds, Background, 0);
-	if ((panel->g_task.config_background_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.background[TASK_ACTIVE] = panel->g_task.background[TASK_NORMAL];
-	if ((panel->g_task.config_background_mask & (1<<TASK_ICONIFIED)) == 0) panel->g_task.background[TASK_ICONIFIED] = panel->g_task.background[TASK_NORMAL];
-	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.config_font_mask & (1 << TASK_NORMAL)) == 0)
+		panel->g_task.font[TASK_NORMAL] = (Color){{1, 1, 1}, 1};
+	if ((panel->g_task.config_font_mask & (1 << TASK_ACTIVE)) == 0)
+		panel->g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL];
+	if ((panel->g_task.config_font_mask & (1 << TASK_ICONIFIED)) == 0)
+		panel->g_task.font[TASK_ICONIFIED] = panel->g_task.font[TASK_NORMAL];
+	if ((panel->g_task.config_font_mask & (1 << TASK_URGENT)) == 0)
+		panel->g_task.font[TASK_URGENT] = panel->g_task.font[TASK_ACTIVE];
+	if ((panel->g_task.config_background_mask & (1 << TASK_NORMAL)) == 0)
+		panel->g_task.background[TASK_NORMAL] = &g_array_index(backgrounds, Background, 0);
+	if ((panel->g_task.config_background_mask & (1 << TASK_ACTIVE)) == 0)
+		panel->g_task.background[TASK_ACTIVE] = panel->g_task.background[TASK_NORMAL];
+	if ((panel->g_task.config_background_mask & (1 << TASK_ICONIFIED)) == 0)
+		panel->g_task.background[TASK_ICONIFIED] = panel->g_task.background[TASK_NORMAL];
+	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)
+		panel->g_task.maximum_width = server.monitors[panel->monitor].width;
+	if (!panel->g_task.maximum_height)
+		panel->g_task.maximum_height = server.monitors[panel->monitor].height;
 
 	if (panel_horizontal) {
-		panel->g_task.area.posy = panel->g_taskbar.area.posy + panel->g_taskbar.background[TASKBAR_NORMAL]->border.width + panel->g_taskbar.area.paddingy;
-		panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy);
-	}
-	else {
-		panel->g_task.area.posx = panel->g_taskbar.area.posx + panel->g_taskbar.background[TASKBAR_NORMAL]->border.width + panel->g_taskbar.area.paddingy;
-		panel->g_task.area.width = panel->area.width - (2 * panel->g_task.area.posx);
+		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_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;
+	} 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_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;
 	}
 
-	for (j=0; j<TASK_STATE_COUNT; ++j) {
-		if (panel->g_task.background[j] == 0)
+	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.rounded > panel->g_task.area.height/2) {
-			printf("task%sbackground_id has a too large rounded value. Please fix your tint2rc\n", j==0 ? "_" : j==1 ? "_active_" : j==2 ? "_iconified_" : "_urgent_");
+		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",
+			       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);
-			panel->g_task.background[j]->border.rounded = panel->g_task.area.height/2;
+			panel->g_task.background[j] = &g_array_index(backgrounds, Background, backgrounds->len - 1);
+			panel->g_task.background[j]->border.radius = panel->g_task.area.height / 2;
 		}
 	}
 
 	// compute vertical position : text and icon
-	int height_ink, height;
-	get_text_size(panel->g_task.font_desc, &height_ink, &height, panel->area.height, "TAjpg", 5);
+	int height_ink, height, width;
+	get_text_size2(panel->g_task.font_desc,
+	               &height_ink,
+	               &height,
+	               &width,
+	               panel->area.height,
+	               panel->area.width,
+	               "TAjpg",
+	               5,
+	               PANGO_WRAP_WORD_CHAR,
+	               PANGO_ELLIPSIZE_END,
+	               FALSE);
 
-	if (!panel->g_task.maximum_width && panel_horizontal)
-		panel->g_task.maximum_width = server.monitor[panel->monitor].width;
-
-	panel->g_task.text_posx = panel->g_task.background[0]->border.width + panel->g_task.area.paddingxlr;
+	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);
-	if (panel->g_task.icon) {
-		panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
+	if (panel->g_task.has_icon) {
+		panel->g_task.icon_size1 = MIN(MIN(panel->g_task.maximum_width, panel->g_task.maximum_height),
+		                               MIN(panel->g_task.area.width, panel->g_task.area.height)) -
+		                           2 * panel->g_task.area.paddingy - MAX(left_right_border_width(&panel->g_task.area),
+		                                                                 top_bottom_border_width(&panel->g_task.area));
 		panel->g_task.text_posx += panel->g_task.icon_size1 + panel->g_task.area.paddingx;
 		panel->g_task.icon_posy = (panel->g_task.area.height - panel->g_task.icon_size1) / 2;
+		if (0)
+			printf("task: icon_size = %d, textx = %f, texth = %f, icony = %d, w = %d, h = %d, maxw = %d, maxh = %d\n",
+			       panel->g_task.icon_size1,
+			       panel->g_task.text_posx,
+			       panel->g_task.text_height,
+			       panel->g_task.icon_posy,
+			       panel->g_task.area.width,
+			       panel->g_task.area.height,
+			       panel->g_task.maximum_width,
+			       panel->g_task.maximum_height);
 	}
-	//printf("monitor %d, task_maximum_width %d\n", panel->monitor, panel->g_task.maximum_width);
 
-	Taskbar *tskbar;
-	panel->nb_desktop = server.nb_desktop;
-	panel->taskbar = calloc(server.nb_desktop, sizeof(Taskbar));
-	for (j=0 ; j < panel->nb_desktop ; j++) {
-		tskbar = &panel->taskbar[j];
-		memcpy(&tskbar->area, &panel->g_taskbar.area, sizeof(Area));
-		tskbar->desktop = j;
-		if (j == server.desktop)
-			tskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
-		else
-			tskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
+	Taskbar *taskbar;
+	panel->num_desktops = server.num_desktops;
+	panel->taskbar = calloc(server.num_desktops, sizeof(Taskbar));
+	for (int j = 0; j < panel->num_desktops; j++) {
+		taskbar = &panel->taskbar[j];
+		memcpy(&taskbar->area, &panel->g_taskbar.area, sizeof(Area));
+		taskbar->desktop = j;
+		if (j == server.desktop) {
+			taskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
+			free_area_gradient_instances(&taskbar->area);
+			instantiate_area_gradients(&taskbar->area);
+		} else {
+			taskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
+			free_area_gradient_instances(&taskbar->area);
+			instantiate_area_gradients(&taskbar->area);
+		}
+
 	}
 	init_taskbarname_panel(panel);
 }
 
-
-void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data)
+void taskbar_init_fonts()
 {
-	remove_task(task_get_task(*(Window*)key));
+	for (int i = 0; i < num_panels; i++) {
+		if (!panels[i].g_task.font_desc) {
+			panels[i].g_task.font_desc = pango_font_description_from_string(get_default_font());
+			pango_font_description_set_size(panels[i].g_task.font_desc,
+			                                pango_font_description_get_size(panels[i].g_task.font_desc) - PANGO_SCALE);
+		}
+	}
 }
 
-
-Task *task_get_task (Window win)
+void taskbar_default_font_changed()
 {
-	GPtrArray* task_group = task_get_tasks(win);
-	if (task_group)
-		return g_ptr_array_index(task_group, 0);
-	else
-		return 0;
+	if (!taskbar_enabled)
+		return;
+
+	gboolean needs_update = FALSE;
+	for (int i = 0; i < num_panels; i++) {
+		if (!panels[i].g_task.has_font) {
+			pango_font_description_free(panels[i].g_task.font_desc);
+			panels[i].g_task.font_desc = NULL;
+			needs_update = TRUE;
+		}
+	}
+	if (!needs_update)
+		return;
+	taskbar_init_fonts();
+	for (int i = 0; i < num_panels; i++) {
+		for (int j = 0; j < panels[i].num_desktops; j++) {
+			Taskbar *taskbar = &panels[i].taskbar[j];
+			for (GList *c = taskbar->area.children; c; c = c->next) {
+				Task *t = c->data;
+				t->area.resize_needed = TRUE;
+				schedule_redraw(&t->area);
+			}
+		}
+	}
+	schedule_panel_redraw();
 }
 
-
-GPtrArray* task_get_tasks(Window win)
+void taskbar_remove_task(Window *win)
 {
-	if (win_to_task_table && taskbar_enabled)
-		return g_hash_table_lookup(win_to_task_table, &win);
-	else
-		return 0;
+	remove_task(get_task(*win));
 }
 
-
-void task_refresh_tasklist ()
+Task *get_task(Window win)
 {
-	Window *win;
-	int num_results, i;
+	GPtrArray *task_buttons = get_task_buttons(win);
+	if (task_buttons)
+		return g_ptr_array_index(task_buttons, 0);
+	return NULL;
+}
 
-	if (!taskbar_enabled) return;
-	win = server_get_property (server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
-	if (!win) return;
+GPtrArray *get_task_buttons(Window win)
+{
+	if (win_to_task && taskbar_enabled)
+		return g_hash_table_lookup(win_to_task, &win);
+	return NULL;
+}
 
-	GList* win_list = g_hash_table_get_keys(win_to_task_table);
-	GList* it;
-	for (it=win_list; it; it=it->next) {
+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);
+	if (!win)
+		return;
+
+	GList *win_list = g_hash_table_get_keys(win_to_task);
+	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) == win[i])
 				break;
 		if (i == num_results)
-			taskbar_remove_task(it->data, 0, 0);
+			taskbar_remove_task(it->data);
 	}
 	g_list_free(win_list);
 
 	// Add any new
-	for (i = 0; i < num_results; i++)
-		if (!task_get_task (win[i]))
-			add_task (win[i]);
+	for (int i = 0; i < num_results; i++)
+		if (!get_task(win[i]))
+			add_task(win[i]);
 
-	XFree (win);
+	XFree(win);
 }
 
-
-void draw_taskbar (void *obj, cairo_t *c)
+int taskbar_compute_desired_size(void *obj)
 {
-	Taskbar *taskbar = obj;
-	int state = (taskbar->desktop == server.desktop) ? TASKBAR_ACTIVE : TASKBAR_NORMAL;
-	
-	taskbar->state_pix[state] = taskbar->area.pix;
+	Taskbar *taskbar = (Taskbar *)obj;
+	Panel *panel = (Panel *)taskbar->area.panel;
+
+	if (taskbar_mode == MULTI_DESKTOP && !taskbar_distribute_size) {
+		int result = 0;
+		for (int i = 0; i < panel->num_desktops; i++) {
+			 Taskbar *t = &panel->taskbar[i];
+			 result = MAX(result, container_compute_desired_size(&t->area));
+		}
+		return result;
+	}
+	return container_compute_desired_size(&taskbar->area);
 }
 
-
-int resize_taskbar(void *obj)
+gboolean resize_taskbar(void *obj)
 {
-	Taskbar *taskbar = (Taskbar*)obj;
-	Panel *panel = (Panel*)taskbar->area.panel;
-	int text_width;
+	Taskbar *taskbar = (Taskbar *)obj;
+	Panel *panel = (Panel *)taskbar->area.panel;
 
-	//printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
+	// printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
 	if (panel_horizontal) {
-		resize_by_layout(obj, panel->g_task.maximum_width);
-		
-		text_width = panel->g_task.maximum_width;
-		GList *l = taskbar->area.list;
-		if (taskbarname_enabled) l = l->next;
+		relayout_with_constraint(&taskbar->area, panel->g_task.maximum_width);
+
+		int text_width = panel->g_task.maximum_width;
+		GList *l = taskbar->area.children;
+		if (taskbarname_enabled)
+			l = l->next;
 		for (; l != NULL; l = l->next) {
 			if (((Task *)l->data)->area.on_screen) {
 				text_width = ((Task *)l->data)->area.width;
 				break;
 			}
 		}
-		taskbar->text_width = text_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingxlr;
+		taskbar->text_width = text_width - panel->g_task.text_posx - right_border_width(&panel->g_task.area) -
+		                      panel->g_task.area.paddingxlr;
+	} else {
+		relayout_with_constraint(&taskbar->area, panel->g_task.maximum_height);
+
+		taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx -
+		                      right_border_width(&panel->g_task.area) - panel->g_task.area.paddingxlr;
 	}
-	else {
-		resize_by_layout(obj, panel->g_task.maximum_height);
-		
-		taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingxlr;
-	}
-	return 0;
+	return FALSE;
 }
 
-
-void on_change_taskbar (void *obj)
+gboolean taskbar_is_empty(Taskbar *taskbar)
 {
-	Taskbar *tskbar = obj;
-	int k;
-
-	// reset Pixmap when position/size changed
-	for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
-		if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
-		tskbar->state_pix[k] = 0;
+	GList *l = taskbar->area.children;
+	if (taskbarname_enabled)
+		l = l->next;
+	for (; l != NULL; l = l->next) {
+		if (((Task *)l->data)->area.on_screen) {
+			return FALSE;
+		}
 	}
-	tskbar->area.pix = 0;
-	tskbar->area.redraw = 1;
+	return TRUE;
 }
 
-
-void set_taskbar_state(Taskbar *tskbar, int state)
+void update_taskbar_visibility(Taskbar *taskbar)
 {
-	tskbar->area.bg = panel1[0].g_taskbar.background[state];
-	tskbar->area.pix = tskbar->state_pix[state];
+	if (taskbar->desktop == server.desktop) {
+		// Taskbar for current desktop is always shown
+		show(&taskbar->area);
+	} else if (taskbar_mode == MULTI_DESKTOP) {
+		if (hide_taskbar_if_empty) {
+			if (taskbar_is_empty(taskbar)) {
+				hide(&taskbar->area);
+			} else {
+				show(&taskbar->area);
+			}
+		} else {
+			show(&taskbar->area);
+		}
+	} else {
+		hide(&taskbar->area);
+	}
+}
+
+void update_all_taskbars_visibility()
+{
+	for (int i = 0; i < num_panels; i++) {
+		Panel *panel = &panels[i];
+		for (int j = 0; j < panel->num_desktops; j++) {
+			update_taskbar_visibility(&panel->taskbar[j]);
+		}
+	}
+}
+
+void set_taskbar_state(Taskbar *taskbar, TaskbarState state)
+{
+	taskbar->area.bg = panels[0].g_taskbar.background[state];
+	free_area_gradient_instances(&taskbar->area);
+	instantiate_area_gradients(&taskbar->area);
+
 	if (taskbarname_enabled) {
-		tskbar->bar_name.area.bg = panel1[0].g_taskbar.background_name[state];
-		tskbar->bar_name.area.pix = tskbar->bar_name.state_pix[state];
+		taskbar->bar_name.area.bg = panels[0].g_taskbar.background_name[state];
+		free_area_gradient_instances(&taskbar->bar_name.area);
+		instantiate_area_gradients(&taskbar->bar_name.area);
 	}
-	if (panel_mode != MULTI_DESKTOP) { 
-		if (state == TASKBAR_NORMAL)
-			tskbar->area.on_screen = 0;
-		else
-			tskbar->area.on_screen = 1;
-	}
-	if (tskbar->area.on_screen == 1) {
-		if (tskbar->state_pix[state] == 0)
-			tskbar->area.redraw = 1;
-		if (taskbarname_enabled && tskbar->bar_name.state_pix[state] == 0)
-			tskbar->bar_name.area.redraw = 1;
-		if (panel_mode == MULTI_DESKTOP && panel1[0].g_taskbar.background[TASKBAR_NORMAL] != panel1[0].g_taskbar.background[TASKBAR_ACTIVE]) {
-			GList *l = tskbar->area.list;
-			if (taskbarname_enabled) l = l->next;
-			for ( ; l ; l = l->next)
-				set_task_redraw(l->data);
+
+	update_taskbar_visibility(taskbar);
+
+	if (taskbar->area.on_screen) {
+		schedule_redraw(&taskbar->area);
+		if (taskbarname_enabled) {
+			schedule_redraw(&taskbar->bar_name.area);
+		}
+		if (taskbar_mode == MULTI_DESKTOP &&
+		    panels[0].g_taskbar.background[TASKBAR_NORMAL] != panels[0].g_taskbar.background[TASKBAR_ACTIVE]) {
+			GList *l = taskbar->area.children;
+			if (taskbarname_enabled)
+				l = l->next;
+			for (; l; l = l->next)
+				schedule_redraw((Area *)l->data);
 		}
 	}
-	panel_refresh = 1;
-}
-
-
-void visible_taskbar(void *p)
-{
-	Panel *panel =(Panel*)p;
-	int j;
-
-	Taskbar *taskbar;
-	for (j=0 ; j < panel->nb_desktop ; j++) {
-		taskbar = &panel->taskbar[j];
-		if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
-			// SINGLE_DESKTOP and not current desktop
-			taskbar->area.on_screen = 0;
-		}
-		else {
-			taskbar->area.on_screen = 1;
-		}
-	}
-	panel_refresh = 1;
+	schedule_panel_redraw();
 }
 
 #define NONTRIVIAL 2
@@ -426,23 +545,21 @@ gint compare_tasks_trivial(Task *a, Task *b, Taskbar *taskbar)
 	if (a == b)
 		return 0;
 	if (taskbarname_enabled) {
-		if (a == taskbar->area.list->data)
+		if (a == taskbar->area.children->data)
 			return -1;
-		if (b == taskbar->area.list->data)
+		if (b == taskbar->area.children->data)
 			return 1;
 	}
 	return NONTRIVIAL;
 }
 
-gint contained_within(Task *a, Task *b)
+gboolean contained_within(Task *a, Task *b)
 {
-	if ((a->win_x <= b->win_x) &&
-		(a->win_y <= b->win_y) &&
-		(a->win_x + a->win_w >= b->win_x + b->win_w) &&
-		(a->win_y + a->win_h >= b->win_y + b->win_h)) {
-		return 1;
+	if ((a->win_x <= b->win_x) && (a->win_y <= b->win_y) && (a->win_x + a->win_w >= b->win_x + b->win_w) &&
+	    (a->win_y + a->win_h >= b->win_y + b->win_h)) {
+		return TRUE;
 	}
-	return 0;
+	return FALSE;
 }
 
 gint compare_task_centers(Task *a, Task *b, Taskbar *taskbar)
@@ -453,10 +570,7 @@ gint compare_task_centers(Task *a, Task *b, Taskbar *taskbar)
 
 	// If a window has the same coordinates and size as the other,
 	// they are considered to be equal in the comparison.
-	if ((a->win_x == b->win_x) &&
-		(a->win_y == b->win_y) &&
-		(a->win_w == b->win_w) &&
-		(a->win_h == b->win_h)) {
+	if ((a->win_x == b->win_x) && (a->win_y == b->win_y) && (a->win_w == b->win_w) && (a->win_h == b->win_h)) {
 		return 0;
 	}
 
@@ -468,11 +582,10 @@ gint compare_task_centers(Task *a, Task *b, Taskbar *taskbar)
 		return 1;
 
 	// Compare centers
-	int a_horiz_c, a_vert_c, b_horiz_c, b_vert_c;
-	a_horiz_c = a->win_x + a->win_w / 2;
-	b_horiz_c = b->win_x + b->win_w / 2;
-	a_vert_c = a->win_y + a->win_h / 2;
-	b_vert_c = b->win_y + b->win_h / 2;
+	int a_horiz_c = a->win_x + a->win_w / 2;
+	int b_horiz_c = b->win_x + b->win_w / 2;
+	int a_vert_c = a->win_y + a->win_h / 2;
+	int b_vert_c = b->win_y + b->win_h / 2;
 	if (panel_horizontal) {
 		if (a_horiz_c != b_horiz_c) {
 			return a_horiz_c - b_horiz_c;
@@ -505,58 +618,59 @@ 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_LRU) {
+		return compare_timespecs(&a->last_activation_time, &b->last_activation_time);
+	} else if (taskbar_sort_method == TASKBAR_SORT_MRU) {
+		return -compare_timespecs(&a->last_activation_time, &b->last_activation_time);
 	}
 	return 0;
 }
 
-int taskbar_needs_sort(Taskbar *taskbar)
+gboolean taskbar_needs_sort(Taskbar *taskbar)
 {
 	if (taskbar_sort_method == TASKBAR_NOSORT)
-		return 0;
+		return FALSE;
 
-	GList *i, *j;
-	for (i = taskbar->area.list, j = i ? i->next : NULL; i && j; i = i->next, j = j->next) {
+	for (GList *i = taskbar->area.children, *j = i ? i->next : NULL; i && j; i = i->next, j = j->next) {
 		if (compare_tasks(i->data, j->data, taskbar) > 0) {
-			return 1;
+			return TRUE;
 		}
 	}
 
-	return 0;
+	return FALSE;
 }
 
 void sort_tasks(Taskbar *taskbar)
 {
 	if (!taskbar)
 		return;
-	if (!taskbar_needs_sort(taskbar)) {
+	if (!taskbar_needs_sort(taskbar))
 		return;
-	}
-	taskbar->area.list = g_list_sort_with_data(taskbar->area.list, (GCompareDataFunc)compare_tasks, taskbar);
-	taskbar->area.resize = 1;
-	panel_refresh = 1;
-	((Panel*)taskbar->area.panel)->area.resize = 1;
-}
 
+	taskbar->area.children = g_list_sort_with_data(taskbar->area.children, (GCompareDataFunc)compare_tasks, taskbar);
+	taskbar->area.resize_needed = TRUE;
+	schedule_panel_redraw();
+	((Panel *)taskbar->area.panel)->area.resize_needed = TRUE;
+}
 
 void sort_taskbar_for_win(Window win)
 {
 	if (taskbar_sort_method == TASKBAR_NOSORT)
 		return;
 
-	GPtrArray* task_group = task_get_tasks(win);
-	if (task_group) {
-		int i;
-		Task* tsk0 = g_ptr_array_index(task_group, 0);
-		if (tsk0) {
-			window_get_coordinates(win, &tsk0->win_x, &tsk0->win_y, &tsk0->win_w, &tsk0->win_h);
+	GPtrArray *task_buttons = get_task_buttons(win);
+	if (task_buttons) {
+		Task *task0 = g_ptr_array_index(task_buttons, 0);
+		if (task0) {
+			get_window_coordinates(win, &task0->win_x, &task0->win_y, &task0->win_w, &task0->win_h);
 		}
-		for (i = 0; i < task_group->len; ++i) {
-			Task* tsk = g_ptr_array_index(task_group, i);
-			tsk->win_x = tsk0->win_x;
-			tsk->win_y = tsk0->win_y;
-			tsk->win_w = tsk0->win_w;
-			tsk->win_h = tsk0->win_h;
-			sort_tasks(tsk->area.parent);
+		for (int i = 0; i < task_buttons->len; ++i) {
+			Task *task = g_ptr_array_index(task_buttons, i);
+			task->win_x = task0->win_x;
+			task->win_y = task0->win_y;
+			task->win_w = task0->win_w;
+			task->win_h = task0->win_h;
+			sort_tasks(task->area.parent);
 		}
 	}
 }

src/taskbar/taskbar.h

@@ -11,74 +11,88 @@
 #include "task.h"
 #include "taskbarname.h"
 
-enum { TASKBAR_NORMAL, TASKBAR_ACTIVE, TASKBAR_STATE_COUNT };
-extern GHashTable *win_to_task_table;
-extern Task *task_active;
-extern Task *task_drag;
-extern int taskbar_enabled;
-extern int taskbar_distribute_size;
-extern int hide_inactive_tasks;
-extern int hide_task_diff_monitor;
-enum { TASKBAR_NOSORT, TASKBAR_SORT_CENTER, TASKBAR_SORT_TITLE };
-extern int taskbar_sort_method;
-extern int taskbar_alignment;
+typedef enum TaskbarState {
+	TASKBAR_NORMAL = 0,
+	TASKBAR_ACTIVE,
+	TASKBAR_STATE_COUNT,
+} TaskbarState;
+
+typedef enum TaskbarSortMethod {
+	TASKBAR_NOSORT = 0,
+	TASKBAR_SORT_CENTER,
+	TASKBAR_SORT_TITLE,
+	TASKBAR_SORT_LRU,
+	TASKBAR_SORT_MRU,
+} TaskbarSortMethod;
 
 typedef struct {
-	// always start with area
 	Area area;
-	Pixmap state_pix[TASKBAR_STATE_COUNT];
-
 	gchar *name;
-	int  posy;
-} Taskbarname;
+	int posy;
+} TaskbarName;
 
-// tint2 use one taskbar per desktop.
 typedef struct {
-	// always start with area
 	Area area;
-
 	int desktop;
-	Pixmap state_pix[TASKBAR_STATE_COUNT];
-
-	Taskbarname bar_name;
-	
-	// task parameters
+	TaskbarName bar_name;
 	int text_width;
 } Taskbar;
 
-typedef struct {
-	//always start with area
+typedef struct GlobalTaskbar {
 	Area area;
 	Area area_name;
-	Background* background[TASKBAR_STATE_COUNT];
-	Background* background_name[TASKBAR_STATE_COUNT];
-} Global_taskbar;
+	Background *background[TASKBAR_STATE_COUNT];
+	Background *background_name[TASKBAR_STATE_COUNT];
+	GList *gradient[TASKBAR_STATE_COUNT];
+	GList *gradient_name[TASKBAR_STATE_COUNT];
+} GlobalTaskbar;
 
+extern gboolean taskbar_enabled;
+extern gboolean taskbar_distribute_size;
+extern gboolean hide_inactive_tasks;
+extern gboolean hide_task_diff_monitor;
+extern gboolean hide_taskbar_if_empty;
+extern gboolean always_show_all_desktop_tasks;
+extern TaskbarSortMethod taskbar_sort_method;
+extern Alignment taskbar_alignment;
+
+// win_to_task holds for every Window an array of tasks. Usually the array contains only one
+// element. However for omnipresent windows (windows which are visible in every taskbar) the array
+// contains to every Task* on each panel a pointer (i.e. GPtrArray.len == server.num_desktops)
+extern GHashTable *win_to_task;
+
+extern Task *active_task;
+extern Task *task_drag;
 
-// default global data
 void default_taskbar();
-
-// freed memory
 void cleanup_taskbar();
-
 void init_taskbar();
 void init_taskbar_panel(void *p);
 
-void draw_taskbar (void *obj, cairo_t *c);
-void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data);
-Task *task_get_task (Window win);
-GPtrArray* task_get_tasks(Window win);
-void task_refresh_tasklist ();
+gboolean resize_taskbar(void *obj);
+void taskbar_default_font_changed();
 
-int  resize_taskbar(void *obj);
-void on_change_taskbar (void *obj);
-void set_taskbar_state(Taskbar *tskbar, int state);
+// Reloads the entire list of tasks from the window manager and recreates the task buttons.
+void taskbar_refresh_tasklist();
 
-// show/hide taskbar according to current desktop
-void visible_taskbar(void *p);
+// Returns the task button for this window. If there are multiple buttons, returns the first one.
+Task *get_task(Window win);
 
+// Returns the task buttons for this window, usually having only one element.
+// However for windows shown on all desktops, there are multiple buttons, one for each taskbar.
+GPtrArray *get_task_buttons(Window win);
+
+// Change state of a taskbar (ACTIVE or NORMAL)
+void set_taskbar_state(Taskbar *taskbar, TaskbarState state);
+
+// Updates the visibility of all taskbars
+void update_all_taskbars_visibility();
+
+// Sorts the taskbar(s) on which the window is present.
 void sort_taskbar_for_win(Window win);
+
 void sort_tasks(Taskbar *taskbar);
 
-#endif
+gboolean taskbar_is_under_mouse(void *obj, int x, int y);
 
+#endif

src/taskbar/taskbarname.c

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

src/taskbar/taskbarname.h

@@ -8,8 +8,7 @@
 #include "common.h"
 #include "area.h"
 
-extern int taskbarname_enabled;
-extern PangoFontDescription *taskbarname_font_desc;
+extern gboolean taskbarname_enabled;
 extern Color taskbarname_font;
 extern Color taskbarname_active_font;
 
@@ -20,8 +19,8 @@ void init_taskbarname_panel(void *p);
 
 void draw_taskbarname(void *obj, cairo_t *c);
 
-int  resize_taskbarname(void *obj);
+gboolean resize_taskbarname(void *obj);
 
+void taskbarname_default_font_changed();
 
 #endif
-

src/tint2conf/CMakeLists.txt

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

src/tint2conf/background_gui.h

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

src/tint2conf/gradient_gui.c

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

src/tint2conf/gradient_gui.h

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

src/tint2conf/gui.h

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

src/tint2conf/main.h

@@ -16,4 +16,6 @@
 
 #define SNAPSHOT_TICK 190
 gboolean update_snapshot();
-void menuApply();
+void menuApply();
+void refresh_current_theme();
+extern GtkWidget *g_window;

src/tint2conf/md4.c

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

src/tint2conf/md4.h

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

src/tint2conf/po/CMakeLists.txt

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

src/tint2conf/po/readme.txt

@@ -1,6 +1,6 @@
 Updating pot file:
 
-find .. -name '*.c' | xargs xgettext --keyword=_ --language=C --output=updated.pot -
+find .. -name '*.c' | sort -r | xargs xgettext --keyword=_ --language=C --output=updated.pot -
 
 Followed by manual editing of updated.pot to make sure the header is OK. Then: