Release 0.12.5

.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,2 @@
+build
+*.user

AUTHORS

@@ -1,4 +1,3 @@
-
 tint2 is developped by :
 - Thierry Lorthiois <lorthiois@bbsoft.fr> from Omega distribution
 - Andreas Fink <andreas.fink85@googlemail.com>
@@ -6,12 +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
+- 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
@@ -24,3 +22,17 @@ Contributors:
   Xico Atelo : startup notifications
   Craig Oakes : WM flags, issue tracker organization
   Jeff Blake (https://gitlab.com/u/berkley4) : more mouse event handlers
+
+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

@@ -7,12 +7,15 @@ option( ENABLE_EXAMPLES "Install additional tin2rc examples" 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 )
@@ -20,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 )
 
@@ -47,6 +85,7 @@ include_directories( ${PROJECT_BINARY_DIR}
                      src/launcher
                      src/tooltip
                      src/util
+					 src/execplugin
                      src/freespace
                      ${X11_INCLUDE_DIRS}
                      ${PANGOCAIRO_INCLUDE_DIRS}
@@ -73,6 +112,7 @@ 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
@@ -85,6 +125,8 @@ if( ENABLE_BATTERY )
 
   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")
@@ -119,6 +161,26 @@ if( ENABLE_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 )
@@ -126,7 +188,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 "")
@@ -156,7 +218,9 @@ target_link_libraries( tint2 ${X11_LIBRARIES}
                              ${CAIRO_LIBRARIES}
                              ${GLIB2_LIBRARIES}
                              ${GOBJECT2_LIBRARIES}
-                             ${IMLIB2_LIBRARIES} )
+							 ${IMLIB2_LIBRARIES}
+							 ${UNWIND_LIBRARIES}
+							 ${EXECINFO_LIBRARIES} )
 if( ENABLE_RSVG )
   target_link_libraries( tint2 ${RSVG_LIBRARIES} )
 endif( ENABLE_RSVG )
@@ -170,8 +234,8 @@ 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 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}" )
+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 )

ChangeLog

@@ -1,3 +1,39 @@
+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;
@@ -17,12 +53,14 @@
   - 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:
@@ -39,6 +77,7 @@
 	- Bad read of option panel_margin
 - New config options:
   - Battery mouse actions and clock middle click and wheel actions (thanks to Jeff Blake)
+
 2015-07-12 0.12
 - Note: the changes listed here are based on the previous release tint2 0.11, however some distributions (e.g. Debian)
   offered packages using newer commits and/or patches; thus from the user's perspective some of these features are
@@ -713,4 +752,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,5 +1,5 @@
-### New stable release: 0.12.3
+# New stable release: 0.12.5
-Changes: https://gitlab.com/o9000/tint2/blob/0.12.3/ChangeLog
+Changes: https://gitlab.com/o9000/tint2/blob/0.12.5/ChangeLog
 
 Documentation: https://gitlab.com/o9000/tint2/wikis/Configure
 
@@ -7,7 +7,7 @@ Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/In
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 0.12.3
+git checkout 0.12.5
 mkdir build
 cd build
 cmake ..
@@ -23,16 +23,13 @@ make install
 
 Please report any problems to https://gitlab.com/o9000/tint2/issues. Your feedback is much appreciated.
 
-Known issues:
-* [System tray resize loop with GTK applications](https://gitlab.com/o9000/tint2/issues/509), see also the [GTK bug report](https://bugzilla.gnome.org/show_bug.cgi?id=710375). Fix landed in 0.12.1, if there are still problems please let me know.
-
 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;
@@ -40,38 +37,45 @@ 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
+# Releases
-  * Latest stable release: tint2 0.12.3 (November 2015)
+  * Latest stable release: tint2 0.12.4 (January 2016)
 
-### 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)

sample/tint2rc

@@ -1,64 +1,141 @@
-# Tint2 sample config file
+#---- Generated by tint2conf 2641 ----
-# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-
+# full documentation of the configuration options.
-# Background definitions
+#-------------------------------------
-# Background 1: panel
+# Backgrounds
-rounded = 7
+# Background 1: Panel
-border_width = 1
+rounded = 0
-background_color = #000000 60
-border_color = #FFFFFF 16
-
-# Background 2: normal/iconified tasks
-rounded = 5
 border_width = 0
+background_color = #000000 60
+border_color = #000000 30
+background_color_hover = #000000 60
+border_color_hover = #000000 30
+background_color_pressed = #000000 60
+border_color_pressed = #000000 30
+
+# Background 2: Default task, Iconified task
+rounded = 4
+border_width = 1
 background_color = #777777 20
 border_color = #777777 30
+background_color_hover = #aaaaaa 22
+border_color_hover = #eaeaea 44
+background_color_pressed = #555555 4
+border_color_pressed = #eaeaea 44
 
-# Background 3: active tasks
+# Background 3: Active task
-rounded = 5
+rounded = 4
 border_width = 1
 background_color = #777777 20
 border_color = #ffffff 40
+background_color_hover = #aaaaaa 22
+border_color_hover = #eaeaea 44
+background_color_pressed = #555555 4
+border_color_pressed = #eaeaea 44
 
-# Background 4: urgent tasks
+# Background 4: Urgent task
-rounded = 5
+rounded = 4
 border_width = 1
 background_color = #aa4400 100
 border_color = #aa7733 100
+background_color_hover = #cc7700 100
+border_color_hover = #aa7733 100
+background_color_pressed = #555555 4
+border_color_pressed = #aa7733 100
 
-# Background 5: tooltips
+# Background 5: Tooltip
-rounded = 2
+rounded = 1
 border_width = 1
 background_color = #ffffaa 100
-border_color = #999999 100
+border_color = #000000 100
+background_color_hover = #ffffaa 100
+border_color_hover = #000000 100
+background_color_pressed = #ffffaa 100
+border_color_pressed = #000000 100
 
+#-------------------------------------
 # Panel
 panel_items = LTSC
-panel_monitor = all
+panel_size = 100% 30
-panel_position = bottom center horizontal
-panel_size = 85% 30
 panel_margin = 0 0
-panel_padding = 7 0 7
+panel_padding = 2 0 2
-panel_dock = 0
-wm_menu = 1
-panel_layer = top
 panel_background_id = 1
-font_shadow = 0
+wm_menu = 1
-
+panel_dock = 0
-# Panel Autohide
+panel_position = bottom center horizontal
+panel_layer = top
+panel_monitor = all
+primary_monitor_first = 0
 autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
 autohide_height = 2
 strut_policy = follow_size
+panel_window_name = tint2
+disable_transparency = 1
+mouse_effects = 1
+font_shadow = 0
+mouse_hover_icon_asb = 100 0 10
+mouse_pressed_icon_asb = 100 0 0
 
+#-------------------------------------
+# Taskbar
+taskbar_mode = single_desktop
+taskbar_padding = 0 0 2
+taskbar_background_id = 0
+taskbar_active_background_id = 0
+taskbar_name = 1
+taskbar_hide_inactive_tasks = 0
+taskbar_hide_different_monitor = 0
+taskbar_always_show_all_desktop_tasks = 0
+taskbar_name_padding = 4 2
+taskbar_name_background_id = 0
+taskbar_name_active_background_id = 0
+taskbar_name_font_color = #e3e3e3 100
+taskbar_name_active_font_color = #ffffff 100
+taskbar_distribute_size = 0
+taskbar_sort_order = none
+task_align = left
+
+#-------------------------------------
+# Task
+task_text = 1
+task_icon = 1
+task_centered = 1
+urgent_nb_of_blink = 100000
+task_maximum_size = 150 35
+task_padding = 2 2 4
+task_tooltip = 1
+task_font_color = #ffffff 100
+task_background_id = 2
+task_active_background_id = 3
+task_urgent_background_id = 4
+task_iconified_background_id = 2
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+#-------------------------------------
+# System tray (notification area)
+systray_padding = 0 4 2
+systray_background_id = 0
+systray_sort = ascending
+systray_icon_size = 24
+systray_icon_asb = 100 0 0
+systray_monitor = 1
+
+#-------------------------------------
 # Launcher
 launcher_padding = 2 4 2
 launcher_background_id = 0
-launcher_icon_size = 18
+launcher_icon_background_id = 0
+launcher_icon_size = 24
 launcher_icon_asb = 100 0 0
-launcher_tooltip = 1
+launcher_icon_theme_override = 0
 startup_notifications = 1
+launcher_tooltip = 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
@@ -66,78 +143,45 @@ 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
+time1_timezone = 
-clock_font_color = #FFFFFF 100
+time2_timezone = 
-clock_padding = 1 0
+clock_font_color = #ffffff 100
+clock_padding = 2 0
 clock_background_id = 0
+clock_tooltip = 
+clock_tooltip_timezone = 
+clock_lclick_command = 
 clock_rclick_command = orage
+clock_mclick_command = 
+clock_uwheel_command = 
+clock_dwheel_command = 
 
-# 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_tooltip = 1
 battery_low_status = 10
 battery_low_cmd = notify-send "battery low"
-battery_hide = 101
+battery_font_color = #ffffff 100
-bat1_font = sans 8
-bat2_font = sans 6
-battery_font_color = #FFFFFF 100
 battery_padding = 1 0
 battery_background_id = 0
+battery_hide = 101
+battery_lclick_command = 
+battery_rclick_command = 
+battery_mclick_command = 
+battery_uwheel_command = 
+battery_dwheel_command = 
+ac_connected_cmd = 
+ac_disconnected_cmd = 
+
+#-------------------------------------
+# Tooltip
+tooltip_show_timeout = 0.5
+tooltip_hide_timeout = 0.1
+tooltip_padding = 2 2
+tooltip_background_id = 5
+tooltip_font_color = #222222 100
 
-# End of config

src/battery/battery.c

@@ -31,19 +31,21 @@
 #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;
+struct BatteryState battery_state;
-int battery_enabled;
+gboolean battery_enabled;
-int battery_tooltip_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;
@@ -52,90 +54,22 @@ char *battery_mclick_command;
 char *battery_rclick_command;
 char *battery_uwheel_command;
 char *battery_dwheel_command;
-int battery_found;
+gboolean battery_found;
 
-void update_battery_tick(void* arg)
+void battery_init_fonts();
-{
+char *battery_get_tooltip(void *obj);
-	if (!battery_enabled)
-		return;
-
-	int 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 (!battery_found) {
-		init_battery();
-		old_ac_connected = battery_state.ac_connected;
-	}
-	if (update_battery() != 0) {
-		// Try to reconfigure on failed update
-		init_battery();
-	}
-
-	if (old_ac_connected != battery_state.ac_connected) {
-		if (battery_state.ac_connected)
-			tint_exec(ac_connected_cmd);
-		else
-			tint_exec(ac_disconnected_cmd);
-	}
-
-	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 default_battery()
 {
-	battery_enabled = 0;
+	battery_enabled = FALSE;
-	battery_tooltip_enabled = 1;
+	battery_tooltip_enabled = TRUE;
-	battery_found = 0;
+	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;
@@ -176,17 +110,11 @@ void cleanup_battery()
 	ac_disconnected_cmd = NULL;
 	stop_timeout(battery_timeout);
 	battery_timeout = NULL;
-	battery_found = 0;
+	battery_found = FALSE;
 
 	battery_os_free();
 }
 
-void reinit_battery()
-{
-	battery_os_free();
-	battery_found = battery_os_init();
-	update_battery();
-}
 void init_battery()
 {
 	if (!battery_enabled)
@@ -200,56 +128,156 @@ void init_battery()
 	update_battery();
 }
 
-char* battery_get_tooltip(void* obj) {
+void reinit_battery()
-	return battery_os_tooltip();
+{
+	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)
+	battery_init_fonts();
-		bat1_font_desc = pango_font_description_from_string(DEFAULT_FONT);
-	if (!bat2_font_desc)
-		bat2_font_desc = pango_font_description_from_string(DEFAULT_FONT);
 
-	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.on_screen = TRUE;
-	battery->area.resize = 1;
+	battery->area.resize_needed = 1;
-	battery->area.mouse_over_effect = battery_lclick_command ||
+	battery->area.has_mouse_over_effect = panel_config.mouse_effects &&
-									  battery_mclick_command ||
+										  (battery_lclick_command || battery_mclick_command || battery_rclick_command ||
-									  battery_rclick_command ||
+										   battery_uwheel_command || battery_dwheel_command);
-									  battery_uwheel_command ||
+	battery->area.has_mouse_press_effect = battery->area.has_mouse_over_effect;
-									  battery_dwheel_command;
-	battery->area.mouse_press_effect = battery->area.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() {
+void battery_default_font_changed()
-	int err;
+{
+	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;
+}
 
-	/* reset */
+void update_battery_tick(void *arg)
+{
+	if (!battery_enabled)
+		return;
+
+	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 (!battery_found) {
+		init_battery();
+		old_ac_connected = battery_state.ac_connected;
+	}
+	if (update_battery() != 0) {
+		// Try to reconfigure on failed update
+		init_battery();
+	}
+
+	if (old_ac_connected != battery_state.ac_connected) {
+		if (battery_state.ac_connected)
+			tint_exec(ac_connected_cmd);
+		else
+			tint_exec(ac_disconnected_cmd);
+	}
+
+	if (battery_state.percentage < battery_low_status && battery_state.state == BATTERY_DISCHARGING &&
+		!battery_low_cmd_sent) {
+		tint_exec(battery_low_cmd);
+		battery_low_cmd_sent = TRUE;
+	}
+	if (battery_state.percentage > battery_low_status && battery_state.state == BATTERY_CHARGING &&
+		battery_low_cmd_sent) {
+		battery_low_cmd_sent = FALSE;
+	}
+
+	for (int i = 0; i < num_panels; i++) {
+		// Show/hide if needed
+		if (!battery_found) {
+			if (panels[i].battery.area.on_screen) {
+				hide(&panels[i].battery.area);
+				panel_refresh = TRUE;
+			}
+		} else {
+			if (battery_state.percentage >= percentage_hide) {
+				if (panels[i].battery.area.on_screen) {
+					hide(&panels[i].battery.area);
+					panel_refresh = TRUE;
+				}
+			} else {
+				if (!panels[i].battery.area.on_screen) {
+					show(&panels[i].battery.area);
+					panel_refresh = TRUE;
+				}
+			}
+		}
+		// Redraw if needed
+		if (panels[i].battery.area.on_screen) {
+			if (old_found != battery_found || old_percentage != battery_state.percentage ||
+				old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) {
+				panels[i].battery.area.resize_needed = TRUE;
+				panel_refresh = TRUE;
+			}
+		}
+	}
+}
+
+int update_battery()
+{
+	// Reset
 	battery_state.state = BATTERY_UNKNOWN;
 	battery_state.percentage = 0;
 	battery_state.ac_connected = FALSE;
-	batstate_set_time(&battery_state, 0);
+	battery_state_set_time(&battery_state, 0);
 
-	err = battery_os_update(&battery_state);
+	int err = battery_os_update(&battery_state);
 
-	// clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
+	// Clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
 	if (battery_state.percentage > 100) {
 		battery_state.percentage = 100;
 	}
@@ -257,15 +285,73 @@ int update_battery() {
 	return err;
 }
 
-
+gboolean resize_battery(void *obj)
-void draw_battery (void *obj, cairo_t *c)
 {
 	Battery *battery = obj;
-	PangoLayout *layout;
+	Panel *panel = battery->area.panel;
+	int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
+	int bat_time_height, bat_time_width, bat_time_height_ink;
+	int ret = 0;
 
-	layout = pango_cairo_create_layout (c);
+	schedule_redraw(&battery->area);
 
-	// draw layout
+	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
+	if (battery_state.state == BATTERY_FULL) {
+		strcpy(buf_bat_time, "Full");
+	} else {
+		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
+	}
+	get_text_size2(bat1_font_desc,
+				   &bat_percentage_height_ink,
+				   &bat_percentage_height,
+				   &bat_percentage_width,
+				   panel->area.height,
+				   panel->area.width,
+				   buf_bat_percentage,
+				   strlen(buf_bat_percentage),
+				   PANGO_WRAP_WORD_CHAR,
+				   PANGO_ELLIPSIZE_NONE,
+				   FALSE);
+	get_text_size2(bat2_font_desc,
+				   &bat_time_height_ink,
+				   &bat_time_height,
+				   &bat_time_width,
+				   panel->area.height,
+				   panel->area.width,
+				   buf_bat_time,
+				   strlen(buf_bat_time),
+				   PANGO_WRAP_WORD_CHAR,
+				   PANGO_ELLIPSIZE_NONE,
+				   FALSE);
+
+	if (panel_horizontal) {
+		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
+		new_size += 2 * battery->area.paddingxlr + 2 * battery->area.bg->border.width;
+		if (new_size > battery->area.width || new_size < battery->area.width - 2) {
+			// we try to limit the number of resize
+			battery->area.width = new_size;
+			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height) / 2;
+			battery->bat2_posy = battery->bat1_posy + bat_percentage_height;
+			ret = 1;
+		}
+	} else {
+		int new_size =
+		    bat_percentage_height + bat_time_height + (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
+		if (new_size > battery->area.height || new_size < battery->area.height - 2) {
+			battery->area.height = new_size;
+			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2) / 2;
+			battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
+			ret = 1;
+		}
+	}
+	return ret;
+}
+
+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);
@@ -273,10 +359,14 @@ void draw_battery (void *obj, cairo_t *c)
 	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[0], battery->font.color[1], battery->font.color[2], battery->font.alpha);
+	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, ((Panel*)battery->area.panel)->font_shadow);
+	draw_text(layout, c, 0, battery->bat1_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
 
 	pango_layout_set_font_description(layout, bat2_font_desc);
 	pango_layout_set_indent(layout, 0);
@@ -286,80 +376,34 @@ void draw_battery (void *obj, cairo_t *c)
 	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);
+	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)
-int resize_battery(void *obj)
 {
-	Battery *battery = obj;
+	return battery_os_tooltip();
-	Panel *panel = battery->area.panel;
-	int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
-	int bat_time_height, bat_time_width, bat_time_height_ink;
-	int ret = 0;
-
-	battery->area.redraw = 1;
-	
-	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
-	if (battery_state.state == BATTERY_FULL) {
-		strcpy(buf_bat_time, "Full");
-	} else {
-		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
-	}
-	get_text_size2(bat1_font_desc, &bat_percentage_height_ink, &bat_percentage_height, &bat_percentage_width,
-				   panel->area.height, panel->area.width, buf_bat_percentage, strlen(buf_bat_percentage),
-				   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE);
-	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);
-
-	if (panel_horizontal) {
-		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
-		new_size += 2 * battery->area.paddingxlr + 2 * battery->area.bg->border.width;
-		if (new_size > battery->area.width ||
-			new_size < battery->area.width - 2) {
-			// we try to limit the number of resize
-			battery->area.width = new_size;
-			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height) / 2;
-			battery->bat2_posy = battery->bat1_posy + bat_percentage_height;
-			ret = 1;
-		}
-	} else {
-		int new_size = bat_percentage_height + bat_time_height +
-					   (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
-		if (new_size > battery->area.height ||
-			new_size < battery->area.height - 2) {
-			battery->area.height =  new_size;
-			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2) / 2;
-			battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
-			ret = 1;
-		}
-	}
-	return ret;
 }
 
 void battery_action(int button)
 {
-	char *command = 0;
+	char *command = NULL;
 	switch (button) {
-		case 1:
+	case 1:
 		command = battery_lclick_command;
 		break;
-		case 2:
+	case 2:
 		command = battery_mclick_command;
 		break;
-		case 3:
+	case 3:
 		command = battery_rclick_command;
 		break;
-		case 4:
+	case 4:
 		command = battery_uwheel_command;
 		break;
-		case 5:
+	case 5:
 		command = battery_dwheel_command;
 		break;
 	}

src/battery/battery.h

@@ -16,42 +16,40 @@
 #include "common.h"
 #include "area.h"
 
-
-// battery drawing parameter (per panel)
 typedef struct Battery {
-	// always start with area
 	Area area;
-
+	Color font_color;
-	Color font;
 	int bat1_posy;
 	int bat2_posy;
 } Battery;
 
-enum chargestate {
+typedef enum ChargeState {
-	BATTERY_UNKNOWN,
+	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;
+	BatteryTime time;
-	enum chargestate state;
+	ChargeState state;
 	gboolean ac_connected;
-} batstate;
+} 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 int battery_tooltip_enabled;
+extern gboolean battery_tooltip_enabled;
 extern int percentage_hide;
 
 extern int8_t battery_low_status;
@@ -66,21 +64,23 @@ extern char *battery_rclick_command;
 extern char *battery_uwheel_command;
 extern char *battery_dwheel_command;
 
-static inline gchar* chargestate2str(enum chargestate state) {
+static inline gchar *chargestate2str(ChargeState state)
-	switch(state) {
+{
-		case BATTERY_CHARGING:
+	switch (state) {
-			return "Charging";
+	case BATTERY_CHARGING:
-		case BATTERY_DISCHARGING:
+		return "Charging";
-			return "Discharging";
+	case BATTERY_DISCHARGING:
-		case BATTERY_FULL:
+		return "Discharging";
-			return "Full";
+	case BATTERY_FULL:
-		case BATTERY_UNKNOWN:
+		return "Full";
-		default:
+	case BATTERY_UNKNOWN:
-			return "Unknown";
+	default:
+		return "Unknown";
 	};
 }
 
-static inline void batstate_set_time(struct batstate *state, int seconds) {
+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;
@@ -94,7 +94,7 @@ void default_battery();
 // freed memory
 void cleanup_battery();
 
-void update_battery_tick(void* arg);
+void update_battery_tick(void *arg);
 int update_battery();
 
 void init_battery();
@@ -102,15 +102,16 @@ 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(struct batstate *state);
+int battery_os_update(BatteryState *state);
-char* battery_os_tooltip();
+char *battery_os_tooltip();
 
 #endif

src/battery/dummy.c

@@ -23,18 +23,22 @@
 
 #warning tint2 has no battery support for this operating system!
 
-gboolean battery_os_init() {
+gboolean battery_os_init()
+{
 	return FALSE;
 }
 
-void battery_os_free() {
+void battery_os_free()
+{
 	return;
 }
 
-int battery_os_update(struct batstate *state) {
+int battery_os_update(BatteryState *state)
+{
 	return -1;
 }
 
-char* battery_os_tooltip() {
+char *battery_os_tooltip()
+{
 	return strdup("Operating System not supported");
 }

src/battery/freebsd.c

@@ -15,7 +15,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **************************************************************************/
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -24,26 +24,29 @@
 #include "common.h"
 #include "battery.h"
 
-gboolean battery_os_init() {
+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.time", &sysctl_out, &len, NULL, 0) == 0) ||
-			(sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
+		   (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
 }
 
-void battery_os_free() {
+void battery_os_free()
+{
 	return;
 }
 
-int battery_os_update(struct batstate *state) {
+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) {
+		switch (sysctl_out) {
 		case 1:
 			state->state = BATTERY_DISCHARGING;
 			break;
@@ -60,7 +63,7 @@ int battery_os_update(struct batstate *state) {
 	}
 
 	if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0)
-		batstate_set_time(state, sysctl_out * 60);
+		battery_state_set_time(state, sysctl_out * 60);
 	else
 		err = -1;
 
@@ -71,11 +74,12 @@ int battery_os_update(struct batstate *state) {
 
 	if (sysctlbyname("hw.acpi.acline", &sysctl_out, &len, NULL, 0) == 0)
 		state->ac_connected = sysctl_out;
-	
+
 	return err;
 }
 
-char* battery_os_tooltip() {
+char *battery_os_tooltip()
+{
 	GString *tooltip = g_string_new("");
 	gchar *result;
 

src/battery/linux.c

@@ -33,65 +33,64 @@ enum psy_type {
 
 struct psy_battery {
 	/* generic properties */
-	gchar*               name;
+	gchar *name;
-	gint64               timestamp;
+	/* monotonic time, in microseconds */
+	gint64 timestamp;
 	/* sysfs files */
-	gchar*               path_present;
+	gchar *path_present;
-	gchar*               path_energy_now;
+	gchar *path_energy_now;
-	gchar*               path_energy_full;
+	gchar *path_energy_full;
-	gchar*               path_power_now;
+	gchar *path_power_now;
-	gchar*               path_status;
+	gchar *path_status;
 	/* sysfs hints */
-	gboolean             energy_in_uamp;
+	gboolean energy_in_uamp;
-	gboolean             power_in_uamp;
+	gboolean power_in_uamp;
 	/* values */
-	gboolean             present;
+	gboolean present;
-	gint                 energy_now;
+	gint energy_now;
-	gint                 energy_full;
+	gint energy_full;
-	gint                 power_now;
+	gint power_now;
-	enum chargestate     status;
+	ChargeState status;
 };
 
 struct psy_mains {
 	/* generic properties */
-	gchar*               name;
+	gchar *name;
 	/* sysfs files */
-	gchar*               path_online;
+	gchar *path_online;
 	/* values */
-	gboolean             online;
+	gboolean online;
 };
 
-static void uevent_battery_update() {
+static void uevent_battery_update()
+{
 	update_battery_tick(NULL);
 }
-static struct uevent_notify psy_change = {
+static struct uevent_notify psy_change = {UEVENT_CHANGE, "power_supply", NULL, uevent_battery_update};
-	UEVENT_CHANGE,
-	"power_supply",
-	NULL,
-	uevent_battery_update
-};
 
-static void uevent_battery_plug() {
+static void uevent_battery_plug()
+{
 	printf("reinitialize batteries after HW change\n");
 	reinit_battery();
 }
-static struct uevent_notify psy_plug = {
+static struct uevent_notify psy_plug = {UEVENT_ADD | UEVENT_REMOVE, "power_supply", NULL, uevent_battery_plug};
-	UEVENT_ADD | UEVENT_REMOVE,
-	"power_supply",
-	NULL,
-	uevent_battery_plug
-};
 
-#define RETURN_ON_ERROR(err) if (error) { g_error_free(err); return FALSE; }
+#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) {
+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) {
+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;
@@ -119,7 +118,8 @@ static enum psy_type power_supply_get_type(const gchar *entryname) {
 	return PSY_UNKNOWN;
 }
 
-static gboolean init_linux_battery(struct psy_battery *bat) {
+static gboolean init_linux_battery(struct psy_battery *bat)
+{
 	const gchar *entryname = bat->name;
 
 	bat->energy_in_uamp = FALSE;
@@ -181,7 +181,8 @@ err0:
 	return FALSE;
 }
 
-static gboolean init_linux_mains(struct psy_mains *ac) {
+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);
@@ -193,7 +194,8 @@ static gboolean init_linux_mains(struct psy_mains *ac) {
 	return TRUE;
 }
 
-static void psy_battery_free(gpointer data) {
+static void psy_battery_free(gpointer data)
+{
 	struct psy_battery *bat = data;
 	g_free(bat->name);
 	g_free(bat->path_status);
@@ -204,14 +206,16 @@ static void psy_battery_free(gpointer data) {
 	g_free(bat);
 }
 
-static void psy_mains_free(gpointer data) {
+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() {
+void battery_os_free()
+{
 	uevent_unregister_notifier(&psy_change);
 	uevent_unregister_notifier(&psy_plug);
 
@@ -221,7 +225,8 @@ void battery_os_free() {
 	mains = NULL;
 }
 
-static void add_battery(const char *entryname) {
+static void add_battery(const char *entryname)
+{
 	struct psy_battery *bat = g_malloc0(sizeof(*bat));
 	bat->name = g_strdup(entryname);
 
@@ -234,7 +239,8 @@ static void add_battery(const char *entryname) {
 	}
 }
 
-static void add_mains(const char *entryname) {
+static void add_mains(const char *entryname)
+{
 	struct psy_mains *ac = g_malloc0(sizeof(*ac));
 	ac->name = g_strdup(entryname);
 
@@ -247,7 +253,8 @@ static void add_mains(const char *entryname) {
 	}
 }
 
-gboolean battery_os_init() {
+gboolean battery_os_init()
+{
 	GDir *directory = 0;
 	GError *error = NULL;
 	const char *entryname;
@@ -260,15 +267,15 @@ gboolean battery_os_init() {
 	while ((entryname = g_dir_read_name(directory))) {
 		enum psy_type type = power_supply_get_type(entryname);
 
-		switch(type) {
+		switch (type) {
-			case PSY_BATTERY:
+		case PSY_BATTERY:
-				add_battery(entryname);
+			add_battery(entryname);
-				break;
+			break;
-			case PSY_MAINS:
+		case PSY_MAINS:
-				add_mains(entryname);
+			add_mains(entryname);
-				break;
+			break;
-			default:
+		default:
-				break;
+			break;
 		}
 	}
 
@@ -280,7 +287,8 @@ gboolean battery_os_init() {
 	return batteries != NULL;
 }
 
-static gint estimate_power_usage(struct psy_battery *bat, gint old_energy_now, gint64 old_timestamp) {
+static gint estimate_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;
 
@@ -290,7 +298,8 @@ static gint estimate_power_usage(struct psy_battery *bat, gint old_energy_now, g
 	return power;
 }
 
-static gboolean update_linux_battery(struct psy_battery *bat) {
+static gboolean update_linux_battery(struct psy_battery *bat)
+{
 	GError *error = NULL;
 	gchar *data;
 	gsize datalen;
@@ -358,8 +367,8 @@ static gboolean update_linux_battery(struct psy_battery *bat) {
 	return TRUE;
 }
 
-
+static gboolean update_linux_mains(struct psy_mains *ac)
-static gboolean update_linux_mains(struct psy_mains *ac) {
+{
 	GError *error = NULL;
 	gchar *data;
 	gsize datalen;
@@ -374,7 +383,8 @@ static gboolean update_linux_mains(struct psy_mains *ac) {
 	return TRUE;
 }
 
-int battery_os_update(struct batstate *state) {
+int battery_os_update(BatteryState *state)
+{
 	GList *l;
 
 	gint64 total_energy_now = 0;
@@ -421,7 +431,7 @@ int battery_os_update(struct batstate *state) {
 		else if (state->state == BATTERY_DISCHARGING)
 			seconds = 3600 * total_energy_now / total_power_now;
 	}
-	batstate_set_time(state, seconds);
+	battery_state_set_time(state, seconds);
 
 	/* calculate percentage */
 	state->percentage = energy_to_percent(total_energy_now, total_energy_full);
@@ -432,27 +442,33 @@ int battery_os_update(struct batstate *state) {
 	return 0;
 }
 
-static gchar* energy_human_readable(struct psy_battery *bat) {
+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,
+							   now / 1000000,
-			full / 1000000, (full % 1000000) / 100000,
+							   (now % 1000000) / 100000,
-			unit);
+							   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,
+							   now / 1000,
-		full / 1000, (full % 1000) / 100,
+							   (now % 1000) / 100,
-		unit);
+							   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) {
+static gchar *power_human_readable(struct psy_battery *bat)
+{
 	gint power = bat->power_now;
 	gchar unit = bat->power_in_uamp ? 'A' : 'W';
 
@@ -467,7 +483,8 @@ static gchar* power_human_readable(struct psy_battery *bat) {
 	}
 }
 
-char* battery_os_tooltip() {
+char *battery_os_tooltip()
+{
 	GList *l;
 	GString *tooltip = g_string_new("");
 	gchar *result;
@@ -491,8 +508,7 @@ char* battery_os_tooltip() {
 
 		guint8 percentage = energy_to_percent(bat->energy_now, bat->energy_full);
 
-		g_string_append_printf(tooltip, "\t%s: %s (%u %%)\n\tPower: %s",
+		g_string_append_printf(tooltip, "\t%s: %s (%u %%)\n\tPower: %s", state, energy, percentage, power);
-			state, energy, percentage, power);
 
 		g_free(power);
 		g_free(energy);

src/battery/openbsd.c

@@ -29,7 +29,8 @@
 
 int apm_fd = -1;
 
-gboolean battery_os_init() {
+gboolean battery_os_init()
+{
 	if (apm_fd > 0)
 		close(apm_fd);
 
@@ -43,13 +44,15 @@ gboolean battery_os_init() {
 	}
 }
 
-void battery_os_free() {
+void battery_os_free()
+{
 	if ((apm_fd != -1) && (close(apm_fd) == -1))
 		warn("cannot close /dev/apm");
 	apm_fd = -1;
 }
 
-int battery_os_update(struct batstate *state) {
+int battery_os_update(BatteryState *state)
+{
 	struct apm_power_info info;
 
 	if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
@@ -70,7 +73,7 @@ int battery_os_update(struct batstate *state) {
 
 		state->percentage = info.battery_life;
 		if (info.minutes_left != -1)
-			batstate_set_time(state, info.minutes_left * 60);
+			battery_state_set_time(state, info.minutes_left * 60);
 
 		state->ac_connected = info.ac_state == APM_AC_ON;
 	} else {
@@ -81,7 +84,8 @@ int battery_os_update(struct batstate *state) {
 	return 0;
 }
 
-char* battery_os_tooltip() {
+char *battery_os_tooltip()
+{
 	GString *tooltip = g_string_new("");
 	gchar *result;
 

src/clock/clock.c

@@ -31,7 +31,6 @@
 #include "timer.h"
 #include "common.h"
 
-
 char *time1_format;
 char *time1_timezone;
 char *time2_format;
@@ -44,14 +43,18 @@ 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()
 {
@@ -68,7 +71,9 @@ void default_clock()
 	clock_rclick_command = NULL;
 	clock_uwheel_command = NULL;
 	clock_dwheel_command = NULL;
+	time1_has_font = FALSE;
 	time1_font_desc = NULL;
+	time2_has_font = FALSE;
 	time2_font_desc = NULL;
 }
 
@@ -104,66 +109,60 @@ void cleanup_clock()
 	clock_timeout = NULL;
 }
 
-
+void update_clocks_sec(void *arg)
-void update_clocks_sec(void* arg)
 {
 	gettimeofday(&time_clock, 0);
-	int i;
 	if (time1_format) {
-		for (i=0 ; i < nb_panel ; i++)
+		for (int i = 0; i < num_panels; i++)
-			panel1[i].clock.area.resize = 1;
+			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++)
+			for (int i = 0; i < num_panels; i++)
-				panel1[i].clock.area.resize = 1;
+				panels[i].clock.area.resize_needed = 1;
 		}
-		panel_refresh = 1;
+		panel_refresh = TRUE;
 	}
 }
 
-struct tm* clock_gettime_for_tz(const char* timezone) {
+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);
-}
-
-char* clock_get_tooltip(void* obj)
 {
-	strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
+	if (timezone) {
-	return strdup(buf_tooltip);
+		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 TRUE;
-	return 0;
+	return FALSE;
 }
 
 void init_clock()
 {
 	if (!clock_timeout) {
-		if (time_format_needs_sec_ticks(time1_format) ||
+		if (time_format_needs_sec_ticks(time1_format) || time_format_needs_sec_ticks(time2_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);
@@ -171,34 +170,28 @@ 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.mouse_press_effect = clock->area.mouse_over_effect = clock_lclick_command ||
+	clock->area.has_mouse_press_effect = clock->area.has_mouse_over_effect =
-																	 clock_mclick_command ||
+			panel_config.mouse_effects && (clock_lclick_command || clock_mclick_command || clock_rclick_command || clock_uwheel_command ||
-																	 clock_rclick_command ||
+										   clock_dwheel_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.resize_needed = 1;
-	clock->area.on_screen = 1;
+	clock->area.on_screen = TRUE;
 
 	if (time_tooltip_format) {
 		clock->area._get_tooltip_text = clock_get_tooltip;
@@ -206,113 +199,165 @@ void init_clock_panel(void *p)
 	}
 }
 
-
+void clock_init_fonts()
-void draw_clock (void *obj, cairo_t *c)
 {
-	Clock *clock = obj;
+	if (!time1_font_desc) {
-	PangoLayout *layout;
+		time1_font_desc = pango_font_description_from_string(get_default_font());
-
+		pango_font_description_set_weight(time1_font_desc, PANGO_WEIGHT_BOLD);
-	layout = pango_cairo_create_layout (c);
+		pango_font_description_set_size(time1_font_desc,
-
+		                                pango_font_description_get_size(time1_font_desc));
-	// draw layout
+	}
-	pango_layout_set_font_description (layout, time1_font_desc);
+	if (!time2_font_desc) {
-	pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
+		time2_font_desc = pango_font_description_from_string(get_default_font());
-	pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+		pango_font_description_set_size(time2_font_desc,
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+		                                pango_font_description_get_size(time2_font_desc) - PANGO_SCALE);
-	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.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);
 	}
-
-	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);
+				   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);
+					   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);
+		new_size += (2 * clock->area.paddingxlr) + (2 * clock->area.bg->border.width);
-		if (new_size > clock->area.width || new_size < (clock->area.width-6)) {
+		if (new_size > clock->area.width || new_size < (clock->area.width - 6)) {
-			// we try to limit the number of resize
+			// 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
+			// we try to limit the number of resizes
-			clock->area.height =  new_size;
+			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 2:
+	case 2:
 		command = clock_mclick_command;
 		break;
-		case 3:
+	case 3:
 		command = clock_rclick_command;
 		break;
-		case 4:
+	case 4:
 		command = clock_uwheel_command;
 		break;
-		case 5:
+	case 5:
 		command = clock_dwheel_command;
 		break;
 	}
 	tint_exec(command);
 }
-

src/clock/clock.h

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

src/config.h

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

src/execplugin/execplugin.c

@@ -0,0 +1,725 @@
+#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.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)
+{
+	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) {
+		tint_exec(command);
+	} 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,142 @@
+#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);
+
+// 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.size_mode = LAYOUT_FIXED;
-	freespace->area.resize = 1;
+	freespace->area.resize_needed = 1;
-	freespace->area.on_screen = 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.children; 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) {
+gboolean resize_freespace(void *obj)
-	FreeSpace *freespace = (FreeSpace*)obj;
+{
-	Panel *panel = (Panel*)freespace->area.panel;
+	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;
+	schedule_redraw(&freespace->area);
-	panel_refresh = 1;
+	panel_refresh = TRUE;
-	return 1;
+	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

@@ -52,7 +52,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 +65,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 ''");
@@ -113,16 +117,19 @@ int read_desktop_file(const char *path, DesktopEntry *entry)
 		return 0;
 	}
 
-	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;
 #define LANG_DBG 0
-	if (LANG_DBG) printf("Languages:");
+	if (LANG_DBG)
+		printf("Languages:");
 	for (i = 0; languages[i]; i++) {
-		if (LANG_DBG) printf(" %s", languages[i]);
+		if (LANG_DBG)
+			printf(" %s", languages[i]);
 	}
-	if (LANG_DBG) printf("\n");
+	if (LANG_DBG)
+		printf("\n");
 	lang_index_default = i;
 	// we currently do not know about any Name key at all, so use an invalid index
 	lang_index = lang_index_default + 1;
@@ -160,7 +167,7 @@ int read_desktop_file(const char *path, DesktopEntry *entry)
 			}
 		}
 	}
-	fclose (fp);
+	fclose(fp);
 	// From this point:
 	// entry->name, entry->icon, entry->exec will never be empty strings (can be NULL though)
 

src/launcher/icon-theme-common.c

@@ -38,7 +38,6 @@ typedef struct IconThemeDir {
 	int threshold;
 } IconThemeDir;
 
-
 int parse_theme_line(char *line, char **key, char **value)
 {
 	return parse_dektop_line(line, key, value);
@@ -67,7 +66,7 @@ const GSList *get_icon_locations()
 	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 +75,8 @@ IconTheme *make_theme(char *name)
 	return theme;
 }
 
-//TODO Use UTF8 when parsing the file
+// TODO Use UTF8 when parsing the file
-IconTheme *load_theme_from_index(char *file_name, char *name)
+IconTheme *load_theme_from_index(const char *file_name, const char *name)
 {
 	IconTheme *theme;
 	FILE *f;
@@ -168,9 +167,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;
+			GSList *dir_item = theme->list_directories;
-			while (dir_item != NULL)
+			while (dir_item != NULL) {
-			{
 				IconThemeDir *dir = dir_item->data;
 				if (strcmp(dir->name, dir_name) == 0) {
 					current_dir = dir;
@@ -186,7 +184,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 +224,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 (const GSList *location = get_icon_locations(); location; location = g_slist_next(location)) {
-	for (location = get_icon_locations(); location; location = g_slist_next(location)) {
+		gchar *path = (gchar *)location->data;
-		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 +243,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 +253,8 @@ IconTheme *load_theme(char *name)
 		return NULL;
 
 	gchar *file_name = NULL;
-	const GSList *location;
+	for (const GSList *location = get_icon_locations(); location; location = g_slist_next(location)) {
-	for (location = get_icon_locations(); location; location = g_slist_next(location)) {
+		gchar *path = (gchar *)location->data;
-		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 +279,12 @@ void free_icon_theme(IconTheme *theme)
 		return;
 	free(theme->name);
 	theme->name = NULL;
-	GSList *l_inherits;
+	for (GSList *l_inherits = theme->list_inherits; l_inherits; l_inherits = l_inherits->next) {
-	for (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 (GSList *l_dir = theme->list_directories; l_dir; l_dir = l_dir->next) {
-	for (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);
@@ -303,15 +297,14 @@ void free_themes(IconThemeWrapper *themes)
 {
 	if (!themes)
 		return;
-	GSList *l;
+	for (GSList *l = themes->themes; l; l = l->next) {
-	for (l = themes->themes; l ; l = l->next) {
+		IconTheme *theme = (IconTheme *)l->data;
-		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) {
+	for (GSList *l = themes->themes_fallback; l; l = l->next) {
-		IconTheme *theme = (IconTheme*) l->data;
+		IconTheme *theme = (IconTheme *)l->data;
 		free_icon_theme(theme);
 		free(theme);
 	}
@@ -328,21 +321,24 @@ void test_launcher_read_theme_file()
 		return;
 	}
 	printf("Loaded theme: %s\n", theme->name);
-	GSList* item = theme->list_inherits;
+	GSList *item = theme->list_inherits;
-	while (item != NULL)
+	while (item != NULL) {
-	{
+		printf("Inherits:%s\n", (char *)item->data);
-		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->name,
-			   dir->type == ICON_DIR_TYPE_FIXED ? "Fixed" :
+			   dir->size,
-			   dir->type == ICON_DIR_TYPE_SCALABLE ? "Scalable" :
+			   dir->min_size,
-			   dir->type == ICON_DIR_TYPE_THRESHOLD ? "Threshold" : "?????");
+			   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 +346,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 +365,17 @@ void load_themes_helper(const char *name, GSList **themes, GSList **queued)
 
 	// Load wrapper->themes
 	while (queue) {
-		char *name = queue->data;
+		char *queued_name = queue->data;
-		queue = g_slist_remove(queue, name);
+		queue = g_slist_remove(queue, queued_name);
 
-		fprintf(stderr, " '%s',", name);
+		fprintf(stderr, " '%s',", queued_name);
-		IconTheme *theme = load_theme(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,13 +386,13 @@ 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);
 }
@@ -420,14 +415,13 @@ IconThemeWrapper *load_themes(const char *icon_theme_name)
 	// Load wrapper->themes_fallback
 	const GSList *location;
 	for (location = get_icon_locations(); location; location = g_slist_next(location)) {
-		gchar *path = (gchar*) location->data;
+		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) &&
+				if (g_file_test(file_name, G_FILE_TEST_EXISTS) && !g_file_test(file_name, G_FILE_TEST_IS_DIR)) {
-					!g_file_test(file_name, G_FILE_TEST_IS_DIR)) {
 					load_themes_helper(name, &wrapper->themes_fallback, &queued);
 				}
 				g_free(file_name);
@@ -438,7 +432,7 @@ IconThemeWrapper *load_themes(const char *icon_theme_name)
 
 	// Free the queued list
 	GSList *l;
-	for (l = queued; l ; l = l->next)
+	for (l = queued; l; l = l->next)
 		free(l->data);
 	g_slist_free(queued);
 
@@ -482,8 +476,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 *da = (const IconThemeDir *)a;
-	const IconThemeDir *db = (const IconThemeDir*)b;
+	const IconThemeDir *db = (const IconThemeDir *)b;
 	return abs(da->size - size) - abs(db->size - size);
 }
 
@@ -509,9 +503,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 (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
-	for (ext = extensions; ext; ext = g_slist_next(ext)) {
+		char *extension = (char *)ext->data;
-		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 +533,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,
+		((IconTheme *)theme->data)->list_directories =
-																			 compare_theme_directories,
+		g_slist_sort_with_data(((IconTheme *)theme->data)->list_directories,
-																			 GINT_TO_POINTER(size));
+							   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 ||
+			possible = possible || (((IconThemeDir *)dir->data)->size >= size &&
-					   (((IconThemeDir*)dir->data)->size >= size &&
+									(next_larger_size == -1 || ((IconThemeDir *)dir->data)->size < next_larger_size) &&
-						(next_larger_size == -1 || ((IconThemeDir*)dir->data)->size < next_larger_size) &&
+									(!next_larger_theme ? 1 : theme == next_larger_theme));
-						(!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 (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
-				for (ext = extensions; ext; ext = g_slist_next(ext)) {
+					char *base_name = (char *)base->data;
-					char *base_name = (char*) base->data;
+					char *theme_name = ((IconTheme *)theme->data)->name;
-					char *theme_name = ((IconTheme*)theme->data)->name;
+					char *dir_name = ((IconThemeDir *)dir->data)->name;
-					char *dir_name = ((IconThemeDir*)dir->data)->name;
+					char *extension = (char *)ext->data;
-					char *extension = (char*) ext->data;
+					if (strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) +
-					if (strlen(base_name) + strlen(theme_name) +
+						strlen(extension) + 100 >
-						strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100 > file_name_size) {
+						file_name_size) {
-						file_name_size = strlen(base_name) + strlen(theme_name) +
+						file_name_size = strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) +
-										 strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100;
+										 strlen(extension) + 100;
 						file_name = realloc(file_name, file_name_size);
 					}
 					file_name[0] = 0;
@@ -578,27 +571,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 &&
+						if (((IconThemeDir *)dir->data)->size >= size &&
-							(next_larger_size == -1 || ((IconThemeDir*)dir->data)->size < next_larger_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 +616,11 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 
 	// Look in unthemed icons
 	{
-		const GSList *base;
+		for (const GSList *base = basenames; base; base = g_slist_next(base)) {
-		for (base = basenames; base; base = g_slist_next(base)) {
+			for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
-			GSList *ext;
+				char *base_name = (char *)base->data;
-			for (ext = extensions; ext; ext = g_slist_next(ext)) {
+				char *extension = (char *)ext->data;
-				char *base_name = (char*) base->data;
+				file_name = calloc(strlen(base_name) + strlen(icon_name) + strlen(extension) + 100, 1);
-				char *extension = (char*) ext->data;
-				char *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)

src/launcher/icon-theme-common.h

@@ -17,7 +17,7 @@ typedef struct IconThemeWrapper {
 
 typedef struct IconTheme {
 	char *name;
-	GSList *list_inherits; // each item is a char* (theme name)
+	GSList *list_inherits;    // each item is a char* (theme name)
 	GSList *list_directories; // each item is an IconThemeDir*
 } IconTheme;
 

src/launcher/launcher.c

@@ -51,7 +51,6 @@ 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;
 
@@ -69,33 +68,26 @@ 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.resize_needed = 1;
-	launcher->area.redraw = 1;
+	schedule_redraw(&launcher->area);
 	if (!launcher->area.bg)
 		launcher->area.bg = &g_array_index(backgrounds, Background, 0);
 
@@ -106,30 +98,22 @@ void init_launcher_panel(void *p)
 	if (launcher->list_apps == NULL)
 		return;
 
-	launcher->area.on_screen = 1;
+	launcher->area.on_screen = TRUE;
-	panel_refresh = 1;
+	panel_refresh = TRUE;
 
 	launcher_load_themes(launcher);
 	launcher_load_icons(launcher);
 }
 
-
 void cleanup_launcher()
 {
-	int i;
+	for (int i = 0; i < num_panels; i++) {
-	GSList *l;
+		Panel *panel = &panels[i];
-
-	if (xsettings_client)
-		xsettings_client_destroy(xsettings_client);
-	xsettings_client = NULL;
-
-	for (i = 0; i < nb_panel; i++) {
-		Panel *panel = &panel1[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,16 +125,14 @@ 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 (GSList *l = launcher->list_icons; l; l = l->next) {
-	for (l = launcher->list_icons; l ; l = l->next) {
+		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
 		if (launcherIcon) {
 			free_icon(launcherIcon->image);
 			free_icon(launcherIcon->image_hover);
@@ -169,14 +151,12 @@ void cleanup_launcher_theme(Launcher *launcher)
 	launcher->list_themes = NULL;
 }
 
-
+gboolean resize_launcher(void *obj)
-int resize_launcher(void *obj)
 {
 	Launcher *launcher = obj;
-	GSList *l;
+	int icons_per_column = 1, icons_per_row = 1, margin = 0;
-	int count, icon_size;
-	int icons_per_column=1, icons_per_row=1, marging=0;
 
+	int icon_size;
 	if (panel_horizontal) {
 		icon_size = launcher->area.height;
 	} else {
@@ -187,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;
@@ -195,7 +175,8 @@ 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->list_themes, launcherIcon->icon_name, launcherIcon->icon_size);
 			if (!new_icon_path) {
 				// Draw a blank icon
 				free_icon(launcherIcon->image);
@@ -234,46 +215,47 @@ int resize_launcher(void *obj)
 		}
 
 		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_hover = adjust_icon(launcherIcon->image,
-			launcherIcon->image_pressed = adjust_icon(launcherIcon->image, panel_config.mouse_pressed_alpha, panel_config.mouse_pressed_saturation, panel_config.mouse_pressed_brightness);
+													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);
+	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);
+			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;
+			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);
+			icons_per_row = count / icons_per_column + (count % icons_per_column != 0);
-			launcher->area.width = (2 * launcher->area.bg->border.width) +
+			launcher->area.width = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) +
-								   (2 * launcher->area.paddingxlr) +
+								   (icon_size * icons_per_row) + ((icons_per_row - 1) * launcher->area.paddingx);
-								   (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);
+			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;
+			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);
+			icons_per_column = count / icons_per_row + (count % icons_per_row != 0);
-			launcher->area.height = (2 * launcher->area.bg->border.width) +
+			launcher->area.height = (2 * launcher->area.bg->border.width) + (2 * launcher->area.paddingxlr) +
-									(2 * launcher->area.paddingxlr) +
+									(icon_size * icons_per_column) + ((icons_per_column - 1) * launcher->area.paddingx);
-									(icon_size * icons_per_column) +
-									((icons_per_column-1) * launcher->area.paddingx);
 		}
 	}
 
-	int i, posx, posy;
+	int posx, posy;
-	int start = launcher->area.bg->border.width + launcher->area.paddingy + marging/2;
+	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;
@@ -282,16 +264,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) {
+	int i;
-		LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
+	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.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
-		launcherIcon->area.posx = ((Area*)launcherIcon->area.parent)->posx + launcherIcon->x;
+		launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
 		launcherIcon->area.width = launcherIcon->icon_size;
 		launcherIcon->area.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;
@@ -309,29 +293,29 @@ int resize_launcher(void *obj)
 		}
 	}
 
-	return 1;
+	return TRUE;
 }
 
 // Here we override the default layout of the icons; normally Area layouts its children
 // in a stack; we need to layout them in a kind of table
 void launcher_icon_on_change_layout(void *obj)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
+	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
-	launcherIcon->area.posy = ((Area*)launcherIcon->area.parent)->posy + launcherIcon->y;
+	launcherIcon->area.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
-	launcherIcon->area.posx = ((Area*)launcherIcon->area.parent)->posx + launcherIcon->x;
+	launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
 	launcherIcon->area.width = launcherIcon->icon_size;
 	launcherIcon->area.height = launcherIcon->icon_size;
 }
 
-char* launcher_icon_get_tooltip_text(void *obj)
+char *launcher_icon_get_tooltip_text(void *obj)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
+	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
 	return strdup(launcherIcon->icon_tooltip);
 }
 
 void draw_launcher_icon(void *obj, cairo_t *c)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
+	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
 
 	Imlib_Image image;
 	// Render
@@ -343,7 +327,7 @@ void draw_launcher_icon(void *obj, cairo_t *c)
 		else
 			image = launcherIcon->image;
 	} else {
-		 image = launcherIcon->image;
+		image = launcherIcon->image;
 	}
 	imlib_context_set_image(image);
 	render_image(launcherIcon->area.pix, 0, 0);
@@ -353,19 +337,25 @@ Imlib_Image scale_icon(Imlib_Image original, int icon_size)
 {
 	Imlib_Image icon_scaled;
 	if (original) {
-		imlib_context_set_image (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);
+		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();
+		DATA32 *data = imlib_image_get_data();
-		adjust_asb(data, icon_size, icon_size, launcher_alpha, (float)launcher_saturation/100, (float)launcher_brightness/100);
+		adjust_asb(data,
+				   icon_size,
+				   icon_size,
+				   launcher_alpha,
+				   (float)launcher_saturation / 100,
+				   (float)launcher_brightness / 100);
 		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);
 	}
@@ -380,18 +370,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;
@@ -408,7 +398,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);
@@ -426,10 +416,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
 	}
@@ -440,23 +430,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.resize_needed = 0;
-			launcherIcon->area.redraw = 1;
+			schedule_redraw(&launcherIcon->area);
-			launcherIcon->area.mouse_over_effect = 1;
+			launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
-			launcherIcon->area.mouse_press_effect = 1;
+			launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
 			launcherIcon->area.bg = launcher_icon_bg;
-			launcherIcon->area.on_screen = 1;
+			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;
@@ -470,25 +459,35 @@ void launcher_load_icons(Launcher *launcher)
 			launcherIcon->icon_tooltip = entry.name ? strdup(entry.name) : strdup(entry.exec);
 			free_desktop_entry(&entry);
 			launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
-			add_area(&launcherIcon->area);
+			add_area(&launcherIcon->area, (Area *)launcher);
 		}
 		app = g_slist_next(app);
 	}
 }
 
-
 // Populates the list_themes list
 void launcher_load_themes(Launcher *launcher)
 {
-	launcher->list_themes = load_themes(launcher_icon_theme_override
+	launcher->list_themes =
-										? (icon_theme_name_config
+	    load_themes(launcher_icon_theme_override
-										   ? icon_theme_name_config
+	                    ? (icon_theme_name_config ? icon_theme_name_config
-										   : icon_theme_name_xsettings
+	                                              : icon_theme_name_xsettings ? icon_theme_name_xsettings : "hicolor")
-											 ? icon_theme_name_xsettings
+	                    : (icon_theme_name_xsettings ? icon_theme_name_xsettings
-											 : "hicolor")
+	                                                 : icon_theme_name_config ? icon_theme_name_config : "hicolor"));
-										: (icon_theme_name_xsettings
+}
-										   ? icon_theme_name_xsettings
+
-										   : icon_theme_name_config
+void launcher_default_icon_theme_changed()
-											 ? icon_theme_name_config
+{
-											 : "hicolor"));
+	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,8 +15,8 @@
 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_apps;  // List of char*, each is a path to a app.desktop file
-	GSList *list_icons; 		// List of LauncherIcon*
+	GSList *list_icons; // List of LauncherIcon*
 	IconThemeWrapper *list_themes;
 } Launcher;
 
@@ -35,16 +35,15 @@ 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;
 
@@ -57,14 +56,15 @@ void init_launcher_panel(void *panel);
 void cleanup_launcher();
 void cleanup_launcher_theme(Launcher *launcher);
 
-int  resize_launcher(void *obj);
+gboolean resize_launcher(void *obj);
-void draw_launcher (void *obj, cairo_t *c);
+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);
-			
+			default_icon_theme_changed();
-			int i;
+		} else if (strcmp(name, "Gtk/FontName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
-			for (i = 0 ; i < nb_panel ; i++) {
+			fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
-				Launcher *launcher = &panel1[i].launcher;
+			if (default_font) {
-				cleanup_launcher_theme(launcher);
+				if (strcmp(default_font, setting->data.v_string) == 0)
-				launcher_load_themes(launcher);
+					return;
-				launcher_load_icons(launcher);
+				free(default_font);
-				launcher->area.resize = 1;
 			}
+			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);
+			client->notify(old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
-		}
+		} else if (cmp == 0) {
-		else if (cmp == 0) {
+			if (!xsettings_setting_equal(old_iter->setting, new_iter->setting))
-			if (!xsettings_setting_equal (old_iter->setting, new_iter->setting))
+				client->notify(old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
-				client->notify (old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
+		} else {
-		}
+			client->notify(new_iter->setting->name, XSETTINGS_ACTION_NEW, 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:
+		case XSETTINGS_TYPE_INT:
-			result = fetch_card32 (&buffer, &v_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:
+		case XSETTINGS_TYPE_STRING:
-			result = fetch_card32 (&buffer, &v_int);
+			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:
+		case XSETTINGS_TYPE_COLOR:
-			result = fetch_ushort (&buffer, &setting->data.v_color.red);
+			result = fetch_ushort(&buffer, &setting->data.v_color.red);
 			if (result != XSETTINGS_SUCCESS)
 				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:
+		case XSETTINGS_DUPLICATE_ENTRY:
-			fprintf (stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
+			fprintf(stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
-			case XSETTINGS_FAILED:
+		case XSETTINGS_FAILED:
-			case XSETTINGS_SUCCESS:
+		case XSETTINGS_SUCCESS:
-			case XSETTINGS_NO_ENTRY:
+		case XSETTINGS_NO_ENTRY:
 			break;
 		}
 
 		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);
+	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);
+	int result = XGetWindowProperty(client->display,
-	XSetErrorHandler (old_handler);
+								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);
+			fprintf(stderr, "Invalid format for XSETTINGS property %d", format);
-		}
+		} else
-		else
+			client->settings = parse_settings(data, n_items);
-			client->settings = parse_settings (data, n_items);
+		XFree(data);
-		XFree (data);
 	}
 
-	notify_changes (client, old_list);
+	notify_changes(client, old_list);
-	xsettings_list_free (old_list);
+	xsettings_list_free(old_list);
 }
 
-
+static void check_manager_window(XSettingsClient *client)
-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);
+	XUngrabServer(client->display);
-	XFlush (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,
-XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNotifyFunc notify, XSettingsWatchFunc watch, void *cb_data) 
+									  int screen,
+									  XSettingsNotifyFunc notify,
+									  XSettingsWatchFunc watch,
+									  void *cb_data)
 {
-	XSettingsClient *client;
+	XSettingsClient *client = calloc(1, sizeof *client);
-
-	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");
+		printf("No XSETTINGS manager, tint2 uses config option 'launcher_icon_theme'.\n");
-		free (client);
+		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) {
-		else if (xev->xany.type == PropertyNotify) {
+			read_settings(client);
-			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 
+typedef enum { XSETTINGS_ACTION_NEW, XSETTINGS_ACTION_CHANGED, XSETTINGS_ACTION_DELETED } XSettingsAction;
-{
-  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 (*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 (*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);
+XSettingsClient *xsettings_client_new(Display *display,
-void xsettings_client_destroy (XSettingsClient *client);
+									  int screen,
-Bool xsettings_client_process_event (XSettingsClient *client, XEvent *xev);
+									  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 *
+XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting)
-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);
+	str_len = strlen(setting->name);
-	result->name = calloc (str_len + 1, 1);
+	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);
+		str_len = strlen(setting->data.v_string);
-		result->data.v_string = calloc (str_len + 1, 1);
+		result->data.v_string = calloc(str_len + 1, 1);
 		if (!result->data.v_string)
 			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->name);
-	free (result);
+	free(result);
 
 	return NULL;
 }
 
-XSettingsList *
+XSettingsList *xsettings_list_copy(XSettingsList *list)
-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);
+		new_node->setting = xsettings_setting_copy(old_iter->setting);
-		if (!new_node->setting)
+		if (!new_node->setting) {
-		{
+			free(new_node);
-			free (new_node);
 			goto error;
 		}
 
@@ -114,22 +109,19 @@ xsettings_list_copy (XSettingsList *list)
 	return new;
 
 error:
-	xsettings_list_free (new);
+	xsettings_list_free(new);
 	return NULL;
 }
 
-int
+int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b)
-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
+void xsettings_setting_free(XSettingsSetting *setting)
-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
+void xsettings_list_free(XSettingsList *list)
-xsettings_list_free (XSettingsList *list)
 {
-	while (list)
+	while (list) {
-	{
 		XSettingsList *next = list->next;
 
-		xsettings_setting_free (list->setting);
+		xsettings_setting_free(list->setting);
-		free (list);
+		free(list);
 
 		list = next;
 	}
 }
 
-XSettingsResult
+XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting)
-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)
+	while (iter) {
-	{
+		int cmp = strcmp(setting->name, iter->setting->name);
-		int cmp = strcmp (setting->name, iter->setting->name);
 
 		if (cmp < 0)
 			break;
-		else if (cmp == 0)
+		else if (cmp == 0) {
-		{
+			free(node);
-			free (node);
 			return XSETTINGS_DUPLICATE_ENTRY;
 		}
 
@@ -212,25 +197,21 @@ xsettings_list_insert (XSettingsList    **list,
 	return XSETTINGS_SUCCESS;
 }
 
-XSettingsResult
+XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name)
-xsettings_list_delete (XSettingsList **list,
-					   const char     *name)
 {
 	XSettingsList *iter;
 	XSettingsList *last = NULL;
 
 	iter = *list;
-	while (iter)
+	while (iter) {
-	{
+		if (strcmp(name, iter->setting->name) == 0) {
-		if (strcmp (name, iter->setting->name) == 0)
-		{
 			if (last)
 				last->next = iter->next;
 			else
 				*list = iter->next;
 
-			xsettings_setting_free (iter->setting);
+			xsettings_setting_free(iter->setting);
-			free (iter);
+			free(iter);
 
 			return XSETTINGS_SUCCESS;
 		}
@@ -242,16 +223,13 @@ xsettings_list_delete (XSettingsList **list,
 	return XSETTINGS_FAILED;
 }
 
-XSettingsSetting *
+XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name)
-xsettings_list_lookup (XSettingsList *list,
-					   const char    *name)
 {
 	XSettingsList *iter;
 
 	iter = list;
-	while (iter)
+	while (iter) {
-	{
+		if (strcmp(name, iter->setting->name) == 0)
-		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
+char xsettings_byte_order(void)
-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 _XSettingsBuffer XSettingsBuffer;
-typedef struct _XSettingsColor   XSettingsColor;
+typedef struct _XSettingsColor XSettingsColor;
-typedef struct _XSettingsList    XSettingsList;
+typedef struct _XSettingsList XSettingsList;
 typedef struct _XSettingsSetting XSettingsSetting;
 
 /* Types of settings possible. Enum values correspond to
  * protocol values.
  */
-typedef enum 
+typedef enum {
-{
+	XSETTINGS_TYPE_INT = 0,
-  XSETTINGS_TYPE_INT     = 0,
+	XSETTINGS_TYPE_STRING = 1,
-  XSETTINGS_TYPE_STRING  = 1,
+	XSETTINGS_TYPE_COLOR = 2,
-  XSETTINGS_TYPE_COLOR   = 2,
+	XSETTINGS_TYPE_NONE = 0xff
-  XSETTINGS_TYPE_NONE    = 0xff
 } XSettingsType;
 
-typedef enum
+typedef enum {
-{
+	XSETTINGS_SUCCESS,
-  XSETTINGS_SUCCESS,
+	XSETTINGS_NO_MEM,
-  XSETTINGS_NO_MEM,
+	XSETTINGS_ACCESS,
-  XSETTINGS_ACCESS,
+	XSETTINGS_FAILED,
-  XSETTINGS_FAILED,
+	XSETTINGS_NO_ENTRY,
-  XSETTINGS_NO_ENTRY,
+	XSETTINGS_DUPLICATE_ENTRY
-  XSETTINGS_DUPLICATE_ENTRY
 } XSettingsResult;
 
-struct _XSettingsBuffer
+struct _XSettingsBuffer {
-{
+	char byte_order;
-  char byte_order;
+	size_t len;
-  size_t len;
+	unsigned char *data;
-  unsigned char *data;
+	unsigned char *pos;
-  unsigned char *pos;
 };
 
-struct _XSettingsColor
+struct _XSettingsColor {
-{
+	unsigned short red, green, blue, alpha;
-  unsigned short red, green, blue, alpha;
 };
 
-struct _XSettingsList
+struct _XSettingsList {
-{
+	XSettingsSetting *setting;
-  XSettingsSetting *setting;
+	XSettingsList *next;
-  XSettingsList *next;
 };
 
-struct _XSettingsSetting
+struct _XSettingsSetting {
-{
+	char *name;
-  char *name;
+	XSettingsType type;
-  XSettingsType type;
-  
-  union {
-    int v_int;
-    char *v_string;
-    XSettingsColor v_color;
-  } data;
 
-  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);
+XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting);
-void              xsettings_setting_free  (XSettingsSetting *setting);
+void xsettings_setting_free(XSettingsSetting *setting);
-int               xsettings_setting_equal (XSettingsSetting *setting_a,
+int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b);
-					   XSettingsSetting *setting_b);
 
-void              xsettings_list_free   (XSettingsList     *list);
+void xsettings_list_free(XSettingsList *list);
-XSettingsList    *xsettings_list_copy   (XSettingsList     *list);
+XSettingsList *xsettings_list_copy(XSettingsList *list);
-XSettingsResult   xsettings_list_insert (XSettingsList    **list,
+XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting);
-					 XSettingsSetting  *setting);
+XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name);
-XSettingsSetting *xsettings_list_lookup (XSettingsList     *list,
+XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name);
-					 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,77 +21,85 @@
 #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 MouseAction mouse_left;
-extern int mouse_middle;
+extern MouseAction mouse_middle;
-extern int mouse_right;
+extern MouseAction mouse_right;
-extern int mouse_scroll_up;
+extern MouseAction mouse_scroll_up;
-extern int mouse_scroll_down;
+extern MouseAction mouse_scroll_down;
-extern int mouse_tilt_left;
+extern MouseAction mouse_tilt_left;
-extern int mouse_tilt_right;
+extern MouseAction mouse_tilt_right;
 
-//panel mode
+// panel mode
-enum { SINGLE_DESKTOP=0, MULTI_DESKTOP };
+typedef enum TaskbarMode {
-enum { BOTTOM_LAYER, NORMAL_LAYER, TOP_LAYER };
+	SINGLE_DESKTOP = 0,
-extern int panel_mode;
+	MULTI_DESKTOP,
-extern int wm_menu;
+} TaskbarMode;
-extern int panel_dock;
+
-extern int panel_layer;
+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;
-
+extern PanelPosition panel_position;
-//panel position
+extern gboolean panel_horizontal;
-enum { LEFT=0x01, RIGHT=0x02, CENTER=0X04, TOP=0X08, BOTTOM=0x10 };
+extern gboolean panel_refresh;
-extern int panel_position;
+extern gboolean task_dragged;
-extern int panel_horizontal;
+extern gboolean panel_autohide;
-
-extern int panel_refresh;
-extern int task_dragged;
-
-//panel autohide
-enum { STRUT_MINIMUM, STRUT_FOLLOW_SIZE, STRUT_NONE };
-extern int 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_autohide_height; // for vertical panels this is of course the width
-extern int panel_strut_policy;
+extern Strut panel_strut_policy;
 extern char *panel_items_order;
-
+extern int max_tick_urgent;
-extern int  max_tick_urgent;
+extern GArray *backgrounds;
-
-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;
 
-
+typedef struct Panel {
-// 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
 	Area area;
 
-	// --------------------------------------------------
-	// panel
 	Window main_win;
 	Pixmap temp_pmap;
 
 	// position relative to root window
 	int posx, posy;
 	int marginx, marginy;
-	int pourcentx, pourcenty;
+	int fractional_width, fractional_height;
-	// location of the panel (monitor number)
 	int monitor;
 	int font_shadow;
-	int mouse_effects;
+	gboolean mouse_effects;
 	// Mouse effects for icons
 	int mouse_over_alpha;
 	int mouse_over_saturation;
@@ -100,46 +108,36 @@ typedef struct {
 	int mouse_pressed_saturation;
 	int mouse_pressed_brightness;
 
-	// --------------------------------------------------
+	// Per-panel parameters and states for Taskbar and Task
-	// task and taskbar parameter per panel
+	GlobalTaskbar g_taskbar;
-	Global_taskbar g_taskbar;
+	GlobalTask g_task;
-	Global_task g_task;
 
-	// --------------------------------------------------
+	// Array of Taskbar, with num_desktops items
-	// 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
 	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
+	// Autohide
-	int is_hidden;
+	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 Panel *panels;
-extern int  nb_panel;
+extern int num_panels;
-
 
 // default global data
 void default_panel();
@@ -152,7 +150,8 @@ 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 set_panel_properties(Panel *p);
@@ -163,22 +162,28 @@ void set_panel_background(Panel *p);
 // detect witch panel
 Panel *get_panel(Window win);
 
-Taskbar *click_taskbar (Panel *panel, int x, int y);
+Taskbar *click_taskbar(Panel *panel, int x, int y);
-Task *click_task (Panel *panel, int x, int y);
+Task *click_task(Panel *panel, int x, int y);
-Launcher *click_launcher (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);
+LauncherIcon *click_launcher_icon(Panel *panel, int x, int y);
-int click_padding(Panel *panel, int x, int y);
+gboolean click_padding(Panel *panel, int x, int y);
-int click_clock(Panel *panel, int x, int y);
+gboolean click_clock(Panel *panel, int x, int y);
 
 #ifdef ENABLE_BATTERY
-int click_battery(Panel *panel, int x, int y);
+gboolean click_battery(Panel *panel, int x, int y);
 #endif
 
-Area* click_area(Panel *panel, int x, int y);
+Area *click_area(Panel *panel, int x, int y);
+Execp *click_execp(Panel *panel, int x, int y);
 
-void autohide_show(void* p);
+void autohide_show(void *p);
-void autohide_hide(void* p);
+void autohide_hide(void *p);
-void autohide_trigger_show(Panel* p);
+void autohide_trigger_show(Panel *p);
-void autohide_trigger_hide(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,125 +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._NET_SYSTEM_TRAY_ICON_SIZE = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_ICON_SIZE", False);
-	server.atom._NET_SYSTEM_TRAY_PADDING = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_PADDING", False);
-	server.atom._XEMBED = XInternAtom(server.dsp, "_XEMBED", False);
-	server.atom._XEMBED_INFO = XInternAtom(server.dsp, "_XEMBED_INFO", False);
-	server.atom._NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);
-
-	// drag 'n' drop
-	server.atom.XdndAware = XInternAtom(server.dsp, "XdndAware", False);
-	server.atom.XdndEnter = XInternAtom(server.dsp, "XdndEnter", False);
-	server.atom.XdndPosition = XInternAtom(server.dsp, "XdndPosition", False);
-	server.atom.XdndStatus = XInternAtom(server.dsp, "XdndStatus", False);
-	server.atom.XdndDrop = XInternAtom(server.dsp, "XdndDrop", False);
-	server.atom.XdndLeave = XInternAtom(server.dsp, "XdndLeave", False);
-	server.atom.XdndSelection = XInternAtom(server.dsp, "XdndSelection", False);
-	server.atom.XdndTypeList = XInternAtom(server.dsp, "XdndTypeList", False);
-	server.atom.XdndActionCopy = XInternAtom(server.dsp, "XdndActionCopy", False);
-	server.atom.XdndFinished = XInternAtom(server.dsp, "XdndFinished", False);
-	server.atom.TARGETS = XInternAtom(server.dsp, "TARGETS", False);
 }
 
+void server_init_atoms()
+{
+	server.atom._XROOTPMAP_ID = XInternAtom(server.display, "_XROOTPMAP_ID", False);
+	server.atom._XROOTMAP_ID = XInternAtom(server.display, "_XROOTMAP_ID", False);
+	server.atom._NET_CURRENT_DESKTOP = XInternAtom(server.display, "_NET_CURRENT_DESKTOP", False);
+	server.atom._NET_NUMBER_OF_DESKTOPS = XInternAtom(server.display, "_NET_NUMBER_OF_DESKTOPS", False);
+	server.atom._NET_DESKTOP_NAMES = XInternAtom(server.display, "_NET_DESKTOP_NAMES", False);
+	server.atom._NET_DESKTOP_GEOMETRY = XInternAtom(server.display, "_NET_DESKTOP_GEOMETRY", False);
+	server.atom._NET_DESKTOP_VIEWPORT = XInternAtom(server.display, "_NET_DESKTOP_VIEWPORT", False);
+	server.atom._NET_WORKAREA = XInternAtom(server.display, "_NET_WORKAREA", False);
+	server.atom._NET_ACTIVE_WINDOW = XInternAtom(server.display, "_NET_ACTIVE_WINDOW", False);
+	server.atom._NET_WM_WINDOW_TYPE = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE", False);
+	server.atom._NET_WM_STATE_SKIP_PAGER = XInternAtom(server.display, "_NET_WM_STATE_SKIP_PAGER", False);
+	server.atom._NET_WM_STATE_SKIP_TASKBAR = XInternAtom(server.display, "_NET_WM_STATE_SKIP_TASKBAR", False);
+	server.atom._NET_WM_STATE_STICKY = XInternAtom(server.display, "_NET_WM_STATE_STICKY", False);
+	server.atom._NET_WM_STATE_DEMANDS_ATTENTION = XInternAtom(server.display, "_NET_WM_STATE_DEMANDS_ATTENTION", False);
+	server.atom._NET_WM_WINDOW_TYPE_DOCK = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_DOCK", False);
+	server.atom._NET_WM_WINDOW_TYPE_DESKTOP = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_DESKTOP", False);
+	server.atom._NET_WM_WINDOW_TYPE_TOOLBAR = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_TOOLBAR", False);
+	server.atom._NET_WM_WINDOW_TYPE_MENU = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_MENU", False);
+	server.atom._NET_WM_WINDOW_TYPE_SPLASH = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_SPLASH", False);
+	server.atom._NET_WM_WINDOW_TYPE_DIALOG = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_DIALOG", False);
+	server.atom._NET_WM_WINDOW_TYPE_NORMAL = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_NORMAL", False);
+	server.atom._NET_WM_DESKTOP = XInternAtom(server.display, "_NET_WM_DESKTOP", False);
+	server.atom.WM_STATE = XInternAtom(server.display, "WM_STATE", False);
+	server.atom._NET_WM_STATE = XInternAtom(server.display, "_NET_WM_STATE", False);
+	server.atom._NET_WM_STATE_MAXIMIZED_VERT = XInternAtom(server.display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
+	server.atom._NET_WM_STATE_MAXIMIZED_HORZ = XInternAtom(server.display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
+	server.atom._NET_WM_STATE_SHADED = XInternAtom(server.display, "_NET_WM_STATE_SHADED", False);
+	server.atom._NET_WM_STATE_HIDDEN = XInternAtom(server.display, "_NET_WM_STATE_HIDDEN", False);
+	server.atom._NET_WM_STATE_BELOW = XInternAtom(server.display, "_NET_WM_STATE_BELOW", False);
+	server.atom._NET_WM_STATE_ABOVE = XInternAtom(server.display, "_NET_WM_STATE_ABOVE", False);
+	server.atom._NET_WM_STATE_MODAL = XInternAtom(server.display, "_NET_WM_STATE_MODAL", False);
+	server.atom._NET_CLIENT_LIST = XInternAtom(server.display, "_NET_CLIENT_LIST", False);
+	server.atom._NET_WM_VISIBLE_NAME = XInternAtom(server.display, "_NET_WM_VISIBLE_NAME", False);
+	server.atom._NET_WM_NAME = XInternAtom(server.display, "_NET_WM_NAME", False);
+	server.atom._NET_WM_STRUT = XInternAtom(server.display, "_NET_WM_STRUT", False);
+	server.atom._NET_WM_ICON = XInternAtom(server.display, "_NET_WM_ICON", False);
+	server.atom._NET_WM_ICON_GEOMETRY = XInternAtom(server.display, "_NET_WM_ICON_GEOMETRY", False);
+	server.atom._NET_WM_ICON_NAME = XInternAtom(server.display, "_NET_WM_ICON_NAME", False);
+	server.atom._NET_CLOSE_WINDOW = XInternAtom(server.display, "_NET_CLOSE_WINDOW", False);
+	server.atom.UTF8_STRING = XInternAtom(server.display, "UTF8_STRING", False);
+	server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom(server.display, "_NET_SUPPORTING_WM_CHECK", False);
+	server.atom._NET_WM_CM_S0 = XInternAtom(server.display, "_NET_WM_CM_S0", False);
+	server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom(server.display, "_NET_WM_NAME", False);
+	server.atom._NET_WM_STRUT_PARTIAL = XInternAtom(server.display, "_NET_WM_STRUT_PARTIAL", False);
+	server.atom.WM_NAME = XInternAtom(server.display, "WM_NAME", False);
+	server.atom.__SWM_VROOT = XInternAtom(server.display, "__SWM_VROOT", False);
+	server.atom._MOTIF_WM_HINTS = XInternAtom(server.display, "_MOTIF_WM_HINTS", False);
+	server.atom.WM_HINTS = XInternAtom(server.display, "WM_HINTS", False);
+	gchar *name = g_strdup_printf("_XSETTINGS_S%d", DefaultScreen(server.display));
+	server.atom._XSETTINGS_SCREEN = XInternAtom(server.display, name, False);
+	g_free(name);
+	server.atom._XSETTINGS_SETTINGS = XInternAtom(server.display, "_XSETTINGS_SETTINGS", False);
+
+	// systray protocol
+	name = g_strdup_printf("_NET_SYSTEM_TRAY_S%d", DefaultScreen(server.display));
+	server.atom._NET_SYSTEM_TRAY_SCREEN = XInternAtom(server.display, name, False);
+	g_free(name);
+	server.atom._NET_SYSTEM_TRAY_OPCODE = XInternAtom(server.display, "_NET_SYSTEM_TRAY_OPCODE", False);
+	server.atom.MANAGER = XInternAtom(server.display, "MANAGER", False);
+	server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA = XInternAtom(server.display, "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
+	server.atom._NET_SYSTEM_TRAY_ORIENTATION = XInternAtom(server.display, "_NET_SYSTEM_TRAY_ORIENTATION", False);
+	server.atom._NET_SYSTEM_TRAY_ICON_SIZE = XInternAtom(server.display, "_NET_SYSTEM_TRAY_ICON_SIZE", False);
+	server.atom._NET_SYSTEM_TRAY_PADDING = XInternAtom(server.display, "_NET_SYSTEM_TRAY_PADDING", False);
+	server.atom._XEMBED = XInternAtom(server.display, "_XEMBED", False);
+	server.atom._XEMBED_INFO = XInternAtom(server.display, "_XEMBED_INFO", False);
+	server.atom._NET_WM_PID = XInternAtom(server.display, "_NET_WM_PID", True);
+
+	// drag 'n' drop
+	server.atom.XdndAware = XInternAtom(server.display, "XdndAware", False);
+	server.atom.XdndEnter = XInternAtom(server.display, "XdndEnter", False);
+	server.atom.XdndPosition = XInternAtom(server.display, "XdndPosition", False);
+	server.atom.XdndStatus = XInternAtom(server.display, "XdndStatus", False);
+	server.atom.XdndDrop = XInternAtom(server.display, "XdndDrop", False);
+	server.atom.XdndLeave = XInternAtom(server.display, "XdndLeave", False);
+	server.atom.XdndSelection = XInternAtom(server.display, "XdndSelection", False);
+	server.atom.XdndTypeList = XInternAtom(server.display, "XdndTypeList", False);
+	server.atom.XdndActionCopy = XInternAtom(server.display, "XdndActionCopy", False);
+	server.atom.XdndFinished = XInternAtom(server.display, "XdndFinished", False);
+	server.atom.TARGETS = XInternAtom(server.display, "TARGETS", False);
+}
 
 void cleanup_server()
 {
 	if (server.colormap)
-		XFreeColormap(server.dsp, server.colormap);
+		XFreeColormap(server.display, server.colormap);
 	server.colormap = 0;
 	if (server.colormap32)
-		XFreeColormap(server.dsp, server.colormap32);
+		XFreeColormap(server.display, server.colormap32);
 	server.colormap32 = 0;
-	if (server.monitor) {
+	if (server.monitors) {
-		int i;
+		for (int i = 0; i < server.num_monitors; ++i) {
-		for (i = 0; i < server.nb_monitor; ++i) {
+			g_strfreev(server.monitors[i].names);
-			g_strfreev(server.monitor[i].names);
+			server.monitors[i].names = NULL;
-			server.monitor[i].names = NULL;
 		}
-		free(server.monitor);
+		free(server.monitors);
-		server.monitor = NULL;
+		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;
 
@@ -159,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;
@@ -172,286 +172,421 @@ 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];
+		data = ((gulong *)prop_value)[0];
-		XFree (prop_value);
+		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
+	// Send fill_color resultcount
-	if (num_results) *num_results = (int)nitems_ret;
+	if (num_results)
+		*num_results = (int)nitems_ret;
 
-	if (result == Success && prop_value) return prop_value;
+	if (result == Success && prop_value)
-	else return 0;
+		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};
-	Atom pixmap_atoms[] = { server.atom._XROOTPMAP_ID, server.atom._XROOTMAP_ID };
+	for (int i = 0; i < sizeof(pixmap_atoms) / sizeof(Atom); ++i) {
-	int i;
+		unsigned long *res = (unsigned long *)server_get_property(server.root_win, pixmap_atoms[i], XA_PIXMAP, NULL);
-
-	for (i=0; i<sizeof(pixmap_atoms)/sizeof(Atom); ++i) {
-		res = server_get_property (server.root_win, pixmap_atoms[i], XA_PIXMAP, 0);
 		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 {
+	} else {
-		XGCValues  gcv;
+		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 compare_monitor_pos(const void *monitor1, const void *monitor2)
-int compareMonitorPos(const void *monitor1, const void *monitor2)
 {
-	Monitor *m1 = (Monitor*)monitor1;
+	const Monitor *m1 = (const Monitor *)monitor1;
-	Monitor *m2 = (Monitor*)monitor2;
+	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 monitor_includes_monitor(const void *monitor1, const void *monitor2)
-int compareMonitorIncluded(const void *monitor1, const void *monitor2)
 {
-	Monitor *m1 = (Monitor*)monitor1;
+	const Monitor *m1 = (const Monitor *)monitor1;
-	Monitor *m2 = (Monitor*)monitor2;
+	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.display)) {
-	if (XineramaIsActive(server.dsp)) {
+		int num_monitors;
-		XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nbmonitor);
+		XineramaScreenInfo *info = XineramaQueryScreens(server.display, &num_monitors);
-		XRRScreenResources *res = XRRGetScreenResourcesCurrent(server.dsp, server.root_win);
+		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 );
+			printf("xRandr: Found crtc's: %d\n", res->ncrtc);
-			server.monitor = calloc(res->ncrtc, sizeof(Monitor));
+			server.monitors = calloc(res->ncrtc, sizeof(Monitor));
-			for (i=0; i<res->ncrtc; ++i) {
+			for (int i = 0; i < res->ncrtc; ++i) {
-				XRRCrtcInfo* crtc_info = XRRGetCrtcInfo(server.dsp, res, res->crtcs[i]);
+				XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(server.display, res, res->crtcs[i]);
-				server.monitor[i].x = crtc_info->x;
+				server.monitors[i].x = crtc_info->x;
-				server.monitor[i].y = crtc_info->y;
+				server.monitors[i].y = crtc_info->y;
-				server.monitor[i].width = crtc_info->width;
+				server.monitors[i].width = crtc_info->width;
-				server.monitor[i].height = crtc_info->height;
+				server.monitors[i].height = crtc_info->height;
-				server.monitor[i].names = calloc((crtc_info->noutput+1), sizeof(gchar*));
+				server.monitors[i].names = calloc((crtc_info->noutput + 1), sizeof(gchar *));
-				for (j=0; j<crtc_info->noutput; ++j) {
+				for (int j = 0; j < crtc_info->noutput; ++j) {
-					XRROutputInfo* output_info = XRRGetOutputInfo(server.dsp, res, crtc_info->outputs[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;
+			num_monitors = res->ncrtc;
-		}
+		} else if (info && num_monitors > 0) {
-		else if (info && nbmonitor > 0) {
+			server.monitors = calloc(num_monitors, sizeof(Monitor));
-			server.monitor = calloc(nbmonitor, sizeof(Monitor));
+			for (int i = 0; i < num_monitors; i++) {
-			for (i=0 ; i < nbmonitor ; i++) {
+				server.monitors[i].x = info[i].x_org;
-				server.monitor[i].x = info[i].x_org;
+				server.monitors[i].y = info[i].y_org;
-				server.monitor[i].y = info[i].y_org;
+				server.monitors[i].width = info[i].width;
-				server.monitor[i].width = info[i].width;
+				server.monitors[i].height = info[i].height;
-				server.monitor[i].height = info[i].height;
+				server.monitors[i].names = 0;
-				server.monitor[i].names = 0;
 			}
 		}
 
-		// ordered monitor
+		// Sort monitors by inclusion
-		qsort(server.monitor, nbmonitor, sizeof(Monitor), compareMonitorIncluded);
+		qsort(server.monitors, num_monitors, sizeof(Monitor), monitor_includes_monitor);
 
-		// remove monitor included into another one
+		// Remove monitors included in other ones
-		i = 0;
+		int i = 0;
-		while (i < nbmonitor) {
+		while (i < num_monitors) {
-			for (j=0; j < i ; j++) {
+			for (int j = 0; j < i; j++) {
-				if (compareMonitorIncluded(&server.monitor[i], &server.monitor[j]) > 0) {
+				if (monitor_includes_monitor(&server.monitors[i], &server.monitors[j]) > 0) {
 					goto next;
 				}
 			}
 			i++;
 		}
-next:
+	next:
-		for (j=i; j<nbmonitor; ++j)
+		for (int j = i; j < num_monitors; ++j)
-			if (server.monitor[j].names)
+			if (server.monitors[j].names)
-				g_strfreev(server.monitor[j].names);
+				g_strfreev(server.monitors[j].names);
-		server.nb_monitor = i;
+		server.num_monitors = i;
-		server.monitor = realloc(server.monitor, server.nb_monitor * sizeof(Monitor));
+		server.monitors = realloc(server.monitors, server.num_monitors * sizeof(Monitor));
-		qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitorPos);
+		qsort(server.monitors, server.num_monitors, sizeof(Monitor), compare_monitor_pos);
 
 		if (res)
 			XRRFreeScreenResources(res);
 		XFree(info);
 	}
 
-	if (!server.nb_monitor) {
+	if (!server.num_monitors) {
-		server.nb_monitor = 1;
+		server.num_monitors = 1;
-		server.monitor = calloc(1, sizeof(Monitor));
+		server.monitors = calloc(1, sizeof(Monitor));
-		server.monitor[0].x = server.monitor[0].y = 0;
+		server.monitors[0].x = server.monitors[0].y = 0;
-		server.monitor[0].width = DisplayWidth (server.dsp, server.screen);
+		server.monitors[0].width = DisplayWidth(server.display, server.screen);
-		server.monitor[0].height = DisplayHeight (server.dsp, server.screen);
+		server.monitors[0].height = DisplayHeight(server.display, server.screen);
-		server.monitor[0].names = 0;
+		server.monitors[0].names = 0;
 	}
 }
 
 void print_monitors()
 {
-	fprintf(stderr, "Number of monitors: %d\n", server.nb_monitor);
+	fprintf(stderr, "Number of monitors: %d\n", server.num_monitors);
-	int i;
+	for (int i = 0; i < server.num_monitors; i++) {
-	for (i = 0; i < server.nb_monitor; i++) {
+		fprintf(stderr,
-		fprintf(stderr, "Monitor %d: x = %d, y = %d, w = %d, h = %d\n",
+				"Monitor %d: x = %d, y = %d, w = %d, h = %d\n",
-				i+1,
+				i + 1,
-				server.monitor[i].x,
+				server.monitors[i].x,
-				server.monitor[i].y,
+				server.monitors[i].y,
-				server.monitor[i].width,
+				server.monitors[i].width,
-				server.monitor[i].height);
+				server.monitors[i].height);
 	}
 }
 
-int server_get_number_of_desktops()
+void server_get_number_of_desktops()
 {
-	return get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);
+	if (server.viewports) {
+		free(server.viewports);
+		server.viewports = NULL;
+	}
+
+	server.num_desktops = get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);
+	if (server.num_desktops > 1)
+		return;
+
+	int num_results;
+	long *work_area_size = server_get_property(server.root_win, server.atom._NET_WORKAREA, XA_CARDINAL, &num_results);
+	if (!work_area_size)
+		return;
+	int work_area_width = work_area_size[0] + work_area_size[2];
+	int work_area_height = work_area_size[1] + work_area_size[3];
+	XFree(work_area_size);
+
+	long *x_screen_size = server_get_property(server.root_win, server.atom._NET_DESKTOP_GEOMETRY, XA_CARDINAL, &num_results);
+	if (!x_screen_size)
+		return;
+	int x_screen_width = x_screen_size[0];
+	int x_screen_height = x_screen_size[1];
+	XFree(x_screen_size);
+
+	int num_viewports = MAX(x_screen_width / work_area_width, 1) * MAX(x_screen_height / work_area_height, 1);
+	if (num_viewports <= 1)
+		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 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);
+
+	return (viewport_y / work_area_height) * ncols + viewport_x / work_area_width;
+}
+
+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++) {
+	for (int i = 0; i < 15; i++) {
-		server.nb_desktop = server_get_number_of_desktops();
+		server_get_number_of_desktops();
-		if (server.nb_desktop > 0) break;
+		if (server.num_desktops > 0)
+			break;
 		sleep(1);
 	}
-	if (server.nb_desktop == 0) {
+	if (server.num_desktops == 0) {
-		server.nb_desktop = 1;
+		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++) {
+		for (int i = 0; i < nvi; i++) {
-			format = XRenderFindVisualFormat(server.dsp, xvi[i].visual);
+			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.real_transparency = FALSE;
-		server.depth = DefaultDepth(server.dsp, server.screen);
+		server.depth = DefaultDepth(server.display, server.screen);
 		printf("real transparency off.... depth: %d\n", server.depth);
-		server.colormap = DefaultColormap(server.dsp, server.screen);
+		server.colormap = DefaultColormap(server.display, server.screen);
-		server.visual = DefaultVisual(server.dsp, server.screen);
+		server.visual = DefaultVisual(server.display, server.screen);
 	}
 }

src/server.h

@@ -18,8 +18,9 @@
 #endif
 #include <glib.h>
 
-typedef struct Global_atom
+extern gboolean primary_monitor_first;
-{
+
+typedef struct Global_atom {
 	Atom _XROOTPMAP_ID;
 	Atom _XROOTMAP_ID;
 	Atom _NET_CURRENT_DESKTOP;
@@ -27,6 +28,7 @@ typedef struct Global_atom
 	Atom _NET_DESKTOP_NAMES;
 	Atom _NET_DESKTOP_GEOMETRY;
 	Atom _NET_DESKTOP_VIEWPORT;
+	Atom _NET_WORKAREA;
 	Atom _NET_ACTIVE_WINDOW;
 	Atom _NET_WM_WINDOW_TYPE;
 	Atom _NET_WM_STATE_SKIP_PAGER;
@@ -91,34 +93,40 @@ typedef struct Global_atom
 	Atom TARGETS;
 } Global_atom;
 
-
+typedef struct Monitor {
-
-typedef struct Monitor
-{
 	int x;
 	int y;
 	int width;
 	int height;
-	gchar** names;
+	gboolean primary;
+	gchar **names;
 } Monitor;
 
+typedef struct Viewport {
+	int x;
+	int y;
+	int width;
+	int height;
+} Viewport;
 
-typedef struct
+typedef struct Server {
-{
+	Display *display;
-	Display *dsp;
 	Window root_win;
 	Window composite_manager;
-	int real_transparency;
+	gboolean real_transparency;
-	int disable_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;
+	int num_monitors;
-	Monitor *monitor;
+	// Non-null only if WM uses viewports (compiz) and number of viewports > 1.
-	int got_root_win;
+	// In that case there are num_desktops viewports.
+	Viewport *viewports;
+	Monitor *monitors;
+	gboolean got_root_win;
 	Visual *visual;
 	Visual *visual32;
 	// root background
@@ -128,24 +136,22 @@ typedef struct
 	Colormap colormap32;
 	Global_atom atom;
 #ifdef HAVE_SN
-	SnDisplay *sn_dsp;
+	SnDisplay *sn_display;
 	GTree *pids;
 #endif // HAVE_SN
-} Server_global;
+} Server;
-
-
-extern Server_global server;
 
+extern Server server;
 
 // freed memory
 void cleanup_server();
 
-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);
-int  get_property32 (Window win, Atom at, Atom type);
+int get_property32(Window win, Atom at, Atom type);
-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 server_get_atom (char *atom_name);
+Atom server_get_atom(char *atom_name);
-void server_catch_error (Display *d, XErrorEvent *ev);
+void server_catch_error(Display *d, XErrorEvent *ev);
-void server_init_atoms ();
+void server_init_atoms();
 void server_init_visual();
 
 // detect root background
@@ -155,6 +161,10 @@ void get_root_pixmap();
 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

src/systray/systraybar.h

@@ -16,57 +16,59 @@
 #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;
+	int icon_size, icons_per_column, icons_per_row, margin;
 } Systraybar;
 
-
+typedef struct {
-typedef struct
-{
 	Window parent;
 	Window win;
 	int x, y;
 	int width, height;
 	// TODO: manage icon's show/hide
-	int hide;
+	gboolean hide;
 	int depth;
 	Damage damage;
-	timeout* render_timeout;
+	timeout *render_timeout;
-	int empty;
+	gboolean empty;
 	int pid;
 	int chrono;
-    struct timespec time_last_render;
+	struct timespec time_last_render;
 	int num_fast_renders;
-	int reparented;
+	gboolean reparented;
-	int embedded;
+	gboolean embedded;
 	int bad_size_counter;
-	timeout* resize_timeout;
+	timeout *resize_timeout;
 	struct timespec time_last_resize;
 	char *name;
 	Imlib_Image image;
 } TrayWindow;
 
-
 // net_sel_win != None when protocol started
 extern Window net_sel_win;
 extern Systraybar systray;
-extern int refresh_systray;
+extern gboolean refresh_systray;
-extern int systray_enabled;
+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();
@@ -79,9 +81,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_panelss);
 
 // systray protocol
 // many tray icon doesn't manage stop/restart of the systray manager
@@ -100,8 +102,10 @@ gboolean request_embed_icon(TrayWindow *traywin);
 void systray_resize_request_event(TrayWindow *traywin, XEvent *e);
 gboolean request_embed_icon(TrayWindow *traywin);
 void systray_reconfigure_event(TrayWindow *traywin, XEvent *e);
+void systray_property_notify(TrayWindow *traywin, XEvent *e);
 void systray_destroy_event(TrayWindow *traywin);
 void kde_update_icons();
 
-#endif
+TrayWindow *systray_find_icon(Window win);
 
+#endif

src/taskbar/task.c

@@ -18,269 +18,263 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **************************************************************************/
 
-#include <X11/Xlib.h>
+#include <glib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.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;
+timeout *urgent_timeout;
-GSList* urgent_list;
+GSList *urgent_list;
 
-char* task_get_tooltip(void* obj)
+char *task_get_tooltip(void *obj)
 {
-	Task* t = obj;
+	Task *t = (Task *)obj;
 	return strdup(t->title);
 }
 
-
+Task *add_task(Window win)
-Task *add_task (Window win)
 {
-	if (!win) return 0;
+	if (!win)
-	if (window_is_hidden(win)) return 0;
+		return NULL;
+	if (window_is_hidden(win))
+		return NULL;
 
-	XSelectInput(server.dsp, win, PropertyChangeMask|StructureNotifyMask);
+	XSelectInput(server.display, win, PropertyChangeMask | StructureNotifyMask);
-	XFlush(server.dsp);
+	XFlush(server.display);
 
-	int monitor;
+	int monitor = 0;
-	if (nb_panel > 1) {
+	if (num_panels > 1) {
-		monitor = window_get_monitor (win);
+		monitor = get_window_monitor(win);
-		if (monitor >= nb_panel) monitor = 0;
+		if (monitor >= num_panels)
+			monitor = 0;
 	}
-	else monitor = 0;
 
-	Task new_tsk;
+	// TODO why do we add the task only to the panel for the current monitor, without checking hide_task_diff_monitor?
-	memset(&new_tsk, 0, sizeof(new_tsk));
+
-	new_tsk.area.mouse_over_effect = 1;
+	Task task_template;
-	new_tsk.area.mouse_press_effect = 1;
+	memset(&task_template, 0, sizeof(task_template));
-	new_tsk.win = win;
+	task_template.area.has_mouse_over_effect = panel_config.mouse_effects;
-	new_tsk.desktop = window_get_desktop (win);
+	task_template.area.has_mouse_press_effect = panel_config.mouse_effects;
-	new_tsk.area.panel = &panel1[monitor];
+	task_template.win = win;
-	new_tsk.current_state = window_is_iconified(win) ? TASK_ICONIFIED : TASK_NORMAL;
+	task_template.desktop = get_window_desktop(win);
-	window_get_coordinates(win, &new_tsk.win_x, &new_tsk.win_y, &new_tsk.win_w, &new_tsk.win_h);
+	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;
+	task_template.title = NULL;
-	int k;
+	for (int k = 0; k < TASK_STATE_COUNT; ++k) {
-	for (k=0; k<TASK_STATE_COUNT; ++k) {
+		task_template.icon[k] = NULL;
-		new_tsk.icon[k] = 0;
-		new_tsk.state_pix[k] = 0;
 	}
-	get_title(&new_tsk);
+	task_update_title(&task_template);
-	get_icon(&new_tsk);
+	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();
+	GPtrArray *task_buttons = g_ptr_array_new();
-	Taskbar *tskbar;
+	for (int j = 0; j < panels[monitor].num_desktops; j++) {
-	Task *new_tsk2=0;
+		if (task_template.desktop != ALL_DESKTOPS && task_template.desktop != j)
-	int j;
+			continue;
-	for (j=0 ; j < panel1[monitor].nb_desktop ; j++) {
-		if (new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j) continue;
 
-		tskbar = &panel1[monitor].taskbar[j];
+		Taskbar *taskbar = &panels[monitor].taskbar[j];
-		new_tsk2 = calloc(1, sizeof(Task));
+		Task *task_instance = calloc(1, sizeof(Task));
-		memcpy(&new_tsk2->area, &panel1[monitor].g_task.area, sizeof(Area));
+		memcpy(&task_instance->area, &panels[monitor].g_task.area, sizeof(Area));
-		new_tsk2->area.parent = tskbar;
+		task_instance->area.has_mouse_over_effect = panel_config.mouse_effects;
-		new_tsk2->area.mouse_over_effect = 1;
+		task_instance->area.has_mouse_press_effect = panel_config.mouse_effects;
-		new_tsk2->area.mouse_press_effect = 1;
+		task_instance->win = task_template.win;
-		new_tsk2->win = new_tsk.win;
+		task_instance->desktop = task_template.desktop;
-		new_tsk2->desktop = new_tsk.desktop;
+		task_instance->win_x = task_template.win_x;
-		new_tsk2->win_x = new_tsk.win_x;
+		task_instance->win_y = task_template.win_y;
-		new_tsk2->win_y = new_tsk.win_y;
+		task_instance->win_w = task_template.win_w;
-		new_tsk2->win_w = new_tsk.win_w;
+		task_instance->win_h = task_template.win_h;
-		new_tsk2->win_h = new_tsk.win_h;
+		task_instance->current_state = TASK_UNDEFINED; // to update the current state later in set_task_state...
-		new_tsk2->current_state = -1;  // to update the current state later in set_task_state...
+		if (task_instance->desktop == ALL_DESKTOPS && server.desktop != j) {
-		if (new_tsk2->desktop == ALLDESKTOP && server.desktop != j) {
+			// fprintf(stderr, "%s %d: win = %ld hiding task: another desktop\n", __FUNCTION__, __LINE__, win);
-			// hide ALLDESKTOP task on non-current desktop
+			task_instance->area.on_screen = always_show_all_desktop_tasks;
-			new_tsk2->area.on_screen = 0;
 		}
-		new_tsk2->title = new_tsk.title;
+		task_instance->title = task_template.title;
-		if (panel1[monitor].g_task.tooltip_enabled)
+		if (panels[monitor].g_task.tooltip_enabled)
-			new_tsk2->area._get_tooltip_text = task_get_tooltip;
+			task_instance->area._get_tooltip_text = task_get_tooltip;
-		for (k=0; k<TASK_STATE_COUNT; ++k) {
+		for (int k = 0; k < TASK_STATE_COUNT; ++k) {
-			new_tsk2->icon[k] = new_tsk.icon[k];
+			task_instance->icon[k] = task_template.icon[k];
-			new_tsk2->icon_hover[k] = new_tsk.icon_hover[k];
+			task_instance->icon_hover[k] = task_template.icon_hover[k];
-			new_tsk2->icon_press[k] = new_tsk.icon_press[k];
+			task_instance->icon_press[k] = task_template.icon_press[k];
-			new_tsk2->state_pix[k] = 0;
 		}
-		new_tsk2->icon_width = new_tsk.icon_width;
+		task_instance->icon_width = task_template.icon_width;
-		new_tsk2->icon_height = new_tsk.icon_height;
+		task_instance->icon_height = task_template.icon_height;
-		tskbar->area.children = g_list_append(tskbar->area.children, new_tsk2);
+
-		tskbar->area.resize = 1;
+		add_area(&task_instance->area, &taskbar->area);
-		g_ptr_array_add(task_group, new_tsk2);
+		g_ptr_array_add(task_buttons, task_instance);
-		//printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
 	}
-	Window* key = calloc(1, sizeof(Window));
+	Window *key = calloc(1, sizeof(Window));
-	*key = new_tsk.win;
+	*key = task_template.win;
-	g_hash_table_insert(win_to_task_table, key, task_group);
+	g_hash_table_insert(win_to_task, key, task_buttons);
-	set_task_state(new_tsk2, new_tsk.current_state);
+
+	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) {
+	if (taskbar_mode == MULTI_DESKTOP) {
-		Panel *panel = new_tsk2->area.panel;
+		Panel *panel = (Panel*)task_template.area.panel;
-		panel->area.resize = 1;
+		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 *task)
-void remove_task (Task *tsk)
 {
-	if (!tsk) return;
+	if (!task)
+		return;
 
-	if (panel_mode == MULTI_DESKTOP) {
+	// fprintf(stderr, "%s %d: win = %ld, task = %s\n", __FUNCTION__, __LINE__, task->win, task->title ? task->title : "??");
-		Panel *panel = tsk->area.panel;
+
-		panel->area.resize = 1;
+	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);
+	// printf("remove_task %s %d\n", task->title, task->desktop);
-	if (tsk->title)
+	if (task->title)
-		free (tsk->title);
+		free(task->title);
-	int k;
+	for (int k = 0; k < TASK_STATE_COUNT; ++k) {
-	for (k=0; k<TASK_STATE_COUNT; ++k) {
+		if (task->icon[k]) {
-		if (tsk->icon[k]) {
+			imlib_context_set_image(task->icon[k]);
-			imlib_context_set_image(tsk->icon[k]);
 			imlib_free_image();
-			tsk->icon[k] = 0;
+			task->icon[k] = 0;
 		}
-		if (tsk->icon_hover[k]) {
+		if (task->icon_hover[k]) {
-			imlib_context_set_image(tsk->icon_hover[k]);
+			imlib_context_set_image(task->icon_hover[k]);
 			imlib_free_image();
-			tsk->icon_hover[k] = 0;
+			task->icon_hover[k] = 0;
 		}
-		if (tsk->icon_press[k]) {
+		if (task->icon_press[k]) {
-			imlib_context_set_image(tsk->icon_press[k]);
+			imlib_context_set_image(task->icon_press[k]);
 			imlib_free_image();
-			tsk->icon_press[k] = 0;
+			task->icon_press[k] = 0;
 		}
-		if (tsk->state_pix[k]) XFreePixmap(server.dsp, tsk->state_pix[k]);
 	}
 
-	int i;
+	GPtrArray *task_buttons = g_hash_table_lookup(win_to_task, &win);
-	Task *tsk2;
+	for (int i = 0; i < task_buttons->len; ++i) {
-	GPtrArray* task_group = g_hash_table_lookup(win_to_task_table, &win);
+		Task *task2 = g_ptr_array_index(task_buttons, i);
-	for (i=0; i<task_group->len; ++i) {
+		if (task2 == active_task)
-		tsk2 = g_ptr_array_index(task_group, i);
+			active_task = 0;
-		if (tsk2 == task_active) task_active = 0;
+		if (task2 == task_drag)
-		if (tsk2 == task_drag) task_drag = 0;
+			task_drag = 0;
-		if (g_slist_find(urgent_list, tsk2)) del_urgent(tsk2);
+		if (g_slist_find(urgent_list, task2))
-		remove_area(tsk2);
+			del_urgent(task2);
-		free(tsk2);
+		remove_area((Area *)task2);
+		free(task2);
 	}
-	g_hash_table_remove(win_to_task_table, &win);
+	g_hash_table_remove(win_to_task, &win);
 }
 
-
+gboolean task_update_title(Task *task)
-int get_title(Task *tsk)
 {
-	Panel *panel = tsk->area.panel;
+	Panel *panel = task->area.panel;
-	char *title, *name;
 
-	if (!panel->g_task.text &&
+	if (!panel->g_task.has_text && !panel->g_task.tooltip_enabled && taskbar_sort_method != TASKBAR_SORT_TITLE)
-		!panel->g_task.tooltip_enabled &&
+		return FALSE;
-		taskbar_sort_method != TASKBAR_SORT_TITLE)
-		return 0;
 
-	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 (name)
-	
+		XFree(name);
-	if (tsk->title) {
-		// check unecessary title change
-		if (strcmp(tsk->title, title) == 0) {
-			free(title);
-			return 0;
-		}
-		else
-			free(tsk->title);
-	} 
 
-	tsk->title = title;
+	if (task->title) {
-	GPtrArray* task_group = task_get_tasks(tsk->win);
+		// check unecessary title change
-	if (task_group) {
+		if (strcmp(task->title, title) == 0) {
-		int i;
+			free(title);
-		for (i=0; i<task_group->len; ++i) {
+			return FALSE;
-			Task* tsk2 = g_ptr_array_index(task_group, i);
+		} else {
-			tsk2->title = tsk->title;
+			free(task->title);
-			set_task_redraw(tsk2);
 		}
 	}
-	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 task_update_icon(Task *task)
-void get_icon (Task *tsk)
 {
-	Panel *panel = tsk->area.panel;
+	Panel *panel = task->area.panel;
-	if (!panel->g_task.icon) return;
+	if (!panel->g_task.has_icon)
-	int i;
+		return;
-	Imlib_Image img = NULL;
-	XWMHints *hints = 0;
-	gulong *data = 0;
 
-	int k;
+	for (int k = 0; k < TASK_STATE_COUNT; ++k) {
-	for (k=0; k<TASK_STATE_COUNT; ++k) {
+		if (task->icon[k]) {
-		if (tsk->icon[k]) {
+			imlib_context_set_image(task->icon[k]);
-			imlib_context_set_image(tsk->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);
+		tmp_data = get_best_icon(data, get_icon_count(data, i), i, &w, &h, panel->g_task.icon_size1);
 #ifdef __x86_64__
 		DATA32 icon_data[w * h];
 		int length = w * h;
-		for (i = 0; i < length; ++i)
+		for (int j = 0; j < length; ++j)
-			icon_data[i] = tmp_data[i];
+			icon_data[j] = tmp_data[j];
-		img = imlib_create_image_using_copied_data (w, h, icon_data);
+		img = imlib_create_image_using_copied_data(w, h, icon_data);
 #else
-		img = imlib_create_image_using_data (w, h, (DATA32*)tmp_data);
+		img = imlib_create_image_using_data(w, h, (DATA32 *)tmp_data);
 #endif
-	}
+		XFree(data);
-	else {
+	} 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
@@ -289,11 +283,12 @@ void get_icon (Task *tsk)
 				uint border_width, bpp;
 				uint w, h;
 
-				//printf("  get pixmap\n");
+				// printf("  get pixmap\n");
-				XGetGeometry(server.dsp, hints->icon_pixmap, &root, &icon_x, &icon_y, &w, &h, &border_width, &bpp);
+				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) {
@@ -304,312 +299,301 @@ void get_icon (Task *tsk)
 	// transform icons
 	imlib_context_set_image(img);
 	imlib_image_set_has_alpha(1);
-	int w, h;
+	int w = imlib_image_get_width();
-	w = imlib_image_get_width();
+	int h = imlib_image_get_height();
-	h = imlib_image_get_height();
+	Imlib_Image orig_image =
-	Imlib_Image orig_image = imlib_create_cropped_scaled_image(0, 0, w, h, panel->g_task.icon_size1, panel->g_task.icon_size1);
+			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();
+	task->icon_width = imlib_image_get_width();
-	tsk->icon_height = imlib_image_get_height();
+	task->icon_height = imlib_image_get_height();
-	for (k=0; k<TASK_STATE_COUNT; ++k) {
+	for (int k = 0; k < TASK_STATE_COUNT; ++k) {
 		imlib_context_set_image(orig_image);
-		tsk->icon[k] = imlib_clone_image();
+		task->icon[k] = imlib_clone_image();
-		imlib_context_set_image(tsk->icon[k]);
+		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],
+					   (float)panel->g_task.saturation[k] / 100,
+					   (float)panel->g_task.brightness[k] / 100);
 			imlib_image_put_back_data(data32);
 		}
 		if (panel_config.mouse_effects) {
-			tsk->icon_hover[k] = adjust_icon(tsk->icon[k], panel_config.mouse_over_alpha, panel_config.mouse_over_saturation, panel_config.mouse_over_brightness);
+			task->icon_hover[k] = adjust_icon(task->icon[k],
-			tsk->icon_press[k] = adjust_icon(tsk->icon[k], panel_config.mouse_pressed_alpha, panel_config.mouse_pressed_saturation, panel_config.mouse_pressed_brightness);
+											 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)
+	GPtrArray *task_buttons = get_task_buttons(task->win);
-		XFree(hints);
+	if (task_buttons) {
-	if (data)
+		for (i = 0; i < task_buttons->len; ++i) {
-		XFree (data);
+			Task *task2 = g_ptr_array_index(task_buttons, i);
-
+			task2->icon_width = task->icon_width;
-	GPtrArray* task_group = task_get_tasks(tsk->win);
+			task2->icon_height = task->icon_height;
-	if (task_group) {
+			for (int k = 0; k < TASK_STATE_COUNT; ++k) {
-		for (i=0; i<task_group->len; ++i) {
+				task2->icon[k] = task->icon[k];
-			Task* tsk2 = g_ptr_array_index(task_group, i);
+				task2->icon_hover[k] = task->icon_hover[k];
-			tsk2->icon_width = tsk->icon_width;
+				task2->icon_press[k] = task->icon_press[k];
-			tsk2->icon_height = tsk->icon_height;
-			int k;
-			for (k=0; k<TASK_STATE_COUNT; ++k) {
-				tsk2->icon[k] = tsk->icon[k];
-				tsk2->icon_hover[k] = tsk->icon_hover[k];
-				tsk2->icon_press[k] = tsk->icon_press[k];
 			}
-			set_task_redraw(tsk2);
+			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)
+		if (panel->g_task.has_text)
-			pos_x = (tsk->area.width - text_width - panel->g_task.icon_size1) / 2;
+			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_Image image;
 	// Render
 	if (panel_config.mouse_effects) {
-		if (tsk->area.mouse_state == MOUSE_OVER)
+		if (task->area.mouse_state == MOUSE_OVER)
-			image = tsk->icon_hover[tsk->current_state];
+			image = task->icon_hover[task->current_state];
-		else if (tsk->area.mouse_state == MOUSE_DOWN)
+		else if (task->area.mouse_state == MOUSE_DOWN)
-			image = tsk->icon_press[tsk->current_state];
+			image = task->icon_press[task->current_state];
 		else
-			image = tsk->icon[tsk->current_state];
+			image = task->icon[task->current_state];
 	} else {
-		 image = tsk->icon[tsk->current_state];
+		image = task->icon[task->current_state];
 	}
 
 	imlib_context_set_image(image);
-	render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy);
+	render_image(task->area.pix, pos_x, panel->g_task.icon_posy);
 }
 
-
+void draw_task(void *obj, cairo_t *c)
-void draw_task (void *obj, cairo_t *c)
 {
-	Task *tsk = obj;
+	Task *task = (Task *)obj;
-	if (!panel_config.mouse_effects)
+	Panel *panel = (Panel *)task->area.panel;
-		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);
 
-	if (panel->g_task.text) {
+	int text_width = 0;
-		/* Layout */
+	if (panel->g_task.has_text) {
-		layout = pango_cairo_create_layout (c);
+		PangoLayout *layout = pango_cairo_create_layout(c);
-		pango_layout_set_font_description (layout, panel->g_task.font_desc);
+		pango_layout_set_font_description(layout, panel->g_task.font_desc);
-		pango_layout_set_text(layout, tsk->title, -1);
+		pango_layout_set_text(layout, task->title, -1);
 
-		/* Drawing width and Cut text */
+		pango_layout_set_width(layout, ((Taskbar *)task->area.parent)->text_width * PANGO_SCALE);
-		// pango use U+22EF or U+2026
-		pango_layout_set_width(layout, ((Taskbar*)tsk->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)
-		if (panel->g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+			pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-		else pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT);
+		else
+			pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
 
-		pango_layout_get_pixel_size (layout, &width, &height);
+		int text_height;
-
+		pango_layout_get_pixel_size(layout, &text_width, &text_height);
-		config_text = &panel->g_task.font[tsk->current_state];
+		double text_posy = (panel->g_task.area.height - text_height) / 2.0;
-
-		double text_posy = (panel->g_task.area.height - 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) {
+	if (panel->g_task.has_icon)
-		draw_task_icon (tsk, width);
+		draw_task_icon(task, text_width);
-	}
 }
 
-
+void on_change_task(void *obj)
-void on_change_task (void *obj)
 {
-	Task *tsk = obj;
+	Task *task = (Task *)obj;
-	Panel *panel = (Panel*)tsk->area.panel;
+	Panel *panel = (Panel *)task->area.panel;
 
-	long value[] = { panel->posx+tsk->area.posx, panel->posy+tsk->area.posy, tsk->area.width, tsk->area.height };
+	long value[] = {panel->posx + task->area.posx, panel->posy + task->area.posy, task->area.width, task->area.height};
-	XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
+	XChangeProperty(server.display,
-	
+					task->win,
-	// reset Pixmap when position/size changed
+					server.atom._NET_WM_ICON_GEOMETRY,
-	set_task_redraw(tsk);
+					XA_CARDINAL,
+					32,
+					PropModeReplace,
+					(unsigned char *)value,
+					4);
 }
 
-// Given a pointer to the active task (active_task) and a pointer
+Task *find_active_task(Task *current_task)
-// 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)
 {
 	if (active_task == NULL)
 		return current_task;
 
-	Taskbar* tskbar = current_task->area.parent;
+	Taskbar *taskbar = (Taskbar *)current_task->area.parent;
 
-	GList *l0 = tskbar->area.children;
+	GList *l0 = taskbar->area.children;
 	if (taskbarname_enabled)
 		l0 = l0->next;
-	for (; l0 ; l0 = l0->next) {
+	for (; l0; l0 = l0->next) {
-		Task *tsk = l0->data;
+		Task *task = (Task *)l0->data;
-		if (tsk->win == active_task->win)
+		if (task->win == active_task->win)
-			return tsk;
+			return task;
 	}
 
 	return current_task;
 }
 
-Task *next_task(Task *tsk)
+Task *next_task(Task *task)
 {
-	if (tsk == 0)
+	if (!task)
-		return 0;
+		return NULL;
 
-	Taskbar* tskbar = tsk->area.parent;
+	Taskbar *taskbar = task->area.parent;
 
-	GList *l0 = tskbar->area.children;
+	GList *l0 = taskbar->area.children;
-	if (taskbarname_enabled) l0 = l0->next;
+	if (taskbarname_enabled)
-	GList *lfirst_tsk = l0;
+		l0 = l0->next;
-	for (; l0 ; l0 = l0->next) {
+	GList *lfirst_task = l0;
-		Task *tsk1 = l0->data;
+	for (; l0; l0 = l0->next) {
-		if (tsk1 == tsk) {
+		Task *task1 = l0->data;
-			if (l0->next == 0) l0 = lfirst_tsk;
+		if (task1 == task) {
-			else l0 = l0->next;
+			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 *taskbar = task->area.parent;
-	Taskbar* tskbar = tsk->area.parent;
 
-	tsk2 = 0;
+	Task *task2 = NULL;
-	GList *l0 = tskbar->area.children;
+	GList *l0 = taskbar->area.children;
-	if (taskbarname_enabled) l0 = l0->next;
+	if (taskbarname_enabled)
-	GList *lfirst_tsk = l0;
+		l0 = l0->next;
-	for (; l0 ; l0 = l0->next) {
+	GList *lfirst_task = l0;
-		tsk1 = l0->data;
+	for (; l0; l0 = l0->next) {
-		if (tsk1 == tsk) {
+		Task *task1 = l0->data;
-			if (l0 == lfirst_tsk) {
+		if (task1 == task) {
-				l0 = g_list_last ( l0 );
+			if (l0 == lfirst_task) {
-				tsk2 = l0->data;
+				l0 = g_list_last(l0);
+				task2 = l0->data;
 			}
-			return tsk2;
+			return task2;
 		}
-		tsk2 = tsk1;
+		task2 = task1;
 	}
 
-	return 0;
+	return NULL;
 }
 
-
+void reset_active_task()
-void active_task()
 {
-	if (task_active) {
+	if (active_task) {
-		set_task_state(task_active, window_is_iconified(task_active->win) ? TASK_ICONIFIED : TASK_NORMAL);
+		set_task_state(active_task, window_is_iconified(active_task->win) ? TASK_ICONIFIED : TASK_NORMAL);
-		task_active = 0;
+		active_task = NULL;
 	}
 
-	Window w1 = window_get_active();
+	Window w1 = get_active_window();
-	//printf("Change active task %ld\n", w1);
+	// 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 *task, TaskState state)
-void set_task_state(Task *tsk, int 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) {
+	if (state == TASK_ACTIVE && task->current_state != state) {
-		GPtrArray* task_group = task_get_tasks(tsk->win);
+		clock_gettime(CLOCK_MONOTONIC, &task->last_activation_time);
-		if (task_group) {
+		if (taskbar_sort_method == TASKBAR_SORT_LRU || taskbar_sort_method == TASKBAR_SORT_MRU) {
-			int i;
+			GPtrArray *task_buttons = get_task_buttons(task->win);
-			for (i=0; i<task_group->len; ++i) {
+			if (task_buttons) {
-				Task* tsk1 = g_ptr_array_index(task_group, i);
+				for (int i = 0; i < task_buttons->len; ++i) {
-				tsk1->current_state = state;
+					Task *task1 = g_ptr_array_index(task_buttons, i);
-				tsk1->area.bg = panel1[0].g_task.background[state];
+					Taskbar *taskbar = (Taskbar *)task1->area.parent;
-				if (!panel_config.mouse_effects) {
+					sort_tasks(taskbar);
-					tsk1->area.pix = tsk1->state_pix[state];
-					if (!tsk1->area.pix)
-						tsk1->area.redraw = 1;
-				} else {
-					tsk1->area.redraw = 1;
 				}
-				if (state == TASK_ACTIVE && g_slist_find(urgent_list, tsk1))
+			}
-					del_urgent(tsk1);
+		}
-				int hide = 0;
+	}
-				Taskbar *taskbar = (Taskbar *)tsk1->area.parent;
+
-				if (tsk->desktop == ALLDESKTOP && server.desktop != taskbar->desktop) {
+	if (task->current_state != state || hide_task_diff_monitor) {
-					// Hide ALLDESKTOP task on non-current desktop
+		GPtrArray *task_buttons = get_task_buttons(task->win);
-					hide = 1;
+		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 = 1;
+						hide = TRUE;
 					}
 				}
-				if (window_get_monitor(tsk->win) != ((Panel*)tsk->area.panel)->monitor &&
+				if (get_window_monitor(task->win) != ((Panel *)task->area.panel)->monitor &&
-					(hide_task_diff_monitor || nb_panel > 1)) {
+					(hide_task_diff_monitor || num_panels > 1)) {
-					hide = 1;
+					hide = TRUE;
 				}
-				if (1 - hide != tsk1->area.on_screen) {
+				if ((!hide) != task1->area.on_screen) {
-					tsk1->area.on_screen = 1 - hide;
+					task1->area.on_screen = !hide;
-					set_task_redraw(tsk1);
+					schedule_redraw(&task1->area);
-					Panel *p = (Panel*)tsk->area.panel;
+					Panel *p = (Panel *)task->area.panel;
-					tsk->area.resize = 1;
+					task->area.resize_needed = TRUE;
-					p->taskbar->area.resize = 1;
+					p->taskbar->area.resize_needed = TRUE;
-					p->area.resize = 1;
+					p->area.resize_needed = TRUE;
 				}
 			}
-			panel_refresh = 1;
+			panel_refresh = TRUE;
 		}
 	}
 }
 
-
+void blink_urgent(void *arg)
-void set_task_redraw(Task* tsk)
 {
-	int k;
+	GSList *urgent_task = urgent_list;
-	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;
 	while (urgent_task) {
-		Task* t = urgent_task->data;
+		Task *t = urgent_task->data;
-		if ( t->urgent_tick < max_tick_urgent) {
+		if (t->urgent_tick < max_tick_urgent) {
 			if (t->urgent_tick++ % 2)
 				set_task_state(t, TASK_URGENT);
 			else
@@ -617,39 +601,37 @@ void blink_urgent(void* arg)
 		}
 		urgent_task = urgent_task->next;
 	}
-	panel_refresh = 1;
+	panel_refresh = TRUE;
 }
 
-
+void add_urgent(Task *task)
-void add_urgent(Task *tsk)
 {
-	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)
+	task = get_task(task->win); // always add the first task for the task buttons (omnipresent windows)
-	tsk->urgent_tick = 0;
+	task->urgent_tick = 0;
-	if (g_slist_find(urgent_list, tsk))
+	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 *task)
-void del_urgent(Task *tsk)
 {
-	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 };
+typedef struct GlobalTask {
-extern timeout* urgent_timeout;
-extern GSList* urgent_list;
-
-// --------------------------------------------------
-// global task parameter
-typedef struct {
 	Area area;
-
+	gboolean has_text;
-	int text;
+	gboolean has_icon;
-	int icon;
+	gboolean centered;
-	int centered;
-
 	int icon_posy;
 	int icon_size1;
 	int maximum_width;
@@ -35,31 +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;
+	gboolean tooltip_enabled;
-} Global_task;
+} GlobalTask;
 
-
+// Stores information about a task.
-
+// Warning: any dynamically allocated members are shared between the Task instances created for the same window
-typedef struct {
+// (if the task appears on all desktops, there will be a different instance on each desktop's taskbar).
-	// always start with area
+typedef struct Task {
 	Area area;
-
-	// TODO: group task with list of windows here
 	Window win;
-	int  desktop;
+	int desktop;
-	int current_state;
+	TaskState current_state;
 	Imlib_Image icon[TASK_STATE_COUNT];
 	Imlib_Image icon_hover[TASK_STATE_COUNT];
 	Imlib_Image icon_press[TASK_STATE_COUNT];
-	Pixmap state_pix[TASK_STATE_COUNT];
 	unsigned int icon_width;
 	unsigned int icon_height;
 	char *title;
@@ -69,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);
+Task *add_task(Window win);
-void remove_task (Task *tsk);
+void remove_task(Task *task);
 
-void draw_task (void *obj, cairo_t *c);
+void draw_task(void *obj, cairo_t *c);
-void on_change_task (void *obj);
+void on_change_task(void *obj);
 
-void get_icon (Task *tsk);
+void task_update_icon(Task *task);
-int  get_title(Task *tsk);
+gboolean task_update_title(Task *task);
-void active_task();
+void reset_active_task();
-void set_task_state(Task* tsk, int state);
+void set_task_state(Task *task, TaskState state);
-void set_task_redraw(Task* tsk);
 
-Task *find_active_task(Task *current_task, Task *active_task);
+// Given a pointer to the task that is currently under the mouse (current_task),
-Task *next_task (Task *tsk);
+// returns a pointer to the Task for the active window on the same taskbar.
-Task *prev_task (Task *tsk);
+// If not found, returns the current task.
+Task *find_active_task(Task *current_task);
 
-void add_urgent(Task *tsk);
+Task *next_task(Task *task);
-void del_urgent(Task *tsk);
+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
+Task *active_task;
-   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 *task_drag;
-int taskbar_enabled;
+gboolean taskbar_enabled;
-int taskbar_distribute_size;
+gboolean taskbar_distribute_size;
-int hide_inactive_tasks;
+gboolean hide_inactive_tasks;
-int hide_task_diff_monitor;
+gboolean hide_task_diff_monitor;
-int taskbar_sort_method;
+gboolean always_show_all_desktop_tasks;
-int taskbar_alignment;
+TaskbarSortMethod taskbar_sort_method;
+Alignment taskbar_alignment;
 
-guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
+void taskbar_init_fonts();
-gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
-void free_ptr_array(gpointer data) { g_ptr_array_free(data, 1); }
 
+// 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_enabled = FALSE;
-	taskbar_distribute_size = 0;
+	taskbar_distribute_size = FALSE;
-	hide_inactive_tasks = 0;
+	hide_inactive_tasks = FALSE;
-	hide_task_diff_monitor = 0;
+	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) {
+	if (win_to_task) {
-		while (g_hash_table_size(win_to_task_table)) {
+		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);
+		g_hash_table_destroy(win_to_task);
-		win_to_task_table = NULL;
+		win_to_task = NULL;
 	}
-	for (i = 0 ; i < nb_panel; i++) {
+	for (int i = 0; i < num_panels; i++) {
-		panel = &panel1[i];
+		Panel *panel = &panels[i];
-		for (j = 0; j < panel->nb_desktop; j++) {
+		for (int j = 0; j < panel->num_desktops; j++) {
-			tskbar = &panel->taskbar[j];
+			Taskbar *taskbar = &panel->taskbar[j];
-			for (k = 0; k < TASKBAR_STATE_COUNT; ++k) {
+			free_area(&taskbar->area);
-				if (tskbar->state_pix[k])
-					XFreePixmap(server.dsp, tskbar->state_pix[k]);
-				tskbar->state_pix[k] = 0;
-			}
-			free_area(&tskbar->area);
 			// remove taskbar from the panel
-			remove_area(tskbar);
+			remove_area((Area *)taskbar);
 		}
 		if (panel->taskbar) {
 			free(panel->taskbar);
@@ -113,61 +116,58 @@ void cleanup_taskbar()
 	stop_timeout(urgent_timeout);
 }
 
-
 void init_taskbar()
 {
-	if (win_to_task_table == 0)
+	if (!panel_config.g_task.has_text && !panel_config.g_task.has_icon) {
-		win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array);
+		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;
+	Panel *panel = (Panel *)p;
-	int j;
 
-	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)
+	if (!panel->g_task.area.bg)
-		panel->g_task.font_desc = pango_font_description_from_string(DEFAULT_FONT);
-	if (panel->g_task.area.bg == 0)
 		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._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.resize_needed = 1;
-	panel->g_taskbar.area_name.on_screen = 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.resize_needed = 1;
-	panel->g_taskbar.area._on_change_layout = on_change_taskbar;
+	panel->g_taskbar.area.on_screen = TRUE;
-	panel->g_taskbar.area.resize = 1;
-	panel->g_taskbar.area.on_screen = 1;
 	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,256 +176,277 @@ 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.resize_needed = 1;
-	panel->g_task.area.on_screen = 1;
+	panel->g_task.area.on_screen = TRUE;
-	if ((panel->g_task.config_asb_mask & (1<<TASK_NORMAL)) == 0) {
+	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_NORMAL)) == 0)
-	if ((panel->g_task.config_font_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL];
+		panel->g_task.font[TASK_NORMAL] = (Color){{1, 1, 1}, 1};
-	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_ACTIVE)) == 0)
-	if ((panel->g_task.config_font_mask & (1<<TASK_URGENT)) == 0) panel->g_task.font[TASK_URGENT] = panel->g_task.font[TASK_ACTIVE];
+		panel->g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL];
-	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_font_mask & (1 << TASK_ICONIFIED)) == 0)
-	if ((panel->g_task.config_background_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.background[TASK_ACTIVE] = panel->g_task.background[TASK_NORMAL];
+		panel->g_task.font[TASK_ICONIFIED] = panel->g_task.font[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_font_mask & (1 << TASK_URGENT)) == 0)
-	if ((panel->g_task.config_background_mask & (1<<TASK_URGENT)) == 0) panel->g_task.background[TASK_URGENT] = panel->g_task.background[TASK_ACTIVE];
+		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 {
-	else {
+		panel->g_task.area.posx = panel->g_taskbar.area.posx +
-		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_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) {
+	for (int j = 0; j < TASK_STATE_COUNT; ++j) {
-		if (panel->g_task.background[j] == 0)
+		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) {
+		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_");
+			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] = &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]->border.radius = panel->g_task.area.height / 2;
 		}
 	}
 
 	// compute vertical position : text and icon
 	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);
+	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) {
+	if (panel->g_task.has_icon) {
 		panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
 		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;
+	Taskbar *taskbar;
-	panel->nb_desktop = server.nb_desktop;
+	panel->num_desktops = server.num_desktops;
-	panel->taskbar = calloc(server.nb_desktop, sizeof(Taskbar));
+	panel->taskbar = calloc(server.num_desktops, sizeof(Taskbar));
-	for (j=0 ; j < panel->nb_desktop ; j++) {
+	for (int j = 0; j < panel->num_desktops; j++) {
-		tskbar = &panel->taskbar[j];
+		taskbar = &panel->taskbar[j];
-		memcpy(&tskbar->area, &panel->g_taskbar.area, sizeof(Area));
+		memcpy(&taskbar->area, &panel->g_taskbar.area, sizeof(Area));
-		tskbar->desktop = j;
+		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_init_fonts()
-void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data)
 {
-	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);
+		}
+	}
 }
 
-
+void taskbar_default_font_changed()
-Task *task_get_task (Window win)
 {
-	GPtrArray* task_group = task_get_tasks(win);
+	if (!taskbar_enabled)
-	if (task_group)
+		return;
-		return g_ptr_array_index(task_group, 0);
+
-	else
+	gboolean needs_update = FALSE;
-		return 0;
+	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;
 }
 
-
+void taskbar_remove_task(Window *win)
-GPtrArray* task_get_tasks(Window win)
 {
-	if (win_to_task_table && taskbar_enabled)
+	remove_task(get_task(*win));
-		return g_hash_table_lookup(win_to_task_table, &win);
-	else
-		return 0;
 }
 
-
+Task *get_task(Window win)
-void task_refresh_tasklist ()
 {
-	Window *win;
+	GPtrArray *task_buttons = get_task_buttons(win);
-	int num_results, i;
+	if (task_buttons)
+		return g_ptr_array_index(task_buttons, 0);
+	return NULL;
+}
 
-	if (!taskbar_enabled) return;
+GPtrArray *get_task_buttons(Window win)
-	win = server_get_property (server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
+{
-	if (!win) return;
+	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);
+void taskbar_refresh_tasklist()
-	GList* it;
+{
-	for (it=win_list; it; it=it->next) {
+	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++)
+	for (int i = 0; i < num_results; i++)
-		if (!task_get_task (win[i]))
+		if (!get_task(win[i]))
-			add_task (win[i]);
+			add_task(win[i]);
 
-	XFree (win);
+	XFree(win);
 }
 
-
+gboolean resize_taskbar(void *obj)
-void draw_taskbar (void *obj, cairo_t *c)
 {
-	Taskbar *taskbar = obj;
+	Taskbar *taskbar = (Taskbar *)obj;
-	int state = (taskbar->desktop == server.desktop) ? TASKBAR_ACTIVE : TASKBAR_NORMAL;
+	Panel *panel = (Panel *)taskbar->area.panel;
-	
-	taskbar->state_pix[state] = taskbar->area.pix;
-}
 
-
+	// printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
-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);
 	if (panel_horizontal) {
-		resize_by_layout(obj, panel->g_task.maximum_width);
+		relayout_with_constraint(&taskbar->area, panel->g_task.maximum_width);
-		
+
-		text_width = panel->g_task.maximum_width;
+		int text_width = panel->g_task.maximum_width;
 		GList *l = taskbar->area.children;
-		if (taskbarname_enabled) l = l->next;
+		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 {
+	return FALSE;
-		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;
 }
 
-
+void set_taskbar_state(Taskbar *taskbar, TaskbarState state)
-void on_change_taskbar (void *obj)
 {
-	Taskbar *tskbar = obj;
+	taskbar->area.bg = panels[0].g_taskbar.background[state];
-	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];
 	if (taskbarname_enabled) {
-		tskbar->bar_name.area.bg = panel1[0].g_taskbar.background_name[state];
+		taskbar->bar_name.area.bg = panels[0].g_taskbar.background_name[state];
-		if (!panel_config.mouse_effects) {
-			tskbar->bar_name.area.pix = tskbar->bar_name.state_pix[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 (taskbar->area.on_screen) {
-		if (tskbar->state_pix[state] == 0)
+		schedule_redraw(&taskbar->area);
-			tskbar->area.redraw = 1;
 		if (taskbarname_enabled) {
-			if (!panel_config.mouse_effects) {
+			schedule_redraw(&taskbar->bar_name.area);
-				if (tskbar->bar_name.state_pix[state] == 0)
-					tskbar->bar_name.area.redraw = 1;
-			} else {
-				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]) {
+		if (taskbar_mode == MULTI_DESKTOP &&
-			GList *l = tskbar->area.children;
+			panels[0].g_taskbar.background[TASKBAR_NORMAL] != panels[0].g_taskbar.background[TASKBAR_ACTIVE]) {
-			if (taskbarname_enabled) l = l->next;
+			GList *l = taskbar->area.children;
-			for ( ; l ; l = l->next)
+			if (taskbarname_enabled)
-				set_task_redraw(l->data);
+				l = l->next;
+			for (; l; l = l->next)
+				schedule_redraw((Area *)l->data);
 		}
 	}
-	panel_refresh = 1;
+	panel_refresh = TRUE;
 }
 
-
+void update_taskbar_visibility(void *p)
-void visible_taskbar(void *p)
 {
-	Panel *panel =(Panel*)p;
+	Panel *panel = (Panel *)p;
-	int j;
 
-	Taskbar *taskbar;
+	for (int j = 0; j < panel->num_desktops; j++) {
-	for (j=0 ; j < panel->nb_desktop ; j++) {
+		Taskbar *taskbar = &panel->taskbar[j];
-		taskbar = &panel->taskbar[j];
+		if (taskbar_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
-		if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
 			// SINGLE_DESKTOP and not current desktop
-			taskbar->area.on_screen = 0;
+			taskbar->area.on_screen = FALSE;
-		}
+		} else {
-		else {
+			taskbar->area.on_screen = TRUE;
-			taskbar->area.on_screen = 1;
 		}
 	}
-	panel_refresh = 1;
+	panel_refresh = TRUE;
 }
 
 #define NONTRIVIAL 2
@@ -442,15 +463,13 @@ gint compare_tasks_trivial(Task *a, Task *b, Taskbar *taskbar)
 	return NONTRIVIAL;
 }
 
-gint contained_within(Task *a, Task *b)
+gboolean contained_within(Task *a, Task *b)
 {
-	if ((a->win_x <= b->win_x) &&
+	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 <= 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)
@@ -461,10 +480,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) &&
+	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)) {
-		(a->win_y == b->win_y) &&
-		(a->win_w == b->win_w) &&
-		(a->win_h == b->win_h)) {
 		return 0;
 	}
 
@@ -476,11 +492,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;
+	int a_horiz_c = a->win_x + a->win_w / 2;
-	a_horiz_c = a->win_x + a->win_w / 2;
+	int b_horiz_c = b->win_x + b->win_w / 2;
-	b_horiz_c = b->win_x + b->win_w / 2;
+	int a_vert_c = a->win_y + a->win_h / 2;
-	a_vert_c = a->win_y + a->win_h / 2;
+	int b_vert_c = b->win_y + b->win_h / 2;
-	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;
@@ -513,58 +528,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 (GList *i = taskbar->area.children, *j = i ? i->next : NULL; i && j; i = i->next, j = j->next) {
-	for (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.children = g_list_sort_with_data(taskbar->area.children, (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);
+	GPtrArray *task_buttons = get_task_buttons(win);
-	if (task_group) {
+	if (task_buttons) {
-		int i;
+		Task *task0 = g_ptr_array_index(task_buttons, 0);
-		Task* tsk0 = g_ptr_array_index(task_group, 0);
+		if (task0) {
-		if (tsk0) {
+			get_window_coordinates(win, &task0->win_x, &task0->win_y, &task0->win_w, &task0->win_h);
-			window_get_coordinates(win, &tsk0->win_x, &tsk0->win_y, &tsk0->win_w, &tsk0->win_h);
 		}
-		for (i = 0; i < task_group->len; ++i) {
+		for (int i = 0; i < task_buttons->len; ++i) {
-			Task* tsk = g_ptr_array_index(task_group, i);
+			Task *task = g_ptr_array_index(task_buttons, i);
-			tsk->win_x = tsk0->win_x;
+			task->win_x = task0->win_x;
-			tsk->win_y = tsk0->win_y;
+			task->win_y = task0->win_y;
-			tsk->win_w = tsk0->win_w;
+			task->win_w = task0->win_w;
-			tsk->win_h = tsk0->win_h;
+			task->win_h = task0->win_h;
-			sort_tasks(tsk->area.parent);
+			sort_tasks(task->area.parent);
 		}
 	}
 }

src/taskbar/taskbar.h

@@ -11,74 +11,82 @@
 #include "task.h"
 #include "taskbarname.h"
 
-enum { TASKBAR_NORMAL, TASKBAR_ACTIVE, TASKBAR_STATE_COUNT };
+typedef enum TaskbarState {
-extern GHashTable *win_to_task_table;
+	TASKBAR_NORMAL = 0,
-extern Task *task_active;
+	TASKBAR_ACTIVE,
-extern Task *task_drag;
+	TASKBAR_STATE_COUNT,
-extern int taskbar_enabled;
+} TaskbarState;
-extern int taskbar_distribute_size;
+
-extern int hide_inactive_tasks;
+typedef enum TaskbarSortMethod {
-extern int hide_task_diff_monitor;
+	TASKBAR_NOSORT = 0,
-enum { TASKBAR_NOSORT, TASKBAR_SORT_CENTER, TASKBAR_SORT_TITLE };
+	TASKBAR_SORT_CENTER,
-extern int taskbar_sort_method;
+	TASKBAR_SORT_TITLE,
-extern int taskbar_alignment;
+	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;
+	int posy;
-} Taskbarname;
+} 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;
-
-	Taskbarname bar_name;
-	
-	// task parameters
 	int text_width;
 } Taskbar;
 
-typedef struct {
+typedef struct GlobalTaskbar {
-	//always start with area
 	Area area;
 	Area area_name;
-	Background* background[TASKBAR_STATE_COUNT];
+	Background *background[TASKBAR_STATE_COUNT];
-	Background* background_name[TASKBAR_STATE_COUNT];
+	Background *background_name[TASKBAR_STATE_COUNT];
-} Global_taskbar;
+} 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);
+gboolean resize_taskbar(void *obj);
-void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data);
+void taskbar_default_font_changed();
-Task *task_get_task (Window win);
-GPtrArray* task_get_tasks(Window win);
-void task_refresh_tasklist ();
 
-int  resize_taskbar(void *obj);
+// Reloads the entire list of tasks from the window manager and recreates the task buttons.
-void on_change_taskbar (void *obj);
+void taskbar_refresh_tasklist();
-void set_taskbar_state(Taskbar *tskbar, int state);
 
-// show/hide taskbar according to current desktop
+// Returns the task button for this window. If there are multiple buttons, returns the first one.
-void visible_taskbar(void *p);
+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
-

src/taskbar/taskbarname.c

@@ -32,143 +32,157 @@
 #include "server.h"
 #include "taskbarname.h"
 
-int taskbarname_enabled;
+gboolean taskbarname_enabled;
-PangoFontDescription *taskbarname_font_desc;
 Color taskbarname_font;
 Color taskbarname_active_font;
 
+void taskbarname_init_fonts();
 
 void default_taskbarname()
 {
-	taskbarname_enabled = 0;
+	taskbarname_enabled = FALSE;
-	taskbarname_font_desc = NULL;
 }
 
-
 void init_taskbarname_panel(void *p)
 {
-	Panel *panel =(Panel*)p;
-	Taskbar *tskbar;
-	int j;
-	
 	if (!taskbarname_enabled)
 		return;
 
-	if (!panel_config.taskbarname_font_desc)
+	Panel *panel = (Panel *)p;
-		panel_config.taskbarname_font_desc = pango_font_description_from_string(DEFAULT_FONT);
 
-	GSList *l, *list = server_get_name_of_desktop();
+	taskbarname_init_fonts();
-	for (j=0, l=list ; j < panel->nb_desktop ; j++) {
+
-		tskbar = &panel->taskbar[j];
+	GSList *list = get_desktop_names();
-		memcpy(&tskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
+	GSList *l = list;
-		tskbar->bar_name.area.parent = tskbar;
+	for (int j = 0; j < panel->num_desktops; j++) {
-		tskbar->bar_name.area.mouse_over_effect = 1;
+		Taskbar *taskbar = &panel->taskbar[j];
-		tskbar->bar_name.area.mouse_press_effect = 1;
+		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.children = g_list_append(tskbar->area.children, &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;
+	for (int i = 0; i < num_panels; i++) {
-	Panel *panel;
+		Panel *panel = &panels[i];
-	Taskbar *tskbar;
+		for (int j = 0; j < panel->num_desktops; j++) {
-
+			Taskbar *taskbar = &panel->taskbar[j];
-	for (i = 0; i < nb_panel; i++) {
+			g_free(taskbar->bar_name.name);
-		panel = &panel1[i];
+			taskbar->bar_name.name = NULL;
-		for (j = 0; j < panel->nb_desktop; j++) {
+			free_area(&taskbar->bar_name.area);
-			tskbar = &panel->taskbar[j];
+			remove_area((Area *)&taskbar->bar_name);
-			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;
-			}
-			remove_area(&tskbar->bar_name);
 		}
 	}
 }
 
-
+gboolean resize_taskbarname(void *obj)
-void draw_taskbarname (void *obj, cairo_t *c)
 {
-	Taskbarname *taskbar_name = 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;
-	if (!panel_config.mouse_effects)
-		taskbar_name->state_pix[state] = taskbar_name->area.pix;
-	
-	// draw content
-	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->color[0], config_text->color[1], config_text->color[2], config_text->alpha);
-
-	pango_cairo_update_layout (c, layout);
-	draw_text(layout, c, 0, taskbar_name->posy, config_text, ((Panel*)taskbar_name->area.panel)->font_shadow);
-
-	g_object_unref (layout);
-	//printf("draw_taskbarname %s ******************************\n", taskbar_name->name);
-}
-
-
-int resize_taskbarname(void *obj)
-{
-	Taskbarname *taskbar_name = obj;
 	Panel *panel = taskbar_name->area.panel;
 	int name_height, name_width, name_height_ink;
-	int ret = 0;
+	gboolean result = FALSE;
 
-	taskbar_name->area.redraw = 1;
+	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),
+	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);
+				   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,7 +8,7 @@
 #include "common.h"
 #include "area.h"
 
-extern int taskbarname_enabled;
+extern gboolean taskbarname_enabled;
 extern Color taskbarname_font;
 extern Color taskbarname_active_font;
 
@@ -19,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

@@ -63,7 +63,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.c

@@ -524,6 +524,7 @@ static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeV
 
 // ====== Theme load/reload ======
 
+#if 0
 static void copy_default_themes()
 {
 	gchar *path_home = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
@@ -569,10 +570,14 @@ static void copy_default_themes()
 		g_free(path_tint2);
 	}
 }
+#endif
 
 static void load_all_themes()
 {
+	// We don't do this anymore since it has proven unpopular...
+#if 0
 	copy_default_themes();
+#endif
 
 	gtk_list_store_clear(GTK_LIST_STORE(g_store));
 

src/tint2conf/properties.c

@@ -37,6 +37,7 @@ GtkWidget *panel_window_name, *disable_transparency;
 GtkWidget *panel_mouse_effects;
 GtkWidget *mouse_hover_icon_opacity, *mouse_hover_icon_saturation, *mouse_hover_icon_brightness;
 GtkWidget *mouse_pressed_icon_opacity, *mouse_pressed_icon_saturation, *mouse_pressed_icon_brightness;
+GtkWidget *panel_primary_monitor_first;
 
 GtkListStore *panel_items, *all_items;
 GtkWidget *panel_items_view, *all_items_view;
@@ -45,18 +46,22 @@ GtkWidget *screen_position[12];
 GSList *screen_position_group;
 GtkWidget *panel_background;
 
+GtkWidget *notebook;
+
 // taskbar
 GtkWidget *taskbar_show_desktop, *taskbar_show_name, *taskbar_padding_x, *taskbar_padding_y, *taskbar_spacing;
 GtkWidget *taskbar_hide_inactive_tasks, *taskbar_hide_diff_monitor;
-GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color, *taskbar_name_active_color, *taskbar_name_font;
+GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color, *taskbar_name_active_color;
+GtkWidget *taskbar_name_font, *taskbar_name_font_set;
 GtkWidget *taskbar_active_background, *taskbar_inactive_background;
 GtkWidget *taskbar_name_active_background, *taskbar_name_inactive_background;
-GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment;
+GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment, *taskbar_always_show_all_desktop_tasks;
 
 // task
 GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down;
 GtkWidget *task_show_icon, *task_show_text, *task_align_center, *font_shadow;
-GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_spacing, *task_font;
+GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_spacing;
+GtkWidget *task_font, *task_font_set;
 GtkWidget *task_default_color, *task_default_color_set,
 		  *task_default_icon_opacity, *task_default_icon_osb_set,
 		  *task_default_icon_saturation,
@@ -88,12 +93,14 @@ GtkWidget *task_iconified_color, *task_iconified_color_set,
 GtkWidget *clock_format_line1, *clock_format_line2, *clock_tmz_line1, *clock_tmz_line2;
 GtkWidget *clock_left_command, *clock_right_command;
 GtkWidget *clock_mclick_command, *clock_rclick_command, *clock_uwheel_command, *clock_dwheel_command;
-GtkWidget *clock_padding_x, *clock_padding_y, *clock_font_line1, *clock_font_line2, *clock_font_color;
+GtkWidget *clock_padding_x, *clock_padding_y;
+GtkWidget *clock_font_line1, *clock_font_line1_set, *clock_font_line2, *clock_font_line2_set, *clock_font_color;
 GtkWidget *clock_background;
 
 // battery
 GtkWidget *battery_hide_if_higher, *battery_alert_if_lower, *battery_alert_cmd;
-GtkWidget *battery_padding_x, *battery_padding_y, *battery_font_line1, *battery_font_line2, *battery_font_color;
+GtkWidget *battery_padding_x, *battery_padding_y;
+GtkWidget *battery_font_line1, *battery_font_line1_set, *battery_font_line2, *battery_font_line2_set, *battery_font_color;
 GtkWidget *battery_background;
 GtkWidget *battery_tooltip;
 GtkWidget *battery_left_command, *battery_mclick_command, *battery_right_command, *battery_uwheel_command, *battery_dwheel_command;
@@ -105,11 +112,14 @@ GtkWidget *systray_icon_size, *systray_icon_opacity, *systray_icon_saturation, *
 GtkWidget *systray_background, *systray_monitor;
 
 // tooltip
-GtkWidget *tooltip_padding_x, *tooltip_padding_y, *tooltip_font, *tooltip_font_color;
+GtkWidget *tooltip_padding_x, *tooltip_padding_y, *tooltip_font, *tooltip_font_set, *tooltip_font_color;
 GtkWidget *tooltip_task_show, *tooltip_show_after, *tooltip_hide_after;
 GtkWidget *clock_format_tooltip, *clock_tmz_tooltip;
 GtkWidget *tooltip_background;
 
+// Executors
+GArray *executors;
+
 // launcher
 
 GtkListStore *launcher_apps, *all_apps;
@@ -168,6 +178,7 @@ void create_task_status(GtkWidget *notebook,
 						GtkWidget **task_status_icon_brightness,
 						GtkWidget **task_status_background,
 						GtkWidget **task_status_background_set);
+void create_execp(GtkWidget *parent, int i);
 void create_clock(GtkWidget *parent);
 void create_systemtray(GtkWidget *parent);
 void create_battery(GtkWidget *parent);
@@ -182,6 +193,16 @@ static gint compare_strings(gconstpointer a, gconstpointer b)
    return strnatcasecmp((const char*)a, (const char*)b);
 }
 
+const gchar *get_default_font()
+{
+	GtkSettings *settings = gtk_settings_get_default();
+	gchar *default_font;
+	g_object_get(settings, "gtk-font-name", &default_font, NULL);
+	if (default_font)
+		return default_font;
+	return "sans 10";
+}
+
 void applyClicked(GtkWidget *widget, gpointer data)
 {
 	gchar *file = get_current_theme_file_name();
@@ -212,9 +233,14 @@ void okClicked(GtkWidget *widget, gpointer data)
 	cancelClicked(widget, data);
 }
 
+void font_set_callback(GtkWidget *widget, gpointer data)
+{
+	gtk_widget_set_sensitive(data, GTK_TOGGLE_BUTTON(widget)->active);
+}
+
 GtkWidget *create_properties()
 {
-	GtkWidget *view, *dialog_vbox3, *button, *notebook;
+	GtkWidget *view, *dialog_vbox3, *button;
 	GtkTooltips *tooltips;
 	GtkWidget *page_panel, *page_panel_items, *page_launcher, *page_taskbar, *page_battery, *page_clock,
 			  *page_tooltip, *page_systemtray, *page_task, *page_background;
@@ -223,11 +249,13 @@ GtkWidget *create_properties()
 	tooltips = gtk_tooltips_new();
 	(void) tooltips;
 
+	executors = g_array_new(FALSE, TRUE, sizeof(Executor));
+
 	// global layer
 	view = gtk_dialog_new();
 	gtk_window_set_title(GTK_WINDOW(view), _("Properties"));
 	gtk_window_set_modal(GTK_WINDOW(view), TRUE);
-	gtk_window_set_default_size(GTK_WINDOW(view), 800, 600);
+	gtk_window_set_default_size(GTK_WINDOW(view), 920, 600);
 	gtk_window_set_skip_pager_hint(GTK_WINDOW(view), TRUE);
 	gtk_window_set_type_hint(GTK_WINDOW(view), GDK_WINDOW_TYPE_HINT_DIALOG);
 
@@ -283,7 +311,6 @@ GtkWidget *create_properties()
 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), addScrollBarToWidget(page_panel_items), label);
 	create_panel_items(page_panel_items);
 
-
 	label = gtk_label_new(_("Taskbar"));
 	gtk_widget_show(label);
 	page_taskbar = gtk_vbox_new(FALSE, DEFAULT_HOR_SPACING);
@@ -1130,6 +1157,20 @@ void create_panel(GtkWidget *parent)
 	gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 0);
 	gtk_tooltips_set_tip(tooltips, panel_combo_monitor, _("The monitor on which the panel is placed"), NULL);
 
+	row++;
+	col = 2;
+	label = gtk_label_new(_("Primary monitor first"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	panel_primary_monitor_first = gtk_check_button_new();
+	gtk_widget_show(panel_primary_monitor_first);
+	gtk_table_attach(GTK_TABLE(table), panel_primary_monitor_first, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, panel_primary_monitor_first, _("If enabled, the primary monitor will have index 1 in the monitor list even if it is not top-left."), NULL);
+
 	row++;
 	col = 2;
 	label = gtk_label_new(_("Length"));
@@ -1651,6 +1692,11 @@ void create_panel_items(GtkWidget *parent)
 					   itemsColName, _("Free space"),
 					   itemsColValue, "F",
 					   -1);
+	gtk_list_store_append(all_items, &iter);
+	gtk_list_store_set(all_items, &iter,
+					   itemsColName, _("Executor"),
+					   itemsColValue, "E",
+					   -1);
 
 	panel_items_view = gtk_tree_view_new();
 	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(panel_items_view),
@@ -1809,9 +1855,11 @@ void set_panel_items(const char *items)
 {
 	gtk_list_store_clear(panel_items);
 
+	int execp_index = -1;
 	for (; items && *items; items++) {
 		const char *value = NULL;
 		const char *name = NULL;
+		char buffer[256];
 
 		char v = *items;
 		if (v == 'B') {
@@ -1832,6 +1880,12 @@ void set_panel_items(const char *items)
 		} else if (v == 'F') {
 			value = "F";
 			name = _("Free space");
+		} else if (v == 'E') {
+			execp_index++;
+			buffer[0] = 0;
+			sprintf(buffer, "%s %d", _("Executor"), execp_index + 1);
+			name = buffer;
+			value = "E";
 		} else {
 			continue;
 		}
@@ -1859,15 +1913,19 @@ void panel_add_item(GtkWidget *widget, gpointer data)
 						   itemsColValue, &value,
 						   -1);
 
-		if (!panel_contains(value)) {
+		if (!panel_contains(value) || g_str_equal(value, "E")) {
 			GtkTreeIter iter;
 			gtk_list_store_append(panel_items, &iter);
 			gtk_list_store_set(panel_items, &iter,
 							   itemsColName, g_strdup(name),
 							   itemsColValue, g_strdup(value),
 							   -1);
+			if (g_str_equal(value, "E")) {
+				execp_create_new();
+			}
 		}
 	}
+	execp_update_indices();
 }
 
 void panel_remove_item(GtkWidget *widget, gpointer data)
@@ -1876,8 +1934,28 @@ void panel_remove_item(GtkWidget *widget, gpointer data)
 	GtkTreeModel *model;
 
 	if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(panel_items_view)), &model, &iter)) {
+		gchar *name;
+		gchar *value;
+
+		gtk_tree_model_get(model, &iter,
+						   itemsColName, &name,
+						   itemsColValue, &value,
+						   -1);
+
+		if (g_str_equal(value, "E")) {
+			for (int i = 0; i < executors->len; i++) {
+				Executor *executor = &g_array_index(executors, Executor, i);
+				if (g_str_equal(name, executor->name)) {
+					execp_remove(i);
+					break;
+				}
+			}
+		}
+
 		gtk_list_store_remove(panel_items, &iter);
 	}
+
+	execp_update_indices();
 }
 
 void panel_move_item_down(GtkWidget *widget, gpointer data)
@@ -1888,9 +1966,40 @@ void panel_move_item_down(GtkWidget *widget, gpointer data)
 	if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(panel_items_view)), &model, &iter)) {
 		GtkTreeIter next = iter;
 		if (gtk_tree_model_iter_next(model, &next)) {
+			gchar *name1;
+			gchar *value1;
+			gtk_tree_model_get(model, &iter,
+							   itemsColName, &name1,
+							   itemsColValue, &value1,
+							   -1);
+			gchar *name2;
+			gchar *value2;
+			gtk_tree_model_get(model, &next,
+							   itemsColName, &name2,
+							   itemsColValue, &value2,
+							   -1);
+
+			if (g_str_equal(value1, "E") && g_str_equal(value2, "E")) {
+				Executor *executor1 = NULL;
+				Executor *executor2 = NULL;
+				for (int i = 0; i < executors->len; i++) {
+					Executor *executor = &g_array_index(executors, Executor, i);
+					if (g_str_equal(name1, executor->name)) {
+						executor1 = executor;
+					}
+					if (g_str_equal(name2, executor->name)) {
+						executor2 = executor;
+					}
+				}
+				Executor tmp = *executor1;
+				*executor1 = *executor2;
+				*executor2 = tmp;
+			}
+
 			gtk_list_store_swap(panel_items, &iter, &next);
 		}
 	}
+	execp_update_indices();
 }
 
 void panel_move_item_up(GtkWidget *widget, gpointer data)
@@ -1902,10 +2011,41 @@ void panel_move_item_up(GtkWidget *widget, gpointer data)
 		if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(panel_items_view)), &model, &iter)) {
 			GtkTreeIter prev = iter;
 			if (gtk_tree_model_iter_prev_tint2(model, &prev)) {
+				gchar *name1;
+				gchar *value1;
+				gtk_tree_model_get(model, &iter,
+								   itemsColName, &name1,
+								   itemsColValue, &value1,
+								   -1);
+				gchar *name2;
+				gchar *value2;
+				gtk_tree_model_get(model, &prev,
+								   itemsColName, &name2,
+								   itemsColValue, &value2,
+								   -1);
+
+				if (g_str_equal(value1, "E") && g_str_equal(value2, "E")) {
+					Executor *executor1 = NULL;
+					Executor *executor2 = NULL;
+					for (int i = 0; i < executors->len; i++) {
+						Executor *executor = &g_array_index(executors, Executor, i);
+						if (g_str_equal(name1, executor->name)) {
+							executor1 = executor;
+						}
+						if (g_str_equal(name2, executor->name)) {
+							executor2 = executor;
+						}
+					}
+					Executor tmp = *executor1;
+					*executor1 = *executor2;
+					*executor2 = tmp;
+				}
+
 				gtk_list_store_swap(panel_items, &iter, &prev);
 			}
 		}
 	}
+	execp_update_indices();
 }
 
 enum {
@@ -2770,6 +2910,23 @@ void create_taskbar(GtkWidget *parent)
 	gtk_tooltips_set_tip(tooltips, taskbar_hide_diff_monitor, _("If enabled, tasks that are not on the same monitor as the panel will not be displayed. "
 						 "This behavior is enabled automatically if the panel monitor is set to 'All'."), NULL);
 
+
+	col = 2;
+	row++;
+	label = gtk_label_new(_("Always show all desktop tasks"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	taskbar_always_show_all_desktop_tasks = gtk_check_button_new();
+	gtk_widget_show(taskbar_always_show_all_desktop_tasks);
+	gtk_table_attach(GTK_TABLE(table), taskbar_always_show_all_desktop_tasks, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, taskbar_always_show_all_desktop_tasks, _("Has effect only if 'Show a taskbar for each desktop' is enabled. "
+																			"If enabled, tasks that appear on all desktops are shown on all taskbars. "
+																			"Otherwise, they are shown only on the taskbar of the current desktop."), NULL);
+
 	row++;
 	col = 2;
 	label = gtk_label_new(_("Task sorting"));
@@ -2785,6 +2942,8 @@ void create_taskbar(GtkWidget *parent)
 	gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("None"));
 	gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("By title"));
 	gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("By center"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("Most recently used first"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("Most recently used last"));
 	gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0);
 	gtk_tooltips_set_tip(tooltips, taskbar_sort_order, _("Specifies how tasks should be sorted on the taskbar. \n"
 						 "'None' means that new tasks are added to the end, and the user can also reorder task buttons by mouse dragging. \n"
@@ -2986,20 +3145,31 @@ void create_taskbar(GtkWidget *parent)
 	col++;
 	gtk_tooltips_set_tip(tooltips, taskbar_name_inactive_color, _("Specifies the font color used to display the name of inactive desktops."), NULL);
 
-	col = 2;
+	col = 1;
 	row++;
+	taskbar_name_font_set = gtk_check_button_new();
+	gtk_widget_show(taskbar_name_font_set);
+	gtk_table_attach(GTK_TABLE(table), taskbar_name_font_set, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_tooltips_set_tip(tooltips, taskbar_name_font_set, _("If not checked, the desktop theme font is used. If checked, the custom font specified here is used."), NULL);
+	col++;
+
 	label = gtk_label_new(_("Font"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 
-	taskbar_name_font = gtk_font_button_new();
+	PangoFontDescription *taskbar_name_font_desc = pango_font_description_from_string(get_default_font());
+	pango_font_description_set_weight(taskbar_name_font_desc, PANGO_WEIGHT_BOLD);
+	taskbar_name_font = gtk_font_button_new_with_font(pango_font_description_to_string(taskbar_name_font_desc));
+	pango_font_description_free(taskbar_name_font_desc);
 	gtk_widget_show(taskbar_name_font);
 	gtk_table_attach(GTK_TABLE(table), taskbar_name_font, col, col+3, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(taskbar_name_font), TRUE);
 	gtk_tooltips_set_tip(tooltips, taskbar_name_font, _("Specifies the font used to display the desktop name."), NULL);
+	gtk_signal_connect(GTK_OBJECT(taskbar_name_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), taskbar_name_font);
+	font_set_callback(taskbar_name_font_set, taskbar_name_font);
 
 	col = 2;
 	row++;
@@ -3365,19 +3535,27 @@ void create_task(GtkWidget *parent)
 	col++;
 	gtk_tooltips_set_tip(tooltips, task_spacing, _("Specifies the spacing between the icon and the text."), NULL);
 
-	row++, col = 2;
+	row++, col = 1;
+	task_font_set = gtk_check_button_new();
+	gtk_widget_show(task_font_set);
+	gtk_table_attach(GTK_TABLE(table), task_font_set, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_tooltips_set_tip(tooltips, task_font_set, _("If not checked, the desktop theme font is used. If checked, the custom font specified here is used."), NULL);
+	col++;
+
 	label = gtk_label_new(_("Font"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 
-	task_font = gtk_font_button_new();
+	task_font = gtk_font_button_new_with_font(get_default_font());
 	gtk_widget_show(task_font);
 	gtk_table_attach(GTK_TABLE(table), task_font, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(task_font), TRUE);
 	gtk_tooltips_set_tip(tooltips, task_font, _("Specifies the font used to display the task button text."), NULL);
+	gtk_signal_connect(GTK_OBJECT(task_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), task_font);
+	font_set_callback(task_font_set, task_font);
 
 	change_paragraph(parent);
 
@@ -3856,33 +4034,56 @@ void create_clock(GtkWidget *parent)
 	gtk_tooltips_set_tip(tooltips, clock_padding_y, _("Specifies the vertical padding of the clock. "
 						 "This is the space between the border and the content inside."), NULL);
 
-	row++, col = 2;
+	row++, col = 1;
+	clock_font_line1_set = gtk_check_button_new();
+	gtk_widget_show(clock_font_line1_set);
+	gtk_table_attach(GTK_TABLE(table), clock_font_line1_set, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_tooltips_set_tip(tooltips, clock_font_line1_set, _("If not checked, the desktop theme font is used. If checked, the custom font specified here is used."), NULL);
+	col++;
+
 	label = gtk_label_new(_("Font first line"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 
-	clock_font_line1 = gtk_font_button_new();
+	PangoFontDescription *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));
+	clock_font_line1 = gtk_font_button_new_with_font(pango_font_description_to_string(time1_font_desc));
+	pango_font_description_free(time1_font_desc);
 	gtk_widget_show(clock_font_line1);
 	gtk_table_attach(GTK_TABLE(table), clock_font_line1, col, col+3, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(clock_font_line1), TRUE);
 	gtk_tooltips_set_tip(tooltips, clock_font_line1, _("Specifies the font used to display the first line of the clock."), NULL);
+	gtk_signal_connect(GTK_OBJECT(clock_font_line1_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), clock_font_line1);
+	font_set_callback(clock_font_line1_set, clock_font_line1);
+
+	row++, col = 1;
+	clock_font_line2_set = gtk_check_button_new();
+	gtk_widget_show(clock_font_line2_set);
+	gtk_table_attach(GTK_TABLE(table), clock_font_line2_set, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_tooltips_set_tip(tooltips, clock_font_line2_set, _("If not checked, the desktop theme font is used. If checked, the custom font specified here is used."), NULL);
+	col++;
 
-	row++, col = 2;
 	label = gtk_label_new(_("Font second line"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 
-	clock_font_line2 = gtk_font_button_new();
+	PangoFontDescription *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);
+	clock_font_line2 = gtk_font_button_new_with_font(pango_font_description_to_string(time2_font_desc));;
+	pango_font_description_free(time2_font_desc);
 	gtk_widget_show(clock_font_line2);
 	gtk_table_attach(GTK_TABLE(table), clock_font_line2, col, col+3, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(clock_font_line2), TRUE);
 	gtk_tooltips_set_tip(tooltips, clock_font_line2, _("Specifies the font used to display the second line of the clock."), NULL);
+	gtk_signal_connect(GTK_OBJECT(clock_font_line2_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), clock_font_line2);
+	font_set_callback(clock_font_line2_set, clock_font_line2);
 
 	row++, col = 2;
 	label = gtk_label_new(_("Font color"));
@@ -3945,6 +4146,447 @@ void create_clock(GtkWidget *parent)
 	change_paragraph(parent);
 }
 
+void create_execp(GtkWidget *notebook, int i)
+{
+	GtkWidget *label;
+	GtkWidget *table;
+	int row, col;
+	GtkTooltips *tooltips = gtk_tooltips_new();
+
+	Executor *executor = &g_array_index(executors, Executor, i);
+
+	executor->name[0] = 0;
+	sprintf(executor->name, "%s %d", _("Executor"), i + 1);
+	executor->page_label = gtk_label_new(executor->name);
+	gtk_widget_show(executor->page_label);
+	executor->page_execp = gtk_vbox_new(FALSE, DEFAULT_HOR_SPACING);
+	executor->container = addScrollBarToWidget(executor->page_execp);
+	gtk_container_set_border_width(GTK_CONTAINER(executor->page_execp), 10);
+	gtk_widget_show(executor->page_execp);
+	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), executor->container, executor->page_label);
+
+	GtkWidget *parent = executor->page_execp;
+
+	table = gtk_table_new(1, 2, FALSE);
+	gtk_widget_show(table);
+	gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 0);
+	gtk_table_set_row_spacings(GTK_TABLE(table), ROW_SPACING);
+	gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING);
+	row = 0, col = 2;
+
+	label = gtk_label_new(_("<b>Format</b>"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);	gtk_widget_show(label);
+	gtk_box_pack_start(GTK_BOX(parent), label, FALSE, FALSE, 0);
+
+	table = gtk_table_new(3, 10, FALSE);
+	gtk_widget_show(table);
+	gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 0);
+	gtk_table_set_row_spacings(GTK_TABLE(table), ROW_SPACING);
+	gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING);
+	row = 0, col = 2;
+
+	label = gtk_label_new(_("Command"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_command = gtk_entry_new();
+	gtk_widget_show(executor->execp_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(executor->execp_command), 50);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_command,
+						 _("Specifies the command to execute."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Interval"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_interval = gtk_spin_button_new_with_range(0, 1000000, 1);
+	gtk_widget_show(executor->execp_interval);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_interval, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_interval, _("Specifies the interval at which the command is executed, in seconds. "
+													 "If zero, the command is executed only once."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Show icon"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_has_icon = gtk_check_button_new();
+	gtk_widget_show(executor->execp_has_icon);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_has_icon, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_has_icon, _("If enabled, the first line printed by the command is interpreted "
+													 "as a path to an image file."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Cache icon"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_cache_icon = gtk_check_button_new();
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(executor->execp_cache_icon), 1);
+	gtk_widget_show(executor->execp_cache_icon);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_cache_icon, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_cache_icon, _("If enabled, the image is not reloaded from disk every time the command is executed if the path remains unchanged. Enabling this is recommended."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Continuous output"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_continuous = gtk_spin_button_new_with_range(0, 1000000, 1);
+	gtk_widget_show(executor->execp_continuous);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_continuous, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_continuous, _("If non-zero, the last execp_continuous lines from the output of "
+													   "the command are displayed, every execp_continuous lines; this is "
+													   "useful for showing the output of commands that run indefinitely, "
+													   "such as 'ping 127.0.0.1'. If zero, the output of the command is "
+													   "displayed after it finishes executing."), NULL);
+	row++, col = 2;
+	label = gtk_label_new(_("Display markup"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_markup = gtk_check_button_new();
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(executor->execp_markup), 1);
+	gtk_widget_show(executor->execp_markup);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_markup, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_markup, _("If enabled, the output of the command is treated as Pango markup, "
+												   "which allows rich text formatting. Note that using this with commands "
+												   "that print data downloaded from the Internet is a potential security risk."), NULL);
+
+	change_paragraph(parent);
+
+	label = gtk_label_new(_("<b>Mouse events</b>"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+	gtk_widget_show(label);
+	gtk_box_pack_start(GTK_BOX(parent), label, FALSE, FALSE, 0);
+
+	table = gtk_table_new(5, 10, FALSE);
+	gtk_widget_show(table);
+	gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 0);
+	gtk_table_set_row_spacings(GTK_TABLE(table), ROW_SPACING);
+	gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING);
+	row = 0, col = 2;
+
+	label = gtk_label_new(_("Left click command"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_left_command = gtk_entry_new();
+	gtk_widget_show(executor->execp_left_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(executor->execp_left_command), 50);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_left_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_left_command,
+						 _("Specifies a command that will be executed when the executor receives a left click."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Right click command"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_right_command = gtk_entry_new();
+	gtk_widget_show(executor->execp_right_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(executor->execp_right_command), 50);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_right_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_right_command,
+						 _("Specifies a command that will be executed when the executor receives a right click."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Middle click command"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_mclick_command = gtk_entry_new();
+	gtk_widget_show(executor->execp_mclick_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(executor->execp_mclick_command), 50);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_mclick_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_mclick_command,
+						 _("Specifies a command that will be executed when the executor receives a middle click."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Wheel scroll up command"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_uwheel_command = gtk_entry_new();
+	gtk_widget_show(executor->execp_uwheel_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(executor->execp_uwheel_command), 50);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_uwheel_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_uwheel_command,
+						 _("Specifies a command that will be executed when the executor receives a mouse scroll up."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Wheel scroll down command"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_dwheel_command = gtk_entry_new();
+	gtk_widget_show(executor->execp_dwheel_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(executor->execp_dwheel_command), 50);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_dwheel_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_dwheel_command,
+						 _("Specifies a command that will be executed when the executor receives a mouse scroll down."), NULL);
+
+	change_paragraph(parent);
+
+	label = gtk_label_new(_("<b>Appearance</b>"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+	gtk_widget_show(label);
+	gtk_box_pack_start(GTK_BOX(parent), label, FALSE, FALSE, 0);
+
+	table = gtk_table_new(3, 22, FALSE);
+	gtk_widget_show(table);
+	gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 0);
+	gtk_table_set_row_spacings(GTK_TABLE(table), ROW_SPACING);
+	gtk_table_set_col_spacings(GTK_TABLE(table), COL_SPACING);
+	row = 0, col = 2;
+
+	label = gtk_label_new(_("Background"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_background = create_background_combo(_("Executor"));
+	gtk_widget_show(executor->execp_background);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_background, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_background, _("Selects the background used to display the executor. "
+													 "Backgrounds can be edited in the Backgrounds tab."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Horizontal padding"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_padding_x = gtk_spin_button_new_with_range(0, 500, 1);
+	gtk_widget_show(executor->execp_padding_x);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_padding_x, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_padding_x, _("Specifies the horizontal padding of the executor. "
+						 "This is the space between the border and the content inside."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Vertical padding"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_padding_y = gtk_spin_button_new_with_range(0, 500, 1);
+	gtk_widget_show(executor->execp_padding_y);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_padding_y, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_padding_y, _("Specifies the vertical padding of the executor. "
+						 "This is the space between the border and the content inside."), NULL);
+
+	row++, col = 1;
+	executor->execp_font_set = gtk_check_button_new();
+	gtk_widget_show(executor->execp_font_set);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_font_set, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_tooltips_set_tip(tooltips, executor->execp_font_set, _("If not checked, the desktop theme font is used. If checked, the custom font specified here is used."), NULL);
+	col++;
+
+	label = gtk_label_new(_("Font"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_font = gtk_font_button_new_with_font(get_default_font());
+	gtk_widget_show(executor->execp_font);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_font, col, col+3, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_font_button_set_show_style(GTK_FONT_BUTTON(executor->execp_font), TRUE);
+	gtk_signal_connect(GTK_OBJECT(executor->execp_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), executor->execp_font);
+	font_set_callback(executor->execp_font_set, executor->execp_font);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Font color"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_font_color = gtk_color_button_new();
+	gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(executor->execp_font_color), TRUE);
+	gtk_widget_show(executor->execp_font_color);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_font_color, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	row++, col = 2;
+	label = gtk_label_new(_("Centered"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_centered = gtk_check_button_new();
+	gtk_widget_show(executor->execp_centered);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_centered, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	row++, col = 2;
+	label = gtk_label_new(_("Icon width"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_icon_w = gtk_spin_button_new_with_range(0, 1000000, 1);
+	gtk_widget_show(executor->execp_icon_w);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_icon_w, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_icon_w, _("If non-zero, the image is resized to this width."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Icon height"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_icon_h = gtk_spin_button_new_with_range(0, 1000000, 1);
+	gtk_widget_show(executor->execp_icon_h);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_icon_h, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_icon_h, _("If non-zero, the image is resized to this height."), NULL);
+
+	row++, col = 2;
+	label = gtk_label_new(_("Tooltip"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_show_tooltip = gtk_check_button_new();
+	gtk_widget_show(executor->execp_show_tooltip);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_show_tooltip, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(executor->execp_show_tooltip), 1);
+	col++;
+
+	row++, col = 2;
+	label = gtk_label_new(_("Tooltip text"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_widget_show(label);
+	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+
+	executor->execp_tooltip = gtk_entry_new();
+	gtk_widget_show(executor->execp_tooltip);
+	gtk_entry_set_width_chars(GTK_ENTRY(executor->execp_tooltip), 50);
+	gtk_table_attach(GTK_TABLE(table), executor->execp_tooltip, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, executor->execp_tooltip,
+						 _("The tooltip text to display. Leave this empty to display an automatically generated tooltip with information about when the command was last executed."), NULL);
+
+	change_paragraph(parent);
+}
+
+void execp_create_new()
+{
+	g_array_set_size(executors, executors->len + 1);
+	create_execp(notebook, executors->len - 1);
+}
+
+Executor *execp_get_last()
+{
+	if (executors->len <= 0)
+		execp_create_new();
+	return &g_array_index(executors, Executor, executors->len - 1);
+}
+
+void execp_remove(int i)
+{
+	Executor *executor = &g_array_index(executors, Executor, i);
+
+	for (int i_page = 0; i_page < gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)); i_page++) {
+		GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), i_page);
+		if (page == executor->container) {
+			gtk_widget_hide(page);
+			gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), i_page);
+		}
+	}
+
+	executors = g_array_remove_index(executors, i);
+}
+
+void execp_update_indices()
+{
+	for (int i = 0; i < executors->len; i++) {
+		Executor *executor = &g_array_index(executors, Executor, i);
+		sprintf(executor->name, "%s %d", _("Executor"), i + 1);
+		gtk_label_set_text(GTK_LABEL(executor->page_label), executor->name);
+	}
+
+	GtkTreeModel *model = GTK_TREE_MODEL(panel_items);
+	GtkTreeIter iter;
+	if (!gtk_tree_model_get_iter_first(model, &iter))
+		return;
+	int execp_index = -1;
+	while (1) {
+		gchar *name;
+		gchar *value;
+		gtk_tree_model_get(model, &iter,
+						   itemsColName, &name,
+						   itemsColValue, &value,
+						   -1);
+
+		if (g_str_equal(value, "E")) {
+			execp_index++;
+			char buffer[256];
+			buffer[0] = 0;
+			sprintf(buffer, "%s %d", _("Executor"), execp_index + 1);
+
+			gtk_list_store_set(panel_items, &iter,
+							   itemsColName, buffer,
+							   -1);
+		}
+
+		if (!gtk_tree_model_iter_next(model, &iter))
+			break;
+	}
+}
+
 void create_systemtray(GtkWidget *parent)
 {
 	GtkWidget *table;
@@ -4421,33 +5063,55 @@ void create_battery(GtkWidget *parent)
 	gtk_tooltips_set_tip(tooltips, battery_padding_y, _("Specifies the vertical padding of the battery. "
 						 "This is the space between the border and the content inside."), NULL);
 
-	row++, col = 2;
+	row++, col = 1;
+	battery_font_line1_set = gtk_check_button_new();
+	gtk_widget_show(battery_font_line1_set);
+	gtk_table_attach(GTK_TABLE(table), battery_font_line1_set, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_tooltips_set_tip(tooltips, battery_font_line1_set, _("If not checked, the desktop theme font is used. If checked, the custom font specified here is used."), NULL);
+	col++;
+
 	label = gtk_label_new(_("Font first line"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 
-	battery_font_line1 = gtk_font_button_new();
+	PangoFontDescription *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);
+	battery_font_line1 = gtk_font_button_new_with_font(pango_font_description_to_string(bat1_font_desc));
 	gtk_widget_show(battery_font_line1);
+	pango_font_description_free(bat1_font_desc);
 	gtk_table_attach(GTK_TABLE(table), battery_font_line1, col, col+3, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(battery_font_line1), TRUE);
 	gtk_tooltips_set_tip(tooltips, battery_font_line1, _("Specifies the font used to display the first line of the battery text."), NULL);
+	gtk_signal_connect(GTK_OBJECT(battery_font_line1_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), battery_font_line1);
+	font_set_callback(battery_font_line1_set, battery_font_line1);
+
+	row++, col = 1;
+	battery_font_line2_set = gtk_check_button_new();
+	gtk_widget_show(battery_font_line2_set);
+	gtk_table_attach(GTK_TABLE(table), battery_font_line2_set, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_tooltips_set_tip(tooltips, battery_font_line2_set, _("If not checked, the desktop theme font is used. If checked, the custom font specified here is used."), NULL);
+	col++;
 
-	row++, col = 2;
 	label = gtk_label_new(_("Font second line"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 
-	battery_font_line2 = gtk_font_button_new();
+	PangoFontDescription *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);
+	battery_font_line2 = gtk_font_button_new_with_font(pango_font_description_to_string(bat2_font_desc));
+	pango_font_description_free(bat2_font_desc);
 	gtk_widget_show(battery_font_line2);
 	gtk_table_attach(GTK_TABLE(table), battery_font_line2, col, col+3, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(battery_font_line2), TRUE);
 	gtk_tooltips_set_tip(tooltips, battery_font_line2, _("Specifies the font used to display the second line of the battery text."), NULL);
+	gtk_signal_connect(GTK_OBJECT(battery_font_line2_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), battery_font_line2);
+	font_set_callback(battery_font_line2_set, battery_font_line2);
 
 	row++, col = 2;
 	label = gtk_label_new(_("Font color"));
@@ -4579,19 +5243,27 @@ void create_tooltip(GtkWidget *parent)
 	gtk_tooltips_set_tip(tooltips, tooltip_padding_y, _("Specifies the vertical padding of the tooltip. "
 						 "This is the space between the border and the content inside."), NULL);
 
-	row++, col = 2;
+	row++, col = 1;
+	tooltip_font_set = gtk_check_button_new();
+	gtk_widget_show(tooltip_font_set);
+	gtk_table_attach(GTK_TABLE(table), tooltip_font_set, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_tooltips_set_tip(tooltips, tooltip_font_set, _("If not checked, the desktop theme font is used. If checked, the custom font specified here is used."), NULL);
+	col++;
+
 	label = gtk_label_new(_("Font"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 
-	tooltip_font = gtk_font_button_new();
+	tooltip_font = gtk_font_button_new_with_font(get_default_font());
 	gtk_widget_show(tooltip_font);
 	gtk_table_attach(GTK_TABLE(table), tooltip_font, col, col+3, row, row+1, GTK_FILL, 0, 0, 0);
 	col++;
 	gtk_font_button_set_show_style(GTK_FONT_BUTTON(tooltip_font), TRUE);
 	gtk_tooltips_set_tip(tooltips, tooltip_font, _("Specifies the font used to display the text of the tooltip."), NULL);
+	gtk_signal_connect(GTK_OBJECT(tooltip_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), tooltip_font);
+	font_set_callback(tooltip_font_set, tooltip_font);
 
 	row++, col = 2;
 	label = gtk_label_new(_("Font color"));

src/tint2conf/properties.h

@@ -17,6 +17,7 @@ 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,
@@ -51,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,
@@ -91,12 +94,14 @@ extern GtkWidget *task_iconified_color, *task_iconified_color_set,
 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_mclick_command, *clock_rclick_command, *clock_uwheel_command, *clock_dwheel_command;
-extern GtkWidget *clock_padding_x, *clock_padding_y, *clock_font_line1, *clock_font_line2, *clock_font_color;
+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;
@@ -108,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 {
@@ -178,4 +199,9 @@ 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();
+
 #endif

src/tint2conf/properties_rw.c

@@ -228,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)));
@@ -282,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);
@@ -310,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");
 
@@ -381,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
@@ -571,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);
@@ -607,8 +620,10 @@ void config_write_battery(FILE *fp)
 	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)));
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(battery_font_line1_set)))
-	fprintf(fp, "bat2_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(battery_font_line2)));
+		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,
@@ -633,6 +648,56 @@ void config_write_battery(FILE *fp)
 	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");
@@ -653,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");
 }
@@ -701,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);
@@ -1016,6 +1083,9 @@ void add_entry(char *key, char *value)
 		else if (strcmp(value, "6") == 0)
 			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 */
 	else if (strcmp(key, "autohide") == 0) {
@@ -1059,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);
@@ -1121,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);
@@ -1130,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);
@@ -1189,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);
 	}
@@ -1228,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));
@@ -1245,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);
@@ -1301,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);
@@ -1537,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 */
@@ -1556,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);

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.rgb[0] = 1;
-	g_tooltip.font_color.color[1] = 1;
+	g_tooltip.font_color.rgb[1] = 1;
-	g_tooltip.font_color.color[2] = 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)
+	if (!g_tooltip.bg)
-		g_tooltip.font_desc = pango_font_description_from_string(DEFAULT_FONT);
-	if (g_tooltip.bg == 0)
 		g_tooltip.bg = &g_array_index(backgrounds, Background, 0);
+	tooltip_init_fonts();
 
 	XSetWindowAttributes attr;
 	attr.override_redirect = True;
@@ -76,66 +75,97 @@ 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);
+		XDestroyWindow(server.display, g_tooltip.window);
-	g_tooltip.window = XCreateWindow(server.dsp, server.root_win, 0, 0, 100, 20, 0, server.depth, InputOutput, server.visual, mask, &attr);
+	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_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)
+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);
+	XTranslateCoordinates(server.display, server.root_win, g_tooltip.panel->main_win, x, y, &mx, &my, &w);
-	Area* area;
+	Area *area = click_area(g_tooltip.panel, mx, my);
-	area = click_area(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;
+	Panel *panel = g_tooltip.panel;
-	cairo_t *c;
+	int screen_width = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width;
-	PangoLayout* layout;
+
-	cs = cairo_xlib_surface_create(server.dsp, g_tooltip.window, server.visual, width, height);
+	cairo_surface_t *cs = cairo_xlib_surface_create(server.display, g_tooltip.window, server.visual, width, height);
-	c = cairo_create(cs);
+	cairo_t *c = cairo_create(cs);
-	layout = pango_cairo_create_layout(c);
+	PangoLayout *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);
+	pango_layout_set_font_description(layout, g_tooltip.font_desc);
-	PangoRectangle r1, r2;
+	PangoRectangle r1, r2;
-	pango_layout_get_pixel_extents(layout, &r1, &r2);
+	pango_layout_set_text(layout, "1234567890", -1);
-	width = 2*g_tooltip.bg->border.width + 2*g_tooltip.paddingx + r2.width;
+	pango_layout_get_pixel_extents(layout, &r1, &r2);
-	height = 2*g_tooltip.bg->border.width + 2*g_tooltip.paddingy + r2.height;
+	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 +178,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;
+		min_x = 0;
-		max_width=server.monitor[panel->monitor].width;
+		max_width = server.monitors[panel->monitor].width;
-		max_height=server.monitor[panel->monitor].height-panel->area.height;
+		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;
+			min_y = panel->area.height;
-	}
+	} else {
-	else {
+		max_width = server.monitors[panel->monitor].width - panel->area.width;
-		max_width=server.monitor[panel->monitor].width-panel->area.width;
+		min_y = 0;
-		min_y=0;
+		max_height = server.monitors[panel->monitor].height;
-		max_height=server.monitor[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)
+	if (x + width > server.monitors[panel->monitor].x + server.monitors[panel->monitor].width)
-		x = server.monitor[panel->monitor].x + server.monitor[panel->monitor].width - width;
+		x = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width - width;
-	if ( y+height > server.monitor[panel->monitor].y + server.monitor[panel->monitor].height)
+	if (y + height > server.monitors[panel->monitor].y + server.monitors[panel->monitor].height)
-		y = server.monitor[panel->monitor].y + server.monitor[panel->monitor].height - height;
+		y = server.monitors[panel->monitor].y + server.monitors[panel->monitor].height - height;
 
-	if (x<min_x)
+	if (x < min_x)
-		x=min_x;
+		x = min_x;
-	if (width>max_width)
+	if (width > max_width)
 		width = max_width;
-	if (y<min_y)
+	if (y < min_y)
-		y=min_y;
+		y = min_y;
-	if (height>max_height)
+	if (height > max_height)
-		height=max_height;
+		height = max_height;
 }
 
 void tooltip_update()
@@ -205,102 +234,93 @@ void tooltip_update()
 	tooltip_update_geometry();
 	if (just_shown) {
 		if (!panel_horizontal)
-			y -= height/2; // center vertically
+			y -= height / 2; // center vertically
-		just_shown = 0;
+		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_surface_t *cs = cairo_xlib_surface_create(server.display, g_tooltip.window, server.visual, width, height);
-	cairo_t *c;
+	cairo_t *c = cairo_create(cs);
-	PangoLayout* layout;
+	Color bc = g_tooltip.bg->fill_color;
-	cs = cairo_xlib_surface_create(server.dsp, g_tooltip.window, server.visual, width, height);
-	c = cairo_create(cs);
-	Color bc = g_tooltip.bg->back;
 	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);
+		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.color[0], bc.color[1], bc.color[2], bc.alpha);
+		cairo_set_source_rgba(c, bc.rgb[0], bc.rgb[1], bc.rgb[2], bc.alpha);
-	}
+	} else {
-	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_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_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);
+	cairo_set_source_rgba(c, fc.rgb[0], fc.rgb[1], fc.rgb[2], fc.alpha);
-	layout = pango_cairo_create_layout(c);
+	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_width(layout, width * PANGO_SCALE);
-	pango_layout_set_height(layout, height*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.x / 2 + g_tooltip.bg->border.width + g_tooltip.paddingx,
-				  -r1.y/2 + 1 + g_tooltip.bg->border.width + g_tooltip.paddingy);
+				  -r1.y / 2 + 1 + g_tooltip.bg->border.width + g_tooltip.paddingy);
-	pango_cairo_show_layout (c, layout);
+	pango_cairo_show_layout(c, layout);
 
-	g_object_unref (layout);
+	g_object_unref(layout);
-	cairo_destroy (c);
+	cairo_destroy(c);
-	cairo_surface_destroy (cs);
+	cairo_surface_destroy(cs);
 }
 
-
 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);
+		XUnmapWindow(server.display, g_tooltip.window);
-		XFlush(server.dsp);
+		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)

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
+	Area *area; // never ever use the area attribut if you are not 100% sure that this area was not freed
-	char* tooltip_text;
+	char *tooltip_text;
-	Panel* panel;
+	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;
+	Background *bg;
-	timeout* timeout;
+	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_trigger_show(Area *area, Panel *p, XEvent *e);
-void tooltip_show(void* /*arg*/);
+void tooltip_show(void * /*arg*/);
 void tooltip_update();
 void tooltip_trigger_hide();
-void tooltip_hide(void* /*arg*/);
+void tooltip_hide(void * /*arg*/);
-void tooltip_copy_text(Area* area);
+void tooltip_copy_text(Area *area);
+void tooltip_default_font_changed();
 
 #endif // TOOLTIP_H

src/util/area.c

@@ -29,144 +29,89 @@
 #include "area.h"
 #include "server.h"
 #include "panel.h"
-
+#include "common.h"
-
-/************************************************************
- * !!! 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).
- *
- ************************************************************/
 
 Area *mouse_over_area = NULL;
 
-void init_rendering(void *obj, int pos)
+void init_background(Background *bg)
 {
-	Area *a = (Area*)obj;
+	memset(bg, 0, sizeof(Background));
-	
+}
-	// initialize fixed position/size
+
-	GList *l;
+void initialize_positions(void *obj, int offset)
-	for (l = a->children; l ; l = l->next) {
+{
-		Area *child = ((Area*)l->data);
+	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);
+			initialize_positions(child, child->posy);
-		}
+		} else {
-		else {
+			child->posx = offset + a->bg->border.width + a->paddingy;
-			child->posx = pos + 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 relayout_fixed(Area *a)
-void rendering(void *obj)
 {
-	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->children; l ; l = l->next)
+	for (l = a->children; l; l = l->next)
-		size_by_content(l->data);
+		relayout_fixed(l->data);
-	
+
-	// calculate area's size
+	// Recalculate size
-	a->on_changed = 0;
+	a->_changed = 0;
-	if (a->resize && a->size_mode == SIZE_BY_CONTENT) {
+	if (a->resize_needed && a->size_mode == LAYOUT_FIXED) {
-		a->resize = 0;
+		a->resize_needed = 0;
 
 		if (a->_resize) {
 			if (a->_resize(a)) {
-				// 'size' changed => 'resize = 1' on the parent
+				// The size hash changed => resize needed for the parent
-				((Area*)a->parent)->resize = 1;
+				if (a->parent)
-				a->on_changed = 1;
+					((Area *)a->parent)->resize_needed = 1;
+				a->_changed = 1;
 			}
 		}
 	}
 }
 
-
+void relayout_dynamic(Area *a, int level)
-void size_by_layout (Area *a, int level)
 {
-	// don't resize hiden objects
 	if (!a->on_screen)
 		return;
 
-	// parent node is resized before its children
+	// Area is resized before its children
-	// calculate area's size
+	if (a->resize_needed && a->size_mode == LAYOUT_DYNAMIC) {
-	GList *l;
+		a->resize_needed = 0;
-	if (a->resize && a->size_mode == SIZE_BY_LAYOUT) {
-		a->resize = 0;
 
 		if (a->_resize) {
 			a->_resize(a);
-			// resize childs with SIZE_BY_LAYOUT
+			// resize children with LAYOUT_DYNAMIC
-			for (l = a->children; l ; l = l->next) {
+			for (GList *l = a->children; l; l = l->next) {
-				Area *child = ((Area*)l->data);
+				Area *child = ((Area *)l->data);
-				if (child->size_mode == SIZE_BY_LAYOUT && child->children)
+				if (child->size_mode == LAYOUT_DYNAMIC && child->children)
-					child->resize = 1;
+					child->resize_needed = 1;
 			}
 		}
 	}
 
-	// update position of children
+	// 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->children; l ; l = l->next) {
+			for (GList *l = a->children; l; l = l->next) {
-				Area *child = ((Area*)l->data);
+				Area *child = ((Area *)l->data);
 				if (!child->on_screen)
 					continue;
 
@@ -174,25 +119,25 @@ 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;
 
-			for (l = g_list_last(a->children); l ; l = l->prev) {
+			for (GList *l = g_list_last(a->children); l; l = l->prev) {
-				Area *child = ((Area*)l->data);
+				Area *child = ((Area *)l->data);
 				if (!child->on_screen)
 					continue;
 
@@ -202,17 +147,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;
 			}
@@ -220,8 +165,8 @@ void size_by_layout (Area *a, int level)
 
 			int children_size = 0;
 
-			for (l = a->children; l ; l = l->next) {
+			for (GList *l = a->children; l; l = l->next) {
-				Area *child = ((Area*)l->data);
+				Area *child = ((Area *)l->data);
 				if (!child->on_screen)
 					continue;
 
@@ -232,8 +177,8 @@ void size_by_layout (Area *a, int level)
 			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->children; l ; l = l->next) {
+			for (GList *l = a->children; l; l = l->next) {
-				Area *child = ((Area*)l->data);
+				Area *child = ((Area *)l->data);
 				if (!child->on_screen)
 					continue;
 
@@ -241,137 +186,129 @@ 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 relayout(Area *a)
-void refresh (Area *a)
 {
-	// don't draw and resize hide objects
+	relayout_fixed(a);
-	if (!a->on_screen) return;
+	relayout_dynamic(a, 1);
+}
 
-	// don't draw transparent objects (without foreground and without background)
+void draw_tree(Area *a)
-	if (a->redraw) {
+{
-		a->redraw = 0;
+	if (!a->on_screen)
-		// force redraw of child
+		return;
-		//GList *l;
-		//for (l = a->children ; l ; l = l->next)
-			//((Area*)l->data)->redraw = 1;
 
-		//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)
-	if (a->pix == 0) printf("empty area posx %d, width %d\n", a->posx, a->width);
+		XCopyArea(server.display, a->pix, ((Panel *)a->panel)->temp_pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
-	XCopyArea (server.dsp, a->pix, ((Panel *)a->panel)->temp_pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
 
-	// and then refresh child object
+	for (GList *l = a->children; l; l = l->next)
-	GList *l;
+		draw_tree((Area *)l->data);
-	for (l = a->children; l ; l = l->next)
-		refresh((Area*)l->data);
 }
 
-
+int relayout_with_constraint(Area *a, int maximum_size)
-int resize_by_layout(void *obj, int maximum_size)
 {
-	Area *child, *a = (Area*)obj;
+	int fixed_children_count = 0;
-	int size, nb_by_content=0, nb_by_layout=0;
+	int dynamic_children_count = 0;
 
-	if (panel_horizontal) {		
+	if (panel_horizontal) {
-		// detect free size for SIZE_BY_LAYOUT's Area
+		// detect free size for LAYOUT_DYNAMIC Areas
-		size = a->width - (2 * (a->paddingxlr + a->bg->border.width));
+		int size = a->width - (2 * (a->paddingxlr + a->bg->border.width));
-		GList *l;
+		for (GList *l = a->children; l; l = l->next) {
-		for (l = a->children ; l ; l = l->next) {
+			Area *child = (Area *)l->data;
-			child = (Area*)l->data;
+			if (child->on_screen && child->size_mode == LAYOUT_FIXED) {
-			if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
 				size -= child->width;
-				nb_by_content++;
+				fixed_children_count++;
 			}
-			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT)
+			if (child->on_screen && child->size_mode == LAYOUT_DYNAMIC)
-				nb_by_layout++;
+				dynamic_children_count++;
 		}
-		//printf("  resize_by_layout Deb %d, %d\n", nb_by_content, nb_by_layout);
+		if (fixed_children_count + dynamic_children_count > 0)
-		if (nb_by_content+nb_by_layout)
+			size -= (fixed_children_count + dynamic_children_count - 1) * a->paddingx;
-			size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);
 
-		int width=0, modulo=0, old_width;
+		int width = 0;
-		if (nb_by_layout) {
+		int modulo = 0;
-			width = size / nb_by_layout;
+		if (dynamic_children_count > 0) {
-			modulo = size % nb_by_layout;
+			width = size / dynamic_children_count;
-			if (width > maximum_size && maximum_size != 0) {
+			modulo = size % dynamic_children_count;
+			if (width > maximum_size && maximum_size > 0) {
 				width = maximum_size;
 				modulo = 0;
 			}
 		}
 
-		// resize SIZE_BY_LAYOUT objects
+		// Resize LAYOUT_DYNAMIC objects
-		for (l = a->children ; l ; l = l->next) {
+		for (GList *l = a->children; l; l = l->next) {
-			child = (Area*)l->data;
+			Area *child = (Area *)l->data;
-			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
+			if (child->on_screen && child->size_mode == LAYOUT_DYNAMIC) {
-				old_width = child->width;
+				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 {
-	else {
+		// detect free size for LAYOUT_DYNAMIC's Area
-		// detect free size for SIZE_BY_LAYOUT's Area
+		int size = a->height - (2 * (a->paddingxlr + a->bg->border.width));
-		size = a->height - (2 * (a->paddingxlr + a->bg->border.width));
+		for (GList *l = a->children; l; l = l->next) {
-		GList *l;
+			Area *child = (Area *)l->data;
-		for (l = a->children ; l ; l = l->next) {
+			if (child->on_screen && child->size_mode == LAYOUT_FIXED) {
-			child = (Area*)l->data;
-			if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
 				size -= child->height;
-				nb_by_content++;
+				fixed_children_count++;
 			}
-			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT)
+			if (child->on_screen && child->size_mode == LAYOUT_DYNAMIC)
-				nb_by_layout++;
+				dynamic_children_count++;
 		}
-		if (nb_by_content+nb_by_layout)
+		if (fixed_children_count + dynamic_children_count > 0)
-			size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);
+			size -= (fixed_children_count + dynamic_children_count - 1) * a->paddingx;
 
-		int height=0, modulo=0;
+		int height = 0;
-		if (nb_by_layout) {
+		int modulo = 0;
-			height = size / nb_by_layout;
+		if (dynamic_children_count) {
-			modulo = size % nb_by_layout;
+			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
+		// Resize LAYOUT_DYNAMIC objects
-		for (l = a->children ; l ; l = l->next) {
+		for (GList *l = a->children; l; l = l->next) {
-			child = (Area*)l->data;
+			Area *child = (Area *)l->data;
-			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
+			if (child->on_screen && child->size_mode == LAYOUT_DYNAMIC) {
 				int old_height = child->height;
 				child->height = height;
 				if (modulo) {
@@ -379,29 +316,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 schedule_redraw(Area *a)
-void set_redraw (Area *a)
 {
-	a->redraw = 1;
+	a->_redraw_needed = TRUE;
 
-	GList *l;
+	if (a->has_mouse_over_effect) {
-	for (l = a->children ; l ; l = l->next)
+		for (int i = 0; i < MOUSE_STATE_COUNT; i++) {
-		set_redraw((Area*)l->data);
+			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;
+	a->on_screen = FALSE;
-	parent->resize = 1;
+	if (parent)
+		parent->resize_needed = 1;
 	if (panel_horizontal)
 		a->width = 0;
 	else
@@ -410,80 +360,120 @@ void hide(Area *a)
 
 void show(Area *a)
 {
-	Area *parent = (Area*)a->parent;
+	Area *parent = (Area *)a->parent;
 
-	a->on_screen = 1;
+	a->on_screen = TRUE;
-	parent->resize = 1;
+	if (parent)
-	a->resize = 1;
+		parent->resize_needed = 1;
+	a->resize_needed = 1;
 }
 
-void draw (Area *a)
+void draw(Area *a)
 {
-	if (a->pix) XFreePixmap (server.dsp, a->pix);
+	if (a->pix) {
-	a->pix = XCreatePixmap (server.dsp, server.root_win, a->width, a->height, server.depth);
+		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)
+	// Add layer of root pixmap (or clear pixmap if real_transparency==true)
-	if (server.real_transparency)
+	if (!a->_clear) {
-		clear_pixmap(a->pix, 0 ,0, a->width, a->height);
+		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 (!server.real_transparency) {
+			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_surface_t *cs = cairo_xlib_surface_create(server.display, a->pix, server.visual, a->width, a->height);
-	cairo_t *c;
+	cairo_t *c = cairo_create(cs);
 
-	cs = cairo_xlib_surface_create (server.dsp, a->pix, server.visual, a->width, a->height);
+	draw_background(a, c);
-	c = cairo_create (cs);
-
-	draw_background (a, c);
 
 	if (a->_draw_foreground)
 		a->_draw_foreground(a, c);
 
-	cairo_destroy (c);
+	cairo_destroy(c);
-	cairo_surface_destroy (cs);
+	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 ||
+	if (a->bg->fill_color.alpha > 0.0 ||
-		(panel_config.mouse_effects && (a->mouse_over_effect || a->mouse_press_effect))) {
+		(panel_config.mouse_effects && (a->has_mouse_over_effect || a->has_mouse_press_effect))) {
-		//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);
 		if (a->mouse_state == MOUSE_OVER)
-			cairo_set_source_rgba(c, a->bg->back_hover.color[0], a->bg->back_hover.color[1], a->bg->back_hover.color[2], a->bg->back_hover.alpha);
+			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->back_pressed.color[0], a->bg->back_pressed.color[1], a->bg->back_pressed.color[2], a->bg->back_pressed.alpha);
+			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->back.color[0], a->bg->back.color[1], a->bg->back.color[2], a->bg->back.alpha);
+			cairo_set_source_rgba(c,
-		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);
+								  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) {
-		cairo_set_line_width (c, a->bg->border.width);
+		cairo_set_line_width(c, a->bg->border.width);
 
 		// draw border inside (x, y, width, height)
 		if (a->mouse_state == MOUSE_OVER)
-			cairo_set_source_rgba(c, a->bg->border_hover.color[0], a->bg->border_hover.color[1], a->bg->border_hover.color[2], a->bg->border_hover.alpha);
+			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_pressed.color[0], a->bg->border_pressed.color[1], a->bg->border_pressed.color[2], a->bg->border_pressed.alpha);
+			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[0], a->bg->border.color[1], a->bg->border.color[2], a->bg->border.alpha);
+			cairo_set_source_rgba(c,
-		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);
+								  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);
 
 		cairo_stroke(c);
 	}
 }
 
-
+void remove_area(Area *a)
-void remove_area (void *a)
 {
-	Area *area = (Area*)a;
+	Area *area = (Area *)a;
-	Area *parent = (Area*)area->parent;
+	Area *parent = (Area *)area->parent;
 
 	if (parent) {
 		parent->children = g_list_remove(parent->children, area);
-		parent->resize = 1;
+		parent->resize_needed = TRUE;
-		set_redraw(parent);
+		panel_refresh = TRUE;
+		schedule_redraw(parent);
 	}
 
 	if (mouse_over_area == a) {
@@ -491,68 +481,47 @@ void remove_area (void *a)
 	}
 }
 
-
+void add_area(Area *a, Area *parent)
-void add_area (Area *a)
 {
-	Area *parent = (Area*)a->parent;
+	g_assert_null(a->parent);
-
-	parent->children = g_list_append(parent->children, a);
-	set_redraw (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 (GList *l = a->children; l; l = l->next)
-	for (l0 = a->children; l0 ; l0 = l0->next)
+		free_area(l->data);
-		free_area (l0->data);
 
 	if (a->children) {
 		g_list_free(a->children);
-		a->children = 0;
+		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);
+		XFreePixmap(server.display, a->pix);
-		a->pix = 0;
+		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)
-{
-	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.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);
-}
-
 void mouse_over(Area *area, int pressed)
 {
 	if (mouse_over_area == area && !area)
@@ -561,11 +530,11 @@ void mouse_over(Area *area, int pressed)
 	MouseState new_state = MOUSE_NORMAL;
 	if (area) {
 		if (!pressed) {
-			new_state = area->mouse_over_effect ? MOUSE_OVER : MOUSE_NORMAL;
+			new_state = area->has_mouse_over_effect ? MOUSE_OVER : MOUSE_NORMAL;
 		} else {
-			new_state = area->mouse_press_effect
+			new_state = area->has_mouse_press_effect
 						? MOUSE_DOWN
-						: area->mouse_over_effect
+						: area->has_mouse_over_effect
 						  ? MOUSE_OVER
 						  : MOUSE_NORMAL;
 		}
@@ -579,8 +548,10 @@ void mouse_over(Area *area, int pressed)
 	mouse_over_area = area;
 
 	mouse_over_area->mouse_state = new_state;
-	set_redraw(mouse_over_area);
+	mouse_over_area->pix = mouse_over_area->pix_by_state[mouse_over_area->has_mouse_over_effect ? mouse_over_area->mouse_state : 0];
-	panel_refresh = 1;
+	if (!mouse_over_area->pix)
+		mouse_over_area->_redraw_needed = TRUE;
+	panel_refresh = TRUE;
 }
 
 void mouse_out()
@@ -588,12 +559,9 @@ void mouse_out()
 	if (!mouse_over_area)
 		return;
 	mouse_over_area->mouse_state = MOUSE_NORMAL;
-	set_redraw(mouse_over_area);
+	mouse_over_area->pix = mouse_over_area->pix_by_state[mouse_over_area->has_mouse_over_effect ? mouse_over_area->mouse_state : 0];
-	panel_refresh = 1;
+	if (!mouse_over_area->pix)
+		mouse_over_area->_redraw_needed = TRUE;
+	panel_refresh = TRUE;
 	mouse_over_area = NULL;
 }
-
-void init_background(Background *bg)
-{
-	memset(bg, 0, sizeof(Background));
-}

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,129 +11,264 @@
 #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
+typedef struct Color {
-{
+	// Values are in [0, 1], with 0 meaning no intensity.
-	double color[3];
+	double rgb[3];
-	double alpha;
+	// Values are in [0, 1], with 0 meaning fully transparent, 1 meaning fully opaque.
-	int width;
-	int rounded;
-} Border;
-
-
-typedef struct
-{
-	double color[3];
 	double alpha;
 } Color;
 
-typedef struct
+typedef struct Border {
-{
+	// It's essential that the first member is color
-	Color back;
+	Color color;
+	// Width in pixels
+	int width;
+	// Corner radius
+	int radius;
+} Border;
+
+typedef struct Background {
+	// Normal state
+	Color fill_color;
 	Border border;
-	Color back_hover;
+	// On mouse hover
-	Color border_hover;
+	Color fill_color_hover;
-	Color back_pressed;
+	Color border_color_hover;
-	Color border_pressed;
+	// 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
+typedef enum Alignment {
-// SIZE_BY_LAYOUT objects : taskbar and task
+	ALIGN_LEFT = 0,
-// SIZE_BY_CONTENT objects : clock, battery, launcher, systray
+	ALIGN_CENTER = 1,
-enum { SIZE_BY_LAYOUT, SIZE_BY_CONTENT };
+	ALIGN_RIGHT = 2,
-enum { ALIGN_LEFT = 0, ALIGN_CENTER = 1, ALIGN_RIGHT = 2 };
+} Alignment;
 
-typedef enum {
+typedef enum MouseState {
 	MOUSE_NORMAL = 0,
 	MOUSE_OVER = 1,
-	MOUSE_DOWN = 2
+	MOUSE_DOWN = 2,
+	MOUSE_STATE_COUNT
 } MouseState;
 
+struct Panel;
 
-typedef struct {
+typedef struct Area {
-	// coordinate relative to panel window
+	// 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 children, each one a pointer to Area
-	// list of child : Area object
 	GList *children;
-
+	// Pointer to the parent Area or NULL
-	// 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
 	void *parent;
-	// panel
+	// Pointer to the Panel that contains this Area
 	void *panel;
-
+	Layout size_mode;
-	int mouse_over_effect;
+	Alignment alignment;
-	int mouse_press_effect;
+	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.
+	// Called on resize, obj = pointer to the Area
-	int (*_resize)(void *obj);
+	// Returns 1 if the new size is different than the previous size.
-	// after pos/size changed, the rendering engine will call _on_change_layout(Area*)
+	gboolean (*_resize)(void *obj);
-	int on_changed;
+
+	// 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);
-	// returns allocated string, that must be free'd after usage
+
-	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);
 } Area;
 
+// Initializes the Background member to default values.
 void init_background(Background *bg);
 
-// on startup, initialize fixed pos/size
+// Layout
-void init_rendering(void *obj, int pos);
 
-void rendering(void *obj);
+// Called on startup to initialize the positions of all Areas in the Area tree.
-void size_by_content (Area *a);
+// Parameters:
-void size_by_layout (Area *a, int level);
+// * obj: pointer to Area
-// draw background and foreground
+// * offset: offset in pixels from left/top, relative to the window
-void refresh (Area *a);
+void initialize_positions(void *obj, int offset);
- 
-// generic resize for SIZE_BY_LAYOUT objects
-int resize_by_layout(void *obj, int maximum_size);
 
-// set 'redraw' on an area and childs
+// Relayouts the Area and its children. Normally called on the root of the tree (i.e. the Panel).
-void set_redraw (Area *a);
+void relayout(Area *a);
 
-// hide/unhide area
+// 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
+// Area tree
-void draw (Area *a);
-void draw_background (Area *a, cairo_t *c);
 
-void remove_area (void *a);
+void add_area(Area *a, Area *parent);
-void add_area (Area *a);
+void remove_area(Area *a);
-void free_area (Area *a);
+void free_area(Area *a);
 
-// draw rounded rectangle
+// Mouse move events
-void draw_rect(cairo_t *c, double x, double y, double w, double h, double r);
-
-// clear pixmap with transparent color
-void clear_pixmap(Pixmap p, int x, int y, int w, int h);
 
 void mouse_over(Area *area, int pressed);
 void mouse_out();
 
 #endif
-

src/util/common.c

@@ -32,72 +32,81 @@
 #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 <sys/resource.h>
+#include <errno.h>
+#include <sys/sysctl.h>
 
 #ifdef HAVE_RSVG
 #include <librsvg/rsvg.h>
 #endif
 
-
+void copy_file(const char *path_src, const char *path_dest)
-void copy_file(const char *pathSrc, const char *pathDest)
 {
-	if (g_str_equal(pathSrc, pathDest))
+	if (g_str_equal(path_src, path_dest))
 		return;
 
-	FILE *fileSrc, *fileDest;
+	FILE *file_src, *file_dest;
-	char buffer[100];
+	char buffer[4096];
-	int  nb;
+	int nb;
 
-	fileSrc = fopen(pathSrc, "rb");
+	file_src = fopen(path_src, "rb");
-	if (fileSrc == NULL) return;
+	if (file_src == NULL)
+		return;
 
-	fileDest = fopen(pathDest, "wb");
+	file_dest = fopen(path_dest, "wb");
-	if (fileDest == NULL) return;
+	if (file_dest == NULL) {
+		fclose(file_src);
+		return;
+	}
 
-	while ((nb = fread(buffer, 1, sizeof(buffer), fileSrc)) > 0) {
+	while ((nb = fread(buffer, 1, sizeof(buffer), file_src)) > 0) {
-		if ( nb != fwrite(buffer, 1, nb, fileDest)) {
+		if (nb != fwrite(buffer, 1, nb, file_dest)) {
-			printf("Error while copying file %s to %s\n", pathSrc, pathDest);
+			printf("Error while copying file %s to %s\n", path_src, path_dest);
 		}
 	}
 
-	fclose (fileDest);
+	fclose(file_dest);
-	fclose (fileSrc);
+	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 ((line[0] == '#') || (line[0] == '\n'))
-	if (!(a = strchr (line, '='))) return 0;
+		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;
+		if (fork() == 0) {
-		pid = fork();
-		if (pid == 0) {
 			// change for the fork the signal mask
-//			sigset_t sigset;
+			//			sigset_t sigset;
-//			sigprocmask(SIG_SETMASK, &sigset, 0);
+			//			sigprocmask(SIG_SETMASK, &sigset, 0);
-//			sigprocmask(SIG_UNBLOCK, &sigset, 0);
+			//			sigprocmask(SIG_UNBLOCK, &sigset, 0);
 			execl("/bin/sh", "/bin/sh", "-c", command, NULL);
 			_exit(0);
 		}
@@ -107,9 +116,7 @@ void tint_exec(const char *command)
 char *expand_tilde(char *s)
 {
 	const gchar *home = g_get_home_dir();
-	if (home &&
+	if (home && (strcmp(s, "~") == 0 || strstr(s, "~/") == s)) {
-		(strcmp(s, "~") == 0 ||
-		strstr(s, "~/") == s)) {
 		char *result = calloc(strlen(home) + strlen(s), 1);
 		strcat(result, home);
 		strcat(result, s + 1);
@@ -129,8 +136,7 @@ char *contract_tilde(char *s)
 	strcat(home_slash, home);
 	strcat(home_slash, "/");
 
-	if ((strcmp(s, home) == 0 ||
+	if ((strcmp(s, home) == 0 || strstr(s, home_slash) == s)) {
-		strstr(s, home_slash) == s)) {
 		char *result = calloc(strlen(s) - strlen(home) + 2, 1);
 		strcat(result, "~");
 		strcat(result, s + strlen(home));
@@ -142,98 +148,96 @@ 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';
+	if (c >= '0' && c <= '9')
-	else if (c >= 'a' && c <= 'f')  r = c - 'a' + 10;
+		r = c - '0';
-	else if (c >= 'A' && c <= 'F')  r = c - 'A' + 10;
+	else if (c >= 'a' && c <= 'f')
-	else  r = 0;
+		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);
+	int len = strlen(hex);
-
-	len = strlen (hex);
 	if (len == 3 + 1) {
-		*r = hex_char_to_int (hex[1]);
+		*r = hex_char_to_int(hex[1]);
-		*g = hex_char_to_int (hex[2]);
+		*g = hex_char_to_int(hex[2]);
-		*b = hex_char_to_int (hex[3]);
+		*b = hex_char_to_int(hex[3]);
-	}
+	} else if (len == 6 + 1) {
-	else if (len == 6 + 1) {
+		*r = hex_char_to_int(hex[1]) * 16 + hex_char_to_int(hex[2]);
-		*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]);
-		*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]);
-		*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]);
-	else if (len == 12 + 1) {
+		*g = hex_char_to_int(hex[5]) * 16 + hex_char_to_int(hex[6]);
-		*r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]);
+		*b = hex_char_to_int(hex[9]) * 16 + hex_char_to_int(hex[10]);
-		*g = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]);
+	} else
-		*b = hex_char_to_int (hex[9]) * 16 + hex_char_to_int (hex[10]);
+		return 0;
-	}
-	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 (*value1)
-	if (*value2) free (*value2);
+		free(*value1);
-	if (*value3) free (*value3);
+	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)
 {
 	unsigned int x, y;
@@ -244,21 +248,24 @@ void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright
 	float hue, saturation, brightness;
 	float redc, greenc, bluec;
 
-	for(y = 0; y < h; y++) {
+	for (y = 0; y < h; y++) {
-		for(id = y * w, x = 0; x < w; x++, id++) {
+		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;
+			if (a == 0)
+				continue;
 			r = (argb >> 16) & 0xff;
 			g = (argb >> 8) & 0xff;
-			b = (argb) & 0xff;
+			b = (argb)&0xff;
 
 			// convert RGB to HSB
 			cmax = (r > g) ? r : g;
-			if (b > cmax) cmax = b;
+			if (b > cmax)
+				cmax = b;
 			cmin = (r < g) ? r : g;
-			if (b < cmin) cmin = b;
+			if (b < cmin)
+				cmin = b;
 			brightness = ((float)cmax) / 255.0f;
 			if (cmax != 0)
 				saturation = ((float)(cmax - cmin)) / ((float)cmax);
@@ -283,13 +290,17 @@ void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright
 
 			// adjust
 			saturation += satur;
-			if (saturation < 0.0) saturation = 0.0;
+			if (saturation < 0.0)
-			if (saturation > 1.0) saturation = 1.0;
+				saturation = 0.0;
+			if (saturation > 1.0)
+				saturation = 1.0;
 			brightness += bright;
-			if (brightness < 0.0) brightness = 0.0;
+			if (brightness < 0.0)
-			if (brightness > 1.0) brightness = 1.0;
+				brightness = 0.0;
+			if (brightness > 1.0)
+				brightness = 1.0;
 			if (alpha != 100)
-				a = (a * alpha)/100;
+				a = (a * alpha) / 100;
 
 			// convert HSB to RGB
 			if (saturation == 0) {
@@ -300,7 +311,7 @@ void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright
 				p = brightness * (1.0f - saturation);
 				q = brightness * (1.0f - saturation * f);
 				t = brightness * (1.0f - (saturation * (1.0f - f)));
-				switch ((int) h2) {
+				switch ((int)h2) {
 				case 0:
 					r = (int)(brightness * 255.0f + 0.5f);
 					g = (int)(t * 255.0f + 0.5f);
@@ -343,34 +354,33 @@ void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright
 	}
 }
 
-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) )
+	if (max < (bottomLeft == topRight) + (bottomLeft == topLeft) + (bottomLeft == bottomRight))
-		maskPos = w*h-w;
+		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 *udata = (unsigned char *)data;
-	unsigned char b = udata[4*maskPos];
+	unsigned char b = udata[4 * maskPos];
-	unsigned char g = udata[4*maskPos+1];
+	unsigned char g = udata[4 * maskPos + 1];
-	unsigned char r = udata[4*maskPos+1];
+	unsigned char r = udata[4 * maskPos + 1];
-	int i;
+	for (int i = 0; i < h * w; ++i) {
-	for (i=0; i<h*w; ++i) {
+		if (b - udata[0] == 0 && g - udata[1] == 0 && r - udata[2] == 0)
-		if ( b-udata[0] == 0 && g-udata[1] == 0 && r-udata[2] == 0 )
 			udata[3] = 0;
 		udata += 4;
 	}
 }
 
-int pixelEmpty(DATA32 argb)
+int pixel_empty(DATA32 argb)
 {
 
 	DATA32 a = (argb >> 24) & 0xff;
@@ -381,29 +391,27 @@ int pixelEmpty(DATA32 argb)
 	return rgb == 0;
 }
 
-int imageEmpty(DATA32* data, int w, int h)
+int image_empty(DATA32 *data, int w, int h)
 {
-	unsigned int x, y;
-
 	if (w > 0 && h > 0) {
-		x = w / 2;
+		int x = w / 2;
-		y = h / 2;
+		int y = h / 2;
-		if (!pixelEmpty(data[y * w + x])) {
+		if (!pixel_empty(data[y * w + x])) {
-			//fprintf(stderr, "Non-empty pixel: [%u, %u] = %x\n", x, y, 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 (int y = 0; y < h; y++) {
-		for (x = 0; x < w; x++) {
+		for (int x = 0; x < w; x++) {
-			if (!pixelEmpty(data[y * w + x])) {
+			if (!pixel_empty(data[y * w + x])) {
-				//fprintf(stderr, "Non-empty pixel: [%u, %u] = %x\n", x, y, 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");
+	// fprintf(stderr, "All pixels are empty\n");
 	return 1;
 }
 
@@ -418,26 +426,26 @@ void render_image(Drawable d, int x, int y)
 
 	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 = XRenderCreatePicture(server.display, pixmap, XRenderFindStandardFormat(server.display, PictStandardARGB32), 0, 0);
-	Picture pict_drawable = XRenderCreatePicture(server.dsp, d, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
+	Picture pict_drawable = XRenderCreatePicture(server.display, d, XRenderFindVisualFormat(server.display, server.visual), 0, 0);
-	Picture pict_mask = XRenderCreatePicture(server.dsp, mask, XRenderFindStandardFormat(server.dsp, PictStandardARGB32), 0, 0);
+	Picture pict_mask =	XRenderCreatePicture(server.display, mask, XRenderFindStandardFormat(server.display, PictStandardARGB32), 0, 0);
-	XRenderComposite(server.dsp, PictOpOver, pict, pict_mask, pict_drawable, 0, 0, 0, 0, x, y, w, h);
+	XRenderComposite(server.display, PictOpOver, pict, pict_mask, pict_drawable, 0, 0, 0, 0, x, y, w, h);
 
-	XRenderFreePicture(server.dsp, pict_mask);
+	XRenderFreePicture(server.display, pict_mask);
-	XRenderFreePicture(server.dsp, pict_drawable);
+	XRenderFreePicture(server.display, pict_drawable);
-	XRenderFreePicture(server.dsp, pict);
+	XRenderFreePicture(server.display, pict);
-	XFreePixmap(server.dsp, mask);
+	XFreePixmap(server.display, mask);
-	XFreePixmap(server.dsp, pixmap);
+	XFreePixmap(server.display, pixmap);
 }
 
 void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, int font_shadow)
@@ -448,17 +456,23 @@ 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);
+	cairo_set_source_rgba(c, color->rgb[0], color->rgb[1], color->rgb[2], color->alpha);
-	pango_cairo_update_layout (c, layout);
+	pango_cairo_update_layout(c, layout);
-	cairo_move_to (c, posx, posy);
+	cairo_move_to(c, posx, posy);
-	pango_cairo_show_layout (c, layout);
+	pango_cairo_show_layout(c, layout);
 }
 
 Imlib_Image load_image(const char *path, int cached)
@@ -477,8 +491,8 @@ Imlib_Image load_image(const char *path, int cached)
 		pid_t pid = fork();
 		if (pid == 0) {
 			// Child
-			GError* err = NULL;
+			GError *err = NULL;
-			RsvgHandle* svg = rsvg_handle_new_from_file(path, &err);
+			RsvgHandle *svg = rsvg_handle_new_from_file(path, &err);
 
 			if (err != NULL) {
 				fprintf(stderr, "Could not load svg image!: %s", err->message);
@@ -519,8 +533,206 @@ Imlib_Image adjust_icon(Imlib_Image original, int alpha, int saturation, int bri
 
 	imlib_context_set_image(copy);
 	imlib_image_set_has_alpha(1);
-	DATA32* data = imlib_image_get_data();
+	DATA32 *data = imlib_image_get_data();
-	adjust_asb(data, imlib_image_get_width(), imlib_image_get_height(), alpha, (float)saturation/100, (float)brightness/100);
+	adjust_asb(data,
+			   imlib_image_get_width(),
+			   imlib_image_get_height(),
+			   alpha,
+			   (float)saturation / 100,
+			   (float)brightness / 100);
 	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
+
+// Based loosely on close_allv from
+// https://git.gnome.org/browse/glib/tree/gio/libasyncns/asyncns.c?h=2.21.0#n205
+// license: LGPL version 2.1
+// but with all the junk removed
+// and
+// https://opensource.apple.com/source/sudo/sudo-46/src/closefrom.c
+// license: BSD
+void close_all_fds()
+{
+	const int from_fd = 3;
+
+#ifdef __linux__
+	DIR *d = opendir("/proc/self/fd");
+	if (d) {
+		for (struct dirent *de = readdir(d); de; de = readdir(d)) {
+			if (de->d_name[0] == '.')
+				continue;
+			int fd = atoi(de->d_name);
+			if (fd < from_fd)
+				continue;
+			if (fd == dirfd(d))
+				continue;
+			close(fd);
+		}
+		closedir(d);
+		return;
+	}
+#endif
+
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+	closefrom(from_fd);
+	return;
+#endif
+
+#if defined(__NetBSD__)
+	fcntl(from_fd, F_CLOSEM, 0);
+#endif
+
+	// Worst case scenario: iterate over all possible fds
+	int max_fd = sysconf(_SC_OPEN_MAX);
+	for (int fd = from_fd; fd < max_fd; fd++) {
+		close(fd);
+	}
+
+	return;
+}
+
+char* get_own_path()
+{
+	const int buf_size = 4096;
+	char *buf = calloc(buf_size, 1);
+
+#ifdef __linux__
+	if (readlink("/proc/self/exe", buf, buf_size) > 0)
+		return buf;
+#endif
+
+#if defined(__FreeBSD__)
+	int mib[4] = {
+		CTL_KERN,
+		KERN_PROC,
+		KERN_PROC_PATHNAME,
+		getpid()
+	};
+
+	size_t max_len = buf_size;
+	if (sysctl(mib, 4, buf, &max_len, NULL, 0) == 0)
+		return buf;
+#endif
+
+#if defined(__DragonFly__)
+	if (readlink("/proc/curproc/file", buf, buf_size) > 0)
+		return buf;
+#endif
+
+#if defined(__NetBSD__)
+	if (readlink("/proc/curproc/exe", buf, buf_size) > 0)
+		return buf;
+#endif
+
+#if defined(__OpenBSD__)
+	int mib[4] = {
+		CTL_KERN,
+		KERN_PROC_ARGS,
+		getpid(),
+		KERN_PROC_ARGV
+	};
+
+	char *path = NULL;
+	size_t len;
+	if (sysctl(mib, 4, NULL, &len, NULL, 0) == 0 && len > 0) {
+		char **argv = malloc(len);
+		if (argv) {
+			if (sysctl(mib, 4, argv, &len, NULL, 0) == 0) {
+				path = realpath(argv[0], NULL);
+			}
+		}
+		free(argv);
+	}
+	if (path) {
+		free(buf);
+		return path;
+	}
+#endif
+
+	sprintf(buf, "tint2");
+	return buf;
+}

src/util/common.h

@@ -6,7 +6,7 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-#define WM_CLASS_TINT   "panel"
+#define WM_CLASS_TINT "panel"
 
 #include <Imlib2.h>
 #include <pango/pangocairo.h>
@@ -14,69 +14,102 @@
 
 #define GREEN  "\033[1;32m"
 #define YELLOW "\033[1;33m"
-#define RED    "\033[31m"
+#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;
-  }
-*/
-
 // 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
+// Parses lines with the format 'key = value' into key and value.
-void copy_file(const char *pathSrc, const char *pathDest);
+// 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
+void extract_values(const char *value, char **value1, char **value2, char **value3);
-int parse_line (const char *line, char **key, char **value);
 
-// execute a command by calling fork
+// Executes a command in a shell.
-void tint_exec(const char* command);
+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.
+// The caller takes ownership of the string.
 char *expand_tilde(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.
+// The caller takes ownership of the string.
 char *contract_tilde(char *s);
 
-// conversion
+// Color
-int hex_char_to_int (char c);
+int hex_char_to_int(char c);
-int hex_to_rgb (char *hex, int *r, int *g, int *b);
+int hex_to_rgb(char *hex, int *r, int *g, int *b);
-void get_color (char *hex, double *rgb);
+void get_color(char *hex, double *rgb);
-
-void extract_values (const char *value, char **value1, char **value2, char **value3);
-
-// 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);
-
-void render_image(Drawable d, int x, int y);
-
-void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, int font_shadow);
 
 Imlib_Image load_image(const char *path, int cached);
 
+// Adjusts the alpha/saturation/brightness on an ARGB image.
+// Parameters: 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);
 Imlib_Image adjust_icon(Imlib_Image original, int alpha, int saturation, int brightness);
 
+void create_heuristic_mask(DATA32 *data, int w, int h);
+
+int image_empty(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);
+
+#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
+
+void close_all_fds();
+
+char* get_own_path();
+
+#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,129 @@
 
 #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
+static inline int nat_isdigit(nat_char a)
-nat_isdigit(nat_char a)
 {
-     return isdigit((unsigned char) a);
+	return isdigit((unsigned char)a);
 }
 
-
+static inline int nat_isspace(nat_char a)
-static inline int
-nat_isspace(nat_char a)
 {
-     return isspace((unsigned char) a);
+	return isspace((unsigned char)a);
 }
 
-
+static inline nat_char nat_toupper(nat_char a)
-static inline nat_char
-nat_toupper(nat_char a)
 {
-     return toupper((unsigned char) a);
+	return toupper((unsigned char)a);
 }
 
-
+static int compare_right(nat_char const *a, nat_char const *b)
-
-static int
-compare_right(nat_char const *a, nat_char const *b)
 {
-     int bias = 0;
+	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;
+	/* 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;
 }
 
-
+static int compare_left(nat_char const *a, nat_char const *b)
-static int
-compare_left(nat_char const *a, nat_char const *b)
 {
-     /* Compare two left-aligned numbers: the first to have a
+	/* Compare two left-aligned numbers: the first to have a different value wins. */
-        different value wins. */
+	for (;; a++, b++) {
-     for (;; a++, b++) {
+		if (!nat_isdigit(*a) && !nat_isdigit(*b))
-	  if (!nat_isdigit(*a)  &&  !nat_isdigit(*b))
+			return 0;
-	       return 0;
+		else if (!nat_isdigit(*a))
-	  else if (!nat_isdigit(*a))
+			return -1;
-	       return -1;
+		else if (!nat_isdigit(*b))
-	  else if (!nat_isdigit(*b))
+			return +1;
-	       return +1;
+		else if (*a < *b)
-	  else if (*a < *b)
+			return -1;
-	       return -1;
+		else if (*a > *b)
-	  else if (*a > *b)
+			return +1;
-	       return +1;
+	}
-     }
-	  
-     return 0;
-}
 
+	return 0;
+}
 
 static int strnatcmp0(nat_char const *a, nat_char const *b, int fold_case)
 {
-     int ai, bi;
+	int ai, bi;
-     nat_char ca, cb;
+	nat_char ca, cb;
-     int fractional, result;
+	int fractional, result;
-     
-     assert(a && b);
-     ai = bi = 0;
-     while (1) {
-	  ca = a[ai]; cb = b[bi];
 
-	  /* skip over leading spaces or zeros */
+	assert(a && b);
-	  while (nat_isspace(ca))
+	ai = bi = 0;
-	       ca = a[++ai];
+	while (1) {
+		ca = a[ai];
+		cb = b[bi];
 
-	  while (nat_isspace(cb))
+		/* skip over leading spaces or zeros */
-	       cb = b[++bi];
+		while (nat_isspace(ca))
+			ca = a[++ai];
 
-	  /* process run of digits */
+		while (nat_isspace(cb))
-	  if (nat_isdigit(ca)  &&  nat_isdigit(cb)) {
+			cb = b[++bi];
-	       fractional = (ca == '0' || cb == '0');
 
-	       if (fractional) {
+		/* process run of digits */
-		    if ((result = compare_left(a+ai, b+bi)) != 0)
+		if (nat_isdigit(ca) && nat_isdigit(cb)) {
-			 return result;
+			fractional = (ca == '0' || cb == '0');
-	       } else {
-		    if ((result = compare_right(a+ai, b+bi)) != 0)
-			 return result;
-	       }
-	  }
 
-	  if (!ca && !cb) {
+			if (fractional) {
-	       /* The strings compare the same.  Perhaps the caller
+				if ((result = compare_left(a + ai, b + bi)) != 0)
-                  will want to call strcmp to break the tie. */
+					return result;
-	       return 0;
+			} else {
-	  }
+				if ((result = compare_right(a + ai, b + bi)) != 0)
+					return result;
+			}
+		}
 
-	  if (fold_case) {
+		if (!ca && !cb) {
-	       ca = nat_toupper(ca);
+			/* The strings compare the same.  Perhaps the caller will want to call strcmp to break the tie. */
-	       cb = nat_toupper(cb);
+			return 0;
-	  }
+		}
-	  
-	  if (ca < cb)
-	       return -1;
-	  else if (ca > cb)
-	       return +1;
 
-	  ++ai; ++bi;
+		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)
-
+{
-int strnatcmp(nat_char const *a, nat_char const *b) {
+	return strnatcmp0(a, b, 0);
-     return strnatcmp0(a, b, 0);
 }
 
-
 /* Compare, recognizing numeric string and ignoring case. */
-int strnatcasecmp(nat_char const *a, nat_char const *b) {
+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,7 +20,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-
 /* CUSTOMIZATION SECTION
  *
  * You can change this typedef, but must then also change the inline

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;
+	GSList *timeout_list;
-	timeout* parent_timeout;
+	timeout *parent_timeout;
 } multi_timeout_handler;
 
 struct _timeout {
 	int interval_msec;
 	struct timespec timeout_expires;
-	void (*_callback)(void*);
+	void (*_callback)(void *);
-	void* arg;
+	void *arg;
-	multi_timeout* multi_timeout;
+	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);
-int align_with_existing_timeouts(timeout* t);
+void create_multi_timeout(timeout *t1, timeout *t2);
-void create_multi_timeout(timeout* t1, timeout* t2);
+void append_multi_timeout(timeout *t1, timeout *t2);
-void append_multi_timeout(timeout* t1, timeout* t2);
+int calc_multi_timeout_interval(multi_timeout_handler *mth);
-int calc_multi_timeout_interval(multi_timeout_handler* mth);
+void update_multi_timeout_values(multi_timeout_handler *mth);
-void update_multi_timeout_values(multi_timeout_handler* mth);
+void callback_multi_timeout(void *mth);
-void callback_multi_timeout(void* mth);
+void remove_from_multi_timeout(timeout *t);
-void remove_from_multi_timeout(timeout* t);
+void stop_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
+// Implementation notes for timeouts
-	* expiration time.
+//
-	* That means that update_next_timeout() only have to consider the first timeout in the list,
+// The timeouts are kept in a GSList sorted by their expiration time.
-	* and callback_timeout_expired() only have to consider the timeouts as long as the expiration time
+// That means that update_next_timeout() only have to consider the first timeout in the list,
-	* is in the past to the current time.
+// and callback_timeout_expired() only have to consider the timeouts as long as the expiration time
-	* As time measurement we use clock_gettime(CLOCK_MONOTONIC) because this refers to a timer, which
+// is in the past to the current time.
-	* reference point lies somewhere in the past and cannot be changed, but just queried.
+// As time measurement we use clock_gettime(CLOCK_MONOTONIC) because this refers to a timer, which
-	* If a single shot timer is installed it will be automatically deleted. I.e. the returned value
+// reference point lies somewhere in the past and cannot be changed, but just queried.
-	* of add_timeout will not be valid anymore. You do not need to call stop_timeout for these timeouts,
+// If a single shot timer is installed it will be automatically deleted. I.e. the returned value
-	* however it's save to call it.
+// 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)) ||
+	if ((timeout_list && g_slist_find(timeout_list, t)) || (multi_timeouts && g_hash_table_lookup(multi_timeouts, 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,
+  return compare_timespecs(&((const timeout *)t1)->timeout_expires, &((const timeout *)t2)->timeout_expires);
-							 &((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;
+	ts.tv_nsec += (msec % 1000) * 1000000;
-	if (ts.tv_nsec >= 1000000000) {  // 10^9
+	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;
+	GSList *it = mth->timeout_list;
-	timeout* t = it->data;
+	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 *mt1 = calloc(1, sizeof(multi_timeout));
-	multi_timeout* mt2 = calloc(1, sizeof(multi_timeout));
+	multi_timeout *mt2 = calloc(1, sizeof(multi_timeout));
-	multi_timeout_handler* mth = calloc(1, sizeof(multi_timeout_handler));
+	multi_timeout_handler *mth = calloc(1, sizeof(multi_timeout_handler));
-	timeout* real_timeout = calloc(1, sizeof(timeout));
+	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 *mt = calloc(1, sizeof(multi_timeout));
-	multi_timeout_handler* mth = g_hash_table_lookup(multi_timeouts, t1);
+	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 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 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;
+		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);
+		add_timeout_intern(msec_to_expiration,
-	}
+						   last_timeout->interval_msec,
-	else
+						   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;
 
-
+// Initializes default global data.
-// 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. **/
 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
+// 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).
+// 'interval_msec' (set it to 0 to prevent periodic timeouts).
-  * '_callback' is the function called when the timer reaches the timeout.
+// '_callback' is the function called when the timer reaches the timeout.
-  * 'arg' is the argument passed to the callback function.
+// '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
+// '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).
+// 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.
+// 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);
-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'. **/
+// 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);
+void change_timeout(timeout **t, int value_msec, int interval_msec, void (*_callback)(void *), void *arg);
 
-/** stops the timeout 't' **/
+// Stops the timer 't'
-void stop_timeout(timeout* 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 **/
+// Returns -1 if t1 < t2, 0 if t1 == t2, 1 if t1 > t2
-gint compare_timespecs(const struct timespec* t1, const struct timespec* 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.
+// Returns the time difference in seconds between the current time and the last time this function was called.
-  * At the first call returns zero.
+// At the first call returns zero.
-**/
 double profiling_get_time();
 
+double get_time();
+
 #endif // TIMER_H

src/util/uevent.c

@@ -36,8 +36,9 @@ 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) {
+static const char *has_prefix(const char *str, const char *end, const char *prefix, size_t prefixlen)
-	if ((end-str) < prefixlen)
+{
+	if ((end - str) < prefixlen)
 		return NULL;
 
 	if (!memcmp(str, prefix, prefixlen))
@@ -46,38 +47,40 @@ static const char* has_prefix(const char *str, const char *end, const char *pref
 	return NULL;
 }
 
-#define HAS_CONST_PREFIX(str,end,prefix)  has_prefix((str),end,prefix,sizeof(prefix)-1)
+#define HAS_CONST_PREFIX(str, end, prefix) has_prefix((str), end, prefix, sizeof(prefix) - 1)
 
-static void uevent_param_free(gpointer data) {
+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) {
+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) {
+static struct uevent *uevent_new(char *buffer, int size)
-	struct uevent *ev;
+{
-	const char* s = buffer;
-	const char* end = s + size;
 	gboolean first = TRUE;
 
 	if (size == 0)
 		return NULL;
 
-	ev = calloc(1, sizeof(*ev));
+	struct uevent *ev = calloc(1, sizeof(*ev));
 	if (!ev)
 		return NULL;
 
 	/* ensure nul termination required by strlen() */
-	buffer[size-1] = '\0';
+	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, '@');
@@ -87,10 +90,10 @@ static struct uevent *uevent_new(char *buffer, int size) {
 				free(ev);
 				return NULL;
 			}
-			ev->path = strdup(p+1);
+			ev->path = strdup(p + 1);
 			first = FALSE;
 		} else {
-			const char* val;
+			const char *val;
 			if ((val = HAS_CONST_PREFIX(s, end, "ACTION=")) != NULL) {
 				if (!strcmp(val, "add"))
 					ev->action = UEVENT_ADD;
@@ -109,8 +112,8 @@ static struct uevent *uevent_new(char *buffer, int size) {
 				if (val) {
 					struct uevent_parameter *param = malloc(sizeof(*param));
 					if (param) {
-						param->key = strndup(s, val-s);
+						param->key = strndup(s, val - s);
-						param->val = strdup(val+1);
+						param->val = strdup(val + 1);
 						ev->params = g_list_append(ev->params, param);
 					}
 				}
@@ -121,11 +124,13 @@ static struct uevent *uevent_new(char *buffer, int size) {
 	return ev;
 }
 
-void uevent_register_notifier(struct uevent_notify *nb) {
+void uevent_register_notifier(struct uevent_notify *nb)
+{
 	notifiers = g_list_append(notifiers, nb);
 }
 
-void uevent_unregister_notifier(struct uevent_notify *nb) {
+void uevent_unregister_notifier(struct uevent_notify *nb)
+{
 	GList *l = notifiers;
 
 	while (l != NULL) {
@@ -139,21 +144,19 @@ void uevent_unregister_notifier(struct uevent_notify *nb) {
 	}
 }
 
-void uevent_handler() {
+void uevent_handler()
-	struct uevent *ev;
+{
-	char buf[512];
-	GList *l;
-
 	if (ueventfd < 0)
 		return;
 
+	char buf[512];
 	int len = recv(ueventfd, buf, sizeof(buf), MSG_DONTWAIT);
 	if (len < 0)
 		return;
 
-	ev = uevent_new(buf, len);
+	struct uevent *ev = uevent_new(buf, len);
 	if (ev) {
-		for (l = notifiers; l != NULL; l = l->next) {
+		for (GList *l = notifiers; l; l = l->next) {
 			struct uevent_notify *nb = l->data;
 
 			if (!(ev->action & nb->action))
@@ -169,9 +172,10 @@ void uevent_handler() {
 	}
 }
 
-int uevent_init() {
+int uevent_init()
+{
 	/* Open hotplug event netlink socket */
-	memset(&nls,0,sizeof(struct sockaddr_nl));
+	memset(&nls, 0, sizeof(struct sockaddr_nl));
 	nls.nl_family = AF_NETLINK;
 	nls.nl_pid = getpid();
 	nls.nl_groups = -1;
@@ -194,7 +198,8 @@ int uevent_init() {
 	return ueventfd;
 }
 
-void uevent_cleanup() {
+void uevent_cleanup()
+{
 	if (ueventfd >= 0)
 		close(ueventfd);
 }

src/util/window.c

@@ -35,247 +35,241 @@
 #include "panel.h"
 #include "taskbar.h"
 
-
+void activate_window(Window win)
-
-void set_active (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 change_window_desktop(Window win, int desktop)
-void set_desktop (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 close_window(Window win)
-void windows_set_desktop (Window win, int desktop)
 {
-	send_event32 (win, server.atom._NET_WM_DESKTOP, desktop, 2, 0);
+	send_event32(win, server.atom._NET_CLOSE_WINDOW, 0, 2, 0);
 }
 
-
+void toggle_window_shade(Window win)
-void set_close (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 toggle_window_maximized(Window win)
-void window_toggle_shade (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);
 }
 
-
+gboolean window_is_hidden(Window win)
-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)
 {
 	Window window;
-	Atom *at;
+	int count;
-	int count, i;
 
-	at = server_get_property (win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+	Atom *at = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
-	for (i = 0; i < count; i++) {
+	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;
+		window = win;
-		while ( XGetTransientForHint(server.dsp, window, &window) ) {
+		while (XGetTransientForHint(server.display, window, &window)) {
-			if ( task_get_tasks(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);
+	at = server_get_property(win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, &count);
-	for (i = 0; i < count; i++) {
+	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) {
+		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++) {
+	for (int i = 0; i < num_panels; i++) {
-		if (panel1[i].main_win == win) {
+		if (panels[i].main_win == win) {
-			return 1;
+			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 get_window_desktop(Window win)
-int window_get_desktop (Window win)
 {
-	return get_property32(win, server.atom._NET_WM_DESKTOP, XA_CARDINAL);
+	if (!server.viewports)
+		return get_property32(win, server.atom._NET_WM_DESKTOP, XA_CARDINAL);
+
+	int x, y, w, h;
+	get_window_coordinates(win, &x, &y, &w, &h);
+
+	int desktop = MIN(get_current_desktop(), server.num_desktops - 1);
+	// Window coordinates are relative to the current viewport, make them absolute
+	x += server.viewports[desktop].x;
+	y += server.viewports[desktop].y;
+
+	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;
+	}
+
+	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;
 }
 
-
+int get_window_monitor(Window win)
-int window_get_monitor (Window win)
 {
-	int i, x, y;
+	int x, y, w, h;
-	Window src;
+	get_window_coordinates(win, &x, &y, &w, &h);
 
-	XTranslateCoordinates(server.dsp, win, server.root_win, 0, 0, &x, &y, &src);
 	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 (i = 0; i < server.nb_monitor; i++) {
+	for (int i = 0; i < server.num_monitors; i++) {
-		if (x >= server.monitor[i].x && x <= (server.monitor[i].x + server.monitor[i].width))
+		if (x >= server.monitors[i].x && x <= (server.monitors[i].x + server.monitors[i].width) &&
-			if (y >= server.monitor[i].y && y <= (server.monitor[i].y + server.monitor[i].height)) {
+			y >= server.monitors[i].y && y <= (server.monitors[i].y + server.monitors[i].height)) {
-				int current_right = x < (server.monitor[i].x + server.monitor[i].width);
+			int current_right = x < (server.monitors[i].x + server.monitors[i].width);
-				int current_bottom = y < (server.monitor[i].y + server.monitor[i].height);
+			int current_bottom = y < (server.monitors[i].y + server.monitors[i].height);
-				if (best_match < 0 ||
+			if (best_match < 0 || (!match_right && current_right) || (!match_bottom && current_bottom)) {
-					(!match_right && current_right) ||
+				best_match = i;
-					(!match_bottom && current_bottom)) {
-					best_match = i;
-				}
 			}
+		}
 	}
 
 	if (best_match < 0)
 		best_match = 0;
-	// printf("window %lx : ecran %d, (%d, %d)\n", win, best_match+1, x, y);
+	//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 window_get_coordinates (Window win, int *x, int *y, int *w, int *h)
+void get_window_coordinates(Window win, int *x, int *y, int *w, int *h)
 {
 	int dummy_int;
 	unsigned ww, wh, bw, bh;
- 	Window src;
+	Window src;
- 	XTranslateCoordinates(server.dsp, win, server.root_win, 0, 0, x, y, &src);
+	XTranslateCoordinates(server.display, win, server.root_win, 0, 0, x, y, &src);
-	XGetGeometry(server.dsp, win, &src, &dummy_int, &dummy_int, &ww, &wh, &bw, &bh);
+	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;
-	int count, i;
+	Atom *at = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
-	at = server_get_property (win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+	for (int i = 0; i < count; i++) {
-	for (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;
 }
 
-
+gboolean window_is_urgent(Window win)
-int window_is_urgent (Window win)
 {
-	Atom *at;
+	int count;
-	int count, i;
 
-	at = server_get_property (win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+	Atom *at = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
-	for (i = 0; i < count; i++) {
+	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;
 }
 
-
+gboolean window_is_skip_taskbar(Window win)
-int window_is_skip_taskbar (Window win)
 {
-	Atom *at;
+	int count;
-	int count, i;
 
-	at = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
+	Atom *at = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
-	for (i=0; i<count; i++) {
+	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;
 }
 
-
+Window get_active_window()
-
-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 ()
 {
 	return get_property32(server.root_win, server.atom._NET_ACTIVE_WINDOW, XA_WINDOW);
 }
 
-
+gboolean window_is_active(Window win)
-int 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];
@@ -286,7 +280,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;
@@ -309,8 +304,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;
+				icon_num = i;
-					highest = width[i];
+				highest = width[i];
 			}
 		}
 	}
@@ -319,44 +314,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_size2(PangoFontDescription *font,
-					int *height_ink,
-					int *height,
-					int *width,
-					int panel_height,
-					int panel_width,
-					char *text,
-					int len,
-					PangoWrapMode wrap,
-					PangoEllipsizeMode ellipsis)
-{
-	PangoRectangle rect_ink, rect;
-
-	Pixmap pmap = XCreatePixmap (server.dsp, server.root_win, panel_height, panel_width, server.depth);
-
-	cairo_surface_t *cs = cairo_xlib_surface_create (server.dsp, 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);
-	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,38 +11,26 @@
 
 #include <glib.h>
 #include <pango/pangocairo.h>
+#include <X11/Xlib.h>
 
+Window get_active_window();
 
-void set_active (Window win);
+gboolean window_is_iconified(Window win);
-void set_desktop (int desktop);
+gboolean window_is_urgent(Window win);
-void set_close (Window win);
+gboolean window_is_hidden(Window win);
-int server_get_current_desktop ();
+gboolean window_is_active(Window win);
-GSList *server_get_name_of_desktop ();
+gboolean window_is_skip_taskbar(Window win);
-void window_get_coordinates (Window win, int *x, int *y, int *w, int *h);
+int get_window_desktop(Window win);
-int window_is_iconified (Window win);
+int get_window_monitor(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 ();
 
-void get_text_size2(PangoFontDescription *font,
+void activate_window(Window win);
-					int *height_ink,
+void close_window(Window win);
-					int *height,
+void get_window_coordinates(Window win, int *x, int *y, int *w, int *h);
-					int *width,
+void toggle_window_maximized(Window win);
-					int panel_height,
+void toggle_window_shade(Window win);
-					int panel_with,
+void change_window_desktop(Window win, int desktop);
-					char *text,
-					int len,
-					PangoWrapMode wrap,
-					PangoEllipsizeMode ellipsis);
 
+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

tint2.files

@@ -160,3 +160,11 @@ src/battery/linux.c
 src/battery/openbsd.c
 src/util/uevent.c
 src/util/uevent.h
+.clang-format
+src/execplugin/execplugin.c
+src/execplugin/execplugin.h
+src/tint2conf/po/bs.po
+src/tint2conf/po/fr.po
+src/tint2conf/po/hr.po
+src/tint2conf/po/pl.po
+src/tint2conf/po/sr.po

tint2.includes

@@ -20,3 +20,4 @@
 po
 src/tint2conf/po
 src/freespace
+src/execplugin