Release 0.12.8

Update ru.po



See merge request !14

.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
@@ -22,5 +21,19 @@ Contributors:
   Marcelo Vianna : taskbar sorting
   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
 
-
+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

@@ -3,13 +3,19 @@ cmake_minimum_required( VERSION 2.6 )
 
 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( 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 +23,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 )
 
@@ -44,6 +85,7 @@ include_directories( ${PROJECT_BINARY_DIR}
                      src/launcher
                      src/tooltip
                      src/util
+                     src/execplugin
                      src/freespace
                      ${X11_INCLUDE_DIRS}
                      ${PANGOCAIRO_INCLUDE_DIRS}
@@ -70,15 +112,32 @@ 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/util/area.c
              src/util/common.c
              src/util/strnatcmp.c
              src/util/timer.c
+             src/util/cache.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 +157,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,7 +189,7 @@ 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_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 ")
 else()
   SET(ASAN_C_FLAGS "")
@@ -135,9 +219,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 +235,17 @@ 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=c99 ${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 themes/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
 install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
 install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
 install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
-if( ENABLE_EXAMPLES )
-  file( GLOB SAMPLEFILES sample/*.tint2rc )
-  install( FILES ${SAMPLEFILES} DESTINATION ${DATADIR}/tint2 )
-endif( ENABLE_EXAMPLES )
+if( ENABLE_EXTRA_THEMES )
+  add_subdirectory(themes)
+endif( ENABLE_EXTRA_THEMES )

ChangeLog

@@ -1,4 +1,136 @@
-2015-07-12 master
+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:
+	- Read config correctly when panel_items is at the end of the config file (issue #511)
+  - Panel:
+	- Do not use nested event loops (related: issue #509)
+  - System tray:
+	- Set _NET_SYSTEM_TRAY_ICON_SIZE and _NET_SYSTEM_TRAY_PADDING
+	- Throttle repeated resizes (workaround for issue #509)
+  - Taskbar:
+	- Use consistent visibility for sticky (all desktop) windows (related: issue #279)
+	- Compute monitor correctly for windows when Openbox animations are enabled (issue #511)
+  - tint2conf:
+	- 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
   already present. They are marked with '(already released by distros)'.
@@ -672,4 +804,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'.

README.md

@@ -1,15 +1,13 @@
-### New stable release: 0.12
-Changes: https://gitlab.com/o9000/tint2/blob/master/ChangeLog
+# New stable release: 0.12.8
+Changes: https://gitlab.com/o9000/tint2/blob/0.12.8/ChangeLog
 
-Documentation: https://gitlab.com/o9000/tint2/wikis/home
+Documentation: https://gitlab.com/o9000/tint2/wikis/Configure
 
 Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 ```
-mkdir tint2-0.12
-cd tint2-0.12
-wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12' --output-document tint2-0.12.tar.gz
-tar -xzf tint2-0.12.tar.gz
-cd tint2.git
+git clone https://gitlab.com/o9000/tint2.git
+cd tint2
+git checkout 0.12.8
 mkdir build
 cd build
 cmake ..
@@ -27,11 +25,11 @@ Please report any problems to https://gitlab.com/o9000/tint2/issues. Your feedba
 
 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/.
 
-### Features
+# Features
 
   * Panel with taskbar, system tray, clock and launcher icons;
   * Easy to customize: color/transparency on fonts, icons, borders and backgrounds;
@@ -39,39 +37,42 @@ 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)
   * [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?
+# 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.
 
-### 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.11 (June 2010)
-  * Next release: planned for mid 2015
+# Screenshots
 
-### Screenshots
-![screenshot](https://gitlab.com/o9000/tint2/wikis/screenshot.png)
+## Default config of the latest release:
+
+![Screenshot_2016-01-23_14-42-57](https://gitlab.com/o9000/tint2/uploads/948fa74eca60864352a033580350b4c3/Screenshot_2016-01-23_14-42-57.png)
+
+## Various configurations:
+
+![screenshot](https://gitlab.com/o9000/tint2/wikis/screenshot.png)

get_version.sh

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

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,116 +31,59 @@
 #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;
-gchar *path_energy_now;
-gchar *path_energy_full;
-gchar *path_current_now;
-gchar *path_status;
-int battery_found;
+char *battery_lclick_command;
+char *battery_mclick_command;
+char *battery_rclick_command;
+char *battery_uwheel_command;
+char *battery_dwheel_command;
+gboolean battery_found;
 
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-int apm_fd;
-#endif
-
-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);
 
 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;
-	path_energy_now = NULL;
-	path_energy_full = NULL;
-	path_current_now = NULL;
-	path_status = NULL;
+	battery_lclick_command = NULL;
+	battery_mclick_command = NULL;
+	battery_rclick_command = NULL;
+	battery_uwheel_command = NULL;
+	battery_dwheel_command = 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()
@@ -161,375 +92,199 @@ 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);
+	battery_lclick_command = NULL;
+	free(battery_mclick_command);
+	battery_mclick_command = NULL;
+	free(battery_rclick_command);
+	battery_rclick_command = NULL;
+	free(battery_uwheel_command);
+	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;
 	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._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;
 }
 
+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);
+	}
+	panel_refresh = TRUE;
+}
 
-	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;
-	}
-#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;
-		}
-	} else {
-		fprintf(stderr, "power update: no such sysctl");
-		errors = 1;
+			tint_exec(ac_disconnected_cmd);
 	}
 
-	// no mapping for freebsd
-	energy_full = 0;
-	energy_now = 0;
+	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;
+	}
 
-	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;
+	for (int i = 0; i < num_panels; i++) {
+		// Show/hide if needed
+		if (!battery_found) {
+			if (panels[i].battery.area.on_screen) {
+				hide(&panels[i].battery.area);
+				panel_refresh = TRUE;
 			}
-			fclose(fp);
 		} else {
-			errors = 1;
+			if (battery_state.percentage >= percentage_hide) {
+				if (panels[i].battery.area.on_screen) {
+					hide(&panels[i].battery.area);
+					panel_refresh = TRUE;
+				}
+			} else {
+				if (!panels[i].battery.area.on_screen) {
+					show(&panels[i].battery.area);
+					panel_refresh = TRUE;
+				}
+			}
 		}
-	} 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;
+		// Redraw if needed
+		if (panels[i].battery.area.on_screen) {
+			if (old_found != battery_found || old_percentage != battery_state.percentage ||
+				old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) {
+				panels[i].battery.area.resize_needed = TRUE;
+				panel_refresh = TRUE;
+			}
 		}
-	} else {
-		errors = 1;
 	}
+}
 
-	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 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_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;
-	}
+	int err = battery_os_update(&battery_state);
 
-	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)
-{
-	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)
+gboolean resize_battery(void *obj)
 {
 	Battery *battery = obj;
 	Panel *panel = battery->area.panel;
@@ -537,24 +292,41 @@ int resize_battery(void *obj)
 	int bat_time_height, bat_time_width, bat_time_height_ink;
 	int ret = 0;
 
-	battery->area.redraw = 1;
-	
+	schedule_redraw(&battery->area);
+
 	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
 	if (battery_state.state == BATTERY_FULL) {
 		strcpy(buf_bat_time, "Full");
 	} else {
 		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
 	}
-	get_text_size2(bat1_font_desc, &bat_percentage_height_ink, &bat_percentage_height, &bat_percentage_width,
-				   panel->area.height, panel->area.width, buf_bat_percentage, strlen(buf_bat_percentage));
-	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) {
+		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;
@@ -562,11 +334,10 @@ 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 + battery->area.bg->border.width));
+		if (new_size > battery->area.height || new_size < battery->area.height - 2) {
+			battery->area.height = new_size;
 			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2) / 2;
 			battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
 			ret = 1;
@@ -574,3 +345,66 @@ int resize_battery(void *obj)
 	}
 	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);
+}
+
+char *battery_get_tooltip(void *obj)
+{
+	return battery_os_tooltip();
+}
+
+void battery_action(int button)
+{
+	char *command = NULL;
+	switch (button) {
+	case 1:
+		command = battery_lclick_command;
+		break;
+	case 2:
+		command = battery_mclick_command;
+		break;
+	case 3:
+		command = battery_rclick_command;
+		break;
+	case 4:
+		command = battery_uwheel_command;
+		break;
+	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,58 +16,102 @@
 #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;
+
+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,533 @@
+/**************************************************************************
+*
+* 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_energy_now;
+	gchar *path_energy_full;
+	gchar *path_power_now;
+	gchar *path_status;
+	/* sysfs hints */
+	gboolean energy_in_uamp;
+	gboolean power_in_uamp;
+	/* values */
+	gboolean present;
+	gint energy_now;
+	gint energy_full;
+	gint power_now;
+	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 (error) {             \
+		g_error_free(err);   \
+		return FALSE;        \
+	}
+
+static GList *batteries = NULL;
+static GList *mains = NULL;
+
+static guint8 energy_to_percent(gint energy_now, gint energy_full)
+{
+	return 0.5 + ((energy_now <= energy_full ? energy_now : energy_full) * 100.0) / energy_full;
+}
+
+static enum psy_type power_supply_get_type(const gchar *entryname)
+{
+	gchar *path_type = g_build_filename("/sys/class/power_supply", entryname, "type", NULL);
+	GError *error = NULL;
+	gchar *type;
+	gsize typelen;
+
+	g_file_get_contents(path_type, &type, &typelen, &error);
+	g_free(path_type);
+	if (error) {
+		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->energy_in_uamp = FALSE;
+	bat->power_in_uamp = FALSE;
+
+	bat->path_present = g_build_filename("/sys/class/power_supply", entryname, "present", NULL);
+	if (!g_file_test(bat->path_present, G_FILE_TEST_EXISTS)) {
+		goto err0;
+	}
+
+	bat->path_energy_now = g_build_filename("/sys/class/power_supply", entryname, "energy_now", NULL);
+	if (!g_file_test(bat->path_energy_now, G_FILE_TEST_EXISTS)) {
+		g_free(bat->path_energy_now);
+		bat->path_energy_now = g_build_filename("/sys/class/power_supply", entryname, "charge_now", NULL);
+		bat->energy_in_uamp = TRUE;
+	}
+	if (!g_file_test(bat->path_energy_now, G_FILE_TEST_EXISTS)) {
+		goto err1;
+	}
+
+	if (!bat->energy_in_uamp) {
+		bat->path_energy_full = g_build_filename("/sys/class/power_supply", entryname, "energy_full", NULL);
+		if (!g_file_test(bat->path_energy_full, G_FILE_TEST_EXISTS))
+			goto err2;
+	} else {
+		bat->path_energy_full = g_build_filename("/sys/class/power_supply", entryname, "charge_full", NULL);
+		if (!g_file_test(bat->path_energy_full, G_FILE_TEST_EXISTS))
+			goto err2;
+	}
+
+	bat->path_power_now = g_build_filename("/sys/class/power_supply", entryname, "power_now", NULL);
+	if (!g_file_test(bat->path_power_now, G_FILE_TEST_EXISTS)) {
+		g_free(bat->path_power_now);
+		bat->path_power_now = g_build_filename("/sys/class/power_supply", entryname, "current_now", NULL);
+		bat->power_in_uamp = TRUE;
+	}
+	if (!g_file_test(bat->path_power_now, G_FILE_TEST_EXISTS)) {
+		goto err3;
+	}
+
+	bat->path_status = g_build_filename("/sys/class/power_supply", entryname, "status", NULL);
+	if (!g_file_test(bat->path_status, G_FILE_TEST_EXISTS)) {
+		goto err4;
+	}
+
+	return TRUE;
+
+err4:
+	g_free(bat->path_status);
+err3:
+	g_free(bat->path_power_now);
+err2:
+	g_free(bat->path_energy_full);
+err1:
+	g_free(bat->path_energy_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("/sys/class/power_supply", entryname, "online", NULL);
+	if (!g_file_test(ac->path_online, G_FILE_TEST_EXISTS)) {
+		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_power_now);
+	g_free(bat->path_energy_full);
+	g_free(bat->path_energy_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, "found battery \"%s\"\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, "found mains \"%s\"\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();
+
+	directory = g_dir_open("/sys/class/power_supply", 0, &error);
+	RETURN_ON_ERROR(error);
+
+	while ((entryname = g_dir_read_name(directory))) {
+		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_power_usage(struct psy_battery *bat, gint old_energy_now, gint64 old_timestamp)
+{
+	gint64 diff_power = ABS(bat->energy_now - old_energy_now);
+	gint64 diff_time = bat->timestamp - old_timestamp;
+
+	/* µW = (µWh * 3600) / (µs / 1000000) */
+	gint power = diff_power * 3600 * 1000000 / MAX(1, diff_time);
+
+	return power;
+}
+
+static gboolean update_linux_battery(struct psy_battery *bat)
+{
+	GError *error = NULL;
+	gchar *data;
+	gsize datalen;
+
+	gint64 old_timestamp = bat->timestamp;
+	int old_energy_now = bat->energy_now;
+
+	/* reset values */
+	bat->present = 0;
+	bat->status = BATTERY_UNKNOWN;
+	bat->energy_now = 0;
+	bat->energy_full = 0;
+	bat->power_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);
+
+	/* energy now */
+	g_file_get_contents(bat->path_energy_now, &data, &datalen, &error);
+	RETURN_ON_ERROR(error);
+	bat->energy_now = atoi(data);
+	g_free(data);
+
+	/* energy full */
+	g_file_get_contents(bat->path_energy_full, &data, &datalen, &error);
+	RETURN_ON_ERROR(error);
+	bat->energy_full = atoi(data);
+	g_free(data);
+
+	/* power now */
+	g_file_get_contents(bat->path_power_now, &data, &datalen, &error);
+	if (g_error_matches(error, G_FILE_ERROR, G_FILE_ERROR_NODEV)) {
+		/* some hardware does not support reading current power consumption */
+		g_error_free(error);
+		bat->power_now = estimate_power_usage(bat, old_energy_now, old_timestamp);
+	} else if (error) {
+		g_error_free(error);
+		return FALSE;
+	} else {
+		bat->power_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_energy_now = 0;
+	gint64 total_energy_full = 0;
+	gint64 total_power_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_energy_now += bat->energy_now;
+		total_energy_full += bat->energy_full;
+		total_power_now += bat->power_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_power_now > 0) {
+		if (state->state == BATTERY_CHARGING)
+			seconds = 3600 * (total_energy_full - total_energy_now) / total_power_now;
+		else if (state->state == BATTERY_DISCHARGING)
+			seconds = 3600 * total_energy_now / total_power_now;
+	}
+	battery_state_set_time(state, seconds);
+
+	/* calculate percentage */
+	state->percentage = energy_to_percent(total_energy_now, total_energy_full);
+
+	/* AC state */
+	state->ac_connected = ac_connected;
+
+	return 0;
+}
+
+static gchar *energy_human_readable(struct psy_battery *bat)
+{
+	gint now = bat->energy_now;
+	gint full = bat->energy_full;
+	gchar unit = bat->energy_in_uamp ? 'A' : 'W';
+
+	if (full >= 1000000) {
+		return g_strdup_printf("%d.%d / %d.%d %ch",
+							   now / 1000000,
+							   (now % 1000000) / 100000,
+							   full / 1000000,
+							   (full % 1000000) / 100000,
+							   unit);
+	} else if (full >= 1000) {
+		return g_strdup_printf("%d.%d / %d.%d m%ch",
+							   now / 1000,
+							   (now % 1000) / 100,
+							   full / 1000,
+							   (full % 1000) / 100,
+							   unit);
+	} else {
+		return g_strdup_printf("%d / %d µ%ch", now, full, unit);
+	}
+}
+
+static gchar *power_human_readable(struct psy_battery *bat)
+{
+	gint power = bat->power_now;
+	gchar unit = bat->power_in_uamp ? 'A' : 'W';
+
+	if (power >= 1000000) {
+		return g_strdup_printf("%d.%d %c", power / 1000000, (power % 1000000) / 100000, unit);
+	} else if (power >= 1000) {
+		return g_strdup_printf("%d.%d m%c", power / 1000, (power % 1000) / 100, unit);
+	} else if (power > 0) {
+		return g_strdup_printf("%d µ%c", power, unit);
+	} 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 *power = power_human_readable(bat);
+		gchar *energy = energy_human_readable(bat);
+		gchar *state = (bat->status == BATTERY_UNKNOWN) ? "Level" : chargestate2str(bat->status);
+
+		guint8 percentage = energy_to_percent(bat->energy_now, bat->energy_full);
+
+		g_string_append_printf(tooltip, "\t%s: %s (%u %%)\n\tPower: %s", state, energy, percentage, power);
+
+		g_free(power);
+		g_free(energy);
+	}
+
+	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;
@@ -39,16 +38,23 @@ char *time2_timezone;
 char *time_tooltip_format;
 char *time_tooltip_timezone;
 char *clock_lclick_command;
+char *clock_mclick_command;
 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);
 
 void default_clock()
 {
@@ -61,8 +67,13 @@ void default_clock()
 	time_tooltip_format = NULL;
 	time_tooltip_timezone = NULL;
 	clock_lclick_command = NULL;
+	clock_mclick_command = NULL;
 	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;
 }
 
@@ -86,72 +97,72 @@ void cleanup_clock()
 	time_tooltip_timezone = NULL;
 	free(clock_lclick_command);
 	clock_lclick_command = NULL;
+	free(clock_mclick_command);
+	clock_mclick_command = NULL;
 	free(clock_rclick_command);
 	clock_rclick_command = NULL;
+	free(clock_uwheel_command);
+	clock_uwheel_command = NULL;
+	free(clock_dwheel_command);
+	clock_dwheel_command = NULL;
 	stop_timeout(clock_timeout);
 	clock_timeout = NULL;
 }
 
-
-void update_clocks_sec(void* arg)
+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;
+	panel_refresh = TRUE;
 }
 
-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;
+		panel_refresh = TRUE;
 	}
 }
 
-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()
 {
 	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);
@@ -159,29 +170,29 @@ void init_clock()
 	}
 }
 
-
 void init_clock_panel(void *p)
 {
-	Panel *panel =(Panel*)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;
+	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;
 	// 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;
 
 	if (time_tooltip_format) {
 		clock->area._get_tooltip_text = clock_get_tooltip;
@@ -189,98 +200,164 @@ 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);
 }
 
+void clock_default_font_changed()
+{
+	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);
+	}
+	panel_refresh = TRUE;
+}
 
-int resize_clock (void *obj)
+gboolean resize_clock(void *obj)
 {
 	Clock *clock = obj;
 	Panel *panel = clock->area.panel;
-	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width, ret = 0;
+	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
+	gboolean result = FALSE;
+
+	schedule_redraw(&clock->area);
 
-	clock->area.redraw = 1;
-	
 	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);
 	}
 
 	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) + (2 * clock->area.bg->border.width);
+		if (new_size > clock->area.width || new_size < (clock->area.width - 6)) {
+			// we try to limit the number of resizes
 			clock->area.width = new_size + 1;
 			clock->time1_posy = (clock->area.height - time_height) / 2;
 			if (time2_format) {
-				clock->time1_posy -= (date_height)/2;
+				clock->time1_posy -= (date_height) / 2;
 				clock->time2_posy = clock->time1_posy + time_height;
 			}
-			ret = 1;
+			result = TRUE;
 		}
-	}
-	else {
+	} else {
 		int new_size = time_height + date_height + (2 * (clock->area.paddingxlr + clock->area.bg->border.width));
 		if (new_size != clock->area.height) {
-			// we try to limit the number of 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);
+}
+
+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 3:
+	case 2:
+		command = clock_mclick_command;
+		break;
+	case 3:
 		command = clock_rclick_command;
 		break;
+	case 4:
+		command = clock_uwheel_command;
+		break;
+	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,19 +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 int clock_enabled;
-
+extern char *clock_uwheel_command;
+extern char *clock_dwheel_command;
+extern gboolean clock_enabled;
 
 // default global data
 void default_clock();
@@ -46,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,734 @@
+#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();
+
+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->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);
+	} 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;
+		}
+
+		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._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;
+
+		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);
+			}
+		}
+	}
+	panel_refresh = TRUE;
+}
+
+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;
+}
+
+gboolean resize_execp(void *obj)
+{
+	Execp *execp = obj;
+	Panel *panel = execp->area.panel;
+	int horiz_padding = (panel_horizontal ? execp->area.paddingxlr : execp->area.paddingy);
+	int vert_padding = (panel_horizontal ? execp->area.paddingy : execp->area.paddingxlr);
+	int interior_padding = execp->area.paddingx;
+
+	schedule_redraw(&execp->area);
+
+	int icon_w, icon_h;
+	if (reload_icon(execp)) {
+		if (execp->backend->icon) {
+			imlib_context_set_image(execp->backend->icon);
+			icon_w = imlib_image_get_width();
+			icon_h = imlib_image_get_height();
+		} 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 + execp->area.bg->border.width)
+						   : execp->area.width - 2 * (horiz_padding + execp->area.bg->border.width),
+					   execp->backend->text,
+					   strlen(execp->backend->text),
+					   PANGO_WRAP_WORD_CHAR,
+					   PANGO_ELLIPSIZE_NONE,
+					   execp->backend->has_markup);
+	}
+
+	gboolean result = FALSE;
+	if (panel_horizontal) {
+		int new_size = txt_width;
+		if (icon_w)
+			new_size += interior_padding + icon_w;
+		new_size += 2 * (horiz_padding + execp->area.bg->border.width);
+		if (new_size > execp->area.width || new_size < (execp->area.width - 6)) {
+			// we try to limit the number of resize
+			execp->area.width = new_size + 1;
+			result = TRUE;
+		}
+	} else {
+		int new_size;
+		if (!text_next_line) {
+			new_size = txt_height + (2 * (vert_padding + execp->area.bg->border.width));
+			if (new_size < icon_h + (2 * (vert_padding + execp->area.bg->border.width))) {
+				new_size = icon_h + (2 * (vert_padding + execp->area.bg->border.width));
+			}
+		} else {
+			new_size = icon_h + interior_padding + txt_height + (2 * (vert_padding + execp->area.bg->border.width));
+		}
+		if (new_size != execp->area.height) {
+			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 = execp->area.bg->border.width + horiz_padding;
+				execp->frontend->texty = (execp->area.height - txt_height) / 2;
+				execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
+			} else {
+				execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
+				execp->frontend->iconx = execp->area.bg->border.width + horiz_padding;
+				execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
+				execp->frontend->textx = execp->frontend->iconx;
+			}
+		} else {
+			execp->frontend->texty = (execp->area.height - txt_height) / 2;
+			execp->frontend->textx = execp->area.bg->border.width + horiz_padding;
+		}
+	}
+
+	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_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);
+		tint_exec(full_cmd);
+		g_free(full_cmd);
+	} else {
+		if (execp->backend->child_pipe > 0) {
+			// Command currently running, nothing to do
+		} else {
+			if (execp->backend->timer)
+				stop_timeout(execp->backend->timer);
+			// Run command right away
+			execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
+		}
+	}
+}
+
+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) {
+		// 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,140 @@
+#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;
+} 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);
+
+// 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>
@@ -33,24 +32,24 @@
 
 void init_freespace_panel(void *p)
 {
-	Panel *panel = (Panel*)p;
+	Panel *panel = (Panel *)p;
 	FreeSpace *freespace = &panel->freespace;
 
-	if (freespace->area.bg == 0)
+	if (!freespace->area.bg)
 		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.size_mode = LAYOUT_FIXED;
+	freespace->area.resize_needed = 1;
+	freespace->area.on_screen = TRUE;
 	freespace->area._resize = resize_freespace;
 }
 
-int freespace_get_max_size(Panel *p) {
+int freespace_get_max_size(Panel *p)
+{
 	// 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)) {
+	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)
@@ -70,16 +69,17 @@ int freespace_get_max_size(Panel *p) {
 	return size;
 }
 
-int resize_freespace(void *obj) {
-	FreeSpace *freespace = (FreeSpace*)obj;
-	Panel *panel = (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 +87,7 @@ int resize_freespace(void *obj) {
 		freespace->area.height = size;
 	}
 
-	freespace->area.redraw = 1;
-	panel_refresh = 1;
-	return 1;
+	schedule_redraw(&freespace->area);
+	panel_refresh = TRUE;
+	return TRUE;
 }

src/freespace/freespace.h

@@ -15,6 +15,6 @@ typedef struct FreeSpace {
 void cleanup_freespace();
 void init_freespace_panel(void *panel);
 
-int resize_freespace(void *obj);
+gboolean resize_freespace(void *obj);
 
 #endif

src/launcher/apps-common.c

@@ -19,12 +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>
 
+static gint compare_strings(gconstpointer a, gconstpointer b)
+{
+	return strnatcasecmp((const char *)a, (const char *)b);
+}
+
 int parse_dektop_line(char *line, char **key, char **value)
 {
 	char *p;
@@ -52,7 +59,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 +72,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,58 +108,77 @@ 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 = 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);
 					}
@@ -157,26 +187,90 @@ int read_desktop_file(const char *path, DesktopEntry *entry)
 				entry->exec = 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(entry->name);
+	free(entry->generic_name);
+	free(entry->icon);
+	free(entry->exec);
+	entry->name = entry->generic_name = entry->icon = entry->exec = NULL;
+
+	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 = 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->generic_name);
 	free(entry->icon);
 	free(entry->exec);
 	free(entry->path);
-	entry->name = entry->icon = entry->exec = entry->path = NULL;
+	entry->name = entry->generic_name = entry->icon = entry->exec = entry->path = NULL;
 }
 
 void test_read_desktop_file()
@@ -184,6 +278,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,15 @@
 #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;
+	gboolean hidden_from_menus;
 } DesktopEntry;
 
 // Parses a line of the form "key = value". Modifies the line.
@@ -22,9 +26,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,25 @@ 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;
+	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 +331,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 +356,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 +375,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 +396,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 +483,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 +527,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 +554,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 +584,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 +622,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 +667,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 +691,89 @@ 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)
+{
+	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);
+
+	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);
 
 // Returns a list of the directories used to store icons.
 // Do not free the result, it is cached.

src/launcher/launcher.c

@@ -32,11 +32,6 @@
 #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,8 +51,8 @@ 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;
 
 Imlib_Image scale_icon(Imlib_Image original, int icon_size);
 void free_icon(Imlib_Image icon);
@@ -73,63 +68,52 @@ 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;
 }
 
-
 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;
 	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.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;
+	launcher->area.on_screen = TRUE;
+	panel_refresh = TRUE;
 
 	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,40 +125,38 @@ 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);
 	}
 	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)
+gboolean resize_launcher(void *obj)
 {
 	Launcher *launcher = obj;
-	GSList *l;
-	int count, icon_size;
-	int icons_per_column=1, icons_per_row=1, marging=0;
+	int icons_per_column = 1, icons_per_row = 1, margin = 0;
 
+	int icon_size;
 	if (panel_horizontal) {
 		icon_size = launcher->area.height;
 	} else {
@@ -185,7 +167,7 @@ int resize_launcher(void *obj)
 		icon_size = launcher_max_icon_size;
 
 	// 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;
@@ -193,57 +175,27 @@ int resize_launcher(void *obj)
 			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);
+			char *new_icon_path =
+				get_icon_path(launcher->icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size);
 			if (!new_icon_path) {
 				// Draw a blank icon
 				free_icon(launcherIcon->image);
+				free_icon(launcherIcon->image_hover);
+				free_icon(launcherIcon->image_pressed);
 				launcherIcon->image = NULL;
 				continue;
 			}
 
 			// 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);
-			}
+			free_icon(launcherIcon->image_hover);
+			free_icon(launcherIcon->image_pressed);
+			// Load the new file
+			launcherIcon->image = load_image(new_icon_path, 1);
 			// On loading error, fallback to default
 			if (!launcherIcon->image) {
 				free(new_icon_path);
-				new_icon_path = get_icon_path(launcher->list_themes, DEFAULT_ICON, launcherIcon->icon_size);
+				new_icon_path = get_icon_path(launcher->icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size);
 				if (new_icon_path)
 					launcherIcon->image = imlib_load_image_immediately(new_icon_path);
 			}
@@ -252,7 +204,7 @@ int resize_launcher(void *obj)
 				// Loading default icon failed, draw a blank icon
 				free(new_icon_path);
 			} else {
-				// Loaded icon successfully
+				// Loaded icon successfully, rescale it
 				Imlib_Image original = launcherIcon->image;
 				launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);
 				free_icon(original);
@@ -261,43 +213,50 @@ int resize_launcher(void *obj)
 				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);
+		}
 	}
-	
-	count = g_slist_length(launcher->list_icons);
+	save_icon_cache(launcher->icon_theme_wrapper);
+
+	int count = g_slist_length(launcher->list_icons);
 
 	if (panel_horizontal) {
 		if (!count) {
 			launcher->area.width = 0;
 		} else {
-			int height = launcher->area.height - 2*launcher->area.bg->border.width - 2*launcher->area.paddingy;
+			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);
+			icons_per_column = (height + launcher->area.paddingx) / (icon_size + launcher->area.paddingx);
+			margin = height - (icons_per_column - 1) * (icon_size + launcher->area.paddingx) - icon_size;
+			icons_per_row = count / icons_per_column + (count % icons_per_column != 0);
+			launcher->area.width = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) +
+								   (icon_size * icons_per_row) + ((icons_per_row - 1) * launcher->area.paddingx);
 		}
-	}
-	else {
+	} else {
 		if (!count) {
 			launcher->area.height = 0;
 		} else {
-			int width = launcher->area.width - 2*launcher->area.bg->border.width - 2*launcher->area.paddingy;
+			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);
+			icons_per_row = (width + launcher->area.paddingx) / (icon_size + launcher->area.paddingx);
+			margin = width - (icons_per_row - 1) * (icon_size + launcher->area.paddingx) - icon_size;
+			icons_per_column = count / icons_per_row + (count % icons_per_row != 0);
+			launcher->area.height = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) +
+									(icon_size * icons_per_column) + ((icons_per_column - 1) * launcher->area.paddingx);
 		}
 	}
 
-	int i, posx, posy;
-	int start = launcher->area.bg->border.width + launcher->area.paddingy + marging/2;
+	int posx, posy;
+	int start = launcher->area.bg->border.width + launcher->area.paddingy + margin / 2;
 	if (panel_horizontal) {
 		posy = start;
 		posx = launcher->area.bg->border.width + launcher->area.paddingxlr;
@@ -306,16 +265,18 @@ int resize_launcher(void *obj)
 		posy = launcher->area.bg->border.width + launcher->area.paddingxlr;
 	}
 
-	for (i=1, l = launcher->list_icons; l ; i++, l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
-		
+	int i;
+	GSList *l;
+	for (i = 1, l = launcher->list_icons; l; i++, l = l->next) {
+		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+
 		launcherIcon->y = posy;
 		launcherIcon->x = posx;
-		launcherIcon->area.posy = ((Area*)launcherIcon->area.parent)->posy + launcherIcon->y;
-		launcherIcon->area.posx = ((Area*)launcherIcon->area.parent)->posx + launcherIcon->x;
+		launcherIcon->area.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);
+		// printf("launcher %d : %d,%d\n", i, posx, posy);
 		if (panel_horizontal) {
 			if (i % icons_per_column) {
 				posy += icon_size + launcher->area.paddingx;
@@ -333,58 +294,83 @@ int resize_launcher(void *obj)
 		}
 	}
 
-	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)
+char *launcher_icon_get_tooltip_text(void *obj)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
-	return launcherIcon->icon_tooltip;
+	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 (server.real_transparency) {
-		render_image(launcherIcon->area.pix, 0, 0);
+	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 {
-		imlib_context_set_blend(1);
-		imlib_context_set_drawable(launcherIcon->area.pix);
-		imlib_render_image_on_drawable(0, 0);
+		image = launcherIcon->image;
 	}
+	imlib_context_set_image(image);
+	render_image(launcherIcon->area.pix, 0, 0);
 }
 
 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);
 	}
@@ -399,18 +385,18 @@ void free_icon(Imlib_Image icon)
 	}
 }
 
-void launcher_action(LauncherIcon *icon, XEvent* evt)
+void launcher_action(LauncherIcon *icon, XEvent *evt)
 {
 	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;
@@ -427,7 +413,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);
@@ -445,10 +431,10 @@ 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
 	}
@@ -459,21 +445,22 @@ void launcher_action(LauncherIcon *icon, XEvent* evt)
 void launcher_load_icons(Launcher *launcher)
 {
 	// Load apps (.desktop style launcher items)
-	GSList* app = launcher->list_apps;
+	GSList *app = launcher->list_apps;
 	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.size_mode = LAYOUT_FIXED;
 			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.resize_needed = 0;
+			schedule_redraw(&launcherIcon->area);
+			launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
+			launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
+			launcherIcon->area.bg = launcher_icon_bg;
+			launcherIcon->area.on_screen = TRUE;
 			launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
 			if (launcher_tooltip_enabled) {
 				launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
@@ -484,28 +471,50 @@ void launcher_load_icons(Launcher *launcher)
 			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);
+			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->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
-			add_area(&launcherIcon->area);
+			add_area(&launcherIcon->area, (Area *)launcher);
 		}
+		free_desktop_entry(&entry);
 		app = g_slist_next(app);
 	}
 }
 
-
-// Populates the list_themes list
+// 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;
+	}
+	panel_refresh = TRUE;
 }

src/launcher/launcher.h

@@ -15,15 +15,17 @@
 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;
 } Launcher;
 
 typedef struct LauncherIcon {
 	// always start with area
 	Area area;
 	Imlib_Image image;
+	Imlib_Image image_hover;
+	Imlib_Image image_pressed;
 	char *cmd;
 	char *icon_name;
 	char *icon_path;
@@ -33,17 +35,17 @@ typedef struct LauncherIcon {
 	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;
 
 // default global data
 void default_launcher();
@@ -54,14 +56,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,123 @@
 #include "systraybar.h"
 #include "launcher.h"
 #include "freespace.h"
+#include "execplugin.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 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 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;
 
-
-// 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 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;
-
 	FreeSpace freespace;
+	GList *execp_list;
 
-	// 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,9 +150,11 @@ 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 set_panel_items_order(Panel *p);
+void place_panel_all_desktops(Panel *p);
 void set_panel_properties(Panel *p);
 
 // draw background panel
@@ -154,17 +163,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);
-Area* click_area(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);
 
-void autohide_show(void* p);
-void autohide_hide(void* p);
-void autohide_trigger_show(Panel* p);
-void autohide_trigger_hide(Panel* p);
+#ifdef ENABLE_BATTERY
+Battery *click_battery(Panel *panel, int x, int y);
+#endif
+
+Area *click_area(Panel *panel, int x, int y);
+Execp *click_execp(Panel *panel, int x, int y);
+
+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/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,123 +29,127 @@
 #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._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;
 }
 
-
-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;
 
@@ -157,11 +160,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;
@@ -170,272 +172,431 @@ 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;
 
 		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 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]);
+				XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(server.display, res, res->crtcs[i]);
 				if (!(crtc_info->x || crtc_info->y || crtc_info->width || crtc_info->height)) {
 					res->ncrtc -= 1;
 				}
 				XRRFreeCrtcInfo(crtc_info);
 			}
 
-			printf("xRandr: Found crtc's: %d\n", res->ncrtc );
-			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]);
+			printf("xRandr: Found crtc's: %d\n", res->ncrtc);
+			server.monitors = calloc(res->ncrtc, sizeof(Monitor));
+			for (int i = 0; i < res->ncrtc; ++i) {
+				XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(server.display, res, res->crtcs[i]);
+				server.monitors[i].x = crtc_info->x;
+				server.monitors[i].y = crtc_info->y;
+				server.monitors[i].width = crtc_info->width;
+				server.monitors[i].height = crtc_info->height;
+				server.monitors[i].names = calloc((crtc_info->noutput + 1), sizeof(gchar *));
+				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].names[j] = g_strdup(output_info->name);
 					XRRFreeOutputInfo(output_info);
+					server.monitors[i].primary = crtc_info->outputs[j] == primary_output;
 				}
-				server.monitor[i].names[j] = 0;
+				server.monitors[i].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;
+			num_monitors = res->ncrtc;
+		} else if (info && num_monitors > 0) {
+			server.monitors = calloc(num_monitors, sizeof(Monitor));
+			for (int i = 0; i < num_monitors; i++) {
+				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 = 0;
 			}
 		}
 
-		// 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;
 	}
 }
 
-int server_get_number_of_desktops()
+void print_monitors()
 {
-	return get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);
+	fprintf(stderr, "Number of monitors: %d\n", server.num_monitors);
+	for (int i = 0; i < server.num_monitors; i++) {
+		fprintf(stderr,
+				"Monitor %d: x = %d, y = %d, w = %d, h = %d\n",
+				i + 1,
+				server.monitors[i].x,
+				server.monitors[i].y,
+				server.monitors[i].width,
+				server.monitors[i].height);
+	}
+}
+
+void server_get_number_of_desktops()
+{
+	if (server.viewports) {
+		free(server.viewports);
+		server.viewports = NULL;
+	}
+
+	server.num_desktops = get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);
+	if (server.num_desktops > 1)
+		return;
+
+	int num_results;
+	long *work_area_size = server_get_property(server.root_win, server.atom._NET_WORKAREA, XA_CARDINAL, &num_results);
+	if (!work_area_size)
+		return;
+	int work_area_width = work_area_size[0] + work_area_size[2];
+	int work_area_height = work_area_size[1] + work_area_size[3];
+	XFree(work_area_size);
+
+	long *x_screen_size =
+		server_get_property(server.root_win, server.atom._NET_DESKTOP_GEOMETRY, XA_CARDINAL, &num_results);
+	if (!x_screen_size)
+		return;
+	int x_screen_width = x_screen_size[0];
+	int x_screen_height = x_screen_size[1];
+	XFree(x_screen_size);
+
+	int num_viewports = MAX(x_screen_width / work_area_width, 1) * MAX(x_screen_height / work_area_height, 1);
+	if (num_viewports <= 1) {
+		server.num_desktops = 1;
+		return;
+	}
+
+	server.viewports = calloc(num_viewports, sizeof(Viewport));
+	int k = 0;
+	for (int i = 0; i < MAX(x_screen_height / work_area_height, 1); i++) {
+		for (int j = 0; j < MAX(x_screen_width / work_area_width, 1); j++) {
+			server.viewports[k].x = j * work_area_width;
+			server.viewports[k].y = i * work_area_height;
+			server.viewports[k].width = work_area_width;
+			server.viewports[k].height = work_area_height;
+			k++;
+		}
+	}
+
+	server.num_desktops = num_viewports;
+}
+
+GSList *get_desktop_names()
+{
+	if (server.viewports) {
+		GSList *list = NULL;
+		for (int j = 0; j < server.num_desktops; j++) {
+			list = g_slist_append(list, g_strdup_printf("%d", j + 1));
+		}
+		return list;
+	}
+
+	int count;
+	GSList *list = NULL;
+	gchar *data_ptr =
+		server_get_property(server.root_win, server.atom._NET_DESKTOP_NAMES, server.atom.UTF8_STRING, &count);
+	if (data_ptr) {
+		list = g_slist_append(list, g_strdup(data_ptr));
+		for (int j = 0; j < count - 1; j++) {
+			if (*(data_ptr + j) == '\0') {
+				gchar *ptr = (gchar *)data_ptr + j + 1;
+				list = g_slist_append(list, g_strdup(ptr));
+			}
+		}
+		XFree(data_ptr);
+	}
+	return list;
+}
+
+int get_current_desktop()
+{
+	if (!server.viewports) {
+		return MAX(0,
+				   MIN(server.num_desktops - 1,
+					   get_property32(server.root_win, server.atom._NET_CURRENT_DESKTOP, XA_CARDINAL)));
+	}
+
+	int num_results;
+	long *work_area_size = server_get_property(server.root_win, server.atom._NET_WORKAREA, XA_CARDINAL, &num_results);
+	if (!work_area_size)
+		return 0;
+	int work_area_width = work_area_size[0] + work_area_size[2];
+	int work_area_height = work_area_size[1] + work_area_size[3];
+	XFree(work_area_size);
+
+	if (work_area_width <= 0 || work_area_height <= 0)
+		return 0;
+
+	long *viewport = server_get_property(server.root_win, server.atom._NET_DESKTOP_VIEWPORT, XA_CARDINAL, &num_results);
+	if (!viewport)
+		return 0;
+	int viewport_x = viewport[0];
+	int viewport_y = viewport[1];
+	XFree(viewport);
+
+	long *x_screen_size =
+		server_get_property(server.root_win, server.atom._NET_DESKTOP_GEOMETRY, XA_CARDINAL, &num_results);
+	if (!x_screen_size)
+		return 0;
+	int x_screen_width = x_screen_size[0];
+	XFree(x_screen_size);
+
+	int ncols = x_screen_width / work_area_width;
+
+	//	fprintf(stderr, "\n");
+	//	fprintf(stderr, "Work area size: %d x %d\n", work_area_width, work_area_height);
+	//	fprintf(stderr, "Viewport pos: %d x %d\n", viewport_x, viewport_y);
+	//	fprintf(stderr, "Viewport i: %d\n", (viewport_y / work_area_height) * ncols + viewport_x / work_area_width);
+
+	int result = (viewport_y / work_area_height) * ncols + viewport_x / work_area_width;
+	return MAX(0, MIN(server.num_desktops - 1, result));
+}
+
+void change_desktop(int desktop)
+{
+	if (!server.viewports) {
+		send_event32(server.root_win, server.atom._NET_CURRENT_DESKTOP, desktop, 0, 0);
+	} else {
+		send_event32(server.root_win,
+					 server.atom._NET_DESKTOP_VIEWPORT,
+					 server.viewports[desktop].x,
+					 server.viewports[desktop].y,
+					 0);
+	}
 }
 
 void get_desktops()
 {
-	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;
@@ -71,6 +73,8 @@ typedef struct Global_atom
 	Atom MANAGER;
 	Atom _NET_SYSTEM_TRAY_MESSAGE_DATA;
 	Atom _NET_SYSTEM_TRAY_ORIENTATION;
+	Atom _NET_SYSTEM_TRAY_ICON_SIZE;
+	Atom _NET_SYSTEM_TRAY_PADDING;
 	Atom _XEMBED;
 	Atom _XEMBED_INFO;
 	Atom _NET_WM_PID;
@@ -89,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
@@ -126,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
@@ -151,7 +159,11 @@ void get_root_pixmap();
 
 // detect monitors and desktops
 void get_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
+#endif

src/systray/systraybar.h

@@ -16,52 +16,65 @@
 #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;
+	// 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;
 
 // default global data
 void default_systray();
@@ -74,9 +87,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
@@ -85,13 +98,20 @@ void stop_net();
 void net_message(XClientMessageEvent *e);
 
 gboolean add_icon(Window id);
+gboolean reparent_icon(TrayWindow *traywin);
+gboolean embed_icon(TrayWindow *traywin);
 void remove_icon(TrayWindow *traywin);
 
 void refresh_systray_icons();
 void systray_render_icon(void *t);
+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.c

@@ -18,268 +18,276 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **************************************************************************/
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
+#include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>
 #include <unistd.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
 
-#include "window.h"
+#include "panel.h"
+#include "server.h"
 #include "task.h"
 #include "taskbar.h"
-#include "server.h"
-#include "panel.h"
-#include "tooltip.h"
 #include "timer.h"
+#include "tooltip.h"
+#include "window.h"
 
-timeout* urgent_timeout;
-GSList* urgent_list;
+timeout *urgent_timeout;
+GSList *urgent_list;
 
-const char* task_get_tooltip(void* obj)
+char *task_get_tooltip(void *obj)
 {
-	Task* t = obj;
-	return t->title;
+	Task *t = (Task *)obj;
+	return strdup(t->title);
 }
 
-
-Task *add_task (Window win)
+Task *add_task(Window win)
 {
-	if (!win) return 0;
-	if (window_is_hidden(win)) return 0;
+	if (!win)
+		return NULL;
+	if (window_is_hidden(win))
+		return NULL;
 
-	XSelectInput(server.dsp, win, PropertyChangeMask|StructureNotifyMask);
-	XFlush(server.dsp);
+	XSelectInput(server.display, win, PropertyChangeMask | StructureNotifyMask);
+	XFlush(server.display);
 
-	int monitor;
-	if (nb_panel > 1) {
-		monitor = window_get_monitor (win);
-		if (monitor >= nb_panel) monitor = 0;
+	int monitor = 0;
+	if (num_panels > 1) {
+		monitor = get_window_monitor(win);
+		if (monitor >= num_panels)
+			monitor = 0;
 	}
-	else monitor = 0;
 
-	Task new_tsk;
-	new_tsk.win = win;
-	new_tsk.desktop = window_get_desktop (win);
-	new_tsk.area.panel = &panel1[monitor];
-	new_tsk.current_state = window_is_iconified(win) ? TASK_ICONIFIED : TASK_NORMAL;
-	window_get_coordinates(win, &new_tsk.win_x, &new_tsk.win_y, &new_tsk.win_w, &new_tsk.win_h);
+	// TODO why do we add the task only to the panel for the current monitor, without checking hide_task_diff_monitor?
+
+	Task task_template;
+	memset(&task_template, 0, sizeof(task_template));
+	task_template.area.has_mouse_over_effect = panel_config.mouse_effects;
+	task_template.area.has_mouse_press_effect = panel_config.mouse_effects;
+	task_template.area._is_under_mouse = full_width_area_is_under_mouse;
+	task_template.win = win;
+	task_template.desktop = get_window_desktop(win);
+	task_template.area.panel = &panels[monitor];
+	task_template.current_state = window_is_iconified(win) ? TASK_ICONIFIED : TASK_NORMAL;
+	get_window_coordinates(win, &task_template.win_x, &task_template.win_y, &task_template.win_w, &task_template.win_h);
 
 	// allocate only one title and one icon
 	// even with task_on_all_desktop and with task_on_all_panel
-	new_tsk.title = 0;
-	int k;
-	for (k=0; k<TASK_STATE_COUNT; ++k) {
-		new_tsk.icon[k] = 0;
-		new_tsk.state_pix[k] = 0;
+	task_template.title = NULL;
+	for (int k = 0; k < TASK_STATE_COUNT; ++k) {
+		task_template.icon[k] = NULL;
 	}
-	get_title(&new_tsk);
-	get_icon(&new_tsk);
+	task_update_title(&task_template);
+	task_update_icon(&task_template);
 
-	//printf("new task %s win %u: desktop %d, monitor %d\n", new_tsk.title, win, new_tsk.desktop, monitor);
+	// fprintf(stderr, "%s %d: win = %ld, task = %s\n", __FUNCTION__, __LINE__, win, task_template.title ?
+	// task_template.title : "??");
+	// fprintf(stderr, "new task %s win %u: desktop %d, monitor %d\n", new_task.title, win, new_task.desktop, monitor);
 
-	GPtrArray* task_group = g_ptr_array_new();
-	Taskbar *tskbar;
-	Task *new_tsk2=0;
-	int j;
-	for (j=0 ; j < panel1[monitor].nb_desktop ; j++) {
-		if (new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j) continue;
+	GPtrArray *task_buttons = g_ptr_array_new();
+	for (int j = 0; j < panels[monitor].num_desktops; j++) {
+		if (task_template.desktop != ALL_DESKTOPS && task_template.desktop != j)
+			continue;
 
-		tskbar = &panel1[monitor].taskbar[j];
-		new_tsk2 = calloc(1, sizeof(Task));
-		memcpy(&new_tsk2->area, &panel1[monitor].g_task.area, sizeof(Area));
-		new_tsk2->area.parent = tskbar;
-		new_tsk2->win = new_tsk.win;
-		new_tsk2->desktop = new_tsk.desktop;
-		new_tsk2->win_x = new_tsk.win_x;
-		new_tsk2->win_y = new_tsk.win_y;
-		new_tsk2->win_w = new_tsk.win_w;
-		new_tsk2->win_h = new_tsk.win_h;
-		new_tsk2->current_state = -1;  // to update the current state later in set_task_state...
-		if (new_tsk2->desktop == ALLDESKTOP && server.desktop != j) {
-			// hide ALLDESKTOP task on non-current desktop
-			new_tsk2->area.on_screen = 0;
+		Taskbar *taskbar = &panels[monitor].taskbar[j];
+		Task *task_instance = calloc(1, sizeof(Task));
+		memcpy(&task_instance->area, &panels[monitor].g_task.area, sizeof(Area));
+		task_instance->area.has_mouse_over_effect = panel_config.mouse_effects;
+		task_instance->area.has_mouse_press_effect = panel_config.mouse_effects;
+		task_instance->area._is_under_mouse = full_width_area_is_under_mouse;
+		task_instance->win = task_template.win;
+		task_instance->desktop = task_template.desktop;
+		task_instance->win_x = task_template.win_x;
+		task_instance->win_y = task_template.win_y;
+		task_instance->win_w = task_template.win_w;
+		task_instance->win_h = task_template.win_h;
+		task_instance->current_state = TASK_UNDEFINED; // to update the current state later in set_task_state...
+		if (task_instance->desktop == ALL_DESKTOPS && server.desktop != j) {
+			// fprintf(stderr, "%s %d: win = %ld hiding task: another desktop\n", __FUNCTION__, __LINE__, win);
+			task_instance->area.on_screen = always_show_all_desktop_tasks;
 		}
-		new_tsk2->title = new_tsk.title;
-		if (panel1[monitor].g_task.tooltip_enabled)
-			new_tsk2->area._get_tooltip_text = task_get_tooltip;
-		for (k=0; k<TASK_STATE_COUNT; ++k) {
-			new_tsk2->icon[k] = new_tsk.icon[k];
-			new_tsk2->state_pix[k] = 0;
+		task_instance->title = task_template.title;
+		if (panels[monitor].g_task.tooltip_enabled)
+			task_instance->area._get_tooltip_text = task_get_tooltip;
+		for (int k = 0; k < TASK_STATE_COUNT; ++k) {
+			task_instance->icon[k] = task_template.icon[k];
+			task_instance->icon_hover[k] = task_template.icon_hover[k];
+			task_instance->icon_press[k] = task_template.icon_press[k];
 		}
-		new_tsk2->icon_width = new_tsk.icon_width;
-		new_tsk2->icon_height = new_tsk.icon_height;
-		tskbar->area.list = g_list_append(tskbar->area.list, new_tsk2);
-		tskbar->area.resize = 1;
-		g_ptr_array_add(task_group, new_tsk2);
-		//printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
+		task_instance->icon_width = task_template.icon_width;
+		task_instance->icon_height = task_template.icon_height;
+
+		add_area(&task_instance->area, &taskbar->area);
+		g_ptr_array_add(task_buttons, task_instance);
 	}
-	Window* key = calloc(1, sizeof(Window));
-	*key = new_tsk.win;
-	g_hash_table_insert(win_to_task_table, key, task_group);
-	set_task_state(new_tsk2, new_tsk.current_state);
+	Window *key = calloc(1, sizeof(Window));
+	*key = task_template.win;
+	g_hash_table_insert(win_to_task, key, task_buttons);
+
+	set_task_state((Task *)g_ptr_array_index(task_buttons, 0), task_template.current_state);
 
 	sort_taskbar_for_win(win);
 
-	if (panel_mode == MULTI_DESKTOP) {
-		Panel *panel = new_tsk2->area.panel;
-		panel->area.resize = 1;
+	if (taskbar_mode == MULTI_DESKTOP) {
+		Panel *panel = (Panel *)task_template.area.panel;
+		panel->area.resize_needed = TRUE;
 	}
 
 	if (window_is_urgent(win)) {
-		add_urgent(new_tsk2);
+		add_urgent((Task *)g_ptr_array_index(task_buttons, 0));
 	}
 
-	return new_tsk2;
+	return (Task *)g_ptr_array_index(task_buttons, 0);
 }
 
-
-void remove_task (Task *tsk)
+void remove_task(Task *task)
 {
-	if (!tsk) return;
+	if (!task)
+		return;
 
-	if (panel_mode == MULTI_DESKTOP) {
-		Panel *panel = tsk->area.panel;
-		panel->area.resize = 1;
+	// fprintf(stderr, "%s %d: win = %ld, task = %s\n", __FUNCTION__, __LINE__, task->win, task->title ? task->title :
+	// "??");
+
+	if (taskbar_mode == MULTI_DESKTOP) {
+		Panel *panel = task->area.panel;
+		panel->area.resize_needed = 1;
 	}
 
-	Window win = tsk->win;
+	Window win = task->win;
 
 	// free title and icon just for the first task
 	// even with task_on_all_desktop and with task_on_all_panel
-	//printf("remove_task %s %d\n", tsk->title, tsk->desktop);
-	if (tsk->title)
-		free (tsk->title);
-	int k;
-	for (k=0; k<TASK_STATE_COUNT; ++k) {
-		if (tsk->icon[k]) {
-			imlib_context_set_image(tsk->icon[k]);
+	// printf("remove_task %s %d\n", task->title, task->desktop);
+	if (task->title)
+		free(task->title);
+	for (int k = 0; k < TASK_STATE_COUNT; ++k) {
+		if (task->icon[k]) {
+			imlib_context_set_image(task->icon[k]);
 			imlib_free_image();
-			tsk->icon[k] = 0;
-			if (tsk->state_pix[k]) XFreePixmap(server.dsp, tsk->state_pix[k]);
+			task->icon[k] = 0;
+		}
+		if (task->icon_hover[k]) {
+			imlib_context_set_image(task->icon_hover[k]);
+			imlib_free_image();
+			task->icon_hover[k] = 0;
+		}
+		if (task->icon_press[k]) {
+			imlib_context_set_image(task->icon_press[k]);
+			imlib_free_image();
+			task->icon_press[k] = 0;
 		}
 	}
 
-	int i;
-	Task *tsk2;
-	Taskbar *tskbar;
-	GPtrArray* task_group = g_hash_table_lookup(win_to_task_table, &win);
-	for (i=0; i<task_group->len; ++i) {
-		tsk2 = g_ptr_array_index(task_group, i);
-		tskbar = tsk2->area.parent;
-		tskbar->area.list = g_list_remove(tskbar->area.list, tsk2);
-		tskbar->area.resize = 1;
-		if (tsk2 == task_active) task_active = 0;
-		if (tsk2 == task_drag) task_drag = 0;
-		if (g_slist_find(urgent_list, tsk2)) del_urgent(tsk2);
-		free(tsk2);
+	GPtrArray *task_buttons = g_hash_table_lookup(win_to_task, &win);
+	for (int i = 0; i < task_buttons->len; ++i) {
+		Task *task2 = g_ptr_array_index(task_buttons, i);
+		if (task2 == active_task)
+			active_task = 0;
+		if (task2 == task_drag)
+			task_drag = 0;
+		if (g_slist_find(urgent_list, task2))
+			del_urgent(task2);
+		remove_area((Area *)task2);
+		free(task2);
 	}
-	g_hash_table_remove(win_to_task_table, &win);
+	g_hash_table_remove(win_to_task, &win);
 }
 
-
-int get_title(Task *tsk)
+gboolean task_update_title(Task *task)
 {
-	Panel *panel = tsk->area.panel;
-	char *title, *name;
+	Panel *panel = task->area.panel;
 
-	if (!panel->g_task.text &&
-		!panel->g_task.tooltip_enabled &&
-		taskbar_sort_method != TASKBAR_SORT_TITLE)
-		return 0;
+	if (!panel->g_task.has_text && !panel->g_task.tooltip_enabled && taskbar_sort_method != TASKBAR_SORT_TITLE)
+		return FALSE;
 
-	name = server_get_property (tsk->win, server.atom._NET_WM_VISIBLE_NAME, server.atom.UTF8_STRING, 0);
+	char *name = server_get_property(task->win, server.atom._NET_WM_VISIBLE_NAME, server.atom.UTF8_STRING, 0);
 	if (!name || !strlen(name)) {
-		name = server_get_property (tsk->win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 0);
+		name = server_get_property(task->win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 0);
 		if (!name || !strlen(name)) {
-			name = server_get_property (tsk->win, server.atom.WM_NAME, XA_STRING, 0);
+			name = server_get_property(task->win, server.atom.WM_NAME, XA_STRING, 0);
 		}
 	}
 
+	char *title;
 	if (name && strlen(name)) {
 		title = strdup(name);
 	} else {
 		title = strdup("Untitled");
 	}
-	if (name) XFree (name);
-	
-	if (tsk->title) {
-		// check unecessary title change
-		if (strcmp(tsk->title, title) == 0) {
-			free(title);
-			return 0;
-		}
-		else
-			free(tsk->title);
-	} 
+	if (name)
+		XFree(name);
 
-	tsk->title = title;
-	GPtrArray* task_group = task_get_tasks(tsk->win);
-	if (task_group) {
-		int i;
-		for (i=0; i<task_group->len; ++i) {
-			Task* tsk2 = g_ptr_array_index(task_group, i);
-			tsk2->title = tsk->title;
-			set_task_redraw(tsk2);
+	if (task->title) {
+		// check unecessary title change
+		if (strcmp(task->title, title) == 0) {
+			free(title);
+			return FALSE;
+		} else {
+			free(task->title);
 		}
 	}
-	return 1;
+
+	task->title = title;
+	GPtrArray *task_buttons = get_task_buttons(task->win);
+	if (task_buttons) {
+		for (int i = 0; i < task_buttons->len; ++i) {
+			Task *task2 = g_ptr_array_index(task_buttons, i);
+			task2->title = task->title;
+			schedule_redraw(&task2->area);
+		}
+	}
+	return TRUE;
 }
 
-
-void get_icon (Task *tsk)
+void task_update_icon(Task *task)
 {
-	Panel *panel = tsk->area.panel;
-	if (!panel->g_task.icon) return;
-	int i;
-	Imlib_Image img = NULL;
-	XWMHints *hints = 0;
-	gulong *data = 0;
+	Panel *panel = task->area.panel;
+	if (!panel->g_task.has_icon)
+		return;
 
-	int k;
-	for (k=0; k<TASK_STATE_COUNT; ++k) {
-		if (tsk->icon[k]) {
-			imlib_context_set_image(tsk->icon[k]);
+	for (int k = 0; k < TASK_STATE_COUNT; ++k) {
+		if (task->icon[k]) {
+			imlib_context_set_image(task->icon[k]);
 			imlib_free_image();
-			tsk->icon[k] = 0;
+			task->icon[k] = 0;
 		}
 	}
 
-	data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
+	Imlib_Image img = NULL;
+
+	int i;
+	gulong *data = server_get_property(task->win, server.atom._NET_WM_ICON, XA_CARDINAL, &i);
 	if (data) {
 		// get ARGB icon
 		int w, h;
 		gulong *tmp_data;
 
-		tmp_data = get_best_icon (data, get_icon_count (data, i), i, &w, &h, panel->g_task.icon_size1);
-#ifdef __x86_64__
+		tmp_data = get_best_icon(data, get_icon_count(data, i), i, &w, &h, panel->g_task.icon_size1);
 		DATA32 icon_data[w * h];
-		int length = w * h;
-		for (i = 0; i < length; ++i)
-			icon_data[i] =  tmp_data[i];
-		img = imlib_create_image_using_copied_data (w, h, icon_data);
-#else
-		img = imlib_create_image_using_data (w, h, (DATA32*)tmp_data);
-#endif
-	}
-	else {
+		for (int j = 0; j < w * h; ++j)
+			icon_data[j] = tmp_data[j];
+		img = imlib_create_image_using_copied_data(w, h, icon_data);
+		XFree(data);
+	} else {
 		// get Pixmap icon
-		hints = XGetWMHints(server.dsp, tsk->win);
+		XWMHints *hints = XGetWMHints(server.display, task->win);
 		if (hints) {
 			if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) {
 				// get width, height and depth for the pixmap
 				Window root;
-				int  icon_x, icon_y;
+				int icon_x, icon_y;
 				uint border_width, bpp;
 				uint w, h;
 
-				//printf("  get pixmap\n");
-				XGetGeometry(server.dsp, hints->icon_pixmap, &root, &icon_x, &icon_y, &w, &h, &border_width, &bpp);
+				// printf("  get pixmap\n");
+				XGetGeometry(server.display, hints->icon_pixmap, &root, &icon_x, &icon_y, &w, &h, &border_width, &bpp);
 				imlib_context_set_drawable(hints->icon_pixmap);
 				img = imlib_create_image_from_drawable(hints->icon_mask, 0, 0, w, h, 0);
 			}
+			XFree(hints);
 		}
 	}
 	if (img == NULL) {
@@ -290,287 +298,308 @@ void get_icon (Task *tsk)
 	// transform icons
 	imlib_context_set_image(img);
 	imlib_image_set_has_alpha(1);
-	int w, h;
-	w = imlib_image_get_width();
-	h = imlib_image_get_height();
-	Imlib_Image orig_image = imlib_create_cropped_scaled_image(0, 0, w, h, panel->g_task.icon_size1, panel->g_task.icon_size1);
+	int w = imlib_image_get_width();
+	int h = imlib_image_get_height();
+	Imlib_Image orig_image =
+		imlib_create_cropped_scaled_image(0, 0, w, h, panel->g_task.icon_size1, panel->g_task.icon_size1);
 	imlib_free_image();
 
 	imlib_context_set_image(orig_image);
-	tsk->icon_width = imlib_image_get_width();
-	tsk->icon_height = imlib_image_get_height();
-	for (k=0; k<TASK_STATE_COUNT; ++k) {
+	task->icon_width = imlib_image_get_width();
+	task->icon_height = imlib_image_get_height();
+	for (int k = 0; k < TASK_STATE_COUNT; ++k) {
 		imlib_context_set_image(orig_image);
-		tsk->icon[k] = imlib_clone_image();
-		imlib_context_set_image(tsk->icon[k]);
+		task->icon[k] = imlib_clone_image();
+		imlib_context_set_image(task->icon[k]);
 		DATA32 *data32;
 		if (panel->g_task.alpha[k] != 100 || panel->g_task.saturation[k] != 0 || panel->g_task.brightness[k] != 0) {
 			data32 = imlib_image_get_data();
-			adjust_asb(data32, tsk->icon_width, tsk->icon_height, panel->g_task.alpha[k], (float)panel->g_task.saturation[k]/100, (float)panel->g_task.brightness[k]/100);
+			adjust_asb(data32,
+					   task->icon_width,
+					   task->icon_height,
+					   panel->g_task.alpha[k] / 100.0,
+					   panel->g_task.saturation[k] / 100.0,
+					   panel->g_task.brightness[k] / 100.0);
 			imlib_image_put_back_data(data32);
 		}
+		if (panel_config.mouse_effects) {
+			task->icon_hover[k] = adjust_icon(task->icon[k],
+											  panel_config.mouse_over_alpha,
+											  panel_config.mouse_over_saturation,
+											  panel_config.mouse_over_brightness);
+			task->icon_press[k] = adjust_icon(task->icon[k],
+											  panel_config.mouse_pressed_alpha,
+											  panel_config.mouse_pressed_saturation,
+											  panel_config.mouse_pressed_brightness);
+		}
 	}
 	imlib_context_set_image(orig_image);
 	imlib_free_image();
 
-	if (hints)
-		XFree(hints);
-	if (data)
-		XFree (data);
-
-	GPtrArray* task_group = task_get_tasks(tsk->win);
-	if (task_group) {
-		for (i=0; i<task_group->len; ++i) {
-			Task* tsk2 = g_ptr_array_index(task_group, i);
-			tsk2->icon_width = tsk->icon_width;
-			tsk2->icon_height = tsk->icon_height;
-			int k;
-			for (k=0; k<TASK_STATE_COUNT; ++k)
-				tsk2->icon[k] = tsk->icon[k];
-			set_task_redraw(tsk2);
+	GPtrArray *task_buttons = get_task_buttons(task->win);
+	if (task_buttons) {
+		for (i = 0; i < task_buttons->len; ++i) {
+			Task *task2 = g_ptr_array_index(task_buttons, i);
+			task2->icon_width = task->icon_width;
+			task2->icon_height = task->icon_height;
+			for (int k = 0; k < TASK_STATE_COUNT; ++k) {
+				task2->icon[k] = task->icon[k];
+				task2->icon_hover[k] = task->icon_hover[k];
+				task2->icon_press[k] = task->icon_press[k];
+			}
+			schedule_redraw(&task2->area);
 		}
 	}
 }
 
 // TODO icons look too large when the panel is large
-void draw_task_icon (Task *tsk, int text_width)
+void draw_task_icon(Task *task, int text_width)
 {
-	if (tsk->icon[tsk->current_state] == 0) return;
+	if (!task->icon[task->current_state])
+		return;
 
 	// Find pos
 	int pos_x;
-	Panel *panel = (Panel*)tsk->area.panel;
+	Panel *panel = (Panel *)task->area.panel;
 	if (panel->g_task.centered) {
-		if (panel->g_task.text)
-			pos_x = (tsk->area.width - text_width - panel->g_task.icon_size1) / 2;
+		if (panel->g_task.has_text)
+			pos_x = (task->area.width - text_width - panel->g_task.icon_size1) / 2;
 		else
-			pos_x = (tsk->area.width - panel->g_task.icon_size1) / 2;
+			pos_x = (task->area.width - panel->g_task.icon_size1) / 2;
+	} else {
+		pos_x = panel->g_task.area.paddingxlr + task->area.bg->border.width;
 	}
-	else pos_x = panel->g_task.area.paddingxlr + tsk->area.bg->border.width;
 
 	// Render
-	imlib_context_set_image (tsk->icon[tsk->current_state]);
-	if (server.real_transparency) {
-		render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy);
+
+	Imlib_Image image;
+	// Render
+	if (panel_config.mouse_effects) {
+		if (task->area.mouse_state == MOUSE_OVER)
+			image = task->icon_hover[task->current_state];
+		else if (task->area.mouse_state == MOUSE_DOWN)
+			image = task->icon_press[task->current_state];
+		else
+			image = task->icon[task->current_state];
 	} else {
-		imlib_context_set_blend(1);
-		imlib_context_set_drawable(tsk->area.pix);
-		imlib_render_image_on_drawable(pos_x, panel->g_task.icon_posy);
+		image = task->icon[task->current_state];
+	}
+
+	imlib_context_set_image(image);
+	render_image(task->area.pix, pos_x, panel->g_task.icon_posy);
+	if (0) {
+		fprintf(stderr, "Task icon size: %d %d pos %d\n", imlib_image_get_width(), imlib_image_get_height(), pos_x);
+		fprintf(stderr, "Task max size : %d %d\n", panel->g_task.maximum_width, panel->g_task.maximum_height);
+		fprintf(stderr, "Task area size: %d %d\n", task->area.width, task->area.height);
+		fprintf(stderr, "Task area bord: %d\n", task->area.bg->border.width);
+		fprintf(stderr, "\n");
 	}
 }
 
-
-void draw_task (void *obj, cairo_t *c)
+void draw_task(void *obj, cairo_t *c)
 {
-	Task *tsk = obj;
-	tsk->state_pix[tsk->current_state] = tsk->area.pix;
-	PangoLayout *layout;
-	Color *config_text;
-	int width=0, height;
-	Panel *panel = (Panel*)tsk->area.panel;
-	//printf("draw_task %d %d\n", tsk->area.posx, tsk->area.posy);
+	Task *task = (Task *)obj;
+	Panel *panel = (Panel *)task->area.panel;
 
-	if (panel->g_task.text) {
-		/* Layout */
-		layout = pango_cairo_create_layout (c);
-		pango_layout_set_font_description (layout, panel->g_task.font_desc);
-		pango_layout_set_text(layout, tsk->title, -1);
+	int text_width = 0;
+	if (panel->g_task.has_text) {
+		PangoLayout *layout = pango_cairo_create_layout(c);
+		pango_layout_set_font_description(layout, panel->g_task.font_desc);
+		pango_layout_set_text(layout, task->title, -1);
 
-		/* Drawing width and Cut text */
-		// pango use U+22EF or U+2026
-		pango_layout_set_width(layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE);
+		pango_layout_set_width(layout, ((Taskbar *)task->area.parent)->text_width * PANGO_SCALE);
 		pango_layout_set_height(layout, panel->g_task.text_height * PANGO_SCALE);
 		pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-		pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
+		pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
 
-		/* Center text */
-		if (panel->g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
-		else pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT);
+		if (panel->g_task.centered)
+			pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+		else
+			pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
 
-		pango_layout_get_pixel_size (layout, &width, &height);
-
-		config_text = &panel->g_task.font[tsk->current_state];
-
-		double text_posy = (panel->g_task.area.height - height) / 2.0;
+		int text_height;
+		pango_layout_get_pixel_size(layout, &text_width, &text_height);
+		double text_posy = (panel->g_task.area.height - text_height) / 2.0;
 
+		Color *config_text = &panel->g_task.font[task->current_state];
 		draw_text(layout, c, panel->g_task.text_posx, text_posy, config_text, panel->font_shadow);
 
-		g_object_unref (layout);
+		g_object_unref(layout);
 	}
 
-	if (panel->g_task.icon) {
-		draw_task_icon (tsk, width);
-	}
+	if (panel->g_task.has_icon)
+		draw_task_icon(task, text_width);
 }
 
-
-void on_change_task (void *obj)
+void on_change_task(void *obj)
 {
-	Task *tsk = obj;
-	Panel *panel = (Panel*)tsk->area.panel;
+	Task *task = (Task *)obj;
+	Panel *panel = (Panel *)task->area.panel;
 
-	long value[] = { panel->posx+tsk->area.posx, panel->posy+tsk->area.posy, tsk->area.width, tsk->area.height };
-	XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
-	
-	// reset Pixmap when position/size changed
-	set_task_redraw(tsk);
+	long value[] = {panel->posx + task->area.posx, panel->posy + task->area.posy, task->area.width, task->area.height};
+	XChangeProperty(server.display,
+					task->win,
+					server.atom._NET_WM_ICON_GEOMETRY,
+					XA_CARDINAL,
+					32,
+					PropModeReplace,
+					(unsigned char *)value,
+					4);
 }
 
-// Given a pointer to the active task (active_task) and a pointer
-// to the task that is currently under the mouse (current_task),
-// returns a pointer to the active task.
-Task *find_active_task(Task *current_task, Task *active_task)
+Task *find_active_task(Task *current_task)
 {
 	if (active_task == NULL)
 		return current_task;
 
-	Taskbar* tskbar = current_task->area.parent;
+	Taskbar *taskbar = (Taskbar *)current_task->area.parent;
 
-	GList *l0 = tskbar->area.list;
+	GList *l0 = taskbar->area.children;
 	if (taskbarname_enabled)
 		l0 = l0->next;
-	for (; l0 ; l0 = l0->next) {
-		Task *tsk = l0->data;
-		if (tsk->win == active_task->win)
-			return tsk;
+	for (; l0; l0 = l0->next) {
+		Task *task = (Task *)l0->data;
+		if (task->win == active_task->win)
+			return task;
 	}
 
 	return current_task;
 }
 
-Task *next_task(Task *tsk)
+Task *next_task(Task *task)
 {
-	if (tsk == 0)
-		return 0;
+	if (!task)
+		return NULL;
 
-	Taskbar* tskbar = tsk->area.parent;
+	Taskbar *taskbar = task->area.parent;
 
-	GList *l0 = tskbar->area.list;
-	if (taskbarname_enabled) l0 = l0->next;
-	GList *lfirst_tsk = l0;
-	for (; l0 ; l0 = l0->next) {
-		Task *tsk1 = l0->data;
-		if (tsk1 == tsk) {
-			if (l0->next == 0) l0 = lfirst_tsk;
-			else l0 = l0->next;
+	GList *l0 = taskbar->area.children;
+	if (taskbarname_enabled)
+		l0 = l0->next;
+	GList *lfirst_task = l0;
+	for (; l0; l0 = l0->next) {
+		Task *task1 = l0->data;
+		if (task1 == task) {
+			l0 = l0->next ? l0->next : lfirst_task;
 			return l0->data;
 		}
 	}
 
-	return 0;
+	return NULL;
 }
 
-Task *prev_task(Task *tsk)
+Task *prev_task(Task *task)
 {
-	if (tsk == 0)
+	if (!task)
 		return 0;
 
-	Task *tsk1, *tsk2;
-	Taskbar* tskbar = tsk->area.parent;
+	Taskbar *taskbar = task->area.parent;
 
-	tsk2 = 0;
-	GList *l0 = tskbar->area.list;
-	if (taskbarname_enabled) l0 = l0->next;
-	GList *lfirst_tsk = l0;
-	for (; l0 ; l0 = l0->next) {
-		tsk1 = l0->data;
-		if (tsk1 == tsk) {
-			if (l0 == lfirst_tsk) {
-				l0 = g_list_last ( l0 );
-				tsk2 = l0->data;
+	Task *task2 = NULL;
+	GList *l0 = taskbar->area.children;
+	if (taskbarname_enabled)
+		l0 = l0->next;
+	GList *lfirst_task = l0;
+	for (; l0; l0 = l0->next) {
+		Task *task1 = l0->data;
+		if (task1 == task) {
+			if (l0 == lfirst_task) {
+				l0 = g_list_last(l0);
+				task2 = l0->data;
 			}
-			return tsk2;
+			return task2;
 		}
-		tsk2 = tsk1;
+		task2 = task1;
 	}
 
-	return 0;
+	return NULL;
 }
 
-
-void active_task()
+void reset_active_task()
 {
-	if (task_active) {
-		set_task_state(task_active, window_is_iconified(task_active->win) ? TASK_ICONIFIED : TASK_NORMAL);
-		task_active = 0;
+	if (active_task) {
+		set_task_state(active_task, window_is_iconified(active_task->win) ? TASK_ICONIFIED : TASK_NORMAL);
+		active_task = NULL;
 	}
 
-	Window w1 = window_get_active();
-	//printf("Change active task %ld\n", w1);
+	Window w1 = get_active_window();
+	// printf("Change active task %ld\n", w1);
 
 	if (w1) {
-		if (!task_get_tasks(w1)) {
+		if (!get_task_buttons(w1)) {
 			Window w2;
-			while (XGetTransientForHint(server.dsp, w1, &w2))
+			while (XGetTransientForHint(server.display, w1, &w2))
 				w1 = w2;
 		}
-		set_task_state((task_active = task_get_task(w1)), TASK_ACTIVE);
+		set_task_state((active_task = get_task(w1)), TASK_ACTIVE);
 	}
 }
 
-
-void set_task_state(Task *tsk, int state)
+void set_task_state(Task *task, TaskState state)
 {
-	if (tsk == 0 || state < 0 || state >= TASK_STATE_COUNT)
+	if (!task || state == TASK_UNDEFINED || state >= TASK_STATE_COUNT)
 		return;
 
-	if (tsk->current_state != state || hide_task_diff_monitor) {
-		GPtrArray* task_group = task_get_tasks(tsk->win);
-		if (task_group) {
-			int i;
-			for (i=0; i<task_group->len; ++i) {
-				Task* tsk1 = g_ptr_array_index(task_group, i);
-				tsk1->current_state = state;
-				tsk1->area.bg = panel1[0].g_task.background[state];
-				tsk1->area.pix = tsk1->state_pix[state];
-				if (tsk1->state_pix[state] == 0)
-					tsk1->area.redraw = 1;
-				if (state == TASK_ACTIVE && g_slist_find(urgent_list, tsk1))
-					del_urgent(tsk1);
-				// Show only the active task
-				int hide = 0;
-				if (hide_inactive_tasks) {
-					if (state != TASK_ACTIVE) {
-						hide = 1;
-					}
-				}
-				if (window_get_monitor(tsk->win) != ((Panel*)tsk->area.panel)->monitor &&
-					(hide_task_diff_monitor || nb_panel > 1)) {
-					hide = 1;
-				}
-				if (1 - hide != tsk1->area.on_screen) {
-					tsk1->area.on_screen = 1 - hide;
-					set_task_redraw(tsk1);
-					Panel *p = (Panel*)tsk->area.panel;
-					tsk->area.resize = 1;
-					p->taskbar->area.resize = 1;
-					p->area.resize = 1;
+	if (state == TASK_ACTIVE && task->current_state != state) {
+		clock_gettime(CLOCK_MONOTONIC, &task->last_activation_time);
+		if (taskbar_sort_method == TASKBAR_SORT_LRU || taskbar_sort_method == TASKBAR_SORT_MRU) {
+			GPtrArray *task_buttons = get_task_buttons(task->win);
+			if (task_buttons) {
+				for (int i = 0; i < task_buttons->len; ++i) {
+					Task *task1 = g_ptr_array_index(task_buttons, i);
+					Taskbar *taskbar = (Taskbar *)task1->area.parent;
+					sort_tasks(taskbar);
 				}
 			}
-			panel_refresh = 1;
+		}
+	}
+
+	if (task->current_state != state || hide_task_diff_monitor) {
+		GPtrArray *task_buttons = get_task_buttons(task->win);
+		if (task_buttons) {
+			for (int i = 0; i < task_buttons->len; ++i) {
+				Task *task1 = g_ptr_array_index(task_buttons, i);
+				task1->current_state = state;
+				task1->area.bg = panels[0].g_task.background[state];
+				schedule_redraw(&task1->area);
+				if (state == TASK_ACTIVE && g_slist_find(urgent_list, task1))
+					del_urgent(task1);
+				gboolean hide = FALSE;
+				Taskbar *taskbar = (Taskbar *)task1->area.parent;
+				if (task->desktop == ALL_DESKTOPS && server.desktop != taskbar->desktop) {
+					// Hide ALL_DESKTOPS task on non-current desktop
+					hide = !always_show_all_desktop_tasks;
+				}
+				if (hide_inactive_tasks) {
+					// Show only the active task
+					if (state != TASK_ACTIVE) {
+						hide = TRUE;
+					}
+				}
+				if (get_window_monitor(task->win) != ((Panel *)task->area.panel)->monitor &&
+					(hide_task_diff_monitor || num_panels > 1)) {
+					hide = TRUE;
+				}
+				if ((!hide) != task1->area.on_screen) {
+					task1->area.on_screen = !hide;
+					schedule_redraw(&task1->area);
+					Panel *p = (Panel *)task->area.panel;
+					task->area.resize_needed = TRUE;
+					p->taskbar->area.resize_needed = TRUE;
+					p->area.resize_needed = TRUE;
+				}
+			}
+			panel_refresh = TRUE;
 		}
 	}
 }
 
-
-void set_task_redraw(Task* tsk)
+void blink_urgent(void *arg)
 {
-	int k;
-	for (k=0; k<TASK_STATE_COUNT; ++k) {
-		if (tsk->state_pix[k]) XFreePixmap(server.dsp, tsk->state_pix[k]);
-		tsk->state_pix[k] = 0;
-	}
-	tsk->area.pix = 0;
-	tsk->area.redraw = 1;
-}
-
-
-void blink_urgent(void* arg)
-{
-	GSList* urgent_task = urgent_list;
+	GSList *urgent_task = urgent_list;
 	while (urgent_task) {
-		Task* t = urgent_task->data;
-		if ( t->urgent_tick < max_tick_urgent) {
+		Task *t = urgent_task->data;
+		if (t->urgent_tick < max_tick_urgent) {
 			if (t->urgent_tick++ % 2)
 				set_task_state(t, TASK_URGENT);
 			else
@@ -578,39 +607,37 @@ void blink_urgent(void* arg)
 		}
 		urgent_task = urgent_task->next;
 	}
-	panel_refresh = 1;
+	panel_refresh = TRUE;
 }
 
-
-void add_urgent(Task *tsk)
+void add_urgent(Task *task)
 {
-	if (!tsk)
+	if (!task)
 		return;
 
 	// some programs set urgency hint although they are active
-	if ( task_active && task_active->win == tsk->win )
+	if (active_task && active_task->win == task->win)
 		return;
 
-	tsk = task_get_task(tsk->win);  // always add the first tsk for a task group (omnipresent windows)
-	tsk->urgent_tick = 0;
-	if (g_slist_find(urgent_list, tsk))
+	task = get_task(task->win); // always add the first task for the task buttons (omnipresent windows)
+	task->urgent_tick = 0;
+	if (g_slist_find(urgent_list, task))
 		return;
 
 	// not yet in the list, so we have to add it
-	urgent_list = g_slist_prepend(urgent_list, tsk);
+	urgent_list = g_slist_prepend(urgent_list, task);
 
 	if (!urgent_timeout)
 		urgent_timeout = add_timeout(10, 1000, blink_urgent, 0, &urgent_timeout);
 
-	Panel *panel = tsk->area.panel;
+	Panel *panel = task->area.panel;
 	if (panel->is_hidden)
 		autohide_show(panel);
 }
 
-
-void del_urgent(Task *tsk)
+void del_urgent(Task *task)
 {
-	urgent_list = g_slist_remove(urgent_list, tsk);
+	urgent_list = g_slist_remove(urgent_list, task);
 	if (!urgent_list) {
 		stop_timeout(urgent_timeout);
 		urgent_timeout = NULL;

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,28 @@ 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];
 	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 +66,32 @@ typedef struct {
 	int win_y;
 	int win_w;
 	int win_h;
+	struct timespec last_activation_time;
 } 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,48 @@
 #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 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();
 
+// 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;
+	always_show_all_desktop_tasks = FALSE;
 	taskbar_sort_method = TASKBAR_NOSORT;
 	taskbar_alignment = ALIGN_LEFT;
 	default_taskbarname();
@@ -70,36 +82,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);
+	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);
@@ -113,61 +116,60 @@ void cleanup_taskbar()
 	stop_timeout(urgent_timeout);
 }
 
-
 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;
+	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;
+	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._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_name.posy = panel->g_taskbar.area.posy;
 		panel->g_taskbar.area_name.height = panel->g_taskbar.area.height;
-	}
-	else {
+	} else {
 		panel->g_taskbar.area.posx = panel->area.bg->border.width + panel->area.paddingy;
 		panel->g_taskbar.area.width = panel->area.width - (2 * panel->g_taskbar.area.posx);
 		panel->g_taskbar.area_name.posx = panel->g_taskbar.area.posx;
@@ -176,248 +178,279 @@ void init_taskbar_panel(void *p)
 
 	// task
 	panel->g_task.area.panel = panel;
-	panel->g_task.area.size_mode = SIZE_BY_LAYOUT;
+	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_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.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;
+	} 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.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.maximum_width = server.monitors[panel->monitor].width;
 
 	panel->g_task.text_posx = panel->g_task.background[0]->border.width + panel->g_task.area.paddingxlr;
 	panel->g_task.text_height = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
-	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(panel->g_task.maximum_width, MIN(panel->g_task.maximum_height, panel->g_task.area.height)) -
+			(2 * panel->g_task.area.paddingy) - 2 * panel->g_task.area.bg->border.width;
 		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;
 	}
-	//printf("monitor %d, task_maximum_width %d\n", panel->monitor, panel->g_task.maximum_width);
+	// 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;
+	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)
-			tskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
+			taskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
 		else
-			tskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
+			taskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
 	}
 	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);
+			}
+		}
+	}
+	panel_refresh = TRUE;
 }
 
-
-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)
+gboolean resize_taskbar(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;
 
-
-int resize_taskbar(void *obj)
-{
-	Taskbar *taskbar = (Taskbar*)obj;
-	Panel *panel = (Panel*)taskbar->area.panel;
-	int text_width;
-
-	//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 - panel->g_task.area.bg->border.width - panel->g_task.area.paddingxlr;
+	} else {
+		relayout_with_constraint(&taskbar->area, panel->g_task.maximum_height);
+
+		taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx -
+							  panel->g_task.area.bg->border.width - panel->g_task.area.paddingxlr;
 	}
-	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)
+void set_taskbar_state(Taskbar *taskbar, TaskbarState state)
 {
-	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;
-	}
-	tskbar->area.pix = 0;
-	tskbar->area.redraw = 1;
-}
-
-
-void set_taskbar_state(Taskbar *tskbar, int state)
-{
-	tskbar->area.bg = panel1[0].g_taskbar.background[state];
-	tskbar->area.pix = tskbar->state_pix[state];
+	taskbar->area.bg = panels[0].g_taskbar.background[state];
 	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];
 	}
-	if (panel_mode != MULTI_DESKTOP) { 
+	if (taskbar_mode != MULTI_DESKTOP) {
 		if (state == TASKBAR_NORMAL)
-			tskbar->area.on_screen = 0;
+			taskbar->area.on_screen = FALSE;
 		else
-			tskbar->area.on_screen = 1;
+			taskbar->area.on_screen = TRUE;
 	}
-	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);
+	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;
+	panel_refresh = TRUE;
 }
 
-
-void visible_taskbar(void *p)
+void update_taskbar_visibility(void *p)
 {
-	Panel *panel =(Panel*)p;
-	int j;
+	Panel *panel = (Panel *)p;
 
-	Taskbar *taskbar;
-	for (j=0 ; j < panel->nb_desktop ; j++) {
-		taskbar = &panel->taskbar[j];
-		if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
+	for (int j = 0; j < panel->num_desktops; j++) {
+		Taskbar *taskbar = &panel->taskbar[j];
+		if (taskbar_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
 			// SINGLE_DESKTOP and not current desktop
-			taskbar->area.on_screen = 0;
-		}
-		else {
-			taskbar->area.on_screen = 1;
+			taskbar->area.on_screen = FALSE;
+		} else {
+			taskbar->area.on_screen = TRUE;
 		}
 	}
-	panel_refresh = 1;
+	panel_refresh = TRUE;
 }
 
 #define NONTRIVIAL 2
@@ -426,23 +459,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) &&
+	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;
+		return TRUE;
 	}
-	return 0;
+	return FALSE;
 }
 
 gint compare_task_centers(Task *a, Task *b, Taskbar *taskbar)
@@ -453,10 +484,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 +496,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 +532,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;
+	panel_refresh = TRUE;
+	((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,84 @@
 #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];
+} GlobalTaskbar;
 
+extern gboolean taskbar_enabled;
+extern gboolean taskbar_distribute_size;
+extern gboolean hide_inactive_tasks;
+extern gboolean hide_task_diff_monitor;
+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);
+
+void set_taskbar_state(Taskbar *taskbar, TaskbarState state);
+
+// Updates the visibility of each taskbar when the current desktop changes.
+void update_taskbar_visibility(void *p);
+
+// 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,157 @@
 #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();
 
 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;
+	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;
 		if (j == server.desktop)
-			tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
+			taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
 		else
-			tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
+			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);
 	}
 
-	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);
+		}
+	}
+	panel_refresh = TRUE;
+}
 
 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)
+gboolean resize_taskbarname(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;
+	TaskbarName *taskbar_name = obj;
 	Panel *panel = taskbar_name->area.panel;
 	int name_height, name_width, name_height_ink;
-	int ret = 0;
+	gboolean result = FALSE;
 
-	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));
+	schedule_redraw(&taskbar_name->area);
+	get_text_size2(panel_config.taskbarname_font_desc,
+				   &name_height_ink,
+				   &name_height,
+				   &name_width,
+				   panel->area.height,
+				   panel->area.width,
+				   taskbar_name->name,
+				   strlen(taskbar_name->name),
+				   PANGO_WRAP_WORD_CHAR,
+				   PANGO_ELLIPSIZE_NONE,
+				   FALSE);
 
 	if (panel_horizontal) {
-		int new_size = name_width + (2* (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
+		int new_size = name_width + (2 * (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
 		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 {
+	} else {
 		int new_size = name_height + (2 * (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
 		if (new_size != taskbar_name->area.height) {
-			taskbar_name->area.height =  new_size;
+			taskbar_name->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,8 +20,9 @@ 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
@@ -63,7 +64,7 @@ endif( NOT DATADIR )
 add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
 add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale\" )
 add_definitions( -DGETTEXT_PACKAGE=\"tint2conf\" )
-set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread" )
+set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread -std=c99" )
 set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )
 
 add_subdirectory(po)

src/tint2conf/main.h

@@ -16,4 +16,5 @@
 
 #define SNAPSHOT_TICK 190
 gboolean update_snapshot();
-void menuApply();
+void menuApply();
+void refresh_current_theme();

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:
 

src/tint2conf/properties.h

@@ -14,6 +14,10 @@ extern GtkWidget *panel_width, *panel_height, *panel_margin_x, *panel_margin_y,
 extern GtkWidget *panel_wm_menu, *panel_dock, *panel_autohide, *panel_autohide_show_time, *panel_autohide_hide_time, *panel_autohide_size;
 extern GtkWidget *panel_combo_strut_policy, *panel_combo_layer, *panel_combo_width_type, *panel_combo_height_type, *panel_combo_monitor;
 extern GtkWidget *panel_window_name, *disable_transparency;
+extern GtkWidget *panel_mouse_effects;
+extern GtkWidget *mouse_hover_icon_opacity, *mouse_hover_icon_saturation, *mouse_hover_icon_brightness;
+extern GtkWidget *mouse_pressed_icon_opacity, *mouse_pressed_icon_saturation, *mouse_pressed_icon_brightness;
+extern GtkWidget *panel_primary_monitor_first;
 
 enum {
 	itemsColName = 0,
@@ -48,15 +52,17 @@ extern GtkWidget *panel_background;
 // taskbar
 extern GtkWidget *taskbar_show_desktop, *taskbar_show_name, *taskbar_padding_x, *taskbar_padding_y, *taskbar_spacing;
 extern GtkWidget *taskbar_hide_inactive_tasks, *taskbar_hide_diff_monitor;
-extern GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color, *taskbar_name_active_color, *taskbar_name_font;
+extern GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color, *taskbar_name_active_color;
+extern GtkWidget *taskbar_name_font, *taskbar_name_font_set;
 extern GtkWidget *taskbar_active_background, *taskbar_inactive_background;
 extern GtkWidget *taskbar_name_active_background, *taskbar_name_inactive_background;
-extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment;
+extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment, *taskbar_always_show_all_desktop_tasks;
 
 // task
 extern GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down;
 extern GtkWidget *task_show_icon, *task_show_text, *task_align_center, *font_shadow;
-extern GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_spacing, *task_font;
+extern GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_spacing;
+extern GtkWidget *task_font, *task_font_set;
 extern GtkWidget *task_default_color, *task_default_color_set,
 		  *task_default_icon_opacity, *task_default_icon_osb_set,
 		  *task_default_icon_saturation,
@@ -87,13 +93,19 @@ extern GtkWidget *task_iconified_color, *task_iconified_color_set,
 // clock
 extern GtkWidget *clock_format_line1, *clock_format_line2, *clock_tmz_line1, *clock_tmz_line2;
 extern GtkWidget *clock_left_command, *clock_right_command;
-extern GtkWidget *clock_padding_x, *clock_padding_y, *clock_font_line1, *clock_font_line2, *clock_font_color;
+extern GtkWidget *clock_mclick_command, *clock_rclick_command, *clock_uwheel_command, *clock_dwheel_command;
+extern GtkWidget *clock_padding_x, *clock_padding_y;
+extern GtkWidget *clock_font_line1, *clock_font_line1_set, *clock_font_line2, *clock_font_line2_set, *clock_font_color;
 extern GtkWidget *clock_background;
 
 // battery
 extern GtkWidget *battery_hide_if_higher, *battery_alert_if_lower, *battery_alert_cmd;
-extern GtkWidget *battery_padding_x, *battery_padding_y, *battery_font_line1, *battery_font_line2, *battery_font_color;
+extern GtkWidget *battery_padding_x, *battery_padding_y;
+extern GtkWidget *battery_font_line1, *battery_font_line1_set, *battery_font_line2, *battery_font_line2_set, *battery_font_color;
 extern GtkWidget *battery_background;
+extern GtkWidget *battery_tooltip;
+extern GtkWidget *battery_left_command, *battery_mclick_command, *battery_right_command, *battery_uwheel_command, *battery_dwheel_command;
+extern GtkWidget *ac_connected_cmd, *ac_disconnected_cmd;
 
 // systray
 extern GtkWidget *systray_icon_order, *systray_padding_x, *systray_padding_y, *systray_spacing;
@@ -101,11 +113,27 @@ extern GtkWidget *systray_icon_size, *systray_icon_opacity, *systray_icon_satura
 extern GtkWidget *systray_background, *systray_monitor;
 
 // tooltip
-extern GtkWidget *tooltip_padding_x, *tooltip_padding_y, *tooltip_font, *tooltip_font_color;
+extern GtkWidget *tooltip_padding_x, *tooltip_padding_y, *tooltip_font, *tooltip_font_set, *tooltip_font_color;
 extern GtkWidget *tooltip_task_show, *tooltip_show_after, *tooltip_hide_after;
 extern GtkWidget *clock_format_tooltip, *clock_tmz_tooltip;
 extern GtkWidget *tooltip_background;
 
+// Executor
+typedef struct Executor {
+	char name[256];
+	GtkWidget *container;
+	GtkWidget *page_execp;
+	GtkWidget *page_label;
+	GtkWidget *execp_command, *execp_interval, *execp_has_icon, *execp_cache_icon, *execp_show_tooltip;
+	GtkWidget *execp_continuous, *execp_markup, *execp_tooltip;
+	GtkWidget *execp_left_command, *execp_right_command;
+	GtkWidget *execp_mclick_command, *execp_rclick_command, *execp_uwheel_command, *execp_dwheel_command;
+	GtkWidget *execp_font, *execp_font_set, *execp_font_color, *execp_padding_x, *execp_padding_y, *execp_centered;
+	GtkWidget *execp_background, *execp_icon_w, *execp_icon_h;
+} Executor;
+
+extern GArray *executors;
+
 // launcher
 
 enum {
@@ -123,7 +151,7 @@ extern GtkWidget *launcher_apps_dirs;
 extern GtkWidget *launcher_icon_size, *launcher_icon_theme, *launcher_padding_x, *launcher_padding_y, *launcher_spacing;
 extern GtkWidget *launcher_icon_opacity, *launcher_icon_saturation, *launcher_icon_brightness;
 extern GtkWidget *margin_x, *margin_y;
-extern GtkWidget *launcher_background;
+extern GtkWidget *launcher_background, *launcher_icon_background;
 extern GtkWidget *startup_notifications;
 extern IconThemeWrapper *icon_theme;
 extern GtkWidget *launcher_tooltip;
@@ -142,6 +170,15 @@ enum {
 	bgColBorderOpacity,
 	bgColBorderWidth,
 	bgColCornerRadius,
+	bgColText,
+	bgColFillColorOver,
+	bgColFillOpacityOver,
+	bgColBorderColorOver,
+	bgColBorderOpacityOver,
+	bgColFillColorPress,
+	bgColFillOpacityPress,
+	bgColBorderColorPress,
+	bgColBorderOpacityPress,
 	bgNumCols
 };
 
@@ -149,6 +186,10 @@ extern GtkListStore *backgrounds;
 extern GtkWidget *current_background,
 		  *background_fill_color,
 		  *background_border_color,
+		  *background_fill_color_over,
+		  *background_border_color_over,
+		  *background_fill_color_press,
+		  *background_border_color_press,
 		  *background_border_width,
 		  *background_corner_radius;
 
@@ -158,4 +199,13 @@ int background_index_safe(int index);
 
 GtkWidget *create_properties();
 
+void execp_create_new();
+Executor *execp_get_last();
+void execp_remove(int i);
+void execp_update_indices();
+
+void create_please_wait(GtkWindow *parent);
+void process_events();
+void destroy_please_wait();
+
 #endif

src/tint2conf/properties_rw.c

@@ -7,7 +7,7 @@
 #include "properties.h"
 #include "properties_rw.h"
 
-
+void finalize_bg();
 void add_entry(char *key, char *value);
 void hex2gdk(char *hex, GdkColor *color);
 void set_action(char *event, GtkWidget *combo);
@@ -22,8 +22,15 @@ int no_items_clock_enabled;
 int no_items_systray_enabled;
 int no_items_battery_enabled;
 
+static int num_bg;
+static int read_bg_color_hover;
+static int read_border_color_hover;
+static int read_bg_color_press;
+static int read_border_color_press;
+
 void config_read_file(const char *path)
 {
+	num_bg = 0;
 	background_create_new();
 
 	FILE *fp;
@@ -51,6 +58,8 @@ void config_read_file(const char *path)
 	}
 	fclose(fp);
 
+	finalize_bg();
+
 	if (!config_has_panel_items) {
 		char panel_items[256];
 		panel_items[0] = 0;
@@ -75,7 +84,7 @@ void config_read_file(const char *path)
 	}
 }
 
-void config_write_color(FILE *fp, char *name, GdkColor color, int opacity)
+void config_write_color(FILE *fp, const char *name, GdkColor color, int opacity)
 {
 	fprintf(fp,
 			"%s = #%02x%02x%02x %d\n",
@@ -110,20 +119,42 @@ void config_write_backgrounds(FILE *fp)
 		int fillOpacity;
 		GdkColor *borderColor;
 		int borderOpacity;
+		GdkColor *fillColorOver;
+		int fillOpacityOver;
+		GdkColor *borderColorOver;
+		int borderOpacityOver;
+		GdkColor *fillColorPress;
+		int fillOpacityPress;
+		GdkColor *borderColorPress;
+		int borderOpacityPress;
+		gchar *text;
 
 		gtk_tree_model_get(GTK_TREE_MODEL(backgrounds), &iter,
 						   bgColFillColor, &fillColor,
 						   bgColFillOpacity, &fillOpacity,
 						   bgColBorderColor, &borderColor,
 						   bgColBorderOpacity, &borderOpacity,
+						   bgColFillColorOver, &fillColorOver,
+						   bgColFillOpacityOver, &fillOpacityOver,
+						   bgColBorderColorOver, &borderColorOver,
+						   bgColBorderOpacityOver, &borderOpacityOver,
+						   bgColFillColorPress, &fillColorPress,
+						   bgColFillOpacityPress, &fillOpacityPress,
+						   bgColBorderColorPress, &borderColorPress,
+						   bgColBorderOpacityPress, &borderOpacityPress,
 						   bgColBorderWidth, &b,
 						   bgColCornerRadius, &r,
+						   bgColText, &text,
 						   -1);
-		fprintf(fp, "# Background %d\n", index);
+		fprintf(fp, "# Background %d: %s\n", index, text ? text : "");
 		fprintf(fp, "rounded = %d\n", r);
 		fprintf(fp, "border_width = %d\n", b);
 		config_write_color(fp, "background_color", *fillColor, fillOpacity);
 		config_write_color(fp, "border_color", *borderColor, borderOpacity);
+		config_write_color(fp, "background_color_hover", *fillColorOver, fillOpacityOver);
+		config_write_color(fp, "border_color_hover", *borderColorOver, borderOpacityOver);
+		config_write_color(fp, "background_color_pressed", *fillColorPress, fillOpacityPress);
+		config_write_color(fp, "border_color_pressed", *borderColorPress, borderOpacityPress);
 		fprintf(fp, "\n");
 	}
 }
@@ -197,6 +228,8 @@ void config_write_panel(FILE *fp)
 	}
 	fprintf(fp, "\n");
 
+	fprintf(fp, "primary_monitor_first = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel_primary_monitor_first)) ? 1 : 0);
+
 	fprintf(fp, "autohide = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel_autohide)) ? 1 : 0);
 	fprintf(fp, "autohide_show_timeout = %g\n", gtk_spin_button_get_value(GTK_SPIN_BUTTON(panel_autohide_show_time)));
 	fprintf(fp, "autohide_hide_timeout = %g\n", gtk_spin_button_get_value(GTK_SPIN_BUTTON(panel_autohide_hide_time)));
@@ -214,7 +247,19 @@ void config_write_panel(FILE *fp)
 
 	fprintf(fp, "panel_window_name = %s\n", gtk_entry_get_text(GTK_ENTRY(panel_window_name)));
 	fprintf(fp, "disable_transparency = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(disable_transparency)) ? 1 : 0);
+	fprintf(fp, "mouse_effects = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel_mouse_effects)) ? 1 : 0);
 	fprintf(fp, "font_shadow = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(font_shadow)) ? 1 : 0);
+	fprintf(fp,
+			"mouse_hover_icon_asb = %d %d %d\n",
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_hover_icon_opacity)),
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_hover_icon_saturation)),
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_hover_icon_brightness)));
+	fprintf(fp,
+			"mouse_pressed_icon_asb = %d %d %d\n",
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_pressed_icon_opacity)),
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_pressed_icon_saturation)),
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_pressed_icon_brightness)));
+
 
 	fprintf(fp, "\n");
 }
@@ -239,13 +284,15 @@ void config_write_taskbar(FILE *fp)
 	fprintf(fp, "taskbar_name = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(taskbar_show_name)) ? 1 : 0);
 	fprintf(fp, "taskbar_hide_inactive_tasks = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(taskbar_hide_inactive_tasks)) ? 1 : 0);
 	fprintf(fp, "taskbar_hide_different_monitor = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(taskbar_hide_diff_monitor)) ? 1 : 0);
+	fprintf(fp, "taskbar_always_show_all_desktop_tasks = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(taskbar_always_show_all_desktop_tasks)) ? 1 : 0);
 	fprintf(fp,
 			"taskbar_name_padding = %d %d\n",
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(taskbar_name_padding_x)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(taskbar_name_padding_y)));
 	fprintf(fp, "taskbar_name_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_name_inactive_background)));
 	fprintf(fp, "taskbar_name_active_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_name_active_background)));
-	fprintf(fp, "taskbar_name_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(taskbar_name_font)));
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(taskbar_name_font_set)))
+		fprintf(fp, "taskbar_name_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(taskbar_name_font)));
 
 	GdkColor color;
 	gtk_color_button_get_color(GTK_COLOR_BUTTON(taskbar_name_inactive_color), &color);
@@ -267,8 +314,14 @@ void config_write_taskbar(FILE *fp)
 		fprintf(fp, "none");
 	} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 1) {
 		fprintf(fp, "title");
-	} else {
+	} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 2) {
 		fprintf(fp, "center");
+	} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 3) {
+		fprintf(fp, "mru");
+	} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 4) {
+		fprintf(fp, "lru");
+	} else {
+		fprintf(fp, "none");
 	}
 	fprintf(fp, "\n");
 
@@ -338,7 +391,8 @@ void config_write_task(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(task_padding_x)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(task_padding_y)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(task_spacing)));
-	fprintf(fp, "task_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(task_font)));
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(task_font_set)))
+		fprintf(fp, "task_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(task_font)));
 	fprintf(fp, "task_tooltip = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tooltip_task_show)) ? 1 : 0);
 
 	// same for: "" _normal _active _urgent _iconified
@@ -466,6 +520,7 @@ void config_write_launcher(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_padding_y)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_spacing)));
 	fprintf(fp, "launcher_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(launcher_background)));
+	fprintf(fp, "launcher_icon_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(launcher_icon_background)));
 	fprintf(fp, "launcher_icon_size = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_icon_size)));
 	fprintf(fp,
 			"launcher_icon_asb = %d %d %d\n",
@@ -527,10 +582,12 @@ void config_write_clock(FILE *fp)
 
 	fprintf(fp, "time1_format = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_format_line1)));
 	fprintf(fp, "time2_format = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_format_line2)));
-	fprintf(fp, "time1_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(clock_font_line1)));
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(clock_font_line1_set)))
+		fprintf(fp, "time1_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(clock_font_line1)));
 	fprintf(fp, "time1_timezone = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_tmz_line1)));
 	fprintf(fp, "time2_timezone = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_tmz_line2)));
-	fprintf(fp, "time2_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(clock_font_line2)));
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(clock_font_line2_set)))
+		fprintf(fp, "time2_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(clock_font_line2)));
 
 	GdkColor color;
 	gtk_color_button_get_color(GTK_COLOR_BUTTON(clock_font_color), &color);
@@ -548,6 +605,9 @@ void config_write_clock(FILE *fp)
 	fprintf(fp, "clock_tooltip_timezone = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_tmz_tooltip)));
 	fprintf(fp, "clock_lclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_left_command)));
 	fprintf(fp, "clock_rclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_right_command)));
+	fprintf(fp, "clock_mclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_mclick_command)));
+	fprintf(fp, "clock_uwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_uwheel_command)));
+	fprintf(fp, "clock_dwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_dwheel_command)));
 
 	fprintf(fp, "\n");
 }
@@ -557,10 +617,13 @@ void config_write_battery(FILE *fp)
 	fprintf(fp, "#-------------------------------------\n");
 	fprintf(fp, "# Battery\n");
 
+	fprintf(fp, "battery_tooltip = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(battery_tooltip)) ? 1 : 0);
 	fprintf(fp, "battery_low_status = %g\n", gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_alert_if_lower)));
 	fprintf(fp, "battery_low_cmd = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_alert_cmd)));
-	fprintf(fp, "bat1_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(battery_font_line1)));
-	fprintf(fp, "bat2_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(battery_font_line2)));
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(battery_font_line1_set)))
+		fprintf(fp, "bat1_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(battery_font_line1)));
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(battery_font_line2_set)))
+		fprintf(fp, "bat2_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(battery_font_line2)));
 	GdkColor color;
 	gtk_color_button_get_color(GTK_COLOR_BUTTON(battery_font_color), &color);
 	config_write_color(fp,
@@ -573,10 +636,68 @@ void config_write_battery(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_padding_y)));
 	fprintf(fp, "battery_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(battery_background)));
 	fprintf(fp, "battery_hide = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_hide_if_higher)));
+	fprintf(fp, "battery_lclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_left_command)));
+	fprintf(fp, "battery_rclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_right_command)));
+	fprintf(fp, "battery_mclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_mclick_command)));
+	fprintf(fp, "battery_uwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_uwheel_command)));
+	fprintf(fp, "battery_dwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_dwheel_command)));
+
+	fprintf(fp, "ac_connected_cmd = %s\n", gtk_entry_get_text(GTK_ENTRY(ac_connected_cmd)));
+	fprintf(fp, "ac_disconnected_cmd = %s\n", gtk_entry_get_text(GTK_ENTRY(ac_disconnected_cmd)));
 
 	fprintf(fp, "\n");
 }
 
+void config_write_execp(FILE *fp)
+{
+	for (int i = 0; i < executors->len; i++) {
+		fprintf(fp, "#-------------------------------------\n");
+		fprintf(fp, "# Executor %d\n", i + 1);
+
+		Executor *executor = &g_array_index(executors, Executor, i);
+
+		fprintf(fp, "execp = new\n");
+		fprintf(fp, "execp_command = %s\n", gtk_entry_get_text(GTK_ENTRY(executor->execp_command)));
+		fprintf(fp, "execp_interval = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(executor->execp_interval)));
+		fprintf(fp, "execp_has_icon = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(executor->execp_has_icon)) ? 1 : 0);
+		fprintf(fp, "execp_cache_icon = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(executor->execp_cache_icon)) ? 1 : 0);
+		fprintf(fp, "execp_continuous = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(executor->execp_continuous)));
+		fprintf(fp, "execp_markup = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(executor->execp_markup)) ? 1 : 0);
+		if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(executor->execp_show_tooltip))) {
+			fprintf(fp, "execp_tooltip = \n");
+		} else {
+			const gchar *text = gtk_entry_get_text(GTK_ENTRY(executor->execp_tooltip));
+			if (strlen(text) > 0)
+				fprintf(fp, "execp_tooltip = %s\n", text);
+		}
+
+		fprintf(fp, "execp_lclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(executor->execp_left_command)));
+		fprintf(fp, "execp_rclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(executor->execp_right_command)));
+		fprintf(fp, "execp_mclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(executor->execp_mclick_command)));
+		fprintf(fp, "execp_uwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(executor->execp_uwheel_command)));
+		fprintf(fp, "execp_dwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(executor->execp_dwheel_command)));
+
+		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(executor->execp_font_set)))
+			fprintf(fp, "execp_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(executor->execp_font)));
+		GdkColor color;
+		gtk_color_button_get_color(GTK_COLOR_BUTTON(executor->execp_font_color), &color);
+		config_write_color(fp,
+						   "execp_font_color",
+						   color,
+						   gtk_color_button_get_alpha(GTK_COLOR_BUTTON(executor->execp_font_color)) * 100 / 0xffff);
+		fprintf(fp,
+				"execp_padding = %d %d\n",
+				(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(executor->execp_padding_x)),
+				(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(executor->execp_padding_y)));
+		fprintf(fp, "execp_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(executor->execp_background)));
+		fprintf(fp, "execp_centered = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(executor->execp_centered)) ? 1 : 0);
+		fprintf(fp, "execp_icon_w = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(executor->execp_icon_w)));
+		fprintf(fp, "execp_icon_h = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(executor->execp_icon_h)));
+
+		fprintf(fp, "\n");
+	}
+}
+
 void config_write_tooltip(FILE *fp)
 {
 	fprintf(fp, "#-------------------------------------\n");
@@ -597,7 +718,8 @@ void config_write_tooltip(FILE *fp)
 					   color,
 					   gtk_color_button_get_alpha(GTK_COLOR_BUTTON(tooltip_font_color)) * 100 / 0xffff);
 
-	fprintf(fp, "tooltip_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(tooltip_font)));
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tooltip_font_set)))
+		fprintf(fp, "tooltip_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(tooltip_font)));
 
 	fprintf(fp, "\n");
 }
@@ -645,6 +767,7 @@ void config_save_file(const char *path) {
 	config_write_launcher(fp);
 	config_write_clock(fp);
 	config_write_battery(fp);
+	config_write_execp(fp);
 	config_write_tooltip(fp);
 
 	checksum = checksum_txt(fp);
@@ -682,6 +805,44 @@ gboolean config_is_manual(const char *path)
 	return result;
 }
 
+void finalize_bg()
+{
+	if (num_bg > 0) {
+		if (!read_bg_color_hover) {
+			GdkColor fillColor;
+			gtk_color_button_get_color(GTK_COLOR_BUTTON(background_fill_color), &fillColor);
+			gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color_over), &fillColor);
+			int fillOpacity = gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_fill_color));
+			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color_over), fillOpacity);
+			background_force_update();
+		}
+		if (!read_border_color_hover) {
+			GdkColor fillColor;
+			gtk_color_button_get_color(GTK_COLOR_BUTTON(background_border_color), &fillColor);
+			gtk_color_button_set_color(GTK_COLOR_BUTTON(background_border_color_over), &fillColor);
+			int fillOpacity = gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_border_color));
+			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color_over), fillOpacity);
+			background_force_update();
+		}
+		if (!read_bg_color_press) {
+			GdkColor fillColor;
+			gtk_color_button_get_color(GTK_COLOR_BUTTON(background_fill_color), &fillColor);
+			gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color_press), &fillColor);
+			int fillOpacity = gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_fill_color));
+			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color_press), fillOpacity);
+			background_force_update();
+		}
+		if (!read_border_color_press) {
+			GdkColor fillColor;
+			gtk_color_button_get_color(GTK_COLOR_BUTTON(background_border_color_over), &fillColor);
+			gtk_color_button_set_color(GTK_COLOR_BUTTON(background_border_color_press), &fillColor);
+			int fillOpacity = gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_border_color_over));
+			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color_press), fillOpacity);
+			background_force_update();
+		}
+	}
+}
+
 void add_entry(char *key, char *value)
 {
 	char *value1=0, *value2=0, *value3=0;
@@ -689,7 +850,13 @@ void add_entry(char *key, char *value)
 	/* Background and border */
 	if (strcmp(key, "rounded") == 0) {
 		// 'rounded' is the first parameter => alloc a new background
+		finalize_bg();
 		background_create_new();
+		num_bg++;
+		read_bg_color_hover = 0;
+		read_border_color_hover = 0;
+		read_bg_color_press = 0;
+		read_border_color_press = 0;
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(background_corner_radius), atoi(value));
 		background_force_update();
 	}
@@ -715,6 +882,46 @@ void add_entry(char *key, char *value)
 		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color), (alpha*65535)/100);
 		background_force_update();
 	}
+	else if (strcmp(key, "background_color_hover") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		GdkColor col;
+		hex2gdk(value1, &col);
+		gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color_over), &col);
+		int alpha = value2 ? atoi(value2) : 50;
+		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color_over), (alpha*65535)/100);
+		background_force_update();
+		read_bg_color_hover = 1;
+	}
+	else if (strcmp(key, "border_color_hover") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		GdkColor col;
+		hex2gdk(value1, &col);
+		gtk_color_button_set_color(GTK_COLOR_BUTTON(background_border_color_over), &col);
+		int alpha = value2 ? atoi(value2) : 50;
+		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color_over), (alpha*65535)/100);
+		background_force_update();
+		read_border_color_hover = 1;
+	}
+	else if (strcmp(key, "background_color_pressed") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		GdkColor col;
+		hex2gdk(value1, &col);
+		gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color_press), &col);
+		int alpha = value2 ? atoi(value2) : 50;
+		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color_press), (alpha*65535)/100);
+		background_force_update();
+		read_bg_color_press = 1;
+	}
+	else if (strcmp(key, "border_color_pressed") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		GdkColor col;
+		hex2gdk(value1, &col);
+		gtk_color_button_set_color(GTK_COLOR_BUTTON(background_border_color_press), &col);
+		int alpha = value2 ? atoi(value2) : 50;
+		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color_press), (alpha*65535)/100);
+		background_force_update();
+		read_border_color_press = 1;
+	}
 
 	/* Panel */
 	else if (strcmp(key, "panel_size") == 0) {
@@ -747,7 +954,7 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "panel_margin") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(panel_margin_x), atoi(value1));
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(panel_margin_y), atoi(value1));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(panel_margin_y), atoi(value2));
 	}
 	else if (strcmp(key, "panel_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -828,6 +1035,21 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "disable_transparency") == 0) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(disable_transparency), atoi(value));
 	}
+	else if (strcmp(key, "mouse_effects") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(panel_mouse_effects), atoi(value));
+	}
+	else if (strcmp(key, "mouse_hover_icon_asb") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_hover_icon_opacity), atoi(value1));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_hover_icon_saturation), atoi(value2));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_hover_icon_brightness), atoi(value3));
+	}
+	else if (strcmp(key, "mouse_pressed_icon_asb") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_pressed_icon_opacity), atoi(value1));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_pressed_icon_saturation), atoi(value2));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_pressed_icon_brightness), atoi(value3));
+	}
 	else if (strcmp(key, "font_shadow") == 0) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(font_shadow), atoi(value));
 	}
@@ -848,20 +1070,21 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "panel_monitor") == 0) {
 		if (strcmp(value, "all") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 0);
-		else if (strcmp(value, "0") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 1);
 		else if (strcmp(value, "1") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 2);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 1);
 		else if (strcmp(value, "2") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 3);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 2);
 		else if (strcmp(value, "3") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 4);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 3);
 		else if (strcmp(value, "4") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 5);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 4);
 		else if (strcmp(value, "5") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 6);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 5);
 		else if (strcmp(value, "6") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 7);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 6);
+	}
+	else if (strcmp(key, "primary_monitor_first") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(panel_primary_monitor_first), atoi(value));
 	}
 	
 	/* autohide options */
@@ -892,12 +1115,13 @@ void add_entry(char *key, char *value)
 	}
 
 	/* Battery */
-	else if (strcmp(key, "systray") == 0) {
+	else if (strcmp(key, "battery") == 0) {
 		// Obsolete option
 		config_has_battery = 1;
 		config_battery_enabled = atoi(value);
-	}
-	else if (strcmp(key, "battery_low_status") == 0) {
+	} else if (strcmp(key, "battery_tooltip") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(battery_tooltip), atoi(value));
+	} else if (strcmp(key, "battery_low_status") == 0) {
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_alert_if_lower), atof(value));
 	}
 	else if (strcmp(key, "battery_low_cmd") == 0) {
@@ -905,9 +1129,11 @@ void add_entry(char *key, char *value)
 	}
 	else if (strcmp(key, "bat1_font") == 0) {
 		gtk_font_button_set_font_name(GTK_FONT_BUTTON(battery_font_line1), value);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(battery_font_line1_set), TRUE);
 	}
 	else if (strcmp(key, "bat2_font") == 0) {
 		gtk_font_button_set_font_name(GTK_FONT_BUTTON(battery_font_line2), value);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(battery_font_line2_set), TRUE);
 	}
 	else if (strcmp(key, "battery_font_color") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -935,6 +1161,27 @@ void add_entry(char *key, char *value)
 		else
 			gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_hide_if_higher), atoi(value));
 	}
+	else if (strcmp(key, "battery_lclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(battery_left_command), value);
+	}
+	else if (strcmp(key, "battery_rclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(battery_right_command), value);
+	}
+	else if (strcmp(key, "battery_mclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(battery_mclick_command), value);
+	}
+	else if (strcmp(key, "battery_uwheel_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(battery_uwheel_command), value);
+	}
+	else if (strcmp(key, "battery_dwheel_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(battery_dwheel_command), value);
+	}
+	else if (strcmp(key, "ac_connected_cmd") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(ac_connected_cmd), value);
+	}
+	else if (strcmp(key, "ac_disconnected_cmd") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(ac_disconnected_cmd), value);
+	}
 
 	/* Clock */
 	else if (strcmp(key, "time1_format") == 0) {
@@ -946,6 +1193,7 @@ void add_entry(char *key, char *value)
 	}
 	else if (strcmp(key, "time1_font") == 0) {
 		gtk_font_button_set_font_name(GTK_FONT_BUTTON(clock_font_line1), value);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(clock_font_line1_set), TRUE);
 	}
 	else if (strcmp(key, "time1_timezone") == 0) {
 		gtk_entry_set_text(GTK_ENTRY(clock_tmz_line1), value);
@@ -955,6 +1203,7 @@ void add_entry(char *key, char *value)
 	}
 	else if (strcmp(key, "time2_font") == 0) {
 		gtk_font_button_set_font_name(GTK_FONT_BUTTON(clock_font_line2), value);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(clock_font_line2_set), TRUE);
 	}
 	else if (strcmp(key, "clock_font_color") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -987,6 +1236,15 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "clock_rclick_command") == 0) {
 		gtk_entry_set_text(GTK_ENTRY(clock_right_command), value);
 	}
+	else if (strcmp(key, "clock_mclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(clock_mclick_command), value);
+	}
+	else if (strcmp(key, "clock_uwheel_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(clock_uwheel_command), value);
+	}
+	else if (strcmp(key, "clock_dwheel_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(clock_dwheel_command), value);
+	}
 
 	/* Taskbar */
 	else if (strcmp(key, "taskbar_mode") == 0) {
@@ -1005,6 +1263,10 @@ void add_entry(char *key, char *value)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 1);
 		else if (strcmp(value, "center") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 2);
+		else if (strcmp(value, "mru") == 0)
+			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 3);
+		else if (strcmp(value, "lru") == 0)
+			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 4);
 		else
 			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0);
 	}
@@ -1044,6 +1306,9 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "taskbar_hide_different_monitor") == 0) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(taskbar_hide_diff_monitor), atoi(value));
 	}
+	else if (strcmp(key, "taskbar_always_show_all_desktop_tasks") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(taskbar_always_show_all_desktop_tasks), atoi(value));
+	}
 	else if (strcmp(key, "taskbar_name_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(taskbar_name_padding_x), atoi(value1));
@@ -1061,6 +1326,7 @@ void add_entry(char *key, char *value)
 	}
 	else if (strcmp(key, "taskbar_name_font") == 0) {
 		gtk_font_button_set_font_name(GTK_FONT_BUTTON(taskbar_name_font), value);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(taskbar_name_font_set), TRUE);
 	}
 	else if (strcmp(key, "taskbar_name_font_color") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -1117,6 +1383,7 @@ void add_entry(char *key, char *value)
 	}
 	else if (strcmp(key, "task_font") == 0) {
 		gtk_font_button_set_font_name(GTK_FONT_BUTTON(task_font), value);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(task_font_set), TRUE);
 	}
 	else if (g_regex_match_simple("task.*_font_color", key, 0, 0)) {
 		gchar** split = g_regex_split_simple("_", key, 0, 0);
@@ -1283,6 +1550,10 @@ void add_entry(char *key, char *value)
 		int id = background_index_safe(atoi(value));
 		gtk_combo_box_set_active(GTK_COMBO_BOX(launcher_background), id);
 	}
+	else if (strcmp(key, "launcher_icon_background_id") == 0) {
+		int id = background_index_safe(atoi(value));
+		gtk_combo_box_set_active(GTK_COMBO_BOX(launcher_icon_background), id);
+	}
 	else if (strcmp(key, "launcher_icon_size") == 0) {
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_icon_size), atoi(value));
 	}
@@ -1349,6 +1620,7 @@ void add_entry(char *key, char *value)
 	}
 	else if (strcmp(key, "tooltip_font") == 0) {
 		gtk_font_button_set_font_name(GTK_FONT_BUTTON(tooltip_font), value);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(tooltip_font_set), TRUE);
 	}
 
 	/* Mouse actions */
@@ -1368,6 +1640,80 @@ void add_entry(char *key, char *value)
 		set_action(value, task_mouse_scroll_down);
 	}
 
+	/* Executor */
+	else if (strcmp(key, "execp") == 0) {
+		execp_create_new();
+	}
+	else if (strcmp(key, "execp_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(execp_get_last()->execp_command), value);
+	}
+	else if (strcmp(key, "execp_interval") == 0) {
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_get_last()->execp_interval), atoi(value));
+	}
+	else if (strcmp(key, "execp_has_icon") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_get_last()->execp_has_icon), atoi(value));
+	}
+	else if (strcmp(key, "execp_cache_icon") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_get_last()->execp_cache_icon), atoi(value));
+	}
+	else if (strcmp(key, "execp_continuous") == 0) {
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_get_last()->execp_continuous), atoi(value));
+	}
+	else if (strcmp(key, "execp_markup") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_get_last()->execp_markup), atoi(value));
+	}
+	else if (strcmp(key, "execp_tooltip") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_get_last()->execp_show_tooltip), 1);
+		gtk_entry_set_text(GTK_ENTRY(execp_get_last()->execp_tooltip), value);
+	}
+	else if (strcmp(key, "execp_lclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(execp_get_last()->execp_left_command), value);
+	}
+	else if (strcmp(key, "execp_rclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(execp_get_last()->execp_right_command), value);
+	}
+	else if (strcmp(key, "execp_mclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(execp_get_last()->execp_mclick_command), value);
+	}
+	else if (strcmp(key, "execp_uwheel_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(execp_get_last()->execp_uwheel_command), value);
+	}
+	else if (strcmp(key, "execp_dwheel_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(execp_get_last()->execp_dwheel_command), value);
+	}
+	else if (strcmp(key, "execp_font") == 0) {
+		gtk_font_button_set_font_name(GTK_FONT_BUTTON(execp_get_last()->execp_font), value);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_get_last()->execp_font_set), TRUE);
+	}
+	else if (strcmp(key, "execp_font_color") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		GdkColor col;
+		hex2gdk(value1, &col);
+		gtk_color_button_set_color(GTK_COLOR_BUTTON(execp_get_last()->execp_font_color), &col);
+		if (value2) {
+			int alpha = atoi(value2);
+			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(execp_get_last()->execp_font_color), (alpha*65535)/100);
+		}
+	}
+	else if (strcmp(key, "execp_padding") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_get_last()->execp_padding_x), atoi(value1));
+		if (value2) gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_get_last()->execp_padding_y), atoi(value2));
+	}
+	else if (strcmp(key, "execp_background_id") == 0) {
+		int id = background_index_safe(atoi(value));
+		gtk_combo_box_set_active(GTK_COMBO_BOX(execp_get_last()->execp_background), id);
+	}
+	else if (strcmp(key, "execp_icon_w") == 0) {
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_get_last()->execp_icon_w), atoi(value));
+	}
+	else if (strcmp(key, "execp_icon_h") == 0) {
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_get_last()->execp_icon_h), atoi(value));
+	}
+	else if (strcmp(key, "execp_centered") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_get_last()->execp_centered), atoi(value));
+	}
+
 	if (value1) free(value1);
 	if (value2) free(value2);
 	if (value3) free(value3);
@@ -1434,4 +1780,4 @@ char *get_action(GtkWidget *combo)
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 10)
 		return "prev_task";
 	return "none";
-}
+}

src/tint2conf/properties_rw.h

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

src/tint2conf/theme_view.c

@@ -17,14 +17,14 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **************************************************************************/
 
-
 #include "main.h"
 #include "strnatcmp.h"
 #include "theme_view.h"
+#include "common.h"
 
 // The data columns that we export via the tree model interface
 GtkWidget *g_theme_view;
-GtkListStore *g_store;
+GtkListStore *theme_list_store;
 int g_width_list, g_height_list;
 GtkCellRenderer *g_renderer;
 
@@ -37,15 +37,14 @@ GtkWidget *create_view()
 {
 	GtkTreeViewColumn *col;
 	GtkCellRenderer *renderer;
-	GtkWidget  *view;
 
-	g_store = gtk_list_store_new(NB_COL, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF);
+	theme_list_store = gtk_list_store_new(NB_COL, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF);
 
-	view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(g_store));
+	GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(theme_list_store));
 	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
 
-	g_object_unref(g_store); // destroy store automatically with view
+	g_object_unref(theme_list_store); // destroy store automatically with view
 
 	renderer = gtk_cell_renderer_text_new();
 	col = gtk_tree_view_column_new();
@@ -66,14 +65,13 @@ GtkWidget *create_view()
 	g_object_set(g_renderer, "xalign", 0.0, NULL);
 	gtk_cell_renderer_set_fixed_size(g_renderer, g_width_list, g_height_list);
 	// specific to gtk-2.18 or higher
-	//gtk_cell_renderer_set_padding(g_renderer, 5, 5);
+	// gtk_cell_renderer_set_padding(g_renderer, 5, 5);
 	col = gtk_tree_view_column_new();
 	gtk_tree_view_column_pack_start(col, g_renderer, TRUE);
 	gtk_tree_view_column_add_attribute(col, g_renderer, "pixbuf", COL_SNAPSHOT);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(view),col);
 
-	GtkTreeSortable *sortable;
-	sortable = GTK_TREE_SORTABLE(g_store);
+	GtkTreeSortable *sortable = GTK_TREE_SORTABLE(theme_list_store);
 	gtk_tree_sortable_set_sort_column_id(sortable, COL_THEME_FILE, GTK_SORT_ASCENDING);
 	gtk_tree_sortable_set_sort_func(sortable, COL_THEME_FILE, theme_name_compare, NULL, NULL);
 	return view;
@@ -87,6 +85,15 @@ gint theme_name_compare(GtkTreeModel *model,
 	gchar *path_a, *path_b;
 	gtk_tree_model_get(model, a, COL_THEME_FILE, &path_a, -1);
 	gtk_tree_model_get(model, b, COL_THEME_FILE, &path_b, -1);
+
+	gboolean home_a = strstr(path_a, g_get_user_config_dir()) == path_a;
+	gboolean home_b = strstr(path_b, g_get_user_config_dir()) == path_b;
+
+	if (home_a && !home_b)
+		return -1;
+	if (!home_a && home_b)
+		return 1;
+
 	gchar *name_a = path_a;
 	gchar *p;
 	for (p = name_a; *p; p++) {
@@ -110,15 +117,45 @@ gint theme_name_compare(GtkTreeModel *model,
 	return result;
 }
 
-void custom_list_append(const gchar *path)
+gboolean theme_list_contains(const char *given_path)
 {
-	GtkTreeIter  iter;
+	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+	GtkTreeIter iter;
 
-	gtk_list_store_append(g_store, &iter);
-	gtk_list_store_set(g_store, &iter, COL_THEME_FILE, path, -1);
+	gboolean have_iter = gtk_tree_model_get_iter_first(model, &iter);
+	while (have_iter) {
+		gchar *filepath;
+		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filepath, -1);
+		if (g_str_equal(filepath, given_path)) {
+			gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
+			g_free(filepath);
+			return TRUE;
+		}
+		g_free(filepath);
+		have_iter = gtk_tree_model_iter_next(model, &iter);
+	}
+	return FALSE;
+}
 
-	gchar *name = g_strdup(strrchr(path, '/') + 1);
-	gtk_list_store_set(g_store, &iter, COL_THEME_NAME, name, -1);
+void theme_list_append(const gchar *path)
+{
+	if (theme_list_contains(path))
+		return;
+
+	GtkTreeIter iter;
+	gtk_list_store_append(theme_list_store, &iter);
+
+	gchar *name = strrchr(path, '/') + 1;
+
+	gchar *dir = g_strdup(path);
+	strrchr(dir, '/')[0] = 0;
+	char *suffix = contract_tilde(dir);
+	g_free(dir);
+
+	gchar *display_name = g_strdup_printf("%s\n(%s)", name, suffix);
+	gtk_list_store_set(theme_list_store, &iter, COL_THEME_FILE, path, COL_THEME_NAME, display_name, -1);
+	g_free(display_name);
+	g_free(suffix);
 }
 
 
@@ -126,7 +163,6 @@ gboolean update_snapshot()
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	GdkPixbuf *icon;
 	gboolean have_iter;
 
 	gint pixWidth = 200, pixHeight = 30;
@@ -134,20 +170,29 @@ gboolean update_snapshot()
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
 	have_iter = gtk_tree_model_get_iter_first(model, &iter);
 	while (have_iter) {
-		gtk_tree_model_get(model, &iter, COL_SNAPSHOT, &icon, -1);
-		if (icon != NULL) {
-			g_object_unref(icon);
+		GdkPixbuf *pixbuf;
+		gtk_tree_model_get(model, &iter, COL_SNAPSHOT, &pixbuf, -1);
+		if (pixbuf) {
+			pixWidth = MAX(pixWidth, gdk_pixbuf_get_width(pixbuf));
+			pixHeight = MAX(pixHeight, gdk_pixbuf_get_height(pixbuf));
+			g_object_unref(pixbuf);
+			have_iter = gtk_tree_model_iter_next(model, &iter);
+			continue;
 		}
 
 		// build panel's snapshot
-		GdkPixbuf *pixbuf = NULL;
-		gchar *name, *snap, *cmd;
+		gchar *path;
+		gtk_tree_model_get(model, &iter,
+						   COL_THEME_FILE, &path,
+						   -1);
 
-		snap = g_build_filename(g_get_user_config_dir(), "tint2", "snap.jpg", NULL);
+		char fname[128];
+		sprintf(fname, "tint2-%d.jpg", (int)getpid());
+
+		gchar *snap = g_build_filename(g_get_tmp_dir(), fname, NULL);
 		g_remove(snap);
 
-		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &name, -1);
-		cmd = g_strdup_printf("tint2 -c \'%s\' -s \'%s\'", name, snap);
+		gchar *cmd = g_strdup_printf("tint2 -c \'%s\' -s \'%s\' 1>/dev/null 2>/dev/null", path, snap);
 		if (system(cmd) == 0) {
 			// load
 			pixbuf = gdk_pixbuf_new_from_file(snap, NULL);
@@ -155,18 +200,18 @@ gboolean update_snapshot()
 				printf("snapshot NULL : %s\n", cmd);
 			}
 		}
-		g_free(snap);
 		g_free(cmd);
-		g_free(name);
 
-		gint w, h;
-		w = gdk_pixbuf_get_width(pixbuf);
-		h = gdk_pixbuf_get_height(pixbuf);
-		pixWidth = w > pixWidth ? w : pixWidth;
-		pixHeight = h > pixHeight ? h : pixHeight;
+		g_remove(snap);
+		g_free(snap);
+		g_free(path);
 
-		gtk_list_store_set(g_store, &iter, COL_SNAPSHOT, pixbuf, -1);
+		pixWidth = MAX(pixWidth, gdk_pixbuf_get_width(pixbuf));
+		pixHeight = MAX(pixHeight, gdk_pixbuf_get_height(pixbuf));
 
+		gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, pixbuf, -1);
+		if (pixbuf)
+			g_object_unref(pixbuf);
 		have_iter = gtk_tree_model_iter_next(model, &iter);
 	}
 
@@ -174,6 +219,3 @@ gboolean update_snapshot()
 
 	return FALSE;
 }
-
-
-

src/tint2conf/theme_view.h

@@ -1,18 +1,14 @@
-
 #ifndef THEME_VIEW
 #define THEME_VIEW
 
 #include <gtk/gtk.h>
 
 extern GtkWidget *g_theme_view;
-extern GtkListStore *g_store;
+extern GtkListStore *theme_list_store;
 enum { COL_THEME_FILE = 0, COL_THEME_NAME, COL_SNAPSHOT, NB_COL, };
 
 GtkWidget *create_view();
 
-void custom_list_append(const gchar *path);
+void theme_list_append(const gchar *path);
 
 #endif
-
-
-

src/tint2conf/tint2conf.desktop

@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Tint2 panel settings
+
+Name=Tint2 Settings
 Name[am]=ፓነል  አስተዳዳሪ
 Name[ar]=مدير الائحة :
 Name[ast]=Alministrador de panel
@@ -17,7 +18,7 @@ Name[es]=Administrador de panel
 Name[et]=Paneelihaldur
 Name[eu]=Panel Kudeatzailea:
 Name[fi]=Paneelin hallinta
-Name[fr]=Gestionnaire de panneau
+Name[fr]=Gestionnaire du panneau tint2
 Name[gl]=Xestor de paneis
 Name[he]=מנהל הלוח
 Name[hu]=Panelkezelő
@@ -37,7 +38,7 @@ Name[pl]=Ustawienia panelu
 Name[pt]=Gestor do Painel
 Name[pt_BR]=Gerenciador do painel
 Name[ro]=Manager de panouri
-Name[ru]=Диспетчер панелей 
+Name[ru]=Настройки tint2
 Name[si]=පුවරු කළමණාකරු
 Name[sk]=Nastavenie panelu
 Name[sq]=Përgjegjës Panelesh
@@ -45,14 +46,69 @@ Name[sv]=Panelhanterare
 Name[ta]=பலகை மேளாலர்:
 Name[tr]=Panel Yöneticisi
 Name[ug]=Panel باشقۇرغۇ
-Name[uk]=Менеджер панелей
+Name[uk]=Настройки tint2
 Name[ur]=پینل منیجر
 Name[ur_PK]=پینل منیجر
 Name[vi]=Quản lý panel
 Name[zh_CN]=面板管理器
 Name[zh_TW]=面板管理程式
+
+GenericName=Panel configurator
+GenericName[am]=ፓነል  አስተዳዳሪ
+GenericName[ar]=مدير الائحة :
+GenericName[ast]=Alministrador de panel
+GenericName[be]=Кіраўнік Панэляў
+GenericName[ca]=Gestor de quadres
+GenericName[cs]=Správce panelu
+GenericName[da]=Panelhåndtering
+GenericName[de]=Leistenverwaltung
+GenericName[dz]=པེ་ནཱལ་འཛིན་སྐྱོང་པ།
+GenericName[el]=Διαχειριστής ταμπλό
+GenericName[en_GB]=Panel Manager
+GenericName[eo]=Administrilo de Panelo
+GenericName[es]=Administrador de panel
+GenericName[et]=Paneelihaldur
+GenericName[eu]=Panel Kudeatzailea:
+GenericName[fi]=Paneelin hallinta
+GenericName[fr]=Gestionnaire de panneau
+GenericName[gl]=Xestor de paneis
+GenericName[he]=מנהל הלוח
+GenericName[hu]=Panelkezelő
+GenericName[id]=Manajer Panel
+GenericName[it]=Gestore dei pannelli
+GenericName[ja]=パネルマネージャ
+GenericName[kk]=Панель менеджері
+GenericName[ko]=패널 관리자
+GenericName[ku]=Gerinendeyê panelan
+GenericName[lv]=Paneļu pārvaldnieks
+GenericName[mk]=Менаџер за панели
+GenericName[nb]=Panelbehandler
+GenericName[nl]=Paneel Manager
+GenericName[nn]=Panelhandsamar
+GenericName[pa]=ਪੈਨਲ ਮੈਨੇਜਰ
+GenericName[pl]=Ustawienia panelu
+GenericName[pt]=Gestor do Painel
+GenericName[pt_BR]=Gerenciador do painel
+GenericName[ro]=Manager de panouri
+GenericName[ru]=Настройки панелей
+GenericName[si]=පුවරු කළමණාකරු
+GenericName[sk]=Nastavenie panelu
+GenericName[sq]=Përgjegjës Panelesh
+GenericName[sv]=Panelhanterare
+GenericName[ta]=பலகை மேளாலர்:
+GenericName[tr]=Panel Yöneticisi
+GenericName[ug]=Panel باشقۇرغۇ
+GenericName[uk]=Настройки панелi
+GenericName[ur]=پینل منیجر
+GenericName[ur_PK]=پینل منیجر
+GenericName[vi]=Quản lý panel
+GenericName[zh_CN]=面板管理器
+GenericName[zh_TW]=面板管理程式
+
+Comment=Tool to configure the tint2 panel
+Comment[ru]=Инструмент конфигурирования панели tint2
+
 Exec=tint2conf
 Icon=tint2conf
 Terminal=false
 Categories=Settings;DesktopSettings;
-

src/tooltip/tooltip.c

@@ -28,26 +28,27 @@
 #include "timer.h"
 
 static int x, y, width, height;
-static int just_shown;
+static gboolean just_shown;
 
 // the next functions are helper functions for tooltip handling
 void start_show_timeout();
 void start_hide_timeout();
 void stop_tooltip_timeout();
 
-Tooltip g_tooltip;
+void tooltip_init_fonts();
 
+Tooltip g_tooltip;
 
 void default_tooltip()
 {
 	// give the tooltip some reasonable default values
 	memset(&g_tooltip, 0, sizeof(Tooltip));
 
-	g_tooltip.font_color.color[0] = 1;
-	g_tooltip.font_color.color[1] = 1;
-	g_tooltip.font_color.color[2] = 1;
+	g_tooltip.font_color.rgb[0] = 1;
+	g_tooltip.font_color.rgb[1] = 1;
+	g_tooltip.font_color.rgb[2] = 1;
 	g_tooltip.font_color.alpha = 1;
-	just_shown = 0;
+	just_shown = FALSE;
 }
 
 void cleanup_tooltip()
@@ -56,19 +57,17 @@ void cleanup_tooltip()
 	tooltip_hide(NULL);
 	tooltip_copy_text(NULL);
 	if (g_tooltip.window)
-		XDestroyWindow(server.dsp, g_tooltip.window);
+		XDestroyWindow(server.display, g_tooltip.window);
 	g_tooltip.window = 0;
 	pango_font_description_free(g_tooltip.font_desc);
 	g_tooltip.font_desc = NULL;
 }
 
-
 void init_tooltip()
 {
-	if (!g_tooltip.font_desc)
-		g_tooltip.font_desc = pango_font_description_from_string(DEFAULT_FONT);
-	if (g_tooltip.bg == 0)
+	if (!g_tooltip.bg)
 		g_tooltip.bg = &g_array_index(backgrounds, Background, 0);
+	tooltip_init_fonts();
 
 	XSetWindowAttributes attr;
 	attr.override_redirect = True;
@@ -76,66 +75,96 @@ void init_tooltip()
 	attr.colormap = server.colormap;
 	attr.background_pixel = 0;
 	attr.border_pixel = 0;
-	unsigned long mask = CWEventMask|CWColormap|CWBorderPixel|CWBackPixel|CWOverrideRedirect;
+	unsigned long mask = CWEventMask | CWColormap | CWBorderPixel | CWBackPixel | CWOverrideRedirect;
 	if (g_tooltip.window)
-		XDestroyWindow(server.dsp, g_tooltip.window);
-	g_tooltip.window = XCreateWindow(server.dsp, server.root_win, 0, 0, 100, 20, 0, server.depth, InputOutput, server.visual, mask, &attr);
+		XDestroyWindow(server.display, g_tooltip.window);
+	g_tooltip.window = XCreateWindow(server.display,
+	                                 server.root_win,
+	                                 0,
+	                                 0,
+	                                 100,
+	                                 20,
+	                                 0,
+	                                 server.depth,
+	                                 InputOutput,
+	                                 server.visual,
+	                                 mask,
+	                                 &attr);
 }
 
+void tooltip_init_fonts()
+{
+	if (!g_tooltip.font_desc)
+		g_tooltip.font_desc = pango_font_description_from_string(get_default_font());
+}
 
-void tooltip_trigger_show(Area* area, Panel* p, XEvent *e)
+void tooltip_default_font_changed()
+{
+	if (g_tooltip.has_font)
+		return;
+	if (!g_tooltip.has_font) {
+		pango_font_description_free(g_tooltip.font_desc);
+		g_tooltip.font_desc = NULL;
+	}
+	tooltip_init_fonts();
+	tooltip_update();
+}
+
+void tooltip_trigger_show(Area *area, Panel *p, XEvent *e)
 {
 	// Position the tooltip in the center of the area
 	x = area->posx + MIN(area->width / 3, 22) + e->xmotion.x_root - e->xmotion.x;
 	y = area->posy + area->height / 2 + e->xmotion.y_root - e->xmotion.y;
-	just_shown = 1;
+	just_shown = TRUE;
 	g_tooltip.panel = p;
 	if (g_tooltip.mapped && g_tooltip.area != area) {
 		tooltip_copy_text(area);
 		tooltip_update();
 		stop_tooltip_timeout();
-	}
-	else if (!g_tooltip.mapped) {
+	} else if (!g_tooltip.mapped) {
 		start_show_timeout();
 	}
 }
 
-
-void tooltip_show(void* arg)
+void tooltip_show(void *arg)
 {
 	int mx, my;
 	Window w;
-	XTranslateCoordinates( server.dsp, server.root_win, g_tooltip.panel->main_win, x, y, &mx, &my, &w);
-	Area* area;
-	area = click_area(g_tooltip.panel, mx, my);
+	XTranslateCoordinates(server.display, server.root_win, g_tooltip.panel->main_win, x, y, &mx, &my, &w);
+	Area *area = find_area_under_mouse(g_tooltip.panel, mx, my);
 	if (!g_tooltip.mapped && area->_get_tooltip_text) {
 		tooltip_copy_text(area);
 		g_tooltip.mapped = True;
-		XMapWindow(server.dsp, g_tooltip.window);
+		XMapWindow(server.display, g_tooltip.window);
 		tooltip_update();
-		XFlush(server.dsp);
+		XFlush(server.display);
 	}
 }
 
-
 void tooltip_update_geometry()
 {
-	cairo_surface_t *cs;
-	cairo_t *c;
-	PangoLayout* layout;
-	cs = cairo_xlib_surface_create(server.dsp, g_tooltip.window, server.visual, width, height);
-	c = cairo_create(cs);
-	layout = pango_cairo_create_layout(c);
-	pango_layout_set_font_description(layout, g_tooltip.font_desc);
-	pango_layout_set_text(layout, g_tooltip.tooltip_text, -1);
-	PangoRectangle r1, r2;
-	pango_layout_get_pixel_extents(layout, &r1, &r2);
-	width = 2*g_tooltip.bg->border.width + 2*g_tooltip.paddingx + r2.width;
-	height = 2*g_tooltip.bg->border.width + 2*g_tooltip.paddingy + r2.height;
+	Panel *panel = g_tooltip.panel;
+	int screen_width = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width;
+
+	cairo_surface_t *cs = cairo_xlib_surface_create(server.display, g_tooltip.window, server.visual, width, height);
+	cairo_t *c = cairo_create(cs);
+	PangoLayout *layout = pango_cairo_create_layout(c);
+
+	pango_layout_set_font_description(layout, g_tooltip.font_desc);
+	PangoRectangle r1, r2;
+	pango_layout_set_text(layout, "1234567890", -1);
+	pango_layout_get_pixel_extents(layout, &r1, &r2);
+	int max_width = MIN(r2.width * 7, screen_width * 2 / 3);
+	pango_layout_set_width(layout, max_width * PANGO_SCALE);
+
+	pango_layout_set_text(layout, g_tooltip.tooltip_text, -1);
+	pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
+	pango_layout_get_pixel_extents(layout, &r1, &r2);
+	width = 2 * g_tooltip.bg->border.width + 2 * g_tooltip.paddingx + r2.width;
+	height = 2 * g_tooltip.bg->border.width + 2 * g_tooltip.paddingy + r2.height;
 
-	Panel* panel = g_tooltip.panel;
 	if (panel_horizontal && panel_position & BOTTOM)
-		y = panel->posy-height;
+		y = panel->posy - height;
 	else if (panel_horizontal && panel_position & TOP)
 		y = panel->posy + panel->area.height;
 	else if (panel_position & LEFT)
@@ -148,51 +177,50 @@ void tooltip_update_geometry()
 	cairo_surface_destroy(cs);
 }
 
-
 void tooltip_adjust_geometry()
 {
 	// adjust coordinates and size to not go offscreen
 	// it seems quite impossible that the height needs to be adjusted, but we do it anyway.
 
+	Panel *panel = g_tooltip.panel;
+	int screen_width = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width;
+	int screen_height = server.monitors[panel->monitor].y + server.monitors[panel->monitor].height;
+	if (x + width <= screen_width && y + height <= screen_height && x >= server.monitors[panel->monitor].x &&
+		y >= server.monitors[panel->monitor].y)
+		return; // no adjustment needed
+
 	int min_x, min_y, max_width, max_height;
-	Panel* panel = g_tooltip.panel;
-	int screen_width = server.monitor[panel->monitor].x + server.monitor[panel->monitor].width;
-	int screen_height = server.monitor[panel->monitor].y + server.monitor[panel->monitor].height;
-	if ( x+width <= screen_width && y+height <= screen_height && x>=server.monitor[panel->monitor].x && y>=server.monitor[panel->monitor].y )
-		return;    // no adjustment needed
-
 	if (panel_horizontal) {
-		min_x=0;
-		max_width=server.monitor[panel->monitor].width;
-		max_height=server.monitor[panel->monitor].height-panel->area.height;
+		min_x = 0;
+		max_width = server.monitors[panel->monitor].width;
+		max_height = server.monitors[panel->monitor].height - panel->area.height;
 		if (panel_position & BOTTOM)
-			min_y=0;
+			min_y = 0;
 		else
-			min_y=panel->area.height;
-	}
-	else {
-		max_width=server.monitor[panel->monitor].width-panel->area.width;
-		min_y=0;
-		max_height=server.monitor[panel->monitor].height;
+			min_y = panel->area.height;
+	} else {
+		max_width = server.monitors[panel->monitor].width - panel->area.width;
+		min_y = 0;
+		max_height = server.monitors[panel->monitor].height;
 		if (panel_position & LEFT)
-			min_x=panel->area.width;
+			min_x = panel->area.width;
 		else
-			min_x=0;
+			min_x = 0;
 	}
 
-	if (x+width > server.monitor[panel->monitor].x + server.monitor[panel->monitor].width)
-		x = server.monitor[panel->monitor].x + server.monitor[panel->monitor].width - width;
-	if ( y+height > server.monitor[panel->monitor].y + server.monitor[panel->monitor].height)
-		y = server.monitor[panel->monitor].y + server.monitor[panel->monitor].height - height;
+	if (x + width > server.monitors[panel->monitor].x + server.monitors[panel->monitor].width)
+		x = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width - width;
+	if (y + height > server.monitors[panel->monitor].y + server.monitors[panel->monitor].height)
+		y = server.monitors[panel->monitor].y + server.monitors[panel->monitor].height - height;
 
-	if (x<min_x)
-		x=min_x;
-	if (width>max_width)
+	if (x < min_x)
+		x = min_x;
+	if (width > max_width)
 		width = max_width;
-	if (y<min_y)
-		y=min_y;
-	if (height>max_height)
-		height=max_height;
+	if (y < min_y)
+		y = min_y;
+	if (height > max_height)
+		height = max_height;
 }
 
 void tooltip_update()
@@ -205,106 +233,97 @@ void tooltip_update()
 	tooltip_update_geometry();
 	if (just_shown) {
 		if (!panel_horizontal)
-			y -= height/2; // center vertically
-		just_shown = 0;
+			y -= height / 2; // center vertically
+		just_shown = FALSE;
 	}
 	tooltip_adjust_geometry();
-	XMoveResizeWindow(server.dsp, g_tooltip.window, x, y, width, height);
+	XMoveResizeWindow(server.display, g_tooltip.window, x, y, width, height);
 
 	// Stuff for drawing the tooltip
-	cairo_surface_t *cs;
-	cairo_t *c;
-	PangoLayout* layout;
-	cs = cairo_xlib_surface_create(server.dsp, g_tooltip.window, server.visual, width, height);
-	c = cairo_create(cs);
-	Color bc = g_tooltip.bg->back;
+	cairo_surface_t *cs = cairo_xlib_surface_create(server.display, g_tooltip.window, server.visual, width, height);
+	cairo_t *c = cairo_create(cs);
+	Color bc = g_tooltip.bg->fill_color;
 	Border b = g_tooltip.bg->border;
 	if (server.real_transparency) {
 		clear_pixmap(g_tooltip.window, 0, 0, width, height);
-		draw_rect(c, b.width, b.width, width-2*b.width, height-2*b.width, b.rounded-b.width/1.571);
-		cairo_set_source_rgba(c, bc.color[0], bc.color[1], bc.color[2], bc.alpha);
-	}
-	else {
+		draw_rect(c, b.width, b.width, width - 2 * b.width, height - 2 * b.width, b.radius - b.width / 1.571);
+		cairo_set_source_rgba(c, bc.rgb[0], bc.rgb[1], bc.rgb[2], bc.alpha);
+	} else {
 		cairo_rectangle(c, 0., 0, width, height);
-		cairo_set_source_rgb(c, bc.color[0], bc.color[1], bc.color[2]);
+		cairo_set_source_rgb(c, bc.rgb[0], bc.rgb[1], bc.rgb[2]);
 	}
 	cairo_fill(c);
 	cairo_set_line_width(c, b.width);
 	if (server.real_transparency)
-		draw_rect(c, b.width/2.0, b.width/2.0, width - b.width, height - b.width, b.rounded);
+		draw_rect(c, b.width / 2.0, b.width / 2.0, width - b.width, height - b.width, b.radius);
 	else
-		cairo_rectangle(c, b.width/2.0, b.width/2.0, width-b.width, height-b.width);
-	cairo_set_source_rgba(c, b.color[0], b.color[1], b.color[2], b.alpha);
+		cairo_rectangle(c, b.width / 2.0, b.width / 2.0, width - b.width, height - b.width);
+	cairo_set_source_rgba(c, b.color.rgb[0], b.color.rgb[1], b.color.rgb[2], b.color.alpha);
 	cairo_stroke(c);
 
 	Color fc = g_tooltip.font_color;
-	cairo_set_source_rgba(c, fc.color[0], fc.color[1], fc.color[2], fc.alpha);
-	layout = pango_cairo_create_layout(c);
+	cairo_set_source_rgba(c, fc.rgb[0], fc.rgb[1], fc.rgb[2], fc.alpha);
+	PangoLayout *layout = pango_cairo_create_layout(c);
 	pango_layout_set_font_description(layout, g_tooltip.font_desc);
+	pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
 	pango_layout_set_text(layout, g_tooltip.tooltip_text, -1);
 	PangoRectangle r1, r2;
 	pango_layout_get_pixel_extents(layout, &r1, &r2);
-	pango_layout_set_width(layout, width*PANGO_SCALE);
-	pango_layout_set_height(layout, height*PANGO_SCALE);
+	pango_layout_set_width(layout, width * PANGO_SCALE);
+	pango_layout_set_height(layout, height * PANGO_SCALE);
 	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
-	// I do not know why this is the right way, but with the below cairo_move_to it seems to be centered (horiz. and vert.)
+	// I do not know why this is the right way, but with the below cairo_move_to it seems to be centered (horiz. and
+	// vert.)
 	cairo_move_to(c,
-				  -r1.x/2 + g_tooltip.bg->border.width + g_tooltip.paddingx,
-				  -r1.y/2 + 1 + g_tooltip.bg->border.width + g_tooltip.paddingy);
-	pango_cairo_show_layout (c, layout);
+				  -r1.x / 2 + g_tooltip.bg->border.width + g_tooltip.paddingx,
+				  -r1.y / 2 + 1 + g_tooltip.bg->border.width + g_tooltip.paddingy);
+	pango_cairo_show_layout(c, layout);
 
-	g_object_unref (layout);
-	cairo_destroy (c);
-	cairo_surface_destroy (cs);
+	g_object_unref(layout);
+	cairo_destroy(c);
+	cairo_surface_destroy(cs);
 }
 
-
-void tooltip_trigger_hide(Tooltip* tooltip)
+void tooltip_trigger_hide()
 {
 	if (g_tooltip.mapped) {
 		tooltip_copy_text(0);
 		start_hide_timeout();
-	}
-	else {
+	} else {
 		// tooltip not visible yet, but maybe a timeout is still pending
 		stop_tooltip_timeout();
 	}
 }
 
-
-void tooltip_hide(void* arg)
+void tooltip_hide(void *arg)
 {
 	if (g_tooltip.mapped) {
 		g_tooltip.mapped = False;
-		XUnmapWindow(server.dsp, g_tooltip.window);
-		XFlush(server.dsp);
+		XUnmapWindow(server.display, g_tooltip.window);
+		XFlush(server.display);
 	}
 }
 
-
 void start_show_timeout()
 {
 	change_timeout(&g_tooltip.timeout, g_tooltip.show_timeout_msec, 0, tooltip_show, 0);
 }
 
-
 void start_hide_timeout()
 {
 	change_timeout(&g_tooltip.timeout, g_tooltip.hide_timeout_msec, 0, tooltip_hide, 0);
 }
 
-
 void stop_tooltip_timeout()
 {
 	stop_timeout(g_tooltip.timeout);
 }
 
-
-void tooltip_copy_text(Area* area)
+void tooltip_copy_text(Area *area)
 {
 	free(g_tooltip.tooltip_text);
 	if (area && area->_get_tooltip_text)
-		g_tooltip.tooltip_text = strdup(area->_get_tooltip_text(area));
+		g_tooltip.tooltip_text = area->_get_tooltip_text(area);
 	else
 		g_tooltip.tooltip_text = NULL;
 	g_tooltip.area = area;

src/tooltip/tooltip.h

@@ -22,26 +22,25 @@
 #include "panel.h"
 #include "timer.h"
 
-
 typedef struct {
-	Area* area;    // never ever use the area attribut if you are not 100% sure that this area was not freed
-	char* tooltip_text;
-	Panel* panel;
+	Area *area; // never ever use the area attribut if you are not 100% sure that this area was not freed
+	char *tooltip_text;
+	Panel *panel;
 	Window window;
 	int show_timeout_msec;
 	int hide_timeout_msec;
 	Bool mapped;
 	int paddingx;
 	int paddingy;
-	PangoFontDescription* font_desc;
+	gboolean has_font;
+	PangoFontDescription *font_desc;
 	Color font_color;
-	Background* bg;
-	timeout* timeout;
+	Background *bg;
+	timeout *timeout;
 } Tooltip;
 
 extern Tooltip g_tooltip;
 
-
 // default global data
 void default_tooltip();
 
@@ -49,11 +48,12 @@ void default_tooltip();
 void cleanup_tooltip();
 
 void init_tooltip();
-void tooltip_trigger_show(Area* area, Panel* p, XEvent *e);
-void tooltip_show(void* /*arg*/);
+void tooltip_trigger_show(Area *area, Panel *p, XEvent *e);
+void tooltip_show(void * /*arg*/);
 void tooltip_update();
 void tooltip_trigger_hide();
-void tooltip_hide(void* /*arg*/);
-void tooltip_copy_text(Area* area);
+void tooltip_hide(void * /*arg*/);
+void tooltip_copy_text(Area *area);
+void tooltip_default_font_changed();
 
 #endif // TOOLTIP_H

src/util/area.c

@@ -29,142 +29,89 @@
 #include "area.h"
 #include "server.h"
 #include "panel.h"
+#include "common.h"
 
+Area *mouse_over_area = NULL;
 
-/************************************************************
- * !!! This design is experimental and not yet fully implemented !!!!!!!!!!!!!
- * 
- * DATA ORGANISATION :
- * Areas in tint2 are similar to widgets in a GUI. 
- * All graphical objects (panel, taskbar, task, systray, clock, ...) 'inherit' an abstract class 'Area'.
- * This class 'Area' manage the background, border, size, position and padding.
- * Area is at the begining of each object (&object == &area).
- * 
- * tint2 define one panel per monitor. And each panel have a tree of Area.
- * The root of the tree is Panel.Area. And task, clock, systray, taskbar,... are nodes.
- * 
- * The tree give the localisation of each object :
- * - tree's root is in the background while tree's leafe are foreground objects
- * - position of a node/Area depend on the layout : parent's position (posx, posy), size of previous brothers and parent's padding
- * - size of a node/Area depend on the content (SIZE_BY_CONTENT objects) or on the layout (SIZE_BY_LAYOUT objects) 
- * 
- * DRAWING AND LAYERING ENGINE :
- * Redrawing an object (like the clock) could come from an 'external event' (date change) 
- * or from a 'layering event' (position change).
- * The following 'drawing engine' take care of :
- * - posx/posy of all Area
- * - 'layering event' propagation between object
- * 1) browse tree SIZE_BY_CONTENT
- *  - resize SIZE_BY_CONTENT node : children are resized before parent
- * 	- if 'size' changed then 'resize = 1' on the parent
- * 2) browse tree SIZE_BY_LAYOUT and POSITION
- *  - resize SIZE_BY_LAYOUT node : parent is resized before children
- *  - calculate position (posx,posy) : parent is calculated before children
- * 	- if 'position' changed then 'redraw = 1'
- * 3) browse tree REDRAW
- *  - redraw needed objects : parent is drawn before children
- *
- * CONFIGURE PANEL'S LAYOUT :
- * 'panel_items' parameter (in config) define the list and the order of nodes in tree's panel.
- * 'panel_items = SC' define a panel with just Systray and Clock.
- * So the tree 'Panel.Area' will have 2 childs (Systray and Clock).
- *
- ************************************************************/
-
-void init_rendering(void *obj, int pos)
+void init_background(Background *bg)
 {
-	Area *a = (Area*)obj;
-	
-	// initialize fixed position/size
-	GList *l;
-	for (l = a->list; l ; l = l->next) {
-		Area *child = ((Area*)l->data);
+	memset(bg, 0, sizeof(Background));
+}
+
+void initialize_positions(void *obj, int offset)
+{
+	Area *a = (Area *)obj;
+	for (GList *l = a->children; l; l = l->next) {
+		Area *child = ((Area *)l->data);
 		if (panel_horizontal) {
-			child->posy = pos + a->bg->border.width + a->paddingy;
+			child->posy = offset + a->bg->border.width + a->paddingy;
 			child->height = a->height - (2 * (a->bg->border.width + a->paddingy));
 			if (child->_on_change_layout)
 				child->_on_change_layout(child);
-			init_rendering(child, child->posy);
-		}
-		else {
-			child->posx = pos + a->bg->border.width + a->paddingy;
+			initialize_positions(child, child->posy);
+		} else {
+			child->posx = offset + a->bg->border.width + a->paddingy;
 			child->width = a->width - (2 * (a->bg->border.width + a->paddingy));
 			if (child->_on_change_layout)
 				child->_on_change_layout(child);
-			init_rendering(child, child->posx);
+			initialize_positions(child, child->posx);
 		}
 	}
 }
 
-
-void rendering(void *obj)
+void relayout_fixed(Area *a)
 {
-	Panel *panel = (Panel*)obj;
-
-	size_by_content(&panel->area);
-	size_by_layout(&panel->area, 1);
-	
-	refresh(&panel->area);
-}
-
-
-void size_by_content (Area *a)
-{
-	// don't resize hiden objects
 	if (!a->on_screen)
 		return;
 
-	// children node are resized before its parent
+	// Children are resized before the parent
 	GList *l;
-	for (l = a->list; l ; l = l->next)
-		size_by_content(l->data);
-	
-	// calculate area's size
-	a->on_changed = 0;
-	if (a->resize && a->size_mode == SIZE_BY_CONTENT) {
-		a->resize = 0;
+	for (l = a->children; l; l = l->next)
+		relayout_fixed(l->data);
+
+	// Recalculate size
+	a->_changed = 0;
+	if (a->resize_needed && a->size_mode == LAYOUT_FIXED) {
+		a->resize_needed = 0;
 
 		if (a->_resize) {
 			if (a->_resize(a)) {
-				// 'size' changed => 'resize = 1' on the parent
-				((Area*)a->parent)->resize = 1;
-				a->on_changed = 1;
+				// The size hash changed => resize needed for the parent
+				if (a->parent)
+					((Area *)a->parent)->resize_needed = 1;
+				a->_changed = 1;
 			}
 		}
 	}
 }
 
-
-void size_by_layout (Area *a, int level)
+void relayout_dynamic(Area *a, int level)
 {
-	// don't resize hiden objects
 	if (!a->on_screen)
 		return;
 
-	// parent node is resized before its children
-	// calculate area's size
-	GList *l;
-	if (a->resize && a->size_mode == SIZE_BY_LAYOUT) {
-		a->resize = 0;
+	// Area is resized before its children
+	if (a->resize_needed && a->size_mode == LAYOUT_DYNAMIC) {
+		a->resize_needed = 0;
 
 		if (a->_resize) {
 			a->_resize(a);
-			// resize childs with SIZE_BY_LAYOUT
-			for (l = a->list; l ; l = l->next) {
-				Area *child = ((Area*)l->data);
-				if (child->size_mode == SIZE_BY_LAYOUT && child->list)
-					child->resize = 1;
+			// resize children with LAYOUT_DYNAMIC
+			for (GList *l = a->children; l; l = l->next) {
+				Area *child = ((Area *)l->data);
+				if (child->size_mode == LAYOUT_DYNAMIC && child->children)
+					child->resize_needed = 1;
 			}
 		}
 	}
 
-	// update position of children
-	if (a->list) {
+	// Layout children
+	if (a->children) {
 		if (a->alignment == ALIGN_LEFT) {
 			int pos = (panel_horizontal ? a->posx : a->posy) + a->bg->border.width + a->paddingxlr;
 
-			for (l = a->list; l ; l = l->next) {
-				Area *child = ((Area*)l->data);
+			for (GList *l = a->children; l; l = l->next) {
+				Area *child = ((Area *)l->data);
 				if (!child->on_screen)
 					continue;
 
@@ -172,25 +119,26 @@ void size_by_layout (Area *a, int level)
 					if (pos != child->posx) {
 						// pos changed => redraw
 						child->posx = pos;
-						child->on_changed = 1;
+						child->_changed = 1;
 					}
 				} else {
 					if (pos != child->posy) {
 						// pos changed => redraw
 						child->posy = pos;
-						child->on_changed = 1;
+						child->_changed = 1;
 					}
 				}
 
-				size_by_layout(child, level+1);
+				relayout_dynamic(child, level + 1);
 
 				pos += panel_horizontal ? child->width + a->paddingx : child->height + a->paddingx;
 			}
 		} else if (a->alignment == ALIGN_RIGHT) {
-			int pos = (panel_horizontal ? a->posx + a->width : a->posy + a->height) - a->bg->border.width - a->paddingxlr;
+			int pos =
+				(panel_horizontal ? a->posx + a->width : a->posy + a->height) - a->bg->border.width - a->paddingxlr;
 
-			for (l = g_list_last(a->list); l ; l = l->prev) {
-				Area *child = ((Area*)l->data);
+			for (GList *l = g_list_last(a->children); l; l = l->prev) {
+				Area *child = ((Area *)l->data);
 				if (!child->on_screen)
 					continue;
 
@@ -200,17 +148,17 @@ void size_by_layout (Area *a, int level)
 					if (pos != child->posx) {
 						// pos changed => redraw
 						child->posx = pos;
-						child->on_changed = 1;
+						child->_changed = 1;
 					}
 				} else {
 					if (pos != child->posy) {
 						// pos changed => redraw
 						child->posy = pos;
-						child->on_changed = 1;
+						child->_changed = 1;
 					}
 				}
 
-				size_by_layout(child, level+1);
+				relayout_dynamic(child, level + 1);
 
 				pos -= a->paddingx;
 			}
@@ -218,20 +166,20 @@ void size_by_layout (Area *a, int level)
 
 			int children_size = 0;
 
-			for (l = a->list; l ; l = l->next) {
-				Area *child = ((Area*)l->data);
+			for (GList *l = a->children; l; l = l->next) {
+				Area *child = ((Area *)l->data);
 				if (!child->on_screen)
 					continue;
 
 				children_size += panel_horizontal ? child->width : child->height;
-				children_size += (l == a->list) ? 0 : a->paddingx;
+				children_size += (l == a->children) ? 0 : a->paddingx;
 			}
 
 			int pos = (panel_horizontal ? a->posx : a->posy) + a->bg->border.width + a->paddingxlr;
 			pos += ((panel_horizontal ? a->width : a->height) - children_size) / 2;
 
-			for (l = a->list; l ; l = l->next) {
-				Area *child = ((Area*)l->data);
+			for (GList *l = a->children; l; l = l->next) {
+				Area *child = ((Area *)l->data);
 				if (!child->on_screen)
 					continue;
 
@@ -239,137 +187,138 @@ void size_by_layout (Area *a, int level)
 					if (pos != child->posx) {
 						// pos changed => redraw
 						child->posx = pos;
-						child->on_changed = 1;
+						child->_changed = 1;
 					}
 				} else {
 					if (pos != child->posy) {
 						// pos changed => redraw
 						child->posy = pos;
-						child->on_changed = 1;
+						child->_changed = 1;
 					}
 				}
 
-				size_by_layout(child, level+1);
+				relayout_dynamic(child, level + 1);
 
 				pos += panel_horizontal ? child->width + a->paddingx : child->height + a->paddingx;
 			}
 		}
 	}
 
-	if (a->on_changed) {
+	if (a->_changed) {
 		// pos/size changed
-		a->redraw = 1;
+		a->_redraw_needed = TRUE;
 		if (a->_on_change_layout)
-			a->_on_change_layout (a);
+			a->_on_change_layout(a);
 	}
 }
 
-
-void refresh (Area *a)
+void relayout(Area *a)
 {
-	// don't draw and resize hide objects
-	if (!a->on_screen) return;
+	relayout_fixed(a);
+	relayout_dynamic(a, 1);
+}
 
-	// don't draw transparent objects (without foreground and without background)
-	if (a->redraw) {
-		a->redraw = 0;
-		// force redraw of child
-		//GList *l;
-		//for (l = a->list ; l ; l = l->next)
-			//((Area*)l->data)->redraw = 1;
+void draw_tree(Area *a)
+{
+	if (!a->on_screen)
+		return;
 
-		//printf("draw area posx %d, width %d\n", a->posx, a->width);
+	if (a->_redraw_needed) {
+		a->_redraw_needed = 0;
 		draw(a);
 	}
 
-	// draw current Area
-	if (a->pix == 0) printf("empty area posx %d, width %d\n", a->posx, a->width);
-	XCopyArea (server.dsp, a->pix, ((Panel *)a->panel)->temp_pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
+	if (a->pix)
+		XCopyArea(server.display,
+				  a->pix,
+				  ((Panel *)a->panel)->temp_pmap,
+				  server.gc,
+				  0,
+				  0,
+				  a->width,
+				  a->height,
+				  a->posx,
+				  a->posy);
 
-	// and then refresh child object
-	GList *l;
-	for (l = a->list; l ; l = l->next)
-		refresh(l->data);
+	for (GList *l = a->children; l; l = l->next)
+		draw_tree((Area *)l->data);
 }
 
-
-int resize_by_layout(void *obj, int maximum_size)
+int relayout_with_constraint(Area *a, int maximum_size)
 {
-	Area *child, *a = (Area*)obj;
-	int size, nb_by_content=0, nb_by_layout=0;
+	int fixed_children_count = 0;
+	int dynamic_children_count = 0;
 
-	if (panel_horizontal) {		
-		// detect free size for SIZE_BY_LAYOUT's Area
-		size = a->width - (2 * (a->paddingxlr + a->bg->border.width));
-		GList *l;
-		for (l = a->list ; l ; l = l->next) {
-			child = (Area*)l->data;
-			if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
+	if (panel_horizontal) {
+		// detect free size for LAYOUT_DYNAMIC Areas
+		int size = a->width - (2 * (a->paddingxlr + a->bg->border.width));
+		for (GList *l = a->children; l; l = l->next) {
+			Area *child = (Area *)l->data;
+			if (child->on_screen && child->size_mode == LAYOUT_FIXED) {
 				size -= child->width;
-				nb_by_content++;
+				fixed_children_count++;
 			}
-			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT)
-				nb_by_layout++;
+			if (child->on_screen && child->size_mode == LAYOUT_DYNAMIC)
+				dynamic_children_count++;
 		}
-		//printf("  resize_by_layout Deb %d, %d\n", nb_by_content, nb_by_layout);
-		if (nb_by_content+nb_by_layout)
-			size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);
+		if (fixed_children_count + dynamic_children_count > 0)
+			size -= (fixed_children_count + dynamic_children_count - 1) * a->paddingx;
 
-		int width=0, modulo=0, old_width;
-		if (nb_by_layout) {
-			width = size / nb_by_layout;
-			modulo = size % nb_by_layout;
-			if (width > maximum_size && maximum_size != 0) {
+		int width = 0;
+		int modulo = 0;
+		if (dynamic_children_count > 0) {
+			width = size / dynamic_children_count;
+			modulo = size % dynamic_children_count;
+			if (width > maximum_size && maximum_size > 0) {
 				width = maximum_size;
 				modulo = 0;
 			}
 		}
 
-		// resize SIZE_BY_LAYOUT objects
-		for (l = a->list ; l ; l = l->next) {
-			child = (Area*)l->data;
-			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
-				old_width = child->width;
+		// Resize LAYOUT_DYNAMIC objects
+		for (GList *l = a->children; l; l = l->next) {
+			Area *child = (Area *)l->data;
+			if (child->on_screen && child->size_mode == LAYOUT_DYNAMIC) {
+				int old_width = child->width;
 				child->width = width;
 				if (modulo) {
 					child->width++;
 					modulo--;
 				}
 				if (child->width != old_width)
-					child->on_changed = 1;
+					child->_changed = 1;
 			}
 		}
-	}
-	else {
-		// detect free size for SIZE_BY_LAYOUT's Area
-		size = a->height - (2 * (a->paddingxlr + a->bg->border.width));
-		GList *l;
-		for (l = a->list ; l ; l = l->next) {
-			child = (Area*)l->data;
-			if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
+	} else {
+		// detect free size for LAYOUT_DYNAMIC's Area
+		int size = a->height - (2 * (a->paddingxlr + a->bg->border.width));
+		for (GList *l = a->children; l; l = l->next) {
+			Area *child = (Area *)l->data;
+			if (child->on_screen && child->size_mode == LAYOUT_FIXED) {
 				size -= child->height;
-				nb_by_content++;
+				fixed_children_count++;
 			}
-			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT)
-				nb_by_layout++;
+			if (child->on_screen && child->size_mode == LAYOUT_DYNAMIC)
+				dynamic_children_count++;
 		}
-		if (nb_by_content+nb_by_layout)
-			size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);
+		if (fixed_children_count + dynamic_children_count > 0)
+			size -= (fixed_children_count + dynamic_children_count - 1) * a->paddingx;
 
-		int height=0, modulo=0;
-		if (nb_by_layout) {
-			height = size / nb_by_layout;
-			modulo = size % nb_by_layout;
+		int height = 0;
+		int modulo = 0;
+		if (dynamic_children_count) {
+			height = size / dynamic_children_count;
+			modulo = size % dynamic_children_count;
 			if (height > maximum_size && maximum_size != 0) {
 				height = maximum_size;
 				modulo = 0;
 			}
 		}
 
-		// resize SIZE_BY_LAYOUT objects
-		for (l = a->list ; l ; l = l->next) {
-			child = (Area*)l->data;
-			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
+		// Resize LAYOUT_DYNAMIC objects
+		for (GList *l = a->children; l; l = l->next) {
+			Area *child = (Area *)l->data;
+			if (child->on_screen && child->size_mode == LAYOUT_DYNAMIC) {
 				int old_height = child->height;
 				child->height = height;
 				if (modulo) {
@@ -377,29 +326,42 @@ int resize_by_layout(void *obj, int maximum_size)
 					modulo--;
 				}
 				if (child->height != old_height)
-					child->on_changed = 1;
+					child->_changed = 1;
 			}
 		}
 	}
 	return 0;
 }
 
-
-void set_redraw (Area *a)
+void schedule_redraw(Area *a)
 {
-	a->redraw = 1;
+	a->_redraw_needed = TRUE;
 
-	GList *l;
-	for (l = a->list ; l ; l = l->next)
-		set_redraw(l->data);
+	if (a->has_mouse_over_effect) {
+		for (int i = 0; i < MOUSE_STATE_COUNT; i++) {
+			XFreePixmap(server.display, a->pix_by_state[i]);
+			if (a->pix == a->pix_by_state[i])
+				a->pix = None;
+			a->pix_by_state[i] = None;
+		}
+		if (a->pix) {
+			XFreePixmap(server.display, a->pix);
+			a->pix = None;
+		}
+	}
+
+	for (GList *l = a->children; l; l = l->next)
+		schedule_redraw((Area *)l->data);
+	panel_refresh = TRUE;
 }
 
 void hide(Area *a)
 {
-	Area *parent = (Area*)a->parent;
+	Area *parent = (Area *)a->parent;
 
-	a->on_screen = 0;
-	parent->resize = 1;
+	a->on_screen = FALSE;
+	if (parent)
+		parent->resize_needed = 1;
 	if (panel_horizontal)
 		a->width = 0;
 	else
@@ -408,161 +370,320 @@ void hide(Area *a)
 
 void show(Area *a)
 {
-	Area *parent = (Area*)a->parent;
+	Area *parent = (Area *)a->parent;
 
-	a->on_screen = 1;
-	parent->resize = 1;
-	a->resize = 1;
+	a->on_screen = TRUE;
+	if (parent)
+		parent->resize_needed = 1;
+	a->resize_needed = 1;
 }
 
-void draw (Area *a)
+void draw(Area *a)
 {
-	if (a->pix) XFreePixmap (server.dsp, a->pix);
-	a->pix = XCreatePixmap (server.dsp, server.root_win, a->width, a->height, server.depth);
+	if (a->pix) {
+		XFreePixmap(server.display, a->pix);
+		if (a->pix_by_state[a->has_mouse_over_effect ? a->mouse_state : 0] != a->pix)
+			XFreePixmap(server.display, a->pix_by_state[a->has_mouse_over_effect ? a->mouse_state : 0]);
+	}
+	a->pix = XCreatePixmap(server.display, server.root_win, a->width, a->height, server.depth);
+	a->pix_by_state[a->has_mouse_over_effect ? a->mouse_state : 0] = a->pix;
 
-	// add layer of root pixmap (or clear pixmap if real_transparency==true)
-	if (server.real_transparency)
-		clear_pixmap(a->pix, 0 ,0, a->width, a->height);
-	XCopyArea (server.dsp, ((Panel *)a->panel)->temp_pmap, a->pix, server.gc, a->posx, a->posy, a->width, a->height, 0, 0);
+	if (!a->_clear) {
+		// Add layer of root pixmap (or clear pixmap if real_transparency==true)
+		if (server.real_transparency)
+			clear_pixmap(a->pix, 0, 0, a->width, a->height);
+		XCopyArea(server.display,
+				  ((Panel *)a->panel)->temp_pmap,
+				  a->pix,
+				  server.gc,
+				  a->posx,
+				  a->posy,
+				  a->width,
+				  a->height,
+				  0,
+				  0);
+	} else {
+		a->_clear(a);
+	}
 
-	cairo_surface_t *cs;
-	cairo_t *c;
+	cairo_surface_t *cs = cairo_xlib_surface_create(server.display, a->pix, server.visual, a->width, a->height);
+	cairo_t *c = cairo_create(cs);
 
-	cs = cairo_xlib_surface_create (server.dsp, a->pix, server.visual, a->width, a->height);
-	c = cairo_create (cs);
-
-	draw_background (a, c);
+	draw_background(a, c);
 
 	if (a->_draw_foreground)
 		a->_draw_foreground(a, c);
 
-	cairo_destroy (c);
-	cairo_surface_destroy (cs);
+	cairo_destroy(c);
+	cairo_surface_destroy(cs);
 }
 
-
-void draw_background (Area *a, cairo_t *c)
+void draw_background(Area *a, cairo_t *c)
 {
-	if (a->bg->back.alpha > 0.0) {
-		//printf("    draw_background (%d %d) RGBA (%lf, %lf, %lf, %lf)\n", a->posx, a->posy, pix->back.color[0], pix->back.color[1], pix->back.color[2], pix->back.alpha);
-		draw_rect(c, a->bg->border.width, a->bg->border.width, a->width-(2.0 * a->bg->border.width), a->height-(2.0*a->bg->border.width), a->bg->border.rounded - a->bg->border.width/1.571);
-		cairo_set_source_rgba(c, a->bg->back.color[0], a->bg->back.color[1], a->bg->back.color[2], a->bg->back.alpha);
+	if (a->bg->fill_color.alpha > 0.0 ||
+		(panel_config.mouse_effects && (a->has_mouse_over_effect || a->has_mouse_press_effect))) {
+		if (a->mouse_state == MOUSE_OVER)
+			cairo_set_source_rgba(c,
+								  a->bg->fill_color_hover.rgb[0],
+								  a->bg->fill_color_hover.rgb[1],
+								  a->bg->fill_color_hover.rgb[2],
+								  a->bg->fill_color_hover.alpha);
+		else if (a->mouse_state == MOUSE_DOWN)
+			cairo_set_source_rgba(c,
+								  a->bg->fill_color_pressed.rgb[0],
+								  a->bg->fill_color_pressed.rgb[1],
+								  a->bg->fill_color_pressed.rgb[2],
+								  a->bg->fill_color_pressed.alpha);
+		else
+			cairo_set_source_rgba(c,
+								  a->bg->fill_color.rgb[0],
+								  a->bg->fill_color.rgb[1],
+								  a->bg->fill_color.rgb[2],
+								  a->bg->fill_color.alpha);
+		draw_rect(c,
+				  a->bg->border.width,
+				  a->bg->border.width,
+				  a->width - (2.0 * a->bg->border.width),
+				  a->height - (2.0 * a->bg->border.width),
+				  a->bg->border.radius - a->bg->border.width / 1.571);
 		cairo_fill(c);
 	}
 
-	if (a->bg->border.width > 0 && a->bg->border.alpha > 0.0) {
-		cairo_set_line_width (c, a->bg->border.width);
+	if (a->bg->border.width > 0) {
+		cairo_set_line_width(c, a->bg->border.width);
 
 		// draw border inside (x, y, width, height)
-		draw_rect(c, a->bg->border.width/2.0, a->bg->border.width/2.0, a->width - a->bg->border.width, a->height - a->bg->border.width, a->bg->border.rounded);
-		/*
-		// convert : radian = degre * M_PI/180
-		// definir le degrade dans un carre de (0,0) (100,100)
-		// ensuite ce degrade est extrapoler selon le ratio width/height
-		// dans repere (0, 0) (100, 100)
-		double X0, Y0, X1, Y1, degre;
-		// x = X * (a->width / 100), y = Y * (a->height / 100)
-		double x0, y0, x1, y1;
-		X0 = 0;
-		Y0 = 100;
-		X1 = 100;
-		Y1 = 0;
-		degre = 45;
-		// et ensuite faire la changement d'unite du repere
-		// car ce qui doit reste inchangee est les traits et pas la direction
+		if (a->mouse_state == MOUSE_OVER)
+			cairo_set_source_rgba(c,
+								  a->bg->border_color_hover.rgb[0],
+								  a->bg->border_color_hover.rgb[1],
+								  a->bg->border_color_hover.rgb[2],
+								  a->bg->border_color_hover.alpha);
+		else if (a->mouse_state == MOUSE_DOWN)
+			cairo_set_source_rgba(c,
+								  a->bg->border_color_pressed.rgb[0],
+								  a->bg->border_color_pressed.rgb[1],
+								  a->bg->border_color_pressed.rgb[2],
+								  a->bg->border_color_pressed.alpha);
+		else
+			cairo_set_source_rgba(c,
+								  a->bg->border.color.rgb[0],
+								  a->bg->border.color.rgb[1],
+								  a->bg->border.color.rgb[2],
+								  a->bg->border.color.alpha);
+		draw_rect(c,
+				  a->bg->border.width / 2.0,
+				  a->bg->border.width / 2.0,
+				  a->width - a->bg->border.width,
+				  a->height - a->bg->border.width,
+				  a->bg->border.radius);
 
-		// il faut d'abord appliquer une rotation de 90 (et -180 si l'angle est superieur a  180)
-		// ceci peut etre applique une fois pour toute au depart
-		// ensuite calculer l'angle dans le nouveau repare
-		// puis faire une rotation de 90
-		x0 = X0 * ((double)a->width / 100);
-		x1 = X1 * ((double)a->width / 100);
-		y0 = Y0 * ((double)a->height / 100);
-		y1 = Y1 * ((double)a->height / 100);
-
-		x0 = X0 * ((double)a->height / 100);
-		x1 = X1 * ((double)a->height / 100);
-		y0 = Y0 * ((double)a->width / 100);
-		y1 = Y1 * ((double)a->width / 100);
-
-		cairo_pattern_t *linpat;
-		linpat = cairo_pattern_create_linear (x0, y0, x1, y1);
-		cairo_pattern_add_color_stop_rgba (linpat, 0, a->border.color[0], a->border.color[1], a->border.color[2], a->border.alpha);
-		cairo_pattern_add_color_stop_rgba (linpat, 1, a->border.color[0], a->border.color[1], a->border.color[2], 0);
-		cairo_set_source (c, linpat);
-		*/
-		cairo_set_source_rgba (c, a->bg->border.color[0], a->bg->border.color[1], a->bg->border.color[2], a->bg->border.alpha);
-
-		cairo_stroke (c);
-		//cairo_pattern_destroy (linpat);
+		cairo_stroke(c);
 	}
 }
 
-
-void remove_area (Area *a)
+void remove_area(Area *a)
 {
-	Area *parent = (Area*)a->parent;
+	Area *area = (Area *)a;
+	Area *parent = (Area *)area->parent;
 
-	parent->list = g_list_remove(parent->list, a);
-	set_redraw (parent);
+	if (parent) {
+		parent->children = g_list_remove(parent->children, area);
+		parent->resize_needed = TRUE;
+		panel_refresh = TRUE;
+		schedule_redraw(parent);
+	}
 
+	if (mouse_over_area == a) {
+		mouse_out();
+	}
 }
 
-
-void add_area (Area *a)
+void add_area(Area *a, Area *parent)
 {
-	Area *parent = (Area*)a->parent;
-
-	parent->list = g_list_append(parent->list, a);
-	set_redraw (parent);
+	g_assert_null(a->parent);
 
+	a->parent = parent;
+	if (parent) {
+		parent->children = g_list_append(parent->children, a);
+		parent->resize_needed = TRUE;
+		schedule_redraw(parent);
+		panel_refresh = TRUE;
+	}
 }
 
-
-void free_area (Area *a)
+void free_area(Area *a)
 {
 	if (!a)
 		return;
 
-	GList *l0;
-	for (l0 = a->list; l0 ; l0 = l0->next)
-		free_area (l0->data);
+	for (GList *l = a->children; l; l = l->next)
+		free_area(l->data);
 
-	if (a->list) {
-		g_list_free(a->list);
-		a->list = 0;
+	if (a->children) {
+		g_list_free(a->children);
+		a->children = NULL;
+	}
+	for (int i = 0; i < MOUSE_STATE_COUNT; i++) {
+		XFreePixmap(server.display, a->pix_by_state[i]);
+		if (a->pix == a->pix_by_state[i]) {
+			a->pix = None;
+		}
+		a->pix_by_state[i] = None;
 	}
 	if (a->pix) {
-		XFreePixmap (server.dsp, a->pix);
-		a->pix = 0;
+		XFreePixmap(server.display, a->pix);
+		a->pix = None;
+	}
+	if (mouse_over_area == a) {
+		mouse_over_area = NULL;
 	}
 }
 
-
-void draw_rect(cairo_t *c, double x, double y, double w, double h, double r)
+void mouse_over(Area *area, int pressed)
 {
-	if (r > 0.0) {
-		double c1 = 0.55228475 * r;
+	if (mouse_over_area == area && !area)
+		return;
 
-		cairo_move_to(c, x+r, y);
-		cairo_rel_line_to(c, w-2*r, 0);
-		cairo_rel_curve_to(c, c1, 0.0, r, c1, r, r);
-		cairo_rel_line_to(c, 0, h-2*r);
-		cairo_rel_curve_to(c, 0.0, c1, c1-r, r, -r, r);
-		cairo_rel_line_to (c, -w +2*r, 0);
-		cairo_rel_curve_to (c, -c1, 0, -r, -c1, -r, -r);
-		cairo_rel_line_to (c, 0, -h + 2 * r);
-		cairo_rel_curve_to (c, 0, -c1, r - c1, -r, r, -r);
+	MouseState new_state = MOUSE_NORMAL;
+	if (area) {
+		if (!pressed) {
+			new_state = area->has_mouse_over_effect ? MOUSE_OVER : MOUSE_NORMAL;
+		} else {
+			new_state =
+				area->has_mouse_press_effect ? MOUSE_DOWN : area->has_mouse_over_effect ? MOUSE_OVER : MOUSE_NORMAL;
+		}
 	}
+
+	if (mouse_over_area == area && mouse_over_area->mouse_state == new_state)
+		return;
+	mouse_out();
+	if (new_state == MOUSE_NORMAL)
+		return;
+	mouse_over_area = area;
+
+	mouse_over_area->mouse_state = new_state;
+	mouse_over_area->pix =
+		mouse_over_area->pix_by_state[mouse_over_area->has_mouse_over_effect ? mouse_over_area->mouse_state : 0];
+	if (!mouse_over_area->pix)
+		mouse_over_area->_redraw_needed = TRUE;
+	panel_refresh = TRUE;
+}
+
+void mouse_out()
+{
+	if (!mouse_over_area)
+		return;
+	mouse_over_area->mouse_state = MOUSE_NORMAL;
+	mouse_over_area->pix =
+		mouse_over_area->pix_by_state[mouse_over_area->has_mouse_over_effect ? mouse_over_area->mouse_state : 0];
+	if (!mouse_over_area->pix)
+		mouse_over_area->_redraw_needed = TRUE;
+	panel_refresh = TRUE;
+	mouse_over_area = NULL;
+}
+
+gboolean area_is_first(void *obj)
+{
+	Area *a = obj;
+	if (!a->on_screen)
+		return FALSE;
+
+	Panel *panel = a->panel;
+
+	Area *node = &panel->area;
+
+	while (node) {
+		if (!node->on_screen)
+			return FALSE;
+		if (node == a)
+			return TRUE;
+
+		GList *l = node->children;
+		node = NULL;
+		for (; l; l = l->next) {
+			Area *child = l->data;
+			if (!child->on_screen)
+				continue;
+			node = child;
+			break;
+		}
+	}
+
+	return FALSE;
+}
+
+gboolean area_is_last(void *obj)
+{
+	Area *a = obj;
+	if (!a->on_screen)
+		return FALSE;
+
+	Panel *panel = a->panel;
+
+	Area *node = &panel->area;
+
+	while (node) {
+		if (!node->on_screen)
+			return FALSE;
+		if (node == a)
+			return TRUE;
+
+		GList *l = node->children;
+		node = NULL;
+		for (; l; l = l->next) {
+			Area *child = l->data;
+			if (!child->on_screen)
+				continue;
+			node = child;
+		}
+	}
+
+	return FALSE;
+}
+
+gboolean area_is_under_mouse(void *obj, int x, int y)
+{
+	Area *a = obj;
+	if (!a->on_screen)
+		return FALSE;
+
+	if (a->_is_under_mouse)
+		return a->_is_under_mouse(a, x, y);
+
+	return x >= a->posx && x <= (a->posx + a->width) && y >= a->posy && y <= (a->posy + a->height);
+}
+
+gboolean full_width_area_is_under_mouse(void *obj, int x, int y)
+{
+	Area *a = obj;
+	if (!a->on_screen)
+		return FALSE;
+
+	if (a->_is_under_mouse && a->_is_under_mouse != full_width_area_is_under_mouse)
+		return a->_is_under_mouse(a, x, y);
+
+	if (panel_horizontal)
+		return (x >= a->posx || area_is_first(a)) && (x <= a->posx + a->width || area_is_last(a));
 	else
-		cairo_rectangle(c, x, y, w, h);
+		return (y >= a->posy || area_is_first(a)) && (y <= a->posy + a->height || area_is_last(a));
 }
 
-
-void clear_pixmap(Pixmap p, int x, int y, int w, int h)
+Area *find_area_under_mouse(void *root, int x, int y)
 {
-	Picture pict = XRenderCreatePicture(server.dsp, p, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
-	XRenderColor col = { .red=0, .green=0, .blue=0, .alpha=0 };
-	XRenderFillRectangle(server.dsp, PictOpSrc, pict, &col, x, y, w, h);
-	XRenderFreePicture(server.dsp, pict);
+	Area *result = root;
+	Area *new_result = result;
+	do {
+		result = new_result;
+		GList *it = result->children;
+		while (it) {
+			Area *a = (Area *)it->data;
+			if (area_is_under_mouse(a, x, y)) {
+				new_result = a;
+				break;
+			}
+			it = it->next;
+		}
+	} while (new_result != result);
+	return result;
 }

src/util/area.h

@@ -1,19 +1,6 @@
 /**************************************************************************
 * Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
 *
-* base class for all graphical objects (panel, taskbar, task, systray, clock, ...).
-* Area is at the begining of each object (&object == &area).
-*
-* Area manage the background and border drawing, size and padding.
-* Each Area has one Pixmap (pix).
-*
-* Area manage the tree of all objects. Parent object drawn before child object.
-*   panel -> taskbars -> tasks
-*         -> systray -> icons
-*         -> clock
-*
-* draw_foreground(obj) and resize(obj) are virtual function.
-*
 **************************************************************************/
 
 #ifndef AREA_H
@@ -24,107 +11,276 @@
 #include <cairo.h>
 #include <cairo-xlib.h>
 
+// DATA ORGANISATION
+//
+// Areas in tint2 are similar to widgets in a GUI.
+// All graphical objects (panel, taskbar, task, systray, clock, ...) inherit the abstract class Area.
+// This class 'Area' stores data about the background, border, size, position, padding and the child areas.
+// Inheritance is simulated by having an Area member as the first member of each object (thus &object == &area).
+//
+// tint2 uses multiple panels, one per monitor. Each panel has an area containing the children objects in a tree of
+// areas. The level in the tree gives the z-order: child areas are always displayed on top of their parents.
+//
+//
+// LAYOUT
+//
+// Sibling areas never overlap.
+//
+// The position of an Area (posx, posy) is relative to the window (i.e. absolute) and
+// is computed based on a simple box model:
+// * parent position + parent padding + sum of the sizes of the previous siblings and spacing
+//
+// The size of an Area is:
+// * SIZE_BY_CONTENT objects:
+//   * fixed and set by the Area
+//   * childred are resized before the parent
+//   * if a child size has changed then the parent is resized
+// * SIZE_BY_LAYOUT objects:
+//   * expandable and computed as the total size of the parent - padding -
+//     the size of the fixed sized siblings - spacing and divided by the number of expandable siblings
+//   * the parent is resized before the children
+//
+//
+// RENDERING
+//
+// Redrawing an object (like the clock) could come from an 'external event' (date change)
+// or from a 'layout event' (position change).
+//
+//
+// WIDGET LIFECYCLE
+//
+// Each widget that occurs once per panel is defined as a struct (e.g. Clock) which is stored as a member of Panel.
+// Widgets that can occur more than once should be stored as an array, still as a member of Panel.
+//
+// There is a special Panel instance called 'panel_config' which stores the config options and the state variables
+// of the widgets (however some config options are stored as global variables by the widgets).
+//
+// Tint2 maintains an array of Panel instances, one for each monitor. These contain the actual Areas that are used to
+// render the panels on screen, interact with user input etc.
+// Each Panel is initialized as a raw copy (memcpy, see init_panel()) of panel_config.
+//
+// Normally, widgets should implement the following functions:
+//
+// * void default_widget();
+//
+//   Called before the config is read and panel_config/panels are created.
+//   Afterwards, the config parsing code creates the widget/widget array in panel_config and
+//   populates the configuration fields.
+//   If the widget uses global variables to store config options or other state variables, they should be initialized
+//   here (e.g. with zero, NULL etc).
+//
+// * void init_widget();
+//
+//   Called after the config is read and panel_config is populated, but before panels are created.
+//   Initializes the state of the widget in panel_config.
+//   If the widget uses global variables to store config options or other state variables which depend on the config
+//   options but not on the panel instance, they should be initialized here.
+//   panel_config.panel_items can be used to determine which backend items are enabled.
+//
+// * void init_widget_panel(void *panel);
+//
+//   Called after each on-screen panel is created, with a pointer to the panel.
+//   Completes the initialization of the widget.
+//   At this point the widget Area has not been added yet to the GUI tree, but it will be added right afterwards.
+//
+// * void cleanup_widget();
+//
+//   Called just before the panels are destroyed. Afterwards, tint2 exits or restarts and reads the config again.
+//   Must releases all resources.
+//   The widget itself should not be freed by this function, only its members or global variables that were set.
+//   The widget is freed by the Area tree cleanup function (remove_area).
+//
+// * void draw_widget(void *obj, cairo_t *c);
+//
+//   Called on draw, obj = pointer to the widget instance from the panel that is redrawn.
+//   The Area's _draw_foreground member must point to this function.
+//
+// * int resize_widget(void *obj);
+//
+//   Called on resize, obj = pointer to the front-end Execp item.
+//   Returns 1 if the new size is different than the previous size.
+//   The Area's _resize member must point to this function.
+//
+// * void widget_action(void *obj, int button);
+//
+//   Called on mouse click event.
+//
+// * void widget_on_change_layout(void *obj);
+//
+//   Implemented only to override the default layout algorithm for this widget.
+//   For example, if this widget is a cell in a table, its position and size should be computed here.
+//   The Area's _on_change_layout member must point to this function.
+//
+// * char* widget_get_tooltip_text(void *obj);
+//
+//   Returns a copy of the tooltip to be displayed for this widget.
+//   The caller takes ownership of the pointer.
+//   The Area's _get_tooltip_text member must point to this function.
 
-typedef struct
-{
-	double color[3];
-	double alpha;
-	int width;
-	int rounded;
-} Border;
-
-
-typedef struct
-{
-	double color[3];
+typedef struct Color {
+	// Values are in [0, 1], with 0 meaning no intensity.
+	double rgb[3];
+	// Values are in [0, 1], with 0 meaning fully transparent, 1 meaning fully opaque.
 	double alpha;
 } Color;
 
-typedef struct
-{
-	Color back;
+typedef struct Border {
+	// It's essential that the first member is color
+	Color color;
+	// Width in pixels
+	int width;
+	// Corner radius
+	int radius;
+} Border;
+
+typedef struct Background {
+	// Normal state
+	Color fill_color;
 	Border border;
+	// On mouse hover
+	Color fill_color_hover;
+	Color border_color_hover;
+	// On mouse press
+	Color fill_color_pressed;
+	Color border_color_pressed;
 } Background;
 
+typedef enum Layout {
+	LAYOUT_DYNAMIC,
+	LAYOUT_FIXED,
+} Layout;
 
-// way to calculate the size
-// SIZE_BY_LAYOUT objects : taskbar and task
-// SIZE_BY_CONTENT objects : clock, battery, launcher, systray
-enum { SIZE_BY_LAYOUT, SIZE_BY_CONTENT };
-enum { ALIGN_LEFT = 0, ALIGN_CENTER = 1, ALIGN_RIGHT = 2 };
+typedef enum Alignment {
+	ALIGN_LEFT = 0,
+	ALIGN_CENTER = 1,
+	ALIGN_RIGHT = 2,
+} Alignment;
 
-typedef struct {
-	// coordinate relative to panel window
+typedef enum MouseState { MOUSE_NORMAL = 0, MOUSE_OVER = 1, MOUSE_DOWN = 2, MOUSE_STATE_COUNT } MouseState;
+
+struct Panel;
+
+typedef struct Area {
+	// Position relative to the panel window
 	int posx, posy;
-	// width and height including border
+	// Size, including borders
 	int width, height;
-	Pixmap pix;
 	Background *bg;
-
-	// list of child : Area object
-	GList *list;
-
-	// object visible on screen. 
-	// An object (like systray) could be enabled but hidden (because no tray icon).
-	int on_screen;
-	// way to calculate the size (SIZE_BY_CONTENT or SIZE_BY_LAYOUT)
-	int size_mode;
-
-	int alignment;
-	// need to calculate position and width
-	int resize;
-	// need redraw Pixmap
-	int redraw;
-	// paddingxlr = horizontal padding left/right
-	// paddingx = horizontal padding between childs
-	int paddingxlr, paddingx, paddingy;
-	// parent Area
+	// List of children, each one a pointer to Area
+	GList *children;
+	// Pointer to the parent Area or NULL
 	void *parent;
-	// panel
+	// Pointer to the Panel that contains this Area
 	void *panel;
+	Layout size_mode;
+	Alignment alignment;
+	gboolean has_mouse_over_effect;
+	gboolean has_mouse_press_effect;
+	// TODO padding/spacing is a clusterfuck
+	// paddingxlr = padding
+	// paddingy = vertical padding, sometimes
+	// paddingx = spacing
+	int paddingxlr, paddingx, paddingy;
+	MouseState mouse_state;
+	// Set to non-zero if the Area is visible. An object may exist but stay hidden.
+	gboolean on_screen;
+	// Set to non-zero if the size of the Area has to be recalculated.
+	gboolean resize_needed;
+	// Set to non-zero if the Area has to be redrawn.
+	// Do not set this directly; use schedule_redraw() instead.
+	gboolean _redraw_needed;
+	// Set to non-zero if the position/size has changed, thus _on_change_layout needs to be called
+	gboolean _changed;
+	// This is the pixmap on which the Area is rendered. Render to it directly if needed.
+	Pixmap pix;
+	Pixmap pix_by_state[MOUSE_STATE_COUNT];
 
-	// each object can overwrite following function
+	// Callbacks
+
+	// Called on draw before any drawing takes place, obj = pointer to the Area
+	void (*_clear)(void *obj);
+
+	// Called on draw, obj = pointer to the Area
 	void (*_draw_foreground)(void *obj, cairo_t *c);
-	// update area's content and update size (width/heith). 
-	// return '1' if size changed, '0' otherwise.
-	int (*_resize)(void *obj);
-	// after pos/size changed, the rendering engine will call _on_change_layout(Area*)
-	int on_changed;
+
+	// Called on resize, obj = pointer to the Area
+	// Returns 1 if the new size is different than the previous size.
+	gboolean (*_resize)(void *obj);
+
+	// Implemented only to override the default layout algorithm for this widget.
+	// For example, if this widget is a cell in a table, its position and size should be computed here.
 	void (*_on_change_layout)(void *obj);
-	const char* (*_get_tooltip_text)(void *obj);
+
+	// Returns a copy of the tooltip to be displayed for this widget.
+	// The caller takes ownership of the pointer.
+	char *(*_get_tooltip_text)(void *obj);
+
+	// Returns true if the Area handles a mouse event at the given x, y coordinates relative to the window.
+	// Leave this to NULL to use a default implementation.
+	gboolean (*_is_under_mouse)(void *obj, int x, int y);
 } Area;
 
-// on startup, initialize fixed pos/size
-void init_rendering(void *obj, int pos);
+// Initializes the Background member to default values.
+void init_background(Background *bg);
 
-void rendering(void *obj);
-void size_by_content (Area *a);
-void size_by_layout (Area *a, int level);
-// draw background and foreground
-void refresh (Area *a);
- 
-// generic resize for SIZE_BY_LAYOUT objects
-int resize_by_layout(void *obj, int maximum_size);
+// Layout
 
-// set 'redraw' on an area and childs
-void set_redraw (Area *a);
+// Called on startup to initialize the positions of all Areas in the Area tree.
+// Parameters:
+// * obj: pointer to Area
+// * offset: offset in pixels from left/top, relative to the window
+void initialize_positions(void *obj, int offset);
 
-// hide/unhide area
+// Relayouts the Area and its children. Normally called on the root of the tree (i.e. the Panel).
+void relayout(Area *a);
+
+// Distributes the Area's size to its children, repositioning them as needed.
+// If maximum_size > 0, it is an upper limit for the child size.
+int relayout_with_constraint(Area *a, int maximum_size);
+
+// Rendering
+
+// Sets the redraw_needed flag on the area and its descendants
+void schedule_redraw(Area *a);
+
+// Recreates the Area pixmap and draws the background and the foreground
+void draw(Area *a);
+
+// Draws the background of the Area
+void draw_background(Area *a, cairo_t *c);
+
+// Explores the entire Area subtree (only if the on_screen flag set)
+// and draws the areas with the redraw_needed flag set
+void draw_tree(Area *a);
+
+// Clears the on_screen flag, sets the size to zero and triggers a parent resize
 void hide(Area *a);
+
+// Sets the on_screen flag and triggers a parent and area resize
 void show(Area *a);
 
-// draw pixmap
-void draw (Area *a);
-void draw_background (Area *a, cairo_t *c);
+// Area tree
 
-void remove_area (Area *a);
-void add_area (Area *a);
-void free_area (Area *a);
+void add_area(Area *a, Area *parent);
+void remove_area(Area *a);
+void free_area(Area *a);
 
-// draw rounded rectangle
-void draw_rect(cairo_t *c, double x, double y, double w, double h, double r);
+// Mouse events
+
+// Returns the area under the mouse for the given x, y mouse coordinates relative to the window.
+// If no area is found, returns the root.
+Area *find_area_under_mouse(void *root, int x, int y);
+
+// Returns true if the Area handles a mouse event at the given x, y coordinates relative to the window.
+gboolean area_is_under_mouse(void *obj, int x, int y);
+
+// Returns true if the Area handles a mouse event at the given x, y coordinates relative to the window.
+// The Area will also handle clicks on the border of its ancestors, including the panel.
+// Useful so that a click at the edge of the screen is still handled by task buttons etc., even if technically
+// they are outside the drawing area of the button.
+gboolean full_width_area_is_under_mouse(void *obj, int x, int y);
+
+void mouse_over(Area *area, int pressed);
+void mouse_out();
 
-// clear pixmap with transparent color
-void clear_pixmap(Pixmap p, int x, int y, int w, int h);
 #endif
-

src/util/cache.c

@@ -0,0 +1,158 @@
+/**************************************************************************
+*
+* Tint2 : cache
+*
+* Copyright (C) 2016 @o9000
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License version 2
+* as published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**************************************************************************/
+
+#include "cache.h"
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "common.h"
+
+void init_cache(Cache *cache)
+{
+	if (cache->_table)
+		free_cache(cache);
+	cache->_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+	cache->dirty = FALSE;
+	cache->loaded = FALSE;
+}
+
+void free_cache(Cache *cache)
+{
+	if (cache->_table)
+		g_hash_table_destroy(cache->_table);
+	cache->_table = NULL;
+	cache->dirty = FALSE;
+	cache->loaded = FALSE;
+}
+
+void load_cache(Cache *cache, const gchar *cache_path)
+{
+	init_cache(cache);
+
+	cache->loaded = TRUE;
+
+	int fd = open(cache_path, O_RDONLY);
+	if (fd == -1)
+		return;
+	flock(fd, LOCK_SH);
+
+	FILE *f = fopen(cache_path, "rt");
+	if (!f)
+		goto unlock;
+
+	char *line = NULL;
+	size_t line_size;
+
+	while (getline(&line, &line_size, f) >= 0) {
+		char *key, *value;
+
+		size_t line_len = strlen(line);
+		gboolean has_newline = FALSE;
+		if (line_len >= 1) {
+			if (line[line_len - 1] == '\n') {
+				line[line_len - 1] = '\0';
+				line_len--;
+				has_newline = TRUE;
+			}
+		}
+		if (!has_newline)
+			break;
+
+		if (line_len == 0)
+			continue;
+
+		if (parse_line(line, &key, &value)) {
+			g_hash_table_insert(cache->_table, g_strdup(key), g_strdup(value));
+		}
+	}
+	free(line);
+	fclose(f);
+
+unlock:
+	flock(fd, LOCK_UN);
+	close(fd);
+}
+
+void write_cache_line(gpointer key, gpointer value, gpointer user_data)
+{
+	gchar *k = key;
+	gchar *v = value;
+	FILE *f = user_data;
+
+	fprintf(f, "%s=%s\n", k, v);
+}
+
+void save_cache(Cache *cache, const gchar *cache_path)
+{
+	int fd = open(cache_path, O_RDONLY | O_CREAT, 0600);
+	if (fd == -1) {
+		gchar *dir_path = g_path_get_dirname(cache_path);
+		g_mkdir_with_parents(dir_path, 0700);
+		g_free(dir_path);
+		fd = open(cache_path, O_RDONLY | O_CREAT, 0600);
+	}
+	if (fd == -1) {
+		fprintf(stderr, RED "Could not save icon theme cache!" RESET "\n");
+		return;
+	}
+	flock(fd, LOCK_EX);
+
+	FILE *f = fopen(cache_path, "w");
+	if (!f) {
+		fprintf(stderr, RED "Could not save icon theme cache!" RESET "\n");
+		goto unlock;
+	}
+	g_hash_table_foreach(cache->_table, write_cache_line, f);
+	fclose(f);
+	cache->dirty = FALSE;
+
+unlock:
+	flock(fd, LOCK_UN);
+	close(fd);
+}
+
+const gchar *get_from_cache(Cache *cache, const gchar *key)
+{
+	if (!cache->_table)
+		return NULL;
+	return g_hash_table_lookup(cache->_table, key);
+}
+
+void add_to_cache(Cache *cache, const gchar *key, const gchar *value)
+{
+	if (!cache->_table)
+		init_cache(cache);
+
+	if (!key || !value)
+		return;
+
+	gchar *old_value = g_hash_table_lookup(cache->_table, key);
+	if (old_value && g_str_equal(old_value, value))
+		return;
+
+	g_hash_table_insert(cache->_table, g_strdup(key), g_strdup(value));
+	cache->dirty = TRUE;
+}

src/util/cache.h

@@ -0,0 +1,39 @@
+#ifndef CACHE_H
+#define CACHE_H
+
+#include <glib.h>
+
+// A cache with string keys and values, backed by a file.
+// The strings must not be NULL and are stripped of any whitespace at start and end.
+typedef struct Cache {
+	gboolean dirty;
+	gboolean loaded;
+	GHashTable *_table;
+} Cache;
+
+// Initializes the cache. You can also call load_cache directly if you set the memory contents to zero first.
+void init_cache(Cache *cache);
+
+// Clears the cache contents and releases all memory, but not the object.
+// You can use init_cache or load_cache afterwards.
+void free_cache(Cache *cache);
+
+// Clears the cache contents and loads new contents from a file.
+// Sets the loaded flag to TRUE.
+void load_cache(Cache *cache, const gchar *cache_path);
+
+// Saves the cache contents to a file.
+// Clears the dirty flag.
+void save_cache(Cache *cache, const gchar *cache_path);
+
+// Returns a pointer to the value in the cache, or NULL if not found.
+// Do not free the returned value!
+const gchar *get_from_cache(Cache *cache, const gchar *key);
+
+// Adds a key-value pair to the cache. NULL keys or values are not allowed.
+// If the key already exists, the old value is and replaced with the new value.
+// Does not take ownership of the pointers (neither key, nor value); instead it makes copies.
+// Sets the dirty flag to TRUE.
+void add_to_cache(Cache *cache, const gchar *key, const gchar *value);
+
+#endif

src/util/common.c

@@ -22,89 +22,101 @@
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/Xrender.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <unistd.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 #include "common.h"
 #include "../server.h"
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <dirent.h>
 
+#ifdef HAVE_RSVG
+#include <librsvg/rsvg.h>
+#endif
 
-
-void copy_file(const char *pathSrc, const char *pathDest)
+void copy_file(const char *path_src, const char *path_dest)
 {
-	if (g_str_equal(pathSrc, pathDest))
+	if (g_str_equal(path_src, path_dest))
 		return;
 
-	FILE *fileSrc, *fileDest;
-	char buffer[100];
-	int  nb;
+	FILE *file_src, *file_dest;
+	char buffer[4096];
+	int nb;
 
-	fileSrc = fopen(pathSrc, "rb");
-	if (fileSrc == NULL) return;
+	file_src = fopen(path_src, "rb");
+	if (file_src == NULL)
+		return;
 
-	fileDest = fopen(pathDest, "wb");
-	if (fileDest == NULL) return;
+	file_dest = fopen(path_dest, "wb");
+	if (file_dest == NULL) {
+		fclose(file_src);
+		return;
+	}
 
-	while ((nb = fread(buffer, 1, sizeof(buffer), fileSrc)) > 0) {
-		if ( nb != fwrite(buffer, 1, nb, fileDest)) {
-			printf("Error while copying file %s to %s\n", pathSrc, pathDest);
+	while ((nb = fread(buffer, 1, sizeof(buffer), file_src)) > 0) {
+		if (nb != fwrite(buffer, 1, nb, file_dest)) {
+			printf("Error while copying file %s to %s\n", path_src, path_dest);
 		}
 	}
 
-	fclose (fileDest);
-	fclose (fileSrc);
+	fclose(file_dest);
+	fclose(file_src);
 }
 
-
-int parse_line (const char *line, char **key, char **value)
+int parse_line(const char *line, char **key, char **value)
 {
 	char *a, *b;
 
 	/* Skip useless lines */
-	if ((line[0] == '#') || (line[0] == '\n')) return 0;
-	if (!(a = strchr (line, '='))) return 0;
+	if ((line[0] == '#') || (line[0] == '\n'))
+		return 0;
+	if (!(a = strchr(line, '=')))
+		return 0;
 
 	/* overwrite '=' with '\0' */
 	a[0] = '\0';
-	*key = strdup (line);
+	*key = strdup(line);
 	a++;
 
 	/* overwrite '\n' with '\0' if '\n' present */
-	if ((b = strchr (a, '\n'))) b[0] = '\0';
+	if ((b = strchr(a, '\n')))
+		b[0] = '\0';
 
-	*value = strdup (a);
+	*value = strdup(a);
 
 	g_strstrip(*key);
 	g_strstrip(*value);
 	return 1;
 }
 
-
 void tint_exec(const char *command)
 {
 	if (command) {
-		pid_t pid;
-		pid = fork();
-		if (pid == 0) {
+		if (fork() == 0) {
 			// change for the fork the signal mask
-//			sigset_t sigset;
-//			sigprocmask(SIG_SETMASK, &sigset, 0);
-//			sigprocmask(SIG_UNBLOCK, &sigset, 0);
+			//			sigset_t sigset;
+			//			sigprocmask(SIG_SETMASK, &sigset, 0);
+			//			sigprocmask(SIG_UNBLOCK, &sigset, 0);
 			execl("/bin/sh", "/bin/sh", "-c", command, NULL);
 			_exit(0);
 		}
 	}
 }
 
-char *expand_tilde(char *s)
+char *expand_tilde(const char *s)
 {
 	const gchar *home = g_get_home_dir();
-	if (home &&
-		(strcmp(s, "~") == 0 ||
-		strstr(s, "~/") == s)) {
+	if (home && (strcmp(s, "~") == 0 || strstr(s, "~/") == s)) {
 		char *result = calloc(strlen(home) + strlen(s), 1);
 		strcat(result, home);
 		strcat(result, s + 1);
@@ -114,7 +126,7 @@ char *expand_tilde(char *s)
 	}
 }
 
-char *contract_tilde(char *s)
+char *contract_tilde(const char *s)
 {
 	const gchar *home = g_get_home_dir();
 	if (!home)
@@ -124,8 +136,7 @@ char *contract_tilde(char *s)
 	strcat(home_slash, home);
 	strcat(home_slash, "/");
 
-	if ((strcmp(s, home) == 0 ||
-		strstr(s, home_slash) == s)) {
+	if ((strcmp(s, home) == 0 || strstr(s, home_slash) == s)) {
 		char *result = calloc(strlen(s) - strlen(home) + 2, 1);
 		strcat(result, "~");
 		strcat(result, s + strlen(home));
@@ -137,295 +148,266 @@ char *contract_tilde(char *s)
 	}
 }
 
-int hex_char_to_int (char c)
+int hex_char_to_int(char c)
 {
 	int r;
 
-	if (c >= '0' && c <= '9')  r = c - '0';
-	else if (c >= 'a' && c <= 'f')  r = c - 'a' + 10;
-	else if (c >= 'A' && c <= 'F')  r = c - 'A' + 10;
-	else  r = 0;
+	if (c >= '0' && c <= '9')
+		r = c - '0';
+	else if (c >= 'a' && c <= 'f')
+		r = c - 'a' + 10;
+	else if (c >= 'A' && c <= 'F')
+		r = c - 'A' + 10;
+	else
+		r = 0;
 
 	return r;
 }
 
-
-int hex_to_rgb (char *hex, int *r, int *g, int *b)
+int hex_to_rgb(char *hex, int *r, int *g, int *b)
 {
-	int len;
+	if (hex == NULL || hex[0] != '#')
+		return (0);
 
-	if (hex == NULL || hex[0] != '#') return (0);
-
-	len = strlen (hex);
+	int len = strlen(hex);
 	if (len == 3 + 1) {
-		*r = hex_char_to_int (hex[1]);
-		*g = hex_char_to_int (hex[2]);
-		*b = hex_char_to_int (hex[3]);
-	}
-	else if (len == 6 + 1) {
-		*r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]);
-		*g = hex_char_to_int (hex[3]) * 16 + hex_char_to_int (hex[4]);
-		*b = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]);
-	}
-	else if (len == 12 + 1) {
-		*r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]);
-		*g = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]);
-		*b = hex_char_to_int (hex[9]) * 16 + hex_char_to_int (hex[10]);
-	}
-	else return 0;
+		*r = hex_char_to_int(hex[1]);
+		*g = hex_char_to_int(hex[2]);
+		*b = hex_char_to_int(hex[3]);
+	} else if (len == 6 + 1) {
+		*r = hex_char_to_int(hex[1]) * 16 + hex_char_to_int(hex[2]);
+		*g = hex_char_to_int(hex[3]) * 16 + hex_char_to_int(hex[4]);
+		*b = hex_char_to_int(hex[5]) * 16 + hex_char_to_int(hex[6]);
+	} else if (len == 12 + 1) {
+		*r = hex_char_to_int(hex[1]) * 16 + hex_char_to_int(hex[2]);
+		*g = hex_char_to_int(hex[5]) * 16 + hex_char_to_int(hex[6]);
+		*b = hex_char_to_int(hex[9]) * 16 + hex_char_to_int(hex[10]);
+	} else
+		return 0;
 
 	return 1;
 }
 
-
-void get_color (char *hex, double *rgb)
+void get_color(char *hex, double *rgb)
 {
 	int r, g, b;
 	r = g = b = 0;
-	hex_to_rgb (hex, &r, &g, &b);
+	hex_to_rgb(hex, &r, &g, &b);
 
 	rgb[0] = (r / 255.0);
 	rgb[1] = (g / 255.0);
 	rgb[2] = (b / 255.0);
 }
 
-
-void extract_values (const char *value, char **value1, char **value2, char **value3)
+void extract_values(const char *value, char **value1, char **value2, char **value3)
 {
-	char *b=0, *c=0;
+	char *b = 0, *c = 0;
 
-	if (*value1) free (*value1);
-	if (*value2) free (*value2);
-	if (*value3) free (*value3);
+	if (*value1)
+		free(*value1);
+	if (*value2)
+		free(*value2);
+	if (*value3)
+		free(*value3);
 
-	if ((b = strchr (value, ' '))) {
+	if ((b = strchr(value, ' '))) {
 		b[0] = '\0';
 		b++;
-	}
-	else {
+	} else {
 		*value2 = 0;
 		*value3 = 0;
 	}
-	*value1 = strdup (value);
+	*value1 = strdup(value);
 	g_strstrip(*value1);
 
 	if (b) {
-		if ((c = strchr (b, ' '))) {
+		if ((c = strchr(b, ' '))) {
 			c[0] = '\0';
 			c++;
-		}
-		else {
+		} else {
 			c = 0;
 			*value3 = 0;
 		}
-		*value2 = strdup (b);
+		*value2 = strdup(b);
 		g_strstrip(*value2);
 	}
 
 	if (c) {
-		*value3 = strdup (c);
+		*value3 = strdup(c);
 		g_strstrip(*value3);
 	}
 }
 
-
-void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright)
+void adjust_asb(DATA32 *data, int w, int h, float alpha_adjust, float satur_adjust, float bright_adjust)
 {
-	unsigned int x, y;
-	unsigned int a, r, g, b, argb;
-	unsigned long id;
-	int cmax, cmin;
-	float h2, f, p, q, t;
-	float hue, saturation, brightness;
-	float redc, greenc, bluec;
+	for (int id = 0; id < w * h; id++) {
+		unsigned int argb = data[id];
+		int a = (argb >> 24) & 0xff;
+		// transparent => nothing to do.
+		if (a == 0)
+			continue;
+		int r = (argb >> 16) & 0xff;
+		int g = (argb >> 8) & 0xff;
+		int b = (argb)&0xff;
 
-	for(y = 0; y < h; y++) {
-		for(id = y * w, x = 0; x < w; x++, id++) {
-			argb = data[id];
-			a = (argb >> 24) & 0xff;
-			// transparent => nothing to do.
-			if (a == 0) continue;
-			r = (argb >> 16) & 0xff;
-			g = (argb >> 8) & 0xff;
-			b = (argb) & 0xff;
-
-			// convert RGB to HSB
-			cmax = (r > g) ? r : g;
-			if (b > cmax) cmax = b;
-			cmin = (r < g) ? r : g;
-			if (b < cmin) cmin = b;
-			brightness = ((float)cmax) / 255.0f;
-			if (cmax != 0)
-				saturation = ((float)(cmax - cmin)) / ((float)cmax);
+		// Convert RGB to HSV
+		int cmax = MAX3(r, g, b);
+		int cmin = MIN3(r, g, b);
+		int delta = cmax - cmin;
+		float brightness = cmax / 255.0f;
+		float saturation;
+		if (cmax != 0)
+			saturation = delta / (float)cmax;
+		else
+			saturation = 0;
+		float hue;
+		if (saturation == 0) {
+			hue = 0;
+		} else {
+			float redc = (cmax - r) / (float)delta;
+			float greenc = (cmax - g) / (float)delta;
+			float bluec = (cmax - b) / (float)delta;
+			if (r == cmax)
+				hue = bluec - greenc;
+			else if (g == cmax)
+				hue = 2.0f + redc - bluec;
 			else
-				saturation = 0;
-			if (saturation == 0)
-				hue = 0;
-			else {
-				redc = ((float)(cmax - r)) / ((float)(cmax - cmin));
-				greenc = ((float)(cmax - g)) / ((float)(cmax - cmin));
-				bluec = ((float)(cmax - b)) / ((float)(cmax - cmin));
-				if (r == cmax)
-					hue = bluec - greenc;
-				else if (g == cmax)
-					hue = 2.0f + redc - bluec;
-				else
-					hue = 4.0f + greenc - redc;
-				hue = hue / 6.0f;
-				if (hue < 0)
-					hue = hue + 1.0f;
-			}
-
-			// adjust
-			saturation += satur;
-			if (saturation < 0.0) saturation = 0.0;
-			if (saturation > 1.0) saturation = 1.0;
-			brightness += bright;
-			if (brightness < 0.0) brightness = 0.0;
-			if (brightness > 1.0) brightness = 1.0;
-			if (alpha != 100)
-				a = (a * alpha)/100;
-
-			// convert HSB to RGB
-			if (saturation == 0) {
-				r = g = b = (int)(brightness * 255.0f + 0.5f);
-			} else {
-				h2 = (hue - (int)hue) * 6.0f;
-				f = h2 - (int)(h2);
-				p = brightness * (1.0f - saturation);
-				q = brightness * (1.0f - saturation * f);
-				t = brightness * (1.0f - (saturation * (1.0f - f)));
-				switch ((int) h2) {
-				case 0:
-					r = (int)(brightness * 255.0f + 0.5f);
-					g = (int)(t * 255.0f + 0.5f);
-					b = (int)(p * 255.0f + 0.5f);
-					break;
-				case 1:
-					r = (int)(q * 255.0f + 0.5f);
-					g = (int)(brightness * 255.0f + 0.5f);
-					b = (int)(p * 255.0f + 0.5f);
-					break;
-				case 2:
-					r = (int)(p * 255.0f + 0.5f);
-					g = (int)(brightness * 255.0f + 0.5f);
-					b = (int)(t * 255.0f + 0.5f);
-					break;
-				case 3:
-					r = (int)(p * 255.0f + 0.5f);
-					g = (int)(q * 255.0f + 0.5f);
-					b = (int)(brightness * 255.0f + 0.5f);
-					break;
-				case 4:
-					r = (int)(t * 255.0f + 0.5f);
-					g = (int)(p * 255.0f + 0.5f);
-					b = (int)(brightness * 255.0f + 0.5f);
-					break;
-				case 5:
-					r = (int)(brightness * 255.0f + 0.5f);
-					g = (int)(p * 255.0f + 0.5f);
-					b = (int)(q * 255.0f + 0.5f);
-					break;
-				}
-			}
-
-			argb = a;
-			argb = (argb << 8) + r;
-			argb = (argb << 8) + g;
-			argb = (argb << 8) + b;
-			data[id] = argb;
+				hue = 4.0f + greenc - redc;
+			hue = hue / 6.0f;
+			if (hue < 0)
+				hue = hue + 1.0f;
 		}
+
+		// Adjust H, S
+		saturation += satur_adjust;
+		saturation = CLAMP(saturation, 0.0, 1.0);
+
+		a *= alpha_adjust;
+		a = CLAMP(a, 0, 255);
+
+		// Convert HSV to RGB
+		if (saturation == 0) {
+			r = g = b = (int)(brightness * 255.0f + 0.5f);
+		} else {
+			float h2 = (hue - (int)hue) * 6.0f;
+			float f = h2 - (int)(h2);
+			float p = brightness * (1.0f - saturation);
+			float q = brightness * (1.0f - saturation * f);
+			float t = brightness * (1.0f - (saturation * (1.0f - f)));
+
+			switch ((int)h2) {
+			case 0:
+				r = (int)(brightness * 255.0f + 0.5f);
+				g = (int)(t * 255.0f + 0.5f);
+				b = (int)(p * 255.0f + 0.5f);
+				break;
+			case 1:
+				r = (int)(q * 255.0f + 0.5f);
+				g = (int)(brightness * 255.0f + 0.5f);
+				b = (int)(p * 255.0f + 0.5f);
+				break;
+			case 2:
+				r = (int)(p * 255.0f + 0.5f);
+				g = (int)(brightness * 255.0f + 0.5f);
+				b = (int)(t * 255.0f + 0.5f);
+				break;
+			case 3:
+				r = (int)(p * 255.0f + 0.5f);
+				g = (int)(q * 255.0f + 0.5f);
+				b = (int)(brightness * 255.0f + 0.5f);
+				break;
+			case 4:
+				r = (int)(t * 255.0f + 0.5f);
+				g = (int)(p * 255.0f + 0.5f);
+				b = (int)(brightness * 255.0f + 0.5f);
+				break;
+			case 5:
+				r = (int)(brightness * 255.0f + 0.5f);
+				g = (int)(p * 255.0f + 0.5f);
+				b = (int)(q * 255.0f + 0.5f);
+				break;
+			}
+		}
+
+		r += bright_adjust * 255;
+		g += bright_adjust * 255;
+		b += bright_adjust * 255;
+
+		r = CLAMP(r, 0, 255);
+		g = CLAMP(g, 0, 255);
+		b = CLAMP(b, 0, 255);
+
+		argb = a;
+		argb = (argb << 8) + r;
+		argb = (argb << 8) + g;
+		argb = (argb << 8) + b;
+		data[id] = argb;
 	}
 }
 
-void createHeuristicMask(DATA32* data, int w, int h)
+void create_heuristic_mask(DATA32 *data, int w, int h)
 {
 	// first we need to find the mask color, therefore we check all 4 edge pixel and take the color which
 	// appears most often (we only need to check three edges, the 4th is implicitly clear)
-	unsigned int topLeft = data[0], topRight = data[w-1], bottomLeft = data[w*h-w], bottomRight = data[w*h-1];
+	unsigned int topLeft = data[0], topRight = data[w - 1], bottomLeft = data[w * h - w], bottomRight = data[w * h - 1];
 	int max = (topLeft == topRight) + (topLeft == bottomLeft) + (topLeft == bottomRight);
 	int maskPos = 0;
-	if ( max < (topRight == topLeft) + (topRight == bottomLeft) + (topRight == bottomRight) ) {
+	if (max < (topRight == topLeft) + (topRight == bottomLeft) + (topRight == bottomRight)) {
 		max = (topRight == topLeft) + (topRight == bottomLeft) + (topRight == bottomRight);
-		maskPos = w-1;
+		maskPos = w - 1;
 	}
-	if ( max < (bottomLeft == topRight) + (bottomLeft == topLeft) + (bottomLeft == bottomRight) )
-		maskPos = w*h-w;
+	if (max < (bottomLeft == topRight) + (bottomLeft == topLeft) + (bottomLeft == bottomRight))
+		maskPos = w * h - w;
 
 	// now mask out every pixel which has the same color as the edge pixels
-	unsigned char* udata = (unsigned char*)data;
-	unsigned char b = udata[4*maskPos];
-	unsigned char g = udata[4*maskPos+1];
-	unsigned char r = udata[4*maskPos+1];
-	int i;
-	for (i=0; i<h*w; ++i) {
-		if ( b-udata[0] == 0 && g-udata[1] == 0 && r-udata[2] == 0 )
+	unsigned char *udata = (unsigned char *)data;
+	unsigned char b = udata[4 * maskPos];
+	unsigned char g = udata[4 * maskPos + 1];
+	unsigned char r = udata[4 * maskPos + 1];
+	for (int i = 0; i < h * w; ++i) {
+		if (b - udata[0] == 0 && g - udata[1] == 0 && r - udata[2] == 0)
 			udata[3] = 0;
 		udata += 4;
 	}
 }
 
-int pixelEmpty(DATA32 argb)
-{
-
-	DATA32 a = (argb >> 24) & 0xff;
-	if (a == 0)
-		return 1;
-
-	DATA32 rgb = argb & 0xffFFff;
-	return rgb == 0;
-}
-
-int imageEmpty(DATA32* data, int w, int h)
-{
-	unsigned int x, y;
-
-	if (w > 0 && h > 0) {
-		x = w / 2;
-		y = h / 2;
-		if (!pixelEmpty(data[y * w + x])) {
-			//fprintf(stderr, "Non-empty pixel: [%u, %u] = %x\n", x, y, data[y * w + x]);
-			return 0;
-		}
-	}
-
-	for (y = 0; y < h; y++) {
-		for (x = 0; x < w; x++) {
-			if (!pixelEmpty(data[y * w + x])) {
-				//fprintf(stderr, "Non-empty pixel: [%u, %u] = %x\n", x, y, data[y * w + x]);
-				return 0;
-			}
-		}
-	}
-
-	//fprintf(stderr, "All pixels are empty\n");
-	return 1;
-}
-
 void render_image(Drawable d, int x, int y)
 {
+	if (!server.real_transparency) {
+		imlib_context_set_blend(1);
+		imlib_context_set_drawable(d);
+		imlib_render_image_on_drawable(x, y);
+		return;
+	}
+
 	int w = imlib_image_get_width(), h = imlib_image_get_height();
 
-	Pixmap pixmap = XCreatePixmap(server.dsp, server.root_win, w, h, 32);
+	Pixmap pixmap = XCreatePixmap(server.display, server.root_win, w, h, 32);
 	imlib_context_set_drawable(pixmap);
 	imlib_context_set_blend(0);
 	imlib_render_image_on_drawable(0, 0);
 
-	Pixmap mask = XCreatePixmap(server.dsp, server.root_win, w, h, 32);
+	Pixmap mask = XCreatePixmap(server.display, server.root_win, w, h, 32);
 	imlib_context_set_drawable(mask);
 	imlib_context_set_blend(0);
 	imlib_render_image_on_drawable(0, 0);
 
-	Picture pict = XRenderCreatePicture(server.dsp, pixmap, XRenderFindStandardFormat(server.dsp, PictStandardARGB32), 0, 0);
-	Picture pict_drawable = XRenderCreatePicture(server.dsp, d, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
-	Picture pict_mask = XRenderCreatePicture(server.dsp, mask, XRenderFindStandardFormat(server.dsp, PictStandardARGB32), 0, 0);
-	XRenderComposite(server.dsp, PictOpOver, pict, pict_mask, pict_drawable, 0, 0, 0, 0, x, y, w, h);
+	Picture pict = XRenderCreatePicture(server.display,
+										pixmap,
+										XRenderFindStandardFormat(server.display, PictStandardARGB32),
+										0,
+										0);
+	Picture pict_drawable =
+		XRenderCreatePicture(server.display, d, XRenderFindVisualFormat(server.display, server.visual), 0, 0);
+	Picture pict_mask =
+		XRenderCreatePicture(server.display, mask, XRenderFindStandardFormat(server.display, PictStandardARGB32), 0, 0);
+	XRenderComposite(server.display, PictOpOver, pict, pict_mask, pict_drawable, 0, 0, 0, 0, x, y, w, h);
 
-	XRenderFreePicture(server.dsp, pict_mask);
-	XRenderFreePicture(server.dsp, pict_drawable);
-	XRenderFreePicture(server.dsp, pict);
-	XFreePixmap(server.dsp, mask);
-	XFreePixmap(server.dsp, pixmap);
+	XRenderFreePicture(server.display, pict_mask);
+	XRenderFreePicture(server.display, pict_drawable);
+	XRenderFreePicture(server.display, pict);
+	XFreePixmap(server.display, mask);
+	XFreePixmap(server.display, pixmap);
 }
 
 void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, int font_shadow)
@@ -436,15 +418,217 @@ void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color
 		int i, j;
 		for (i = -shadow_size; i <= shadow_size; i++) {
 			for (j = -shadow_size; j <= shadow_size; j++) {
-				cairo_set_source_rgba(c, 0.0, 0.0, 0.0, 1.0 - (1.0 - shadow_edge_alpha) * sqrt((i*i + j*j)/(double)(shadow_size*shadow_size)));
+				cairo_set_source_rgba(c,
+									  0.0,
+									  0.0,
+									  0.0,
+									  1.0 -
+										  (1.0 - shadow_edge_alpha) *
+											  sqrt((i * i + j * j) / (double)(shadow_size * shadow_size)));
 				pango_cairo_update_layout(c, layout);
 				cairo_move_to(c, posx + i, posy + j);
 				pango_cairo_show_layout(c, layout);
 			}
 		}
 	}
-	cairo_set_source_rgba (c, color->color[0], color->color[1], color->color[2], color->alpha);
-	pango_cairo_update_layout (c, layout);
-	cairo_move_to (c, posx, posy);
-	pango_cairo_show_layout (c, layout);
+	cairo_set_source_rgba(c, color->rgb[0], color->rgb[1], color->rgb[2], color->alpha);
+	pango_cairo_update_layout(c, layout);
+	cairo_move_to(c, posx, posy);
+	pango_cairo_show_layout(c, layout);
+}
+
+Imlib_Image load_image(const char *path, int cached)
+{
+	Imlib_Image image;
+#ifdef HAVE_RSVG
+	if (cached) {
+		image = imlib_load_image_immediately(path);
+	} else {
+		image = imlib_load_image_immediately_without_cache(path);
+	}
+	if (!image && g_str_has_suffix(path, ".svg")) {
+		char tmp_filename[128];
+		sprintf(tmp_filename, "/tmp/tint2-%d-XXXXXX.png", (int)getpid());
+		int fd = mkstemps(tmp_filename, 4);
+		if (fd) {
+			// 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(path, &err);
+
+				if (err != NULL) {
+					fprintf(stderr, "Could not load svg image!: %s", err->message);
+					g_error_free(err);
+				} else {
+					GdkPixbuf *pixbuf = rsvg_handle_get_pixbuf(svg);
+					gdk_pixbuf_save(pixbuf, tmp_filename, "png", NULL, NULL);
+				}
+				exit(0);
+			} else {
+				// Parent
+				waitpid(pid, 0, 0);
+				image = imlib_load_image_immediately_without_cache(tmp_filename);
+				unlink(tmp_filename);
+			}
+		}
+	} else
+#endif
+	{
+		if (cached) {
+			image = imlib_load_image_immediately(path);
+		} else {
+			image = imlib_load_image_immediately_without_cache(path);
+		}
+	}
+	return image;
+}
+
+Imlib_Image adjust_icon(Imlib_Image original, int alpha, int saturation, int brightness)
+{
+	if (!original)
+		return NULL;
+
+	imlib_context_set_image(original);
+	Imlib_Image copy = imlib_clone_image();
+
+	imlib_context_set_image(copy);
+	imlib_image_set_has_alpha(1);
+	DATA32 *data = imlib_image_get_data();
+	adjust_asb(data,
+			   imlib_image_get_width(),
+			   imlib_image_get_height(),
+			   alpha / 100.0,
+			   saturation / 100.0,
+			   brightness / 100.0);
+	imlib_image_put_back_data(data);
+	return copy;
+}
+
+void draw_rect(cairo_t *c, double x, double y, double w, double h, double r)
+{
+	if (r > 0.0) {
+		double c1 = 0.55228475 * r;
+
+		cairo_move_to(c, x + r, y);
+		cairo_rel_line_to(c, w - 2 * r, 0);
+		cairo_rel_curve_to(c, c1, 0.0, r, c1, r, r);
+		cairo_rel_line_to(c, 0, h - 2 * r);
+		cairo_rel_curve_to(c, 0.0, c1, c1 - r, r, -r, r);
+		cairo_rel_line_to(c, -w + 2 * r, 0);
+		cairo_rel_curve_to(c, -c1, 0, -r, -c1, -r, -r);
+		cairo_rel_line_to(c, 0, -h + 2 * r);
+		cairo_rel_curve_to(c, 0, -c1, r - c1, -r, r, -r);
+	} else
+		cairo_rectangle(c, x, y, w, h);
+}
+
+void clear_pixmap(Pixmap p, int x, int y, int w, int h)
+{
+	Picture pict =
+		XRenderCreatePicture(server.display, p, XRenderFindVisualFormat(server.display, server.visual), 0, 0);
+	XRenderColor col;
+	col.red = col.green = col.blue = col.alpha = 0;
+	XRenderFillRectangle(server.display, PictOpSrc, pict, &col, x, y, w, h);
+	XRenderFreePicture(server.display, pict);
+}
+
+void get_text_size2(PangoFontDescription *font,
+					int *height_ink,
+					int *height,
+					int *width,
+					int panel_height,
+					int panel_width,
+					char *text,
+					int len,
+					PangoWrapMode wrap,
+					PangoEllipsizeMode ellipsis,
+					gboolean markup)
+{
+	PangoRectangle rect_ink, rect;
+
+	Pixmap pmap = XCreatePixmap(server.display, server.root_win, panel_height, panel_width, server.depth);
+
+	cairo_surface_t *cs = cairo_xlib_surface_create(server.display, pmap, server.visual, panel_height, panel_width);
+	cairo_t *c = cairo_create(cs);
+
+	PangoLayout *layout = pango_cairo_create_layout(c);
+	pango_layout_set_width(layout, panel_width * PANGO_SCALE);
+	pango_layout_set_height(layout, panel_height * PANGO_SCALE);
+	pango_layout_set_wrap(layout, wrap);
+	pango_layout_set_ellipsize(layout, ellipsis);
+	pango_layout_set_font_description(layout, font);
+	if (!markup)
+		pango_layout_set_text(layout, text, len);
+	else
+		pango_layout_set_markup(layout, text, len);
+
+	pango_layout_get_pixel_extents(layout, &rect_ink, &rect);
+	*height_ink = rect_ink.height;
+	*height = rect.height;
+	*width = rect.width;
+	// printf("dimension : %d - %d\n", rect_ink.height, rect.height);
+
+	g_object_unref(layout);
+	cairo_destroy(c);
+	cairo_surface_destroy(cs);
+	XFreePixmap(server.display, pmap);
+}
+
+#if !GLIB_CHECK_VERSION(2, 33, 4)
+GList *g_list_copy_deep(GList *list, GCopyFunc func, gpointer user_data)
+{
+	list = g_list_copy(list);
+
+	if (func) {
+		for (GList *l = list; l; l = l->next) {
+			l->data = func(l->data, user_data);
+		}
+	}
+
+	return list;
+}
+#endif
+
+GSList *load_locations_from_env(GSList *locations, const char *var, ...)
+{
+	char *value = getenv(var);
+	if (value) {
+		value = strdup(value);
+		char *p = value;
+		for (char *token = strsep(&value, ":"); token; token = strsep(&value, ":")) {
+			va_list ap;
+			va_start(ap, var);
+			for (const char *suffix = va_arg(ap, const char *); suffix; suffix = va_arg(ap, const char *)) {
+				locations = g_slist_append(locations, g_build_filename(token, suffix, NULL));
+			}
+			va_end(ap);
+		}
+		free(p);
+	}
+	return locations;
+}
+
+GSList *slist_remove_duplicates(GSList *list, GCompareFunc eq, GDestroyNotify fr)
+{
+	GSList *new_list = NULL;
+
+	for (GSList *l1 = list; l1; l1 = g_slist_next(l1)) {
+		gboolean duplicate = FALSE;
+		for (GSList *l2 = new_list; l2; l2 = g_slist_next(l2)) {
+			if (eq(l1->data, l2->data)) {
+				duplicate = TRUE;
+				break;
+			}
+		}
+		if (!duplicate) {
+			new_list = g_slist_append(new_list, l1->data);
+			l1->data = NULL;
+		}
+	}
+
+	g_slist_free_full(list, fr);
+
+	return new_list;
 }

src/util/common.h

@@ -6,73 +6,131 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-#define WM_CLASS_TINT   "panel"
+#define WM_CLASS_TINT "panel"
 
+#include <glib.h>
 #include <Imlib2.h>
 #include <pango/pangocairo.h>
 #include "area.h"
 
-#define GREEN  "\033[1;32m"
+#define GREEN "\033[1;32m"
 #define YELLOW "\033[1;33m"
-#define RED    "\033[31m"
-#define BLUE   "\033[1;34m"
-#define RESET  "\033[0m"
+#define RED "\033[1;31m"
+#define BLUE "\033[1;34m"
+#define RESET "\033[0m"
 
-/*
-void fxfree(void** ptr){
-  if(*ptr){
-    free(*ptr);
-    *ptr=NULL;
-    }
-  }
-FXint fxmalloc(void** ptr,unsigned long size){
-  *ptr=NULL;
-  if(size!=0){
-    if((*ptr=malloc(size))==NULL) return FALSE;
-    }
-  return TRUE;
-  }
-*/
+#define MAX3(a, b, c) MAX(MAX(a, b), c)
+#define MIN3(a, b, c) MIN(MIN(a, b), c)
 
 // mouse actions
-enum { NONE=0, CLOSE, TOGGLE, ICONIFY, SHADE, TOGGLE_ICONIFY, MAXIMIZE_RESTORE, MAXIMIZE, RESTORE, DESKTOP_LEFT, DESKTOP_RIGHT, NEXT_TASK, PREV_TASK };
+typedef enum MouseAction {
+	NONE = 0,
+	CLOSE,
+	TOGGLE,
+	ICONIFY,
+	SHADE,
+	TOGGLE_ICONIFY,
+	MAXIMIZE_RESTORE,
+	MAXIMIZE,
+	RESTORE,
+	DESKTOP_LEFT,
+	DESKTOP_RIGHT,
+	NEXT_TASK,
+	PREV_TASK
+} MouseAction;
 
-#define ALLDESKTOP  0xFFFFFFFF
+#define ALL_DESKTOPS 0xFFFFFFFF
 
+// Copies a file to another path
+void copy_file(const char *path_src, const char *path_dest);
 
-// copy file source to file dest
-void copy_file(const char *pathSrc, const char *pathDest);
+// Parses lines with the format 'key = value' into key and value.
+// Strips key and value.
+// Values may contain spaces and the equal sign.
+// Returns 1 if both key and value could be read, zero otherwise.
+int parse_line(const char *line, char **key, char **value);
 
-// extract key = value
-int parse_line (const char *line, char **key, char **value);
+void extract_values(const char *value, char **value1, char **value2, char **value3);
 
-// execute a command by calling fork
-void tint_exec(const char* command);
+// Executes a command in a shell.
+void tint_exec(const char *command);
 
 // Returns a copy of s in which "~" is expanded to the path to the user's home directory.
-// The returned string must be freed by the caller.
-char *expand_tilde(char *s);
+// The caller takes ownership of the string.
+char *expand_tilde(const char *s);
 
 // The opposite of expand_tilde: replaces the path to the user's home directory with "~".
-// The returned string must be freed by the caller.
-char *contract_tilde(char *s);
+// The caller takes ownership of the string.
+char *contract_tilde(const char *s);
 
-// conversion
-int hex_char_to_int (char c);
-int hex_to_rgb (char *hex, int *r, int *g, int *b);
-void get_color (char *hex, double *rgb);
+// Color
+int hex_char_to_int(char c);
+int hex_to_rgb(char *hex, int *r, int *g, int *b);
+void get_color(char *hex, double *rgb);
 
-void extract_values (const char *value, char **value1, char **value2, char **value3);
+Imlib_Image load_image(const char *path, int cached);
 
-// adjust Alpha/Saturation/Brightness on an ARGB icon
-// alpha from 0 to 100, satur from 0 to 1, bright from 0 to 1.
-void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright);
-void createHeuristicMask(DATA32* data, int w, int h);
-int imageEmpty(DATA32* data, int w, int h);
+// Adjusts the alpha/saturation/brightness on an ARGB image.
+// Parameters:
+// * alpha_adjust: multiplicative:
+//    * 0 = full transparency
+//    * 1 = no adjustment
+//    * 2 = twice the current opacity
+// * satur_adjust: additive:
+//   * -1 = full grayscale
+//   *  0 = no adjustment
+//   *  1 = full color
+// * bright_adjust: additive:
+//   * -1 = black
+//   *  0 = no adjustment
+//   *  1 = white
+void adjust_asb(DATA32 *data, int w, int h, float alpha_adjust, float satur_adjust, float bright_adjust);
+Imlib_Image adjust_icon(Imlib_Image original, int alpha, int saturation, int brightness);
 
+void create_heuristic_mask(DATA32 *data, int w, int h);
+
+// Renders the current Imlib image to a drawable. Wrapper around imlib_render_image_on_drawable.
 void render_image(Drawable d, int x, int y);
 
+void get_text_size2(PangoFontDescription *font,
+					int *height_ink,
+					int *height,
+					int *width,
+					int panel_height,
+					int panel_with,
+					char *text,
+					int len,
+					PangoWrapMode wrap,
+					PangoEllipsizeMode ellipsis,
+					gboolean markup);
+
 void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, int font_shadow);
 
+// Draws a rounded rectangle
+void draw_rect(cairo_t *c, double x, double y, double w, double h, double r);
+
+// Clears the pixmap (with transparent color)
+void clear_pixmap(Pixmap p, int x, int y, int w, int h);
+
+// Appends to the list locations all the directories contained in the environment variable var (split by ":").
+// Optional suffixes are added to each directory. The suffix arguments MUST end with NULL.
+// Returns the new value of the list.
+GSList *load_locations_from_env(GSList *locations, const char *var, ...);
+
+GSList *slist_remove_duplicates(GSList *list, GCompareFunc eq, GDestroyNotify fr);
+
+#define free_and_null(p) \
+	{                    \
+		free(p);         \
+		p = NULL;        \
+	}
+
+#if !GLIB_CHECK_VERSION(2, 33, 4)
+GList *g_list_copy_deep(GList *list, GCopyFunc func, gpointer user_data);
 #endif
 
+#if !GLIB_CHECK_VERSION(2, 38, 0)
+#define g_assert_null(expr) g_assert((expr) == NULL)
+#endif
+
+#endif

src/util/strnatcmp.c

@@ -20,7 +20,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-
 /* partial change history:
  *
  * 2004-10-10 mbp: Lift out character type dependencies into macros.
@@ -37,142 +36,117 @@
 
 #include "strnatcmp.h"
 
-
-/* These are defined as macros to make it easier to adapt this code to
- * different characters types or comparison functions. */
-static inline int
-nat_isdigit(nat_char a)
+// Compare two right-aligned numbers:
+// The longest run of digits wins.  That aside, the greatest
+// value wins, but we can't know that it will until we've scanned
+// both numbers to know that they have the same magnitude, so we
+// remember it in BIAS.
+static int compare_right(char const *a, char const *b)
 {
-     return isdigit((unsigned char) a);
+	int bias = 0;
+
+	for (;; a++, b++) {
+		if (!isdigit(*a) && !isdigit(*b))
+			return bias;
+		else if (!isdigit(*a))
+			return -1;
+		else if (!isdigit(*b))
+			return +1;
+		else if (*a < *b) {
+			if (!bias)
+				bias = -1;
+		} else if (*a > *b) {
+			if (!bias)
+				bias = +1;
+		} else if (!*a && !*b)
+			return bias;
+	}
+
+	return 0;
 }
 
-
-static inline int
-nat_isspace(nat_char a)
+// Compare two left-aligned numbers:
+// The first to have a different value wins.
+static int compare_left(char const *a, char const *b)
 {
-     return isspace((unsigned char) a);
+	for (;; a++, b++) {
+		if (!isdigit(*a) && !isdigit(*b))
+			return 0;
+		else if (!isdigit(*a))
+			return -1;
+		else if (!isdigit(*b))
+			return +1;
+		else if (*a < *b)
+			return -1;
+		else if (*a > *b)
+			return +1;
+	}
+
+	return 0;
 }
 
-
-static inline nat_char
-nat_toupper(nat_char a)
+static int strnatcmp0(char const *a, char const *b, int ignore_case)
 {
-     return toupper((unsigned char) a);
+	assert(a && b);
+
+	int ai, bi;
+	ai = bi = 0;
+	while (1) {
+		char ca = a[ai];
+		char cb = b[bi];
+
+		// Skip over leading spaces
+		while (isspace(ca)) {
+			ai++;
+			ca = a[ai];
+		}
+
+		while (isspace(cb)) {
+			bi++;
+			cb = b[bi];
+		}
+
+		// Process run of digits
+		if (isdigit(ca) && isdigit(cb)) {
+			int fractional = (ca == '0' || cb == '0');
+
+			if (fractional) {
+				int result = compare_left(a + ai, b + bi);
+				if (result)
+					return result;
+			} else {
+				int result = compare_right(a + ai, b + bi);
+				if (result)
+					return result;
+			}
+		}
+
+		if (!ca && !cb) {
+			// The strings compare the same.  Perhaps the caller will want to call strcmp to break the tie.
+			return 0;
+		}
+
+		if (ignore_case) {
+			ca = toupper(ca);
+			cb = toupper(cb);
+		}
+
+		if (ca < cb)
+			return -1;
+		else if (ca > cb)
+			return +1;
+
+		ai++;
+		bi++;
+	}
 }
 
-
-
-static int
-compare_right(nat_char const *a, nat_char const *b)
+int strnatcmp(char const *a, char const *b)
 {
-     int bias = 0;
-     
-     /* The longest run of digits wins.  That aside, the greatest
-	value wins, but we can't know that it will until we've scanned
-	both numbers to know that they have the same magnitude, so we
-	remember it in BIAS. */
-     for (;; a++, b++) {
-	  if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
-	       return bias;
-	  else if (!nat_isdigit(*a))
-	       return -1;
-	  else if (!nat_isdigit(*b))
-	       return +1;
-	  else if (*a < *b) {
-	       if (!bias)
-		    bias = -1;
-	  } else if (*a > *b) {
-	       if (!bias)
-		    bias = +1;
-	  } else if (!*a  &&  !*b)
-	       return bias;
-     }
-
-     return 0;
+	return strnatcmp0(a, b, 0);
 }
 
-
-static int
-compare_left(nat_char const *a, nat_char const *b)
+int strnatcasecmp(char const *a, char const *b)
 {
-     /* Compare two left-aligned numbers: the first to have a
-        different value wins. */
-     for (;; a++, b++) {
-	  if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
-	       return 0;
-	  else if (!nat_isdigit(*a))
-	       return -1;
-	  else if (!nat_isdigit(*b))
-	       return +1;
-	  else if (*a < *b)
-	       return -1;
-	  else if (*a > *b)
-	       return +1;
-     }
-	  
-     return 0;
-}
-
-
-static int strnatcmp0(nat_char const *a, nat_char const *b, int fold_case)
-{
-     int ai, bi;
-     nat_char ca, cb;
-     int fractional, result;
-     
-     assert(a && b);
-     ai = bi = 0;
-     while (1) {
-	  ca = a[ai]; cb = b[bi];
-
-	  /* skip over leading spaces or zeros */
-	  while (nat_isspace(ca))
-	       ca = a[++ai];
-
-	  while (nat_isspace(cb))
-	       cb = b[++bi];
-
-	  /* process run of digits */
-	  if (nat_isdigit(ca)  &&  nat_isdigit(cb)) {
-	       fractional = (ca == '0' || cb == '0');
-
-	       if (fractional) {
-		    if ((result = compare_left(a+ai, b+bi)) != 0)
-			 return result;
-	       } else {
-		    if ((result = compare_right(a+ai, b+bi)) != 0)
-			 return result;
-	       }
-	  }
-
-	  if (!ca && !cb) {
-	       /* The strings compare the same.  Perhaps the caller
-                  will want to call strcmp to break the tie. */
-	       return 0;
-	  }
-
-	  if (fold_case) {
-	       ca = nat_toupper(ca);
-	       cb = nat_toupper(cb);
-	  }
-	  
-	  if (ca < cb)
-	       return -1;
-	  else if (ca > cb)
-	       return +1;
-
-	  ++ai; ++bi;
-     }
-}
-
-
-
-int strnatcmp(nat_char const *a, nat_char const *b) {
-     return strnatcmp0(a, b, 0);
-}
-
-
-/* Compare, recognizing numeric string and ignoring case. */
-int strnatcasecmp(nat_char const *a, nat_char const *b) {
-     return strnatcmp0(a, b, 1);
+	return strnatcmp0(a, b, 1);
 }

src/util/strnatcmp.h

@@ -20,12 +20,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
+// Compare, recognizing numeric strings. Case sensitive.
+int strnatcmp(char const *a, char const *b);
 
-/* CUSTOMIZATION SECTION
- *
- * You can change this typedef, but must then also change the inline
- * functions in strnatcmp.c */
-typedef char nat_char;
-
-int strnatcmp(nat_char const *a, nat_char const *b);
-int strnatcasecmp(nat_char const *a, nat_char const *b);
+// Compare, recognizing numeric strings. Case insensitive.
+int strnatcasecmp(char const *a, char const *b);

src/util/timer.c

@@ -22,10 +22,9 @@
 
 #include "timer.h"
 
-GSList* timeout_list;
+GSList *timeout_list;
 struct timeval next_timeout;
-GHashTable* multi_timeouts;
-
+GHashTable *multi_timeouts;
 
 // functions and structs for multi timeouts
 typedef struct {
@@ -34,32 +33,31 @@ typedef struct {
 } multi_timeout;
 
 typedef struct {
-	GSList* timeout_list;
-	timeout* parent_timeout;
+	GSList *timeout_list;
+	timeout *parent_timeout;
 } multi_timeout_handler;
 
 struct _timeout {
 	int interval_msec;
 	struct timespec timeout_expires;
-	void (*_callback)(void*);
-	void* arg;
-	multi_timeout* multi_timeout;
+	void (*_callback)(void *);
+	void *arg;
+	multi_timeout *multi_timeout;
 	timeout **self;
 };
 
-void add_timeout_intern(int value_msec, int interval_msec, void(*_callback)(void*), void* arg, timeout* t);
+void add_timeout_intern(int value_msec, int interval_msec, void (*_callback)(void *), void *arg, timeout *t);
 gint compare_timeouts(gconstpointer t1, gconstpointer t2);
-int timespec_subtract(struct timespec* result, struct timespec* x, struct timespec* y);
+int timespec_subtract(struct timespec *result, struct timespec *x, struct timespec *y);
 
-
-int align_with_existing_timeouts(timeout* t);
-void create_multi_timeout(timeout* t1, timeout* t2);
-void append_multi_timeout(timeout* t1, timeout* t2);
-int calc_multi_timeout_interval(multi_timeout_handler* mth);
-void update_multi_timeout_values(multi_timeout_handler* mth);
-void callback_multi_timeout(void* mth);
-void remove_from_multi_timeout(timeout* t);
-void stop_multi_timeout(timeout* t);
+int align_with_existing_timeouts(timeout *t);
+void create_multi_timeout(timeout *t1, timeout *t2);
+void append_multi_timeout(timeout *t1, timeout *t2);
+int calc_multi_timeout_interval(multi_timeout_handler *mth);
+void update_multi_timeout_values(multi_timeout_handler *mth);
+void callback_multi_timeout(void *mth);
+void remove_from_multi_timeout(timeout *t);
+void stop_multi_timeout(timeout *t);
 
 void default_timeout()
 {
@@ -70,7 +68,7 @@ void default_timeout()
 void cleanup_timeout()
 {
 	while (timeout_list) {
-		timeout* t = timeout_list->data;
+		timeout *t = timeout_list->data;
 		if (t->multi_timeout)
 			stop_multi_timeout(t);
 		if (t->self)
@@ -84,28 +82,29 @@ void cleanup_timeout()
 	}
 }
 
-/** Implementation notes for timeouts: The timeouts are kept in a GSList sorted by their
-	* expiration time.
-	* That means that update_next_timeout() only have to consider the first timeout in the list,
-	* and callback_timeout_expired() only have to consider the timeouts as long as the expiration time
-	* is in the past to the current time.
-	* As time measurement we use clock_gettime(CLOCK_MONOTONIC) because this refers to a timer, which
-	* reference point lies somewhere in the past and cannot be changed, but just queried.
-	* If a single shot timer is installed it will be automatically deleted. I.e. the returned value
-	* of add_timeout will not be valid anymore. You do not need to call stop_timeout for these timeouts,
-	* however it's save to call it.
-**/
+// Implementation notes for timeouts
+//
+// The timeouts are kept in a GSList sorted by their expiration time.
+// That means that update_next_timeout() only have to consider the first timeout in the list,
+// and callback_timeout_expired() only have to consider the timeouts as long as the expiration time
+// is in the past to the current time.
+// As time measurement we use clock_gettime(CLOCK_MONOTONIC) because this refers to a timer, which
+// reference point lies somewhere in the past and cannot be changed, but just queried.
+// If a single shot timer is installed it will be automatically deleted. I.e. the returned value
+// of add_timeout will not be valid anymore. You do not need to call stop_timeout for these timeouts,
+// however it's save to call it.
 
-timeout* add_timeout(int value_msec, int interval_msec, void (*_callback)(void*), void* arg, timeout **self)
+timeout *add_timeout(int value_msec, int interval_msec, void (*_callback)(void *), void *arg, timeout **self)
 {
-	timeout* t = calloc(1, sizeof(timeout));
+	if (self && *self)
+		return *self;
+	timeout *t = calloc(1, sizeof(timeout));
 	t->self = self;
 	add_timeout_intern(value_msec, interval_msec, _callback, arg, t);
 	return t;
 }
 
-
-void change_timeout(timeout **t, int value_msec, int interval_msec, void(*_callback)(), void* arg)
+void change_timeout(timeout **t, int value_msec, int interval_msec, void (*_callback)(), void *arg)
 {
 	if (!((timeout_list && g_slist_find(timeout_list, *t)) ||
 		  (multi_timeouts && g_hash_table_lookup(multi_timeouts, *t))))
@@ -119,32 +118,28 @@ void change_timeout(timeout **t, int value_msec, int interval_msec, void(*_callb
 	}
 }
 
-
 void update_next_timeout()
 {
 	if (timeout_list) {
-		timeout* t = timeout_list->data;
+		timeout *t = timeout_list->data;
 		struct timespec cur_time;
-		struct timespec next_timeout2 = { .tv_sec=next_timeout.tv_sec, .tv_nsec=next_timeout.tv_usec*1000 };
+		struct timespec next_timeout2 = {.tv_sec = next_timeout.tv_sec, .tv_nsec = next_timeout.tv_usec * 1000};
 		clock_gettime(CLOCK_MONOTONIC, &cur_time);
 		if (timespec_subtract(&next_timeout2, &t->timeout_expires, &cur_time)) {
 			next_timeout.tv_sec = 0;
 			next_timeout.tv_usec = 0;
-		}
-		else {
+		} else {
 			next_timeout.tv_sec = next_timeout2.tv_sec;
-			next_timeout.tv_usec = next_timeout2.tv_nsec/1000;
+			next_timeout.tv_usec = next_timeout2.tv_nsec / 1000;
 		}
-	}
-	else
+	} else
 		next_timeout.tv_sec = -1;
 }
 
-
 void callback_timeout_expired()
 {
 	struct timespec cur_time;
-	timeout* t;
+	timeout *t;
 	while (timeout_list) {
 		clock_gettime(CLOCK_MONOTONIC, &cur_time);
 		t = timeout_list->data;
@@ -170,14 +165,12 @@ void callback_timeout_expired()
 	}
 }
 
-
-void stop_timeout(timeout* t)
+void stop_timeout(timeout *t)
 {
 	if (!t)
 		return;
 	// if not in the list, it was deleted in callback_timeout_expired
-	if ((timeout_list && g_slist_find(timeout_list, t)) ||
-		(multi_timeouts && g_hash_table_lookup(multi_timeouts, t))) {
+	if ((timeout_list && g_slist_find(timeout_list, t)) || (multi_timeouts && g_hash_table_lookup(multi_timeouts, t))) {
 		if (multi_timeouts && t->multi_timeout)
 			remove_from_multi_timeout(t);
 		if (timeout_list)
@@ -188,8 +181,7 @@ void stop_timeout(timeout* t)
 	}
 }
 
-
-void add_timeout_intern(int value_msec, int interval_msec, void(*_callback)(), void* arg, timeout *t)
+void add_timeout_intern(int value_msec, int interval_msec, void (*_callback)(), void *arg, timeout *t)
 {
 	t->interval_msec = interval_msec;
 	t->_callback = _callback;
@@ -205,15 +197,12 @@ void add_timeout_intern(int value_msec, int interval_msec, void(*_callback)(), v
 		timeout_list = g_slist_insert_sorted(timeout_list, t, compare_timeouts);
 }
 
-
 gint compare_timeouts(gconstpointer t1, gconstpointer t2)
 {
-	return compare_timespecs(&((timeout*)t1)->timeout_expires,
-							 &((timeout*)t2)->timeout_expires);
+	return compare_timespecs(&((const timeout *)t1)->timeout_expires, &((const timeout *)t2)->timeout_expires);
 }
 
-
-gint compare_timespecs(const struct timespec* t1, const struct timespec* t2)
+gint compare_timespecs(const struct timespec *t1, const struct timespec *t2)
 {
 	if (t1->tv_sec < t2->tv_sec)
 		return -1;
@@ -224,12 +213,11 @@ gint compare_timespecs(const struct timespec* t1, const struct timespec* t2)
 			return 0;
 		else
 			return 1;
-	}
-	else
+	} else
 		return 1;
 }
 
-int timespec_subtract(struct timespec* result, struct timespec* x, struct timespec* y)
+int timespec_subtract(struct timespec *result, struct timespec *x, struct timespec *y)
 {
 	/* Perform the carry for the later subtraction by updating y. */
 	if (x->tv_nsec < y->tv_nsec) {
@@ -251,27 +239,25 @@ int timespec_subtract(struct timespec* result, struct timespec* x, struct timesp
 	return x->tv_sec < y->tv_sec;
 }
 
-
 struct timespec add_msec_to_timespec(struct timespec ts, int msec)
 {
 	ts.tv_sec += msec / 1000;
-	ts.tv_nsec += (msec % 1000)*1000000;
-	if (ts.tv_nsec >= 1000000000) {  // 10^9
+	ts.tv_nsec += (msec % 1000) * 1000000;
+	if (ts.tv_nsec >= 1000000000) { // 10^9
 		ts.tv_sec++;
 		ts.tv_nsec -= 1000000000;
 	}
 	return ts;
 }
 
-
 int align_with_existing_timeouts(timeout *t)
 {
-	GSList* it = timeout_list;
+	GSList *it = timeout_list;
 	while (it) {
-		timeout* t2 = it->data;
+		timeout *t2 = it->data;
 		if (t2->interval_msec > 0) {
 			if (t->interval_msec % t2->interval_msec == 0 || t2->interval_msec % t->interval_msec == 0) {
-				if (multi_timeouts == 0)
+				if (!multi_timeouts)
 					multi_timeouts = g_hash_table_new(0, 0);
 				if (!t->multi_timeout && !t2->multi_timeout) {
 					// both timeouts can be aligned, but there is no multi timeout for them
@@ -288,11 +274,10 @@ int align_with_existing_timeouts(timeout *t)
 	return 0;
 }
 
-
-int calc_multi_timeout_interval(multi_timeout_handler* mth)
+int calc_multi_timeout_interval(multi_timeout_handler *mth)
 {
-	GSList* it = mth->timeout_list;
-	timeout* t = it->data;
+	GSList *it = mth->timeout_list;
+	timeout *t = it->data;
 	int min_interval = t->interval_msec;
 	it = it->next;
 	while (it) {
@@ -304,13 +289,12 @@ int calc_multi_timeout_interval(multi_timeout_handler* mth)
 	return min_interval;
 }
 
-
-void create_multi_timeout(timeout* t1, timeout* t2)
+void create_multi_timeout(timeout *t1, timeout *t2)
 {
-	multi_timeout* mt1 = calloc(1, sizeof(multi_timeout));
-	multi_timeout* mt2 = calloc(1, sizeof(multi_timeout));
-	multi_timeout_handler* mth = calloc(1, sizeof(multi_timeout_handler));
-	timeout* real_timeout = calloc(1, sizeof(timeout));
+	multi_timeout *mt1 = calloc(1, sizeof(multi_timeout));
+	multi_timeout *mt2 = calloc(1, sizeof(multi_timeout));
+	multi_timeout_handler *mth = calloc(1, sizeof(multi_timeout_handler));
+	timeout *real_timeout = calloc(1, sizeof(timeout));
 
 	mth->timeout_list = 0;
 	mth->timeout_list = g_slist_prepend(mth->timeout_list, t1);
@@ -325,7 +309,7 @@ void create_multi_timeout(timeout* t1, timeout* t2)
 	t2->multi_timeout = mt2;
 	// set real_timeout->multi_timeout to something, such that we see in add_timeout_intern that
 	// it is already a multi_timeout (we never use it, except of checking for 0 ptr)
-	real_timeout->multi_timeout = (void*)real_timeout;
+	real_timeout->multi_timeout = (void *)real_timeout;
 
 	timeout_list = g_slist_remove(timeout_list, t1);
 	timeout_list = g_slist_remove(timeout_list, t2);
@@ -333,18 +317,17 @@ void create_multi_timeout(timeout* t1, timeout* t2)
 	update_multi_timeout_values(mth);
 }
 
-
-void append_multi_timeout(timeout* t1, timeout* t2)
+void append_multi_timeout(timeout *t1, timeout *t2)
 {
 	if (t2->multi_timeout) {
 		// swap t1 and t2 such that t1 is the multi timeout
-		timeout* tmp = t2;
+		timeout *tmp = t2;
 		t2 = t1;
 		t1 = tmp;
 	}
 
-	multi_timeout* mt = calloc(1, sizeof(multi_timeout));
-	multi_timeout_handler* mth = g_hash_table_lookup(multi_timeouts, t1);
+	multi_timeout *mt = calloc(1, sizeof(multi_timeout));
+	multi_timeout_handler *mth = g_hash_table_lookup(multi_timeouts, t1);
 
 	mth->timeout_list = g_slist_prepend(mth->timeout_list, t2);
 	g_hash_table_insert(multi_timeouts, t2, mth);
@@ -354,8 +337,7 @@ void append_multi_timeout(timeout* t1, timeout* t2)
 	update_multi_timeout_values(mth);
 }
 
-
-void update_multi_timeout_values(multi_timeout_handler* mth)
+void update_multi_timeout_values(multi_timeout_handler *mth)
 {
 	int interval = calc_multi_timeout_interval(mth);
 	int next_timeout_msec = interval;
@@ -363,14 +345,14 @@ void update_multi_timeout_values(multi_timeout_handler* mth)
 	struct timespec cur_time;
 	clock_gettime(CLOCK_MONOTONIC, &cur_time);
 
-	GSList* it = mth->timeout_list;
+	GSList *it = mth->timeout_list;
 	struct timespec diff_time;
 	while (it) {
-		timeout* t = it->data;
+		timeout *t = it->data;
 		t->multi_timeout->count_to_expiration = t->interval_msec / interval;
 		timespec_subtract(&diff_time, &t->timeout_expires, &cur_time);
-		int msec_to_expiration = diff_time.tv_sec*1000 + diff_time.tv_nsec/1000000;
-		int count_left = msec_to_expiration / interval + (msec_to_expiration%interval != 0);
+		int msec_to_expiration = diff_time.tv_sec * 1000 + diff_time.tv_nsec / 1000000;
+		int count_left = msec_to_expiration / interval + (msec_to_expiration % interval != 0);
 		t->multi_timeout->current_count = t->multi_timeout->count_to_expiration - count_left;
 		if (msec_to_expiration < next_timeout_msec)
 			next_timeout_msec = msec_to_expiration;
@@ -382,15 +364,14 @@ void update_multi_timeout_values(multi_timeout_handler* mth)
 	add_timeout_intern(next_timeout_msec, interval, callback_multi_timeout, mth, mth->parent_timeout);
 }
 
-
-void callback_multi_timeout(void* arg)
+void callback_multi_timeout(void *arg)
 {
-	multi_timeout_handler* mth = arg;
+	multi_timeout_handler *mth = arg;
 	struct timespec cur_time;
 	clock_gettime(CLOCK_MONOTONIC, &cur_time);
-	GSList* it = mth->timeout_list;
+	GSList *it = mth->timeout_list;
 	while (it) {
-		timeout* t = it->data;
+		timeout *t = it->data;
 		if (++t->multi_timeout->current_count >= t->multi_timeout->count_to_expiration) {
 			t->_callback(t->arg);
 			if (multi_timeouts && g_hash_table_lookup(multi_timeouts, t)) {
@@ -405,10 +386,9 @@ void callback_multi_timeout(void* arg)
 	}
 }
 
-
-void remove_from_multi_timeout(timeout* t)
+void remove_from_multi_timeout(timeout *t)
 {
-	multi_timeout_handler* mth = g_hash_table_lookup(multi_timeouts, t);
+	multi_timeout_handler *mth = g_hash_table_lookup(multi_timeouts, t);
 	g_hash_table_remove(multi_timeouts, t);
 
 	mth->timeout_list = g_slist_remove(mth->timeout_list, t);
@@ -416,7 +396,7 @@ void remove_from_multi_timeout(timeout* t)
 	t->multi_timeout = 0;
 
 	if (g_slist_length(mth->timeout_list) == 1) {
-		timeout* last_timeout = mth->timeout_list->data;
+		timeout *last_timeout = mth->timeout_list->data;
 		mth->timeout_list = g_slist_remove(mth->timeout_list, last_timeout);
 		free(last_timeout->multi_timeout);
 		last_timeout->multi_timeout = 0;
@@ -429,20 +409,22 @@ void remove_from_multi_timeout(timeout* t)
 		struct timespec cur_time, diff_time;
 		clock_gettime(CLOCK_MONOTONIC, &cur_time);
 		timespec_subtract(&diff_time, &t->timeout_expires, &cur_time);
-		int msec_to_expiration = diff_time.tv_sec*1000 + diff_time.tv_nsec/1000000;
-		add_timeout_intern(msec_to_expiration, last_timeout->interval_msec, last_timeout->_callback, last_timeout->arg, last_timeout);
-	}
-	else
+		int msec_to_expiration = diff_time.tv_sec * 1000 + diff_time.tv_nsec / 1000000;
+		add_timeout_intern(msec_to_expiration,
+						   last_timeout->interval_msec,
+						   last_timeout->_callback,
+						   last_timeout->arg,
+						   last_timeout);
+	} else
 		update_multi_timeout_values(mth);
 }
 
-
-void stop_multi_timeout(timeout* t)
+void stop_multi_timeout(timeout *t)
 {
-	multi_timeout_handler* mth = g_hash_table_lookup(multi_timeouts, t);
+	multi_timeout_handler *mth = g_hash_table_lookup(multi_timeouts, t);
 	g_hash_table_remove(multi_timeouts, mth->parent_timeout);
 	while (mth->timeout_list) {
-		timeout* t1 = mth->timeout_list->data;
+		timeout *t1 = mth->timeout_list->data;
 		mth->timeout_list = g_slist_remove(mth->timeout_list, t1);
 		g_hash_table_remove(multi_timeouts, t1);
 		free(t1->multi_timeout);
@@ -452,11 +434,17 @@ void stop_multi_timeout(timeout* t)
 }
 
 double profiling_get_time_old_time = 0;
-double profiling_get_time()
+
+double get_time()
 {
 	struct timespec cur_time;
 	clock_gettime(CLOCK_MONOTONIC, &cur_time);
-	double t = cur_time.tv_sec + cur_time.tv_nsec * 1.0e-9;
+	return cur_time.tv_sec + cur_time.tv_nsec * 1.0e-9;
+}
+
+double profiling_get_time()
+{
+	double t = get_time();
 	if (profiling_get_time_old_time == 0)
 		profiling_get_time_old_time = t;
 	double delta = t - profiling_get_time_old_time;

src/util/timer.h

@@ -1,4 +1,4 @@
-/**************************************************************************
+/*************************************************************************
 *
 * Copyright (C) 2009 Andreas.Fink (Andreas.Fink85@gmail.com)
 *
@@ -15,7 +15,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **************************************************************************/
 
-
 #ifndef TIMER_H
 #define TIMER_H
 
@@ -23,59 +22,53 @@
 #include <time.h>
 #include <sys/time.h>
 
+// Single shot timers (i.e. timers with interval_msec == 0) are deleted automatically as soon as they expire,
+// i.e. you do not need to stop them, however it is safe to call stop_timeout for these timers.
+// You can pass the address of the variable storing the pointer to the timer as 'self' in add_timeout, in which
+// case it is used to clear the pointer if the timer is destroyed automatically. This enforces the timeout pointers
+// to be either valid or NULL.
+// Periodic timeouts are aligned to each other whenever possible, i.e. one interval_msec is an
+// integral multiple of the other.
+
 extern struct timeval next_timeout;
-
-
 typedef struct _timeout timeout;
 
-
-// timer functions
-/**
-  * Single shot timers (i.e. timers with interval_msec == 0) are deleted automatically as soon as they expire,
-  * i.e. you do not need to stop them, however it is safe to call stop_timeout for these timers.
-  * You can pass the address of the variable storing the pointer to the timer as 'self' in add_timeout, in which
-  * case it is used to clear the pointer if the timer is destroyed automatically. This enforces the timeout pointers
-  * to be either valid or NULL.
-  * Periodic timeouts are aligned to each other whenever possible, i.e. one interval_msec is an
-  * integral multiple of the other.
-**/
-
-/** Initializes default global data. **/
+// Initializes default global data.
 void default_timeout();
 
-/** Cleans up: stops all timers and frees memory. **/
+// Cleans up: stops all timers and frees memory.
 void cleanup_timeout();
 
-/** Installs a timer with the first timeout after 'value_msec' and then an optional periodic timeout every
-  * 'interval_msec' (set it to 0 to prevent periodic timeouts).
-  * '_callback' is the function called when the timer reaches the timeout.
-  * 'arg' is the argument passed to the callback function.
-  * 'self' is an optional pointer to a timeout* variable. If non-NULL, the variable is set to NULL when the timer
-  * is destroyed (with stop_timeout, cleanup_timeout or when the timer expires and it is single-shot).
-  * Returns a pointer to the timer, which is needed for stopping/changing it.
-**/
-timeout* add_timeout(int value_msec, int interval_msec, void (*_callback)(void*), void* arg, timeout **self);
+// Installs a timer with the first timeout after 'value_msec' and then an optional periodic timeout every
+// 'interval_msec' (set it to 0 to prevent periodic timeouts).
+// '_callback' is the function called when the timer reaches the timeout.
+// 'arg' is the argument passed to the callback function.
+// 'self' is an optional pointer to a timeout* variable. If non-NULL, the variable is set to NULL when the timer
+// is destroyed (with stop_timeout, cleanup_timeout or when the timer expires and it is single-shot).
+// Returns a pointer to the timer, which is needed for stopping/changing it.
+timeout *add_timeout(int value_msec, int interval_msec, void (*_callback)(void *), void *arg, timeout **self);
 
-/** Changes timer 't'. If it does not exist, a new timer is created, with self set to 't'. **/
-void change_timeout(timeout** t, int value_msec, int interval_msec, void (*_callback)(void*), void* arg);
+// Changes timer 't'. If it does not exist, a new timer is created, with self set to 't'.
+void change_timeout(timeout **t, int value_msec, int interval_msec, void (*_callback)(void *), void *arg);
 
-/** stops the timeout 't' **/
-void stop_timeout(timeout* t);
+// Stops the timer 't'
+void stop_timeout(timeout *t);
 
-/** update_next_timeout updates next_timeout to the value, when the next installed timeout will expire **/
+// Updates next_timeout to the value, when the next installed timeout will expire
 void update_next_timeout();
 
-/** Callback of all expired timeouts **/
+// Callback of all expired timeouts
 void callback_timeout_expired();
 
-/** Returns -1 if t1 < t2, 0 if t1 == t2, 1 if t1 > t2 **/
-gint compare_timespecs(const struct timespec* t1, const struct timespec* t2);
+// Returns -1 if t1 < t2, 0 if t1 == t2, 1 if t1 > t2
+gint compare_timespecs(const struct timespec *t1, const struct timespec *t2);
 
 struct timespec add_msec_to_timespec(struct timespec ts, int msec);
 
-/** Returns the time difference in seconds between the current time and the last time this function was called.
-  * At the first call returns zero.
-**/
+// Returns the time difference in seconds between the current time and the last time this function was called.
+// At the first call returns zero.
 double profiling_get_time();
 
+double get_time();
+
 #endif // TIMER_H

src/util/uevent.c

@@ -0,0 +1,207 @@
+/**************************************************************************
+*
+* Linux Kernel uevent handler
+*
+* 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 ENABLE_UEVENT
+
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <sys/socket.h>
+#include <sys/types.h>
+
+#include <linux/types.h>
+#include <linux/netlink.h>
+
+#include "common.h"
+#include "uevent.h"
+
+static int ueventfd = -1;
+static struct sockaddr_nl nls;
+static GList *notifiers = NULL;
+
+static const char *has_prefix(const char *str, const char *end, const char *prefix, size_t prefixlen)
+{
+	if ((end - str) < prefixlen)
+		return NULL;
+
+	if (!memcmp(str, prefix, prefixlen))
+		return str + prefixlen;
+
+	return NULL;
+}
+
+#define HAS_CONST_PREFIX(str, end, prefix) has_prefix((str), end, prefix, sizeof(prefix) - 1)
+
+static void uevent_param_free(gpointer data)
+{
+	struct uevent_parameter *param = data;
+	free(param->key);
+	free(param->val);
+	free(param);
+}
+
+static void uevent_free(struct uevent *ev)
+{
+	free(ev->path);
+	free(ev->subsystem);
+	g_list_free_full(ev->params, uevent_param_free);
+	free(ev);
+}
+
+static struct uevent *uevent_new(char *buffer, int size)
+{
+	gboolean first = TRUE;
+
+	if (size == 0)
+		return NULL;
+
+	struct uevent *ev = calloc(1, sizeof(*ev));
+	if (!ev)
+		return NULL;
+
+	/* ensure nul termination required by strlen() */
+	buffer[size - 1] = '\0';
+
+	const char *s = buffer;
+	const char *end = s + size;
+	for (; s < end; s += strlen(s) + 1) {
+		if (first) {
+			const char *p = strchr(s, '@');
+			if (!p) {
+				/* error: kernel events contain @ */
+				/* triggered by udev events, though */
+				free(ev);
+				return NULL;
+			}
+			ev->path = strdup(p + 1);
+			first = FALSE;
+		} else {
+			const char *val;
+			if ((val = HAS_CONST_PREFIX(s, end, "ACTION=")) != NULL) {
+				if (!strcmp(val, "add"))
+					ev->action = UEVENT_ADD;
+				else if (!strcmp(val, "remove"))
+					ev->action = UEVENT_REMOVE;
+				else if (!strcmp(val, "change"))
+					ev->action = UEVENT_CHANGE;
+				else
+					ev->action = UEVENT_UNKNOWN;
+			} else if ((val = HAS_CONST_PREFIX(s, end, "SEQNUM=")) != NULL) {
+				ev->sequence = atoi(val);
+			} else if ((val = HAS_CONST_PREFIX(s, end, "SUBSYSTEM=")) != NULL) {
+				ev->subsystem = strdup(val);
+			} else {
+				val = strchr(s, '=');
+				if (val) {
+					struct uevent_parameter *param = malloc(sizeof(*param));
+					if (param) {
+						param->key = strndup(s, val - s);
+						param->val = strdup(val + 1);
+						ev->params = g_list_append(ev->params, param);
+					}
+				}
+			}
+		}
+	}
+
+	return ev;
+}
+
+void uevent_register_notifier(struct uevent_notify *nb)
+{
+	notifiers = g_list_append(notifiers, nb);
+}
+
+void uevent_unregister_notifier(struct uevent_notify *nb)
+{
+	GList *l = notifiers;
+
+	while (l != NULL) {
+		GList *next = l->next;
+		struct uevent_notify *lnb = l->data;
+
+		if (memcmp(nb, lnb, sizeof(struct uevent_notify)) == 0)
+			notifiers = g_list_delete_link(notifiers, l);
+
+		l = next;
+	}
+}
+
+void uevent_handler()
+{
+	if (ueventfd < 0)
+		return;
+
+	char buf[512];
+	int len = recv(ueventfd, buf, sizeof(buf), MSG_DONTWAIT);
+	if (len < 0)
+		return;
+
+	struct uevent *ev = uevent_new(buf, len);
+	if (ev) {
+		for (GList *l = notifiers; l; l = l->next) {
+			struct uevent_notify *nb = l->data;
+
+			if (!(ev->action & nb->action))
+				continue;
+
+			if (nb->subsystem && strcmp(ev->subsystem, nb->subsystem))
+				continue;
+
+			nb->cb(ev, nb->userdata);
+		}
+
+		uevent_free(ev);
+	}
+}
+
+int uevent_init()
+{
+	/* Open hotplug event netlink socket */
+	memset(&nls, 0, sizeof(struct sockaddr_nl));
+	nls.nl_family = AF_NETLINK;
+	nls.nl_pid = getpid();
+	nls.nl_groups = -1;
+
+	/* open socket */
+	ueventfd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
+	if (ueventfd < 0) {
+		fprintf(stderr, "Error: socket open failed\n");
+		return -1;
+	}
+
+	/* Listen to netlink socket */
+	if (bind(ueventfd, (void *)&nls, sizeof(struct sockaddr_nl))) {
+		fprintf(stderr, "Bind failed\n");
+		return -1;
+	}
+
+	printf("Kernel uevent interface initialized...\n");
+
+	return ueventfd;
+}
+
+void uevent_cleanup()
+{
+	if (ueventfd >= 0)
+		close(ueventfd);
+}
+
+#endif

src/util/uevent.h

@@ -0,0 +1,81 @@
+/**************************************************************************
+*
+* Linux Kernel uevent handler
+*
+* 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.
+**************************************************************************/
+
+#ifndef UEVENT_H
+#define UEVENT_H
+
+enum uevent_action {
+	UEVENT_UNKNOWN = 0x01,
+	UEVENT_ADD = 0x02,
+	UEVENT_REMOVE = 0x04,
+	UEVENT_CHANGE = 0x08,
+};
+
+struct uevent_parameter {
+	char *key;
+	char *val;
+};
+
+struct uevent {
+	char *path;
+	enum uevent_action action;
+	int sequence;
+	char *subsystem;
+	GList *params;
+};
+
+struct uevent_notify {
+	int action;      /* bitfield */
+	char *subsystem; /* NULL => any */
+	void *userdata;
+
+	void (*cb)(struct uevent *e, void *userdata);
+};
+
+#if ENABLE_UEVENT
+int uevent_init();
+void uevent_cleanup();
+void uevent_handler();
+
+void uevent_register_notifier(struct uevent_notify *nb);
+void uevent_unregister_notifier(struct uevent_notify *nb);
+#else
+static inline int uevent_init()
+{
+	return -1;
+}
+
+static inline void uevent_cleanup()
+{
+}
+
+static inline void uevent_handler()
+{
+}
+
+static inline void uevent_register_notifier(struct uevent_notify *nb)
+{
+}
+
+static inline void uevent_unregister_notifier(struct uevent_notify *nb)
+{
+}
+#endif
+
+#endif

src/util/window.c

@@ -35,236 +35,247 @@
 #include "panel.h"
 #include "taskbar.h"
 
-
-
-void set_active (Window win)
+void activate_window(Window win)
 {
-	send_event32 (win, server.atom._NET_ACTIVE_WINDOW, 2, CurrentTime, 0);
+	send_event32(win, server.atom._NET_ACTIVE_WINDOW, 2, CurrentTime, 0);
 }
 
-
-void set_desktop (int desktop)
+void change_window_desktop(Window win, int desktop)
 {
-	send_event32 (server.root_win, server.atom._NET_CURRENT_DESKTOP, desktop, 0, 0);
+	send_event32(win, server.atom._NET_WM_DESKTOP, desktop, 2, 0);
 }
 
-
-void windows_set_desktop (Window win, int desktop)
+void close_window(Window win)
 {
-	send_event32 (win, server.atom._NET_WM_DESKTOP, desktop, 2, 0);
+	send_event32(win, server.atom._NET_CLOSE_WINDOW, 0, 2, 0);
 }
 
-
-void set_close (Window win)
+void toggle_window_shade(Window win)
 {
-	send_event32 (win, server.atom._NET_CLOSE_WINDOW, 0, 2, 0);
+	send_event32(win, server.atom._NET_WM_STATE, 2, server.atom._NET_WM_STATE_SHADED, 0);
 }
 
-
-void window_toggle_shade (Window win)
+void toggle_window_maximized(Window win)
 {
-	send_event32 (win, server.atom._NET_WM_STATE, 2, server.atom._NET_WM_STATE_SHADED, 0);
+	send_event32(win, server.atom._NET_WM_STATE, 2, server.atom._NET_WM_STATE_MAXIMIZED_VERT, 0);
+	send_event32(win, server.atom._NET_WM_STATE, 2, server.atom._NET_WM_STATE_MAXIMIZED_HORZ, 0);
 }
 
-
-void window_maximize_restore (Window win)
-{
-	send_event32 (win, server.atom._NET_WM_STATE, 2, server.atom._NET_WM_STATE_MAXIMIZED_VERT, 0);
-	send_event32 (win, server.atom._NET_WM_STATE, 2, server.atom._NET_WM_STATE_MAXIMIZED_HORZ, 0);
-}
-
-
-int window_is_hidden (Window win)
+gboolean window_is_hidden(Window win)
 {
 	Window window;
-	Atom *at;
-	int count, i;
+	int count;
 
-	at = server_get_property (win, server.atom._NET_WM_STATE, XA_ATOM, &count);
-	for (i = 0; i < count; i++) {
+	Atom *at = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+	for (int i = 0; i < count; i++) {
 		if (at[i] == server.atom._NET_WM_STATE_SKIP_TASKBAR) {
 			XFree(at);
-			return 1;
+			return TRUE;
 		}
 		// do not add transient_for windows if the transient window is already in the taskbar
-		window=win;
-		while ( XGetTransientForHint(server.dsp, window, &window) ) {
-			if ( task_get_tasks(window) ) {
+		window = win;
+		while (XGetTransientForHint(server.display, window, &window)) {
+			if (get_task_buttons(window)) {
 				XFree(at);
-				return 1;
+				return TRUE;
 			}
 		}
 	}
 	XFree(at);
 
-	at = server_get_property (win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, &count);
-	for (i = 0; i < count; i++) {
-		if (at[i] == server.atom._NET_WM_WINDOW_TYPE_DOCK || at[i] == server.atom._NET_WM_WINDOW_TYPE_DESKTOP || at[i] == server.atom._NET_WM_WINDOW_TYPE_TOOLBAR || at[i] == server.atom._NET_WM_WINDOW_TYPE_MENU || at[i] == server.atom._NET_WM_WINDOW_TYPE_SPLASH) {
+	at = server_get_property(win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, &count);
+	for (int i = 0; i < count; i++) {
+		if (at[i] == server.atom._NET_WM_WINDOW_TYPE_DOCK || at[i] == server.atom._NET_WM_WINDOW_TYPE_DESKTOP ||
+			at[i] == server.atom._NET_WM_WINDOW_TYPE_TOOLBAR || at[i] == server.atom._NET_WM_WINDOW_TYPE_MENU ||
+			at[i] == server.atom._NET_WM_WINDOW_TYPE_SPLASH) {
 			XFree(at);
-			return 1;
+			return TRUE;
 		}
 	}
 	XFree(at);
 
-	for (i=0 ; i < nb_panel ; i++) {
-		if (panel1[i].main_win == win) {
-			return 1;
+	for (int i = 0; i < num_panels; i++) {
+		if (panels[i].main_win == win) {
+			return TRUE;
 		}
 	}
 
 	// specification
 	// Windows with neither _NET_WM_WINDOW_TYPE nor WM_TRANSIENT_FOR set
 	// MUST be taken as top-level window.
-	return 0;
+	return FALSE;
 }
 
-
-int window_get_desktop (Window win)
+int get_window_desktop(Window win)
 {
-	return get_property32(win, server.atom._NET_WM_DESKTOP, XA_CARDINAL);
-}
+	int desktop = get_property32(win, server.atom._NET_WM_DESKTOP, XA_CARDINAL);
+	if (desktop == ALL_DESKTOPS)
+		return desktop;
+	if (!server.viewports)
+		return CLAMP(desktop, 0, server.num_desktops - 1);
 
+	int x, y, w, h;
+	get_window_coordinates(win, &x, &y, &w, &h);
 
-int window_get_monitor (Window win)
-{
-	int i, x, y;
-	Window src;
+	desktop = get_current_desktop();
+	// Window coordinates are relative to the current viewport, make them absolute
+	x += server.viewports[desktop].x;
+	y += server.viewports[desktop].y;
 
-	XTranslateCoordinates(server.dsp, win, server.root_win, 0, 0, &x, &y, &src);
-	x += 2;
-	y += 2;
-	for (i = 0; i < server.nb_monitor; i++) {
-		if (x >= server.monitor[i].x && x <= (server.monitor[i].x + server.monitor[i].width))
-			if (y >= server.monitor[i].y && y <= (server.monitor[i].y + server.monitor[i].height))
-				break;
+	if (x < 0 || y < 0) {
+		int num_results;
+		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];
+		int x_screen_height = x_screen_size[1];
+		XFree(x_screen_size);
+
+		// Wrap
+		if (x < 0)
+			x += x_screen_width;
+		if (y < 0)
+			y += x_screen_height;
 	}
 
-	//printf("window %lx : ecran %d, (%d, %d)\n", win, i, x, y);
-	if (i == server.nb_monitor) return 0;
-	else return i;
+	int best_match = -1;
+	int match_right = 0;
+	int match_bottom = 0;
+	// There is an ambiguity when a window is right on the edge between viewports.
+	// In that case, prefer the viewports which is on the right and bottom of the window's top-left corner.
+	for (int i = 0; i < server.num_desktops; i++) {
+		if (x >= server.viewports[i].x && x <= (server.viewports[i].x + server.viewports[i].width) &&
+			y >= server.viewports[i].y && y <= (server.viewports[i].y + server.viewports[i].height)) {
+			int current_right = x < (server.viewports[i].x + server.viewports[i].width);
+			int current_bottom = y < (server.viewports[i].y + server.viewports[i].height);
+			if (best_match < 0 || (!match_right && current_right) || (!match_bottom && current_bottom)) {
+				best_match = i;
+			}
+		}
+	}
+
+	if (best_match < 0)
+		best_match = 0;
+	// fprintf(stderr, "window %lx %s : viewport %d, (%d, %d)\n", win, get_task(win) ? get_task(win)->title : "??",
+	// best_match+1, x, y);
+	return best_match;
 }
 
-void window_get_coordinates (Window win, int *x, int *y, int *w, int *h)
+int get_window_monitor(Window win)
+{
+	int x, y, w, h;
+	get_window_coordinates(win, &x, &y, &w, &h);
+
+	int best_match = -1;
+	int match_right = 0;
+	int match_bottom = 0;
+	// There is an ambiguity when a window is right on the edge between screens.
+	// In that case, prefer the monitor which is on the right and bottom of the window's top-left corner.
+	for (int i = 0; i < server.num_monitors; i++) {
+		if (x >= server.monitors[i].x && x <= (server.monitors[i].x + server.monitors[i].width) &&
+			y >= server.monitors[i].y && y <= (server.monitors[i].y + server.monitors[i].height)) {
+			int current_right = x < (server.monitors[i].x + server.monitors[i].width);
+			int current_bottom = y < (server.monitors[i].y + server.monitors[i].height);
+			if (best_match < 0 || (!match_right && current_right) || (!match_bottom && current_bottom)) {
+				best_match = i;
+			}
+		}
+	}
+
+	if (best_match < 0)
+		best_match = 0;
+	// fprintf(stderr, "desktop %d, window %lx %s : monitor %d, (%d, %d)\n", 1 + get_current_desktop(), win,
+	// get_task(win) ? get_task(win)->title : "??", best_match+1, x, y);
+	return best_match;
+}
+
+void get_window_coordinates(Window win, int *x, int *y, int *w, int *h)
 {
 	int dummy_int;
 	unsigned ww, wh, bw, bh;
- 	Window src;
- 	XTranslateCoordinates(server.dsp, win, server.root_win, 0, 0, x, y, &src);
-	XGetGeometry(server.dsp, win, &src, &dummy_int, &dummy_int, &ww, &wh, &bw, &bh);
+	Window src;
+	XTranslateCoordinates(server.display, win, server.root_win, 0, 0, x, y, &src);
+	XGetGeometry(server.display, win, &src, &dummy_int, &dummy_int, &ww, &wh, &bw, &bh);
 	*w = ww + bw;
 	*h = wh + bh;
 }
 
-int window_is_iconified (Window win)
+gboolean window_is_iconified(Window win)
 {
 	// EWMH specification : minimization of windows use _NET_WM_STATE_HIDDEN.
 	// WM_STATE is not accurate for shaded window and in multi_desktop mode.
-	Atom *at;
-	int count, i;
-	at = server_get_property (win, server.atom._NET_WM_STATE, XA_ATOM, &count);
-	for (i = 0; i < count; i++) {
+	int count;
+	Atom *at = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+	for (int i = 0; i < count; i++) {
 		if (at[i] == server.atom._NET_WM_STATE_HIDDEN) {
 			XFree(at);
-			return 1;
+			return TRUE;
 		}
 	}
 	XFree(at);
-	return 0;
+	return FALSE;
 }
 
-
-int window_is_urgent (Window win)
+gboolean window_is_urgent(Window win)
 {
-	Atom *at;
-	int count, i;
+	int count;
 
-	at = server_get_property (win, server.atom._NET_WM_STATE, XA_ATOM, &count);
-	for (i = 0; i < count; i++) {
+	Atom *at = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+	for (int i = 0; i < count; i++) {
 		if (at[i] == server.atom._NET_WM_STATE_DEMANDS_ATTENTION) {
 			XFree(at);
-			return 1;
+			return TRUE;
 		}
 	}
 	XFree(at);
-	return 0;
+	return FALSE;
 }
 
-
-int window_is_skip_taskbar (Window win)
+gboolean window_is_skip_taskbar(Window win)
 {
-	Atom *at;
-	int count, i;
+	int count;
 
-	at = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
-	for (i=0; i<count; i++) {
+	Atom *at = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+	for (int i = 0; i < count; i++) {
 		if (at[i] == server.atom._NET_WM_STATE_SKIP_TASKBAR) {
 			XFree(at);
 			return 1;
 		}
 	}
 	XFree(at);
-	return 0;
+	return FALSE;
 }
 
-
-
-GSList *server_get_name_of_desktop ()
-{
-	int count, j;
-	GSList *list = NULL;
-	gchar *data_ptr, *ptr;
-	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 (j = 0; j < count-1; j++) {
-			if (*(data_ptr + j)	== '\0') {
-				ptr = (gchar*)data_ptr + j + 1;
-				list = g_slist_append(list, g_strdup(ptr));
-			}
-		}
-		XFree(data_ptr);
-	}
-	return list;
-}
-
-
-int server_get_current_desktop ()
-{
-	return get_property32(server.root_win, server.atom._NET_CURRENT_DESKTOP, XA_CARDINAL);
-}
-
-
-Window window_get_active ()
+Window get_active_window()
 {
 	return get_property32(server.root_win, server.atom._NET_ACTIVE_WINDOW, XA_WINDOW);
 }
 
-
-int window_is_active (Window win)
+gboolean window_is_active(Window win)
 {
 	return (win == get_property32(server.root_win, server.atom._NET_ACTIVE_WINDOW, XA_WINDOW));
 }
 
-
-int get_icon_count (gulong *data, int num)
+int get_icon_count(gulong *data, int num)
 {
 	int count, pos, w, h;
 
 	count = 0;
 	pos = 0;
-	while (pos+2 < num) {
+	while (pos + 2 < num) {
 		w = data[pos++];
 		h = data[pos++];
 		pos += w * h;
-		if (pos > num || w <= 0 || h <= 0) break;
+		if (pos > num || w <= 0 || h <= 0)
+			break;
 		count++;
 	}
 
 	return count;
 }
 
-
-gulong *get_best_icon (gulong *data, int icon_count, int num, int *iw, int *ih, int best_icon_size)
+gulong *get_best_icon(gulong *data, int icon_count, int num, int *iw, int *ih, int best_icon_size)
 {
 	int width[icon_count], height[icon_count], pos, i, w, h;
 	gulong *icon_data[icon_count];
@@ -275,7 +286,8 @@ gulong *get_best_icon (gulong *data, int icon_count, int num, int *iw, int *ih,
 	while (i--) {
 		w = data[pos++];
 		h = data[pos++];
-		if (pos + w * h > num) break;
+		if (pos + w * h > num)
+			break;
 
 		width[i] = w;
 		height[i] = h;
@@ -298,8 +310,8 @@ gulong *get_best_icon (gulong *data, int icon_count, int num, int *iw, int *ih,
 		int highest = 0;
 		for (i = 0; i < icon_count; i++) {
 			if (width[i] > highest) {
-					icon_num = i;
-					highest = width[i];
+				icon_num = i;
+				highest = width[i];
 			}
 		}
 	}
@@ -308,56 +320,3 @@ gulong *get_best_icon (gulong *data, int icon_count, int num, int *iw, int *ih,
 	*ih = height[icon_num];
 	return icon_data[icon_num];
 }
-
-
-void get_text_size(PangoFontDescription *font, int *height_ink, int *height, int panel_height, char *text, int len)
-{
-	PangoRectangle rect_ink, rect;
-
-	Pixmap pmap = XCreatePixmap (server.dsp, server.root_win, panel_height, panel_height, server.depth);
-
-	cairo_surface_t *cs = cairo_xlib_surface_create (server.dsp, pmap, server.visual, panel_height, panel_height);
-	cairo_t *c = cairo_create (cs);
-
-	PangoLayout *layout = pango_cairo_create_layout (c);
-	pango_layout_set_font_description (layout, font);
-	pango_layout_set_text (layout, text, len);
-
-	pango_layout_get_pixel_extents(layout, &rect_ink, &rect);
-	*height_ink = rect_ink.height;
-	*height = rect.height;
-	//printf("dimension : %d - %d\n", rect_ink.height, rect.height);
-
-	g_object_unref (layout);
-	cairo_destroy (c);
-	cairo_surface_destroy (cs);
-	XFreePixmap (server.dsp, pmap);
-}
-
-
-void get_text_size2(PangoFontDescription *font, int *height_ink, int *height, int *width, int panel_height, int panel_with, char *text, int len)
-{
-	PangoRectangle rect_ink, rect;
-
-	Pixmap pmap = XCreatePixmap (server.dsp, server.root_win, panel_height, panel_height, server.depth);
-
-	cairo_surface_t *cs = cairo_xlib_surface_create (server.dsp, pmap, server.visual, panel_height, panel_with);
-	cairo_t *c = cairo_create (cs);
-
-	PangoLayout *layout = pango_cairo_create_layout (c);
-	pango_layout_set_font_description (layout, font);
-	pango_layout_set_text (layout, text, len);
-
-	pango_layout_get_pixel_extents(layout, &rect_ink, &rect);
-	*height_ink = rect_ink.height;
-	*height = rect.height;
-	*width = rect.width;
-	//printf("dimension : %d - %d\n", rect_ink.height, rect.height);
-
-	g_object_unref (layout);
-	cairo_destroy (c);
-	cairo_surface_destroy (cs);
-	XFreePixmap (server.dsp, pmap);
-}
-
-

src/util/window.h

@@ -11,30 +11,26 @@
 
 #include <glib.h>
 #include <pango/pangocairo.h>
+#include <X11/Xlib.h>
 
+Window get_active_window();
 
-void set_active (Window win);
-void set_desktop (int desktop);
-void set_close (Window win);
-int server_get_current_desktop ();
-GSList *server_get_name_of_desktop ();
-void window_get_coordinates (Window win, int *x, int *y, int *w, int *h);
-int window_is_iconified (Window win);
-int window_is_urgent (Window win);
-int window_is_hidden (Window win);
-int window_is_active (Window win);
-int window_is_skip_taskbar (Window win);
-int get_icon_count (gulong *data, int num);
-gulong *get_best_icon (gulong *data, int icon_count, int num, int *iw, int *ih, int best_icon_size);
-void window_maximize_restore (Window win);
-void window_toggle_shade (Window win);
-int window_get_desktop (Window win);
-void windows_set_desktop (Window win, int desktop);
-int window_get_monitor (Window win);
-Window window_get_active ();
+gboolean window_is_iconified(Window win);
+gboolean window_is_urgent(Window win);
+gboolean window_is_hidden(Window win);
+gboolean window_is_active(Window win);
+gboolean window_is_skip_taskbar(Window win);
+int get_window_desktop(Window win);
+int get_window_monitor(Window win);
 
-void get_text_size(PangoFontDescription *font, int *height_ink, int *height, int panel_height, char *text, int len);
-void get_text_size2(PangoFontDescription *font, int *height_ink, int *height, int *width, int panel_height, int panel_with, char *text, int len);
+void activate_window(Window win);
+void close_window(Window win);
+void get_window_coordinates(Window win, int *x, int *y, int *w, int *h);
+void toggle_window_maximized(Window win);
+void toggle_window_shade(Window win);
+void change_window_desktop(Window win, int desktop);
 
+int get_icon_count(gulong *data, int num);
+gulong *get_best_icon(gulong *data, int icon_count, int num, int *iw, int *ih, int best_icon_size);
 
 #endif

test/workspaces-stress.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# List normal windows
+# wmctrl -l | awk '{if ($4 != "Desktop") print $1}'
+#
+# Change the number of desktops
+# xprop -root -f _NET_NUMBER_OF_DESKTOPS 32c -set _NET_NUMBER_OF_DESKTOPS 2
+#
+# Move window to desktop
+# xprop -id 0x03600007 -f _NET_WM_DESKTOP 32c -set _NET_WM_DESKTOP 0
+#
+# Move window to all desktops
+# xprop -id 0x03600007 -f _NET_WM_DESKTOP 32c -set _NET_WM_DESKTOP 4294967295
+
+while true
+do
+  # change the number of desktops to a random value
+  num_desktops=$(( $RANDOM % 8 + 1 ))
+  xprop -root -f _NET_NUMBER_OF_DESKTOPS 32c -set _NET_NUMBER_OF_DESKTOPS $num_desktops
+  max_desktop=$(( $num_desktops - 1 ))
+  desktops=$(echo 4294967295; seq 0 $max_desktop)
+  for run in 1 2 3
+  do
+    # start and stop calculators
+    if (( $RANDOM % 5 == 0 ))
+    then
+      killall gnome-calculator 1>/dev/null 2>/dev/null
+      sleep 0.1
+    else
+      (gnome-calculator 1>/dev/null 2>/dev/null &)
+    fi
+    # change the current desktop to a random value
+    for change in 1 2 3
+    do
+      desktop=$(shuf -n 1 -e $(seq 0 $max_desktop))
+      xprop -root -f _NET_CURRENT_DESKTOP 32c -set _NET_CURRENT_DESKTOP $desktop
+      sleep 0.1
+    done
+    # move windows around
+    for win in $(wmctrl -l | awk '!/Terminal/ {if ($4 != "Desktop") print $1}')
+    do
+      desktop=$(shuf -n 1 -e $desktops)
+      xprop -id $win -f _NET_WM_DESKTOP 32c -set _NET_WM_DESKTOP $desktop
+    done
+    sleep 0.1
+  done
+  sleep 0.1
+done

themes/CMakeLists.txt

@@ -0,0 +1,2 @@
+file( GLOB EXTRATHEMEFILES *.tint2rc )
+install( FILES ${EXTRATHEMEFILES} DESTINATION ${DATADIR}/tint2 )