Updated readme

CMakeLists.txt

@@ -145,9 +145,12 @@ set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -fno-strict-aliasin
 set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS}" )
 
 install( TARGETS tint2 DESTINATION bin )
+install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
+install( FILES tint2.desktop DESTINATION ${DATADIR}/applications )
+install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
 install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
 install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
-install( FILES AUTHORS ChangeLog README DESTINATION ${DOCDIR} )
+install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
 install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
 if( ENABLE_EXAMPLES )
   file( GLOB SAMPLEFILES sample/*.tint2rc )

ChangeLog

@@ -1,4 +1,4 @@
-2015-04-25 tint2-0.12-rc1
+2015-05-23 master
 - 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)'.
@@ -9,8 +9,10 @@
     - Enhancement: more thorough search for icons
   - Configuration GUI: tint2conf
     - Experimental, testing/feedback needed
+  - Icons (system tray, task buttons, launcher):
+    - Changed rendering method to fix icon corruptions (please report any problems)
   - System tray:
-    - Changed rendering method to fix icon corruptions (need user feedback)
+    - Workaround for misbehaving applications leaving empty tray icons
   - Many bugfixes
 - New config options (see https://gitlab.com/o9000/tint2/wikis/Configure):
   - Panel:
@@ -27,6 +29,7 @@
     - launcher* (already released by distros)
     - launcher_apps_dir (previously patched in by some distros)
     - startup_notifications
+    - launcher_icon_theme_override
   - System tray:
     - systray_monitor
 - Config options with changed behavior:
@@ -36,15 +39,12 @@
       set it to zero (or change the border color/style to match tint2). If you set it to zero, make sure you do not have
       reserved space at the edge of the screen in the OpenBox config.
       Reason for change: issues 257, 394, 461, 465, 481.
+    - panel_layer: previously, 'panel_layer = normal' was not functioning correctly. Now it does (it requires panel_dock = 0).
+      Note that in this case some compositors will draw shadows of other windows behind tint2. This can be avoided in compton
+      using the option shadow-exclude-reg = "x35+0-0" where 35 should be replaced with the size of the panel.
     - font_shadow: shadows are thicker and softer, and are now applied to all text elements, not just the taskbar.
       Reason for change: legibility improved for transparent panels.
   - Launcher:
-    - launcher_icon_theme: previously, this parameter had a lower priority than the icon theme provided through the
-      XSettings manager; as virtually all DEs provide one, it was useless. Now the parameter has a higher priority.
-      Remove it to respect the XSettings manager settings.
-      Reasons for change:
-      * ability to use a custom icon theme only in tint2
-      * several DEs do not allow selecting the hicolor theme
     - launcher_item_app: now it expands leading ~ to the path to the user's home directory.
 - Project hosting:
   - Migrated from https://code.google.com/p/tint2 to https://gitlab.com/o9000/tint2 and switched from svn to git
@@ -634,5 +634,3 @@ released tint-0.2
 2008-04-22
 - fork ttm projet from p://code.google.com/p/ttm/ (by Pål Staurland staura@gmail.com)
   while the projet is no longer in developpement, have not changed the name of 'tint'.
-
-

README.md

@@ -1,3 +1,26 @@
+### New unstable release: 0.12-rc5
+Changes: https://gitlab.com/o9000/tint2/blob/master/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
+mkdir build
+cd build
+cmake ..
+make -j4
+./tint2 &
+./src/tint2conf/tint2conf &
+```
+Please report any problems to https://gitlab.com/o9000/tint2/issues. Your feedback is much appreciated.
+
+P.S. GitLab is now the official location of the tint2 project, migrated from Google Code, which is shutting down. In case you are wondering why not GitHub, BitBucket etc., we chose GitLab because it is open source, it is mature and works well, looks cool and has a very nice team.
+
 ### What is tint2?
 
 tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm http://code.google.com/p/ttm/.

make_release.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Usage: ./make_release.sh
-# Creates a tar.bz2 archive of the current tree.
+# Creates a tar.gz archive of the current tree.
 #
 # To bump the version number for the current commit (make sure you are in HEAD!), run manually:
 #
@@ -9,7 +9,7 @@
 #
 # To generate a release for an older tagged commit, first list the tags with:
 #
-# git tags
+# git tag
 #
 # then checkout the tagged commit with:
 #
@@ -18,6 +18,8 @@
 # Finally, to revert to HEAD:
 #
 # git checkout master
+#
+# See more at https://gitlab.com/o9000/tint2/wikis/Development
 
 VERSION=$(./get_version.sh --strict)
 if [ ! $? -eq 0 ]
@@ -27,8 +29,9 @@ then
 fi
 
 DIR=tint2-$VERSION
+ARCHIVE=$DIR.tar.gz
 echo "Making release $DIR"
-rm -rf $DIR
+rm -rf $DIR $ARCHIVE
 
 git checkout-index --prefix=$DIR/ -a
 
@@ -38,8 +41,8 @@ rm -f $DIR/make_release.sh
 echo "echo \"#define VERSION_STRING \\\"$VERSION\\\"\" > version.h" > $DIR/get_version.sh
 
 # Create tarball and remove the exported directory
-tar -cjf $DIR.tar.bz2 $DIR
+tar -czf $ARCHIVE $DIR
 rm -rf $DIR
 
-sha1sum -b $DIR.tar.bz2
+sha1sum -b $ARCHIVE
-sha256sum -b $DIR.tar.bz2
+sha256sum -b $ARCHIVE

sample/horizontal-dark-opaque.tint2rc

@@ -0,0 +1,162 @@
+#---- Generated by tint2conf 1238 ----
+#-------------------------------------
+# Backgrounds
+# Background 1
+rounded = 5
+border_width = 1
+background_color = #111111 100
+border_color = #333333 100
+
+# Background 2
+rounded = 5
+border_width = 0
+background_color = #111111 100
+border_color = #222222 100
+
+# Background 3
+rounded = 5
+border_width = 1
+background_color = #222222 100
+border_color = #777777 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 = #111111 100
+border_color = #222222 100
+
+# Background 7
+rounded = 2
+border_width = 1
+background_color = #222222 100
+border_color = #777777 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 = #dddddd 100
+taskbar_name_active_font_color = #dddddd 100
+taskbar_distribute_size = 1
+taskbar_sort_order = none
+
+#-------------------------------------
+# 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 = #eeeeee 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
+startup_notifications = 1
+launcher_tooltip = 1
+launcher_item_app = /usr/share/applications/firefox.desktop
+launcher_item_app = /usr/share/applications/iceweasel.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 = #eeeeee 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 = #eeeeee 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
+

sample/horizontal-dark-transparent.tint2rc

@@ -0,0 +1,162 @@
+#---- Generated by tint2conf 24b3 ----
+#-------------------------------------
+# Backgrounds
+# Background 1
+rounded = 5
+border_width = 1
+background_color = #000000 80
+border_color = #555555 80
+
+# Background 2
+rounded = 5
+border_width = 0
+background_color = #777777 0
+border_color = #777777 10
+
+# Background 3
+rounded = 5
+border_width = 1
+background_color = #555555 10
+border_color = #ffffff 60
+
+# 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 = #777777 0
+border_color = #777777 30
+
+# Background 7
+rounded = 2
+border_width = 1
+background_color = #555555 10
+border_color = #ffffff 60
+
+#-------------------------------------
+# 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 = #dddddd 100
+taskbar_name_active_font_color = #dddddd 100
+taskbar_distribute_size = 1
+taskbar_sort_order = none
+
+#-------------------------------------
+# 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 = #eeeeee 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
+startup_notifications = 1
+launcher_tooltip = 1
+launcher_item_app = /usr/share/applications/firefox.desktop
+launcher_item_app = /usr/share/applications/iceweasel.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 = #eeeeee 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 = #eeeeee 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
+

sample/horizontal-light-opaque.tint2rc

@@ -0,0 +1,168 @@
+#---- Generated by tint2conf 3ad3 ----
+#-------------------------------------
+# Backgrounds
+# Background 1
+rounded = 0
+border_width = 1
+background_color = #eeeeee 100
+border_color = #bbbbbb 100
+
+# Background 2
+rounded = 5
+border_width = 0
+background_color = #eeeeee 100
+border_color = #cccccc 100
+
+# Background 3
+rounded = 5
+border_width = 1
+background_color = #dddddd 100
+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 100
+border_color = #cccccc 100
+
+# Background 7
+rounded = 2
+border_width = 1
+background_color = #dddddd 100
+border_color = #999999 100
+
+# Background 8
+rounded = 3
+border_width = 0
+background_color = #999999 100
+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 = #222222 100
+taskbar_name_active_font_color = #222222 100
+taskbar_distribute_size = 1
+taskbar_sort_order = none
+
+#-------------------------------------
+# 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 = #222222 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 = 8
+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
+startup_notifications = 1
+launcher_tooltip = 1
+launcher_item_app = /usr/share/applications/firefox.desktop
+launcher_item_app = /usr/share/applications/iceweasel.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 = #222222 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 = #222222 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
+

sample/vertical-dark-opaque.tint2rc

@@ -0,0 +1,162 @@
+#---- Generated by tint2conf c113 ----
+#-------------------------------------
+# Backgrounds
+# Background 1
+rounded = 5
+border_width = 1
+background_color = #111111 100
+border_color = #333333 100
+
+# Background 2
+rounded = 5
+border_width = 0
+background_color = #111111 100
+border_color = #222222 100
+
+# Background 3
+rounded = 5
+border_width = 1
+background_color = #222222 100
+border_color = #777777 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 = #111111 100
+border_color = #222222 100
+
+# Background 7
+rounded = 2
+border_width = 1
+background_color = #222222 100
+border_color = #777777 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 = #dddddd 100
+taskbar_name_active_font_color = #dddddd 100
+taskbar_distribute_size = 1
+taskbar_sort_order = none
+
+#-------------------------------------
+# 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 = #eeeeee 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
+startup_notifications = 1
+launcher_tooltip = 1
+launcher_item_app = /usr/share/applications/firefox.desktop
+launcher_item_app = /usr/share/applications/iceweasel.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 = #eeeeee 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 = #eeeeee 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
+

sample/vertical-dark-transparent.tint2rc

@@ -0,0 +1,162 @@
+#---- Generated by tint2conf bec8 ----
+#-------------------------------------
+# Backgrounds
+# Background 1
+rounded = 5
+border_width = 1
+background_color = #000000 80
+border_color = #555555 80
+
+# Background 2
+rounded = 5
+border_width = 0
+background_color = #777777 0
+border_color = #777777 10
+
+# Background 3
+rounded = 5
+border_width = 1
+background_color = #555555 10
+border_color = #ffffff 60
+
+# 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 = #777777 0
+border_color = #777777 30
+
+# Background 7
+rounded = 2
+border_width = 1
+background_color = #555555 10
+border_color = #ffffff 60
+
+#-------------------------------------
+# 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 = #dddddd 100
+taskbar_name_active_font_color = #dddddd 100
+taskbar_distribute_size = 1
+taskbar_sort_order = none
+
+#-------------------------------------
+# 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 = #eeeeee 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
+startup_notifications = 1
+launcher_tooltip = 1
+launcher_item_app = /usr/share/applications/firefox.desktop
+launcher_item_app = /usr/share/applications/iceweasel.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 = #eeeeee 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 = #eeeeee 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
+

sample/vertical-light-opaque.tint2rc

@@ -0,0 +1,168 @@
+#---- Generated by tint2conf f7f7 ----
+#-------------------------------------
+# Backgrounds
+# Background 1
+rounded = 0
+border_width = 1
+background_color = #eeeeee 100
+border_color = #bbbbbb 100
+
+# Background 2
+rounded = 5
+border_width = 0
+background_color = #eeeeee 100
+border_color = #cccccc 100
+
+# Background 3
+rounded = 5
+border_width = 1
+background_color = #dddddd 100
+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 100
+border_color = #cccccc 100
+
+# Background 7
+rounded = 2
+border_width = 1
+background_color = #dddddd 100
+border_color = #999999 100
+
+# Background 8
+rounded = 3
+border_width = 0
+background_color = #aaaaaa 100
+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 = #222222 100
+taskbar_name_active_font_color = #222222 100
+taskbar_distribute_size = 1
+taskbar_sort_order = none
+
+#-------------------------------------
+# 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 = #222222 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 = 8
+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
+startup_notifications = 1
+launcher_tooltip = 1
+launcher_item_app = /usr/share/applications/firefox.desktop
+launcher_item_app = /usr/share/applications/iceweasel.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 = #222222 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 = #222222 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
+

src/battery/battery.c

@@ -76,6 +76,9 @@ void update_battery_tick(void* arg)
 	int16_t old_hours = battery_state.time.hours;
 	int8_t old_minutes = battery_state.time.minutes;
 	
+	if (!battery_found) {
+		init_battery();
+	}
 	if (update_battery() != 0) {
 		// Reconfigure
 		init_battery();
@@ -103,15 +106,23 @@ void update_battery_tick(void* arg)
 
 	int i;
 	for (i = 0; i < nb_panel; i++) {
-		if (!battery_found && panel1[i].battery.area.on_screen == 1) {
+		if (!battery_found) {
-			hide(&panel1[i].battery.area);
+			if (panel1[i].battery.area.on_screen == 1) {
-			panel_refresh = 1;
+				hide(&panel1[i].battery.area);
-		} else if (battery_state.percentage >= percentage_hide && panel1[i].battery.area.on_screen == 1) {
+				panel_refresh = 1;
-			hide(&panel1[i].battery.area);
+			}
-			panel_refresh = 1;
+		} else {
-		} else if (battery_state.percentage < percentage_hide && panel1[i].battery.area.on_screen == 0) {
+			if (battery_state.percentage >= percentage_hide) {
-			show(&panel1[i].battery.area);
+				if (panel1[i].battery.area.on_screen == 1) {
-			panel_refresh = 1;
+					hide(&panel1[i].battery.area);
+					panel_refresh = 1;
+				}
+			} else {
+				if (panel1[i].battery.area.on_screen == 0) {
+					show(&panel1[i].battery.area);
+					panel_refresh = 1;
+				}
+			}
 		}
 		if (panel1[i].battery.area.on_screen == 1) {
 			panel1[i].battery.area.resize = 1;
@@ -188,7 +199,11 @@ void init_battery()
 		battery_found = 1;
 	}
 #elif defined(__FreeBSD__)
-	// Nothing to do
+	int sysctl_out = 0;
+	size_t len = sizeof(sysctl_out);
+	battery_found = (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) ||
+					(sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0) ||
+					(sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
 #else // Linux
 	GDir *directory = 0;
 	GError *error = NULL;
@@ -275,7 +290,7 @@ void init_battery()
 #endif
 
 	if (!battery_timeout)
-		battery_timeout = add_timeout(10, 10000, update_battery_tick, 0, &battery_timeout);
+		battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
 }
 
 
@@ -470,7 +485,7 @@ int update_battery() {
 	battery_state.time.seconds = seconds;
 
 	if (energy_full > 0)
-		new_percentage = ((energy_now <= energy_full ? energy_now : energy_full) * 100) / energy_full;
+		new_percentage = 0.5 + ((energy_now <= energy_full ? energy_now : energy_full) * 100.0) / energy_full;
 
 	battery_state.percentage = new_percentage;
 

src/config.c

@@ -474,6 +474,7 @@ void add_entry (char *key, char *value)
 	else if (strcmp (key, "taskbar_name_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		panel_config.g_taskbar.area_name.paddingxlr = panel_config.g_taskbar.area_name.paddingx = atoi (value1);
+		if (value2) panel_config.g_taskbar.area_name.paddingy = atoi (value2);
 	}
 	else if (strcmp (key, "taskbar_name_background_id") == 0) {
 		int id = atoi (value);
@@ -612,13 +613,13 @@ void add_entry (char *key, char *value)
 	}
 	else if (strcmp(key, "systray_sort") == 0) {
 		if (strcmp(value, "descending") == 0)
-			systray.sort = -1;
+			systray.sort = SYSTRAY_SORT_DESCENDING;
 		else if (strcmp(value, "ascending") == 0)
-			systray.sort = 1;
+			systray.sort = SYSTRAY_SORT_ASCENDING;
 		else if (strcmp(value, "left2right") == 0)
-			systray.sort = 2;
+			systray.sort = SYSTRAY_SORT_LEFT2RIGHT;
 		else  if (strcmp(value, "right2left") == 0)
-			systray.sort = 3;
+			systray.sort = SYSTRAY_SORT_RIGHT2LEFT;
 	}
 	else if (strcmp(key, "systray_icon_size") == 0) {
 		systray_max_icon_size = atoi(value);
@@ -663,6 +664,9 @@ void add_entry (char *key, char *value)
 			free(icon_theme_name_config);
 		icon_theme_name_config = strdup(value);
 	}
+	else if (strcmp(key, "launcher_icon_theme_override") == 0) {
+		launcher_icon_theme_override = atoi(value);
+	}
 	else if (strcmp(key, "launcher_icon_asb") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		launcher_alpha = atoi(value1);

src/launcher/icon-theme-common.c

@@ -536,6 +536,9 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 	char *next_larger = NULL;
 	GSList *next_larger_theme = NULL;
 
+	int file_name_size = 4096;
+	char *file_name = calloc(file_name_size, 1);
+
 	for (theme = themes; theme; theme = g_slist_next(theme)) {
 		((IconTheme*)theme->data)->list_directories = g_slist_sort_with_data(((IconTheme*)theme->data)->list_directories,
 																			 compare_theme_directories,
@@ -560,8 +563,13 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 					char *theme_name = ((IconTheme*)theme->data)->name;
 					char *dir_name = ((IconThemeDir*)dir->data)->name;
 					char *extension = (char*) ext->data;
-					char *file_name = calloc(strlen(base_name) + strlen(theme_name) +
+					if (strlen(base_name) + strlen(theme_name) +
-											 strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100, 1);
+						strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100 > file_name_size) {
+						file_name_size = strlen(base_name) + strlen(theme_name) +
+										 strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100;
+						file_name = realloc(file_name, file_name_size);
+					}
+					file_name[0] = 0;
 					// filename = directory/$(themename)/subdirectory/iconname.extension
 					sprintf(file_name, "%s/%s/%s/%s%s", base_name, theme_name, dir_name, icon_name, extension);
 					if (DEBUG_ICON_SEARCH)
@@ -596,11 +604,12 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
 								printf("next_larger = %s; next_larger_size = %d\n", next_larger, next_larger_size);
 						}
 					}
-					free(file_name);
 				}
 			}
 		}
 	}
+	free(file_name);
+	file_name = NULL;
 	if (next_larger) {
 		g_slist_free(extensions);
 		free(best_file_name);

src/launcher/launcher.c

@@ -31,10 +31,11 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #ifdef HAVE_RSVG
 #include <librsvg/rsvg.h>
-#include <librsvg/rsvg-cairo.h>
 #endif
 
 #include "window.h"
@@ -54,6 +55,7 @@ int launcher_saturation;
 int launcher_brightness;
 char *icon_theme_name_config;
 char *icon_theme_name_xsettings;
+int launcher_icon_theme_override;
 XSettingsClient *xsettings_client;
 int startup_notifications;
 
@@ -70,6 +72,7 @@ void default_launcher()
 	launcher_brightness = 0;
 	icon_theme_name_config = NULL;
 	icon_theme_name_xsettings = NULL;
+	launcher_icon_theme_override = 0;
 	xsettings_client = NULL;
 	startup_notifications = 0;
 }
@@ -149,8 +152,7 @@ void cleanup_launcher_theme(Launcher *launcher)
 	for (l = launcher->list_icons; l ; l = l->next) {
 		LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
 		if (launcherIcon) {
-			free_icon(launcherIcon->icon_scaled);
+			free_icon(launcherIcon->image);
-			free_icon(launcherIcon->icon_original);
 			free(launcherIcon->icon_name);
 			free(launcherIcon->icon_path);
 			free(launcherIcon->cmd);
@@ -185,7 +187,7 @@ int resize_launcher(void *obj)
 	// Resize icons if necessary
 	for (l = launcher->list_icons; l ; l = l->next) {
 		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (launcherIcon->icon_size != icon_size || !launcherIcon->icon_original) {
+		if (launcherIcon->icon_size != icon_size || !launcherIcon->image) {
 			launcherIcon->icon_size = icon_size;
 			launcherIcon->area.width = launcherIcon->icon_size;
 			launcherIcon->area.height = launcherIcon->icon_size;
@@ -194,68 +196,69 @@ int resize_launcher(void *obj)
 			char *new_icon_path = get_icon_path(launcher->list_themes, launcherIcon->icon_name, launcherIcon->icon_size);
 			if (!new_icon_path) {
 				// Draw a blank icon
-				free_icon(launcherIcon->icon_original);
+				free_icon(launcherIcon->image);
-				launcherIcon->icon_original = NULL;
+				launcherIcon->image = NULL;
-				free_icon(launcherIcon->icon_scaled);
-				launcherIcon->icon_scaled = NULL;
 				continue;
 			}
-			if (launcherIcon->icon_path && strcmp(new_icon_path, launcherIcon->icon_path) == 0) {
+
-				// If it's the same file just rescale
+			// Free the old files
-				free_icon(launcherIcon->icon_scaled);
+			free_icon(launcherIcon->image);
-				launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, icon_size);
+			launcherIcon->image = NULL;
-				free(new_icon_path);
+			// Load the new file and scale
-				fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+			launcherIcon->image = imlib_load_image_immediately(new_icon_path);
-			} else {
-				// Free the old files
-				free_icon(launcherIcon->icon_original);
-				free_icon(launcherIcon->icon_scaled);
-				launcherIcon->icon_original = launcherIcon->icon_scaled = NULL;
-				// Load the new file and scale
 #ifdef HAVE_RSVG
-				if (g_str_has_suffix(new_icon_path, ".svg")) {
+			if (!launcherIcon->image && g_str_has_suffix(new_icon_path, ".svg")) {
+				char suffix[128];
+				sprintf(suffix, "tmpicon-%d.png", getpid());
+				// We fork here because librsvg allocates memory like crazy
+				pid_t pid = fork();
+				if (pid == 0) {
+					// Child
 					GError* err = NULL;
 					RsvgHandle* svg = rsvg_handle_new_from_file(new_icon_path, &err);
 
 					if (err != NULL) {
 						fprintf(stderr, "Could not load svg image!: %s", err->message);
 						g_error_free(err);
-						launcherIcon->icon_original = NULL;
+						launcherIcon->image = NULL;
 					} else {
-						char suffix[128];
-						sprintf(suffix, "tmpicon-%d.png", getpid());
 						gchar *name = g_build_filename(g_get_user_config_dir(), "tint2", suffix, NULL);
 						GdkPixbuf *pixbuf = rsvg_handle_get_pixbuf(svg);
 						gdk_pixbuf_save(pixbuf, name, "png", NULL, NULL);
-						launcherIcon->icon_original = imlib_load_image_immediately_without_cache(name);
-						g_remove(name);
-						g_free(name);
-						g_object_unref(G_OBJECT(pixbuf));
-						g_object_unref(G_OBJECT(svg));
 					}
-				} else
+					exit(0);
-#endif
-				{
-					launcherIcon->icon_original = imlib_load_image_immediately(new_icon_path);
-				}
-				// On loading error, fallback to default
-				if (!launcherIcon->icon_original) {
-					free(new_icon_path);
-					new_icon_path = get_icon_path(launcher->list_themes, DEFAULT_ICON, launcherIcon->icon_size);
-					if (new_icon_path)
-						launcherIcon->icon_original = imlib_load_image_immediately(new_icon_path);
-				}
-
-				if (!launcherIcon->icon_original) {
-					// Loading default icon failed, draw a blank icon
-					free(new_icon_path);
 				} else {
-					// Loaded icon successfully
+					// Parent
-					launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, launcherIcon->icon_size);
+					waitpid(pid, 0, 0);
-					free(launcherIcon->icon_path);
+					gchar *name = g_build_filename(g_get_user_config_dir(), "tint2", suffix, NULL);
-					launcherIcon->icon_path = new_icon_path;
+					launcherIcon->image = imlib_load_image_immediately_without_cache(name);
-					fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+					g_remove(name);
+					g_free(name);
 				}
+			} else
+#endif
+			{
+				launcherIcon->image = imlib_load_image_immediately(new_icon_path);
+			}
+			// On loading error, fallback to default
+			if (!launcherIcon->image) {
+				free(new_icon_path);
+				new_icon_path = get_icon_path(launcher->list_themes, DEFAULT_ICON, launcherIcon->icon_size);
+				if (new_icon_path)
+					launcherIcon->image = imlib_load_image_immediately(new_icon_path);
+			}
+
+			if (!launcherIcon->image) {
+				// Loading default icon failed, draw a blank icon
+				free(new_icon_path);
+			} else {
+				// Loaded icon successfully
+				Imlib_Image original = launcherIcon->image;
+				launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);
+				free_icon(original);
+				free(launcherIcon->icon_path);
+				launcherIcon->icon_path = new_icon_path;
+				fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
 			}
 		}
 	}
@@ -329,6 +332,7 @@ int resize_launcher(void *obj)
 			}
 		}
 	}
+
 	return 1;
 }
 
@@ -353,12 +357,15 @@ void draw_launcher_icon(void *obj, cairo_t *c)
 {
 	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
 
-	Imlib_Image icon_scaled = launcherIcon->icon_scaled;
 	// Render
-	imlib_context_set_image (icon_scaled);
+	imlib_context_set_image(launcherIcon->image);
-	imlib_context_set_blend(1);
+	if (server.real_transparency) {
-	imlib_context_set_drawable(launcherIcon->area.pix);
+		render_image(launcherIcon->area.pix, 0, 0);
-	imlib_render_image_on_drawable(0, 0);
+	} else {
+		imlib_context_set_blend(1);
+		imlib_context_set_drawable(launcherIcon->area.pix);
+		imlib_render_image_on_drawable(0, 0);
+	}
 }
 
 Imlib_Image scale_icon(Imlib_Image original, int icon_size)
@@ -367,11 +374,14 @@ Imlib_Image scale_icon(Imlib_Image original, int icon_size)
 	if (original) {
 		imlib_context_set_image (original);
 		icon_scaled = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), icon_size, icon_size);
+
 		imlib_context_set_image (icon_scaled);
 		imlib_image_set_has_alpha(1);
 		DATA32* data = imlib_image_get_data();
 		adjust_asb(data, icon_size, icon_size, launcher_alpha, (float)launcher_saturation/100, (float)launcher_brightness/100);
 		imlib_image_put_back_data(data);
+
+		imlib_context_set_image (icon_scaled);
 	} else {
 		icon_scaled = imlib_create_image(icon_size, icon_size);
 		imlib_context_set_image (icon_scaled);
@@ -394,7 +404,7 @@ void launcher_action(LauncherIcon *icon, XEvent* evt)
 	char *cmd = calloc(strlen(icon->cmd) + 10, 1);
 	sprintf(cmd, "(%s&)", icon->cmd);
 #if HAVE_SN
-	SnLauncherContext* ctx;
+	SnLauncherContext* ctx = 0;
 	Time time;
 	if (startup_notifications) {
 		ctx = sn_launcher_context_new(server.sn_dsp, server.screen);
@@ -487,9 +497,15 @@ void launcher_load_icons(Launcher *launcher)
 // Populates the list_themes list
 void launcher_load_themes(Launcher *launcher)
 {
-	launcher->list_themes = load_themes(icon_theme_name_config
+	launcher->list_themes = load_themes(launcher_icon_theme_override
-										? icon_theme_name_config
+										? (icon_theme_name_config
-										: icon_theme_name_xsettings
+										   ? icon_theme_name_config
-										  ? icon_theme_name_xsettings
+										   : icon_theme_name_xsettings
-										  : "hicolor");
+											 ? icon_theme_name_xsettings
+											 : "hicolor")
+										: (icon_theme_name_xsettings
+										   ? icon_theme_name_xsettings
+										   : icon_theme_name_config
+											 ? icon_theme_name_config
+											 : "hicolor"));
 }

src/launcher/launcher.h

@@ -23,8 +23,7 @@ typedef struct Launcher {
 typedef struct LauncherIcon {
 	// always start with area
 	Area area;
-	Imlib_Image icon_scaled;
+	Imlib_Image image;
-	Imlib_Image icon_original;
 	char *cmd;
 	char *icon_name;
 	char *icon_path;
@@ -42,6 +41,7 @@ extern int launcher_saturation;
 extern int launcher_brightness;
 extern char *icon_theme_name_xsettings; 	// theme name
 extern char *icon_theme_name_config;
+extern int launcher_icon_theme_override;
 extern XSettingsClient *xsettings_client;
 extern int startup_notifications;
 

src/panel.c

@@ -524,7 +524,9 @@ void set_panel_properties(Panel *p)
 	}
 
 	// Dock
-	long val = panel_dock ? server.atom._NET_WM_WINDOW_TYPE_DOCK : server.atom._NET_WM_WINDOW_TYPE_SPLASH;
+	long val = (!panel_dock && panel_layer == NORMAL_LAYER)
+			   ? server.atom._NET_WM_WINDOW_TYPE_SPLASH
+			   : server.atom._NET_WM_WINDOW_TYPE_DOCK;
 	XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
 
 	val = ALLDESKTOP;

src/server.c

@@ -98,6 +98,7 @@ void server_init_atoms ()
 	server.atom._NET_SYSTEM_TRAY_ORIENTATION = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_ORIENTATION", False);
 	server.atom._XEMBED = XInternAtom(server.dsp, "_XEMBED", False);
 	server.atom._XEMBED_INFO = XInternAtom(server.dsp, "_XEMBED_INFO", False);
+	server.atom._NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);
 
 	// drag 'n' drop
 	server.atom.XdndAware = XInternAtom(server.dsp, "XdndAware", False);

src/server.h

@@ -15,9 +15,8 @@
 
 #ifdef HAVE_SN
 #include <libsn/sn.h>
-#include <glib.h>
 #endif
-
+#include <glib.h>
 
 typedef struct Global_atom
 {
@@ -74,6 +73,7 @@ typedef struct Global_atom
 	Atom _NET_SYSTEM_TRAY_ORIENTATION;
 	Atom _XEMBED;
 	Atom _XEMBED_INFO;
+	Atom _NET_WM_PID;
 	Atom _XSETTINGS_SCREEN;
 	Atom _XSETTINGS_SETTINGS;
 	Atom XdndAware;

src/systray/systraybar.c

@@ -52,7 +52,7 @@ int refresh_systray;
 int systray_enabled;
 int systray_max_icon_size;
 int systray_monitor;
-
+int chrono;
 // background pixmap if we render ourselves the icons
 static Pixmap render_background;
 
@@ -61,8 +61,9 @@ void default_systray()
 {
 	memset(&systray, 0, sizeof(Systraybar));
 	render_background = 0;
+	chrono = 0;
 	systray.alpha = 100;
-	systray.sort = 3;
+	systray.sort = SYSTRAY_SORT_LEFT2RIGHT;
 	systray.area._draw_foreground = draw_systray;
 	systray.area._on_change_layout = on_change_systray;
 	systray.area.size_mode = SIZE_BY_CONTENT;
@@ -108,8 +109,9 @@ void init_systray_panel(void *p)
 	GSList *l;
 	int count = 0;
 	for (l = systray.list_icons; l ; l = l->next) {
-		if (!((TrayWindow*)l->data)->hide)
+		if (((TrayWindow*)l->data)->hide)
-			count++;
+			continue;
+		count++;
 	}
 	if (count == 0)
 		hide(&systray.area);
@@ -146,8 +148,9 @@ int resize_systray(void *obj)
 		sysbar->icon_size = systray_max_icon_size;
 	count = 0;
 	for (l = systray.list_icons; l ; l = l->next) {
-		if (!((TrayWindow*)l->data)->hide)
+		if (((TrayWindow*)l->data)->hide)
-			count++;
+			continue;
+		count++;
 	}
 	//printf("count %d\n", count);
 
@@ -194,11 +197,12 @@ void on_change_systray (void *obj)
 	GSList *l;
 	for (i=1, l = systray.list_icons; l ; i++, l = l->next) {
 		traywin = (TrayWindow*)l->data;
-		if (traywin->hide) continue;
+		if (traywin->hide)
+			continue;
 
 		traywin->y = posy;
 		traywin->x = posx;
-		//printf("systray %d : %d,%d\n", i, posx, posy);
+		// printf("systray %d : pos %d, %d\n", traywin->tray_id, posx, posy);
 		traywin->width = sysbar->icon_size;
 		traywin->height = sysbar->icon_size;
 		if (panel_horizontal) {
@@ -336,21 +340,39 @@ static gint compare_traywindows(gconstpointer a, gconstpointer b)
 {
 	const TrayWindow * traywin_a = (TrayWindow*)a;
 	const TrayWindow * traywin_b = (TrayWindow*)b;
-	XTextProperty name_a, name_b;
 
-	if(XGetWMName(server.dsp, traywin_a->tray_id, &name_a) == 0) {
+	if (traywin_a->empty && !traywin_b->empty)
-		return -1;
-	}
-	else if(XGetWMName(server.dsp, traywin_b->tray_id, &name_b) == 0) {
-		XFree(name_a.value);
 		return 1;
+	if (!traywin_a->empty && traywin_b->empty)
+		return -1;
+
+	if (systray.sort == SYSTRAY_SORT_ASCENDING ||
+		systray.sort == SYSTRAY_SORT_DESCENDING) {
+		XTextProperty name_a, name_b;
+
+		if (XGetWMName(server.dsp, traywin_a->tray_id, &name_a) == 0) {
+			return -1;
+		}
+		else if (XGetWMName(server.dsp, traywin_b->tray_id, &name_b) == 0) {
+			XFree(name_a.value);
+			return 1;
+		}
+		else {
+			gint retval = g_ascii_strncasecmp((char*)name_a.value, (char*)name_b.value, -1) *
+						  (systray.sort == SYSTRAY_SORT_ASCENDING ? 1 : -1);
+			XFree(name_a.value);
+			XFree(name_b.value);
+			return retval;
+		}
 	}
-	else {
+
-		gint retval = g_ascii_strncasecmp((char*)name_a.value, (char*)name_b.value, -1) * systray.sort;
+	if (systray.sort == SYSTRAY_SORT_LEFT2RIGHT ||
-		XFree(name_a.value);
+		systray.sort == SYSTRAY_SORT_RIGHT2LEFT) {
-		XFree(name_b.value);
+		return (traywin_a->chrono - traywin_b->chrono) *
-		return retval;
+				(systray.sort == SYSTRAY_SORT_LEFT2RIGHT ? 1 : -1);
 	}
+
+	return 0;
 }
 
 
@@ -361,12 +383,42 @@ gboolean add_icon(Window id)
 	Panel *panel = systray.area.panel;
 	int hide = 0;
 
+	int pid = 0;
+	{
+		Atom actual_type;
+		int actual_format;
+		unsigned long nitems;
+		unsigned long bytes_after;
+		unsigned char *prop = 0;
+		int ret = XGetWindowProperty(server.dsp, id, server.atom._NET_WM_PID, 0, 1024, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &prop);
+		if (ret == Success && prop) {
+			pid = prop[1] * 256;
+			pid += prop[0];
+		}
+	}
+
 	GSList *l;
+	int num_empty_same_pid = 0;
 	for (l = systray.list_icons; l; l = l->next) {
 		if (((TrayWindow*)l->data)->tray_id == id)
 			return FALSE;
+		if (pid && ((TrayWindow*)l->data)->pid == pid && ((TrayWindow*)l->data)->empty)
+			num_empty_same_pid++;
 	}
 
+	const int max_num_empty_same_pid = 0;
+	if (num_empty_same_pid > max_num_empty_same_pid) {
+		for (l = systray.list_icons; l; l = l->next) {
+			if (pid && ((TrayWindow*)l->data)->pid == pid && ((TrayWindow*)l->data)->empty) {
+				num_empty_same_pid++;
+				fprintf(stderr, "Removing tray icon %lu from misbehaving application with pid=%d\n", ((TrayWindow*)l->data)->tray_id, pid);
+				remove_icon((TrayWindow*)l->data);
+				break;
+			}
+		}
+	}
+	//printf("add_icon: %d, pid %d, %d\n", id, pid, num_empty_same_pid);
+
 	error = FALSE;
 	XWindowAttributes attr;
 	if ( XGetWindowAttributes(server.dsp, id, &attr) == False ) return FALSE;
@@ -445,16 +497,19 @@ gboolean add_icon(Window id)
 	traywin->hide = hide;
 	traywin->depth = attr.depth;
 	traywin->damage = 0;
+	traywin->empty = 0;
+	traywin->pid = pid;
+	traywin->chrono = chrono;
+	chrono++;
 
 	if (systray.area.on_screen == 0)
 		show(&systray.area);
 
-	if (systray.sort == 3)
+	if (systray.sort == SYSTRAY_SORT_RIGHT2LEFT)
 		systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
-	else if (systray.sort == 2)
-		systray.list_icons = g_slist_append(systray.list_icons, traywin);
 	else
-		systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows);
+		systray.list_icons = g_slist_append(systray.list_icons, traywin);
+	systray.list_icons = g_slist_sort(systray.list_icons, compare_traywindows);
 	//printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons));
 
 	if (FORCE_COMPOSITED_RENDERING || server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
@@ -481,7 +536,7 @@ void remove_icon(TrayWindow *traywin)
 
 	// remove from our list
 	systray.list_icons = g_slist_remove(systray.list_icons, traywin);
-	//printf("remove_icon id %lx, %d\n", traywin->id);
+	//printf("remove_icon: %d\n", traywin->tray_id);
 
 	XSelectInput(server.dsp, traywin->tray_id, NoEventMask);
 	if (traywin->damage)
@@ -503,8 +558,9 @@ void remove_icon(TrayWindow *traywin)
 	int count = 0;
 	GSList *l;
 	for (l = systray.list_icons; l; l = l->next) {
-		if (!((TrayWindow*)l->data)->hide)
+		if (((TrayWindow*)l->data)->hide)
-			count++;
+			continue;
+		count++;
 	}
 	if (count == 0)
 		hide(&systray.area);
@@ -546,6 +602,7 @@ void systray_render_icon_now(void* t)
 	// we end up in this function only in real transparency mode or if systray_task_asb != 100 0 0
 	// we made also sure, that we always have a 32 bit visual, i.e. we can safely create 32 bit pixmaps here
 	TrayWindow* traywin = t;
+
 	traywin->render_timeout = 0;
 	if ( traywin->width == 0 || traywin->height == 0 ) {
 		// reschedule rendering since the geometry information has not yet been processed (can happen on slow cpu)
@@ -553,6 +610,30 @@ void systray_render_icon_now(void* t)
 		return;
 	}
 
+	int empty = 1;
+	XImage *ximage = XGetImage(server.dsp, traywin->tray_id, 0, 0, traywin->width, traywin->height, AllPlanes, XYPixmap);
+	if (ximage) {
+		XColor color;
+		int x, y;
+		for (x = 0; empty && x < traywin->width; x++) {
+			for (y = 0; empty && y < traywin->height; y++) {
+				color.pixel = XGetPixel(ximage, x, y);
+				if (color.pixel != 0)
+					empty = 0;
+			}
+		}
+		XFree(ximage);
+	}
+	if (traywin->empty != empty) {
+		traywin->empty = empty;
+		systray.area.resize = 1;
+		panel_refresh = 1;
+		systray.list_icons = g_slist_sort(systray.list_icons, compare_traywindows);
+	}
+	//printf("systray_render_icon_now: %d empty %d\n", traywin->tray_id, empty);
+	if (empty)
+		return;
+
 	// good systray icons support 32 bit depth, but some icons are still 24 bit.
 	// We create a heuristic mask for these icons, i.e. we get the rgb value in the top left corner, and
 	// mask out all pixel with the same rgb value
@@ -601,7 +682,7 @@ void systray_render_icon_now(void* t)
 		adjust_asb(data, traywin->width, traywin->height, systray.alpha, (float)systray.saturation/100, (float)systray.brightness/100);
 	imlib_image_put_back_data(data);
 	XCopyArea(server.dsp, render_background, systray.area.pix, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x-systray.area.posx, traywin->y-systray.area.posy);
-	render_image(systray.area.pix, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height);
+	render_image(systray.area.pix, traywin->x-systray.area.posx, traywin->y-systray.area.posy);
 	XCopyArea(server.dsp, systray.area.pix, panel->main_win, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x, traywin->y);
 	imlib_free_image_and_decache();
 	XFreePixmap(server.dsp, tmp_pmap);
@@ -636,7 +717,8 @@ void refresh_systray_icon()
 	GSList *l;
 	for (l = systray.list_icons; l ; l = l->next) {
 		traywin = (TrayWindow*)l->data;
-		if (traywin->hide) continue;
+		if (traywin->hide)
+			continue;
 		systray_render_icon(traywin);
 	}
 }

src/systray/systraybar.h

@@ -20,6 +20,7 @@
 // Flags for _XEMBED_INFO
 #define XEMBED_MAPPED		(1 << 0)
 
+enum { SYSTRAY_SORT_ASCENDING, SYSTRAY_SORT_DESCENDING, SYSTRAY_SORT_LEFT2RIGHT, SYSTRAY_SORT_RIGHT2LEFT };
 
 typedef struct {
 	// always start with area
@@ -43,6 +44,9 @@ typedef struct
 	int depth;
 	Damage damage;
 	timeout* render_timeout;
+	int empty;
+	int pid;
+	int chrono;
 } TrayWindow;
 
 

src/taskbar/task.c

@@ -50,6 +50,9 @@ Task *add_task (Window win)
 	if (!win) return 0;
 	if (window_is_hidden(win)) return 0;
 
+	XSelectInput(server.dsp, win, PropertyChangeMask|StructureNotifyMask);
+	XFlush(server.dsp);
+
 	int monitor;
 	if (nb_panel > 1) {
 		monitor = window_get_monitor (win);
@@ -75,8 +78,7 @@ Task *add_task (Window win)
 	get_title(&new_tsk);
 	get_icon(&new_tsk);
 
-	//printf("task %s : desktop %d, monitor %d\n", new_tsk->title, desktop, monitor);
+	//printf("new task %s win %u: desktop %d, monitor %d\n", new_tsk.title, win, new_tsk.desktop, monitor);
-	XSelectInput (server.dsp, new_tsk.win, PropertyChangeMask|StructureNotifyMask);
 
 	GPtrArray* task_group = g_ptr_array_new();
 	Taskbar *tskbar;
@@ -193,18 +195,14 @@ int get_title(Task *tsk)
 		name = server_get_property (tsk->win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 0);
 		if (!name || !strlen(name)) {
 			name = server_get_property (tsk->win, server.atom.WM_NAME, XA_STRING, 0);
-			if (!name || !strlen(name)) {
-				name = calloc(10, 1);
-				strcpy(name, "Untitled");
-			}
 		}
 	}
 
-	// add space before title
+	if (name && strlen(name)) {
-	title = calloc(strlen(name)+2, 1);
+		title = strdup(name);
-	if (panel->g_task.icon) strcpy(title, " ");
+	} else {
-	else title[0] = 0;
+		title = strdup("Untitled");
-	strcat(title, name);
+	}
 	if (name) XFree (name);
 	
 	if (tsk->title) {
@@ -352,9 +350,13 @@ void draw_task_icon (Task *tsk, int text_width)
 
 	// Render
 	imlib_context_set_image (tsk->icon[tsk->current_state]);
-	imlib_context_set_blend(1);
+	if (server.real_transparency) {
-	imlib_context_set_drawable(tsk->area.pix);
+		render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy);
-	imlib_render_image_on_drawable(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);
+	}
 }
 
 
@@ -378,7 +380,7 @@ void draw_task (void *obj, cairo_t *c)
 		// pango use U+22EF or U+2026
 		pango_layout_set_width(layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE);
 		pango_layout_set_height(layout, panel->g_task.text_height * PANGO_SCALE);
-		pango_layout_set_wrap(layout, PANGO_WRAP_CHAR);
+		pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
 		pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
 
 		/* Center text */

src/taskbar/taskbar.c

@@ -239,7 +239,7 @@ void init_taskbar_panel(void *p)
 	panel->g_task.text_height = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
 	if (panel->g_task.icon) {
 		panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
-		panel->g_task.text_posx += panel->g_task.icon_size1;
+		panel->g_task.text_posx += panel->g_task.icon_size1 + panel->g_task.area.paddingx;
 		panel->g_task.icon_posy = (panel->g_task.area.height - panel->g_task.icon_size1) / 2;
 	}
 	//printf("monitor %d, task_maximum_width %d\n", panel->monitor, panel->g_task.maximum_width);
@@ -342,12 +342,12 @@ int resize_taskbar(void *obj)
 				break;
 			}
 		}
-		taskbar->text_width = text_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
+		taskbar->text_width = text_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingxlr;
 	}
 	else {
 		resize_by_layout(obj, panel->g_task.maximum_height);
 		
-		taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx -	panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
+		taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingxlr;
 	}
 	return 0;
 }

src/tint.c

@@ -727,6 +727,7 @@ void event_property_notify (XEvent *e)
 	}
 	else {
 		tsk = task_get_task (win);
+		//printf("change win = %u, task = %p\n", win, tsk);
 		if (!tsk) {
 			if (at != server.atom._NET_WM_STATE)
 				return;

src/tint2conf/CMakeLists.txt

@@ -56,15 +56,18 @@ target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}
                                  ${RSVG_LIBRARIES} )
 
 if ( NOT DATADIR )
-  set( DATADIR share )
+  set(DATADIR share)
 endif( NOT DATADIR )
 
 add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
+add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale\" )
+add_definitions( -DGETTEXT_PACKAGE=\"tint2conf\" )
 set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread" )
 set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )
 
+add_subdirectory(po)
+
 install( TARGETS tint2conf DESTINATION bin )
-install( PROGRAMS tintwizard.py DESTINATION bin )
+install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
-install( FILES taskbar.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
 install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
 install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )

src/tint2conf/main.c

@@ -69,6 +69,7 @@ static void refresh_current_theme();
 static void menuAbout();
 static gboolean view_onPopupMenu(GtkWidget *treeview, gpointer userdata);
 static gboolean view_onButtonPressed(GtkWidget *treeview, GdkEventButton *event, gpointer userdata);
+static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data);
 static gboolean theme_selected(GtkTreeSelection *selection,
 							   GtkTreeModel *model,
 							   GtkTreePath *path,
@@ -118,26 +119,12 @@ static const char *global_ui =
 	"  </popup>"
 	"</ui>";
 
-
-// define menubar and toolbar action
-static GtkActionEntry entries[] = {
-	{"ThemeMenu", NULL, _("Theme"), NULL, NULL, NULL},
-	{"ThemeAdd", GTK_STOCK_ADD, _("_Import theme..."), "<Control>N", _("Import theme"), G_CALLBACK(menuImport)},
-	{"ThemeDefault", GTK_STOCK_NEW, _("_Import default theme..."), NULL, _("Import default theme"), G_CALLBACK(menuImportDefault)},
-	{"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)},
-	{"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)},
-	{"EditRefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Refresh all"), G_CALLBACK(load_all_themes)},
-	{"HelpMenu", NULL, _("Help"), NULL, NULL, NULL},
-	{"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "<Control>A", _("About"), G_CALLBACK(menuAbout)}
-};
-
-
 int main(int argc, char **argv)
 {
+	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+	textdomain(GETTEXT_PACKAGE);
+
 	GtkWidget *vBox = NULL, *scrollbar = NULL;
 	GtkActionGroup *actionGroup;
 
@@ -166,6 +153,23 @@ int main(int argc, char **argv)
 	gtk_container_add(GTK_CONTAINER(g_window), vBox);
 
 	actionGroup = gtk_action_group_new("menuActionGroup");
+
+	// Menubar and toolbar entries
+	GtkActionEntry entries[] = {
+		{"ThemeMenu", NULL, _("Theme"), NULL, NULL, NULL},
+		{"ThemeAdd", GTK_STOCK_ADD, _("_Import theme..."), "<Control>N", _("Import theme"), G_CALLBACK(menuImport)},
+		{"ThemeDefault", GTK_STOCK_NEW, _("_Import default theme..."), NULL, _("Import default theme"), G_CALLBACK(menuImportDefault)},
+		{"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)},
+		{"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)},
+		{"EditRefreshAll", GTK_STOCK_REFRESH, _("Refresh all"), NULL, _("Refresh all"), G_CALLBACK(load_all_themes)},
+		{"HelpMenu", NULL, _("Help"), NULL, NULL, NULL},
+		{"HelpAbout", GTK_STOCK_ABOUT, _("_About"), "<Control>A", _("About"), G_CALLBACK(menuAbout)}
+	};
+
 	gtk_action_group_add_actions(actionGroup, entries, G_N_ELEMENTS(entries), NULL);
 	globalUIManager = gtk_ui_manager_new();
 	gtk_ui_manager_insert_action_group(globalUIManager, actionGroup, 0);
@@ -204,6 +208,7 @@ int main(int argc, char **argv)
 	gtk_widget_show(g_theme_view);
 	g_signal_connect(g_theme_view, "button-press-event", (GCallback)view_onButtonPressed, NULL);
 	g_signal_connect(g_theme_view, "popup-menu", (GCallback)view_onPopupMenu, NULL);
+	g_signal_connect(g_theme_view, "row-activated", G_CALLBACK(viewRowActivated), NULL);
 	gtk_tree_selection_set_select_function(gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view)), theme_selected, NULL, NULL);
 
 	// load themes
@@ -244,6 +249,7 @@ static void menuImport()
 {
 	GtkWidget *dialog = gtk_file_chooser_dialog_new(_("Import theme(s)"), GTK_WINDOW(g_window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL);
 	GtkFileChooser *chooser = GTK_FILE_CHOOSER(dialog);
+	gtk_file_chooser_set_select_multiple(chooser, TRUE);
 
 	if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) {
 		gtk_widget_destroy(dialog);
@@ -476,6 +482,11 @@ static void edit_current_theme()
 	}
 }
 
+static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
+{
+	edit_current_theme();
+}
+
 // ====== Theme load/reload ======
 
 static void load_all_themes()

src/tint2conf/main.h

@@ -11,6 +11,7 @@
 #include <glib/gi18n-lib.h>
 #else
 #define _(String) String
+#define GETTEXT_PACKAGE "tint2conf"
 #endif
 
 #define SNAPSHOT_TICK 190

src/tint2conf/po/CMakeLists.txt

@@ -0,0 +1,20 @@
+include(FindGettext)
+if (GETTEXT_FOUND)
+    set(GETTEXT_PACKAGE tint2conf)
+    file(GLOB POTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.po")
+    string(REPLACE ".po" " " LANGUAGES ${POTFILES})
+    message(STATUS "gettext found languages: ${LANGUAGES}")
+    string(REPLACE " " ";" LANGUAGES ${LANGUAGES})
+    if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.8")
+        GETTEXT_CREATE_TRANSLATIONS("${CMAKE_CURRENT_SOURCE_DIR}/tint2conf.pot" ALL ${POTFILES})
+    else()
+        foreach(LANG ${LANGUAGES})
+            GETTEXT_PROCESS_PO_FILES(${LANG} ALL PO_FILES ${LANG}.po)
+            install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo"
+                    DESTINATION "${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale/${LANG}/LC_MESSAGES"
+                    RENAME "${GETTEXT_PACKAGE}.mo")
+            endforeach ()
+    endif()
+else ()
+    message(STATUS "gettext not found")
+endif ()

src/tint2conf/properties.h

@@ -48,7 +48,7 @@ extern GtkWidget *panel_background;
 // taskbar
 extern GtkWidget *taskbar_show_desktop, *taskbar_show_name, *taskbar_padding_x, *taskbar_padding_y, *taskbar_spacing;
 extern GtkWidget *taskbar_hide_inactive_tasks, *taskbar_hide_diff_monitor;
-extern GtkWidget *taskbar_name_padding_x, *taskbar_name_inactive_color, *taskbar_name_active_color, *taskbar_name_font;
+extern GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color, *taskbar_name_active_color, *taskbar_name_font;
 extern GtkWidget *taskbar_active_background, *taskbar_inactive_background;
 extern GtkWidget *taskbar_name_active_background, *taskbar_name_inactive_background;
 extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order;
@@ -56,7 +56,7 @@ extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order;
 // task
 extern GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down;
 extern GtkWidget *task_show_icon, *task_show_text, *task_align_center, *font_shadow;
-extern GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_font;
+extern GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_spacing, *task_font;
 extern GtkWidget *task_default_color, *task_default_color_set,
 		  *task_default_icon_opacity, *task_default_icon_osb_set,
 		  *task_default_icon_saturation,
@@ -121,11 +121,13 @@ extern GtkWidget *launcher_apps_view, *all_apps_view;
 extern GtkWidget *launcher_apps_dirs;
 
 extern GtkWidget *launcher_icon_size, *launcher_icon_theme, *launcher_padding_x, *launcher_padding_y, *launcher_spacing;
+extern GtkWidget *launcher_icon_opacity, *launcher_icon_saturation, *launcher_icon_brightness;
 extern GtkWidget *margin_x, *margin_y;
 extern GtkWidget *launcher_background;
 extern GtkWidget *startup_notifications;
 extern IconThemeWrapper *icon_theme;
 extern GtkWidget *launcher_tooltip;
+extern GtkWidget *launcher_icon_theme_override;
 
 void load_desktop_file(const char *file, gboolean selected);
 void set_current_icon_theme(const char *theme);

src/tint2conf/properties_rw.c

@@ -1,4 +1,3 @@
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,7 +10,8 @@
 
 void add_entry(char *key, char *value);
 void hex2gdk(char *hex, GdkColor *color);
-void get_action(char *event, GtkWidget *combo);
+void set_action(char *event, GtkWidget *combo);
+char *get_action(GtkWidget *combo);
 
 int config_has_panel_items;
 int config_has_battery;
@@ -24,6 +24,8 @@ int no_items_battery_enabled;
 
 void config_read_file(const char *path)
 {
+	background_create_new();
+
 	FILE *fp;
 	char line[512];
 	char *key, *value;
@@ -90,7 +92,7 @@ void config_write_backgrounds(FILE *fp)
 	fprintf(fp, "# Backgrounds\n");
 
 	int index;
-	for (index = 0; ; index++) {
+	for (index = 1; ; index++) {
 		GtkTreePath *path;
 		GtkTreeIter iter;
 
@@ -117,7 +119,7 @@ void config_write_backgrounds(FILE *fp)
 						   bgColBorderWidth, &b,
 						   bgColCornerRadius, &r,
 						   -1);
-		fprintf(fp, "#%d\n", index + 1);
+		fprintf(fp, "# Background %d\n", index);
 		fprintf(fp, "rounded = %d\n", r);
 		fprintf(fp, "border_width = %d\n", b);
 		config_write_color(fp, "background_color", *fillColor, fillOpacity);
@@ -145,7 +147,7 @@ void config_write_panel(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(panel_padding_x)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(panel_padding_y)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(panel_spacing)));
-	fprintf(fp, "panel_background_id = %d\n", 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(panel_background)));
+	fprintf(fp, "panel_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(panel_background)));
 	fprintf(fp, "wm_menu = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel_wm_menu)) ? 1 : 0);
 	fprintf(fp, "panel_dock = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel_dock)) ? 1 : 0);
 
@@ -181,7 +183,7 @@ void config_write_panel(FILE *fp)
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(panel_combo_layer)) == 0) {
 		fprintf(fp, "top");
 	} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(panel_combo_layer)) == 1) {
-		fprintf(fp, "center");
+		fprintf(fp, "normal");
 	} else {
 		fprintf(fp, "bottom");
 	}
@@ -232,16 +234,17 @@ void config_write_taskbar(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(taskbar_padding_x)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(taskbar_padding_y)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(taskbar_spacing)));
-	fprintf(fp, "taskbar_background_id = %d\n", 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_inactive_background)));
+	fprintf(fp, "taskbar_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_inactive_background)));
-	fprintf(fp, "taskbar_active_background_id = %d\n", 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_active_background)));
+	fprintf(fp, "taskbar_active_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_active_background)));
 	fprintf(fp, "taskbar_name = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(taskbar_show_name)) ? 1 : 0);
 	fprintf(fp, "taskbar_hide_inactive_tasks = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(taskbar_hide_inactive_tasks)) ? 1 : 0);
 	fprintf(fp, "taskbar_hide_different_monitor = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(taskbar_hide_diff_monitor)) ? 1 : 0);
 	fprintf(fp,
-			"taskbar_name_padding = %d\n",
+			"taskbar_name_padding = %d %d\n",
-			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(taskbar_name_padding_x)));
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(taskbar_name_padding_x)),
-	fprintf(fp, "taskbar_name_background_id = %d\n", 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_name_inactive_background)));
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(taskbar_name_padding_y)));
-	fprintf(fp, "taskbar_name_active_background_id = %d\n", 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_name_active_background)));
+	fprintf(fp, "taskbar_name_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_name_inactive_background)));
+	fprintf(fp, "taskbar_name_active_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_name_active_background)));
 	fprintf(fp, "taskbar_name_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(taskbar_name_font)));
 
 	GdkColor color;
@@ -260,7 +263,7 @@ void config_write_taskbar(FILE *fp)
 	fprintf(fp, "taskbar_distribute_size = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(taskbar_distribute_size)) ? 1 : 0);
 
 	fprintf(fp, "taskbar_sort_order = ");
-	if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 0) {
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) <= 0) {
 		fprintf(fp, "none");
 	} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 1) {
 		fprintf(fp, "title");
@@ -304,7 +307,7 @@ void config_write_task_background(FILE *fp, char *name, GtkWidget *task_backgrou
 {
 	char full_name[128];
 	sprintf(full_name, "task%s_background_id", name);
-	fprintf(fp, "%s = %d\n", full_name, 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(task_background)));
+	fprintf(fp, "%s = %d\n", full_name, gtk_combo_box_get_active(GTK_COMBO_BOX(task_background)));
 }
 
 void config_write_task(FILE *fp)
@@ -321,9 +324,10 @@ void config_write_task(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(task_maximum_width)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(task_maximum_height)));
 	fprintf(fp,
-			"task_padding = %d %d\n",
+			"task_padding = %d %d %d\n",
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(task_padding_x)),
-			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(task_padding_y)));
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(task_padding_y)),
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(task_spacing)));
 	fprintf(fp, "task_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(task_font)));
 	fprintf(fp, "task_tooltip = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tooltip_task_show)) ? 1 : 0);
 
@@ -393,6 +397,13 @@ void config_write_task(FILE *fp)
 		config_write_task_background(fp, "_iconified", task_iconified_background);
 	}
 
+
+	fprintf(fp, "mouse_left = %s\n", get_action(task_mouse_left));
+	fprintf(fp, "mouse_middle = %s\n", get_action(task_mouse_middle));
+	fprintf(fp, "mouse_right = %s\n", get_action(task_mouse_right));
+	fprintf(fp, "mouse_scroll_up = %s\n", get_action(task_mouse_scroll_up));
+	fprintf(fp, "mouse_scroll_down = %s\n", get_action(task_mouse_scroll_down));
+
 	fprintf(fp, "\n");
 }
 
@@ -406,7 +417,7 @@ void config_write_systray(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(systray_padding_x)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(systray_padding_y)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(systray_spacing)));
-	fprintf(fp, "systray_background_id = %d\n", 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(systray_background)));
+	fprintf(fp, "systray_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(systray_background)));
 
 	fprintf(fp, "systray_sort = ");
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(systray_icon_order)) == 0) {
@@ -428,7 +439,7 @@ void config_write_systray(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(systray_icon_brightness)));
 
 	fprintf(fp, "systray_monitor = ");
-	fprintf(fp, "%d", gtk_combo_box_get_active(GTK_COMBO_BOX(systray_monitor)));
+	fprintf(fp, "%d", MAX(1, 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(systray_monitor))));
 	fprintf(fp, "\n");
 
 	fprintf(fp, "\n");
@@ -444,14 +455,20 @@ void config_write_launcher(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_padding_x)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_padding_y)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_spacing)));
-	fprintf(fp, "launcher_background_id = %d\n", 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(launcher_background)));
+	fprintf(fp, "launcher_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(launcher_background)));
 	fprintf(fp, "launcher_icon_size = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_icon_size)));
+	fprintf(fp,
+			"launcher_icon_asb = %d %d %d\n",
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_icon_opacity)),
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_icon_saturation)),
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_icon_brightness)));
 	gchar *icon_theme = get_current_icon_theme();
 	if (icon_theme && !g_str_equal(icon_theme, "")) {
 		fprintf(fp, "launcher_icon_theme = %s\n", icon_theme);
 		g_free(icon_theme);
 		icon_theme = NULL;
 	}
+	fprintf(fp, "launcher_icon_theme_override = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(launcher_icon_theme_override)) ? 1 : 0);
 	fprintf(fp, "startup_notifications = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(startup_notifications)) ? 1 : 0);
 	fprintf(fp, "launcher_tooltip = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(launcher_tooltip)) ? 1 : 0);
 
@@ -515,8 +532,8 @@ void config_write_clock(FILE *fp)
 	fprintf(fp,
 			"clock_padding = %d %d\n",
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(clock_padding_x)),
-			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(clock_padding_x)));
+			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(clock_padding_y)));
-	fprintf(fp, "clock_background_id = %d\n", 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(clock_background)));
+	fprintf(fp, "clock_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(clock_background)));
 	fprintf(fp, "clock_tooltip = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_format_tooltip)));
 	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)));
@@ -544,7 +561,7 @@ void config_write_battery(FILE *fp)
 			"battery_padding = %d %d\n",
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_padding_x)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_padding_y)));
-	fprintf(fp, "battery_background_id = %d\n", 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(battery_background)));
+	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, "\n");
@@ -561,7 +578,7 @@ void config_write_tooltip(FILE *fp)
 			"tooltip_padding = %d %d\n",
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(tooltip_padding_x)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(tooltip_padding_y)));
-	fprintf(fp, "tooltip_background_id = %d\n", 1 + gtk_combo_box_get_active(GTK_COMBO_BOX(tooltip_background)));
+	fprintf(fp, "tooltip_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(tooltip_background)));
 
 	GdkColor color;
 	gtk_color_button_get_color(GTK_COLOR_BUTTON(tooltip_font_color), &color);
@@ -607,6 +624,8 @@ void config_save_file(const char *path) {
 
 	unsigned short checksum = 0;
 	fprintf(fp, "#---- Generated by tint2conf %04x ----\n", checksum);
+	fprintf(fp, "# See https://gitlab.com/o9000/tint2/wikis/Configure for \n");
+	fprintf(fp, "# full documentation of the configuration options.\n");
 
 	config_write_backgrounds(fp);
 	config_write_panel(fp);
@@ -1008,6 +1027,7 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "taskbar_name_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(taskbar_name_padding_x), atoi(value1));
+		if (value2) gtk_spin_button_set_value(GTK_SPIN_BUTTON(taskbar_name_padding_y), atoi(value2));
 	}
 	else if (strcmp(key, "taskbar_name_background_id") == 0) {
 		int id = background_index_safe(atoi(value));
@@ -1071,7 +1091,9 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "task_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_padding_x), atoi(value1));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_spacing), atoi(value1));
 		if (value2) gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_padding_y), atoi(value2));
+		if (value3) gtk_spin_button_set_value(GTK_SPIN_BUTTON(task_spacing), atoi(value3));
 	}
 	else if (strcmp(key, "task_font") == 0) {
 		gtk_font_button_set_font_name(GTK_FONT_BUTTON(task_font), value);
@@ -1209,20 +1231,18 @@ void add_entry(char *key, char *value)
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(systray_icon_size), atoi(value));
 	}
 	else if (strcmp(key, "systray_monitor") == 0) {
-		if (strcmp(value, "0") == 0)
+		if (strcmp(value, "1") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 1);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 0);
-		else if (strcmp(value, "1") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 2);
 		else if (strcmp(value, "2") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 3);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 1);
 		else if (strcmp(value, "3") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 4);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 2);
 		else if (strcmp(value, "4") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 5);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 3);
 		else if (strcmp(value, "5") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 6);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 4);
 		else if (strcmp(value, "6") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 7);
+			gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 5);
 	}
 	else if (strcmp(key, "systray_icon_asb") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -1265,12 +1285,21 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "launcher_icon_theme") == 0) {
 		set_current_icon_theme(value);
 	}
+	else if (strcmp(key, "launcher_icon_theme_override") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(launcher_icon_theme_override), atoi(value));
+	}
 	else if (strcmp(key, "launcher_tooltip") == 0) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(launcher_tooltip), atoi(value));
 	}
 	else if (strcmp(key, "startup_notifications") == 0) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(startup_notifications), atoi(value));
 	}
+	else if (strcmp(key, "launcher_icon_asb") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_icon_opacity), atoi(value1));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_icon_saturation), atoi(value2));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_icon_brightness), atoi(value3));
+	}
 
 	/* Tooltip */
 	else if (strcmp(key, "tooltip_show_timeout") == 0) {
@@ -1304,19 +1333,19 @@ void add_entry(char *key, char *value)
 
 	/* Mouse actions */
 	else if (strcmp(key, "mouse_left") == 0) {
-		get_action(value, task_mouse_left);
+		set_action(value, task_mouse_left);
 	}
 	else if (strcmp(key, "mouse_middle") == 0) {
-		get_action(value, task_mouse_middle);
+		set_action(value, task_mouse_middle);
 	}
 	else if (strcmp(key, "mouse_right") == 0) {
-		get_action(value, task_mouse_right);
+		set_action(value, task_mouse_right);
 	}
 	else if (strcmp(key, "mouse_scroll_up") == 0) {
-		get_action(value, task_mouse_scroll_up);
+		set_action(value, task_mouse_scroll_up);
 	}
 	else if (strcmp(key, "mouse_scroll_down") == 0) {
-		get_action(value, task_mouse_scroll_down);
+		set_action(value, task_mouse_scroll_down);
 	}
 
 	if (value1) free(value1);
@@ -1334,7 +1363,7 @@ void hex2gdk(char *hex, GdkColor *color)
 	color->pixel = 0;
 }
 
-void get_action(char *event, GtkWidget *combo)
+void set_action(char *event, GtkWidget *combo)
 {
 	if (strcmp(event, "none") == 0)
 		gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
@@ -1359,3 +1388,30 @@ void get_action(char *event, GtkWidget *combo)
 	else if (strcmp(event, "prev_task") == 0)
 		gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 10);
 }
+
+char *get_action(GtkWidget *combo)
+{
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 0)
+		return "none";
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 1)
+		return "close";
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 2)
+		return "toggle";
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 3)
+		return "iconify";
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 4)
+		return "shade";
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 5)
+		return "toggle_iconify";
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 6)
+		return "maximize_restore";
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 7)
+		return "desktop_left";
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 8)
+		return "desktop_right";
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 9)
+		return "next_task";
+	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 10)
+		return "prev_task";
+	return "none";
+}

src/tint2conf/tint2conf.desktop

@@ -1,148 +1,58 @@
 [Desktop Entry]
 Type=Application
-Name=Panel tint2
+Name=Tint2 panel settings
-Name[am]=ፓነል  tint2
+Name[am]=ፓነል  አስተዳዳሪ
-Name[ar]=الشريط tint2
+Name[ar]=مدير الائحة :
-Name[ast]=Panel tint2
+Name[ast]=Alministrador de panel
-Name[be]=Панэль tint2
+Name[be]=Кіраўнік Панэляў
-Name[ca]=Quadre tint2
+Name[ca]=Gestor de quadres
-Name[cs]=Panel tint2
+Name[cs]=Správce panelu
-Name[da]=Panel tint2
+Name[da]=Panelhåndtering
-Name[de]=Leiste tint2
+Name[de]=Leistenverwaltung
-Name[dz]=པེ་ནཱལ། tint2
+Name[dz]=པེ་ནཱལ་འཛིན་སྐྱོང་པ།
-Name[el]=Ταμπλό tint2
+Name[el]=Διαχειριστής ταμπλό
-Name[en_GB]=Panel tint2
+Name[en_GB]=Panel Manager
-Name[eo]=Panelo tint2
+Name[eo]=Administrilo de Panelo
-Name[es]=Panel tint2
+Name[es]=Administrador de panel
-Name[et]=Ääreriba tint2
+Name[et]=Paneelihaldur
-Name[eu]=Panela tint2
+Name[eu]=Panel Kudeatzailea:
-Name[fi]=Paneeli tint2
+Name[fi]=Paneelin hallinta
-Name[fr]=Panneau tint2
+Name[fr]=Gestionnaire de panneau
-Name[gl]=Panel tint2
+Name[gl]=Xestor de paneis
-Name[he]=לוח tint2
+Name[he]=מנהל הלוח
-Name[hu]=Panel tint2
+Name[hu]=Panelkezelő
-Name[id]=Panel tint2
+Name[id]=Manajer Panel
-Name[it]=Pannello tint2
+Name[it]=Gestore dei pannelli
-Name[ja]=パネル tint2
+Name[ja]=パネルマネージャ
-Name[kk]=Панель tint2
+Name[kk]=Панель менеджері
-Name[ko]=패널 tint2
+Name[ko]=패널 관리자
-Name[ku]=Panel tint2
+Name[ku]=Gerinendeyê panelan
-Name[lv]=Panelis tint2
+Name[lv]=Paneļu pārvaldnieks
-Name[mk]=Панел tint2
+Name[mk]=Менаџер за панели
-Name[nb]=Panel tint2
+Name[nb]=Panelbehandler
-Name[nl]=Paneel tint2
+Name[nl]=Paneel Manager
-Name[nn]=Panel tint2
+Name[nn]=Panelhandsamar
-Name[pa]=ਪੈਨਲ tint2
+Name[pa]=ਪੈਨਲ ਮੈਨੇਜਰ
-Name[pl]=Panel tint2
+Name[pl]=Panel
-Name[pt]=Painel tint2
+Name[pt]=Gestor do Painel
-Name[pt_BR]=Painel tint2
+Name[pt_BR]=Gerenciador do painel
-Name[ro]=Panou tint2
+Name[ro]=Manager de panouri
-Name[ru]=Панель tint2
+Name[ru]=Диспетчер панелей 
-Name[si]=පුවරුව tint2
+Name[si]=පුවරු කළමණාකරු
-Name[sk]=Panel tint2
+Name[sk]=Nastavenie panelu
-Name[sq]=Panel tint2
+Name[sq]=Përgjegjës Panelesh
-Name[sv]=Panel tint2
+Name[sv]=Panelhanterare
-Name[ta]=பலகை tint2
+Name[ta]=பலகை மேளாலர்:
-Name[tr]=Panel tint2
+Name[tr]=Panel Yöneticisi
-Name[ug]=panel tint2
+Name[ug]=Panel باشقۇرغۇ
-Name[uk]=Панель tint2
+Name[uk]=Менеджер панелей
-Name[ur]=پینل tint2
+Name[ur]=پینل منیجر
-Name[ur_PK]=پینل tint2
+Name[ur_PK]=پینل منیجر
-Name[vi]=Panel tint2
+Name[vi]=Quản lý panel
-Name[zh_CN]=面板 tint2
+Name[zh_CN]=面板管理器
-Name[zh_TW]=面板 tint2
+Name[zh_TW]=面板管理程式
-GenericName=Panel Manager
-GenericName[am]=ፓነል  አስተዳዳሪ
-GenericName[ar]=مدير الائحة :
-GenericName[ast]=Alministrador de panel
-GenericName[be]=Кіраўнік Панэляў
-GenericName[ca]=Gestor de quadres
-GenericName[cs]=Správce panelu
-GenericName[da]=Panelhåndtering
-GenericName[de]=Leistenverwaltung
-GenericName[dz]=པེ་ནཱལ་འཛིན་སྐྱོང་པ།
-GenericName[el]=Διαχειριστής ταμπλό
-GenericName[en_GB]=Panel Manager
-GenericName[eo]=Administrilo de Panelo
-GenericName[es]=Administrador de panel
-GenericName[et]=Paneelihaldur
-GenericName[eu]=Panel Kudeatzailea:
-GenericName[fi]=Paneelin hallinta
-GenericName[fr]=Gestionnaire de panneau
-GenericName[gl]=Xestor de paneis
-GenericName[he]=מנהל הלוח
-GenericName[hu]=Panelkezelő
-GenericName[id]=Manajer Panel
-GenericName[it]=Gestore dei pannelli
-GenericName[ja]=パネルマネージャ
-GenericName[kk]=Панель менеджері
-GenericName[ko]=패널 관리자
-GenericName[ku]=Gerinendeyê panelan
-GenericName[lv]=Paneļu pārvaldnieks
-GenericName[mk]=Менаџер за панели
-GenericName[nb]=Panelbehandler
-GenericName[nl]=Paneel Manager
-GenericName[nn]=Panelhandsamar
-GenericName[pa]=ਪੈਨਲ ਮੈਨੇਜਰ
-GenericName[pl]=Panel
-GenericName[pt]=Gestor do Painel
-GenericName[pt_BR]=Gerenciador do painel
-GenericName[ro]=Manager de panouri
-GenericName[ru]=Диспетчер панелей 
-GenericName[si]=පුවරු කළමණාකරු
-GenericName[sk]=Nastavenie panelu
-GenericName[sq]=Përgjegjës Panelesh
-GenericName[sv]=Panelhanterare
-GenericName[ta]=பலகை மேளாலர்:
-GenericName[tr]=Panel Yöneticisi
-GenericName[ug]=Panel باشقۇرغۇ
-GenericName[uk]=Менеджер панелей
-GenericName[ur]=پینل منیجر
-GenericName[ur_PK]=پینل منیجر
-GenericName[vi]=Quản lý panel
-GenericName[zh_CN]=面板管理器
-GenericName[zh_TW]=面板管理程式
-Comment=Customize the panel settings
-Comment[ast]=Personalice la configuración del panel
-Comment[ca]=Personalitza els ajustaments del quadre
-Comment[cs]=Přizpůsobit nastavení panelu
-Comment[da]=Tilpas panelets indstillinger
-Comment[de]=Leiste anpassen
-Comment[el]=Προσαρμογή ρυθμίσεων ταμπλό
-Comment[en_GB]=Customise the panel settings
-Comment[es]=Personalice la configuración del panel
-Comment[et]=Ääreriba seadistamine käepäraseks
-Comment[eu]=Pertsonalizatu panel ezapenak
-Comment[fi]=Mukauta paneelin asetuksia
-Comment[fr]=Configurer le panneau
-Comment[gl]=Personalizar a configuración do panel
-Comment[hu]=A panel beállításainak személyre szabása
-Comment[id]=Kustomisasi pengaturan panel
-Comment[it]=Personalizzazione delle impostazioni del pannello
-Comment[ja]=パネルの設定をカスタマイズします
-Comment[kk]=Панельді баптау
-Comment[lv]=Pielāgot paneļa uzstādījumus
-Comment[nb]=Tilpass panelet
-Comment[nl]=Paneel configureren
-Comment[nn]=Tilpass innstillingane for panelet
-Comment[pl]=Konfiguruje ustawienia paneli
-Comment[pt]=Personalizar as definições do painel
-Comment[pt_BR]=Personalizar as configurações do painel
-Comment[ro]=Schimbați opțiunile panoului
-Comment[ru]=Настроить панель 
-Comment[si]=පුවරු සිටුවම් සකසන්න
-Comment[sk]=Prispôsobiť nastavenia panelu
-Comment[sq]=Përshtasni rregullimet për panelin
-Comment[sv]=Anpassa panelinställningarna
-Comment[ta]=நிரல்பலகை அமைப்பை தன்விருப்பமாற்றம் செய்க
-Comment[tr]=Panel ayarlarını özelleştir
-Comment[ug]=panel تەڭشىكىنى Customize قىلىش
-Comment[uk]=Налаштувати властивості панелі
-Comment[ur]=پینل کی ترتیبات
-Comment[ur_PK]=پینل کی ترتیبات
-Comment[zh_CN]=自定义面板设置
 Exec=tint2conf
-Icon=taskbar
+Icon=tint2conf
 Terminal=false
 Categories=Settings;DesktopSettings;
 

src/tint2conf/tint2conf.svg

@@ -0,0 +1,509 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="48"
+   height="48"
+   id="svg1325"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="tint2conf.svg"
+   inkscape:export-filename="/home/omega_dist/4_devel_open_source/9_tint/tint2/src/tint2conf/tint2conf.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata50">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1768"
+     inkscape:window-height="1056"
+     id="namedview48"
+     showgrid="false"
+     inkscape:zoom="16"
+     inkscape:cx="30.824904"
+     inkscape:cy="2.1959811"
+     inkscape:window-x="152"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g3841" />
+  <defs
+     id="defs1327">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective52" />
+    <linearGradient
+       id="linearGradient4708">
+      <stop
+         id="stop4710"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4712"
+         style="stop-color:black;stop-opacity:1"
+         offset="0.57954973" />
+      <stop
+         id="stop4714"
+         style="stop-color:black;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2270">
+      <stop
+         id="stop2272"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2274"
+         style="stop-color:white;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20"
+       y1="18"
+       x2="20"
+       y2="46"
+       id="linearGradient2851"
+       xlink:href="#linearGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-9.9999992)" />
+    <linearGradient
+       x1="30"
+       y1="17"
+       x2="30"
+       y2="47"
+       id="linearGradient2854"
+       xlink:href="#linearGradient2181"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-9.9999992)" />
+    <linearGradient
+       x1="63.397362"
+       y1="-12.489107"
+       x2="63.397362"
+       y2="5.4675598"
+       id="linearGradient2685"
+       xlink:href="#linearGradient4873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436509,0,0,1.5436158,-80.015712,21.419381)" />
+    <linearGradient
+       id="linearGradient4873">
+      <stop
+         id="stop4875"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4877"
+         style="stop-color:white;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="23.895569"
+       cy="3.9900031"
+       r="20.397499"
+       fx="23.895569"
+       fy="3.9900031"
+       id="radialGradient2688"
+       xlink:href="#linearGradient3242-187-536"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.7008781,-2.245129,0,24.958071,-40.236051)" />
+    <linearGradient
+       id="linearGradient3242-187-536">
+      <stop
+         id="stop2778"
+         style="stop-color:#8badea;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2780"
+         style="stop-color:#6396cd;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop2782"
+         style="stop-color:#3b7caf;stop-opacity:1"
+         offset="0.66093999" />
+      <stop
+         id="stop2784"
+         style="stop-color:#194c70;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="18.379412"
+       y1="44.980297"
+       x2="18.379412"
+       y2="3.0816143"
+       id="linearGradient2690"
+       xlink:href="#linearGradient2490-182-124"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7126612,0,0,0.7126613,-1.1038706,-1.1038704)" />
+    <linearGradient
+       id="linearGradient2490-182-124">
+      <stop
+         id="stop2788"
+         style="stop-color:#1f4b6a;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2790"
+         style="stop-color:#4083c2;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="62.625"
+       cy="4.625"
+       r="10.625"
+       fx="62.625"
+       fy="4.625"
+       id="radialGradient2693"
+       xlink:href="#linearGradient8838"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5058824,0,0,0.37647,-78.305888,26.258824)" />
+    <linearGradient
+       id="linearGradient8838">
+      <stop
+         id="stop8840"
+         style="stop-color:black;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8842"
+         style="stop-color:black;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2181">
+      <stop
+         id="stop2183"
+         style="stop-color:#f0f0f0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2185"
+         style="stop-color:#d3d3d3;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="50.23077"
+       y1="22"
+       x2="53"
+       y2="22"
+       id="linearGradient4720"
+       xlink:href="#linearGradient4708"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.3333333,0,0,1,-176.66667,0)" />
+    <mask
+       id="mask4716">
+      <rect
+         width="52"
+         height="32"
+         x="1"
+         y="6"
+         id="rect4718"
+         style="fill:url(#linearGradient4720);fill-opacity:1;stroke:none" />
+    </mask>
+    <linearGradient
+       x1="50.23077"
+       y1="22"
+       x2="53"
+       y2="22"
+       id="linearGradient4726"
+       xlink:href="#linearGradient4708"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.3333333,0,0,1,-176.66667,0)" />
+    <mask
+       id="mask4722">
+      <rect
+         width="52"
+         height="32"
+         x="1"
+         y="6"
+         id="rect4724"
+         style="fill:url(#linearGradient4726);fill-opacity:1;stroke:none" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4873"
+       id="linearGradient2861"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8085571,0,0,0.74493792,-86.459085,24.622683)"
+       x1="63.397362"
+       y1="-12.489107"
+       x2="63.397362"
+       y2="5.4675598" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3242-187-536"
+       id="radialGradient2864"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.82083158,-2.630416,0,36.52927,-5.1317867)"
+       cx="23.895569"
+       cy="3.9900031"
+       fx="23.895569"
+       fy="3.9900031"
+       r="20.397499" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2490-182-124"
+       id="linearGradient2866"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.83496113,0,0,0.34392523,5.994833,13.753123)"
+       x1="18.379412"
+       y1="44.980297"
+       x2="18.379412"
+       y2="3.0816143" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8838"
+       id="radialGradient2869"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7643072,0,0,0.18168172,-84.455838,26.958163)"
+       cx="62.625"
+       cy="4.625"
+       fx="62.625"
+       fy="4.625"
+       r="10.625" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8838"
+       id="radialGradient2876"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7643072,0,0,0.18168172,-84.455838,26.958163)"
+       cx="62.625"
+       cy="4.625"
+       fx="62.625"
+       fy="4.625"
+       r="10.625" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3242-187-536"
+       id="radialGradient2878"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.82083158,-2.630416,0,36.52927,-5.1317867)"
+       cx="23.895569"
+       cy="3.9900031"
+       fx="23.895569"
+       fy="3.9900031"
+       r="20.397499" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2490-182-124"
+       id="linearGradient2880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.83496113,0,0,0.34392523,5.994833,13.753123)"
+       x1="18.379412"
+       y1="44.980297"
+       x2="18.379412"
+       y2="3.0816143" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4873"
+       id="linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8085571,0,0,0.74493792,-86.459085,24.622683)"
+       x1="63.397362"
+       y1="-12.489107"
+       x2="63.397362"
+       y2="5.4675598" />
+    <inkscape:perspective
+       id="perspective2924"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       x1="30"
+       y1="17"
+       x2="30"
+       y2="47"
+       id="linearGradient2854-0"
+       xlink:href="#linearGradient2181-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-9.9999992)" />
+    <linearGradient
+       id="linearGradient2181-7">
+      <stop
+         id="stop2183-8"
+         style="stop-color:#f0f0f0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2185-6"
+         style="stop-color:#d3d3d3;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <mask
+       id="mask4722-8">
+      <rect
+         width="52"
+         height="32"
+         x="1"
+         y="6"
+         id="rect4724-8"
+         style="fill:url(#linearGradient4726-4);fill-opacity:1;stroke:none" />
+    </mask>
+    <linearGradient
+       x1="50.23077"
+       y1="22"
+       x2="53"
+       y2="22"
+       id="linearGradient4726-4"
+       xlink:href="#linearGradient4708-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.3333333,0,0,1,-176.66667,0)" />
+    <linearGradient
+       id="linearGradient4708-3">
+      <stop
+         id="stop4710-1"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4712-4"
+         style="stop-color:black;stop-opacity:1"
+         offset="0.57954973" />
+      <stop
+         id="stop4714-9"
+         style="stop-color:black;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="47"
+       x2="30"
+       y1="17"
+       x1="30"
+       gradientTransform="translate(0,-9.9999992)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2940"
+       xlink:href="#linearGradient2181-7"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2894"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <rect
+     width="46"
+     height="29"
+     x="2.5"
+     y="7.5"
+     mask="url(#mask4722)"
+     id="rect1333"
+     style="fill:url(#linearGradient2854);fill-opacity:1;stroke:#2c2c2c;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     transform="translate(-0.20338983,3.4237288)" />
+  <rect
+     width="45"
+     height="27"
+     x="3.5"
+     y="8.5"
+     mask="url(#mask4716)"
+     id="rect2210"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2851);stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     transform="translate(-0.20338983,3.4237288)" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#333424;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0.69999999999999996"
+     id="rect6306"
+     width="29.45332"
+     height="9.5719652"
+     x="10.697065"
+     y="21.044527"
+     rx="1.4456253"
+     ry="1.6443363" />
+  <g
+     id="g3841"
+     transform="translate(130.875,44.5)">
+    <path
+       sodipodi:nodetypes="csscccsscc"
+       inkscape:connector-curvature="0"
+       id="path3833"
+       d="M -71.433946,14.735703 C -80.071947,4.6612321 -89.248707,-5.737975 -92.147263,-9.1977463 c -3.224562,-3.8488997 -3.263797,-3.3549747 -1.493188,-4.5254517 l 1.278694,-0.845292 14.113986,16.2862263 14.113987,16.2862257 -1.004295,0.889458 c -0.552362,0.489201 -1.149443,0.973153 -1.326848,1.075448 -0.259255,0.149489 -1.234399,-0.877491 -4.969019,-5.233165 z"
+       style="fill:#87aade" />
+    <path
+       sodipodi:nodetypes="cscsssc"
+       inkscape:connector-curvature="0"
+       id="path3825"
+       d="m -98.105823,-13.116897 c -0.09278,-0.307786 -1.541317,-8.963836 -1.697567,-8.726554 -0.0244,0.03706 7.876058,3.167414 7.876435,3.661796 0.27526,-0.22635 0.628731,0.02647 0.174381,0.954172 -0.406614,0.830238 -0.712942,1.441488 -2.270947,2.615226 -0.993109,0.748168 -2.553662,1.682052 -2.971367,1.846131 -0.688741,0.270545 -1.081414,0.266981 -1.110935,-0.350771 z"
+       style="fill:#e9c6af" />
+    <path
+       sodipodi:nodetypes="scscscsss"
+       inkscape:connector-curvature="0"
+       id="path3831"
+       d="m -77.291221,0.7427987 -14.60455,-16.3513767 0.637035,-0.730536 c 0.266185,-0.305255 0.324002,-1.389769 0.39974,-1.43161 0.07574,-0.04184 6.588518,8.0823714 14.511041,17.25171965 l 14.404588,16.67154235 -0.456991,0.486444 c -0.251345,0.267543 -0.509994,0.486443 -0.574776,0.486443 -0.06478,0 -6.507022,-7.3721814 -14.316087,-16.3826263 z"
+       style="fill:#afc6e9" />
+    <path
+       sodipodi:nodetypes="sssssscs"
+       inkscape:connector-curvature="0"
+       id="path3835"
+       d="m -72.642373,17.731344 c -15.785516,-18.3468257 -22.67882,-27.078419 -24.317731,-29.175546 -0.237129,-0.303427 -0.02287,-0.396673 0.25262,-0.547032 0.446221,-0.24354 0.48891,-0.24519 1.064375,0.556916 0.626398,0.873099 10.342493,12.0396466 21.114327,24.608034 6.242539,7.283685 7.651572,8.214809 7.295404,8.484526 -0.209506,0.158654 -1.332932,1.444171 -1.357614,0.66226 -0.39968,0.56189 -2.205614,-2.443908 -4.051381,-4.589158 z"
+       style="fill:#3771c8" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3837"
+       d="m -99.864407,-18.915254 3.050848,-2.237288"
+       style="fill:#0b2822;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path3049"
+       d="m -98.144068,-11.76536 29.460805,34.842161 7.728814,-6.711865 -29.898305,-34.576271"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path3823"
+       d="m -98.112288,-12.03125 2.174788,-0.688559 3.864407,-2.847458 1.079449,-2.691208 -9.621826,-4.630826 z"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccscccsscc"
+       inkscape:connector-curvature="0"
+       id="path3827"
+       d="m -80.955348,4.2773755 c -7.750968,-9.0443333 -14.97509,-16.8628515 -14.945966,-16.9543465 0.02912,-0.09149 1.512719,-0.624766 2.1979,-1.135322 l 1.426197,-1.062718 14.171177,16.60582 14.202426,16.387071 -0.88474,0.775212 c -0.486606,0.426368 -1.11724,0.948927 -1.401408,1.161244 l -0.516667,0.386032 z"
+       style="fill:#5f8dd3" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3829"
+       d="m -83.124992,5.0906125 c -7.869016,-9.1612493 -14.285686,-16.7328745 -14.259267,-16.8258325 0.02642,-0.09296 0.288522,-0.270134 0.582452,-0.393722 0.525603,-0.220999 0.770084,0.05025 14.820977,16.4434263 l 14.286559,16.6681317 -0.492096,0.387084 c -0.270652,0.212894 -0.523421,0.384976 -0.561709,0.382405 -0.03829,-0.0026 -6.507899,-7.500244 -14.376916,-16.6614925 l 0,0 z"
+       style="fill:#3771c8" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path3051"
+       d="m -96.265889,-12.891949 29.350635,34.044492"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3053"
+       d="m -92.338983,-15.661017 29.084746,33.559322"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="scscccccs"
+       inkscape:connector-curvature="0"
+       id="path3839"
+       d="m -100.69352,-20.893751 c -0.0917,-0.34644 -0.71612,-3.00338 -0.8271,-3.157561 0.0437,-0.0437 2.636115,1.39898 2.993406,1.577103 l 1.143051,0.524237 -0.435163,0.963572 -0.709103,0.627398 -0.787319,0.476477 -1.110472,0.181053 c 0.17185,0.510627 -0.0972,-0.549821 -0.2673,-1.192279 z"
+       style="fill:#5f8dd3;fill-opacity:1" />
+  </g>
+</svg>

src/util/common.c

@@ -363,24 +363,30 @@ void createHeuristicMask(DATA32* data, int w, int h)
 }
 
 
-void render_image(Drawable d, int x, int y, int w, int h)
+void render_image(Drawable d, int x, int y)
 {
-	// in real_transparency mode imlib_render_image_on_drawable does not the right thing, because
+	int w = imlib_image_get_width(), h = imlib_image_get_height();
-	// the operation is IMLIB_OP_COPY, but we would need IMLIB_OP_OVER (which does not exist)
+
-	// Therefore we have to do it with the XRender extension (i.e. copy what imlib is doing internally)
+	Pixmap pixmap = XCreatePixmap(server.dsp, server.root_win, w, h, 32);
-	// But first we need to render the image onto itself with PictOpIn to adjust the colors to the alpha channel
+	imlib_context_set_drawable(pixmap);
-	Pixmap pmap_tmp = XCreatePixmap(server.dsp, server.root_win, w, h, 32);
-	imlib_context_set_drawable(pmap_tmp);
 	imlib_context_set_blend(0);
 	imlib_render_image_on_drawable(0, 0);
-	Picture pict_image = XRenderCreatePicture(server.dsp, pmap_tmp, XRenderFindStandardFormat(server.dsp, PictStandardARGB32), 0, 0);
+
+	Pixmap mask = XCreatePixmap(server.dsp, server.root_win, w, h, 32);
+	imlib_context_set_drawable(mask);
+	imlib_context_set_blend(0);
+	imlib_render_image_on_drawable(0, 0);
+
+	Picture pict = XRenderCreatePicture(server.dsp, pixmap, XRenderFindStandardFormat(server.dsp, PictStandardARGB32), 0, 0);
 	Picture pict_drawable = XRenderCreatePicture(server.dsp, d, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
-	XRenderComposite(server.dsp, PictOpIn, pict_image, None, pict_image, 0, 0, 0, 0, 0, 0, w, h);
+	Picture pict_mask = XRenderCreatePicture(server.dsp, mask, XRenderFindStandardFormat(server.dsp, PictStandardARGB32), 0, 0);
-	XRenderComposite(server.dsp, PictOpOver, pict_image, None, pict_drawable, 0, 0, 0, 0, x, y, w, h);
+	XRenderComposite(server.dsp, PictOpOver, pict, pict_mask, pict_drawable, 0, 0, 0, 0, x, y, w, h);
-	imlib_context_set_blend(1);
+
-	XFreePixmap(server.dsp, pmap_tmp);
+	XRenderFreePicture(server.dsp, pict_mask);
-	XRenderFreePicture(server.dsp, pict_image);
 	XRenderFreePicture(server.dsp, pict_drawable);
+	XRenderFreePicture(server.dsp, pict);
+	XFreePixmap(server.dsp, mask);
+	XFreePixmap(server.dsp, pixmap);
 }
 
 void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, int font_shadow)

src/util/common.h

@@ -6,7 +6,6 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-
 #define WM_CLASS_TINT   "panel"
 
 #include <Imlib2.h>
@@ -64,7 +63,7 @@ void extract_values (const char *value, char **value1, char **value2, char **val
 void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright);
 void createHeuristicMask(DATA32* data, int w, int h);
 
-void render_image(Drawable d, int x, int y, int w, int h);
+void render_image(Drawable d, int x, int y);
 
 void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, int font_shadow);
 

tint2.desktop

@@ -0,0 +1,60 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Tint2 panel
+Name[am]=ፓነል  tint2
+Name[ar]=الشريط tint2
+Name[ast]=Panel tint2
+Name[be]=Панэль tint2
+Name[ca]=Quadre tint2
+Name[cs]=Panel tint2
+Name[da]=Panel tint2
+Name[de]=Leiste tint2
+Name[dz]=པེ་ནཱལ། tint2
+Name[el]=Ταμπλό tint2
+Name[en_GB]=Panel tint2
+Name[eo]=Panelo tint2
+Name[es]=Panel tint2
+Name[et]=Ääreriba tint2
+Name[eu]=Panela tint2
+Name[fi]=Paneeli tint2
+Name[fr]=Panneau tint2
+Name[gl]=Panel tint2
+Name[he]=לוח tint2
+Name[hu]=Panel tint2
+Name[id]=Panel tint2
+Name[it]=Pannello tint2
+Name[ja]=パネル tint2
+Name[kk]=Панель tint2
+Name[ko]=패널 tint2
+Name[ku]=Panel tint2
+Name[lv]=Panelis tint2
+Name[mk]=Панел tint2
+Name[nb]=Panel tint2
+Name[nl]=Paneel tint2
+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
+Name[sk]=Panel tint2
+Name[sq]=Panel tint2
+Name[sv]=Panel tint2
+Name[ta]=பலகை tint2
+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
+Comment=Lightweight panel
+Comment[fr_FR]=Panel léger
+Exec=tint2
+Icon=taskbar
+Terminal=false
+Categories=System;