Updated for 0.12.2

fix battery option parsing
Fix copy&paste mistake, battery should be enabled for obsolete "battery" option instead of obsolete "systray" option.
2015-08-11 09:26:49 +02:00 · 2015-08-07 10:24:20 +02:00 · 2015-08-07 10:23:49 +02:00 · 2015-08-07 10:23:44 +02:00 · 2015-08-07 10:23:36 +02:00 · 2015-08-07 10:23:25 +02:00
59 changed files with 10684 additions and 6111 deletions
--- a/4
+++ b/4
@@ -6,6 +6,7 @@ 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

 tint2 is based on ttm source code (http://code.google.com/p/ttm/)
 - 2007-2008 Pål Staurland <staura@gmail.com>
@@ -22,5 +23,4 @@ Contributors:
  Marcelo Vianna : taskbar sorting
  Xico Atelo : startup notifications
  Craig Oakes : WM flags, issue tracker organization
-
-
+  Jeff Blake (https://gitlab.com/u/berkley4) : more mouse event handlers
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required( VERSION 2.6 )

 option( ENABLE_BATTERY "Enable battery status plugin" ON )
 option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme configurator for tint2" ON )
-option( ENABLE_EXAMPLES "Install additional tin2rc examples" OFF )
+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 )
@@ -23,7 +23,7 @@ pkg_check_modules( SN libstartup-notification-1.0>=0.12 )
 find_library( RT_LIBRARY rt )

 if( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )
-  message( FATAL_ERROR "Not all dependencies fulfilled. See https://code.google.com/p/tint2/wiki/Install" )
+  message( FATAL_ERROR "Not all dependencies fulfilled. See https://gitlab.com/o9000/tint2/wikis/Install" )
 endif( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )

 string( REPLACE ";" " " FLAGS_REPLACED "${IMLIB2_LDFLAGS}" )
@@ -33,6 +33,8 @@ if( NOT IMLIB_BUILD_WITH_X )
  message( FATAL_ERROR "Imlib is not built with X support" )
 endif( NOT IMLIB_BUILD_WITH_X )

+add_definitions( -D_GNU_SOURCE )
+
 include_directories( ${PROJECT_BINARY_DIR}
                     src
                     src/battery
@@ -42,7 +44,7 @@ include_directories( ${PROJECT_BINARY_DIR}
                     src/launcher
                     src/tooltip
                     src/util
-					 src/freespace
+                     src/freespace
                     ${X11_INCLUDE_DIRS}
                     ${PANGOCAIRO_INCLUDE_DIRS}
                     ${PANGO_INCLUDE_DIRS}
@@ -68,8 +70,8 @@ set( SOURCES src/config.c
             src/taskbar/taskbar.c
             src/taskbar/taskbarname.c
             src/tooltip/tooltip.c
-			 src/freespace/freespace.c
-			 src/util/area.c
+             src/freespace/freespace.c
+             src/util/area.c
             src/util/common.c
             src/util/strnatcmp.c
             src/util/timer.c
@@ -156,5 +158,5 @@ install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
 install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
 if( ENABLE_EXAMPLES )
  file( GLOB SAMPLEFILES sample/*.tint2rc )
-  install( FILES ${SAMPLEFILES} DESTINATION ${DOCDIR}/examples )
+  install( FILES ${SAMPLEFILES} DESTINATION ${DATADIR}/tint2 )
 endif( ENABLE_EXAMPLES )
--- a/35
+++ b/35
@@ -1,8 +1,33 @@
-2015-05-23 master
+2015-08-11 0.12.2
+- Fixes:
+  - Systray: do not move empty icons to the side, as it breaks GTK2 StatusIcon blinking (issue #515)
+  - tint2conf: Fix read of panel_monitor (issue #520)
+  - Fix command line argument processing (issue #516)
+  - Fix battery option parsing
+2015-08-01 0.12.1
+- Fixes:
+  - Config:
+	- Read config correctly when panel_items is at the end of the config file (issue #511)
+  - Panel:
+	- Do not use nested event loops (related: issue #509)
+  - System tray:
+	- Set _NET_SYSTEM_TRAY_ICON_SIZE and _NET_SYSTEM_TRAY_PADDING
+	- Throttle repeated resizes (workaround for issue #509)
+  - Taskbar:
+	- Use consistent visibility for sticky (all desktop) windows (related: issue #279)
+	- Compute monitor correctly for windows when Openbox animations are enabled (issue #511)
+  - tint2conf:
+	- Bad read of option panel_margin
+- New config options:
+  - Battery mouse actions and clock middle click and wheel actions (thanks to Jeff Blake)
+2015-07-12 0.12
 - Note: the changes listed here are based on the previous release tint2 0.11, however some distributions (e.g. Debian)
  offered packages using newer commits and/or patches; thus from the user's perspective some of these features are
  already present. They are marked with '(already released by distros)'.
 - Major changes:
+  - Panel:
+  - Checks if a compositor is launched during the first 30 seconds after startup and if found, restarts the panel with
+    transparency enabled.
  - Launcher:
    - The launcher is now considered stable
    - Enhancement: SVG icon support
@@ -27,7 +52,7 @@
    - taskbar_hide_inactive_tasks
    - taskbar_sort_order
    - taskbar_name (already released by distros)
-	- task_align (already released by distros)
+    - task_align (already released by distros)
  - Launcher:
    - launcher* (already released by distros)
    - launcher_apps_dir (previously patched in by some distros)
@@ -70,6 +95,7 @@
    background of other icons;
  - a crash caused by a change that prevents Google Chrome (and possibly other misbehaving applications) from leaving a large
    number of empty icons in the system tray;
+  - a crash caused by the system tray code on computers with ATI cards;
  - the panel window had a shadow;
  - some ATI drivers return an extra monitor with size zero which should be ignored when using panel_monitor = all;
  - the battery applet was sometimes working incorrectly with certain laptop models (the battery applet stopped updating after
@@ -79,7 +105,10 @@
    application was started;
  - seconds were not updating in the clock;
  - tint2 hang triggered when an application started from the launcher was closed and startup notifications were enabled;
-  - the code that loads SVG icons was using a lot of memory.
+  - tint2 may fail to process X events for a few seconds when a new icon is added to the system tray;
+  - the code that loads SVG icons was using a lot of memory;
+  - fixed occasional race at startup in detecting screen resolution changes;
+  - modified timer code to prevent some rare double-frees or duplicate timers.

 2010-06-26
 - unhide tint2 panel when dragging something
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -7,5 +7,4 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr ../
 make
 sudo make install

-To see additional options you can do after the cmake step a 'cmake -L ../'
-
+To see additional options you can set at the 'cmake' step, run 'cmake -L ../'
--- a/README.md
+++ b/README.md
@@ -1,15 +1,13 @@
-### New unstable release: 0.12-rc5
-Changes: https://gitlab.com/o9000/tint2/blob/master/ChangeLog
+### New stable release: 0.12.2
+Changes: https://gitlab.com/o9000/tint2/blob/0.12.2/ChangeLog

 Documentation: https://gitlab.com/o9000/tint2/wikis/home

 Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 ```
-mkdir tint2-0.12-rc5
-cd tint2-0.12-rc5
-wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc5' --output-document tint2-0.12-rc5.tar.gz
-tar -xzf tint2-0.12-rc5.tar.gz
-cd tint2.git
+git clone https://gitlab.com/o9000/tint2.git
+cd tint2
+git checkout 0.12.2
 mkdir build
 cd build
 cmake ..
@@ -17,8 +15,17 @@ make -j4
 ./tint2 &
 ./src/tint2conf/tint2conf &
 ```
+
+To install from source, also run (as root):
+```
+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?
@@ -49,7 +56,7 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
  * [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)  
+  * [Debug](https://gitlab.com/o9000/tint2/wikis/Debug)

 ### How can I help out?

@@ -64,8 +71,7 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
  * Old project location (inactive): https://code.google.com/p/tint2

 ### Releases
-  * Latest stable release: tint2 0.11 (June 2010)
-  * Next release: planned for mid 2015
+  * Latest stable release: tint2 0.12.2 (August 2015)

 ### Screenshots
 ![screenshot](https://gitlab.com/o9000/tint2/wikis/screenshot.png)
--- a/README.source
+++ b/README.source
@@ -1,4 +1,3 @@
 DEPENDENCIES:
-cairo (whit X support), pango, glib2, libX11, libXinerama, libXrandr, libXrender, libXcomposite, libXdamage imlib2 (with X support)
-you might need -dev packages on debian
-
+cairo (with X support), pango, glib2, libX11, libXinerama, libXrandr, libXrender, libXcomposite, libXdamage, imlib2 (with X support)
+you might need -dev packages on Debian
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH TINT2 1 "2009-01-17"
+.TH TINT2 1 "2015-07-05"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -37,7 +37,7 @@ compliance with freedesktop specifications.
 .PP
 On the first startup tint2 creates a config file in $HOME/.config/tint2/tint2rc.
 .PP
-See wiki page on http://code.google.com/p/tint2/wiki/Welcome for more information.
+See the wiki page at https://gitlab.com/o9000/tint2/wikis/home for more information.
 .SH OPTIONS
 .TP
 .B \-c config-file
--- a/get_version.sh
+++ b/get_version.sh
@@ -1,5 +1,6 @@
 #!/bin/sh

+MAJOR=0.12
 DIRTY=""

 git update-index -q --ignore-submodules --refresh
@@ -29,7 +30,8 @@ then
    fi
 fi

-VERSION=$(git describe --exact-match 2>/dev/null || echo "0.11-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')")$DIRTY
+VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')")$DIRTY
+VERSION=$(echo "$VERSION" | sed 's/^v//')

 echo '#define VERSION_STRING "'$VERSION'"' > version.h
 echo $VERSION
--- a/sample/horizontal-dark-opaque.tint2rc
+++ b/sample/horizontal-dark-opaque.tint2rc
@@ -121,8 +121,12 @@ launcher_icon_size = 22
 launcher_icon_asb = 100 0 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
 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

 #-------------------------------------
 # Clock
--- a/sample/horizontal-dark-transparent.tint2rc
+++ b/sample/horizontal-dark-transparent.tint2rc
@@ -121,8 +121,12 @@ launcher_icon_size = 22
 launcher_icon_asb = 100 0 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
 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

 #-------------------------------------
 # Clock
--- a/sample/horizontal-light-opaque.tint2rc
+++ b/sample/horizontal-light-opaque.tint2rc
@@ -127,8 +127,12 @@ launcher_icon_size = 22
 launcher_icon_asb = 100 0 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
 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

 #-------------------------------------
 # Clock
--- a/sample/horizontal-light-transparent.tint2rc
+++ b/sample/horizontal-light-transparent.tint2rc
@@ -0,0 +1,176 @@
+#---- Generated by tint2conf e324 ----
+# See https://gitlab.com/o9000/tint2/wikis/Configure for 
+# full documentation of the configuration options.
+#-------------------------------------
+# Backgrounds
+# Background 1
+rounded = 0
+border_width = 1
+background_color = #eeeeee 0
+border_color = #bbbbbb 10
+
+# Background 2
+rounded = 5
+border_width = 0
+background_color = #eeeeee 4
+border_color = #cccccc 100
+
+# Background 3
+rounded = 5
+border_width = 1
+background_color = #dddddd 4
+border_color = #999999 100
+
+# Background 4
+rounded = 5
+border_width = 1
+background_color = #aa4400 100
+border_color = #aa7733 100
+
+# Background 5
+rounded = 2
+border_width = 1
+background_color = #ffffaa 100
+border_color = #999999 100
+
+# Background 6
+rounded = 2
+border_width = 1
+background_color = #eeeeee 4
+border_color = #cccccc 100
+
+# Background 7
+rounded = 2
+border_width = 1
+background_color = #dddddd 3
+border_color = #999999 100
+
+# Background 8
+rounded = 3
+border_width = 0
+background_color = #999999 4
+border_color = #cccccc 100
+
+#-------------------------------------
+# Panel
+panel_items = LTSC
+panel_size = 100% 32
+panel_margin = 0 0
+panel_padding = 4 2 4
+panel_background_id = 1
+wm_menu = 1
+panel_dock = 0
+panel_position = bottom center horizontal
+panel_layer = normal
+panel_monitor = all
+autohide = 0
+autohide_show_timeout = 0
+autohide_hide_timeout = 0.5
+autohide_height = 2
+strut_policy = follow_size
+panel_window_name = tint2
+disable_transparency = 0
+font_shadow = 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_name_padding = 6 3
+taskbar_name_background_id = 6
+taskbar_name_active_background_id = 7
+taskbar_name_font = sans bold 9
+taskbar_name_font_color = #ffffff 100
+taskbar_name_active_font_color = #ffffff 100
+taskbar_distribute_size = 1
+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 = 140 35
+task_padding = 4 3 4
+task_font = sans 8
+task_tooltip = 1
+task_font_color = #ffffff 100
+task_icon_asb = 100 0 0
+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 = prev_task
+mouse_scroll_down = next_task
+
+#-------------------------------------
+# System tray (notification area)
+systray_padding = 4 0 2
+systray_background_id = 0
+systray_sort = ascending
+systray_icon_size = 22
+systray_icon_asb = 100 0 0
+systray_monitor = 1
+
+#-------------------------------------
+# Launcher
+launcher_padding = 0 0 2
+launcher_background_id = 0
+launcher_icon_size = 22
+launcher_icon_asb = 100 0 0
+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
+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
+
+#-------------------------------------
+# Clock
+time1_format = %H:%M
+time2_format = %A %d %B
+time1_font = sans bold 8
+time1_timezone = 
+time2_timezone = 
+time2_font = sans 7
+clock_font_color = #ffffff 100
+clock_padding = 1 0
+clock_background_id = 0
+clock_tooltip = 
+clock_tooltip_timezone = 
+clock_lclick_command = zenity --calendar --text ""
+clock_rclick_command = orage
+
+#-------------------------------------
+# Battery
+battery_low_status = 10
+battery_low_cmd = notify-send "battery low"
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #ffffff 100
+battery_padding = 1 0
+battery_background_id = 0
+battery_hide = 101
+
+#-------------------------------------
+# Tooltip
+tooltip_show_timeout = 0.5
+tooltip_hide_timeout = 0.1
+tooltip_padding = 2 2
+tooltip_background_id = 5
+tooltip_font_color = #222222 100
+tooltip_font = sans 9
+
--- a/sample/tint2rc
+++ b/sample/tint2rc
@@ -59,8 +59,12 @@ launcher_icon_size = 18
 launcher_icon_asb = 100 0 0
 launcher_tooltip = 1
 startup_notifications = 1
+launcher_item_app = /usr/share/applications/tint2conf.desktop
+launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
+launcher_item_app = /usr/share/applications/chromium-browser.desktop
+launcher_item_app = /usr/share/applications/google-chrome.desktop

 # Taskbar
 taskbar_mode = single_desktop
@@ -85,7 +89,7 @@ urgent_nb_of_blink = 100000
 task_icon_asb = 100 0 0
 task_active_icon_asb = 100 0 0
 task_urgent_icon_asb = 100 0 0
-task_iconified_icon_asb = 70 0 0
+task_iconified_icon_asb = 100 0 0

 # Fonts
 task_font = sans 8
@@ -113,7 +117,7 @@ time1_format = %H:%M
 time1_font = sans 8
 time2_format = %A %d %B
 time2_font = sans 7
-clock_font_color = #FFFFFF 90
+clock_font_color = #FFFFFF 100
 clock_padding = 1 0
 clock_background_id = 0
 clock_rclick_command = orage
@@ -132,7 +136,7 @@ battery_low_cmd = notify-send "battery low"
 battery_hide = 101
 bat1_font = sans 8
 bat2_font = sans 6
-battery_font_color = #FFFFFF 94
+battery_font_color = #FFFFFF 100
 battery_padding = 1 0
 battery_background_id = 0

--- a/sample/vertical-dark-opaque.tint2rc
+++ b/sample/vertical-dark-opaque.tint2rc
@@ -1,4 +1,6 @@
-#---- Generated by tint2conf c113 ----
+#---- Generated by tint2conf 258e ----
+# See https://gitlab.com/o9000/tint2/wikis/Configure for 
+# full documentation of the configuration options.
 #-------------------------------------
 # Backgrounds
 # Background 1
@@ -81,6 +83,7 @@ taskbar_name_font_color = #dddddd 100
 taskbar_name_active_font_color = #dddddd 100
 taskbar_distribute_size = 1
 taskbar_sort_order = none
+task_align = left

 #-------------------------------------
 # Task
@@ -119,10 +122,15 @@ launcher_padding = 0 0 2
 launcher_background_id = 0
 launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
+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
 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

 #-------------------------------------
 # Clock
--- a/sample/vertical-dark-transparent.tint2rc
+++ b/sample/vertical-dark-transparent.tint2rc
@@ -121,8 +121,12 @@ launcher_icon_size = 22
 launcher_icon_asb = 100 0 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
 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

 #-------------------------------------
 # Clock
--- a/sample/vertical-light-opaque.tint2rc
+++ b/sample/vertical-light-opaque.tint2rc
@@ -127,8 +127,12 @@ launcher_icon_size = 22
 launcher_icon_asb = 100 0 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
 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

 #-------------------------------------
 # Clock
--- a/sample/vertical-light-transparent.tint2rc
+++ b/sample/vertical-light-transparent.tint2rc
@@ -0,0 +1,176 @@
+#---- Generated by tint2conf e324 ----
+# See https://gitlab.com/o9000/tint2/wikis/Configure for 
+# full documentation of the configuration options.
+#-------------------------------------
+# Backgrounds
+# Background 1
+rounded = 0
+border_width = 1
+background_color = #eeeeee 0
+border_color = #bbbbbb 10
+
+# Background 2
+rounded = 5
+border_width = 0
+background_color = #eeeeee 4
+border_color = #cccccc 100
+
+# Background 3
+rounded = 5
+border_width = 1
+background_color = #dddddd 4
+border_color = #999999 100
+
+# Background 4
+rounded = 5
+border_width = 1
+background_color = #aa4400 100
+border_color = #aa7733 100
+
+# Background 5
+rounded = 2
+border_width = 1
+background_color = #ffffaa 100
+border_color = #999999 100
+
+# Background 6
+rounded = 2
+border_width = 1
+background_color = #eeeeee 4
+border_color = #cccccc 100
+
+# Background 7
+rounded = 2
+border_width = 1
+background_color = #dddddd 3
+border_color = #999999 100
+
+# Background 8
+rounded = 3
+border_width = 0
+background_color = #999999 4
+border_color = #cccccc 100
+
+#-------------------------------------
+# Panel
+panel_items = CSTL
+panel_size = 100% 152
+panel_margin = 0 0
+panel_padding = 2 2 2
+panel_background_id = 1
+wm_menu = 1
+panel_dock = 0
+panel_position = bottom left vertical
+panel_layer = normal
+panel_monitor = all
+autohide = 0
+autohide_show_timeout = 0
+autohide_hide_timeout = 0.5
+autohide_height = 2
+strut_policy = follow_size
+panel_window_name = tint2
+disable_transparency = 0
+font_shadow = 0
+
+#-------------------------------------
+# Taskbar
+taskbar_mode = multi_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_name_padding = 6 3
+taskbar_name_background_id = 6
+taskbar_name_active_background_id = 7
+taskbar_name_font = sans bold 9
+taskbar_name_font_color = #ffffff 100
+taskbar_name_active_font_color = #ffffff 100
+taskbar_distribute_size = 1
+taskbar_sort_order = none
+task_align = left
+
+#-------------------------------------
+# Task
+task_text = 1
+task_icon = 1
+task_centered = 0
+urgent_nb_of_blink = 100000
+task_maximum_size = 152 35
+task_padding = 4 3 4
+task_font = sans 8
+task_tooltip = 1
+task_font_color = #ffffff 100
+task_icon_asb = 100 0 0
+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 = prev_task
+mouse_scroll_down = next_task
+
+#-------------------------------------
+# System tray (notification area)
+systray_padding = 0 0 2
+systray_background_id = 0
+systray_sort = ascending
+systray_icon_size = 22
+systray_icon_asb = 100 0 0
+systray_monitor = 1
+
+#-------------------------------------
+# Launcher
+launcher_padding = 0 0 2
+launcher_background_id = 0
+launcher_icon_size = 22
+launcher_icon_asb = 100 0 0
+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
+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
+
+#-------------------------------------
+# Clock
+time1_format = %H:%M
+time2_format = %A %d %B
+time1_font = sans bold 9
+time1_timezone = 
+time2_timezone = 
+time2_font = sans 9
+clock_font_color = #ffffff 100
+clock_padding = 1 0
+clock_background_id = 0
+clock_tooltip = 
+clock_tooltip_timezone = 
+clock_lclick_command = zenity --calendar --text ""
+clock_rclick_command = orage
+
+#-------------------------------------
+# Battery
+battery_low_status = 10
+battery_low_cmd = notify-send "battery low"
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #ffffff 100
+battery_padding = 1 0
+battery_background_id = 0
+battery_hide = 101
+
+#-------------------------------------
+# Tooltip
+tooltip_show_timeout = 0.5
+tooltip_hide_timeout = 0.1
+tooltip_padding = 2 2
+tooltip_background_id = 5
+tooltip_font_color = #222222 100
+tooltip_font = sans 9
+
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -56,6 +56,11 @@ static char buf_bat_time[20];
 int8_t battery_low_status;
 unsigned char battery_low_cmd_sent;
 char *battery_low_cmd;
+char *battery_lclick_command;
+char *battery_mclick_command;
+char *battery_rclick_command;
+char *battery_uwheel_command;
+char *battery_dwheel_command;
 gchar *path_energy_now;
 gchar *path_energy_full;
 gchar *path_current_now;
@@ -141,6 +146,11 @@ void default_battery()
 	bat1_font_desc = NULL;
 	bat2_font_desc = NULL;
 	battery_low_cmd = NULL;
+	battery_lclick_command = NULL;
+	battery_mclick_command = NULL;
+	battery_rclick_command = NULL;
+	battery_uwheel_command = NULL;
+	battery_dwheel_command = NULL;
 	path_energy_now = NULL;
 	path_energy_full = NULL;
 	path_current_now = NULL;
@@ -171,6 +181,16 @@ void cleanup_battery()
 	path_status = NULL;
 	free(battery_low_cmd);
 	battery_low_cmd = NULL;
+	free(battery_lclick_command);
+	battery_lclick_command = NULL;
+	free(battery_mclick_command);
+	battery_mclick_command = NULL;
+	free(battery_rclick_command);
+	battery_rclick_command = NULL;
+	free(battery_uwheel_command);
+	battery_uwheel_command = NULL;
+	free(battery_dwheel_command);
+	battery_dwheel_command = NULL;
 	stop_timeout(battery_timeout);
 	battery_timeout = NULL;
 	battery_found = 0;
@@ -574,3 +594,26 @@ int resize_battery(void *obj)
 	}
 	return ret;
 }
+
+void battery_action(int button)
+{
+	char *command = 0;
+	switch (button) {
+		case 1:
+		command = battery_lclick_command;
+		break;
+		case 2:
+		command = battery_mclick_command;
+		break;
+		case 3:
+		command = battery_rclick_command;
+		break;
+		case 4:
+		command = battery_uwheel_command;
+		break;
+		case 5:
+		command = battery_dwheel_command;
+		break;
+	}
+	tint_exec(command);
+}
--- a/src/battery/battery.h
+++ b/src/battery/battery.h
@@ -56,6 +56,12 @@ extern int percentage_hide;
 extern int8_t battery_low_status;
 extern char *battery_low_cmd;

+extern char *battery_lclick_command;
+extern char *battery_mclick_command;
+extern char *battery_rclick_command;
+extern char *battery_uwheel_command;
+extern char *battery_dwheel_command;
+
 // default global data
 void default_battery();

@@ -71,4 +77,6 @@ void draw_battery(void *obj, cairo_t *c);

 int  resize_battery(void *obj);

+void battery_action(int button);
+
 #endif
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -39,7 +39,10 @@ char *time2_timezone;
 char *time_tooltip_format;
 char *time_tooltip_timezone;
 char *clock_lclick_command;
+char *clock_mclick_command;
 char *clock_rclick_command;
+char *clock_uwheel_command;
+char *clock_dwheel_command;
 struct timeval time_clock;
 PangoFontDescription *time1_font_desc;
 PangoFontDescription *time2_font_desc;
@@ -61,7 +64,10 @@ void default_clock()
 	time_tooltip_format = NULL;
 	time_tooltip_timezone = NULL;
 	clock_lclick_command = NULL;
+	clock_mclick_command = NULL;
 	clock_rclick_command = NULL;
+	clock_uwheel_command = NULL;
+	clock_dwheel_command = NULL;
 	time1_font_desc = NULL;
 	time2_font_desc = NULL;
 }
@@ -86,8 +92,14 @@ void cleanup_clock()
 	time_tooltip_timezone = NULL;
 	free(clock_lclick_command);
 	clock_lclick_command = NULL;
+	free(clock_mclick_command);
+	clock_mclick_command = NULL;
 	free(clock_rclick_command);
 	clock_rclick_command = NULL;
+	free(clock_uwheel_command);
+	clock_uwheel_command = NULL;
+	free(clock_dwheel_command);
+	clock_dwheel_command = NULL;
 	stop_timeout(clock_timeout);
 	clock_timeout = NULL;
 }
@@ -277,9 +289,18 @@ void clock_action(int button)
 		case 1:
 		command = clock_lclick_command;
 		break;
+		case 2:
+		command = clock_mclick_command;
+		break;
 		case 3:
 		command = clock_rclick_command;
 		break;
+		case 4:
+		command = clock_uwheel_command;
+		break;
+		case 5:
+		command = clock_dwheel_command;
+		break;
 	}
 	tint_exec(command);
 }
--- a/src/clock/clock.h
+++ b/src/clock/clock.h
@@ -33,7 +33,10 @@ extern char *time_tooltip_timezone;
 extern PangoFontDescription *time1_font_desc;
 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;


--- a/src/config.c
+++ b/src/config.c
@@ -258,6 +258,13 @@ void add_entry (char *key, char *value)
 		new_config_file = 1;
 		panel_items_order = strdup(value);
 		int j;
+		systray_enabled = 0;
+		launcher_enabled = 0;
+#ifdef ENABLE_BATTERY
+		battery_enabled = 0;
+#endif
+		clock_enabled = 0;
+		taskbar_enabled = 0;
 		for (j=0 ; j < strlen(panel_items_order) ; j++) {
 			if (panel_items_order[j] == 'L')
 				launcher_enabled = 1;
@@ -349,6 +356,36 @@ void add_entry (char *key, char *value)
 		battery_low_status = atoi(value);
 		if(battery_low_status < 0 || battery_low_status > 100)
 			battery_low_status = 0;
+#endif
+	}
+	else if (strcmp(key, "battery_lclick_command") == 0) {
+#ifdef ENABLE_BATTERY
+		if (strlen(value) > 0)
+			battery_lclick_command = strdup(value);
+#endif
+	}
+	else if (strcmp(key, "battery_mclick_command") == 0) {
+#ifdef ENABLE_BATTERY
+		if (strlen(value) > 0)
+			battery_mclick_command = strdup(value);
+#endif
+	}
+	else if (strcmp(key, "battery_rclick_command") == 0) {
+#ifdef ENABLE_BATTERY
+		if (strlen(value) > 0)
+			battery_rclick_command = strdup(value);
+#endif
+	}
+	else if (strcmp(key, "battery_uwheel_command") == 0) {
+#ifdef ENABLE_BATTERY
+		if (strlen(value) > 0)
+			battery_uwheel_command = strdup(value);
+#endif
+	}
+	else if (strcmp(key, "battery_dwheel_command") == 0) {
+#ifdef ENABLE_BATTERY
+		if (strlen(value) > 0)
+			battery_dwheel_command = strdup(value);
 #endif
 	}
 	else if (strcmp (key, "battery_low_cmd") == 0) {
@@ -463,10 +500,22 @@ void add_entry (char *key, char *value)
 		if (strlen(value) > 0)
 			clock_lclick_command = strdup(value);
 	}
+	else if (strcmp(key, "clock_mclick_command") == 0) {
+		if (strlen(value) > 0)
+			clock_mclick_command = strdup(value);
+	}
 	else if (strcmp(key, "clock_rclick_command") == 0) {
 		if (strlen(value) > 0)
 			clock_rclick_command = strdup(value);
 	}
+	else if (strcmp(key, "clock_uwheel_command") == 0) {
+		if (strlen(value) > 0)
+			clock_uwheel_command = strdup(value);
+	}
+	else if (strcmp(key, "clock_dwheel_command") == 0) {
+		if (strlen(value) > 0)
+			clock_dwheel_command = strdup(value);
+	}

 	/* Taskbar */
 	else if (strcmp (key, "taskbar_mode") == 0) {
--- a/src/launcher/apps-common.c
+++ b/src/launcher/apps-common.c
@@ -105,6 +105,7 @@ int read_desktop_file(const char *path, DesktopEntry *entry)
 	char *key, *value;
 	int i;

+	entry->path = strdup(path);
 	entry->name = entry->icon = entry->exec = NULL;

 	if ((fp = fopen(path, "rt")) == NULL) {
@@ -174,7 +175,8 @@ void free_desktop_entry(DesktopEntry *entry)
 	free(entry->name);
 	free(entry->icon);
 	free(entry->exec);
-	entry->name = entry->icon = entry->exec = NULL;
+	free(entry->path);
+	entry->name = entry->icon = entry->exec = entry->path = NULL;
 }

 void test_read_desktop_file()
--- a/src/launcher/apps-common.h
+++ b/src/launcher/apps-common.h
@@ -11,6 +11,7 @@ typedef struct DesktopEntry {
 	char *name;
 	char *exec;
 	char *icon;
+	char *path;
 } DesktopEntry;

 // Parses a line of the form "key = value". Modifies the line.
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -359,13 +359,7 @@ void draw_launcher_icon(void *obj, cairo_t *c)

 	// Render
 	imlib_context_set_image(launcherIcon->image);
-	if (server.real_transparency) {
-		render_image(launcherIcon->area.pix, 0, 0);
-	} else {
-		imlib_context_set_blend(1);
-		imlib_context_set_drawable(launcherIcon->area.pix);
-		imlib_render_image_on_drawable(0, 0);
-	}
+	render_image(launcherIcon->area.pix, 0, 0);
 }

 Imlib_Image scale_icon(Imlib_Image original, int icon_size)
--- a/src/panel.c
+++ b/src/panel.c
@@ -549,7 +549,7 @@ void set_panel_properties(Panel *p)
 	memset(&wmhints, 0, sizeof(wmhints));
 	if (panel_dock) {
 		// Necessary for placing the panel into the dock on Openbox and Fluxbox.
-		// See https://code.google.com/p/tint2/issues/detail?id=465
+		// See https://gitlab.com/o9000/tint2/issues/465
 		wmhints.icon_window = wmhints.window_group = p->main_win;
 		wmhints.flags = StateHint | IconWindowHint;
 		wmhints.initial_state = WithdrawnState;
@@ -796,6 +796,22 @@ int click_clock(Panel *panel, int x, int y)
 }


+#ifdef ENABLE_BATTERY
+int click_battery(Panel *panel, int x, int y)
+{
+	Battery bat = panel->battery;
+	if (panel_horizontal) {
+		if (bat.area.on_screen && x >= bat.area.posx && x <= (bat.area.posx + bat.area.width))
+			return TRUE;
+	} else {
+		if (bat.area.on_screen && y >= bat.area.posy && y <= (bat.area.posy + bat.area.height))
+			return TRUE;
+	}
+	return FALSE;
+}
+#endif
+
+
 Area* click_area(Panel *panel, int x, int y)
 {
 	Area* result = &panel->area;
--- a/src/panel.h
+++ b/src/panel.h
@@ -160,6 +160,11 @@ Launcher *click_launcher (Panel *panel, int x, int y);
 LauncherIcon *click_launcher_icon (Panel *panel, int x, int y);
 int click_padding(Panel *panel, int x, int y);
 int click_clock(Panel *panel, int x, int y);
+
+#ifdef ENABLE_BATTERY
+int click_battery(Panel *panel, int x, int y);
+#endif
+
 Area* click_area(Panel *panel, int x, int y);

 void autohide_show(void* p);
--- a/src/server.c
+++ b/src/server.c
@@ -96,6 +96,8 @@ void server_init_atoms ()
 	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);
@@ -284,7 +286,7 @@ void get_monitors()
 		if (res && res->ncrtc >= nbmonitor) {
 			// use xrandr to identify monitors (does not work with proprietery nvidia drivers)

-			// Workaround for issue https://code.google.com/p/tint2/issues/detail?id=353
+			// 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;
@@ -362,6 +364,20 @@ next:
 	}
 }

+void print_monitors()
+{
+	fprintf(stderr, "Number of monitors: %d\n", server.nb_monitor);
+	int i;
+	for (i = 0; i < server.nb_monitor; i++) {
+		fprintf(stderr, "Monitor %d: x = %d, y = %d, w = %d, h = %d\n",
+				i+1,
+				server.monitor[i].x,
+				server.monitor[i].y,
+				server.monitor[i].width,
+				server.monitor[i].height);
+	}
+}
+
 int server_get_number_of_desktops()
 {
 	return get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);
--- a/src/server.h
+++ b/src/server.h
@@ -71,6 +71,8 @@ typedef struct Global_atom
 	Atom MANAGER;
 	Atom _NET_SYSTEM_TRAY_MESSAGE_DATA;
 	Atom _NET_SYSTEM_TRAY_ORIENTATION;
+	Atom _NET_SYSTEM_TRAY_ICON_SIZE;
+	Atom _NET_SYSTEM_TRAY_PADDING;
 	Atom _XEMBED;
 	Atom _XEMBED_INFO;
 	Atom _NET_WM_PID;
@@ -151,7 +153,8 @@ void get_root_pixmap();

 // detect monitors and desktops
 void get_monitors();
+void print_monitors();
 void get_desktops();
 int server_get_number_of_desktops();

-#endif
+#endif
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
--- a/src/systray/systraybar.h
+++ b/src/systray/systraybar.h
@@ -48,7 +48,14 @@ typedef struct
 	int pid;
 	int chrono;
    struct timespec time_last_render;
+	int num_fast_renders;
 	int reparented;
+	int embedded;
+	int bad_size_counter;
+	timeout* resize_timeout;
+	struct timespec time_last_resize;
+	char *name;
+	Imlib_Image image;
 } TrayWindow;


@@ -59,6 +66,7 @@ extern int refresh_systray;
 extern int systray_enabled;
 extern int systray_max_icon_size;
 extern int systray_monitor;
+extern int systray_profile;

 // default global data
 void default_systray();
@@ -82,10 +90,17 @@ void stop_net();
 void net_message(XClientMessageEvent *e);

 gboolean add_icon(Window id);
+gboolean reparent_icon(TrayWindow *traywin);
+gboolean embed_icon(TrayWindow *traywin);
 void remove_icon(TrayWindow *traywin);

-void refresh_systray_icon();
-void systray_render_icon(TrayWindow* traywin);
+void refresh_systray_icons();
+void systray_render_icon(void *t);
+gboolean request_embed_icon(TrayWindow *traywin);
+void systray_resize_request_event(TrayWindow *traywin, XEvent *e);
+gboolean request_embed_icon(TrayWindow *traywin);
+void systray_reconfigure_event(TrayWindow *traywin, XEvent *e);
+void systray_destroy_event(TrayWindow *traywin);
 void kde_update_icons();

 #endif
--- a/src/taskbar/task.c
+++ b/src/taskbar/task.c
@@ -350,13 +350,7 @@ void draw_task_icon (Task *tsk, int text_width)

 	// Render
 	imlib_context_set_image (tsk->icon[tsk->current_state]);
-	if (server.real_transparency) {
-		render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy);
-	} else {
-		imlib_context_set_blend(1);
-		imlib_context_set_drawable(tsk->area.pix);
-		imlib_render_image_on_drawable(pos_x, panel->g_task.icon_posy);
-	}
+	render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy);
 }


@@ -527,9 +521,14 @@ void set_task_state(Task *tsk, int state)
 					tsk1->area.redraw = 1;
 				if (state == TASK_ACTIVE && g_slist_find(urgent_list, tsk1))
 					del_urgent(tsk1);
-				// Show only the active task
 				int hide = 0;
+				Taskbar *taskbar = (Taskbar *)tsk1->area.parent;
+				if (tsk->desktop == ALLDESKTOP && server.desktop != taskbar->desktop) {
+					// Hide ALLDESKTOP task on non-current desktop
+					hide = 1;
+				}
 				if (hide_inactive_tasks) {
+					// Show only the active task
 					if (state != TASK_ACTIVE) {
 						hide = 1;
 					}
--- a/src/tint.c
+++ b/src/tint.c
@@ -20,6 +20,7 @@

 #include <sys/stat.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -58,6 +59,43 @@ Atom dnd_atom;
 int dnd_sent_request;
 char *dnd_launcher_exec;

+timeout* detect_compositor_timer = NULL;
+int detect_compositor_timer_counter = 0;
+
+void detect_compositor(void *arg)
+{
+	if (server.composite_manager) {
+		stop_timeout(detect_compositor_timer);
+		return;
+	}
+
+	detect_compositor_timer_counter--;
+	if (detect_compositor_timer_counter < 0) {
+		stop_timeout(detect_compositor_timer);
+		return;
+	}
+
+	// No compositor, check for one
+	if (XGetSelectionOwner(server.dsp, server.atom._NET_WM_CM_S0) != None) {
+		stop_timeout(detect_compositor_timer);
+		// Restart tint2
+		fprintf(stderr, "Detected compositor, restarting tint2...\n");
+		kill(getpid(), SIGUSR1);
+	}
+}
+
+void start_detect_compositor()
+{
+	// Already have a compositor, nothing to do
+	if (server.composite_manager)
+		return;
+
+	stop_timeout(detect_compositor_timer);
+	// Check every 0.5 seconds for up to 30 seconds
+	detect_compositor_timer_counter = 60;
+	detect_compositor_timer = add_timeout(500, 500, detect_compositor, 0, &detect_compositor_timer);
+}
+
 void signal_handler(int sig)
 {
 	// signal handler is light as it should be
@@ -85,23 +123,35 @@ void init (int argc, char *argv[])

 	// read options
 	for (i = 1; i < argc; ++i) {
-		if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))	{
-			printf("Usage: tint2 [-c] <config_file>\n");
+		int error = 0;
+		if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+			printf("Usage: tint2 [[-c] <config_file>]\n");
 			exit(0);
-		}
-		if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version"))	{
+		} else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--version") == 0) {
 			printf("tint2 version %s\n", VERSION_STRING);
 			exit(0);
-		}
-		if (!strcmp(argv[i], "-c")) {
-			i++;
-			if (i < argc)
+		} else if (strcmp(argv[i], "-c") == 0) {
+			if (i+1 < argc) {
+				i++;
 				config_path = strdup(argv[i]);
-		}
-		if (!strcmp(argv[i], "-s"))	{
-			i++;
-			if (i < argc)
+			} else {
+				error = 1;
+			}
+		} else if (strcmp(argv[i], "-s") == 0)	{
+			if (i+1 < argc) {
+				i++;
 				snapshot_path = strdup(argv[i]);
+			} else {
+				error = 1;
+			}
+		} else if (i+1 == argc)	{
+			config_path = strdup(argv[i]);
+		} else {
+			error = 1;
+		}
+		if (error) {
+			printf("Usage: tint2 [[-c] <config_file>]\n");
+			exit(1);
 		}
 	}
 	// Set signal handler
@@ -165,9 +215,7 @@ static void sigchld_handler_async() {
 	while ((pid = waitpid(-1, NULL, WNOHANG)) > 0) {
 		SnLauncherContext *ctx;
 		ctx = (SnLauncherContext *) g_tree_lookup (server.pids, GINT_TO_POINTER (pid));
-		if (ctx == NULL) {
-			fprintf(stderr, "Unknown child %d terminated!\n", pid);
-		} else {
+		if (ctx) {
 			g_tree_remove (server.pids, GINT_TO_POINTER (pid));
 			sn_launcher_context_complete (ctx);
 			sn_launcher_context_unref (ctx);
@@ -203,6 +251,9 @@ void init_X11_pre_config()
 	// config file use '.' as decimal separator
 	setlocale(LC_NUMERIC, "POSIX");

+	/* Catch events */
+	XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
+
 	// get monitor and desktop config
 	get_monitors();
 	get_desktops();
@@ -224,9 +275,11 @@ void init_X11_post_config()
 		if (pipe(sn_pipe) != 0) {
 			fprintf(stderr, "Creating pipe failed.\n");
 		} else {
+			fcntl(sn_pipe[0], F_SETFL, O_NONBLOCK | fcntl(sn_pipe[0], F_GETFL));
+			fcntl(sn_pipe[1], F_SETFL, O_NONBLOCK | fcntl(sn_pipe[1], F_GETFL));
 			sn_pipe_valid = 1;
 			struct sigaction act;
-			memset (&act, 0, sizeof (struct sigaction));
+			memset(&act, 0, sizeof(struct sigaction));
 			act.sa_handler = sigchld_handler;
 			if (sigaction(SIGCHLD, &act, 0)) {
 				perror("sigaction");
@@ -239,9 +292,6 @@ void init_X11_post_config()
 	imlib_context_set_visual (server.visual);
 	imlib_context_set_colormap (server.colormap);

-	/* Catch events */
-	XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
-
 	// load default icon
 	gchar *path;
 	const gchar * const *data_dirs;
@@ -409,11 +459,27 @@ int tint2_handles_click(Panel* panel, XButtonEvent* e)
 	if (tskbar && e->button == 1 && panel_mode == MULTI_DESKTOP)
 		return 1;
 	if (click_clock(panel, e->x, e->y)) {
-		if ( (e->button == 1 && clock_lclick_command) || (e->button == 3 && clock_rclick_command) )
+		if (	(e->button == 1 && clock_lclick_command) ||
+			(e->button == 2 && clock_mclick_command) ||
+			(e->button == 3 && clock_rclick_command) ||
+			(e->button == 4 && clock_uwheel_command) ||
+			(e->button == 5 && clock_dwheel_command) )
 			return 1;
 		else
 			return 0;
 	}
+	#ifdef ENABLE_BATTERY
+	if (click_battery(panel, e->x, e->y)) {
+		if (	(e->button == 1 && battery_lclick_command) ||
+			(e->button == 2 && battery_mclick_command) ||
+			(e->button == 3 && battery_rclick_command) ||
+			(e->button == 4 && battery_uwheel_command) ||
+			(e->button == 5 && battery_dwheel_command) )
+			return 1;
+		else
+			return 0;
+	}
+	#endif
 	return 0;
 }

@@ -561,6 +627,16 @@ void event_button_release (XEvent *e)
 		return;
 	}

+	#ifdef ENABLE_BATTERY
+	if (click_battery(panel, e->xbutton.x, e->xbutton.y)) {
+		battery_action(e->xbutton.button);
+		if (panel_layer == BOTTOM_LAYER)
+			XLowerWindow (server.dsp, panel->main_win);
+		task_drag = 0;
+		return;
+	}
+	#endif
+
 	if (e->xbutton.button == 1 && click_launcher(panel, e->xbutton.x, e->xbutton.y)) {
 		LauncherIcon *icon = click_launcher_icon(panel, e->xbutton.x, e->xbutton.y);
 		if (icon) {
@@ -817,8 +893,10 @@ void event_expose (XEvent *e)
 }


-void event_configure_notify (Window win)
+void event_configure_notify(XEvent *e)
 {
+	Window win = e->xconfigure.window;
+
 	// change in root window (xrandr)
 	if (win == server.root_win) {
 		signal_pending = SIGUSR1;
@@ -831,12 +909,7 @@ void event_configure_notify (Window win)
 	for (l = systray.list_icons; l ; l = l->next) {
 		traywin = (TrayWindow*)l->data;
 		if (traywin->win == win) {
-			//printf("move tray %d\n", traywin->x);
-			XMoveResizeWindow(server.dsp, traywin->parent, traywin->x, traywin->y, traywin->width, traywin->height);
-			if (traywin->reparented)
-				XMoveResizeWindow(server.dsp, traywin->win, 0, 0, traywin->width, traywin->height);
-			panel_refresh = 1;
-			refresh_systray = 1;
+			systray_reconfigure_event(traywin, e);
 			return;
 		}
 	}
@@ -1081,7 +1154,7 @@ int main (int argc, char *argv[])
 	int x11_fd, i;
 	Panel *panel;
 	GSList *it;
-	struct timeval* timeout;
+	struct timeval* select_timeout;
 	int hidden_dnd = 0;

 	// Make stdout/stderr flush after a newline (for some reason they don't even if tint2 is started from a terminal)
@@ -1105,6 +1178,7 @@ start:
 	}

 	init_X11_post_config();
+	start_detect_compositor();

 	init_panel();
 	if (snapshot_path) {
@@ -1132,32 +1206,32 @@ start:

 	while (1) {
 		if (panel_refresh) {
+			if (systray_profile)
+				fprintf(stderr, BLUE "[%f] %s:%d redrawing panel\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__);
 			panel_refresh = 0;

-			for (i=0 ; i < nb_panel ; i++) {
+			for (i = 0; i < nb_panel ;i++) {
 				panel = &panel1[i];

 				if (panel->is_hidden) {
 					XCopyArea(server.dsp, panel->hidden_pixmap, panel->main_win, server.gc, 0, 0, panel->hidden_width, panel->hidden_height, 0, 0);
 					XSetWindowBackgroundPixmap(server.dsp, panel->main_win, panel->hidden_pixmap);
-				}
-				else {
-					if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
+				} else {
+					if (panel->temp_pmap)
+						XFreePixmap(server.dsp, panel->temp_pmap);
 					panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
 					rendering(panel);
+					if (panel == (Panel*)systray.area.panel) {
+						if (refresh_systray && panel && !panel->is_hidden) {
+							refresh_systray = 0;
+							XSetWindowBackgroundPixmap(server.dsp, panel->main_win, panel->temp_pmap);
+							refresh_systray_icons();
+						}
+					}
 					XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
 				}
 			}
-			XFlush (server.dsp);
-
-			panel = (Panel*)systray.area.panel;
-			if (refresh_systray && panel && !panel->is_hidden) {
-				refresh_systray = 0;
-				// tint2 doen't draw systray icons. it just redraw background.
-				XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap);
-				// force icon's refresh
-				refresh_systray_icon();
-			}
+			XFlush(server.dsp);
 		}

 		// thanks to AngryLlama for the timer
@@ -1171,253 +1245,282 @@ start:
 		}
 		update_next_timeout();
 		if (next_timeout.tv_sec >= 0 && next_timeout.tv_usec >= 0)
-			timeout = &next_timeout;
+			select_timeout = &next_timeout;
 		else
-			timeout = 0;
+			select_timeout = 0;

 		// Wait for X Event or a Timer
-		if (select(maxfd+1, &fdset, 0, 0, timeout) > 0) {
-			if (FD_ISSET(sn_pipe[0], &fdset)) {
+		if (XPending(server.dsp) > 0 || select(maxfd+1, &fdset, 0, 0, select_timeout) >= 0) {
+			if (sn_pipe_valid) {
 				char buffer[1];
-				ssize_t wur = read(sn_pipe[0], buffer, 1);
-				(void) wur;
-				sigchld_handler_async();
+				while (read(sn_pipe[0], buffer, sizeof(buffer)) > 0) {
+					sigchld_handler_async();
+				}
 			}
-			if (FD_ISSET(x11_fd, &fdset)) {
-				while (XPending (server.dsp)) {
-					XNextEvent(server.dsp, &e);
+			if (XPending(server.dsp) > 0) {
+				XNextEvent(server.dsp, &e);
 #if HAVE_SN
-					if (startup_notifications)
-						sn_display_process_event(server.sn_dsp, &e);
+				if (startup_notifications)
+					sn_display_process_event(server.sn_dsp, &e);
 #endif // HAVE_SN

-					panel = get_panel(e.xany.window);
-					if (panel && panel_autohide) {
-						if (e.type == EnterNotify)
-							autohide_trigger_show(panel);
-						else if (e.type == LeaveNotify)
-							autohide_trigger_hide(panel);
-						if (panel->is_hidden) {
-							if (e.type == ClientMessage && e.xclient.message_type == server.atom.XdndPosition) {
-								hidden_dnd = 1;
-								autohide_show(panel);
-							}
-							else
-								continue;   // discard further processing of this event because the panel is not visible yet
+				panel = get_panel(e.xany.window);
+				if (panel && panel_autohide) {
+					if (e.type == EnterNotify)
+						autohide_trigger_show(panel);
+					else if (e.type == LeaveNotify)
+						autohide_trigger_hide(panel);
+					if (panel->is_hidden) {
+						if (e.type == ClientMessage && e.xclient.message_type == server.atom.XdndPosition) {
+							hidden_dnd = 1;
+							autohide_show(panel);
 						}
-						else if (hidden_dnd && e.type == ClientMessage && e.xclient.message_type == server.atom.XdndLeave) {
-							hidden_dnd = 0;
-							autohide_hide(panel);
-						}
-					}
-
-					switch (e.type) {
-					case ButtonPress:
-						tooltip_hide(0);
-						event_button_press (&e);
-						break;
-
-					case ButtonRelease:
-						event_button_release(&e);
-						break;
-
-					case MotionNotify: {
-						unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
-						if (e.xmotion.state & button_mask)
-							event_button_motion_notify (&e);
-
-						Panel* panel = get_panel(e.xmotion.window);
-						Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
-						if (area->_get_tooltip_text)
-							tooltip_trigger_show(area, panel, &e);
 						else
-							tooltip_trigger_hide();
+							continue;   // discard further processing of this event because the panel is not visible yet
+					}
+					else if (hidden_dnd && e.type == ClientMessage && e.xclient.message_type == server.atom.XdndLeave) {
+						hidden_dnd = 0;
+						autohide_hide(panel);
+					}
+				}
+
+				switch (e.type) {
+				case ButtonPress:
+					tooltip_hide(0);
+					event_button_press (&e);
+					break;
+
+				case ButtonRelease:
+					event_button_release(&e);
+					break;
+
+				case MotionNotify: {
+					unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
+					if (e.xmotion.state & button_mask)
+						event_button_motion_notify (&e);
+
+					Panel* panel = get_panel(e.xmotion.window);
+					Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
+					if (area->_get_tooltip_text)
+						tooltip_trigger_show(area, panel, &e);
+					else
+						tooltip_trigger_hide();
+					break;
+				}
+
+				case LeaveNotify:
+					tooltip_trigger_hide();
+					break;
+
+				case Expose:
+					event_expose(&e);
+					break;
+
+				case PropertyNotify:
+					event_property_notify(&e);
+					break;
+
+				case ConfigureNotify:
+					event_configure_notify(&e);
+					break;
+
+				case ConfigureRequest:
+					// 'win' is a trayer icon
+					for (it = systray.list_icons; it ; it = g_slist_next(it)) {
+						TrayWindow *traywin = (TrayWindow*)it->data;
+						if (traywin->win == e.xany.window) {
+							systray_reconfigure_event(traywin, &e);
+							break;
+						}
+					}
+					break;
+
+				case ResizeRequest:
+					// 'win' is a trayer icon
+					for (it = systray.list_icons; it ; it = g_slist_next(it)) {
+						TrayWindow *traywin = (TrayWindow*)it->data;
+						if (traywin->win == e.xany.window) {
+							systray_resize_request_event(traywin, &e);
+							break;
+						}
+					}
+					break;
+
+				case ReparentNotify:
+					if (!systray_enabled)
+						break;
+					panel = (Panel*)systray.area.panel;
+					if (e.xany.window == panel->main_win) // don't care
+						break;
+					for (it = systray.list_icons; it; it = g_slist_next(it)) {
+						TrayWindow *traywin = (TrayWindow*)it->data;
+						if (traywin->win == e.xreparent.window) {
+							if (traywin->parent == e.xreparent.parent) {
+								embed_icon(traywin);
+							} else {
+								remove_icon(traywin);
+							}
+							break;
+						}
+					}
+					break;
+				case UnmapNotify:
+					break;
+				case DestroyNotify:
+					if (e.xany.window == server.composite_manager) {
+						// Stop real_transparency
+						fprintf(stderr, "Detected compositor shutdown, restarting tint2...\n");
+						signal_pending = SIGUSR1;
 						break;
 					}
-
-					case LeaveNotify:
-						tooltip_trigger_hide();
+					if (e.xany.window == g_tooltip.window || !systray_enabled)
 						break;
-
-					case Expose:
-						event_expose(&e);
-						break;
-
-					case PropertyNotify:
-						event_property_notify(&e);
-						break;
-
-					case ConfigureNotify:
-						event_configure_notify (e.xconfigure.window);
-						break;
-
-					case ReparentNotify:
-						if (!systray_enabled)
+					for (it = systray.list_icons; it; it = g_slist_next(it)) {
+						if (((TrayWindow*)it->data)->win == e.xany.window) {
+							systray_destroy_event((TrayWindow*)it->data);
 							break;
-						panel = (Panel*)systray.area.panel;
-						if (e.xany.window == panel->main_win) // reparented to us
-							break;
-						// FIXME: 'reparent to us' badly detected => disabled
-						break;
-					case UnmapNotify:
-					case DestroyNotify:
-						if (e.xany.window == server.composite_manager) {
+						}
+					}
+					break;
+
+				case ClientMessage:
+					ev = &e.xclient;
+					if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
+						if (ev->data.l[2] == None)
 							// Stop real_transparency
 							signal_pending = SIGUSR1;
-							break;
-						}
-						if (e.xany.window == g_tooltip.window || !systray_enabled)
-							break;
-						for (it = systray.list_icons; it; it = g_slist_next(it)) {
-							if (((TrayWindow*)it->data)->win == e.xany.window) {
-								remove_icon((TrayWindow*)it->data);
-								break;
+						else
+							// Start real_transparency
+							signal_pending = SIGUSR1;
+					}
+					if (systray_enabled && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
+						net_message(&e.xclient);
+					}
+					else if (e.xclient.message_type == server.atom.XdndEnter) {
+						dnd_enter(&e.xclient);
+					}
+					else if (e.xclient.message_type == server.atom.XdndPosition) {
+						dnd_position(&e.xclient);
+					}
+					else if (e.xclient.message_type == server.atom.XdndDrop) {
+						dnd_drop(&e.xclient);
+					}
+					break;
+
+				case SelectionNotify:
+				{
+					Atom target = e.xselection.target;
+
+					fprintf(stderr, "DnD %s:%d: A selection notify has arrived!\n", __FILE__, __LINE__);
+					fprintf(stderr, "DnD %s:%d: Requestor = %lu\n", __FILE__, __LINE__, e.xselectionrequest.requestor);
+					fprintf(stderr, "DnD %s:%d: Selection atom = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e.xselection.selection));
+					fprintf(stderr, "DnD %s:%d: Target atom    = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, target));
+					fprintf(stderr, "DnD %s:%d: Property atom  = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e.xselection.property));
+
+					if (e.xselection.property != None && dnd_launcher_exec) {
+						Property prop = read_property(server.dsp, dnd_target_window, dnd_selection);
+
+						//If we're being given a list of targets (possible conversions)
+						if (target == server.atom.TARGETS && !dnd_sent_request) {
+							dnd_sent_request = 1;
+							dnd_atom = pick_target_from_targets(server.dsp, prop);
+
+							if (dnd_atom == None) {
+								fprintf(stderr, "No matching datatypes.\n");
+							} else {
+								//Request the data type we are able to select
+								fprintf(stderr, "Now requsting type %s", GetAtomName(server.dsp, dnd_atom));
+								XConvertSelection(server.dsp, dnd_selection, dnd_atom, dnd_selection, dnd_target_window, CurrentTime);
 							}
-						}
-						break;
+						} else if (target == dnd_atom) {
+							//Dump the binary data
+							fprintf(stderr, "DnD %s:%d: Data begins:\n", __FILE__, __LINE__);
+							fprintf(stderr, "--------\n");
+							int i;
+							for (i = 0; i < prop.nitems * prop.format/8; i++)
+								fprintf(stderr, "%c", ((char*)prop.data)[i]);
+							fprintf(stderr, "--------\n");

-					case ClientMessage:
-						ev = &e.xclient;
-						if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
-							if (ev->data.l[2] == None)
-								// Stop real_transparency
-								signal_pending = SIGUSR1;
-							else
-								// Start real_transparency
-								signal_pending = SIGUSR1;
-						}
-						if (systray_enabled && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
-							net_message(&e.xclient);
-						}
-						else if (e.xclient.message_type == server.atom.XdndEnter) {
-							dnd_enter(&e.xclient);
-						}
-						else if (e.xclient.message_type == server.atom.XdndPosition) {
-							dnd_position(&e.xclient);
-						}
-						else if (e.xclient.message_type == server.atom.XdndDrop) {
-							dnd_drop(&e.xclient);
-						}
-						break;
-
-					case SelectionNotify:
-					{
-						Atom target = e.xselection.target;
-
-						fprintf(stderr, "DnD %s:%d: A selection notify has arrived!\n", __FILE__, __LINE__);
-						fprintf(stderr, "DnD %s:%d: Requestor = %lu\n", __FILE__, __LINE__, e.xselectionrequest.requestor);
-						fprintf(stderr, "DnD %s:%d: Selection atom = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e.xselection.selection));
-						fprintf(stderr, "DnD %s:%d: Target atom    = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, target));
-						fprintf(stderr, "DnD %s:%d: Property atom  = %s\n", __FILE__, __LINE__, GetAtomName(server.dsp, e.xselection.property));
-
-						if (e.xselection.property != None && dnd_launcher_exec) {
-							Property prop = read_property(server.dsp, dnd_target_window, dnd_selection);
-
-							//If we're being given a list of targets (possible conversions)
-							if (target == server.atom.TARGETS && !dnd_sent_request) {
-								dnd_sent_request = 1;
-								dnd_atom = pick_target_from_targets(server.dsp, prop);
-
-								if (dnd_atom == None) {
-									fprintf(stderr, "No matching datatypes.\n");
+							int cmd_length = 0;
+							cmd_length += 1; // (
+							cmd_length += strlen(dnd_launcher_exec) + 1; // exec + space
+							cmd_length += 1; // open double quotes
+							for (i = 0; i < prop.nitems * prop.format/8; i++) {
+								char c = ((char*)prop.data)[i];
+								if (c == '\n') {
+									if (i < prop.nitems * prop.format/8 - 1) {
+										cmd_length += 3; // close double quotes, space, open double quotes
+									}
+								} else if (c == '\r') {
 								} else {
-									//Request the data type we are able to select
-									fprintf(stderr, "Now requsting type %s", GetAtomName(server.dsp, dnd_atom));
-									XConvertSelection(server.dsp, dnd_selection, dnd_atom, dnd_selection, dnd_target_window, CurrentTime);
-								}
-							} else if (target == dnd_atom) {
-								//Dump the binary data
-								fprintf(stderr, "DnD %s:%d: Data begins:\n", __FILE__, __LINE__);
-								fprintf(stderr, "--------\n");
-								int i;
-								for (i = 0; i < prop.nitems * prop.format/8; i++)
-									fprintf(stderr, "%c", ((char*)prop.data)[i]);
-								fprintf(stderr, "--------\n");
-
-								int cmd_length = 0;
-								cmd_length += 1; // (
-								cmd_length += strlen(dnd_launcher_exec) + 1; // exec + space
-								cmd_length += 1; // open double quotes
-								for (i = 0; i < prop.nitems * prop.format/8; i++) {
-									char c = ((char*)prop.data)[i];
-									if (c == '\n') {
-										if (i < prop.nitems * prop.format/8 - 1) {
-											cmd_length += 3; // close double quotes, space, open double quotes
-										}
-									} else if (c == '\r') {
-									} else {
-										cmd_length += 1; // 1 character
-										if (c == '`' || c == '$' || c == '\\') {
-											cmd_length += 1; // escape with one backslash
-										}
+									cmd_length += 1; // 1 character
+									if (c == '`' || c == '$' || c == '\\') {
+										cmd_length += 1; // escape with one backslash
 									}
 								}
-								cmd_length += 1; // close double quotes
-								cmd_length += 2; // &)
-								cmd_length += 1; // terminator
-
-								char *cmd = calloc(cmd_length, 1);
-								cmd[0] = '\0';
-								strcat(cmd, "(");
-								strcat(cmd, dnd_launcher_exec);
-								strcat(cmd, " \"");
-								for (i = 0; i < prop.nitems * prop.format/8; i++) {
-									char c = ((char*)prop.data)[i];
-									if (c == '\n') {
-										if (i < prop.nitems * prop.format/8 - 1) {
-											strcat(cmd, "\" \"");
-										}
-									} else if (c == '\r') {
-									} else {
-										if (c == '`' || c == '$' || c == '\\') {
-											strcat(cmd, "\\");
-										}
-										char sc[2];
-										sc[0] = c;
-										sc[1] = '\0';
-										strcat(cmd, sc);
-									}
-								}
-								strcat(cmd, "\"");
-								strcat(cmd, "&)");
-								fprintf(stderr, "DnD %s:%d: Running command: %s\n", __FILE__, __LINE__, cmd);
-								tint_exec(cmd);
-								free(cmd);
-
-								// Reply OK.
-								XClientMessageEvent m;
-								memset(&m, 0, sizeof(m));
-								m.type = ClientMessage;
-								m.display = server.dsp;
-								m.window = dnd_source_window;
-								m.message_type = server.atom.XdndFinished;
-								m.format = 32;
-								m.data.l[0] = dnd_target_window;
-								m.data.l[1] = 1;
-								m.data.l[2] = server.atom.XdndActionCopy; //We only ever copy.
-								XSendEvent(server.dsp, dnd_source_window, False, NoEventMask, (XEvent*)&m);
-								XSync(server.dsp, False);
 							}
+							cmd_length += 1; // close double quotes
+							cmd_length += 2; // &)
+							cmd_length += 1; // terminator

-							XFree(prop.data);
+							char *cmd = calloc(cmd_length, 1);
+							cmd[0] = '\0';
+							strcat(cmd, "(");
+							strcat(cmd, dnd_launcher_exec);
+							strcat(cmd, " \"");
+							for (i = 0; i < prop.nitems * prop.format/8; i++) {
+								char c = ((char*)prop.data)[i];
+								if (c == '\n') {
+									if (i < prop.nitems * prop.format/8 - 1) {
+										strcat(cmd, "\" \"");
+									}
+								} else if (c == '\r') {
+								} else {
+									if (c == '`' || c == '$' || c == '\\') {
+										strcat(cmd, "\\");
+									}
+									char sc[2];
+									sc[0] = c;
+									sc[1] = '\0';
+									strcat(cmd, sc);
+								}
+							}
+							strcat(cmd, "\"");
+							strcat(cmd, "&)");
+							fprintf(stderr, "DnD %s:%d: Running command: %s\n", __FILE__, __LINE__, cmd);
+							tint_exec(cmd);
+							free(cmd);
+
+							// Reply OK.
+							XClientMessageEvent m;
+							memset(&m, 0, sizeof(m));
+							m.type = ClientMessage;
+							m.display = server.dsp;
+							m.window = dnd_source_window;
+							m.message_type = server.atom.XdndFinished;
+							m.format = 32;
+							m.data.l[0] = dnd_target_window;
+							m.data.l[1] = 1;
+							m.data.l[2] = server.atom.XdndActionCopy; //We only ever copy.
+							XSendEvent(server.dsp, dnd_source_window, False, NoEventMask, (XEvent*)&m);
+							XSync(server.dsp, False);
 						}

-						break;
+						XFree(prop.data);
 					}

-					default:
-						if (e.type == XDamageNotify+damage_event) {
-							// union needed to avoid strict-aliasing warnings by gcc
-							union { XEvent e; XDamageNotifyEvent de; } event_union = {.e=e};
-							TrayWindow *traywin;
-							GSList *l;
-							XDamageNotifyEvent* de = &event_union.de;
-							for (l = systray.list_icons; l ; l = l->next) {
-								traywin = (TrayWindow*)l->data;
-								if ( traywin->parent == de->drawable ) {
-									systray_render_icon(traywin);
-									break;
-								}
+					break;
+				}
+
+				default:
+					if (e.type == XDamageNotify+damage_event) {
+						XDamageNotifyEvent *de = (XDamageNotifyEvent*)&e;
+						GSList *l;
+						for (l = systray.list_icons; l ; l = l->next) {
+							TrayWindow *traywin = (TrayWindow*)l->data;
+							if (traywin->parent == de->drawable) {
+								systray_render_icon(traywin);
+								break;
 							}
 						}
 					}
@@ -1432,7 +1535,6 @@ start:
 			if (signal_pending == SIGUSR1) {
 				// restart tint2
 				// SIGUSR1 used when : user's signal, composite manager stop/start or xrandr
-				FD_CLR (x11_fd, &fdset); // not sure if needed
 				goto start;
 			}
 			else {
--- a/src/tint2conf/CMakeLists.txt
+++ b/src/tint2conf/CMakeLists.txt
@@ -20,6 +20,7 @@ include_directories( ../util
                     ${RSVG_INCLUDE_DIRS} )

 set(SOURCES ../util/common.c
+			../util/strnatcmp.c
 			../config.c
            ../server.c
            ../launcher/apps-common.c
--- a/src/tint2conf/main.c
+++ b/src/tint2conf/main.c
@@ -18,6 +18,7 @@
 **************************************************************************/

 #include <time.h>
+#include <unistd.h>

 #ifdef HAVE_VERSION_H
 #include "version.h"
@@ -65,6 +66,7 @@ static void menuImportDefault();
 static void menuSaveAs();
 static void menuDelete();
 static void edit_current_theme();
+static void set_current_theme();
 static void refresh_current_theme();
 static void menuAbout();
 static gboolean view_onPopupMenu(GtkWidget *treeview, gpointer userdata);
@@ -110,6 +112,7 @@ static const char *global_ui =
 	"  </menubar>"
 	"  <toolbar  name='ToolBar'>"
 	"    <toolitem action='ThemeProperties'/>"
+	"    <toolitem action='ThemeSelect'/>"
 	"  </toolbar>"
 	"  <popup  name='ThemePopup'>"
 	"    <menuitem action='ThemeProperties'/>"
@@ -129,7 +132,10 @@ int main(int argc, char **argv)
 	GtkActionGroup *actionGroup;

 	gtk_init(&argc, &argv);
-	g_thread_init((NULL));
+
+#if !GLIB_CHECK_VERSION(2, 31, 0)
+	g_thread_init(NULL);
+#endif

 	{
 		gchar *tint2_config_dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL);
@@ -162,6 +168,7 @@ int main(int argc, char **argv)
 		{"ThemeSaveAs", GTK_STOCK_SAVE_AS, _("_Save as..."), NULL, _("Save theme as"), G_CALLBACK(menuSaveAs)},
 		{"ThemeDelete", GTK_STOCK_DELETE, _("_Delete"), NULL, _("Delete theme"), G_CALLBACK(menuDelete)},
 		{"ThemeProperties", GTK_STOCK_PROPERTIES, _("_Edit theme..."), NULL, _("Edit selected theme"), G_CALLBACK(edit_current_theme)},
+		{"ThemeSelect", GTK_STOCK_APPLY, _("_Make default"), NULL, _("Replace the default theme with the selected one"), G_CALLBACK(set_current_theme)},
 		{"ThemeQuit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", _("Quit"), G_CALLBACK(gtk_main_quit)},
 		{"EditMenu", NULL, _("Edit"), NULL, NULL, NULL},
 		{"EditRefresh", GTK_STOCK_REFRESH, _("Refresh"), NULL, _("Refresh"), G_CALLBACK(refresh_current_theme)},
@@ -482,6 +489,33 @@ static void edit_current_theme()
 	}
 }

+static void set_current_theme()
+{
+	GtkTreeSelection *sel;
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	gchar *file;
+
+	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view));
+	if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) {
+		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file,  -1);
+		// config_read_file(file);
+
+		gchar *main_file = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
+		{
+			gchar *backup_path = g_strdup_printf("%s.backup.%ld", main_file, time(NULL));
+			copy_file(main_file, backup_path);
+			g_free(backup_path);
+		}
+		copy_file(file, main_file);
+		int unused = system("killall -SIGUSR1 tint2 || pkill -SIGUSR1 -x tint2");
+		(void)unused;
+		g_free(file);
+		select_first_theme();
+		refresh_current_theme();
+	}
+}
+
 static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
 {
 	edit_current_theme();
@@ -489,8 +523,56 @@ static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeV

 // ====== Theme load/reload ======

+static void copy_default_themes()
+{
+	gchar *path_home = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
+	if (!g_file_test(path_home, G_FILE_TEST_EXISTS)) {
+		const gchar * const * system_dirs = g_get_system_config_dirs();
+		int i;
+		for (i = 0; system_dirs[i]; i++) {
+			gchar *path = g_build_filename(system_dirs[i], "tint2", "tint2rc", NULL);
+			if (g_file_test(path, G_FILE_TEST_EXISTS)) {
+				copy_file(path, path_home);
+			}
+			g_free(path);
+		}
+	}
+	g_free(path_home);
+
+	const gchar * const * data_dirs = g_get_system_data_dirs();
+	int i;
+	for (i = 0; data_dirs[i]; i++) {
+		gchar *path_tint2 = g_build_filename(data_dirs[i], "tint2", NULL);
+		fprintf(stderr, "%s\n", path_tint2);
+		GDir *dir = g_dir_open(path_tint2, 0, NULL);
+		if (dir) {
+			const gchar *file_name;
+			while ((file_name = g_dir_read_name(dir))) {
+				if (!g_file_test(file_name, G_FILE_TEST_IS_DIR) &&
+					!strstr(file_name, "backup") &&
+					!strstr(file_name, "copy") &&
+					!strstr(file_name, "~") &&
+					(endswith(file_name, "tint2rc") ||
+					 endswith(file_name, ".conf"))) {
+					gchar *path_home = g_build_filename(g_get_user_config_dir(), "tint2", file_name, NULL);
+					if (!g_file_test(path_home, G_FILE_TEST_EXISTS)) {
+						gchar *path_usr = g_build_filename(path_tint2, file_name, NULL);
+						copy_file(path_usr, path_home);
+						g_free(path_usr);
+					}
+					g_free(path_home);
+				}
+			}
+			g_dir_close(dir);
+		}
+		g_free(path_tint2);
+	}
+}
+
 static void load_all_themes()
 {
+	copy_default_themes();
+
 	gtk_list_store_clear(GTK_LIST_STORE(g_store));

 	gchar *tint2_config_dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL);
@@ -500,6 +582,7 @@ static void load_all_themes()
 		return;
 	}
 	gboolean found_theme = FALSE;
+
 	const gchar *file_name;
 	while ((file_name = g_dir_read_name(dir))) {
 		if (!g_file_test(file_name, G_FILE_TEST_IS_DIR) &&
@@ -515,12 +598,7 @@ static void load_all_themes()
 		}
 	}

-	if (!found_theme) {
-		gchar *path_tint2rc = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL);
-		copy_file(get_default_config_path(), path_tint2rc);
-		g_free(path_tint2rc);
-		load_all_themes();
-	} else {
+	if (found_theme) {
 		select_first_theme();

 		GtkTreeIter iter;
--- a/src/tint2conf/po/bs.po
+++ b/src/tint2conf/po/bs.po
--- a/src/tint2conf/po/fr.po
+++ b/src/tint2conf/po/fr.po
--- a/src/tint2conf/po/hr.po
+++ b/src/tint2conf/po/hr.po
--- a/src/tint2conf/po/pl.po
+++ b/src/tint2conf/po/pl.po
--- a/src/tint2conf/po/readme.txt
+++ b/src/tint2conf/po/readme.txt
@@ -0,0 +1,11 @@
+Updating pot file:
+
+find .. -name '*.c' | xargs xgettext --keyword=_ --language=C --output=updated.pot -
+
+Followed by manual editing of updated.pot to make sure the header is OK. Then:
+
+cat updated.pot > tint2conf.pot && rm -f updated.pot
+
+Then update the po files:
+
+for f in *.po ; do lang=$(basename $f .po); echo $lang ; msgmerge -i -o $lang.pox $lang.po tint2conf.pot ; cat ${lang}.pox > ${lang}.po ; rm ${lang}.pox ; done
--- a/src/tint2conf/po/sr.po
+++ b/src/tint2conf/po/sr.po
--- a/src/tint2conf/po/tint2conf.pot
+++ b/src/tint2conf/po/tint2conf.pot
--- a/src/tint2conf/properties.c
+++ b/src/tint2conf/properties.c
@@ -23,6 +23,7 @@
 #include "../launcher/apps-common.h"
 #include "../launcher/icon-theme-common.h"
 #include "../util/common.h"
+#include "strnatcmp.h"

 #define ROW_SPACING 10
 #define COL_SPACING 8
@@ -83,6 +84,7 @@ GtkWidget *task_iconified_color, *task_iconified_color_set,
 // clock
 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_background;

@@ -90,6 +92,7 @@ GtkWidget *clock_background;
 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_background;
+GtkWidget *battery_left_command, *battery_mclick_command, *battery_right_command, *battery_uwheel_command, *battery_dwheel_command;

 // systray
 GtkWidget *systray_icon_order, *systray_padding_x, *systray_padding_y, *systray_spacing;
@@ -1769,23 +1772,84 @@ void load_desktop_file(const char *file, gboolean selected)
 	free_desktop_entry(&entry);
 }

-void load_desktop_files(const gchar *path)
+void populate_from_entries(GList *entries, gboolean selected)
 {
+	GList *l;
+	for (l = entries; l; l = l->next) {
+		DesktopEntry *entry = (DesktopEntry *)l->data;
+		GdkPixbuf *pixbuf = load_icon(entry->icon);
+		GtkTreeIter iter;
+		gtk_list_store_append(selected ? launcher_apps : all_apps, &iter);
+		gtk_list_store_set(selected ? launcher_apps :all_apps, &iter,
+						   appsColIcon, pixbuf,
+						   appsColText, g_strdup(entry->name),
+						   appsColPath, g_strdup(entry->path),
+						   appsColIconName, g_strdup(entry->icon),
+						   -1);
+		if (pixbuf)
+			g_object_unref(pixbuf);
+	}
+}
+
+static gint compare_entries(gconstpointer a, gconstpointer b)
+{
+   return strnatcasecmp(((DesktopEntry*)a)->name, ((DesktopEntry*)b)->name);
+}
+
+void load_desktop_entry(const char *file, GList **entries)
+{
+	DesktopEntry *entry = calloc(1, sizeof(DesktopEntry));
+	if (!read_desktop_file(file, entry))
+		printf("Could not load %s\n", file);
+	if (!entry->name)
+		entry->name = strdup(file);
+	if (!entry->icon)
+		entry->icon = strdup("");
+	*entries = g_list_append(*entries, entry);
+}
+
+static gint compare_strings(gconstpointer a, gconstpointer b)
+{
+   return strnatcasecmp((const char*)a, (const char*)b);
+}
+
+void load_desktop_entries(const char *path, GList **entries)
+{
+	GList *subdirs = NULL;
+	GList *files = NULL;
+
 	GDir *d = g_dir_open(path, 0, NULL);
-	if (!d)
-		return;
-	const gchar *name;
-	while ((name = g_dir_read_name(d))) {
-		gchar *file = g_build_filename(path, name, NULL);
-		if (!g_file_test(file, G_FILE_TEST_IS_DIR) &&
-			g_str_has_suffix(file, ".desktop")) {
-			load_desktop_file(file, FALSE);
-		} else if (g_file_test(file, G_FILE_TEST_IS_DIR)) {
-			load_desktop_files(file);
+	if (d) {
+		const gchar *name;
+		while ((name = g_dir_read_name(d))) {
+			gchar *file = g_build_filename(path, name, NULL);
+			if (!g_file_test(file, G_FILE_TEST_IS_DIR) && g_str_has_suffix(file, ".desktop")) {
+				files = g_list_append(files, file);
+			} else if (g_file_test(file, G_FILE_TEST_IS_DIR)) {
+				subdirs = g_list_append(subdirs, file);
+			} else {
+				g_free(file);
+			}
 		}
+		g_dir_close(d);
+	}
+
+	subdirs = g_list_sort(subdirs, compare_strings);
+	GList *l;
+	for (l = subdirs; l; l = g_list_next(l)) {
+		gchar *dir = (gchar *)l->data;
+		load_desktop_entries(dir, entries);
+		g_free(dir);
+	}
+	g_list_free(subdirs);
+
+	files = g_list_sort(files, compare_strings);
+	for (l = files; l; l = g_list_next(l)) {
+		gchar *file = (gchar *)l->data;
+		load_desktop_entry(file, entries);
 		g_free(file);
 	}
-	g_dir_close(d);
+	g_list_free(files);
 }

 void load_theme_file(const char *file_name, const char *theme)
@@ -2215,10 +2279,20 @@ void create_launcher(GtkWidget *parent)
 	fprintf(stderr, "Icon themes loaded\n");

 	fprintf(stderr, "Loading .desktop files\n");
-	load_desktop_files("/usr/share/applications");
-	load_desktop_files("/usr/local/share/applications");
+	GList *entries = NULL;
+	load_desktop_entries("/usr/share/applications", &entries);
+	load_desktop_entries("/usr/local/share/applications", &entries);
 	gchar *path = g_build_filename(g_get_home_dir(), ".local/share/applications", NULL);
-	load_desktop_files(path);
+	load_desktop_entries(path, &entries);
+	entries = g_list_sort(entries, compare_entries);
+	populate_from_entries(entries, FALSE);
+
+	GList *l;
+	for (l = entries; l; l = l->next) {
+		free_desktop_entry((DesktopEntry*)l->data);
+	}
+	g_list_free(entries);
+
 	g_free(path);

 	icon_theme_changed();
@@ -3244,7 +3318,7 @@ void create_clock(GtkWidget *parent)
 	gtk_widget_show(label);
 	gtk_box_pack_start(GTK_BOX(parent), label, FALSE, FALSE, 0);

-	table = gtk_table_new(2, 10, FALSE);
+	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);
@@ -3280,6 +3354,51 @@ void create_clock(GtkWidget *parent)
 	gtk_tooltips_set_tip(tooltips, clock_right_command,
 						 _("Specifies a command that will be executed when the clock 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++;
+
+	clock_mclick_command = gtk_entry_new();
+	gtk_widget_show(clock_mclick_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(clock_mclick_command), 50);
+	gtk_table_attach(GTK_TABLE(table), clock_mclick_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, clock_mclick_command,
+						 _("Specifies a command that will be executed when the clock 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++;
+
+	clock_uwheel_command = gtk_entry_new();
+	gtk_widget_show(clock_uwheel_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(clock_uwheel_command), 50);
+	gtk_table_attach(GTK_TABLE(table), clock_uwheel_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, clock_uwheel_command,
+						 _("Specifies a command that will be executed when the clock 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++;
+
+	clock_dwheel_command = gtk_entry_new();
+	gtk_widget_show(clock_dwheel_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(clock_dwheel_command), 50);
+	gtk_table_attach(GTK_TABLE(table), clock_dwheel_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, clock_dwheel_command,
+						 _("Specifies a command that will be executed when the clock receives a mouse scroll down."), NULL);
+
 	change_paragraph(parent);

 	label = gtk_label_new(_("<b>Appearance</b>"));
@@ -3697,6 +3816,95 @@ void create_battery(GtkWidget *parent)

 	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++;
+
+	battery_left_command = gtk_entry_new();
+	gtk_widget_show(battery_left_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(battery_left_command), 50);
+	gtk_table_attach(GTK_TABLE(table), battery_left_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, battery_left_command,
+						 _("Specifies a command that will be executed when the battery 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++;
+
+	battery_right_command = gtk_entry_new();
+	gtk_widget_show(battery_right_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(battery_right_command), 50);
+	gtk_table_attach(GTK_TABLE(table), battery_right_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, battery_right_command,
+						 _("Specifies a command that will be executed when the battery 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++;
+
+	battery_mclick_command = gtk_entry_new();
+	gtk_widget_show(battery_mclick_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(battery_mclick_command), 50);
+	gtk_table_attach(GTK_TABLE(table), battery_mclick_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, battery_mclick_command,
+						 _("Specifies a command that will be executed when the battery 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++;
+
+	battery_uwheel_command = gtk_entry_new();
+	gtk_widget_show(battery_uwheel_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(battery_uwheel_command), 50);
+	gtk_table_attach(GTK_TABLE(table), battery_uwheel_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, battery_uwheel_command,
+						 _("Specifies a command that will be executed when the battery 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++;
+
+	battery_dwheel_command = gtk_entry_new();
+	gtk_widget_show(battery_dwheel_command);
+	gtk_entry_set_width_chars(GTK_ENTRY(battery_dwheel_command), 50);
+	gtk_table_attach(GTK_TABLE(table), battery_dwheel_command, col, col+1, row, row+1, GTK_FILL, 0, 0, 0);
+	col++;
+	gtk_tooltips_set_tip(tooltips, battery_dwheel_command,
+						 _("Specifies a command that will be executed when the battery 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);
--- a/src/tint2conf/properties.h
+++ b/src/tint2conf/properties.h
@@ -87,6 +87,7 @@ extern GtkWidget *task_iconified_color, *task_iconified_color_set,
 // clock
 extern GtkWidget *clock_format_line1, *clock_format_line2, *clock_tmz_line1, *clock_tmz_line2;
 extern GtkWidget *clock_left_command, *clock_right_command;
+extern GtkWidget *clock_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_background;

@@ -94,6 +95,7 @@ extern GtkWidget *clock_background;
 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_background;
+extern GtkWidget *battery_left_command, *battery_mclick_command, *battery_right_command, *battery_uwheel_command, *battery_dwheel_command;

 // systray
 extern GtkWidget *systray_icon_order, *systray_padding_x, *systray_padding_y, *systray_spacing;
--- a/src/tint2conf/properties_rw.c
+++ b/src/tint2conf/properties_rw.c
@@ -511,7 +511,7 @@ void config_write_launcher(FILE *fp)
 		g_strstrip(dir);
 		if (strlen(dir) > 0) {
 			char *contracted = contract_tilde(dir);
-			fprintf(fp, "launcher_item_app = %s\n", contracted);
+			fprintf(fp, "launcher_apps_dir = %s\n", contracted);
 			free(contracted);
 		}
 	}
@@ -548,6 +548,9 @@ void config_write_clock(FILE *fp)
 	fprintf(fp, "clock_tooltip_timezone = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_tmz_tooltip)));
 	fprintf(fp, "clock_lclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_left_command)));
 	fprintf(fp, "clock_rclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_right_command)));
+	fprintf(fp, "clock_mclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_mclick_command)));
+	fprintf(fp, "clock_uwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_uwheel_command)));
+	fprintf(fp, "clock_dwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_dwheel_command)));

 	fprintf(fp, "\n");
 }
@@ -573,6 +576,11 @@ void config_write_battery(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_padding_y)));
 	fprintf(fp, "battery_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(battery_background)));
 	fprintf(fp, "battery_hide = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_hide_if_higher)));
+	fprintf(fp, "battery_lclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_left_command)));
+	fprintf(fp, "battery_rclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_right_command)));
+	fprintf(fp, "battery_mclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_mclick_command)));
+	fprintf(fp, "battery_uwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_uwheel_command)));
+	fprintf(fp, "battery_dwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_dwheel_command)));

 	fprintf(fp, "\n");
 }
@@ -747,7 +755,7 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "panel_margin") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(panel_margin_x), atoi(value1));
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(panel_margin_y), atoi(value1));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(panel_margin_y), atoi(value2));
 	}
 	else if (strcmp(key, "panel_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -848,20 +856,18 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "panel_monitor") == 0) {
 		if (strcmp(value, "all") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 0);
-		else if (strcmp(value, "0") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 1);
 		else if (strcmp(value, "1") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 2);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 1);
 		else if (strcmp(value, "2") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 3);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 2);
 		else if (strcmp(value, "3") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 4);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 3);
 		else if (strcmp(value, "4") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 5);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 4);
 		else if (strcmp(value, "5") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 6);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 5);
 		else if (strcmp(value, "6") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 7);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 6);
 	}
 	
 	/* autohide options */
@@ -892,7 +898,7 @@ void add_entry(char *key, char *value)
 	}

 	/* Battery */
-	else if (strcmp(key, "systray") == 0) {
+	else if (strcmp(key, "battery") == 0) {
 		// Obsolete option
 		config_has_battery = 1;
 		config_battery_enabled = atoi(value);
@@ -935,6 +941,21 @@ void add_entry(char *key, char *value)
 		else
 			gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_hide_if_higher), atoi(value));
 	}
+	else if (strcmp(key, "battery_lclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(battery_left_command), value);
+	}
+	else if (strcmp(key, "battery_rclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(battery_right_command), value);
+	}
+	else if (strcmp(key, "battery_mclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(battery_mclick_command), value);
+	}
+	else if (strcmp(key, "battery_uwheel_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(battery_uwheel_command), value);
+	}
+	else if (strcmp(key, "battery_dwheel_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(battery_dwheel_command), value);
+	}

 	/* Clock */
 	else if (strcmp(key, "time1_format") == 0) {
@@ -987,6 +1008,15 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "clock_rclick_command") == 0) {
 		gtk_entry_set_text(GTK_ENTRY(clock_right_command), value);
 	}
+	else if (strcmp(key, "clock_mclick_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(clock_mclick_command), value);
+	}
+	else if (strcmp(key, "clock_uwheel_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(clock_uwheel_command), value);
+	}
+	else if (strcmp(key, "clock_dwheel_command") == 0) {
+		gtk_entry_set_text(GTK_ENTRY(clock_dwheel_command), value);
+	}

 	/* Taskbar */
 	else if (strcmp(key, "taskbar_mode") == 0) {
@@ -1010,13 +1040,13 @@ void add_entry(char *key, char *value)
 	}
 	else if (strcmp(key, "task_align") == 0) {
 		if (strcmp(value, "left") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 0);
 		else if (strcmp(value, "center") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 1);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 1);
 		else if (strcmp(value, "right") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 2);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 2);
 		else
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 0);
 	}
 	else if (strcmp(key, "taskbar_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -1434,4 +1464,4 @@ char *get_action(GtkWidget *combo)
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 10)
 		return "prev_task";
 	return "none";
-}
+}
--- a/src/tint2conf/theme_view.c
+++ b/src/tint2conf/theme_view.c
@@ -19,6 +19,7 @@


 #include "main.h"
+#include "strnatcmp.h"
 #include "theme_view.h"

 // The data columns that we export via the tree model interface
@@ -27,6 +28,11 @@ GtkListStore *g_store;
 int g_width_list, g_height_list;
 GtkCellRenderer *g_renderer;

+gint theme_name_compare(GtkTreeModel *model,
+						GtkTreeIter *a,
+						GtkTreeIter *b,
+						gpointer user_data);
+
 GtkWidget *create_view()
 {
 	GtkTreeViewColumn *col;
@@ -69,21 +75,50 @@ GtkWidget *create_view()
 	GtkTreeSortable *sortable;
 	sortable = GTK_TREE_SORTABLE(g_store);
 	gtk_tree_sortable_set_sort_column_id(sortable, COL_THEME_FILE, GTK_SORT_ASCENDING);
+	gtk_tree_sortable_set_sort_func(sortable, COL_THEME_FILE, theme_name_compare, NULL, NULL);
 	return view;
 }

+gint theme_name_compare(GtkTreeModel *model,
+						GtkTreeIter *a,
+						GtkTreeIter *b,
+						gpointer user_data)
+{
+	gchar *path_a, *path_b;
+	gtk_tree_model_get(model, a, COL_THEME_FILE, &path_a, -1);
+	gtk_tree_model_get(model, b, COL_THEME_FILE, &path_b, -1);
+	gchar *name_a = path_a;
+	gchar *p;
+	for (p = name_a; *p; p++) {
+		if (*p == '/')
+			name_a = p + 1;
+	}
+	gchar *name_b = path_b;
+	for (p = name_b; *p; p++) {
+		if (*p == '/')
+			name_b = p + 1;
+	}
+	if (g_str_equal(name_a, name_b))
+		return 0;
+	if (g_str_equal(name_a, "tint2rc"))
+		return -1;
+	if (g_str_equal(name_b, "tint2rc"))
+		return 1;
+	gint result = strnatcasecmp(name_a, name_b);
+	g_free(path_a);
+	g_free(path_b);
+	return result;
+}

-void custom_list_append(const gchar *name)
+void custom_list_append(const gchar *path)
 {
 	GtkTreeIter  iter;

 	gtk_list_store_append(g_store, &iter);
-	gtk_list_store_set(g_store, &iter, COL_THEME_FILE, name, -1);
+	gtk_list_store_set(g_store, &iter, COL_THEME_FILE, path, -1);

-	gchar *b, *n;
-	b = strrchr(name, '/');
-	n = g_strdup(b+1);
-	gtk_list_store_set(g_store, &iter, COL_THEME_NAME, n, -1);
+	gchar *name = g_strdup(strrchr(path, '/') + 1);
+	gtk_list_store_set(g_store, &iter, COL_THEME_NAME, name, -1);
 }


--- a/src/tint2conf/theme_view.h
+++ b/src/tint2conf/theme_view.h
@@ -10,7 +10,7 @@ enum { COL_THEME_FILE = 0, COL_THEME_NAME, COL_SNAPSHOT, NB_COL, };

 GtkWidget *create_view();

-void custom_list_append(const gchar *name);
+void custom_list_append(const gchar *path);

 #endif

--- a/src/tint2conf/tintwizard.py
+++ b/src/tint2conf/tintwizard.py
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -259,7 +259,7 @@ void tooltip_update()
 }


-void tooltip_trigger_hide(Tooltip* tooltip)
+void tooltip_trigger_hide()
 {
 	if (g_tooltip.mapped) {
 		tooltip_copy_text(0);
--- a/src/util/common.c
+++ b/src/util/common.c
@@ -35,6 +35,9 @@

 void copy_file(const char *pathSrc, const char *pathDest)
 {
+	if (g_str_equal(pathSrc, pathDest))
+		return;
+
 	FILE *fileSrc, *fileDest;
 	char buffer[100];
 	int  nb;
@@ -117,13 +120,13 @@ char *contract_tilde(char *s)
 	if (!home)
 		return strdup(s);

-	char *home_slash = calloc(strlen(home) + 1, 1);
+	char *home_slash = calloc(strlen(home) + 2, 1);
 	strcat(home_slash, home);
 	strcat(home_slash, "/");

 	if ((strcmp(s, home) == 0 ||
 		strstr(s, home_slash) == s)) {
-		char *result = calloc(strlen(s) - strlen(home) + 1, 1);
+		char *result = calloc(strlen(s) - strlen(home) + 2, 1);
 		strcat(result, "~");
 		strcat(result, s + strlen(home));
 		free(home_slash);
@@ -362,9 +365,52 @@ void createHeuristicMask(DATA32* data, int w, int h)
 	}
 }

+int pixelEmpty(DATA32 argb)
+{
+
+	DATA32 a = (argb >> 24) & 0xff;
+	if (a == 0)
+		return 1;
+
+	DATA32 rgb = argb & 0xffFFff;
+	return rgb == 0;
+}
+
+int imageEmpty(DATA32* data, int w, int h)
+{
+	unsigned int x, y;
+
+	if (w > 0 && h > 0) {
+		x = w / 2;
+		y = h / 2;
+		if (!pixelEmpty(data[y * w + x])) {
+			//fprintf(stderr, "Non-empty pixel: [%u, %u] = %x\n", x, y, data[y * w + x]);
+			return 0;
+		}
+	}
+
+	for (y = 0; y < h; y++) {
+		for (x = 0; x < w; x++) {
+			if (!pixelEmpty(data[y * w + x])) {
+				//fprintf(stderr, "Non-empty pixel: [%u, %u] = %x\n", x, y, data[y * w + x]);
+				return 0;
+			}
+		}
+	}
+
+	//fprintf(stderr, "All pixels are empty\n");
+	return 1;
+}

 void render_image(Drawable d, int x, int y)
 {
+	if (!server.real_transparency) {
+		imlib_context_set_blend(1);
+		imlib_context_set_drawable(d);
+		imlib_render_image_on_drawable(x, y);
+		return;
+	}
+
 	int w = imlib_image_get_width(), h = imlib_image_get_height();

 	Pixmap pixmap = XCreatePixmap(server.dsp, server.root_win, w, h, 32);
--- a/src/util/common.h
+++ b/src/util/common.h
@@ -12,6 +12,12 @@
 #include <pango/pangocairo.h>
 #include "area.h"

+#define GREEN  "\033[1;32m"
+#define YELLOW "\033[1;33m"
+#define RED    "\033[31m"
+#define BLUE   "\033[1;34m"
+#define RESET  "\033[0m"
+
 /*
 void fxfree(void** ptr){
  if(*ptr){
@@ -62,6 +68,7 @@ void extract_values (const char *value, char **value1, char **value2, char **val
 // 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);

--- a/src/util/timer.c
+++ b/src/util/timer.c
@@ -393,8 +393,13 @@ void callback_multi_timeout(void* arg)
 		timeout* t = it->data;
 		if (++t->multi_timeout->current_count >= t->multi_timeout->count_to_expiration) {
 			t->_callback(t->arg);
-			t->multi_timeout->current_count = 0;
-			t->timeout_expires = add_msec_to_timespec(cur_time, t->interval_msec);
+			if (multi_timeouts && g_hash_table_lookup(multi_timeouts, t)) {
+				// Timer still exists
+				t->multi_timeout->current_count = 0;
+				t->timeout_expires = add_msec_to_timespec(cur_time, t->interval_msec);
+			} else {
+				return;
+			}
 		}
 		it = it->next;
 	}
@@ -445,3 +450,16 @@ void stop_multi_timeout(timeout* t)
 	}
 	free(mth);
 }
+
+double profiling_get_time_old_time = 0;
+double profiling_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;
+	if (profiling_get_time_old_time == 0)
+		profiling_get_time_old_time = t;
+	double delta = t - profiling_get_time_old_time;
+	profiling_get_time_old_time = t;
+	return delta;
+}
--- a/src/util/timer.h
+++ b/src/util/timer.h
@@ -73,4 +73,9 @@ gint compare_timespecs(const struct timespec* t1, const struct timespec* t2);

 struct timespec add_msec_to_timespec(struct timespec ts, int msec);

+/** Returns the time difference in seconds between the current time and the last time this function was called.
+  * At the first call returns zero.
+**/
+double profiling_get_time();
+
 #endif // TIMER_H
--- a/src/util/window.c
+++ b/src/util/window.c
@@ -131,17 +131,28 @@ int window_get_monitor (Window win)
 	Window src;

 	XTranslateCoordinates(server.dsp, win, server.root_win, 0, 0, &x, &y, &src);
-	x += 2;
-	y += 2;
+	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++) {
 		if (x >= server.monitor[i].x && x <= (server.monitor[i].x + server.monitor[i].width))
-			if (y >= server.monitor[i].y && y <= (server.monitor[i].y + server.monitor[i].height))
-				break;
+			if (y >= server.monitor[i].y && y <= (server.monitor[i].y + server.monitor[i].height)) {
+				int current_right = x < (server.monitor[i].x + server.monitor[i].width);
+				int current_bottom = y < (server.monitor[i].y + server.monitor[i].height);
+				if (best_match < 0 ||
+					(!match_right && current_right) ||
+					(!match_bottom && current_bottom)) {
+					best_match = i;
+				}
+			}
 	}

-	//printf("window %lx : ecran %d, (%d, %d)\n", win, i, x, y);
-	if (i == server.nb_monitor) return 0;
-	else return i;
+	if (best_match < 0)
+		best_match = 0;
+	// printf("window %lx : ecran %d, (%d, %d)\n", win, best_match+1, x, y);
+	return best_match;
 }

 void window_get_coordinates (Window win, int *x, int *y, int *w, int *h)
--- a/tint2.config
+++ b/tint2.config
@@ -0,0 +1,4 @@
+// ADD PREDEFINED MACROS HERE!
+#define HAVE_RSVG 1
+#define HAVE_SN 1
+#define ENABLE_BATTERY 1
--- a/tint2.creator
+++ b/tint2.creator
@@ -0,0 +1 @@
+[General]
--- a/tint2.desktop
+++ b/tint2.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Encoding=UTF-8
 Name=Tint2 panel
-Name[am]=ፓነል  tint2
+Name[am]=ፓነል tint2
 Name[ar]=الشريط tint2
 Name[ast]=Panel tint2
 Name[be]=Панэль tint2
@@ -12,7 +12,7 @@ Name[da]=Panel tint2
 Name[de]=Leiste tint2
 Name[dz]=པེ་ནཱལ། tint2
 Name[el]=Ταμπλό tint2
-Name[en_GB]=Panel tint2
+Name[en]=Tint2 panel
 Name[eo]=Panelo tint2
 Name[es]=Panel tint2
 Name[et]=Ääreriba tint2
@@ -36,7 +36,6 @@ Name[nn]=Panel tint2
 Name[pa]=ਪੈਨਲ tint2
 Name[pl]=Panel tint2
 Name[pt]=Painel tint2
-Name[pt_BR]=Painel tint2
 Name[ro]=Panou tint2
 Name[ru]=Панель tint2
 Name[si]=පුවරුව tint2
@@ -48,12 +47,10 @@ Name[tr]=Panel tint2
 Name[ug]=panel tint2
 Name[uk]=Панель tint2
 Name[ur]=پینل tint2
-Name[ur_PK]=پینل tint2
 Name[vi]=Panel tint2
-Name[zh_CN]=面板 tint2
-Name[zh_TW]=面板 tint2
+Name[zh]=面板 tint2
 Comment=Lightweight panel
-Comment[fr_FR]=Panel léger
+Comment[fr]=Panel léger
 Comment[pl]=Lekki panel
 Exec=tint2
 Icon=taskbar
--- a/tint2.files
+++ b/tint2.files
@@ -0,0 +1,153 @@
+doc/tint2.1
+sample/icon_and_text_1.tint2rc
+sample/icon_and_text_2.tint2rc
+sample/icon_and_text_3.tint2rc
+sample/icon_and_text_4.tint2rc
+sample/icon_only_1.tint2rc
+sample/icon_only_2.tint2rc
+sample/icon_only_3.tint2rc
+sample/icon_only_4.tint2rc
+sample/icon_only_6.tint2rc
+sample/icon_only_7.tint2rc
+sample/text_only_1.tint2rc
+sample/text_only_2.tint2rc
+sample/text_only_3.tint2rc
+sample/text_only_4.tint2rc
+sample/text_only_5.tint2rc
+sample/text_only_6.tint2rc
+sample/tint2rc
+src/battery/battery.c
+src/battery/battery.h
+src/clock/clock.c
+src/clock/clock.h
+src/execplugin/execplugin.c
+src/execplugin/execplugin.h
+src/launcher/launcher.c
+src/launcher/launcher.h
+src/launcher/xsettings-client.c
+src/launcher/xsettings-client.h
+src/launcher/xsettings-common.c
+src/launcher/xsettings-common.h
+src/sysmon/sysmon.c
+src/sysmon/sysmon.h
+src/systray/systraybar.c
+src/systray/systraybar.h
+src/taskbar/task.c
+src/taskbar/task.h
+src/taskbar/taskbar.c
+src/taskbar/taskbar.h
+src/taskbar/taskbarname.c
+src/taskbar/taskbarname.h
+src/tint2conf/CMakeLists.txt
+src/tint2conf/main.c
+src/tint2conf/main.h
+src/tint2conf/properties.c
+src/tint2conf/properties.h
+src/tint2conf/properties_rw.c
+src/tint2conf/properties_rw.h
+src/tint2conf/taskbar.svg
+src/tint2conf/theme_view.c
+src/tint2conf/theme_view.h
+src/tint2conf/tint2conf.desktop
+src/tint2conf/tintwizard.py
+src/tooltip/tooltip.c
+src/tooltip/tooltip.h
+src/util/area.c
+src/util/area.h
+src/util/blur.c
+src/util/blur.h
+src/util/common.c
+src/util/common.h
+src/util/timer.c
+src/util/timer.h
+src/util/window.c
+src/util/window.h
+src/config.c
+src/config.h
+src/panel.c
+src/panel.h
+src/server.c
+src/server.h
+src/tint.c
+AUTHORS
+ChangeLog
+CMakeLists.txt
+COPYING
+default_icon.png
+get_svnrev.sh
+INSTALL.txt
+make_release.sh
+README
+README.source
+src/launcher/apps-common.c
+src/launcher/apps-common.h
+src/launcher/icon-theme-common.c
+src/launcher/icon-theme-common.h
+src/util/strnatcmp.c
+src/util/strnatcmp.h
+get_version.sh
+src/battery/battery.c
+src/battery/battery.h
+src/clock/clock.c
+src/clock/clock.h
+src/launcher/apps-common.c
+src/launcher/apps-common.h
+src/launcher/icon-theme-common.c
+src/launcher/icon-theme-common.h
+src/launcher/launcher.c
+src/launcher/launcher.h
+src/launcher/xsettings-client.c
+src/launcher/xsettings-client.h
+src/launcher/xsettings-common.c
+src/launcher/xsettings-common.h
+src/systray/systraybar.c
+src/systray/systraybar.h
+src/taskbar/task.c
+src/taskbar/task.h
+src/taskbar/taskbar.c
+src/taskbar/taskbar.h
+src/taskbar/taskbarname.c
+src/taskbar/taskbarname.h
+src/tint2conf/CMakeLists.txt
+src/tint2conf/main.c
+src/tint2conf/main.h
+src/tint2conf/properties.c
+src/tint2conf/properties.h
+src/tint2conf/properties_rw.c
+src/tint2conf/properties_rw.h
+src/tint2conf/theme_view.c
+src/tint2conf/theme_view.h
+src/tint2conf/tint2conf.desktop
+src/tint2conf/tint2conf.svg
+src/tint2conf/tintwizard.py
+src/tooltip/tooltip.c
+src/tooltip/tooltip.h
+src/util/area.c
+src/util/area.h
+src/util/common.c
+src/util/common.h
+src/util/strnatcmp.c
+src/util/strnatcmp.h
+src/util/timer.c
+src/util/timer.h
+src/util/window.c
+src/util/window.h
+src/config.c
+src/config.h
+src/panel.c
+src/panel.h
+src/server.c
+src/server.h
+src/tint.c
+po/CMakeLists.txt
+po/LINGUAS
+po/POTFILES.in
+src/tint2conf/po/CMakeLists.txt
+src/tint2conf/po/CMakeLists.txt
+src/tint2conf/po/fr.po
+src/tint2conf/po/tint2conf.pot
+src/tint2conf/po/pl.po
+src/tint2conf/po/tint2conf.pot
+src/freespace/freespace.c
+src/freespace/freespace.h
+src/tint2conf/po/readme.txt
--- a/tint2.includes
+++ b/tint2.includes
@@ -0,0 +1,22 @@
+.
+./src
+./src/battery
+./src/clock
+./src/execplugin
+./src/launcher
+./src/sysmon
+./src/systray
+./src/taskbar
+./src/tint2conf
+./src/tooltip
+./src/util
+/usr/include
+/usr/include/gtk-2.0
+/usr/include/glib-2.0
+/usr/include/gdk-pixbuf-2.0
+/usr/include/cairo
+/usr/include/pango-1.0
+/usr/include/startup-notification-1.0
+po
+src/tint2conf/po
+src/freespace
Author	SHA1	Message	Date
o9000	dc300c0215	Updated for 0.12.2	2015-08-11 09:26:49 +02:00
Sebastian Reichel	257df4ef22	fix battery option parsing Fix copy&paste mistake, battery should be enabled for obsolete "battery" option instead of obsolete "systray" option.	2015-08-07 10:24:20 +02:00
o9000	3a2a734b86	Update author list (Sebastian's info)	2015-08-07 10:23:49 +02:00
o9000	5a526c9328	tint2conf: Fix read of panel_monitor (issue #520 )	2015-08-07 10:23:44 +02:00
Sebastian Reichel	70210fafc7	reset color after systray existing message Currently all messages following the "another systray is running" message are also printed in red. Fix this by reseting the color at the end of the message.	2015-08-07 10:23:36 +02:00
o9000	86d5872408	Systray: do not move empty icons to the side, as it breaks GTK2 StatusIcon blinking (issue #515 )	2015-08-07 10:23:25 +02:00
o9000	419f3f5c21	Fix command line argument processing (issue #516 )	2015-08-07 10:23:14 +02:00
o9000	bdd56bc813	Remove parameter from tooltip_trigger_hide() (issue #516 )	2015-08-07 10:22:34 +02:00
o9000	84c58ce9af	Updated readme for 0.12.1	2015-08-01 21:54:28 +00:00
o9000	184703998b	Updated changelog	2015-08-01 23:50:42 +02:00
o9000	e345c0ddcd	tint2conf: Add more mouse events for clock and battery (issue #505 )	2015-08-01 09:31:11 +02:00
o9000	c874e76343	Merge branch 'moreclicks' into 'master' Moreclicks The two commits in this merge request would allow the user to set up as many as eight extra custom actions via tint2rc. I've been running these changes (minus the up/down wheel actions) for many months without any obvious issues, mainly to adjust laptop screen brightness via a couple of scripts. I've just tested the wheel actions and they appeared to work fine. The clock commit should solve issue #505. I have merely augmented the work of two other people, and appropriate credits/references are indicated in the individual commit messages. See merge request !5	2015-08-01 07:02:51 +00:00
o9000	687f5f2a1b	Systray: use correct pointer type in xembed detection (note: dead code)	2015-08-01 08:45:20 +02:00
o9000	c7aa70f078	Systray: remove SubstructureNotifyMask from XSelectInput	2015-08-01 08:40:56 +02:00
o9000	690fe3f4d8	Systray: remove debugging messages	2015-08-01 08:39:51 +02:00
o9000	c1d0a42bed	Update changelog	2015-08-01 08:30:00 +02:00
o9000	e5cd73f4a7	Add debugging function for showing monitor geometry	2015-08-01 08:25:36 +02:00
o9000	7ffc220891	Taskbar: Use consistent behavior when showing/hiding sticky (all desktop) windows	2015-08-01 08:22:08 +02:00
o9000	2799fe9346	Taskbar: better task monitor detection (issue #511 )	2015-08-01 00:21:25 +02:00
o9000	e2023b7172	systray: Revert break embedding into 2 steps (breaks transparency for Qt icons)	2015-07-31 10:04:41 +02:00
o9000	9224971407	systray: Proper resize redirect handling	2015-07-31 09:58:17 +02:00
o9000	d492f80468	systray: Redirect resize events	2015-07-31 09:31:03 +02:00
o9000	78bc330448	systray: Break embedding into 2 steps	2015-07-30 23:54:46 +02:00
o9000	3805adc9f3	Updated readme	2015-07-30 23:10:07 +02:00
o9000	4e3989f9f5	Revert "taskbar: Add logging for window_get_monitor()" This reverts commit `7162c5dea1`.	2015-07-30 22:56:01 +02:00
o9000	9624b5d558	Revert "taskbar: Add logging for event_configure_notify()" This reverts commit `b99c5c204b`.	2015-07-30 22:55:47 +02:00
o9000	754d9187df	systray: Revert change that removed XSyncs	2015-07-27 09:47:00 +02:00
o9000	a4996c9d3e	Updated readme	2015-07-26 10:31:20 +00:00
o9000	b99c5c204b	taskbar: Add logging for event_configure_notify()	2015-07-26 12:08:59 +02:00
o9000	7162c5dea1	taskbar: Add logging for window_get_monitor()	2015-07-26 11:51:39 +02:00
o9000	e3939a56e1	systray: Set _NET_SYSTEM_TRAY_ICON_SIZE	2015-07-26 11:23:27 +02:00
o9000	ceafe9b281	config: Add missing #if	2015-07-23 23:29:02 +02:00
o9000	263d1ab15f	systray: Remove unused variable	2015-07-23 22:08:56 +02:00
o9000	e76202b355	Fix systray rendering when compositor off	2015-07-23 20:38:33 +02:00
o9000	f68eabcf35	config: Prevent segfault if panel_items appears late in the config file	2015-07-23 19:56:34 +02:00
o9000	e218b3fa96	systray: Prevent segfault if systray disabled	2015-07-23 19:38:26 +02:00
o9000	50e21b4077	systray: Trying some variations	2015-07-19 18:06:45 +02:00
o9000	b6a1a1c0f6	systray: Remove unneeded resize	2015-07-19 17:12:41 +02:00
o9000	15e12142ca	Minor improvements	2015-07-19 17:10:53 +02:00
o9000	b8c1c29df2	systray: Throttle resize events for misbehaving applications	2015-07-19 16:49:05 +02:00
o9000	4a1880ead0	Move things around in the systray code	2015-07-19 16:12:02 +02:00
o9000	57b878d5e4	Remove debug line	2015-07-16 22:33:13 +02:00
o9000	46aab61bf6	Revert "systray: Process XEmbed events according to spec" This reverts commit `227dc8e48a`.	2015-07-16 22:25:18 +02:00
o9000	227dc8e48a	systray: Process XEmbed events according to spec	2015-07-16 21:08:48 +02:00
o9000	68c3205b53	systray: Handle UnmapNotify correctly	2015-07-16 21:08:48 +02:00
o9000	61f0a4ec85	systray: remove icon when reparented away from us	2015-07-16 21:08:47 +02:00
o9000	c606a1a35a	systray: Separate reparenting from embedding	2015-07-16 21:08:47 +02:00
o9000	9933399dc4	systray: Withdraw window before reparenting	2015-07-16 21:08:47 +02:00
o9000	5ce8023ef7	systray: Watch for window events before reparenting	2015-07-16 21:08:47 +02:00
o9000	6438c75faf	systray: A bit of cleanup	2015-07-16 21:08:47 +02:00
o9000	712097ba45	systray: Make sure we redraw the panel when rendering icons	2015-07-16 14:01:57 +02:00
o9000	9a5cb749ed	systray: Workaround for GTK icon resize loop issue	2015-07-16 13:12:42 +02:00
o9000	d730f23027	systray: Trigger icon resize only when necessary	2015-07-16 09:02:13 +02:00
o9000	9f161f2baf	More logging	2015-07-16 08:53:25 +02:00
o9000	2570ae2cf6	systray: Resize icons only if necessary	2015-07-15 09:53:09 +02:00
o9000	8d5c2d8cbb	tint: remove inner loop from the main event loop	2015-07-14 08:33:13 +02:00
o9000	28bf0a437c	Updated readme	2015-07-13 05:31:43 +00:00
berkley4	fd78e6d886	Allow clicking and mousewheeling on the battery panel This commit is the same as vimishor's original [] except that I have added middle-click and up/down mousewheel actions. In order to fix a ftbs I also added guards to panel.c, panel.h & tint.c The following configuration settings have been created :- battery_lclick_command battery_mclick_command battery_rclick_command battery_uwheel_command battery_dwheel_command [] `c78732c46a`	2015-07-13 04:57:16 +01:00
berkley4	e84d963ab6	Allow middle click & up/down mousewheel on the clock The bulk of this commit originally came from David B. Cortarello's patch (see here - https://gitlab.com/o9000/tint2/issues/430), with me adding the up/down mousewheel elements. Under Openbox the middle-click is normally used to display the Openbox menu and the mousewheel to switch desktop. So I needed to modify tint.c in order to prevent openbox intercepting the new actions. This commit creates the following new configuration settings :- clock_mclick_command clock_uwheel_command clock_dwheel_command	2015-07-13 04:10:45 +01:00
o9000	c4fbc2962e	tint2conf: Fix bad read of panel_margin	2015-07-12 22:23:25 +02:00
o9000	a0af851d9d	Updated readme	2015-07-12 16:28:43 +00:00
o9000	477d08b5da	Remove v from git tag when generating version string	2015-07-12 18:24:19 +02:00
o9000	50a07df5d2	Silence g_thread_init warning	2015-07-12 17:54:40 +02:00
o9000	b3cdde78b1	Add define _GNU_SOURCE for getline()	2015-07-12 17:50:59 +02:00
o9000	8207b16598	Updated theme files	2015-07-12 17:40:32 +02:00
o9000	f61f2af2f4	Updated string files for translations	2015-07-12 17:24:43 +02:00
o9000	90805cb526	tint2conf: Better theme management	2015-07-12 17:01:44 +02:00
o9000	04fe80b498	copy_file(): prevent truncating file if src == dest	2015-07-12 17:01:20 +02:00
o9000	60657c9809	Updated themes	2015-07-12 17:00:37 +02:00
o9000	3150b91f80	Install additional themes to /usr/[local/]share/tint2	2015-07-12 17:00:16 +02:00
o9000	7b854d49e3	Update readme	2015-07-12 14:42:47 +02:00
o9000	81a48b8f79	Update changelog	2015-07-12 14:40:00 +02:00
o9000	655ea6f06f	Update build script	2015-07-12 14:36:11 +02:00
o9000	efe9aadb39	Prevent race at startup in detecting screen resolution changes	2015-07-12 14:36:11 +02:00
o9000	c0e1709d57	Capitalize name in desktop shortcut	2015-07-05 15:48:09 +00:00
o9000	ea8a4fbb1e	Capitalize title in desktop shortcut	2015-07-05 10:34:36 +00:00
o9000	093963dadd	Merge branch 'doc-fixes' into 'master' Doc fixes Hi o9000, thanks for resurrecting tint2! Here are some purely "bureaucratic" fixes: I fixed some typo's, updated URLs, and cleaned up a few files. See merge request !4	2015-07-05 10:33:43 +00:00
Sebastiaan Lokhorst	df429e8c34	Clean up .desktop file: remove unnecessary localization, fix English translation, use consistent captitalization of "tint2" (with a lowercase "t").	2015-07-05 11:34:57 +02:00
Sebastiaan Lokhorst	d3c45adf34	Fix some typo's and clean up indentation.	2015-07-05 11:23:57 +02:00
Sebastiaan Lokhorst	043a0f7ab3	Update old Google Code URLs to new GitLab location.	2015-07-05 11:14:00 +02:00
o9000	574b6bc214	tint2conf: Fix typo to load desktop files from subdirectories	2015-07-04 18:41:04 +02:00
o9000	89e4a5a460	Fix crash in tint2conf (wrong string length in allocation)	2015-07-04 18:31:01 +02:00
o9000	2ebc75944e	tint2conf: Sort launchers by name	2015-07-04 17:33:19 +02:00
o9000	acedd48708	Add IDE files	2015-07-04 16:57:45 +02:00
o9000	9fd9d51010	Fix timer bug (again)	2015-07-04 16:47:29 +02:00
o9000	9f8423f2eb	Updated changelog	2015-07-04 13:37:42 +02:00
o9000	8242c969e3	Detect compositor at startup	2015-07-04 13:34:42 +02:00
o9000	7cd5c16fca	Fix crash when calling stop_timeout from the callback of a repeated timer	2015-07-04 13:34:09 +02:00
o9000	290ddc1fea	tint2conf: fix launcher_apps_dir	2015-07-04 08:39:46 +02:00
o9000	47a7013029	Remove noisy debug messages	2015-06-28 11:34:53 +02:00
o9000	a4de005a54	Add missing include	2015-06-26 23:46:43 +02:00
o9000	7ace3a5956	Updated changelog	2015-06-25 14:18:35 +00:00
o9000	5abbf168a9	Cosmetic changes	2015-06-25 15:56:36 +02:00
o9000	4d69a0bc33	tint2: Do not rely only on select() to detect new X events, since we sync the socket in the system tray which messes up select	2015-06-25 15:36:47 +02:00
o9000	222eca4099	systray: (disable_transparency=1) detect empty icons whenever a new icon is added, from any process; clear icon area because some icons were failing to redraw	2015-06-21 15:23:55 +02:00
o9000	ea75558ac2	systray: reduce icon flicker by painting on buffer instead of directly on window	2015-06-21 15:00:01 +02:00
o9000	876cae8239	systray: fix black icon background for 32-bit icons when disable_transparency = 1; fix empty icon detection when disable_transparency = 1; fix icon blinking by delaying rendering less aggressively; removed XClearArea on traywin->win (triggers unnecessary redraws); cache icon names; profiling messages updated	2015-06-21 14:50:08 +02:00
o9000	7c3951e3a0	systray: Profiling code. Export environment variable SYSTRAY_PROFILING=1 when running tint2 to enable it	2015-06-19 10:46:29 +02:00
o9000	552f060612	Updated strings in pl.po	2015-06-15 19:27:05 +02:00
o9000	e7cfa35288	Merge branch 'translation-bs_hr_sr' into 'master' tint2conf: added bs, hr and sr translations I translated tint2conf into Bosnian, Croatian and Serbian (Cyrillic). See merge request !3	2015-06-15 07:52:22 +00:00
dglava	4326cd1380	tint2conf: added bs, hr and sr translations	2015-06-14 23:10:30 +02:00
o9000	19b40bc59e	systray: Check icon position	2015-06-14 12:23:34 +02:00
o9000	8c9a9a111e	systray: trigger resizes in some places	2015-06-14 11:39:51 +02:00
o9000	b13540123b	systray: force a repaint on icon resize	2015-06-14 11:21:42 +02:00
o9000	f5b2de62b6	systray: reorder operations to prevent the long icon first show delay that occurs sometimes	2015-06-14 10:51:30 +02:00
o9000	1ba023fc83	Removed tintwizard.py as it no longer supports all config options	2015-06-14 10:06:33 +02:00
o9000	36e9e92df1	Changed tintwizard #! to python 2 (note that tintwizard is obsolete)	2015-06-13 10:54:28 +00:00
o9000	0f1dac50f1	Updated readme for 0.12-rc6	2015-06-13 10:08:43 +00:00
o9000	eb0346e02a	Updated changelog	2015-06-13 10:07:23 +00:00
o9000	cae621918e	systray: Do not turn off compositing for missing window errors	2015-06-13 11:32:22 +02:00