taskbar+area: Implement center alignment

AUTHORS

@@ -5,8 +5,6 @@ tint2 is developped by :
 - Euan Freeman <euan04@gmail.com> (tintwizard)
 - Christian Ruppert <Spooky85@gmail.com> (autotools build system)
 - Ovidiu M <mrovi9000 at gmail.com> : launcher, bug fixes
-- Mishael A Sibiryakov (death@junki.org) : freespace
-- Sebastian Reichel <sre@ring0.de> : battery, various fixes
 
 tint2 is based on ttm source code (http://code.google.com/p/ttm/)
 - 2007-2008 Pål Staurland <staura@gmail.com>
@@ -23,4 +21,5 @@ Contributors:
   Marcelo Vianna : taskbar sorting
   Xico Atelo : startup notifications
   Craig Oakes : WM flags, issue tracker organization
-  Jeff Blake (https://gitlab.com/u/berkley4) : more mouse event handlers
+
+

CMakeLists.txt

@@ -3,13 +3,10 @@ cmake_minimum_required( VERSION 2.6 )
 
 option( ENABLE_BATTERY "Enable battery status plugin" ON )
 option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme configurator for tint2" ON )
-option( ENABLE_EXAMPLES "Install additional tin2rc examples" ON )
+option( ENABLE_EXAMPLES "Install additional tin2rc examples" OFF )
 option( ENABLE_RSVG "Rsvg support (launcher only)" ON )
 option( ENABLE_SN "Startup notification support" ON )
 option( ENABLE_ASAN "Build tint2 with AddressSanitizer" OFF )
-if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
-  option( ENABLE_UEVENT "Kernel event handling support" ON )
-endif( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
 
 include( FindPkgConfig )
 include( CheckLibraryExists )
@@ -26,7 +23,7 @@ pkg_check_modules( SN libstartup-notification-1.0>=0.12 )
 find_library( RT_LIBRARY rt )
 
 if( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )
-  message( FATAL_ERROR "Not all dependencies fulfilled. See https://gitlab.com/o9000/tint2/wikis/Install" )
+  message( FATAL_ERROR "Not all dependencies fulfilled. See https://code.google.com/p/tint2/wiki/Install" )
 endif( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )
 
 string( REPLACE ";" " " FLAGS_REPLACED "${IMLIB2_LDFLAGS}" )
@@ -36,8 +33,6 @@ if( NOT IMLIB_BUILD_WITH_X )
   message( FATAL_ERROR "Imlib is not built with X support" )
 endif( NOT IMLIB_BUILD_WITH_X )
 
-add_definitions( -D_GNU_SOURCE )
-
 include_directories( ${PROJECT_BINARY_DIR}
                      src
                      src/battery
@@ -47,7 +42,6 @@ include_directories( ${PROJECT_BINARY_DIR}
                      src/launcher
                      src/tooltip
                      src/util
-                     src/freespace
                      ${X11_INCLUDE_DIRS}
                      ${PANGOCAIRO_INCLUDE_DIRS}
                      ${PANGO_INCLUDE_DIRS}
@@ -73,7 +67,6 @@ set( SOURCES src/config.c
              src/taskbar/taskbar.c
              src/taskbar/taskbarname.c
              src/tooltip/tooltip.c
-             src/freespace/freespace.c
              src/util/area.c
              src/util/common.c
              src/util/strnatcmp.c
@@ -81,20 +74,7 @@ set( SOURCES src/config.c
              src/util/window.c )
 
 if( ENABLE_BATTERY )
-  set( SOURCES ${SOURCES} src/battery/battery.c)
+  set( SOURCES ${SOURCES} src/battery/battery.c )
-
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set( SOURCES ${SOURCES} src/battery/linux.c)
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-    set( SOURCES ${SOURCES} src/battery/freebsd.c)
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-    set( SOURCES ${SOURCES} src/battery/openbsd.c)
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
-    set( SOURCES ${SOURCES} src/battery/openbsd.c)
-  else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set( SOURCES ${SOURCES} src/battery/dummy.c)
-  endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-
   add_definitions( -DENABLE_BATTERY )
 endif( ENABLE_BATTERY )
 
@@ -114,11 +94,6 @@ if( ENABLE_SN )
   endif( SN_FOUND )
 endif( ENABLE_SN)
 
-if( ENABLE_UEVENT )
-  add_definitions( -DENABLE_UEVENT )
-  set( SOURCES ${SOURCES} src/util/uevent.c)
-endif( ENABLE_UEVENT )
-
 if( ENABLE_TINT2CONF )
   add_definitions( -DHAVE_VERSION_H )
   add_subdirectory( src/tint2conf )
@@ -156,13 +131,9 @@ target_link_libraries( tint2 ${X11_LIBRARIES}
                              ${CAIRO_LIBRARIES}
                              ${GLIB2_LIBRARIES}
                              ${GOBJECT2_LIBRARIES}
-                             ${IMLIB2_LIBRARIES} )
+                             ${IMLIB2_LIBRARIES}
-if( ENABLE_RSVG )
+                             ${RSVG_LIBRARIES}
-  target_link_libraries( tint2 ${RSVG_LIBRARIES} )
+                             ${SN_LIBRARIES} )
-endif( ENABLE_RSVG )
-if( ENABLE_SN )
-  target_link_libraries( tint2 ${SN_LIBRARIES} )
-endif( ENABLE_SN )
 if( RT_LIBRARY )
   target_link_libraries( tint2 ${RT_LIBRARY} )
 endif( RT_LIBRARY )
@@ -183,5 +154,5 @@ install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
 install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
 if( ENABLE_EXAMPLES )
   file( GLOB SAMPLEFILES sample/*.tint2rc )
-  install( FILES ${SAMPLEFILES} DESTINATION ${DATADIR}/tint2 )
+  install( FILES ${SAMPLEFILES} DESTINATION ${DOCDIR}/examples )
 endif( ENABLE_EXAMPLES )

ChangeLog

@@ -1,52 +1,8 @@
-2015-11-12 0.12.3
+2015-05-03 master
-- Enhancements:
-  - Battery: Multiple batteries are now supported under Linux (issue #139;
-    thanks to Sebastian Reichel)
-  - Battery: The time left for charging/discharging the battery is now estimated
-    when the system is not able to read current data from sensors (issue #522;
-    thanks to Sebastian Reichel)
-  - Battery: Reacts to plug/unplug events (thanks to Sebastian Reichel)
-  - tint2conf: Backgrounds now have a text label showing which panel component
-    uses them, to make them easier to identify; the label is saved as a comment
-    in the config file (issue #521)
-- New config options:
-  - Mouse over effects (mouse_effects, background_color_hover, border_color_hover)
-  - Launcher icon background (launcher_icon_background_id)
-  - Enable/disable battery tooltips (battery_tooltip_enabled)
-- Fixes:
-  - Updated French translation
-  - The correct icon is now used in tint2.desktop (issue #523)
-  - The font setting for the desktop name is no longer lost on tint2 restart
-2015-08-11 0.12.2
-- Fixes:
-  - Systray: do not move empty icons to the side, as it breaks GTK2 StatusIcon blinking (issue #515)
-  - tint2conf: Fix read of panel_monitor (issue #520)
-  - Fix command line argument processing (issue #516)
-  - Fix battery option parsing
-2015-08-01 0.12.1
-- Fixes:
-  - Config:
-	- Read config correctly when panel_items is at the end of the config file (issue #511)
-  - Panel:
-	- Do not use nested event loops (related: issue #509)
-  - System tray:
-	- Set _NET_SYSTEM_TRAY_ICON_SIZE and _NET_SYSTEM_TRAY_PADDING
-	- Throttle repeated resizes (workaround for issue #509)
-  - Taskbar:
-	- Use consistent visibility for sticky (all desktop) windows (related: issue #279)
-	- Compute monitor correctly for windows when Openbox animations are enabled (issue #511)
-  - tint2conf:
-	- Bad read of option panel_margin
-- New config options:
-  - Battery mouse actions and clock middle click and wheel actions (thanks to Jeff Blake)
-2015-07-12 0.12
 - Note: the changes listed here are based on the previous release tint2 0.11, however some distributions (e.g. Debian)
   offered packages using newer commits and/or patches; thus from the user's perspective some of these features are
   already present. They are marked with '(already released by distros)'.
 - Major changes:
-  - Panel:
-  - Checks if a compositor is launched during the first 30 seconds after startup and if found, restarts the panel with
-    transparency enabled.
   - Launcher:
     - The launcher is now considered stable
     - Enhancement: SVG icon support
@@ -55,10 +11,6 @@
     - Experimental, testing/feedback needed
   - Icons (system tray, task buttons, launcher):
     - Changed rendering method to fix icon corruptions (please report any problems)
-  - System tray:
-    - Icon rendering is faster
-    - Several kinds of graphical corruptions have been fixed
-    - Added workaround for misbehaving applications leaving empty tray icons
   - Many bugfixes
 - New config options (see https://gitlab.com/o9000/tint2/wikis/Configure):
   - Panel:
@@ -71,7 +23,6 @@
     - taskbar_hide_inactive_tasks
     - taskbar_sort_order
     - taskbar_name (already released by distros)
-    - task_align (already released by distros)
   - Launcher:
     - launcher* (already released by distros)
     - launcher_apps_dir (previously patched in by some distros)
@@ -79,7 +30,6 @@
     - launcher_icon_theme_override
   - System tray:
     - systray_monitor
-  - Freespace (already released by distros)
 - Config options with changed behavior:
   - Panel:
     - panel_dock: previously, 'panel_dock = 1' was actually not placing the panel into the dock. This option now
@@ -94,40 +44,8 @@
       Reason for change: legibility improved for transparent panels.
   - Launcher:
     - launcher_item_app: now it expands leading ~ to the path to the user's home directory.
-- Known issues:
-  - tint2 might close unexpectedly and/or cause X to freeze on certain ATI graphics cards.
-    Workaround: set 'disable_transparency = 1' in the config.
-    Reference: https://gitlab.com/o9000/tint2/issues/497
 - Project hosting:
   - Migrated from https://code.google.com/p/tint2 to https://gitlab.com/o9000/tint2 and switched from svn to git
-- Bugfixes:
-  - task switching from tint2 using the mouse wheel (mouse_scroll_up = prev_task and mouse_scroll_down = next_task) with
-    multiple desktops and taskbar_mode = multi_desktop when hovering over the first/last window in the taskbar was broken;
-    also when a window is set to appear on all desktops;
-  - the launcher was not loading an icon if the icon theme was not providing it in a size close to the value of launcher_icon_size;
-  - the launcher was not loading an icon if the extension was incorrect (e.g. file contents were PNG but the file name
-    had extension SVG);
-  - some launcher icons (PNG files saved with an indexed colormap and alpha mask) were sometimes rendered with white instead of
-    transparency;
-  - icons looked washed out when the panel was very transparent;
-  - the panel border was rendered in the background of every systray icon; sometimes systray icons were rendered in the
-    background of other icons;
-  - a crash caused by a change that prevents Google Chrome (and possibly other misbehaving applications) from leaving a large
-    number of empty icons in the system tray;
-  - a crash caused by the system tray code on computers with ATI cards;
-  - the panel window had a shadow;
-  - some ATI drivers return an extra monitor with size zero which should be ignored when using panel_monitor = all;
-  - the battery applet was sometimes working incorrectly with certain laptop models (the battery applet stopped updating after
-    suspend with the battery unplugged);
-  - crashed caused by incomplete or malformed config files;
-  - with the fvwm window manager, the window title was sometimes not displayed correctly if it changed right after an
-    application was started;
-  - seconds were not updating in the clock;
-  - tint2 hang triggered when an application started from the launcher was closed and startup notifications were enabled;
-  - tint2 may fail to process X events for a few seconds when a new icon is added to the system tray;
-  - the code that loads SVG icons was using a lot of memory;
-  - fixed occasional race at startup in detecting screen resolution changes;
-  - modified timer code to prevent some rare double-frees or duplicate timers.
 
 2010-06-26
 - unhide tint2 panel when dragging something

INSTALL.txt

@@ -7,4 +7,5 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr ../
 make
 sudo make install
 
-To see additional options you can set at the 'cmake' step, run 'cmake -L ../'
+To see additional options you can do after the cmake step a 'cmake -L ../'
+

README.md

@@ -1,13 +1,15 @@
-### New stable release: 0.12.3
+### New unstable release: 0.12-rc3
-Changes: https://gitlab.com/o9000/tint2/blob/0.12.3/ChangeLog
+Changes: https://gitlab.com/o9000/tint2/blob/master/ChangeLog
 
-Documentation: https://gitlab.com/o9000/tint2/wikis/Configure
+Documentation: https://gitlab.com/o9000/tint2/wikis/home
 
 Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 ```
-git clone https://gitlab.com/o9000/tint2.git
+mkdir tint2-0.12-rc3
-cd tint2
+cd tint2-0.12-rc3
-git checkout 0.12.3
+wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc3' --output-document tint2-0.12-rc3.tar.gz
+tar -xzf tint2-0.12-rc3.tar.gz
+cd tint2.git
 mkdir build
 cd build
 cmake ..
@@ -15,17 +17,8 @@ make -j4
 ./tint2 &
 ./src/tint2conf/tint2conf &
 ```
-
-To install from source, also run (as root):
-```
-make install
-```
-
 Please report any problems to https://gitlab.com/o9000/tint2/issues. Your feedback is much appreciated.
 
-Known issues:
-* [System tray resize loop with GTK applications](https://gitlab.com/o9000/tint2/issues/509), see also the [GTK bug report](https://bugzilla.gnome.org/show_bug.cgi?id=710375). Fix landed in 0.12.1, if there are still problems please let me know.
-
 P.S. GitLab is now the official location of the tint2 project, migrated from Google Code, which is shutting down. In case you are wondering why not GitHub, BitBucket etc., we chose GitLab because it is open source, it is mature and works well, looks cool and has a very nice team.
 
 ### What is tint2?
@@ -71,7 +64,8 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
   * Old project location (inactive): https://code.google.com/p/tint2
 
 ### Releases
-  * Latest stable release: tint2 0.12.3 (November 2015)
+  * Latest stable release: tint2 0.11 (June 2010)
+  * Next release: planned for mid 2015
 
 ### Screenshots
 ![screenshot](https://gitlab.com/o9000/tint2/wikis/screenshot.png)

README.source

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

doc/tint2.1

@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH TINT2 1 "2015-07-05"
+.TH TINT2 1 "2009-01-17"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -37,7 +37,7 @@ compliance with freedesktop specifications.
 .PP
 On the first startup tint2 creates a config file in $HOME/.config/tint2/tint2rc.
 .PP
-See the wiki page at https://gitlab.com/o9000/tint2/wikis/home for more information.
+See wiki page on http://code.google.com/p/tint2/wiki/Welcome for more information.
 .SH OPTIONS
 .TP
 .B \-c config-file

get_version.sh

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-MAJOR=0.12
 DIRTY=""
 
 git update-index -q --ignore-submodules --refresh
@@ -30,8 +29,7 @@ then
     fi
 fi
 
-VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')")$DIRTY
+VERSION=$(git describe --exact-match 2>/dev/null || echo "0.11-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')")$DIRTY
-VERSION=$(echo "$VERSION" | sed 's/^v//')
 
 echo '#define VERSION_STRING "'$VERSION'"' > version.h
 echo $VERSION

sample/horizontal-dark-opaque.tint2rc

@@ -1,77 +1,47 @@
-#---- Generated by tint2conf bd50 ----
+#---- Generated by tint2conf 1238 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 5
 border_width = 1
 background_color = #111111 100
 border_color = #333333 100
-background_color_hover = #111111 100
-border_color_hover = #333333 100
-background_color_pressed = #111111 100
-border_color_pressed = #333333 100
 
-# Background 2: Default task, Iconified task
+# Background 2
 rounded = 5
-border_width = 1
+border_width = 0
 background_color = #111111 100
 border_color = #222222 100
-background_color_hover = #111111 100
-border_color_hover = #555555 100
-background_color_pressed = #333333 100
-border_color_pressed = #555555 100
 
-# Background 3: Active task
+# Background 3
 rounded = 5
 border_width = 1
 background_color = #222222 100
 border_color = #777777 100
-background_color_hover = #222222 100
-border_color_hover = #777777 100
-background_color_pressed = #333333 100
-border_color_pressed = #777777 100
 
-# Background 4: Urgent task
+# Background 4
 rounded = 5
 border_width = 1
 background_color = #aa4400 100
 border_color = #aa7733 100
-background_color_hover = #aa4400 100
-border_color_hover = #aa7733 100
-background_color_pressed = #aa4400 100
-border_color_pressed = #aa7733 100
 
-# Background 5: Tooltip
+# Background 5
 rounded = 2
 border_width = 1
 background_color = #ffffaa 100
 border_color = #999999 100
-background_color_hover = #ffffaa 100
-border_color_hover = #999999 100
-background_color_pressed = #ffffaa 100
-border_color_pressed = #999999 100
 
-# Background 6: Inactive desktop name
+# Background 6
 rounded = 2
 border_width = 1
 background_color = #111111 100
 border_color = #222222 100
-background_color_hover = #111111 100
-border_color_hover = #555555 100
-background_color_pressed = #333333 100
-border_color_pressed = #555555 100
 
-# Background 7: Active desktop name
+# Background 7
 rounded = 2
 border_width = 1
 background_color = #222222 100
 border_color = #777777 100
-background_color_hover = #222222 100
-border_color_hover = #777777 100
-background_color_pressed = #222222 100
-border_color_pressed = #777777 100
 
 #-------------------------------------
 # Panel
@@ -92,10 +62,7 @@ autohide_height = 2
 strut_policy = follow_size
 panel_window_name = tint2
 disable_transparency = 0
-mouse_effects = 1
 font_shadow = 0
-mouse_hover_icon_asb = 100 0 10
-mouse_pressed_icon_asb = 100 0 0
 
 #-------------------------------------
 # Taskbar
@@ -114,7 +81,6 @@ taskbar_name_font_color = #dddddd 100
 taskbar_name_active_font_color = #dddddd 100
 taskbar_distribute_size = 1
 taskbar_sort_order = none
-task_align = left
 
 #-------------------------------------
 # Task
@@ -151,18 +117,12 @@ systray_monitor = 1
 # Launcher
 launcher_padding = 0 0 2
 launcher_background_id = 0
-launcher_icon_background_id = 0
 launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
 
 #-------------------------------------
 # Clock
@@ -179,13 +139,9 @@ clock_tooltip =
 clock_tooltip_timezone = 
 clock_lclick_command = zenity --calendar --text ""
 clock_rclick_command = orage
-clock_mclick_command = 
-clock_uwheel_command = 
-clock_dwheel_command = 
 
 #-------------------------------------
 # Battery
-battery_tooltip = 1
 battery_low_status = 10
 battery_low_cmd = notify-send "battery low"
 bat1_font = sans 8
@@ -194,13 +150,6 @@ battery_font_color = #eeeeee 100
 battery_padding = 1 0
 battery_background_id = 0
 battery_hide = 101
-battery_lclick_command = 
-battery_rclick_command = 
-battery_mclick_command = 
-battery_uwheel_command = 
-battery_dwheel_command = 
-ac_connected_cmd = 
-ac_disconnected_cmd = 
 
 #-------------------------------------
 # Tooltip

sample/horizontal-dark-transparent.tint2rc

@@ -1,77 +1,47 @@
-#---- Generated by tint2conf ab72 ----
+#---- Generated by tint2conf 24b3 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 5
 border_width = 1
 background_color = #000000 80
 border_color = #555555 80
-background_color_hover = #000000 80
-border_color_hover = #555555 80
-background_color_pressed = #000000 80
-border_color_pressed = #555555 80
 
-# Background 2: Default task, Iconified task
+# Background 2
 rounded = 5
-border_width = 1
+border_width = 0
 background_color = #777777 0
-border_color = #777777 0
+border_color = #777777 10
-background_color_hover = #777777 4
-border_color_hover = #cccccc 30
-background_color_pressed = #333333 4
-border_color_pressed = #777777 30
 
-# Background 3: Active task
+# Background 3
 rounded = 5
 border_width = 1
 background_color = #555555 10
 border_color = #ffffff 60
-background_color_hover = #cccccc 10
-border_color_hover = #ffffff 60
-background_color_pressed = #555555 10
-border_color_pressed = #ffffff 60
 
-# Background 4: Urgent task
+# Background 4
 rounded = 5
 border_width = 1
 background_color = #aa4400 100
 border_color = #aa7733 100
-background_color_hover = #aa4400 100
-border_color_hover = #aa7733 100
-background_color_pressed = #aa4400 100
-border_color_pressed = #aa7733 100
 
-# Background 5: Tooltip
+# Background 5
 rounded = 2
 border_width = 1
 background_color = #ffffaa 100
 border_color = #999999 100
-background_color_hover = #ffffaa 100
-border_color_hover = #999999 100
-background_color_pressed = #ffffaa 100
-border_color_pressed = #999999 100
 
-# Background 6: Inactive desktop name
+# Background 6
 rounded = 2
 border_width = 1
 background_color = #777777 0
 border_color = #777777 30
-background_color_hover = #777777 4
-border_color_hover = #cccccc 30
-background_color_pressed = #777777 0
-border_color_pressed = #777777 30
 
-# Background 7: Active desktop name
+# Background 7
 rounded = 2
 border_width = 1
 background_color = #555555 10
 border_color = #ffffff 60
-background_color_hover = #555555 10
-border_color_hover = #ffffff 60
-background_color_pressed = #555555 10
-border_color_pressed = #ffffff 60
 
 #-------------------------------------
 # Panel
@@ -92,10 +62,7 @@ autohide_height = 2
 strut_policy = follow_size
 panel_window_name = tint2
 disable_transparency = 0
-mouse_effects = 1
 font_shadow = 0
-mouse_hover_icon_asb = 100 0 10
-mouse_pressed_icon_asb = 100 0 0
 
 #-------------------------------------
 # Taskbar
@@ -114,7 +81,6 @@ taskbar_name_font_color = #dddddd 100
 taskbar_name_active_font_color = #dddddd 100
 taskbar_distribute_size = 1
 taskbar_sort_order = none
-task_align = left
 
 #-------------------------------------
 # Task
@@ -151,16 +117,12 @@ systray_monitor = 1
 # Launcher
 launcher_padding = 0 0 2
 launcher_background_id = 0
-launcher_icon_background_id = 0
 launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 
 #-------------------------------------
 # Clock
@@ -177,13 +139,9 @@ clock_tooltip =
 clock_tooltip_timezone = 
 clock_lclick_command = zenity --calendar --text ""
 clock_rclick_command = orage
-clock_mclick_command = 
-clock_uwheel_command = 
-clock_dwheel_command = 
 
 #-------------------------------------
 # Battery
-battery_tooltip = 1
 battery_low_status = 10
 battery_low_cmd = notify-send "battery low"
 bat1_font = sans 8
@@ -192,13 +150,6 @@ battery_font_color = #eeeeee 100
 battery_padding = 1 0
 battery_background_id = 0
 battery_hide = 101
-battery_lclick_command = 
-battery_rclick_command = 
-battery_mclick_command = 
-battery_uwheel_command = 
-battery_dwheel_command = 
-ac_connected_cmd = 
-ac_disconnected_cmd = 
 
 #-------------------------------------
 # Tooltip

sample/horizontal-light-opaque.tint2rc

@@ -1,87 +1,53 @@
-#---- Generated by tint2conf 079a ----
+#---- Generated by tint2conf 3ad3 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 0
 border_width = 1
 background_color = #eeeeee 100
 border_color = #bbbbbb 100
-background_color_hover = #eeeeee 100
-border_color_hover = #bbbbbb 100
-background_color_pressed = #eeeeee 100
-border_color_pressed = #bbbbbb 100
 
-# Background 2: Default task, Iconified task
+# Background 2
 rounded = 5
-border_width = 1
+border_width = 0
 background_color = #eeeeee 100
-border_color = #eeeeee 100
+border_color = #cccccc 100
-background_color_hover = #eeeeee 100
-border_color_hover = #cccccc 100
-background_color_pressed = #cccccc 100
-border_color_pressed = #cccccc 100
 
-# Background 3: Active task
+# Background 3
 rounded = 5
 border_width = 1
 background_color = #dddddd 100
 border_color = #999999 100
-background_color_hover = #eeeeee 100
-border_color_hover = #aaaaaa 100
-background_color_pressed = #cccccc 100
-border_color_pressed = #999999 100
 
-# Background 4: Urgent task
+# Background 4
 rounded = 5
 border_width = 1
 background_color = #aa4400 100
 border_color = #aa7733 100
-background_color_hover = #aa4400 100
-border_color_hover = #aa7733 100
-background_color_pressed = #aa4400 100
-border_color_pressed = #aa7733 100
 
-# Background 5: Tooltip
+# Background 5
 rounded = 2
 border_width = 1
 background_color = #ffffaa 100
 border_color = #999999 100
-background_color_hover = #ffffaa 100
-border_color_hover = #999999 100
-background_color_pressed = #ffffaa 100
-border_color_pressed = #999999 100
 
-# Background 6: Inactive desktop name
+# Background 6
 rounded = 2
 border_width = 1
 background_color = #eeeeee 100
 border_color = #cccccc 100
-background_color_hover = #eeeeee 100
-border_color_hover = #cccccc 100
-background_color_pressed = #eeeeee 100
-border_color_pressed = #cccccc 100
 
-# Background 7: Active desktop name
+# Background 7
 rounded = 2
 border_width = 1
 background_color = #dddddd 100
 border_color = #999999 100
-background_color_hover = #dddddd 100
-border_color_hover = #999999 100
-background_color_pressed = #dddddd 100
-border_color_pressed = #999999 100
 
-# Background 8: Systray
+# Background 8
 rounded = 3
 border_width = 0
-background_color = #dddddd 100
+background_color = #999999 100
 border_color = #cccccc 100
-background_color_hover = #dddddd 100
-border_color_hover = #cccccc 100
-background_color_pressed = #dddddd 100
-border_color_pressed = #cccccc 100
 
 #-------------------------------------
 # Panel
@@ -102,10 +68,7 @@ autohide_height = 2
 strut_policy = follow_size
 panel_window_name = tint2
 disable_transparency = 0
-mouse_effects = 1
 font_shadow = 0
-mouse_hover_icon_asb = 100 0 10
-mouse_pressed_icon_asb = 100 0 0
 
 #-------------------------------------
 # Taskbar
@@ -124,7 +87,6 @@ taskbar_name_font_color = #222222 100
 taskbar_name_active_font_color = #222222 100
 taskbar_distribute_size = 1
 taskbar_sort_order = none
-task_align = left
 
 #-------------------------------------
 # Task
@@ -161,10 +123,8 @@ systray_monitor = 1
 # Launcher
 launcher_padding = 0 0 2
 launcher_background_id = 0
-launcher_icon_background_id = 0
 launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
 launcher_item_app = /usr/share/applications/firefox.desktop
@@ -185,13 +145,9 @@ clock_tooltip =
 clock_tooltip_timezone = 
 clock_lclick_command = zenity --calendar --text ""
 clock_rclick_command = orage
-clock_mclick_command = 
-clock_uwheel_command = 
-clock_dwheel_command = 
 
 #-------------------------------------
 # Battery
-battery_tooltip = 1
 battery_low_status = 10
 battery_low_cmd = notify-send "battery low"
 bat1_font = sans 8
@@ -200,13 +156,6 @@ battery_font_color = #222222 100
 battery_padding = 1 0
 battery_background_id = 0
 battery_hide = 101
-battery_lclick_command = 
-battery_rclick_command = 
-battery_mclick_command = 
-battery_uwheel_command = 
-battery_dwheel_command = 
-ac_connected_cmd = 
-ac_disconnected_cmd = 
 
 #-------------------------------------
 # Tooltip

sample/horizontal-light-transparent.tint2rc

@@ -1,213 +0,0 @@
-#---- Generated by tint2conf 5b63 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Backgrounds
-# Background 1: Panel
-rounded = 0
-border_width = 1
-background_color = #eeeeee 0
-border_color = #bbbbbb 10
-background_color_hover = #eeeeee 0
-border_color_hover = #bbbbbb 10
-background_color_pressed = #eeeeee 0
-border_color_pressed = #bbbbbb 10
-
-# Background 2: Default task, Iconified task
-rounded = 5
-border_width = 1
-background_color = #eeeeee 4
-border_color = #cccccc 44
-background_color_hover = #eeeeee 22
-border_color_hover = #eaeaea 44
-background_color_pressed = #dddddd 4
-border_color_pressed = #eaeaea 44
-
-# Background 3: Active task
-rounded = 5
-border_width = 1
-background_color = #dddddd 4
-border_color = #999999 100
-background_color_hover = #eeeeee 22
-border_color_hover = #999999 100
-background_color_pressed = #dddddd 4
-border_color_pressed = #999999 100
-
-# Background 4: Urgent task
-rounded = 5
-border_width = 1
-background_color = #aa4400 100
-border_color = #aa7733 100
-background_color_hover = #aa4400 100
-border_color_hover = #aa7733 100
-background_color_pressed = #aa4400 100
-border_color_pressed = #aa7733 100
-
-# Background 5: Tooltip
-rounded = 2
-border_width = 1
-background_color = #ffffaa 100
-border_color = #999999 100
-background_color_hover = #ffffaa 100
-border_color_hover = #999999 100
-background_color_pressed = #ffffaa 100
-border_color_pressed = #999999 100
-
-# Background 6: Inactive desktop name
-rounded = 2
-border_width = 1
-background_color = #eeeeee 4
-border_color = #cccccc 100
-background_color_hover = #eeeeee 22
-border_color_hover = #999999 100
-background_color_pressed = #dddddd 4
-border_color_pressed = #999999 100
-
-# Background 7: Active desktop name
-rounded = 2
-border_width = 1
-background_color = #dddddd 3
-border_color = #999999 100
-background_color_hover = #dddddd 3
-border_color_hover = #999999 100
-background_color_pressed = #dddddd 3
-border_color_pressed = #999999 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
-mouse_effects = 1
-font_shadow = 0
-mouse_hover_icon_asb = 100 0 10
-mouse_pressed_icon_asb = 100 0 0
-
-#-------------------------------------
-# Taskbar
-taskbar_mode = single_desktop
-taskbar_padding = 0 0 2
-taskbar_background_id = 0
-taskbar_active_background_id = 0
-taskbar_name = 1
-taskbar_hide_inactive_tasks = 0
-taskbar_hide_different_monitor = 0
-taskbar_name_padding = 6 3
-taskbar_name_background_id = 6
-taskbar_name_active_background_id = 7
-taskbar_name_font = sans bold 9
-taskbar_name_font_color = #ffffff 100
-taskbar_name_active_font_color = #ffffff 100
-taskbar_distribute_size = 1
-taskbar_sort_order = none
-task_align = left
-
-#-------------------------------------
-# Task
-task_text = 1
-task_icon = 1
-task_centered = 1
-urgent_nb_of_blink = 100000
-task_maximum_size = 140 35
-task_padding = 4 3 4
-task_font = sans 8
-task_tooltip = 1
-task_font_color = #ffffff 100
-task_icon_asb = 100 0 0
-task_background_id = 2
-task_active_background_id = 3
-task_urgent_background_id = 4
-task_iconified_background_id = 2
-mouse_left = toggle_iconify
-mouse_middle = none
-mouse_right = close
-mouse_scroll_up = prev_task
-mouse_scroll_down = next_task
-
-#-------------------------------------
-# System tray (notification area)
-systray_padding = 4 0 2
-systray_background_id = 0
-systray_sort = ascending
-systray_icon_size = 22
-systray_icon_asb = 100 0 0
-systray_monitor = 1
-
-#-------------------------------------
-# Launcher
-launcher_padding = 0 0 2
-launcher_background_id = 0
-launcher_icon_background_id = 0
-launcher_icon_size = 22
-launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
-startup_notifications = 1
-launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
-
-#-------------------------------------
-# Clock
-time1_format = %H:%M
-time2_format = %A %d %B
-time1_font = sans bold 8
-time1_timezone = 
-time2_timezone = 
-time2_font = sans 7
-clock_font_color = #ffffff 100
-clock_padding = 1 0
-clock_background_id = 0
-clock_tooltip = 
-clock_tooltip_timezone = 
-clock_lclick_command = zenity --calendar --text ""
-clock_rclick_command = orage
-clock_mclick_command = 
-clock_uwheel_command = 
-clock_dwheel_command = 
-
-#-------------------------------------
-# Battery
-battery_tooltip = 1
-battery_low_status = 10
-battery_low_cmd = notify-send "battery low"
-bat1_font = sans 8
-bat2_font = sans 6
-battery_font_color = #ffffff 100
-battery_padding = 1 0
-battery_background_id = 0
-battery_hide = 101
-battery_lclick_command = 
-battery_rclick_command = 
-battery_mclick_command = 
-battery_uwheel_command = 
-battery_dwheel_command = 
-ac_connected_cmd = 
-ac_disconnected_cmd = 
-
-#-------------------------------------
-# Tooltip
-tooltip_show_timeout = 0.5
-tooltip_hide_timeout = 0.1
-tooltip_padding = 2 2
-tooltip_background_id = 5
-tooltip_font_color = #222222 100
-tooltip_font = sans 9
-

sample/tint2rc

@@ -59,12 +59,8 @@ launcher_icon_size = 18
 launcher_icon_asb = 100 0 0
 launcher_tooltip = 1
 startup_notifications = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
 
 # Taskbar
 taskbar_mode = single_desktop
@@ -89,7 +85,7 @@ urgent_nb_of_blink = 100000
 task_icon_asb = 100 0 0
 task_active_icon_asb = 100 0 0
 task_urgent_icon_asb = 100 0 0
-task_iconified_icon_asb = 100 0 0
+task_iconified_icon_asb = 70 0 0
 
 # Fonts
 task_font = sans 8
@@ -117,7 +113,7 @@ time1_format = %H:%M
 time1_font = sans 8
 time2_format = %A %d %B
 time2_font = sans 7
-clock_font_color = #FFFFFF 100
+clock_font_color = #FFFFFF 90
 clock_padding = 1 0
 clock_background_id = 0
 clock_rclick_command = orage
@@ -136,7 +132,7 @@ battery_low_cmd = notify-send "battery low"
 battery_hide = 101
 bat1_font = sans 8
 bat2_font = sans 6
-battery_font_color = #FFFFFF 100
+battery_font_color = #FFFFFF 94
 battery_padding = 1 0
 battery_background_id = 0
 

sample/vertical-dark-opaque.tint2rc

@@ -1,77 +1,47 @@
-#---- Generated by tint2conf 14e9 ----
+#---- Generated by tint2conf c113 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 5
 border_width = 1
 background_color = #111111 100
 border_color = #333333 100
-background_color_hover = #111111 100
-border_color_hover = #333333 100
-background_color_pressed = #111111 100
-border_color_pressed = #333333 100
 
-# Background 2: Default task, Iconified task
+# Background 2
 rounded = 5
-border_width = 1
+border_width = 0
 background_color = #111111 100
 border_color = #222222 100
-background_color_hover = #111111 100
-border_color_hover = #555555 100
-background_color_pressed = #333333 100
-border_color_pressed = #555555 100
 
-# Background 3: Active task
+# Background 3
 rounded = 5
 border_width = 1
 background_color = #222222 100
 border_color = #777777 100
-background_color_hover = #333333 100
-border_color_hover = #777777 100
-background_color_pressed = #555555 100
-border_color_pressed = #777777 100
 
-# Background 4: Urgent task
+# Background 4
 rounded = 5
 border_width = 1
 background_color = #aa4400 100
 border_color = #aa7733 100
-background_color_hover = #aa4400 100
-border_color_hover = #aa7733 100
-background_color_pressed = #aa4400 100
-border_color_pressed = #aa7733 100
 
-# Background 5: Tooltip
+# Background 5
 rounded = 2
 border_width = 1
 background_color = #ffffaa 100
 border_color = #999999 100
-background_color_hover = #ffffaa 100
-border_color_hover = #999999 100
-background_color_pressed = #ffffaa 100
-border_color_pressed = #999999 100
 
-# Background 6: Inactive desktop name
+# Background 6
 rounded = 2
 border_width = 1
 background_color = #111111 100
 border_color = #222222 100
-background_color_hover = #111111 100
-border_color_hover = #333333 100
-background_color_pressed = #555555 100
-border_color_pressed = #333333 100
 
-# Background 7: Active desktop name
+# Background 7
 rounded = 2
 border_width = 1
 background_color = #222222 100
 border_color = #777777 100
-background_color_hover = #222222 100
-border_color_hover = #777777 100
-background_color_pressed = #222222 100
-border_color_pressed = #777777 100
 
 #-------------------------------------
 # Panel
@@ -92,10 +62,7 @@ autohide_height = 2
 strut_policy = follow_size
 panel_window_name = tint2
 disable_transparency = 0
-mouse_effects = 1
 font_shadow = 0
-mouse_hover_icon_asb = 100 0 10
-mouse_pressed_icon_asb = 100 0 0
 
 #-------------------------------------
 # Taskbar
@@ -114,7 +81,6 @@ taskbar_name_font_color = #dddddd 100
 taskbar_name_active_font_color = #dddddd 100
 taskbar_distribute_size = 1
 taskbar_sort_order = none
-task_align = left
 
 #-------------------------------------
 # Task
@@ -151,16 +117,12 @@ systray_monitor = 1
 # Launcher
 launcher_padding = 0 0 2
 launcher_background_id = 0
-launcher_icon_background_id = -1
 launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 
 #-------------------------------------
 # Clock
@@ -177,13 +139,9 @@ clock_tooltip =
 clock_tooltip_timezone = 
 clock_lclick_command = zenity --calendar --text ""
 clock_rclick_command = orage
-clock_mclick_command = 
-clock_uwheel_command = 
-clock_dwheel_command = 
 
 #-------------------------------------
 # Battery
-battery_tooltip = 1
 battery_low_status = 10
 battery_low_cmd = notify-send "battery low"
 bat1_font = sans 8
@@ -192,13 +150,6 @@ battery_font_color = #eeeeee 100
 battery_padding = 1 0
 battery_background_id = 0
 battery_hide = 101
-battery_lclick_command = 
-battery_rclick_command = 
-battery_mclick_command = 
-battery_uwheel_command = 
-battery_dwheel_command = 
-ac_connected_cmd = 
-ac_disconnected_cmd = 
 
 #-------------------------------------
 # Tooltip

sample/vertical-dark-transparent.tint2rc

@@ -1,77 +1,47 @@
-#---- Generated by tint2conf fc8e ----
+#---- Generated by tint2conf bec8 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 5
 border_width = 1
 background_color = #000000 80
 border_color = #555555 80
-background_color_hover = #000000 80
-border_color_hover = #555555 80
-background_color_pressed = #000000 80
-border_color_pressed = #555555 80
 
-# Background 2: Default task, Iconified task
+# Background 2
 rounded = 5
-border_width = 1
+border_width = 0
 background_color = #777777 0
 border_color = #777777 10
-background_color_hover = #777777 4
-border_color_hover = #cccccc 30
-background_color_pressed = #333333 4
-border_color_pressed = #777777 30
 
-# Background 3: Active task
+# Background 3
 rounded = 5
 border_width = 1
 background_color = #555555 10
 border_color = #ffffff 60
-background_color_hover = #cccccc 10
-border_color_hover = #ffffff 60
-background_color_pressed = #555555 10
-border_color_pressed = #ffffff 60
 
-# Background 4: Urgent task
+# Background 4
 rounded = 5
 border_width = 1
 background_color = #aa4400 100
 border_color = #aa7733 100
-background_color_hover = #aa4400 100
-border_color_hover = #aa7733 100
-background_color_pressed = #aa4400 100
-border_color_pressed = #aa7733 100
 
-# Background 5: Tooltip
+# Background 5
 rounded = 2
 border_width = 1
 background_color = #ffffaa 100
 border_color = #999999 100
-background_color_hover = #ffffaa 100
-border_color_hover = #999999 100
-background_color_pressed = #ffffaa 100
-border_color_pressed = #999999 100
 
-# Background 6: Inactive desktop name
+# Background 6
 rounded = 2
 border_width = 1
 background_color = #777777 0
 border_color = #777777 30
-background_color_hover = #777777 4
-border_color_hover = #cccccc 30
-background_color_pressed = #777777 0
-border_color_pressed = #777777 30
 
-# Background 7: Active desktop name
+# Background 7
 rounded = 2
 border_width = 1
 background_color = #555555 10
 border_color = #ffffff 60
-background_color_hover = #555555 10
-border_color_hover = #ffffff 60
-background_color_pressed = #555555 10
-border_color_pressed = #ffffff 60
 
 #-------------------------------------
 # Panel
@@ -92,10 +62,7 @@ autohide_height = 2
 strut_policy = follow_size
 panel_window_name = tint2
 disable_transparency = 0
-mouse_effects = 1
 font_shadow = 0
-mouse_hover_icon_asb = 100 0 10
-mouse_pressed_icon_asb = 100 0 0
 
 #-------------------------------------
 # Taskbar
@@ -114,7 +81,6 @@ taskbar_name_font_color = #dddddd 100
 taskbar_name_active_font_color = #dddddd 100
 taskbar_distribute_size = 1
 taskbar_sort_order = none
-task_align = left
 
 #-------------------------------------
 # Task
@@ -151,16 +117,12 @@ systray_monitor = 1
 # Launcher
 launcher_padding = 0 0 2
 launcher_background_id = 0
-launcher_icon_background_id = -1
 launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 
 #-------------------------------------
 # Clock
@@ -177,13 +139,9 @@ clock_tooltip =
 clock_tooltip_timezone = 
 clock_lclick_command = zenity --calendar --text ""
 clock_rclick_command = orage
-clock_mclick_command = 
-clock_uwheel_command = 
-clock_dwheel_command = 
 
 #-------------------------------------
 # Battery
-battery_tooltip = 1
 battery_low_status = 10
 battery_low_cmd = notify-send "battery low"
 bat1_font = sans 8
@@ -192,13 +150,6 @@ battery_font_color = #eeeeee 100
 battery_padding = 1 0
 battery_background_id = 0
 battery_hide = 101
-battery_lclick_command = 
-battery_rclick_command = 
-battery_mclick_command = 
-battery_uwheel_command = 
-battery_dwheel_command = 
-ac_connected_cmd = 
-ac_disconnected_cmd = 
 
 #-------------------------------------
 # Tooltip

sample/vertical-light-opaque.tint2rc

@@ -1,87 +1,53 @@
-#---- Generated by tint2conf 1f37 ----
+#---- Generated by tint2conf f7f7 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 0
 border_width = 1
 background_color = #eeeeee 100
 border_color = #bbbbbb 100
-background_color_hover = #eeeeee 100
-border_color_hover = #bbbbbb 100
-background_color_pressed = #eeeeee 100
-border_color_pressed = #bbbbbb 100
 
-# Background 2: Default task, Iconified task
+# Background 2
 rounded = 5
-border_width = 1
+border_width = 0
 background_color = #eeeeee 100
 border_color = #cccccc 100
-background_color_hover = #fafafa 100
-border_color_hover = #cccccc 100
-background_color_pressed = #cccccc 100
-border_color_pressed = #cccccc 100
 
-# Background 3: Active task
+# Background 3
 rounded = 5
 border_width = 1
 background_color = #dddddd 100
 border_color = #999999 100
-background_color_hover = #fafafa 100
-border_color_hover = #aaaaaa 100
-background_color_pressed = #cccccc 100
-border_color_pressed = #999999 100
 
-# Background 4: Urgent task
+# Background 4
 rounded = 5
 border_width = 1
 background_color = #aa4400 100
 border_color = #aa7733 100
-background_color_hover = #aa4400 100
-border_color_hover = #aa7733 100
-background_color_pressed = #aa4400 100
-border_color_pressed = #aa7733 100
 
-# Background 5: Tooltip
+# Background 5
 rounded = 2
 border_width = 1
 background_color = #ffffaa 100
 border_color = #999999 100
-background_color_hover = #ffffaa 100
-border_color_hover = #999999 100
-background_color_pressed = #ffffaa 100
-border_color_pressed = #999999 100
 
-# Background 6: Inactive desktop name
+# Background 6
 rounded = 2
 border_width = 1
 background_color = #eeeeee 100
 border_color = #cccccc 100
-background_color_hover = #fafafa 100
-border_color_hover = #cccccc 100
-background_color_pressed = #eeeeee 100
-border_color_pressed = #cccccc 100
 
-# Background 7: Active desktop name
+# Background 7
 rounded = 2
 border_width = 1
 background_color = #dddddd 100
 border_color = #999999 100
-background_color_hover = #dddddd 100
-border_color_hover = #999999 100
-background_color_pressed = #dddddd 100
-border_color_pressed = #999999 100
 
-# Background 8: Systray
+# Background 8
 rounded = 3
 border_width = 0
-background_color = #dddddd 100
+background_color = #aaaaaa 100
 border_color = #cccccc 100
-background_color_hover = #cccccc 100
-border_color_hover = #cccccc 100
-background_color_pressed = #cccccc 100
-border_color_pressed = #cccccc 100
 
 #-------------------------------------
 # Panel
@@ -102,10 +68,7 @@ autohide_height = 2
 strut_policy = follow_size
 panel_window_name = tint2
 disable_transparency = 0
-mouse_effects = 1
 font_shadow = 0
-mouse_hover_icon_asb = 100 0 10
-mouse_pressed_icon_asb = 100 0 0
 
 #-------------------------------------
 # Taskbar
@@ -124,7 +87,6 @@ taskbar_name_font_color = #222222 100
 taskbar_name_active_font_color = #222222 100
 taskbar_distribute_size = 1
 taskbar_sort_order = none
-task_align = left
 
 #-------------------------------------
 # Task
@@ -161,16 +123,12 @@ systray_monitor = 1
 # Launcher
 launcher_padding = 0 0 2
 launcher_background_id = 0
-launcher_icon_background_id = 0
 launcher_icon_size = 22
 launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
 startup_notifications = 1
 launcher_tooltip = 1
 launcher_item_app = /usr/share/applications/firefox.desktop
 launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
 
 #-------------------------------------
 # Clock
@@ -187,13 +145,9 @@ clock_tooltip =
 clock_tooltip_timezone = 
 clock_lclick_command = zenity --calendar --text ""
 clock_rclick_command = orage
-clock_mclick_command = 
-clock_uwheel_command = 
-clock_dwheel_command = 
 
 #-------------------------------------
 # Battery
-battery_tooltip = 1
 battery_low_status = 10
 battery_low_cmd = notify-send "battery low"
 bat1_font = sans 8
@@ -202,13 +156,6 @@ battery_font_color = #222222 100
 battery_padding = 1 0
 battery_background_id = 0
 battery_hide = 101
-battery_lclick_command = 
-battery_rclick_command = 
-battery_mclick_command = 
-battery_uwheel_command = 
-battery_dwheel_command = 
-ac_connected_cmd = 
-ac_disconnected_cmd = 
 
 #-------------------------------------
 # Tooltip

sample/vertical-light-transparent.tint2rc

@@ -1,213 +0,0 @@
-#---- Generated by tint2conf 812e ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Backgrounds
-# Background 1: Panel
-rounded = 0
-border_width = 1
-background_color = #eeeeee 0
-border_color = #bbbbbb 10
-background_color_hover = #eeeeee 0
-border_color_hover = #bbbbbb 10
-background_color_pressed = #eeeeee 0
-border_color_pressed = #bbbbbb 10
-
-# Background 2: Default task, Iconified task
-rounded = 5
-border_width = 1
-background_color = #eeeeee 4
-border_color = #eeeeee 0
-background_color_hover = #eeeeee 22
-border_color_hover = #eaeaea 44
-background_color_pressed = #dddddd 4
-border_color_pressed = #eaeaea 44
-
-# Background 3: Active task
-rounded = 5
-border_width = 1
-background_color = #dddddd 4
-border_color = #999999 100
-background_color_hover = #eeeeee 22
-border_color_hover = #999999 100
-background_color_pressed = #dddddd 4
-border_color_pressed = #999999 100
-
-# Background 4: Urgent task
-rounded = 5
-border_width = 1
-background_color = #aa4400 100
-border_color = #aa7733 100
-background_color_hover = #aa4400 100
-border_color_hover = #aa7733 100
-background_color_pressed = #aa4400 100
-border_color_pressed = #aa7733 100
-
-# Background 5: Tooltip
-rounded = 2
-border_width = 1
-background_color = #ffffaa 100
-border_color = #999999 100
-background_color_hover = #ffffaa 100
-border_color_hover = #999999 100
-background_color_pressed = #ffffaa 100
-border_color_pressed = #999999 100
-
-# Background 6: Inactive desktop name
-rounded = 2
-border_width = 1
-background_color = #eeeeee 4
-border_color = #999999 100
-background_color_hover = #eeeeee 22
-border_color_hover = #999999 100
-background_color_pressed = #dddddd 4
-border_color_pressed = #999999 100
-
-# Background 7: Active desktop name
-rounded = 2
-border_width = 1
-background_color = #dddddd 3
-border_color = #999999 100
-background_color_hover = #dddddd 3
-border_color_hover = #999999 100
-background_color_pressed = #dddddd 3
-border_color_pressed = #999999 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
-mouse_effects = 1
-font_shadow = 0
-mouse_hover_icon_asb = 100 0 10
-mouse_pressed_icon_asb = 100 0 0
-
-#-------------------------------------
-# Taskbar
-taskbar_mode = multi_desktop
-taskbar_padding = 0 0 2
-taskbar_background_id = 0
-taskbar_active_background_id = 0
-taskbar_name = 1
-taskbar_hide_inactive_tasks = 0
-taskbar_hide_different_monitor = 0
-taskbar_name_padding = 6 3
-taskbar_name_background_id = 6
-taskbar_name_active_background_id = 7
-taskbar_name_font = sans bold 9
-taskbar_name_font_color = #ffffff 100
-taskbar_name_active_font_color = #ffffff 100
-taskbar_distribute_size = 1
-taskbar_sort_order = none
-task_align = left
-
-#-------------------------------------
-# Task
-task_text = 1
-task_icon = 1
-task_centered = 0
-urgent_nb_of_blink = 100000
-task_maximum_size = 152 35
-task_padding = 4 3 4
-task_font = sans 8
-task_tooltip = 1
-task_font_color = #ffffff 100
-task_icon_asb = 100 0 0
-task_background_id = 2
-task_active_background_id = 3
-task_urgent_background_id = 4
-task_iconified_background_id = 2
-mouse_left = toggle_iconify
-mouse_middle = none
-mouse_right = close
-mouse_scroll_up = prev_task
-mouse_scroll_down = next_task
-
-#-------------------------------------
-# System tray (notification area)
-systray_padding = 0 0 2
-systray_background_id = 0
-systray_sort = ascending
-systray_icon_size = 22
-systray_icon_asb = 100 0 0
-systray_monitor = 1
-
-#-------------------------------------
-# Launcher
-launcher_padding = 0 0 2
-launcher_background_id = 0
-launcher_icon_background_id = 0
-launcher_icon_size = 22
-launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
-startup_notifications = 1
-launcher_tooltip = 1
-launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = /usr/share/applications/google-chrome.desktop
-
-#-------------------------------------
-# Clock
-time1_format = %H:%M
-time2_format = %A %d %B
-time1_font = sans bold 9
-time1_timezone = 
-time2_timezone = 
-time2_font = sans 9
-clock_font_color = #ffffff 100
-clock_padding = 1 0
-clock_background_id = 0
-clock_tooltip = 
-clock_tooltip_timezone = 
-clock_lclick_command = zenity --calendar --text ""
-clock_rclick_command = orage
-clock_mclick_command = 
-clock_uwheel_command = 
-clock_dwheel_command = 
-
-#-------------------------------------
-# Battery
-battery_tooltip = 1
-battery_low_status = 10
-battery_low_cmd = notify-send "battery low"
-bat1_font = sans 8
-bat2_font = sans 6
-battery_font_color = #ffffff 100
-battery_padding = 1 0
-battery_background_id = 0
-battery_hide = 101
-battery_lclick_command = 
-battery_rclick_command = 
-battery_mclick_command = 
-battery_uwheel_command = 
-battery_dwheel_command = 
-ac_connected_cmd = 
-ac_disconnected_cmd = 
-
-#-------------------------------------
-# Tooltip
-tooltip_show_timeout = 0.5
-tooltip_hide_timeout = 0.1
-tooltip_padding = 2 2
-tooltip_background_id = 5
-tooltip_font_color = #222222 100
-tooltip_font = sans 9
-

src/battery/battery.c

@@ -1,8 +1,8 @@
 /**************************************************************************
 *
-* Tint2 : Generic battery
+* Tint2 : battery
 *
-* Copyright (C) 2009-2015 Sebastian Reichel <sre@ring0.de>
+* Copyright (C) 2009 Sebastian Reichel <elektranox@gmail.com>
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -24,6 +24,18 @@
 #include <cairo-xlib.h>
 #include <pango/pangocairo.h>
 
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+#include <machine/apmvar.h>
+#include <err.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#endif
+
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+
 #include "window.h"
 #include "server.h"
 #include "panel.h"
@@ -35,7 +47,6 @@ PangoFontDescription *bat1_font_desc;
 PangoFontDescription *bat2_font_desc;
 struct batstate battery_state;
 int battery_enabled;
-int battery_tooltip_enabled;
 int percentage_hide;
 static timeout* battery_timeout;
 
@@ -44,16 +55,17 @@ static char buf_bat_time[20];
 
 int8_t battery_low_status;
 unsigned char battery_low_cmd_sent;
-char *ac_connected_cmd;
-char *ac_disconnected_cmd;
 char *battery_low_cmd;
-char *battery_lclick_command;
+gchar *path_energy_now;
-char *battery_mclick_command;
+gchar *path_energy_full;
-char *battery_rclick_command;
+gchar *path_current_now;
-char *battery_uwheel_command;
+gchar *path_status;
-char *battery_dwheel_command;
 int battery_found;
 
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+int apm_fd;
+#endif
+
 void update_battery_tick(void* arg)
 {
 	if (!battery_enabled)
@@ -61,26 +73,15 @@ void update_battery_tick(void* arg)
 
 	int old_found = battery_found;
 	int old_percentage = battery_state.percentage;
-	gboolean old_ac_connected = battery_state.ac_connected;
 	int16_t old_hours = battery_state.time.hours;
 	int8_t old_minutes = battery_state.time.minutes;
 	
-	if (!battery_found) {
-		init_battery();
-		old_ac_connected = battery_state.ac_connected;
-	}
 	if (update_battery() != 0) {
-		// Try to reconfigure on failed update
+		// Reconfigure
 		init_battery();
+		// Try again
+		update_battery();
 	}
-
-	if (old_ac_connected != battery_state.ac_connected) {
-		if (battery_state.ac_connected)
-			tint_exec(ac_connected_cmd);
-		else
-			tint_exec(ac_disconnected_cmd);
-	}
-
 	if (old_found == battery_found &&
 		old_percentage == battery_state.percentage &&
 		old_hours == battery_state.time.hours &&
@@ -102,23 +103,15 @@ void update_battery_tick(void* arg)
 
 	int i;
 	for (i = 0; i < nb_panel; i++) {
-		if (!battery_found) {
+		if (!battery_found && panel1[i].battery.area.on_screen == 1) {
-			if (panel1[i].battery.area.on_screen == 1) {
+			hide(&panel1[i].battery.area);
-				hide(&panel1[i].battery.area);
+			panel_refresh = 1;
-				panel_refresh = 1;
+		} else if (battery_state.percentage >= percentage_hide && panel1[i].battery.area.on_screen == 1) {
-			}
+			hide(&panel1[i].battery.area);
-		} else {
+			panel_refresh = 1;
-			if (battery_state.percentage >= percentage_hide) {
+		} else if (battery_state.percentage < percentage_hide && panel1[i].battery.area.on_screen == 0) {
-				if (panel1[i].battery.area.on_screen == 1) {
+			show(&panel1[i].battery.area);
-					hide(&panel1[i].battery.area);
+			panel_refresh = 1;
-					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;
@@ -130,26 +123,25 @@ void update_battery_tick(void* arg)
 void default_battery()
 {
 	battery_enabled = 0;
-	battery_tooltip_enabled = 1;
 	battery_found = 0;
 	percentage_hide = 101;
 	battery_low_cmd_sent = 0;
 	battery_timeout = NULL;
 	bat1_font_desc = NULL;
 	bat2_font_desc = NULL;
-	ac_connected_cmd = NULL;
-	ac_disconnected_cmd = NULL;
 	battery_low_cmd = NULL;
-	battery_lclick_command = NULL;
+	path_energy_now = NULL;
-	battery_mclick_command = NULL;
+	path_energy_full = NULL;
-	battery_rclick_command = NULL;
+	path_current_now = NULL;
-	battery_uwheel_command = NULL;
+	path_status = NULL;
-	battery_dwheel_command = NULL;
 	battery_state.percentage = 0;
 	battery_state.time.hours = 0;
 	battery_state.time.minutes = 0;
 	battery_state.time.seconds = 0;
 	battery_state.state = BATTERY_UNKNOWN;
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+	apm_fd = -1;
+#endif
 }
 
 void cleanup_battery()
@@ -158,51 +150,138 @@ void cleanup_battery()
 	bat1_font_desc = NULL;
 	pango_font_description_free(bat2_font_desc);
 	bat2_font_desc = NULL;
+	g_free(path_energy_now);
+	path_energy_now = NULL;
+	g_free(path_energy_full);
+	path_energy_full = NULL;
+	g_free(path_current_now);
+	path_current_now = NULL;
+	g_free(path_status);
+	path_status = NULL;
 	free(battery_low_cmd);
 	battery_low_cmd = NULL;
-	free(battery_lclick_command);
-	battery_lclick_command = NULL;
-	free(battery_mclick_command);
-	battery_mclick_command = NULL;
-	free(battery_rclick_command);
-	battery_rclick_command = NULL;
-	free(battery_uwheel_command);
-	battery_uwheel_command = NULL;
-	free(battery_dwheel_command);
-	battery_dwheel_command = NULL;
-	free(ac_connected_cmd);
-	ac_connected_cmd = NULL;
-	free(ac_disconnected_cmd);
-	ac_disconnected_cmd = NULL;
 	stop_timeout(battery_timeout);
 	battery_timeout = NULL;
 	battery_found = 0;
 
-	battery_os_free();
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+	if ((apm_fd != -1) && (close(apm_fd) == -1))
+		warn("cannot close /dev/apm");
+	apm_fd = -1;
+#endif
 }
 
-void reinit_battery()
-{
-	battery_os_free();
-	battery_found = battery_os_init();
-	update_battery();
-}
 void init_battery()
 {
 	if (!battery_enabled)
 		return;
+	battery_found = 0;
 
-	battery_found = battery_os_init();
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+	if (apm_fd > 0)
+		close(apm_fd);
+	apm_fd = open("/dev/apm", O_RDONLY);
+	if (apm_fd < 0) {
+		warn("ERROR: battery applet cannot open /dev/apm.");
+		battery_found = 0;
+	} else {
+		battery_found = 1;
+	}
+#elif defined(__FreeBSD__)
+	int sysctl_out = 0;
+	size_t len = sizeof(sysctl_out);
+	battery_found = (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) ||
+					(sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0) ||
+					(sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
+#else // Linux
+	GDir *directory = 0;
+	GError *error = NULL;
+	const char *entryname;
+	gchar *battery_dir = 0;
+
+	directory = g_dir_open("/sys/class/power_supply", 0, &error);
+	if (error) {
+		g_error_free(error);
+	} else {
+		while ((entryname = g_dir_read_name(directory))) {
+			if (strncmp(entryname, "AC", 2) == 0)
+				continue;
+
+			gchar *path1 = g_build_filename("/sys/class/power_supply", entryname, "present", NULL);
+			if (g_file_test(path1, G_FILE_TEST_EXISTS)) {
+				g_free(path1);
+				battery_dir = g_build_filename("/sys/class/power_supply", entryname, NULL);
+				break;
+			}
+			g_free(path1);
+		}
+	}
+	if (directory)
+		g_dir_close(directory);
+	if (!battery_dir) {
+		fprintf(stderr, "ERROR: battery applet cannot find any battery\n");
+		battery_found = 0;
+	} else {
+		battery_found = 1;
+
+		g_free(path_energy_now);
+		path_energy_now = g_build_filename(battery_dir, "energy_now", NULL);
+		if (!g_file_test(path_energy_now, G_FILE_TEST_EXISTS)) {
+			g_free(path_energy_now);
+			path_energy_now = g_build_filename(battery_dir, "charge_now", NULL);
+		}
+		if (!g_file_test(path_energy_now, G_FILE_TEST_EXISTS)) {
+			fprintf(stderr, "ERROR: battery applet cannot find energy_now nor charge_now\n");
+			g_free(path_energy_now);
+			path_energy_now = NULL;
+		}
+
+		g_free(path_energy_full);
+		path_energy_full = g_build_filename(battery_dir, "energy_full", NULL);
+		if (!g_file_test(path_energy_full, G_FILE_TEST_EXISTS)) {
+			g_free(path_energy_full);
+			path_energy_full = g_build_filename(battery_dir, "charge_full", NULL);
+		}
+		if (!g_file_test(path_energy_full, G_FILE_TEST_EXISTS)) {
+			fprintf(stderr, "ERROR: battery applet cannot find energy_now nor charge_now\n");
+			g_free(path_energy_full);
+			path_energy_full = NULL;
+		}
+
+		g_free(path_current_now);
+		path_current_now = g_build_filename(battery_dir, "power_now", NULL);
+		if (!g_file_test(path_current_now, G_FILE_TEST_EXISTS)) {
+			g_free(path_current_now);
+			path_current_now = g_build_filename(battery_dir, "current_now", NULL);
+		}
+		if (!g_file_test(path_current_now, G_FILE_TEST_EXISTS)) {
+			fprintf(stderr, "ERROR: battery applet cannot find power_now nor current_now\n");
+			g_free(path_current_now);
+			path_current_now = NULL;
+		}
+
+		g_free(path_status);
+		path_status = g_build_filename(battery_dir, "status", NULL);
+		if (!g_file_test(path_status, G_FILE_TEST_EXISTS)) {
+			fprintf(stderr, "ERROR: battery applet cannot find battery status\n");
+			g_free(path_status);
+			path_status = NULL;
+		}
+
+		g_free(battery_dir);
+		battery_dir = NULL;
+	}
+
+	if (!path_status) {
+		battery_found = 0;
+		fprintf(stderr, "ERROR: battery applet cannot find any batteries\n");
+	}
+#endif
 
 	if (!battery_timeout)
-		battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
+		battery_timeout = add_timeout(10, 10000, update_battery_tick, 0, &battery_timeout);
-
-	update_battery();
 }
 
-char* battery_get_tooltip(void* obj) {
-	return battery_os_tooltip();
-}
 
 void init_battery_panel(void *p)
 {
@@ -227,34 +306,184 @@ void init_battery_panel(void *p)
 	battery->area._resize = resize_battery;
 	battery->area.on_screen = 1;
 	battery->area.resize = 1;
-	battery->area.mouse_over_effect = battery_lclick_command ||
-									  battery_mclick_command ||
-									  battery_rclick_command ||
-									  battery_uwheel_command ||
-									  battery_dwheel_command;
-	battery->area.mouse_press_effect = battery->area.mouse_over_effect;
-	if (battery_tooltip_enabled)
-		battery->area._get_tooltip_text = battery_get_tooltip;
 }
 
 
 int update_battery() {
-	int err;
+	int64_t energy_now = 0,
+			energy_full = 0;
+	int seconds = 0;
+	int8_t new_percentage = 0;
+	int errors = 0;
 
-	/* reset */
 	battery_state.state = BATTERY_UNKNOWN;
-	battery_state.percentage = 0;
-	battery_state.ac_connected = FALSE;
-	batstate_set_time(&battery_state, 0);
 
-	err = battery_os_update(&battery_state);
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+	struct apm_power_info info;
+	if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
+		// best attempt at mapping to Linux battery states
+		switch (info.battery_state) {
+		case APM_BATT_CHARGING:
+			battery_state.state = BATTERY_CHARGING;
+			break;
+		default:
+			battery_state.state = BATTERY_DISCHARGING;
+			break;
+		}
+
+		if (info.battery_life == 100)
+			battery_state.state = BATTERY_FULL;
+
+		// no mapping for openbsd really
+		energy_full = 0;
+		energy_now = 0;
+
+		if (info.minutes_left != -1)
+			seconds = info.minutes_left * 60;
+		else
+			seconds = -1;
+
+		new_percentage = info.battery_life;
+	} else {
+		warn("power update: APM_IOC_GETPOWER");
+		errors = 1;
+	}
+#elif defined(__FreeBSD__)
+	int sysctl_out = 0;
+	size_t len = sizeof(sysctl_out);
+
+	if (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) {
+		// attemp to map the battery state to Linux
+		battery_state.state = BATTERY_UNKNOWN;
+		switch(sysctl_out) {
+		case 1:
+			battery_state.state = BATTERY_DISCHARGING;
+			break;
+		case 2:
+			battery_state.state = BATTERY_CHARGING;
+			break;
+		default:
+			battery_state.state = BATTERY_FULL;
+			break;
+		}
+	} else {
+		fprintf(stderr, "power update: no such sysctl");
+		errors = 1;
+	}
+
+	// no mapping for freebsd
+	energy_full = 0;
+	energy_now = 0;
+
+	if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) != 0)
+		seconds = -1;
+	else
+		seconds = sysctl_out * 60;
+
+	// charging or error
+	if (seconds < 0)
+		seconds = 0;
+
+	if (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) != 0)
+		new_percentage = -1;
+	else
+		new_percentage = sysctl_out;
+#else
+	FILE *fp = NULL;
+	char tmp[25] = "";
+	int64_t current_now = 0;
+	if (path_status) {
+		fp = fopen(path_status, "r");
+		if (fp != NULL) {
+			if (fgets(tmp, sizeof(tmp), fp)) {
+				if (strcasecmp(tmp, "Charging\n") == 0)
+					battery_state.state = BATTERY_CHARGING;
+				if (strcasecmp(tmp, "Discharging\n") == 0)
+					battery_state.state = BATTERY_DISCHARGING;
+				if (strcasecmp(tmp, "Full\n") == 0)
+					battery_state.state = BATTERY_FULL;
+			}
+			fclose(fp);
+		} else {
+			errors = 1;
+		}
+	} else {
+		errors = 1;
+	}
+
+	if (path_energy_now) {
+		fp = fopen(path_energy_now, "r");
+		if (fp != NULL) {
+			if (fgets(tmp, sizeof tmp, fp))
+				energy_now = atoi(tmp);
+			fclose(fp);
+		} else {
+			errors = 1;
+		}
+	} else {
+		errors = 1;
+	}
+
+	if (path_energy_full) {
+		fp = fopen(path_energy_full, "r");
+		if (fp != NULL) {
+			if (fgets(tmp, sizeof tmp, fp))
+				energy_full = atoi(tmp);
+			fclose(fp);
+		} else {
+			errors = 1;
+		}
+	} else {
+		errors = 1;
+	}
+
+	if (path_current_now) {
+		fp = fopen(path_current_now, "r");
+		if (fp != NULL) {
+			if (fgets(tmp, sizeof tmp, fp))
+				current_now = atoi(tmp);
+			fclose(fp);
+		} else {
+			errors = 1;
+		}
+	} else {
+		errors = 1;
+	}
+
+	if (current_now > 0) {
+		switch (battery_state.state) {
+		case BATTERY_CHARGING:
+			seconds = 3600 * (energy_full - energy_now) / current_now;
+			break;
+		case BATTERY_DISCHARGING:
+			seconds = 3600 * energy_now / current_now;
+			break;
+		default:
+			seconds = 0;
+			break;
+		}
+	} else {
+		seconds = 0;
+	}
+#endif
+
+	battery_state.time.hours = seconds / 3600;
+	seconds -= 3600 * battery_state.time.hours;
+	battery_state.time.minutes = seconds / 60;
+	seconds -= 60 * battery_state.time.minutes;
+	battery_state.time.seconds = seconds;
+
+	if (energy_full > 0)
+		new_percentage = ((energy_now <= energy_full ? energy_now : energy_full) * 100) / energy_full;
+
+	battery_state.percentage = new_percentage;
 
 	// clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
 	if (battery_state.percentage > 100) {
 		battery_state.percentage = 100;
 	}
 
-	return err;
+	return errors;
 }
 
 
@@ -269,8 +498,6 @@ void draw_battery (void *obj, cairo_t *c)
 	pango_layout_set_font_description(layout, bat1_font_desc);
 	pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
 	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
 	pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
 
 	cairo_set_source_rgba(c, battery->font.color[0], battery->font.color[1], battery->font.color[2], battery->font.alpha);
@@ -280,8 +507,6 @@ void draw_battery (void *obj, cairo_t *c)
 
 	pango_layout_set_font_description(layout, bat2_font_desc);
 	pango_layout_set_indent(layout, 0);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
 	pango_layout_set_text(layout, buf_bat_time, strlen(buf_bat_time));
 	pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
 
@@ -310,13 +535,9 @@ int resize_battery(void *obj)
 		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
 	}
 	get_text_size2(bat1_font_desc, &bat_percentage_height_ink, &bat_percentage_height, &bat_percentage_width,
-				   panel->area.height, panel->area.width, buf_bat_percentage, strlen(buf_bat_percentage),
+				   panel->area.height, panel->area.width, buf_bat_percentage, strlen(buf_bat_percentage));
-				   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE);
 	get_text_size2(bat2_font_desc, &bat_time_height_ink, &bat_time_height, &bat_time_width,
-				   panel->area.height, panel->area.width, buf_bat_time, strlen(buf_bat_time),
+				   panel->area.height, panel->area.width, buf_bat_time, strlen(buf_bat_time));
-				   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE);
 
 	if (panel_horizontal) {
 		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
@@ -342,26 +563,3 @@ int resize_battery(void *obj)
 	}
 	return ret;
 }
-
-void battery_action(int button)
-{
-	char *command = 0;
-	switch (button) {
-		case 1:
-		command = battery_lclick_command;
-		break;
-		case 2:
-		command = battery_mclick_command;
-		break;
-		case 3:
-		command = battery_rclick_command;
-		break;
-		case 4:
-		command = battery_uwheel_command;
-		break;
-		case 5:
-		command = battery_dwheel_command;
-		break;
-	}
-	tint_exec(command);
-}

src/battery/battery.h

@@ -1,8 +1,9 @@
 /**************************************************************************
-* Copyright (C) 2009-2015 Sebastian Reichel <sre@ring0.de>
+* Copyright (C) 2009 Sebastian Reichel <elektranox@gmail.com>
 *
 * Battery with functional data (percentage, time to life) and drawing data
 * (area, font, ...). Each panel use his own drawing data.
+* Need kernel > 2.6.23.
 *
 **************************************************************************/
 
@@ -44,73 +45,30 @@ typedef struct batstate {
 	int percentage;
 	struct battime time;
 	enum chargestate state;
-	gboolean ac_connected;
 } batstate;
 
 extern struct batstate battery_state;
 extern PangoFontDescription *bat1_font_desc;
 extern PangoFontDescription *bat2_font_desc;
 extern int battery_enabled;
-extern int battery_tooltip_enabled;
 extern int percentage_hide;
 
 extern int8_t battery_low_status;
 extern char *battery_low_cmd;
 
-extern char *ac_connected_cmd;
-extern char *ac_disconnected_cmd;
-
-extern char *battery_lclick_command;
-extern char *battery_mclick_command;
-extern char *battery_rclick_command;
-extern char *battery_uwheel_command;
-extern char *battery_dwheel_command;
-
-static inline gchar* chargestate2str(enum chargestate state) {
-	switch(state) {
-		case BATTERY_CHARGING:
-			return "Charging";
-		case BATTERY_DISCHARGING:
-			return "Discharging";
-		case BATTERY_FULL:
-			return "Full";
-		case BATTERY_UNKNOWN:
-		default:
-			return "Unknown";
-	};
-}
-
-static inline void batstate_set_time(struct batstate *state, int seconds) {
-	state->time.hours = seconds / 3600;
-	seconds -= 3600 * state->time.hours;
-	state->time.minutes = seconds / 60;
-	seconds -= 60 * state->time.minutes;
-	state->time.seconds = seconds;
-}
-
 // default global data
 void default_battery();
 
 // freed memory
 void cleanup_battery();
 
-void update_battery_tick(void* arg);
 int update_battery();
 
 void init_battery();
 void init_battery_panel(void *panel);
 
-void reinit_battery();
 void draw_battery(void *obj, cairo_t *c);
 
 int  resize_battery(void *obj);
 
-void battery_action(int button);
-
-/* operating system specific functions */
-gboolean battery_os_init();
-void battery_os_free();
-int battery_os_update(struct batstate *state);
-char* battery_os_tooltip();
-
 #endif

src/battery/dummy.c

@@ -1,40 +0,0 @@
-/**************************************************************************
-*
-* Tint2 : Dummy battery (non-functional)
-*
-* Copyright (C) 2015 Sebastian Reichel <sre@ring0.de>
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License version 2
-* or any later version as published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**************************************************************************/
-
-#include <string.h>
-#include "common.h"
-#include "battery.h"
-
-#warning tint2 has no battery support for this operating system!
-
-gboolean battery_os_init() {
-	return FALSE;
-}
-
-void battery_os_free() {
-	return;
-}
-
-int battery_os_update(struct batstate *state) {
-	return -1;
-}
-
-char* battery_os_tooltip() {
-	return strdup("Operating System not supported");
-}

src/battery/freebsd.c

@@ -1,98 +0,0 @@
-/**************************************************************************
-*
-* Tint2 : FreeBSD battery
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License version 2
-* or any later version as published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**************************************************************************/
-
-#if defined(__FreeBSD__)
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <string.h>
-
-#include "common.h"
-#include "battery.h"
-
-gboolean battery_os_init() {
-	int sysctl_out = 0;
-	size_t len = sizeof(sysctl_out);
-
-	return (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) ||
-			(sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0) ||
-			(sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
-}
-
-void battery_os_free() {
-	return;
-}
-
-int battery_os_update(struct batstate *state) {
-	int sysctl_out = 0;
-	size_t len = sizeof(sysctl_out);
-	gboolean err = 0;
-
-	if (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) {
-		switch(sysctl_out) {
-		case 1:
-			state->state = BATTERY_DISCHARGING;
-			break;
-		case 2:
-			state->state = BATTERY_CHARGING;
-			break;
-		default:
-			state->state = BATTERY_FULL;
-			break;
-		}
-	} else {
-		fprintf(stderr, "power update: no such sysctl");
-		err = -1;
-	}
-
-	if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0)
-		batstate_set_time(state, sysctl_out * 60);
-	else
-		err = -1;
-
-	if (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0)
-		state->percentage = sysctl_out;
-	else
-		err = -1;
-
-	if (sysctlbyname("hw.acpi.acline", &sysctl_out, &len, NULL, 0) == 0)
-		state->ac_connected = sysctl_out;
-	
-	return err;
-}
-
-char* battery_os_tooltip() {
-	GString *tooltip = g_string_new("");
-	gchar *result;
-
-	g_string_append_printf(tooltip, "Battery\n");
-
-	gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
-
-	g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
-
-	g_string_append_c(tooltip, '\n');
-	g_string_append_printf(tooltip, "AC\n");
-	g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
-
-	result = tooltip->str;
-	g_string_free(tooltip, FALSE);
-
-	return result;
-}
-
-#endif

src/battery/linux.c

@@ -1,517 +0,0 @@
-/**************************************************************************
-*
-* Tint2 : Linux battery
-*
-* Copyright (C) 2015 Sebastian Reichel <sre@ring0.de>
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License version 2
-* or any later version as published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**************************************************************************/
-
-#ifdef __linux
-
-#include <stdlib.h>
-
-#include "common.h"
-#include "battery.h"
-#include "uevent.h"
-
-enum psy_type {
-	PSY_UNKNOWN,
-	PSY_BATTERY,
-	PSY_MAINS,
-};
-
-struct psy_battery {
-	/* generic properties */
-	gchar*               name;
-	gint64               timestamp;
-	/* sysfs files */
-	gchar*               path_present;
-	gchar*               path_energy_now;
-	gchar*               path_energy_full;
-	gchar*               path_power_now;
-	gchar*               path_status;
-	/* sysfs hints */
-	gboolean             energy_in_uamp;
-	gboolean             power_in_uamp;
-	/* values */
-	gboolean             present;
-	gint                 energy_now;
-	gint                 energy_full;
-	gint                 power_now;
-	enum chargestate     status;
-};
-
-struct psy_mains {
-	/* generic properties */
-	gchar*               name;
-	/* sysfs files */
-	gchar*               path_online;
-	/* values */
-	gboolean             online;
-};
-
-static void uevent_battery_update() {
-	update_battery_tick(NULL);
-}
-static struct uevent_notify psy_change = {
-	UEVENT_CHANGE,
-	"power_supply",
-	NULL,
-	uevent_battery_update
-};
-
-static void uevent_battery_plug() {
-	printf("reinitialize batteries after HW change\n");
-	reinit_battery();
-}
-static struct uevent_notify psy_plug = {
-	UEVENT_ADD | UEVENT_REMOVE,
-	"power_supply",
-	NULL,
-	uevent_battery_plug
-};
-
-#define RETURN_ON_ERROR(err) if (error) { g_error_free(err); return FALSE; }
-
-static GList *batteries = NULL;
-static GList *mains = NULL;
-
-static guint8 energy_to_percent(gint energy_now, gint energy_full) {
-	return 0.5 + ((energy_now <= energy_full ? energy_now : energy_full) * 100.0) / energy_full;
-}
-
-static enum psy_type power_supply_get_type(const gchar *entryname) {
-	gchar *path_type = g_build_filename("/sys/class/power_supply", entryname, "type", NULL);
-	GError *error = NULL;
-	gchar *type;
-	gsize typelen;
-
-	g_file_get_contents(path_type, &type, &typelen, &error);
-	g_free(path_type);
-	if (error) {
-		g_error_free(error);
-		return PSY_UNKNOWN;
-	}
-
-	if (!g_strcmp0(type, "Battery\n")) {
-		g_free(type);
-		return PSY_BATTERY;
-	}
-
-	if (!g_strcmp0(type, "Mains\n")) {
-		g_free(type);
-		return PSY_MAINS;
-	}
-
-	g_free(type);
-
-	return PSY_UNKNOWN;
-}
-
-static gboolean init_linux_battery(struct psy_battery *bat) {
-	const gchar *entryname = bat->name;
-
-	bat->energy_in_uamp = FALSE;
-	bat->power_in_uamp = FALSE;
-
-	bat->path_present = g_build_filename("/sys/class/power_supply", entryname, "present", NULL);
-	if (!g_file_test(bat->path_present, G_FILE_TEST_EXISTS)) {
-		goto err0;
-	}
-
-	bat->path_energy_now = g_build_filename("/sys/class/power_supply", entryname, "energy_now", NULL);
-	if (!g_file_test(bat->path_energy_now, G_FILE_TEST_EXISTS)) {
-		g_free(bat->path_energy_now);
-		bat->path_energy_now = g_build_filename("/sys/class/power_supply", entryname, "charge_now", NULL);
-		bat->energy_in_uamp = TRUE;
-	}
-	if (!g_file_test(bat->path_energy_now, G_FILE_TEST_EXISTS)) {
-		goto err1;
-	}
-
-	if (!bat->energy_in_uamp) {
-		bat->path_energy_full = g_build_filename("/sys/class/power_supply", entryname, "energy_full", NULL);
-		if (!g_file_test(bat->path_energy_full, G_FILE_TEST_EXISTS))
-			goto err2;
-	} else {
-		bat->path_energy_full = g_build_filename("/sys/class/power_supply", entryname, "charge_full", NULL);
-		if (!g_file_test(bat->path_energy_full, G_FILE_TEST_EXISTS))
-			goto err2;
-	}
-
-	bat->path_power_now = g_build_filename("/sys/class/power_supply", entryname, "power_now", NULL);
-	if (!g_file_test(bat->path_power_now, G_FILE_TEST_EXISTS)) {
-		g_free(bat->path_power_now);
-		bat->path_power_now = g_build_filename("/sys/class/power_supply", entryname, "current_now", NULL);
-		bat->power_in_uamp = TRUE;
-	}
-	if (!g_file_test(bat->path_power_now, G_FILE_TEST_EXISTS)) {
-		goto err3;
-	}
-
-	bat->path_status = g_build_filename("/sys/class/power_supply", entryname, "status", NULL);
-	if (!g_file_test(bat->path_status, G_FILE_TEST_EXISTS)) {
-		goto err4;
-	}
-
-	return TRUE;
-
-err4:
-	g_free(bat->path_status);
-err3:
-	g_free(bat->path_power_now);
-err2:
-	g_free(bat->path_energy_full);
-err1:
-	g_free(bat->path_energy_now);
-err0:
-	g_free(bat->path_present);
-
-	return FALSE;
-}
-
-static gboolean init_linux_mains(struct psy_mains *ac) {
-	const gchar *entryname = ac->name;
-
-	ac->path_online = g_build_filename("/sys/class/power_supply", entryname, "online", NULL);
-	if (!g_file_test(ac->path_online, G_FILE_TEST_EXISTS)) {
-		g_free(ac->path_online);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void psy_battery_free(gpointer data) {
-	struct psy_battery *bat = data;
-	g_free(bat->name);
-	g_free(bat->path_status);
-	g_free(bat->path_power_now);
-	g_free(bat->path_energy_full);
-	g_free(bat->path_energy_now);
-	g_free(bat->path_present);
-	g_free(bat);
-}
-
-static void psy_mains_free(gpointer data) {
-	struct psy_mains *ac = data;
-	g_free(ac->name);
-	g_free(ac->path_online);
-	g_free(ac);
-}
-
-void battery_os_free() {
-	uevent_unregister_notifier(&psy_change);
-	uevent_unregister_notifier(&psy_plug);
-
-	g_list_free_full(batteries, psy_battery_free);
-	batteries = NULL;
-	g_list_free_full(mains, psy_mains_free);
-	mains = NULL;
-}
-
-static void add_battery(const char *entryname) {
-	struct psy_battery *bat = g_malloc0(sizeof(*bat));
-	bat->name = g_strdup(entryname);
-
-	if (init_linux_battery(bat)) {
-		batteries = g_list_append(batteries, bat);
-		fprintf(stdout, "found battery \"%s\"\n", bat->name);
-	} else {
-		g_free(bat);
-		fprintf(stderr, RED "failed to initialize battery \"%s\"\n" RESET, entryname);
-	}
-}
-
-static void add_mains(const char *entryname) {
-	struct psy_mains *ac = g_malloc0(sizeof(*ac));
-	ac->name = g_strdup(entryname);
-
-	if (init_linux_mains(ac)) {
-		mains = g_list_append(mains, ac);
-		fprintf(stdout, "found mains \"%s\"\n", ac->name);
-	} else {
-		g_free(ac);
-		fprintf(stderr, RED "failed to initialize mains \"%s\"\n" RESET, entryname);
-	}
-}
-
-gboolean battery_os_init() {
-	GDir *directory = 0;
-	GError *error = NULL;
-	const char *entryname;
-
-	battery_os_free();
-
-	directory = g_dir_open("/sys/class/power_supply", 0, &error);
-	RETURN_ON_ERROR(error);
-
-	while ((entryname = g_dir_read_name(directory))) {
-		enum psy_type type = power_supply_get_type(entryname);
-
-		switch(type) {
-			case PSY_BATTERY:
-				add_battery(entryname);
-				break;
-			case PSY_MAINS:
-				add_mains(entryname);
-				break;
-			default:
-				break;
-		}
-	}
-
-	g_dir_close(directory);
-
-	uevent_register_notifier(&psy_change);
-	uevent_register_notifier(&psy_plug);
-
-	return batteries != NULL;
-}
-
-static gint estimate_power_usage(struct psy_battery *bat, gint old_energy_now, gint64 old_timestamp) {
-	gint64 diff_power = ABS(bat->energy_now - old_energy_now);
-	gint64 diff_time = bat->timestamp - old_timestamp;
-
-	/* µW = (µWh * 3600) / (µs / 1000000) */
-	gint power = diff_power * 3600 * 1000000 / MAX(1, diff_time);
-
-	return power;
-}
-
-static gboolean update_linux_battery(struct psy_battery *bat) {
-	GError *error = NULL;
-	gchar *data;
-	gsize datalen;
-
-	gint64 old_timestamp = bat->timestamp;
-	int old_energy_now = bat->energy_now;
-
-	/* reset values */
-	bat->present = 0;
-	bat->status = BATTERY_UNKNOWN;
-	bat->energy_now = 0;
-	bat->energy_full = 0;
-	bat->power_now = 0;
-	bat->timestamp = g_get_monotonic_time();
-
-	/* present */
-	g_file_get_contents(bat->path_present, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
-	bat->present = (atoi(data) == 1);
-	g_free(data);
-
-	/* we are done, if battery is not present */
-	if (!bat->present)
-		return TRUE;
-
-	/* status */
-	bat->status = BATTERY_UNKNOWN;
-	g_file_get_contents(bat->path_status, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
-	if (!g_strcmp0(data, "Charging\n")) {
-		bat->status = BATTERY_CHARGING;
-	} else if (!g_strcmp0(data, "Discharging\n")) {
-		bat->status = BATTERY_DISCHARGING;
-	} else if (!g_strcmp0(data, "Full\n")) {
-		bat->status = BATTERY_FULL;
-	}
-	g_free(data);
-
-	/* energy now */
-	g_file_get_contents(bat->path_energy_now, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
-	bat->energy_now = atoi(data);
-	g_free(data);
-
-	/* energy full */
-	g_file_get_contents(bat->path_energy_full, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
-	bat->energy_full = atoi(data);
-	g_free(data);
-
-	/* power now */
-	g_file_get_contents(bat->path_power_now, &data, &datalen, &error);
-	if (g_error_matches(error, G_FILE_ERROR, G_FILE_ERROR_NODEV)) {
-		/* some hardware does not support reading current power consumption */
-		g_error_free(error);
-		bat->power_now = estimate_power_usage(bat, old_energy_now, old_timestamp);
-	} else if (error) {
-		g_error_free(error);
-		return FALSE;
-	} else {
-		bat->power_now = atoi(data);
-		g_free(data);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean update_linux_mains(struct psy_mains *ac) {
-	GError *error = NULL;
-	gchar *data;
-	gsize datalen;
-	ac->online = FALSE;
-
-	/* online */
-	g_file_get_contents(ac->path_online, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
-	ac->online = (atoi(data) == 1);
-	g_free(data);
-
-	return TRUE;
-}
-
-int battery_os_update(struct batstate *state) {
-	GList *l;
-
-	gint64 total_energy_now = 0;
-	gint64 total_energy_full = 0;
-	gint64 total_power_now = 0;
-	gint seconds = 0;
-
-	gboolean charging = FALSE;
-	gboolean discharging = FALSE;
-	gboolean full = FALSE;
-	gboolean ac_connected = FALSE;
-
-	for (l = batteries; l != NULL; l = l->next) {
-		struct psy_battery *bat = l->data;
-		update_linux_battery(bat);
-
-		total_energy_now += bat->energy_now;
-		total_energy_full += bat->energy_full;
-		total_power_now += bat->power_now;
-
-		charging |= (bat->status == BATTERY_CHARGING);
-		discharging |= (bat->status == BATTERY_DISCHARGING);
-		full |= (bat->status == BATTERY_FULL);
-	}
-
-	for (l = mains; l != NULL; l = l->next) {
-		struct psy_mains *ac = l->data;
-		update_linux_mains(ac);
-		ac_connected |= (ac->online);
-	}
-
-	/* build global state */
-	if (charging && !discharging)
-		state->state = BATTERY_CHARGING;
-	else if (!charging && discharging)
-		state->state = BATTERY_DISCHARGING;
-	else if (!charging && !discharging && full)
-		state->state = BATTERY_FULL;
-
-	/* calculate seconds */
-	if (total_power_now > 0) {
-		if (state->state == BATTERY_CHARGING)
-			seconds = 3600 * (total_energy_full - total_energy_now) / total_power_now;
-		else if (state->state == BATTERY_DISCHARGING)
-			seconds = 3600 * total_energy_now / total_power_now;
-	}
-	batstate_set_time(state, seconds);
-
-	/* calculate percentage */
-	state->percentage = energy_to_percent(total_energy_now, total_energy_full);
-
-	/* AC state */
-	state->ac_connected = ac_connected;
-
-	return 0;
-}
-
-static gchar* energy_human_readable(struct psy_battery *bat) {
-	gint now = bat->energy_now;
-	gint full = bat->energy_full;
-	gchar unit = bat->energy_in_uamp ? 'A' : 'W';
-
-	if (full >= 1000000) {
-		return g_strdup_printf("%d.%d / %d.%d %ch",
-			now / 1000000, (now % 1000000) / 100000,
-			full / 1000000, (full % 1000000) / 100000,
-			unit);
-	} else if (full >= 1000) {
-		return g_strdup_printf("%d.%d / %d.%d m%ch",
-		now / 1000, (now % 1000) / 100,
-		full / 1000, (full % 1000) / 100,
-		unit);
-	} else {
-		return g_strdup_printf("%d / %d µ%ch", now, full, unit);
-	}
-}
-
-static gchar* power_human_readable(struct psy_battery *bat) {
-	gint power = bat->power_now;
-	gchar unit = bat->power_in_uamp ? 'A' : 'W';
-
-	if (power >= 1000000) {
-		return g_strdup_printf("%d.%d %c", power / 1000000, (power % 1000000) / 100000, unit);
-	} else if (power >= 1000) {
-		return g_strdup_printf("%d.%d m%c", power / 1000, (power % 1000) / 100, unit);
-	} else if (power > 0) {
-		return g_strdup_printf("%d µ%c", power, unit);
-	} else {
-		return g_strdup_printf("0 %c", unit);
-	}
-}
-
-char* battery_os_tooltip() {
-	GList *l;
-	GString *tooltip = g_string_new("");
-	gchar *result;
-
-	for (l = batteries; l != NULL; l = l->next) {
-		struct psy_battery *bat = l->data;
-
-		if (tooltip->len)
-			g_string_append_c(tooltip, '\n');
-
-		g_string_append_printf(tooltip, "%s\n", bat->name);
-
-		if (!bat->present) {
-			g_string_append_printf(tooltip, "\tnot connected");
-			continue;
-		}
-
-		gchar *power = power_human_readable(bat);
-		gchar *energy = energy_human_readable(bat);
-		gchar *state = (bat->status == BATTERY_UNKNOWN) ? "Level" : chargestate2str(bat->status);
-
-		guint8 percentage = energy_to_percent(bat->energy_now, bat->energy_full);
-
-		g_string_append_printf(tooltip, "\t%s: %s (%u %%)\n\tPower: %s",
-			state, energy, percentage, power);
-
-		g_free(power);
-		g_free(energy);
-	}
-
-	for (l = mains; l != NULL; l = l->next) {
-		struct psy_mains *ac = l->data;
-
-		if (tooltip->len)
-			g_string_append_c(tooltip, '\n');
-
-		g_string_append_printf(tooltip, "%s\n", ac->name);
-		g_string_append_printf(tooltip, ac->online ? "\tConnected" : "\tDisconnected");
-	}
-
-	result = tooltip->str;
-	g_string_free(tooltip, FALSE);
-
-	return result;
-}
-
-#endif

src/battery/openbsd.c

@@ -1,104 +0,0 @@
-/**************************************************************************
-*
-* Tint2 : OpenBSD & NetBSD battery
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License version 2
-* or any later version as published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**************************************************************************/
-
-#if defined(__OpenBSD__) || defined(__NetBSD__)
-
-#include <stdint.h>
-#include <err.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <string.h>
-#include <machine/apmvar.h>
-
-#include "common.h"
-#include "battery.h"
-
-int apm_fd = -1;
-
-gboolean battery_os_init() {
-	if (apm_fd > 0)
-		close(apm_fd);
-
-	apm_fd = open("/dev/apm", O_RDONLY);
-
-	if (apm_fd < 0) {
-		warn("ERROR: battery applet cannot open /dev/apm.");
-		return FALSE;
-	} else {
-		return TRUE;
-	}
-}
-
-void battery_os_free() {
-	if ((apm_fd != -1) && (close(apm_fd) == -1))
-		warn("cannot close /dev/apm");
-	apm_fd = -1;
-}
-
-int battery_os_update(struct batstate *state) {
-	struct apm_power_info info;
-
-	if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
-		// best attempt at mapping to Linux battery states
-		switch (info.battery_state) {
-		case APM_BATT_CHARGING:
-			state->state = BATTERY_CHARGING;
-			break;
-		default:
-			state->state = BATTERY_DISCHARGING;
-			break;
-		}
-
-		if (info.battery_life > 100)
-			info.battery_life = 100;
-		if (info.battery_life == 100)
-			state->state = BATTERY_FULL;
-
-		state->percentage = info.battery_life;
-		if (info.minutes_left != -1)
-			batstate_set_time(state, info.minutes_left * 60);
-
-		state->ac_connected = info.ac_state == APM_AC_ON;
-	} else {
-		warn("power update: APM_IOC_GETPOWER");
-		return -1;
-	}
-
-	return 0;
-}
-
-char* battery_os_tooltip() {
-	GString *tooltip = g_string_new("");
-	gchar *result;
-
-	g_string_append_printf(tooltip, "Battery\n");
-
-	gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
-
-	g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
-
-	g_string_append_c(tooltip, '\n');
-	g_string_append_printf(tooltip, "AC\n");
-	g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
-
-	result = tooltip->str;
-	g_string_free(tooltip, FALSE);
-
-	return result;
-}
-
-#endif

src/clock/clock.c

@@ -39,10 +39,7 @@ char *time2_timezone;
 char *time_tooltip_format;
 char *time_tooltip_timezone;
 char *clock_lclick_command;
-char *clock_mclick_command;
 char *clock_rclick_command;
-char *clock_uwheel_command;
-char *clock_dwheel_command;
 struct timeval time_clock;
 PangoFontDescription *time1_font_desc;
 PangoFontDescription *time2_font_desc;
@@ -64,10 +61,7 @@ void default_clock()
 	time_tooltip_format = NULL;
 	time_tooltip_timezone = NULL;
 	clock_lclick_command = NULL;
-	clock_mclick_command = NULL;
 	clock_rclick_command = NULL;
-	clock_uwheel_command = NULL;
-	clock_dwheel_command = NULL;
 	time1_font_desc = NULL;
 	time2_font_desc = NULL;
 }
@@ -92,14 +86,8 @@ void cleanup_clock()
 	time_tooltip_timezone = NULL;
 	free(clock_lclick_command);
 	clock_lclick_command = NULL;
-	free(clock_mclick_command);
-	clock_mclick_command = NULL;
 	free(clock_rclick_command);
 	clock_rclick_command = NULL;
-	free(clock_uwheel_command);
-	clock_uwheel_command = NULL;
-	free(clock_dwheel_command);
-	clock_dwheel_command = NULL;
 	stop_timeout(clock_timeout);
 	clock_timeout = NULL;
 }
@@ -144,10 +132,10 @@ struct tm* clock_gettime_for_tz(const char* timezone) {
 	else return localtime(&time_clock.tv_sec);
 }
 
-char* clock_get_tooltip(void* obj)
+const char* clock_get_tooltip(void* obj)
 {
 	strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
-	return strdup(buf_tooltip);
+	return buf_tooltip;
 }
 
 int time_format_needs_sec_ticks(char *time_format)
@@ -185,11 +173,6 @@ void init_clock_panel(void *p)
 		clock->area.bg = &g_array_index(backgrounds, Background, 0);
 	clock->area.parent = p;
 	clock->area.panel = p;
-	clock->area.mouse_press_effect = clock->area.mouse_over_effect = clock_lclick_command ||
-																	 clock_mclick_command ||
-																	 clock_rclick_command ||
-																	 clock_uwheel_command ||
-																	 clock_dwheel_command;
 	clock->area._draw_foreground = draw_clock;
 	clock->area.size_mode = SIZE_BY_CONTENT;
 	clock->area._resize = resize_clock;
@@ -218,8 +201,6 @@ void draw_clock (void *obj, cairo_t *c)
 	pango_layout_set_font_description (layout, time1_font_desc);
 	pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
 	pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
 	pango_layout_set_text (layout, buf_time, strlen(buf_time));
 
 	cairo_set_source_rgba (c, clock->font.color[0], clock->font.color[1], clock->font.color[2], clock->font.alpha);
@@ -251,14 +232,10 @@ int resize_clock (void *obj)
 	
 	date_height = date_width = 0;
 	strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
-	get_text_size2(time1_font_desc, &time_height_ink, &time_height, &time_width, panel->area.height, panel->area.width, buf_time, strlen(buf_time),
+	get_text_size2(time1_font_desc, &time_height_ink, &time_height, &time_width, panel->area.height, panel->area.width, buf_time, strlen(buf_time));
-				   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE);
 	if (time2_format) {
 		strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
-		get_text_size2(time2_font_desc, &date_height_ink, &date_height, &date_width, panel->area.height, panel->area.width, buf_date, strlen(buf_date),
+		get_text_size2(time2_font_desc, &date_height_ink, &date_height, &date_width, panel->area.height, panel->area.width, buf_date, strlen(buf_date));
-					   PANGO_WRAP_WORD_CHAR,
-					   PANGO_ELLIPSIZE_NONE);
 	}
 
 	if (panel_horizontal) {
@@ -300,18 +277,9 @@ void clock_action(int button)
 		case 1:
 		command = clock_lclick_command;
 		break;
-		case 2:
-		command = clock_mclick_command;
-		break;
 		case 3:
 		command = clock_rclick_command;
 		break;
-		case 4:
-		command = clock_uwheel_command;
-		break;
-		case 5:
-		command = clock_dwheel_command;
-		break;
 	}
 	tint_exec(command);
 }

src/clock/clock.h

@@ -33,10 +33,7 @@ extern char *time_tooltip_timezone;
 extern PangoFontDescription *time1_font_desc;
 extern PangoFontDescription *time2_font_desc;
 extern char *clock_lclick_command;
-extern char *clock_mclick_command;
 extern char *clock_rclick_command;
-extern char *clock_uwheel_command;
-extern char *clock_dwheel_command;
 extern int clock_enabled;
 
 

src/config.c

@@ -41,7 +41,6 @@
 
 #include "common.h"
 #include "server.h"
-#include "strnatcmp.h"
 #include "panel.h"
 #include "task.h"
 #include "taskbar.h"
@@ -70,11 +69,6 @@ char *snapshot_path;
 // detect if it's an old config file (==1)
 static int new_config_file;
 
-static int read_bg_color_hover;
-static int read_border_color_hover;
-static int read_bg_color_press;
-static int read_border_color_press;
-
 
 void default_config()
 {
@@ -159,48 +153,23 @@ int config_get_monitor(char* monitor)
 	return -1;
 }
 
-static gint compare_strings(gconstpointer a, gconstpointer b)
-{
-   return strnatcasecmp((const char*)a, (const char*)b);
-}
-
 void load_launcher_app_dir(const char *path)
 {
-    GList *subdirs = NULL;
+	GDir *d = g_dir_open(path, 0, NULL);
-	GList *files = NULL;
-
-    GDir *d = g_dir_open(path, 0, NULL);
 	if (d) {
 		const gchar *name;
 		while ((name = g_dir_read_name(d))) {
 			gchar *file = g_build_filename(path, name, NULL);
-			if (!g_file_test(file, G_FILE_TEST_IS_DIR) && g_str_has_suffix(file, ".desktop")) {
+			if (!g_file_test(file, G_FILE_TEST_IS_DIR) &&
-				files = g_list_append(files, file);
+				g_str_has_suffix(file, ".desktop")) {
+				panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, strdup(file));
 			} else if (g_file_test(file, G_FILE_TEST_IS_DIR)) {
-				subdirs = g_list_append(subdirs, file);
+				load_launcher_app_dir(file);
-			} else {
+			}
-                g_free(file);
+			g_free(file);
-            }
 		}
 		g_dir_close(d);
 	}
-
-    subdirs = g_list_sort(subdirs, compare_strings);
-    GList *l;
-    for (l = subdirs; l; l = g_list_next(l)) {
-        gchar *dir = (gchar *)l->data;
-        load_launcher_app_dir(dir);
-        g_free(dir);
-    }
-    g_list_free(subdirs);
-
-    files = g_list_sort(files, compare_strings);
-    for (l = files; l; l = g_list_next(l)) {
-        gchar *file = (gchar *)l->data;
-        panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, strdup(file));
-        g_free(file);
-    }
-    g_list_free(files);
 }
 
 void add_entry (char *key, char *value)
@@ -210,25 +179,10 @@ void add_entry (char *key, char *value)
 	/* Background and border */
 	if (strcmp (key, "rounded") == 0) {
 		// 'rounded' is the first parameter => alloc a new background
-		if (backgrounds->len > 0) {
-			Background *bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
-			if (!read_bg_color_hover)
-				memcpy(&bg->back_hover, &bg->back, sizeof(Color));
-			if (!read_border_color_hover)
-				memcpy(&bg->border_hover, &bg->border, sizeof(Color));
-			if (!read_bg_color_press)
-				memcpy(&bg->back_pressed, &bg->back_hover, sizeof(Color));
-			if (!read_border_color_press)
-				memcpy(&bg->border_pressed, &bg->border_hover, sizeof(Color));
-		}
 		Background bg;
-		init_background(&bg);
+		memset(&bg, 0, sizeof(bg));
 		bg.border.rounded = atoi(value);
 		g_array_append_val(backgrounds, bg);
-		read_bg_color_hover = 0;
-		read_border_color_hover = 0;
-		read_bg_color_press = 0;
-		read_border_color_press = 0;
 	}
 	else if (strcmp (key, "border_width") == 0) {
 		g_array_index(backgrounds, Background, backgrounds->len-1).border.width = atoi(value);
@@ -247,38 +201,6 @@ void add_entry (char *key, char *value)
 		if (value2) bg->border.alpha = (atoi (value2) / 100.0);
 		else bg->border.alpha = 0.5;
 	}
-	else if (strcmp (key, "background_color_hover") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->back_hover.color);
-		if (value2) bg->back_hover.alpha = (atoi (value2) / 100.0);
-		else bg->back_hover.alpha = 0.5;
-    read_bg_color_hover = 1;
-	}
-	else if (strcmp (key, "border_color_hover") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->border_hover.color);
-		if (value2) bg->border_hover.alpha = (atoi (value2) / 100.0);
-		else bg->border_hover.alpha = 0.5;
-		read_border_color_hover = 1;
-	}
-	else if (strcmp (key, "background_color_pressed") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->back_pressed.color);
-		if (value2) bg->back_pressed.alpha = (atoi (value2) / 100.0);
-		else bg->back_pressed.alpha = 0.5;
-		read_bg_color_press = 1;
-	}
-	else if (strcmp (key, "border_color_pressed") == 0) {
-		Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
-		extract_values(value, &value1, &value2, &value3);
-		get_color (value1, bg->border_pressed.color);
-		if (value2) bg->border_pressed.alpha = (atoi (value2) / 100.0);
-		else bg->border_pressed.alpha = 0.5;
-		read_border_color_press = 1;
-	}
 
 	/* Panel */
 	else if (strcmp (key, "panel_monitor") == 0) {
@@ -310,13 +232,6 @@ void add_entry (char *key, char *value)
 		new_config_file = 1;
 		panel_items_order = strdup(value);
 		int j;
-		systray_enabled = 0;
-		launcher_enabled = 0;
-#ifdef ENABLE_BATTERY
-		battery_enabled = 0;
-#endif
-		clock_enabled = 0;
-		taskbar_enabled = 0;
 		for (j=0 ; j < strlen(panel_items_order) ; j++) {
 			if (panel_items_order[j] == 'L')
 				launcher_enabled = 1;
@@ -406,56 +321,14 @@ void add_entry (char *key, char *value)
 	else if (strcmp (key, "battery_low_status") == 0) {
 #ifdef ENABLE_BATTERY
 		battery_low_status = atoi(value);
-		if (battery_low_status < 0 || battery_low_status > 100)
+		if(battery_low_status < 0 || battery_low_status > 100)
 			battery_low_status = 0;
-#endif
-	}
-	else if (strcmp(key, "battery_lclick_command") == 0) {
-#ifdef ENABLE_BATTERY
-		if (strlen(value) > 0)
-			battery_lclick_command = strdup(value);
-#endif
-	}
-	else if (strcmp(key, "battery_mclick_command") == 0) {
-#ifdef ENABLE_BATTERY
-		if (strlen(value) > 0)
-			battery_mclick_command = strdup(value);
-#endif
-	}
-	else if (strcmp(key, "battery_rclick_command") == 0) {
-#ifdef ENABLE_BATTERY
-		if (strlen(value) > 0)
-			battery_rclick_command = strdup(value);
-#endif
-	}
-	else if (strcmp(key, "battery_uwheel_command") == 0) {
-#ifdef ENABLE_BATTERY
-		if (strlen(value) > 0)
-			battery_uwheel_command = strdup(value);
-#endif
-	}
-	else if (strcmp(key, "battery_dwheel_command") == 0) {
-#ifdef ENABLE_BATTERY
-		if (strlen(value) > 0)
-			battery_dwheel_command = strdup(value);
 #endif
 	}
 	else if (strcmp (key, "battery_low_cmd") == 0) {
 #ifdef ENABLE_BATTERY
 		if (strlen(value) > 0)
 			battery_low_cmd = strdup (value);
-#endif
-	}
-	else if (strcmp (key, "ac_connected_cmd") == 0) {
-#ifdef ENABLE_BATTERY
-		if (strlen(value) > 0)
-			ac_connected_cmd = strdup (value);
-#endif
-	}
-	else if (strcmp (key, "ac_disconnected_cmd") == 0) {
-#ifdef ENABLE_BATTERY
-		if (strlen(value) > 0)
-			ac_disconnected_cmd = strdup (value);
 #endif
 	}
 	else if (strcmp (key, "bat1_font") == 0) {
@@ -498,11 +371,6 @@ void add_entry (char *key, char *value)
 			percentage_hide = 101;
 #endif
 	}
-	else if (strcmp (key, "battery_tooltip") == 0) {
-#ifdef ENABLE_BATTERY
-		battery_tooltip_enabled = atoi(value);
-#endif
-	}
 
 	/* Clock */
 	else if (strcmp (key, "time1_format") == 0) {
@@ -569,22 +437,10 @@ void add_entry (char *key, char *value)
 		if (strlen(value) > 0)
 			clock_lclick_command = strdup(value);
 	}
-	else if (strcmp(key, "clock_mclick_command") == 0) {
-		if (strlen(value) > 0)
-			clock_mclick_command = strdup(value);
-	}
 	else if (strcmp(key, "clock_rclick_command") == 0) {
 		if (strlen(value) > 0)
 			clock_rclick_command = strdup(value);
 	}
-	else if (strcmp(key, "clock_uwheel_command") == 0) {
-		if (strlen(value) > 0)
-			clock_uwheel_command = strdup(value);
-	}
-	else if (strcmp(key, "clock_dwheel_command") == 0) {
-		if (strlen(value) > 0)
-			clock_dwheel_command = strdup(value);
-	}
 
 	/* Taskbar */
 	else if (strcmp (key, "taskbar_mode") == 0) {
@@ -633,7 +489,7 @@ void add_entry (char *key, char *value)
 		panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
 	}
 	else if (strcmp (key, "taskbar_name_font") == 0) {
-		panel_config.taskbarname_font_desc = pango_font_description_from_string(value);
+		taskbarname_font_desc = pango_font_description_from_string (value);
 	}
 	else if (strcmp (key, "taskbar_name_font_color") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -662,15 +518,6 @@ void add_entry (char *key, char *value)
 			taskbar_sort_method = TASKBAR_NOSORT;
 		}
 	}
-	else if (strcmp (key, "task_align") == 0) {
-		if (strcmp(value, "center") == 0) {
-			taskbar_alignment = ALIGN_CENTER;
-		} else if (strcmp(value, "right") == 0) {
-			taskbar_alignment = ALIGN_RIGHT;
-		} else {
-			taskbar_alignment = ALIGN_LEFT;
-		}
-	}
 
 	/* Task */
 	else if (strcmp (key, "task_text") == 0)
@@ -766,13 +613,13 @@ void add_entry (char *key, char *value)
 	}
 	else if (strcmp(key, "systray_sort") == 0) {
 		if (strcmp(value, "descending") == 0)
-			systray.sort = SYSTRAY_SORT_DESCENDING;
+			systray.sort = -1;
 		else if (strcmp(value, "ascending") == 0)
-			systray.sort = SYSTRAY_SORT_ASCENDING;
+			systray.sort = 1;
 		else if (strcmp(value, "left2right") == 0)
-			systray.sort = SYSTRAY_SORT_LEFT2RIGHT;
+			systray.sort = 2;
 		else  if (strcmp(value, "right2left") == 0)
-			systray.sort = SYSTRAY_SORT_RIGHT2LEFT;
+			systray.sort = 3;
 	}
 	else if (strcmp(key, "systray_icon_size") == 0) {
 		systray_max_icon_size = atoi(value);
@@ -799,11 +646,6 @@ void add_entry (char *key, char *value)
 		id = (id < backgrounds->len && id >= 0) ? id : 0;
 		panel_config.launcher.area.bg = &g_array_index(backgrounds, Background, id);
 	}
-	else if (strcmp (key, "launcher_icon_background_id") == 0) {
-		int id = atoi (value);
-		id = (id < backgrounds->len && id >= 0) ? id : 0;
-		launcher_icon_bg = &g_array_index(backgrounds, Background, id);
-	}
 	else if (strcmp(key, "launcher_icon_size") == 0) {
 		launcher_max_icon_size = atoi(value);
 	}
@@ -878,21 +720,6 @@ void add_entry (char *key, char *value)
 		get_action (value, &mouse_scroll_up);
 	else if (strcmp (key, "mouse_scroll_down") == 0)
 		get_action (value, &mouse_scroll_down);
-	else if (strcmp (key, "mouse_effects") == 0)
-		panel_config.mouse_effects = atoi(value);
-	else if (strcmp(key, "mouse_hover_icon_asb") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		panel_config.mouse_over_alpha = atoi(value1);
-		panel_config.mouse_over_saturation = atoi(value2);
-		panel_config.mouse_over_brightness = atoi(value3);
-	}
-	else if (strcmp(key, "mouse_pressed_icon_asb") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		panel_config.mouse_pressed_alpha = atoi(value1);
-		panel_config.mouse_pressed_saturation = atoi(value2);
-		panel_config.mouse_pressed_brightness = atoi(value3);
-	}
-
 
 	/* autohide options */
 	else if (strcmp(key, "autohide") == 0)
@@ -1036,18 +863,6 @@ int config_read_file (const char *path)
 			panel_items_order = strdup("T");
 	}
 
-  if (backgrounds->len > 0) {
-    Background *bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
-    if (!read_bg_color_hover)
-      memcpy(&bg->back_hover, &bg->back, sizeof(Color));
-    if (!read_border_color_hover)
-      memcpy(&bg->border_hover, &bg->border, sizeof(Color));
-    if (!read_bg_color_press)
-	  memcpy(&bg->back_pressed, &bg->back_hover, sizeof(Color));
-    if (!read_border_color_press)
-	  memcpy(&bg->border_pressed, &bg->border_hover, sizeof(Color));
-  }
-
 	return 1;
 }
 

src/freespace/freespace.c

@@ -1,93 +0,0 @@
-/**************************************************************************
-*
-* Tint2 : freespace
-*
-* Copyright (C) 2011 Mishael A Sibiryakov (death@junki.org)
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License version 2
-* as published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**************************************************************************/
-
-
-#include <string.h>
-#include <stdio.h>
-#include <cairo.h>
-#include <cairo-xlib.h>
-#include <pango/pangocairo.h>
-#include <stdlib.h>
-
-#include "window.h"
-#include "server.h"
-#include "panel.h"
-#include "freespace.h"
-#include "common.h"
-
-void init_freespace_panel(void *p)
-{
-	Panel *panel = (Panel*)p;
-	FreeSpace *freespace = &panel->freespace;
-
-	if (freespace->area.bg == 0)
-		freespace->area.bg = &g_array_index(backgrounds, Background, 0);
-	freespace->area.parent = p;
-	freespace->area.panel = p;
-	freespace->area.size_mode = SIZE_BY_CONTENT;
-	freespace->area.resize = 1;
-	freespace->area.on_screen = 1;
-	freespace->area._resize = resize_freespace;
-}
-
-int freespace_get_max_size(Panel *p) {
-	// Get space used by every element except the freespace
-	GList *walk;
-	int size = 0;
-	for (walk = p->area.children; walk; walk = g_list_next(walk)) {
-		Area *a = (Area *)walk->data;
-
-		if (a->_resize == resize_freespace || !a->on_screen)
-			continue;
-
-		if (panel_horizontal)
-			size += a->width + (a->bg->border.width * 2) + p->area.paddingx;
-		else
-			size += a->height + (a->bg->border.width * 2) + p->area.paddingy;
-	}
-
-	if (panel_horizontal)
-		size = p->area.width - size - (p->area.bg->border.width * 2) - p->area.paddingxlr;
-	else
-		size = p->area.height - size - (p->area.bg->border.width * 2) - p->area.paddingxlr;
-
-	return size;
-}
-
-int resize_freespace(void *obj) {
-	FreeSpace *freespace = (FreeSpace*)obj;
-	Panel *panel = (Panel*)freespace->area.panel;
-	if (!freespace->area.on_screen)
-		return 0;
-
-	int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
-	int size = freespace_get_max_size(panel);
-	if (old_size == size)
-		return 0;
-
-	if (panel_horizontal) {
-		freespace->area.width = size;
-	} else {
-		freespace->area.height = size;
-	}
-
-	freespace->area.redraw = 1;
-	panel_refresh = 1;
-	return 1;
-}

src/freespace/freespace.h

@@ -1,20 +0,0 @@
-/**************************************************************************
-* Copyright (C) 2011 Mishael A Sibiryakov (death@junki.org)
-**************************************************************************/
-
-#ifndef FREESPACE_H
-#define FREESPACE_H
-
-#include "common.h"
-#include "area.h"
-
-typedef struct FreeSpace {
-	Area area;
-} FreeSpace;
-
-void cleanup_freespace();
-void init_freespace_panel(void *panel);
-
-int resize_freespace(void *obj);
-
-#endif

src/launcher/apps-common.c

@@ -105,7 +105,6 @@ int read_desktop_file(const char *path, DesktopEntry *entry)
 	char *key, *value;
 	int i;
 
-	entry->path = strdup(path);
 	entry->name = entry->icon = entry->exec = NULL;
 
 	if ((fp = fopen(path, "rt")) == NULL) {
@@ -175,8 +174,7 @@ void free_desktop_entry(DesktopEntry *entry)
 	free(entry->name);
 	free(entry->icon);
 	free(entry->exec);
-	free(entry->path);
+	entry->name = entry->icon = entry->exec = NULL;
-	entry->name = entry->icon = entry->exec = entry->path = NULL;
 }
 
 void test_read_desktop_file()

src/launcher/apps-common.h

@@ -11,7 +11,6 @@ typedef struct DesktopEntry {
 	char *name;
 	char *exec;
 	char *icon;
-	char *path;
 } DesktopEntry;
 
 // Parses a line of the form "key = value". Modifies the line.

src/launcher/icon-theme-common.c

@@ -536,9 +536,6 @@ 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,
@@ -563,13 +560,8 @@ 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;
-					if (strlen(base_name) + strlen(theme_name) +
+					char *file_name = calloc(strlen(base_name) + strlen(theme_name) +
-						strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100 > file_name_size) {
+											 strlen(dir_name) + strlen(icon_name) + strlen(extension) + 100, 1);
-						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)
@@ -604,12 +596,11 @@ 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,7 +31,10 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <sys/types.h>
+
+#ifdef HAVE_RSVG
+#include <librsvg/rsvg.h>
+#endif
 
 #include "window.h"
 #include "server.h"
@@ -53,7 +56,6 @@ char *icon_theme_name_xsettings;
 int launcher_icon_theme_override;
 XSettingsClient *xsettings_client;
 int startup_notifications;
-Background *launcher_icon_bg;
 
 Imlib_Image scale_icon(Imlib_Image original, int icon_size);
 void free_icon(Imlib_Image icon);
@@ -71,7 +73,6 @@ void default_launcher()
 	launcher_icon_theme_override = 0;
 	xsettings_client = NULL;
 	startup_notifications = 0;
-	launcher_icon_bg = NULL;
 }
 
 
@@ -99,9 +100,6 @@ void init_launcher_panel(void *p)
 	if (!launcher->area.bg)
 		launcher->area.bg = &g_array_index(backgrounds, Background, 0);
 
-	if (!launcher_icon_bg)
-		launcher_icon_bg = &g_array_index(backgrounds, Background, 0);
-
 	// check consistency
 	if (launcher->list_apps == NULL)
 		return;
@@ -152,9 +150,8 @@ 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->image);
+			free_icon(launcherIcon->icon_scaled);
-			free_icon(launcherIcon->image_hover);
+			free_icon(launcherIcon->icon_original);
-			free_icon(launcherIcon->image_pressed);
 			free(launcherIcon->icon_name);
 			free(launcherIcon->icon_path);
 			free(launcherIcon->cmd);
@@ -189,7 +186,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->image) {
+		if (launcherIcon->icon_size != icon_size || !launcherIcon->icon_original) {
 			launcherIcon->icon_size = icon_size;
 			launcherIcon->area.width = launcherIcon->icon_size;
 			launcherIcon->area.height = launcherIcon->icon_size;
@@ -198,44 +195,70 @@ 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->image);
+				free_icon(launcherIcon->icon_original);
-				free_icon(launcherIcon->image_hover);
+				launcherIcon->icon_original = NULL;
-				free_icon(launcherIcon->image_pressed);
+				free_icon(launcherIcon->icon_scaled);
-				launcherIcon->image = NULL;
+				launcherIcon->icon_scaled = NULL;
 				continue;
 			}
-
+			if (launcherIcon->icon_path && strcmp(new_icon_path, launcherIcon->icon_path) == 0) {
-			// Free the old files
+				// If it's the same file just rescale
-			free_icon(launcherIcon->image);
+				free_icon(launcherIcon->icon_scaled);
-			free_icon(launcherIcon->image_hover);
+				launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, icon_size);
-			free_icon(launcherIcon->image_pressed);
-			// Load the new file
-			launcherIcon->image = load_image(new_icon_path, 1);
-			// On loading error, fallback to default
-			if (!launcherIcon->image) {
 				free(new_icon_path);
-				new_icon_path = get_icon_path(launcher->list_themes, DEFAULT_ICON, launcherIcon->icon_size);
-				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, rescale it
-				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);
-			}
+			} 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
+				launcherIcon->icon_original = imlib_load_image_immediately(new_icon_path);
+#ifdef HAVE_RSVG
+				if (!launcherIcon->icon_original && g_str_has_suffix(new_icon_path, ".svg")) {
+					GError* err = NULL;
+					RsvgHandle* svg = rsvg_handle_new_from_file(new_icon_path, &err);
 
-		if (panel_config.mouse_effects) {
+					if (err != NULL) {
-			launcherIcon->image_hover = adjust_icon(launcherIcon->image, panel_config.mouse_over_alpha, panel_config.mouse_over_saturation, panel_config.mouse_over_brightness);
+						fprintf(stderr, "Could not load svg image!: %s", err->message);
-			launcherIcon->image_pressed = adjust_icon(launcherIcon->image, panel_config.mouse_pressed_alpha, panel_config.mouse_pressed_saturation, panel_config.mouse_pressed_brightness);
+						g_error_free(err);
+						launcherIcon->icon_original = 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
+#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
+					launcherIcon->icon_scaled = scale_icon(launcherIcon->icon_original, launcherIcon->icon_size);
+					free(launcherIcon->icon_path);
+					launcherIcon->icon_path = new_icon_path;
+					fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+				}
+			}
 		}
 	}
 	
@@ -308,7 +331,6 @@ int resize_launcher(void *obj)
 			}
 		}
 	}
-
 	return 1;
 }
 
@@ -323,30 +345,26 @@ void launcher_icon_on_change_layout(void *obj)
 	launcherIcon->area.height = launcherIcon->icon_size;
 }
 
-char* launcher_icon_get_tooltip_text(void *obj)
+const char* launcher_icon_get_tooltip_text(void *obj)
 {
 	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
-	return strdup(launcherIcon->icon_tooltip);
+	return launcherIcon->icon_tooltip;
 }
 
 void draw_launcher_icon(void *obj, cairo_t *c)
 {
 	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
 
-	Imlib_Image image;
+	Imlib_Image icon_scaled = launcherIcon->icon_scaled;
 	// Render
-	if (panel_config.mouse_effects) {
+	imlib_context_set_image(icon_scaled);
-		if (launcherIcon->area.mouse_state == MOUSE_OVER)
+	if (server.real_transparency) {
-			image = launcherIcon->image_hover ? launcherIcon->image_hover : launcherIcon->image;
+		render_image(launcherIcon->area.pix, 0, 0);
-		else if (launcherIcon->area.mouse_state == MOUSE_DOWN)
-			image = launcherIcon->image_pressed ? launcherIcon->image_pressed : launcherIcon->image;
-		else
-			image = launcherIcon->image;
 	} else {
-		 image = launcherIcon->image;
+		imlib_context_set_blend(1);
+		imlib_context_set_drawable(launcherIcon->area.pix);
+		imlib_render_image_on_drawable(0, 0);
 	}
-	imlib_context_set_image(image);
-	render_image(launcherIcon->area.pix, 0, 0);
 }
 
 Imlib_Image scale_icon(Imlib_Image original, int icon_size)
@@ -385,7 +403,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 = 0;
+	SnLauncherContext* ctx;
 	Time time;
 	if (startup_notifications) {
 		ctx = sn_launcher_context_new(server.sn_dsp, server.screen);
@@ -453,9 +471,7 @@ void launcher_load_icons(Launcher *launcher)
 			launcherIcon->area._resize = NULL;
 			launcherIcon->area.resize = 0;
 			launcherIcon->area.redraw = 1;
-			launcherIcon->area.mouse_over_effect = 1;
+			launcherIcon->area.bg = &g_array_index(backgrounds, Background, 0);
-			launcherIcon->area.mouse_press_effect = 1;
-			launcherIcon->area.bg = launcher_icon_bg;
 			launcherIcon->area.on_screen = 1;
 			launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
 			if (launcher_tooltip_enabled) {

src/launcher/launcher.h

@@ -23,9 +23,8 @@ typedef struct Launcher {
 typedef struct LauncherIcon {
 	// always start with area
 	Area area;
-	Imlib_Image image;
+	Imlib_Image icon_scaled;
-	Imlib_Image image_hover;
+	Imlib_Image icon_original;
-	Imlib_Image image_pressed;
 	char *cmd;
 	char *icon_name;
 	char *icon_path;
@@ -46,7 +45,6 @@ extern char *icon_theme_name_config;
 extern int launcher_icon_theme_override;
 extern XSettingsClient *xsettings_client;
 extern int startup_notifications;
-extern Background *launcher_icon_bg;
 
 // default global data
 void default_launcher();

src/panel.c

@@ -97,16 +97,10 @@ void default_panel()
 	backgrounds = g_array_new(0, 0, sizeof(Background));
 
 	memset(&panel_config, 0, sizeof(Panel));
-	panel_config.mouse_over_alpha = 100;
-	panel_config.mouse_over_saturation = 0;
-	panel_config.mouse_over_brightness = 10;
-	panel_config.mouse_pressed_alpha = 100;
-	panel_config.mouse_pressed_saturation = 0;
-	panel_config.mouse_pressed_brightness = 0;
 
 	// append full transparency background
 	Background transparent_bg;
-	init_background(&transparent_bg);
+	memset(&transparent_bg, 0, sizeof(Background));
 	g_array_append_val(backgrounds, transparent_bg);
 }
 
@@ -146,8 +140,6 @@ void cleanup_panel()
 	backgrounds = NULL;
 	pango_font_description_free(panel_config.g_task.font_desc);
 	panel_config.g_task.font_desc = NULL;
-	pango_font_description_free(panel_config.taskbarname_font_desc);
-	panel_config.taskbarname_font_desc = NULL;
 }
 
 void init_panel()
@@ -212,8 +204,6 @@ void init_panel()
 			}
 			if (panel_items_order[k] == 'C')
 				init_clock_panel(p);
-			if (panel_items_order[k] == 'F' && !strstr(panel_items_order, "T"))
-				init_freespace_panel(p);
 		}
 		set_panel_items_order(p);
 
@@ -223,17 +213,14 @@ void init_panel()
 		p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att);
 
 		long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask;
-		if (p->mouse_effects ||
+		if (p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text || (launcher_enabled && launcher_tooltip_enabled))
-			p->g_task.tooltip_enabled ||
-			p->clock.area._get_tooltip_text ||
-			(launcher_enabled && launcher_tooltip_enabled))
 			event_mask |= PointerMotionMask|LeaveWindowMask;
 		if (panel_autohide)
 			event_mask |= LeaveWindowMask|EnterWindowMask;
 		XChangeWindowAttributes(server.dsp, p->main_win, CWEventMask, &(XSetWindowAttributes){.event_mask=event_mask});
 
 		if (!server.gc) {
-			XGCValues gcv;
+			XGCValues  gcv;
 			server.gc = XCreateGC(server.dsp, p->main_win, 0, &gcv);
 		}
 		//printf("panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height);
@@ -335,13 +322,13 @@ void init_panel_size_and_position(Panel *panel)
 
 int resize_panel(void *obj)
 {
-	Panel *panel = (Panel*)obj;
+	resize_by_layout(obj, 0);
-	resize_by_layout(panel, 0);
 	
 	//printf("resize_panel\n");
 	if (panel_mode != MULTI_DESKTOP && taskbar_enabled) {
 		// propagate width/height on hidden taskbar
 		int i, width, height;
+		Panel *panel = (Panel*)obj;
 		width = panel->taskbar[server.desktop].area.width;
 		height = panel->taskbar[server.desktop].area.height;
 		for (i=0 ; i < panel->nb_desktop ; i++) {
@@ -352,6 +339,7 @@ int resize_panel(void *obj)
 	}
 	if (panel_mode == MULTI_DESKTOP && taskbar_enabled && taskbar_distribute_size) {
 		// Distribute the available space between taskbars
+		Panel *panel = (Panel*)obj;
 
 		// Compute the total available size, and the total size requested by the taskbars
 		int total_size = 0;
@@ -367,16 +355,16 @@ int resize_panel(void *obj)
 
 			Taskbar *taskbar = &panel->taskbar[i];
 			GList *l;
-			for (l = taskbar->area.children; l; l = l->next) {
+			for (l = taskbar->area.list; l; l = l->next) {
 				Area *child = l->data;
 				if (!child->on_screen)
 					continue;
 				total_items++;
 			}
 			if (taskbarname_enabled) {
-				if (taskbar->area.children) {
+				if (taskbar->area.list) {
 					total_items--;
-					Area *name = taskbar->area.children->data;
+					Area *name = taskbar->area.list->data;
 					if (panel_horizontal) {
 						total_name_size += name->width;
 					} else {
@@ -401,7 +389,7 @@ int resize_panel(void *obj)
 
 				int requested_size = (2 * taskbar->area.bg->border.width) + (2 * taskbar->area.paddingxlr);
 				int items = 0;
-				GList *l = taskbar->area.children;
+				GList *l = taskbar->area.list;
 				if (taskbarname_enabled)
 					l = l->next;
 				for (; l; l = l->next) {
@@ -430,8 +418,6 @@ int resize_panel(void *obj)
 			}
 		}
 	}
-	if (panel->freespace.area.on_screen)
-		resize_freespace(&panel->freespace);
 	return 0;
 }
 
@@ -450,7 +436,7 @@ void update_strut(Panel* p)
 	int d3;
 	XGetGeometry(server.dsp, server.root_win, &d2, &d3, &d3, &screen_width, &screen_height, &d1, &d1);
 	Monitor monitor = server.monitor[p->monitor];
-	long struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+	long   struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	if (panel_horizontal) {
 		int height = p->area.height + p->marginy;
 		if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden))
@@ -495,32 +481,30 @@ void set_panel_items_order(Panel *p)
 {
 	int k, j;
 	
-	if (p->area.children) {
+	if (p->area.list) {
-		g_list_free(p->area.children);
+		g_list_free(p->area.list);
-		p->area.children = 0;
+		p->area.list = 0;
 	}
 
 	for (k=0 ; k < strlen(panel_items_order) ; k++) {
 		if (panel_items_order[k] == 'L') {
-			p->area.children = g_list_append(p->area.children, &p->launcher);
+			p->area.list = g_list_append(p->area.list, &p->launcher);
 			p->launcher.area.resize = 1;
 		}
 		if (panel_items_order[k] == 'T') {
 			for (j=0 ; j < p->nb_desktop ; j++)
-				p->area.children = g_list_append(p->area.children, &p->taskbar[j]);
+				p->area.list = g_list_append(p->area.list, &p->taskbar[j]);
 		}
 #ifdef ENABLE_BATTERY
 		if (panel_items_order[k] == 'B') 
-			p->area.children = g_list_append(p->area.children, &p->battery);
+			p->area.list = g_list_append(p->area.list, &p->battery);
 #endif
 		int i = p - panel1;
 		if (panel_items_order[k] == 'S' && systray_on_monitor(i, nb_panel)) {
-			p->area.children = g_list_append(p->area.children, &systray);
+			p->area.list = g_list_append(p->area.list, &systray);
 		}
 		if (panel_items_order[k] == 'C')
-			p->area.children = g_list_append(p->area.children, &p->clock);
+			p->area.list = g_list_append(p->area.list, &p->clock);
-		if (panel_items_order[k] == 'F')
-			p->area.children = g_list_append(p->area.children, &p->freespace);
 	}
 	init_rendering(&p->area, 0);
 }
@@ -560,7 +544,7 @@ void set_panel_properties(Panel *p)
 	memset(&wmhints, 0, sizeof(wmhints));
 	if (panel_dock) {
 		// Necessary for placing the panel into the dock on Openbox and Fluxbox.
-		// See https://gitlab.com/o9000/tint2/issues/465
+		// See https://code.google.com/p/tint2/issues/detail?id=465
 		wmhints.icon_window = wmhints.window_group = p->main_win;
 		wmhints.flags = StateHint | IconWindowHint;
 		wmhints.initial_state = WithdrawnState;
@@ -619,7 +603,7 @@ void set_panel_background(Panel *p)
 		get_root_pixmap();
 		// copy background (server.root_pmap) in panel.area.pix
 		Window dummy;
-		int x, y;
+		int  x, y;
 		XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy);
 		if (panel_autohide && p->is_hidden) {
 			x -= xoff;
@@ -647,7 +631,7 @@ void set_panel_background(Panel *p)
 	// redraw panel's object
 	GList *l0;
 	Area *a;
-	for (l0 = p->area.children; l0 ; l0 = l0->next) {
+	for (l0 = p->area.list; l0 ; l0 = l0->next) {
 		a = l0->data;
 		set_redraw(a);
 	}
@@ -665,7 +649,7 @@ void set_panel_background(Panel *p)
 		}
 		tskbar->area.pix = 0;
 		tskbar->bar_name.area.pix = 0;
-		l0 = tskbar->area.children;
+		l0 = tskbar->area.list;
 		if (taskbarname_enabled) l0 = l0->next;
 		for (; l0 ; l0 = l0->next) {
 			set_task_redraw((Task *)l0->data);
@@ -717,7 +701,7 @@ Task *click_task (Panel *panel, int x, int y)
 	if ( (tskbar = click_taskbar(panel, x, y)) ) {
 		if (panel_horizontal) {
 			Task *tsk;
-			l0 = tskbar->area.children;
+			l0 = tskbar->area.list;
 			if (taskbarname_enabled) l0 = l0->next;
 			for (; l0 ; l0 = l0->next) {
 				tsk = l0->data;
@@ -728,7 +712,7 @@ Task *click_task (Panel *panel, int x, int y)
 		}
 		else {
 			Task *tsk;
-			l0 = tskbar->area.children;
+			l0 = tskbar->area.list;
 			if (taskbarname_enabled) l0 = l0->next;
 			for (; l0 ; l0 = l0->next) {
 				tsk = l0->data;
@@ -807,31 +791,15 @@ int click_clock(Panel *panel, int x, int y)
 }
 
 
-#ifdef ENABLE_BATTERY
-int click_battery(Panel *panel, int x, int y)
-{
-	Battery bat = panel->battery;
-	if (panel_horizontal) {
-		if (bat.area.on_screen && x >= bat.area.posx && x <= (bat.area.posx + bat.area.width))
-			return TRUE;
-	} else {
-		if (bat.area.on_screen && y >= bat.area.posy && y <= (bat.area.posy + bat.area.height))
-			return TRUE;
-	}
-	return FALSE;
-}
-#endif
-
-
 Area* click_area(Panel *panel, int x, int y)
 {
 	Area* result = &panel->area;
 	Area* new_result = result;
 	do {
 		result = new_result;
-		GList* it = result->children;
+		GList* it = result->list;
 		while (it) {
-			Area* a = (Area*)it->data;
+			Area* a = it->data;
 			if (a->on_screen && x >= a->posx && x <= (a->posx + a->width)
 					&& y >= a->posy && y <= (a->posy + a->height)) {
 				new_result = a;

src/panel.h

@@ -20,7 +20,6 @@
 #include "taskbar.h"
 #include "systraybar.h"
 #include "launcher.h"
-#include "freespace.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
@@ -91,14 +90,6 @@ typedef struct {
 	// location of the panel (monitor number)
 	int monitor;
 	int font_shadow;
-	int mouse_effects;
-	// Mouse effects for icons
-	int mouse_over_alpha;
-	int mouse_over_saturation;
-	int mouse_over_brightness;
-	int mouse_pressed_alpha;
-	int mouse_pressed_saturation;
-	int mouse_pressed_brightness;
 
 	// --------------------------------------------------
 	// task and taskbar parameter per panel
@@ -112,7 +103,6 @@ typedef struct {
 	// while panel->area.list is used to loop over all panel's objects
 	Taskbar *taskbar;
 	int  nb_desktop;
-	PangoFontDescription *taskbarname_font_desc;
 
 	// --------------------------------------------------
 	// clock
@@ -126,8 +116,6 @@ typedef struct {
 
 	Launcher launcher;
 
-	FreeSpace freespace;
-
 	// autohide
 	int is_hidden;
 	int hidden_width, hidden_height;
@@ -169,11 +157,6 @@ Launcher *click_launcher (Panel *panel, int x, int y);
 LauncherIcon *click_launcher_icon (Panel *panel, int x, int y);
 int click_padding(Panel *panel, int x, int y);
 int click_clock(Panel *panel, int x, int y);
-
-#ifdef ENABLE_BATTERY
-int click_battery(Panel *panel, int x, int y);
-#endif
-
 Area* click_area(Panel *panel, int x, int y);
 
 void autohide_show(void* p);

src/server.c

@@ -96,11 +96,8 @@ void server_init_atoms ()
 	server.atom.MANAGER = XInternAtom(server.dsp, "MANAGER", False);
 	server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
 	server.atom._NET_SYSTEM_TRAY_ORIENTATION = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_ORIENTATION", False);
-	server.atom._NET_SYSTEM_TRAY_ICON_SIZE = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_ICON_SIZE", False);
-	server.atom._NET_SYSTEM_TRAY_PADDING = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_PADDING", False);
 	server.atom._XEMBED = XInternAtom(server.dsp, "_XEMBED", False);
 	server.atom._XEMBED_INFO = XInternAtom(server.dsp, "_XEMBED_INFO", False);
-	server.atom._NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);
 
 	// drag 'n' drop
 	server.atom.XdndAware = XInternAtom(server.dsp, "XdndAware", False);
@@ -286,7 +283,7 @@ void get_monitors()
 		if (res && res->ncrtc >= nbmonitor) {
 			// use xrandr to identify monitors (does not work with proprietery nvidia drivers)
 
-			// Workaround for issue https://gitlab.com/o9000/tint2/issues/353
+			// Workaround for issue https://code.google.com/p/tint2/issues/detail?id=353
 			// on some recent configs, XRRGetScreenResourcesCurrent returns a fantom monitor at last position
 			{
 				int i = res->ncrtc - 1;
@@ -364,20 +361,6 @@ next:
 	}
 }
 
-void print_monitors()
-{
-	fprintf(stderr, "Number of monitors: %d\n", server.nb_monitor);
-	int i;
-	for (i = 0; i < server.nb_monitor; i++) {
-		fprintf(stderr, "Monitor %d: x = %d, y = %d, w = %d, h = %d\n",
-				i+1,
-				server.monitor[i].x,
-				server.monitor[i].y,
-				server.monitor[i].width,
-				server.monitor[i].height);
-	}
-}
-
 int server_get_number_of_desktops()
 {
 	return get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);

src/server.h

@@ -15,8 +15,9 @@
 
 #ifdef HAVE_SN
 #include <libsn/sn.h>
-#endif
 #include <glib.h>
+#endif
+
 
 typedef struct Global_atom
 {
@@ -71,11 +72,8 @@ typedef struct Global_atom
 	Atom MANAGER;
 	Atom _NET_SYSTEM_TRAY_MESSAGE_DATA;
 	Atom _NET_SYSTEM_TRAY_ORIENTATION;
-	Atom _NET_SYSTEM_TRAY_ICON_SIZE;
-	Atom _NET_SYSTEM_TRAY_PADDING;
 	Atom _XEMBED;
 	Atom _XEMBED_INFO;
-	Atom _NET_WM_PID;
 	Atom _XSETTINGS_SCREEN;
 	Atom _XSETTINGS_SETTINGS;
 	Atom XdndAware;
@@ -153,7 +151,6 @@ void get_root_pixmap();
 
 // detect monitors and desktops
 void get_monitors();
-void print_monitors();
 void get_desktops();
 int server_get_number_of_desktops();
 

src/systray/systraybar.h

@@ -20,7 +20,6 @@
 // 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
@@ -35,8 +34,8 @@ typedef struct {
 
 typedef struct
 {
-	Window parent;
+	Window id;
-	Window win;
+	Window tray_id;
 	int x, y;
 	int width, height;
 	// TODO: manage icon's show/hide
@@ -44,18 +43,6 @@ typedef struct
 	int depth;
 	Damage damage;
 	timeout* render_timeout;
-	int empty;
-	int pid;
-	int chrono;
-    struct timespec time_last_render;
-	int num_fast_renders;
-	int reparented;
-	int embedded;
-	int bad_size_counter;
-	timeout* resize_timeout;
-	struct timespec time_last_resize;
-	char *name;
-	Imlib_Image image;
 } TrayWindow;
 
 
@@ -66,7 +53,6 @@ extern int refresh_systray;
 extern int systray_enabled;
 extern int systray_max_icon_size;
 extern int systray_monitor;
-extern int systray_profile;
 
 // default global data
 void default_systray();
@@ -90,17 +76,10 @@ void stop_net();
 void net_message(XClientMessageEvent *e);
 
 gboolean add_icon(Window id);
-gboolean reparent_icon(TrayWindow *traywin);
-gboolean embed_icon(TrayWindow *traywin);
 void remove_icon(TrayWindow *traywin);
 
-void refresh_systray_icons();
+void refresh_systray_icon();
-void systray_render_icon(void *t);
+void systray_render_icon(TrayWindow* traywin);
-gboolean request_embed_icon(TrayWindow *traywin);
-void systray_resize_request_event(TrayWindow *traywin, XEvent *e);
-gboolean request_embed_icon(TrayWindow *traywin);
-void systray_reconfigure_event(TrayWindow *traywin, XEvent *e);
-void systray_destroy_event(TrayWindow *traywin);
 void kde_update_icons();
 
 #endif

src/taskbar/task.c

@@ -38,10 +38,10 @@
 timeout* urgent_timeout;
 GSList* urgent_list;
 
-char* task_get_tooltip(void* obj)
+const char* task_get_tooltip(void* obj)
 {
 	Task* t = obj;
-	return strdup(t->title);
+	return t->title;
 }
 
 
@@ -50,9 +50,6 @@ 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);
@@ -61,9 +58,6 @@ Task *add_task (Window win)
 	else monitor = 0;
 
 	Task new_tsk;
-	memset(&new_tsk, 0, sizeof(new_tsk));
-	new_tsk.area.mouse_over_effect = 1;
-	new_tsk.area.mouse_press_effect = 1;
 	new_tsk.win = win;
 	new_tsk.desktop = window_get_desktop (win);
 	new_tsk.area.panel = &panel1[monitor];
@@ -81,7 +75,8 @@ Task *add_task (Window win)
 	get_title(&new_tsk);
 	get_icon(&new_tsk);
 
-	//printf("new task %s win %u: desktop %d, monitor %d\n", new_tsk.title, win, new_tsk.desktop, monitor);
+	//printf("task %s : desktop %d, monitor %d\n", new_tsk->title, desktop, monitor);
+	XSelectInput (server.dsp, new_tsk.win, PropertyChangeMask|StructureNotifyMask);
 
 	GPtrArray* task_group = g_ptr_array_new();
 	Taskbar *tskbar;
@@ -94,8 +89,6 @@ Task *add_task (Window win)
 		new_tsk2 = calloc(1, sizeof(Task));
 		memcpy(&new_tsk2->area, &panel1[monitor].g_task.area, sizeof(Area));
 		new_tsk2->area.parent = tskbar;
-		new_tsk2->area.mouse_over_effect = 1;
-		new_tsk2->area.mouse_press_effect = 1;
 		new_tsk2->win = new_tsk.win;
 		new_tsk2->desktop = new_tsk.desktop;
 		new_tsk2->win_x = new_tsk.win_x;
@@ -112,13 +105,11 @@ Task *add_task (Window win)
 			new_tsk2->area._get_tooltip_text = task_get_tooltip;
 		for (k=0; k<TASK_STATE_COUNT; ++k) {
 			new_tsk2->icon[k] = new_tsk.icon[k];
-			new_tsk2->icon_hover[k] = new_tsk.icon_hover[k];
-			new_tsk2->icon_press[k] = new_tsk.icon_press[k];
 			new_tsk2->state_pix[k] = 0;
 		}
 		new_tsk2->icon_width = new_tsk.icon_width;
 		new_tsk2->icon_height = new_tsk.icon_height;
-		tskbar->area.children = g_list_append(tskbar->area.children, new_tsk2);
+		tskbar->area.list = g_list_append(tskbar->area.list, new_tsk2);
 		tskbar->area.resize = 1;
 		g_ptr_array_add(task_group, new_tsk2);
 		//printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
@@ -165,29 +156,22 @@ void remove_task (Task *tsk)
 			imlib_context_set_image(tsk->icon[k]);
 			imlib_free_image();
 			tsk->icon[k] = 0;
+			if (tsk->state_pix[k]) XFreePixmap(server.dsp, tsk->state_pix[k]);
 		}
-		if (tsk->icon_hover[k]) {
-			imlib_context_set_image(tsk->icon_hover[k]);
-			imlib_free_image();
-			tsk->icon_hover[k] = 0;
-		}
-		if (tsk->icon_press[k]) {
-			imlib_context_set_image(tsk->icon_press[k]);
-			imlib_free_image();
-			tsk->icon_press[k] = 0;
-		}
-		if (tsk->state_pix[k]) XFreePixmap(server.dsp, tsk->state_pix[k]);
 	}
 
 	int i;
 	Task *tsk2;
+	Taskbar *tskbar;
 	GPtrArray* task_group = g_hash_table_lookup(win_to_task_table, &win);
 	for (i=0; i<task_group->len; ++i) {
 		tsk2 = g_ptr_array_index(task_group, i);
+		tskbar = tsk2->area.parent;
+		tskbar->area.list = g_list_remove(tskbar->area.list, tsk2);
+		tskbar->area.resize = 1;
 		if (tsk2 == task_active) task_active = 0;
 		if (tsk2 == task_drag) task_drag = 0;
 		if (g_slist_find(urgent_list, tsk2)) del_urgent(tsk2);
-		remove_area(tsk2);
 		free(tsk2);
 	}
 	g_hash_table_remove(win_to_task_table, &win);
@@ -272,7 +256,7 @@ void get_icon (Task *tsk)
 		DATA32 icon_data[w * h];
 		int length = w * h;
 		for (i = 0; i < length; ++i)
-			icon_data[i] = tmp_data[i];
+			icon_data[i] =  tmp_data[i];
 		img = imlib_create_image_using_copied_data (w, h, icon_data);
 #else
 		img = imlib_create_image_using_data (w, h, (DATA32*)tmp_data);
@@ -285,7 +269,7 @@ void get_icon (Task *tsk)
 			if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) {
 				// get width, height and depth for the pixmap
 				Window root;
-				int icon_x, icon_y;
+				int  icon_x, icon_y;
 				uint border_width, bpp;
 				uint w, h;
 
@@ -323,10 +307,6 @@ void get_icon (Task *tsk)
 			adjust_asb(data32, tsk->icon_width, tsk->icon_height, panel->g_task.alpha[k], (float)panel->g_task.saturation[k]/100, (float)panel->g_task.brightness[k]/100);
 			imlib_image_put_back_data(data32);
 		}
-		if (panel_config.mouse_effects) {
-			tsk->icon_hover[k] = adjust_icon(tsk->icon[k], panel_config.mouse_over_alpha, panel_config.mouse_over_saturation, panel_config.mouse_over_brightness);
-			tsk->icon_press[k] = adjust_icon(tsk->icon[k], panel_config.mouse_pressed_alpha, panel_config.mouse_pressed_saturation, panel_config.mouse_pressed_brightness);
-		}
 	}
 	imlib_context_set_image(orig_image);
 	imlib_free_image();
@@ -343,11 +323,8 @@ void get_icon (Task *tsk)
 			tsk2->icon_width = tsk->icon_width;
 			tsk2->icon_height = tsk->icon_height;
 			int k;
-			for (k=0; k<TASK_STATE_COUNT; ++k) {
+			for (k=0; k<TASK_STATE_COUNT; ++k)
 				tsk2->icon[k] = tsk->icon[k];
-				tsk2->icon_hover[k] = tsk->icon_hover[k];
-				tsk2->icon_press[k] = tsk->icon_press[k];
-			}
 			set_task_redraw(tsk2);
 		}
 	}
@@ -370,30 +347,21 @@ void draw_task_icon (Task *tsk, int text_width)
 	else pos_x = panel->g_task.area.paddingxlr + tsk->area.bg->border.width;
 
 	// Render
-
+	imlib_context_set_image (tsk->icon[tsk->current_state]);
-	Imlib_Image image;
+	if (server.real_transparency) {
-	// Render
+		render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy);
-	if (panel_config.mouse_effects) {
-		if (tsk->area.mouse_state == MOUSE_OVER)
-			image = tsk->icon_hover[tsk->current_state];
-		else if (tsk->area.mouse_state == MOUSE_DOWN)
-			image = tsk->icon_press[tsk->current_state];
-		else
-			image = tsk->icon[tsk->current_state];
 	} else {
-		 image = tsk->icon[tsk->current_state];
+		imlib_context_set_blend(1);
+		imlib_context_set_drawable(tsk->area.pix);
+		imlib_render_image_on_drawable(pos_x, panel->g_task.icon_posy);
 	}
-
-	imlib_context_set_image(image);
-	render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy);
 }
 
 
 void draw_task (void *obj, cairo_t *c)
 {
 	Task *tsk = obj;
-	if (!panel_config.mouse_effects)
+	tsk->state_pix[tsk->current_state] = tsk->area.pix;
-		tsk->state_pix[tsk->current_state] = tsk->area.pix;
 	PangoLayout *layout;
 	Color *config_text;
 	int width=0, height;
@@ -456,7 +424,7 @@ Task *find_active_task(Task *current_task, Task *active_task)
 
 	Taskbar* tskbar = current_task->area.parent;
 
-	GList *l0 = tskbar->area.children;
+	GList *l0 = tskbar->area.list;
 	if (taskbarname_enabled)
 		l0 = l0->next;
 	for (; l0 ; l0 = l0->next) {
@@ -475,7 +443,7 @@ Task *next_task(Task *tsk)
 
 	Taskbar* tskbar = tsk->area.parent;
 
-	GList *l0 = tskbar->area.children;
+	GList *l0 = tskbar->area.list;
 	if (taskbarname_enabled) l0 = l0->next;
 	GList *lfirst_tsk = l0;
 	for (; l0 ; l0 = l0->next) {
@@ -499,7 +467,7 @@ Task *prev_task(Task *tsk)
 	Taskbar* tskbar = tsk->area.parent;
 
 	tsk2 = 0;
-	GList *l0 = tskbar->area.children;
+	GList *l0 = tskbar->area.list;
 	if (taskbarname_enabled) l0 = l0->next;
 	GList *lfirst_tsk = l0;
 	for (; l0 ; l0 = l0->next) {
@@ -552,23 +520,14 @@ void set_task_state(Task *tsk, int state)
 				Task* tsk1 = g_ptr_array_index(task_group, i);
 				tsk1->current_state = state;
 				tsk1->area.bg = panel1[0].g_task.background[state];
-				if (!panel_config.mouse_effects) {
+				tsk1->area.pix = tsk1->state_pix[state];
-					tsk1->area.pix = tsk1->state_pix[state];
+				if (tsk1->state_pix[state] == 0)
-					if (!tsk1->area.pix)
-						tsk1->area.redraw = 1;
-				} else {
 					tsk1->area.redraw = 1;
-				}
 				if (state == TASK_ACTIVE && g_slist_find(urgent_list, tsk1))
 					del_urgent(tsk1);
+				// Show only the active task
 				int hide = 0;
-				Taskbar *taskbar = (Taskbar *)tsk1->area.parent;
-				if (tsk->desktop == ALLDESKTOP && server.desktop != taskbar->desktop) {
-					// Hide ALLDESKTOP task on non-current desktop
-					hide = 1;
-				}
 				if (hide_inactive_tasks) {
-					// Show only the active task
 					if (state != TASK_ACTIVE) {
 						hide = 1;
 					}

src/taskbar/task.h

@@ -57,8 +57,6 @@ typedef struct {
 	int  desktop;
 	int current_state;
 	Imlib_Image icon[TASK_STATE_COUNT];
-	Imlib_Image icon_hover[TASK_STATE_COUNT];
-	Imlib_Image icon_press[TASK_STATE_COUNT];
 	Pixmap state_pix[TASK_STATE_COUNT];
 	unsigned int icon_width;
 	unsigned int icon_height;

src/taskbar/taskbar.c

@@ -47,7 +47,6 @@ int taskbar_distribute_size;
 int hide_inactive_tasks;
 int hide_task_diff_monitor;
 int taskbar_sort_method;
-int taskbar_alignment;
 
 guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
 gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
@@ -64,7 +63,6 @@ void default_taskbar()
 	hide_inactive_tasks = 0;
 	hide_task_diff_monitor = 0;
 	taskbar_sort_method = TASKBAR_NOSORT;
-	taskbar_alignment = ALIGN_LEFT;
 	default_taskbarname();
 }
 
@@ -99,7 +97,7 @@ void cleanup_taskbar()
 			}
 			free_area(&tskbar->area);
 			// remove taskbar from the panel
-			remove_area(tskbar);
+			panel->area.list = g_list_remove(panel->area.list, tskbar);
 		}
 		if (panel->taskbar) {
 			free(panel->taskbar);
@@ -155,7 +153,7 @@ void init_taskbar_panel(void *p)
 	panel->g_taskbar.area.parent = panel;
 	panel->g_taskbar.area.panel = panel;
 	panel->g_taskbar.area.size_mode = SIZE_BY_LAYOUT;
-	panel->g_taskbar.area.alignment = taskbar_alignment;
+	panel->g_taskbar.area.alignment = ALIGN_CENTER;
 	panel->g_taskbar.area._resize = resize_taskbar;
 	panel->g_taskbar.area._draw_foreground = draw_taskbar;
 	panel->g_taskbar.area._on_change_layout = on_change_taskbar;
@@ -232,8 +230,8 @@ void init_taskbar_panel(void *p)
 	}
 
 	// compute vertical position : text and icon
-	int height_ink, height, width;
+	int height_ink, height;
-	get_text_size2(panel->g_task.font_desc, &height_ink, &height, &width, panel->area.height, panel->area.width, "TAjpg", 5, PANGO_WRAP_WORD_CHAR, PANGO_ELLIPSIZE_END);
+	get_text_size(panel->g_task.font_desc, &height_ink, &height, panel->area.height, "TAjpg", 5);
 
 	if (!panel->g_task.maximum_width && panel_horizontal)
 		panel->g_task.maximum_width = server.monitor[panel->monitor].width;
@@ -337,7 +335,7 @@ int resize_taskbar(void *obj)
 		resize_by_layout(obj, panel->g_task.maximum_width);
 		
 		text_width = panel->g_task.maximum_width;
-		GList *l = taskbar->area.children;
+		GList *l = taskbar->area.list;
 		if (taskbarname_enabled) l = l->next;
 		for (; l != NULL; l = l->next) {
 			if (((Task *)l->data)->area.on_screen) {
@@ -377,9 +375,7 @@ void set_taskbar_state(Taskbar *tskbar, int state)
 	tskbar->area.pix = tskbar->state_pix[state];
 	if (taskbarname_enabled) {
 		tskbar->bar_name.area.bg = panel1[0].g_taskbar.background_name[state];
-		if (!panel_config.mouse_effects) {
+		tskbar->bar_name.area.pix = tskbar->bar_name.state_pix[state];
-			tskbar->bar_name.area.pix = tskbar->bar_name.state_pix[state];
-		}
 	}
 	if (panel_mode != MULTI_DESKTOP) { 
 		if (state == TASKBAR_NORMAL)
@@ -390,16 +386,10 @@ void set_taskbar_state(Taskbar *tskbar, int state)
 	if (tskbar->area.on_screen == 1) {
 		if (tskbar->state_pix[state] == 0)
 			tskbar->area.redraw = 1;
-		if (taskbarname_enabled) {
+		if (taskbarname_enabled && tskbar->bar_name.state_pix[state] == 0)
-			if (!panel_config.mouse_effects) {
+			tskbar->bar_name.area.redraw = 1;
-				if (tskbar->bar_name.state_pix[state] == 0)
-					tskbar->bar_name.area.redraw = 1;
-			} else {
-				tskbar->bar_name.area.redraw = 1;
-			}
-		}
 		if (panel_mode == MULTI_DESKTOP && panel1[0].g_taskbar.background[TASKBAR_NORMAL] != panel1[0].g_taskbar.background[TASKBAR_ACTIVE]) {
-			GList *l = tskbar->area.children;
+			GList *l = tskbar->area.list;
 			if (taskbarname_enabled) l = l->next;
 			for ( ; l ; l = l->next)
 				set_task_redraw(l->data);
@@ -434,9 +424,9 @@ gint compare_tasks_trivial(Task *a, Task *b, Taskbar *taskbar)
 	if (a == b)
 		return 0;
 	if (taskbarname_enabled) {
-		if (a == taskbar->area.children->data)
+		if (a == taskbar->area.list->data)
 			return -1;
-		if (b == taskbar->area.children->data)
+		if (b == taskbar->area.list->data)
 			return 1;
 	}
 	return NONTRIVIAL;
@@ -523,7 +513,7 @@ int taskbar_needs_sort(Taskbar *taskbar)
 		return 0;
 
 	GList *i, *j;
-	for (i = taskbar->area.children, j = i ? i->next : NULL; i && j; i = i->next, j = j->next) {
+	for (i = taskbar->area.list, j = i ? i->next : NULL; i && j; i = i->next, j = j->next) {
 		if (compare_tasks(i->data, j->data, taskbar) > 0) {
 			return 1;
 		}
@@ -539,7 +529,7 @@ void sort_tasks(Taskbar *taskbar)
 	if (!taskbar_needs_sort(taskbar)) {
 		return;
 	}
-	taskbar->area.children = g_list_sort_with_data(taskbar->area.children, (GCompareDataFunc)compare_tasks, taskbar);
+	taskbar->area.list = g_list_sort_with_data(taskbar->area.list, (GCompareDataFunc)compare_tasks, taskbar);
 	taskbar->area.resize = 1;
 	panel_refresh = 1;
 	((Panel*)taskbar->area.panel)->area.resize = 1;

src/taskbar/taskbar.h

@@ -21,7 +21,6 @@ extern int hide_inactive_tasks;
 extern int hide_task_diff_monitor;
 enum { TASKBAR_NOSORT, TASKBAR_SORT_CENTER, TASKBAR_SORT_TITLE };
 extern int taskbar_sort_method;
-extern int taskbar_alignment;
 
 typedef struct {
 	// always start with area

src/taskbar/taskbarname.c

@@ -54,16 +54,14 @@ void init_taskbarname_panel(void *p)
 	if (!taskbarname_enabled)
 		return;
 
-	if (!panel_config.taskbarname_font_desc)
+	if (!taskbarname_font_desc)
-		panel_config.taskbarname_font_desc = pango_font_description_from_string(DEFAULT_FONT);
+		taskbarname_font_desc = pango_font_description_from_string(DEFAULT_FONT);
 
 	GSList *l, *list = server_get_name_of_desktop();
 	for (j=0, l=list ; j < panel->nb_desktop ; j++) {
 		tskbar = &panel->taskbar[j];
 		memcpy(&tskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
 		tskbar->bar_name.area.parent = tskbar;
-		tskbar->bar_name.area.mouse_over_effect = 1;
-		tskbar->bar_name.area.mouse_press_effect = 1;
 		if (j == server.desktop)
 			tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
 		else
@@ -78,7 +76,7 @@ void init_taskbarname_panel(void *p)
 			tskbar->bar_name.name = g_strdup_printf("%d", j+1);
 		
 		// append the name at the beginning of taskbar
-		tskbar->area.children = g_list_append(tskbar->area.children, &tskbar->bar_name);
+		tskbar->area.list = g_list_append(tskbar->area.list, &tskbar->bar_name);
 	}
 
 	for (l=list ; l ; l = l->next)
@@ -105,9 +103,12 @@ void cleanup_taskbarname()
 					XFreePixmap(server.dsp, tskbar->bar_name.state_pix[k]);
 				tskbar->bar_name.state_pix[k] = 0;
 			}
-			remove_area(&tskbar->bar_name);
+			tskbar->area.list = g_list_remove(tskbar->area.list, &tskbar->bar_name);
 		}
 	}
+
+	pango_font_description_free(taskbarname_font_desc);
+	taskbarname_font_desc = NULL;
 }
 
 
@@ -119,16 +120,13 @@ void draw_taskbarname (void *obj, cairo_t *c)
 	Color *config_text = (taskbar->desktop == server.desktop) ? &taskbarname_active_font : &taskbarname_font;
 
 	int state = (taskbar->desktop == server.desktop) ? TASKBAR_ACTIVE : TASKBAR_NORMAL;
-	if (!panel_config.mouse_effects)
+	taskbar_name->state_pix[state] = taskbar_name->area.pix;
-		taskbar_name->state_pix[state] = taskbar_name->area.pix;
 	
 	// draw content
 	layout = pango_cairo_create_layout (c);
-	pango_layout_set_font_description (layout, panel_config.taskbarname_font_desc);
+	pango_layout_set_font_description (layout, taskbarname_font_desc);
 	pango_layout_set_width (layout, taskbar_name->area.width * PANGO_SCALE);
 	pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
 	pango_layout_set_text (layout, taskbar_name->name, strlen(taskbar_name->name));
 
 	cairo_set_source_rgba (c, config_text->color[0], config_text->color[1], config_text->color[2], config_text->alpha);
@@ -149,9 +147,7 @@ int resize_taskbarname(void *obj)
 	int ret = 0;
 
 	taskbar_name->area.redraw = 1;
-	get_text_size2(panel_config.taskbarname_font_desc, &name_height_ink, &name_height, &name_width, panel->area.height, panel->area.width, taskbar_name->name, strlen(taskbar_name->name),
+	get_text_size2(taskbarname_font_desc, &name_height_ink, &name_height, &name_width, panel->area.height, panel->area.width, taskbar_name->name, strlen(taskbar_name->name));
-				   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE);
 
 	if (panel_horizontal) {
 		int new_size = name_width + (2* (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));

src/taskbar/taskbarname.h

@@ -9,6 +9,7 @@
 #include "area.h"
 
 extern int taskbarname_enabled;
+extern PangoFontDescription *taskbarname_font_desc;
 extern Color taskbarname_font;
 extern Color taskbarname_active_font;
 

src/tint2conf/CMakeLists.txt

@@ -20,7 +20,6 @@ include_directories( ../util
                      ${RSVG_INCLUDE_DIRS} )
 
 set(SOURCES ../util/common.c
-			../util/strnatcmp.c
 			../config.c
             ../server.c
             ../launcher/apps-common.c
@@ -57,17 +56,13 @@ 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( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
 install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )

src/tint2conf/main.c

@@ -18,7 +18,6 @@
 **************************************************************************/
 
 #include <time.h>
-#include <unistd.h>
 
 #ifdef HAVE_VERSION_H
 #include "version.h"
@@ -66,7 +65,6 @@ static void menuImportDefault();
 static void menuSaveAs();
 static void menuDelete();
 static void edit_current_theme();
-static void set_current_theme();
 static void refresh_current_theme();
 static void menuAbout();
 static gboolean view_onPopupMenu(GtkWidget *treeview, gpointer userdata);
@@ -112,7 +110,6 @@ static const char *global_ui =
 	"  </menubar>"
 	"  <toolbar  name='ToolBar'>"
 	"    <toolitem action='ThemeProperties'/>"
-	"    <toolitem action='ThemeSelect'/>"
 	"  </toolbar>"
 	"  <popup  name='ThemePopup'>"
 	"    <menuitem action='ThemeProperties'/>"
@@ -122,21 +119,31 @@ 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)
 {
-	setlocale(LC_ALL, "");
-	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
-	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-	textdomain(GETTEXT_PACKAGE);
-
 	GtkWidget *vBox = NULL, *scrollbar = NULL;
 	GtkActionGroup *actionGroup;
 
 	gtk_init(&argc, &argv);
-
+	g_thread_init((NULL));
-#if !GLIB_CHECK_VERSION(2, 31, 0)
-	g_thread_init(NULL);
-#endif
 
 	{
 		gchar *tint2_config_dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL);
@@ -160,24 +167,6 @@ 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)},
-		{"ThemeSelect", GTK_STOCK_APPLY, _("_Make default"), NULL, _("Replace the default theme with the selected one"), G_CALLBACK(set_current_theme)},
-		{"ThemeQuit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", _("Quit"), G_CALLBACK(gtk_main_quit)},
-		{"EditMenu", NULL, _("Edit"), NULL, NULL, NULL},
-		{"EditRefresh", GTK_STOCK_REFRESH, _("Refresh"), NULL, _("Refresh"), G_CALLBACK(refresh_current_theme)},
-		{"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);
@@ -490,33 +479,6 @@ static void edit_current_theme()
 	}
 }
 
-static void set_current_theme()
-{
-	GtkTreeSelection *sel;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
-	gchar *file;
-
-	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view));
-	if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) {
-		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &file,  -1);
-		// config_read_file(file);
-
-		gchar *main_file = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
-		{
-			gchar *backup_path = g_strdup_printf("%s.backup.%ld", main_file, time(NULL));
-			copy_file(main_file, backup_path);
-			g_free(backup_path);
-		}
-		copy_file(file, main_file);
-		int unused = system("killall -SIGUSR1 tint2 || pkill -SIGUSR1 -x tint2");
-		(void)unused;
-		g_free(file);
-		select_first_theme();
-		refresh_current_theme();
-	}
-}
-
 static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data)
 {
 	edit_current_theme();
@@ -524,56 +486,8 @@ static void viewRowActivated(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeV
 
 // ====== Theme load/reload ======
 
-static void copy_default_themes()
-{
-	gchar *path_home = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL);
-	if (!g_file_test(path_home, G_FILE_TEST_EXISTS)) {
-		const gchar * const * system_dirs = g_get_system_config_dirs();
-		int i;
-		for (i = 0; system_dirs[i]; i++) {
-			gchar *path = g_build_filename(system_dirs[i], "tint2", "tint2rc", NULL);
-			if (g_file_test(path, G_FILE_TEST_EXISTS)) {
-				copy_file(path, path_home);
-			}
-			g_free(path);
-		}
-	}
-	g_free(path_home);
-
-	const gchar * const * data_dirs = g_get_system_data_dirs();
-	int i;
-	for (i = 0; data_dirs[i]; i++) {
-		gchar *path_tint2 = g_build_filename(data_dirs[i], "tint2", NULL);
-		fprintf(stderr, "%s\n", path_tint2);
-		GDir *dir = g_dir_open(path_tint2, 0, NULL);
-		if (dir) {
-			const gchar *file_name;
-			while ((file_name = g_dir_read_name(dir))) {
-				if (!g_file_test(file_name, G_FILE_TEST_IS_DIR) &&
-					!strstr(file_name, "backup") &&
-					!strstr(file_name, "copy") &&
-					!strstr(file_name, "~") &&
-					(endswith(file_name, "tint2rc") ||
-					 endswith(file_name, ".conf"))) {
-					gchar *path_home = g_build_filename(g_get_user_config_dir(), "tint2", file_name, NULL);
-					if (!g_file_test(path_home, G_FILE_TEST_EXISTS)) {
-						gchar *path_usr = g_build_filename(path_tint2, file_name, NULL);
-						copy_file(path_usr, path_home);
-						g_free(path_usr);
-					}
-					g_free(path_home);
-				}
-			}
-			g_dir_close(dir);
-		}
-		g_free(path_tint2);
-	}
-}
-
 static void load_all_themes()
 {
-	copy_default_themes();
-
 	gtk_list_store_clear(GTK_LIST_STORE(g_store));
 
 	gchar *tint2_config_dir = g_build_filename(g_get_user_config_dir(), "tint2", NULL);
@@ -583,7 +497,6 @@ static void load_all_themes()
 		return;
 	}
 	gboolean found_theme = FALSE;
-
 	const gchar *file_name;
 	while ((file_name = g_dir_read_name(dir))) {
 		if (!g_file_test(file_name, G_FILE_TEST_IS_DIR) &&
@@ -599,7 +512,12 @@ static void load_all_themes()
 		}
 	}
 
-	if (found_theme) {
+	if (!found_theme) {
+		gchar *path_tint2rc = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL);
+		copy_file(get_default_config_path(), path_tint2rc);
+		g_free(path_tint2rc);
+		load_all_themes();
+	} else {
 		select_first_theme();
 
 		GtkTreeIter iter;

src/tint2conf/main.h

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

src/tint2conf/po/CMakeLists.txt

@@ -1,20 +0,0 @@
-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/po/readme.txt

@@ -1,11 +0,0 @@
-Updating pot file:
-
-find .. -name '*.c' | sort -r | xargs xgettext --keyword=_ --language=C --output=updated.pot -
-
-Followed by manual editing of updated.pot to make sure the header is OK. Then:
-
-cat updated.pot > tint2conf.pot && rm -f updated.pot
-
-Then update the po files:
-
-for f in *.po ; do lang=$(basename $f .po); echo $lang ; msgmerge -i -o $lang.pox $lang.po tint2conf.pot ; cat ${lang}.pox > ${lang}.po ; rm ${lang}.pox ; done

src/tint2conf/properties.h

@@ -14,9 +14,6 @@ extern GtkWidget *panel_width, *panel_height, *panel_margin_x, *panel_margin_y,
 extern GtkWidget *panel_wm_menu, *panel_dock, *panel_autohide, *panel_autohide_show_time, *panel_autohide_hide_time, *panel_autohide_size;
 extern GtkWidget *panel_combo_strut_policy, *panel_combo_layer, *panel_combo_width_type, *panel_combo_height_type, *panel_combo_monitor;
 extern GtkWidget *panel_window_name, *disable_transparency;
-extern GtkWidget *panel_mouse_effects;
-extern GtkWidget *mouse_hover_icon_opacity, *mouse_hover_icon_saturation, *mouse_hover_icon_brightness;
-extern GtkWidget *mouse_pressed_icon_opacity, *mouse_pressed_icon_saturation, *mouse_pressed_icon_brightness;
 
 enum {
 	itemsColName = 0,
@@ -54,7 +51,7 @@ extern GtkWidget *taskbar_hide_inactive_tasks, *taskbar_hide_diff_monitor;
 extern GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color, *taskbar_name_active_color, *taskbar_name_font;
 extern GtkWidget *taskbar_active_background, *taskbar_inactive_background;
 extern GtkWidget *taskbar_name_active_background, *taskbar_name_inactive_background;
-extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment;
+extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order;
 
 // task
 extern GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down;
@@ -90,7 +87,6 @@ extern GtkWidget *task_iconified_color, *task_iconified_color_set,
 // clock
 extern GtkWidget *clock_format_line1, *clock_format_line2, *clock_tmz_line1, *clock_tmz_line2;
 extern GtkWidget *clock_left_command, *clock_right_command;
-extern GtkWidget *clock_mclick_command, *clock_rclick_command, *clock_uwheel_command, *clock_dwheel_command;
 extern GtkWidget *clock_padding_x, *clock_padding_y, *clock_font_line1, *clock_font_line2, *clock_font_color;
 extern GtkWidget *clock_background;
 
@@ -98,9 +94,6 @@ extern GtkWidget *clock_background;
 extern GtkWidget *battery_hide_if_higher, *battery_alert_if_lower, *battery_alert_cmd;
 extern GtkWidget *battery_padding_x, *battery_padding_y, *battery_font_line1, *battery_font_line2, *battery_font_color;
 extern GtkWidget *battery_background;
-extern GtkWidget *battery_tooltip;
-extern GtkWidget *battery_left_command, *battery_mclick_command, *battery_right_command, *battery_uwheel_command, *battery_dwheel_command;
-extern GtkWidget *ac_connected_cmd, *ac_disconnected_cmd;
 
 // systray
 extern GtkWidget *systray_icon_order, *systray_padding_x, *systray_padding_y, *systray_spacing;
@@ -130,7 +123,7 @@ extern GtkWidget *launcher_apps_dirs;
 extern GtkWidget *launcher_icon_size, *launcher_icon_theme, *launcher_padding_x, *launcher_padding_y, *launcher_spacing;
 extern GtkWidget *launcher_icon_opacity, *launcher_icon_saturation, *launcher_icon_brightness;
 extern GtkWidget *margin_x, *margin_y;
-extern GtkWidget *launcher_background, *launcher_icon_background;
+extern GtkWidget *launcher_background;
 extern GtkWidget *startup_notifications;
 extern IconThemeWrapper *icon_theme;
 extern GtkWidget *launcher_tooltip;
@@ -149,15 +142,6 @@ enum {
 	bgColBorderOpacity,
 	bgColBorderWidth,
 	bgColCornerRadius,
-	bgColText,
-	bgColFillColorOver,
-	bgColFillOpacityOver,
-	bgColBorderColorOver,
-	bgColBorderOpacityOver,
-	bgColFillColorPress,
-	bgColFillOpacityPress,
-	bgColBorderColorPress,
-	bgColBorderOpacityPress,
 	bgNumCols
 };
 
@@ -165,10 +149,6 @@ extern GtkListStore *backgrounds;
 extern GtkWidget *current_background,
 		  *background_fill_color,
 		  *background_border_color,
-		  *background_fill_color_over,
-		  *background_border_color_over,
-		  *background_fill_color_press,
-		  *background_border_color_press,
 		  *background_border_width,
 		  *background_corner_radius;
 

src/tint2conf/properties_rw.c

@@ -7,7 +7,7 @@
 #include "properties.h"
 #include "properties_rw.h"
 
-void finalize_bg();
+
 void add_entry(char *key, char *value);
 void hex2gdk(char *hex, GdkColor *color);
 void set_action(char *event, GtkWidget *combo);
@@ -22,15 +22,8 @@ int no_items_clock_enabled;
 int no_items_systray_enabled;
 int no_items_battery_enabled;
 
-static int num_bg;
-static int read_bg_color_hover;
-static int read_border_color_hover;
-static int read_bg_color_press;
-static int read_border_color_press;
-
 void config_read_file(const char *path)
 {
-	num_bg = 0;
 	background_create_new();
 
 	FILE *fp;
@@ -58,8 +51,6 @@ void config_read_file(const char *path)
 	}
 	fclose(fp);
 
-	finalize_bg();
-
 	if (!config_has_panel_items) {
 		char panel_items[256];
 		panel_items[0] = 0;
@@ -84,7 +75,7 @@ void config_read_file(const char *path)
 	}
 }
 
-void config_write_color(FILE *fp, const char *name, GdkColor color, int opacity)
+void config_write_color(FILE *fp, char *name, GdkColor color, int opacity)
 {
 	fprintf(fp,
 			"%s = #%02x%02x%02x %d\n",
@@ -119,42 +110,20 @@ void config_write_backgrounds(FILE *fp)
 		int fillOpacity;
 		GdkColor *borderColor;
 		int borderOpacity;
-		GdkColor *fillColorOver;
-		int fillOpacityOver;
-		GdkColor *borderColorOver;
-		int borderOpacityOver;
-		GdkColor *fillColorPress;
-		int fillOpacityPress;
-		GdkColor *borderColorPress;
-		int borderOpacityPress;
-		gchar *text;
 
 		gtk_tree_model_get(GTK_TREE_MODEL(backgrounds), &iter,
 						   bgColFillColor, &fillColor,
 						   bgColFillOpacity, &fillOpacity,
 						   bgColBorderColor, &borderColor,
 						   bgColBorderOpacity, &borderOpacity,
-						   bgColFillColorOver, &fillColorOver,
-						   bgColFillOpacityOver, &fillOpacityOver,
-						   bgColBorderColorOver, &borderColorOver,
-						   bgColBorderOpacityOver, &borderOpacityOver,
-						   bgColFillColorPress, &fillColorPress,
-						   bgColFillOpacityPress, &fillOpacityPress,
-						   bgColBorderColorPress, &borderColorPress,
-						   bgColBorderOpacityPress, &borderOpacityPress,
 						   bgColBorderWidth, &b,
 						   bgColCornerRadius, &r,
-						   bgColText, &text,
 						   -1);
-		fprintf(fp, "# Background %d: %s\n", index, text ? text : "");
+		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);
 		config_write_color(fp, "border_color", *borderColor, borderOpacity);
-		config_write_color(fp, "background_color_hover", *fillColorOver, fillOpacityOver);
-		config_write_color(fp, "border_color_hover", *borderColorOver, borderOpacityOver);
-		config_write_color(fp, "background_color_pressed", *fillColorPress, fillOpacityPress);
-		config_write_color(fp, "border_color_pressed", *borderColorPress, borderOpacityPress);
 		fprintf(fp, "\n");
 	}
 }
@@ -245,19 +214,7 @@ void config_write_panel(FILE *fp)
 
 	fprintf(fp, "panel_window_name = %s\n", gtk_entry_get_text(GTK_ENTRY(panel_window_name)));
 	fprintf(fp, "disable_transparency = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(disable_transparency)) ? 1 : 0);
-	fprintf(fp, "mouse_effects = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel_mouse_effects)) ? 1 : 0);
 	fprintf(fp, "font_shadow = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(font_shadow)) ? 1 : 0);
-	fprintf(fp,
-			"mouse_hover_icon_asb = %d %d %d\n",
-			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_hover_icon_opacity)),
-			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_hover_icon_saturation)),
-			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_hover_icon_brightness)));
-	fprintf(fp,
-			"mouse_pressed_icon_asb = %d %d %d\n",
-			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_pressed_icon_opacity)),
-			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_pressed_icon_saturation)),
-			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_pressed_icon_brightness)));
-
 
 	fprintf(fp, "\n");
 }
@@ -315,16 +272,6 @@ void config_write_taskbar(FILE *fp)
 	}
 	fprintf(fp, "\n");
 
-	fprintf(fp, "task_align = ");
-	if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_alignment)) <= 0) {
-		fprintf(fp, "left");
-	} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_alignment)) == 1) {
-		fprintf(fp, "center");
-	} else {
-		fprintf(fp, "right");
-	}
-	fprintf(fp, "\n");
-
 	fprintf(fp, "\n");
 }
 
@@ -509,7 +456,6 @@ void config_write_launcher(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_padding_y)),
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_spacing)));
 	fprintf(fp, "launcher_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(launcher_background)));
-	fprintf(fp, "launcher_icon_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(launcher_icon_background)));
 	fprintf(fp, "launcher_icon_size = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(launcher_icon_size)));
 	fprintf(fp,
 			"launcher_icon_asb = %d %d %d\n",
@@ -555,7 +501,7 @@ void config_write_launcher(FILE *fp)
 		g_strstrip(dir);
 		if (strlen(dir) > 0) {
 			char *contracted = contract_tilde(dir);
-			fprintf(fp, "launcher_apps_dir = %s\n", contracted);
+			fprintf(fp, "launcher_item_app = %s\n", contracted);
 			free(contracted);
 		}
 	}
@@ -592,9 +538,6 @@ void config_write_clock(FILE *fp)
 	fprintf(fp, "clock_tooltip_timezone = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_tmz_tooltip)));
 	fprintf(fp, "clock_lclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_left_command)));
 	fprintf(fp, "clock_rclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_right_command)));
-	fprintf(fp, "clock_mclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_mclick_command)));
-	fprintf(fp, "clock_uwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_uwheel_command)));
-	fprintf(fp, "clock_dwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(clock_dwheel_command)));
 
 	fprintf(fp, "\n");
 }
@@ -604,7 +547,6 @@ void config_write_battery(FILE *fp)
 	fprintf(fp, "#-------------------------------------\n");
 	fprintf(fp, "# Battery\n");
 
-	fprintf(fp, "battery_tooltip = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(battery_tooltip)) ? 1 : 0);
 	fprintf(fp, "battery_low_status = %g\n", gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_alert_if_lower)));
 	fprintf(fp, "battery_low_cmd = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_alert_cmd)));
 	fprintf(fp, "bat1_font = %s\n", gtk_font_button_get_font_name(GTK_FONT_BUTTON(battery_font_line1)));
@@ -621,14 +563,6 @@ void config_write_battery(FILE *fp)
 			(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_padding_y)));
 	fprintf(fp, "battery_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(battery_background)));
 	fprintf(fp, "battery_hide = %d\n", (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(battery_hide_if_higher)));
-	fprintf(fp, "battery_lclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_left_command)));
-	fprintf(fp, "battery_rclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_right_command)));
-	fprintf(fp, "battery_mclick_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_mclick_command)));
-	fprintf(fp, "battery_uwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_uwheel_command)));
-	fprintf(fp, "battery_dwheel_command = %s\n", gtk_entry_get_text(GTK_ENTRY(battery_dwheel_command)));
-
-	fprintf(fp, "ac_connected_cmd = %s\n", gtk_entry_get_text(GTK_ENTRY(ac_connected_cmd)));
-	fprintf(fp, "ac_disconnected_cmd = %s\n", gtk_entry_get_text(GTK_ENTRY(ac_disconnected_cmd)));
 
 	fprintf(fp, "\n");
 }
@@ -738,44 +672,6 @@ gboolean config_is_manual(const char *path)
 	return result;
 }
 
-void finalize_bg()
-{
-	if (num_bg > 0) {
-		if (!read_bg_color_hover) {
-			GdkColor fillColor;
-			gtk_color_button_get_color(GTK_COLOR_BUTTON(background_fill_color), &fillColor);
-			gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color_over), &fillColor);
-			int fillOpacity = gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_fill_color));
-			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color_over), fillOpacity);
-			background_force_update();
-		}
-		if (!read_border_color_hover) {
-			GdkColor fillColor;
-			gtk_color_button_get_color(GTK_COLOR_BUTTON(background_border_color), &fillColor);
-			gtk_color_button_set_color(GTK_COLOR_BUTTON(background_border_color_over), &fillColor);
-			int fillOpacity = gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_border_color));
-			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color_over), fillOpacity);
-			background_force_update();
-		}
-		if (!read_bg_color_press) {
-			GdkColor fillColor;
-			gtk_color_button_get_color(GTK_COLOR_BUTTON(background_fill_color), &fillColor);
-			gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color_press), &fillColor);
-			int fillOpacity = gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_fill_color));
-			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color_press), fillOpacity);
-			background_force_update();
-		}
-		if (!read_border_color_press) {
-			GdkColor fillColor;
-			gtk_color_button_get_color(GTK_COLOR_BUTTON(background_border_color_over), &fillColor);
-			gtk_color_button_set_color(GTK_COLOR_BUTTON(background_border_color_press), &fillColor);
-			int fillOpacity = gtk_color_button_get_alpha(GTK_COLOR_BUTTON(background_border_color_over));
-			gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color_press), fillOpacity);
-			background_force_update();
-		}
-	}
-}
-
 void add_entry(char *key, char *value)
 {
 	char *value1=0, *value2=0, *value3=0;
@@ -783,13 +679,7 @@ void add_entry(char *key, char *value)
 	/* Background and border */
 	if (strcmp(key, "rounded") == 0) {
 		// 'rounded' is the first parameter => alloc a new background
-		finalize_bg();
 		background_create_new();
-		num_bg++;
-		read_bg_color_hover = 0;
-		read_border_color_hover = 0;
-		read_bg_color_press = 0;
-		read_border_color_press = 0;
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(background_corner_radius), atoi(value));
 		background_force_update();
 	}
@@ -815,46 +705,6 @@ void add_entry(char *key, char *value)
 		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color), (alpha*65535)/100);
 		background_force_update();
 	}
-	else if (strcmp(key, "background_color_hover") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		GdkColor col;
-		hex2gdk(value1, &col);
-		gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color_over), &col);
-		int alpha = value2 ? atoi(value2) : 50;
-		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color_over), (alpha*65535)/100);
-		background_force_update();
-		read_bg_color_hover = 1;
-	}
-	else if (strcmp(key, "border_color_hover") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		GdkColor col;
-		hex2gdk(value1, &col);
-		gtk_color_button_set_color(GTK_COLOR_BUTTON(background_border_color_over), &col);
-		int alpha = value2 ? atoi(value2) : 50;
-		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color_over), (alpha*65535)/100);
-		background_force_update();
-		read_border_color_hover = 1;
-	}
-	else if (strcmp(key, "background_color_pressed") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		GdkColor col;
-		hex2gdk(value1, &col);
-		gtk_color_button_set_color(GTK_COLOR_BUTTON(background_fill_color_press), &col);
-		int alpha = value2 ? atoi(value2) : 50;
-		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_fill_color_press), (alpha*65535)/100);
-		background_force_update();
-		read_bg_color_press = 1;
-	}
-	else if (strcmp(key, "border_color_pressed") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		GdkColor col;
-		hex2gdk(value1, &col);
-		gtk_color_button_set_color(GTK_COLOR_BUTTON(background_border_color_press), &col);
-		int alpha = value2 ? atoi(value2) : 50;
-		gtk_color_button_set_alpha(GTK_COLOR_BUTTON(background_border_color_press), (alpha*65535)/100);
-		background_force_update();
-		read_border_color_press = 1;
-	}
 
 	/* Panel */
 	else if (strcmp(key, "panel_size") == 0) {
@@ -887,7 +737,7 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "panel_margin") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(panel_margin_x), atoi(value1));
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(panel_margin_y), atoi(value2));
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(panel_margin_y), atoi(value1));
 	}
 	else if (strcmp(key, "panel_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
@@ -968,21 +818,6 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "disable_transparency") == 0) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(disable_transparency), atoi(value));
 	}
-	else if (strcmp(key, "mouse_effects") == 0) {
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(panel_mouse_effects), atoi(value));
-	}
-	else if (strcmp(key, "mouse_hover_icon_asb") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_hover_icon_opacity), atoi(value1));
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_hover_icon_saturation), atoi(value2));
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_hover_icon_brightness), atoi(value3));
-	}
-	else if (strcmp(key, "mouse_pressed_icon_asb") == 0) {
-		extract_values(value, &value1, &value2, &value3);
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_pressed_icon_opacity), atoi(value1));
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_pressed_icon_saturation), atoi(value2));
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_pressed_icon_brightness), atoi(value3));
-	}
 	else if (strcmp(key, "font_shadow") == 0) {
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(font_shadow), atoi(value));
 	}
@@ -1003,18 +838,20 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "panel_monitor") == 0) {
 		if (strcmp(value, "all") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 0);
-		else if (strcmp(value, "1") == 0)
+		else if (strcmp(value, "0") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 1);
-		else if (strcmp(value, "2") == 0)
+		else if (strcmp(value, "1") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 2);
-		else if (strcmp(value, "3") == 0)
+		else if (strcmp(value, "2") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 3);
-		else if (strcmp(value, "4") == 0)
+		else if (strcmp(value, "3") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 4);
-		else if (strcmp(value, "5") == 0)
+		else if (strcmp(value, "4") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 5);
-		else if (strcmp(value, "6") == 0)
+		else if (strcmp(value, "5") == 0)
 			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 6);
+		else if (strcmp(value, "6") == 0)
+			gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 7);
 	}
 	
 	/* autohide options */
@@ -1045,13 +882,12 @@ void add_entry(char *key, char *value)
 	}
 
 	/* Battery */
-	else if (strcmp(key, "battery") == 0) {
+	else if (strcmp(key, "systray") == 0) {
 		// Obsolete option
 		config_has_battery = 1;
 		config_battery_enabled = atoi(value);
-	} else if (strcmp(key, "battery_tooltip") == 0) {
+	}
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(battery_tooltip), atoi(value));
+	else if (strcmp(key, "battery_low_status") == 0) {
-	} else if (strcmp(key, "battery_low_status") == 0) {
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_alert_if_lower), atof(value));
 	}
 	else if (strcmp(key, "battery_low_cmd") == 0) {
@@ -1089,27 +925,6 @@ void add_entry(char *key, char *value)
 		else
 			gtk_spin_button_set_value(GTK_SPIN_BUTTON(battery_hide_if_higher), atoi(value));
 	}
-	else if (strcmp(key, "battery_lclick_command") == 0) {
-		gtk_entry_set_text(GTK_ENTRY(battery_left_command), value);
-	}
-	else if (strcmp(key, "battery_rclick_command") == 0) {
-		gtk_entry_set_text(GTK_ENTRY(battery_right_command), value);
-	}
-	else if (strcmp(key, "battery_mclick_command") == 0) {
-		gtk_entry_set_text(GTK_ENTRY(battery_mclick_command), value);
-	}
-	else if (strcmp(key, "battery_uwheel_command") == 0) {
-		gtk_entry_set_text(GTK_ENTRY(battery_uwheel_command), value);
-	}
-	else if (strcmp(key, "battery_dwheel_command") == 0) {
-		gtk_entry_set_text(GTK_ENTRY(battery_dwheel_command), value);
-	}
-	else if (strcmp(key, "ac_connected_cmd") == 0) {
-		gtk_entry_set_text(GTK_ENTRY(ac_connected_cmd), value);
-	}
-	else if (strcmp(key, "ac_disconnected_cmd") == 0) {
-		gtk_entry_set_text(GTK_ENTRY(ac_disconnected_cmd), value);
-	}
 
 	/* Clock */
 	else if (strcmp(key, "time1_format") == 0) {
@@ -1162,15 +977,6 @@ void add_entry(char *key, char *value)
 	else if (strcmp(key, "clock_rclick_command") == 0) {
 		gtk_entry_set_text(GTK_ENTRY(clock_right_command), value);
 	}
-	else if (strcmp(key, "clock_mclick_command") == 0) {
-		gtk_entry_set_text(GTK_ENTRY(clock_mclick_command), value);
-	}
-	else if (strcmp(key, "clock_uwheel_command") == 0) {
-		gtk_entry_set_text(GTK_ENTRY(clock_uwheel_command), value);
-	}
-	else if (strcmp(key, "clock_dwheel_command") == 0) {
-		gtk_entry_set_text(GTK_ENTRY(clock_dwheel_command), value);
-	}
 
 	/* Taskbar */
 	else if (strcmp(key, "taskbar_mode") == 0) {
@@ -1192,16 +998,6 @@ void add_entry(char *key, char *value)
 		else
 			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0);
 	}
-	else if (strcmp(key, "task_align") == 0) {
-		if (strcmp(value, "left") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 0);
-		else if (strcmp(value, "center") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 1);
-		else if (strcmp(value, "right") == 0)
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 2);
-		else
-			gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 0);
-	}
 	else if (strcmp(key, "taskbar_padding") == 0) {
 		extract_values(value, &value1, &value2, &value3);
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(taskbar_padding_x), atoi(value1));
@@ -1467,10 +1263,6 @@ void add_entry(char *key, char *value)
 		int id = background_index_safe(atoi(value));
 		gtk_combo_box_set_active(GTK_COMBO_BOX(launcher_background), id);
 	}
-	else if (strcmp(key, "launcher_icon_background_id") == 0) {
-		int id = background_index_safe(atoi(value));
-		gtk_combo_box_set_active(GTK_COMBO_BOX(launcher_icon_background), id);
-	}
 	else if (strcmp(key, "launcher_icon_size") == 0) {
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(launcher_icon_size), atoi(value));
 	}
@@ -1622,4 +1414,4 @@ char *get_action(GtkWidget *combo)
 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == 10)
 		return "prev_task";
 	return "none";
-}
+}

src/tint2conf/theme_view.c

@@ -19,7 +19,6 @@
 
 
 #include "main.h"
-#include "strnatcmp.h"
 #include "theme_view.h"
 
 // The data columns that we export via the tree model interface
@@ -28,11 +27,6 @@ GtkListStore *g_store;
 int g_width_list, g_height_list;
 GtkCellRenderer *g_renderer;
 
-gint theme_name_compare(GtkTreeModel *model,
-						GtkTreeIter *a,
-						GtkTreeIter *b,
-						gpointer user_data);
-
 GtkWidget *create_view()
 {
 	GtkTreeViewColumn *col;
@@ -75,50 +69,21 @@ GtkWidget *create_view()
 	GtkTreeSortable *sortable;
 	sortable = GTK_TREE_SORTABLE(g_store);
 	gtk_tree_sortable_set_sort_column_id(sortable, COL_THEME_FILE, GTK_SORT_ASCENDING);
-	gtk_tree_sortable_set_sort_func(sortable, COL_THEME_FILE, theme_name_compare, NULL, NULL);
 	return view;
 }
 
-gint theme_name_compare(GtkTreeModel *model,
-						GtkTreeIter *a,
-						GtkTreeIter *b,
-						gpointer user_data)
-{
-	gchar *path_a, *path_b;
-	gtk_tree_model_get(model, a, COL_THEME_FILE, &path_a, -1);
-	gtk_tree_model_get(model, b, COL_THEME_FILE, &path_b, -1);
-	gchar *name_a = path_a;
-	gchar *p;
-	for (p = name_a; *p; p++) {
-		if (*p == '/')
-			name_a = p + 1;
-	}
-	gchar *name_b = path_b;
-	for (p = name_b; *p; p++) {
-		if (*p == '/')
-			name_b = p + 1;
-	}
-	if (g_str_equal(name_a, name_b))
-		return 0;
-	if (g_str_equal(name_a, "tint2rc"))
-		return -1;
-	if (g_str_equal(name_b, "tint2rc"))
-		return 1;
-	gint result = strnatcasecmp(name_a, name_b);
-	g_free(path_a);
-	g_free(path_b);
-	return result;
-}
 
-void custom_list_append(const gchar *path)
+void custom_list_append(const gchar *name)
 {
 	GtkTreeIter  iter;
 
 	gtk_list_store_append(g_store, &iter);
-	gtk_list_store_set(g_store, &iter, COL_THEME_FILE, path, -1);
+	gtk_list_store_set(g_store, &iter, COL_THEME_FILE, name, -1);
 
-	gchar *name = g_strdup(strrchr(path, '/') + 1);
+	gchar *b, *n;
-	gtk_list_store_set(g_store, &iter, COL_THEME_NAME, name, -1);
+	b = strrchr(name, '/');
+	n = g_strdup(b+1);
+	gtk_list_store_set(g_store, &iter, COL_THEME_NAME, n, -1);
 }
 
 

src/tint2conf/theme_view.h

@@ -10,7 +10,7 @@ enum { COL_THEME_FILE = 0, COL_THEME_NAME, COL_SNAPSHOT, NB_COL, };
 
 GtkWidget *create_view();
 
-void custom_list_append(const gchar *path);
+void custom_list_append(const gchar *name);
 
 #endif
 

src/tint2conf/tint2conf.desktop

@@ -33,7 +33,7 @@ Name[nb]=Panelbehandler
 Name[nl]=Paneel Manager
 Name[nn]=Panelhandsamar
 Name[pa]=ਪੈਨਲ ਮੈਨੇਜਰ
-Name[pl]=Ustawienia panelu
+Name[pl]=Panel
 Name[pt]=Gestor do Painel
 Name[pt_BR]=Gerenciador do painel
 Name[ro]=Manager de panouri

src/tooltip/tooltip.c

@@ -259,7 +259,7 @@ void tooltip_update()
 }
 
 
-void tooltip_trigger_hide()
+void tooltip_trigger_hide(Tooltip* tooltip)
 {
 	if (g_tooltip.mapped) {
 		tooltip_copy_text(0);
@@ -304,7 +304,7 @@ void tooltip_copy_text(Area* area)
 {
 	free(g_tooltip.tooltip_text);
 	if (area && area->_get_tooltip_text)
-		g_tooltip.tooltip_text = area->_get_tooltip_text(area);
+		g_tooltip.tooltip_text = strdup(area->_get_tooltip_text(area));
 	else
 		g_tooltip.tooltip_text = NULL;
 	g_tooltip.area = area;

src/util/area.c

@@ -71,15 +71,13 @@
  *
  ************************************************************/
 
-Area *mouse_over_area = NULL;
-
 void init_rendering(void *obj, int pos)
 {
 	Area *a = (Area*)obj;
 	
 	// initialize fixed position/size
 	GList *l;
-	for (l = a->children; l ; l = l->next) {
+	for (l = a->list; l ; l = l->next) {
 		Area *child = ((Area*)l->data);
 		if (panel_horizontal) {
 			child->posy = pos + a->bg->border.width + a->paddingy;
@@ -118,7 +116,7 @@ void size_by_content (Area *a)
 
 	// children node are resized before its parent
 	GList *l;
-	for (l = a->children; l ; l = l->next)
+	for (l = a->list; l ; l = l->next)
 		size_by_content(l->data);
 	
 	// calculate area's size
@@ -143,6 +141,12 @@ void size_by_layout (Area *a, int level)
 	if (!a->on_screen)
 		return;
 
+	if (a == &panel1->taskbar[0]) {
+		printf("%s %d: Taskbar 0: y=%d, h=%d, b=%d\n", __FUNCTION__, __LINE__, a->posy, a->height, a->posy + a->height);
+	} else if (a == &panel1->taskbar[1]) {
+		printf("%s %d: Taskbar 1: y=%d, h=%d, b=%d\n", __FUNCTION__, __LINE__, a->posy, a->height, a->posy + a->height);
+	}
+
 	// parent node is resized before its children
 	// calculate area's size
 	GList *l;
@@ -152,20 +156,20 @@ void size_by_layout (Area *a, int level)
 		if (a->_resize) {
 			a->_resize(a);
 			// resize childs with SIZE_BY_LAYOUT
-			for (l = a->children; l ; l = l->next) {
+			for (l = a->list; l ; l = l->next) {
 				Area *child = ((Area*)l->data);
-				if (child->size_mode == SIZE_BY_LAYOUT && child->children)
+				if (child->size_mode == SIZE_BY_LAYOUT && child->list)
 					child->resize = 1;
 			}
 		}
 	}
 
 	// update position of children
-	if (a->children) {
+	if (a->list) {
 		if (a->alignment == ALIGN_LEFT) {
 			int pos = (panel_horizontal ? a->posx : a->posy) + a->bg->border.width + a->paddingxlr;
 
-			for (l = a->children; l ; l = l->next) {
+			for (l = a->list; l ; l = l->next) {
 				Area *child = ((Area*)l->data);
 				if (!child->on_screen)
 					continue;
@@ -191,7 +195,7 @@ void size_by_layout (Area *a, int level)
 		} else if (a->alignment == ALIGN_RIGHT) {
 			int pos = (panel_horizontal ? a->posx + a->width : a->posy + a->height) - a->bg->border.width - a->paddingxlr;
 
-			for (l = g_list_last(a->children); l ; l = l->prev) {
+			for (l = g_list_last(a->list); l ; l = l->prev) {
 				Area *child = ((Area*)l->data);
 				if (!child->on_screen)
 					continue;
@@ -218,21 +222,21 @@ void size_by_layout (Area *a, int level)
 			}
 		} else if (a->alignment == ALIGN_CENTER) {
 
-			int children_size = 0;
+            int children_size = 0;
 
-			for (l = a->children; l ; l = l->next) {
+            for (l = a->list; l ; l = l->next) {
 				Area *child = ((Area*)l->data);
 				if (!child->on_screen)
 					continue;
 
 				children_size += panel_horizontal ? child->width : child->height;
-				children_size += (l == a->children) ? 0 : a->paddingx;
+                children_size += (l == a->list) ? 0 : a->paddingx;
 			}
 
-			int pos = (panel_horizontal ? a->posx : a->posy) + a->bg->border.width + a->paddingxlr;
+            int pos = (panel_horizontal ? a->posx : a->posy) + a->bg->border.width + a->paddingxlr;
-			pos += ((panel_horizontal ? a->width : a->height) - children_size) / 2;
+            pos += ((panel_horizontal ? a->width : a->height) - children_size) / 2;
 
-			for (l = a->children; l ; l = l->next) {
+            for (l = a->list; l ; l = l->next) {
 				Area *child = ((Area*)l->data);
 				if (!child->on_screen)
 					continue;
@@ -276,8 +280,8 @@ void refresh (Area *a)
 	if (a->redraw) {
 		a->redraw = 0;
 		// force redraw of child
-		//GList *l;
+		//GSList *l;
-		//for (l = a->children ; l ; l = l->next)
+		//for (l = a->list ; l ; l = l->next)
 			//((Area*)l->data)->redraw = 1;
 
 		//printf("draw area posx %d, width %d\n", a->posx, a->width);
@@ -290,8 +294,8 @@ void refresh (Area *a)
 
 	// and then refresh child object
 	GList *l;
-	for (l = a->children; l ; l = l->next)
+	for (l = a->list; l ; l = l->next)
-		refresh((Area*)l->data);
+		refresh(l->data);
 }
 
 
@@ -304,7 +308,7 @@ int resize_by_layout(void *obj, int maximum_size)
 		// detect free size for SIZE_BY_LAYOUT's Area
 		size = a->width - (2 * (a->paddingxlr + a->bg->border.width));
 		GList *l;
-		for (l = a->children ; l ; l = l->next) {
+		for (l = a->list ; l ; l = l->next) {
 			child = (Area*)l->data;
 			if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
 				size -= child->width;
@@ -328,7 +332,7 @@ int resize_by_layout(void *obj, int maximum_size)
 		}
 
 		// resize SIZE_BY_LAYOUT objects
-		for (l = a->children ; l ; l = l->next) {
+		for (l = a->list ; l ; l = l->next) {
 			child = (Area*)l->data;
 			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
 				old_width = child->width;
@@ -346,7 +350,7 @@ int resize_by_layout(void *obj, int maximum_size)
 		// detect free size for SIZE_BY_LAYOUT's Area
 		size = a->height - (2 * (a->paddingxlr + a->bg->border.width));
 		GList *l;
-		for (l = a->children ; l ; l = l->next) {
+		for (l = a->list ; l ; l = l->next) {
 			child = (Area*)l->data;
 			if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
 				size -= child->height;
@@ -369,11 +373,16 @@ int resize_by_layout(void *obj, int maximum_size)
 		}
 
 		// resize SIZE_BY_LAYOUT objects
-		for (l = a->children ; l ; l = l->next) {
+		for (l = a->list ; l ; l = l->next) {
 			child = (Area*)l->data;
 			if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
 				int old_height = child->height;
 				child->height = height;
+				if (child == &panel1->taskbar[0]) {
+					printf("Taskbar 0: y=%d, h=%d, b=%d\n", child->posy, child->height, child->posy + child->height);
+				} else if (child == &panel1->taskbar[1]) {
+					printf("Taskbar 1: y=%d, h=%d, b=%d\n", child->posy, child->height, child->posy + child->height);
+				}
 				if (modulo) {
 					child->height++;
 					modulo--;
@@ -392,8 +401,8 @@ void set_redraw (Area *a)
 	a->redraw = 1;
 
 	GList *l;
-	for (l = a->children ; l ; l = l->next)
+	for (l = a->list ; l ; l = l->next)
-		set_redraw((Area*)l->data);
+		set_redraw(l->data);
 }
 
 void hide(Area *a)
@@ -445,50 +454,69 @@ void draw (Area *a)
 
 void draw_background (Area *a, cairo_t *c)
 {
-	if (a->bg->back.alpha > 0.0 ||
+	if (a->bg->back.alpha > 0.0) {
-		(panel_config.mouse_effects && (a->mouse_over_effect || a->mouse_press_effect))) {
 		//printf("    draw_background (%d %d) RGBA (%lf, %lf, %lf, %lf)\n", a->posx, a->posy, pix->back.color[0], pix->back.color[1], pix->back.color[2], pix->back.alpha);
-		if (a->mouse_state == MOUSE_OVER)
-			cairo_set_source_rgba(c, a->bg->back_hover.color[0], a->bg->back_hover.color[1], a->bg->back_hover.color[2], a->bg->back_hover.alpha);
-		else if (a->mouse_state == MOUSE_DOWN)
-			cairo_set_source_rgba(c, a->bg->back_pressed.color[0], a->bg->back_pressed.color[1], a->bg->back_pressed.color[2], a->bg->back_pressed.alpha);
-		else
-			cairo_set_source_rgba(c, a->bg->back.color[0], a->bg->back.color[1], a->bg->back.color[2], a->bg->back.alpha);
 		draw_rect(c, a->bg->border.width, a->bg->border.width, a->width-(2.0 * a->bg->border.width), a->height-(2.0*a->bg->border.width), a->bg->border.rounded - a->bg->border.width/1.571);
+		cairo_set_source_rgba(c, a->bg->back.color[0], a->bg->back.color[1], a->bg->back.color[2], a->bg->back.alpha);
 		cairo_fill(c);
 	}
 
-	if (a->bg->border.width > 0) {
+	if (a->bg->border.width > 0 && a->bg->border.alpha > 0.0) {
 		cairo_set_line_width (c, a->bg->border.width);
 
 		// draw border inside (x, y, width, height)
-		if (a->mouse_state == MOUSE_OVER)
-			cairo_set_source_rgba(c, a->bg->border_hover.color[0], a->bg->border_hover.color[1], a->bg->border_hover.color[2], a->bg->border_hover.alpha);
-		else if (a->mouse_state == MOUSE_DOWN)
-			cairo_set_source_rgba(c, a->bg->border_pressed.color[0], a->bg->border_pressed.color[1], a->bg->border_pressed.color[2], a->bg->border_pressed.alpha);
-		else
-			cairo_set_source_rgba(c, a->bg->border.color[0], a->bg->border.color[1], a->bg->border.color[2], a->bg->border.alpha);
 		draw_rect(c, a->bg->border.width/2.0, a->bg->border.width/2.0, a->width - a->bg->border.width, a->height - a->bg->border.width, a->bg->border.rounded);
+		/*
+		// convert : radian = degre * M_PI/180
+		// definir le degrade dans un carre de (0,0) (100,100)
+		// ensuite ce degrade est extrapoler selon le ratio width/height
+		// dans repere (0, 0) (100, 100)
+		double X0, Y0, X1, Y1, degre;
+		// x = X * (a->width / 100), y = Y * (a->height / 100)
+		double x0, y0, x1, y1;
+		X0 = 0;
+		Y0 = 100;
+		X1 = 100;
+		Y1 = 0;
+		degre = 45;
+		// et ensuite faire la changement d'unite du repere
+		// car ce qui doit reste inchangee est les traits et pas la direction
 
-		cairo_stroke(c);
+		// il faut d'abord appliquer une rotation de 90 (et -180 si l'angle est superieur a  180)
+		// ceci peut etre applique une fois pour toute au depart
+		// ensuite calculer l'angle dans le nouveau repare
+		// puis faire une rotation de 90
+		x0 = X0 * ((double)a->width / 100);
+		x1 = X1 * ((double)a->width / 100);
+		y0 = Y0 * ((double)a->height / 100);
+		y1 = Y1 * ((double)a->height / 100);
+
+		x0 = X0 * ((double)a->height / 100);
+		x1 = X1 * ((double)a->height / 100);
+		y0 = Y0 * ((double)a->width / 100);
+		y1 = Y1 * ((double)a->width / 100);
+
+		cairo_pattern_t *linpat;
+		linpat = cairo_pattern_create_linear (x0, y0, x1, y1);
+		cairo_pattern_add_color_stop_rgba (linpat, 0, a->border.color[0], a->border.color[1], a->border.color[2], a->border.alpha);
+		cairo_pattern_add_color_stop_rgba (linpat, 1, a->border.color[0], a->border.color[1], a->border.color[2], 0);
+		cairo_set_source (c, linpat);
+		*/
+		cairo_set_source_rgba (c, a->bg->border.color[0], a->bg->border.color[1], a->bg->border.color[2], a->bg->border.alpha);
+
+		cairo_stroke (c);
+		//cairo_pattern_destroy (linpat);
 	}
 }
 
 
-void remove_area (void *a)
+void remove_area (Area *a)
 {
-	Area *area = (Area*)a;
+	Area *parent = (Area*)a->parent;
-	Area *parent = (Area*)area->parent;
 
-	if (parent) {
+	parent->list = g_list_remove(parent->list, a);
-		parent->children = g_list_remove(parent->children, area);
+	set_redraw (parent);
-		parent->resize = 1;
-		set_redraw(parent);
-	}
 
-	if (mouse_over_area == a) {
-		mouse_out();
-	}
 }
 
 
@@ -496,7 +524,7 @@ void add_area (Area *a)
 {
 	Area *parent = (Area*)a->parent;
 
-	parent->children = g_list_append(parent->children, a);
+	parent->list = g_list_append(parent->list, a);
 	set_redraw (parent);
 
 }
@@ -508,20 +536,17 @@ void free_area (Area *a)
 		return;
 
 	GList *l0;
-	for (l0 = a->children; l0 ; l0 = l0->next)
+	for (l0 = a->list; l0 ; l0 = l0->next)
 		free_area (l0->data);
 
-	if (a->children) {
+	if (a->list) {
-		g_list_free(a->children);
+		g_list_free(a->list);
-		a->children = 0;
+		a->list = 0;
 	}
 	if (a->pix) {
 		XFreePixmap (server.dsp, a->pix);
 		a->pix = 0;
 	}
-	if (mouse_over_area == a) {
-		mouse_over_area = NULL;
-	}
 }
 
 
@@ -552,48 +577,3 @@ void clear_pixmap(Pixmap p, int x, int y, int w, int h)
 	XRenderFillRectangle(server.dsp, PictOpSrc, pict, &col, x, y, w, h);
 	XRenderFreePicture(server.dsp, pict);
 }
-
-void mouse_over(Area *area, int pressed)
-{
-	if (mouse_over_area == area && !area)
-		return;
-
-	MouseState new_state = MOUSE_NORMAL;
-	if (area) {
-		if (!pressed) {
-			new_state = area->mouse_over_effect ? MOUSE_OVER : MOUSE_NORMAL;
-		} else {
-			new_state = area->mouse_press_effect
-						? MOUSE_DOWN
-						: area->mouse_over_effect
-						  ? MOUSE_OVER
-						  : MOUSE_NORMAL;
-		}
-	}
-
-	if (mouse_over_area == area && mouse_over_area->mouse_state == new_state)
-		return;
-	mouse_out();
-	if (new_state == MOUSE_NORMAL)
-		return;
-	mouse_over_area = area;
-
-	mouse_over_area->mouse_state = new_state;
-	set_redraw(mouse_over_area);
-	panel_refresh = 1;
-}
-
-void mouse_out()
-{
-	if (!mouse_over_area)
-		return;
-	mouse_over_area->mouse_state = MOUSE_NORMAL;
-	set_redraw(mouse_over_area);
-	panel_refresh = 1;
-	mouse_over_area = NULL;
-}
-
-void init_background(Background *bg)
-{
-	memset(bg, 0, sizeof(Background));
-}

src/util/area.h

@@ -44,10 +44,6 @@ typedef struct
 {
 	Color back;
 	Border border;
-	Color back_hover;
-	Color border_hover;
-	Color back_pressed;
-	Color border_pressed;
 } Background;
 
 
@@ -55,15 +51,9 @@ typedef struct
 // SIZE_BY_LAYOUT objects : taskbar and task
 // SIZE_BY_CONTENT objects : clock, battery, launcher, systray
 enum { SIZE_BY_LAYOUT, SIZE_BY_CONTENT };
+
 enum { ALIGN_LEFT = 0, ALIGN_CENTER = 1, ALIGN_RIGHT = 2 };
 
-typedef enum {
-	MOUSE_NORMAL = 0,
-	MOUSE_OVER = 1,
-	MOUSE_DOWN = 2
-} MouseState;
-
-
 typedef struct {
 	// coordinate relative to panel window
 	int posx, posy;
@@ -73,7 +63,7 @@ typedef struct {
 	Background *bg;
 
 	// list of child : Area object
-	GList *children;
+	GList *list;
 
 	// object visible on screen. 
 	// An object (like systray) could be enabled but hidden (because no tray icon).
@@ -94,10 +84,6 @@ typedef struct {
 	// panel
 	void *panel;
 
-	int mouse_over_effect;
-	int mouse_press_effect;
-	MouseState mouse_state;
-
 	// each object can overwrite following function
 	void (*_draw_foreground)(void *obj, cairo_t *c);
 	// update area's content and update size (width/heith). 
@@ -106,12 +92,9 @@ typedef struct {
 	// after pos/size changed, the rendering engine will call _on_change_layout(Area*)
 	int on_changed;
 	void (*_on_change_layout)(void *obj);
-	// returns allocated string, that must be free'd after usage
+	const char* (*_get_tooltip_text)(void *obj);
-	char* (*_get_tooltip_text)(void *obj);
 } Area;
 
-void init_background(Background *bg);
-
 // on startup, initialize fixed pos/size
 void init_rendering(void *obj, int pos);
 
@@ -135,7 +118,7 @@ void show(Area *a);
 void draw (Area *a);
 void draw_background (Area *a, cairo_t *c);
 
-void remove_area (void *a);
+void remove_area (Area *a);
 void add_area (Area *a);
 void free_area (Area *a);
 
@@ -144,9 +127,5 @@ void draw_rect(cairo_t *c, double x, double y, double w, double h, double r);
 
 // clear pixmap with transparent color
 void clear_pixmap(Pixmap p, int x, int y, int w, int h);
-
-void mouse_over(Area *area, int pressed);
-void mouse_out();
-
 #endif
 

src/util/common.c

@@ -28,21 +28,13 @@
 #include <math.h>
 #include <unistd.h>
 #include <glib.h>
-#include <glib/gstdio.h>
 #include "common.h"
 #include "../server.h"
-#include <sys/wait.h>
 
-#ifdef HAVE_RSVG
-#include <librsvg/rsvg.h>
-#endif
 
 
 void copy_file(const char *pathSrc, const char *pathDest)
 {
-	if (g_str_equal(pathSrc, pathDest))
-		return;
-
 	FILE *fileSrc, *fileDest;
 	char buffer[100];
 	int  nb;
@@ -125,13 +117,13 @@ char *contract_tilde(char *s)
 	if (!home)
 		return strdup(s);
 
-	char *home_slash = calloc(strlen(home) + 2, 1);
+	char *home_slash = calloc(strlen(home) + 1, 1);
 	strcat(home_slash, home);
 	strcat(home_slash, "/");
 
 	if ((strcmp(s, home) == 0 ||
 		strstr(s, home_slash) == s)) {
-		char *result = calloc(strlen(s) - strlen(home) + 2, 1);
+		char *result = calloc(strlen(s) - strlen(home) + 1, 1);
 		strcat(result, "~");
 		strcat(result, s + strlen(home));
 		free(home_slash);
@@ -370,52 +362,9 @@ void createHeuristicMask(DATA32* data, int w, int h)
 	}
 }
 
-int pixelEmpty(DATA32 argb)
-{
-
-	DATA32 a = (argb >> 24) & 0xff;
-	if (a == 0)
-		return 1;
-
-	DATA32 rgb = argb & 0xffFFff;
-	return rgb == 0;
-}
-
-int imageEmpty(DATA32* data, int w, int h)
-{
-	unsigned int x, y;
-
-	if (w > 0 && h > 0) {
-		x = w / 2;
-		y = h / 2;
-		if (!pixelEmpty(data[y * w + x])) {
-			//fprintf(stderr, "Non-empty pixel: [%u, %u] = %x\n", x, y, data[y * w + x]);
-			return 0;
-		}
-	}
-
-	for (y = 0; y < h; y++) {
-		for (x = 0; x < w; x++) {
-			if (!pixelEmpty(data[y * w + x])) {
-				//fprintf(stderr, "Non-empty pixel: [%u, %u] = %x\n", x, y, data[y * w + x]);
-				return 0;
-			}
-		}
-	}
-
-	//fprintf(stderr, "All pixels are empty\n");
-	return 1;
-}
 
 void render_image(Drawable d, int x, int y)
 {
-	if (!server.real_transparency) {
-		imlib_context_set_blend(1);
-		imlib_context_set_drawable(d);
-		imlib_render_image_on_drawable(x, y);
-		return;
-	}
-
 	int w = imlib_image_get_width(), h = imlib_image_get_height();
 
 	Pixmap pixmap = XCreatePixmap(server.dsp, server.root_win, w, h, 32);
@@ -460,67 +409,3 @@ void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color
 	cairo_move_to (c, posx, posy);
 	pango_cairo_show_layout (c, layout);
 }
-
-Imlib_Image load_image(const char *path, int cached)
-{
-	Imlib_Image image;
-#ifdef HAVE_RSVG
-	if (cached) {
-		image = imlib_load_image_immediately(path);
-	} else {
-		image = imlib_load_image_immediately_without_cache(path);
-	}
-	if (!image && g_str_has_suffix(path, ".svg")) {
-		char suffix[128];
-		sprintf(suffix, "tmpimage-%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(path, &err);
-
-			if (err != NULL) {
-				fprintf(stderr, "Could not load svg image!: %s", err->message);
-				g_error_free(err);
-			} else {
-				gchar *name = g_build_filename(g_get_user_config_dir(), "tint2", suffix, NULL);
-				GdkPixbuf *pixbuf = rsvg_handle_get_pixbuf(svg);
-				gdk_pixbuf_save(pixbuf, name, "png", NULL, NULL);
-			}
-			exit(0);
-		} else {
-			// Parent
-			waitpid(pid, 0, 0);
-			gchar *name = g_build_filename(g_get_user_config_dir(), "tint2", suffix, NULL);
-			image = imlib_load_image_immediately_without_cache(name);
-			g_remove(name);
-			g_free(name);
-		}
-	} else
-#endif
-	{
-		if (cached) {
-			image = imlib_load_image_immediately(path);
-		} else {
-			image = imlib_load_image_immediately_without_cache(path);
-		}
-	}
-	return image;
-}
-
-Imlib_Image adjust_icon(Imlib_Image original, int alpha, int saturation, int brightness)
-{
-	if (!original)
-		return NULL;
-
-	imlib_context_set_image(original);
-	Imlib_Image copy = imlib_clone_image();
-
-	imlib_context_set_image(copy);
-	imlib_image_set_has_alpha(1);
-	DATA32* data = imlib_image_get_data();
-	adjust_asb(data, imlib_image_get_width(), imlib_image_get_height(), alpha, (float)saturation/100, (float)brightness/100);
-	imlib_image_put_back_data(data);
-	return copy;
-}

src/util/common.h

@@ -12,23 +12,17 @@
 #include <pango/pangocairo.h>
 #include "area.h"
 
-#define GREEN  "\033[1;32m"
-#define YELLOW "\033[1;33m"
-#define RED    "\033[31m"
-#define BLUE   "\033[1;34m"
-#define RESET  "\033[0m"
-
 /*
 void fxfree(void** ptr){
-  if (*ptr){
+  if(*ptr){
     free(*ptr);
     *ptr=NULL;
     }
   }
 FXint fxmalloc(void** ptr,unsigned long size){
   *ptr=NULL;
-  if (size!=0){
+  if(size!=0){
-    if ((*ptr=malloc(size))==NULL) return FALSE;
+    if((*ptr=malloc(size))==NULL) return FALSE;
     }
   return TRUE;
   }
@@ -68,15 +62,10 @@ void extract_values (const char *value, char **value1, char **value2, char **val
 // alpha from 0 to 100, satur from 0 to 1, bright from 0 to 1.
 void adjust_asb(DATA32 *data, int w, int h, int alpha, float satur, float bright);
 void createHeuristicMask(DATA32* data, int w, int h);
-int imageEmpty(DATA32* data, int w, int h);
 
 void render_image(Drawable d, int x, int y);
 
 void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, int font_shadow);
 
-Imlib_Image load_image(const char *path, int cached);
-
-Imlib_Image adjust_icon(Imlib_Image original, int alpha, int saturation, int brightness);
-
 #endif
 

src/util/timer.c

@@ -49,7 +49,9 @@ struct _timeout {
 
 void add_timeout_intern(int value_msec, int interval_msec, void(*_callback)(void*), void* arg, timeout* t);
 gint compare_timeouts(gconstpointer t1, gconstpointer t2);
+gint compare_timespecs(const struct timespec* t1, const struct timespec* t2);
 int timespec_subtract(struct timespec* result, struct timespec* x, struct timespec* y);
+struct timespec add_msec_to_timespec(struct timespec ts, int msec);
 
 
 int align_with_existing_timeouts(timeout* t);
@@ -393,13 +395,8 @@ void callback_multi_timeout(void* arg)
 		timeout* t = it->data;
 		if (++t->multi_timeout->current_count >= t->multi_timeout->count_to_expiration) {
 			t->_callback(t->arg);
-			if (multi_timeouts && g_hash_table_lookup(multi_timeouts, t)) {
+			t->multi_timeout->current_count = 0;
-				// Timer still exists
+			t->timeout_expires = add_msec_to_timespec(cur_time, t->interval_msec);
-				t->multi_timeout->current_count = 0;
-				t->timeout_expires = add_msec_to_timespec(cur_time, t->interval_msec);
-			} else {
-				return;
-			}
 		}
 		it = it->next;
 	}
@@ -450,16 +447,3 @@ void stop_multi_timeout(timeout* t)
 	}
 	free(mth);
 }
-
-double profiling_get_time_old_time = 0;
-double profiling_get_time()
-{
-	struct timespec cur_time;
-	clock_gettime(CLOCK_MONOTONIC, &cur_time);
-	double t = cur_time.tv_sec + cur_time.tv_nsec * 1.0e-9;
-	if (profiling_get_time_old_time == 0)
-		profiling_get_time_old_time = t;
-	double delta = t - profiling_get_time_old_time;
-	profiling_get_time_old_time = t;
-	return delta;
-}

src/util/timer.h

@@ -20,8 +20,6 @@
 #define TIMER_H
 
 #include <glib.h>
-#include <time.h>
-#include <sys/time.h>
 
 extern struct timeval next_timeout;
 
@@ -68,14 +66,4 @@ void update_next_timeout();
 /** Callback of all expired timeouts **/
 void callback_timeout_expired();
 
-/** Returns -1 if t1 < t2, 0 if t1 == t2, 1 if t1 > t2 **/
-gint compare_timespecs(const struct timespec* t1, const struct timespec* t2);
-
-struct timespec add_msec_to_timespec(struct timespec ts, int msec);
-
-/** Returns the time difference in seconds between the current time and the last time this function was called.
-  * At the first call returns zero.
-**/
-double profiling_get_time();
-
 #endif // TIMER_H

src/util/uevent.c

@@ -1,202 +0,0 @@
-/**************************************************************************
-*
-* Linux Kernel uevent handler
-*
-* Copyright (C) 2015 Sebastian Reichel <sre@ring0.de>
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License version 2
-* or any later version as published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**************************************************************************/
-
-#ifdef ENABLE_UEVENT
-
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <sys/socket.h>
-#include <sys/types.h>
-
-#include <linux/types.h>
-#include <linux/netlink.h>
-
-#include "common.h"
-#include "uevent.h"
-
-static int ueventfd = -1;
-static struct sockaddr_nl nls;
-static GList *notifiers = NULL;
-
-static const char* has_prefix(const char *str, const char *end, const char *prefix, size_t prefixlen) {
-	if ((end-str) < prefixlen)
-		return NULL;
-
-	if (!memcmp(str, prefix, prefixlen))
-		return str + prefixlen;
-
-	return NULL;
-}
-
-#define HAS_CONST_PREFIX(str,end,prefix)  has_prefix((str),end,prefix,sizeof(prefix)-1)
-
-static void uevent_param_free(gpointer data) {
-	struct uevent_parameter *param = data;
-	free(param->key);
-	free(param->val);
-	free(param);
-}
-
-static void uevent_free(struct uevent *ev) {
-	free(ev->path);
-	free(ev->subsystem);
-	g_list_free_full(ev->params, uevent_param_free);
-	free(ev);
-}
-
-static struct uevent *uevent_new(char *buffer, int size) {
-	struct uevent *ev;
-	const char* s = buffer;
-	const char* end = s + size;
-	gboolean first = TRUE;
-
-	if (size == 0)
-		return NULL;
-
-	ev = calloc(1, sizeof(*ev));
-	if (!ev)
-		return NULL;
-
-	/* ensure nul termination required by strlen() */
-	buffer[size-1] = '\0';
-
-	for (; s < end; s += strlen(s) + 1) {
-		if (first) {
-			const char *p = strchr(s, '@');
-			if (!p) {
-				/* error: kernel events contain @ */
-				/* triggered by udev events, though */
-				free(ev);
-				return NULL;
-			}
-			ev->path = strdup(p+1);
-			first = FALSE;
-		} else {
-			const char* val;
-			if ((val = HAS_CONST_PREFIX(s, end, "ACTION=")) != NULL) {
-				if (!strcmp(val, "add"))
-					ev->action = UEVENT_ADD;
-				else if (!strcmp(val, "remove"))
-					ev->action = UEVENT_REMOVE;
-				else if (!strcmp(val, "change"))
-					ev->action = UEVENT_CHANGE;
-				else
-					ev->action = UEVENT_UNKNOWN;
-			} else if ((val = HAS_CONST_PREFIX(s, end, "SEQNUM=")) != NULL) {
-				ev->sequence = atoi(val);
-			} else if ((val = HAS_CONST_PREFIX(s, end, "SUBSYSTEM=")) != NULL) {
-				ev->subsystem = strdup(val);
-			} else {
-				val = strchr(s, '=');
-				if (val) {
-					struct uevent_parameter *param = malloc(sizeof(*param));
-					if (param) {
-						param->key = strndup(s, val-s);
-						param->val = strdup(val+1);
-						ev->params = g_list_append(ev->params, param);
-					}
-				}
-			}
-		}
-	}
-
-	return ev;
-}
-
-void uevent_register_notifier(struct uevent_notify *nb) {
-	notifiers = g_list_append(notifiers, nb);
-}
-
-void uevent_unregister_notifier(struct uevent_notify *nb) {
-	GList *l = notifiers;
-
-	while (l != NULL) {
-		GList *next = l->next;
-		struct uevent_notify *lnb = l->data;
-
-		if (memcmp(nb, lnb, sizeof(struct uevent_notify)) == 0)
-			notifiers = g_list_delete_link(notifiers, l);
-
-		l = next;
-	}
-}
-
-void uevent_handler() {
-	struct uevent *ev;
-	char buf[512];
-	GList *l;
-
-	if (ueventfd < 0)
-		return;
-
-	int len = recv(ueventfd, buf, sizeof(buf), MSG_DONTWAIT);
-	if (len < 0)
-		return;
-
-	ev = uevent_new(buf, len);
-	if (ev) {
-		for (l = notifiers; l != NULL; l = l->next) {
-			struct uevent_notify *nb = l->data;
-
-			if (!(ev->action & nb->action))
-				continue;
-
-			if (nb->subsystem && strcmp(ev->subsystem, nb->subsystem))
-				continue;
-
-			nb->cb(ev, nb->userdata);
-		}
-
-		uevent_free(ev);
-	}
-}
-
-int uevent_init() {
-	/* Open hotplug event netlink socket */
-	memset(&nls,0,sizeof(struct sockaddr_nl));
-	nls.nl_family = AF_NETLINK;
-	nls.nl_pid = getpid();
-	nls.nl_groups = -1;
-
-	/* open socket */
-	ueventfd = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
-	if (ueventfd < 0) {
-		fprintf(stderr, "Error: socket open failed\n");
-		return -1;
-	}
-
-	/* Listen to netlink socket */
-	if (bind(ueventfd, (void *)&nls, sizeof(struct sockaddr_nl))) {
-		fprintf(stderr, "Bind failed\n");
-		return -1;
-	}
-
-	printf("Kernel uevent interface initialized...\n");
-
-	return ueventfd;
-}
-
-void uevent_cleanup() {
-	if (ueventfd >= 0)
-		close(ueventfd);
-}
-
-#endif

src/util/uevent.h

@@ -1,70 +0,0 @@
-/**************************************************************************
-*
-* Linux Kernel uevent handler
-*
-* Copyright (C) 2015 Sebastian Reichel <sre@ring0.de>
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License version 2
-* or any later version as published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**************************************************************************/
-
-#ifndef UEVENT_H
-#define UEVENT_H
-
-enum uevent_action {
-	UEVENT_UNKNOWN = 0x01,
-	UEVENT_ADD     = 0x02,
-	UEVENT_REMOVE  = 0x04,
-	UEVENT_CHANGE  = 0x08,
-};
-
-struct uevent_parameter {
-	char *key;
-	char *val;
-};
-
-struct uevent {
-	char *path;
-	enum uevent_action action;
-	int sequence;
-	char *subsystem;
-	GList *params;
-};
-
-struct uevent_notify {
-	int action; /* bitfield */
-	char *subsystem; /* NULL => any */
-	void *userdata;
-
-	void (*cb)(struct uevent *e, void *userdata);
-};
-
-#if ENABLE_UEVENT
-int uevent_init();
-void uevent_cleanup();
-void uevent_handler();
-
-void uevent_register_notifier(struct uevent_notify *nb);
-void uevent_unregister_notifier(struct uevent_notify *nb);
-#else
-static inline int uevent_init() {
-	return -1;
-}
-
-static inline void uevent_cleanup() { }
-static inline void uevent_handler() { }
-
-static inline void uevent_register_notifier(struct uevent_notify *nb) { }
-static inline void uevent_unregister_notifier(struct uevent_notify *nb) { }
-#endif
-
-#endif

src/util/window.c

@@ -131,28 +131,17 @@ int window_get_monitor (Window win)
 	Window src;
 
 	XTranslateCoordinates(server.dsp, win, server.root_win, 0, 0, &x, &y, &src);
-	int best_match = -1;
+	x += 2;
-	int match_right = 0;
+	y += 2;
-	int match_bottom = 0;
-	// There is an ambiguity when a window is right on the edge between screens.
-	// In that case, prefer the monitor which is on the right and bottom of the window's top-left corner.
 	for (i = 0; i < server.nb_monitor; i++) {
 		if (x >= server.monitor[i].x && x <= (server.monitor[i].x + server.monitor[i].width))
-			if (y >= server.monitor[i].y && y <= (server.monitor[i].y + server.monitor[i].height)) {
+			if (y >= server.monitor[i].y && y <= (server.monitor[i].y + server.monitor[i].height))
-				int current_right = x < (server.monitor[i].x + server.monitor[i].width);
+				break;
-				int current_bottom = y < (server.monitor[i].y + server.monitor[i].height);
-				if (best_match < 0 ||
-					(!match_right && current_right) ||
-					(!match_bottom && current_bottom)) {
-					best_match = i;
-				}
-			}
 	}
 
-	if (best_match < 0)
+	//printf("window %lx : ecran %d, (%d, %d)\n", win, i, x, y);
-		best_match = 0;
+	if (i == server.nb_monitor) return 0;
-	// printf("window %lx : ecran %d, (%d, %d)\n", win, best_match+1, x, y);
+	else return i;
-	return best_match;
 }
 
 void window_get_coordinates (Window win, int *x, int *y, int *w, int *h)
@@ -321,29 +310,41 @@ gulong *get_best_icon (gulong *data, int icon_count, int num, int *iw, int *ih,
 }
 
 
-void get_text_size2(PangoFontDescription *font,
+void get_text_size(PangoFontDescription *font, int *height_ink, int *height, int panel_height, char *text, int len)
-					int *height_ink,
-					int *height,
-					int *width,
-					int panel_height,
-					int panel_width,
-					char *text,
-					int len,
-					PangoWrapMode wrap,
-					PangoEllipsizeMode ellipsis)
 {
 	PangoRectangle rect_ink, rect;
 
-	Pixmap pmap = XCreatePixmap (server.dsp, server.root_win, panel_height, panel_width, server.depth);
+	Pixmap pmap = XCreatePixmap (server.dsp, server.root_win, panel_height, panel_height, server.depth);
 
-	cairo_surface_t *cs = cairo_xlib_surface_create (server.dsp, pmap, server.visual, panel_height, panel_width);
+	cairo_surface_t *cs = cairo_xlib_surface_create (server.dsp, pmap, server.visual, panel_height, panel_height);
+	cairo_t *c = cairo_create (cs);
+
+	PangoLayout *layout = pango_cairo_create_layout (c);
+	pango_layout_set_font_description (layout, font);
+	pango_layout_set_text (layout, text, len);
+
+	pango_layout_get_pixel_extents(layout, &rect_ink, &rect);
+	*height_ink = rect_ink.height;
+	*height = rect.height;
+	//printf("dimension : %d - %d\n", rect_ink.height, rect.height);
+
+	g_object_unref (layout);
+	cairo_destroy (c);
+	cairo_surface_destroy (cs);
+	XFreePixmap (server.dsp, pmap);
+}
+
+
+void get_text_size2(PangoFontDescription *font, int *height_ink, int *height, int *width, int panel_height, int panel_with, char *text, int len)
+{
+	PangoRectangle rect_ink, rect;
+
+	Pixmap pmap = XCreatePixmap (server.dsp, server.root_win, panel_height, panel_height, server.depth);
+
+	cairo_surface_t *cs = cairo_xlib_surface_create (server.dsp, pmap, server.visual, panel_height, panel_with);
 	cairo_t *c = cairo_create (cs);
 
 	PangoLayout *layout = pango_cairo_create_layout (c);
-	pango_layout_set_width(layout, panel_width * PANGO_SCALE);
-	pango_layout_set_height(layout, panel_height * PANGO_SCALE);
-	pango_layout_set_wrap(layout, wrap);
-	pango_layout_set_ellipsize(layout, ellipsis);
 	pango_layout_set_font_description (layout, font);
 	pango_layout_set_text (layout, text, len);
 

src/util/window.h

@@ -33,16 +33,8 @@ void windows_set_desktop (Window win, int desktop);
 int window_get_monitor (Window win);
 Window window_get_active ();
 
-void get_text_size2(PangoFontDescription *font,
+void get_text_size(PangoFontDescription *font, int *height_ink, int *height, int panel_height, char *text, int len);
-					int *height_ink,
+void get_text_size2(PangoFontDescription *font, int *height_ink, int *height, int *width, int panel_height, int panel_with, char *text, int len);
-					int *height,
-					int *width,
-					int panel_height,
-					int panel_with,
-					char *text,
-					int len,
-					PangoWrapMode wrap,
-					PangoEllipsizeMode ellipsis);
 
 
 #endif

tint2.config

@@ -1,6 +0,0 @@
-// ADD PREDEFINED MACROS HERE!
-#define HAVE_RSVG 1
-#define HAVE_SN 1
-#define ENABLE_BATTERY 1
-#define ENABLE_UEVENT 1
-#define GETTEXT_PACKAGE

tint2.creator

@@ -1 +0,0 @@
-[General]

tint2.desktop

@@ -2,7 +2,7 @@
 Type=Application
 Encoding=UTF-8
 Name=Tint2 panel
-Name[am]=ፓነል tint2
+Name[am]=ፓነል  tint2
 Name[ar]=الشريط tint2
 Name[ast]=Panel tint2
 Name[be]=Панэль tint2
@@ -12,7 +12,7 @@ Name[da]=Panel tint2
 Name[de]=Leiste tint2
 Name[dz]=པེ་ནཱལ། tint2
 Name[el]=Ταμπλό tint2
-Name[en]=Tint2 panel
+Name[en_GB]=Panel tint2
 Name[eo]=Panelo tint2
 Name[es]=Panel tint2
 Name[et]=Ääreriba tint2
@@ -36,6 +36,7 @@ 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
@@ -47,12 +48,13 @@ Name[tr]=Panel tint2
 Name[ug]=panel tint2
 Name[uk]=Панель tint2
 Name[ur]=پینل tint2
+Name[ur_PK]=پینل tint2
 Name[vi]=Panel tint2
-Name[zh]=面板 tint2
+Name[zh_CN]=面板 tint2
+Name[zh_TW]=面板 tint2
 Comment=Lightweight panel
-Comment[fr]=Panel léger
+Comment[fr_FR]=Panel léger
-Comment[pl]=Lekki panel
 Exec=tint2
-Icon=tint2
+Icon=taskbar
 Terminal=false
 Categories=System;

tint2.files

@@ -1,162 +0,0 @@
-doc/tint2.1
-sample/icon_and_text_1.tint2rc
-sample/icon_and_text_2.tint2rc
-sample/icon_and_text_3.tint2rc
-sample/icon_and_text_4.tint2rc
-sample/icon_only_1.tint2rc
-sample/icon_only_2.tint2rc
-sample/icon_only_3.tint2rc
-sample/icon_only_4.tint2rc
-sample/icon_only_6.tint2rc
-sample/icon_only_7.tint2rc
-sample/text_only_1.tint2rc
-sample/text_only_2.tint2rc
-sample/text_only_3.tint2rc
-sample/text_only_4.tint2rc
-sample/text_only_5.tint2rc
-sample/text_only_6.tint2rc
-sample/tint2rc
-src/battery/battery.c
-src/battery/battery.h
-src/clock/clock.c
-src/clock/clock.h
-src/execplugin/execplugin.c
-src/execplugin/execplugin.h
-src/launcher/launcher.c
-src/launcher/launcher.h
-src/launcher/xsettings-client.c
-src/launcher/xsettings-client.h
-src/launcher/xsettings-common.c
-src/launcher/xsettings-common.h
-src/sysmon/sysmon.c
-src/sysmon/sysmon.h
-src/systray/systraybar.c
-src/systray/systraybar.h
-src/taskbar/task.c
-src/taskbar/task.h
-src/taskbar/taskbar.c
-src/taskbar/taskbar.h
-src/taskbar/taskbarname.c
-src/taskbar/taskbarname.h
-src/tint2conf/CMakeLists.txt
-src/tint2conf/main.c
-src/tint2conf/main.h
-src/tint2conf/properties.c
-src/tint2conf/properties.h
-src/tint2conf/properties_rw.c
-src/tint2conf/properties_rw.h
-src/tint2conf/taskbar.svg
-src/tint2conf/theme_view.c
-src/tint2conf/theme_view.h
-src/tint2conf/tint2conf.desktop
-src/tint2conf/tintwizard.py
-src/tooltip/tooltip.c
-src/tooltip/tooltip.h
-src/util/area.c
-src/util/area.h
-src/util/blur.c
-src/util/blur.h
-src/util/common.c
-src/util/common.h
-src/util/timer.c
-src/util/timer.h
-src/util/window.c
-src/util/window.h
-src/config.c
-src/config.h
-src/panel.c
-src/panel.h
-src/server.c
-src/server.h
-src/tint.c
-AUTHORS
-ChangeLog
-CMakeLists.txt
-COPYING
-default_icon.png
-get_svnrev.sh
-INSTALL.txt
-make_release.sh
-README
-README.source
-src/launcher/apps-common.c
-src/launcher/apps-common.h
-src/launcher/icon-theme-common.c
-src/launcher/icon-theme-common.h
-src/util/strnatcmp.c
-src/util/strnatcmp.h
-get_version.sh
-src/battery/battery.c
-src/battery/battery.h
-src/clock/clock.c
-src/clock/clock.h
-src/launcher/apps-common.c
-src/launcher/apps-common.h
-src/launcher/icon-theme-common.c
-src/launcher/icon-theme-common.h
-src/launcher/launcher.c
-src/launcher/launcher.h
-src/launcher/xsettings-client.c
-src/launcher/xsettings-client.h
-src/launcher/xsettings-common.c
-src/launcher/xsettings-common.h
-src/systray/systraybar.c
-src/systray/systraybar.h
-src/taskbar/task.c
-src/taskbar/task.h
-src/taskbar/taskbar.c
-src/taskbar/taskbar.h
-src/taskbar/taskbarname.c
-src/taskbar/taskbarname.h
-src/tint2conf/CMakeLists.txt
-src/tint2conf/main.c
-src/tint2conf/main.h
-src/tint2conf/properties.c
-src/tint2conf/properties.h
-src/tint2conf/properties_rw.c
-src/tint2conf/properties_rw.h
-src/tint2conf/theme_view.c
-src/tint2conf/theme_view.h
-src/tint2conf/tint2conf.desktop
-src/tint2conf/tint2conf.svg
-src/tint2conf/tintwizard.py
-src/tooltip/tooltip.c
-src/tooltip/tooltip.h
-src/util/area.c
-src/util/area.h
-src/util/common.c
-src/util/common.h
-src/util/strnatcmp.c
-src/util/strnatcmp.h
-src/util/timer.c
-src/util/timer.h
-src/util/window.c
-src/util/window.h
-src/config.c
-src/config.h
-src/panel.c
-src/panel.h
-src/server.c
-src/server.h
-src/tint.c
-po/CMakeLists.txt
-po/LINGUAS
-po/POTFILES.in
-src/tint2conf/po/CMakeLists.txt
-src/tint2conf/po/CMakeLists.txt
-src/tint2conf/po/fr.po
-src/tint2conf/po/tint2conf.pot
-src/tint2conf/po/pl.po
-src/tint2conf/po/tint2conf.pot
-src/freespace/freespace.c
-src/freespace/freespace.h
-src/tint2conf/po/readme.txt
-src/battery/linux.c
-src/battery/battery.c
-src/battery/battery.h
-src/battery/dummy.c
-src/battery/freebsd.c
-src/battery/linux.c
-src/battery/openbsd.c
-src/util/uevent.c
-src/util/uevent.h

tint2.includes

@@ -1,22 +0,0 @@
-.
-./src
-./src/battery
-./src/clock
-./src/execplugin
-./src/launcher
-./src/sysmon
-./src/systray
-./src/taskbar
-./src/tint2conf
-./src/tooltip
-./src/util
-/usr/include
-/usr/include/gtk-2.0
-/usr/include/glib-2.0
-/usr/include/gdk-pixbuf-2.0
-/usr/include/cairo
-/usr/include/pango-1.0
-/usr/include/startup-notification-1.0
-po
-src/tint2conf/po
-src/freespace