Updated for 0.12.2

Fix copy&paste mistake, battery should be enabled
for obsolete "battery" option instead of obsolete
"systray" option.

.clang-format

@@ -1,66 +0,0 @@
-# works with clang-format-3.7
-#
-# Most controversial fields are UseTab, IndentWidth, ContinuationIndentWidth, ColumnLimit, BreakBeforeBraces
-
-#BasedOnStyle: Google
-AccessModifierOffset: 0
-AlignAfterOpenBracket: true
-AlignConsecutiveAssignments: false
-#AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: true
-AlignOperands: true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Linux
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-ColumnLimit: 120
-CommentPragmas: ''
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ConstructorInitializerIndentWidth: 0
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DerivePointerBinding: false
-DisableFormat: false
-ForEachMacros: ['foreach']
-IndentCaseLabels: false
-IndentFunctionDeclarationAfterType: false
-IndentWidth: 4
-IndentWrappedFunctionNames: false
-Language: Cpp
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakBeforeFirstCallParameter: 1000
-PenaltyBreakComment: 100
-PenaltyBreakFirstLessLess: 0
-PenaltyBreakString: 100
-PenaltyExcessCharacter: 100
-PenaltyReturnTypeOnItsOwnLine: 2000
-PointerAlignment: Right
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
-SpacesInCStyleCastParentheses: false
-SpacesInContainerLiterals: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp11
-TabWidth: 4
-UseTab: Never

.gitignore

@@ -1,7 +0,0 @@
-build
-*.user
-version.h
-*.pyc
-*.todo
-packaging/make_ubuntu2.sh
-test_*.log

AUTHORS

@@ -1,3 +1,4 @@
+
 tint2 is developped by :
 - Thierry Lorthiois <lorthiois@bbsoft.fr> from Omega distribution
 - Andreas Fink <andreas.fink85@googlemail.com>
@@ -5,11 +6,12 @@ tint2 is developped by :
 - Christian Ruppert <Spooky85@gmail.com> (autotools build system)
 - Ovidiu M <mrovi9000 at gmail.com> : launcher, bug fixes
 - Mishael A Sibiryakov (death@junki.org) : freespace
-- Sebastian Reichel <sre@ring0.de> : battery, various fixes, debian package maintainer
+- Sebastian Reichel <sre@ring0.de> : battery, various fixes
 
-tint2 is based on the ttm source code (http://code.google.com/p/ttm/)
+tint2 is based on ttm source code (http://code.google.com/p/ttm/)
 - 2007-2008 Pål Staurland <staura@gmail.com>
 
+
 Contributors:
   Kwaku Yeboah <kwakuyeboah@gmail.com> : wiki page
   Daniel Moerner <dmoerner@gmail.com> : man page and debian package
@@ -22,29 +24,3 @@ Contributors:
   Xico Atelo : startup notifications
   Craig Oakes : WM flags, issue tracker organization
   Jeff Blake (https://gitlab.com/u/berkley4) : more mouse event handlers
-  Vladimir <vladimir-csp@yandex.ru> : translations, bug reports
-  Christophe D. <stophe72.d@gmail.com> : non-rectangular borders
-  Benoit Averty : taskbar enhancements
-  Justin Jacobs : tint2conf fixes
-  Oskari Rauta : separator plugin, gradients
-  Michael Messmore : Support for Path in .desktop files
-  Matthew Otnel : config option systray_name_filter
-  Ryan Gray, Jeff Blake (https://gitlab.com/berkley4) : battery format
-  aaaz (https://gitlab.com/aaaz) : clock fixes
-  heisenbug (https://gitlab.com/heisenbugh) : taskbar button tinting with icon color
-
-Translations:
-  Bosnian:
-    Dino Duratović <dinomol@mail.com>
-  Croatian:
-    Dino Duratović <dinomol@mail.com>
-  French:
-    Jocelyn <anechampenois@solydxk.com>
-    The Bento team <meets@gmx.fr>
-    Wagner <https://gitlab.com/u/wagmic>
-  Polish:
-    Daniel Napora <napcok@gmail.com>
-  Serbian:
-    Dino Duratović <dinomol@mail.com>
-  Spanish:
-    Vic <vicmz@yandex.com>

CMakeLists.txt

@@ -1,85 +1,24 @@
 project( tint2 )
-cmake_minimum_required( VERSION 2.8.5 )
+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_EXTRA_THEMES "Install additional tint2 themes" ON )
+option( ENABLE_EXAMPLES "Install additional tin2rc examples" ON )
 option( ENABLE_RSVG "Rsvg support (launcher only)" ON )
 option( ENABLE_SN "Startup notification support" ON )
-option( ENABLE_TRACING "Build tint2 with tracing instrumentation" OFF )
 option( ENABLE_ASAN "Build tint2 with AddressSanitizer" OFF )
-option( ENABLE_BACKTRACE "Dump a backtrace in case of fatal errors (e.g. X11 I/O error)" OFF )
-option( ENABLE_BACKTRACE_ON_SIGNAL "Dump a backtrace also when receiving signals such as SIGSEGV" OFF )
-if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
-  option( ENABLE_UEVENT "Kernel event handling support" ON )
-endif( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
-
-include( GNUInstallDirs )
-if(NOT docdir)
-  set(docdir ${CMAKE_INSTALL_DOCDIR})
-endif()
-if(NOT htmldir)
-  set(htmldir ${docdir}/html)
-endif()
 
 include( FindPkgConfig )
 include( CheckLibraryExists )
-include( CheckCSourceCompiles )
+pkg_check_modules( X11 REQUIRED x11 xcomposite xdamage xinerama xrender xrandr>=1.3 )
-pkg_check_modules( X11 REQUIRED x11 xcomposite xdamage xinerama xext xrender xrandr>=1.3 )
 pkg_check_modules( PANGOCAIRO REQUIRED pangocairo )
 pkg_check_modules( PANGO REQUIRED pango )
 pkg_check_modules( CAIRO REQUIRED cairo )
 pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
 pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )
 pkg_check_modules( IMLIB2 REQUIRED imlib2>=1.4.2 )
-
-if(ENABLE_BACKTRACE)
-	check_c_source_compiles(
-		"#include <stdlib.h>\n#include <execinfo.h>\nint main () { backtrace(NULL, 0); }"
-		BACKTRACE_LIBC)
-
-	if(BACKTRACE_LIBC)
-		set(BACKTRACE_LIBC_FOUND TRUE)
-		set(BACKTRACE_L_FLAGS "-rdynamic")
-	else()
-		pkg_check_modules( UNWIND libunwind )
-		find_library(EXECINFO_LIBRARIES NAMES execinfo)
-		if(EXECINFO_LIBRARIES OR EXECINFO_LIBRARIES_FOUND)
-			set(EXECINFO_FOUND TRUE)
-			set(EXECINFO_LIBRARIES "-lexecinfo")
-			set(BACKTRACE_L_FLAGS "-rdynamic")
-		else()
-			set(EXECINFO_LIBRARIES "")
-			set(BACKTRACE_L_FLAGS "")
-		endif()
-	endif()
-
-	if( NOT BACKTRACE_LIBC_FOUND AND NOT UNWIND_FOUND AND NOT EXECINFO_FOUND )
-	  message( WARNING "Backtrace support not available. You can enable it by installing libexecinfo or libunwind." )
-	endif()
-else()
-	set(EXECINFO_LIBRARIES "")
-	set(BACKTRACE_L_FLAGS "")
-endif()
-
-check_c_source_compiles(
-    "#define print(x) _Generic((x), default : print_unknown)(x) \n void print_unknown(){} \n int main () { print(0); }"
-    HAS_GENERIC)
-
-if(HAS_GENERIC)
-    add_definitions(-DHAS_GENERIC)
-    set(CSTD "c11")
-else()
-    set(CSTD "c99")
-endif(HAS_GENERIC)
-
-if( ENABLE_RSVG )
 pkg_check_modules( RSVG librsvg-2.0>=2.14.0 )
-endif( ENABLE_RSVG )
-
-if( ENABLE_SN )
 pkg_check_modules( SN libstartup-notification-1.0>=0.12 )
-endif(ENABLE_SN)
 
 find_library( RT_LIBRARY rt )
 
@@ -94,13 +33,7 @@ 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 )
-add_definitions( -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_WITH_GETLINE )
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  add_definitions( -D_POSIX_C_SOURCE=200809L )
-endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-
 
 include_directories( ${PROJECT_BINARY_DIR}
                      src
@@ -111,10 +44,7 @@ include_directories( ${PROJECT_BINARY_DIR}
                      src/launcher
                      src/tooltip
                      src/util
-                     src/execplugin
-                     src/button
                      src/freespace
-                     src/separator
                      ${X11_INCLUDE_DIRS}
                      ${PANGOCAIRO_INCLUDE_DIRS}
                      ${PANGO_INCLUDE_DIRS}
@@ -127,13 +57,8 @@ include_directories( ${PROJECT_BINARY_DIR}
 
 set( SOURCES src/config.c
              src/panel.c
-             src/util/server.c
+             src/server.c
-             src/main.c
+             src/tint.c
-             src/init.c
-             src/util/signals.c
-             src/util/tracing.c
-             src/mouse_actions.c
-             src/drag_and_drop.c
              src/clock/clock.c
              src/systray/systraybar.c
              src/launcher/launcher.c
@@ -145,41 +70,15 @@ set( SOURCES src/config.c
              src/taskbar/taskbar.c
              src/taskbar/taskbarname.c
              src/tooltip/tooltip.c
-             src/execplugin/execplugin.c
-             src/button/button.c
              src/freespace/freespace.c
-             src/separator/separator.c
-             src/tint2rc.c
              src/util/area.c
              src/util/common.c
-             src/util/fps_distribution.c
              src/util/strnatcmp.c
              src/util/timer.c
-             src/util/cache.c
-             src/util/color.c
-             src/util/print.c
-             src/util/gradient.c
-             src/util/test.c
-             src/util/uevent.c
              src/util/window.c )
 
 if( ENABLE_BATTERY )
-  set( SOURCES ${SOURCES} src/battery/battery.c)
+  set( SOURCES ${SOURCES} src/battery/battery.c )
-
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set( SOURCES ${SOURCES} src/battery/linux.c)
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "DragonFly")
-    set( SOURCES ${SOURCES} src/battery/freebsd.c)
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-    set( SOURCES ${SOURCES} src/battery/freebsd.c)
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-    set( SOURCES ${SOURCES} src/battery/openbsd.c)
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
-    set( SOURCES ${SOURCES} src/battery/openbsd.c)
-  else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set( SOURCES ${SOURCES} src/battery/dummy.c)
-  endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-
   add_definitions( -DENABLE_BATTERY )
 endif( ENABLE_BATTERY )
 
@@ -199,30 +98,6 @@ if( ENABLE_SN )
   endif( SN_FOUND )
 endif( ENABLE_SN)
 
-if( ENABLE_UEVENT )
-  add_definitions( -DENABLE_UEVENT )
-endif( ENABLE_UEVENT )
-
-if(ENABLE_BACKTRACE)
-	if(BACKTRACE_LIBC_FOUND)
-	  add_definitions( -DENABLE_EXECINFO )
-	endif()
-
-	if( UNWIND_FOUND )
-	  add_definitions( -DENABLE_LIBUNWIND )
-	endif( UNWIND_FOUND )
-
-	if( EXECINFO_FOUND )
-	  add_definitions( -DENABLE_EXECINFO )
-	endif( EXECINFO_FOUND )
-
-	if(ENABLE_BACKTRACE_ON_SIGNAL)
-		add_definitions( -DBACKTRACE_ON_SIGNAL )
-	endif()
-else()
-	add_definitions( -DDISABLE_BACKTRACE )
-endif()
-
 if( ENABLE_TINT2CONF )
   add_definitions( -DHAVE_VERSION_H )
   add_subdirectory( src/tint2conf )
@@ -230,23 +105,19 @@ if( ENABLE_TINT2CONF )
 endif( ENABLE_TINT2CONF )
 
 if( ENABLE_ASAN )
-  SET(ASAN_C_FLAGS " -O0 -g3 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic -Wshadow")
+  SET(ASAN_C_FLAGS " -O0 -g3 -gdwarf-2 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic ")
-  SET(ASAN_L_FLAGS " -O0 -g3 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic -fuse-ld=gold ")
+  SET(ASAN_L_FLAGS " -O0 -g3 -gdwarf-2 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic ")
 else()
   SET(ASAN_C_FLAGS "")
   SET(ASAN_L_FLAGS "")
 endif()
 
-if( ENABLE_TRACING )
+set( MANDIR share/man CACHE PATH "Directory for man pages" )
-  add_definitions( -DHAVE_TRACING )
+set( DATADIR share CACHE PATH "Directory for shared data" )
-  SET(TRACING_C_FLAGS " -finstrument-functions -finstrument-functions-exclude-file-list=tracing.c -finstrument-functions-exclude-function-list=get_time,gettime -O0 -g3 -fno-common -fno-omit-frame-pointer -rdynamic")
+set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" )
-  SET(TRACING_L_FLAGS " -O0 -g3 -fno-common -fno-omit-frame-pointer -rdynamic")
+set( DOCDIR share/doc/tint2 CACHE PATH "Directory for documentation files" )
-else()
-  SET(TRACING_C_FLAGS "")
-  SET(TRACING_L_FLAGS "")
-endif()
 
-add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" -- "\"${PROJECT_SOURCE_DIR}/\"" )
+add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" "\"${PROJECT_SOURCE_DIR}\"" )
 
 link_directories( ${X11_LIBRARY_DIRS}
                   ${PANGOCAIRO_LIBRARY_DIRS}
@@ -264,15 +135,9 @@ target_link_libraries( tint2 ${X11_LIBRARIES}
                              ${CAIRO_LIBRARIES}
                              ${GLIB2_LIBRARIES}
                              ${GOBJECT2_LIBRARIES}
-							 ${IMLIB2_LIBRARIES}
+                             ${IMLIB2_LIBRARIES}
-							 ${UNWIND_LIBRARIES}
+                             ${RSVG_LIBRARIES}
-							 ${EXECINFO_LIBRARIES} )
+                             ${SN_LIBRARIES} )
-if( ENABLE_RSVG )
-  target_link_libraries( tint2 ${RSVG_LIBRARIES} )
-endif( ENABLE_RSVG )
-if( ENABLE_SN )
-  target_link_libraries( tint2 ${SN_LIBRARIES} )
-endif( ENABLE_SN )
 if( RT_LIBRARY )
   target_link_libraries( tint2 ${RT_LIBRARY} )
 endif( RT_LIBRARY )
@@ -280,18 +145,18 @@ endif( RT_LIBRARY )
 target_link_libraries( tint2 m )
 
 add_dependencies( tint2 version )
-set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=${CSTD} ${ASAN_C_FLAGS} ${TRACING_C_FLAGS}" )
+set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -fno-strict-aliasing -pthread ${ASAN_C_FLAGS}" )
-set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS} ${BACKTRACE_L_FLAGS}  ${TRACING_L_FLAGS}" )
+set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS}" )
 
 install( TARGETS tint2 DESTINATION bin )
-install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
-install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
+install( FILES tint2.desktop DESTINATION ${DATADIR}/applications )
-install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
+install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
-install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
-install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
+install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
-install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
+install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
-install( DIRECTORY doc/images DESTINATION ${htmldir} )
+install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
-install( FILES doc/tint2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
+if( ENABLE_EXAMPLES )
-if( ENABLE_EXTRA_THEMES )
+  file( GLOB SAMPLEFILES sample/*.tint2rc )
-  add_subdirectory(themes)
+  install( FILES ${SAMPLEFILES} DESTINATION ${DATADIR}/tint2 )
-endif( ENABLE_EXTRA_THEMES )
+endif( ENABLE_EXAMPLES )

CONTRIBUTING.md

@@ -1 +0,0 @@
-Please read https://gitlab.com/o9000/tint2/wikis/Development

ChangeLog

@@ -1,284 +1,9 @@
-2017-12-20 16.0
-- Fixes:
-  - Taskbar: `taskbar_distribute_size = 1` now playes well with `task_align = center` and
-    `task_align = right` (issue #688)
-- Enhancements:
-  - Added Spanish translation (contributed by Vicmz)
-  - Executor: updated tooltip documentation (issue #676)
-  - Systray: warn on duplicate config option systray_name_filter (issue #652)
-  - Changed standard from C99 to C11 to support generic printing for unit tests
-
-2017-11-05 15.3
-- Fixes:
-  - Launcher: Reset signal mask before executing commands (issue #674)
-  - cmake: Do not hardcode path to /etc
-
-2017-10-01 15.2
-- Fixes:
-  - Battery info is now again displayed even when current sensor is missing (https://github.com/jmc-88/tint3/issues/34)
-  - Text elements compute their size correctly (issue #671)
-  - Window order persists on panel restart (issue #615)
-
-2017-09-08 15.1
-- Fixes:
-  - Fixed build on non-Linux and non-x86 systems
-
-2017-09-02 15.0
-- Fixes:
-  - Clock, executors and other timers fire correctly after waking up from suspend
-  - One-shot timers are restarted correctly from their own callbacks
-  - Clock is refreshed with better accuracy (thanks @aaaz)
-  - Panel: by popular demand, the old struts behavior with autohide has been restored (issue #619);
-    if you encounter applications that interact poorly with it,
-	you might have better luck with strut_policy = minimum,
-	if that does not work, you will have to turn off autohide.
-- Enhancements:
-  - Panel:
-    - _NET_WM_PID is set correctly, so now tint2 can be interacted with more easily from wmctrl and similar apps
-  - Taskbar: new config option taskbar_hide_different_desktop
-  - Battery:
-    - New config option bat1_format and bat2_format
-	- New config option battery_full_cmd
-	- Better "Unknown" state handling
-  - Executor:
-    - Hide if output is empty
-    - If no user tooltip is set, displays the script standard error as tooltip.
-      Tooltip is multiline, can be cleared with the VT100 clear screen sequence, in shell: (>&2 echo -en "\033[2J").
-      Long tooltips are truncated to 4096 characters.
-  - Launcher:
-    - Drag and drop now handles correctly text/uri-list
-    - Support for Terminal=true
-    - Support for %f and %F
-- Configuration changes:
-  - Removed primary_monitor_first as it was conflicting with taskbar behavior; use *_monitor = primary instead.
-- Other:
-  - Major code refactoring
-- Dropping "0." from the version number and no longer using semver ("Breaking.Feature.Fix").
-  - Tint2 will always strive to be backwards compatible with respect to the configuration format.
-  - Very few configurations changes have been broken between 2010 (0.10) - 2017 (0.14);
-    in all cases they were minor options that caused incorrect behavior,
-    and the changes were described better by "Feature" or "Fix".
-  - Practically all releases starting from 0.10 have been very stable,
-    so there is no point in staying in "0." anymore.
-  - But I don't want the project to get stuck in "1." forever.
-  - The new versioning scheme is the following:
-    - Version numbers will have the format "Feature.Fix", where:
-      - "Feature" is increased when significant new features are added.
-      - "Fix" is increased for bugfixes or minor changes.
-    - 0.14.6 will be followed by 15.0.
-
-2017-06-11 0.14.6
-- Fixes:
-  - Take into account border width when computing text height
-  - Taskbar: Fix task icon size limits
-  - Executor: Do not output last line if it is not terminated by newline
-- Enhancements:
-  - Re-execute tint2 on SIGUSR2.
-    This is useful for preserving config options and environment when updating tint2.
-
-2017-05-21 0.14.5
-- Fixes:
-  - Fixed a couple of memory leaks
-
-2017-04-29 0.14.4
-- Fixes:
-  - Fix regression in executor (issue #639)
-  - Fix crash when _NET_WM_ICON is set but empty (https://github.com/jmc-88/tint3/issues/21)
-
-2017-04-23 0.14.3
-- Fixes:
-  - Make versioning more robust when building as package
-- Enhancements:
-  - Tint2conf: Open current tint2 config automatically when started from tint2
-
-2017-03-26 0.14.1
-- Fixes:
-  - Fixed tint2conf problem under FreeBSD (or generally any system using clang).
-
-2017-03-26 0.14
-- Enhancements:
-  - New plugin: button.
-
-2017-03-25 0.13.3
-- Fixes:
-  - Fixed autohide for non-bottom panels (issue #632)
-  - Translations updated (contributed by Vladimir)
-
-2017-03-19 0.13.2
-- Fixes:
-  - Fixed compilation under FreeBSD
-
-2017-03-12 0.13.1
-- Fixes:
-  - Fixed compilation with new glibc (issue #625)
-  - Fixed regression in distributing size between taskbars (issue #628)
-  - Create ~/.config dir if it does not exist (issue #629)
-- Enhancements:
-  - New config option systray_name_filter to hide hide specific apps from the system tray (contributed by Matthew Otnel)
-  - Tint2conf: minor improvements
-
-2017-03-04 0.13
-- Fixes:
-  - Ignore monitors with size 0, fixing crash (issue #618)
-  - Battery: support Asus Chromebook Flip C100PA (issue #616)
-  - Panel: do not change struts (available screen size) when shown in autohide mode (issue #619)
-  - tint2conf: executor tooltips are now correctly disabled when text config value is empty (contributed by Justin Jacobs)
-- Enhancements:
-  - Desktop files (shortcuts) used in launcher are reloaded on click, in case the file has changed
-  - New config option taskbar_hide_if_empty to hide an empty taskbar in multi_desktop mode (contributed by Benoit Averty)
-  - Gradient backgrounds (contributed by Oskari Rauta)
-  - New option: panel_shrink (fixes issue #333)
-  - Support for Path in .desktop files (contributed by Michael Messmore)
-  - Tint2conf start up is much faster
-- New plugin: separator (contributed by Oskari Rauta)
-
-2016-08-02 0.12.12
-- Fixes:
-  - Set task maximum height equal to width if not specified, instead of hardcoding 30 (issue #583; thanks @VastOne)
-  - tint2conf
-    - Process background selection events correctly (issue #582)
-	- Menus accessible with keyboard shortcuts (issue #590)
-- Enhancements:
-  - Borders can now be drawn on only some sides; configurable with the option border_sides (issue #580; thanks @stophe)
-  - Updated man page
-  - The geometry of panel items is printed to stderr if the environment variable DEBUG_GEOMETRY is set
-
-2016-05-14 0.12.11
-- Fixes:
-  - tint2conf:
-    - Fixed crash in tint2conf when adding background
-    - Add correct extension to file name in tint2conf for 'Save as'
-    - Changed main window title in tint2conf
-
-2016-05-07 0.12.10
-- Fixes:
-  - Fixed crash in systray with non-Latin languagess (thanks zcodes)
-  - Invalidate cached pixmaps on resize/move (issue #576)
-  - Battery: do not show negative durations when the sensors return garbage
-  - Proper workaround for issue #555
-
-2016-04-02 0.12.9
-- Fixes:
-  - Regression: Do not detect empty areas as clickable (issue #572)
-  - Regression: Position and resize task icon correctly (issue #575)
-  - Use imlib2 for taking screenshot; if it fails, use Xlib (issue #574)
-  - Battery: lower sample frequency when there is no support for reading current/power
-
-2016-03-25 0.12.8
-- Major changes (see details below):
-  - Icon cache and lazy icon theme loading to improve performance in tint2 and tint2conf
-  - Extra tint2rc themes are installed to /usr/share/tint2 and available in tint2conf
-  - Tint2conf GUI improvements
-- Config options with changed behavior:
-  - The launcher now also allows launcher_item_app entries without a full path.
-    In this case the .desktop file is searched in the standard application directories (issue #565).
-  - If the panel size is given as a percentage and a non-zero margin is also specified,
-    the size is now computed as a fraction of the available size (i.e. monitor size - margin).
-    Before it was computed as a fraction of the monitor size first, then the margin was subtracted from the value, which
-    was not intuitive (issue #559).
-- Fixes:
-  - Taskbar icons are now resized correctly for certain geometries (issue #560)
-  - Fix get_version.sh so that it returns the correct version when .git is missing
-  - Fix build on powerpc
-  - Temporary files are now created in /tmp
-  - The XDG paths are now used in the icon and application lookup in addition to the hardcoded defaults
-  - Brigtness adjustments no longer distort colors
-  - Fixed race in sorting systray icons by name
-  - Fixed desktop entry parsing (issue #570)
-  - tint2conf:
-    - Applications are now sorted correctly
-    - Avoid duplicate icon themes due to symlinks
-    - Avoid loading desktop files marked as NoDisplay
-- Enhancements:
-  - Launcher icon paths are now cached, which greatly improves loading time for tint2 and tint2conf.
-    The correct icon should be found even if you change the icon theme or install a new theme.
-    If this is not the case, delete the file ~/.cache/tint2/icon.cache, restart tint2 and please file a bug report
-    indicating the application name and the icon theme name.
-  - Fallback icon themes are loaded lazily to speed up tint2 and tint2conf startup
-  - A better Name and GenericName is used in the tint2 and tint2conf .desktop files
-  - tint2conf:
-    - Allows selection of themes from /usr/share
-    - Menu reorganization (thanks @Vladimir-csp for feedback)
-    - Icon themes are now sorted in the displayed list
-    - Updated ru translation (thanks @Vladimir-csp)
-
-2016-01-29 0.12.7
-- Fixes:
-  - Fix crash caused by race when reading inconsistent values for _NET_CURRENT_DESKTOP and _NET_NUMBER_OF_DESKTOPS
-  - Fix regression (all desktop tasks not working)
-  - Fix small memory leak in launcher
-
-2016-01-25 0.12.6
-- Fixes:
-  - Fix crash on 32-bit systems (issue #546)
-  - Fix compilation on Slackware (issue #547)
-  - Terminal color reset code moved to the same line to prevent interference with logging (issue #545)
-- Enhancements:
-  - Executor now sends click coordinates via environment variables (issue #544)
-
-2016-01-24 0.12.5
-- Fixes:
-  - Fix rendering corruption triggered occasionally when the compositor is disabled (regression in 0.12.4)
-
-2016-01-23 0.12.4
-- Enhancements:
-  - Support for NETWM viewports (as used by Compiz or Unity) (issue #94)
-  - The default desktop font (Gtk/FontName from XSettings) is used when a font is not specified in the config file
-  - When no fonts are specified in the config, tint2 picks up the default font of the desktop environment via XSettings
-  - Tint2 is now able to dump a stack trace to stderr and ~/.tint2-crash.log in case of a crash.
-    If the cmake flag ENABLE_BACKTRACE is set, stack traces are dumped on X11 I/O errors.
-    If the cmake flag ENABLE_BACKTRACE_ON_SIGNAL is set, stack traces are dumped also on signals such as SIGSEGV.
-    Both ENABLE_BACKTRACE and ENABLE_BACKTRACE_ON_SIGNAL are disabled by default.
-  - Pixmaps are cached instead of always redrawn between different button states when mouse effects are enabled,
-    to improve performance
-  - Tooltips are no longer very wide
-  - Default config looks nicer
-- New config options:
-  - Executor: new plugin that displays the output of a command in the panel (issue #161)
-  - New taskbar sort order options: least-recently-used (lru), most-recently-used (mru) (issue #532)
-  - Place the primary monitor before all the other monitors (primary_monitor_first, issue #538)
-  - taskbar_always_show_all_desktop_tasks (issue #279)
-- Config options with changed behavior:
-  - Mouse effects are enabled by default
-- Fixes:
-  - Battery changes visibility correctly (issue #531)
-  - Fixed rendering corruption (issue #543)
-  - Reverted the window flags back to the value in 0.11 to make sure the window manager detects that tint2 is a panel
-    (affected kwin, bspwm; fixes issue #537, breaks issue #455)
-  - Fixed a rare crash caused by the system tray code
-  - The system tray now reorders icons correctly when the icon name changes and the sorting order is configured as
-    ascending or descending (affected GTK icons, which sometimes set their name late after creating the icon)
-  - Tint2conf no longer copies sample themes to ~/.config
-- New optional dependencies:
-  - libexecinfo on the *BSDs (only if the cmake flag ENABLE_BACKTRACE is set)
-
-2015-11-12 0.12.3
-- Enhancements:
-  - Battery: Multiple batteries are now supported under Linux (issue #139;
-    thanks to Sebastian Reichel)
-  - Battery: The time left for charging/discharging the battery is now estimated
-    when the system is not able to read current data from sensors (issue #522;
-    thanks to Sebastian Reichel)
-  - Battery: Reacts to plug/unplug events (thanks to Sebastian Reichel)
-  - tint2conf: Backgrounds now have a text label showing which panel component
-    uses them, to make them easier to identify; the label is saved as a comment
-    in the config file (issue #521)
-- New config options:
-  - Mouse over effects (mouse_effects, background_color_hover, border_color_hover)
-  - Launcher icon background (launcher_icon_background_id)
-  - Enable/disable battery tooltips (battery_tooltip_enabled)
-- Fixes:
-  - Updated French translation
-  - The correct icon is now used in tint2.desktop (issue #523)
-  - The font setting for the desktop name is no longer lost on tint2 restart
-
 2015-08-11 0.12.2
 - Fixes:
   - Systray: do not move empty icons to the side, as it breaks GTK2 StatusIcon blinking (issue #515)
   - tint2conf: Fix read of panel_monitor (issue #520)
   - Fix command line argument processing (issue #516)
   - Fix battery option parsing
-
 2015-08-01 0.12.1
 - Fixes:
   - Config:
@@ -295,7 +20,6 @@
 	- 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
@@ -970,9 +694,4 @@ released tint-0.2
 
 2008-04-22
 - fork ttm projet from p://code.google.com/p/ttm/ (by Pål Staurland staura@gmail.com)
-  while the projet is no longer in developpement, have not changed the name of 'tint'.
+  while the projet is no longer in developpement, have not changed the name of 'tint'.
-.
-.
-.
-.
-.

INSTALL.txt

@@ -0,0 +1,10 @@
+To build and install tint2 you need CMake.
+These steps should be enough for building tint2:
+
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=/usr ../
+make
+sudo make install
+
+To see additional options you can set at the 'cmake' step, run 'cmake -L ../'

README.md

@@ -1,39 +1,38 @@
-# Latest stable release: 16.0
+### New stable release: 0.12.2
-Changes: https://gitlab.com/o9000/tint2/blob/16.0/ChangeLog
+Changes: https://gitlab.com/o9000/tint2/blob/0.12.2/ChangeLog
 
-Documentation: [doc/tint2.md](doc/tint2.md)
+Documentation: https://gitlab.com/o9000/tint2/wikis/home
-
-Compile it with (after you install the [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 
+Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 16.0
+git checkout 0.12.2
 mkdir build
 cd build
 cmake ..
 make -j4
+./tint2 &
+./src/tint2conf/tint2conf &
 ```
 
-To install, run (as root):
+To install from source, also run (as root):
-
 ```
 make install
-update-icon-caches /usr/local/share/icons/hicolor
-update-mime-database /usr/local/share/mime
 ```
 
-And then you can run the panel `tint2` and the configuration program `tint2conf`.
-
 Please report any problems to https://gitlab.com/o9000/tint2/issues. Your feedback is much appreciated.
 
+Known issues:
+* [System tray resize loop with GTK applications](https://gitlab.com/o9000/tint2/issues/509), see also the [GTK bug report](https://bugzilla.gnome.org/show_bug.cgi?id=710375). Fix landed in 0.12.1, if there are still problems please let me know.
+
 P.S. GitLab is now the official location of the tint2 project, migrated from Google Code, which is shutting down. In case you are wondering why not GitHub, BitBucket etc., we chose GitLab because it is open source, it is mature and works well, looks cool and has a very nice team.
 
-# What is tint2?
+### What is tint2?
 
-tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm https://code.google.com/p/ttm/.
+tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm http://code.google.com/p/ttm/.
 
-# Features
+### Features
 
   * Panel with taskbar, system tray, clock and launcher icons;
   * Easy to customize: color/transparency on fonts, icons, borders and backgrounds;
@@ -41,60 +40,38 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
   * Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;
   * Customizable mouse events.
 
-# Goals
+### Goals
 
   * Be unintrusive and light (in terms of memory, CPU and aesthetic);
   * Follow the freedesktop.org specifications;
   * Make certain workflows, such as multi-desktop and multi-monitor, easy to use.
 
-# I want it!
+### I want it!
 
   * [Install tint2](https://gitlab.com/o9000/tint2/wikis/Install)
 
-# How do I ...
+### How do I ...
 
   * [Install](https://gitlab.com/o9000/tint2/wikis/Install)
-  * [Configure](https://gitlab.com/o9000/tint2/blob/master/doc/tint2.md)
+  * [Configure](https://gitlab.com/o9000/tint2/wikis/Configure)
   * [Add applet not supported by tint2](https://gitlab.com/o9000/tint2/wikis/ThirdPartyApplets)
   * [Other frequently asked questions](https://gitlab.com/o9000/tint2/wikis/FAQ)
-  * [Obtain a stack trace when tint2 crashes](https://gitlab.com/o9000/tint2/wikis/Debug)
+  * [Debug](https://gitlab.com/o9000/tint2/wikis/Debug)
 
-# Known issues
+### How can I help out?
-
-  * Graphical glitches on Intel graphics cards can be avoided by changing the acceleration method to UXA ([issue 595](https://gitlab.com/o9000/tint2/issues/595))
-  * Window managers that do not follow exactly the EWMH specification might not interact well with tint2 ([issue 627](https://gitlab.com/o9000/tint2/issues/627)).
-  * Full transparency requires a compositor such as Compton (if not provided already by the window manager, as in Compiz/Unity, KDE or XFCE).
-
-# How can I help out?
 
   * Report bugs and ask questions on the [issue tracker](https://gitlab.com/o9000/tint2/issues);
-  * Contribute to the development by helping us fix bugs and suggesting new features. Please read the contribution guide: [CONTRIBUTING.md](CONTRIBUTING.md)
+  * Contribute to the development by helping us fix bugs and suggesting new features.
 
-# Links
+### Links
   * Home page: https://gitlab.com/o9000/tint2
   * Git repository: https://gitlab.com/o9000/tint2.git
   * Documentation: https://gitlab.com/o9000/tint2/wikis/home
   * Downloads: https://gitlab.com/o9000/tint2-archive/tree/master or https://code.google.com/p/tint2/downloads/list
   * Old project location (inactive): https://code.google.com/p/tint2
 
-# Screenshots
+### Releases
+  * Latest stable release: tint2 0.12.2 (August 2015)
 
-## Default config:
+### Screenshots
-
+![screenshot](https://gitlab.com/o9000/tint2/wikis/screenshot.png)
-![Screenshot_2016-01-23_14-42-57](https://gitlab.com/o9000/tint2/uploads/948fa74eca60864352a033580350b4c3/Screenshot_2016-01-23_14-42-57.png)
-
-## Various configs:
-
-* [Screenshots](https://gitlab.com/o9000/tint2/wikis/screenshots)
-
-## Demos
-
-* [Compact panel, separator, color gradients](https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.0.gif)
-* [Executor](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.4.gif)
-* [Mouse over effects](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.3.gif)
-* [Distribute size between taskbars, freespace](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif)
-
-## More
-
-* [Tint2 wiki](https://gitlab.com/o9000/tint2/wikis/Home)
-Home)

README.source

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

doc/footer.html

@@ -1,2 +0,0 @@
-</body>
-</html>

doc/generate-doc.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# You can install md2man with gem install md2man. You need gem and ruby-dev.
-
-set -e
-set -x
-
-md2man-roff tint2.md > tint2.1
-
-cat header.html > manual.html
-cat tint2.md | sed 's/^# TINT2 .*$/# TINT2/g' | md2man-html >> manual.html
-cat footer.html >> manual.html
-
-cat header.html > readme.html
-cat ../README.md | sed 's|doc/tint2.md|manual.html|g' | md2man-html >> readme.html
-cat footer.html >> readme.html

doc/header.html

@@ -1,201 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<head>
-<style type="text/css">
-html,
-body {
-  color: #333;
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 1.6;
-  word-wrap: break-word;
-  max-width: 1000px;
-  margin: 0 auto;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin-top: 1em;
-  margin-bottom: 1rem;
-}
-
-h1 {
-  font-size: 1.8rem;
-  font-weight: normal;
-  font-style: normal;
-  border-bottom: 1px solid #eee;
-}
-
-h2 {
-  font-size: 1.5rem;
-  font-weight: normal;
-  font-style: normal;
-  border-bottom: 1px solid #eee;
-}
-
-h3 {
-  font-size: 1.2rem;
-  font-weight: bold;
-  font-style: normal;
-}
-
-h4 {
-  font-size: 1rem;
-  font-weight: bold;
-  font-style: normal;
-}
-
-h5 {
-  font-size: 1rem;
-  font-weight: bold;
-  font-style: italic;
-}
-
-h6 {
-  font-size: 1rem;
-  font-weight: normal;
-  font-style: italic;
-}
-
-
-code,
-kbd,
-pre {
-  font-family: monospace;
-  font-size: 1em;
-}
-
-table {
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-
-td,
-th {
-  padding: 0;
-}
-
-asdff {
-  box-sizing: border-box;
-}
-
-a {
-  color: #46c;
-  text-decoration: none;
-}
-
-a:hover,
-a:active {
-  text-decoration: underline;
-}
-
-a:not([href]) {
-  color: inherit;
-  text-decoration: none;
-}
-
-hr {
-  box-sizing: content-box;
-  height: 0;
-  margin: 15px 0;
-  overflow: hidden;
-  background: transparent;
-  border: 0;
-  border-bottom: 1px solid #ddd;
-}
-
-hr::before {
-  display: table;
-  content: "";
-}
-
-hr::after {
-  display: table;
-  clear: both;
-  content: "";
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 0.7em;
-}
-
-blockquote {
-  margin: 0;
-}
-
-code {
-  font-family: "Liberation Mono", monospace;
-  font-size: 1em;
-}
-
-pre {
-  margin-top: 0;
-  margin-bottom: 0;
-  font: 1em "Liberation Mono", monospace;
-  overflow-x: auto;
-}
-
-blockquote {
-  padding: 0 15px;
-  color: #777;
-  border-left: 4px solid #ddd;
-}
-
-blockquote>:first-child {
-  margin-top: 0;
-}
-
-blockquote>:last-child {
-  margin-bottom: 0;
-}
-
-table {
-  display: block;
-  width: 100%;
-  overflow: auto;
-  word-break: normal;
-}
-
-table th {
-  font-weight: bold;
-}
-
-table th,
-table td {
-  padding: 6px 13px;
-  border: 1px solid #ddd;
-}
-
-table tr {
-  background-color: #fff;
-  border-top: 1px solid #ccc;
-}
-
-table tr:nth-child(2n) {
-  background-color: #f8f8f8;
-}
-
-code {
-  padding: 0.2em;
-  margin: 0;
-  font-size: 0.95em;
-  background-color: #eee;
-}
-
-pre {
-  word-wrap: normal;
-  background-color: #eee;
-  margin: 1em 0;
-  padding: 0.2em;
-}
-
-
-</style>
-</head>
-<body>

doc/manual.html

@@ -1,704 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<head>
-<style type="text/css">
-html,
-body {
-  color: #333;
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 1.6;
-  word-wrap: break-word;
-  max-width: 1000px;
-  margin: 0 auto;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin-top: 1em;
-  margin-bottom: 1rem;
-}
-
-h1 {
-  font-size: 1.8rem;
-  font-weight: normal;
-  font-style: normal;
-  border-bottom: 1px solid #eee;
-}
-
-h2 {
-  font-size: 1.5rem;
-  font-weight: normal;
-  font-style: normal;
-  border-bottom: 1px solid #eee;
-}
-
-h3 {
-  font-size: 1.2rem;
-  font-weight: bold;
-  font-style: normal;
-}
-
-h4 {
-  font-size: 1rem;
-  font-weight: bold;
-  font-style: normal;
-}
-
-h5 {
-  font-size: 1rem;
-  font-weight: bold;
-  font-style: italic;
-}
-
-h6 {
-  font-size: 1rem;
-  font-weight: normal;
-  font-style: italic;
-}
-
-
-code,
-kbd,
-pre {
-  font-family: monospace;
-  font-size: 1em;
-}
-
-table {
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-
-td,
-th {
-  padding: 0;
-}
-
-asdff {
-  box-sizing: border-box;
-}
-
-a {
-  color: #46c;
-  text-decoration: none;
-}
-
-a:hover,
-a:active {
-  text-decoration: underline;
-}
-
-a:not([href]) {
-  color: inherit;
-  text-decoration: none;
-}
-
-hr {
-  box-sizing: content-box;
-  height: 0;
-  margin: 15px 0;
-  overflow: hidden;
-  background: transparent;
-  border: 0;
-  border-bottom: 1px solid #ddd;
-}
-
-hr::before {
-  display: table;
-  content: "";
-}
-
-hr::after {
-  display: table;
-  clear: both;
-  content: "";
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 0.7em;
-}
-
-blockquote {
-  margin: 0;
-}
-
-code {
-  font-family: "Liberation Mono", monospace;
-  font-size: 1em;
-}
-
-pre {
-  margin-top: 0;
-  margin-bottom: 0;
-  font: 1em "Liberation Mono", monospace;
-  overflow-x: auto;
-}
-
-blockquote {
-  padding: 0 15px;
-  color: #777;
-  border-left: 4px solid #ddd;
-}
-
-blockquote>:first-child {
-  margin-top: 0;
-}
-
-blockquote>:last-child {
-  margin-bottom: 0;
-}
-
-table {
-  display: block;
-  width: 100%;
-  overflow: auto;
-  word-break: normal;
-}
-
-table th {
-  font-weight: bold;
-}
-
-table th,
-table td {
-  padding: 6px 13px;
-  border: 1px solid #ddd;
-}
-
-table tr {
-  background-color: #fff;
-  border-top: 1px solid #ccc;
-}
-
-table tr:nth-child(2n) {
-  background-color: #f8f8f8;
-}
-
-code {
-  padding: 0.2em;
-  margin: 0;
-  font-size: 0.95em;
-  background-color: #eee;
-}
-
-pre {
-  word-wrap: normal;
-  background-color: #eee;
-  margin: 1em 0;
-  padding: 0.2em;
-}
-
-
-</style>
-</head>
-<body>
-<h1 id="tint2"><span class="md2man-title">TINT2</span><a name="tint2" href="#tint2" class="md2man-permalink" title="permalink"></a></h1><h2 id="name">NAME<a name="name" href="#name" class="md2man-permalink" title="permalink"></a></h2><p>tint2 - lightweight panel/taskbar</p><h2 id="description">DESCRIPTION<a name="description" href="#description" class="md2man-permalink" title="permalink"></a></h2><p>tint2 is a simple panel/taskbar made for modern X window managers.
-It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.).</p><p>Features:</p>
-<ul>
-<li>Panel with taskbar, system tray, clock and launcher icons;</li>
-<li>Easy to customize: color/transparency on fonts, icons, borders and backgrounds;</li>
-<li>Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;</li>
-<li>Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;</li>
-<li>Customizable mouse events.</li>
-</ul>
-<p>Goals:</p>
-<ul>
-<li>Be unintrusive and light (in terms of memory, CPU and aesthetic);</li>
-<li>Follow the freedesktop.org specifications;</li>
-<li>Make certain workflows, such as multi-desktop and multi-monitor, easy to use.</li>
-</ul>
-<h2 id="synopsis">SYNOPSIS<a name="synopsis" href="#synopsis" class="md2man-permalink" title="permalink"></a></h2><p><code>tint2 [OPTION...]</code></p><h2 id="options">OPTIONS<a name="options" href="#options" class="md2man-permalink" title="permalink"></a></h2><dl><dt><code>-c path_to_config_file</code></dt><dd>Specifies which configuration file to use instead of the default.</dd></dl><dl><dt><code>-v, --version</code></dt><dd>Prints version information and exits.</dd></dl><dl><dt><code>-h, --help</code></dt><dd>Display this help and exits.</dd></dl><h2 id="configuration">CONFIGURATION<a name="configuration" href="#configuration" class="md2man-permalink" title="permalink"></a></h2><h3 id="table-of-contents">Table of contents<a name="table-of-contents" href="#table-of-contents" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><a href="#introduction">Introduction</a></p></li>
-<li><p><a href="#backgrounds-and-borders">Backgrounds and borders</a></p></li>
-<li><p><a href="#gradients">Gradients</a></p></li>
-<li><p><a href="#panel">Panel</a></p></li>
-<li><p><a href="#launcher">Launcher</a></p></li>
-<li><p><a href="#taskbar-pager">Taskbar/Pager</a></p></li>
-<li><p><a href="#taskbar-buttons">Taskbar buttons</a></p></li>
-<li><p><a href="#mouse-actions-for-taskbar-buttons">Mouse actions for taskbar buttons</a></p></li>
-<li><p><a href="#system-tray">System tray</a></p></li>
-<li><p><a href="#clock">Clock</a></p></li>
-<li><p><a href="#tooltip">Tooltip</a></p></li>
-<li><p><a href="#battery">Battery</a></p></li>
-<li><p><a href="#executor">Executor</a></p></li>
-<li><p><a href="#button">Button</a></p></li>
-<li><p><a href="#separator">Separator</a></p></li>
-<li><p><a href="#example-configuration">Example configuration</a></p></li>
-</ul>
-<h3 id="introduction">Introduction<a name="introduction" href="#introduction" class="md2man-permalink" title="permalink"></a></h3><p>These are instructions for configuring tint2 directly by editing its config file.
-You may also use instead the graphical interface <code>tint2conf</code>.</p><p>The first time you run tint2, it will create the config file in <code>$HOME/.config/tint2/tint2rc</code> (This applies if you have done a clean install. Running tint2 in the source directory without doing &#39;make install&#39; will not create the config file.)</p><p>You can also specify another file on the command line with the -c option, e.g.: <code>tint2 -c $HOME/tint2.conf</code>. This can be used to run multiple instances of tint2 that use different settings.</p><p>If you change the config file while tint2 is running, the command <code>killall -SIGUSR1 tint2</code> will force tint2 to reload it.</p><p>All the configuration options supported in the config file are listed below.
-Try to respect as much as possible the order of the options as given below.</p><h3 id="backgrounds-and-borders">Backgrounds and borders<a name="backgrounds-and-borders" href="#backgrounds-and-borders" class="md2man-permalink" title="permalink"></a></h3><p>The tint2 config file starts with the options defining background elements with borders:</p>
-<ul>
-<li><p><code>rounded = number_of_pixels</code> : the corner radius</p></li>
-<li><p><code>border_width = integer</code> : the border width in pixels</p></li>
-<li><p><code>border_sides = LRTB</code> : the sides to draw the border on (left, right, top, bottom). If not specified, all sides are used. <em>(since 0.12.12)</em></p></li>
-<li><p><code>background_color = color opacity</code></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz).</li>
-</ul></li>
-<li><p><code>border_color = color opacity</code></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
-</ul></li>
-<li><p><code>background_color_hover = color opacity</code> (default: same as <code>background_color</code>) <em>(since 0.12.3)</em></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)</li>
-</ul></li>
-<li><p><code>border_color_hover = color opacity</code> (default: same as <code>border_color</code>) <em>(since 0.12.3)</em></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
-</ul></li>
-<li><p><code>background_color_pressed = color opacity</code> (default: same as <code>background_color_hover</code>) <em>(since 0.12.3)</em></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)</li>
-</ul></li>
-<li><p><code>border_color_pressed = color opacity</code> (default: same as <code>border_color_hover</code>) <em>(since 0.12.3)</em></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
-</ul></li>
-<li><p><code>border_content_tint_weight = integer</code> : Mixes the border color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). <em>(since 16.0)</em></p></li>
-<li><p><code>background_content_tint_weight = integer</code> : Mixes the background color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). <em>(since 16.0)</em></p></li>
-</ul>
-<p>You can define as many backgrounds as you want. For example, the following config defines two backgrounds:</p><pre class="highlight plaintext"><code>rounded = 1
-border_width = 0
-background_color = #282828 100
-border_color = #000000 0
-
-rounded = 1
-border_width = 0
-background_color = #f6b655 90
-border_color = #cccccc 40
-</code></pre>
-<p>tint2 automatically identifies each background with a number starting from 1 (1, 2, ...).
-Afterwards, you can apply a background to objects (panel, taskbar, task, clock, systray) using the background id, for example:</p><pre class="highlight plaintext"><code>panel_background_id = 1
-taskbar_background_id = 0
-task_background_id = 0
-task_active_background_id = 2
-systray_background_id = 0
-clock_background_id = 0
-</code></pre>
-<p>Identifier 0 refers to a special background which is fully transparent, identifier 1 applies the first background defined in the config file etc.</p><h3 id="gradients">Gradients<a name="gradients" href="#gradients" class="md2man-permalink" title="permalink"></a></h3><p>(Available since 0.13.0)</p><p>Backgrounds also allow specifying gradient layers
-that are drawn on top of the solid color background.</p><p>First the user must define one or more gradients in the config file,
-each starting with <code>gradient = TYPE</code>. These must be added before backgrounds.</p><p>Then gradients can be added by index to backgrounds,
-using the <code>gradient_id = INDEX</code>, <code>gradient_id_hover = INDEX</code> and
-<code>gradient_id_pressed = INDEX</code>, where <code>INDEX</code> is
-the gradient index, starting from 1.</p><h4 id="gradient-types">Gradient types<a name="gradient-types" href="#gradient-types" class="md2man-permalink" title="permalink"></a></h4><p>Gradients vary the color between fixed control points:
-* vertical gradients: top-to-bottom;
-* horizontal gradients: left-to-right;
-* radial gradients: center-to-corners.</p><p>The user must specify the start and end colors, and can optionally add extra color stops in between
-using the <code>color_stop</code> option, as explained below.</p><h5 id="vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors">Vertical gradient, with color varying from the top edge to the bottom edge, two colors<a name="vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors" href="#vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>gradient = vertical
-start_color = #rrggbb opacity
-end_color = #rrggbb opacity
-</code></pre>
-<h5 id="horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors">Horizontal gradient, with color varying from the left edge to the right edge, two colors<a name="horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors" href="#horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>gradient = horizontal
-start_color = #rrggbb opacity
-end_color = #rrggbb opacity
-</code></pre>
-<h5 id="radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors">Radial gradient, with color varying from the center to the corner, two colors:<a name="radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors" href="#radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>gradient = radial
-start_color = #rrggbb opacity
-end_color = #rrggbb opacity
-</code></pre>
-<h5 id="adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points">Adding extra color stops (0% and 100% remain fixed, more colors at x% between the start and end control points)<a name="adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points" href="#adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>color_stop = percentage #rrggbb opacity
-</code></pre>
-<h4 id="gradient-examples">Gradient examples<a name="gradient-examples" href="#gradient-examples" class="md2man-permalink" title="permalink"></a></h4><pre class="highlight plaintext"><code># Gradient 1: thin film effect
-gradient = horizontal
-start_color = #111122 30
-end_color = #112211 30
-color_stop = 60 #221111 30
-
-# Gradient 2: radial glow
-gradient = radial
-start_color = #ffffff 20
-end_color = #ffffff 0
-
-# Gradient 3: elegant black
-gradient = vertical
-start_color = #444444 100
-end_color = #222222 100
-
-# Gradient 4: elegant black
-gradient = horizontal
-start_color = #111111 100
-end_color = #222222 100
-
-# Background 1: Active desktop name
-rounded = 2
-border_width = 1
-border_sides = TBLR
-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
-gradient_id = 3
-gradient_id_hover = 4
-gradient_id_pressed = 2
-
-[...]
-</code></pre>
-<h3 id="panel">Panel<a name="panel" href="#panel" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>panel_items = LTSBC</code> defines the items tint2 will show and the order of those items. Each letter refers to an item, defined as:</p>
-<ul>
-<li><code>L</code> shows the Launcher</li>
-<li><code>T</code> shows the Taskbar</li>
-<li><code>S</code> shows the Systray (also called notification area)</li>
-<li><code>B</code> shows the Battery status</li>
-<li><code>C</code> shows the Clock</li>
-<li><code>F</code> adds an extensible spacer (freespace). You can specify more than one. Has no effect if <code>T</code> is also present. <em>(since 0.12)</em></li>
-<li><code>E</code> adds an executor plugin. You can specify more than one. <em>(since 0.12.4)</em></li>
-<li><code>P</code> adds a push button. You can specify more than one. <em>(since 0.14)</em></li>
-<li><code>:</code> adds a separator. You can specify more than one. <em>(since 0.13.0)</em></li>
-</ul>
-<p>For example, <code>panel_items = STC</code> will show the systray, the taskbar and the clock (from left to right).</p></li>
-<li><p><code>panel_monitor = monitor (all or primary or 1 or 2 or ...)</code> : Which monitor tint2 draws the panel on</p>
-<ul>
-<li>The first monitor is <code>1</code></li>
-<li>Use <code>panel_monitor = all</code> to get a separate panel per monitor</li>
-</ul></li>
-<li><p><code>primary_monitor_first = boolean (0 or 1)</code> : Place the primary monitor before all the other monitors in the list. <em>(since 0.12.4; removed in 1.0, use <code>primary</code> instead)</em></p></li>
-</ul>
-<p><img src="images/panel_padding.jpg" alt=""></p>
-<ul>
-<li><p><code>panel_position = vertical_position horizontal_position orientation</code></p>
-<ul>
-<li><code>vertical_position</code> is one of: <code>bottom</code>, <code>top</code>, <code>center</code></li>
-<li><code>horizontal_position</code> is one of: <code>left</code>, <code>right</code>, <code>center</code></li>
-<li><code>orientation</code> is one of: <code>horizontal</code>, <code>vertical</code></li>
-</ul></li>
-<li><p><code>panel_size = width height</code></p>
-<ul>
-<li><code>width</code> and <code>height</code> can be specified without units (e.g. <code>123</code>) as pixels, or followed by <code>%</code> as percentages of the monitor size (e.g. <code>50%</code>). Use <code>100%</code> for full monitor width/height.
-Example:</li>
-</ul></li>
-</ul>
-<pre class="highlight plaintext"><code># The panel's width is 94% the size of the monitor, the height is 30 pixels:
-panel_size = 94% 30
-</code></pre>
-
-<ul>
-<li><p><code>panel_shrink = boolean (0 or 1)</code> : If set to 1, the panel will shrink to a compact size dynamically. <em>(since 0.13)</em></p></li>
-<li><p><code>panel_margin = horizontal_margin vertical_margin</code> : The margins define the distance between the panel and the horizontal/vertical monitor edge. Use <code>0</code> to obtain a panel with the same size as the edge of the monitor (no margin).</p></li>
-</ul>
-<p><img src="images/panel_size_margin.jpg" alt=""></p>
-<ul>
-<li><code>panel_padding = horizontal_padding vertical_padding spacing</code> : Please refer to the image below.</li>
-</ul>
-<p><img src="images/panel_padding.jpg" alt=""></p>
-<ul>
-<li><p><code>font_shadow = boolean (0 or 1)</code></p></li>
-<li><p><code>panel_background_id = integer</code> : Which background to use for the panel.</p></li>
-<li><p><code>wm_menu = boolean (0 or 1)</code> : Defines if tint2 forwards unhandled mouse events to your window manager. Useful for window managers such as openbox, which display the start menu if you right click on the desktop.</p></li>
-<li><p><code>panel_dock = boolean (0 or 1)</code> : Defines if tint2 is placed into the window manager&#39;s dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).</p></li>
-<li><p><code>panel_layer = bottom/normal/top</code> : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.</p></li>
-<li><p><code>strut_policy = follow_size/minimum/none</code> : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.</p>
-<ul>
-<li><code>follow_size</code> means that the maximized windows always resize to have a common edge with tint2.</li>
-<li><code>minimum</code> means that the maximized windows always expand to have a common edge with the hidden panel. This is useful if the <code>autohide</code> option is enabled.</li>
-<li><code>none</code> means that the maximized windows use the full screen size.</li>
-</ul></li>
-<li><p><code>panel_window_name = string</code> : Defines the name of the panel&#39;s window. Default: &#39;tint2&#39;. <em>(since 0.12)</em></p></li>
-<li><p><code>disable_transparency = boolean (0 or 1)</code> : Whether to disable transparency instead of detecting if it is supported. Useful on broken graphics stacks. <em>(since 0.12)</em></p></li>
-<li><p><code>mouse_effects = boolean (0 or 1)</code> : Whether to enable mouse hover effects for clickable items. <em>(since 0.12.3)</em></p></li>
-<li><p><code>mouse_hover_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency on mouse hover (works only when mouse_effects = 1).` <em>(since 0.12.3)</em></p></li>
-<li><p><code>mouse_pressed_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency on mouse press (works only when mouse_effects = 1).` <em>(since 0.12.3)</em></p></li>
-<li><p><code>autohide = boolean (0 or 1)</code> : Whether to enable panel hiding when the mouse cursor exists the panel.</p></li>
-<li><p><code>autohide_show_timeout = float</code> : Show timeout in seconds after the mouse cursor enters the panel. Use &#39;.&#39; as decimal separator.</p></li>
-<li><p><code>autohide_hide_timeout = float</code> : Hide timeout in seconds after the mouse cursor exits the panel. Use &#39;.&#39; as decimal separator.</p></li>
-<li><p><code>autohide_height = integer</code> : panel height (width for vertical panels) in hidden mode.</p></li>
-</ul>
-<h3 id="launcher">Launcher<a name="launcher" href="#launcher" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>launcher_item_app = path_to_application</code> : Each <code>launcher_item_app</code> must be a file path to a .desktop file following the freedesktop.org <a href="http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html">specification</a>. The paths may begin with <code>~</code>, which is expanded to the path of the user&#39;s home directory. If only a file name is specified, the file is search in the standard application directories (<code>$XDG_DATA_HOME/applications</code>, <code>~/.local/share/applications</code>, <code>$XDG_DATA_DIRS/applications</code>, <code>/usr/local/share/applications</code>, <code>/usr/share/applications</code>, <code>/opt/share/applications</code>).</p></li>
-<li><p><code>launcher_apps_dir = path_to_directory</code> : Specifies a path to a directory from which the launcher is loading all .desktop files (all subdirectories are explored recursively). Can be used multiple times. The path may begin with <code>~</code>, which is expanded to the path of the user&#39;s home directory. <em>(since 0.12)</em></p></li>
-<li><p><code>launcher_background_id = integer</code> : Defines which background to use.</p></li>
-<li><p><code>launcher_icon_background_id = integer</code> : Defines which background to use for icons.</p></li>
-<li><p><code>launcher_padding = horizontal_padding vertical_padding spacing</code></p></li>
-<li><p><code>launcher_icon_size = integer</code> : The launcher icon size, in pixels.</p></li>
-<li><p><code>launcher_icon_theme = name_of_theme</code> : (Optional) Uses the specified icon theme to display shortcut icons. Note that tint2 will detect and use the icon theme of your desktop if you have an XSETTINGS manager running (which you probably do), unless <code>launcher_icon_theme_override = 1</code>.</p></li>
-<li><p><code>launcher_icon_theme_override = boolean (0 or 1)</code> : Whether <code>launcher_icon_theme</code> overrides the value obtained from the XSETTINGS manager. <em>(since 0.12)</em></p></li>
-<li><p><code>launcher_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency.</p></li>
-<li><p><code>launcher_tooltip = boolean (0 or 1)</code> : Whether to show tooltips for the launcher icons.</p></li>
-<li><p><code>startup_notifications = boolean (0 or 1)</code> : Whether to show startup notifications when starting applications from the launcher. <em>(since 0.12)</em></p></li>
-</ul>
-<h3 id="taskbar-pager">Taskbar / Pager<a name="taskbar-pager" href="#taskbar-pager" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>taskbar_mode = single_desktop/multi_desktop</code></p>
-<ul>
-<li><code>single_desktop</code> : Shows a normal taskbar listing the tasks running on the current virtual desktop (also known as &#39;workspace&#39;);</li>
-<li><code>multi_desktop</code> : Pager like capability. Shows multiple taskbars, one per virtual desktop, with which:
-
-<ul>
-<li>You can drag-and-drop tasks between virtual desktops;</li>
-<li>You can switch between virtual desktops.</li>
-</ul></li>
-</ul></li>
-<li><p><code>taskbar_hide_if_empty = boolean (0 or 1)</code> : If enabled, in multi-desktop mode the taskbars corresponding to empty desktops different from the current desktop are hidden. <em>(since 0.13)</em></p></li>
-<li><p><code>taskbar_distribute_size = boolean (0 or 1)</code> : If enabled, in multi-desktop mode distributes between taskbars the available size proportionally to the number of tasks. Default: disabled. <em>(since 0.12)</em></p></li>
-<li><p><code>taskbar_padding = horizontal_padding vertical_padding spacing</code></p></li>
-</ul>
-<p><img src="images/taskbar_padding.jpg" alt=""></p>
-<ul>
-<li><p><code>taskbar_background_id = integer</code> : Which background to use</p></li>
-<li><p><code>taskbar_active_background_id = integer</code> : Which background to use for the taskbar of the current virtual desktop.</p></li>
-<li><p><code>taskbar_hide_inactive_tasks = boolean (0 or 1)</code> :  If enabled, the taskbar shows only the active task. <em>(since 0.12)</em></p></li>
-<li><p><code>taskbar_hide_different_monitor = boolean (0 or 1)</code> :  If enabled, the taskbar shows only the tasks from the current monitor. Useful when running different tint2 instances on different monitors, each one having its own config. <em>(since 0.12)</em></p></li>
-<li><p><code>taskbar_hide_different_desktop = boolean (0 or 1)</code> :  If enabled, the taskbar shows only the tasks from the current desktop. Useful to make multi-desktop taskbars more compact, but still allow desktop switching with mouse click. <em>(since 1.0)</em></p></li>
-<li><p><code>taskbar_always_show_all_desktop_tasks = boolean (0 or 1)</code> :  Has effect only if <code>taskbar_mode = multi_desktop</code>. If enabled, tasks that appear on all desktops are shown on all taskbars. Otherwise, they are shown only on the taskbar of the current desktop. <em>(since 0.12.4)</em></p></li>
-<li><p><code>taskbar_sort_order = none/title/center</code> : Specifies the sort order of the tasks on the taskbar.  <em>(since 0.12)</em></p>
-<ul>
-<li><code>none</code> : No sorting. New tasks are simply appended at the end of the taskbar when they appear.</li>
-<li><code>title</code> : Sorts the tasks by title.</li>
-<li><code>center</code> : Sorts the tasks by their window centers.</li>
-<li><code>mru</code> : Shows the most recently used tasks first. <em>(since 0.12.4)</em></li>
-<li><code>lru</code> : Shows the most recently used tasks last. <em>(since 0.12.4)</em></li>
-</ul></li>
-<li><p><code>task_align = left/center/right</code> : Specifies the alignment of the tasks on the taskbar. Default: left.</p></li>
-<li><p><code>taskbar_name = boolean (0 or 1)</code> :  Whether to show the virtual desktop name in the taskbar.</p></li>
-<li><p><code>taskbar_name_padding = padding</code> :  Padding for the virtual desktop name.</p></li>
-<li><p><code>taskbar_name_background_id = integer</code> :  Which background to use for the desktop name.</p></li>
-<li><p><code>taskbar_name_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> :  Font configuration for the desktop name.</p></li>
-<li><p><code>taskbar_name_font_color = color opacity (0 to 100)</code> :  Font color for the desktop name.</p></li>
-<li><p><code>taskbar_name_active_background_id = integer</code> :  Which background to use for the name of the current desktop.</p></li>
-<li><p><code>taskbar_name_active_font_color = color opacity (0 to 100)</code> :  Font color for the name of the current desktop.</p></li>
-</ul>
-<h1 id="taskbar-buttons">Taskbar buttons<a name="taskbar-buttons" href="#taskbar-buttons" class="md2man-permalink" title="permalink"></a></h1><p>The following options configure the task buttons in the taskbar:</p>
-<ul>
-<li><p><code>task_icon = boolean (0 or 1)</code> : Whether to display the task icon. There is no explicit option to control the task icon size; it depends on the vertical padding set with <code>task_padding</code>.</p></li>
-<li><p><code>task_text = boolean (0 or 1)</code> : Whether to display the task text.</p></li>
-<li><p><code>task_centered = boolean (0 or 1)</code> : Whether the task text is centered.</p></li>
-<li><p><code>task_tooltip = boolean (0 or 1)</code> : Whether to show tooltips for tasks.</p></li>
-<li><p><code>task_thumbnail = boolean (0 or 1)</code> : Whether to show thumbnail tooltips for tasks. <em>(since 16.0)</em></p></li>
-<li><p><code>task_thumbnail_size = width</code> : Thumbnail size. <em>(since 16.0)</em></p></li>
-<li><p><code>task_maximum_size = width height</code></p>
-<ul>
-<li><code>width</code> is used with horizontal panels to limit the size of the tasks. Use <code>width = 0</code> to get full taskbar width.</li>
-<li><code>height</code> is used with vertical panels.</li>
-</ul></li>
-<li><p><code>task_padding = horizontal_padding vertical_padding spacing</code></p></li>
-<li><p><code>urgent_nb_of_blink = integer</code> : Number of blinks on &#39;get attention&#39; events.</p></li>
-</ul>
-<p><img src="images/task_padding.jpg" alt=""></p>
-<ul>
-<li><p><code>task_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-<li><p><code>task_font_color = color opacity (0 to 100)</code></p></li>
-<li><p><code>task_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjust the task icon&#39;s color and transparency.</p></li>
-<li><p><code>task_background_id = integer</code> : Which background to use for non selected tasks</p></li>
-</ul>
-<dl><dt>For the next 3 options STATUS can be <code>active</code> / <code>iconified</code>  / <code>urgent</code>:</dt><dd>* <code>task_STATUS_font_color = color opacity (0 to 100)</code></dd></dl>
-<ul>
-<li><p><code>task_STATUS_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the task icon&#39;s color and transparency.</p></li>
-<li><p><code>task_STATUS_background_id = integer</code> : Which background to use for the task.</p></li>
-</ul>
-<h3 id="mouse-actions-for-taskbar-buttons">Mouse actions for taskbar buttons<a name="mouse-actions-for-taskbar-buttons" href="#mouse-actions-for-taskbar-buttons" class="md2man-permalink" title="permalink"></a></h3><p>The possible mouse events are: <code>left, middle, right, scroll_up, scroll_down</code>.</p><p>The possible mouse actions are: <code>none, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task</code>.</p><p>Use <code>mouse_event = action</code> to customize mouse actions. Example:
-<code>
-  mouse_middle = none
-  mouse_right = close
-  mouse_scroll_up = toggle
-  mouse_scroll_down = iconify
-</code></p><dl><dt>The action semantics:</dt><dd>* <code>none</code> : If <code>wm_menu = 1</code> is set, the mouse event is forwarded to the window manager. Otherwise it is ignored.
-* <code>close</code> : close the task
-* <code>toggle</code> : toggle the task
-* <code>iconify</code> : iconify (minimize) the task
-* <code>toggle_iconify</code> : toggle or iconify the task
-* <code>maximize_restore</code> : maximized or minimized the task
-* <code>shade</code> : shades (collapses) the task
-* <code>desktop_left</code> : send the task to the desktop on the left
-* <code>desktop_right</code> : send the task to the desktop on the right
-* <code>next_task</code> : send the focus to next task
-* <code>prev_task</code> : send the focus to previous task</dd></dl><h3 id="system-tray">System Tray<a name="system-tray" href="#system-tray" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>systray_padding = horizontal_padding vertical_padding spacing</code></p></li>
-<li><p><code>systray_background_id = integer</code> : Which background to use.</p></li>
-<li><p><code>systray_sort = ascending/descending/left2right/right2left</code> : Specifies the sorting order for the icons in the systray: in ascending/descending alphabetical order of the icon title, or always add icons to the right/left (note that with <code>left2right</code> or <code>right2left</code> the order can be different on panel restart).</p></li>
-<li><p><code>systray_icon_size = max_icon_size</code> : Set the maximum system tray icon size to <code>number</code>. Set to <code>0</code> for automatic icon sizing.</p></li>
-<li><p><code>systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjust the systray icons color and transparency.</p></li>
-<li><p><code>systray_monitor = integer (1, 2, ...) or primary</code> :  On which monitor to draw the systray. The first monitor is <code>1</code>. <em>(since 0.12)</em></p></li>
-<li><p><code>systray_name_filter = string</code> :  Regular expression to identify icon names to be hidden. For example, <code>^audacious$</code> will hide icons with the exact name <code>audacious</code>, while <code>aud</code> will hide any icons having <code>aud</code> in the name. <em>(since 0.13.1)</em></p></li>
-</ul>
-<h3 id="clock">Clock<a name="clock" href="#clock" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>time1_format = %H:%M</code> : The format used by the first line of the clock.</p>
-<ul>
-<li><code>time1_format</code>, <code>time2_format</code> and <code>clock_tooltip</code> use the &#39;strftime&#39; syntax. More info can be found here: <a href="http://www.manpagez.com/man/3/strftime/">http://www.manpagez.com/man/3/strftime/</a></li>
-<li>To hide the clock, comment <code>time1_format</code> and <code>time2_format</code>.</li>
-</ul></li>
-<li><p><code>time1_timezone = :US/Hawaii</code></p>
-<ul>
-<li><code>time1_timezone</code>, <code>time2_timezone</code> and <code>clock_tooltip_timezone</code> can be used to specify a timezone. If you do not specify a value the system-wide timezone is used. The timezones can usually be found in <code>/usr/share/zoneinfo</code>. If your timezones are in a different directory, you need to specify the absolute path, e.g. <code>time1_timezone = :/different/zoneinfo/dir/US/Hawaii</code> Always prepend the timezone with a &#39;:&#39;</li>
-</ul></li>
-<li><p><code>time1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-<li><p><code>time2_format = %A %d %B</code></p></li>
-<li><p><code>time2_timezone = :Europe/Berlin</code></p></li>
-<li><p><code>time2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-<li><p><code>clock_font_color = color opacity (0 to 100)</code></p></li>
-<li><p><code>clock_padding = horizontal_padding vertical_padding</code></p></li>
-<li><p><code>clock_background_id = integer</code> : Which background to use</p></li>
-<li><p><code>clock_tooltip = %a, %d. %b %Y</code> : Format for the clock&#39;s tooltip.</p></li>
-<li><p><code>clock_tooltip_timezone = :UTC</code></p></li>
-<li><p><code>clock_lclick_command = text</code> : Command to execute on left click.</p></li>
-<li><p><code>clock_rclick_command = text</code> : Command to execute on right click.</p></li>
-<li><p><code>clock_mclick_command = text</code> : Command to execute on middle click. <em>(since 0.12.1)</em></p></li>
-<li><p><code>clock_uwheel_command = text</code> : Command to execute on wheel scroll up. <em>(since 0.12.1)</em></p></li>
-<li><p><code>clock_dwheel_command = text</code> : Command to execute on wheel scroll down. <em>(since 0.12.1)</em></p></li>
-</ul>
-<h3 id="tooltip">Tooltip<a name="tooltip" href="#tooltip" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>tooltip_padding = horizontal_padding vertical_padding</code></p></li>
-<li><p><code>tooltip_show_timeout = float</code> : Delay to show the tooltip in seconds. Use <code>.</code> as decimal separator.</p></li>
-<li><p><code>tooltip_hide_timeout = float</code> : Delay to hide the tooltip in seconds. Use <code>.</code> as decimal separator.</p></li>
-<li><p><code>tooltip_background_id = integer</code> : Which background to use for tooltips. Note that with fake transparency the alpha channel and corner radius options are not respected.</p></li>
-<li><p><code>tooltip_font_color = color opacity  (0 to 100)</code></p></li>
-<li><p><code>tooltip_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-</ul>
-<h3 id="battery">Battery<a name="battery" href="#battery" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>battery_hide = never/integer (0 to 100)</code> : At what battery percentage the battery item is hidden.</p></li>
-<li><p><code>battery_low_status = integer</code>: At what battery percentage the low command is executed.</p></li>
-<li><p><code>battery_low_cmd = notify-send &quot;battery low&quot;</code> : Command to execute when the battery is low.</p></li>
-<li><p><code>battery_full_cmd = notify-send &quot;battery full&quot;</code> : Command to execute when the battery is full.</p></li>
-<li><p><code>bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-<li><p><code>bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-<li><p><code>battery_font_color = color opacity (0 to 100)</code></p></li>
-<li><p><code>bat1_format = FORMAT_STRING</code> : Format for battery line 1. Default: %p. <em>(since 1.0)</em> Format specification:</p>
-<ul>
-<li>%s: State (charging, discharging, full, unknown).</li>
-<li>%m: Minutes left until completely charged/discharged (estimated).</li>
-<li>%h: Hours left until completely charged/discharged (estimated).</li>
-<li>%t: Time left. Shows &quot;hrs:mins&quot; when charging/discharging, or &quot;Ful\&quot; when full.</li>
-<li>%p: Percentage. Includes the % sign.</li>
-</ul></li>
-<li><p><code>bat2_format = FORMAT_STRING</code> : Format for battery line 2. Default: %t. <em>(since 1.0)</em></p></li>
-<li><p><code>battery_padding = horizontal_padding vertical_padding</code></p></li>
-<li><p><code>battery_background_id = integer</code> : Which background to use for the battery.</p></li>
-<li><p><code>battery_tooltip_enabled = boolean (0 or 1)</code> : Enable/disable battery tooltips. <em>(since 0.12.3)</em></p></li>
-<li><p><code>battery_lclick_command = text</code> : Command to execute on left click. <em>(since 0.12.1)</em></p></li>
-<li><p><code>battery_rclick_command = text</code> : Command to execute on right click. <em>(since 0.12.1)</em></p></li>
-<li><p><code>battery_mclick_command = text</code> : Command to execute on middle click. <em>(since 0.12.1)</em></p></li>
-<li><p><code>battery_uwheel_command = text</code> : Command to execute on wheel scroll up. <em>(since 0.12.1)</em></p></li>
-<li><p><code>battery_dwheel_command = text</code> : Command to execute on wheel scroll down. <em>(since 0.12.1)</em></p></li>
-<li><p><code>ac_connected_cmd = text</code> : Command to execute when the power adapter is plugged in. <em>(since 0.12.3)</em></p></li>
-<li><p><code>ac_disconnected_cmd = text</code> : Command to execute when the power adapter is unplugged. <em>(since 0.12.3)</em></p></li>
-</ul>
-<h3 id="executor">Executor<a name="executor" href="#executor" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>execp = new</code> : Begins the configuration of a new executor plugin. Multiple such plugins are supported; just use multiple <code>E</code>s in <code>panel_items</code>. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_command = text</code> : Command to execute. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_interval = integer</code> : The command is executed again after <code>execp_interval</code> seconds from the moment it exits. If zero, the command is executed only once. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_continuous = integer</code> : If non-zero, the last <code>execp_continuous</code> lines from the output of the command are displayed, every <code>execp_continuous</code> lines; this is useful for showing the output of commands that run indefinitely, such as <code>ping 127.0.0.1</code>. If zero, the output of the command is displayed after it finishes executing. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_has_icon = boolean (0 or 1)</code> : If <code>execp_has_icon = 1</code>, the first line printed by the command is interpreted as a path to an image file. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_cache_icon = boolean (0 or 1)</code> : If <code>execp_cache_icon = 0</code>, the image is reloaded each time the command is executed (useful if the image file is changed on disk by the program executed by <code>execp_command</code>). <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_icon_w = integer</code> : You can use <code>execp_icon_w</code> and <code>execp_icon_h</code> to resize the image. If one of them is zero/missing, the image is rescaled proportionally. If both of them are zero/missing, the image is not rescaled. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_icon_h = integer</code> : See <code>execp_icon_w</code>. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_tooltip = text</code> : The tooltip. If left empty, no tooltip is displayed. If missing, the standard error of the command is shown as a tooltip (an ANSI clear screen sequence can reset the contents, bash: <code>printf '\e[2J'</code>, C: <code>printf(&quot;\x1b[2J&quot;);</code>). If the standard error is empty, the tooltip will show information about the time when the command was last executed. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> : The font used to draw the text.  <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_font_color = color opacity</code> : The font color. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_markup = boolean (0 or 1)</code> : If non-zero, the output of the command is treated as Pango markup, which allows rich text formatting. The format is <a href="https://developer.gnome.org/pygtk/stable/pango-markup-language.html">documented here</a>. Note that using this with commands that print data downloaded from the Internet is a possible security risk. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_background_id = integer</code> : Which background to use. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_centered = boolean (0 or 1)</code> : Whether to center the text. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text</code> <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_lclick_command = text</code> : Command to execute on left click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_mclick_command = text</code> : Command to execute on right click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_rclick_command = text</code> : Command to execute on middle click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_uwheel_command = text</code> : Command to execute on wheel scroll up. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_dwheel_command = text</code> : Command to execute on wheel scroll down. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
-</ul>
-<h4 id="executor-samples">Executor samples<a name="executor-samples" href="#executor-samples" class="md2man-permalink" title="permalink"></a></h4><h5 id="print-the-hostname">Print the hostname<a name="print-the-hostname" href="#print-the-hostname" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = hostname
-execp_interval = 0
-</code></pre>
-<h5 id="print-disk-usage-for-the-root-partition-every-10-seconds">Print disk usage for the root partition every 10 seconds<a name="print-disk-usage-for-the-root-partition-every-10-seconds" href="#print-disk-usage-for-the-root-partition-every-10-seconds" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = df -h | awk '/\/$/ { print $6 ": " $2 " " $5}'
-execp_interval = 10
-</code></pre>
-<h5 id="button-with-icon-and-rich-text-executes-command-when-clicked">Button with icon and rich text, executes command when clicked<a name="button-with-icon-and-rich-text-executes-command-when-clicked" href="#button-with-icon-and-rich-text-executes-command-when-clicked" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = echo /usr/share/icons/elementary-xfce/emblems/24/emblem-colors-blue.png; echo '&lt;span foreground="#7f7"&gt;Click&lt;/span&gt; &lt;span foreground="#77f"&gt;me&lt;/span&gt; &lt;span foreground="#f77"&gt;pls&lt;/span&gt;'
-execp_has_icon = 1
-execp_interval = 0
-execp_centered = 1
-execp_font = sans 9
-execp_markup = 1
-execp_font_color = #aaffaa 100
-execp_padding = 2 0
-execp_tooltip = I will tell you a secret...
-execp_lclick_command = zenity --info "--text=$(uname -sr)"
-execp_background_id = 2
-</code></pre>
-<h5 id="desktop-pager-with-text">Desktop pager with text<a name="desktop-pager-with-text" href="#desktop-pager-with-text" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = xprop -root -spy | awk '/^_NET_CURRENT_DESKTOP/ { print "Workspace " ($3 + 1) ; fflush(); }'
-execp_interval = 1
-execp_continuous = 1
-</code></pre>
-<h5 id="desktop-pager-with-icon">Desktop pager with icon<a name="desktop-pager-with-icon" href="#desktop-pager-with-icon" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp_command = xprop -root -spy | awk -v home="$HOME" '/^_NET_CURRENT_DESKTOP/ { print home "/.config/myPager/" ($3 + 1) ".png\n" ; fflush(); }'
-execp_interval = 1
-execp_has_icon = 1
-execp_cache_icon = 1
-execp_continuous = 2
-</code></pre>
-<h5 id="round-trip-time-to-the-gateway-refreshed-every-second">Round-trip time to the gateway, refreshed every second<a name="round-trip-time-to-the-gateway-refreshed-every-second" href="#round-trip-time-to-the-gateway-refreshed-every-second" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = ping -i 1 -c 1 -W 1 -O -D -n $(ip route | grep default | grep via | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*') | awk '/no/ { print "&lt;span foreground=\"#faa\"&gt;timeout&lt;/span&gt;"; fflush(); }; /time=/ { gsub(/time=/, "", $8); printf "&lt;span foreground=\"#7af\"&gt;%3.0f %s&lt;/span&gt;\n", $8, $9; fflush(); } '
-execp_continuous = 0
-execp_interval = 1
-execp_markup = 1
-</code></pre>
-<h5 id="memory-usage">Memory usage<a name="memory-usage" href="#memory-usage" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = free | awk '/^-/ { printf "Mem: '$(free -h | awk '/^Mem:/ { print $2 }')' %.0f%%\n", 100*$3/($3+$4); fflush(stdout) }'
-execp_interval = 5
-execp_continuous = 0
-</code></pre>
-<h5 id="network-load">Network load<a name="network-load" href="#network-load" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code># Note the use of "stdbuf -oL" to force the program to flush the output line by line.
-execp = new
-execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }; fflush(stdout)'
-execp_continuous = 1
-execp_interval = 1
-</code></pre>
-<h3 id="button">Button<a name="button" href="#button" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>button = new</code> : Begins the configuration of a new button. Multiple such plugins are supported; just use multiple <code>P</code>s in <code>panel_items</code>. <em>(since 0.14)</em></p></li>
-<li><p><code>button_icon = text</code> : Name or path of icon (or empty). <em>(since 0.14)</em></p></li>
-<li><p><code>button_text = text</code> : Text to display (or empty). <em>(since 0.14)</em></p></li>
-<li><p><code>button_tooltip = text</code> : The tooltip (or empty). <em>(since 0.14)</em></p></li>
-<li><p><code>button_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> : The font used to draw the text.  <em>(since 0.14)</em></p></li>
-<li><p><code>button_font_color = color opacity</code> : The font color. <em>(since 0.14)</em></p></li>
-<li><p><code>button_background_id = integer</code> : Which background to use. <em>(since 0.14)</em></p></li>
-<li><p><code>button_centered = boolean (0 or 1)</code> : Whether to center the text. <em>(since 0.14)</em></p></li>
-<li><p><code>button_padding = horizontal_padding vertical_padding spacing_between_icon_and_text</code> <em>(since 0.14)</em></p></li>
-<li><p><code>button_max_icon_size = integer</code> : Sets a limit to the icon size. Otherwise, the icon will expand to the edges. <em>(since 0.14)</em></p></li>
-<li><p><code>button_lclick_command = text</code> : Command to execute on left click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.14)</em></p></li>
-<li><p><code>button_mclick_command = text</code> : Command to execute on right click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.14)</em></p></li>
-<li><p><code>button_rclick_command = text</code> : Command to execute on middle click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.14)</em></p></li>
-<li><p><code>button_uwheel_command = text</code> : Command to execute on wheel scroll up. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.14)</em></p></li>
-<li><p><code>button_dwheel_command = text</code> : Command to execute on wheel scroll down. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.14)</em></p></li>
-</ul>
-<h3 id="separator">Separator<a name="separator" href="#separator" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>separator = new</code> : Begins the configuration of a new separator. Multiple such plugins are supported; just use multiple <code>:</code>s in <code>panel_items</code>. <em>(since 0.13.0)</em></p></li>
-<li><p><code>separator_background_id = integer</code> : Which background to use. <em>(since 0.13.0)</em></p></li>
-<li><p><code>separator_color = color opacity</code> : The foreground color. <em>(since 0.13.0)</em></p></li>
-<li><p><code>separator_style = [empty | line | dots]</code> : The separator style. <em>(since 0.13.0)</em></p></li>
-<li><p><code>separator_size = integer</code> : The thickness of the separator. Does not include the border and padding. For example, if the style is <code>line</code>, this is the line thickness; if the style is <code>dots</code>, this is the dot&#39;s diameter. <em>(since 0.13.0)</em></p></li>
-<li><p><code>separator_padding = side_padding cap_padding</code> : The padding to add to the sides of the separator, in pixels. <em>(since 0.13.0)</em></p></li>
-</ul>
-<h3 id="example-configuration">Example configuration<a name="example-configuration" href="#example-configuration" class="md2man-permalink" title="permalink"></a></h3><p>See /etc/xdg/tint2/tint2rc.</p><h2 id="author">AUTHOR<a name="author" href="#author" class="md2man-permalink" title="permalink"></a></h2><p>tint2 was written by Thierry Lorthiois <a href="mailto:lorthiois@bbsoft.fr">lorthiois@bbsoft.fr</a>.
-It is based on ttm, originally written by Pål Staurland <a href="mailto:staura@gmail.com">staura@gmail.com</a>.</p><p>This manual page was originally written by Daniel Moerner <a href="mailto:dmoerner@gmail.com">dmoerner@gmail.com</a>, for the Debian project (but may be used by others).
-It was adopted from the tint2 docs.</p><h2 id="see-also">SEE ALSO<a name="see-also" href="#see-also" class="md2man-permalink" title="permalink"></a></h2><p>The main website <a href="https://gitlab.com/o9000/tint2">https://gitlab.com/o9000/tint2</a>
-and the wiki page at <a href="https://gitlab.com/o9000/tint2/wikis/home">https://gitlab.com/o9000/tint2/wikis/home</a>.</p><p>This documentation is also provided in HTML and Markdown format in the system&#39;s default location
-for documentation files, usually <code>/usr/share/doc/tint2</code> or <code>/usr/local/share/doc/tint2</code>.
-.</p>
-</body>
-</html>

doc/readme.html

@@ -1,276 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<head>
-<style type="text/css">
-html,
-body {
-  color: #333;
-  font-family: Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 1.6;
-  word-wrap: break-word;
-  max-width: 1000px;
-  margin: 0 auto;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin-top: 1em;
-  margin-bottom: 1rem;
-}
-
-h1 {
-  font-size: 1.8rem;
-  font-weight: normal;
-  font-style: normal;
-  border-bottom: 1px solid #eee;
-}
-
-h2 {
-  font-size: 1.5rem;
-  font-weight: normal;
-  font-style: normal;
-  border-bottom: 1px solid #eee;
-}
-
-h3 {
-  font-size: 1.2rem;
-  font-weight: bold;
-  font-style: normal;
-}
-
-h4 {
-  font-size: 1rem;
-  font-weight: bold;
-  font-style: normal;
-}
-
-h5 {
-  font-size: 1rem;
-  font-weight: bold;
-  font-style: italic;
-}
-
-h6 {
-  font-size: 1rem;
-  font-weight: normal;
-  font-style: italic;
-}
-
-
-code,
-kbd,
-pre {
-  font-family: monospace;
-  font-size: 1em;
-}
-
-table {
-  border-spacing: 0;
-  border-collapse: collapse;
-}
-
-td,
-th {
-  padding: 0;
-}
-
-asdff {
-  box-sizing: border-box;
-}
-
-a {
-  color: #46c;
-  text-decoration: none;
-}
-
-a:hover,
-a:active {
-  text-decoration: underline;
-}
-
-a:not([href]) {
-  color: inherit;
-  text-decoration: none;
-}
-
-hr {
-  box-sizing: content-box;
-  height: 0;
-  margin: 15px 0;
-  overflow: hidden;
-  background: transparent;
-  border: 0;
-  border-bottom: 1px solid #ddd;
-}
-
-hr::before {
-  display: table;
-  content: "";
-}
-
-hr::after {
-  display: table;
-  clear: both;
-  content: "";
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 0.7em;
-}
-
-blockquote {
-  margin: 0;
-}
-
-code {
-  font-family: "Liberation Mono", monospace;
-  font-size: 1em;
-}
-
-pre {
-  margin-top: 0;
-  margin-bottom: 0;
-  font: 1em "Liberation Mono", monospace;
-  overflow-x: auto;
-}
-
-blockquote {
-  padding: 0 15px;
-  color: #777;
-  border-left: 4px solid #ddd;
-}
-
-blockquote>:first-child {
-  margin-top: 0;
-}
-
-blockquote>:last-child {
-  margin-bottom: 0;
-}
-
-table {
-  display: block;
-  width: 100%;
-  overflow: auto;
-  word-break: normal;
-}
-
-table th {
-  font-weight: bold;
-}
-
-table th,
-table td {
-  padding: 6px 13px;
-  border: 1px solid #ddd;
-}
-
-table tr {
-  background-color: #fff;
-  border-top: 1px solid #ccc;
-}
-
-table tr:nth-child(2n) {
-  background-color: #f8f8f8;
-}
-
-code {
-  padding: 0.2em;
-  margin: 0;
-  font-size: 0.95em;
-  background-color: #eee;
-}
-
-pre {
-  word-wrap: normal;
-  background-color: #eee;
-  margin: 1em 0;
-  padding: 0.2em;
-}
-
-
-</style>
-</head>
-<body>
-<h1 id="latest-stable-release-16-0"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">16.0</span><a name="latest-stable-release-16-0" href="#latest-stable-release-16-0" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/16.0/ChangeLog">https://gitlab.com/o9000/tint2/blob/16.0/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
-cd tint2
-git checkout 16.0
-mkdir build
-cd build
-cmake ..
-make -j4
-</code></pre>
-<p>To install, run (as root):</p><pre class="highlight plaintext"><code>make install
-update-icon-caches /usr/local/share/icons/hicolor
-update-mime-database /usr/local/share/mime
-</code></pre>
-<p>And then you can run the panel <code>tint2</code> and the configuration program <code>tint2conf</code>.</p><p>Please report any problems to <a href="https://gitlab.com/o9000/tint2/issues">https://gitlab.com/o9000/tint2/issues</a>. Your feedback is much appreciated.</p><p>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.</p><h1 id="what-is-tint2">What is tint2?<a name="what-is-tint2" href="#what-is-tint2" class="md2man-permalink" title="permalink"></a></h1><p>tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm <a href="https://code.google.com/p/ttm/">https://code.google.com/p/ttm/</a>.</p><h1 id="features">Features<a name="features" href="#features" class="md2man-permalink" title="permalink"></a></h1>
-<ul>
-<li>Panel with taskbar, system tray, clock and launcher icons;</li>
-<li>Easy to customize: color/transparency on fonts, icons, borders and backgrounds;</li>
-<li>Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;</li>
-<li>Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;</li>
-<li>Customizable mouse events.</li>
-</ul>
-<h1 id="goals">Goals<a name="goals" href="#goals" class="md2man-permalink" title="permalink"></a></h1>
-<ul>
-<li>Be unintrusive and light (in terms of memory, CPU and aesthetic);</li>
-<li>Follow the freedesktop.org specifications;</li>
-<li>Make certain workflows, such as multi-desktop and multi-monitor, easy to use.</li>
-</ul>
-<h1 id="i-want-it">I want it!<a name="i-want-it" href="#i-want-it" class="md2man-permalink" title="permalink"></a></h1>
-<ul>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/Install">Install tint2</a></li>
-</ul>
-<h1 id="how-do-i">How do I ...<a name="how-do-i" href="#how-do-i" class="md2man-permalink" title="permalink"></a></h1>
-<ul>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/Install">Install</a></li>
-<li><a href="https://gitlab.com/o9000/tint2/blob/master/manual.html">Configure</a></li>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/ThirdPartyApplets">Add applet not supported by tint2</a></li>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/FAQ">Other frequently asked questions</a></li>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/Debug">Obtain a stack trace when tint2 crashes</a></li>
-</ul>
-<h1 id="known-issues">Known issues<a name="known-issues" href="#known-issues" class="md2man-permalink" title="permalink"></a></h1>
-<ul>
-<li>Graphical glitches on Intel graphics cards can be avoided by changing the acceleration method to UXA (<a href="https://gitlab.com/o9000/tint2/issues/595">issue 595</a>)</li>
-<li>Window managers that do not follow exactly the EWMH specification might not interact well with tint2 (<a href="https://gitlab.com/o9000/tint2/issues/627">issue 627</a>).</li>
-<li>Full transparency requires a compositor such as Compton (if not provided already by the window manager, as in Compiz/Unity, KDE or XFCE).</li>
-</ul>
-<h1 id="how-can-i-help-out">How can I help out?<a name="how-can-i-help-out" href="#how-can-i-help-out" class="md2man-permalink" title="permalink"></a></h1>
-<ul>
-<li>Report bugs and ask questions on the <a href="https://gitlab.com/o9000/tint2/issues">issue tracker</a>;</li>
-<li>Contribute to the development by helping us fix bugs and suggesting new features. Please read the contribution guide: <a href="CONTRIBUTING.md">CONTRIBUTING.md</a></li>
-</ul>
-<h1 id="links">Links<a name="links" href="#links" class="md2man-permalink" title="permalink"></a></h1>
-<ul>
-<li>Home page: <a href="https://gitlab.com/o9000/tint2">https://gitlab.com/o9000/tint2</a></li>
-<li>Git repository: <a href="https://gitlab.com/o9000/tint2.git">https://gitlab.com/o9000/tint2.git</a></li>
-<li>Documentation: <a href="https://gitlab.com/o9000/tint2/wikis/home">https://gitlab.com/o9000/tint2/wikis/home</a></li>
-<li>Downloads: <a href="https://gitlab.com/o9000/tint2-archive/tree/master">https://gitlab.com/o9000/tint2-archive/tree/master</a> or <a href="https://code.google.com/p/tint2/downloads/list">https://code.google.com/p/tint2/downloads/list</a></li>
-<li>Old project location (inactive): <a href="https://code.google.com/p/tint2">https://code.google.com/p/tint2</a></li>
-</ul>
-<h1 id="screenshots">Screenshots<a name="screenshots" href="#screenshots" class="md2man-permalink" title="permalink"></a></h1><h2 id="default-config">Default config:<a name="default-config" href="#default-config" class="md2man-permalink" title="permalink"></a></h2><p><img src="https://gitlab.com/o9000/tint2/uploads/948fa74eca60864352a033580350b4c3/Screenshot_2016-01-23_14-42-57.png" alt="Screenshot_2016-01-23_14-42-57"></p><h2 id="various-configs">Various configs:<a name="various-configs" href="#various-configs" class="md2man-permalink" title="permalink"></a></h2>
-<ul>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/screenshots">Screenshots</a></li>
-</ul>
-<h2 id="demos">Demos<a name="demos" href="#demos" class="md2man-permalink" title="permalink"></a></h2>
-<ul>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.0.gif">Compact panel, separator, color gradients</a></li>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.4.gif">Executor</a></li>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.3.gif">Mouse over effects</a></li>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif">Distribute size between taskbars, freespace</a></li>
-</ul>
-<h2 id="more">More<a name="more" href="#more" class="md2man-permalink" title="permalink"></a></h2>
-<ul>
-<li><a href="https://gitlab.com/o9000/tint2/wikis/Home">Tint2 wiki</a>
-Home)</li>
-</ul>
-</body>
-</html>

doc/tint2.1

@@ -1,906 +1,51 @@
-.TH TINT2 1 "2017\-12\-20" 16.0
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" 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"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
 .SH NAME
-.PP
 tint2 \- lightweight panel/taskbar
-.SH DESCRIPTION
-.PP
-tint2 is a simple panel/taskbar made for modern X window managers.
-It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.).
-.PP
-Features:
-.RS
-.IP \(bu 2
-Panel with taskbar, system tray, clock and launcher icons;
-.IP \(bu 2
-Easy to customize: color/transparency on fonts, icons, borders and backgrounds;
-.IP \(bu 2
-Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;
-.IP \(bu 2
-Multi\-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;
-.IP \(bu 2
-Customizable mouse events.
-.RE
-.PP
-Goals:
-.RS
-.IP \(bu 2
-Be unintrusive and light (in terms of memory, CPU and aesthetic);
-.IP \(bu 2
-Follow the freedesktop.org specifications;
-.IP \(bu 2
-Make certain workflows, such as multi\-desktop and multi\-monitor, easy to use.
-.RE
 .SH SYNOPSIS
+.B tint2
+.br
+.B tint2
+.RI -c
+.IR /path_to_config_file 
+.SH DESCRIPTION
+This manual page documents briefly the
+.B tint2
+command.
 .PP
-\fB\fCtint2 [OPTION...]\fR
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBtint2\fP is a simple panel/taskbar intentionally made for openbox3, but 
+should also work with other window managers. It's based on ttm code. The goal is to keep a clean and unintrusive look with code lightweight and 
+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.
 .SH OPTIONS
 .TP
-\fB\fC\-c path_to_config_file\fR
+.B \-c config-file
-Specifies which configuration file to use instead of the default.
+Specify which configuration file to use instead of the default.
-.TP
-\fB\fC\-v, \-\-version\fR
-Prints version information and exits.
-.TP
-\fB\fC\-h, \-\-help\fR
-Display this help and exits.
-.SH CONFIGURATION
-.SS Table of contents
-.RS
-.IP \(bu 2
-Introduction \[la]#introduction\[ra]
-.IP \(bu 2
-Backgrounds and borders \[la]#backgrounds-and-borders\[ra]
-.IP \(bu 2
-Gradients \[la]#gradients\[ra]
-.IP \(bu 2
-Panel \[la]#panel\[ra]
-.IP \(bu 2
-Launcher \[la]#launcher\[ra]
-.IP \(bu 2
-Taskbar/Pager \[la]#taskbar-pager\[ra]
-.IP \(bu 2
-Taskbar buttons \[la]#taskbar-buttons\[ra]
-.IP \(bu 2
-Mouse actions for taskbar buttons \[la]#mouse-actions-for-taskbar-buttons\[ra]
-.IP \(bu 2
-System tray \[la]#system-tray\[ra]
-.IP \(bu 2
-Clock \[la]#clock\[ra]
-.IP \(bu 2
-Tooltip \[la]#tooltip\[ra]
-.IP \(bu 2
-Battery \[la]#battery\[ra]
-.IP \(bu 2
-Executor \[la]#executor\[ra]
-.IP \(bu 2
-Button \[la]#button\[ra]
-.IP \(bu 2
-Separator \[la]#separator\[ra]
-.IP \(bu 2
-Example configuration \[la]#example-configuration\[ra]
-.RE
-.SS Introduction
-.PP
-These are instructions for configuring tint2 directly by editing its config file.
-You may also use instead the graphical interface \fB\fCtint2conf\fR\&.
-.PP
-The first time you run tint2, it will create the config file in \fB\fC$HOME/.config/tint2/tint2rc\fR (This applies if you have done a clean install. Running tint2 in the source directory without doing 'make install' will not create the config file.)
-.PP
-You can also specify another file on the command line with the \-c option, e.g.: \fB\fCtint2 \-c $HOME/tint2.conf\fR\&. This can be used to run multiple instances of tint2 that use different settings.
-.PP
-If you change the config file while tint2 is running, the command \fB\fCkillall \-SIGUSR1 tint2\fR will force tint2 to reload it.
-.PP
-All the configuration options supported in the config file are listed below.
-Try to respect as much as possible the order of the options as given below.
-.SS Backgrounds and borders
-.PP
-The tint2 config file starts with the options defining background elements with borders:
-.RS
-.IP \(bu 2
-\fB\fCrounded = number_of_pixels\fR : the corner radius
-.IP \(bu 2
-\fB\fCborder_width = integer\fR : the border width in pixels
-.IP \(bu 2
-\fB\fCborder_sides = LRTB\fR : the sides to draw the border on (left, right, top, bottom). If not specified, all sides are used. \fI(since 0.12.12)\fP
-.IP \(bu 2
-\fB\fCbackground_color = color opacity\fR
-.RS
-.IP \(bu 2
-\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
-.IP \(bu 2
-\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz).
-.RE
-.IP \(bu 2
-\fB\fCborder_color = color opacity\fR
-.RS
-.IP \(bu 2
-\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
-.IP \(bu 2
-\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
-.RE
-.IP \(bu 2
-\fB\fCbackground_color_hover = color opacity\fR (default: same as \fB\fCbackground_color\fR) \fI(since 0.12.3)\fP
-.RS
-.IP \(bu 2
-\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
-.IP \(bu 2
-\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)
-.RE
-.IP \(bu 2
-\fB\fCborder_color_hover = color opacity\fR (default: same as \fB\fCborder_color\fR) \fI(since 0.12.3)\fP
-.RS
-.IP \(bu 2
-\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
-.IP \(bu 2
-\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
-.RE
-.IP \(bu 2
-\fB\fCbackground_color_pressed = color opacity\fR (default: same as \fB\fCbackground_color_hover\fR) \fI(since 0.12.3)\fP
-.RS
-.IP \(bu 2
-\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
-.IP \(bu 2
-\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)
-.RE
-.IP \(bu 2
-\fB\fCborder_color_pressed = color opacity\fR (default: same as \fB\fCborder_color_hover\fR) \fI(since 0.12.3)\fP
-.RS
-.IP \(bu 2
-\fB\fCcolor\fR is specified in hex RGB, e.g. #ff0000 is red
-.IP \(bu 2
-\fB\fCopacity\fR varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
-.RE
-.IP \(bu 2
-\fB\fCborder_content_tint_weight = integer\fR : Mixes the border color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). \fI(since 16.0)\fP
-.IP \(bu 2
-\fB\fCbackground_content_tint_weight = integer\fR : Mixes the background color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). \fI(since 16.0)\fP
-.RE
-.PP
-You can define as many backgrounds as you want. For example, the following config defines two backgrounds:
-.PP
-.RS
-.nf
-rounded = 1
-border_width = 0
-background_color = #282828 100
-border_color = #000000 0
-
-rounded = 1
-border_width = 0
-background_color = #f6b655 90
-border_color = #cccccc 40
-.fi
-.RE
-.PP
-tint2 automatically identifies each background with a number starting from 1 (1, 2, ...).
-Afterwards, you can apply a background to objects (panel, taskbar, task, clock, systray) using the background id, for example:
-.PP
-.RS
-.nf
-panel_background_id = 1
-taskbar_background_id = 0
-task_background_id = 0
-task_active_background_id = 2
-systray_background_id = 0
-clock_background_id = 0
-.fi
-.RE
-.PP
-Identifier 0 refers to a special background which is fully transparent, identifier 1 applies the first background defined in the config file etc.
-.SS Gradients
-.PP
-(Available since 0.13.0)
-.PP
-Backgrounds also allow specifying gradient layers
-that are drawn on top of the solid color background.
-.PP
-First the user must define one or more gradients in the config file,
-each starting with \fB\fCgradient = TYPE\fR\&. These must be added before backgrounds.
-.PP
-Then gradients can be added by index to backgrounds,
-using the \fB\fCgradient_id = INDEX\fR, \fB\fCgradient_id_hover = INDEX\fR and
-\fB\fCgradient_id_pressed = INDEX\fR, where \fB\fCINDEX\fR is
-the gradient index, starting from 1.
-.SS Gradient types
-.PP
-Gradients vary the color between fixed control points:
-* vertical gradients: top\-to\-bottom;
-* horizontal gradients: left\-to\-right;
-* radial gradients: center\-to\-corners.
-.PP
-The user must specify the start and end colors, and can optionally add extra color stops in between
-using the \fB\fCcolor_stop\fR option, as explained below.
-.SS Vertical gradient, with color varying from the top edge to the bottom edge, two colors
-.PP
-.RS
-.nf
-gradient = vertical
-start_color = #rrggbb opacity
-end_color = #rrggbb opacity
-.fi
-.RE
-.SS Horizontal gradient, with color varying from the left edge to the right edge, two colors
-.PP
-.RS
-.nf
-gradient = horizontal
-start_color = #rrggbb opacity
-end_color = #rrggbb opacity
-.fi
-.RE
-.SS Radial gradient, with color varying from the center to the corner, two colors:
-.PP
-.RS
-.nf
-gradient = radial
-start_color = #rrggbb opacity
-end_color = #rrggbb opacity
-.fi
-.RE
-.SS Adding extra color stops (0% and 100% remain fixed, more colors at x% between the start and end control points)
-.PP
-.RS
-.nf
-color_stop = percentage #rrggbb opacity
-.fi
-.RE
-.SS Gradient examples
-.PP
-.RS
-.nf
-# Gradient 1: thin film effect
-gradient = horizontal
-start_color = #111122 30
-end_color = #112211 30
-color_stop = 60 #221111 30
-
-# Gradient 2: radial glow
-gradient = radial
-start_color = #ffffff 20
-end_color = #ffffff 0
-
-# Gradient 3: elegant black
-gradient = vertical
-start_color = #444444 100
-end_color = #222222 100
-
-# Gradient 4: elegant black
-gradient = horizontal
-start_color = #111111 100
-end_color = #222222 100
-
-# Background 1: Active desktop name
-rounded = 2
-border_width = 1
-border_sides = TBLR
-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
-gradient_id = 3
-gradient_id_hover = 4
-gradient_id_pressed = 2
-
-[...]
-.fi
-.RE
-.SS Panel
-.RS
-.IP \(bu 2
-\fB\fCpanel_items = LTSBC\fR defines the items tint2 will show and the order of those items. Each letter refers to an item, defined as:
-.RS
-.IP \(bu 2
-\fB\fCL\fR shows the Launcher
-.IP \(bu 2
-\fB\fCT\fR shows the Taskbar
-.IP \(bu 2
-\fB\fCS\fR shows the Systray (also called notification area)
-.IP \(bu 2
-\fB\fCB\fR shows the Battery status
-.IP \(bu 2
-\fB\fCC\fR shows the Clock
-.IP \(bu 2
-\fB\fCF\fR adds an extensible spacer (freespace). You can specify more than one. Has no effect if \fB\fCT\fR is also present. \fI(since 0.12)\fP
-.IP \(bu 2
-\fB\fCE\fR adds an executor plugin. You can specify more than one. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCP\fR adds a push button. You can specify more than one. \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fC:\fR adds a separator. You can specify more than one. \fI(since 0.13.0)\fP
-.RE
-.PP
-For example, \fB\fCpanel_items = STC\fR will show the systray, the taskbar and the clock (from left to right).
-.IP \(bu 2
-\fB\fCpanel_monitor = monitor (all or primary or 1 or 2 or ...)\fR : Which monitor tint2 draws the panel on
-.RS
-.IP \(bu 2
-The first monitor is \fB\fC1\fR
-.IP \(bu 2
-Use \fB\fCpanel_monitor = all\fR to get a separate panel per monitor
-.RE
-.IP \(bu 2
-\fB\fCprimary_monitor_first = boolean (0 or 1)\fR : Place the primary monitor before all the other monitors in the list. \fI(since 0.12.4; removed in 1.0, use \fB\fCprimary\fR instead)\fP
-.RE
-.PP
-[](images/panel_padding.jpg)
-.RS
-.IP \(bu 2
-\fB\fCpanel_position = vertical_position horizontal_position orientation\fR
-.RS
-.IP \(bu 2
-\fB\fCvertical_position\fR is one of: \fB\fCbottom\fR, \fB\fCtop\fR, \fB\fCcenter\fR
-.IP \(bu 2
-\fB\fChorizontal_position\fR is one of: \fB\fCleft\fR, \fB\fCright\fR, \fB\fCcenter\fR
-.IP \(bu 2
-\fB\fCorientation\fR is one of: \fB\fChorizontal\fR, \fB\fCvertical\fR
-.RE
-.IP \(bu 2
-\fB\fCpanel_size = width height\fR
-.RS
-.IP \(bu 2
-\fB\fCwidth\fR and \fB\fCheight\fR can be specified without units (e.g. \fB\fC123\fR) as pixels, or followed by \fB\fC%\fR as percentages of the monitor size (e.g. \fB\fC50%\fR). Use \fB\fC100%\fR for full monitor width/height.
-Example:
-.RE
-.RE
-.PP
-.RS
-.nf
-# The panel's width is 94% the size of the monitor, the height is 30 pixels:
-panel_size = 94% 30
-.fi
-.RE
-.RS
-.IP \(bu 2
-\fB\fCpanel_shrink = boolean (0 or 1)\fR : If set to 1, the panel will shrink to a compact size dynamically. \fI(since 0.13)\fP
-.IP \(bu 2
-\fB\fCpanel_margin = horizontal_margin vertical_margin\fR : The margins define the distance between the panel and the horizontal/vertical monitor edge. Use \fB\fC0\fR to obtain a panel with the same size as the edge of the monitor (no margin).
-.RE
-.PP
-[](images/panel\fIsize\fPmargin.jpg)
-.RS
-.IP \(bu 2
-\fB\fCpanel_padding = horizontal_padding vertical_padding spacing\fR : Please refer to the image below.
-.RE
-.PP
-[](images/panel_padding.jpg)
-.RS
-.IP \(bu 2
-\fB\fCfont_shadow = boolean (0 or 1)\fR
-.IP \(bu 2
-\fB\fCpanel_background_id = integer\fR : Which background to use for the panel.
-.IP \(bu 2
-\fB\fCwm_menu = boolean (0 or 1)\fR : Defines if tint2 forwards unhandled mouse events to your window manager. Useful for window managers such as openbox, which display the start menu if you right click on the desktop.
-.IP \(bu 2
-\fB\fCpanel_dock = boolean (0 or 1)\fR : Defines if tint2 is placed into the window manager's dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).
-.IP \(bu 2
-\fB\fCpanel_layer = bottom/normal/top\fR : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.
-.IP \(bu 2
-\fB\fCstrut_policy = follow_size/minimum/none\fR : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi\-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.
-.RS
-.IP \(bu 2
-\fB\fCfollow_size\fR means that the maximized windows always resize to have a common edge with tint2.
-.IP \(bu 2
-\fB\fCminimum\fR means that the maximized windows always expand to have a common edge with the hidden panel. This is useful if the \fB\fCautohide\fR option is enabled.
-.IP \(bu 2
-\fB\fCnone\fR means that the maximized windows use the full screen size.
-.RE
-.IP \(bu 2
-\fB\fCpanel_window_name = string\fR : Defines the name of the panel's window. Default: 'tint2'. \fI(since 0.12)\fP
-.IP \(bu 2
-\fB\fCdisable_transparency = boolean (0 or 1)\fR : Whether to disable transparency instead of detecting if it is supported. Useful on broken graphics stacks. \fI(since 0.12)\fP
-.IP \(bu 2
-\fB\fCmouse_effects = boolean (0 or 1)\fR : Whether to enable mouse hover effects for clickable items. \fI(since 0.12.3)\fP
-.IP \(bu 2
-\fB\fCmouse_hover_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjusts the icon color and transparency on mouse hover (works only when mouse_effects = 1).` \fI(since 0.12.3)\fP
-.IP \(bu 2
-\fB\fCmouse_pressed_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjusts the icon color and transparency on mouse press (works only when mouse_effects = 1).` \fI(since 0.12.3)\fP
-.IP \(bu 2
-\fB\fCautohide = boolean (0 or 1)\fR : Whether to enable panel hiding when the mouse cursor exists the panel.
-.IP \(bu 2
-\fB\fCautohide_show_timeout = float\fR : Show timeout in seconds after the mouse cursor enters the panel. Use '.' as decimal separator.
-.IP \(bu 2
-\fB\fCautohide_hide_timeout = float\fR : Hide timeout in seconds after the mouse cursor exits the panel. Use '.' as decimal separator.
-.IP \(bu 2
-\fB\fCautohide_height = integer\fR : panel height (width for vertical panels) in hidden mode.
-.RE
-.SS Launcher
-.RS
-.IP \(bu 2
-\fB\fClauncher_item_app = path_to_application\fR : Each \fB\fClauncher_item_app\fR must be a file path to a .desktop file following the freedesktop.org specification \[la]http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html\[ra]\&. The paths may begin with \fB\fC~\fR, which is expanded to the path of the user's home directory. If only a file name is specified, the file is search in the standard application directories (\fB\fC$XDG_DATA_HOME/applications\fR, \fB\fC~/.local/share/applications\fR, \fB\fC$XDG_DATA_DIRS/applications\fR, \fB\fC/usr/local/share/applications\fR, \fB\fC/usr/share/applications\fR, \fB\fC/opt/share/applications\fR).
-.IP \(bu 2
-\fB\fClauncher_apps_dir = path_to_directory\fR : Specifies a path to a directory from which the launcher is loading all .desktop files (all subdirectories are explored recursively). Can be used multiple times. The path may begin with \fB\fC~\fR, which is expanded to the path of the user's home directory. \fI(since 0.12)\fP
-.IP \(bu 2
-\fB\fClauncher_background_id = integer\fR : Defines which background to use.
-.IP \(bu 2
-\fB\fClauncher_icon_background_id = integer\fR : Defines which background to use for icons.
-.IP \(bu 2
-\fB\fClauncher_padding = horizontal_padding vertical_padding spacing\fR
-.IP \(bu 2
-\fB\fClauncher_icon_size = integer\fR : The launcher icon size, in pixels.
-.IP \(bu 2
-\fB\fClauncher_icon_theme = name_of_theme\fR : (Optional) Uses the specified icon theme to display shortcut icons. Note that tint2 will detect and use the icon theme of your desktop if you have an XSETTINGS manager running (which you probably do), unless \fB\fClauncher_icon_theme_override = 1\fR\&.
-.IP \(bu 2
-\fB\fClauncher_icon_theme_override = boolean (0 or 1)\fR : Whether \fB\fClauncher_icon_theme\fR overrides the value obtained from the XSETTINGS manager. \fI(since 0.12)\fP
-.IP \(bu 2
-\fB\fClauncher_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjusts the icon color and transparency.
-.IP \(bu 2
-\fB\fClauncher_tooltip = boolean (0 or 1)\fR : Whether to show tooltips for the launcher icons.
-.IP \(bu 2
-\fB\fCstartup_notifications = boolean (0 or 1)\fR : Whether to show startup notifications when starting applications from the launcher. \fI(since 0.12)\fP
-.RE
-.SS Taskbar / Pager
-.RS
-.IP \(bu 2
-\fB\fCtaskbar_mode = single_desktop/multi_desktop\fR
-.RS
-.IP \(bu 2
-\fB\fCsingle_desktop\fR : Shows a normal taskbar listing the tasks running on the current virtual desktop (also known as 'workspace');
-.IP \(bu 2
-\fB\fCmulti_desktop\fR : Pager like capability. Shows multiple taskbars, one per virtual desktop, with which:
-.RS
-.IP \(bu 2
-You can drag\-and\-drop tasks between virtual desktops;
-.IP \(bu 2
-You can switch between virtual desktops.
-.RE
-.RE
-.IP \(bu 2
-\fB\fCtaskbar_hide_if_empty = boolean (0 or 1)\fR : If enabled, in multi\-desktop mode the taskbars corresponding to empty desktops different from the current desktop are hidden. \fI(since 0.13)\fP
-.IP \(bu 2
-\fB\fCtaskbar_distribute_size = boolean (0 or 1)\fR : If enabled, in multi\-desktop mode distributes between taskbars the available size proportionally to the number of tasks. Default: disabled. \fI(since 0.12)\fP
-.IP \(bu 2
-\fB\fCtaskbar_padding = horizontal_padding vertical_padding spacing\fR
-.RE
-.PP
-[](images/taskbar_padding.jpg)
-.RS
-.IP \(bu 2
-\fB\fCtaskbar_background_id = integer\fR : Which background to use
-.IP \(bu 2
-\fB\fCtaskbar_active_background_id = integer\fR : Which background to use for the taskbar of the current virtual desktop.
-.IP \(bu 2
-\fB\fCtaskbar_hide_inactive_tasks = boolean (0 or 1)\fR :  If enabled, the taskbar shows only the active task. \fI(since 0.12)\fP
-.IP \(bu 2
-\fB\fCtaskbar_hide_different_monitor = boolean (0 or 1)\fR :  If enabled, the taskbar shows only the tasks from the current monitor. Useful when running different tint2 instances on different monitors, each one having its own config. \fI(since 0.12)\fP
-.IP \(bu 2
-\fB\fCtaskbar_hide_different_desktop = boolean (0 or 1)\fR :  If enabled, the taskbar shows only the tasks from the current desktop. Useful to make multi\-desktop taskbars more compact, but still allow desktop switching with mouse click. \fI(since 1.0)\fP
-.IP \(bu 2
-\fB\fCtaskbar_always_show_all_desktop_tasks = boolean (0 or 1)\fR :  Has effect only if \fB\fCtaskbar_mode = multi_desktop\fR\&. If enabled, tasks that appear on all desktops are shown on all taskbars. Otherwise, they are shown only on the taskbar of the current desktop. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCtaskbar_sort_order = none/title/center\fR : Specifies the sort order of the tasks on the taskbar.  \fI(since 0.12)\fP
-.RS
-.IP \(bu 2
-\fB\fCnone\fR : No sorting. New tasks are simply appended at the end of the taskbar when they appear.
-.IP \(bu 2
-\fB\fCtitle\fR : Sorts the tasks by title.
-.IP \(bu 2
-\fB\fCcenter\fR : Sorts the tasks by their window centers.
-.IP \(bu 2
-\fB\fCmru\fR : Shows the most recently used tasks first. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fClru\fR : Shows the most recently used tasks last. \fI(since 0.12.4)\fP
-.RE
-.IP \(bu 2
-\fB\fCtask_align = left/center/right\fR : Specifies the alignment of the tasks on the taskbar. Default: left.
-.IP \(bu 2
-\fB\fCtaskbar_name = boolean (0 or 1)\fR :  Whether to show the virtual desktop name in the taskbar.
-.IP \(bu 2
-\fB\fCtaskbar_name_padding = padding\fR :  Padding for the virtual desktop name.
-.IP \(bu 2
-\fB\fCtaskbar_name_background_id = integer\fR :  Which background to use for the desktop name.
-.IP \(bu 2
-\fB\fCtaskbar_name_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR :  Font configuration for the desktop name.
-.IP \(bu 2
-\fB\fCtaskbar_name_font_color = color opacity (0 to 100)\fR :  Font color for the desktop name.
-.IP \(bu 2
-\fB\fCtaskbar_name_active_background_id = integer\fR :  Which background to use for the name of the current desktop.
-.IP \(bu 2
-\fB\fCtaskbar_name_active_font_color = color opacity (0 to 100)\fR :  Font color for the name of the current desktop.
-.RE
-.SH Taskbar buttons
-.PP
-The following options configure the task buttons in the taskbar:
-.RS
-.IP \(bu 2
-\fB\fCtask_icon = boolean (0 or 1)\fR : Whether to display the task icon. There is no explicit option to control the task icon size; it depends on the vertical padding set with \fB\fCtask_padding\fR\&.
-.IP \(bu 2
-\fB\fCtask_text = boolean (0 or 1)\fR : Whether to display the task text.
-.IP \(bu 2
-\fB\fCtask_centered = boolean (0 or 1)\fR : Whether the task text is centered.
-.IP \(bu 2
-\fB\fCtask_tooltip = boolean (0 or 1)\fR : Whether to show tooltips for tasks.
-.IP \(bu 2
-\fB\fCtask_thumbnail = boolean (0 or 1)\fR : Whether to show thumbnail tooltips for tasks. \fI(since 16.0)\fP
-.IP \(bu 2
-\fB\fCtask_thumbnail_size = width\fR : Thumbnail size. \fI(since 16.0)\fP
-.IP \(bu 2
-\fB\fCtask_maximum_size = width height\fR
-.RS
-.IP \(bu 2
-\fB\fCwidth\fR is used with horizontal panels to limit the size of the tasks. Use \fB\fCwidth = 0\fR to get full taskbar width.
-.IP \(bu 2
-\fB\fCheight\fR is used with vertical panels.
-.RE
-.IP \(bu 2
-\fB\fCtask_padding = horizontal_padding vertical_padding spacing\fR
-.IP \(bu 2
-\fB\fCurgent_nb_of_blink = integer\fR : Number of blinks on 'get attention' events.
-.RE
-.PP
-[](images/task_padding.jpg)
-.RS
-.IP \(bu 2
-\fB\fCtask_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
-.IP \(bu 2
-\fB\fCtask_font_color = color opacity (0 to 100)\fR
-.IP \(bu 2
-\fB\fCtask_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjust the task icon's color and transparency.
-.IP \(bu 2
-\fB\fCtask_background_id = integer\fR : Which background to use for non selected tasks
-.RE
-.TP
-For the next 3 options STATUS can be \fB\fCactive\fR / \fB\fCiconified\fR  / \fB\fCurgent\fR:
-* \fB\fCtask_STATUS_font_color = color opacity (0 to 100)\fR
-.RS
-.IP \(bu 2
-\fB\fCtask_STATUS_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjusts the task icon's color and transparency.
-.IP \(bu 2
-\fB\fCtask_STATUS_background_id = integer\fR : Which background to use for the task.
-.RE
-.SS Mouse actions for taskbar buttons
-.PP
-The possible mouse events are: \fB\fCleft, middle, right, scroll_up, scroll_down\fR\&.
-.PP
-The possible mouse actions are: \fB\fCnone, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task\fR\&.
-.PP
-Use \fB\fCmouse_event = action\fR to customize mouse actions. Example:
-\fB\fC
-  mouse_middle = none
-  mouse_right = close
-  mouse_scroll_up = toggle
-  mouse_scroll_down = iconify
-\fR
-.TP
-The action semantics:
-* \fB\fCnone\fR : If \fB\fCwm_menu = 1\fR is set, the mouse event is forwarded to the window manager. Otherwise it is ignored.
-* \fB\fCclose\fR : close the task
-* \fB\fCtoggle\fR : toggle the task
-* \fB\fCiconify\fR : iconify (minimize) the task
-* \fB\fCtoggle_iconify\fR : toggle or iconify the task
-* \fB\fCmaximize_restore\fR : maximized or minimized the task
-* \fB\fCshade\fR : shades (collapses) the task
-* \fB\fCdesktop_left\fR : send the task to the desktop on the left
-* \fB\fCdesktop_right\fR : send the task to the desktop on the right
-* \fB\fCnext_task\fR : send the focus to next task
-* \fB\fCprev_task\fR : send the focus to previous task
-.SS System Tray
-.RS
-.IP \(bu 2
-\fB\fCsystray_padding = horizontal_padding vertical_padding spacing\fR
-.IP \(bu 2
-\fB\fCsystray_background_id = integer\fR : Which background to use.
-.IP \(bu 2
-\fB\fCsystray_sort = ascending/descending/left2right/right2left\fR : Specifies the sorting order for the icons in the systray: in ascending/descending alphabetical order of the icon title, or always add icons to the right/left (note that with \fB\fCleft2right\fR or \fB\fCright2left\fR the order can be different on panel restart).
-.IP \(bu 2
-\fB\fCsystray_icon_size = max_icon_size\fR : Set the maximum system tray icon size to \fB\fCnumber\fR\&. Set to \fB\fC0\fR for automatic icon sizing.
-.IP \(bu 2
-\fB\fCsystray_icon_asb = alpha (0 to 100) saturation (\-100 to 100) brightness (\-100 to 100)\fR : Adjust the systray icons color and transparency.
-.IP \(bu 2
-\fB\fCsystray_monitor = integer (1, 2, ...) or primary\fR :  On which monitor to draw the systray. The first monitor is \fB\fC1\fR\&. \fI(since 0.12)\fP
-.IP \(bu 2
-\fB\fCsystray_name_filter = string\fR :  Regular expression to identify icon names to be hidden. For example, \fB\fC^audacious$\fR will hide icons with the exact name \fB\fCaudacious\fR, while \fB\fCaud\fR will hide any icons having \fB\fCaud\fR in the name. \fI(since 0.13.1)\fP
-.RE
-.SS Clock
-.RS
-.IP \(bu 2
-\fB\fCtime1_format = %H:%M\fR : The format used by the first line of the clock.
-.RS
-.IP \(bu 2
-\fB\fCtime1_format\fR, \fB\fCtime2_format\fR and \fB\fCclock_tooltip\fR use the 'strftime' syntax. More info can be found here: \[la]http://www.manpagez.com/man/3/strftime/\[ra]
-.IP \(bu 2
-To hide the clock, comment \fB\fCtime1_format\fR and \fB\fCtime2_format\fR\&.
-.RE
-.IP \(bu 2
-\fB\fCtime1_timezone = :US/Hawaii\fR
-.RS
-.IP \(bu 2
-\fB\fCtime1_timezone\fR, \fB\fCtime2_timezone\fR and \fB\fCclock_tooltip_timezone\fR can be used to specify a timezone. If you do not specify a value the system\-wide timezone is used. The timezones can usually be found in \fB\fC/usr/share/zoneinfo\fR\&. If your timezones are in a different directory, you need to specify the absolute path, e.g. \fB\fCtime1_timezone = :/different/zoneinfo/dir/US/Hawaii\fR Always prepend the timezone with a ':'
-.RE
-.IP \(bu 2
-\fB\fCtime1_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
-.IP \(bu 2
-\fB\fCtime2_format = %A %d %B\fR
-.IP \(bu 2
-\fB\fCtime2_timezone = :Europe/Berlin\fR
-.IP \(bu 2
-\fB\fCtime2_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
-.IP \(bu 2
-\fB\fCclock_font_color = color opacity (0 to 100)\fR
-.IP \(bu 2
-\fB\fCclock_padding = horizontal_padding vertical_padding\fR
-.IP \(bu 2
-\fB\fCclock_background_id = integer\fR : Which background to use
-.IP \(bu 2
-\fB\fCclock_tooltip = %a, %d. %b %Y\fR : Format for the clock's tooltip.
-.IP \(bu 2
-\fB\fCclock_tooltip_timezone = :UTC\fR
-.IP \(bu 2
-\fB\fCclock_lclick_command = text\fR : Command to execute on left click.
-.IP \(bu 2
-\fB\fCclock_rclick_command = text\fR : Command to execute on right click.
-.IP \(bu 2
-\fB\fCclock_mclick_command = text\fR : Command to execute on middle click. \fI(since 0.12.1)\fP
-.IP \(bu 2
-\fB\fCclock_uwheel_command = text\fR : Command to execute on wheel scroll up. \fI(since 0.12.1)\fP
-.IP \(bu 2
-\fB\fCclock_dwheel_command = text\fR : Command to execute on wheel scroll down. \fI(since 0.12.1)\fP
-.RE
-.SS Tooltip
-.RS
-.IP \(bu 2
-\fB\fCtooltip_padding = horizontal_padding vertical_padding\fR
-.IP \(bu 2
-\fB\fCtooltip_show_timeout = float\fR : Delay to show the tooltip in seconds. Use \fB\fC\&.\fR as decimal separator.
-.IP \(bu 2
-\fB\fCtooltip_hide_timeout = float\fR : Delay to hide the tooltip in seconds. Use \fB\fC\&.\fR as decimal separator.
-.IP \(bu 2
-\fB\fCtooltip_background_id = integer\fR : Which background to use for tooltips. Note that with fake transparency the alpha channel and corner radius options are not respected.
-.IP \(bu 2
-\fB\fCtooltip_font_color = color opacity  (0 to 100)\fR
-.IP \(bu 2
-\fB\fCtooltip_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
-.RE
-.SS Battery
-.RS
-.IP \(bu 2
-\fB\fCbattery_hide = never/integer (0 to 100)\fR : At what battery percentage the battery item is hidden.
-.IP \(bu 2
-\fB\fCbattery_low_status = integer\fR: At what battery percentage the low command is executed.
-.IP \(bu 2
-\fB\fCbattery_low_cmd = notify\-send "battery low"\fR : Command to execute when the battery is low.
-.IP \(bu 2
-\fB\fCbattery_full_cmd = notify\-send "battery full"\fR : Command to execute when the battery is full.
-.IP \(bu 2
-\fB\fCbat1_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
-.IP \(bu 2
-\fB\fCbat2_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR
-.IP \(bu 2
-\fB\fCbattery_font_color = color opacity (0 to 100)\fR
-.IP \(bu 2
-\fB\fCbat1_format = FORMAT_STRING\fR : Format for battery line 1. Default: %p. \fI(since 1.0)\fP Format specification:
-.RS
-.IP \(bu 2
-%s: State (charging, discharging, full, unknown).
-.IP \(bu 2
-%m: Minutes left until completely charged/discharged (estimated).
-.IP \(bu 2
-%h: Hours left until completely charged/discharged (estimated).
-.IP \(bu 2
-%t: Time left. Shows "hrs:mins" when charging/discharging, or "Ful\[rs]" when full.
-.IP \(bu 2
-%p: Percentage. Includes the % sign.
-.RE
-.IP \(bu 2
-\fB\fCbat2_format = FORMAT_STRING\fR : Format for battery line 2. Default: %t. \fI(since 1.0)\fP
-.IP \(bu 2
-\fB\fCbattery_padding = horizontal_padding vertical_padding\fR
-.IP \(bu 2
-\fB\fCbattery_background_id = integer\fR : Which background to use for the battery.
-.IP \(bu 2
-\fB\fCbattery_tooltip_enabled = boolean (0 or 1)\fR : Enable/disable battery tooltips. \fI(since 0.12.3)\fP
-.IP \(bu 2
-\fB\fCbattery_lclick_command = text\fR : Command to execute on left click. \fI(since 0.12.1)\fP
-.IP \(bu 2
-\fB\fCbattery_rclick_command = text\fR : Command to execute on right click. \fI(since 0.12.1)\fP
-.IP \(bu 2
-\fB\fCbattery_mclick_command = text\fR : Command to execute on middle click. \fI(since 0.12.1)\fP
-.IP \(bu 2
-\fB\fCbattery_uwheel_command = text\fR : Command to execute on wheel scroll up. \fI(since 0.12.1)\fP
-.IP \(bu 2
-\fB\fCbattery_dwheel_command = text\fR : Command to execute on wheel scroll down. \fI(since 0.12.1)\fP
-.IP \(bu 2
-\fB\fCac_connected_cmd = text\fR : Command to execute when the power adapter is plugged in. \fI(since 0.12.3)\fP
-.IP \(bu 2
-\fB\fCac_disconnected_cmd = text\fR : Command to execute when the power adapter is unplugged. \fI(since 0.12.3)\fP
-.RE
-.SS Executor
-.RS
-.IP \(bu 2
-\fB\fCexecp = new\fR : Begins the configuration of a new executor plugin. Multiple such plugins are supported; just use multiple \fB\fCE\fRs in \fB\fCpanel_items\fR\&. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_command = text\fR : Command to execute. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_interval = integer\fR : The command is executed again after \fB\fCexecp_interval\fR seconds from the moment it exits. If zero, the command is executed only once. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_continuous = integer\fR : If non\-zero, the last \fB\fCexecp_continuous\fR lines from the output of the command are displayed, every \fB\fCexecp_continuous\fR lines; this is useful for showing the output of commands that run indefinitely, such as \fB\fCping 127.0.0.1\fR\&. If zero, the output of the command is displayed after it finishes executing. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_has_icon = boolean (0 or 1)\fR : If \fB\fCexecp_has_icon = 1\fR, the first line printed by the command is interpreted as a path to an image file. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_cache_icon = boolean (0 or 1)\fR : If \fB\fCexecp_cache_icon = 0\fR, the image is reloaded each time the command is executed (useful if the image file is changed on disk by the program executed by \fB\fCexecp_command\fR). \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_icon_w = integer\fR : You can use \fB\fCexecp_icon_w\fR and \fB\fCexecp_icon_h\fR to resize the image. If one of them is zero/missing, the image is rescaled proportionally. If both of them are zero/missing, the image is not rescaled. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_icon_h = integer\fR : See \fB\fCexecp_icon_w\fR\&. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_tooltip = text\fR : The tooltip. If left empty, no tooltip is displayed. If missing, the standard error of the command is shown as a tooltip (an ANSI clear screen sequence can reset the contents, bash: \fB\fCprintf '\\e[2J'\fR, C: \fB\fCprintf("\\x1b[2J");\fR). If the standard error is empty, the tooltip will show information about the time when the command was last executed. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR : The font used to draw the text.  \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_font_color = color opacity\fR : The font color. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_markup = boolean (0 or 1)\fR : If non\-zero, the output of the command is treated as Pango markup, which allows rich text formatting. The format is documented here \[la]https://developer.gnome.org/pygtk/stable/pango-markup-language.html\[ra]\&. Note that using this with commands that print data downloaded from the Internet is a possible security risk. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_background_id = integer\fR : Which background to use. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_centered = boolean (0 or 1)\fR : Whether to center the text. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text\fR \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_lclick_command = text\fR : Command to execute on left click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_mclick_command = text\fR : Command to execute on right click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_rclick_command = text\fR : Command to execute on middle click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_uwheel_command = text\fR : Command to execute on wheel scroll up. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
-.IP \(bu 2
-\fB\fCexecp_dwheel_command = text\fR : Command to execute on wheel scroll down. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
-.RE
-.SS Executor samples
-.SS Print the hostname
-.PP
-.RS
-.nf
-execp = new
-execp_command = hostname
-execp_interval = 0
-.fi
-.RE
-.SS Print disk usage for the root partition every 10 seconds
-.PP
-.RS
-.nf
-execp = new
-execp_command = df \-h | awk '/\\/$/ { print $6 ": " $2 " " $5}'
-execp_interval = 10
-.fi
-.RE
-.SS Button with icon and rich text, executes command when clicked
-.PP
-.RS
-.nf
-execp = new
-execp_command = echo /usr/share/icons/elementary\-xfce/emblems/24/emblem\-colors\-blue.png; echo '<span foreground="#7f7">Click</span> <span foreground="#77f">me</span> <span foreground="#f77">pls</span>'
-execp_has_icon = 1
-execp_interval = 0
-execp_centered = 1
-execp_font = sans 9
-execp_markup = 1
-execp_font_color = #aaffaa 100
-execp_padding = 2 0
-execp_tooltip = I will tell you a secret...
-execp_lclick_command = zenity \-\-info "\-\-text=$(uname \-sr)"
-execp_background_id = 2
-.fi
-.RE
-.SS Desktop pager with text
-.PP
-.RS
-.nf
-execp = new
-execp_command = xprop \-root \-spy | awk '/^_NET_CURRENT_DESKTOP/ { print "Workspace " ($3 + 1) ; fflush(); }'
-execp_interval = 1
-execp_continuous = 1
-.fi
-.RE
-.SS Desktop pager with icon
-.PP
-.RS
-.nf
-execp_command = xprop \-root \-spy | awk \-v home="$HOME" '/^_NET_CURRENT_DESKTOP/ { print home "/.config/myPager/" ($3 + 1) ".png\\n" ; fflush(); }'
-execp_interval = 1
-execp_has_icon = 1
-execp_cache_icon = 1
-execp_continuous = 2
-.fi
-.RE
-.SS Round\-trip time to the gateway, refreshed every second
-.PP
-.RS
-.nf
-execp = new
-execp_command = ping \-i 1 \-c 1 \-W 1 \-O \-D \-n $(ip route | grep default | grep via | grep \-o '[0\-9]*\\.[0\-9]*\\.[0\-9]*\\.[0\-9]*') | awk '/no/ { print "<span foreground=\\"#faa\\">timeout</span>"; fflush(); }; /time=/ { gsub(/time=/, "", $8); printf "<span foreground=\\"#7af\\">%3.0f %s</span>\\n", $8, $9; fflush(); } '
-execp_continuous = 0
-execp_interval = 1
-execp_markup = 1
-.fi
-.RE
-.SS Memory usage
-.PP
-.RS
-.nf
-execp = new
-execp_command = free | awk '/^\-/ { printf "Mem: '$(free \-h | awk '/^Mem:/ { print $2 }')' %.0f%%\\n", 100*$3/($3+$4); fflush(stdout) }'
-execp_interval = 5
-execp_continuous = 0
-.fi
-.RE
-.SS Network load
-.PP
-.RS
-.nf
-# Note the use of "stdbuf \-oL" to force the program to flush the output line by line.
-execp = new
-execp_command = stdbuf \-oL bwm\-ng \-o csv \-t 1000 | awk \-F ';' '/total/ { printf "Net: %.0f Mb/s\\n", ($5*8/1.0e6) }; fflush(stdout)'
-execp_continuous = 1
-execp_interval = 1
-.fi
-.RE
-.SS Button
-.RS
-.IP \(bu 2
-\fB\fCbutton = new\fR : Begins the configuration of a new button. Multiple such plugins are supported; just use multiple \fB\fCP\fRs in \fB\fCpanel_items\fR\&. \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_icon = text\fR : Name or path of icon (or empty). \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_text = text\fR : Text to display (or empty). \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_tooltip = text\fR : The tooltip (or empty). \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_font = [FAMILY\-LIST] [STYLE\-OPTIONS] [SIZE]\fR : The font used to draw the text.  \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_font_color = color opacity\fR : The font color. \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_background_id = integer\fR : Which background to use. \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_centered = boolean (0 or 1)\fR : Whether to center the text. \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_padding = horizontal_padding vertical_padding spacing_between_icon_and_text\fR \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_max_icon_size = integer\fR : Sets a limit to the icon size. Otherwise, the icon will expand to the edges. \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_lclick_command = text\fR : Command to execute on left click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_mclick_command = text\fR : Command to execute on right click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_rclick_command = text\fR : Command to execute on middle click. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_uwheel_command = text\fR : Command to execute on wheel scroll up. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.14)\fP
-.IP \(bu 2
-\fB\fCbutton_dwheel_command = text\fR : Command to execute on wheel scroll down. If not defined, \fB\fCexecp_command\fR is  executed immediately, unless it is currently running. \fI(since 0.14)\fP
-.RE
-.SS Separator
-.RS
-.IP \(bu 2
-\fB\fCseparator = new\fR : Begins the configuration of a new separator. Multiple such plugins are supported; just use multiple \fB\fC:\fRs in \fB\fCpanel_items\fR\&. \fI(since 0.13.0)\fP
-.IP \(bu 2
-\fB\fCseparator_background_id = integer\fR : Which background to use. \fI(since 0.13.0)\fP
-.IP \(bu 2
-\fB\fCseparator_color = color opacity\fR : The foreground color. \fI(since 0.13.0)\fP
-.IP \(bu 2
-\fB\fCseparator_style = [empty | line | dots]\fR : The separator style. \fI(since 0.13.0)\fP
-.IP \(bu 2
-\fB\fCseparator_size = integer\fR : The thickness of the separator. Does not include the border and padding. For example, if the style is \fB\fCline\fR, this is the line thickness; if the style is \fB\fCdots\fR, this is the dot's diameter. \fI(since 0.13.0)\fP
-.IP \(bu 2
-\fB\fCseparator_padding = side_padding cap_padding\fR : The padding to add to the sides of the separator, in pixels. \fI(since 0.13.0)\fP
-.RE
-.SS Example configuration
-.PP
-See /etc/xdg/tint2/tint2rc.
 .SH AUTHOR
+tint2 was written by Thierry Lorthiois <lorthiois@bbsoft.fr>.  It is based on
+ttm, originally written by Pål Staurland <staura@gmail.com>
 .PP
-tint2 was written by Thierry Lorthiois \[la]lorthiois@bbsoft.fr\[ra]\&.
+This manual page was written by Daniel Moerner <dmoerner@gmail.com>,
-It is based on ttm, originally written by Pål Staurland \[la]staura@gmail.com\[ra]\&.
+for the Debian project (but may be used by others).  It was adopted from the
-.PP
+tint2 docs.
-This manual page was originally written by Daniel Moerner \[la]dmoerner@gmail.com\[ra], for the Debian project (but may be used by others).
-It was adopted from the tint2 docs.
-.SH SEE ALSO
-.PP
-The main website \[la]https://gitlab.com/o9000/tint2\[ra]
-and the wiki page at \[la]https://gitlab.com/o9000/tint2/wikis/home\[ra]\&.
-.PP
-This documentation is also provided in HTML and Markdown format in the system's default location
-for documentation files, usually \fB\fC/usr/share/doc/tint2\fR or \fB\fC/usr/local/share/doc/tint2\fR\&.
-\&.

doc/tint2.html

@@ -1,524 +0,0 @@
-<h1 id="tint2-1-2016-05-22"><span class="md2man-title">TINT2</span> <span class="md2man-section">1</span> <span class="md2man-date">2016-05-22</span><a name="tint2-1-2016-05-22" href="#tint2-1-2016-05-22" class="md2man-permalink" title="permalink"></a></h1><h2 id="name">NAME<a name="name" href="#name" class="md2man-permalink" title="permalink"></a></h2><p>tint2 - lightweight panel/taskbar</p><h2 id="synopsis">SYNOPSIS<a name="synopsis" href="#synopsis" class="md2man-permalink" title="permalink"></a></h2><p><code>tint2 [-c path_to_config_file]</code></p><h2 id="description">DESCRIPTION<a name="description" href="#description" class="md2man-permalink" title="permalink"></a></h2><p>tint2 is a simple panel/taskbar made for modern X window managers.
-It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.).</p><p>Features:</p>
-<ul>
-<li>Panel with taskbar, system tray, clock and launcher icons;</li>
-<li>Easy to customize: color/transparency on fonts, icons, borders and backgrounds;</li>
-<li>Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;</li>
-<li>Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;</li>
-<li>Customizable mouse events.</li>
-</ul>
-<p>Goals:</p>
-<ul>
-<li>Be unintrusive and light (in terms of memory, CPU and aesthetic);</li>
-<li>Follow the freedesktop.org specifications;</li>
-<li>Make certain workflows, such as multi-desktop and multi-monitor, easy to use.</li>
-</ul>
-<h2 id="options">OPTIONS<a name="options" href="#options" class="md2man-permalink" title="permalink"></a></h2><dl><dt><code>-c path_to_config_file</code></dt><dd>Specifies which configuration file to use instead of the default.</dd></dl><h2 id="configuration">CONFIGURATION<a name="configuration" href="#configuration" class="md2man-permalink" title="permalink"></a></h2><h3 id="table-of-contents">Table of contents<a name="table-of-contents" href="#table-of-contents" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><a href="#introduction">Introduction</a></p></li>
-<li><p><a href="#backgrounds-and-borders">Backgrounds and borders</a></p></li>
-<li><p><a href="#panel">Panel</a></p></li>
-<li><p><a href="#launcher">Launcher</a></p></li>
-<li><p><a href="#taskbar-pager">Taskbar/Pager</a></p></li>
-<li><p><a href="#taskbar-buttons">Taskbar buttons</a></p></li>
-<li><p><a href="#mouse-actions-for-taskbar-buttons">Mouse actions for taskbar buttons</a></p></li>
-<li><p><a href="#system-tray">System tray</a></p></li>
-<li><p><a href="#clock">Clock</a></p></li>
-<li><p><a href="#tooltip">Tooltip</a></p></li>
-<li><p><a href="#battery">Battery</a></p></li>
-<li><p><a href="#executor">Executor</a></p></li>
-<li><p><a href="#example-configuration">Example configuration</a></p></li>
-</ul>
-<h3 id="introduction">Introduction<a name="introduction" href="#introduction" class="md2man-permalink" title="permalink"></a></h3><p>These are instructions for configuring tint2 directly by editing its config file.
-You may also use instead the graphical interface <code>tint2conf</code>.</p><p>The first time you run tint2, it will create the config file in <code>$HOME/.config/tint2/tint2rc</code> (This applies if you have done a clean install. Running tint2 in the source directory without doing &#39;make install&#39; will not create the config file.)</p><p>You can also specify another file on the command line with the -c option, e.g.: <code>tint2 -c $HOME/tint2.conf</code>. This can be used to run multiple instances of tint2 that use different settings.</p><p>If you change the config file while tint2 is running, the command <code>killall -SIGUSR1 tint2</code> will force tint2 to reload it.</p><p>All the configuration options supported in the config file are listed below.
-Try to respect as much as possible the order of the options as given below.</p><h3 id="backgrounds-and-borders">Backgrounds and borders<a name="backgrounds-and-borders" href="#backgrounds-and-borders" class="md2man-permalink" title="permalink"></a></h3><p>The tint2 config file starts with the options defining background elements with borders:</p>
-<ul>
-<li><p><code>rounded = number_of_pixels</code> : the corner radius</p></li>
-<li><p><code>border_width = integer</code> : the border width in pixels</p></li>
-<li><p><code>border_sides = LRTB</code> : the sides to draw the border on (left, right, top, bottom). If not specified, all sides are used.</p></li>
-<li><p><code>background_color = color opacity</code></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz).</li>
-</ul></li>
-<li><p><code>border_color = color opacity</code></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
-</ul></li>
-<li><p><code>background_color_hover = color opacity</code> (default: same as background_color) <em>(since 0.12.3)</em></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)</li>
-</ul></li>
-<li><p><code>border_color_hover = color opacity</code> (default: same as border_color) <em>(since 0.12.3)</em></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
-</ul></li>
-<li><p><code>background_color_pressed = color opacity</code> (default: same as background<em>color</em>hover) <em>(since 0.12.3)</em></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)</li>
-</ul></li>
-<li><p><code>border_color_pressed = color opacity</code> (default: same as border<em>color</em>hover) <em>(since 0.12.3)</em></p>
-<ul>
-<li><code>color</code> is specified in hex RGB, e.g. #ff0000 is red</li>
-<li><code>opacity</code> varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque</li>
-</ul></li>
-</ul>
-<p>You can define as many backgrounds as you want. For example, the following config defines two backgrounds:</p><pre class="highlight plaintext"><code>rounded = 1
-border_width = 0
-background_color = #282828 100
-border_color = #000000 0
-
-rounded = 1
-border_width = 0
-background_color = #f6b655 90
-border_color = #cccccc 40
-</code></pre>
-<p>tint2 automatically identifies each background with a number starting from 1 (1, 2, ...).
-Afterwards, you can apply a background to objects (panel, taskbar, task, clock, systray) using the background id, for example:</p><pre class="highlight plaintext"><code>panel_background_id = 1
-taskbar_background_id = 0
-task_background_id = 0
-task_active_background_id = 2
-systray_background_id = 0
-clock_background_id = 0
-</code></pre>
-<p>Identifier 0 refers to a special background which is fully transparent, identifier 1 applies the first background defined in the config file etc.</p><h3 id="panel">Panel<a name="panel" href="#panel" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>panel_items = LTSBC</code> defines the items tint2 will show and the order of those items. Each letter refers to an item, defined as:</p>
-<ul>
-<li><code>L</code> shows the Launcher</li>
-<li><code>T</code> shows the Taskbar</li>
-<li><code>S</code> shows the Systray (also called notification area)</li>
-<li><code>B</code> shows the Battery status</li>
-<li><code>C</code> shows the Clock</li>
-<li><code>F</code> adds an extensible spacer (freespace). Has no effect if <code>T</code> is also present. <em>(since 0.12)</em></li>
-<li><code>E</code> adds an executor plugin. You can specify more than one. <em>(since 0.12.4)</em></li>
-</ul>
-<p>For example, <code>panel_items = STC</code> will show the systray, the taskbar and the clock (from left to right).</p></li>
-<li><p><code>panel_monitor = monitor (all or 1 or 2 or ...)</code> : Which monitor tint2 draws the panel on</p>
-<ul>
-<li>The first monitor is <code>1</code></li>
-<li>Use <code>panel_monitor = all</code> to get a separate panel per monitor</li>
-</ul></li>
-<li><p><code>primary_monitor_first = boolean (0 or 1)</code> : Place the primary monitor before all the other monitors in the list. <em>(since 0.12.4)</em></p></li>
-</ul>
-<p><img src="panel_padding.jpg" alt=""></p>
-<ul>
-<li><p><code>panel_position = vertical_position horizontal_position orientation</code></p>
-<ul>
-<li><code>vertical_position</code> is one of: <code>bottom</code>, <code>top</code>, <code>center</code></li>
-<li><code>horizontal_position</code> is one of: <code>left</code>, <code>right</code>, <code>center</code></li>
-<li><code>orientation</code> is one of: <code>horizontal</code>, <code>vertical</code></li>
-</ul></li>
-<li><p><code>panel_size = width height</code></p>
-<ul>
-<li><code>width</code> and <code>height</code> can be specified without units (e.g. <code>123</code>) as pixels, or followed by <code>%</code> as percentages of the monitor size (e.g. <code>50%</code>). Use <code>100%</code> for full monitor width/height.
-Example:</li>
-</ul></li>
-</ul>
-<pre class="highlight plaintext"><code># The panel's width is 94% the size of the monitor, the height is 30 pixels:
-panel_size = 94% 30
-</code></pre>
-
-<ul>
-<li><code>panel_margin = horizontal_margin vertical_margin</code> : The margins define the distance between the panel and the horizontal/vertical monitor edge. Use <code>0</code> to obtain a panel with the same size as the edge of the monitor (no margin).</li>
-</ul>
-<p><img src="panel_size_margin.jpg" alt=""></p>
-<ul>
-<li><code>panel_padding = horizontal_padding vertical_padding spacing</code> : Please refer to the image below.</li>
-</ul>
-<p><img src="panel_padding.jpg" alt=""></p>
-<ul>
-<li><p><code>font_shadow = boolean (0 or 1)</code></p></li>
-<li><p><code>panel_background_id = integer</code> : Which background to use for the panel.</p></li>
-<li><p><code>wm_menu = boolean (0 or 1)</code> : Defines if tint2 forwards unhandled mouse events to your window manager. Useful for window managers such as openbox, which display the start menu if you right click on the desktop.</p></li>
-<li><p><code>panel_dock = boolean (0 or 1)</code> : Defines if tint2 is placed into the window manager&#39;s dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).</p></li>
-<li><p><code>panel_layer = bottom/normal/top</code> : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.</p></li>
-<li><p><code>strut_policy = follow_size/minimum/none</code> : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.</p>
-<ul>
-<li><code>follow_size</code> means that the maximized windows always resize to have a common edge with tint2.</li>
-<li><code>minimum</code> means that the maximized windows always expand to have a common edge with the hidden panel. This is useful if the <code>autohide</code> option is enabled.</li>
-<li><code>none</code> means that the maximized windows use the full screen size.</li>
-</ul></li>
-<li><p><code>panel_window_name = string</code> : Defines the name of the panel&#39;s window. Default: &#39;tint2&#39;. <em>(since 0.12)</em></p></li>
-<li><p><code>disable_transparency = boolean (0 or 1)</code> : Whether to disable transparency instead of detecting if it is supported. Useful on broken graphics stacks. <em>(since 0.12)</em></p></li>
-<li><p><code>mouse_effects = boolean (0 or 1)</code> : Whether to enable mouse hover effects for clickable items. <em>(since 0.12.3)</em></p></li>
-<li><p><code>mouse_hover_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency on mouse hover (works only when mouse_effects = 1).` <em>(since 0.12.3)</em></p></li>
-<li><p><code>mouse_pressed_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency on mouse press (works only when mouse_effects = 1).` <em>(since 0.12.3)</em></p></li>
-<li><p><code>autohide = boolean (0 or 1)</code> : Whether to enable panel hiding when the mouse cursor exists the panel.</p></li>
-<li><p><code>autohide_show_timeout = float</code> : Show timeout in seconds after the mouse cursor enters the panel. Use &#39;.&#39; as decimal separator.</p></li>
-<li><p><code>autohide_hide_timeout = float</code> : Hide timeout in seconds after the mouse cursor exits the panel. Use &#39;.&#39; as decimal separator.</p></li>
-<li><p><code>autohide_height = integer</code> : panel height (width for vertical panels) in hidden mode.</p></li>
-</ul>
-<h3 id="launcher">Launcher<a name="launcher" href="#launcher" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>launcher_item_app = path_to_application</code> : Each <code>launcher_item_app</code> must be a file path to a .desktop file following the freedesktop.org <a href="http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html">specification</a>. The paths may begin with <code>~</code>, which is expanded to the path of the user&#39;s home directory. If only a file name is specified, the file is search in the standard application directories (<code>$XDG_DATA_HOME/applications</code>, <code>~/.local/share/applications</code>, <code>$XDG_DATA_DIRS/applications</code>, <code>/usr/local/share/applications</code>, <code>/usr/share/applications</code>, <code>/opt/share/applications</code>).</p></li>
-<li><p><code>launcher_apps_dir = path_to_directory</code> : Specifies a path to a directory from which the launcher is loading all .desktop files (all subdirectories are explored recursively). Can be used multiple times. The path may begin with <code>~</code>, which is expanded to the path of the user&#39;s home directory. <em>(since 0.12)</em></p></li>
-<li><p><code>launcher_background_id = integer</code> : Defines which background to use.</p></li>
-<li><p><code>launcher_icon_background_id = integer</code> : Defines which background to use for icons.</p></li>
-<li><p><code>launcher_padding = horizontal_padding vertical_padding spacing</code></p></li>
-<li><p><code>launcher_icon_size = integer</code> : The launcher icon size, in pixels.</p></li>
-<li><p><code>launcher_icon_theme = name_of_theme</code> : (Optional) Uses the specified icon theme to display shortcut icons. Note that tint2 will detect and use the icon theme of your desktop if you have an XSETTINGS manager running (which you probably do), unless <code>launcher_icon_theme_override = 1</code>.</p></li>
-<li><p><code>launcher_icon_theme_override = boolean (0 or 1)</code> : Whether <code>launcher_icon_theme</code> overrides the value obtained from the XSETTINGS manager. <em>(since 0.12)</em></p></li>
-<li><p><code>launcher_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the icon color and transparency.</p></li>
-<li><p><code>launcher_tooltip = boolean (0 or 1)</code> : Whether to show tooltips for the launcher icons.</p></li>
-<li><p><code>startup_notifications = boolean (0 or 1)</code> : Whether to show startup notifications when starting applications from the launcher. <em>(since 0.12)</em></p></li>
-</ul>
-<h3 id="taskbar-pager">Taskbar / Pager<a name="taskbar-pager" href="#taskbar-pager" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>taskbar_mode = single_desktop/multi_desktop</code></p>
-<ul>
-<li><code>single_desktop</code> : Shows a normal taskbar listing the tasks running on the current virtual desktop (also known as &#39;workspace&#39;);</li>
-<li><code>multi_desktop</code> : Pager like capability. Shows multiple taskbars, one per virtual desktop, with which:
-
-<ul>
-<li>You can drag-and-drop tasks between virtual desktops;</li>
-<li>You can switch between virtual desktops.</li>
-</ul></li>
-</ul></li>
-<li><p><code>taskbar_distribute_size = boolean (0 or 1)</code> :  If enabled, in multi-desktop mode distributes between taskbars the available size proportionally to the number of tasks. Default: disabled. <em>(since 0.12)</em></p></li>
-<li><p><code>taskbar_padding = horizontal_padding vertical_padding spacing</code></p></li>
-</ul>
-<p><img src="taskbar_padding.jpg" alt=""></p>
-<ul>
-<li><p><code>taskbar_background_id = integer</code> : Which background to use</p></li>
-<li><p><code>taskbar_active_background_id = integer</code> : Which background to use for the taskbar of the current virtual desktop.</p></li>
-<li><p><code>taskbar_hide_inactive_tasks = boolean (0 or 1)</code> :  If enabled, the taskbar shows only the active task. <em>(since 0.12)</em></p></li>
-<li><p><code>taskbar_hide_different_monitor = boolean (0 or 1)</code> :  If enabled, the taskbar shows only the tasks from the current monitor. Useful when running different tint2 instances on different monitors, each one having its own config. <em>(since 0.12)</em></p></li>
-<li><p><code>taskbar_always_show_all_desktop_tasks = boolean (0 or 1)</code> :  Has effect only if <code>taskbar_mode = multi_desktop</code>. If enabled, tasks that appear on all desktops are shown on all taskbars. Otherwise, they are shown only on the taskbar of the current desktop. <em>(since 0.12.4)</em></p></li>
-<li><p><code>taskbar_sort_order = none/title/center</code> : Specifies the sort order of the tasks on the taskbar.  <em>(since 0.12)</em></p>
-<ul>
-<li><code>none</code> : No sorting. New tasks are simply appended at the end of the taskbar when they appear.</li>
-<li><code>title</code> : Sorts the tasks by title.</li>
-<li><code>center</code> : Sorts the tasks by their window centers.</li>
-<li><code>mru</code> : Shows the most recently used tasks first. <em>(since 0.12.4)</em></li>
-<li><code>lru</code> : Shows the most recently used tasks last. <em>(since 0.12.4)</em></li>
-</ul></li>
-<li><p><code>task_align = left/center/right</code> : Specifies the alignment of the tasks on the taskbar. Default: left.</p></li>
-<li><p><code>taskbar_name = boolean (0 or 1)</code> :  Whether to show the virtual desktop name in the taskbar.</p></li>
-<li><p><code>taskbar_name_padding = padding</code> :  Padding for the virtual desktop name.</p></li>
-<li><p><code>taskbar_name_background_id = integer</code> :  Which background to use for the desktop name.</p></li>
-<li><p><code>taskbar_name_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> :  Font configuration for the desktop name.</p></li>
-<li><p><code>taskbar_name_font_color = color opacity (0 to 100)</code> :  Font color for the desktop name.</p></li>
-<li><p><code>taskbar_name_active_background_id = integer</code> :  Which background to use for the name of the current desktop.</p></li>
-<li><p><code>taskbar_name_active_font_color = color opacity (0 to 100)</code> :  Font color for the name of the current desktop.</p></li>
-</ul>
-<h1 id="taskbar-buttons">Taskbar buttons<a name="taskbar-buttons" href="#taskbar-buttons" class="md2man-permalink" title="permalink"></a></h1><p>The following options configure the task buttons in the taskbar:</p>
-<ul>
-<li><p><code>task_icon = boolean (0 or 1)</code> : Whether to display the task icon.</p></li>
-<li><p><code>task_text = boolean (0 or 1)</code> : Whether to display the task text.</p></li>
-<li><p><code>task_centered = boolean (0 or 1)</code> : Whether the task text is centered.</p></li>
-<li><p><code>task_tooltip = boolean (0 or 1)</code> : Whether to show tooltips for tasks.</p></li>
-<li><p><code>task_maximum_size = width height</code></p>
-<ul>
-<li><code>width</code> is used with horizontal panels to limit the size of the tasks. Use <code>width = 0</code> to get full taskbar width.</li>
-<li><code>height</code> is used with vertical panels.</li>
-</ul></li>
-<li><p><code>task_padding = horizontal_padding vertical_padding spacing</code></p></li>
-<li><p><code>urgent_nb_of_blink = integer</code> : Number of blinks on &#39;get attention&#39; events.</p></li>
-</ul>
-<p><img src="task_padding.jpg" alt=""></p>
-<ul>
-<li><p><code>task_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-<li><p><code>task_font_color = color opacity (0 to 100)</code></p></li>
-<li><p><code>task_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjust the task icon&#39;s color and transparency.</p></li>
-<li><p><code>task_background_id = integer</code> : Which background to use for non selected tasks</p></li>
-</ul>
-<dl><dt>For the next 3 options STATUS can be <code>active</code> / <code>iconified</code>  / <code>urgent</code>:</dt><dd>* <code>task_STATUS_font_color = color opacity (0 to 100)</code></dd></dl>
-<ul>
-<li><p><code>task_STATUS_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjusts the task icon&#39;s color and transparency.</p></li>
-<li><p><code>task_STATUS_background_id = integer</code> : Which background to use for the task.</p></li>
-</ul>
-<h3 id="mouse-actions-for-taskbar-buttons">Mouse actions for taskbar buttons<a name="mouse-actions-for-taskbar-buttons" href="#mouse-actions-for-taskbar-buttons" class="md2man-permalink" title="permalink"></a></h3><p>The possible mouse events are: <code>left, middle, right, scroll_up, scroll_down</code>.</p><p>The possible mouse actions are: <code>none, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task</code>.</p><p>Use <code>mouse_event = action</code> to customize mouse actions. Example:
-<code>
-  mouse_middle = none
-  mouse_right = close
-  mouse_scroll_up = toggle
-  mouse_scroll_down = iconify
-</code></p><dl><dt>The action semantics:</dt><dd>* <code>none</code> : If <code>wm_menu = 1</code> is set, the mouse event is forwarded to the window manager. Otherwise it is ignored.
-* <code>close</code> : close the task
-* <code>toggle</code> : toggle the task
-* <code>iconify</code> : iconify (minimize) the task
-* <code>toggle_iconify</code> : toggle or iconify the task
-* <code>maximize_restore</code> : maximized or minimized the task
-* <code>shade</code> : shades (collapses) the task
-* <code>desktop_left</code> : send the task to the desktop on the left
-* <code>desktop_right</code> : send the task to the desktop on the right
-* <code>next_task</code> : send the focus to next task
-* <code>prev_task</code> : send the focus to previous task</dd></dl><h3 id="system-tray">System Tray<a name="system-tray" href="#system-tray" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>systray_padding = horizontal_padding vertical_padding spacing</code></p></li>
-<li><p><code>systray_background_id = integer</code> : Which background to use.</p></li>
-<li><p><code>systray_sort = ascending/descending/left2right/right2left</code> : Specifies the sorting order for the icons in the systray: in ascending/descending alphabetical order of the icon title, or always add icons to the right/left (note that with <code>left2right</code> or <code>right2left</code> the order can be different on panel restart).</p></li>
-<li><p><code>systray_icon_size = max_icon_size</code> : Set the maximum system tray icon size to <code>number</code>. Set to <code>0</code> for automatic icon sizing.</p></li>
-<li><p><code>systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</code> : Adjust the systray icons color and transparency.</p></li>
-<li><p><code>systray_monitor = integer (1, 2, ...)</code> :  On which monitor to draw the systray. The first monitor is <code>1</code>. <em>(since 0.12)</em></p></li>
-</ul>
-<h3 id="clock">Clock<a name="clock" href="#clock" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>time1_format = %H:%M</code> : The format used by the first line of the clock.</p>
-<ul>
-<li><code>time1_format</code>, <code>time2_format</code> and <code>clock_tooltip</code> use the &#39;strftime&#39; syntax. More info can be found here: <a href="http://www.manpagez.com/man/3/strftime/">http://www.manpagez.com/man/3/strftime/</a></li>
-<li>To hide the clock, comment <code>time1_format</code> and <code>time2_format</code>.</li>
-</ul></li>
-<li><p><code>time1_timezone = :US/Hawaii</code></p>
-<ul>
-<li><code>time1_timezone</code>, <code>time2_timezone</code> and <code>clock_tooltip_timezone</code> can be used to specify a timezone. If you do not specify a value the system-wide timezone is used. The timezones can usually be found in <code>/usr/share/zoneinfo</code>. If your timezones are in a different directory, you need to specify the absolute path, e.g. <code>time1_timezone = :/different/zoneinfo/dir/US/Hawaii</code> Always prepend the timezone with a &#39;:&#39;</li>
-</ul></li>
-<li><p><code>time1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-<li><p><code>time2_format = %A %d %B</code></p></li>
-<li><p><code>time2_timezone = :Europe/Berlin</code></p></li>
-<li><p><code>time2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-<li><p><code>clock_font_color = color opacity (0 to 100)</code></p></li>
-<li><p><code>clock_padding = horizontal_padding vertical_padding</code></p></li>
-<li><p><code>clock_background_id = integer</code> : Which background to use</p></li>
-<li><p><code>clock_tooltip = %a, %d. %b %Y</code> : Format for the clock&#39;s tooltip.</p></li>
-<li><p><code>clock_tooltip_timezone = :UTC</code></p></li>
-<li><p><code>clock_lclick_command = text</code> : Command to execute on left click.</p></li>
-<li><p><code>clock_rclick_command = text</code> : Command to execute on right click.</p></li>
-<li><p><code>clock_mclick_command = text</code> : Command to execute on middle click. <em>(since 0.12.1)</em></p></li>
-<li><p><code>clock_uwheel_command = text</code> : Command to execute on wheel scroll up. <em>(since 0.12.1)</em></p></li>
-<li><p><code>clock_dwheel_command = text</code> : Command to execute on wheel scroll down. <em>(since 0.12.1)</em></p></li>
-</ul>
-<h3 id="tooltip">Tooltip<a name="tooltip" href="#tooltip" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>tooltip_padding = horizontal_padding vertical_padding</code></p></li>
-<li><p><code>tooltip_show_timeout = float</code> : Delay to show the tooltip in seconds. Use &#39;.&#39; as decimal separator.</p></li>
-<li><p><code>tooltip_hide_timeout = float</code> : Delay to hide the tooltip in seconds. Use &#39;.&#39; as decimal separator.</p></li>
-<li><p><code>tooltip_background_id = integer</code> : Which background to use for tooltips. Note that with fake transparency the alpha channel and corner radius options are not respected.</p></li>
-<li><p><code>tooltip_font_color = color opacity  (0 to 100)</code></p></li>
-<li><p><code>tooltip_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-</ul>
-<h3 id="battery">Battery<a name="battery" href="#battery" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>battery_hide = never/integer (0 to 100)</code> : At what battery percentage the battery item is hidden.</p></li>
-<li><p><code>battery_low_status = integer</code>: At what battery percentage the low command is executed.</p></li>
-<li><p><code>battery_low_cmd = notify-send &quot;battery low&quot;</code> : Command to execute when the battery is low.</p></li>
-<li><p><code>bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-<li><p><code>bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
-<li><p><code>battery_font_color = color opacity (0 to 100)</code></p></li>
-<li><p><code>battery_padding = horizontal_padding vertical_padding</code></p></li>
-<li><p><code>battery_background_id = integer</code> : Which background to use for the battery.</p></li>
-<li><p><code>battery_tooltip_enabled = boolean (0 or 1)</code> : Enable/disable battery tooltips. <em>(since 0.12.3)</em></p></li>
-<li><p><code>battery_lclick_command = text</code> : Command to execute on left click. <em>(since 0.12.1)</em></p></li>
-<li><p><code>battery_rclick_command = text</code> : Command to execute on right click. <em>(since 0.12.1)</em></p></li>
-<li><p><code>battery_mclick_command = text</code> : Command to execute on middle click. <em>(since 0.12.1)</em></p></li>
-<li><p><code>battery_uwheel_command = text</code> : Command to execute on wheel scroll up. <em>(since 0.12.1)</em></p></li>
-<li><p><code>battery_dwheel_command = text</code> : Command to execute on wheel scroll down. <em>(since 0.12.1)</em></p></li>
-<li><p><code>ac_connected_cmd = text</code> : Command to execute when the power adapter is plugged in. <em>(since 0.12.3)</em></p></li>
-<li><p><code>ac_disconnected_cmd = text</code> : Command to execute when the power adapter is unplugged. <em>(since 0.12.3)</em></p></li>
-</ul>
-<h3 id="executor">Executor<a name="executor" href="#executor" class="md2man-permalink" title="permalink"></a></h3>
-<ul>
-<li><p><code>execp = new</code> : Begins the configuration of a new executor plugin. Multiple such plugins are supported; just use multiple <code>E</code>s in <code>panel_items</code>. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_command = text</code> : Command to execute. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_interval = integer</code> : The command is executed again after <code>execp_interval</code> seconds from the moment it exits. If zero, the command is executed only once. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_continuous = integer</code> : If non-zero, the last <code>execp_continuous</code> lines from the output of the command are displayed, every <code>execp_continuous</code> lines; this is useful for showing the output of commands that run indefinitely, such as <code>ping 127.0.0.1</code>. If zero, the output of the command is displayed after it finishes executing. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_has_icon = boolean (0 or 1)</code> : If <code>execp_has_icon = 1</code>, the first line printed by the command is interpreted as a path to an image file. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_cache_icon = boolean (0 or 1)</code> : If execp<em>cache</em>icon = 0, the image is reloaded each time the command is executed (useful if the image file is changed on disk by the program executed by <code>execp_command</code>). <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_icon_w = integer</code> : You can use execp<em>icon</em>w and execp<em>icon</em>h to resize the image. If one of them is zero/missing, the image is rescaled proportionally. If both of them are zero/missing, the image is not rescaled. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_icon_h = integer</code> : See <code>execp_icon_w</code>. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_tooltip = text</code> : The tooltip. Leave it empty to not display a tooltip. Not specifying this option leads to showing an automatically generated tooltip with information about when the command was last executed. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> : The font used to draw the text.  <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_font_color = color opacity</code> : The font color. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_markup = boolean (0 or 1)</code> : If non-zero, the output of the command is treated as Pango markup, which allows rich text formatting. The format is <a href="https://developer.gnome.org/pygtk/stable/pango-markup-language.html">documented here</a>. Note that using this with commands that print data downloaded from the Internet is a possible security risk. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_background_id = integer</code> : Which background to use. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_centered = boolean (0 or 1)</code> : Whether to center the text. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text</code> <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_lclick_command = text</code> : Command to execute on left click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_mclick_command = text</code> : Command to execute on right click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_rclick_command = text</code> : Command to execute on middle click. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_uwheel_command = text</code> : Command to execute on wheel scroll up. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
-<li><p><code>execp_dwheel_command = text</code> : Command to execute on wheel scroll down. If not defined, <code>execp_command</code> is  executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
-</ul>
-<h4 id="executor-samples">Executor samples<a name="executor-samples" href="#executor-samples" class="md2man-permalink" title="permalink"></a></h4><h5 id="print-the-hostname">Print the hostname<a name="print-the-hostname" href="#print-the-hostname" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = hostname
-execp_interval = 0
-</code></pre>
-<h5 id="print-disk-usage-for-the-root-partition-every-10-seconds">Print disk usage for the root partition every 10 seconds<a name="print-disk-usage-for-the-root-partition-every-10-seconds" href="#print-disk-usage-for-the-root-partition-every-10-seconds" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = df -h | awk '/\/$/ { print $6 ": " $2 " " $5}'
-execp_interval = 10
-</code></pre>
-<h5 id="button-with-icon-and-rich-text-executes-command-when-clicked">Button with icon and rich text, executes command when clicked<a name="button-with-icon-and-rich-text-executes-command-when-clicked" href="#button-with-icon-and-rich-text-executes-command-when-clicked" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = echo /usr/share/icons/elementary-xfce/emblems/24/emblem-colors-blue.png; echo '&lt;span foreground="#7f7"&gt;Click&lt;/span&gt; &lt;span foreground="#77f"&gt;me&lt;/span&gt; &lt;span foreground="#f77"&gt;pls&lt;/span&gt;'
-execp_has_icon = 1
-execp_interval = 0
-execp_centered = 1
-execp_font = sans 9
-execp_markup = 1
-execp_font_color = #aaffaa 100
-execp_padding = 2 0
-execp_tooltip = I will tell you a secret...
-execp_lclick_command = zenity --info "--text=$(uname -sr)"
-execp_background_id = 2
-</code></pre>
-<h5 id="desktop-pager-with-text">Desktop pager with text<a name="desktop-pager-with-text" href="#desktop-pager-with-text" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = xprop -root -spy | awk '/^_NET_CURRENT_DESKTOP/ { print "Workspace " ($3 + 1) ; fflush(); }'
-execp_interval = 1
-execp_continuous = 1
-</code></pre>
-<h5 id="desktop-pager-with-icon">Desktop pager with icon<a name="desktop-pager-with-icon" href="#desktop-pager-with-icon" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp_command = xprop -root -spy | awk -v home="$HOME" '/^_NET_CURRENT_DESKTOP/ { print home "/.config/myPager/" ($3 + 1) ".png\n" ; fflush(); }'
-execp_interval = 1
-execp_has_icon = 1
-execp_cache_icon = 1
-execp_continuous = 2
-</code></pre>
-<h5 id="round-trip-time-to-the-gateway-refreshed-every-second">Round-trip time to the gateway, refreshed every second<a name="round-trip-time-to-the-gateway-refreshed-every-second" href="#round-trip-time-to-the-gateway-refreshed-every-second" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = ping -i 1 -W 1 -O -D -n $(ip route | grep default | grep via | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*') | awk '/no/ { print "&lt;span foreground=\"#faa\"&gt;timeout&lt;/span&gt;"; fflush(); }; /time=/ { gsub(/time=/, "", $8); printf "&lt;span foreground=\"#7af\"&gt;%3.0f %s&lt;/span&gt;\n", $8, $9; fflush(); } '
-execp_continuous = 1
-execp_interval = 1
-execp_markup = 1
-</code></pre>
-<h5 id="memory-usage">Memory usage<a name="memory-usage" href="#memory-usage" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
-execp_command = free -s 2 | awk '/^-/ { printf "Mem: '$(free -h | awk '/^Mem:/ { print $2 }')' %.0f%\n", 100*$3/($3+$4); fflush(stdout) }'
-execp_interval = 1
-execp_continuous = 1
-</code></pre>
-<h5 id="network-load">Network load<a name="network-load" href="#network-load" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code># Note the use of "stdbuf -oL" to force the program to flush the output line by line.
-execp = new
-execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }; fflush(stdout)'
-execp_continuous = 1
-execp_interval = 1
-</code></pre>
-<h3 id="example-configuration">Example configuration<a name="example-configuration" href="#example-configuration" class="md2man-permalink" title="permalink"></a></h3><pre class="highlight plaintext"><code>#---------------------------------------------
-## TINT2 CONFIG FILE
-#---------------------------------------------
-
-#---------------------------------------------
-## BACKGROUND AND BORDER
-#---------------------------------------------
-rounded = 7
-border_width = 2
-background_color = #000000 60
-border_color = #ffffff 18
-
-rounded = 5
-border_width = 0
-background_color = #ffffff 40
-border_color = #ffffff 50
-
-rounded = 5
-border_width = 0
-background_color = #ffffff 18
-border_color = #ffffff 70
-
-#---------------------------------------------
-## PANEL
-#---------------------------------------------
-panel_monitor = all
-panel_position = bottom center
-panel_size = 94% 30
-panel_margin = 0 0
-panel_padding = 7 0
-font_shadow = 0
-panel_background_id = 1
-wm_menu = 0
-panel_dock = 0
-panel_layer = bottom
-
-#---------------------------------------------
-## TASKBAR
-#---------------------------------------------
-#taskbar_mode = multi_desktop
-taskbar_mode = single_desktop
-taskbar_padding = 2 3 2
-taskbar_background_id = 0
-#taskbar_active_background_id = 0
-
-#---------------------------------------------
-## TASKS
-#---------------------------------------------
-task_icon = 1
-task_text = 1
-task_maximum_size = 140 35
-task_centered = 1
-task_padding = 6 3
-task_font = sans 7
-task_font_color = #ffffff 70
-task_background_id = 3
-task_icon_asb = 100 0 0
-## replace STATUS by 'urgent', 'active' or 'iconfied'
-#task_STATUS_background_id = 2
-#task_STATUS_font_color = #ffffff 85
-#task_STATUS_icon_asb = 100 0 0
-## example:
-task_active_background_id = 2
-task_active_font_color = #ffffff 85
-task_active_icon_asb = 100 0 0
-urgent_nb_of_blink = 8
-
-#---------------------------------------------
-## SYSTRAYBAR
-#---------------------------------------------
-systray = 1
-systray_padding = 0 4 5
-systray_background_id = 0
-systray_sort = left2right
-systray_icon_size = 0
-systray_icon_asb = 100 0 0
-
-#---------------------------------------------
-## CLOCK
-#---------------------------------------------
-time1_format = %H:%M
-time1_font = sans 8
-time2_format = %A %d %B
-time2_font = sans 6
-clock_font_color = #ffffff 76
-clock_padding = 1 0
-clock_background_id = 0
-#clock_lclick_command = xclock
-clock_rclick_command = orage
-#clock_tooltip = %A %d %B
-#time1_timezone = :US/Hawaii
-#time2_timezone = :Europe/Berlin
-#clock_tooltip_timezone = :/usr/share/zoneinfo/Europe/Paris
-
-#---------------------------------------------
-## BATTERY
-#---------------------------------------------
-battery = 0
-battery_hide = 98
-battery_low_status = 10
-battery_low_cmd = notify-send "battery low"
-bat1_font = sans 8
-bat2_font = sans 6
-battery_font_color = #ffffff 76
-battery_padding = 1 0
-battery_background_id = 0
-
-#---------------------------------------------
-## TOOLTIP
-#---------------------------------------------
-tooltip = 0
-tooltip_padding = 2 2
-tooltip_show_timeout = 0.7
-tooltip_hide_timeout = 0.3
-tooltip_background_id = 1
-tooltip_font_color = #OOOOOO 80
-tooltip_font = sans 10
-
-#---------------------------------------------
-## MOUSE ACTION ON TASK
-#---------------------------------------------
-mouse_middle = none
-mouse_right = close
-mouse_scroll_up = toggle
-mouse_scroll_down = iconify
-
-#---------------------------------------------
-## AUTOHIDE OPTIONS
-#---------------------------------------------
-autohide = 0
-autohide_show_timeout = 0.3
-autohide_hide_timeout = 2
-autohide_height = 4
-strut_policy = minimum
-</code></pre>
-<h2 id="author">AUTHOR<a name="author" href="#author" class="md2man-permalink" title="permalink"></a></h2><p>tint2 was written by Thierry Lorthiois <a href="mailto:lorthiois@bbsoft.fr">lorthiois@bbsoft.fr</a>.
-It is based on ttm, originally written by Pål Staurland <a href="mailto:staura@gmail.com">staura@gmail.com</a>.</p><p>This manual page was written by Daniel Moerner <a href="mailto:dmoerner@gmail.com">dmoerner@gmail.com</a>, for the Debian project (but may be used by others).
-It was adopted from the tint2 docs.</p><h2 id="see-also">SEE ALSO<a name="see-also" href="#see-also" class="md2man-permalink" title="permalink"></a></h2><p>The main website <a href="https://gitlab.com/o9000/tint2">https://gitlab.com/o9000/tint2</a>
-and the wiki page at <a href="https://gitlab.com/o9000/tint2/wikis/home">https://gitlab.com/o9000/tint2/wikis/home</a>.</p>

doc/tint2.md

@@ -1,763 +0,0 @@
-# TINT2 1 "2017-12-20" 16.0
-
-## NAME
-tint2 - lightweight panel/taskbar
-
-## DESCRIPTION
-tint2 is a simple panel/taskbar made for modern X window managers.
-It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.).
-
-Features:
-
-  * Panel with taskbar, system tray, clock and launcher icons;
-  * Easy to customize: color/transparency on fonts, icons, borders and backgrounds;
-  * Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;
-  * Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;
-  * Customizable mouse events.
-
-Goals:
-
-  * Be unintrusive and light (in terms of memory, CPU and aesthetic);
-  * Follow the freedesktop.org specifications;
-  * Make certain workflows, such as multi-desktop and multi-monitor, easy to use.
-
-## SYNOPSIS
-`tint2 [OPTION...]`
-
-## OPTIONS
-`-c path_to_config_file`
-  Specifies which configuration file to use instead of the default.
-
-`-v, --version`
-  Prints version information and exits.
-
-`-h, --help`
-  Display this help and exits.
-
-
-## CONFIGURATION
-
-### Table of contents
-
-  * [Introduction](#introduction)
-
-  * [Backgrounds and borders](#backgrounds-and-borders)
-
-  * [Gradients](#gradients)
-
-  * [Panel](#panel)
-
-  * [Launcher](#launcher)
-
-  * [Taskbar/Pager](#taskbar-pager)
-
-  * [Taskbar buttons](#taskbar-buttons)
-
-  * [Mouse actions for taskbar buttons](#mouse-actions-for-taskbar-buttons)
-
-  * [System tray](#system-tray)
-
-  * [Clock](#clock)
-
-  * [Tooltip](#tooltip)
-
-  * [Battery](#battery)
-
-  * [Executor](#executor)
-
-  * [Button](#button)
-
-  * [Separator](#separator)
-
-  * [Example configuration](#example-configuration)
-
-### Introduction
-
-These are instructions for configuring tint2 directly by editing its config file.
-You may also use instead the graphical interface `tint2conf`.
-
-The first time you run tint2, it will create the config file in `$HOME/.config/tint2/tint2rc` (This applies if you have done a clean install. Running tint2 in the source directory without doing 'make install' will not create the config file.)
-
-You can also specify another file on the command line with the -c option, e.g.: `tint2 -c $HOME/tint2.conf`. This can be used to run multiple instances of tint2 that use different settings.
-
-If you change the config file while tint2 is running, the command `killall -SIGUSR1 tint2` will force tint2 to reload it.
-
-All the configuration options supported in the config file are listed below.
-Try to respect as much as possible the order of the options as given below.
-
-### Backgrounds and borders
-
-The tint2 config file starts with the options defining background elements with borders:
-
-  * `rounded = number_of_pixels` : the corner radius
-
-  * `border_width = integer` : the border width in pixels
-
-  * `border_sides = LRTB` : the sides to draw the border on (left, right, top, bottom). If not specified, all sides are used. *(since 0.12.12)*
-
-  * `background_color = color opacity`
-    * `color` is specified in hex RGB, e.g. #ff0000 is red
-    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz).
-
-  * `border_color = color opacity`
-    * `color` is specified in hex RGB, e.g. #ff0000 is red
-    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
-
-  * `background_color_hover = color opacity` (default: same as `background_color`) *(since 0.12.3)*
-    * `color` is specified in hex RGB, e.g. #ff0000 is red
-    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)
-
-  * `border_color_hover = color opacity` (default: same as `border_color`) *(since 0.12.3)*
-    * `color` is specified in hex RGB, e.g. #ff0000 is red
-    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
-
-  * `background_color_pressed = color opacity` (default: same as `background_color_hover`) *(since 0.12.3)*
-    * `color` is specified in hex RGB, e.g. #ff0000 is red
-    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque. Note that for a transparent panel you need to enable a desktop compositor (such as compton or compiz)
-
-  * `border_color_pressed = color opacity` (default: same as `border_color_hover`) *(since 0.12.3)*
-    * `color` is specified in hex RGB, e.g. #ff0000 is red
-    * `opacity` varies from (0 to 100), where 0 is fully transparent, 100 is fully opaque
-
-  * `border_content_tint_weight = integer` : Mixes the border color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). *(since 16.0)*
-
-  * `background_content_tint_weight = integer` : Mixes the background color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). *(since 16.0)*
-
-You can define as many backgrounds as you want. For example, the following config defines two backgrounds:
-
-```
-rounded = 1
-border_width = 0
-background_color = #282828 100
-border_color = #000000 0
-
-rounded = 1
-border_width = 0
-background_color = #f6b655 90
-border_color = #cccccc 40
-```
-
-tint2 automatically identifies each background with a number starting from 1 (1, 2, ...).
-Afterwards, you can apply a background to objects (panel, taskbar, task, clock, systray) using the background id, for example:
-
-```
-panel_background_id = 1
-taskbar_background_id = 0
-task_background_id = 0
-task_active_background_id = 2
-systray_background_id = 0
-clock_background_id = 0
-```
-
-Identifier 0 refers to a special background which is fully transparent, identifier 1 applies the first background defined in the config file etc.
-
-### Gradients
-
-(Available since 0.13.0)
-
-Backgrounds also allow specifying gradient layers
-that are drawn on top of the solid color background.
-
-First the user must define one or more gradients in the config file,
-each starting with `gradient = TYPE`. These must be added before backgrounds.
-
-Then gradients can be added by index to backgrounds,
-using the `gradient_id = INDEX`, `gradient_id_hover = INDEX` and
-`gradient_id_pressed = INDEX`, where `INDEX` is
-the gradient index, starting from 1.
-
-#### Gradient types
-
-Gradients vary the color between fixed control points:
-* vertical gradients: top-to-bottom;
-* horizontal gradients: left-to-right;
-* radial gradients: center-to-corners.
-
-The user must specify the start and end colors, and can optionally add extra color stops in between
-using the `color_stop` option, as explained below.
-
-##### Vertical gradient, with color varying from the top edge to the bottom edge, two colors
-
-```
-gradient = vertical
-start_color = #rrggbb opacity
-end_color = #rrggbb opacity
-```
-
-##### Horizontal gradient, with color varying from the left edge to the right edge, two colors
-
-```
-gradient = horizontal
-start_color = #rrggbb opacity
-end_color = #rrggbb opacity
-```
-
-##### Radial gradient, with color varying from the center to the corner, two colors:
-
-```
-gradient = radial
-start_color = #rrggbb opacity
-end_color = #rrggbb opacity
-```
-
-##### Adding extra color stops (0% and 100% remain fixed, more colors at x% between the start and end control points)
-
-```
-color_stop = percentage #rrggbb opacity
-```
-
-#### Gradient examples
-
-```
-# Gradient 1: thin film effect
-gradient = horizontal
-start_color = #111122 30
-end_color = #112211 30
-color_stop = 60 #221111 30
-
-# Gradient 2: radial glow
-gradient = radial
-start_color = #ffffff 20
-end_color = #ffffff 0
-
-# Gradient 3: elegant black
-gradient = vertical
-start_color = #444444 100
-end_color = #222222 100
-
-# Gradient 4: elegant black
-gradient = horizontal
-start_color = #111111 100
-end_color = #222222 100
-
-# Background 1: Active desktop name
-rounded = 2
-border_width = 1
-border_sides = TBLR
-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
-gradient_id = 3
-gradient_id_hover = 4
-gradient_id_pressed = 2
-
-[...]
-```
-
-### Panel
-
-  * `panel_items = LTSBC` defines the items tint2 will show and the order of those items. Each letter refers to an item, defined as:
-    * `L` shows the Launcher
-    * `T` shows the Taskbar
-    * `S` shows the Systray (also called notification area)
-    * `B` shows the Battery status
-    * `C` shows the Clock
-    * `F` adds an extensible spacer (freespace). You can specify more than one. Has no effect if `T` is also present. *(since 0.12)*
-    * `E` adds an executor plugin. You can specify more than one. *(since 0.12.4)*
-    * `P` adds a push button. You can specify more than one. *(since 0.14)*
-    * `:` adds a separator. You can specify more than one. *(since 0.13.0)*
-
-    For example, `panel_items = STC` will show the systray, the taskbar and the clock (from left to right).
-
-  * `panel_monitor = monitor (all or primary or 1 or 2 or ...)` : Which monitor tint2 draws the panel on
-    * The first monitor is `1`
-    * Use `panel_monitor = all` to get a separate panel per monitor
-
-  * `primary_monitor_first = boolean (0 or 1)` : Place the primary monitor before all the other monitors in the list. *(since 0.12.4; removed in 1.0, use `primary` instead)*
-
-![](images/panel_padding.jpg)
-
-  * `panel_position = vertical_position horizontal_position orientation`
-    * `vertical_position` is one of: `bottom`, `top`, `center`
-    * `horizontal_position` is one of: `left`, `right`, `center`
-    * `orientation` is one of: `horizontal`, `vertical`
-
-  * `panel_size = width height`
-    * `width` and `height` can be specified without units (e.g. `123`) as pixels, or followed by `%` as percentages of the monitor size (e.g. `50%`). Use `100%` for full monitor width/height.
-      Example:
-
-```
-# The panel's width is 94% the size of the monitor, the height is 30 pixels:
-panel_size = 94% 30
-```
-
-  * `panel_shrink = boolean (0 or 1)` : If set to 1, the panel will shrink to a compact size dynamically. *(since 0.13)*
-
-  * `panel_margin = horizontal_margin vertical_margin` : The margins define the distance between the panel and the horizontal/vertical monitor edge. Use `0` to obtain a panel with the same size as the edge of the monitor (no margin).
-
-![](images/panel_size_margin.jpg)
-
-  * `panel_padding = horizontal_padding vertical_padding spacing` : Please refer to the image below.
-
-![](images/panel_padding.jpg)
-
-  * `font_shadow = boolean (0 or 1)`
-
-  * `panel_background_id = integer` : Which background to use for the panel.
-
-  * `wm_menu = boolean (0 or 1)` : Defines if tint2 forwards unhandled mouse events to your window manager. Useful for window managers such as openbox, which display the start menu if you right click on the desktop.
-
-  * `panel_dock = boolean (0 or 1)` : Defines if tint2 is placed into the window manager's dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).
-
-  * `panel_layer = bottom/normal/top` : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.
-
-  * `strut_policy = follow_size/minimum/none` : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.
-    * `follow_size` means that the maximized windows always resize to have a common edge with tint2.
-    * `minimum` means that the maximized windows always expand to have a common edge with the hidden panel. This is useful if the `autohide` option is enabled.
-    * `none` means that the maximized windows use the full screen size.
-
-  * `panel_window_name = string` : Defines the name of the panel's window. Default: 'tint2'. *(since 0.12)*
-
-  * `disable_transparency = boolean (0 or 1)` : Whether to disable transparency instead of detecting if it is supported. Useful on broken graphics stacks. *(since 0.12)*
-
-  * `mouse_effects = boolean (0 or 1)` : Whether to enable mouse hover effects for clickable items. *(since 0.12.3)*
-
-  * `mouse_hover_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjusts the icon color and transparency on mouse hover (works only when mouse_effects = 1).` *(since 0.12.3)*
-
-  * `mouse_pressed_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjusts the icon color and transparency on mouse press (works only when mouse_effects = 1).` *(since 0.12.3)*
-
-  * `autohide = boolean (0 or 1)` : Whether to enable panel hiding when the mouse cursor exists the panel.
-
-  * `autohide_show_timeout = float` : Show timeout in seconds after the mouse cursor enters the panel. Use '.' as decimal separator.
-
-  * `autohide_hide_timeout = float` : Hide timeout in seconds after the mouse cursor exits the panel. Use '.' as decimal separator.
-
-  * `autohide_height = integer` : panel height (width for vertical panels) in hidden mode.
-
-### Launcher
-  * `launcher_item_app = path_to_application` : Each `launcher_item_app` must be a file path to a .desktop file following the freedesktop.org [specification](http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html). The paths may begin with `~`, which is expanded to the path of the user's home directory. If only a file name is specified, the file is search in the standard application directories (`$XDG_DATA_HOME/applications`, `~/.local/share/applications`, `$XDG_DATA_DIRS/applications`, `/usr/local/share/applications`, `/usr/share/applications`, `/opt/share/applications`).
-
-  * `launcher_apps_dir = path_to_directory` : Specifies a path to a directory from which the launcher is loading all .desktop files (all subdirectories are explored recursively). Can be used multiple times. The path may begin with `~`, which is expanded to the path of the user's home directory. *(since 0.12)*
-
-  * `launcher_background_id = integer` : Defines which background to use.
-
-  * `launcher_icon_background_id = integer` : Defines which background to use for icons.
-
-  * `launcher_padding = horizontal_padding vertical_padding spacing`
-
-  * `launcher_icon_size = integer` : The launcher icon size, in pixels.
-
-  * `launcher_icon_theme = name_of_theme` : (Optional) Uses the specified icon theme to display shortcut icons. Note that tint2 will detect and use the icon theme of your desktop if you have an XSETTINGS manager running (which you probably do), unless `launcher_icon_theme_override = 1`.
-
-  * `launcher_icon_theme_override = boolean (0 or 1)` : Whether `launcher_icon_theme` overrides the value obtained from the XSETTINGS manager. *(since 0.12)*
-
-  * `launcher_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjusts the icon color and transparency.
-
-  * `launcher_tooltip = boolean (0 or 1)` : Whether to show tooltips for the launcher icons.
-
-  * `startup_notifications = boolean (0 or 1)` : Whether to show startup notifications when starting applications from the launcher. *(since 0.12)*
-
-### Taskbar / Pager
-
-  * `taskbar_mode = single_desktop/multi_desktop`
-    * `single_desktop` : Shows a normal taskbar listing the tasks running on the current virtual desktop (also known as 'workspace');
-    * `multi_desktop` : Pager like capability. Shows multiple taskbars, one per virtual desktop, with which:
-      * You can drag-and-drop tasks between virtual desktops;
-      * You can switch between virtual desktops.
-
-  * `taskbar_hide_if_empty = boolean (0 or 1)` : If enabled, in multi-desktop mode the taskbars corresponding to empty desktops different from the current desktop are hidden. *(since 0.13)*
-
-  * `taskbar_distribute_size = boolean (0 or 1)` : If enabled, in multi-desktop mode distributes between taskbars the available size proportionally to the number of tasks. Default: disabled. *(since 0.12)*
-
-  * `taskbar_padding = horizontal_padding vertical_padding spacing`
-
-![](images/taskbar_padding.jpg)
-
-  * `taskbar_background_id = integer` : Which background to use
-
-  * `taskbar_active_background_id = integer` : Which background to use for the taskbar of the current virtual desktop.
-
-  * `taskbar_hide_inactive_tasks = boolean (0 or 1)` :  If enabled, the taskbar shows only the active task. *(since 0.12)*
-
-  * `taskbar_hide_different_monitor = boolean (0 or 1)` :  If enabled, the taskbar shows only the tasks from the current monitor. Useful when running different tint2 instances on different monitors, each one having its own config. *(since 0.12)*
-
-  * `taskbar_hide_different_desktop = boolean (0 or 1)` :  If enabled, the taskbar shows only the tasks from the current desktop. Useful to make multi-desktop taskbars more compact, but still allow desktop switching with mouse click. *(since 1.0)*
-
-  * `taskbar_always_show_all_desktop_tasks = boolean (0 or 1)` :  Has effect only if `taskbar_mode = multi_desktop`. If enabled, tasks that appear on all desktops are shown on all taskbars. Otherwise, they are shown only on the taskbar of the current desktop. *(since 0.12.4)*
-
-  * `taskbar_sort_order = none/title/center` : Specifies the sort order of the tasks on the taskbar.  *(since 0.12)*
-    * `none` : No sorting. New tasks are simply appended at the end of the taskbar when they appear.
-    * `title` : Sorts the tasks by title.
-    * `center` : Sorts the tasks by their window centers.
-    * `mru` : Shows the most recently used tasks first. *(since 0.12.4)*
-    * `lru` : Shows the most recently used tasks last. *(since 0.12.4)*
-
-  * `task_align = left/center/right` : Specifies the alignment of the tasks on the taskbar. Default: left.
-
-  * `taskbar_name = boolean (0 or 1)` :  Whether to show the virtual desktop name in the taskbar.
-
-  * `taskbar_name_padding = padding` :  Padding for the virtual desktop name.
-
-  * `taskbar_name_background_id = integer` :  Which background to use for the desktop name.
-
-  * `taskbar_name_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]` :  Font configuration for the desktop name.
-
-  * `taskbar_name_font_color = color opacity (0 to 100)` :  Font color for the desktop name.
-
-  * `taskbar_name_active_background_id = integer` :  Which background to use for the name of the current desktop.
-
-  * `taskbar_name_active_font_color = color opacity (0 to 100)` :  Font color for the name of the current desktop.
-
-# Taskbar buttons
-
-The following options configure the task buttons in the taskbar:
-
-  * `task_icon = boolean (0 or 1)` : Whether to display the task icon. There is no explicit option to control the task icon size; it depends on the vertical padding set with `task_padding`.
-
-  * `task_text = boolean (0 or 1)` : Whether to display the task text.
-
-  * `task_centered = boolean (0 or 1)` : Whether the task text is centered.
-
-  * `task_tooltip = boolean (0 or 1)` : Whether to show tooltips for tasks.
-
-  * `task_thumbnail = boolean (0 or 1)` : Whether to show thumbnail tooltips for tasks. *(since 16.0)*
-
-  * `task_thumbnail_size = width` : Thumbnail size. *(since 16.0)*
-
-  * `task_maximum_size = width height`
-    * `width` is used with horizontal panels to limit the size of the tasks. Use `width = 0` to get full taskbar width.
-    * `height` is used with vertical panels.
-
-  * `task_padding = horizontal_padding vertical_padding spacing`
-
-  * `urgent_nb_of_blink = integer` : Number of blinks on 'get attention' events.
-
-![](images/task_padding.jpg)
-
-  * `task_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
-
-  * `task_font_color = color opacity (0 to 100)`
-
-  * `task_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjust the task icon's color and transparency.
-
-  * `task_background_id = integer` : Which background to use for non selected tasks
-
-For the next 3 options STATUS can be `active` / `iconified`  / `urgent`:
-  * `task_STATUS_font_color = color opacity (0 to 100)`
-
-  * `task_STATUS_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjusts the task icon's color and transparency.
-
-  * `task_STATUS_background_id = integer` : Which background to use for the task.
-
-### Mouse actions for taskbar buttons
-
-The possible mouse events are: `left, middle, right, scroll_up, scroll_down`.
-
-The possible mouse actions are: `none, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task`.
-
-Use `mouse_event = action` to customize mouse actions. Example:
-```
-  mouse_middle = none
-  mouse_right = close
-  mouse_scroll_up = toggle
-  mouse_scroll_down = iconify
-```
-
-The action semantics:
-  * `none` : If `wm_menu = 1` is set, the mouse event is forwarded to the window manager. Otherwise it is ignored.
-  * `close` : close the task
-  * `toggle` : toggle the task
-  * `iconify` : iconify (minimize) the task
-  * `toggle_iconify` : toggle or iconify the task
-  * `maximize_restore` : maximized or minimized the task
-  * `shade` : shades (collapses) the task
-  * `desktop_left` : send the task to the desktop on the left
-  * `desktop_right` : send the task to the desktop on the right
-  * `next_task` : send the focus to next task
-  * `prev_task` : send the focus to previous task
-
-### System Tray
-
-  * `systray_padding = horizontal_padding vertical_padding spacing`
-
-  * `systray_background_id = integer` : Which background to use.
-
-  * `systray_sort = ascending/descending/left2right/right2left` : Specifies the sorting order for the icons in the systray: in ascending/descending alphabetical order of the icon title, or always add icons to the right/left (note that with `left2right` or `right2left` the order can be different on panel restart).
-
-  * `systray_icon_size = max_icon_size` : Set the maximum system tray icon size to `number`. Set to `0` for automatic icon sizing.
-
-  * `systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)` : Adjust the systray icons color and transparency.
-
-  * `systray_monitor = integer (1, 2, ...) or primary` :  On which monitor to draw the systray. The first monitor is `1`. *(since 0.12)*
-
-  * `systray_name_filter = string` :  Regular expression to identify icon names to be hidden. For example, `^audacious$` will hide icons with the exact name `audacious`, while `aud` will hide any icons having `aud` in the name. *(since 0.13.1)*
-
-### Clock
-
-  * `time1_format = %H:%M` : The format used by the first line of the clock.
-    * `time1_format`, `time2_format` and `clock_tooltip` use the 'strftime' syntax. More info can be found here: http://www.manpagez.com/man/3/strftime/
-    * To hide the clock, comment `time1_format` and `time2_format`.
-
-  * `time1_timezone = :US/Hawaii`
-    * `time1_timezone`, `time2_timezone` and `clock_tooltip_timezone` can be used to specify a timezone. If you do not specify a value the system-wide timezone is used. The timezones can usually be found in `/usr/share/zoneinfo`. If your timezones are in a different directory, you need to specify the absolute path, e.g. `time1_timezone = :/different/zoneinfo/dir/US/Hawaii` Always prepend the timezone with a ':'
-
-  * `time1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
-
-  * `time2_format = %A %d %B`
-
-  * `time2_timezone = :Europe/Berlin`
-
-  * `time2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
-
-  * `clock_font_color = color opacity (0 to 100)`
-
-  * `clock_padding = horizontal_padding vertical_padding`
-
-  * `clock_background_id = integer` : Which background to use
-
-  * `clock_tooltip = %a, %d. %b %Y` : Format for the clock's tooltip.
-
-  * `clock_tooltip_timezone = :UTC`
-
-  * `clock_lclick_command = text` : Command to execute on left click.
-
-  * `clock_rclick_command = text` : Command to execute on right click.
-
-  * `clock_mclick_command = text` : Command to execute on middle click. *(since 0.12.1)*
-
-  * `clock_uwheel_command = text` : Command to execute on wheel scroll up. *(since 0.12.1)*
-
-  * `clock_dwheel_command = text` : Command to execute on wheel scroll down. *(since 0.12.1)*
-
-### Tooltip
-
-  * `tooltip_padding = horizontal_padding vertical_padding`
-
-  * `tooltip_show_timeout = float` : Delay to show the tooltip in seconds. Use `.` as decimal separator.
-
-  * `tooltip_hide_timeout = float` : Delay to hide the tooltip in seconds. Use `.` as decimal separator.
-
-  * `tooltip_background_id = integer` : Which background to use for tooltips. Note that with fake transparency the alpha channel and corner radius options are not respected.
-
-  * `tooltip_font_color = color opacity  (0 to 100)`
-
-  * `tooltip_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
-
-### Battery
-
-  * `battery_hide = never/integer (0 to 100)` : At what battery percentage the battery item is hidden.
-
-  * `battery_low_status = integer`: At what battery percentage the low command is executed.
-
-  * `battery_low_cmd = notify-send "battery low"` : Command to execute when the battery is low.
-
-  * `battery_full_cmd = notify-send "battery full"` : Command to execute when the battery is full.
-
-  * `bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
-
-  * `bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]`
-
-  * `battery_font_color = color opacity (0 to 100)`
-
-  * `bat1_format = FORMAT_STRING` : Format for battery line 1. Default: %p. *(since 1.0)* Format specification:
-    * %s: State (charging, discharging, full, unknown).
-    * %m: Minutes left until completely charged/discharged (estimated).
-    * %h: Hours left until completely charged/discharged (estimated).
-    * %t: Time left. Shows "hrs:mins" when charging/discharging, or "Ful\" when full.
-    * %p: Percentage. Includes the % sign.
-
-  * `bat2_format = FORMAT_STRING` : Format for battery line 2. Default: %t. *(since 1.0)*
-
-  * `battery_padding = horizontal_padding vertical_padding`
-
-  * `battery_background_id = integer` : Which background to use for the battery.
-
-  * `battery_tooltip_enabled = boolean (0 or 1)` : Enable/disable battery tooltips. *(since 0.12.3)*
-
-  * `battery_lclick_command = text` : Command to execute on left click. *(since 0.12.1)*
-
-  * `battery_rclick_command = text` : Command to execute on right click. *(since 0.12.1)*
-
-  * `battery_mclick_command = text` : Command to execute on middle click. *(since 0.12.1)*
-
-  * `battery_uwheel_command = text` : Command to execute on wheel scroll up. *(since 0.12.1)*
-
-  * `battery_dwheel_command = text` : Command to execute on wheel scroll down. *(since 0.12.1)*
-
-  * `ac_connected_cmd = text` : Command to execute when the power adapter is plugged in. *(since 0.12.3)*
-
-  * `ac_disconnected_cmd = text` : Command to execute when the power adapter is unplugged. *(since 0.12.3)*
-
-### Executor
-
-  * `execp = new` : Begins the configuration of a new executor plugin. Multiple such plugins are supported; just use multiple `E`s in `panel_items`. *(since 0.12.4)*
-
-  * `execp_command = text` : Command to execute. *(since 0.12.4)*
-
-  * `execp_interval = integer` : The command is executed again after `execp_interval` seconds from the moment it exits. If zero, the command is executed only once. *(since 0.12.4)*
-
-  * `execp_continuous = integer` : If non-zero, the last `execp_continuous` lines from the output of the command are displayed, every `execp_continuous` lines; this is useful for showing the output of commands that run indefinitely, such as `ping 127.0.0.1`. If zero, the output of the command is displayed after it finishes executing. *(since 0.12.4)*
-
-  * `execp_has_icon = boolean (0 or 1)` : If `execp_has_icon = 1`, the first line printed by the command is interpreted as a path to an image file. *(since 0.12.4)*
-
-  * `execp_cache_icon = boolean (0 or 1)` : If `execp_cache_icon = 0`, the image is reloaded each time the command is executed (useful if the image file is changed on disk by the program executed by `execp_command`). *(since 0.12.4)*
-
-  * `execp_icon_w = integer` : You can use `execp_icon_w` and `execp_icon_h` to resize the image. If one of them is zero/missing, the image is rescaled proportionally. If both of them are zero/missing, the image is not rescaled. *(since 0.12.4)*
-
-  * `execp_icon_h = integer` : See `execp_icon_w`. *(since 0.12.4)*
-
-  * `execp_tooltip = text` : The tooltip. If left empty, no tooltip is displayed. If missing, the standard error of the command is shown as a tooltip (an ANSI clear screen sequence can reset the contents, bash: `printf '\e[2J'`, C: `printf("\x1b[2J");`). If the standard error is empty, the tooltip will show information about the time when the command was last executed. *(since 0.12.4)*
-
-  * `execp_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]` : The font used to draw the text.  *(since 0.12.4)*
-
-  * `execp_font_color = color opacity` : The font color. *(since 0.12.4)*
-
-  * `execp_markup = boolean (0 or 1)` : If non-zero, the output of the command is treated as Pango markup, which allows rich text formatting. The format is [documented here](https://developer.gnome.org/pygtk/stable/pango-markup-language.html). Note that using this with commands that print data downloaded from the Internet is a possible security risk. *(since 0.12.4)*
-
-  * `execp_background_id = integer` : Which background to use. *(since 0.12.4)*
-
-  * `execp_centered = boolean (0 or 1)` : Whether to center the text. *(since 0.12.4)*
-
-  * `execp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text` *(since 0.12.4)*
-
-  * `execp_lclick_command = text` : Command to execute on left click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.12.4)*
-  * `execp_mclick_command = text` : Command to execute on right click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.12.4)*
-  * `execp_rclick_command = text` : Command to execute on middle click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.12.4)*
-  * `execp_uwheel_command = text` : Command to execute on wheel scroll up. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.12.4)*
-  * `execp_dwheel_command = text` : Command to execute on wheel scroll down. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.12.4)*
-
-#### Executor samples
-
-##### Print the hostname
-
-```
-execp = new
-execp_command = hostname
-execp_interval = 0
-```
-
-##### Print disk usage for the root partition every 10 seconds
-
-```
-execp = new
-execp_command = df -h | awk '/\/$/ { print $6 ": " $2 " " $5}'
-execp_interval = 10
-```
-
-##### Button with icon and rich text, executes command when clicked
-
-```
-execp = new
-execp_command = echo /usr/share/icons/elementary-xfce/emblems/24/emblem-colors-blue.png; echo '<span foreground="#7f7">Click</span> <span foreground="#77f">me</span> <span foreground="#f77">pls</span>'
-execp_has_icon = 1
-execp_interval = 0
-execp_centered = 1
-execp_font = sans 9
-execp_markup = 1
-execp_font_color = #aaffaa 100
-execp_padding = 2 0
-execp_tooltip = I will tell you a secret...
-execp_lclick_command = zenity --info "--text=$(uname -sr)"
-execp_background_id = 2
-```
-
-##### Desktop pager with text
-
-```
-execp = new
-execp_command = xprop -root -spy | awk '/^_NET_CURRENT_DESKTOP/ { print "Workspace " ($3 + 1) ; fflush(); }'
-execp_interval = 1
-execp_continuous = 1
-```
-
-##### Desktop pager with icon
-
-```
-execp_command = xprop -root -spy | awk -v home="$HOME" '/^_NET_CURRENT_DESKTOP/ { print home "/.config/myPager/" ($3 + 1) ".png\n" ; fflush(); }'
-execp_interval = 1
-execp_has_icon = 1
-execp_cache_icon = 1
-execp_continuous = 2
-```
-
-##### Round-trip time to the gateway, refreshed every second
-
-```
-execp = new
-execp_command = ping -i 1 -c 1 -W 1 -O -D -n $(ip route | grep default | grep via | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*') | awk '/no/ { print "<span foreground=\"#faa\">timeout</span>"; fflush(); }; /time=/ { gsub(/time=/, "", $8); printf "<span foreground=\"#7af\">%3.0f %s</span>\n", $8, $9; fflush(); } '
-execp_continuous = 0
-execp_interval = 1
-execp_markup = 1
-```
-
-##### Memory usage
-
-```
-execp = new
-execp_command = free | awk '/^-/ { printf "Mem: '$(free -h | awk '/^Mem:/ { print $2 }')' %.0f%%\n", 100*$3/($3+$4); fflush(stdout) }'
-execp_interval = 5
-execp_continuous = 0
-```
-
-##### Network load
-
-```
-# Note the use of "stdbuf -oL" to force the program to flush the output line by line.
-execp = new
-execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }; fflush(stdout)'
-execp_continuous = 1
-execp_interval = 1
-```
-
-### Button
-
-  * `button = new` : Begins the configuration of a new button. Multiple such plugins are supported; just use multiple `P`s in `panel_items`. *(since 0.14)*
-
-  * `button_icon = text` : Name or path of icon (or empty). *(since 0.14)*
-
-  * `button_text = text` : Text to display (or empty). *(since 0.14)*
-
-  * `button_tooltip = text` : The tooltip (or empty). *(since 0.14)*
-
-  * `button_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]` : The font used to draw the text.  *(since 0.14)*
-
-  * `button_font_color = color opacity` : The font color. *(since 0.14)*
-
-  * `button_background_id = integer` : Which background to use. *(since 0.14)*
-
-  * `button_centered = boolean (0 or 1)` : Whether to center the text. *(since 0.14)*
-
-  * `button_padding = horizontal_padding vertical_padding spacing_between_icon_and_text` *(since 0.14)*
-  * `button_max_icon_size = integer` : Sets a limit to the icon size. Otherwise, the icon will expand to the edges. *(since 0.14)*
-
-  * `button_lclick_command = text` : Command to execute on left click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.14)*
-  * `button_mclick_command = text` : Command to execute on right click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.14)*
-  * `button_rclick_command = text` : Command to execute on middle click. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.14)*
-  * `button_uwheel_command = text` : Command to execute on wheel scroll up. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.14)*
-  * `button_dwheel_command = text` : Command to execute on wheel scroll down. If not defined, `execp_command` is  executed immediately, unless it is currently running. *(since 0.14)*
-
-### Separator
-
-  * `separator = new` : Begins the configuration of a new separator. Multiple such plugins are supported; just use multiple `:`s in `panel_items`. *(since 0.13.0)*
-
-  * `separator_background_id = integer` : Which background to use. *(since 0.13.0)*
-
-  * `separator_color = color opacity` : The foreground color. *(since 0.13.0)*
-
-  * `separator_style = [empty | line | dots]` : The separator style. *(since 0.13.0)*
-
-  * `separator_size = integer` : The thickness of the separator. Does not include the border and padding. For example, if the style is `line`, this is the line thickness; if the style is `dots`, this is the dot's diameter. *(since 0.13.0)*
-
-  * `separator_padding = side_padding cap_padding` : The padding to add to the sides of the separator, in pixels. *(since 0.13.0)*
-
-### Example configuration
-
-See /etc/xdg/tint2/tint2rc.
-
-## AUTHOR
-tint2 was written by Thierry Lorthiois <lorthiois@bbsoft.fr>.
-It is based on ttm, originally written by Pål Staurland <staura@gmail.com>.
-
-This manual page was originally written by Daniel Moerner <dmoerner@gmail.com>, for the Debian project (but may be used by others).
-It was adopted from the tint2 docs.
-
-## SEE ALSO
-The main website https://gitlab.com/o9000/tint2
-and the wiki page at https://gitlab.com/o9000/tint2/wikis/home.
-
-This documentation is also provided in HTML and Markdown format in the system's default location
-for documentation files, usually `/usr/share/doc/tint2` or `/usr/local/share/doc/tint2`.
-.

format-code.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-find . '(' -name '*.h' -o -name '*.c' ')' -exec clang-format-3.7 -style=file -i '{}' \;

get_version.sh

@@ -1,61 +1,36 @@
 #!/bin/sh
 
-SCRIPT_DIR=$(dirname "$0")
+MAJOR=0.12
 DIRTY=""
-VERSION=""
 
-if [ -d ${SCRIPT_DIR}/.git ] && git status 1>/dev/null 2>/dev/null
+git update-index -q --ignore-submodules --refresh
+# Disallow unstaged changes in the working tree
+if ! git diff-files --quiet --ignore-submodules --
 then
-    git update-index -q --ignore-submodules --refresh
+    if [ "$1" = "--strict" ]
-    # Disallow unstaged changes in the working tree
-    if ! git diff-files --quiet --ignore-submodules --
     then
-        if [ "$1" = "--strict" ]
+        echo >&2 "Error: there are unstaged changes."
-        then
+        git diff-files --name-status -r --ignore-submodules -- >&2
-            echo >&2 "Error: there are unstaged changes."
+        exit 1
-            git diff-files --name-status -r --ignore-submodules -- >&2
+    else
-            exit 1
+        DIRTY="-dirty"
-        else
-            DIRTY="-dirty"
-        fi
-    fi
-
-    # Disallow uncommitted changes in the index
-    if ! git diff-index --cached --quiet HEAD --ignore-submodules --
-    then
-        if [ "$1" = "--strict" ]
-        then
-            echo >&2 "Error: there are uncommitted changes."
-            git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
-            exit 1
-        else
-            DIRTY="-dirty"
-        fi
-    fi
-    if git describe 1>/dev/null 2>/dev/null
-    then
-        VERSION=$(git describe 2>/dev/null)$DIRTY
-    elif git log -n 1 1>/dev/null 2>/dev/null
-    then
-        VERSION=$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 2)
-        if [ "$VERSION" = "master" ]
-        then
-            PREVIOUS=$(grep '^2' "${SCRIPT_DIR}/ChangeLog" | head -n 2 | tail -n 1 | cut -d ' ' -f 2)
-            HASH=$(git log -n 1 --pretty=format:%cI.%ct.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g' 2>/dev/null)
-            VERSION=$PREVIOUS-next-$HASH
-        fi
     fi
 fi
 
-if [ -z "$VERSION" ]
+# Disallow uncommitted changes in the index
+if ! git diff-index --cached --quiet HEAD --ignore-submodules --
 then
-    VERSION=$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 2)
+    if [ "$1" = "--strict" ]
-    if [ "$VERSION" = "master" ]
     then
-        VERSION=$VERSION-$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 1)
+        echo >&2 "Error: there are uncommitted changes."
+        git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
+        exit 1
+    else
+        DIRTY="-dirty"
     fi
 fi
 
+VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')")$DIRTY
 VERSION=$(echo "$VERSION" | sed 's/^v//')
 
 echo '#define VERSION_STRING "'$VERSION'"' > version.h

make_release.sh

@@ -2,6 +2,24 @@
 
 # Usage: ./make_release.sh
 # Creates a tar.gz archive of the current tree.
+#
+# To bump the version number for the current commit (make sure you are in HEAD!), run manually:
+#
+# git tag -a v0.12 -m 'Version 0.12'
+#
+# To generate a release for an older tagged commit, first list the tags with:
+#
+# git tag
+#
+# then checkout the tagged commit with:
+#
+# git checkout tags/v0.1
+#
+# Finally, to revert to HEAD:
+#
+# git checkout master
+#
+# See more at https://gitlab.com/o9000/tint2/wikis/Development
 
 VERSION=$(./get_version.sh --strict)
 if [ ! $? -eq 0 ]
@@ -10,10 +28,21 @@ then
     exit 1
 fi
 
-ARCHIVE=tint2-$VERSION.tar.gz
+DIR=tint2-$VERSION
+ARCHIVE=$DIR.tar.gz
+echo "Making release $DIR"
+rm -rf $DIR $ARCHIVE
 
-echo "Making release tint2-$VERSION"
+git checkout-index --prefix=$DIR/ -a
-git archive --format=tar.gz --prefix=tint2-$VERSION/ v$VERSION >$ARCHIVE
+
+# Delete unneeded files
+rm -f $DIR/make_release.sh
+
+echo "echo \"#define VERSION_STRING \\\"$VERSION\\\"\" > version.h" > $DIR/get_version.sh
+
+# Create tarball and remove the exported directory
+tar -czf $ARCHIVE $DIR
+rm -rf $DIR
 
 sha1sum -b $ARCHIVE
 sha256sum -b $ARCHIVE

new-release.py

@@ -1,196 +0,0 @@
-#!/usr/bin/env python2
-
-import argparse
-import datetime
-import inspect
-import logging
-import os
-import re
-import subprocess
-import sys
-import time
-
-
-ansi_brown = "\x1b[0;33;40m"
-ansi_yello_bold = "\x1b[1;33;40m"
-ansi_lblue = "\x1b[0;36;40m"
-ansi_pinky = "\x1b[0;35;40m"
-ansi_reset = "\x1b[0m"
-
-
-log_ts = None
-def log_time():
-  global log_ts
-  if log_ts == None:
-    log_ts = time.time()
-  ts = time.time()
-  delta_ms = int((ts - log_ts) * 1000)
-  log_ts = ts
-  return "{0: >6}".format(delta_ms)
-
-
-def log_prefix():
-  line = inspect.stack()[2][2]
-  function = inspect.stack()[2][3]
-  return ansi_lblue + "{0} {1}:{2}".format(log_time(), function, line) + ansi_reset
-
-
-def debug(*args):
-  parts = [log_prefix()]
-  for s in args:
-    parts.append(str(s))
-  logging.debug(" ".join(parts))
-
-
-def info(*args):
-  parts = [log_prefix()]
-  for s in args:
-    parts.append(str(s))
-  logging.info(" ".join(parts))
-
-
-def cmd(s):
-  logging.debug(log_prefix() + " Executing: " + ansi_brown + s + ansi_reset)
-  return s
-
-
-def run(s):
-  proc = subprocess.Popen(cmd(s), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
-  ret = proc.wait()
-  out = proc.communicate()[0]
-  for line in out.split("\n"):
-    debug(ansi_pinky + line + ansi_reset)
-  debug(ansi_pinky + "Exit code: " + str(ret))
-  if ret != 0:
-    raise Exception("Command failed!")
-  return out
-
-
-def natsorted(ls):
-  dre = re.compile(r'(\d+)')
-  return sorted(ls, key=lambda l: [int(s) if s.isdigit() else s.lower() for s in re.split(dre, l)])
-
-
-def get_last_version():
-  tags = natsorted(run("git tag -l 'v*'").split("\n"))
-  return tags[-1]
-
-
-def inc_version(v, feature=False):
-  if v.startswith("v0."):
-    assert v == "v0.14.6"
-    return "v15.0"
-  # v4.11 -> v4.12 or v5.0
-  parts = v.split(".")
-  while len(parts) < 2:
-    parts.append("0")
-  assert len(parts) == 2
-  if feature:
-    parts[-2] = "v" + str(int(parts[-2].replace("v", "")) + 1)
-    parts[-1] = "0"
-  else:
-    parts[-1] = str(int(parts[-1]) + 1)
-  return ".".join([s for s in parts if s])
-
-
-def assert_equal(a, b):
-  if a != b:
-    info(a, "!=", b)
-    assert(False)
-
-
-def test_inc_version():
-  # auto
-  assert_equal(inc_version("v0.14.6"), "v15.0")
-  assert_equal(inc_version("v15"), "v15.1")
-  assert_equal(inc_version("v15.0"), "v15.1")
-  assert_equal(inc_version("v16.1"), "v16.2")
-  assert_equal(inc_version("v16.10"), "v16.11")
-  # fix
-  assert_equal(inc_version("v0.14.6", False), "v15.0")
-  assert_equal(inc_version("v15", False), "v15.1")
-  assert_equal(inc_version("v15.0", False), "v15.1")
-  assert_equal(inc_version("v16.1", False), "v16.2")
-  assert_equal(inc_version("v16.10", False), "v16.11")
-  # feature
-  assert_equal(inc_version("v15", True), "v16.0")
-  assert_equal(inc_version("v15.0", True), "v16.0")
-  assert_equal(inc_version("v15.1", True), "v16.0")
-  assert_equal(inc_version("v15.2", True), "v16.0")
-  assert_equal(inc_version("v15.10", True), "v16.0")
-
-
-def replace_in_file(path, before, after):
-  with open(path, "r+") as f:
-    old = f.read()
-    new = old.replace(before, after)
-    f.seek(0)
-    f.write(new)
-
-
-def update_man(path, version, date):
-  with open(path, "r+") as f:
-    lines = f.read().split("\n")
-    # # TINT2 1 "2017-03-26" 0.14.1
-    parts = lines[0].split()
-    parts[-2] = '"' + date + '"'
-    parts[-1] = version
-    lines[0] = " ".join(parts)
-    f.seek(0)
-    f.write("\n".join(lines))
-  run("cd doc ; ./generate-doc.sh")
-
-
-def update_log(path, version, date):
-  with open(path, "r+") as f:
-    lines = f.read().split("\n")
-    f.seek(0)
-    assert lines[0].endswith("master")
-    lines[0] = date + " " + version
-    f.write("\n".join(lines))
-
-
-if __name__ == '__main__':
-  parser = argparse.ArgumentParser()
-  parser.add_argument("--feature", action="store_true")
-  parser.add_argument("--undo", action="store_true")
-  args = parser.parse_args()
-  logging.basicConfig(format=ansi_lblue + "%(asctime)s %(pathname)s %(levelname)s" + ansi_reset + " %(message)s", level=logging.DEBUG)
-  test_inc_version()
-  # Read version from last tag and increment
-  old_version = get_last_version()
-  if args.undo:
-    info("Revering last commit...")
-    run("git tag -d %s" % old_version)
-    run("git tag -d %s" % old_version.replace("v", ""))
-    run("git reset --soft HEAD~")
-    run("git reset")
-    run("git stash")
-    os.system("git log -1")
-    sys.exit(0)
-  info("Old version:", old_version)
-  version = inc_version(old_version, args.feature)
-  readable_version = version.replace("v", "")
-  date = datetime.datetime.now().strftime("%Y-%m-%d")
-  info("New version:", readable_version, version, date)
-  # Disallow unstaged changes in the working tree
-  run("git diff-files --quiet --ignore-submodules --")
-  # Disallow uncommitted changes in the index
-  run("git diff-index --cached --quiet HEAD --ignore-submodules --")
-  # Update version string
-  replace_in_file("README.md", old_version.replace("v", ""), readable_version)
-  update_man("doc/tint2.md", readable_version, date)
-  update_log("ChangeLog", readable_version, date)
-  run("git commit -am 'Release %s'" % readable_version)
-  run("git tag -a %s -m 'version %s'" % (version, readable_version))
-  run("git tag -a %s -m 'version %s'" % (readable_version, readable_version))
-  run("rm -rf tint2-%s* || true" % readable_version)
-  run("./make_release.sh")
-  run("tar -xzf tint2-%s.tar.gz" % readable_version)
-  run("cd tint2-%s ; mkdir build ; cd build ; cmake .. ; make" % readable_version)
-  assert_equal(run("./tint2-%s/build/tint2 -v" % readable_version).strip(), "tint2 version %s" % readable_version)
-  os.system("git log -p -1 --word-diff")
-  print "Does this look correct? [y/n]"
-  choice = raw_input().lower()
-  if choice != "y":
-    run("git reset --hard HEAD~ ; git tag -d %s ; git tag -d %s" % (version, readable_version))

packaging/debian/changelog

@@ -1,244 +0,0 @@
-tint2 (0.12.12-3) unstable; urgency=medium
-
-  * Cherry pick upstream fix for use-after-free
-
- -- Sebastian Reichel <sre@debian.org>  Sun, 29 Jan 2017 21:18:20 +0100
-
-tint2 (0.12.12-2) unstable; urgency=medium
-
-  * Cherry pick a few upstream fixes (Closes: #849228)
-
- -- Sebastian Reichel <sre@debian.org>  Fri, 13 Jan 2017 22:01:29 +0100
-
-tint2 (0.12.12-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Sebastian Reichel <sre@debian.org>  Sun, 21 Aug 2016 22:39:16 +0200
-
-tint2 (0.12.11-1) unstable; urgency=low
-
-  * New upstream release (Closes: #824568)
-  * Update Debian Standards Version to 3.9.8
-
- -- Sebastian Reichel <sre@debian.org>  Wed, 01 Jun 2016 00:48:54 +0200
-
-tint2 (0.12.7-2) unstable; urgency=medium
-
-  * Add upstream patch to fix build on ppc
-  * Use https:// vcs urls
-
- -- Sebastian Reichel <sre@debian.org>  Mon, 22 Feb 2016 03:23:51 +0100
-
-tint2 (0.12.7-1) unstable; urgency=medium
-
-  * New upstream release
-  * Update Debian Standards Version to 3.9.7
-  * Drop -dbg package (Debian will build -dbgsym package automatically)
-
- -- Sebastian Reichel <sre@debian.org>  Wed, 10 Feb 2016 00:42:23 +0100
-
-tint2 (0.12.3-1) unstable; urgency=low
-
-  * New upstream release
-  * Fix privacy-breach-generic in documentation
-
- -- Sebastian Reichel <sre@debian.org>  Thu, 26 Nov 2015 22:49:26 +0100
-
-tint2 (0.12.2-1) unstable; urgency=medium
-
-  * New upstream release
-  * Drop all patches (applied upstream)
-
- -- Sebastian Reichel <sre@debian.org>  Fri, 11 Sep 2015 18:41:22 +0200
-
-tint2 (0.12.1-2) unstable; urgency=medium
-
-  * Import upstream patch fixing bug with blinking systray icon
-
- -- Sebastian Reichel <sre@debian.org>  Tue, 04 Aug 2015 01:16:08 +0200
-
-tint2 (0.12.1-1) unstable; urgency=medium
-
-  * New upstream release
-
- -- Sebastian Reichel <sre@debian.org>  Mon, 03 Aug 2015 17:03:13 +0200
-
-tint2 (0.12-1) unstable; urgency=medium
-
-  * New upstream release (Closes: #793797)
-   - Drop 04-freespace.patch (applied upstream)
-   - Drop 05-task-align.patch (needs rework)
-
- -- Sebastian Reichel <sre@debian.org>  Wed, 29 Jul 2015 18:53:03 +0200
-
-tint2 (0.11+svn20121014-3) unstable; urgency=low
-
-  * Add some patches from upstream's bug tracker. Those are already
-    used by the Debian based VSIDO distribution for some time.
-   - 03-launcher_apps_dir.patch
-     Add support for loading multiple launcher icons by specifing
-     the directory for their *.desktop files.
-   - 04-freespace.patch
-     Add support for a separator panel element.
-   - 05-task-align.patch, 06-sample-task-align.patch
-     Add support for task alignment.
-
- -- Sebastian Reichel <sre@debian.org>  Thu, 05 Jun 2014 17:39:43 +0200
-
-tint2 (0.11+svn20121014-2) unstable; urgency=low
-
-  * Reintroduce tint2conf (Closes: #720200)
-  * Add patch fixing argv evaluation (Closes: #716390)
-  * Add patch fixing incorrect function declaration (Closes: #748171)
-  * Bump Debian Standards Version to 3.9.5
-
- -- Sebastian Reichel <sre@debian.org>  Sun, 01 Jun 2014 17:13:06 +0200
-
-tint2 (0.11+svn20121014-1) unstable; urgency=low
-
-  * New upstream checkout (Closes: #678918)
-   - Fix for no task cycling if all windows are minimized
-   - Fix for incorrect task cycling when windows visible on
-     all desktops are present
-   - Adding startup-notification support
-   - Drag and drop support for launchers
-   - Localize launcher tooltips
-   - Launcher: add icon lookup in ~/.local and /usr/local
-   - Disable mouse hover events when the launcher tooltip
-     is disabled
-  * Do not install tint2conf (Closes: #672840)
-  * Add libstartup-notification dependency
-  * Bump Debian Standards Version to 3.9.4
-  * Bump compat level to 9
-
- -- Sebastian Reichel <sre@debian.org>  Thu, 25 Oct 2012 13:35:15 +0200
-
-tint2 (0.11+svn20111022-3) unstable; urgency=low
-
-  * Update debian/copyright to conform with Debian copyright format 1.0
-  * Update Debian Standards Version to 3.9.3
-  * Add dump of tint2's FAQ and Configure wiki page as offline
-    documentation (Closes: #658226)
-
- -- Sebastian Reichel <sre@debian.org>  Wed, 07 Mar 2012 10:09:20 +0100
-
-tint2 (0.11+svn20111022-2) unstable; urgency=low
-
-   * Add inform-about-unsupported-saving.patch (Closes: #646055)
-
- -- Sebastian Reichel <sre@debian.org>  Sun, 23 Oct 2011 10:57:35 +0200
-
-tint2 (0.11+svn20111022-1) unstable; urgency=low
-
-  * New upstream checkout
-   - Fix double free of launcher configuration (Closes: #645208)
-
- -- Sebastian Reichel <sre@debian.org>  Sat, 22 Oct 2011 08:17:18 +0200
-
-tint2 (0.11+svn20111011-2) unstable; urgency=low
-
-  * build debug symbols 
-
- -- Sebastian Reichel <sre@debian.org>  Fri, 21 Oct 2011 16:30:50 +0200
-
-tint2 (0.11+svn20111011-1) unstable; urgency=low
-
-  * New upstream snapshot
-   - misc. fixes
-   - added alpha, saturation, brightness control for launcher icons
-   - launcher tooltips configurable, default off
-
- -- Sebastian Reichel <sre@debian.org>  Wed, 19 Oct 2011 19:49:54 +0200
-
-tint2 (0.11+svn20110307-1) unstable; urgency=low
-
-  * New upstream snapshot (Closes: #624792)
-  * Remove power_now support patch (applied upstream)
-  * Do not install tintwizard (it does not support config of SVN snapshot)
-  * Also build a tint2-dbg package
-
- -- Sebastian Reichel <sre@debian.org>  Sun, 01 May 2011 19:35:32 +0200
-
-tint2 (0.11-2) unstable; urgency=low
-
-  * Recommend python-gtk2 instead of python-gtk 
-
- -- Sebastian Reichel <sre@debian.org>  Sun, 05 Dec 2010 05:05:46 +0100
-
-tint2 (0.11-1) unstable; urgency=low
-
-  * Make me the maintainer of this package (Closes: #598688)
-  * New Upstream Version (Closes: #591008)
-  * drop patch (applied upstream)
-  * Update watch file
-    + use googlecode.debian.net
-    + new files are release as tar.bz2
-  * Update Debian Standards Version to 3.9.1
-  * Use DEP5 for debian/copyright
-  * Added build dependencies: cmake, libgtk2.0-dev
-  * Add patch renaming tintwizard.py to tintwizard
-  * Add patch adding power_now support
-  * Recommend python (needed by tintwizard)
-
- -- Sebastian Reichel <sre@debian.org>  Fri, 26 Nov 2010 22:01:43 +0100
-
-tint2 (0.9-2) unstable; urgency=low
-
-  * debian/patches/update-systray-clock-every-second.diff: Cherry-pick
-    patch from upstream to keep systray clock in sync with system time.
-    (Closes: #572227)
-
- -- Daniel Moerner <dmoerner@gmail.com>  Wed, 03 Mar 2010 23:40:02 -0800
-
-tint2 (0.9-1) unstable; urgency=low
-
-  * New Upstream Version
-  * debian/watch: Upstream uses both _beta and -rc1 for version strings,
-    update uversionmangle to handle both.
-  * debian/control:
-    - Bump to Version 3.8.4, no changes.
-    - Add libxdamage-dev and libxcomposite-dev to Build-Depends.
-
- -- Daniel Moerner <dmoerner@gmail.com>  Wed, 24 Feb 2010 10:21:01 -0800
-
-tint2 (0.8-1) unstable; urgency=low
-
-  * New Upstream Version
-  * debian/examples: Upstream has renamed the sample tint2rc files.
-  * debian/source: Switch to dpkg-source 3.0 (quilt) format.
-  * debian/copyright: Update with new upstream authors.
-
- -- Daniel Moerner <dmoerner@gmail.com>  Tue, 12 Jan 2010 11:48:49 -0800
-
-tint2 (0.7.1-1) unstable; urgency=low
-
-  * New Upstream Version
-  * debian/watch: add uversionmangle line to ignore upstream's beta
-    releases.
-  * debian/control: Update to Debian Policy 3.8.3, fix description typo.
-
- -- Daniel Moerner <dmoerner@gmail.com>  Sun, 06 Sep 2009 18:57:06 -0700
-
-tint2 (0.7-1) unstable; urgency=low
-
-  * New Upstream Version. (LP: #319436)
-    - Update watch file to point to tint2 instead of tint.
-    - Remove debian/tint.1: integrated upstream (Closes: #532307)
-    - Remove dpatch and patches/01-remove-strip-from-makefile.dpatch:
-      integrated upstream.
-    - Refresh debian/examples and remove debian/docs
-    - tint2 is now licensed under the GPL-2.
-  * Added Vcs-Git and Vcs-Browser fields to debian/control.
-  * Updated to Standards Version 3.8.2
-  * Switched to tiny dh 7 rules file with overrides.
-
- -- Daniel Moerner <dmoerner@gmail.com>  Wed, 01 Jul 2009 02:01:27 -0700
-
-tint2 (0.6.0-1) unstable; urgency=low
-
-  * Initial release (closes: #491596)
-  * Wrote manpage from upstream docs
-  * 01-remove-strip-from-makefile.dpatch: dh_strip will strip the binary instead
-
- -- Daniel Moerner <dmoerner@gmail.com>  Sat, 06 Sep 2008 07:54:24 -0700

packaging/debian/compat

@@ -1 +0,0 @@
-9

packaging/debian/control

@@ -1,37 +0,0 @@
-Source: tint2
-Section: x11
-Priority: optional
-Maintainer: Sebastian Reichel <sre@debian.org>
-Build-Depends: cmake,
-               debhelper (>= 9),
-               libcairo2-dev,
-               libglib2.0-dev,
-               libgtk2.0-dev,
-               libimlib2-dev,
-               libpango1.0-dev,
-               librsvg2-dev,
-               libstartup-notification0-dev,
-               libxcomposite-dev,
-               libxdamage-dev,
-               libxinerama-dev,
-               libxrandr-dev
-Standards-Version: 3.9.7
-Vcs-Git: https://alioth.debian.org/anonscm/git/collab-maint/tint2.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/tint2.git
-Homepage: https://gitlab.com/o9000/tint2/
-
-Package: tint2
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         procps
-Description: lightweight taskbar
- Tint is a simple panel/taskbar intentionally made for openbox3, but should
- also work with other window managers. The taskbar includes transparency and
- color settings for the font, icons, border, and background. It also supports
- multihead setups, customized mouse actions, and a built-in clock. Tint was
- originally based on ttm code. Since then, support has also been added
- for a battery monitor and system tray.
- .
- The goal is to keep a clean and unintrusive look with lightweight code and
- compliance with freedesktop specification.

packaging/debian/copyright

@@ -1,61 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: https://gitlab.com/o9000/tint2.git
-
-Files: *
-Copyright: 2007-2008 Pål Staurland <staura@gmail.com>
-           2008-2009 Thierry Lorthiois <lorthiois@bbsoft.fr>
-           2009 Andreas Fink <andreas.fink85@googlemail.com>
-           2011-2015 Ovidiu M <mrovi9000@gmail.com>
-License: GPL-2
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation, or (at your option) any
- later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA  02110-1301, USA.
- .
- On Debian systems, the full text of the GNU General Public License 2
- can be found in `/usr/share/common-licenses/GPL-2'.
-
-Files: src/battery/*
-Copyright: 2009 Sebastian Reichel <sre@debian.org>
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License version 2
- as published by the Free Software Foundation, or (at your option) any
- later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA  02110-1301, USA.
- .
- On Debian systems, the full text of the GNU General Public License 2
- can be found in `/usr/share/common-licenses/GPL-2'.
-
-Files: debian/*
-Copyright: 2008-2010 Daniel Moerner <dmoerner@gmail.com>
-           2010-2012 Sebastian Reichel <sre@debian.org>
-License: ISC
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

packaging/debian/examples

@@ -1 +0,0 @@
-sample/*.tint2rc

packaging/debian/postinst

@@ -1,2 +0,0 @@
-pkill -SIGUSR2 tint2 || true
-

packaging/debian/rules

@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_SYSCONFDIR=/etc
-
-override_dh_auto_install:
-	dh_auto_install --destdir=$(CURDIR)/debian/tmp
-
-override_dh_installdocs:
-	dh_installdocs --link-doc=tint2

packaging/debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

packaging/debian/tint2.install

@@ -1,12 +0,0 @@
-/usr/bin/tint2
-/usr/bin/tint2conf
-/etc/xdg/tint2/tint2rc
-/usr/share/applications/tint2.desktop
-/usr/share/applications/tint2conf.desktop
-/usr/share/man/man1/tint2.1
-/usr/share/doc/tint2/*
-/usr/share/icons/hicolor/scalable/apps/tint2.svg
-/usr/share/icons/hicolor/scalable/apps/tint2conf.svg
-/usr/share/locale/*
-/usr/share/tint2/*
-/usr/share/mime/packages/*

packaging/debian/tint2.manpages

@@ -1 +0,0 @@
-debian/tint2conf.1

packaging/debian/tint2conf.1

@@ -1,15 +0,0 @@
-.TH TINT2CONF 1 "April 25, 2011"
-.\" Please adjust this date whenever revising the manpage.
-.SH NAME
-tint2conf \- tint configuration manager
-.SH SYNOPSIS
-.B tint2conf
-.SH DESCRIPTION
-tint2conf is a GTK based configuration previewer for tint2.
-.SH OPTIONS
-tint2conf takes no parameters.
-.SH AUTHOR
-tint2conf was written by the tint2 team.
-.PP
-This manual page was written by Sebastian Reichel <sre@debian.org>,
-for the Debian project (but may be used by others).

packaging/debian/watch

@@ -1,4 +0,0 @@
-version=3
-
-opts=filenamemangle=s/.*\.tar\.gz\?ref=v?(\d\S*)/tint2-$1\.tar\.gz/g,uversionmangle=s/\-rc(\d)/\~rc$1/ \
-https://gitlab.com/o9000/tint2/tags .*archive\.tar\.gz\?ref=v?(\d\S*) 

packaging/make_ubuntu.sh

@@ -1,79 +0,0 @@
-#!/bin/bash
-
-# Requirements: devscripts
-
-set -x
-
-rm -rf tint2* 2>/dev/null || true
-
-if [ ! -z "$1" ]
-then
-    MINOR="$1"
-else
-    MINOR="1"
-fi
-
-# Get version (and check that the repository is clean)
-VERSION=$(../get_version.sh --strict)
-if [ ! $? -eq 0 ]
-then
-    echo >&2 "Error: get_version.sh failed!"
-    exit 1
-fi
-rm -f version.h
-VERSION=$(git describe --exact-match 2>/dev/null)
-if [ $? -eq 0 ]
-then
-    VERSION=$(echo "$VERSION" | sed 's/^v//')
-    REPO="tint2"
-else
-    VERSION="$(git show -s --pretty=format:%cI.%ct.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g').$MINOR"
-    REPO="tint2-git"
-fi
-
-set -e
-
-# Export repository contents to source directory
-DIR=tint2-$VERSION
-echo "Making release $DIR"
-
-pushd .
-cd ..
-git checkout-index --prefix=packaging/$DIR/ -a
-popd
-
-# Update version file in source directory
-rm -f $DIR/make_release.sh
-echo "echo \"#define VERSION_STRING \\\"$VERSION\\\"\" > version.h" > $DIR/get_version.sh
-
-# Copy the debian files into the source directory
-cp -r debian $DIR/debian
-
-for DISTRO in trusty xenial zesty artful
-do
-    # Cleanup from previous builds
-    rm -rf tint2_$VERSION-*
-
-    # Update debian package changelog if necessary
-    echo -e "tint2 ($VERSION-$DISTRO-1) $DISTRO; urgency=medium\n\n$(git log --pretty=format:'  * %h %an (%ci) %s %d')\n -- o9000 <mrovi9000@gmail.com>  $(date -R)\n" > $DIR/debian/changelog
-
-    # Create source tarball
-    ARCHIVE=tint2_$VERSION-$DISTRO.orig.tar.gz
-    rm -rf $ARCHIVE
-    tar -czf $ARCHIVE $DIR
-
-    # Build package
-    KEY=$(gpg --list-secret-keys | awk '/^sec/ { print $2 }' | cut -d / -f 2)
-
-    pushd .
-    cd $DIR
-    debuild -S -k$KEY
-    popd
-
-    # Upload package
-    dput ppa:o9000/$REPO tint2_$VERSION-$DISTRO-1_source.changes
-done
-
-# Cleanup
-rm -rf $DIR $ARCHIVE
-rm -rf tint2_$VERSION-*

packaging/update_version_status.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-export PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
-
-set -e
-set -x
-
-[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en "$0" "$0" "$@" || :
-
-exec > ~/tint2.runner-version.log
-exec 2>&1
-
-cd ~/tint2.wiki
-git reset --hard
-git pull
-
-
-~/tint2/packaging/version_status.py > packaging.tmp.md
-cat packaging.tmp.md > packaging.md
-rm packaging.tmp.md
-
-git commit -am 'Update packaging info'
-git push origin master

packaging/version_status.py

@@ -1,422 +0,0 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
-
-import sys
-reload(sys)
-sys.setdefaultencoding('utf8')
-import datetime
-import xml.etree.ElementTree as ET
-import ftplib
-import gzip
-import json
-import re
-from StringIO import StringIO
-import urllib2
-
-
-# Returns true if `value` is an integer represented as a string.
-def is_int(value):
-  # type: (str) -> bool
-  try:
-    value = int(value)
-  except ValueError:
-    return False
-  return True
-
-
-# Returns a new string with all instances of multiple whitespace
-# replaced with a single space.
-def collapse_multiple_spaces(line):
-  # type: (str) -> str
-  return " ".join(line.split())
-
-
-# Extracts the file name from a line of an FTP listing.
-# The input must be a valid directory entry (starting with "-" or "d").
-def ftp_file_name_from_listing(line):
-  # type: (str) -> str
-  line = collapse_multiple_spaces(line)
-  return line.split(" ", 8)[-1]
-
-
-# Extracts a list of the directories and a list of the files
-# from an FTP listing.
-def ftp_list_dir_process_listing(lines):
-  # type: (List[str]) -> List[str], List[str]
-  dirs = []
-  files = []
-  for line in lines:
-    if line.startswith("d"):
-      dirs.append(ftp_file_name_from_listing(line))
-    elif line.startswith("-"):
-      files.append(ftp_file_name_from_listing(line))
-  return dirs, files
-
-
-# Lists the remote FTP directory located at `path`.
-# Returns a list of the directories and a list of the files.
-def ftp_list_dir(ftp, path):
-  # type: (ftplib.FTP, str) -> List[str], List[str]
-  ftp.cwd(path)
-  lines = []
-  ftp.retrlines("LIST", lines.append)
-  return ftp_list_dir_process_listing(lines)
-
-
-# Downloads a binary file to a string.
-# Returns the string.
-def ftp_download(ftp, path):
-  # type: (ftplib.FTP, str) -> str
-  blocks = []
-  ftp.retrbinary("RETR {0}".format(path), blocks.append)
-  return "".join(blocks)
-
-
-# Extracts the list of links from an HTML string.
-def http_links_from_listing(html):
-  # type: (str) -> List[str]
-  pattern = re.compile(r"""href=['"]+([^'"]+)['"]+""")
-  return re.findall(pattern, html)
-
-
-# Extracts the list of paths (relative links, except to ../*) from an HTML string.
-def http_paths_from_listing(html):
-  # type: (str) -> List[str]
-  paths = []
-  for link in http_links_from_listing(html):
-    if link.startswith(".."):
-      continue
-    if link == "./" or link == "/":
-      continue
-    if "://" in link:
-      continue
-    paths.append(link)
-  return paths
-
-
-# Downloads a file as string from an URL. Decodes correctly.
-def http_download_txt(url):
-  # type: (str) -> str
-  try:
-    r = urllib2.urlopen(url)
-    encoding = r.headers.getparam("charset")
-    if not encoding:
-      encoding = "utf-8"
-    return r.read().decode(encoding)
-  except:
-    raise
-
-
-# Extracts the list of paths (relative links, except to ../*) from the HTML code
-# located at `url`.
-def http_list_dir(url):
-  # type: (str) -> List[str]
-  try:
-    html = http_download_txt(url)
-  except:
-    return []
-  return http_paths_from_listing(html)
-
-
-# Extracts the version and maintainer info for a package, from a Debian repository Packages file.
-def deb_packages_extract_version(packages, name):
-  # type: (str, str) -> str, str
-  inside = False
-  version = None
-  maintainer = None
-  for line in packages.split("\n"):
-    if line == "Package: " + name:
-      inside = True
-    elif not line:
-      if inside:
-        break
-    else:
-      if inside:
-        if line.startswith("Version:"):
-          version = line.split(":", 1)[-1].strip()
-        elif line.startswith("Maintainer:"):
-          maintainer = line.split(":", 1)[-1].strip()
-  return version, maintainer
-
-# Extracts the version and maintainer info for a package, from an Arch PKGBUILD file.
-def arch_pkgbuild_extract_version(pkgbuild):
-  # type: (str) -> str, str
-  version = None
-  maintainer = None
-  for line in pkgbuild.split("\n"):
-    if line.startswith("# Maintainer:"):
-      maintainer = line.split(":", 1)[-1].strip()
-    elif line.startswith("pkgver="):
-      version = line.split("=", 1)[-1].strip()
-  return version, maintainer
-
-
-# Debian
-
-def get_debian_release_version(release):
-  data = http_download_txt("http://metadata.ftp-master.debian.org/changelogs/main/t/tint2/{0}_changelog".format(release))
-  version = data.split("\n", 1)[0].split("(", 1)[-1].split(")", 1)[0].strip()
-  maintainer = [line.split("--", 1)[-1] for line in data.split("\n") if line.startswith(" --")][0].split("  ")[0].strip()
-  return release, version, maintainer
-
-
-def get_debian_versions():
-  print >> sys.stderr, "Debian ..."
-  return "Debian", "debian", [get_debian_release_version(release) for release in ["stable", "testing", "unstable", "experimental"]]
-
-
-# Ubuntu
-
-def get_ubuntu_versions():
-  print >> sys.stderr, "Ubuntu ..."
-  data = http_download_txt("https://api.launchpad.net/1.0/ubuntu/+archive/primary?ws.op=getPublishedSources&source_name=tint2&exact_match=true")
-  data = json.loads(data)["entries"]
-  data.reverse()
-  versions = []
-  for package in data:
-    if package["status"] == "Published":
-      version = package["source_package_version"]
-      release = package["distro_series_link"].split("/")[-1]
-      maintainer = package["package_maintainer_link"]
-      versions.append((release, version, maintainer))
-  return "Ubuntu", "ubuntu", versions
-
-
-# BunsenLabs
-
-def get_bunsenlabs_versions():
-  print >> sys.stderr, "BunsenLabs ..."
-  dirs = http_list_dir("https://eu.pkg.bunsenlabs.org/debian/dists/")
-  versions = []
-  for d in dirs:
-    if d.endswith("/") and "/" not in d[:-1]:
-      release = d.replace("/", "")
-      packages = http_download_txt("https://eu.pkg.bunsenlabs.org/debian/dists/{0}/main/binary-amd64/Packages".format(release))
-      version, maintainer = deb_packages_extract_version(packages, "tint2")
-      if version:
-        versions.append((release, version, maintainer))
-  return "BunsenLabs", "bunsenlabs", versions
-
-
-# Arch
-
-def get_arch_versions():
-  print >> sys.stderr, "Arch ..."
-  pkgbuild = http_download_txt("https://git.archlinux.org/svntogit/community.git/plain/trunk/PKGBUILD?h=packages/tint2")
-  version, maintainer = arch_pkgbuild_extract_version(pkgbuild)
-  return "Arch Linux", "archlinux", [("Community", version, maintainer)]
-
-
-# Fedora
-
-def get_fedora_versions():
-  print >> sys.stderr, "Fedora ..."
-  dirs = http_list_dir("http://mirror.switch.ch/ftp/mirror/fedora/linux/development/")
-  versions = []
-  for d in dirs:
-    if d.endswith("/") and "/" not in d[:-1]:
-      release = d.replace("/", "")
-      packages = http_list_dir("http://mirror.switch.ch/ftp/mirror/fedora/linux/development/{0}/Everything/source/tree/Packages/t/".format(release))
-      for p in packages:
-        if p.startswith("tint2-"):
-          version = p.split("-", 1)[-1].split(".fc")[0]
-          v = (release, version, "")
-          if v not in versions:
-            versions.append(v)
-  return "Fedora", "fedora", versions
-
-
-# Red Hat (EPEL)
-
-def get_redhat_epel_versions():
-  print >> sys.stderr, "RedHat ..."
-  dirs = http_list_dir("http://mirror.switch.ch/ftp/mirror/epel/")
-  versions = []
-  for d in dirs:
-    if d.endswith("/") and "/" not in d[:-1] and is_int(d[:-1]):
-      release = d.replace("/", "")
-      packages = http_list_dir("http://mirror.switch.ch/ftp/mirror/epel/{0}/SRPMS/t/".format(release))
-      for p in packages:
-        if p.startswith("tint2-"):
-          version = p.split("-", 1)[-1].split(".el")[0]
-          v = (release, version, "")
-          if v not in versions:
-            versions.append(v)
-  return "RedHat (EPEL)", "rhel", versions
-
-
-# SUSE
-
-def get_suse_versions():
-  print >> sys.stderr, "Suse ..."
-  ftp = ftplib.FTP("mirror.switch.ch")
-  ftp.login()
-  releases, _ = ftp_list_dir(ftp, "/mirror/opensuse/opensuse/ports/update/leap/")
-  versions = []
-  for release in releases:
-    root = "/mirror/opensuse/opensuse/ports/update/leap/{0}/oss/repodata/".format(release)
-    _, files = ftp_list_dir(ftp, root)
-    for fname in files:
-      if fname.endswith("-primary.xml.gz"):
-        data = ftp_download(ftp, "{0}/{1}".format(root, fname))
-        xml = gzip.GzipFile(fileobj=StringIO(data)).read()
-        root = ET.fromstring(xml)
-        for package in root.findall("{http://linux.duke.edu/metadata/common}package"):
-          name = package.find("{http://linux.duke.edu/metadata/common}name").text
-          if name == "tint2":
-            version = package.find("{http://linux.duke.edu/metadata/common}version").get("ver")
-            versions.append((release, version, ""))
-  ftp.quit()
-  return "OpenSUSE", "opensuse", versions
-
-
-# Gentoo
-
-def get_gentoo_versions():
-  print >> sys.stderr, "Gentoo ..."
-  files = http_list_dir("https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-misc/tint2")
-  versions = []
-  for f in files:
-    if "tint2" in f and f.endswith(".ebuild"):
-      version = f.split("tint2-")[-1].split(".ebuild")[0]
-      v = ("", version, "")
-      if v not in versions:
-        versions.append(v)
-  return "Gentoo", "gentoo", versions
-
-
-# Void
-
-def get_void_versions():
-  print >> sys.stderr, "Void ..."
-  template = http_download_txt("https://raw.githubusercontent.com/voidlinux/void-packages/master/srcpkgs/tint2/template")
-  versions = []
-  version = None
-  maintainer = None
-  for line in template.split("\n"):
-    if line.startswith("version="):
-      version = line.split("=", 1)[-1].replace('"', "").strip()
-    elif line.startswith("maintainer="):
-      maintainer = line.split("=", 1)[-1].replace('"', "").strip()
-  if version:
-    versions.append(("", version, maintainer))
-  return "Void Linux", "void", versions
-
-
-# Alpine
-
-def get_alpine_versions():
-  print >> sys.stderr, "Alpine ..."
-  apkbuild = http_download_txt("https://git.alpinelinux.org/cgit/aports/plain/community/tint2/APKBUILD")
-  versions = []
-  version = None
-  maintainer = None
-  for line in apkbuild.split("\n"):
-    if line.startswith("pkgver="):
-      version = line.split("=", 1)[-1].replace('"', "").strip()
-    elif line.startswith("# Maintainer:"):
-      maintainer = line.split(":", 1)[-1].replace('"', "").strip()
-  if version:
-    versions.append(("", version, maintainer))
-  return "Alpine Linux", "alpine", versions
-
-
-# Slackware
-
-def get_slack_versions():
-  print >> sys.stderr, "Slackware ..."
-  dirs = http_list_dir("https://slackbuilds.org/slackbuilds/")
-  versions = []
-  for d in dirs:
-    if d.endswith("/") and "/" not in d[:-1]:
-      release = d.replace("/", "")
-      try:
-        info = http_download_txt("https://slackbuilds.org/slackbuilds/{0}/desktop/tint2/tint2.info".format(release))
-      except:
-        continue
-      version = None
-      maintainer = None
-      for line in info.split("\n"):
-        if line.startswith("VERSION="):
-          version = line.split("=", 1)[-1].replace('"', "").strip()
-        elif line.startswith("MAINTAINER="):
-          maintainer = line.split("=", 1)[-1].replace('"', "").strip()
-      if version:
-        versions.append((release, version, maintainer))
-  return "Slackware", "slackware", versions
-
-# FreeBSD
-
-def get_freebsd_versions():
-  print >> sys.stderr, "FreeBSD ..."
-  makefile = http_download_txt("https://svnweb.freebsd.org/ports/head/x11/tint/Makefile?view=co")
-  versions = []
-  version = None
-  maintainer = None
-  for line in makefile.split("\n"):
-    if line.startswith("PORTVERSION="):
-      version = line.split("=", 1)[-1].strip()
-    elif line.startswith("MAINTAINER="):
-      maintainer = line.split("=", 1)[-1].strip()
-  if version:
-    versions.append(("", version, maintainer))
-  return "FreeBSD", "freebsd", versions
-
-
-# OpenBSD
-
-def get_openbsd_versions():
-  print >> sys.stderr, "OpenBSD ..."
-  makefile = http_download_txt("http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/x11/tint2/Makefile?rev=1.5&content-type=text/plain")
-  versions = []
-  version = None
-  for line in makefile.split("\n"):
-    if line.startswith("V="):
-      version = line.split("=", 1)[-1].strip()
-  if version:
-    versions.append(("", version, ""))
-  return "OpenBSD", "openbsd", versions
-
-
-# Upstream
-
-def get_tint2_version():
-  print >> sys.stderr, "Upstream ..."
-  readme = http_download_txt("https://gitlab.com/o9000/tint2/raw/master/README.md")
-  version = readme.split("\n", 1)[0].split(":", 1)[-1].strip()
-  return version
-
-
-def main():
-  latest = get_tint2_version()
-  distros = []
-  distros.append(get_debian_versions())
-  distros.append(get_bunsenlabs_versions())
-  distros.append(get_ubuntu_versions())
-  distros.append(get_fedora_versions())
-  distros.append(get_redhat_epel_versions())
-  #distros.append(get_suse_versions())
-  distros.append(get_alpine_versions())
-  distros.append(get_slack_versions())
-  distros.append(get_arch_versions())
-  distros.append(get_void_versions())
-  distros.append(get_gentoo_versions())
-  distros.append(get_freebsd_versions())
-  distros.append(get_openbsd_versions())
-  print "| Distribution | Release | Version | Status |"
-  print "| ------------ | ------- | ------- | ------ |"
-  for dist, dcode, releases in distros:
-    icon = "![](numix-icons/distributor-logo-{0}.svg.png)".format(dcode)
-    for r in releases:
-      if r[1].split("-", 1)[0] == latest:
-        status = ":white_check_mark: Latest"
-      else:
-        status = ":warning: Out of date"
-      print "| {0} {1} | {2} | {3} | {4} |".format(icon, dist, r[0], r[1], status)
-  utc_datetime = datetime.datetime.utcnow()
-  print ""
-  print "Last updated:", utc_datetime.strftime("%Y-%m-%d %H:%M UTC")
-
-
-if __name__ == "__main__":
-  main()

packaging/version_status_test.py

@@ -1,208 +0,0 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
-
-import unittest
-from version_status import *
-
-
-class TestStringFunctions(unittest.TestCase):
-  def test_collapse_multiple_spaces(self):
-    self.assertEqual(collapse_multiple_spaces("asdf"), "asdf")
-    self.assertEqual(collapse_multiple_spaces("as df"), "as df")
-    self.assertEqual(collapse_multiple_spaces("as  df"), "as df")
-    self.assertEqual(collapse_multiple_spaces("a  s    d f"), "a s d f")
-
-
-class TestFtpFunctions(unittest.TestCase):
-  def test_ftp_file_name_from_listing(self):
-    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18 README"), "README")
-    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18:12 README"), "README")
-    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18 READ ME"), "READ ME")
-    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18:12 READ ME"), "READ ME")
-    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18 README"), "README")
-    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18:12 README.txt"), "README.txt")
-    self.assertEqual(ftp_file_name_from_listing("-rw-rw-r-- 1 1176 1176 1063 Jun 15 10:18:12 READ ME.txt"), "READ ME.txt")
-
-  def test_ftp_list_dir_process_listing(self):
-    lines = [ "-rw-rw-r--    1 1176     1176         1063 Jun 15 10:18 README",
-              "-rw-rw-r--    1 1176     1176         1063 Jun 15 10:18:11 READ ME.txt",
-              "drwxr-sr-x    5 1176     1176         4096 Dec 19  2000 pool",
-              "drwxr-sr-x    4 1176     1176         4096 Nov 17  2008 project",
-              "drwxr-xr-x    3 1176     1176         4096 Oct 10  2012 tools"]
-    dirs_check = ["pool", "project", "tools"]
-    files_check = ["README", "READ ME.txt"]
-    dirs, files = ftp_list_dir_process_listing(lines)
-    dirs.sort()
-    dirs_check.sort()
-    files.sort()
-    files_check.sort()
-    self.assertEqual(dirs, dirs_check)
-    self.assertEqual(files, files_check)
-
-
-class TestHttpFunctions(unittest.TestCase):
-  def test_http_links_from_listing(self):
-    html = """<html>
-              <head><title>Index of /debian/dists/</title></head>
-              <body bgcolor="white">
-              <a href="http://google.com">google/</a>
-              <h1>Index of /debian/dists/</h1><hr><pre><a href="../">../</a>
-              <a href="bunsen-hydrogen/">bunsen-hydrogen/</a>                                   08-May-2017 20:31       -
-              <a href="jessie-backports/">jessie-backports/</a>                                  01-Jul-2017 15:58       -
-              <a href="unstable/">unstable/</a>                                          12-Aug-2017 19:32       -
-              </pre><hr></body>
-              </html>"""
-    links_check = ["../", "bunsen-hydrogen/", "jessie-backports/", "unstable/", "http://google.com"]
-    links = http_links_from_listing(html)
-    links.sort()
-    links_check.sort()
-    self.assertEqual(links, links_check)
-
-  def test_http_paths_from_listing(self):
-    html = """<html>
-              <head><title>Index of /debian/dists/</title></head>
-              <body bgcolor="white">
-              <h1>Index of /debian/dists/</h1><hr><pre><a href="../">../</a>
-              <a href="bunsen-hydrogen/">bunsen-hydrogen/</a>                                   08-May-2017 20:31       -
-              <a href="jessie-backports/">jessie-backports/</a>                                  01-Jul-2017 15:58       -
-              <a href="unstable/">unstable/</a>                                          12-Aug-2017 19:32       -
-              </pre><hr></body>
-              </html>"""
-    paths_check = ["bunsen-hydrogen/", "jessie-backports/", "unstable/"]
-    paths = http_paths_from_listing(html)
-    paths.sort()
-    paths_check.sort()
-    self.assertEqual(paths, paths_check)
-
-
-class TestPackageFunctions(unittest.TestCase):
-  def test_deb_packages_extract_version(self):
-    packages = """Package: sendmailanalyzer
-Version: 9.2-1.1
-Architecture: all
-Maintainer: Dominique Fournier <dominique@fournier38.fr>
-Installed-Size: 749
-Pre-Depends: perl
-Depends: apache2
-Homepage: http://sareport.darold.net/
-Priority: optional
-Section: mail
-Filename: pool/main/s/sendmailanalyzer/sendmailanalyzer_9.2-1.1_all.deb
-Size: 143576
-SHA256: 0edcbde19a23333c8c894e27af32447582b38e3ccd84122ac07720fdaab8fa0c
-SHA1: a7f4dcf42e850acf2c201bc4594cb6b765dced20
-MD5sum: adb39196fc33a826b24e9d0e440cba25
-Description: Perl Sendmail/Postfix log analyser
- SendmailAnalyzer continuously read your mail log file to generate
- periodical HTML and graph reports. All reports are shown through
- a CGI web interface.
- It reports all you ever wanted to know about email trafic on your network.
- You can also use it in ISP environment with per domain report.
-
-Package: tint2
-Version: 0.14.6-1
-Architecture: amd64
-Maintainer: Jens John <dev@2ion.de>
-Installed-Size: 1230
-Depends: libatk1.0-0 (>= 1.12.4), libc6 (>= 2.15), libcairo2 (>= 1.2.4), libfontconfig1 (>= 2.11), libfreetype6 (>= 2.2.1), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.35.9), libgtk2.0-0 (>= 2.14.0), libimlib2 (>= 1.4.5), libpango-1.0-0 (>= 1.20.0), libpangocairo-1.0-0 (>= 1.14.0), libpangoft2-1.0-0 (>= 1.14.0), librsvg2-2 (>= 2.14.4), libstartup-notification0 (>= 0.4), libx11-6, libxcomposite1 (>= 1:0.3-1), libxdamage1 (>= 1:1.1), libxfixes3, libxinerama1, libxrandr2 (>= 2:1.2.99.3), libxrender1
-Homepage: https://gitlab.com/o9000/tint2/
-Priority: optional
-Section: x11
-Filename: pool/main/t/tint2/tint2_0.14.6-1_amd64.deb
-Size: 279638
-SHA256: c96e745425a97828952e9e0277176fe68e2512056915560ac968a66c88a0a8b7
-SHA1: 82edd60429a494bb127e6d8a10434fca0ee60f61
-MD5sum: 65455638fb41503361560b25a70b33b7
-Description: lightweight taskbar
- Tint is a simple panel/taskbar intentionally made for openbox3, but should
- also work with other window managers. The taskbar includes transparency and
- color settings for the font, icons, border, and background. It also supports
- multihead setups, customized mouse actions, and a built-in clock. Tint was
- originally based on ttm code. Since then, support has also been added
- for a battery monitor and system tray.
- .
- The goal is to keep a clean and unintrusive look with lightweight code and
- compliance with freedesktop specification.
-
-Package: xfce4-power-manager
-Version: 1.4.4-4~bpo8+1
-Architecture: amd64
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
-Installed-Size: 541
-Depends: libc6 (>= 2.4), libcairo2 (>= 1.2.4), libdbus-1-3 (>= 1.0.2), libdbus-glib-1-2 (>= 0.88), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.41.1), libgtk2.0-0 (>= 2.24.0), libnotify4 (>= 0.7.0), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libupower-glib3 (>= 0.99.0), libx11-6, libxext6, libxfce4ui-1-0 (>= 4.9.0), libxfce4util6 (>= 4.9.0), libxfconf-0-2 (>= 4.6.0), libxrandr2 (>= 2:1.2.99.2), upower (>= 0.99), xfce4-power-manager-data (= 1.4.4-4~bpo8+1)
-Recommends: libpam-systemd, xfce4-power-manager-plugins
-Homepage: http://goodies.xfce.org/projects/applications/xfce4-power-manager
-Priority: optional
-Section: xfce
-Filename: pool/main/x/xfce4-power-manager/xfce4-power-manager_1.4.4-4~bpo8+1_amd64.deb
-Size: 214122
-SHA256: 992b606afe5e9934bce19a1df2b8d7067c98b9d64e23a9b63dbd0c4cf28b4ac9
-SHA1: 6bfcd77071f31577a37abab063bf21a34f4d616c
-MD5sum: fb777aecbbfe39742649b768eb22c697
-Description: power manager for Xfce desktop
- This power manager for the Xfce desktop enables laptop users to set up
- a power profile for two different modes "on battery power" and "on ac
- power" while still allowing desktop users to at least change the DPMS
- settings and CPU frequency using the settings dialogue..
- .
- It features:
-   * battery monitoring
-   * cpu frequency settings
-   * monitor DPMS settings
-   * suspend/Hibernate
-   * LCD brightness control
-   * Lid, sleep and power switches control"""
-    version, maintainer = deb_packages_extract_version(packages, "tint2")
-    self.assertEqual(version, "0.14.6-1")
-    self.assertEqual(maintainer, "Jens John <dev@2ion.de>")
-    version, maintainer = deb_packages_extract_version(packages, "asdf")
-    self.assertEqual(version, None)
-    self.assertEqual(maintainer, None)
-
-  def test_arch_packages_extract_version(self):
-    pkgbuild = """# $Id$
-# Maintainer: Alexander F Rødseth <xyproto@archlinux.org>
-# Contributor: Blue Peppers <bluepeppers@archlinux.us>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Yannick LM <LMyannicklm1337@gmail.com>
-
-pkgname=tint2
-pkgver=0.14.6
-pkgrel=2
-pkgdesc='Basic, good-looking task manager for WMs'
-arch=('x86_64' 'i686')
-url='https://gitlab.com/o9000/tint2'
-license=('GPL2')
-depends=('gtk2' 'imlib2' 'startup-notification')
-makedepends=('cmake' 'startup-notification' 'git' 'ninja' 'setconf')
-source=("$pkgname-$pkgver.tar.bz2::https://gitlab.com/o9000/tint2/repository/archive.tar.bz2?ref=$pkgver")
-sha256sums=('b40079fb187aa248cd3b6957076f138d040c723b309e1b254ac0c8ec9826a451')
-
-prepare() {
-  mv "$pkgname-$pkgver-"* "$pkgname"
-  setconf "$pkgname/get_version.sh" VERSION "$pkgver"
-}
-
-build() {
-  mkdir -p build
-  cd build
-  cmake "../$pkgname" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_TINT2CONF=1 \
-    -GNinja
-  ninja
-}
-
-package() {
-  DESTDIR="$pkgdir" ninja -C build install
-}
-
-# getver: gitlab.com/o9000/tint2/blob/master/README.md
-# vim: ts=2 sw=2 et:"""
-    version, maintainer = arch_pkgbuild_extract_version(pkgbuild)
-    self.assertEqual(version, "0.14.6")
-    self.assertEqual(maintainer, "Alexander F Rødseth <xyproto@archlinux.org>")
-
-
-if __name__ == '__main__':
-  unittest.main()

sample/horizontal-dark-opaque.tint2rc

@@ -1,86 +1,47 @@
-#---- Generated by tint2conf 08d3 ----
+#---- Generated by tint2conf 1238 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Gradients
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 5
 border_width = 1
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 background_color = #222222 100
-border_color = #777777 30
+border_color = #777777 100
-background_color_hover = #222222 100
-border_color_hover = #777777 30
-background_color_pressed = #222222 100
-border_color_pressed = #777777 30
 
 #-------------------------------------
 # Panel
@@ -94,7 +55,6 @@ panel_dock = 0
 panel_position = bottom center horizontal
 panel_layer = normal
 panel_monitor = all
-panel_shrink = 0
 autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
@@ -102,23 +62,17 @@ 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_hide_if_empty = 0
 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_hide_different_desktop = 0
-taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 6 3
 taskbar_name_background_id = 6
 taskbar_name_active_background_id = 7
@@ -127,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
@@ -159,24 +112,21 @@ systray_sort = ascending
 systray_icon_size = 22
 systray_icon_asb = 100 0 0
 systray_monitor = 1
-systray_name_filter = 
 
 #-------------------------------------
 # 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 = tint2conf.desktop
+launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = firefox.desktop
+launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = iceweasel.desktop
+launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = chromium-browser.desktop
+launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = google-chrome.desktop
+launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = x-terminal-emulator.desktop
+launcher_item_app = /usr/share/applications/google-chrome.desktop
 
 #-------------------------------------
 # Clock
@@ -193,31 +143,17 @@ 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"
-battery_full_cmd = 
 bat1_font = sans 8
 bat2_font = sans 6
 battery_font_color = #eeeeee 100
-bat1_format = 
-bat2_format = 
 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,86 +1,47 @@
-#---- Generated by tint2conf 3947 ----
+#---- Generated by tint2conf 24b3 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Gradients
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 5
 border_width = 1
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
@@ -94,7 +55,6 @@ panel_dock = 0
 panel_position = bottom center horizontal
 panel_layer = normal
 panel_monitor = all
-panel_shrink = 0
 autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
@@ -102,23 +62,17 @@ 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_hide_if_empty = 0
 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_hide_different_desktop = 0
-taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 6 3
 taskbar_name_background_id = 6
 taskbar_name_active_background_id = 7
@@ -127,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
@@ -159,24 +112,21 @@ systray_sort = ascending
 systray_icon_size = 22
 systray_icon_asb = 100 0 0
 systray_monitor = 1
-systray_name_filter = 
 
 #-------------------------------------
 # 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 = tint2conf.desktop
+launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = firefox.desktop
+launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = iceweasel.desktop
+launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = chromium-browser.desktop
+launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = google-chrome.desktop
+launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = x-terminal-emulator.desktop
+launcher_item_app = /usr/share/applications/google-chrome.desktop
 
 #-------------------------------------
 # Clock
@@ -193,31 +143,17 @@ 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"
-battery_full_cmd = 
 bat1_font = sans 8
 bat2_font = sans 6
 battery_font_color = #eeeeee 100
-bat1_format = 
-bat2_format = 
 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,97 +1,53 @@
-#---- Generated by tint2conf f101 ----
+#---- Generated by tint2conf 3ad3 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Gradients
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 0
 border_width = 1
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
+background_color = #999999 100
-background_color = #dddddd 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
@@ -105,7 +61,6 @@ panel_dock = 0
 panel_position = bottom center horizontal
 panel_layer = normal
 panel_monitor = all
-panel_shrink = 0
 autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
@@ -113,23 +68,17 @@ 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_hide_if_empty = 0
 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_hide_different_desktop = 0
-taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 6 3
 taskbar_name_background_id = 6
 taskbar_name_active_background_id = 7
@@ -138,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
@@ -170,24 +118,21 @@ systray_sort = ascending
 systray_icon_size = 22
 systray_icon_asb = 100 0 0
 systray_monitor = 1
-systray_name_filter = 
 
 #-------------------------------------
 # 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 = tint2conf.desktop
+launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = firefox.desktop
+launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = iceweasel.desktop
+launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = chromium-browser.desktop
+launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = google-chrome.desktop
+launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = x-terminal-emulator.desktop
+launcher_item_app = /usr/share/applications/google-chrome.desktop
 
 #-------------------------------------
 # Clock
@@ -204,31 +149,17 @@ 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"
-battery_full_cmd = 
 bat1_font = sans 8
 bat2_font = sans 6
 battery_font_color = #222222 100
-bat1_format = 
-bat2_format = 
 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,86 +1,55 @@
-#---- Generated by tint2conf 6ae3 ----
+#---- Generated by tint2conf e324 ----
 # See https://gitlab.com/o9000/tint2/wikis/Configure for 
 # full documentation of the configuration options.
 #-------------------------------------
-# Gradients
-#-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 0
 border_width = 1
-border_sides = TBLR
 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
+# Background 2
 rounded = 5
-border_width = 1
+border_width = 0
-border_sides = TBLR
 background_color = #eeeeee 4
-border_color = #cccccc 44
+border_color = #cccccc 100
-background_color_hover = #eeeeee 22
-border_color_hover = #eaeaea 44
-background_color_pressed = #dddddd 4
-border_color_pressed = #eaeaea 44
 
-# Background 3: Active task
+# Background 3
 rounded = 5
 border_width = 1
-border_sides = TBLR
 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
+# Background 4
 rounded = 5
 border_width = 1
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 background_color = #eeeeee 4
-border_color = #cccccc 30
+border_color = #cccccc 100
-background_color_hover = #eeeeee 22
-border_color_hover = #999999 30
-background_color_pressed = #dddddd 4
-border_color_pressed = #999999 30
 
-# Background 7: Active desktop name
+# Background 7
 rounded = 2
 border_width = 1
-border_sides = TBLR
 background_color = #dddddd 3
 border_color = #999999 100
-background_color_hover = #dddddd 3
+
-border_color_hover = #999999 100
+# Background 8
-background_color_pressed = #dddddd 3
+rounded = 3
-border_color_pressed = #999999 100
+border_width = 0
+background_color = #999999 4
+border_color = #cccccc 100
 
 #-------------------------------------
 # Panel
@@ -94,7 +63,6 @@ panel_dock = 0
 panel_position = bottom center horizontal
 panel_layer = normal
 panel_monitor = all
-panel_shrink = 0
 autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
@@ -102,23 +70,17 @@ 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_hide_if_empty = 0
 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_hide_different_desktop = 0
-taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 6 3
 taskbar_name_background_id = 6
 taskbar_name_active_background_id = 7
@@ -159,24 +121,22 @@ systray_sort = ascending
 systray_icon_size = 22
 systray_icon_asb = 100 0 0
 systray_monitor = 1
-systray_name_filter = 
 
 #-------------------------------------
 # 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 = tint2conf.desktop
+launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = firefox.desktop
+launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = iceweasel.desktop
+launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = chromium-browser.desktop
+launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = google-chrome.desktop
+launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = x-terminal-emulator.desktop
+launcher_item_app = /usr/share/applications/google-chrome.desktop
 
 #-------------------------------------
 # Clock
@@ -193,31 +153,17 @@ 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"
-battery_full_cmd = 
 bat1_font = sans 8
 bat2_font = sans 6
 battery_font_color = #ffffff 100
-bat1_format = 
-bat2_format = 
 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/icon_and_text_1.tint2rc

@@ -0,0 +1,119 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 7
+border_width = 2
+background_color = #000000 60
+border_color = #FFFFFF 17
+
+# ID 2
+rounded = 5
+border_width = 0
+background_color = #FFFFFF 40
+border_color = #FFFFFF 49
+
+# ID 3
+rounded = 5
+border_width = 0
+background_color = #FFFFFF 17
+border_color = #FFFFFF 69
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 94% 30
+panel_margin = 0 0
+panel_padding = 7 0 7
+panel_dock = 0
+wm_menu = 0
+panel_layer = top
+panel_background_id = 1
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.3
+autohide_hide_timeout = 2
+autohide_height = 2
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = single_desktop
+taskbar_padding = 2 3 2
+taskbar_background_id = 0
+taskbar_active_background_id = 0
+
+# Tasks
+urgent_nb_of_blink = 8
+task_icon = 1
+task_text = 1
+task_centered = 1
+task_maximum_size = 140 35
+task_padding = 6 2
+task_background_id = 3
+task_active_background_id = 2
+task_urgent_background_id = 2
+task_iconified_background_id = 3
+task_tooltip = 0
+
+# Task Icons
+task_icon_asb = 70 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 70 0 0
+
+# Fonts
+task_font = sans 7
+task_font_color = #FFFFFF 69
+task_active_font_color = #FFFFFF 84
+task_urgent_font_color = #FFFFFF 84
+task_iconified_font_color = #FFFFFF 69
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 0 4 5
+systray_sort = ascending
+systray_background_id = 0
+systray_icon_size = 16
+systray_icon_asb = 70 0 0
+
+# Clock
+time1_format = %H:%M
+time1_font = sans 8
+time2_format = %A %d %B
+time2_font = sans 6
+clock_font_color = #FFFFFF 75
+clock_padding = 1 0
+clock_background_id = 0
+clock_rclick_command = orage
+
+# Tooltips
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font = sans 10
+tooltip_font_color = #000000 80
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 10
+battery_low_cmd = notify-send "battery low"
+battery_hide = 98
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #FFFFFF 75
+battery_padding = 1 0
+battery_background_id = 0
+
+# End of config

sample/icon_and_text_2.tint2rc

@@ -0,0 +1,118 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 7
+border_width = 1
+background_color = #000000 60
+border_color = #FFFFFF 17
+
+# ID 2
+rounded = 5
+border_width = 0
+background_color = #FFFFFF 40
+border_color = #FFFFFF 49
+
+# ID 3
+rounded = 5
+border_width = 0
+background_color = #FFFFFF 17
+border_color = #FFFFFF 69
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 98% 28
+panel_margin = 0 5
+panel_padding = 3 0 3
+panel_dock = 0
+wm_menu = 0
+panel_layer = bottom
+panel_background_id = 0
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.7
+autohide_hide_timeout = 1.5
+autohide_height = 2
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = single_desktop
+taskbar_padding = 2 2 2
+taskbar_background_id = 1
+taskbar_active_background_id = 1
+
+# Tasks
+urgent_nb_of_blink = 8
+task_icon = 1
+task_text = 1
+task_centered = 1
+task_maximum_size = 140 35
+task_padding = 2 3
+task_background_id = 3
+task_active_background_id = 2
+task_urgent_background_id = 2
+task_iconified_background_id = 3
+task_tooltip = 0
+
+# Task Icons
+task_icon_asb = 80 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 80 0 0
+
+# Fonts
+task_font = Sawasdee Bold 8
+task_font_color = #FFFFFF 89
+task_active_font_color = #FFFFFF 100
+task_urgent_font_color = #FFFFFF 100
+task_iconified_font_color = #FFFFFF 89
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 6 0 5
+systray_sort = left2right
+systray_background_id = 1
+systray_icon_size = 18
+systray_icon_asb = 100 0 -10
+
+# Clock
+time1_format = %H:%M
+time1_font = Sawasdee Bold 12
+clock_font_color = #FFFFFF 89
+clock_tooltip = %A %d %B
+clock_padding = 4 0
+clock_background_id = 1
+clock_rclick_command = gsimplecal
+
+# Tooltips
+tooltip_padding = 5 0
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font = Sans 10
+tooltip_font_color = #000000 80
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = close
+mouse_right = none
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 10
+battery_low_cmd = notify-send "battery low"
+battery_hide = 95
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #FFFFFF 75
+battery_padding = 1 0
+battery_background_id = 0
+
+# End of config

sample/icon_and_text_3.tint2rc

@@ -0,0 +1,124 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 0
+border_width = 1
+background_color = #EAEAEA 100
+border_color = #BBBBBB 100
+
+# ID 2
+rounded = 2
+border_width = 1
+background_color = #E0EBE7 100
+border_color = #BBBBBB 100
+
+# ID 3
+rounded = 2
+border_width = 1
+background_color = #FCFAFB 100
+border_color = #BBBBBB 100
+
+# ID 4
+rounded = 2
+border_width = 2
+background_color = #E0EBE7 100
+border_color = #F15A7D 80
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 100% 30
+panel_margin = 0 0
+panel_padding = 7 3 4
+panel_dock = 0
+wm_menu = 1
+panel_layer = top
+panel_background_id = 1
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.7
+autohide_hide_timeout = 1.5
+autohide_height = 2
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = single_desktop
+taskbar_padding = 0 0 2
+taskbar_background_id = 0
+#taskbar_active_background_id = 0
+
+# Tasks
+urgent_nb_of_blink = 20
+task_icon = 1
+task_text = 1
+task_centered = 1
+task_maximum_size = 140 40
+task_padding = 5 3
+task_background_id = 2
+task_active_background_id = 3
+task_urgent_background_id = 4
+task_iconified_background_id = 2
+task_tooltip = 1
+
+# Task Icons
+task_icon_asb = 80 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 80 0 0
+
+# Fonts
+task_font = sans 10
+task_font_color = #000000 100
+task_active_font_color = #000000 100
+task_urgent_font_color = #000000 100
+task_iconified_font_color = #000000 100
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 5 0 5
+systray_sort = ascending
+systray_background_id = 2
+systray_icon_size = 15
+systray_icon_asb = 100 0 -10
+
+# Clock
+time1_format = %F  %l:%M %P
+time1_font = sans 10
+clock_font_color = #000000 100
+clock_tooltip = %A %d %B
+clock_padding = 1 1
+clock_background_id = 0
+clock_rclick_command = gsimplecal
+
+# Tooltips
+tooltip_padding = 5 0
+tooltip_show_timeout = 1.2
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font = Sans 9
+tooltip_font_color = #5E5E5E 100
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 20
+battery_low_cmd = notify-send "battery low"
+battery_hide = 95
+bat1_font = Sans 9
+bat2_font = Sans 8
+battery_font_color = #000000 100
+battery_padding = 1 1
+battery_background_id = 0
+
+# End of config

sample/icon_and_text_4.tint2rc

@@ -0,0 +1,124 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 5
+border_width = 0
+background_color = #000000 60
+border_color = #FFFFFF 20
+
+# ID 2
+rounded = 5
+border_width = 1
+background_color = #FFFFFF 0
+border_color = #FFFFFF 20
+
+# ID 3
+rounded = 5
+border_width = 0
+background_color = #000000 29
+border_color = #000000 0
+
+# ID 4
+rounded = 5
+border_width = 1
+background_color = #E80000 60
+border_color = #FFFFFF 20
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 92% 28
+panel_margin = 0 0
+panel_padding = 7 0 7
+panel_dock = 0
+wm_menu = 1
+panel_layer = top
+panel_background_id = 0
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.0
+autohide_hide_timeout = 0.0
+autohide_height = 0
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_padding = 2 3 2
+taskbar_background_id = 3
+#taskbar_active_background_id = 0
+
+# Tasks
+urgent_nb_of_blink = 18
+task_icon = 1
+task_text = 1
+task_centered = 1
+task_maximum_size = 140 30
+task_padding = 2 3
+task_background_id = 2
+task_active_background_id = 1
+task_urgent_background_id = 4
+task_iconified_background_id = 2
+task_tooltip = 0
+
+# Task Icons
+task_icon_asb = 100 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 100 0 0
+
+# Fonts
+task_font = sans 7
+task_font_color = #FFFFFF 69
+task_active_font_color = #FFFFFF 84
+task_urgent_font_color = #FFFFFF 84
+task_iconified_font_color = #FFFFFF 69
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 5 2 5
+systray_sort = ascending
+systray_background_id = 1
+systray_icon_size = 16
+systray_icon_asb = 100 -10 -5
+
+# Clock
+time1_format = %H:%M
+time1_font = sans 8
+time2_format = %A %d %B
+time2_font = sans 6
+clock_font_color = #FFFFFF 75
+clock_padding = 4 4
+clock_background_id = 1
+
+# Tooltips
+tooltip_padding = 0 0
+tooltip_show_timeout = 0
+tooltip_hide_timeout = 0
+tooltip_background_id = 0
+tooltip_font = Sans 12
+tooltip_font_color = #FFFFFF 100
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 7
+battery_low_cmd = notify-send "battery low"
+battery_hide = 95
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #FFFFFF 75
+battery_padding = 1 0
+battery_background_id = 1
+
+# End of config

sample/icon_only_1.tint2rc

@@ -0,0 +1,138 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 5
+border_width = 1
+background_color = #44475D 41
+border_color = #44475D 100
+
+# ID 2
+rounded = 5
+border_width = 1
+background_color = #FFFFFF 20
+border_color = #444444 66
+
+# ID 3
+rounded = 0
+border_width = 1
+background_color = #FFFFFF 20
+border_color = #444444 20
+
+# ID 4
+rounded = 5
+border_width = 1
+background_color = #DBDBDB 49
+border_color = #222222 74
+
+# ID 5
+rounded = 3
+border_width = 0
+background_color = #44475D 20
+border_color = #222222 74
+
+# ID 6
+rounded = 3
+border_width = 0
+background_color = #DE1150 34
+border_color = #222222 74
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 96% 37
+panel_margin = 0 0
+panel_padding = 9 3 9
+panel_dock = 0
+wm_menu = 1
+panel_layer = top
+panel_background_id = 1
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.3
+autohide_hide_timeout = 1.7
+autohide_height = 2
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_padding = 0 0 0
+taskbar_background_id = 2
+taskbar_active_background_id = 4
+
+# Tasks
+urgent_nb_of_blink = 16
+task_icon = 1
+task_text = 0
+task_centered = 1
+task_maximum_size = 40 20
+task_padding = 0 2
+task_background_id = 0
+task_active_background_id = 5
+task_urgent_background_id = 6
+task_iconified_background_id = 0
+task_tooltip = 1
+
+# Task Icons
+task_icon_asb = 100 -25 -8
+task_active_icon_asb = 100 0 -5
+task_urgent_icon_asb = 100 0 -5
+task_iconified_icon_asb = 100 -25 -8
+
+# Fonts
+task_font = kiloji 10
+task_font_color = #333333 80
+task_active_font_color = #333333 100
+task_urgent_font_color = #333333 100
+task_iconified_font_color = #333333 80
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 7 0 5
+systray_sort = ascending
+systray_background_id = 2
+systray_icon_size = 18
+systray_icon_asb = 100 -20 -5
+
+# Clock
+time1_format = %H:%M
+time1_font = sans 8 bold
+time2_format = %A %d %B
+time2_font = sans 7
+clock_font_color = #FFFFFF 75
+clock_tooltip = 
+clock_padding = 2 0
+clock_background_id = 0
+clock_rclick_command = gsimplecal
+
+# Tooltips
+tooltip_padding = 5 3
+tooltip_show_timeout = 0.8
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font = Sans 8
+tooltip_font_color = #FFFFFF 100
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 20
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = sans 8 bold
+bat2_font = sans 7
+battery_font_color = #FFFFFF 75
+battery_padding = 2 0
+battery_background_id = 0
+
+# End of config

sample/icon_only_2.tint2rc

@@ -0,0 +1,126 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 0
+border_width = 0
+background_color = #000000 54
+border_color = #9B9B9B 34
+
+# ID 2
+rounded = 2
+border_width = 0
+background_color = #000000 69
+border_color = #9B9B9B 74
+
+# ID 3
+rounded = 1
+border_width = 0
+background_color = #000000 69
+border_color = #FFFFFF 20
+
+# ID 4
+rounded = 0
+border_width = 0
+background_color = #BBBBBB 20
+border_color = #BBBBBB 29
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 100% 37
+panel_margin = 0 0
+panel_padding = 5 2 3
+panel_dock = 0
+wm_menu = 1
+panel_layer = top
+panel_background_id = 1
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.7
+autohide_hide_timeout = 1.5
+autohide_height = 2
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_padding = 0 0 0
+taskbar_background_id = 0
+taskbar_active_background_id = 2
+
+# Tasks
+urgent_nb_of_blink = 21
+task_icon = 1
+task_text = 0
+task_centered = 1
+task_maximum_size = 50 35
+task_padding = 4 2
+task_background_id = 0
+task_active_background_id = 3
+task_urgent_background_id = 3
+task_iconified_background_id = 0
+task_tooltip = 1
+
+# Task Icons
+task_icon_asb = 90 -100 -20
+task_active_icon_asb = 100 -70 -10
+task_urgent_icon_asb = 100 -70 -10
+task_iconified_icon_asb = 90 -100 -20
+
+# Fonts
+task_font = kiloji 8
+task_font_color = #A0A0A0 100
+task_active_font_color = #D4D4D4 100
+task_urgent_font_color = #D4D4D4 100
+task_iconified_font_color = #A0A0A0 100
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 8 1 5
+systray_sort = ascending
+systray_background_id = 2
+systray_icon_size = 16
+systray_icon_asb = 100 -90 -15
+
+# Clock
+time1_format = %H:%M
+time1_font = sans 8 bold
+time2_format = %A %d %B
+time2_font = sans 7
+clock_font_color = #FFFFFF 75
+clock_tooltip = %A %d %B
+clock_padding = 2 0
+clock_background_id = 0
+clock_rclick_command = gsimplecal
+
+# Tooltips
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.9
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 4
+tooltip_font = sans 10
+tooltip_font_color = #000000 80
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 1
+battery_low_status = 7
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #FFFFFF 75
+battery_padding = 1 0
+battery_background_id = 0
+
+# End of config

sample/icon_only_3.tint2rc

@@ -0,0 +1,115 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 1
+border_width = 0
+background_color = #282828 49
+border_color = #000000 0
+
+# ID 2
+rounded = 1
+border_width = 1
+background_color = #FFFFFF 29
+border_color = #FFFFFF 60
+
+# ID 3
+rounded = 5
+border_width = 0
+background_color = #FFFFFF 17
+border_color = #FFFFFF 69
+
+# ID 4
+rounded = 1
+border_width = 0
+background_color = #FFFFFF 29
+border_color = #FFFFFF 60
+
+# Panel
+panel_monitor = all
+panel_position = bottom left horizontal
+panel_size = 100% 38
+panel_margin = 0 0
+panel_padding = 7 3 7
+panel_dock = 0
+wm_menu = 0
+panel_layer = bottom
+panel_background_id = 0
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.3
+autohide_hide_timeout = 2
+autohide_height = 4
+strut_policy = minimum
+
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_padding = 0 0 0
+taskbar_background_id = 1
+taskbar_active_background_id = 1
+
+# Tasks
+urgent_nb_of_blink = 15
+task_icon = 1
+task_text = 0
+task_centered = 1
+task_maximum_size = 45 35
+task_padding = 2 1
+task_background_id = 0
+task_active_background_id = 2
+task_urgent_background_id = 4
+task_iconified_background_id = 0
+task_tooltip = 0
+
+# Task Icons
+task_icon_asb = 70 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 70 0 0
+task_iconified_icon_asb = 70 0 0
+
+# Fonts
+task_font = sans bold 9
+task_font_color = #FFFFFF 60
+task_active_font_color = #FFFFFF 100
+task_urgent_font_color = #FFFFFF 100
+task_iconified_font_color = #FFFFFF 60
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 0 4 5
+systray_sort = left2right
+systray_background_id = 0
+systray_icon_size = 20
+systray_icon_asb = 100 0 0
+
+# Tooltips
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font = sans 10
+tooltip_font_color = #000000 80
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = none
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 10
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #FFFFFF 75
+battery_padding = 1 0
+battery_background_id = 0
+
+# End of config

sample/icon_only_4.tint2rc

@@ -0,0 +1,115 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 0
+border_width = 1
+background_color = #888888 29
+border_color = #000000 29
+
+# ID 2
+rounded = 3
+border_width = 1
+background_color = #888888 69
+border_color = #FFFFFF 49
+
+# ID 3
+rounded = 3
+border_width = 1
+background_color = #888888 29
+border_color = #FFFFFF 20
+
+# ID 4
+rounded = 3
+border_width = 1
+background_color = #888888 29
+border_color = #ED2323 60
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 100% 40
+panel_margin = 0 0
+panel_padding = 0 0 0
+panel_dock = 0
+wm_menu = 1
+panel_layer = top
+panel_background_id = 1
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.7
+autohide_hide_timeout = 1.5
+autohide_height = 2
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_padding = 6 1 6
+taskbar_background_id = 0
+#taskbar_active_background_id = 0
+
+# Tasks
+urgent_nb_of_blink = 20
+task_icon = 1
+task_text = 0
+task_centered = 1
+task_maximum_size = 40 40
+task_padding = 6 3
+task_background_id = 3
+task_active_background_id = 2
+task_urgent_background_id = 4
+task_iconified_background_id = 3
+task_tooltip = 1
+
+# Task Icons
+task_icon_asb = 90 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 90 0 0
+
+# Fonts
+task_font = kroeger 06_55 6
+task_font_color = #222222 100
+task_active_font_color = #000000 100
+task_urgent_font_color = #000000 100
+task_iconified_font_color = #222222 100
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 4 4 5
+systray_sort = ascending
+systray_background_id = 0
+systray_icon_size = 20
+systray_icon_asb = 100 0 -10
+
+# Tooltips
+tooltip_padding = 5 0
+tooltip_show_timeout = 0.8
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font = Sans 10
+tooltip_font_color = #FFFFFF 80
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 20
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = Sans 12
+bat2_font = Sans 12
+battery_font_color = #FFFFFF 100
+battery_padding = 0 0
+battery_background_id = 0
+
+# End of config

sample/icon_only_6.tint2rc

@@ -0,0 +1,126 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 5
+border_width = 0
+background_color = #000000 49
+border_color = #FFFFFF 40
+
+# ID 2
+rounded = 5
+border_width = 0
+background_color = #FFFFFF 60
+border_color = #FFFFFF 49
+
+# ID 3
+rounded = 5
+border_width = 0
+background_color = #FFFFFF 24
+border_color = #FFFFFF 69
+
+# ID 4
+rounded = 5
+border_width = 0
+background_color = #BDBDBD 80
+border_color = #FFFFFF 69
+
+# Panel
+panel_monitor = all
+panel_position = top left vertical
+panel_size = 75% 50
+panel_margin = 0 0
+panel_padding = 2 2 2
+panel_dock = 0
+wm_menu = 0
+panel_layer = top
+panel_background_id = 0
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.3
+autohide_hide_timeout = 2
+autohide_height = 4
+strut_policy = minimum
+
+# Taskbar
+taskbar_mode = single_desktop
+taskbar_padding = 2 2 2
+taskbar_background_id = 1
+taskbar_active_background_id = 1
+
+# Tasks
+urgent_nb_of_blink = 20
+task_icon = 1
+task_text = 0
+task_centered = 1
+task_maximum_size = 140 35
+task_padding = 6 3
+task_background_id = 3
+task_active_background_id = 2
+task_urgent_background_id = 2
+task_iconified_background_id = 3
+task_tooltip = 1
+
+# Task Icons
+task_icon_asb = 100 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 90 0 0
+
+# Fonts
+task_font = sans 7
+task_font_color = #FFFFFF 69
+task_active_font_color = #FFFFFF 84
+task_urgent_font_color = #EC9B9B 84
+task_iconified_font_color = #FFFFFF 69
+font_shadow = 1
+
+# System Tray
+systray = 1
+systray_padding = 4 4 5
+systray_sort = left2right
+systray_background_id = 1
+systray_icon_size = 16
+systray_icon_asb = 100 0 0
+
+# Clock
+time1_format = %H:%M
+time1_font = sans bold 8
+time2_format = %h.%e
+time2_font = sans 6
+clock_font_color = #FFFFFF 75
+clock_tooltip = %A %d %B
+clock_padding = 4 2
+clock_background_id = 1
+clock_rclick_command = zenity --calendar
+
+# Tooltips
+tooltip_padding = 3 2
+tooltip_show_timeout = 0.9
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 4
+tooltip_font = sans 8
+tooltip_font_color = #000000 89
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 10
+battery_low_cmd = notify-send "battery low"
+battery_hide = 98
+bat1_font = sans bold 8
+bat2_font = sans 6
+battery_font_color = #FFFFFF 75
+battery_padding = 4 2
+battery_background_id = 1
+
+# End of config

sample/icon_only_7.tint2rc

@@ -0,0 +1,122 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 1
+border_width = 0
+background_color = #282828 60
+border_color = #000000 0
+
+# ID 2
+rounded = 1
+border_width = 1
+background_color = #CCCCCC 0
+border_color = #CCCCCC 54
+
+# ID 3
+rounded = 1
+border_width = 0
+background_color = #CCCCCC 20
+border_color = #CCCCCC 40
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 95% 30
+panel_margin = 0 0
+panel_padding = 7 3 7
+panel_dock = 0
+wm_menu = 1
+panel_layer = top
+panel_background_id = 1
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.7
+autohide_hide_timeout = 1.5
+autohide_height = 2
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_padding = 0 0 0
+taskbar_background_id = 2
+taskbar_active_background_id = 2
+
+# Tasks
+urgent_nb_of_blink = 7
+task_icon = 1
+task_text = 0
+task_centered = 1
+task_maximum_size = 34 34
+task_padding = 2 3
+task_background_id = 0
+task_active_background_id = 3
+task_urgent_background_id = 0
+task_iconified_background_id = 0
+task_tooltip = 1
+
+# Task Icons
+task_icon_asb = 100 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 100 0 0
+
+# Fonts
+task_font = sans 8
+task_font_color = #FFFFFF 60
+task_active_font_color = #FFFFFF 100
+task_urgent_font_color = #FFFFFF 60
+task_iconified_font_color = #FFFFFF 60
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 0 0 5
+systray_sort = ascending
+systray_background_id = 0
+systray_icon_size = 16
+systray_icon_asb = 100 0 0
+
+# Clock
+time1_format = Paris %H:%M - %d/%m
+time1_font = sans 7
+time2_format = Moscow %H:%M - %d/%m
+time2_font = sans 7
+clock_font_color = #FFFFFF 100
+clock_tooltip = 
+clock_padding = 1 0
+clock_background_id = 0
+clock_rclick_command = gsimplecal
+time1_timezone = :Europe/Paris
+time2_timezone = :Europe/Moscow
+
+# Tooltips
+tooltip_padding = 5 4
+tooltip_show_timeout = 0.8
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font = Sans 7
+tooltip_font_color = #FFFFFF 100
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 1
+battery_low_status = 7
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = sans 7
+bat2_font = sans 7
+battery_font_color = #FFFFFF 100
+battery_padding = 1 0
+battery_background_id = 0
+
+# End of config

sample/text_only_1.tint2rc

@@ -0,0 +1,132 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 0
+border_width = 1
+background_color = #076073 100
+border_color = #076073 100
+
+# ID 2
+rounded = 0
+border_width = 0
+background_color = #000000 100
+border_color = #FFFFFF 8
+
+# ID 3
+rounded = 0
+border_width = 0
+background_color = #222222 100
+border_color = #222222 8
+
+# ID 4
+rounded = 0
+border_width = 0
+background_color = #222222 100
+border_color = #222222 8
+
+# ID 5
+rounded = 0
+border_width = 0
+background_color = #FFFFFF 100
+border_color = #FFFFFF 8
+
+# Panel
+panel_monitor = LVDS
+panel_position = bottom left horizontal
+panel_size = 100% 35
+panel_margin = 0 0
+panel_padding = 0 0 0
+panel_dock = 0
+wm_menu = 1
+panel_layer = bottom
+panel_background_id = 0
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.7
+autohide_hide_timeout = 1.5
+autohide_height = 2
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_padding = 12 9 12
+taskbar_background_id = 2
+taskbar_active_background_id = 2
+
+# Tasks
+urgent_nb_of_blink = 7
+task_icon = 0
+task_text = 1
+task_centered = 1
+task_maximum_size = 0 32
+task_padding = 5 2
+task_background_id = 4
+task_active_background_id = 1
+task_urgent_background_id = 0
+task_iconified_background_id = 4
+task_tooltip = 0
+
+# Task Icons
+task_icon_asb = 100 -90 -15
+task_active_icon_asb = 100 -70 0
+task_urgent_icon_asb = 100 -90 -15
+task_iconified_icon_asb = 100 -90 -15
+
+# Fonts
+task_font = Aller 7.6
+task_font_color = #D3CAAA 33
+task_active_font_color = #FFFFFF 100
+task_urgent_font_color = #FFFFFF 100
+task_iconified_font_color = #D3CAAA 33
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 5 5 5
+systray_sort = ascending
+systray_background_id = 4
+systray_icon_size = 18
+systray_icon_asb = 100 -90 -15
+
+# Clock
+time1_format = %H:%M
+time1_font = Diavlo 12
+time2_format = %b %d
+time2_font = Diavlo 6
+clock_font_color = #FFFFFF 100
+clock_tooltip = %A %d %B
+clock_padding = 4 2
+clock_background_id = 1
+clock_rclick_command = gsimplecal
+
+# Tooltips
+tooltip_padding = 5 5
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 4
+tooltip_font = Aller 8
+tooltip_font_color = #D3CAAA 33
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 1
+battery_low_status = 7
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = Diavlo 10
+bat2_font = Aller 0
+battery_font_color = #D3CAAA 48
+battery_padding = 4 2
+battery_background_id = 4
+
+# End of config

sample/text_only_2.tint2rc

@@ -0,0 +1,132 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 0
+border_width = 1
+background_color = #730A07 100
+border_color = #730A07 100
+
+# ID 2
+rounded = 0
+border_width = 0
+background_color = #000000 100
+border_color = #FFFFFF 8
+
+# ID 3
+rounded = 0
+border_width = 0
+background_color = #222222 100
+border_color = #222222 8
+
+# ID 4
+rounded = 0
+border_width = 0
+background_color = #222222 100
+border_color = #222222 8
+
+# ID 5
+rounded = 0
+border_width = 0
+background_color = #FFFFFF 100
+border_color = #FFFFFF 8
+
+# Panel
+panel_monitor = all
+panel_position = bottom left horizontal
+panel_size = 100% 42
+panel_margin = 0 0
+panel_padding = 0 0 0
+panel_dock = 0
+wm_menu = 1
+panel_layer = bottom
+panel_background_id = 0
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.7
+autohide_hide_timeout = 1.5
+autohide_height = 2
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_padding = 12 7 12
+taskbar_background_id = 2
+#taskbar_active_background_id = 0
+
+# Tasks
+urgent_nb_of_blink = 7
+task_icon = 0
+task_text = 1
+task_centered = 1
+task_maximum_size = 0 32
+task_padding = 5 1
+task_background_id = 4
+task_active_background_id = 1
+task_urgent_background_id = 0
+task_iconified_background_id = 4
+task_tooltip = 0
+
+# Task Icons
+task_icon_asb = 100 -90 -15
+task_active_icon_asb = 100 -70 0
+task_urgent_icon_asb = 100 -90 -15
+task_iconified_icon_asb = 100 -90 -15
+
+# Fonts
+task_font = Aller 7.6
+task_font_color = #D3CAAA 33
+task_active_font_color = #FFFFFF 100
+task_urgent_font_color = #FFFFFF 100
+task_iconified_font_color = #D3CAAA 33
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 5 5 5
+systray_sort = ascending
+systray_background_id = 4
+systray_icon_size = 18
+systray_icon_asb = 100 -90 -15
+
+# Clock
+time1_format = %H:%M
+time1_font = Diavlo 12
+time2_format = %b %d
+time2_font = Diavlo 6
+clock_font_color = #FFFFFF 100
+clock_tooltip = %A %d %B
+clock_padding = 4 2
+clock_background_id = 1
+clock_rclick_command = gsimplecal
+
+# Tooltips
+tooltip_padding = 5 5
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 4
+tooltip_font = Aller 8
+tooltip_font_color = #D3CAAA 33
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 1
+battery_low_status = 7
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = Diavlo 10
+bat2_font = Aller 0
+battery_font_color = #D3CAAA 48
+battery_padding = 4 2
+battery_background_id = 4
+
+# End of config

sample/text_only_3.tint2rc

@@ -0,0 +1,110 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 1
+border_width = 0
+background_color = #282828 100
+border_color = #000000 0
+
+# ID 2
+rounded = 1
+border_width = 0
+background_color = #F6B655 85
+border_color = #CCCCCC 40
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 100% 22
+panel_margin = 0 0
+panel_padding = 3 0 3
+panel_dock = 0
+wm_menu = 1
+panel_layer = bottom
+panel_background_id = 1
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.0
+autohide_hide_timeout = 0.0
+autohide_height = 0
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = single_desktop
+taskbar_padding = 0 0 0
+taskbar_background_id = 0
+#taskbar_active_background_id = 0
+
+# Tasks
+urgent_nb_of_blink = 7
+task_icon = 0
+task_text = 1
+task_centered = 1
+task_maximum_size = 200 32
+task_padding = 5 0
+task_background_id = 0
+task_active_background_id = 2
+task_urgent_background_id = 2
+task_iconified_background_id = 0
+task_tooltip = 0
+
+# Task Icons
+task_icon_asb = 100 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 100 0 0
+
+# Fonts
+task_font = sans 7.5
+task_font_color = #FFFFFF 60
+task_active_font_color = #000000 100
+task_urgent_font_color = #000000 100
+task_iconified_font_color = #FFFFFF 60
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 3 0 3
+systray_sort = ascending
+systray_background_id = 0
+systray_icon_size = 14
+systray_icon_asb = 100 -90 -15
+
+# Clock
+time1_format = %H:%M
+time1_font = sans 13
+clock_font_color = #FFFFFF 85
+clock_padding = 2 0
+clock_background_id = 0
+
+# Tooltips
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.5
+tooltip_hide_timeout = 1.2
+tooltip_background_id = 1
+tooltip_font = Sans 9
+tooltip_font_color = #FFFFFF 100
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 1
+battery_low_status = 7
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = sans 7
+bat2_font = sans 6
+battery_font_color = #FFFFFF 100
+battery_padding = 2 0
+battery_background_id = 0
+
+# End of config

sample/text_only_4.tint2rc

@@ -0,0 +1,103 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 3
+border_width = 1
+background_color = #000000 40
+border_color = #D1D1D1 30
+
+# ID 2
+rounded = 3
+border_width = 1
+background_color = #000000 51
+border_color = #D1D1D1 40
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 97% 26
+panel_margin = 0 0
+panel_padding = 0 2 5
+panel_dock = 0
+wm_menu = 1
+panel_layer = bottom
+panel_background_id = 0
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.0
+autohide_hide_timeout = 0.0
+autohide_height = 0
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = single_desktop
+taskbar_padding = 0 0 5
+taskbar_background_id = 0
+#taskbar_active_background_id = 0
+
+# Tasks
+urgent_nb_of_blink = 7
+task_icon = 0
+task_text = 1
+task_centered = 1
+task_maximum_size = 160 30
+task_padding = 3 1
+task_background_id = 1
+task_active_background_id = 2
+task_urgent_background_id = 2
+task_iconified_background_id = 1
+task_tooltip = 0
+
+# Task Icons
+task_icon_asb = 100 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 100 0 0
+
+# Fonts
+task_font = sans bold 7.5
+task_font_color = #FFFFFF 60
+task_active_font_color = #FFFFFF 86
+task_urgent_font_color = #FFFFFF 86
+task_iconified_font_color = #FFFFFF 60
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 6 2 6
+systray_sort = ascending
+systray_background_id = 1
+systray_icon_size = 16
+systray_icon_asb = 100 -100 -15
+
+# Tooltips
+tooltip_padding = 0 0
+tooltip_show_timeout = 0
+tooltip_hide_timeout = 0
+tooltip_background_id = 0
+tooltip_font = Sans 12
+tooltip_font_color = #FFFFFF 100
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 10
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = sans 7
+bat2_font = sans 7
+battery_font_color = #FFFFFF 100
+battery_padding = 1 0
+battery_background_id = 0
+
+# End of config

sample/text_only_5.tint2rc

@@ -0,0 +1,116 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 0
+border_width = 0
+background_color = #FFFFFF 0
+border_color = #FFFFFF 60
+
+# ID 2
+rounded = 0
+border_width = 1
+background_color = #333333 40
+border_color = #FFFFFF 40
+
+# ID 3
+rounded = 0
+border_width = 0
+background_color = #EEEEEC 60
+border_color = #FFFFFF 100
+
+# Panel
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 99% 27
+panel_margin = 0 0
+panel_padding = 3 3 3
+panel_dock = 0
+wm_menu = 1
+panel_layer = bottom
+panel_background_id = 3
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.2
+autohide_hide_timeout = 1.6
+autohide_height = 1
+strut_policy = minimum
+
+# Taskbar
+taskbar_mode = multi_desktop
+taskbar_padding = 0 0 0
+taskbar_background_id = 0
+taskbar_active_background_id = 0
+
+# Tasks
+urgent_nb_of_blink = 7
+task_icon = 0
+task_text = 1
+task_centered = 1
+task_maximum_size = 200 30
+task_padding = 5 0
+task_background_id = 1
+task_active_background_id = 2
+task_urgent_background_id = 2
+task_iconified_background_id = 1
+task_tooltip = 1
+
+# Task Icons
+task_icon_asb = 50 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 50 0 0
+
+# Fonts
+task_font = AvantGardeLTMedium 8
+task_font_color = #151515 60
+task_active_font_color = #FFFFFF 60
+task_urgent_font_color = #7E9659 89
+task_iconified_font_color = #FFFFFF 69
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 4 2 3
+systray_sort = ascending
+systray_background_id = 0
+systray_icon_size = 15
+systray_icon_asb = 100 0 -10
+
+# Clock
+time1_format = %H:%M / %a %d %b
+time1_font = AvantGardeLTMedium 8
+clock_font_color = #151515 60
+clock_padding = 4 0
+clock_background_id = 0
+
+# Tooltips
+tooltip_padding = 3 3
+tooltip_show_timeout = 1.5
+tooltip_hide_timeout = 0.3
+tooltip_background_id = 1
+tooltip_font = AvantGardeLTMedium 8
+tooltip_font_color = #434141 100
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 7
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #151515 60
+battery_padding = 1 0
+battery_background_id = 0
+
+# End of config

sample/text_only_6.tint2rc

@@ -0,0 +1,109 @@
+# Tint2 config file
+# Generated by tintwizard (http://code.google.com/p/tintwizard/)
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# ID 1
+rounded = 0
+border_width = 0
+background_color = #303030 89
+border_color = #FFFFFF 17
+
+# ID 2
+rounded = 0
+border_width = 0
+background_color = #303030 89
+border_color = #FFFFFF 49
+
+# ID 3
+rounded = 0
+border_width = 0
+background_color = #303030 49
+border_color = #FFFFFF 69
+
+# Panel
+panel_monitor = all
+panel_position = top center horizontal
+panel_size = 94% 38
+panel_margin = 0 1
+panel_padding = 10 6 6
+panel_dock = 0
+wm_menu = 1
+panel_layer = bottom
+panel_background_id = 3
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0.7
+autohide_hide_timeout = 1.5
+autohide_height = 2
+strut_policy = follow_size
+
+# Taskbar
+taskbar_mode = single_desktop
+taskbar_padding = 0 0 6
+taskbar_background_id = 0
+#taskbar_active_background_id = 0
+
+# Tasks
+urgent_nb_of_blink = 7
+task_icon = 0
+task_text = 1
+task_centered = 1
+task_maximum_size = 120 32
+task_padding = 6 2
+task_background_id = 2
+task_active_background_id = 2
+task_urgent_background_id = 2
+task_iconified_background_id = 0
+task_tooltip = 0
+
+# Task Icons
+task_icon_asb = 100 -90 -15
+task_active_icon_asb = 100 -70 0
+task_urgent_icon_asb = 100 -90 -15
+task_iconified_icon_asb = 100 -90 -15
+
+# Fonts
+task_font = BasicDots 6
+task_font_color = #FFFFFF 69
+task_active_font_color = #7E9659 89
+task_urgent_font_color = #7E9659 89
+task_iconified_font_color = #FFFFFF 69
+font_shadow = 0
+
+# System Tray
+systray = 1
+systray_padding = 6 3 0
+systray_sort = ascending
+systray_background_id = 1
+systray_icon_size = 18
+systray_icon_asb = 100 -70 -15
+
+# Tooltips
+tooltip_padding = 5 5
+tooltip_show_timeout = 0.7
+tooltip_hide_timeout = 0.3
+tooltip_background_id = -1
+tooltip_font = Aller 8
+tooltip_font_color = #D3CAAA 33
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# Battery
+battery = 0
+battery_low_status = 10
+battery_low_cmd = notify-send "battery low"
+battery_hide = 90
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #FFFFFF 75
+battery_padding = 1 0
+battery_background_id = 0
+
+# End of config

sample/tint2rc

@@ -0,0 +1,143 @@
+# Tint2 sample config file
+# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
+
+# Background definitions
+# Background 1: panel
+rounded = 7
+border_width = 1
+background_color = #000000 60
+border_color = #FFFFFF 16
+
+# Background 2: normal/iconified tasks
+rounded = 5
+border_width = 0
+background_color = #777777 20
+border_color = #777777 30
+
+# Background 3: active tasks
+rounded = 5
+border_width = 1
+background_color = #777777 20
+border_color = #ffffff 40
+
+# Background 4: urgent tasks
+rounded = 5
+border_width = 1
+background_color = #aa4400 100
+border_color = #aa7733 100
+
+# Background 5: tooltips
+rounded = 2
+border_width = 1
+background_color = #ffffaa 100
+border_color = #999999 100
+
+# Panel
+panel_items = LTSC
+panel_monitor = all
+panel_position = bottom center horizontal
+panel_size = 85% 30
+panel_margin = 0 0
+panel_padding = 7 0 7
+panel_dock = 0
+wm_menu = 1
+panel_layer = top
+panel_background_id = 1
+font_shadow = 0
+
+# Panel Autohide
+autohide = 0
+autohide_show_timeout = 0
+autohide_hide_timeout = 0.5
+autohide_height = 2
+strut_policy = follow_size
+
+# Launcher
+launcher_padding = 2 4 2
+launcher_background_id = 0
+launcher_icon_size = 18
+launcher_icon_asb = 100 0 0
+launcher_tooltip = 1
+startup_notifications = 1
+launcher_item_app = /usr/share/applications/tint2conf.desktop
+launcher_item_app = /usr/local/share/applications/tint2conf.desktop
+launcher_item_app = /usr/share/applications/firefox.desktop
+launcher_item_app = /usr/share/applications/iceweasel.desktop
+launcher_item_app = /usr/share/applications/chromium-browser.desktop
+launcher_item_app = /usr/share/applications/google-chrome.desktop
+
+# Taskbar
+taskbar_mode = single_desktop
+taskbar_padding = 2 3 2
+taskbar_background_id = 0
+taskbar_active_background_id = 0
+
+# Tasks
+task_icon = 1
+task_text = 1
+task_centered = 1
+task_maximum_size = 140 35
+task_padding = 6 2
+task_background_id = 2
+task_active_background_id = 3
+task_urgent_background_id = 4
+task_iconified_background_id = 2
+task_tooltip = 1
+urgent_nb_of_blink = 100000
+
+# Task Icons
+task_icon_asb = 100 0 0
+task_active_icon_asb = 100 0 0
+task_urgent_icon_asb = 100 0 0
+task_iconified_icon_asb = 100 0 0
+
+# Fonts
+task_font = sans 8
+task_font_color = #FFFFFF 90
+task_active_font_color = #FFFFFF 90
+task_urgent_font_color = #FFFFFF 90
+task_iconified_font_color = #FFFFFF 90
+
+# Mouse
+mouse_left = toggle_iconify
+mouse_middle = none
+mouse_right = close
+mouse_scroll_up = toggle
+mouse_scroll_down = iconify
+
+# System Tray
+systray_padding = 0 4 5
+systray_sort = ascending
+systray_background_id = 0
+systray_icon_size = 22
+systray_icon_asb = 70 0 0
+
+# Clock
+time1_format = %H:%M
+time1_font = sans 8
+time2_format = %A %d %B
+time2_font = sans 7
+clock_font_color = #FFFFFF 100
+clock_padding = 1 0
+clock_background_id = 0
+clock_rclick_command = orage
+
+# Tooltips
+tooltip_padding = 2 2
+tooltip_show_timeout = 0.5
+tooltip_hide_timeout = 0.1
+tooltip_background_id = 5
+tooltip_font = sans 9
+tooltip_font_color = #222222 100
+
+# Battery
+battery_low_status = 10
+battery_low_cmd = notify-send "battery low"
+battery_hide = 101
+bat1_font = sans 8
+bat2_font = sans 6
+battery_font_color = #FFFFFF 100
+battery_padding = 1 0
+battery_background_id = 0
+
+# End of config

sample/vertical-dark-opaque.tint2rc

@@ -1,86 +1,49 @@
-#---- Generated by tint2conf 4216 ----
+#---- Generated by tint2conf 258e ----
 # See https://gitlab.com/o9000/tint2/wikis/Configure for 
 # full documentation of the configuration options.
 #-------------------------------------
-# Gradients
-#-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 5
 border_width = 1
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
@@ -94,7 +57,6 @@ panel_dock = 0
 panel_position = bottom left vertical
 panel_layer = normal
 panel_monitor = all
-panel_shrink = 0
 autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
@@ -102,23 +64,17 @@ 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_hide_if_empty = 0
 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_hide_different_desktop = 0
-taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 6 3
 taskbar_name_background_id = 6
 taskbar_name_active_background_id = 7
@@ -159,24 +115,22 @@ systray_sort = ascending
 systray_icon_size = 22
 systray_icon_asb = 100 0 0
 systray_monitor = 1
-systray_name_filter = 
 
 #-------------------------------------
 # 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 = tint2conf.desktop
+launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = firefox.desktop
+launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = iceweasel.desktop
+launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = chromium-browser.desktop
+launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = google-chrome.desktop
+launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = x-terminal-emulator.desktop
+launcher_item_app = /usr/share/applications/google-chrome.desktop
 
 #-------------------------------------
 # Clock
@@ -193,31 +147,17 @@ 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"
-battery_full_cmd = 
 bat1_font = sans 8
 bat2_font = sans 6
 battery_font_color = #eeeeee 100
-bat1_format = 
-bat2_format = 
 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,86 +1,47 @@
-#---- Generated by tint2conf 688d ----
+#---- Generated by tint2conf bec8 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Gradients
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 5
 border_width = 1
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
@@ -94,7 +55,6 @@ panel_dock = 0
 panel_position = bottom left vertical
 panel_layer = normal
 panel_monitor = all
-panel_shrink = 0
 autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
@@ -102,23 +62,17 @@ 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_hide_if_empty = 0
 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_hide_different_desktop = 0
-taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 6 3
 taskbar_name_background_id = 6
 taskbar_name_active_background_id = 7
@@ -127,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
@@ -159,24 +112,21 @@ systray_sort = ascending
 systray_icon_size = 22
 systray_icon_asb = 100 0 0
 systray_monitor = 1
-systray_name_filter = 
 
 #-------------------------------------
 # 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 = tint2conf.desktop
+launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = firefox.desktop
+launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = iceweasel.desktop
+launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = chromium-browser.desktop
+launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = google-chrome.desktop
+launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = x-terminal-emulator.desktop
+launcher_item_app = /usr/share/applications/google-chrome.desktop
 
 #-------------------------------------
 # Clock
@@ -193,31 +143,17 @@ 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"
-battery_full_cmd = 
 bat1_font = sans 8
 bat2_font = sans 6
 battery_font_color = #eeeeee 100
-bat1_format = 
-bat2_format = 
 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,97 +1,53 @@
-#---- Generated by tint2conf e02a ----
+#---- Generated by tint2conf f7f7 ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Gradients
 #-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 0
 border_width = 1
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
+background_color = #aaaaaa 100
-background_color = #dddddd 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
@@ -105,7 +61,6 @@ panel_dock = 0
 panel_position = bottom left vertical
 panel_layer = normal
 panel_monitor = all
-panel_shrink = 0
 autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
@@ -113,23 +68,17 @@ 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_hide_if_empty = 0
 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_hide_different_desktop = 0
-taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 6 3
 taskbar_name_background_id = 6
 taskbar_name_active_background_id = 7
@@ -138,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
@@ -170,24 +118,21 @@ systray_sort = ascending
 systray_icon_size = 22
 systray_icon_asb = 100 0 0
 systray_monitor = 1
-systray_name_filter = 
 
 #-------------------------------------
 # 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 = tint2conf.desktop
+launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = firefox.desktop
+launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = iceweasel.desktop
+launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = chromium-browser.desktop
+launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = google-chrome.desktop
+launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = x-terminal-emulator.desktop
+launcher_item_app = /usr/share/applications/google-chrome.desktop
 
 #-------------------------------------
 # Clock
@@ -204,31 +149,17 @@ 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"
-battery_full_cmd = 
 bat1_font = sans 8
 bat2_font = sans 6
 battery_font_color = #222222 100
-bat1_format = 
-bat2_format = 
 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,86 +1,55 @@
-#---- Generated by tint2conf 7cb8 ----
+#---- Generated by tint2conf e324 ----
 # See https://gitlab.com/o9000/tint2/wikis/Configure for 
 # full documentation of the configuration options.
 #-------------------------------------
-# Gradients
-#-------------------------------------
 # Backgrounds
-# Background 1: Panel
+# Background 1
 rounded = 0
 border_width = 1
-border_sides = TBLR
 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
+# Background 2
 rounded = 5
-border_width = 1
+border_width = 0
-border_sides = TBLR
 background_color = #eeeeee 4
-border_color = #eeeeee 0
+border_color = #cccccc 100
-background_color_hover = #eeeeee 22
-border_color_hover = #eaeaea 44
-background_color_pressed = #dddddd 4
-border_color_pressed = #eaeaea 44
 
-# Background 3: Active task
+# Background 3
 rounded = 5
 border_width = 1
-border_sides = TBLR
 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
+# Background 4
 rounded = 5
 border_width = 1
-border_sides = TBLR
 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
-border_sides = TBLR
 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
-border_sides = TBLR
 background_color = #eeeeee 4
-border_color = #999999 30
+border_color = #cccccc 100
-background_color_hover = #eeeeee 22
-border_color_hover = #999999 30
-background_color_pressed = #dddddd 4
-border_color_pressed = #999999 30
 
-# Background 7: Active desktop name
+# Background 7
 rounded = 2
 border_width = 1
-border_sides = TBLR
 background_color = #dddddd 3
 border_color = #999999 100
-background_color_hover = #dddddd 3
+
-border_color_hover = #999999 100
+# Background 8
-background_color_pressed = #dddddd 3
+rounded = 3
-border_color_pressed = #999999 100
+border_width = 0
+background_color = #999999 4
+border_color = #cccccc 100
 
 #-------------------------------------
 # Panel
@@ -94,7 +63,6 @@ panel_dock = 0
 panel_position = bottom left vertical
 panel_layer = normal
 panel_monitor = all
-panel_shrink = 0
 autohide = 0
 autohide_show_timeout = 0
 autohide_hide_timeout = 0.5
@@ -102,23 +70,17 @@ 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_hide_if_empty = 0
 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_hide_different_desktop = 0
-taskbar_always_show_all_desktop_tasks = 0
 taskbar_name_padding = 6 3
 taskbar_name_background_id = 6
 taskbar_name_active_background_id = 7
@@ -159,24 +121,22 @@ systray_sort = ascending
 systray_icon_size = 22
 systray_icon_asb = 100 0 0
 systray_monitor = 1
-systray_name_filter = 
 
 #-------------------------------------
 # 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 = tint2conf.desktop
+launcher_item_app = /usr/share/applications/tint2conf.desktop
-launcher_item_app = firefox.desktop
+launcher_item_app = /usr/local/share/applications/tint2conf.desktop
-launcher_item_app = iceweasel.desktop
+launcher_item_app = /usr/share/applications/firefox.desktop
-launcher_item_app = chromium-browser.desktop
+launcher_item_app = /usr/share/applications/iceweasel.desktop
-launcher_item_app = google-chrome.desktop
+launcher_item_app = /usr/share/applications/chromium-browser.desktop
-launcher_item_app = x-terminal-emulator.desktop
+launcher_item_app = /usr/share/applications/google-chrome.desktop
 
 #-------------------------------------
 # Clock
@@ -193,31 +153,17 @@ 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"
-battery_full_cmd = 
 bat1_font = sans 8
 bat2_font = sans 6
 battery_font_color = #ffffff 100
-bat1_format = 
-bat2_format = 
 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

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"
@@ -31,438 +43,577 @@
 #include "timer.h"
 #include "common.h"
 
-gboolean bat1_has_font;
 PangoFontDescription *bat1_font_desc;
-gboolean bat2_has_font;
 PangoFontDescription *bat2_font_desc;
-char *bat1_format;
+struct batstate battery_state;
-char *bat2_format;
+int battery_enabled;
-struct BatteryState battery_state;
-gboolean battery_enabled;
-gboolean battery_tooltip_enabled;
 int percentage_hide;
-static timeout *battery_timeout;
+static timeout* battery_timeout;
 
-#define BATTERY_BUF_SIZE 256
+static char buf_bat_percentage[10];
-static char buf_bat_line1[BATTERY_BUF_SIZE];
+static char buf_bat_time[20];
-static char buf_bat_line2[BATTERY_BUF_SIZE];
 
 int8_t battery_low_status;
-gboolean battery_low_cmd_sent;
+unsigned char battery_low_cmd_sent;
-gboolean battery_full_cmd_sent;
-char *ac_connected_cmd;
-char *ac_disconnected_cmd;
 char *battery_low_cmd;
-char *battery_full_cmd;
 char *battery_lclick_command;
 char *battery_mclick_command;
 char *battery_rclick_command;
 char *battery_uwheel_command;
 char *battery_dwheel_command;
-gboolean battery_found;
+gchar *path_energy_now;
+gchar *path_energy_full;
+gchar *path_current_now;
+gchar *path_status;
+int battery_found;
 
-char *battery_sys_prefix = (char *)"";
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+int apm_fd;
+#endif
 
-void battery_init_fonts();
+void update_battery_tick(void* arg)
-char *battery_get_tooltip(void *obj);
+{
-int battery_compute_desired_size(void *obj);
+	if (!battery_enabled)
-void battery_dump_geometry(void *obj, int indent);
+		return;
+
+	int old_found = battery_found;
+	int old_percentage = battery_state.percentage;
+	int16_t old_hours = battery_state.time.hours;
+	int8_t old_minutes = battery_state.time.minutes;
+	
+	if (!battery_found) {
+		init_battery();
+	}
+	if (update_battery() != 0) {
+		// Reconfigure
+		init_battery();
+		// Try again
+		update_battery();
+	}
+	if (old_found == battery_found &&
+		old_percentage == battery_state.percentage &&
+		old_hours == battery_state.time.hours &&
+		old_minutes == battery_state.time.minutes) {
+		return;
+	}
+
+	if (battery_state.percentage < battery_low_status &&
+		battery_state.state == BATTERY_DISCHARGING &&
+		!battery_low_cmd_sent) {
+		tint_exec(battery_low_cmd);
+		battery_low_cmd_sent = 1;
+	}
+	if (battery_state.percentage > battery_low_status &&
+		battery_state.state == BATTERY_CHARGING &&
+		battery_low_cmd_sent) {
+		battery_low_cmd_sent = 0;
+	}
+
+	int i;
+	for (i = 0; i < nb_panel; i++) {
+		if (!battery_found) {
+			if (panel1[i].battery.area.on_screen == 1) {
+				hide(&panel1[i].battery.area);
+				panel_refresh = 1;
+			}
+		} else {
+			if (battery_state.percentage >= percentage_hide) {
+				if (panel1[i].battery.area.on_screen == 1) {
+					hide(&panel1[i].battery.area);
+					panel_refresh = 1;
+				}
+			} else {
+				if (panel1[i].battery.area.on_screen == 0) {
+					show(&panel1[i].battery.area);
+					panel_refresh = 1;
+				}
+			}
+		}
+		if (panel1[i].battery.area.on_screen == 1) {
+			panel1[i].battery.area.resize = 1;
+			panel_refresh = 1;
+		}
+	}
+}
 
 void default_battery()
 {
-    battery_enabled = FALSE;
+	battery_enabled = 0;
-    battery_tooltip_enabled = TRUE;
+	battery_found = 0;
-    battery_found = FALSE;
+	percentage_hide = 101;
-    percentage_hide = 101;
+	battery_low_cmd_sent = 0;
-    battery_low_cmd_sent = FALSE;
+	battery_timeout = NULL;
-    battery_full_cmd_sent = FALSE;
+	bat1_font_desc = NULL;
-    battery_timeout = NULL;
+	bat2_font_desc = NULL;
-    bat1_has_font = FALSE;
+	battery_low_cmd = NULL;
-    bat1_font_desc = NULL;
+	battery_lclick_command = NULL;
-    bat1_format = NULL;
+	battery_mclick_command = NULL;
-    bat2_has_font = FALSE;
+	battery_rclick_command = NULL;
-    bat2_font_desc = NULL;
+	battery_uwheel_command = NULL;
-    bat2_format = NULL;
+	battery_dwheel_command = NULL;
-    ac_connected_cmd = NULL;
+	path_energy_now = NULL;
-    ac_disconnected_cmd = NULL;
+	path_energy_full = NULL;
-    battery_low_cmd = NULL;
+	path_current_now = NULL;
-    battery_full_cmd = NULL;
+	path_status = NULL;
-    battery_lclick_command = NULL;
+	battery_state.percentage = 0;
-    battery_mclick_command = NULL;
+	battery_state.time.hours = 0;
-    battery_rclick_command = NULL;
+	battery_state.time.minutes = 0;
-    battery_uwheel_command = NULL;
+	battery_state.time.seconds = 0;
-    battery_dwheel_command = NULL;
+	battery_state.state = BATTERY_UNKNOWN;
-    battery_state.percentage = 0;
+#if defined(__OpenBSD__) || defined(__NetBSD__)
-    battery_state.time.hours = 0;
+	apm_fd = -1;
-    battery_state.time.minutes = 0;
+#endif
-    battery_state.time.seconds = 0;
-    battery_state.state = BATTERY_UNKNOWN;
 }
 
 void cleanup_battery()
 {
-    pango_font_description_free(bat1_font_desc);
+	pango_font_description_free(bat1_font_desc);
-    bat1_font_desc = NULL;
+	bat1_font_desc = NULL;
-    pango_font_description_free(bat2_font_desc);
+	pango_font_description_free(bat2_font_desc);
-    bat2_font_desc = NULL;
+	bat2_font_desc = NULL;
-    free(battery_low_cmd);
+	g_free(path_energy_now);
-    battery_low_cmd = NULL;
+	path_energy_now = NULL;
-    free(battery_full_cmd);
+	g_free(path_energy_full);
-    battery_full_cmd = NULL;
+	path_energy_full = NULL;
-    free(bat1_format);
+	g_free(path_current_now);
-    bat1_format = NULL;
+	path_current_now = NULL;
-    free(bat2_format);
+	g_free(path_status);
-    bat2_format = NULL;
+	path_status = NULL;
-    free(battery_lclick_command);
+	free(battery_low_cmd);
-    battery_lclick_command = NULL;
+	battery_low_cmd = NULL;
-    free(battery_mclick_command);
+	free(battery_lclick_command);
-    battery_mclick_command = NULL;
+	battery_lclick_command = NULL;
-    free(battery_rclick_command);
+	free(battery_mclick_command);
-    battery_rclick_command = NULL;
+	battery_mclick_command = NULL;
-    free(battery_uwheel_command);
+	free(battery_rclick_command);
-    battery_uwheel_command = NULL;
+	battery_rclick_command = NULL;
-    free(battery_dwheel_command);
+	free(battery_uwheel_command);
-    battery_dwheel_command = NULL;
+	battery_uwheel_command = NULL;
-    free(ac_connected_cmd);
+	free(battery_dwheel_command);
-    ac_connected_cmd = NULL;
+	battery_dwheel_command = NULL;
-    free(ac_disconnected_cmd);
+	stop_timeout(battery_timeout);
-    ac_disconnected_cmd = NULL;
+	battery_timeout = NULL;
-    stop_timeout(battery_timeout);
+	battery_found = 0;
-    battery_timeout = NULL;
-    battery_found = FALSE;
 
-    battery_os_free();
+#if defined(__OpenBSD__) || defined(__NetBSD__)
-}
+	if ((apm_fd != -1) && (close(apm_fd) == -1))
-
+		warn("cannot close /dev/apm");
-// Appends addendum to dest, and does not allow dest to grow over limit (including NULL terminator).
+	apm_fd = -1;
-char *strnappend(char *dest, const char *addendum, size_t limit)
+#endif
-{
-    char *tmp = strdup(dest);
-
-    // Actually concatenate them.
-    snprintf(dest, limit, "%s%s", tmp, addendum);
-
-    free(tmp);
-    return dest;
-}
-
-void battery_update_text(char *dest, char *format)
-{
-    if (!battery_enabled || !dest || !format)
-        return;
-    // We want to loop over the format specifier, replacing any known symbols with our battery data.
-    // First, erase anything already stored in the buffer.
-    // This ensures the string will always be null-terminated.
-    bzero(dest, BATTERY_BUF_SIZE);
-
-    for (size_t o = 0; o < strlen(format); o++) {
-        char buf[BATTERY_BUF_SIZE];
-        bzero(buf, BATTERY_BUF_SIZE);
-        char *c = &format[o];
-        // Format specification:
-        // %s :	State (charging, discharging, full, unknown)
-        // %m :	Minutes left (estimated).
-        // %h : Hours left (estimated).
-        // %t :	Time left. This is equivalent to the old behaviour; i.e. "(plugged in)" or "hrs:mins" otherwise.
-        // %p :	Percentage left. Includes the % sign.
-        if (*c == '%') {
-            c++;
-            o++; // Skip the format control character.
-            switch (*c) {
-            case 's':
-                // Append the appropriate status message to the string.
-                strnappend(dest,
-                        (battery_state.state == BATTERY_CHARGING)
-                            ? "Charging"
-                            : (battery_state.state == BATTERY_DISCHARGING)
-                                  ? "Discharging"
-                                  : (battery_state.state == BATTERY_FULL)
-                                        ? "Full"
-                                        : "Unknown",
-                        BATTERY_BUF_SIZE);
-                break;
-            case 'm':
-                snprintf(buf, sizeof(buf), "%02d", battery_state.time.minutes);
-                strnappend(dest, buf, BATTERY_BUF_SIZE);
-                break;
-            case 'h':
-                snprintf(buf, sizeof(buf), "%02d", battery_state.time.hours);
-                strnappend(dest, buf, BATTERY_BUF_SIZE);
-                break;
-            case 'p':
-                snprintf(buf, sizeof(buf), "%d%%", battery_state.percentage);
-                strnappend(dest, buf, BATTERY_BUF_SIZE);
-                break;
-            case 't':
-                if (battery_state.state == BATTERY_FULL) {
-                    snprintf(buf, sizeof(buf), "Full");
-                    strnappend(dest, buf, BATTERY_BUF_SIZE);
-                } else if (battery_state.time.hours > 0 && battery_state.time.minutes > 0) {
-                    snprintf(buf, sizeof(buf), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
-                    strnappend(dest, buf, BATTERY_BUF_SIZE);
-                }
-                break;
-
-            case '%':
-            case '\0':
-                strnappend(dest, "%", BATTERY_BUF_SIZE);
-                break;
-            default:
-                fprintf(stderr, "tint2: Battery: unrecognised format specifier '%%%c'.\n", *c);
-                buf[0] = *c;
-                strnappend(dest, buf, BATTERY_BUF_SIZE);
-            }
-        } else {
-            buf[0] = *c;
-            strnappend(dest, buf, BATTERY_BUF_SIZE);
-        }
-    }
 }
 
 void init_battery()
 {
-    if (!battery_enabled)
+	if (!battery_enabled)
-        return;
+		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;
 
-    battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
+	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;
 
-    update_battery();
+			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);
 }
 
-void reinit_battery()
-{
-    battery_os_free();
-    battery_found = battery_os_init();
-    update_battery();
-}
 
 void init_battery_panel(void *p)
 {
-    Panel *panel = (Panel *)p;
+	Panel *panel = (Panel*)p;
-    Battery *battery = &panel->battery;
+	Battery *battery = &panel->battery;
 
-    if (!battery_enabled)
+	if (!battery_enabled)
-        return;
+		return;
 
-    battery_init_fonts();
+	if (!bat1_font_desc)
+		bat1_font_desc = pango_font_description_from_string(DEFAULT_FONT);
+	if (!bat2_font_desc)
+		bat2_font_desc = pango_font_description_from_string(DEFAULT_FONT);
 
-    if (!battery->area.bg)
+	if (battery->area.bg == 0)
-        battery->area.bg = &g_array_index(backgrounds, Background, 0);
+		battery->area.bg = &g_array_index(backgrounds, Background, 0);
 
-    battery->area.parent = p;
+	battery->area.parent = p;
-    battery->area.panel = p;
+	battery->area.panel = p;
-    snprintf(battery->area.name, sizeof(battery->area.name), "Battery");
+	battery->area._draw_foreground = draw_battery;
-    battery->area._draw_foreground = draw_battery;
+	battery->area.size_mode = SIZE_BY_CONTENT;
-    battery->area.size_mode = LAYOUT_FIXED;
+	battery->area._resize = resize_battery;
-    battery->area._resize = resize_battery;
+	battery->area.on_screen = 1;
-    battery->area._compute_desired_size = battery_compute_desired_size;
+	battery->area.resize = 1;
-    battery->area._is_under_mouse = full_width_area_is_under_mouse;
-    battery->area.on_screen = TRUE;
-    battery->area.resize_needed = 1;
-    battery->area.has_mouse_over_effect =
-        panel_config.mouse_effects && (battery_lclick_command || battery_mclick_command || battery_rclick_command ||
-                                       battery_uwheel_command || battery_dwheel_command);
-    battery->area.has_mouse_press_effect = battery->area.has_mouse_over_effect;
-    if (battery_tooltip_enabled)
-        battery->area._get_tooltip_text = battery_get_tooltip;
-    instantiate_area_gradients(&battery->area);
-
-    if (!bat1_format && !bat2_format) {
-        bat1_format = strdup("%p");
-        bat2_format = strdup("%t");
-    }
 }
 
-void battery_init_fonts()
+
+int update_battery() {
+	int64_t energy_now = 0,
+			energy_full = 0;
+	int seconds = 0;
+	int8_t new_percentage = 0;
+	int errors = 0;
+
+	battery_state.state = BATTERY_UNKNOWN;
+
+#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 = 0.5 + ((energy_now <= energy_full ? energy_now : energy_full) * 100.0) / energy_full;
+
+	battery_state.percentage = new_percentage;
+
+	// clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
+	if (battery_state.percentage > 100) {
+		battery_state.percentage = 100;
+	}
+
+	return errors;
+}
+
+
+void draw_battery (void *obj, cairo_t *c)
 {
-    if (!bat1_font_desc) {
+	Battery *battery = obj;
-        bat1_font_desc = pango_font_description_from_string(get_default_font());
+	PangoLayout *layout;
-        pango_font_description_set_size(bat1_font_desc, pango_font_description_get_size(bat1_font_desc) - PANGO_SCALE);
+
-    }
+	layout = pango_cairo_create_layout (c);
-    if (!bat2_font_desc) {
+
-        bat2_font_desc = pango_font_description_from_string(get_default_font());
+	// draw layout
-        pango_font_description_set_size(bat2_font_desc, pango_font_description_get_size(bat2_font_desc) - PANGO_SCALE);
+	pango_layout_set_font_description(layout, bat1_font_desc);
-    }
+	pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
+	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+	pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
+
+	cairo_set_source_rgba(c, battery->font.color[0], battery->font.color[1], battery->font.color[2], battery->font.alpha);
+
+	pango_cairo_update_layout(c, layout);
+	draw_text(layout, c, 0, battery->bat1_posy, &battery->font, ((Panel*)battery->area.panel)->font_shadow);
+
+	pango_layout_set_font_description(layout, bat2_font_desc);
+	pango_layout_set_indent(layout, 0);
+	pango_layout_set_text(layout, buf_bat_time, strlen(buf_bat_time));
+	pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
+
+	pango_cairo_update_layout(c, layout);
+	draw_text(layout, c, 0, battery->bat2_posy, &battery->font, ((Panel*)battery->area.panel)->font_shadow);
+	pango_cairo_show_layout(c, layout);
+
+	g_object_unref(layout);
 }
 
-void battery_default_font_changed()
+
+int resize_battery(void *obj)
 {
-    if (!battery_enabled)
+	Battery *battery = obj;
-        return;
+	Panel *panel = battery->area.panel;
-    if (bat1_has_font && bat2_has_font)
+	int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
-        return;
+	int bat_time_height, bat_time_width, bat_time_height_ink;
-    if (!bat1_has_font) {
+	int ret = 0;
-        pango_font_description_free(bat1_font_desc);
+
-        bat1_font_desc = NULL;
+	battery->area.redraw = 1;
-    }
+	
-    if (!bat2_has_font) {
+	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
-        pango_font_description_free(bat2_font_desc);
+	if (battery_state.state == BATTERY_FULL) {
-        bat2_font_desc = NULL;
+		strcpy(buf_bat_time, "Full");
-    }
+	} else {
-    battery_init_fonts();
+		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
-    for (int i = 0; i < num_panels; i++) {
+	}
-        panels[i].battery.area.resize_needed = TRUE;
+	get_text_size2(bat1_font_desc, &bat_percentage_height_ink, &bat_percentage_height, &bat_percentage_width,
-        schedule_redraw(&panels[i].battery.area);
+				   panel->area.height, panel->area.width, buf_bat_percentage, strlen(buf_bat_percentage));
-    }
+	get_text_size2(bat2_font_desc, &bat_time_height_ink, &bat_time_height, &bat_time_width,
-    schedule_panel_redraw();
+				   panel->area.height, panel->area.width, buf_bat_time, strlen(buf_bat_time));
+
+	if (panel_horizontal) {
+		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
+		new_size += 2 * battery->area.paddingxlr + 2 * battery->area.bg->border.width;
+		if (new_size > battery->area.width ||
+			new_size < battery->area.width - 2) {
+			// we try to limit the number of resize
+			battery->area.width = new_size;
+			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height) / 2;
+			battery->bat2_posy = battery->bat1_posy + bat_percentage_height;
+			ret = 1;
+		}
+	} else {
+		int new_size = bat_percentage_height + bat_time_height +
+					   (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
+		if (new_size > battery->area.height ||
+			new_size < battery->area.height - 2) {
+			battery->area.height =  new_size;
+			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2) / 2;
+			battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
+			ret = 1;
+		}
+	}
+	return ret;
 }
 
-void update_battery_tick(void *arg)
+void battery_action(int button)
 {
-    if (!battery_enabled)
+	char *command = 0;
-        return;
+	switch (button) {
-
+		case 1:
-    gboolean old_found = battery_found;
+		command = battery_lclick_command;
-    int old_percentage = battery_state.percentage;
+		break;
-    gboolean old_ac_connected = battery_state.ac_connected;
+		case 2:
-    int16_t old_hours = battery_state.time.hours;
+		command = battery_mclick_command;
-    int8_t old_minutes = battery_state.time.minutes;
+		break;
-
+		case 3:
-    if (!battery_found) {
+		command = battery_rclick_command;
-        init_battery();
+		break;
-        old_ac_connected = battery_state.ac_connected;
+		case 4:
-    }
+		command = battery_uwheel_command;
-    if (update_battery() != 0) {
+		break;
-        // Try to reconfigure on failed update
+		case 5:
-        init_battery();
+		command = battery_dwheel_command;
-    }
+		break;
-
+	}
-    if (old_ac_connected != battery_state.ac_connected) {
+	tint_exec(command);
-        if (battery_state.ac_connected)
+}
-            tint_exec_no_sn(ac_connected_cmd);
-        else
-            tint_exec_no_sn(ac_disconnected_cmd);
-    }
-
-    if (battery_state.percentage < battery_low_status && battery_state.state == BATTERY_DISCHARGING &&
-        !battery_low_cmd_sent) {
-        tint_exec_no_sn(battery_low_cmd);
-        battery_low_cmd_sent = TRUE;
-    }
-    if (battery_state.percentage > battery_low_status && battery_state.state == BATTERY_CHARGING &&
-        battery_low_cmd_sent) {
-        battery_low_cmd_sent = FALSE;
-    }
-
-    if ((battery_state.percentage >= 100 || battery_state.state == BATTERY_FULL) &&
-        !battery_full_cmd_sent) {
-        tint_exec_no_sn(battery_full_cmd);
-        battery_full_cmd_sent = TRUE;
-    }
-    if (battery_state.percentage < 100 && battery_state.state != BATTERY_FULL &&
-        battery_full_cmd_sent) {
-        battery_full_cmd_sent = FALSE;
-    }
-
-    for (int i = 0; i < num_panels; i++) {
-        // Show/hide if needed
-        if (!battery_found) {
-            hide(&panels[i].battery.area);
-        } else {
-            if (battery_state.percentage >= percentage_hide)
-                hide(&panels[i].battery.area);
-            else
-                show(&panels[i].battery.area);
-        }
-        // Redraw if needed
-        if (panels[i].battery.area.on_screen) {
-            if (old_found != battery_found || old_percentage != battery_state.percentage ||
-                old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) {
-                panels[i].battery.area.resize_needed = TRUE;
-                schedule_panel_redraw();
-            }
-        }
-    }
-}
-
-int update_battery()
-{
-    // Reset
-    battery_state.state = BATTERY_UNKNOWN;
-    battery_state.percentage = 0;
-    battery_state.ac_connected = FALSE;
-    battery_state_set_time(&battery_state, 0);
-
-    int err = battery_os_update(&battery_state);
-
-    // Clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
-    if (battery_state.percentage > 100) {
-        battery_state.percentage = 100;
-    }
-
-    battery_update_text(buf_bat_line1, bat1_format);
-    if (bat2_format != 0) {
-        battery_update_text(buf_bat_line2, bat2_format);
-    }
-
-    return err;
-}
-
-int battery_compute_desired_size(void *obj)
-{
-    Battery *battery = (Battery *)obj;
-    return text_area_compute_desired_size(&battery->area, buf_bat_line1, buf_bat_line2, bat1_font_desc, bat2_font_desc);
-}
-
-gboolean resize_battery(void *obj)
-{
-    Battery *battery = (Battery *)obj;
-    return resize_text_area(&battery->area,
-                            buf_bat_line1,
-                            buf_bat_line2,
-                            bat1_font_desc,
-                            bat2_font_desc,
-                            &battery->bat1_posy,
-                            &battery->bat2_posy);
-}
-
-void draw_battery(void *obj, cairo_t *c)
-{
-    Battery *battery = (Battery *)obj;
-    draw_text_area(&battery->area,
-                   c,
-                   buf_bat_line1,
-                   buf_bat_line2,
-                   bat1_font_desc,
-                   bat2_font_desc,
-                   battery->bat1_posy,
-                   battery->bat2_posy,
-                   &battery->font_color);
-}
-
-void battery_dump_geometry(void *obj, int indent)
-{
-    Battery *battery = (Battery *)obj;
-    fprintf(stderr, "tint2: %*sText 1: y = %d, text = %s\n", indent, "", battery->bat1_posy, buf_bat_line1);
-    fprintf(stderr, "tint2: %*sText 2: y = %d, text = %s\n", indent, "", battery->bat2_posy, buf_bat_line2);
-}
-
-char *battery_get_tooltip(void *obj)
-{
-    return battery_os_tooltip();
-}
-
-void battery_action(void *obj, int button, int x, int y, Time time)
-{
-    char *command = NULL;
-    switch (button) {
-    case 1:
-        command = battery_lclick_command;
-        break;
-    case 2:
-        command = battery_mclick_command;
-        break;
-    case 3:
-        command = battery_rclick_command;
-        break;
-    case 4:
-        command = battery_uwheel_command;
-        break;
-    case 5:
-        command = battery_dwheel_command;
-        break;
-    }
-    tint_exec(command, NULL, NULL, time, obj, x, y, FALSE, TRUE);
-}

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.
 *
 **************************************************************************/
 
@@ -16,50 +17,44 @@
 #include "common.h"
 #include "area.h"
 
+
+// battery drawing parameter (per panel)
 typedef struct Battery {
-    Area area;
+	// always start with area
-    Color font_color;
+	Area area;
-    int bat1_posy;
+
-    int bat2_posy;
+	Color font;
+	int bat1_posy;
+	int bat2_posy;
 } Battery;
 
-typedef enum ChargeState {
+enum chargestate {
-    BATTERY_UNKNOWN = 0,
+	BATTERY_UNKNOWN,
-    BATTERY_CHARGING,
+	BATTERY_CHARGING,
-    BATTERY_DISCHARGING,
+	BATTERY_DISCHARGING,
-    BATTERY_FULL,
+	BATTERY_FULL
-} ChargeState;
+};
 
-typedef struct BatteryTime {
+typedef struct battime {
-    int16_t hours;
+	int16_t hours;
-    int8_t minutes;
+	int8_t minutes;
-    int8_t seconds;
+	int8_t seconds;
-} BatteryTime;
+} battime;
 
-typedef struct BatteryState {
+typedef struct batstate {
-    int percentage;
+	int percentage;
-    BatteryTime time;
+	struct battime time;
-    ChargeState state;
+	enum chargestate state;
-    gboolean ac_connected;
+} batstate;
-} BatteryState;
 
-extern struct BatteryState battery_state;
+extern struct batstate battery_state;
-extern gboolean bat1_has_font;
 extern PangoFontDescription *bat1_font_desc;
-extern gboolean bat2_has_font;
 extern PangoFontDescription *bat2_font_desc;
-extern char *bat1_format;
+extern int battery_enabled;
-extern char *bat2_format;
-extern gboolean battery_enabled;
-extern gboolean battery_tooltip_enabled;
 extern int percentage_hide;
 
 extern int8_t battery_low_status;
 extern char *battery_low_cmd;
-extern char *battery_full_cmd;
-
-extern char *ac_connected_cmd;
-extern char *ac_disconnected_cmd;
 
 extern char *battery_lclick_command;
 extern char *battery_mclick_command;
@@ -67,56 +62,21 @@ extern char *battery_rclick_command;
 extern char *battery_uwheel_command;
 extern char *battery_dwheel_command;
 
-extern char *battery_sys_prefix;
-
-static inline gchar *chargestate2str(ChargeState state)
-{
-    switch (state) {
-    case BATTERY_CHARGING:
-        return "Charging";
-    case BATTERY_DISCHARGING:
-        return "Discharging";
-    case BATTERY_FULL:
-        return "Full";
-    case BATTERY_UNKNOWN:
-    default:
-        return "Unknown";
-    };
-}
-
-static inline void battery_state_set_time(BatteryState *state, int seconds)
-{
-    state->time.hours = seconds / 3600;
-    seconds -= 3600 * state->time.hours;
-    state->time.minutes = seconds / 60;
-    seconds -= 60 * state->time.minutes;
-    state->time.seconds = seconds;
-}
-
 // default global data
 void default_battery();
 
 // freed memory
 void cleanup_battery();
 
-void update_battery_tick(void *arg);
 int update_battery();
 
 void init_battery();
 void init_battery_panel(void *panel);
 
-void reinit_battery();
 void draw_battery(void *obj, cairo_t *c);
-void battery_default_font_changed();
 
-gboolean resize_battery(void *obj);
+int  resize_battery(void *obj);
 
-void battery_action(void *obj, int button, int x, int y, Time time);
+void battery_action(int button);
-
-/* operating system specific functions */
-gboolean battery_os_init();
-void battery_os_free();
-int battery_os_update(BatteryState *state);
-char *battery_os_tooltip();
 
 #endif

src/battery/dummy.c

@@ -1,44 +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(BatteryState *state)
-{
-    return -1;
-}
-
-char *battery_os_tooltip()
-{
-    return strdup("Operating System not supported");
-}

src/battery/freebsd.c

@@ -1,102 +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__) || defined(__DragonFly__)
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <string.h>
-
-#include "common.h"
-#include "battery.h"
-
-gboolean battery_os_init()
-{
-    int sysctl_out = 0;
-    size_t len = sizeof(sysctl_out);
-
-    return (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) ||
-           (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0) ||
-           (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
-}
-
-void battery_os_free()
-{
-    return;
-}
-
-int battery_os_update(BatteryState *state)
-{
-    int sysctl_out = 0;
-    size_t len = sizeof(sysctl_out);
-    gboolean err = 0;
-
-    if (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) {
-        switch (sysctl_out) {
-        case 1:
-            state->state = BATTERY_DISCHARGING;
-            break;
-        case 2:
-            state->state = BATTERY_CHARGING;
-            break;
-        default:
-            state->state = BATTERY_FULL;
-            break;
-        }
-    } else {
-        fprintf(stderr, "tint2: power update: no such sysctl");
-        err = -1;
-    }
-
-    if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0)
-        battery_state_set_time(state, sysctl_out * 60);
-    else
-        err = -1;
-
-    if (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0)
-        state->percentage = sysctl_out;
-    else
-        err = -1;
-
-    if (sysctlbyname("hw.acpi.acline", &sysctl_out, &len, NULL, 0) == 0)
-        state->ac_connected = sysctl_out;
-
-    return err;
-}
-
-char *battery_os_tooltip()
-{
-    GString *tooltip = g_string_new("");
-    gchar *result;
-
-    g_string_append_printf(tooltip, "Battery\n");
-
-    gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
-
-    g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
-
-    g_string_append_c(tooltip, '\n');
-    g_string_append_printf(tooltip, "AC\n");
-    g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
-
-    result = tooltip->str;
-    g_string_free(tooltip, FALSE);
-
-    return result;
-}
-
-#endif

src/battery/linux.c

@@ -1,566 +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;
-    /* monotonic time, in microseconds */
-    gint64 timestamp;
-    /* sysfs files */
-    gchar *path_present;
-    gchar *path_level_now;
-    gchar *path_level_full;
-    gchar *path_rate_now;
-    gchar *path_status;
-    /* values */
-    gboolean present;
-    gint level_now;
-    gint level_full;
-    gint rate_now;
-    gchar unit;
-    ChargeState status;
-};
-
-struct psy_mains {
-    /* generic properties */
-    gchar *name;
-    /* sysfs files */
-    gchar *path_online;
-    /* values */
-    gboolean online;
-};
-
-static gboolean is_file_non_empty(const char *path)
-{
-    FILE *f = fopen(path, "r");
-    if (!f)
-        return FALSE;
-    char buffer[1024];
-    size_t count = fread(buffer, 1, sizeof(buffer), f);
-    fclose(f);
-    if (count > 0)
-        return TRUE;
-    else
-        return FALSE;
-}
-
-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()
-{
-    fprintf(stderr, "tint2: 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 (err) {                                                                      \
-        g_error_free(err);                                                          \
-        fprintf(stderr, RED "tint2: %s:%d: errror" RESET "\n", __FILE__, __LINE__); \
-        return FALSE;                                                               \
-    }
-
-static GList *batteries = NULL;
-static GList *mains = NULL;
-
-static guint8 level_to_percent(gint level_now, gint level_full)
-{
-    return 0.5 + ((level_now <= level_full ? level_now : level_full) * 100.0) / level_full;
-}
-
-static enum psy_type power_supply_get_type(const gchar *entryname)
-{
-    gchar *path_type = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "type", NULL);
-    GError *error = NULL;
-    gchar *type;
-    gsize typelen;
-
-    g_file_get_contents(path_type, &type, &typelen, &error);
-    if (error) {
-        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, path_type);
-        g_free(path_type);
-        g_error_free(error);
-        return PSY_UNKNOWN;
-    }
-    g_free(path_type);
-
-    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->path_present = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "present", NULL);
-    if (!is_file_non_empty(bat->path_present)) {
-        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, bat->path_present);
-        goto err0;
-    }
-
-    bat->path_level_now =
-        g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_now", NULL);
-    bat->path_level_full =
-        g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_full", NULL);
-    bat->path_rate_now = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "power_now", NULL);
-    bat->unit = 'W';
-
-    if (!is_file_non_empty(bat->path_level_now) ||
-        !is_file_non_empty(bat->path_level_full)) {
-        g_free(bat->path_level_now);
-        g_free(bat->path_level_full);
-        g_free(bat->path_rate_now);
-        bat->path_level_now =
-            g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "charge_now", NULL);
-        bat->path_level_full =
-            g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "charge_full", NULL);
-        bat->path_rate_now =
-            g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "current_now", NULL);
-        bat->unit = 'A';
-    }
-    if (!is_file_non_empty(bat->path_level_now)) {
-        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, bat->path_level_now);
-        goto err1;
-    }
-    if (!is_file_non_empty(bat->path_level_full)) {
-        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, bat->path_level_full);
-        goto err1;
-    }
-
-    bat->path_status = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "status", NULL);
-    if (!is_file_non_empty(bat->path_status)) {
-        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, bat->path_status);
-        goto err2;
-    }
-
-    return TRUE;
-
-err2:
-    g_free(bat->path_status);
-err1:
-    g_free(bat->path_level_now);
-    g_free(bat->path_level_full);
-    g_free(bat->path_rate_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(battery_sys_prefix, "/sys/class/power_supply", entryname, "online", NULL);
-    if (!is_file_non_empty(ac->path_online)) {
-        fprintf(stderr, RED "tint2: %s:%d: read failed for %s" RESET "\n", __FILE__, __LINE__, ac->path_online);
-        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_rate_now);
-    g_free(bat->path_level_full);
-    g_free(bat->path_level_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(stderr, GREEN "Found battery \"%s\"" RESET "\n", bat->name);
-    } else {
-        g_free(bat);
-        fprintf(stderr, RED "tint2: Failed to initialize battery \"%s\"" RESET "\n", entryname);
-    }
-}
-
-static void add_mains(const char *entryname)
-{
-    struct psy_mains *ac = g_malloc0(sizeof(*ac));
-    ac->name = g_strdup(entryname);
-
-    if (init_linux_mains(ac)) {
-        mains = g_list_append(mains, ac);
-        fprintf(stderr, GREEN "Found mains \"%s\"" RESET "\n", ac->name);
-    } else {
-        g_free(ac);
-        fprintf(stderr, RED "tint2: Failed to initialize mains \"%s\"" RESET "\n", entryname);
-    }
-}
-
-gboolean battery_os_init()
-{
-    GDir *directory = 0;
-    GError *error = NULL;
-    const char *entryname;
-
-    battery_os_free();
-
-    gchar *dir_path = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", NULL);
-    directory = g_dir_open(dir_path, 0, &error);
-    g_free(dir_path);
-    RETURN_ON_ERROR(error);
-
-    while ((entryname = g_dir_read_name(directory))) {
-        fprintf(stderr, GREEN "tint2: Found power device %s" RESET "\n", entryname);
-        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_rate_usage(struct psy_battery *bat, gint old_level_now, gint64 old_timestamp)
-{
-    gint64 diff_level = ABS(bat->level_now - old_level_now);
-    gint64 diff_time = bat->timestamp - old_timestamp;
-
-    /* µW = (µWh * 3600) / (µs / 1000000) */
-    gint rate = diff_level * 3600 * 1000000 / MAX(1, diff_time);
-
-    return rate;
-}
-
-static gboolean update_linux_battery(struct psy_battery *bat)
-{
-    GError *error = NULL;
-    gchar *data;
-    gsize datalen;
-
-    gint64 old_timestamp = bat->timestamp;
-    int old_level_now = bat->level_now;
-    gint old_rate_now = bat->rate_now;
-
-    /* reset values */
-    bat->present = 0;
-    bat->status = BATTERY_UNKNOWN;
-    bat->level_now = 0;
-    bat->level_full = 0;
-    bat->rate_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);
-
-    /* level now */
-    g_file_get_contents(bat->path_level_now, &data, &datalen, &error);
-    RETURN_ON_ERROR(error);
-    bat->level_now = atoi(data);
-    g_free(data);
-
-    /* level full */
-    g_file_get_contents(bat->path_level_full, &data, &datalen, &error);
-    RETURN_ON_ERROR(error);
-    bat->level_full = atoi(data);
-    g_free(data);
-
-    /* rate now */
-    g_file_get_contents(bat->path_rate_now, &data, &datalen, &error);
-    if (g_error_matches(error, G_FILE_ERROR, G_FILE_ERROR_NODEV)) {
-        /* some hardware does not support reading current rate consumption */
-        g_error_free(error);
-        bat->rate_now = estimate_rate_usage(bat, old_level_now, old_timestamp);
-        if (bat->rate_now == 0 && bat->status != BATTERY_FULL) {
-            /* If the hardware updates the level slower than our sampling period,
-             * we need to sample more rarely */
-            bat->rate_now = old_rate_now;
-            bat->timestamp = old_timestamp;
-        }
-    } else if (error) {
-        g_error_free(error);
-        return FALSE;
-    } else {
-        bat->rate_now = atoi(data);
-        g_free(data);
-    }
-
-    return TRUE;
-}
-
-static gboolean update_linux_mains(struct psy_mains *ac)
-{
-    GError *error = NULL;
-    gchar *data;
-    gsize datalen;
-    ac->online = FALSE;
-
-    /* online */
-    g_file_get_contents(ac->path_online, &data, &datalen, &error);
-    RETURN_ON_ERROR(error);
-    ac->online = (atoi(data) == 1);
-    g_free(data);
-
-    return TRUE;
-}
-
-int battery_os_update(BatteryState *state)
-{
-    GList *l;
-
-    gint64 total_level_now = 0;
-    gint64 total_level_full = 0;
-    gint64 total_rate_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_level_now += bat->level_now;
-        total_level_full += bat->level_full;
-        total_rate_now += bat->rate_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_rate_now > 0) {
-        if (state->state == BATTERY_CHARGING)
-            seconds = 3600 * (total_level_full - total_level_now) / total_rate_now;
-        else if (state->state == BATTERY_DISCHARGING)
-            seconds = 3600 * total_level_now / total_rate_now;
-        seconds = MAX(0, seconds);
-    }
-    battery_state_set_time(state, seconds);
-
-    /* calculate percentage */
-    state->percentage = level_to_percent(total_level_now, total_level_full);
-
-    /* AC state */
-    state->ac_connected = ac_connected;
-
-    if (state->state == BATTERY_UNKNOWN) {
-        if (ac_connected) {
-            if (total_rate_now == 0 && state->percentage >= 90)
-                state->state = BATTERY_FULL;
-            else
-                state->state = BATTERY_CHARGING;
-        } else {
-            state->state = BATTERY_DISCHARGING;
-        }
-    }
-
-    return 0;
-}
-
-static gchar *level_human_readable(struct psy_battery *bat)
-{
-    gint now = bat->level_now;
-    gint full = bat->level_full;
-
-    if (full >= 1000000) {
-        return g_strdup_printf("%d.%d / %d.%d %ch",
-                               now / 1000000,
-                               (now % 1000000) / 100000,
-                               full / 1000000,
-                               (full % 1000000) / 100000,
-                               bat->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,
-                               bat->unit);
-    } else {
-        return g_strdup_printf("%d / %d µ%ch", now, full, bat->unit);
-    }
-}
-
-static gchar *rate_human_readable(struct psy_battery *bat)
-{
-    gint rate = bat->rate_now;
-    gchar unit = bat->unit;
-
-    if (rate >= 1000000) {
-        return g_strdup_printf("%d.%d %c", rate / 1000000, (rate % 1000000) / 100000, unit);
-    } else if (rate >= 1000) {
-        return g_strdup_printf("%d.%d m%c", rate / 1000, (rate % 1000) / 100, unit);
-    } else if (rate > 0) {
-        return g_strdup_printf("%d µ%c", rate, 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 *rate = rate_human_readable(bat);
-        gchar *level = level_human_readable(bat);
-        gchar *state = (bat->status == BATTERY_UNKNOWN) ? "energy" : chargestate2str(bat->status);
-
-        guint8 percentage = level_to_percent(bat->level_now, bat->level_full);
-
-        g_string_append_printf(tooltip, "\t%s: %s (%u %%)\n\trate: %s", state, level, percentage, rate);
-
-        g_free(rate);
-        g_free(level);
-    }
-
-    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,108 +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(BatteryState *state)
-{
-    struct apm_power_info info;
-
-    if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
-        // best attempt at mapping to Linux battery states
-        switch (info.battery_state) {
-        case APM_BATT_CHARGING:
-            state->state = BATTERY_CHARGING;
-            break;
-        default:
-            state->state = BATTERY_DISCHARGING;
-            break;
-        }
-
-        if (info.battery_life > 100)
-            info.battery_life = 100;
-        if (info.battery_life == 100)
-            state->state = BATTERY_FULL;
-
-        state->percentage = info.battery_life;
-        if (info.minutes_left != -1)
-            battery_state_set_time(state, info.minutes_left * 60);
-
-        state->ac_connected = info.ac_state == APM_AC_ON;
-    } else {
-        warn("power update: APM_IOC_GETPOWER");
-        return -1;
-    }
-
-    return 0;
-}
-
-char *battery_os_tooltip()
-{
-    GString *tooltip = g_string_new("");
-    gchar *result;
-
-    g_string_append_printf(tooltip, "Battery\n");
-
-    gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
-
-    g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
-
-    g_string_append_c(tooltip, '\n');
-    g_string_append_printf(tooltip, "AC\n");
-    g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
-
-    result = tooltip->str;
-    g_string_free(tooltip, FALSE);
-
-    return result;
-}
-
-#endif

src/button/button.c

@@ -1,541 +0,0 @@
-#include "button.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <cairo.h>
-#include <cairo-xlib.h>
-#include <math.h>
-#include <pango/pangocairo.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <time.h>
-#include <fcntl.h>
-
-#include "window.h"
-#include "server.h"
-#include "panel.h"
-#include "timer.h"
-#include "common.h"
-
-char *button_get_tooltip(void *obj);
-void button_init_fonts();
-int button_compute_desired_size(void *obj);
-void button_dump_geometry(void *obj, int indent);
-
-void default_button()
-{
-}
-
-Button *create_button()
-{
-    Button *button = calloc(1, sizeof(Button));
-    button->backend = calloc(1, sizeof(ButtonBackend));
-    button->backend->centered = TRUE;
-    button->backend->font_color.alpha = 0.5;
-    return button;
-}
-
-gpointer create_button_frontend(gconstpointer arg, gpointer data)
-{
-    Button *button_backend = (Button *)arg;
-
-    Button *button_frontend = calloc(1, sizeof(Button));
-    button_frontend->backend = button_backend->backend;
-    button_backend->backend->instances = g_list_append(button_backend->backend->instances, button_frontend);
-    button_frontend->frontend = calloc(1, sizeof(ButtonFrontend));
-    return button_frontend;
-}
-
-void destroy_button(void *obj)
-{
-    Button *button = (Button *)obj;
-    if (button->frontend) {
-        // This is a frontend element
-        free_icon(button->frontend->icon);
-        free_icon(button->frontend->icon_hover);
-        free_icon(button->frontend->icon_pressed);
-        button->backend->instances = g_list_remove_all(button->backend->instances, button);
-        free_and_null(button->frontend);
-        remove_area(&button->area);
-        free_area(&button->area);
-        free_and_null(button);
-    } else {
-        // This is a backend element
-        free_and_null(button->backend->text);
-        free_and_null(button->backend->icon_name);
-        free_and_null(button->backend->tooltip);
-
-        button->backend->bg = NULL;
-        pango_font_description_free(button->backend->font_desc);
-        button->backend->font_desc = NULL;
-        free_and_null(button->backend->lclick_command);
-        free_and_null(button->backend->mclick_command);
-        free_and_null(button->backend->rclick_command);
-        free_and_null(button->backend->dwheel_command);
-        free_and_null(button->backend->uwheel_command);
-
-        if (button->backend->instances) {
-            fprintf(stderr, "tint2: Error: Attempt to destroy backend while there are still frontend instances!\n");
-            exit(EXIT_FAILURE);
-        }
-        free(button->backend);
-        free(button);
-    }
-}
-
-void init_button()
-{
-    GList *to_remove = panel_config.button_list;
-    for (int k = 0; k < strlen(panel_items_order) && to_remove; k++) {
-        if (panel_items_order[k] == 'P') {
-            to_remove = to_remove->next;
-        }
-    }
-
-    if (to_remove) {
-        if (to_remove == panel_config.button_list) {
-            g_list_free_full(to_remove, destroy_button);
-            panel_config.button_list = NULL;
-        } else {
-            // Cut panel_config.button_list
-            if (to_remove->prev)
-                to_remove->prev->next = NULL;
-            to_remove->prev = NULL;
-            // Remove all elements of to_remove and to_remove itself
-            g_list_free_full(to_remove, destroy_button);
-        }
-    }
-
-    button_init_fonts();
-    for (GList *l = panel_config.button_list; l; l = l->next) {
-        Button *button = l->data;
-
-        // Set missing config options
-        if (!button->backend->bg)
-            button->backend->bg = &g_array_index(backgrounds, Background, 0);
-    }
-}
-
-void init_button_panel(void *p)
-{
-    Panel *panel = (Panel *)p;
-
-    // Make sure this is only done once if there are multiple items
-    if (panel->button_list && ((Button *)panel->button_list->data)->frontend)
-        return;
-
-    // panel->button_list is now a copy of the pointer panel_config.button_list
-    // We make it a deep copy
-    panel->button_list = g_list_copy_deep(panel_config.button_list, create_button_frontend, NULL);
-
-    load_icon_themes();
-
-    for (GList *l = panel->button_list; l; l = l->next) {
-        Button *button = l->data;
-        button->area.bg = button->backend->bg;
-        button->area.paddingx = button->backend->paddingx;
-        button->area.paddingy = button->backend->paddingy;
-        button->area.paddingxlr = button->backend->paddingxlr;
-        button->area.parent = panel;
-        button->area.panel = panel;
-        button->area._dump_geometry = button_dump_geometry;
-        button->area._compute_desired_size = button_compute_desired_size;
-        snprintf(button->area.name, sizeof(button->area.name), "Button");
-        button->area._draw_foreground = draw_button;
-        button->area.size_mode = LAYOUT_FIXED;
-        button->area._resize = resize_button;
-        button->area._get_tooltip_text = button_get_tooltip;
-        button->area._is_under_mouse = full_width_area_is_under_mouse;
-        button->area.has_mouse_press_effect =
-            panel_config.mouse_effects &&
-            (button->area.has_mouse_over_effect = button->backend->lclick_command || button->backend->mclick_command ||
-                                                  button->backend->rclick_command || button->backend->uwheel_command ||
-                                                  button->backend->dwheel_command);
-
-        button->area.resize_needed = TRUE;
-        button->area.on_screen = TRUE;
-        instantiate_area_gradients(&button->area);
-
-        button_reload_icon(button);
-    }
-}
-
-void button_init_fonts()
-{
-    for (GList *l = panel_config.button_list; l; l = l->next) {
-        Button *button = l->data;
-        if (!button->backend->font_desc)
-            button->backend->font_desc = pango_font_description_from_string(get_default_font());
-    }
-}
-
-void button_default_font_changed()
-{
-    gboolean needs_update = FALSE;
-    for (GList *l = panel_config.button_list; l; l = l->next) {
-        Button *button = l->data;
-
-        if (!button->backend->has_font) {
-            pango_font_description_free(button->backend->font_desc);
-            button->backend->font_desc = NULL;
-            needs_update = TRUE;
-        }
-    }
-    if (!needs_update)
-        return;
-
-    button_init_fonts();
-    for (int i = 0; i < num_panels; i++) {
-        for (GList *l = panels[i].button_list; l; l = l->next) {
-            Button *button = l->data;
-
-            if (!button->backend->has_font) {
-                button->area.resize_needed = TRUE;
-                schedule_redraw(&button->area);
-            }
-        }
-    }
-    schedule_panel_redraw();
-}
-
-void button_reload_icon(Button *button)
-{
-    free_icon(button->frontend->icon);
-    free_icon(button->frontend->icon_hover);
-    free_icon(button->frontend->icon_pressed);
-    button->frontend->icon = NULL;
-    button->frontend->icon_hover = NULL;
-    button->frontend->icon_pressed = NULL;
-
-    button->frontend->icon_load_size = button->frontend->iconw;
-
-    if (!button->backend->icon_name)
-        return;
-
-    char *new_icon_path = get_icon_path(icon_theme_wrapper, button->backend->icon_name, button->frontend->iconw, TRUE);
-    if (new_icon_path)
-        button->frontend->icon = load_image(new_icon_path, TRUE);
-    free(new_icon_path);
-    // On loading error, fallback to default
-    if (!button->frontend->icon) {
-        new_icon_path = get_icon_path(icon_theme_wrapper, DEFAULT_ICON, button->frontend->iconw, TRUE);
-        if (new_icon_path)
-            button->frontend->icon = load_image(new_icon_path, TRUE);
-        free(new_icon_path);
-    }
-    Imlib_Image original = button->frontend->icon;
-    button->frontend->icon = scale_icon(button->frontend->icon, button->frontend->iconw);
-    free_icon(original);
-
-    if (panel_config.mouse_effects) {
-        button->frontend->icon_hover = adjust_icon(button->frontend->icon,
-                                                   panel_config.mouse_over_alpha,
-                                                   panel_config.mouse_over_saturation,
-                                                   panel_config.mouse_over_brightness);
-        button->frontend->icon_pressed = adjust_icon(button->frontend->icon,
-                                                     panel_config.mouse_pressed_alpha,
-                                                     panel_config.mouse_pressed_saturation,
-                                                     panel_config.mouse_pressed_brightness);
-    }
-    schedule_redraw(&button->area);
-}
-
-void button_default_icon_theme_changed()
-{
-    for (int i = 0; i < num_panels; i++) {
-        for (GList *l = panels[i].button_list; l; l = l->next) {
-            Button *button = l->data;
-            button_reload_icon(button);
-        }
-    }
-    schedule_panel_redraw();
-}
-
-void cleanup_button()
-{
-    // Cleanup frontends
-    for (int i = 0; i < num_panels; i++) {
-        g_list_free_full(panels[i].button_list, destroy_button);
-        panels[i].button_list = NULL;
-    }
-
-    // Cleanup backends
-    g_list_free_full(panel_config.button_list, destroy_button);
-    panel_config.button_list = NULL;
-}
-
-int button_compute_desired_size(void *obj)
-{
-    Button *button = (Button *)obj;
-    Panel *panel = (Panel *)button->area.panel;
-    int horiz_padding = (panel_horizontal ? button->area.paddingxlr : button->area.paddingy);
-    int vert_padding = (panel_horizontal ? button->area.paddingy : button->area.paddingxlr);
-    int interior_padding = button->area.paddingx;
-
-    int icon_w, icon_h;
-    if (button->backend->icon_name) {
-        if (panel_horizontal)
-            icon_h = icon_w = button->area.height - top_bottom_border_width(&button->area) - 2 * vert_padding;
-        else
-            icon_h = icon_w = button->area.width - left_right_border_width(&button->area) - 2 * horiz_padding;
-        if (button->backend->max_icon_size) {
-            icon_w = MIN(icon_w, button->backend->max_icon_size);
-            icon_h = MIN(icon_h, button->backend->max_icon_size);
-        }
-    } else {
-        icon_h = icon_w = 0;
-    }
-
-    int txt_height_ink, txt_height, txt_width;
-    if (button->backend->text) {
-        if (panel_horizontal) {
-            get_text_size2(button->backend->font_desc,
-                           &txt_height_ink,
-                           &txt_height,
-                           &txt_width,
-                           panel->area.height,
-                           panel->area.width,
-                           button->backend->text,
-                           strlen(button->backend->text),
-                           PANGO_WRAP_WORD_CHAR,
-                           PANGO_ELLIPSIZE_NONE,
-                           FALSE);
-        } else {
-            get_text_size2(button->backend->font_desc,
-                           &txt_height_ink,
-                           &txt_height,
-                           &txt_width,
-                           panel->area.height,
-                           button->area.width - icon_w - (icon_w ? interior_padding : 0) - 2 * horiz_padding -
-                               left_right_border_width(&button->area),
-                           button->backend->text,
-                           strlen(button->backend->text),
-                           PANGO_WRAP_WORD_CHAR,
-                           PANGO_ELLIPSIZE_NONE,
-                           FALSE);
-        }
-    } else {
-        txt_height_ink = txt_height = txt_width = 0;
-    }
-
-    if (panel_horizontal) {
-        int new_size = txt_width + icon_w + (txt_width && icon_w ? interior_padding : 0);
-        new_size += 2 * horiz_padding + left_right_border_width(&button->area);
-        return new_size;
-    } else {
-        int new_size;
-        new_size = txt_height + 2 * vert_padding + top_bottom_border_width(&button->area);
-        new_size = MAX(new_size, icon_h + 2 * vert_padding + top_bottom_border_width(&button->area));
-        return new_size;
-    }
-}
-
-gboolean resize_button(void *obj)
-{
-    Button *button = (Button *)obj;
-    Panel *panel = (Panel *)button->area.panel;
-    Area *area = &button->area;
-    int horiz_padding = (panel_horizontal ? button->area.paddingxlr : button->area.paddingy);
-    int vert_padding = (panel_horizontal ? button->area.paddingy : button->area.paddingxlr);
-    int interior_padding = button->area.paddingx;
-
-    int icon_w, icon_h;
-    if (button->backend->icon_name) {
-        if (panel_horizontal)
-            icon_h = icon_w = button->area.height - top_bottom_border_width(&button->area) - 2 * vert_padding;
-        else
-            icon_h = icon_w = button->area.width - left_right_border_width(&button->area) - 2 * horiz_padding;
-        if (button->backend->max_icon_size) {
-            icon_w = MIN(icon_w, button->backend->max_icon_size);
-            icon_h = MIN(icon_h, button->backend->max_icon_size);
-        }
-    } else {
-        icon_h = icon_w = 0;
-    }
-
-    button->frontend->iconw = icon_w;
-    button->frontend->iconh = icon_h;
-    if (button->frontend->icon_load_size != button->frontend->iconw)
-        button_reload_icon(button);
-
-    int available_w, available_h;
-    if (panel_horizontal) {
-        available_w = panel->area.width;
-        available_h = area->height - 2 * area->paddingy - left_right_border_width(area);
-    } else {
-        available_w =
-            area->width - icon_w - (icon_w ? interior_padding : 0) - 2 * horiz_padding - left_right_border_width(area);
-        available_h = panel->area.height;
-    }
-
-    int txt_height_ink, txt_height, txt_width;
-    if (button->backend->text) {
-        get_text_size2(button->backend->font_desc,
-                       &txt_height_ink,
-                       &txt_height,
-                       &txt_width,
-                       available_h,
-                       available_w,
-                       button->backend->text,
-                       strlen(button->backend->text),
-                       PANGO_WRAP_WORD_CHAR,
-                       PANGO_ELLIPSIZE_NONE,
-                       FALSE);
-    } else {
-        txt_height_ink = txt_height = txt_width = 0;
-    }
-
-    gboolean result = FALSE;
-    if (panel_horizontal) {
-        int new_size = txt_width + icon_w + (txt_width && icon_w ? interior_padding : 0);
-        new_size += 2 * horiz_padding + left_right_border_width(&button->area);
-        if (new_size != button->area.width) {
-            button->area.width = new_size;
-            result = TRUE;
-        }
-    } else {
-        int new_size;
-        new_size = txt_height + 2 * vert_padding + top_bottom_border_width(&button->area);
-        new_size = MAX(new_size, icon_h + 2 * vert_padding + top_bottom_border_width(&button->area));
-        if (new_size != button->area.height) {
-            button->area.height = new_size;
-            result = TRUE;
-        }
-    }
-    button->frontend->textw = txt_width;
-    button->frontend->texth = txt_height;
-    if (button->backend->centered) {
-        if (icon_w) {
-            button->frontend->icony = (button->area.height - icon_h) / 2;
-            button->frontend->iconx =
-                (button->area.width - txt_width - (txt_width ? interior_padding : 0) - icon_w) / 2;
-            button->frontend->texty = (button->area.height - txt_height) / 2;
-            button->frontend->textx = button->frontend->iconx + icon_w + interior_padding;
-        } else {
-            button->frontend->texty = (button->area.height - txt_height) / 2;
-            button->frontend->textx = (button->area.width - txt_width) / 2;
-        }
-    } else {
-        if (icon_w) {
-            button->frontend->icony = (button->area.height - icon_h) / 2;
-            button->frontend->iconx = left_border_width(&button->area) + horiz_padding;
-            button->frontend->texty = (button->area.height - txt_height) / 2;
-            button->frontend->textx = button->frontend->iconx + icon_w + interior_padding;
-        } else {
-            button->frontend->texty = (button->area.height - txt_height) / 2;
-            button->frontend->textx = left_border_width(&button->area) + horiz_padding;
-        }
-    }
-
-    schedule_redraw(&button->area);
-
-    return result;
-}
-
-void draw_button(void *obj, cairo_t *c)
-{
-    Button *button = obj;
-
-    if (button->frontend->icon) {
-        // Render icon
-        Imlib_Image image;
-        if (panel_config.mouse_effects) {
-            if (button->area.mouse_state == MOUSE_OVER)
-                image = button->frontend->icon_hover ? button->frontend->icon_hover : button->frontend->icon;
-            else if (button->area.mouse_state == MOUSE_DOWN)
-                image = button->frontend->icon_pressed ? button->frontend->icon_pressed : button->frontend->icon;
-            else
-                image = button->frontend->icon;
-        } else {
-            image = button->frontend->icon;
-        }
-
-        imlib_context_set_image(image);
-        render_image(button->area.pix, button->frontend->iconx, button->frontend->icony);
-    }
-
-    // Render text
-    if (button->backend->text) {
-        PangoLayout *layout = pango_cairo_create_layout(c);
-
-        pango_layout_set_font_description(layout, button->backend->font_desc);
-        pango_layout_set_width(layout, button->frontend->textw * PANGO_SCALE);
-        pango_layout_set_alignment(layout, button->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT);
-        pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-        pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-        pango_layout_set_text(layout, button->backend->text, strlen(button->backend->text));
-
-        pango_cairo_update_layout(c, layout);
-        draw_text(layout,
-                  c,
-                  button->frontend->textx,
-                  button->frontend->texty,
-                  &button->backend->font_color,
-                  panel_config.font_shadow);
-
-        g_object_unref(layout);
-    }
-}
-
-void button_dump_geometry(void *obj, int indent)
-{
-    Button *button = obj;
-
-    if (button->frontend->icon) {
-        Imlib_Image tmp = imlib_context_get_image();
-        imlib_context_set_image(button->frontend->icon);
-        fprintf(stderr,
-                "tint2: %*sIcon: x = %d, y = %d, w = %d, h = %d\n",
-                indent,
-                "",
-                button->frontend->iconx,
-                button->frontend->icony,
-                imlib_image_get_width(),
-                imlib_image_get_height());
-        if (tmp)
-            imlib_context_set_image(tmp);
-    }
-    fprintf(stderr,
-            "tint2: %*sText: x = %d, y = %d, w = %d, align = %s, text = %s\n",
-            indent,
-            "",
-            button->frontend->textx,
-            button->frontend->texty,
-            button->frontend->textw,
-            button->backend->centered ? "center" : "left",
-            button->backend->text);
-}
-
-void button_action(void *obj, int mouse_button, int x, int y, Time time)
-{
-    Button *button = (Button *)obj;
-    char *command = NULL;
-    switch (mouse_button) {
-    case 1:
-        command = button->backend->lclick_command;
-        break;
-    case 2:
-        command = button->backend->mclick_command;
-        break;
-    case 3:
-        command = button->backend->rclick_command;
-        break;
-    case 4:
-        command = button->backend->uwheel_command;
-        break;
-    case 5:
-        command = button->backend->dwheel_command;
-        break;
-    }
-    tint_exec(command, NULL, NULL, time, obj, x, y, FALSE, TRUE);
-}
-
-char *button_get_tooltip(void *obj)
-{
-    Button *button = obj;
-
-    if (button->backend->tooltip && strlen(button->backend->tooltip) > 0)
-        return strdup(button->backend->tooltip);
-    return NULL;
-}

src/button/button.h

@@ -1,113 +0,0 @@
-#ifndef BUTTON_H
-#define BUTTON_H
-
-#include <sys/time.h>
-#include <pango/pangocairo.h>
-
-#include "area.h"
-#include "common.h"
-#include "timer.h"
-
-// Architecture:
-// Panel panel_config contains an array of Button, each storing all config options and all the state variables.
-// Only these run commands.
-//
-// Tint2 maintains an array of Panels, one for each monitor. Each stores an array of Button which was initially copied
-// from panel_config. Each works as a frontend to the corresponding Button in panel_config as backend, using the
-// backend's config and state variables.
-
-typedef struct ButtonBackend {
-    // Config:
-    char *icon_name;
-    char *text;
-    char *tooltip;
-    gboolean centered;
-    int max_icon_size;
-    gboolean has_font;
-    PangoFontDescription *font_desc;
-    Color font_color;
-    char *lclick_command;
-    char *mclick_command;
-    char *rclick_command;
-    char *uwheel_command;
-    char *dwheel_command;
-    // paddingxlr = horizontal padding left/right
-    // paddingx = horizontal padding between childs
-    int paddingxlr, paddingx, paddingy;
-    Background *bg;
-
-    // List of Button which are frontends for this backend, one for each panel
-    GList *instances;
-} ButtonBackend;
-
-typedef struct ButtonFrontend {
-    // Frontend state:
-    Imlib_Image icon;
-    Imlib_Image icon_hover;
-    Imlib_Image icon_pressed;
-    int icon_load_size;
-    int iconx;
-    int icony;
-    int iconw;
-    int iconh;
-    int textx;
-    int texty;
-    int textw;
-    int texth;
-} ButtonFrontend;
-
-typedef struct Button {
-    Area area;
-    // All elements have the backend pointer set. However only backend elements have ownership.
-    ButtonBackend *backend;
-    // Set only for frontend Button items.
-    ButtonFrontend *frontend;
-} Button;
-
-// Called before the config is read and panel_config/panels are created.
-// Afterwards, the config parsing code creates the array of Button in panel_config and populates the configuration
-// fields
-// in the backend.
-// Probably does nothing.
-void default_button();
-
-// Creates a new Button item with only the backend field set. The state is NOT initialized. The config is initialized to
-// the default values.
-// This will be used by the config code to populate its backedn config fields.
-Button *create_button();
-
-void destroy_button(void *obj);
-
-// Called after the config is read and panel_config is populated, but before panels are created.
-// Initializes the state of the backend items.
-// panel_config.panel_items is used to determine which backend items are enabled. The others should be destroyed and
-// removed from panel_config.button_list.
-void init_button();
-
-// Called after each on-screen panel is created, with a pointer to the panel.
-// Initializes the state of the frontend items. Also adds a pointer to it in backend->instances.
-// At this point the Area has not been added yet to the GUI tree, but it will be added right away.
-void init_button_panel(void *panel);
-
-// Called just before the panels are destroyed. Afterwards, tint2 exits or restarts and reads the config again.
-// Releases all frontends and then all the backends.
-// The frontend items are not freed by this function, only their members. The items are Areas which are freed in the
-// GUI element tree cleanup function (remove_area).
-void cleanup_button();
-
-// Called on draw, obj = pointer to the front-end Button item.
-void draw_button(void *obj, cairo_t *c);
-
-// Called on resize, obj = pointer to the front-end Button item.
-// Returns 1 if the new size is different than the previous size.
-gboolean resize_button(void *obj);
-
-// Called on mouse click event.
-void button_action(void *obj, int button, int x, int y, Time time);
-
-void button_default_font_changed();
-void button_default_icon_theme_changed();
-
-void button_reload_icon(Button *button);
-
-#endif // BUTTON_H

src/clock/clock.c

@@ -31,6 +31,7 @@
 #include "timer.h"
 #include "common.h"
 
+
 char *time1_format;
 char *time1_timezone;
 char *time2_format;
@@ -43,315 +44,264 @@ char *clock_rclick_command;
 char *clock_uwheel_command;
 char *clock_dwheel_command;
 struct timeval time_clock;
-gboolean time1_has_font;
 PangoFontDescription *time1_font_desc;
-gboolean time2_has_font;
 PangoFontDescription *time2_font_desc;
 static char buf_time[256];
 static char buf_date[256];
 static char buf_tooltip[512];
 int clock_enabled;
-static timeout *clock_timeout;
+static timeout* clock_timeout;
 
-void clock_init_fonts();
-char *clock_get_tooltip(void *obj);
-int clock_compute_desired_size(void *obj);
-void clock_dump_geometry(void *obj, int indent);
 
 void default_clock()
 {
-    clock_enabled = 0;
+	clock_enabled = 0;
-    clock_timeout = NULL;
+	clock_timeout = NULL;
-    time1_format = NULL;
+	time1_format = NULL;
-    time1_timezone = NULL;
+	time1_timezone = NULL;
-    time2_format = NULL;
+	time2_format = NULL;
-    time2_timezone = NULL;
+	time2_timezone = NULL;
-    time_tooltip_format = NULL;
+	time_tooltip_format = NULL;
-    time_tooltip_timezone = NULL;
+	time_tooltip_timezone = NULL;
-    clock_lclick_command = NULL;
+	clock_lclick_command = NULL;
-    clock_mclick_command = NULL;
+	clock_mclick_command = NULL;
-    clock_rclick_command = NULL;
+	clock_rclick_command = NULL;
-    clock_uwheel_command = NULL;
+	clock_uwheel_command = NULL;
-    clock_dwheel_command = NULL;
+	clock_dwheel_command = NULL;
-    time1_has_font = FALSE;
+	time1_font_desc = NULL;
-    time1_font_desc = NULL;
+	time2_font_desc = NULL;
-    time2_has_font = FALSE;
-    time2_font_desc = NULL;
-    buf_time[0] = 0;
-    buf_date[0] = 0;
-    buf_tooltip[0] = 0;
 }
 
 void cleanup_clock()
 {
-    pango_font_description_free(time1_font_desc);
+	pango_font_description_free(time1_font_desc);
-    time1_font_desc = NULL;
+	time1_font_desc = NULL;
-    pango_font_description_free(time2_font_desc);
+	pango_font_description_free(time2_font_desc);
-    time2_font_desc = NULL;
+	time2_font_desc = NULL;
-    free(time1_format);
+	free(time1_format);
-    time1_format = NULL;
+	time1_format = NULL;
-    free(time2_format);
+	free(time2_format);
-    time2_format = NULL;
+	time2_format = NULL;
-    free(time_tooltip_format);
+	free(time_tooltip_format);
-    time_tooltip_format = NULL;
+	time_tooltip_format = NULL;
-    free(time1_timezone);
+	free(time1_timezone);
-    time1_timezone = NULL;
+	time1_timezone = NULL;
-    free(time2_timezone);
+	free(time2_timezone);
-    time2_timezone = NULL;
+	time2_timezone = NULL;
-    free(time_tooltip_timezone);
+	free(time_tooltip_timezone);
-    time_tooltip_timezone = NULL;
+	time_tooltip_timezone = NULL;
-    free(clock_lclick_command);
+	free(clock_lclick_command);
-    clock_lclick_command = NULL;
+	clock_lclick_command = NULL;
-    free(clock_mclick_command);
+	free(clock_mclick_command);
-    clock_mclick_command = NULL;
+	clock_mclick_command = NULL;
-    free(clock_rclick_command);
+	free(clock_rclick_command);
-    clock_rclick_command = NULL;
+	clock_rclick_command = NULL;
-    free(clock_uwheel_command);
+	free(clock_uwheel_command);
-    clock_uwheel_command = NULL;
+	clock_uwheel_command = NULL;
-    free(clock_dwheel_command);
+	free(clock_dwheel_command);
-    clock_dwheel_command = NULL;
+	clock_dwheel_command = NULL;
-    stop_timeout(clock_timeout);
+	stop_timeout(clock_timeout);
-    clock_timeout = NULL;
+	clock_timeout = NULL;
 }
 
-struct tm *clock_gettime_for_tz(const char *timezone)
+
+void update_clocks_sec(void* arg)
 {
-    if (timezone) {
+	gettimeofday(&time_clock, 0);
-        const char *old_tz = getenv("TZ");
+	int i;
-        setenv("TZ", timezone, 1);
+	if (time1_format) {
-        struct tm *result = localtime(&time_clock.tv_sec);
+		for (i=0 ; i < nb_panel ; i++)
-        if (old_tz)
+			panel1[i].clock.area.resize = 1;
-            setenv("TZ", old_tz, 1);
+	}
-        else
+	panel_refresh = 1;
-            unsetenv("TZ");
-        return result;
-    } else {
-        return localtime(&time_clock.tv_sec);
-    }
 }
 
-void update_clocks()
+void update_clocks_min(void* arg)
 {
-    if (time1_format)
+	// remember old_sec because after suspend/hibernate the clock should be updated directly, and not
-        strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
+	// on next minute change
-    if (time2_format)
+	time_t old_sec = time_clock.tv_sec;
-        strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
+	gettimeofday(&time_clock, 0);
-    if (time1_format || time2_format) {
+	if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) {
-        for (int i = 0; i < num_panels; i++)
+		int i;
-            panels[i].clock.area.resize_needed = 1;
+		if (time1_format) {
-    }
+			for (i=0 ; i < nb_panel ; i++)
-    schedule_panel_redraw();
+				panel1[i].clock.area.resize = 1;
+		}
+		panel_refresh = 1;
+	}
 }
 
-int ms_until_second_change(struct timeval* tm)
+struct tm* clock_gettime_for_tz(const char* timezone) {
-{
+	if (timezone) {
-    long us_until_change = 1000000 - tm->tv_usec;
+		const char* old_tz = getenv("TZ");
-    // compute ms, rounding up so we don't ask to wait too short
+		setenv("TZ", timezone, 1);
-    int ms = (us_until_change+999)/1000;
+		struct tm* result = localtime(&time_clock.tv_sec);
-    return ms;
+		if (old_tz) setenv("TZ", old_tz, 1);
+		else unsetenv("TZ");
+		return result;
+	}
+	else return localtime(&time_clock.tv_sec);
 }
 
-void update_clocks_sec(void *arg)
+const char* clock_get_tooltip(void* obj)
 {
-    gettimeofday(&time_clock, 0);
+	strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
-    update_clocks();
+	return buf_tooltip;
-    clock_timeout = add_timeout(ms_until_second_change(&time_clock), 0, update_clocks_sec, 0, &clock_timeout);
 }
 
-void update_clocks_min(void *arg)
+int time_format_needs_sec_ticks(char *time_format)
 {
-    // remember old_sec because after suspend/hibernate the clock should be updated directly, and not
+	if (!time_format)
-    // on next minute change
+		return 0;
-    static time_t old_sec = 0;
+	if (strchr(time_format, 'S') || strchr(time_format, 'T') || strchr(time_format, 'r'))
-    gettimeofday(&time_clock, 0);
+		return 1;
-    if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60 || (time1_format && !buf_time[0]) || (time2_format && !buf_date[0]))
+	return 0;
-        update_clocks();
-    old_sec = time_clock.tv_sec;
-    clock_timeout = add_timeout(ms_until_second_change(&time_clock), 0, update_clocks_min, 0, &clock_timeout);
-}
-
-gboolean time_format_needs_sec_ticks(char *time_format)
-{
-    if (!time_format)
-        return FALSE;
-    if (strchr(time_format, 'S') || strchr(time_format, 'T') || strchr(time_format, 'r'))
-        return TRUE;
-    return FALSE;
 }
 
 void init_clock()
 {
+	if (!clock_timeout) {
+		if (time_format_needs_sec_ticks(time1_format) ||
+			time_format_needs_sec_ticks(time2_format)) {
+			clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0, &clock_timeout);
+		} else {
+			clock_timeout = add_timeout(10, 1000, update_clocks_min, 0, &clock_timeout);
+		}
+	}
 }
 
+
 void init_clock_panel(void *p)
 {
-    Panel *panel = (Panel *)p;
+	Panel *panel =(Panel*)p;
-    Clock *clock = &panel->clock;
+	Clock *clock = &panel->clock;
+	
+	if (!time1_font_desc)
+		time1_font_desc = pango_font_description_from_string(DEFAULT_FONT);
+	if (!time2_font_desc)
+		time2_font_desc = pango_font_description_from_string(DEFAULT_FONT);
+	if (!clock->area.bg)
+		clock->area.bg = &g_array_index(backgrounds, Background, 0);
+	clock->area.parent = p;
+	clock->area.panel = p;
+	clock->area._draw_foreground = draw_clock;
+	clock->area.size_mode = SIZE_BY_CONTENT;
+	clock->area._resize = resize_clock;
+	// check consistency
+	if (!time1_format)
+		return;
 
-    if (!clock->area.bg)
+	clock->area.resize = 1;
-        clock->area.bg = &g_array_index(backgrounds, Background, 0);
+	clock->area.on_screen = 1;
-    clock_init_fonts();
-    clock->area.parent = p;
-    clock->area.panel = p;
-    snprintf(clock->area.name, sizeof(clock->area.name), "Clock");
-    clock->area._is_under_mouse = full_width_area_is_under_mouse;
-    clock->area.has_mouse_press_effect = clock->area.has_mouse_over_effect =
-        panel_config.mouse_effects && (clock_lclick_command || clock_mclick_command || clock_rclick_command ||
-                                       clock_uwheel_command || clock_dwheel_command);
-    clock->area._draw_foreground = draw_clock;
-    clock->area.size_mode = LAYOUT_FIXED;
-    clock->area._resize = resize_clock;
-    clock->area._compute_desired_size = clock_compute_desired_size;
-    clock->area._dump_geometry = clock_dump_geometry;
-    // check consistency
-    if (!time1_format)
-        return;
 
-    clock->area.resize_needed = 1;
+	if (time_tooltip_format) {
-    clock->area.on_screen = TRUE;
+		clock->area._get_tooltip_text = clock_get_tooltip;
-    instantiate_area_gradients(&clock->area);
+		strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
-
+	}
-    if (time_tooltip_format) {
-        clock->area._get_tooltip_text = clock_get_tooltip;
-        strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
-    }
-
-    if (!clock_timeout) {
-        if (time_format_needs_sec_ticks(time1_format) || time_format_needs_sec_ticks(time2_format)) {
-            update_clocks_sec(NULL);
-        } else {
-            update_clocks_min(NULL);
-        }
-    }
 }
 
-void clock_init_fonts()
+
+void draw_clock (void *obj, cairo_t *c)
 {
-    if (!time1_font_desc) {
+	Clock *clock = obj;
-        time1_font_desc = pango_font_description_from_string(get_default_font());
+	PangoLayout *layout;
-        pango_font_description_set_weight(time1_font_desc, PANGO_WEIGHT_BOLD);
+
-        pango_font_description_set_size(time1_font_desc, pango_font_description_get_size(time1_font_desc));
+	layout = pango_cairo_create_layout (c);
-    }
+
-    if (!time2_font_desc) {
+	// draw layout
-        time2_font_desc = pango_font_description_from_string(get_default_font());
+	pango_layout_set_font_description (layout, time1_font_desc);
-        pango_font_description_set_size(time2_font_desc,
+	pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
-                                        pango_font_description_get_size(time2_font_desc) - PANGO_SCALE);
+	pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
-    }
+	pango_layout_set_text (layout, buf_time, strlen(buf_time));
+
+	cairo_set_source_rgba (c, clock->font.color[0], clock->font.color[1], clock->font.color[2], clock->font.alpha);
+
+	pango_cairo_update_layout (c, layout);
+	draw_text(layout, c, 0, clock->time1_posy, &clock->font, ((Panel*)clock->area.panel)->font_shadow);
+
+	if (time2_format) {
+		pango_layout_set_font_description (layout, time2_font_desc);
+		pango_layout_set_indent(layout, 0);
+		pango_layout_set_text (layout, buf_date, strlen(buf_date));
+		pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
+
+		pango_cairo_update_layout (c, layout);
+		draw_text(layout, c, 0, clock->time2_posy, &clock->font, ((Panel*)clock->area.panel)->font_shadow);
+	}
+
+	g_object_unref (layout);
 }
 
-void clock_default_font_changed()
+
+int resize_clock (void *obj)
 {
-    if (!clock_enabled)
+	Clock *clock = obj;
-        return;
+	Panel *panel = clock->area.panel;
-    if (time1_has_font && time2_has_font)
+	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width, ret = 0;
-        return;
+
-    if (!time1_has_font) {
+	clock->area.redraw = 1;
-        pango_font_description_free(time1_font_desc);
+	
-        time1_font_desc = NULL;
+	date_height = date_width = 0;
-    }
+	strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
-    if (!time2_has_font) {
+	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_font_description_free(time2_font_desc);
+	if (time2_format) {
-        time2_font_desc = NULL;
+		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));
-    clock_init_fonts();
+	}
-    for (int i = 0; i < num_panels; i++) {
+
-        panels[i].clock.area.resize_needed = TRUE;
+	if (panel_horizontal) {
-        schedule_redraw(&panels[i].clock.area);
+		int new_size = (time_width > date_width) ? time_width : date_width;
-    }
+		new_size += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
-    schedule_panel_redraw();
+		if (new_size > clock->area.width || new_size < (clock->area.width-6)) {
+			// we try to limit the number of resize
+			clock->area.width = new_size + 1;
+			clock->time1_posy = (clock->area.height - time_height) / 2;
+			if (time2_format) {
+				clock->time1_posy -= (date_height)/2;
+				clock->time2_posy = clock->time1_posy + time_height;
+			}
+			ret = 1;
+		}
+	}
+	else {
+		int new_size = time_height + date_height + (2 * (clock->area.paddingxlr + clock->area.bg->border.width));
+		if (new_size != clock->area.height) {
+			// we try to limit the number of resize
+			clock->area.height =  new_size;
+			clock->time1_posy = (clock->area.height - time_height) / 2;
+			if (time2_format) {
+				clock->time1_posy -= (date_height)/2;
+				clock->time2_posy = clock->time1_posy + time_height;
+			}
+			ret = 1;
+		}
+	}
+
+	return ret;
 }
 
-void clock_compute_text_geometry(Clock *clock,
+
-                                 int *time_height_ink,
+void clock_action(int button)
-                                 int *time_height,
-                                 int *time_width,
-                                 int *date_height_ink,
-                                 int *date_height,
-                                 int *date_width)
 {
-    area_compute_text_geometry(&clock->area,
+	char *command = 0;
-                               buf_time,
+	switch (button) {
-                               time2_format ? buf_date : NULL,
+		case 1:
-                               time1_font_desc,
+		command = clock_lclick_command;
-                               time2_font_desc,
+		break;
-                               time_height_ink,
+		case 2:
-                               time_height,
+		command = clock_mclick_command;
-                               time_width,
+		break;
-                               date_height_ink,
+		case 3:
-                               date_height,
+		command = clock_rclick_command;
-                               date_width);
+		break;
+		case 4:
+		command = clock_uwheel_command;
+		break;
+		case 5:
+		command = clock_dwheel_command;
+		break;
+	}
+	tint_exec(command);
 }
 
-int clock_compute_desired_size(void *obj)
-{
-    Clock *clock = (Clock *)obj;
-    return text_area_compute_desired_size(&clock->area,
-                                          buf_time,
-                                          time2_format ? buf_date : NULL,
-                                          time1_font_desc,
-                                          time2_font_desc);
-}
-
-gboolean resize_clock(void *obj)
-{
-    Clock *clock = (Clock *)obj;
-    return resize_text_area(&clock->area,
-                            buf_time,
-                            time2_format ? buf_date : NULL,
-                            time1_font_desc,
-                            time2_font_desc,
-                            &clock->time1_posy,
-                            &clock->time2_posy);
-}
-
-void draw_clock(void *obj, cairo_t *c)
-{
-    Clock *clock = (Clock *)obj;
-    draw_text_area(&clock->area,
-                   c,
-                   buf_time,
-                   time2_format ? buf_date : NULL,
-                   time1_font_desc,
-                   time2_font_desc,
-                   clock->time1_posy,
-                   clock->time2_posy,
-                   &clock->font);
-}
-
-void clock_dump_geometry(void *obj, int indent)
-{
-    Clock *clock = (Clock *)obj;
-    fprintf(stderr, "tint2: %*sText 1: y = %d, text = %s\n", indent, "", clock->time1_posy, buf_time);
-    if (time2_format) {
-        fprintf(stderr, "tint2: %*sText 2: y = %d, text = %s\n", indent, "", clock->time2_posy, buf_date);
-    }
-}
-
-char *clock_get_tooltip(void *obj)
-{
-    strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
-    return strdup(buf_tooltip);
-}
-
-void clock_action(void *obj, int button, int x, int y, Time time)
-{
-    char *command = NULL;
-    switch (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, NULL, NULL, time, obj, x, y, FALSE, TRUE);
-}

src/clock/clock.h

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

src/config.h

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

src/drag_and_drop.c

@@ -1,444 +0,0 @@
-/**************************************************************************
-* Copyright (C) 2017 tint2 authors
-*
-* 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "drag_and_drop.h"
-#include "panel.h"
-#include "server.h"
-#include "task.h"
-
-// Drag and Drop state variables
-static Window dnd_source_window;
-static Window dnd_target_window;
-static int dnd_version;
-static Atom dnd_selection;
-static Atom dnd_atom;
-static int dnd_sent_request;
-static LauncherIcon *dnd_launcher_icon;
-gboolean debug_dnd = FALSE;
-
-gboolean hidden_panel_shown_for_dnd;
-
-// This fetches all the data from a property
-struct Property dnd_read_property(Display *disp, Window w, Atom property)
-{
-    Atom actual_type;
-    int actual_format;
-    unsigned long nitems;
-    unsigned long bytes_after;
-    unsigned char *ret = 0;
-
-    int read_bytes = 1024;
-
-    // Keep trying to read the property until there are no
-    // bytes unread.
-    do {
-        if (ret != 0)
-            XFree(ret);
-        XGetWindowProperty(disp,
-                           w,
-                           property,
-                           0,
-                           read_bytes,
-                           False,
-                           AnyPropertyType,
-                           &actual_type,
-                           &actual_format,
-                           &nitems,
-                           &bytes_after,
-                           &ret);
-        read_bytes *= 2;
-    } while (bytes_after != 0);
-
-    if (debug_dnd)
-        fprintf(stderr, "tint2: DnD %s:%d: Property:\n", __FILE__, __LINE__);
-    fprintf(stderr, "tint2: DnD %s:%d: Actual type: %s\n", __FILE__, __LINE__, GetAtomName(disp, actual_type));
-    fprintf(stderr, "tint2: DnD %s:%d: Actual format: %d\n", __FILE__, __LINE__, actual_format);
-    fprintf(stderr, "tint2: DnD %s:%d: Number of items: %lu\n", __FILE__, __LINE__, nitems);
-
-    Property p;
-    p.data = ret;
-    p.format = actual_format;
-    p.nitems = nitems;
-    p.type = actual_type;
-
-    return p;
-}
-
-// This function takes a list of targets which can be converted to (atom_list, nitems)
-// and a list of acceptable targets with prioritees (datatypes). It returns the highest
-// entry in datatypes which is also in atom_list: ie it finds the best match.
-Atom dnd_pick_target_from_list(Display *disp, Atom *atom_list, int nitems)
-{
-    Atom to_be_requested = None;
-    int i;
-    for (i = 0; i < nitems; i++) {
-        const char *atom_name = GetAtomName(disp, atom_list[i]);
-        fprintf(stderr, "tint2: DnD %s:%d: Type %d = %s\n", __FILE__, __LINE__, i, atom_name);
-
-        // See if this data type is allowed and of higher priority (closer to zero)
-        // than the present one.
-        if (strcasecmp(atom_name, "STRING") == 0) {
-            to_be_requested = atom_list[i];
-        } else if (strcasecmp(atom_name, "text/uri-list") == 0 && !to_be_requested) {
-            to_be_requested = atom_list[i];
-        }
-    }
-
-    fprintf(stderr,
-            "tint2: DnD %s:%d: Accepting: Type %s\n",
-            __FILE__,
-            __LINE__,
-            GetAtomName(server.display, to_be_requested));
-
-    return to_be_requested;
-}
-
-// Finds the best target given up to three atoms provided (any can be None).
-// Useful for part of the Xdnd protocol.
-Atom dnd_pick_target_from_atoms(Display *disp, Atom t1, Atom t2, Atom t3)
-{
-    Atom atoms[3];
-    int n = 0;
-
-    if (t1 != None)
-        atoms[n++] = t1;
-
-    if (t2 != None)
-        atoms[n++] = t2;
-
-    if (t3 != None)
-        atoms[n++] = t3;
-
-    return dnd_pick_target_from_list(disp, atoms, n);
-}
-
-// Finds the best target given a local copy of a property.
-Atom dnd_pick_target_from_targets(Display *disp, Property p)
-{
-    // The list of targets is a list of atoms, so it should have type XA_ATOM
-    // but it may have the type TARGETS instead.
-
-    if ((p.type != XA_ATOM && p.type != server.atom.TARGETS) || p.format != 32) {
-        // This would be really broken. Targets have to be an atom list
-        // and applications should support this. Nevertheless, some
-        // seem broken (MATLAB 7, for instance), so ask for STRING
-        // next instead as the lowest common denominator
-        return XA_STRING;
-    } else {
-        Atom *atom_list = (Atom *)p.data;
-
-        return dnd_pick_target_from_list(disp, atom_list, p.nitems);
-    }
-}
-
-void dnd_init()
-{
-    dnd_source_window = 0;
-    dnd_target_window = 0;
-    dnd_version = 0;
-    dnd_selection = XInternAtom(server.display, "PRIMARY", 0);
-    dnd_atom = None;
-    dnd_sent_request = 0;
-    dnd_launcher_icon = NULL;
-    hidden_panel_shown_for_dnd = FALSE;
-}
-
-void handle_dnd_enter(XClientMessageEvent *e)
-{
-    dnd_atom = None;
-    int more_than_3 = e->data.l[1] & 1;
-    dnd_source_window = e->data.l[0];
-    dnd_version = (e->data.l[1] >> 24);
-
-    if (debug_dnd) {
-        fprintf(stderr, "tint2: DnD %s:%d: DnDEnter\n", __FILE__, __LINE__);
-        fprintf(stderr,
-                "DnD %s:%d: DnDEnter. Supports > 3 types = %s\n",
-                __FILE__,
-                __LINE__,
-                more_than_3 ? "yes" : "no");
-        fprintf(stderr, "tint2: DnD %s:%d: Protocol version = %d\n", __FILE__, __LINE__, dnd_version);
-        fprintf(stderr,
-                "tint2: DnD %s:%d: Type 1 = %s\n",
-                __FILE__,
-                __LINE__,
-                GetAtomName(server.display, e->data.l[2]));
-        fprintf(stderr,
-                "tint2: DnD %s:%d: Type 2 = %s\n",
-                __FILE__,
-                __LINE__,
-                GetAtomName(server.display, e->data.l[3]));
-        fprintf(stderr,
-                "tint2: DnD %s:%d: Type 3 = %s\n",
-                __FILE__,
-                __LINE__,
-                GetAtomName(server.display, e->data.l[4]));
-    }
-
-    // Query which conversions are available and pick the best
-    if (more_than_3) {
-        // Fetch the list of possible conversions
-        // Notice the similarity to TARGETS with paste.
-        Property p = dnd_read_property(server.display, dnd_source_window, server.atom.XdndTypeList);
-        dnd_atom = dnd_pick_target_from_targets(server.display, p);
-        XFree(p.data);
-    } else {
-        // Use the available list
-        dnd_atom = dnd_pick_target_from_atoms(server.display, e->data.l[2], e->data.l[3], e->data.l[4]);
-    }
-
-    if (debug_dnd)
-        fprintf(stderr,
-                "tint2: DnD %s:%d: Requested type = %s\n",
-                __FILE__,
-                __LINE__,
-                GetAtomName(server.display, dnd_atom));
-}
-
-void handle_dnd_position(XClientMessageEvent *e)
-{
-    dnd_target_window = e->window;
-    int accept = 0;
-    Panel *panel = get_panel(e->window);
-    int x, y, mapX, mapY;
-    Window child;
-    x = (e->data.l[2] >> 16) & 0xFFFF;
-    y = e->data.l[2] & 0xFFFF;
-    XTranslateCoordinates(server.display, server.root_win, e->window, x, y, &mapX, &mapY, &child);
-    Task *task = click_task(panel, mapX, mapY);
-    if (task) {
-        if (task->desktop != server.desktop)
-            change_desktop(task->desktop);
-        task_handle_mouse_event(task, TOGGLE);
-    } else {
-        LauncherIcon *icon = click_launcher_icon(panel, mapX, mapY);
-        if (icon) {
-            accept = 1;
-            dnd_launcher_icon = icon;
-        } else {
-            dnd_launcher_icon = NULL;
-        }
-    }
-
-    // send XdndStatus event to get more XdndPosition events
-    XClientMessageEvent se;
-    se.type = ClientMessage;
-    se.window = e->data.l[0];
-    se.message_type = server.atom.XdndStatus;
-    se.format = 32;
-    se.data.l[0] = e->window;      // XID of the target window
-    se.data.l[1] = accept ? 1 : 0; // bit 0: accept drop    bit 1: send XdndPosition events if inside rectangle
-    se.data.l[2] = 0;              // Rectangle x,y for which no more XdndPosition events
-    se.data.l[3] = (1 << 16) | 1;  // Rectangle w,h for which no more XdndPosition events
-    if (accept) {
-        se.data.l[4] = server.atom.XdndActionCopy;
-    } else {
-        se.data.l[4] = None; // None = drop will not be accepted
-    }
-
-    if (debug_dnd)
-        fprintf(stderr,
-                "tint2: DnD %s:%d: Accepted: %s\n",
-                __FILE__,
-                __LINE__,
-                accept ? GetAtomName(server.display, (Atom)se.data.l[4]) : "no");
-
-    XSendEvent(server.display, e->data.l[0], False, NoEventMask, (XEvent *)&se);
-}
-
-void handle_dnd_drop(XClientMessageEvent *e)
-{
-    if (dnd_target_window && dnd_launcher_icon) {
-        if (dnd_version >= 1) {
-            XConvertSelection(server.display,
-                              server.atom.XdndSelection,
-                              dnd_atom,
-                              dnd_selection,
-                              dnd_target_window,
-                              e->data.l[2]);
-        } else {
-            XConvertSelection(server.display,
-                              server.atom.XdndSelection,
-                              dnd_atom,
-                              dnd_selection,
-                              dnd_target_window,
-                              CurrentTime);
-        }
-    } else {
-        // The source is sending anyway, despite instructions to the contrary.
-        // So reply that we're not interested.
-        XClientMessageEvent m;
-        memset(&m, 0, sizeof(m));
-        m.type = ClientMessage;
-        m.display = e->display;
-        m.window = e->data.l[0];
-        m.message_type = server.atom.XdndFinished;
-        m.format = 32;
-        m.data.l[0] = dnd_target_window;
-        m.data.l[1] = 0;
-        m.data.l[2] = None; // Failed.
-        XSendEvent(server.display, e->data.l[0], False, NoEventMask, (XEvent *)&m);
-    }
-}
-
-void handle_dnd_selection_notify(XSelectionEvent *e)
-{
-    Atom target = e->target;
-
-    if (debug_dnd) {
-        fprintf(stderr, "tint2: DnD %s:%d: A selection notify has arrived!\n", __FILE__, __LINE__);
-        fprintf(stderr,
-                "DnD %s:%d: Selection atom = %s\n",
-                __FILE__,
-                __LINE__,
-                GetAtomName(server.display, e->selection));
-        fprintf(stderr, "tint2: DnD %s:%d: Target atom = %s\n", __FILE__, __LINE__, GetAtomName(server.display, target));
-        fprintf(stderr,
-                "DnD %s:%d: Property atom  = %s\n",
-                __FILE__,
-                __LINE__,
-                GetAtomName(server.display, e->property));
-    }
-
-    if (dnd_launcher_icon) {
-        Property prop = dnd_read_property(server.display, dnd_target_window, dnd_selection);
-
-        if (prop.data) {
-            // If we're being given a list of targets (possible conversions)
-            if (target == server.atom.TARGETS && !dnd_sent_request) {
-                dnd_sent_request = 1;
-                dnd_atom = dnd_pick_target_from_targets(server.display, prop);
-
-                if (dnd_atom == None) {
-                    if (debug_dnd)
-                        fprintf(stderr, "tint2: No matching datatypes.\n");
-                } else {
-                    // Request the data type we are able to select
-                    if (debug_dnd)
-                        fprintf(stderr, "tint2: Now requsting type %s", GetAtomName(server.display, dnd_atom));
-                    XConvertSelection(server.display,
-                                      dnd_selection,
-                                      dnd_atom,
-                                      dnd_selection,
-                                      dnd_target_window,
-                                      CurrentTime);
-                }
-            } else if (target == dnd_atom) {
-                // Dump the binary data
-                if (debug_dnd) {
-                    fprintf(stderr, "tint2: DnD %s:%d: Received data:\n", __FILE__, __LINE__);
-                    fprintf(stderr, "tint2: --------\n");
-                    for (int i = 0; i < prop.nitems * prop.format / 8; i++)
-                        fprintf(stderr, "%c", ((char *)prop.data)[i]);
-                    fprintf(stderr, "tint2: --------\n");
-                }
-
-                // https://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables
-                GString *cmd = g_string_new(dnd_launcher_icon->cmd);
-
-                const char *atom_name = GetAtomName(server.display, prop.type);
-                if (strcasecmp(atom_name, "STRING") == 0 || strcasecmp(atom_name, "text/uri-list") == 0) {
-                    GString *url = g_string_new("");
-                    GString *prev_url = g_string_new("");
-                    gboolean must_unescape = strcasecmp(atom_name, "text/uri-list") == 0;
-                    for (int i = 0; i < prop.nitems * prop.format / 8; i++) {
-                        char c = ((char *)prop.data)[i];
-                        if (c == '\n') {
-                            if (must_unescape) {
-                                char *raw = g_uri_unescape_string(url->str, NULL);
-                                if (raw) {
-                                    g_string_assign(url, raw);
-                                }
-                                free(raw);
-                            }
-                            // Many programs cannot handle this prefix
-                            tint2_g_string_replace(url, "file://", "");
-                            // Some programs put duplicates in the list, we remove them
-                            if (strcmp(url->str, prev_url->str) != 0) {
-                                if (strstr(cmd->str, "%F")) {
-                                    GString *piece = g_string_new("");
-                                    g_string_append(piece, " \"");
-                                    g_string_append(piece, url->str);
-                                    g_string_append(piece, "\"");
-                                    g_string_append(piece, " %F");
-                                    tint2_g_string_replace(cmd, "%F", piece->str);
-                                    g_string_free(piece, TRUE);
-                                } else if (strstr(cmd->str, "%f")) {
-                                    GString *piece = g_string_new("");
-                                    g_string_append(piece, " \"");
-                                    g_string_append(piece, url->str);
-                                    g_string_append(piece, "\"");
-                                    tint2_g_string_replace(cmd, "%f", piece->str);
-                                    g_string_free(piece, TRUE);
-                                    break;
-                                } else {
-                                    g_string_append(cmd, " \"");
-                                    g_string_append(cmd, url->str);
-                                    g_string_append(cmd, "\"");
-                                }
-                            }
-                            g_string_assign(prev_url, url->str);
-                            g_string_assign(url, "");
-                        } else if (c == '\r') {
-                            // Nothing to do
-                        } else {
-                            if (c == '`' || c == '$' || c == '\\') {
-                                g_string_append(url, "\\");
-                            }
-                            g_string_append_c(url, c);
-                        }
-                    }
-                    g_string_free(url, TRUE);
-                    g_string_free(prev_url, TRUE);
-                }
-                tint2_g_string_replace(cmd, "%F", "");
-                tint2_g_string_replace(cmd, "%f", "");
-                if (debug_dnd)
-                    fprintf(stderr, "tint2: DnD %s:%d: Running command: %s\n", __FILE__, __LINE__, cmd->str);
-                tint_exec(cmd->str,
-                          NULL,
-                          NULL,
-                          e->time,
-                          NULL,
-                          0,
-                          0,
-                          dnd_launcher_icon->start_in_terminal,
-                          dnd_launcher_icon->startup_notification);
-                g_string_free(cmd, TRUE);
-
-                // Reply OK.
-                XClientMessageEvent m;
-                memset(&m, 0, sizeof(m));
-                m.type = ClientMessage;
-                m.display = server.display;
-                m.window = dnd_source_window;
-                m.message_type = server.atom.XdndFinished;
-                m.format = 32;
-                m.data.l[0] = dnd_target_window;
-                m.data.l[1] = 1;
-                m.data.l[2] = server.atom.XdndActionCopy; // We only ever copy.
-                XSendEvent(server.display, dnd_source_window, False, NoEventMask, (XEvent *)&m);
-                XSync(server.display, False);
-            }
-
-            XFree(prop.data);
-        }
-    }
-}

src/drag_and_drop.h

@@ -1,22 +0,0 @@
-/**************************************************************************
- * Copyright (C) 2017 tint2 authors
- *
- **************************************************************************/
-
-#ifndef DRAG_AND_DROP_H
-#define DRAG_AND_DROP_H
-
-#include <X11/Xlib.h>
-#include <glib.h>
-
-extern gboolean hidden_panel_shown_for_dnd;
-extern gboolean debug_dnd;
-
-void dnd_init();
-
-void handle_dnd_enter(XClientMessageEvent *e);
-void handle_dnd_position(XClientMessageEvent *e);
-void handle_dnd_drop(XClientMessageEvent *e);
-void handle_dnd_selection_notify(XSelectionEvent *e);
-
-#endif

src/execplugin/execplugin.c

@@ -1,999 +0,0 @@
-#include "execplugin.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <cairo.h>
-#include <cairo-xlib.h>
-#include <math.h>
-#include <pango/pangocairo.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <time.h>
-#include <fcntl.h>
-
-#include "window.h"
-#include "server.h"
-#include "panel.h"
-#include "timer.h"
-#include "common.h"
-
-#define MAX_TOOLTIP_LEN 4096
-
-void execp_timer_callback(void *arg);
-char *execp_get_tooltip(void *obj);
-void execp_init_fonts();
-int execp_compute_desired_size(void *obj);
-void execp_dump_geometry(void *obj, int indent);
-
-void default_execp()
-{
-}
-
-Execp *create_execp()
-{
-    Execp *execp = (Execp *)calloc(1, sizeof(Execp));
-    execp->backend = (ExecpBackend *)calloc(1, sizeof(ExecpBackend));
-    execp->backend->child_pipe_stdout = -1;
-    execp->backend->child_pipe_stderr = -1;
-    execp->backend->cmd_pids = g_tree_new(cmp_ptr);
-    execp->backend->interval = 30;
-    execp->backend->cache_icon = TRUE;
-    execp->backend->centered = TRUE;
-    execp->backend->font_color.alpha = 0.5;
-    return execp;
-}
-
-gpointer create_execp_frontend(gconstpointer arg, gpointer data)
-{
-    Execp *execp_backend = (Execp *)arg;
-
-    Execp *execp_frontend = (Execp *)calloc(1, sizeof(Execp));
-    execp_frontend->backend = execp_backend->backend;
-    execp_backend->backend->instances = g_list_append(execp_backend->backend->instances, execp_frontend);
-    execp_frontend->frontend = (ExecpFrontend *)calloc(1, sizeof(ExecpFrontend));
-    return execp_frontend;
-}
-
-void destroy_execp(void *obj)
-{
-    Execp *execp = (Execp *)obj;
-    if (execp->frontend) {
-        // This is a frontend element
-        execp->backend->instances = g_list_remove_all(execp->backend->instances, execp);
-        free_and_null(execp->frontend);
-        remove_area(&execp->area);
-        free_area(&execp->area);
-        free_and_null(execp);
-    } else {
-        // This is a backend element
-        stop_timeout(execp->backend->timer);
-        execp->backend->timer = NULL;
-
-        free_icon(execp->backend->icon);
-        free_and_null(execp->backend->buf_stdout);
-        free_and_null(execp->backend->buf_stderr);
-        free_and_null(execp->backend->text);
-        free_and_null(execp->backend->icon_path);
-        if (execp->backend->child) {
-            kill(-execp->backend->child, SIGHUP);
-            execp->backend->child = 0;
-        }
-        if (execp->backend->child_pipe_stdout >= 0) {
-            close(execp->backend->child_pipe_stdout);
-            execp->backend->child_pipe_stdout = -1;
-        }
-        if (execp->backend->child_pipe_stderr >= 0) {
-            close(execp->backend->child_pipe_stderr);
-            execp->backend->child_pipe_stderr = -1;
-        }
-        if (execp->backend->cmd_pids) {
-            g_tree_destroy(execp->backend->cmd_pids);
-            execp->backend->cmd_pids = NULL;
-        }
-
-        execp->backend->bg = NULL;
-        pango_font_description_free(execp->backend->font_desc);
-        execp->backend->font_desc = NULL;
-        free_and_null(execp->backend->command);
-        free_and_null(execp->backend->tooltip);
-        free_and_null(execp->backend->lclick_command);
-        free_and_null(execp->backend->mclick_command);
-        free_and_null(execp->backend->rclick_command);
-        free_and_null(execp->backend->dwheel_command);
-        free_and_null(execp->backend->uwheel_command);
-
-        if (execp->backend->instances) {
-            fprintf(stderr, "tint2: Error: Attempt to destroy backend while there are still frontend instances!\n");
-            exit(EXIT_FAILURE);
-        }
-        free(execp->backend);
-        free(execp);
-    }
-}
-
-void init_execp()
-{
-    GList *to_remove = panel_config.execp_list;
-    for (int k = 0; k < strlen(panel_items_order) && to_remove; k++) {
-        if (panel_items_order[k] == 'E') {
-            to_remove = to_remove->next;
-        }
-    }
-
-    if (to_remove) {
-        if (to_remove == panel_config.execp_list) {
-            g_list_free_full(to_remove, destroy_execp);
-            panel_config.execp_list = NULL;
-        } else {
-            // Cut panel_config.execp_list
-            if (to_remove->prev)
-                to_remove->prev->next = NULL;
-            to_remove->prev = NULL;
-            // Remove all elements of to_remove and to_remove itself
-            g_list_free_full(to_remove, destroy_execp);
-        }
-    }
-
-    execp_init_fonts();
-    for (GList *l = panel_config.execp_list; l; l = l->next) {
-        Execp *execp = l->data;
-
-        // Set missing config options
-        if (!execp->backend->bg)
-            execp->backend->bg = &g_array_index(backgrounds, Background, 0);
-        execp->backend->buf_stdout_capacity = 1024;
-        execp->backend->buf_stdout = calloc(execp->backend->buf_stdout_capacity, 1);
-        execp->backend->buf_stderr_capacity = 1024;
-        execp->backend->buf_stderr = calloc(execp->backend->buf_stderr_capacity, 1);
-        execp->backend->text = strdup("");
-        execp->backend->icon_path = NULL;
-    }
-}
-
-void init_execp_panel(void *p)
-{
-    Panel *panel = (Panel *)p;
-
-    // Make sure this is only done once if there are multiple items
-    if (panel->execp_list && ((Execp *)panel->execp_list->data)->frontend)
-        return;
-
-    // panel->execp_list is now a copy of the pointer panel_config.execp_list
-    // We make it a deep copy
-    panel->execp_list = g_list_copy_deep(panel_config.execp_list, create_execp_frontend, NULL);
-
-    for (GList *l = panel->execp_list; l; l = l->next) {
-        Execp *execp = l->data;
-        execp->area.bg = execp->backend->bg;
-        execp->area.paddingx = execp->backend->paddingx;
-        execp->area.paddingy = execp->backend->paddingy;
-        execp->area.paddingxlr = execp->backend->paddingxlr;
-        execp->area.parent = panel;
-        execp->area.panel = panel;
-        execp->area._dump_geometry = execp_dump_geometry;
-        execp->area._compute_desired_size = execp_compute_desired_size;
-        snprintf(execp->area.name,
-                 sizeof(execp->area.name),
-                 "Execp %s",
-                 execp->backend->command ? execp->backend->command : "null");
-        execp->area._draw_foreground = draw_execp;
-        execp->area.size_mode = LAYOUT_FIXED;
-        execp->area._resize = resize_execp;
-        execp->area._get_tooltip_text = execp_get_tooltip;
-        execp->area._is_under_mouse = full_width_area_is_under_mouse;
-        execp->area.has_mouse_press_effect =
-            panel_config.mouse_effects &&
-            (execp->area.has_mouse_over_effect = execp->backend->lclick_command || execp->backend->mclick_command ||
-                                                 execp->backend->rclick_command || execp->backend->uwheel_command ||
-                                                 execp->backend->dwheel_command);
-
-        execp->area.resize_needed = TRUE;
-        execp->area.on_screen = TRUE;
-        instantiate_area_gradients(&execp->area);
-
-        execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
-
-        execp_update_post_read(execp);
-    }
-}
-
-void execp_init_fonts()
-{
-    for (GList *l = panel_config.execp_list; l; l = l->next) {
-        Execp *execp = l->data;
-        if (!execp->backend->font_desc)
-            execp->backend->font_desc = pango_font_description_from_string(get_default_font());
-    }
-}
-
-void execp_default_font_changed()
-{
-    gboolean needs_update = FALSE;
-    for (GList *l = panel_config.execp_list; l; l = l->next) {
-        Execp *execp = l->data;
-
-        if (!execp->backend->has_font) {
-            pango_font_description_free(execp->backend->font_desc);
-            execp->backend->font_desc = NULL;
-            needs_update = TRUE;
-        }
-    }
-    if (!needs_update)
-        return;
-
-    execp_init_fonts();
-    for (int i = 0; i < num_panels; i++) {
-        for (GList *l = panels[i].execp_list; l; l = l->next) {
-            Execp *execp = l->data;
-
-            if (!execp->backend->has_font) {
-                execp->area.resize_needed = TRUE;
-                schedule_redraw(&execp->area);
-            }
-        }
-    }
-    schedule_panel_redraw();
-}
-
-void cleanup_execp()
-{
-    // Cleanup frontends
-    for (int i = 0; i < num_panels; i++) {
-        g_list_free_full(panels[i].execp_list, destroy_execp);
-        panels[i].execp_list = NULL;
-    }
-
-    // Cleanup backends
-    g_list_free_full(panel_config.execp_list, destroy_execp);
-    panel_config.execp_list = NULL;
-}
-
-// Called from backend functions.
-gboolean reload_icon(Execp *execp)
-{
-    char *icon_path = execp->backend->icon_path;
-
-    if (execp->backend->has_icon && icon_path) {
-        if (execp->backend->icon) {
-            imlib_context_set_image(execp->backend->icon);
-            imlib_free_image();
-        }
-        execp->backend->icon = load_image(icon_path, execp->backend->cache_icon);
-        if (execp->backend->icon) {
-            imlib_context_set_image(execp->backend->icon);
-            int w = imlib_image_get_width();
-            int h = imlib_image_get_height();
-            if (w && h) {
-                if (execp->backend->icon_w) {
-                    if (!execp->backend->icon_h) {
-                        h = (int)(0.5 + h * execp->backend->icon_w / (float)(w));
-                        w = execp->backend->icon_w;
-                    } else {
-                        w = execp->backend->icon_w;
-                        h = execp->backend->icon_h;
-                    }
-                } else {
-                    if (execp->backend->icon_h) {
-                        w = (int)(0.5 + w * execp->backend->icon_h / (float)(h));
-                        h = execp->backend->icon_h;
-                    }
-                }
-                if (w < 1)
-                    w = 1;
-                if (h < 1)
-                    h = 1;
-            }
-            if (w != imlib_image_get_width() || h != imlib_image_get_height()) {
-                Imlib_Image icon_scaled =
-                    imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), w, h);
-                imlib_context_set_image(execp->backend->icon);
-                imlib_free_image();
-                execp->backend->icon = icon_scaled;
-            }
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-void execp_compute_icon_text_geometry(Execp *execp,
-                                      int *horiz_padding,
-                                      int *vert_padding,
-                                      int *interior_padding,
-                                      int *icon_w,
-                                      int *icon_h,
-                                      gboolean *text_next_line,
-                                      int *txt_height_ink,
-                                      int *txt_height,
-                                      int *txt_width,
-                                      int *new_size,
-                                      gboolean *resized)
-{
-    Panel *panel = (Panel *)execp->area.panel;
-    Area *area = &execp->area;
-    *horiz_padding = (panel_horizontal ? area->paddingxlr : area->paddingy);
-    *vert_padding = (panel_horizontal ? area->paddingy : area->paddingxlr);
-    *interior_padding = area->paddingx;
-
-    if (reload_icon(execp)) {
-        if (execp->backend->icon) {
-            imlib_context_set_image(execp->backend->icon);
-            *icon_w = imlib_image_get_width();
-            *icon_h = imlib_image_get_height();
-        } else {
-            *icon_w = *icon_h = 0;
-        }
-    } else {
-        *icon_w = *icon_h = 0;
-    }
-
-    *text_next_line = !panel_horizontal && *icon_w > area->width / 2;
-
-    int available_w, available_h;
-    if (panel_horizontal) {
-        available_w = panel->area.width;
-        available_h = area->height - 2 * area->paddingy - left_right_border_width(area);
-    } else {
-        available_w = !text_next_line
-                          ? area->width - *icon_w - (*icon_w ? *interior_padding : 0) - 2 * *horiz_padding -
-                                left_right_border_width(area)
-                          : area->width - 2 * *horiz_padding - left_right_border_width(area);
-        available_h = panel->area.height;
-    }
-    get_text_size2(execp->backend->font_desc,
-                   txt_height_ink,
-                   txt_height,
-                   txt_width,
-                   available_h,
-                   available_w,
-                   execp->backend->text,
-                   strlen(execp->backend->text),
-                   PANGO_WRAP_WORD_CHAR,
-                   PANGO_ELLIPSIZE_NONE,
-                   execp->backend->has_markup);
-
-    *resized = FALSE;
-    if (panel_horizontal) {
-        *new_size = *txt_width;
-        if (*icon_w)
-            *new_size += *interior_padding + *icon_w;
-        *new_size += 2 * *horiz_padding + left_right_border_width(area);
-        if (*new_size < area->width && abs(*new_size - area->width) < 6) {
-            // we try to limit the number of resizes
-            *new_size = area->width;
-            *resized = TRUE;
-        } else {
-            *resized = *new_size != area->width;
-        }
-    } else {
-        if (!*text_next_line) {
-            *new_size = *txt_height + 2 * *vert_padding + top_bottom_border_width(area);
-            *new_size = MAX(*new_size, *icon_h + 2 * *vert_padding + top_bottom_border_width(area));
-        } else {
-            *new_size = *icon_h + *interior_padding + *txt_height + 2 * *vert_padding + top_bottom_border_width(area);
-        }
-        if (*new_size != area->height) {
-            *resized = TRUE;
-        }
-    }
-}
-
-int execp_compute_desired_size(void *obj)
-{
-    Execp *execp = (Execp *)obj;
-    int horiz_padding, vert_padding, interior_padding;
-    int icon_w, icon_h;
-    gboolean text_next_line;
-    int txt_height_ink, txt_height, txt_width;
-    int new_size;
-    gboolean resized;
-    execp_compute_icon_text_geometry(execp,
-                                     &horiz_padding,
-                                     &vert_padding,
-                                     &interior_padding,
-                                     &icon_w,
-                                     &icon_h,
-                                     &text_next_line,
-                                     &txt_height_ink,
-                                     &txt_height,
-                                     &txt_width,
-                                     &new_size,
-                                     &resized);
-
-    return new_size;
-}
-
-gboolean resize_execp(void *obj)
-{
-    Execp *execp = (Execp *)obj;
-    int horiz_padding, vert_padding, interior_padding;
-    int icon_w, icon_h;
-    gboolean text_next_line;
-    int txt_height_ink, txt_height, txt_width;
-    int new_size;
-    gboolean resized;
-    execp_compute_icon_text_geometry(execp,
-                                     &horiz_padding,
-                                     &vert_padding,
-                                     &interior_padding,
-                                     &icon_w,
-                                     &icon_h,
-                                     &text_next_line,
-                                     &txt_height_ink,
-                                     &txt_height,
-                                     &txt_width,
-                                     &new_size,
-                                     &resized);
-
-    if (panel_horizontal)
-        execp->area.width = new_size;
-    else
-        execp->area.height = new_size;
-
-    execp->frontend->textw = txt_width;
-    execp->frontend->texth = txt_height;
-    if (execp->backend->centered) {
-        if (icon_w) {
-            if (!text_next_line) {
-                execp->frontend->icony = (execp->area.height - icon_h) / 2;
-                execp->frontend->iconx = (execp->area.width - txt_width - interior_padding - icon_w) / 2;
-                execp->frontend->texty = (execp->area.height - txt_height) / 2;
-                execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
-            } else {
-                execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
-                execp->frontend->iconx = (execp->area.width - icon_w) / 2;
-                execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
-                execp->frontend->textx = (execp->area.width - txt_width) / 2;
-            }
-        } else {
-            execp->frontend->texty = (execp->area.height - txt_height) / 2;
-            execp->frontend->textx = (execp->area.width - txt_width) / 2;
-        }
-    } else {
-        if (icon_w) {
-            if (!text_next_line) {
-                execp->frontend->icony = (execp->area.height - icon_h) / 2;
-                execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
-                execp->frontend->texty = (execp->area.height - txt_height) / 2;
-                execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
-            } else {
-                execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
-                execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
-                execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
-                execp->frontend->textx = execp->frontend->iconx;
-            }
-        } else {
-            execp->frontend->texty = (execp->area.height - txt_height) / 2;
-            execp->frontend->textx = left_border_width(&execp->area) + horiz_padding;
-        }
-    }
-
-    schedule_redraw(&execp->area);
-    return resized;
-}
-
-void draw_execp(void *obj, cairo_t *c)
-{
-    Execp *execp = (Execp *)obj;
-    PangoLayout *layout = pango_cairo_create_layout(c);
-
-    if (execp->backend->has_icon && execp->backend->icon) {
-        imlib_context_set_image(execp->backend->icon);
-        // Render icon
-        render_image(execp->area.pix, execp->frontend->iconx, execp->frontend->icony);
-    }
-
-    // draw layout
-    pango_layout_set_font_description(layout, execp->backend->font_desc);
-    pango_layout_set_width(layout, execp->frontend->textw * PANGO_SCALE);
-    pango_layout_set_alignment(layout, execp->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT);
-    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-    if (!execp->backend->has_markup)
-        pango_layout_set_text(layout, execp->backend->text, strlen(execp->backend->text));
-    else
-        pango_layout_set_markup(layout, execp->backend->text, strlen(execp->backend->text));
-
-    pango_cairo_update_layout(c, layout);
-    draw_text(layout,
-              c,
-              execp->frontend->textx,
-              execp->frontend->texty,
-              &execp->backend->font_color,
-              panel_config.font_shadow);
-
-    g_object_unref(layout);
-}
-
-void execp_dump_geometry(void *obj, int indent)
-{
-    Execp *execp = (Execp *)obj;
-
-    if (execp->backend->has_icon && execp->backend->icon) {
-        Imlib_Image tmp = imlib_context_get_image();
-        imlib_context_set_image(execp->backend->icon);
-        fprintf(stderr,
-                "tint2: %*sIcon: x = %d, y = %d, w = %d, h = %d\n",
-                indent,
-                "",
-                execp->frontend->iconx,
-                execp->frontend->icony,
-                imlib_image_get_width(),
-                imlib_image_get_height());
-        if (tmp)
-            imlib_context_set_image(tmp);
-    }
-    fprintf(stderr,
-            "tint2: %*sText: x = %d, y = %d, w = %d, align = %s, text = %s\n",
-            indent,
-            "",
-            execp->frontend->textx,
-            execp->frontend->texty,
-            execp->frontend->textw,
-            execp->backend->centered ? "center" : "left",
-            execp->backend->text);
-}
-
-void execp_force_update(Execp *execp)
-{
-    if (execp->backend->child_pipe_stdout > 0) {
-        // Command currently running, nothing to do
-    } else {
-        if (execp->backend->timer)
-            stop_timeout(execp->backend->timer);
-        // Run command right away
-        execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
-    }
-}
-
-void execp_action(void *obj, int button, int x, int y, Time time)
-{
-    Execp *execp = (Execp *)obj;
-    char *command = NULL;
-    switch (button) {
-    case 1:
-        command = execp->backend->lclick_command;
-        break;
-    case 2:
-        command = execp->backend->mclick_command;
-        break;
-    case 3:
-        command = execp->backend->rclick_command;
-        break;
-    case 4:
-        command = execp->backend->uwheel_command;
-        break;
-    case 5:
-        command = execp->backend->dwheel_command;
-        break;
-    }
-    if (command) {
-        setenvd("EXECP_X", x);
-        setenvd("EXECP_Y", y);
-        setenvd("EXECP_W", execp->area.width);
-        setenvd("EXECP_H", execp->area.height);
-        pid_t pid = tint_exec(command, NULL, NULL, time, obj, x, y, FALSE, TRUE);
-        unsetenv("EXECP_X");
-        unsetenv("EXECP_Y");
-        unsetenv("EXECP_W");
-        unsetenv("EXECP_H");
-        if (pid > 0)
-            g_tree_insert(execp->backend->cmd_pids, GINT_TO_POINTER(pid), GINT_TO_POINTER(1));
-    } else {
-        execp_force_update(execp);
-    }
-}
-
-void execp_cmd_completed(Execp *execp, pid_t pid)
-{
-    g_tree_remove(execp->backend->cmd_pids, GINT_TO_POINTER(pid));
-    execp_force_update(execp);
-}
-
-void execp_timer_callback(void *arg)
-{
-    Execp *execp = (Execp *)arg;
-
-    if (!execp->backend->command)
-        return;
-
-    // Still running!
-    if (execp->backend->child_pipe_stdout > 0)
-        return;
-
-    int pipe_fd_stdout[2];
-    if (pipe(pipe_fd_stdout)) {
-        // TODO maybe write this in tooltip, but if this happens we're screwed anyways
-        fprintf(stderr, "tint2: Execp: Creating pipe failed!\n");
-        return;
-    }
-
-    fcntl(pipe_fd_stdout[0], F_SETFL, O_NONBLOCK | fcntl(pipe_fd_stdout[0], F_GETFL));
-
-    int pipe_fd_stderr[2];
-    if (pipe(pipe_fd_stderr)) {
-        close(pipe_fd_stdout[1]);
-        close(pipe_fd_stdout[0]);
-        // TODO maybe write this in tooltip, but if this happens we're screwed anyways
-        fprintf(stderr, "tint2: Execp: Creating pipe failed!\n");
-        return;
-    }
-
-    fcntl(pipe_fd_stderr[0], F_SETFL, O_NONBLOCK | fcntl(pipe_fd_stderr[0], F_GETFL));
-
-    // Fork and run command, capturing stdout in pipe
-    pid_t child = fork();
-    if (child == -1) {
-        // TODO maybe write this in tooltip, but if this happens we're screwed anyways
-        fprintf(stderr, "tint2: Fork failed.\n");
-        close(pipe_fd_stdout[1]);
-        close(pipe_fd_stdout[0]);
-        close(pipe_fd_stderr[1]);
-        close(pipe_fd_stderr[0]);
-        return;
-    } else if (child == 0) {
-        fprintf(stderr, "tint2: Executing: %s\n", execp->backend->command);
-        // We are in the child
-        close(pipe_fd_stdout[0]);
-        dup2(pipe_fd_stdout[1], 1); // 1 is stdout
-        close(pipe_fd_stdout[1]);
-        close(pipe_fd_stderr[0]);
-        dup2(pipe_fd_stderr[1], 2); // 2 is stderr
-        close(pipe_fd_stderr[1]);
-        close_all_fds();
-        setpgid(0, 0);
-        execl("/bin/sh", "/bin/sh", "-c", execp->backend->command, NULL);
-        // This should never happen!
-        fprintf(stderr, "execl() failed\nexecl() failed\n");
-        exit(0);
-    }
-    close(pipe_fd_stdout[1]);
-    close(pipe_fd_stderr[1]);
-    execp->backend->child = child;
-    execp->backend->child_pipe_stdout = pipe_fd_stdout[0];
-    execp->backend->child_pipe_stderr = pipe_fd_stderr[0];
-    execp->backend->buf_stdout_length = 0;
-    execp->backend->buf_stdout[execp->backend->buf_stdout_length] = '\0';
-    execp->backend->buf_stderr_length = 0;
-    execp->backend->buf_stderr[execp->backend->buf_stderr_length] = '\0';
-    execp->backend->last_update_start_time = time(NULL);
-}
-
-void read_from_pipe(int fd, char **buffer, ssize_t *buffer_length, ssize_t *buffer_capacity, gboolean *eof)
-{
-    *eof = FALSE;
-    while (1) {
-        // Make sure there is free space in the buffer
-        if (*buffer_capacity - *buffer_length < 1024) {
-            *buffer_capacity *= 2;
-            *buffer = (char *)realloc(*buffer, *buffer_capacity);
-        }
-        ssize_t count = read(fd,
-                             *buffer + *buffer_length,
-                             *buffer_capacity - *buffer_length - 1);
-        if (count > 0) {
-            // Successful read
-            *buffer_length += count;
-            (*buffer)[*buffer_length] = '\0';
-            continue;
-        } else if (count == 0) {
-            // End of file
-            *eof = TRUE;
-            break;
-        } else if (errno == EAGAIN || errno == EWOULDBLOCK) {
-            // No more data available at the moment
-            break;
-        } else if (errno == EINTR) {
-            // Harmless interruption by signal
-            continue;
-        } else {
-            // Error
-            *eof = TRUE;
-            break;
-        }
-        break;
-    }
-}
-
-gboolean starts_with(char *s, char *prefix)
-{
-    char *p, *q;
-    for (p = s, q = prefix; *p && *q; p++, q++) {
-        if (*p != *q)
-            return FALSE;
-    }
-    return *q == '\0';
-}
-
-char *last_substring(char *s, char *sub)
-{
-    char *result = NULL;
-    for (char *p = s; *p; p++) {
-        if (starts_with(p, sub))
-            result = p;
-    }
-    return result;
-}
-
-void rstrip(char *s)
-{
-    size_t len = strlen(s);
-    while (len > 0) {
-        if (s[len-1] == ' ' || s[len-1] == '\n') {
-            s[len-1] = 0;
-            len--;
-        } else {
-            break;
-        }
-    }
-}
-
-gboolean read_execp(void *obj)
-{
-    Execp *execp = (Execp *)obj;
-
-    if (execp->backend->child_pipe_stdout < 0)
-        return FALSE;
-
-    gboolean stdout_eof, stderr_eof;
-    read_from_pipe(execp->backend->child_pipe_stdout,
-                   &execp->backend->buf_stdout,
-                   &execp->backend->buf_stdout_length,
-                   &execp->backend->buf_stdout_capacity,
-                   &stdout_eof);
-    read_from_pipe(execp->backend->child_pipe_stderr,
-                   &execp->backend->buf_stderr,
-                   &execp->backend->buf_stderr_length,
-                   &execp->backend->buf_stderr_capacity,
-                   &stderr_eof);
-
-    gboolean command_finished = stdout_eof && stderr_eof;
-
-    if (command_finished) {
-        execp->backend->child = 0;
-        close(execp->backend->child_pipe_stdout);
-        execp->backend->child_pipe_stdout = -1;
-        close(execp->backend->child_pipe_stderr);
-        execp->backend->child_pipe_stderr = -1;
-        if (execp->backend->interval)
-            execp->backend->timer =
-                add_timeout(execp->backend->interval * 1000, 0, execp_timer_callback, execp, &execp->backend->timer);
-    }
-
-    char *ansi_clear_screen = (char*)"\x1b[2J";
-    if (!execp->backend->continuous && command_finished) {
-        // Handle stdout
-        free_and_null(execp->backend->text);
-        free_and_null(execp->backend->icon_path);
-        if (!execp->backend->has_icon) {
-            execp->backend->text = strdup(execp->backend->buf_stdout);
-        } else {
-            char *text = strchr(execp->backend->buf_stdout, '\n');
-            if (text) {
-                *text = '\0';
-                text++;
-                execp->backend->text = strdup(text);
-            } else {
-                execp->backend->text = strdup("");
-            }
-            execp->backend->icon_path = strdup(execp->backend->buf_stdout);
-        }
-        int len = strlen(execp->backend->text);
-        if (len > 0 && execp->backend->text[len - 1] == '\n')
-            execp->backend->text[len - 1] = '\0';
-        execp->backend->buf_stdout_length = 0;
-        execp->backend->buf_stdout[execp->backend->buf_stdout_length] = '\0';
-        // Handle stderr
-        if (!execp->backend->has_user_tooltip) {
-            free_and_null(execp->backend->tooltip);
-            char *start = last_substring(execp->backend->buf_stderr, ansi_clear_screen);
-            if (start)
-                start += strlen(ansi_clear_screen);
-            else
-                start = execp->backend->buf_stderr;
-            if (*start) {
-                execp->backend->tooltip = strdup(start);
-                rstrip(execp->backend->tooltip);
-                if (strlen(execp->backend->tooltip) > MAX_TOOLTIP_LEN)
-                    execp->backend->tooltip[MAX_TOOLTIP_LEN] = '\0';
-            }
-        }
-        execp->backend->buf_stderr_length = 0;
-        execp->backend->buf_stderr[execp->backend->buf_stderr_length] = '\0';
-        //
-        execp->backend->last_update_finish_time = time(NULL);
-        execp->backend->last_update_duration =
-            execp->backend->last_update_finish_time - execp->backend->last_update_start_time;
-        return TRUE;
-    } else if (execp->backend->continuous > 0) {
-        // Handle stderr
-        if (!execp->backend->has_user_tooltip) {
-            free_and_null(execp->backend->tooltip);
-            char *start = last_substring(execp->backend->buf_stderr, ansi_clear_screen);
-            if (start) {
-                start += strlen(ansi_clear_screen);
-                memmove(execp->backend->buf_stderr, start, strlen(start) + 1);
-                execp->backend->buf_stderr_length = (ssize_t)strlen(execp->backend->buf_stderr);
-            }
-            if (execp->backend->buf_stderr_length > MAX_TOOLTIP_LEN) {
-                execp->backend->buf_stderr_length = MAX_TOOLTIP_LEN;
-                execp->backend->buf_stderr[execp->backend->buf_stderr_length] = '\0';
-            }
-            execp->backend->tooltip = strdup(execp->backend->buf_stderr);
-            rstrip(execp->backend->tooltip);
-        } else {
-            execp->backend->buf_stderr_length = 0;
-            execp->backend->buf_stderr[execp->backend->buf_stderr_length] = '\0';
-        }
-        // Handle stdout
-        // Count lines in buffer
-        int num_lines = 0;
-        char *end = NULL;
-        for (char *c = execp->backend->buf_stdout; *c; c++) {
-            if (*c == '\n') {
-                num_lines++;
-                if (num_lines == execp->backend->continuous)
-                    end = c;
-            }
-        }
-        if (num_lines >= execp->backend->continuous) {
-            if (end)
-                *end = '\0';
-            free_and_null(execp->backend->text);
-            free_and_null(execp->backend->icon_path);
-            if (!execp->backend->has_icon) {
-                execp->backend->text = strdup(execp->backend->buf_stdout);
-            } else {
-                char *text = strchr(execp->backend->buf_stdout, '\n');
-                if (text) {
-                    *text = '\0';
-                    text++;
-                    execp->backend->text = strdup(text);
-                } else {
-                    execp->backend->text = strdup("");
-                }
-                execp->backend->icon_path = strdup(execp->backend->buf_stdout);
-            }
-            size_t len = strlen(execp->backend->text);
-            if (len > 0 && execp->backend->text[len - 1] == '\n')
-                execp->backend->text[len - 1] = '\0';
-
-            if (end) {
-                char *next = end + 1;
-                ssize_t copied = next - execp->backend->buf_stdout;
-                ssize_t remaining = execp->backend->buf_stdout_length - copied;
-                if (remaining > 0) {
-                    memmove(execp->backend->buf_stdout, next, (size_t)remaining);
-                    execp->backend->buf_stdout_length = remaining;
-                    execp->backend->buf_stdout[execp->backend->buf_stdout_length] = '\0';
-                } else {
-                    execp->backend->buf_stdout_length = 0;
-                    execp->backend->buf_stdout[execp->backend->buf_stdout_length] = '\0';
-                }
-            }
-
-            execp->backend->last_update_finish_time = time(NULL);
-            execp->backend->last_update_duration =
-                execp->backend->last_update_finish_time - execp->backend->last_update_start_time;
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-const char *time_to_string(int seconds, char *buffer)
-{
-    if (seconds < 60) {
-        sprintf(buffer, "%ds", seconds);
-    } else if (seconds < 60 * 60) {
-        int m = seconds / 60;
-        seconds = seconds % 60;
-        int s = seconds;
-        sprintf(buffer, "%d:%ds", m, s);
-    } else {
-        int h = seconds / (60 * 60);
-        seconds = seconds % (60 * 60);
-        int m = seconds / 60;
-        seconds = seconds % 60;
-        int s = seconds;
-        sprintf(buffer, "%d:%d:%ds", h, m, s);
-    }
-    return buffer;
-}
-
-char *execp_get_tooltip(void *obj)
-{
-    Execp *execp = (Execp *)obj;
-
-    if (execp->backend->tooltip) {
-        if (strlen(execp->backend->tooltip) > 0)
-            return strdup(execp->backend->tooltip);
-        else
-            return NULL;
-    }
-
-    time_t now = time(NULL);
-
-    char tmp_buf1[256];
-    char tmp_buf2[256];
-    char tmp_buf3[256];
-    if (execp->backend->child_pipe_stdout < 0) {
-        // Not executing command
-        if (execp->backend->last_update_finish_time) {
-            // We updated at least once
-            if (execp->backend->interval > 0) {
-                sprintf(execp->backend->tooltip_text,
-                        "Last update finished %s ago (took %s). Next update starting in %s.",
-                        time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
-                        time_to_string((int)execp->backend->last_update_duration, tmp_buf2),
-                        time_to_string((int)(execp->backend->interval - (now - execp->backend->last_update_finish_time)),
-                                       tmp_buf3));
-            } else {
-                sprintf(execp->backend->tooltip_text,
-                        "Last update finished %s ago (took %s).",
-                        time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
-                        time_to_string((int)execp->backend->last_update_duration, tmp_buf2));
-            }
-        } else {
-            // we never requested an update
-            sprintf(execp->backend->tooltip_text, "Never updated. No update scheduled.");
-        }
-    } else {
-        // Currently executing command
-        if (execp->backend->last_update_finish_time) {
-            // we finished updating at least once
-            sprintf(execp->backend->tooltip_text,
-                    "Last update finished %s ago. Update in progress (started %s ago).",
-                    time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
-                    time_to_string((int)(now - execp->backend->last_update_start_time), tmp_buf3));
-        } else {
-            // we never finished an update
-            sprintf(execp->backend->tooltip_text,
-                    "First update in progress (started %s seconds ago).",
-                    time_to_string((int)(now - execp->backend->last_update_start_time), tmp_buf1));
-        }
-    }
-    return strdup(execp->backend->tooltip_text);
-}
-
-void execp_update_post_read(Execp *execp)
-{
-    int icon_h, icon_w;
-    if (reload_icon(execp)) {
-        if (execp->backend->icon) {
-            imlib_context_set_image(execp->backend->icon);
-            icon_w = imlib_image_get_width();
-            icon_h = imlib_image_get_height();
-        } else {
-            icon_w = icon_h = 0;
-        }
-    } else {
-        icon_w = icon_h = 0;
-    }
-
-    if ((icon_h == 0 || icon_w == 0) && execp->backend->text[0] == 0) {
-        // Easy to test with bash -c 'R=$(( RANDOM % 2 )); [ $R -eq 0 ] && echo HELLO $R'
-        if (execp->area.on_screen)
-            hide(&execp->area);
-    } else {
-        if (!execp->area.on_screen)
-            show(&execp->area);
-        execp->area.resize_needed = TRUE;
-        schedule_panel_redraw();
-    }
-}
-
-void handle_execp_events()
-{
-    for (GList *l = panel_config.execp_list; l; l = l->next) {
-        Execp *execp = (Execp *)l->data;
-        if (read_execp(execp)) {
-            GList *l_instance;
-            for (l_instance = execp->backend->instances; l_instance; l_instance = l_instance->next) {
-                Execp *instance = (Execp *)l_instance->data;
-                execp_update_post_read(instance);
-            }
-        }
-    }
-}

src/execplugin/execplugin.h

@@ -1,153 +0,0 @@
-#ifndef EXECPLUGIN_H
-#define EXECPLUGIN_H
-
-#include <sys/time.h>
-#include <pango/pangocairo.h>
-
-#include "area.h"
-#include "common.h"
-#include "timer.h"
-
-// Architecture:
-// Panel panel_config contains an array of Execp, each storing all config options and all the state variables.
-// Only these run commands.
-//
-// Tint2 maintains an array of Panels, one for each monitor. Each stores an array of Execp which was initially copied
-// from panel_config. Each works as a frontend to the corresponding Execp in panel_config as backend, using the
-// backend's config and state variables.
-
-typedef struct ExecpBackend {
-    // Config:
-    // Command to execute at a specified interval
-    char *command;
-    // Interval in seconds
-    int interval;
-    // 1 if first line of output is an icon path
-    gboolean has_icon;
-    gboolean cache_icon;
-    int icon_w;
-    int icon_h;
-    gboolean has_user_tooltip;
-    char *tooltip;
-    gboolean centered;
-    gboolean has_font;
-    PangoFontDescription *font_desc;
-    Color font_color;
-    int continuous;
-    gboolean has_markup;
-    char *lclick_command;
-    char *mclick_command;
-    char *rclick_command;
-    char *uwheel_command;
-    char *dwheel_command;
-    // paddingxlr = horizontal padding left/right
-    // paddingx = horizontal padding between childs
-    int paddingxlr, paddingx, paddingy;
-    Background *bg;
-
-    // Backend state:
-    timeout *timer;
-    int child_pipe_stdout;
-    int child_pipe_stderr;
-    pid_t child;
-
-    // Command output buffer
-    char *buf_stdout;
-    ssize_t buf_stdout_length;
-    ssize_t buf_stdout_capacity;
-    char *buf_stderr;
-    ssize_t buf_stderr_length;
-    ssize_t buf_stderr_capacity;
-
-    // Text extracted from the output buffer
-    char *text;
-    // Icon path extracted from the output buffer
-    char *icon_path;
-    Imlib_Image icon;
-    gchar tooltip_text[512];
-
-    // The time the last command was started
-    time_t last_update_start_time;
-    // The time the last output was obtained
-    time_t last_update_finish_time;
-    // The time it took to execute last command
-    time_t last_update_duration;
-
-    // List of Execp which are frontends for this backend, one for each panel
-    GList *instances;
-    GTree *cmd_pids;
-} ExecpBackend;
-
-typedef struct ExecpFrontend {
-    // Frontend state:
-    int iconx;
-    int icony;
-    int textx;
-    int texty;
-    int textw;
-    int texth;
-} ExecpFrontend;
-
-typedef struct Execp {
-    Area area;
-    // All elements have the backend pointer set. However only backend elements have ownership.
-    ExecpBackend *backend;
-    // Set only for frontend Execp items.
-    ExecpFrontend *frontend;
-} Execp;
-
-// Called before the config is read and panel_config/panels are created.
-// Afterwards, the config parsing code creates the array of Execp in panel_config and populates the configuration fields
-// in the backend.
-// Probably does nothing.
-void default_execp();
-
-// Creates a new Execp item with only the backend field set. The state is NOT initialized. The config is initialized to
-// the default values.
-// This will be used by the config code to populate its backedn config fields.
-Execp *create_execp();
-
-void destroy_execp(void *obj);
-
-// Called after the config is read and panel_config is populated, but before panels are created.
-// Initializes the state of the backend items.
-// panel_config.panel_items is used to determine which backend items are enabled. The others should be destroyed and
-// removed from panel_config.execp_list.
-void init_execp();
-
-// Called after each on-screen panel is created, with a pointer to the panel.
-// Initializes the state of the frontend items. Also adds a pointer to it in backend->instances.
-// At this point the Area has not been added yet to the GUI tree, but it will be added right away.
-void init_execp_panel(void *panel);
-
-// Called just before the panels are destroyed. Afterwards, tint2 exits or restarts and reads the config again.
-// Releases all frontends and then all the backends.
-// The frontend items are not freed by this function, only their members. The items are Areas which are freed in the
-// GUI element tree cleanup function (remove_area).
-void cleanup_execp();
-
-// Called on draw, obj = pointer to the front-end Execp item.
-void draw_execp(void *obj, cairo_t *c);
-
-// Called on resize, obj = pointer to the front-end Execp item.
-// Returns 1 if the new size is different than the previous size.
-gboolean resize_execp(void *obj);
-
-// Called on mouse click event.
-void execp_action(void *obj, int button, int x, int y, Time time);
-
-void execp_cmd_completed(Execp *obj, pid_t pid);
-
-// Called to check if new output from the command can be read.
-// No command might be running.
-// Returns 1 if the output has been updated and a redraw is needed.
-gboolean read_execp(void *obj);
-
-// Called for Execp front elements when the command output has changed.
-void execp_update_post_read(Execp *execp);
-
-void execp_default_font_changed();
-
-void handle_execp_events();
-
-#endif // EXECPLUGIN_H

src/freespace/freespace.c

@@ -17,6 +17,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **************************************************************************/
 
+
 #include <string.h>
 #include <stdio.h>
 #include <cairo.h>
@@ -30,97 +31,63 @@
 #include "freespace.h"
 #include "common.h"
 
-int freespace_area_compute_desired_size(void *obj);
-
 void init_freespace_panel(void *p)
 {
-    Panel *panel = (Panel *)p;
+	Panel *panel = (Panel*)p;
+	FreeSpace *freespace = &panel->freespace;
 
-    // Make sure this is only done once if there are multiple items
+	if (freespace->area.bg == 0)
-    if (panel->freespace_list)
+		freespace->area.bg = &g_array_index(backgrounds, Background, 0);
-        return;
+	freespace->area.parent = p;
-
+	freespace->area.panel = p;
-    for (size_t k = 0; k < strlen(panel_items_order); k++) {
+	freespace->area.size_mode = SIZE_BY_CONTENT;
-        if (panel_items_order[k] == 'F') {
+	freespace->area.resize = 1;
-            FreeSpace *freespace = (FreeSpace *)calloc(1, sizeof(FreeSpace));
+	freespace->area.on_screen = 1;
-            panel->freespace_list = g_list_append(panel->freespace_list, freespace);
+	freespace->area._resize = resize_freespace;
-            if (!freespace->area.bg)
-                freespace->area.bg = &g_array_index(backgrounds, Background, 0);
-            freespace->area.parent = p;
-            freespace->area.panel = p;
-            snprintf(freespace->area.name, sizeof(freespace->area.name), "Freespace");
-            freespace->area.size_mode = LAYOUT_FIXED;
-            freespace->area.resize_needed = 1;
-            freespace->area.on_screen = TRUE;
-            freespace->area._resize = resize_freespace;
-            freespace->area._compute_desired_size = freespace_area_compute_desired_size;
-        }
-    }
 }
 
-void cleanup_freespace(Panel *panel)
+int freespace_get_max_size(Panel *p) {
-{
+	// Get space used by every element except the freespace
-    if (panel->freespace_list)
+	GList *walk;
-        g_list_free_full(panel->freespace_list, free);
+	int size = 0;
-    panel->freespace_list = NULL;
+	for (walk = p->area.list; 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 freespace_get_max_size(Panel *p)
+int resize_freespace(void *obj) {
-{
+	FreeSpace *freespace = (FreeSpace*)obj;
-    if (panel_shrink)
+	Panel *panel = (Panel*)freespace->area.panel;
-        return 0;
+	if (!freespace->area.on_screen)
-    // Get space used by every element except the freespace
+		return 0;
-    int size = 0;
-    int spacers = 0;
-    for (GList *walk = p->area.children; walk; walk = g_list_next(walk)) {
-        Area *a = (Area *)walk->data;
 
-        if (!a->on_screen)
+	int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
-            continue;
+	int size = freespace_get_max_size(panel);
-        if (a->_resize == resize_freespace) {
+	if (old_size == size)
-            spacers++;
+		return 0;
-            continue;
-        }
 
-        if (panel_horizontal)
+	if (panel_horizontal) {
-            size += a->width + p->area.paddingx;
+		freespace->area.width = size;
-        else
+	} else {
-            size += a->height + p->area.paddingy;
+		freespace->area.height = size;
-    }
+	}
 
-    if (panel_horizontal)
+	freespace->area.redraw = 1;
-        size = p->area.width - size - left_right_border_width(&p->area) - p->area.paddingxlr;
+	panel_refresh = 1;
-    else
+	return 1;
-        size = p->area.height - size - top_bottom_border_width(&p->area) - p->area.paddingxlr;
-
-    return size / spacers;
-}
-
-int freespace_area_compute_desired_size(void *obj)
-{
-    FreeSpace *freespace = (FreeSpace *)obj;
-    return freespace_get_max_size((Panel *)freespace->area.panel);
-}
-
-gboolean resize_freespace(void *obj)
-{
-    FreeSpace *freespace = (FreeSpace *)obj;
-    Panel *panel = (Panel *)freespace->area.panel;
-    if (!freespace->area.on_screen)
-        return FALSE;
-
-    int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
-    int size = freespace_get_max_size(panel);
-    if (old_size == size)
-        return FALSE;
-
-    if (panel_horizontal) {
-        freespace->area.width = size;
-    } else {
-        freespace->area.height = size;
-    }
-
-    schedule_redraw(&freespace->area);
-    schedule_panel_redraw();
-    return TRUE;
 }

src/freespace/freespace.h

@@ -9,14 +9,12 @@
 #include "area.h"
 
 typedef struct FreeSpace {
-    Area area;
+	Area area;
 } FreeSpace;
 
-struct Panel;
+void cleanup_freespace();
-
-void cleanup_freespace(struct Panel *panel);
 void init_freespace_panel(void *panel);
 
-gboolean resize_freespace(void *obj);
+int resize_freespace(void *obj);
 
 #endif

src/init.c

@@ -1,298 +0,0 @@
-#include "init.h"
-
-#include <locale.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/extensions/XShm.h>
-
-#include "config.h"
-#include "drag_and_drop.h"
-#include "fps_distribution.h"
-#include "panel.h"
-#include "server.h"
-#include "signals.h"
-#include "test.h"
-#include "tooltip.h"
-#include "tracing.h"
-#include "uevent.h"
-#include "version.h"
-
-void print_usage()
-{
-    fprintf(stdout,
-            "Usage: tint2 [OPTION...]\n"
-            "\n"
-            "Options:\n"
-            "  -c path_to_config_file   Loads the configuration file from a\n"
-            "                           custom location.\n"
-            "  -v, --version            Prints version information and exits.\n"
-            "  -h, --help               Display this help and exits.\n"
-            "\n"
-            "For more information, run `man tint2` or visit the project page\n"
-            "<https://gitlab.com/o9000/tint2>.\n");
-}
-
-void handle_cli_arguments(int argc, char **argv)
-{
-    // Read command line arguments
-    for (int i = 1; i < argc; ++i) {
-        gboolean error = FALSE;
-        if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
-            print_usage();
-            exit(0);
-        } else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--version") == 0) {
-            fprintf(stdout, "tint2 version %s\n", VERSION_STRING);
-            exit(0);
-        } else if (strcmp(argv[i], "--test") == 0) {
-            run_all_tests();
-            exit(0);
-        } else if (strcmp(argv[i], "-c") == 0) {
-            if (i + 1 < argc) {
-                i++;
-                config_path = strdup(argv[i]);
-            } else {
-                error = TRUE;
-            }
-        } else if (strcmp(argv[i], "-s") == 0) {
-            if (i + 1 < argc) {
-                i++;
-                snapshot_path = strdup(argv[i]);
-            } else {
-                error = TRUE;
-            }
-        } else if (i + 1 == argc) {
-            config_path = strdup(argv[i]);
-        }
-#ifdef ENABLE_BATTERY
-        else if (strcmp(argv[i], "--battery-sys-prefix") == 0) {
-            if (i + 1 < argc) {
-                i++;
-                battery_sys_prefix = strdup(argv[i]);
-            } else {
-                error = TRUE;
-            }
-        }
-#endif
-        else {
-            error = TRUE;
-        }
-        if (error) {
-            print_usage();
-            exit(EXIT_FAILURE);
-        }
-    }
-}
-
-void handle_env_vars()
-{
-    debug_geometry = getenv("DEBUG_GEOMETRY") != NULL;
-    debug_gradients = getenv("DEBUG_GRADIENTS") != NULL;
-    debug_icons = getenv("DEBUG_ICONS") != NULL;
-    debug_fps = getenv("DEBUG_FPS") != NULL;
-    debug_frames = getenv("DEBUG_FRAMES") != NULL;
-    debug_dnd = getenv("DEBUG_DND") != NULL;
-    debug_thumbnails = getenv("DEBUG_THUMBNAILS") != NULL;
-    if (debug_fps) {
-        init_fps_distribution();
-        char *s = getenv("TRACING_FPS_THRESHOLD");
-        if (!s || sscanf(s, "%lf", &tracing_fps_threshold) != 1) {
-            tracing_fps_threshold = 60;
-        }
-    }
-}
-
-static timeout *detect_compositor_timer = NULL;
-static int detect_compositor_timer_counter = 0;
-
-void detect_compositor(void *arg)
-{
-    if (server.composite_manager) {
-        stop_timeout(detect_compositor_timer);
-        return;
-    }
-
-    detect_compositor_timer_counter--;
-    if (detect_compositor_timer_counter < 0) {
-        stop_timeout(detect_compositor_timer);
-        return;
-    }
-
-    // No compositor, check for one
-    if (XGetSelectionOwner(server.display, server.atom._NET_WM_CM_S0) != None) {
-        stop_timeout(detect_compositor_timer);
-        // Restart tint2
-        fprintf(stderr, "tint2: Detected compositor, restarting tint2...\n");
-        kill(getpid(), SIGUSR1);
-    }
-}
-
-void start_detect_compositor()
-{
-    // Already have a compositor, nothing to do
-    if (server.composite_manager)
-        return;
-
-    stop_timeout(detect_compositor_timer);
-    // Check every 0.5 seconds for up to 30 seconds
-    detect_compositor_timer_counter = 60;
-    detect_compositor_timer = add_timeout(500, 500, detect_compositor, 0, &detect_compositor_timer);
-}
-
-void create_default_elements()
-{
-    default_timeout();
-    default_systray();
-    memset(&server, 0, sizeof(server));
-#ifdef ENABLE_BATTERY
-    default_battery();
-#endif
-    default_clock();
-    default_launcher();
-    default_taskbar();
-    default_tooltip();
-    default_execp();
-    default_button();
-    default_panel();
-}
-
-void init_post_config()
-{
-    server_init_visual();
-    server_init_xdamage();
-
-    imlib_context_set_display(server.display);
-    imlib_context_set_visual(server.visual);
-    imlib_context_set_colormap(server.colormap);
-
-    init_signals_postconfig();
-
-    // load default icon
-    const gchar *const *data_dirs = g_get_system_data_dirs();
-    for (int i = 0; data_dirs[i] != NULL; i++) {
-        gchar *path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
-        if (g_file_test(path, G_FILE_TEST_EXISTS))
-            default_icon = load_image(path, TRUE);
-        g_free(path);
-    }
-    if (!default_icon) {
-        fprintf(stderr,
-                RED "Could not load default_icon.png. Please check that tint2 has been installed correctly!" RESET
-                    "\n");
-    }
-
-    XSync(server.display, False);
-}
-
-void init_X11_pre_config()
-{
-    server.display = XOpenDisplay(NULL);
-    if (!server.display) {
-        fprintf(stderr, "tint2: could not open display!\n");
-        exit(EXIT_FAILURE);
-    }
-    server.x11_fd = ConnectionNumber(server.display);
-    XSetErrorHandler((XErrorHandler)server_catch_error);
-    XSetIOErrorHandler((XIOErrorHandler)x11_io_error);
-    server_init_atoms();
-    server.screen = DefaultScreen(server.display);
-    server.root_win = RootWindow(server.display, server.screen);
-    server.desktop = get_current_desktop();
-    server.has_shm = XShmQueryExtension(server.display);
-
-    // Needed since the config file uses '.' as decimal separator
-    setlocale(LC_ALL, "");
-    setlocale(LC_NUMERIC, "POSIX");
-
-    /* Catch events */
-    XSelectInput(server.display, server.root_win, PropertyChangeMask | StructureNotifyMask);
-
-    // get monitor and desktop config
-    get_monitors();
-    get_desktops();
-
-    server.disable_transparency = 0;
-
-    xsettings_client = xsettings_client_new(server.display, server.screen, xsettings_notify_cb, NULL, NULL);
-}
-
-void init(int argc, char **argv)
-{
-    setlinebuf(stdout);
-    setlinebuf(stderr);
-    default_config();
-    handle_cli_arguments(argc, argv);
-    create_default_elements();
-    init_signals();
-    handle_env_vars();
-
-    init_X11_pre_config();
-    if (!config_read()) {
-        fprintf(stderr, "tint2: Could not read config file.\n");
-        print_usage();
-        cleanup();
-        return;
-    }
-
-    init_post_config();
-    start_detect_compositor();
-    init_panel();
-}
-
-void cleanup()
-{
-#ifdef HAVE_SN
-    if (startup_notifications) {
-        sn_display_unref(server.sn_display);
-        server.sn_display = NULL;
-    }
-#endif // HAVE_SN
-
-    cleanup_button();
-    cleanup_execp();
-    cleanup_systray();
-    cleanup_tooltip();
-    cleanup_clock();
-    cleanup_launcher();
-#ifdef ENABLE_BATTERY
-    cleanup_battery();
-#endif
-    cleanup_separator();
-    cleanup_panel();
-    cleanup_config();
-
-    if (default_icon) {
-        imlib_context_set_image(default_icon);
-        imlib_free_image();
-        default_icon = NULL;
-    }
-    imlib_context_disconnect_display();
-
-    xsettings_client_destroy(xsettings_client);
-    xsettings_client = NULL;
-
-    cleanup_server();
-    cleanup_timeout();
-
-    if (server.display)
-        XCloseDisplay(server.display);
-    server.display = NULL;
-
-    if (sigchild_pipe_valid) {
-        sigchild_pipe_valid = FALSE;
-        close(sigchild_pipe[1]);
-        close(sigchild_pipe[0]);
-    }
-
-    uevent_cleanup();
-    cleanup_fps_distribution();
-
-#ifdef HAVE_TRACING
-    cleanup_tracing();
-#endif
-}

src/init.h

@@ -1,7 +0,0 @@
-#ifndef INIT_H
-#define INIT_H
-
-void init(int argc, char **argv);
-void cleanup();
-
-#endif

src/launcher/apps-common.c

@@ -19,301 +19,171 @@
 /* http://standards.freedesktop.org/desktop-entry-spec/ */
 
 #include "apps-common.h"
-#include "common.h"
-#include "strnatcmp.h"
 
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
-
-static gint compare_strings(gconstpointer a, gconstpointer b)
-{
-    return strnatcasecmp((const char *)a, (const char *)b);
-}
 
 int parse_dektop_line(char *line, char **key, char **value)
 {
-    char *p;
+	char *p;
-    int found = 0;
+	int found = 0;
-    *key = line;
+	*key = line;
-    for (p = line; *p; p++) {
+	for (p = line; *p; p++) {
-        if (*p == '=') {
+		if (*p == '=') {
-            *value = p + 1;
+			*value = p + 1;
-            *p = 0;
+			*p = 0;
-            found = 1;
+			found = 1;
-            break;
+			break;
-        }
+		}
-    }
+	}
-    if (!found)
+	if (!found)
-        return 0;
+		return 0;
-    if (found && (strlen(*key) == 0 || strlen(*value) == 0))
+	if (found && (strlen(*key) == 0 || strlen(*value) == 0))
-        return 0;
+		return 0;
-    return 1;
+	return 1;
 }
 
 void expand_exec(DesktopEntry *entry, const char *path)
 {
-    // Expand % in exec
+	// Expand % in exec
-    // %i -> --icon Icon
+	// %i -> --icon Icon
-    // %c -> Name
+	// %c -> Name
-    // %k -> path
+	// %k -> path
-    if (entry->exec) {
+	if (entry->exec) {
-        char *exec2 = calloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) +
+		char *exec2 = calloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) + (entry->icon ? strlen(entry->icon) : 1) + 100, 1);
-                                 (entry->icon ? strlen(entry->icon) : 1) + 100,
+		char *p, *q;
-                             1);
+		// p will never point to an escaped char
-        char *p, *q;
+		for (p = entry->exec, q = exec2; *p; p++, q++) {
-        // p will never point to an escaped char
+			*q = *p; // Copy
-        for (p = entry->exec, q = exec2; *p; p++, q++) {
+			if (*p == '\\') {
-            *q = *p; // Copy
+				p++, q++;
-            if (*p == '\\') {
+				// Copy the escaped char
-                p++, q++;
+				if (*p == '%') // For % we delete the backslash, i.e. write % over it
-                // Copy the escaped char
+					q--;
-                if (*p == '%') // For % we delete the backslash, i.e. write % over it
+				*q = *p;
-                    q--;
+				if (!*p) break;
-                *q = *p;
+				continue;
-                if (!*p)
+			}
-                    break;
+			if (*p == '%') {
-                continue;
+				p++;
-            }
+				if (!*p) break;
-            if (*p == '%') {
+				if (*p == 'i' && entry->icon != NULL) {
-                p++;
+					sprintf(q, "--icon '%s'", entry->icon);
-                if (!*p)
+					q += strlen("--icon ''");
-                    break;
+					q += strlen(entry->icon);
-                if (*p == 'i' && entry->icon != NULL) {
+					q--; // To balance the q++ in the for
-                    sprintf(q, "--icon '%s'", entry->icon);
+				} else if (*p == 'c' && entry->name != NULL) {
-                    q += strlen("--icon ''");
+					sprintf(q, "'%s'", entry->name);
-                    q += strlen(entry->icon);
+					q += strlen("''");
-                    q--; // To balance the q++ in the for
+					q += strlen(entry->name);
-                } else if (*p == 'c' && entry->name != NULL) {
+					q--; // To balance the q++ in the for
-                    sprintf(q, "'%s'", entry->name);
+				} else if (*p == 'c') {
-                    q += strlen("''");
+					sprintf(q, "'%s'", path);
-                    q += strlen(entry->name);
+					q += strlen("''");
-                    q--; // To balance the q++ in the for
+					q += strlen(path);
-                } else if (*p == 'c') {
+					q--; // To balance the q++ in the for
-                    sprintf(q, "'%s'", path);
+				} else {
-                    q += strlen("''");
+					// We don't care about other expansions
-                    q += strlen(path);
+					q--; // Delete the last % from q
-                    q--; // To balance the q++ in the for
+				}
-                } else if (*p == 'f' || *p == 'F') {
+				continue;
-                    sprintf(q, "%c%c", '%', *p);
+			}
-                    q += 2;
+		}
-                    q--; // To balance the q++ in the for
+		*q = '\0';
-                } else {
+		free(entry->exec);
-                    // We don't care about other expansions
+		entry->exec = exec2;
-                    q--; // Delete the last % from q
+	}
-                }
-                continue;
-            }
-        }
-        *q = '\0';
-        free(entry->exec);
-        entry->exec = exec2;
-    }
 }
 
-gboolean read_desktop_file_full_path(const char *path, DesktopEntry *entry)
+int read_desktop_file(const char *path, DesktopEntry *entry)
 {
-    entry->name = entry->generic_name = entry->icon = entry->exec = entry->cwd = NULL;
+	FILE *fp;
-    entry->hidden_from_menus = FALSE;
+	char *line = NULL;
-    entry->start_in_terminal = FALSE;
+	size_t line_size;
-    entry->startup_notification = TRUE;
+	char *key, *value;
+	int i;
 
-    FILE *fp = fopen(path, "rt");
+	entry->path = strdup(path);
-    if (fp == NULL) {
+	entry->name = entry->icon = entry->exec = NULL;
-        fprintf(stderr, "tint2: Could not open file %s\n", path);
-        return FALSE;
-    }
 
-    const gchar **languages = (const gchar **)g_get_language_names();
+	if ((fp = fopen(path, "rt")) == NULL) {
-    // lang_index is the index of the language for the best Name key in the language vector
+		fprintf(stderr, "Could not open file %s\n", path);
-    // lang_index_default is a constant that encodes the Name key without a language
+		return 0;
-    int lang_index_default = 1;
+	}
+
+	gchar **languages = (gchar **)g_get_language_names();
+	// lang_index is the index of the language for the best Name key in the language vector
+	// lang_index_default is a constant that encodes the Name key without a language
+	int lang_index, lang_index_default;
 #define LANG_DBG 0
-    if (LANG_DBG)
+	if (LANG_DBG) printf("Languages:");
-        fprintf(stderr, "tint2: Languages:");
+	for (i = 0; languages[i]; i++) {
-    for (int i = 0; languages[i]; i++) {
+		if (LANG_DBG) printf(" %s", languages[i]);
-        lang_index_default = i + 1;
+	}
-        if (LANG_DBG)
+	if (LANG_DBG) printf("\n");
-            fprintf(stderr, "tint2:  %s", languages[i]);
+	lang_index_default = i;
-    }
+	// we currently do not know about any Name key at all, so use an invalid index
-    if (LANG_DBG)
+	lang_index = lang_index_default + 1;
-        fprintf(stderr, "tint2: \n");
-    // we currently do not know about any Name key at all, so use an invalid index
-    int lang_index_name = lang_index_default + 1;
-    int lang_index_generic_name = lang_index_default + 1;
 
-    gboolean inside_desktop_entry = 0;
+	int inside_desktop_entry = 0;
-    char *line = NULL;
+	while (getline(&line, &line_size, fp) >= 0) {
-    size_t line_size;
+		int len = strlen(line);
-    while (getline(&line, &line_size, fp) >= 0) {
+		if (len == 0)
-        int len = strlen(line);
+			continue;
-        if (len == 0)
+		line[len - 1] = '\0';
-            continue;
+		if (line[0] == '[') {
-        if (line[len - 1] == '\n')
+			inside_desktop_entry = (strcmp(line, "[Desktop Entry]") == 0);
-            line[len - 1] = '\0';
+		}
-        if (line[0] == '[') {
+		if (inside_desktop_entry && parse_dektop_line(line, &key, &value)) {
-            inside_desktop_entry = (strcmp(line, "[Desktop Entry]") == 0);
+			if (strstr(key, "Name") == key) {
-        }
+				if (strcmp(key, "Name") == 0 && lang_index > lang_index_default) {
-        char *key, *value;
+					entry->name = strdup(value);
-        if (inside_desktop_entry && parse_dektop_line(line, &key, &value)) {
+					lang_index = lang_index_default;
-            if (strstr(key, "Name") == key) {
+				} else {
-                if (strcmp(key, "Name") == 0 && lang_index_name > lang_index_default) {
+					for (i = 0; languages[i] && i < lang_index; i++) {
-                    entry->name = strdup(value);
+						gchar *localized_key = g_strdup_printf("Name[%s]", languages[i]);
-                    lang_index_name = lang_index_default;
+						if (strcmp(key, localized_key) == 0) {
-                } else {
+							if (entry->name)
-                    for (int i = 0; languages[i] && i < lang_index_name; i++) {
+								free(entry->name);
-                        gchar *localized_key = g_strdup_printf("Name[%s]", languages[i]);
+							entry->name = strdup(value);
-                        if (strcmp(key, localized_key) == 0) {
+							lang_index = i;
-                            if (entry->name)
+						}
-                                free(entry->name);
+						g_free(localized_key);
-                            entry->name = strdup(value);
+					}
-                            lang_index_name = i;
+				}
-                        }
+			} else if (!entry->exec && strcmp(key, "Exec") == 0) {
-                        g_free(localized_key);
+				entry->exec = strdup(value);
-                    }
+			} else if (!entry->icon && strcmp(key, "Icon") == 0) {
-                }
+				entry->icon = strdup(value);
-            } else if (strstr(key, "GenericName") == key) {
+			}
-                if (strcmp(key, "GenericName") == 0 && lang_index_generic_name > lang_index_default) {
+		}
-                    entry->generic_name = strdup(value);
+	}
-                    lang_index_generic_name = lang_index_default;
+	fclose (fp);
-                } else {
+	// From this point:
-                    for (int i = 0; languages[i] && i < lang_index_generic_name; i++) {
+	// entry->name, entry->icon, entry->exec will never be empty strings (can be NULL though)
-                        gchar *localized_key = g_strdup_printf("GenericName[%s]", languages[i]);
-                        if (strcmp(key, localized_key) == 0) {
-                            if (entry->generic_name)
-                                free(entry->generic_name);
-                            entry->generic_name = strdup(value);
-                            lang_index_generic_name = i;
-                        }
-                        g_free(localized_key);
-                    }
-                }
-            } else if (!entry->exec && strcmp(key, "Exec") == 0) {
-                entry->exec = strdup(value);
-            } else if (!entry->cwd && strcmp(key, "Path") == 0) {
-                entry->cwd = strdup(value);
-            } else if (!entry->icon && strcmp(key, "Icon") == 0) {
-                entry->icon = strdup(value);
-            } else if (strcmp(key, "NoDisplay") == 0) {
-                entry->hidden_from_menus = strcasecmp(value, "true") == 0;
-            } else if (strcmp(key, "Terminal") == 0) {
-                entry->start_in_terminal = strcasecmp(value, "true") == 0;
-            } else if (strcmp(key, "StartupNotify") == 0) {
-                entry->startup_notification = strcasecmp(value, "true") == 0;
-            }
-        }
-    }
-    fclose(fp);
-    // From this point:
-    // entry->name, entry->generic_name, entry->icon, entry->exec will never be empty strings (can be NULL though)
 
-    expand_exec(entry, entry->path);
+	expand_exec(entry, path);
 
-    free(line);
+	free(line);
-    return entry->exec != NULL;
+	return 1;
-}
-
-gboolean read_desktop_file_from_dir(const char *path, const char *file_name, DesktopEntry *entry)
-{
-    gchar *full_path = g_build_filename(path, file_name, NULL);
-    if (read_desktop_file_full_path(full_path, entry)) {
-        g_free(full_path);
-        return TRUE;
-    }
-    free_and_null(entry->name);
-    free_and_null(entry->generic_name);
-    free_and_null(entry->icon);
-    free_and_null(entry->exec);
-    free_and_null(entry->cwd);
-
-    GList *subdirs = NULL;
-
-    GDir *d = g_dir_open(path, 0, NULL);
-    if (d) {
-        const gchar *name;
-        while ((name = g_dir_read_name(d))) {
-            gchar *child = g_build_filename(path, name, NULL);
-            if (g_file_test(child, G_FILE_TEST_IS_DIR)) {
-                subdirs = g_list_append(subdirs, child);
-            } else {
-                g_free(child);
-            }
-        }
-        g_dir_close(d);
-    }
-
-    subdirs = g_list_sort(subdirs, compare_strings);
-    gboolean found = FALSE;
-    for (GList *l = subdirs; l; l = g_list_next(l)) {
-        if (read_desktop_file_from_dir(l->data, file_name, entry)) {
-            found = TRUE;
-            break;
-        }
-    }
-
-    for (GList *l = subdirs; l; l = g_list_next(l)) {
-        g_free(l->data);
-    }
-    g_list_free(subdirs);
-    g_free(full_path);
-
-    return found;
-}
-
-gboolean read_desktop_file(const char *path, DesktopEntry *entry)
-{
-    entry->path = strdup(path);
-    entry->name = entry->generic_name = entry->icon = entry->exec = entry->cwd = NULL;
-
-    if (strchr(path, '/'))
-        return read_desktop_file_full_path(path, entry);
-    for (const GSList *location = get_apps_locations(); location; location = g_slist_next(location)) {
-        if (read_desktop_file_from_dir(location->data, path, entry))
-            return TRUE;
-    }
-    return FALSE;
 }
 
 void free_desktop_entry(DesktopEntry *entry)
 {
-    free_and_null(entry->name);
+	free(entry->name);
-    free_and_null(entry->generic_name);
+	free(entry->icon);
-    free_and_null(entry->icon);
+	free(entry->exec);
-    free_and_null(entry->exec);
+	free(entry->path);
-    free_and_null(entry->path);
+	entry->name = entry->icon = entry->exec = entry->path = NULL;
-    free_and_null(entry->cwd);
 }
 
 void test_read_desktop_file()
 {
-    fprintf(stderr, YELLOW);
+	fprintf(stdout, "\033[1;33m");
-    DesktopEntry entry;
+	DesktopEntry entry;
-    read_desktop_file("/usr/share/applications/firefox.desktop", &entry);
+	read_desktop_file("/usr/share/applications/firefox.desktop", &entry);
-    fprintf(stderr, "tint2: Name:%s GenericName:%s Icon:%s Exec:%s\n", entry.name, entry.generic_name, entry.icon, entry.exec);
+	printf("Name:%s Icon:%s Exec:%s\n", entry.name, entry.icon, entry.exec);
-    fprintf(stderr, RESET);
+	fprintf(stdout, "\033[0m");
-}
-
-GSList *apps_locations = NULL;
-// Do not free the result.
-const GSList *get_apps_locations()
-{
-    if (apps_locations)
-        return apps_locations;
-
-    apps_locations = load_locations_from_env(apps_locations, "XDG_DATA_HOME", "applications", NULL);
-
-    apps_locations =
-        g_slist_append(apps_locations, g_build_filename(g_get_home_dir(), ".local/share/applications", NULL));
-
-    apps_locations = load_locations_from_env(apps_locations, "XDG_DATA_DIRS", "applications", NULL);
-
-    apps_locations = g_slist_append(apps_locations, g_strdup("/usr/local/share/applications"));
-    apps_locations = g_slist_append(apps_locations, g_strdup("/usr/share/applications"));
-    apps_locations = g_slist_append(apps_locations, g_strdup("/opt/share/applications"));
-
-    apps_locations = slist_remove_duplicates(apps_locations, g_str_equal, g_free);
-
-    return apps_locations;
 }

src/launcher/apps-common.h

@@ -7,18 +7,11 @@
 #ifndef APPS_COMMON_H
 #define APPS_COMMON_H
 
-#include <glib.h>
-
 typedef struct DesktopEntry {
-    char *name;
+	char *name;
-    char *generic_name;
+	char *exec;
-    char *exec;
+	char *icon;
-    char *icon;
+	char *path;
-    char *path;
-    char *cwd;
-    gboolean hidden_from_menus;
-    gboolean start_in_terminal;
-    gboolean startup_notification;
 } DesktopEntry;
 
 // Parses a line of the form "key = value". Modifies the line.
@@ -29,13 +22,9 @@ int parse_dektop_line(char *line, char **key, char **value);
 // Reads the .desktop file from the given path into the DesktopEntry entry.
 // The DesktopEntry object must be initially empty.
 // Returns 1 if successful.
-gboolean read_desktop_file(const char *path, DesktopEntry *entry);
+int read_desktop_file(const char *path, DesktopEntry *entry);
 
 // Empties DesktopEntry: releases the memory of the *members* of entry.
 void free_desktop_entry(DesktopEntry *entry);
 
-// Returns a list of the directories used to store desktop files.
-// Do not free the result, it is cached.
-const GSList *get_apps_locations();
-
 #endif

src/launcher/icon-theme-common.h

@@ -7,30 +7,18 @@
 #define ICON_THEME_COMMON_H
 
 #include <glib.h>
-#include "cache.h"
 
 typedef struct IconThemeWrapper {
-    // The icon theme name for which this wrapper was created
+	// List of IconTheme*
-    char *icon_theme_name;
+	GSList *themes;
-    // List of IconTheme*
+	// List of IconTheme*
-    GSList *themes;
+	GSList *themes_fallback;
-    // Themes are loaded lazily when needed.
-    gboolean _themes_loaded;
-    // List of IconTheme*
-    GSList *themes_fallback;
-    // Fallback themes are loaded lazily when needed.
-    gboolean _fallback_loaded;
-    Cache _cache;
-    // List of icon theme names that have been queued for loading.
-    // Used to avoid loading the same theme twice, and to avoid cycles.
-    GSList *_queued;
 } IconThemeWrapper;
 
 typedef struct IconTheme {
-    char *name;
+	char *name;
-    char *description;
+	GSList *list_inherits; // each item is a char* (theme name)
-    GSList *list_inherits;    // each item is a char* (theme name)
+	GSList *list_directories; // each item is an IconThemeDir*
-    GSList *list_directories; // each item is an IconThemeDir*
 } IconTheme;
 
 // Parses a line of the form "key = value". Modifies the line.
@@ -42,21 +30,16 @@ int parse_theme_line(char *line, char **key, char **value);
 // inherited themes, the hicolor theme and possibly fallback themes.
 IconThemeWrapper *load_themes(const char *icon_theme_name);
 
-void save_icon_cache(IconThemeWrapper *wrapper);
+void free_themes(IconThemeWrapper *themes);
-
-void free_themes(IconThemeWrapper *wrapper);
-void free_icon_theme(IconTheme *theme);
 
 #define DEFAULT_ICON "application-x-executable"
 
 // Returns the full path to an icon file (or NULL) given the list of icon themes to search and the icon name
 // Note: needs to be released with free().
-char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size, gboolean use_fallbacks);
+char *get_icon_path(IconThemeWrapper *theme, const char *icon_name, int size);
 
 // Returns a list of the directories used to store icons.
 // Do not free the result, it is cached.
 const GSList *get_icon_locations();
 
-extern gboolean debug_icons;
-
 #endif

src/launcher/launcher.c

@@ -30,7 +30,13 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <sys/types.h>
+#include <sys/wait.h>
+
+#ifdef HAVE_RSVG
+#include <librsvg/rsvg.h>
+#endif
 
 #include "window.h"
 #include "server.h"
@@ -50,555 +56,450 @@ int launcher_brightness;
 char *icon_theme_name_config;
 char *icon_theme_name_xsettings;
 int launcher_icon_theme_override;
-Background *launcher_icon_bg;
+XSettingsClient *xsettings_client;
-GList *launcher_icon_gradients;
+int startup_notifications;
-
-IconThemeWrapper *icon_theme_wrapper;
 
 Imlib_Image scale_icon(Imlib_Image original, int icon_size);
 void free_icon(Imlib_Image icon);
-void launcher_icon_dump_geometry(void *obj, int indent);
-void launcher_reload_icon(Launcher *launcher, LauncherIcon *launcherIcon);
-void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon);
-void launcher_reload_hidden_icons(Launcher *launcher);
-void launcher_icon_on_change_layout(void *obj);
-int launcher_compute_desired_size(void *obj);
-
-void relayout_launcher();
 
 void default_launcher()
 {
-    launcher_enabled = 0;
+	launcher_enabled = 0;
-    launcher_max_icon_size = 0;
+	launcher_max_icon_size = 0;
-    launcher_tooltip_enabled = 0;
+	launcher_tooltip_enabled = 0;
-    launcher_alpha = 100;
+	launcher_alpha = 100;
-    launcher_saturation = 0;
+	launcher_saturation = 0;
-    launcher_brightness = 0;
+	launcher_brightness = 0;
-    icon_theme_name_config = NULL;
+	icon_theme_name_config = NULL;
-    icon_theme_name_xsettings = NULL;
+	icon_theme_name_xsettings = NULL;
-    launcher_icon_theme_override = 0;
+	launcher_icon_theme_override = 0;
-    startup_notifications = 0;
+	xsettings_client = NULL;
-    launcher_icon_bg = NULL;
+	startup_notifications = 0;
-    launcher_icon_gradients = NULL;
 }
 
+
 void init_launcher()
 {
+	if (launcher_enabled) {
+		// if XSETTINGS manager running, tint2 read the icon_theme_name.
+		xsettings_client = xsettings_client_new(server.dsp, server.screen, xsettings_notify_cb, NULL, NULL);
+	}
 }
 
+
 void init_launcher_panel(void *p)
 {
-    Panel *panel = (Panel *)p;
+	Panel *panel =(Panel*)p;
-    Launcher *launcher = &panel->launcher;
+	Launcher *launcher = &panel->launcher;
 
-    launcher->area.parent = p;
+	launcher->area.parent = p;
-    launcher->area.panel = p;
+	launcher->area.panel = p;
-    snprintf(launcher->area.name, sizeof(launcher->area.name), "Launcher");
+	launcher->area._draw_foreground = NULL;
-    launcher->area._draw_foreground = NULL;
+	launcher->area.size_mode = SIZE_BY_CONTENT;
-    launcher->area.size_mode = LAYOUT_FIXED;
+	launcher->area._resize = resize_launcher;
-    launcher->area._resize = resize_launcher;
+	launcher->area.resize = 1;
-    launcher->area._on_change_layout = relayout_launcher;
+	launcher->area.redraw = 1;
-    launcher->area._compute_desired_size = launcher_compute_desired_size;
+	if (!launcher->area.bg)
-    launcher->area.resize_needed = 1;
+		launcher->area.bg = &g_array_index(backgrounds, Background, 0);
-    schedule_redraw(&launcher->area);
-    if (!launcher->area.bg)
-        launcher->area.bg = &g_array_index(backgrounds, Background, 0);
 
-    if (!launcher_icon_bg)
+	// check consistency
-        launcher_icon_bg = &g_array_index(backgrounds, Background, 0);
+	if (launcher->list_apps == NULL)
+		return;
 
-    // check consistency
+	launcher->area.on_screen = 1;
-    if (launcher->list_apps == NULL)
+	panel_refresh = 1;
-        return;
 
-    // This will be recomputed on resize, we just initialize to a non-zero value
+	launcher_load_themes(launcher);
-    launcher->icon_size = launcher_max_icon_size > 0 ? launcher_max_icon_size : 24;
+	launcher_load_icons(launcher);
-
-    launcher->area.on_screen = TRUE;
-    schedule_panel_redraw();
-    instantiate_area_gradients(&launcher->area);
-
-    load_icon_themes();
-    launcher_load_icons(launcher);
 }
 
-void free_icon_themes()
-{
-    free_themes(icon_theme_wrapper);
-    icon_theme_wrapper = NULL;
-}
 
 void cleanup_launcher()
 {
-    for (int i = 0; i < num_panels; i++) {
+	int i;
-        Panel *panel = &panels[i];
+	GSList *l;
-        Launcher *launcher = &panel->launcher;
-        cleanup_launcher_theme(launcher);
-    }
 
-    for (GSList *l = panel_config.launcher.list_apps; l; l = l->next) {
+	if (xsettings_client)
-        free(l->data);
+		xsettings_client_destroy(xsettings_client);
-    }
+	xsettings_client = NULL;
-    g_slist_free(panel_config.launcher.list_apps);
-    panel_config.launcher.list_apps = NULL;
 
-    free(icon_theme_name_config);
+	for (i = 0; i < nb_panel; i++) {
-    icon_theme_name_config = NULL;
+		Panel *panel = &panel1[i];
+		Launcher *launcher = &panel->launcher;
+		cleanup_launcher_theme(launcher);
+	}
 
-    free(icon_theme_name_xsettings);
+	for (l = panel_config.launcher.list_apps; l ; l = l->next) {
-    icon_theme_name_xsettings = NULL;
+		free(l->data);
+	}
+	g_slist_free(panel_config.launcher.list_apps);
+	panel_config.launcher.list_apps = NULL;
 
-    launcher_enabled = FALSE;
+	free(icon_theme_name_config);
+	icon_theme_name_config = NULL;
+
+	free(icon_theme_name_xsettings);
+	icon_theme_name_xsettings = NULL;
+
+	launcher_enabled = 0;
 }
 
+
 void cleanup_launcher_theme(Launcher *launcher)
 {
-    free_area(&launcher->area);
+	free_area(&launcher->area);
-    for (GSList *l = launcher->list_icons; l; l = l->next) {
+	GSList *l;
-        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+	for (l = launcher->list_icons; l ; l = l->next) {
-        if (launcherIcon) {
+		LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
-            free_icon(launcherIcon->image);
+		if (launcherIcon) {
-            free_icon(launcherIcon->image_hover);
+			free_icon(launcherIcon->image);
-            free_icon(launcherIcon->image_pressed);
+			free(launcherIcon->icon_name);
-            free(launcherIcon->icon_name);
+			free(launcherIcon->icon_path);
-            free(launcherIcon->icon_path);
+			free(launcherIcon->cmd);
-            free(launcherIcon->cmd);
+			free(launcherIcon->icon_tooltip);
-            g_free(launcherIcon->icon_tooltip);
+		}
-            free(launcherIcon->config_path);
+		free(launcherIcon);
-        }
+	}
-        free(launcherIcon);
+	g_slist_free(launcher->list_icons);
-    }
+	launcher->list_icons = NULL;
-    g_slist_free(launcher->list_icons);
+
-    launcher->list_icons = NULL;
+	free_themes(launcher->list_themes);
+	launcher->list_themes = NULL;
 }
 
-int launcher_compute_icon_size(Launcher *launcher)
+
+int resize_launcher(void *obj)
 {
-    int icon_size = panel_horizontal ? launcher->area.height : launcher->area.width;
+	Launcher *launcher = obj;
-    icon_size = icon_size - MAX(left_right_border_width(&launcher->area), top_bottom_border_width(&launcher->area)) -
+	GSList *l;
-                (2 * launcher->area.paddingy);
+	int count, icon_size;
-    if (launcher_max_icon_size > 0 && icon_size > launcher_max_icon_size)
+	int icons_per_column=1, icons_per_row=1, marging=0;
-        icon_size = launcher_max_icon_size;
-    return icon_size;
-}
 
-void launcher_compute_geometry(Launcher *launcher,
+	if (panel_horizontal) {
-                               int *size,
+		icon_size = launcher->area.height;
-                               int *icon_size,
+	} else {
-                               int *icons_per_column,
+		icon_size = launcher->area.width;
-                               int *icons_per_row,
+	}
-                               int *margin)
+	icon_size = icon_size - (2 * launcher->area.bg->border.width) - (2 * launcher->area.paddingy);
-{
+	if (launcher_max_icon_size > 0 && icon_size > launcher_max_icon_size)
-    int count = 0;
+		icon_size = launcher_max_icon_size;
-    for (GSList *l = launcher->list_icons; l; l = l->next) {
-        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-        if (launcherIcon->area.on_screen)
-            count++;
-    }
 
-    *icon_size = launcher_compute_icon_size(launcher);
+	// Resize icons if necessary
-    *icons_per_column = 1;
+	for (l = launcher->list_icons; l ; l = l->next) {
-    *icons_per_row = 1;
+		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-    *margin = 0;
+		if (launcherIcon->icon_size != icon_size || !launcherIcon->image) {
-    if (panel_horizontal) {
+			launcherIcon->icon_size = icon_size;
-        if (!count) {
+			launcherIcon->area.width = launcherIcon->icon_size;
-            *size = 0;
+			launcherIcon->area.height = launcherIcon->icon_size;
-        } else {
-            int height = launcher->area.height - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
-            // here icons_per_column always higher than 0
-            *icons_per_column = (height + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
-            *margin = height - (*icons_per_column - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
-            *icons_per_row = count / *icons_per_column + (count % *icons_per_column != 0);
-            *size = left_right_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
-                    (*icon_size * *icons_per_row) + ((*icons_per_row - 1) * launcher->area.paddingx);
-        }
-    } else {
-        if (!count) {
-            *size = 0;
-        } else {
-            int width = launcher->area.width - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
-            // here icons_per_row always higher than 0
-            *icons_per_row = (width + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
-            *margin = width - (*icons_per_row - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
-            *icons_per_column = count / *icons_per_row + (count % *icons_per_row != 0);
-            *size = top_bottom_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
-                    (*icon_size * *icons_per_column) + ((*icons_per_column - 1) * launcher->area.paddingx);
-        }
-    }
-}
 
-int launcher_compute_desired_size(void *obj)
+			// Get the path for an icon file with the new size
-{
+			char *new_icon_path = get_icon_path(launcher->list_themes, launcherIcon->icon_name, launcherIcon->icon_size);
-    Launcher *launcher = (Launcher *)obj;
+			if (!new_icon_path) {
+				// Draw a blank icon
+				free_icon(launcherIcon->image);
+				launcherIcon->image = NULL;
+				continue;
+			}
 
-    int size, icon_size, icons_per_column, icons_per_row, margin;
+			// Free the old files
-    launcher_compute_geometry(launcher, &size, &icon_size, &icons_per_column, &icons_per_row, &margin);
+			free_icon(launcherIcon->image);
-    return size;
+			launcherIcon->image = NULL;
-}
+			// Load the new file and scale
+			launcherIcon->image = imlib_load_image_immediately(new_icon_path);
+#ifdef HAVE_RSVG
+			if (!launcherIcon->image && g_str_has_suffix(new_icon_path, ".svg")) {
+				char suffix[128];
+				sprintf(suffix, "tmpicon-%d.png", getpid());
+				// We fork here because librsvg allocates memory like crazy
+				pid_t pid = fork();
+				if (pid == 0) {
+					// Child
+					GError* err = NULL;
+					RsvgHandle* svg = rsvg_handle_new_from_file(new_icon_path, &err);
 
-gboolean resize_launcher(void *obj)
+					if (err != NULL) {
-{
+						fprintf(stderr, "Could not load svg image!: %s", err->message);
-    Launcher *launcher = (Launcher *)obj;
+						g_error_free(err);
+						launcherIcon->image = NULL;
+					} else {
+						gchar *name = g_build_filename(g_get_user_config_dir(), "tint2", suffix, NULL);
+						GdkPixbuf *pixbuf = rsvg_handle_get_pixbuf(svg);
+						gdk_pixbuf_save(pixbuf, name, "png", NULL, NULL);
+					}
+					exit(0);
+				} else {
+					// Parent
+					waitpid(pid, 0, 0);
+					gchar *name = g_build_filename(g_get_user_config_dir(), "tint2", suffix, NULL);
+					launcherIcon->image = imlib_load_image_immediately_without_cache(name);
+					g_remove(name);
+					g_free(name);
+				}
+			} else
+#endif
+			{
+				launcherIcon->image = imlib_load_image_immediately(new_icon_path);
+			}
+			// 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);
+			}
 
-    int size, icons_per_column, icons_per_row, margin;
+			if (!launcherIcon->image) {
-    launcher_compute_geometry(launcher, &size, &launcher->icon_size, &icons_per_column, &icons_per_row, &margin);
+				// Loading default icon failed, draw a blank icon
+				free(new_icon_path);
+			} else {
+				// Loaded icon successfully
+				Imlib_Image original = launcherIcon->image;
+				launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);
+				free_icon(original);
+				free(launcherIcon->icon_path);
+				launcherIcon->icon_path = new_icon_path;
+				fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+			}
+		}
+	}
+	
+	count = g_slist_length(launcher->list_icons);
 
-    // Resize icons if necessary
+	if (panel_horizontal) {
-    for (GSList *l = launcher->list_icons; l; l = l->next) {
+		if (!count) {
-        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+			launcher->area.width = 0;
-        if (launcherIcon->icon_size != launcher->icon_size || !launcherIcon->image) {
+		} else {
-            launcherIcon->icon_size = launcher->icon_size;
+			int height = launcher->area.height - 2*launcher->area.bg->border.width - 2*launcher->area.paddingy;
-            launcherIcon->area.width = launcherIcon->icon_size;
+			// here icons_per_column always higher than 0
-            launcherIcon->area.height = launcherIcon->icon_size;
+			icons_per_column = (height+launcher->area.paddingx) / (icon_size+launcher->area.paddingx);
-            launcher_reload_icon_image(launcher, launcherIcon);
+			marging = height - (icons_per_column-1)*(icon_size+launcher->area.paddingx) - icon_size;
-        }
+			icons_per_row = count / icons_per_column + (count%icons_per_column != 0);
-    }
+			launcher->area.width = (2 * launcher->area.bg->border.width) +
-    save_icon_cache(icon_theme_wrapper);
+								   (2 * launcher->area.paddingxlr) +
+								   (icon_size * icons_per_row) +
+								   ((icons_per_row-1) * launcher->area.paddingx);
+		}
+	}
+	else {
+		if (!count) {
+			launcher->area.height = 0;
+		} else {
+			int width = launcher->area.width - 2*launcher->area.bg->border.width - 2*launcher->area.paddingy;
+			// here icons_per_row always higher than 0
+			icons_per_row = (width+launcher->area.paddingx) / (icon_size+launcher->area.paddingx);
+			marging = width - (icons_per_row-1)*(icon_size+launcher->area.paddingx) - icon_size;
+			icons_per_column = count / icons_per_row+ (count%icons_per_row != 0);
+			launcher->area.height = (2 * launcher->area.bg->border.width) +
+									(2 * launcher->area.paddingxlr) +
+									(icon_size * icons_per_column) +
+									((icons_per_column-1) * launcher->area.paddingx);
+		}
+	}
 
-    int count = 0;
+	int i, posx, posy;
-    gboolean needs_repositioning = FALSE;
+	int start = launcher->area.bg->border.width + launcher->area.paddingy + marging/2;
-    for (GSList *l = launcher->list_icons; l; l = l->next) {
+	if (panel_horizontal) {
-        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+		posy = start;
-        if (launcherIcon->area.on_screen) {
+		posx = launcher->area.bg->border.width + launcher->area.paddingxlr;
-            count++;
+	} else {
-            if (launcherIcon->area.posx < 0 || launcherIcon->area.posy < 0)
+		posx = start;
-                needs_repositioning = TRUE;
+		posy = launcher->area.bg->border.width + launcher->area.paddingxlr;
-        }
+	}
-    }
 
-    if (!needs_repositioning) {
+	for (i=1, l = launcher->list_icons; l ; i++, l = l->next) {
-        if (panel_horizontal) {
+		LauncherIcon *launcherIcon = (LauncherIcon*)l->data;
-            if (launcher->area.width == size)
+		
-                return FALSE;
+		launcherIcon->y = posy;
-            launcher->area.width = size;
+		launcherIcon->x = posx;
-        } else {
+		launcherIcon->area.posy = ((Area*)launcherIcon->area.parent)->posy + launcherIcon->y;
-            if (launcher->area.height == size)
+		launcherIcon->area.posx = ((Area*)launcherIcon->area.parent)->posx + launcherIcon->x;
-                return FALSE;
+		launcherIcon->area.width = launcherIcon->icon_size;
-            launcher->area.height = size;
+		launcherIcon->area.height = launcherIcon->icon_size;
-        }
+		//printf("launcher %d : %d,%d\n", i, posx, posy);
-    }
+		if (panel_horizontal) {
+			if (i % icons_per_column) {
+				posy += icon_size + launcher->area.paddingx;
+			} else {
+				posy = start;
+				posx += (icon_size + launcher->area.paddingx);
+			}
+		} else {
+			if (i % icons_per_row) {
+				posx += icon_size + launcher->area.paddingx;
+			} else {
+				posx = start;
+				posy += (icon_size + launcher->area.paddingx);
+			}
+		}
+	}
 
-    int posx, posy;
+	return 1;
-    int start;
-    if (panel_horizontal) {
-        posy = start = top_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
-        posx = left_border_width(&launcher->area) + launcher->area.paddingxlr;
-    } else {
-        posx = start = left_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
-        posy = top_border_width(&launcher->area) + launcher->area.paddingxlr;
-    }
-
-    int i = 0;
-    for (GSList *l = launcher->list_icons; l; l = l->next) {
-        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-        if (!launcherIcon->area.on_screen)
-            continue;
-        i++;
-        launcherIcon->y = posy;
-        launcherIcon->x = posx;
-        launcher_icon_on_change_layout(launcherIcon);
-        // fprintf(stderr, "tint2: launcher %d : %d,%d\n", i, posx, posy);
-        if (panel_horizontal) {
-            if (i % icons_per_column) {
-                posy += launcher->icon_size + launcher->area.paddingx;
-            } else {
-                posy = start;
-                posx += (launcher->icon_size + launcher->area.paddingx);
-            }
-        } else {
-            if (i % icons_per_row) {
-                posx += launcher->icon_size + launcher->area.paddingx;
-            } else {
-                posx = start;
-                posy += (launcher->icon_size + launcher->area.paddingx);
-            }
-        }
-    }
-
-    if ((panel_horizontal && icons_per_column == 1) || (!panel_horizontal && icons_per_row == 1)) {
-        launcher->area._is_under_mouse = full_width_area_is_under_mouse;
-        for (GSList *l = launcher->list_icons; l; l = l->next)
-            ((LauncherIcon *)l->data)->area._is_under_mouse = full_width_area_is_under_mouse;
-    } else {
-        launcher->area._is_under_mouse = NULL;
-        for (GSList *l = launcher->list_icons; l; l = l->next)
-            ((LauncherIcon *)l->data)->area._is_under_mouse = NULL;
-    }
-
-    return TRUE;
-}
-
-void relayout_launcher(void *obj)
-{
-    Launcher *launcher = (Launcher *)obj;
-    for (GSList *l = launcher->list_icons; l; l = l->next) {
-        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-        if (!launcherIcon->area.on_screen)
-            continue;
-        launcher_icon_on_change_layout(launcherIcon);
-    }
 }
 
 // Here we override the default layout of the icons; normally Area layouts its children
 // in a stack; we need to layout them in a kind of table
 void launcher_icon_on_change_layout(void *obj)
 {
-    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
-    launcherIcon->area.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
+	launcherIcon->area.posy = ((Area*)launcherIcon->area.parent)->posy + launcherIcon->y;
-    launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
+	launcherIcon->area.posx = ((Area*)launcherIcon->area.parent)->posx + launcherIcon->x;
-    launcherIcon->area.width = launcherIcon->icon_size;
+	launcherIcon->area.width = launcherIcon->icon_size;
-    launcherIcon->area.height = launcherIcon->icon_size;
+	launcherIcon->area.height = launcherIcon->icon_size;
 }
 
-int launcher_icon_compute_desired_size(void *obj)
+const char* launcher_icon_get_tooltip_text(void *obj)
 {
-    LauncherIcon *icon = (LauncherIcon *)obj;
+	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
-    return icon->icon_size;
+	return launcherIcon->icon_tooltip;
-}
-
-char *launcher_icon_get_tooltip_text(void *obj)
-{
-    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
-    return strdup(launcherIcon->icon_tooltip);
 }
 
 void draw_launcher_icon(void *obj, cairo_t *c)
 {
-    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+	LauncherIcon *launcherIcon = (LauncherIcon*)obj;
 
-    Imlib_Image image;
+	// Render
-    // Render
+	imlib_context_set_image(launcherIcon->image);
-    if (panel_config.mouse_effects) {
+	render_image(launcherIcon->area.pix, 0, 0);
-        if (launcherIcon->area.mouse_state == MOUSE_OVER)
-            image = launcherIcon->image_hover ? launcherIcon->image_hover : launcherIcon->image;
-        else if (launcherIcon->area.mouse_state == MOUSE_DOWN)
-            image = launcherIcon->image_pressed ? launcherIcon->image_pressed : launcherIcon->image;
-        else
-            image = launcherIcon->image;
-    } else {
-        image = launcherIcon->image;
-    }
-    imlib_context_set_image(image);
-    render_image(launcherIcon->area.pix, 0, 0);
-}
-
-void launcher_icon_dump_geometry(void *obj, int indent)
-{
-    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
-    fprintf(stderr,
-            "tint2: %*sIcon: w = h = %d, name = %s\n",
-            indent,
-            "",
-            launcherIcon->icon_size,
-            launcherIcon->icon_name);
 }
 
 Imlib_Image scale_icon(Imlib_Image original, int icon_size)
 {
-    Imlib_Image icon_scaled;
+	Imlib_Image icon_scaled;
-    if (original) {
+	if (original) {
-        imlib_context_set_image(original);
+		imlib_context_set_image (original);
-        icon_scaled = imlib_create_cropped_scaled_image(0,
+		icon_scaled = imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), icon_size, icon_size);
-                                                        0,
-                                                        imlib_image_get_width(),
-                                                        imlib_image_get_height(),
-                                                        icon_size,
-                                                        icon_size);
 
-        imlib_context_set_image(icon_scaled);
+		imlib_context_set_image (icon_scaled);
-        imlib_image_set_has_alpha(1);
+		imlib_image_set_has_alpha(1);
-        DATA32 *data = imlib_image_get_data();
+		DATA32* data = imlib_image_get_data();
-        adjust_asb(data,
+		adjust_asb(data, icon_size, icon_size, launcher_alpha, (float)launcher_saturation/100, (float)launcher_brightness/100);
-                   icon_size,
+		imlib_image_put_back_data(data);
-                   icon_size,
-                   launcher_alpha / 100.0,
-                   launcher_saturation / 100.0,
-                   launcher_brightness / 100.0);
-        imlib_image_put_back_data(data);
 
-        imlib_context_set_image(icon_scaled);
+		imlib_context_set_image (icon_scaled);
-    } else {
+	} else {
-        icon_scaled = imlib_create_image(icon_size, icon_size);
+		icon_scaled = imlib_create_image(icon_size, icon_size);
-        imlib_context_set_image(icon_scaled);
+		imlib_context_set_image (icon_scaled);
-        imlib_context_set_color(255, 255, 255, 255);
+		imlib_context_set_color(255, 255, 255, 255);
-        imlib_image_fill_rectangle(0, 0, icon_size, icon_size);
+		imlib_image_fill_rectangle(0, 0, icon_size, icon_size);
-    }
+	}
-    return icon_scaled;
+	return icon_scaled;
 }
 
 void free_icon(Imlib_Image icon)
 {
-    if (icon) {
+	if (icon) {
-        imlib_context_set_image(icon);
+		imlib_context_set_image(icon);
-        imlib_free_image();
+		imlib_free_image();
-    }
+	}
 }
 
-void launcher_action(LauncherIcon *icon, XEvent *evt, int x, int y)
+void launcher_action(LauncherIcon *icon, XEvent* evt)
 {
-    launcher_reload_icon((Launcher *)icon->area.parent, icon);
+	char *cmd = calloc(strlen(icon->cmd) + 10, 1);
-    launcher_reload_hidden_icons((Launcher *)icon->area.parent);
+	sprintf(cmd, "(%s&)", icon->cmd);
-
+#if HAVE_SN
-    if (evt->type == ButtonPress || evt->type == ButtonRelease) {
+	SnLauncherContext* ctx = 0;
-        GString *cmd = g_string_new(icon->cmd);
+	Time time;
-        tint2_g_string_replace(cmd, "%f", "");
+	if (startup_notifications) {
-        tint2_g_string_replace(cmd, "%F", "");
+		ctx = sn_launcher_context_new(server.sn_dsp, server.screen);
-        tint_exec(cmd->str,
+		sn_launcher_context_set_name(ctx, icon->icon_tooltip);
-                  icon->cwd,
+		sn_launcher_context_set_description(ctx, "Application launched from tint2");
-                  icon->icon_tooltip,
+		sn_launcher_context_set_binary_name (ctx, icon->cmd);
-                  evt->xbutton.time,
+		// Get a timestamp from the X event
-                  &icon->area,
+		if (evt->type == ButtonPress || evt->type == ButtonRelease) {
-                  x,
+			time = evt->xbutton.time;
-                  y,
+		} else {
-                  icon->start_in_terminal,
+			fprintf(stderr, "Unknown X event: %d\n", evt->type);
-                  icon->startup_notification);
+			free(cmd);
-        g_string_free(cmd, TRUE);
+			return;
-    }
+		}
+		sn_launcher_context_initiate(ctx, "tint2", icon->cmd, time);
+	}
+#endif /* HAVE_SN */
+	pid_t pid;
+	pid = fork();
+	if (pid < 0) {
+		fprintf(stderr, "Could not fork\n");
+	} else if (pid == 0) {
+		// Child process
+#if HAVE_SN
+		if (startup_notifications) {
+			sn_launcher_context_setup_child_process(ctx);
+		}
+#endif // HAVE_SN
+		// Allow children to exist after parent destruction
+		setsid();
+		// Run the command
+		execl("/bin/sh", "/bin/sh", "-c", icon->cmd, NULL);
+		fprintf(stderr, "Failed to execlp %s\n", icon->cmd);
+#if HAVE_SN
+		if (startup_notifications) {
+			sn_launcher_context_unref(ctx);
+		}
+#endif // HAVE_SN
+		exit(1);
+	} else {
+		// Parent process
+#if HAVE_SN
+		if (startup_notifications) {
+			g_tree_insert(server.pids, GINT_TO_POINTER (pid), ctx);
+		}
+#endif // HAVE_SN
+	}
+	free(cmd);
 }
 
 // Populates the list_icons list from the list_apps list
 void launcher_load_icons(Launcher *launcher)
 {
-    // Load apps (.desktop style launcher items)
+	// Load apps (.desktop style launcher items)
-    GSList *app = launcher->list_apps;
+	GSList* app = launcher->list_apps;
-    int index = 0;
+	while (app != NULL) {
-    while (app != NULL) {
+		DesktopEntry entry;
-        index++;
+		read_desktop_file(app->data, &entry);
-        LauncherIcon *launcherIcon = (LauncherIcon *)calloc(1, sizeof(LauncherIcon));
+		if (entry.exec) {
-        launcherIcon->area.panel = launcher->area.panel;
+			LauncherIcon *launcherIcon = calloc(1, sizeof(LauncherIcon));
-        launcherIcon->area._draw_foreground = draw_launcher_icon;
+			launcherIcon->area.parent = launcher;
-        launcherIcon->area.size_mode = LAYOUT_FIXED;
+			launcherIcon->area.panel = launcher->area.panel;
-        launcherIcon->area._resize = NULL;
+			launcherIcon->area._draw_foreground = draw_launcher_icon;
-        launcherIcon->area._compute_desired_size = launcher_icon_compute_desired_size;
+			launcherIcon->area.size_mode = SIZE_BY_CONTENT;
-        sprintf(launcherIcon->area.name, "LauncherIcon %d", index);
+			launcherIcon->area._resize = NULL;
-        launcherIcon->area.resize_needed = 0;
+			launcherIcon->area.resize = 0;
-        launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
+			launcherIcon->area.redraw = 1;
-        launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
+			launcherIcon->area.bg = &g_array_index(backgrounds, Background, 0);
-        launcherIcon->area.bg = launcher_icon_bg;
+			launcherIcon->area.on_screen = 1;
-        launcherIcon->area.on_screen = TRUE;
+			launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
-        launcherIcon->area.posx = -1;
+			if (launcher_tooltip_enabled) {
-        launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
+				launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
-        launcherIcon->area._dump_geometry = launcher_icon_dump_geometry;
+			} else {
-        if (launcher_tooltip_enabled) {
+				launcherIcon->area._get_tooltip_text = NULL;
-            launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
+			}
-        } else {
+			launcherIcon->is_app_desktop = 1;
-            launcherIcon->area._get_tooltip_text = NULL;
+			launcherIcon->cmd = strdup(entry.exec);
-        }
+			launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(DEFAULT_ICON);
-        launcherIcon->config_path = strdup(app->data);
+			launcherIcon->icon_size = 1;
-        add_area(&launcherIcon->area, (Area *)launcher);
+			launcherIcon->icon_tooltip = entry.name ? strdup(entry.name) : strdup(entry.exec);
-        launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
+			free_desktop_entry(&entry);
-        launcherIcon->icon_size = launcher->icon_size;
+			launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
-        launcher_reload_icon(launcher, launcherIcon);
+			add_area(&launcherIcon->area);
-        instantiate_area_gradients(&launcherIcon->area);
+		}
-        app = g_slist_next(app);
+		app = g_slist_next(app);
-    }
+	}
 }
 
-void launcher_reload_icon(Launcher *launcher, LauncherIcon *launcherIcon)
+
+// Populates the list_themes list
+void launcher_load_themes(Launcher *launcher)
 {
-    DesktopEntry entry;
+	launcher->list_themes = load_themes(launcher_icon_theme_override
-    if (read_desktop_file(launcherIcon->config_path, &entry) && entry.exec) {
+										? (icon_theme_name_config
-        schedule_redraw(&launcherIcon->area);
+										   ? icon_theme_name_config
-        if (launcherIcon->cmd)
+										   : icon_theme_name_xsettings
-            free(launcherIcon->cmd);
+											 ? icon_theme_name_xsettings
-        launcherIcon->cmd = strdup(entry.exec);
+											 : "hicolor")
-        if (launcherIcon->cwd)
+										: (icon_theme_name_xsettings
-            free(launcherIcon->cwd);
+										   ? icon_theme_name_xsettings
-        if (entry.cwd)
+										   : icon_theme_name_config
-            launcherIcon->cwd = strdup(entry.cwd);
+											 ? icon_theme_name_config
-        else
+											 : "hicolor"));
-            launcherIcon->cwd = NULL;
-        launcherIcon->start_in_terminal = entry.start_in_terminal;
-        launcherIcon->startup_notification = entry.startup_notification;
-        if (launcherIcon->icon_name)
-            free(launcherIcon->icon_name);
-        launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(DEFAULT_ICON);
-        if (entry.name) {
-            if (entry.generic_name) {
-                launcherIcon->icon_tooltip = g_strdup_printf("%s (%s)", entry.name, entry.generic_name);
-            } else {
-                launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.name);
-            }
-        } else {
-            if (entry.generic_name) {
-                launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.generic_name);
-            } else if (entry.exec) {
-                launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.exec);
-            }
-        }
-        launcher_reload_icon_image(launcher, launcherIcon);
-        show(&launcherIcon->area);
-    } else {
-        hide(&launcherIcon->area);
-    }
-    free_desktop_entry(&entry);
-}
-
-void launcher_reload_hidden_icons(Launcher *launcher)
-{
-    for (GSList *l = launcher->list_icons; l; l = l->next) {
-        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-        if (!launcherIcon->area.on_screen)
-            launcher_reload_icon(launcher, launcherIcon);
-    }
-}
-
-void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon)
-{
-    free_icon(launcherIcon->image);
-    free_icon(launcherIcon->image_hover);
-    free_icon(launcherIcon->image_pressed);
-    launcherIcon->image = NULL;
-
-    char *new_icon_path = get_icon_path(icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size, TRUE);
-    if (new_icon_path)
-        launcherIcon->image = load_image(new_icon_path, TRUE);
-    // On loading error, fallback to default
-    if (!launcherIcon->image) {
-        free(new_icon_path);
-        new_icon_path = get_icon_path(icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size, TRUE);
-        if (new_icon_path)
-            launcherIcon->image = load_image(new_icon_path, TRUE);
-    }
-    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, "tint2: launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
-
-    if (panel_config.mouse_effects) {
-        launcherIcon->image_hover = adjust_icon(launcherIcon->image,
-                                                panel_config.mouse_over_alpha,
-                                                panel_config.mouse_over_saturation,
-                                                panel_config.mouse_over_brightness);
-        launcherIcon->image_pressed = adjust_icon(launcherIcon->image,
-                                                  panel_config.mouse_pressed_alpha,
-                                                  panel_config.mouse_pressed_saturation,
-                                                  panel_config.mouse_pressed_brightness);
-    }
-    schedule_redraw(&launcherIcon->area);
-}
-
-void load_icon_themes()
-{
-    if (icon_theme_wrapper)
-        return;
-    icon_theme_wrapper =
-        load_themes(launcher_icon_theme_override
-                        ? (icon_theme_name_config ? icon_theme_name_config
-                                                  : icon_theme_name_xsettings ? icon_theme_name_xsettings : "hicolor")
-                        : (icon_theme_name_xsettings ? icon_theme_name_xsettings
-                                                     : icon_theme_name_config ? icon_theme_name_config : "hicolor"));
-}
-
-void launcher_default_icon_theme_changed()
-{
-    for (int i = 0; i < num_panels; i++) {
-        Launcher *launcher = &panels[i].launcher;
-        cleanup_launcher_theme(launcher);
-        launcher_load_icons(launcher);
-        launcher->area.resize_needed = 1;
-    }
-    schedule_panel_redraw();
 }

src/launcher/launcher.h

@@ -12,47 +12,38 @@
 #include "xsettings-client.h"
 #include "icon-theme-common.h"
 
-extern IconThemeWrapper *icon_theme_wrapper;
-void load_icon_themes();
-void free_icon_themes();
-
 typedef struct Launcher {
-    // always start with area
+	// always start with area
-    Area area;
+	Area area;
-    GSList *list_apps;  // List of char*, each is a path to a app.desktop file
+	GSList *list_apps;			// List of char*, each is a path to a app.desktop file
-    GSList *list_icons; // List of LauncherIcon*
+	GSList *list_icons; 		// List of LauncherIcon*
-    int icon_size;
+	IconThemeWrapper *list_themes;
 } Launcher;
 
 typedef struct LauncherIcon {
-    // always start with area
+	// always start with area
-    Area area;
+	Area area;
-    char *config_path;
+	Imlib_Image image;
-    Imlib_Image image;
+	char *cmd;
-    Imlib_Image image_hover;
+	char *icon_name;
-    Imlib_Image image_pressed;
+	char *icon_path;
-    char *cmd;
+	char *icon_tooltip;
-    char *cwd;
+	int icon_size;
-    gboolean start_in_terminal;
+	int is_app_desktop;
-    gboolean startup_notification;
+	int x, y;
-    char *icon_name;
-    char *icon_path;
-    char *icon_tooltip;
-    int icon_size;
-    int x, y;
 } LauncherIcon;
 
-extern gboolean launcher_enabled;
+extern int launcher_enabled;
 extern int launcher_max_icon_size;
 extern int launcher_tooltip_enabled;
 extern int launcher_alpha;
 extern int launcher_saturation;
 extern int launcher_brightness;
-extern char *icon_theme_name_xsettings; // theme name
+extern char *icon_theme_name_xsettings; 	// theme name
 extern char *icon_theme_name_config;
 extern int launcher_icon_theme_override;
-extern Background *launcher_icon_bg;
+extern XSettingsClient *xsettings_client;
-extern GList *launcher_icon_gradients;
+extern int startup_notifications;
 
 // default global data
 void default_launcher();
@@ -63,13 +54,14 @@ void init_launcher_panel(void *panel);
 void cleanup_launcher();
 void cleanup_launcher_theme(Launcher *launcher);
 
-gboolean resize_launcher(void *obj);
+int  resize_launcher(void *obj);
-void draw_launcher(void *obj, cairo_t *c);
+void draw_launcher (void *obj, cairo_t *c);
-void launcher_default_icon_theme_changed();
 
 // Populates the list_icons list
 void launcher_load_icons(Launcher *launcher);
-void launcher_action(LauncherIcon *icon, XEvent *e, int x, int y);
+// Populates the list_themes list
+void launcher_load_themes(Launcher *launcher);
+void launcher_action(LauncherIcon *icon, XEvent* e);
 
 void test_launcher_read_desktop_file();
 void test_launcher_read_theme_file();

src/launcher/xsettings-client.c

@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Owen Taylor, Red Hat, Inc.
@@ -26,452 +26,456 @@
 #include <string.h>
 
 #include <X11/Xlib.h>
-#include <X11/Xmd.h> /* For CARD16 */
+#include <X11/Xmd.h>		/* For CARD16 */
 
 #include "xsettings-client.h"
 #include "server.h"
 #include "panel.h"
 #include "launcher.h"
 
-struct _XSettingsClient {
+struct _XSettingsClient
-    Display *display;
+{
-    int screen;
+	Display *display;
-    XSettingsNotifyFunc notify;
+	int screen;
-    XSettingsWatchFunc watch;
+	XSettingsNotifyFunc notify;
-    void *cb_data;
+	XSettingsWatchFunc watch;
+	void *cb_data;
 
-    Window manager_window;
+	Window manager_window;
-    XSettingsList *settings;
+	XSettingsList *settings;
 };
 
-void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data)
+
+void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSetting *setting, void *data)
 {
-    if ((action == XSETTINGS_ACTION_NEW || action == XSETTINGS_ACTION_CHANGED) && name != NULL && setting != NULL) {
+	//printf("xsettings_notify_cb\n");
-        if (strcmp(name, "Net/IconThemeName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
+	if ((action == XSETTINGS_ACTION_NEW || action == XSETTINGS_ACTION_CHANGED) && name != NULL && setting != NULL) {
-            fprintf(stderr, "tint2: xsettings: %s = %s\n", name, setting->data.v_string);
+		if (!strcmp(name, "Net/IconThemeName") && setting->type == XSETTINGS_TYPE_STRING) {
-            if (icon_theme_name_xsettings) {
+			if (icon_theme_name_xsettings) {
-                if (strcmp(icon_theme_name_xsettings, setting->data.v_string) == 0)
+				if (strcmp(icon_theme_name_xsettings, setting->data.v_string) == 0)
-                    return;
+					return;
-                free(icon_theme_name_xsettings);
+				free(icon_theme_name_xsettings);
-            }
+			}
-            icon_theme_name_xsettings = strdup(setting->data.v_string);
+			icon_theme_name_xsettings = strdup(setting->data.v_string);
-            default_icon_theme_changed();
+			
-        } else if (strcmp(name, "Gtk/FontName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
+			int i;
-            fprintf(stderr, "tint2: xsettings: %s = %s\n", name, setting->data.v_string);
+			for (i = 0 ; i < nb_panel ; i++) {
-            if (default_font) {
+				Launcher *launcher = &panel1[i].launcher;
-                if (strcmp(default_font, setting->data.v_string) == 0)
+				cleanup_launcher_theme(launcher);
-                    return;
+				launcher_load_themes(launcher);
-                free(default_font);
+				launcher_load_icons(launcher);
-            }
+				launcher->area.resize = 1;
-            default_font = strdup(setting->data.v_string);
+			}
-            default_font_changed();
+		}
-        }
+	}
-    }
 }
 
-static void notify_changes(XSettingsClient *client, XSettingsList *old_list)
+
+static void notify_changes (XSettingsClient *client, XSettingsList *old_list)
 {
-    XSettingsList *old_iter = old_list;
+	XSettingsList *old_iter = old_list;
-    XSettingsList *new_iter = client->settings;
+	XSettingsList *new_iter = client->settings;
 
-    if (!client->notify)
+	if (!client->notify)
-        return;
+		return;
 
-    while (old_iter || new_iter) {
+	while (old_iter || new_iter) {
-        int cmp;
+		int cmp;
 
-        if (old_iter && new_iter)
+		if (old_iter && new_iter)
-            cmp = strcmp(old_iter->setting->name, new_iter->setting->name);
+			cmp = strcmp (old_iter->setting->name, new_iter->setting->name);
-        else if (old_iter)
+		else if (old_iter)
-            cmp = -1;
+			cmp = -1;
-        else
+		else
-            cmp = 1;
+			cmp = 1;
 
-        if (cmp < 0) {
+		if (cmp < 0) {
-            client->notify(old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
+			client->notify (old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
-        } else if (cmp == 0) {
+		}
-            if (!xsettings_setting_equal(old_iter->setting, new_iter->setting))
+		else if (cmp == 0) {
-                client->notify(old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
+			if (!xsettings_setting_equal (old_iter->setting, new_iter->setting))
-        } else {
+				client->notify (old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
-            client->notify(new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
+		}
-        }
+		else {
+			client->notify (new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
+		}
 
-        if (old_iter)
+		if (old_iter)
-            old_iter = old_iter->next;
+			old_iter = old_iter->next;
-        if (new_iter)
+		if (new_iter)
-            new_iter = new_iter->next;
+			new_iter = new_iter->next;
-    }
+	}
 }
 
-static int ignore_errors(Display *display, XErrorEvent *event)
+
+static int ignore_errors (Display *display, XErrorEvent *event)
 {
-    return True;
+	return True;
 }
 
 static char local_byte_order = '\0';
 
 #define BYTES_LEFT(buffer) ((buffer)->data + (buffer)->len - (buffer)->pos)
 
-static XSettingsResult fetch_card16(XSettingsBuffer *buffer, CARD16 *result)
+static XSettingsResult fetch_card16 (XSettingsBuffer *buffer, CARD16 *result)
 {
-    CARD16 x;
+	CARD16 x;
 
-    if (BYTES_LEFT(buffer) < 2)
+	if (BYTES_LEFT (buffer) < 2)
-        return XSETTINGS_ACCESS;
+		return XSETTINGS_ACCESS;
 
-    x = *(CARD16 *)buffer->pos;
+	x = *(CARD16 *)buffer->pos;
-    buffer->pos += 2;
+	buffer->pos += 2;
 
-    if (buffer->byte_order == local_byte_order)
+	if (buffer->byte_order == local_byte_order)
-        *result = x;
+		*result = x;
-    else
+	else
-        *result = (x << 8) | (x >> 8);
+		*result = (x << 8) | (x >> 8);
 
-    return XSETTINGS_SUCCESS;
+	return XSETTINGS_SUCCESS;
 }
 
-static XSettingsResult fetch_ushort(XSettingsBuffer *buffer, unsigned short *result)
+
+static XSettingsResult fetch_ushort (XSettingsBuffer *buffer, unsigned short  *result) 
 {
-    CARD16 x;
+	CARD16 x;
-    XSettingsResult r;
+	XSettingsResult r;  
 
-    r = fetch_card16(buffer, &x);
+	r = fetch_card16 (buffer, &x);
-    if (r == XSETTINGS_SUCCESS)
+	if (r == XSETTINGS_SUCCESS)
-        *result = x;
+		*result = x;
 
-    return r;
+	return r;
 }
 
-static XSettingsResult fetch_card32(XSettingsBuffer *buffer, CARD32 *result)
+
+static XSettingsResult fetch_card32 (XSettingsBuffer *buffer, CARD32 *result)
 {
-    CARD32 x;
+	CARD32 x;
 
-    if (BYTES_LEFT(buffer) < 4)
+	if (BYTES_LEFT (buffer) < 4)
-        return XSETTINGS_ACCESS;
+		return XSETTINGS_ACCESS;
 
-    x = *(CARD32 *)buffer->pos;
+	x = *(CARD32 *)buffer->pos;
-    buffer->pos += 4;
+	buffer->pos += 4;
 
-    if (buffer->byte_order == local_byte_order)
+	if (buffer->byte_order == local_byte_order)
-        *result = x;
+		*result = x;
-    else
+	else
-        *result = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);
+		*result = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);
 
-    return XSETTINGS_SUCCESS;
+	return XSETTINGS_SUCCESS;
 }
 
-static XSettingsResult fetch_card8(XSettingsBuffer *buffer, CARD8 *result)
+static XSettingsResult fetch_card8 (XSettingsBuffer *buffer, CARD8 *result)
 {
-    if (BYTES_LEFT(buffer) < 1)
+	if (BYTES_LEFT (buffer) < 1)
-        return XSETTINGS_ACCESS;
+		return XSETTINGS_ACCESS;
 
-    *result = *(CARD8 *)buffer->pos;
+	*result = *(CARD8 *)buffer->pos;
-    buffer->pos += 1;
+	buffer->pos += 1;
 
-    return XSETTINGS_SUCCESS;
+	return XSETTINGS_SUCCESS;
 }
 
-#define XSETTINGS_PAD(n, m) ((n + m - 1) & (~(m - 1)))
+#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
 
-static XSettingsList *parse_settings(unsigned char *data, size_t len)
+static XSettingsList *parse_settings (unsigned char *data, size_t len)
 {
-    XSettingsBuffer buffer;
+	XSettingsBuffer buffer;
-    XSettingsResult result = XSETTINGS_SUCCESS;
+	XSettingsResult result = XSETTINGS_SUCCESS;
-    XSettingsList *settings = NULL;
+	XSettingsList *settings = NULL;
-    CARD32 serial;
+	CARD32 serial;
-    CARD32 n_entries;
+	CARD32 n_entries;
-    CARD32 i;
+	CARD32 i;
-    XSettingsSetting *setting = NULL;
+	XSettingsSetting *setting = NULL;
 
-    local_byte_order = xsettings_byte_order();
+	local_byte_order = xsettings_byte_order ();
 
-    buffer.byte_order = local_byte_order;
+	buffer.byte_order = local_byte_order;
-    buffer.pos = buffer.data = data;
+	buffer.pos = buffer.data = data;
-    buffer.len = len;
+	buffer.len = len;
 
-    result = fetch_card8(&buffer, (CARD8 *)&buffer.byte_order);
+	result = fetch_card8 (&buffer, (CARD8*)&buffer.byte_order);
-    if (buffer.byte_order != MSBFirst && buffer.byte_order != LSBFirst) {
+	if (buffer.byte_order != MSBFirst && buffer.byte_order != LSBFirst) {
-        fprintf(stderr, "tint2: Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
+		fprintf (stderr, "Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
-        result = XSETTINGS_FAILED;
+		result = XSETTINGS_FAILED;
-        goto out;
+		goto out;
-    }
+	}
 
-    buffer.pos += 3;
+	buffer.pos += 3;
 
-    result = fetch_card32(&buffer, &serial);
+	result = fetch_card32 (&buffer, &serial);
-    if (result != XSETTINGS_SUCCESS)
+	if (result != XSETTINGS_SUCCESS)
-        goto out;
+		goto out;
 
-    result = fetch_card32(&buffer, &n_entries);
+	result = fetch_card32 (&buffer, &n_entries);
-    if (result != XSETTINGS_SUCCESS)
+	if (result != XSETTINGS_SUCCESS)
-        goto out;
+		goto out;
 
-    for (i = 0; i < n_entries; i++) {
+	for (i = 0; i < n_entries; i++) {
-        CARD8 type;
+		CARD8 type;
-        CARD16 name_len;
+		CARD16 name_len;
-        CARD32 v_int;
+		CARD32 v_int;
-        size_t pad_len;
+		size_t pad_len;
 
-        result = fetch_card8(&buffer, &type);
+		result = fetch_card8 (&buffer, &type);
-        if (result != XSETTINGS_SUCCESS)
+		if (result != XSETTINGS_SUCCESS)
-            goto out;
+			goto out;
 
-        buffer.pos += 1;
+		buffer.pos += 1;
 
-        result = fetch_card16(&buffer, &name_len);
+		result = fetch_card16 (&buffer, &name_len);
-        if (result != XSETTINGS_SUCCESS)
+		if (result != XSETTINGS_SUCCESS)
-            goto out;
+			goto out;
 
-        pad_len = XSETTINGS_PAD(name_len, 4);
+		pad_len = XSETTINGS_PAD(name_len, 4);
-        if (BYTES_LEFT(&buffer) < pad_len) {
+		if (BYTES_LEFT (&buffer) < pad_len) {
-            result = XSETTINGS_ACCESS;
+			result = XSETTINGS_ACCESS;
-            goto out;
+			goto out;
-        }
+		}
 
-        setting = calloc(1, sizeof *setting);
+		setting = calloc (1, sizeof *setting);
-        if (!setting) {
+		if (!setting) {
-            result = XSETTINGS_NO_MEM;
+			result = XSETTINGS_NO_MEM;
-            goto out;
+			goto out;
-        }
+		}
-        setting->type = XSETTINGS_TYPE_INT; /* No allocated memory */
+		setting->type = XSETTINGS_TYPE_INT; /* No allocated memory */
 
-        setting->name = calloc(name_len + 1, 1);
+		setting->name = calloc (name_len + 1, 1);
-        if (!setting->name) {
+		if (!setting->name) {
-            result = XSETTINGS_NO_MEM;
+			result = XSETTINGS_NO_MEM;
-            goto out;
+			goto out;
-        }
+		}
 
-        memcpy(setting->name, buffer.pos, name_len);
+		memcpy (setting->name, buffer.pos, name_len);
-        setting->name[name_len] = '\0';
+		setting->name[name_len] = '\0';
-        buffer.pos += pad_len;
+		buffer.pos += pad_len;
 
-        result = fetch_card32(&buffer, &v_int);
+		result = fetch_card32 (&buffer, &v_int);
-        if (result != XSETTINGS_SUCCESS)
+		if (result != XSETTINGS_SUCCESS)
-            goto out;
+			goto out;
-        setting->last_change_serial = v_int;
+		setting->last_change_serial = v_int;
 
-        switch (type) {
+		switch (type) {
-        case XSETTINGS_TYPE_INT:
+			case XSETTINGS_TYPE_INT:
-            result = fetch_card32(&buffer, &v_int);
+			result = fetch_card32 (&buffer, &v_int);
-            if (result != XSETTINGS_SUCCESS)
+			if (result != XSETTINGS_SUCCESS)
-                goto out;
+				goto out;
-            setting->data.v_int = (INT32)v_int;
+			setting->data.v_int = (INT32)v_int;
-            break;
+			break;
-        case XSETTINGS_TYPE_STRING:
+			case XSETTINGS_TYPE_STRING:
-            result = fetch_card32(&buffer, &v_int);
+			result = fetch_card32 (&buffer, &v_int);
-            if (result != XSETTINGS_SUCCESS)
+			if (result != XSETTINGS_SUCCESS)
-                goto out;
+				goto out;
 
-            pad_len = XSETTINGS_PAD(v_int, 4);
+			pad_len = XSETTINGS_PAD (v_int, 4);
-            if (v_int + 1 == 0 || /* Guard against wrap-around */
+			if (v_int + 1 == 0 || /* Guard against wrap-around */
-                BYTES_LEFT(&buffer) < pad_len) {
+			BYTES_LEFT (&buffer) < pad_len) {
-                result = XSETTINGS_ACCESS;
+				result = XSETTINGS_ACCESS;
-                goto out;
+				goto out;
-            }
+			}
 
-            setting->data.v_string = calloc(v_int + 1, 1);
+			setting->data.v_string = calloc (v_int + 1, 1);
-            if (!setting->data.v_string) {
+			if (!setting->data.v_string) {
-                result = XSETTINGS_NO_MEM;
+				result = XSETTINGS_NO_MEM;
-                goto out;
+				goto out;
-            }
+			}
 
-            memcpy(setting->data.v_string, buffer.pos, v_int);
+			memcpy (setting->data.v_string, buffer.pos, v_int);
-            setting->data.v_string[v_int] = '\0';
+			setting->data.v_string[v_int] = '\0';
-            buffer.pos += pad_len;
+			buffer.pos += pad_len;
-            break;
+			break;
-        case XSETTINGS_TYPE_COLOR:
+			case XSETTINGS_TYPE_COLOR:
-            result = fetch_ushort(&buffer, &setting->data.v_color.red);
+			result = fetch_ushort (&buffer, &setting->data.v_color.red);
-            if (result != XSETTINGS_SUCCESS)
+			if (result != XSETTINGS_SUCCESS)
-                goto out;
+				goto out;
-            result = fetch_ushort(&buffer, &setting->data.v_color.green);
+			result = fetch_ushort (&buffer, &setting->data.v_color.green);
-            if (result != XSETTINGS_SUCCESS)
+			if (result != XSETTINGS_SUCCESS)
-                goto out;
+				goto out;
-            result = fetch_ushort(&buffer, &setting->data.v_color.blue);
+			result = fetch_ushort (&buffer, &setting->data.v_color.blue);
-            if (result != XSETTINGS_SUCCESS)
+			if (result != XSETTINGS_SUCCESS)
-                goto out;
+				goto out;
-            result = fetch_ushort(&buffer, &setting->data.v_color.alpha);
+			result = fetch_ushort (&buffer, &setting->data.v_color.alpha);
-            if (result != XSETTINGS_SUCCESS)
+			if (result != XSETTINGS_SUCCESS)
-                goto out;
+				goto out;
-            break;
+			break;
-        default:
+			default:
-            /* Quietly ignore unknown types */
+			/* Quietly ignore unknown types */
-            break;
+			break;
-        }
+		}
 
-        setting->type = type;
+		setting->type = type;
 
-        result = xsettings_list_insert(&settings, setting);
+		result = xsettings_list_insert (&settings, setting);
-        if (result != XSETTINGS_SUCCESS)
+		if (result != XSETTINGS_SUCCESS)
-            goto out;
+		goto out;
 
-        setting = NULL;
+		setting = NULL;
-    }
+	}
 
-out:
+	out:
 
-    if (result != XSETTINGS_SUCCESS) {
+	if (result != XSETTINGS_SUCCESS) {
-        switch (result) {
+		switch (result) {
-        case XSETTINGS_NO_MEM:
+			case XSETTINGS_NO_MEM:
-            fprintf(stderr, "tint2: Out of memory reading XSETTINGS property\n");
+			fprintf(stderr, "Out of memory reading XSETTINGS property\n");
-            break;
+			break;
-        case XSETTINGS_ACCESS:
+			case XSETTINGS_ACCESS:
-            fprintf(stderr, "tint2: Invalid XSETTINGS property (read off end)\n");
+			fprintf(stderr, "Invalid XSETTINGS property (read off end)\n");
-            break;
+			break;
-        case XSETTINGS_DUPLICATE_ENTRY:
+			case XSETTINGS_DUPLICATE_ENTRY:
-            fprintf(stderr, "tint2: Duplicate XSETTINGS entry for '%s'\n", setting->name);
+			fprintf (stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
-        case XSETTINGS_FAILED:
+			case XSETTINGS_FAILED:
-        case XSETTINGS_SUCCESS:
+			case XSETTINGS_SUCCESS:
-        case XSETTINGS_NO_ENTRY:
+			case XSETTINGS_NO_ENTRY:
-            break;
+			break;
-        }
+		}
 
-        if (setting)
+		if (setting)
-            xsettings_setting_free(setting);
+			xsettings_setting_free (setting);
 
-        xsettings_list_free(settings);
+		xsettings_list_free (settings);
-        settings = NULL;
+		settings = NULL;
-    }
+	}
 
-    return settings;
+	return settings;
 }
 
-static void read_settings(XSettingsClient *client)
+
+static void read_settings (XSettingsClient *client)
 {
-    Atom type;
+	Atom type;
-    int format;
+	int format;
-    unsigned long n_items;
+	unsigned long n_items;
-    unsigned long bytes_after;
+	unsigned long bytes_after;
-    unsigned char *data;
+	unsigned char *data;
+	int result;
 
-    int (*old_handler)(Display *, XErrorEvent *);
+	int (*old_handler) (Display *, XErrorEvent *);
 
-    XSettingsList *old_list = client->settings;
+	XSettingsList *old_list = client->settings;
-    client->settings = NULL;
+	client->settings = NULL;
 
-    old_handler = XSetErrorHandler(ignore_errors);
+	old_handler = XSetErrorHandler (ignore_errors);
-    int result = XGetWindowProperty(client->display,
+	result = XGetWindowProperty (client->display, client->manager_window, server.atom._XSETTINGS_SETTINGS, 0, LONG_MAX, False, server.atom._XSETTINGS_SETTINGS, &type, &format, &n_items, &bytes_after, &data);
-                                    client->manager_window,
+	XSetErrorHandler (old_handler);
-                                    server.atom._XSETTINGS_SETTINGS,
-                                    0,
-                                    LONG_MAX,
-                                    False,
-                                    server.atom._XSETTINGS_SETTINGS,
-                                    &type,
-                                    &format,
-                                    &n_items,
-                                    &bytes_after,
-                                    &data);
-    XSetErrorHandler(old_handler);
 
-    if (result == Success && type == server.atom._XSETTINGS_SETTINGS) {
+	if (result == Success && type == server.atom._XSETTINGS_SETTINGS) {
-        if (format != 8) {
+		if (format != 8) {
-            fprintf(stderr, "tint2: Invalid format for XSETTINGS property %d", format);
+			fprintf (stderr, "Invalid format for XSETTINGS property %d", format);
-        } else
+		}
-            client->settings = parse_settings(data, n_items);
+		else
-        XFree(data);
+			client->settings = parse_settings (data, n_items);
-    }
+		XFree (data);
+	}
 
-    notify_changes(client, old_list);
+	notify_changes (client, old_list);
-    xsettings_list_free(old_list);
+	xsettings_list_free (old_list);
 }
 
-static void check_manager_window(XSettingsClient *client)
+
+static void check_manager_window (XSettingsClient *client)
 {
-    if (client->manager_window && client->watch)
+	if (client->manager_window && client->watch)
-        client->watch(client->manager_window, False, 0, client->cb_data);
+		client->watch (client->manager_window, False, 0, client->cb_data);
 
-    XGrabServer(client->display);
+	XGrabServer (client->display);
 
-    client->manager_window = XGetSelectionOwner(server.display, server.atom._XSETTINGS_SCREEN);
+	client->manager_window = XGetSelectionOwner (server.dsp, server.atom._XSETTINGS_SCREEN);
-    if (client->manager_window)
+	if (client->manager_window)
-        XSelectInput(server.display, client->manager_window, PropertyChangeMask | StructureNotifyMask);
+		XSelectInput (server.dsp, client->manager_window, PropertyChangeMask | StructureNotifyMask);
 
-    XUngrabServer(client->display);
+	XUngrabServer (client->display);
-    XFlush(client->display);
+	XFlush (client->display);
 
-    if (client->manager_window && client->watch)
+	if (client->manager_window && client->watch)
-        client->watch(client->manager_window, True, PropertyChangeMask | StructureNotifyMask, client->cb_data);
+		client->watch (client->manager_window, True, PropertyChangeMask | StructureNotifyMask, client->cb_data);
 
-    read_settings(client);
+	read_settings (client);
 }
 
-XSettingsClient *xsettings_client_new(Display *display,
+
-                                      int screen,
+XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNotifyFunc notify, XSettingsWatchFunc watch, void *cb_data) 
-                                      XSettingsNotifyFunc notify,
-                                      XSettingsWatchFunc watch,
-                                      void *cb_data)
 {
-    XSettingsClient *client = calloc(1, sizeof *client);
+	XSettingsClient *client;
-    if (!client)
-        return NULL;
 
-    client->display = display;
+	client = calloc (1, sizeof *client);
-    client->screen = screen;
+	if (!client)
-    client->notify = notify;
+		return NULL;
-    client->watch = watch;
-    client->cb_data = cb_data;
 
-    client->manager_window = None;
+	client->display = display;
-    client->settings = NULL;
+	client->screen = screen;
+	client->notify = notify;
+	client->watch = watch;
+	client->cb_data = cb_data;
 
-    if (client->watch)
+	client->manager_window = None;
-        client->watch(RootWindow(display, screen), True, StructureNotifyMask, client->cb_data);
+	client->settings = NULL;
 
-    check_manager_window(client);
+	if (client->watch)
+		client->watch (RootWindow (display, screen), True, StructureNotifyMask,	client->cb_data);
 
-    if (client->manager_window == None) {
+	check_manager_window (client);
-        fprintf(stderr, "tint2: No XSETTINGS manager, tint2 uses config option 'launcher_icon_theme'.\n");
+
-        free(client);
+	if (client->manager_window == None) {
-        return NULL;
+		printf("NO XSETTINGS manager, tint2 use config 'launcher_icon_theme'.\n");
-    } else {
+		free (client);
-        return client;
+		return NULL;
-    }
+	}
+	else
+		return client;
 }
 
-void xsettings_client_destroy(XSettingsClient *client)
-{
-    if (!client)
-        return;
-    if (client->watch)
-        client->watch(RootWindow(client->display, client->screen), False, 0, client->cb_data);
-    if (client->manager_window && client->watch)
-        client->watch(client->manager_window, False, 0, client->cb_data);
 
-    xsettings_list_free(client->settings);
+void xsettings_client_destroy (XSettingsClient *client)
-    free(client);
+{
+	if (client->watch)
+		client->watch (RootWindow (client->display, client->screen), False, 0, client->cb_data);
+	if (client->manager_window && client->watch)
+		client->watch (client->manager_window, False, 0, client->cb_data);
+
+	xsettings_list_free (client->settings);
+	free (client);
 }
 
-XSettingsResult xsettings_client_get_setting(XSettingsClient *client, const char *name, XSettingsSetting **setting)
+
+XSettingsResult xsettings_client_get_setting (XSettingsClient *client, const char *name, XSettingsSetting **setting)
 {
-    XSettingsSetting *search = xsettings_list_lookup(client->settings, name);
+	XSettingsSetting *search = xsettings_list_lookup (client->settings, name);
-    if (search) {
+	if (search) {
-        *setting = xsettings_setting_copy(search);
+		*setting = xsettings_setting_copy (search);
-        return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM;
+		return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM;
-    } else
+	}
-        return XSETTINGS_NO_ENTRY;
+	else
+		return XSETTINGS_NO_ENTRY;
 }
 
-Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev)
-{
-    /* The checks here will not unlikely cause us to reread
-    * the properties from the manager window a number of
-    * times when the manager changes from A->B. But manager changes
-    * are going to be pretty rare.
-    */
-    if (xev->xany.window == RootWindow(server.display, server.screen)) {
-        if (xev->xany.type == ClientMessage && xev->xclient.message_type == server.atom.MANAGER) {
-            check_manager_window(client);
-            return True;
-        }
-    } else if (xev->xany.window == client->manager_window) {
-        if (xev->xany.type == DestroyNotify) {
-            check_manager_window(client);
-            return True;
-        } else if (xev->xany.type == PropertyNotify) {
-            read_settings(client);
-            return True;
-        }
-    }
 
-    return False;
+Bool xsettings_client_process_event (XSettingsClient *client, XEvent *xev)
+{
+	/* The checks here will not unlikely cause us to reread
+	* the properties from the manager window a number of
+	* times when the manager changes from A->B. But manager changes
+	* are going to be pretty rare.
+	*/
+	if (xev->xany.window == RootWindow (server.dsp, server.screen)) {
+		if (xev->xany.type == ClientMessage && xev->xclient.message_type == server.atom.MANAGER) {
+			check_manager_window (client);
+			return True;
+		}
+	}
+	else if (xev->xany.window == client->manager_window) {
+		if (xev->xany.type == DestroyNotify) {
+			check_manager_window (client);
+			return True;
+		}
+		else if (xev->xany.type == PropertyNotify) {
+			read_settings (client);
+			return True;
+		}
+	}
+
+	return False;
 }
+

src/launcher/xsettings-client.h

@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Owen Taylor, Red Hat, Inc.
@@ -32,22 +32,23 @@ extern "C" {
 
 typedef struct _XSettingsClient XSettingsClient;
 
-typedef enum { XSETTINGS_ACTION_NEW, XSETTINGS_ACTION_CHANGED, XSETTINGS_ACTION_DELETED } XSettingsAction;
+typedef enum 
+{
+  XSETTINGS_ACTION_NEW,
+  XSETTINGS_ACTION_CHANGED,
+  XSETTINGS_ACTION_DELETED
+} XSettingsAction;
 
-typedef void (*XSettingsNotifyFunc)(const char *name, XSettingsAction action, XSettingsSetting *setting, void *cb_data);
+typedef void (*XSettingsNotifyFunc) (const char *name, XSettingsAction action, XSettingsSetting *setting, void *cb_data);
-typedef void (*XSettingsWatchFunc)(Window window, Bool is_start, long mask, void *cb_data);
+typedef void (*XSettingsWatchFunc) (Window window, Bool is_start, long mask, void *cb_data);
 
-XSettingsClient *xsettings_client_new(Display *display,
+XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNotifyFunc notify, XSettingsWatchFunc watch, void *cb_data);
-                                      int screen,
+void xsettings_client_destroy (XSettingsClient *client);
-                                      XSettingsNotifyFunc notify,
+Bool xsettings_client_process_event (XSettingsClient *client, XEvent *xev);
-                                      XSettingsWatchFunc watch,
-                                      void *cb_data);
-void xsettings_client_destroy(XSettingsClient *client);
-Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev);
 
-void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data);
+void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSetting *setting, void *data);
 
-XSettingsResult xsettings_client_get_setting(XSettingsClient *client, const char *name, XSettingsSetting **setting);
+XSettingsResult xsettings_client_get_setting (XSettingsClient *client, const char *name, XSettingsSetting **setting);
 
 #ifdef __cplusplus
 }

src/launcher/xsettings-common.c

@@ -24,222 +24,245 @@
 #include "stdlib.h"
 
 #include <X11/Xlib.h>
-#include <X11/Xmd.h> /* For CARD32 */
+#include <X11/Xmd.h>		/* For CARD32 */
 
 #include "xsettings-common.h"
 
-XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting)
+XSettingsSetting *
+xsettings_setting_copy (XSettingsSetting *setting)
 {
-    XSettingsSetting *result;
+	XSettingsSetting *result;
-    size_t str_len;
+	size_t str_len;
 
-    result = calloc(1, sizeof *result);
+	result = calloc (1, sizeof *result);
-    if (!result)
+	if (!result)
-        return NULL;
+		return NULL;
 
-    str_len = strlen(setting->name);
+	str_len = strlen (setting->name);
-    result->name = calloc(str_len + 1, 1);
+	result->name = calloc (str_len + 1, 1);
-    if (!result->name)
+	if (!result->name)
-        goto err;
+		goto err;
 
-    memcpy(result->name, setting->name, str_len + 1);
+	memcpy (result->name, setting->name, str_len + 1);
 
-    result->type = setting->type;
+	result->type = setting->type;
 
-    switch (setting->type) {
+	switch (setting->type)
-    case XSETTINGS_TYPE_INT:
+	{
-        result->data.v_int = setting->data.v_int;
+	case XSETTINGS_TYPE_INT:
-        break;
+		result->data.v_int = setting->data.v_int;
-    case XSETTINGS_TYPE_COLOR:
+		break;
-        result->data.v_color = setting->data.v_color;
+	case XSETTINGS_TYPE_COLOR:
-        break;
+		result->data.v_color = setting->data.v_color;
-    case XSETTINGS_TYPE_STRING:
+		break;
-        str_len = strlen(setting->data.v_string);
+	case XSETTINGS_TYPE_STRING:
-        result->data.v_string = calloc(str_len + 1, 1);
+		str_len = strlen (setting->data.v_string);
-        if (!result->data.v_string)
+		result->data.v_string = calloc (str_len + 1, 1);
-            goto err;
+		if (!result->data.v_string)
+			goto err;
 
-        memcpy(result->data.v_string, setting->data.v_string, str_len + 1);
+		memcpy (result->data.v_string, setting->data.v_string, str_len + 1);
-        break;
+		break;
-    default:
+	default:
-        break;
+		break;
-    }
+	}
 
-    result->last_change_serial = setting->last_change_serial;
+	result->last_change_serial = setting->last_change_serial;
 
-    return result;
+	return result;
 
 err:
-    if (result->name)
+	if (result->name)
-        free(result->name);
+		free (result->name);
-    free(result);
+	free (result);
 
-    return NULL;
+	return NULL;
 }
 
-XSettingsList *xsettings_list_copy(XSettingsList *list)
+XSettingsList *
+xsettings_list_copy (XSettingsList *list)
 {
-    XSettingsList *new = NULL;
+	XSettingsList *new = NULL;
-    XSettingsList *old_iter = list;
+	XSettingsList *old_iter = list;
-    XSettingsList *new_iter = NULL;
+	XSettingsList *new_iter = NULL;
 
-    while (old_iter) {
+	while (old_iter)
-        XSettingsList *new_node;
+	{
+		XSettingsList *new_node;
 
-        new_node = calloc(1, sizeof *new_node);
+		new_node = calloc (1, sizeof *new_node);
-        if (!new_node)
+		if (!new_node)
-            goto error;
+			goto error;
 
-        new_node->setting = xsettings_setting_copy(old_iter->setting);
+		new_node->setting = xsettings_setting_copy (old_iter->setting);
-        if (!new_node->setting) {
+		if (!new_node->setting)
-            free(new_node);
+		{
-            goto error;
+			free (new_node);
-        }
+			goto error;
+		}
 
-        if (new_iter)
+		if (new_iter)
-            new_iter->next = new_node;
+			new_iter->next = new_node;
-        else
+		else
-            new = new_node;
+			new = new_node;
 
-        new_iter = new_node;
+		new_iter = new_node;
 
-        old_iter = old_iter->next;
+		old_iter = old_iter->next;
-    }
+	}
 
-    return new;
+	return new;
 
 error:
-    xsettings_list_free(new);
+	xsettings_list_free (new);
-    return NULL;
+	return NULL;
 }
 
-int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b)
+int
+xsettings_setting_equal (XSettingsSetting *setting_a,
+						 XSettingsSetting *setting_b)
 {
-    if (setting_a->type != setting_b->type)
+	if (setting_a->type != setting_b->type)
-        return 0;
+		return 0;
 
-    if (strcmp(setting_a->name, setting_b->name) != 0)
+	if (strcmp (setting_a->name, setting_b->name) != 0)
-        return 0;
+		return 0;
 
-    switch (setting_a->type) {
+	switch (setting_a->type)
-    case XSETTINGS_TYPE_INT:
+	{
-        return setting_a->data.v_int == setting_b->data.v_int;
+	case XSETTINGS_TYPE_INT:
-    case XSETTINGS_TYPE_COLOR:
+		return setting_a->data.v_int == setting_b->data.v_int;
-        return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
+	case XSETTINGS_TYPE_COLOR:
-                setting_a->data.v_color.green == setting_b->data.v_color.green &&
+		return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
-                setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
+				setting_a->data.v_color.green == setting_b->data.v_color.green &&
-                setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
+				setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
-    case XSETTINGS_TYPE_STRING:
+				setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
-        return strcmp(setting_a->data.v_string, setting_b->data.v_string) == 0;
+	case XSETTINGS_TYPE_STRING:
-    default:
+		return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0;
-        break;
+	default:
-    }
+		break;
+	}
 
-    return 0;
+	return 0;
 }
 
-void xsettings_setting_free(XSettingsSetting *setting)
+void
+xsettings_setting_free (XSettingsSetting *setting)
 {
-    if (setting->type == XSETTINGS_TYPE_STRING)
+	if (setting->type == XSETTINGS_TYPE_STRING)
-        free(setting->data.v_string);
+		free (setting->data.v_string);
 
-    if (setting->name)
+	if (setting->name)
-        free(setting->name);
+		free (setting->name);
 
-    free(setting);
+	free (setting);
 }
 
-void xsettings_list_free(XSettingsList *list)
+void
+xsettings_list_free (XSettingsList *list)
 {
-    while (list) {
+	while (list)
-        XSettingsList *next = list->next;
+	{
+		XSettingsList *next = list->next;
 
-        xsettings_setting_free(list->setting);
+		xsettings_setting_free (list->setting);
-        free(list);
+		free (list);
 
-        list = next;
+		list = next;
-    }
+	}
 }
 
-XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting)
+XSettingsResult
+xsettings_list_insert (XSettingsList    **list,
+					   XSettingsSetting  *setting)
 {
-    XSettingsList *node;
+	XSettingsList *node;
-    XSettingsList *iter;
+	XSettingsList *iter;
-    XSettingsList *last = NULL;
+	XSettingsList *last = NULL;
 
-    node = calloc(1, sizeof *node);
+	node = calloc (1, sizeof *node);
-    if (!node)
+	if (!node)
-        return XSETTINGS_NO_MEM;
+		return XSETTINGS_NO_MEM;
-    node->setting = setting;
+	node->setting = setting;
 
-    iter = *list;
+	iter = *list;
-    while (iter) {
+	while (iter)
-        int cmp = strcmp(setting->name, iter->setting->name);
+	{
+		int cmp = strcmp (setting->name, iter->setting->name);
 
-        if (cmp < 0)
+		if (cmp < 0)
-            break;
+			break;
-        else if (cmp == 0) {
+		else if (cmp == 0)
-            free(node);
+		{
-            return XSETTINGS_DUPLICATE_ENTRY;
+			free (node);
-        }
+			return XSETTINGS_DUPLICATE_ENTRY;
+		}
 
-        last = iter;
+		last = iter;
-        iter = iter->next;
+		iter = iter->next;
-    }
+	}
 
-    if (last)
+	if (last)
-        last->next = node;
+		last->next = node;
-    else
+	else
-        *list = node;
+		*list = node;
 
-    node->next = iter;
+	node->next = iter;
 
-    return XSETTINGS_SUCCESS;
+	return XSETTINGS_SUCCESS;
 }
 
-XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name)
+XSettingsResult
+xsettings_list_delete (XSettingsList **list,
+					   const char     *name)
 {
-    XSettingsList *iter;
+	XSettingsList *iter;
-    XSettingsList *last = NULL;
+	XSettingsList *last = NULL;
 
-    iter = *list;
+	iter = *list;
-    while (iter) {
+	while (iter)
-        if (strcmp(name, iter->setting->name) == 0) {
+	{
-            if (last)
+		if (strcmp (name, iter->setting->name) == 0)
-                last->next = iter->next;
+		{
-            else
+			if (last)
-                *list = iter->next;
+				last->next = iter->next;
+			else
+				*list = iter->next;
 
-            xsettings_setting_free(iter->setting);
+			xsettings_setting_free (iter->setting);
-            free(iter);
+			free (iter);
 
-            return XSETTINGS_SUCCESS;
+			return XSETTINGS_SUCCESS;
-        }
+		}
 
-        last = iter;
+		last = iter;
-        iter = iter->next;
+		iter = iter->next;
-    }
+	}
 
-    return XSETTINGS_FAILED;
+	return XSETTINGS_FAILED;
 }
 
-XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name)
+XSettingsSetting *
+xsettings_list_lookup (XSettingsList *list,
+					   const char    *name)
 {
-    XSettingsList *iter;
+	XSettingsList *iter;
 
-    iter = list;
+	iter = list;
-    while (iter) {
+	while (iter)
-        if (strcmp(name, iter->setting->name) == 0)
+	{
-            return iter->setting;
+		if (strcmp (name, iter->setting->name) == 0)
+			return iter->setting;
 
-        iter = iter->next;
+		iter = iter->next;
-    }
+	}
 
-    return NULL;
+	return NULL;
 }
 
-char xsettings_byte_order(void)
+char
+xsettings_byte_order (void)
 {
-    CARD32 myint = 0x01020304;
+	CARD32 myint = 0x01020304;
-    return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;
+	return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;
 }

src/launcher/xsettings-common.h

@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Owen Taylor, Red Hat, Inc.
@@ -27,72 +27,82 @@
 extern "C" {
 #endif /* __cplusplus */
 
-typedef struct _XSettingsBuffer XSettingsBuffer;
+typedef struct _XSettingsBuffer  XSettingsBuffer;
-typedef struct _XSettingsColor XSettingsColor;
+typedef struct _XSettingsColor   XSettingsColor;
-typedef struct _XSettingsList XSettingsList;
+typedef struct _XSettingsList    XSettingsList;
 typedef struct _XSettingsSetting XSettingsSetting;
 
 /* Types of settings possible. Enum values correspond to
  * protocol values.
  */
-typedef enum {
+typedef enum 
-    XSETTINGS_TYPE_INT = 0,
+{
-    XSETTINGS_TYPE_STRING = 1,
+  XSETTINGS_TYPE_INT     = 0,
-    XSETTINGS_TYPE_COLOR = 2,
+  XSETTINGS_TYPE_STRING  = 1,
-    XSETTINGS_TYPE_NONE = 0xff
+  XSETTINGS_TYPE_COLOR   = 2,
+  XSETTINGS_TYPE_NONE    = 0xff
 } XSettingsType;
 
-typedef enum {
+typedef enum
-    XSETTINGS_SUCCESS,
+{
-    XSETTINGS_NO_MEM,
+  XSETTINGS_SUCCESS,
-    XSETTINGS_ACCESS,
+  XSETTINGS_NO_MEM,
-    XSETTINGS_FAILED,
+  XSETTINGS_ACCESS,
-    XSETTINGS_NO_ENTRY,
+  XSETTINGS_FAILED,
-    XSETTINGS_DUPLICATE_ENTRY
+  XSETTINGS_NO_ENTRY,
+  XSETTINGS_DUPLICATE_ENTRY
 } XSettingsResult;
 
-struct _XSettingsBuffer {
+struct _XSettingsBuffer
-    char byte_order;
+{
-    size_t len;
+  char byte_order;
-    unsigned char *data;
+  size_t len;
-    unsigned char *pos;
+  unsigned char *data;
+  unsigned char *pos;
 };
 
-struct _XSettingsColor {
+struct _XSettingsColor
-    unsigned short red, green, blue, alpha;
+{
+  unsigned short red, green, blue, alpha;
 };
 
-struct _XSettingsList {
+struct _XSettingsList
-    XSettingsSetting *setting;
+{
-    XSettingsList *next;
+  XSettingsSetting *setting;
+  XSettingsList *next;
 };
 
-struct _XSettingsSetting {
+struct _XSettingsSetting
-    char *name;
+{
-    XSettingsType type;
+  char *name;
+  XSettingsType type;
+  
+  union {
+    int v_int;
+    char *v_string;
+    XSettingsColor v_color;
+  } data;
 
-    union {
+  unsigned long last_change_serial;
-        int v_int;
-        char *v_string;
-        XSettingsColor v_color;
-    } data;
-
-    unsigned long last_change_serial;
 };
 
-XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting);
+XSettingsSetting *xsettings_setting_copy  (XSettingsSetting *setting);
-void xsettings_setting_free(XSettingsSetting *setting);
+void              xsettings_setting_free  (XSettingsSetting *setting);
-int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b);
+int               xsettings_setting_equal (XSettingsSetting *setting_a,
+					   XSettingsSetting *setting_b);
 
-void xsettings_list_free(XSettingsList *list);
+void              xsettings_list_free   (XSettingsList     *list);
-XSettingsList *xsettings_list_copy(XSettingsList *list);
+XSettingsList    *xsettings_list_copy   (XSettingsList     *list);
-XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting);
+XSettingsResult   xsettings_list_insert (XSettingsList    **list,
-XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name);
+					 XSettingsSetting  *setting);
-XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name);
+XSettingsSetting *xsettings_list_lookup (XSettingsList     *list,
+					 const char        *name);
+XSettingsResult   xsettings_list_delete (XSettingsList    **list,
+					 const char        *name);
 
-char xsettings_byte_order(void);
+char xsettings_byte_order (void);
 
-#define XSETTINGS_PAD(n, m) ((n + m - 1) & (~(m - 1)))
+#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
 
 #ifdef __cplusplus
 }

src/main.c

@@ -1,806 +0,0 @@
-/**************************************************************************
-*
-* Tint2 panel
-*
-* Copyright (C) 2007 Pål Staurland (staura@gmail.com)
-* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
-*
-* 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 <errno.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/Xlocale.h>
-#include <X11/extensions/Xdamage.h>
-#include <Imlib2.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-
-#ifdef HAVE_SN
-#include <libsn/sn.h>
-#endif
-
-#include "config.h"
-#include "drag_and_drop.h"
-#include "fps_distribution.h"
-#include "init.h"
-#include "launcher.h"
-#include "mouse_actions.h"
-#include "panel.h"
-#include "server.h"
-#include "signals.h"
-#include "systraybar.h"
-#include "task.h"
-#include "taskbar.h"
-#include "tooltip.h"
-#include "timer.h"
-#include "tracing.h"
-#include "uevent.h"
-#include "version.h"
-#include "window.h"
-#include "xsettings-client.h"
-
-// Global process state variables
-
-XSettingsClient *xsettings_client = NULL;
-
-gboolean debug_fps = FALSE;
-gboolean debug_frames = FALSE;
-static int frame = 0;
-double tracing_fps_threshold = 60;
-static double ts_event_read;
-static double ts_event_processed;
-static double ts_render_finished;
-static double ts_flush_finished;
-
-static gboolean first_render;
-
-void handle_event_property_notify(XEvent *e)
-{
-    gboolean debug = FALSE;
-
-    Window win = e->xproperty.window;
-    Atom at = e->xproperty.atom;
-
-    if (xsettings_client)
-        xsettings_client_process_event(xsettings_client, e);
-    for (int i = 0; i < num_panels; i++) {
-        Panel *p = &panels[i];
-        if (win == p->main_win) {
-            if (at == server.atom._NET_WM_DESKTOP && get_window_desktop(p->main_win) != ALL_DESKTOPS)
-                replace_panel_all_desktops(p);
-            return;
-        }
-    }
-    if (win == server.root_win) {
-        if (!server.got_root_win) {
-            XSelectInput(server.display, server.root_win, PropertyChangeMask | StructureNotifyMask);
-            server.got_root_win = TRUE;
-        }
-
-        // Change name of desktops
-        else if (at == server.atom._NET_DESKTOP_NAMES) {
-            if (debug)
-                fprintf(stderr, "tint2: %s %d: win = root, atom = _NET_DESKTOP_NAMES\n", __func__, __LINE__);
-            update_desktop_names();
-        }
-        // Change desktops
-        else if (at == server.atom._NET_NUMBER_OF_DESKTOPS || at == server.atom._NET_DESKTOP_GEOMETRY ||
-                 at == server.atom._NET_DESKTOP_VIEWPORT || at == server.atom._NET_WORKAREA ||
-                 at == server.atom._NET_CURRENT_DESKTOP) {
-            if (debug)
-                fprintf(stderr, "tint2: %s %d: win = root, atom = ?? desktops changed\n", __func__, __LINE__);
-            if (!taskbar_enabled)
-                return;
-            int old_num_desktops = server.num_desktops;
-            int old_desktop = server.desktop;
-            server_get_number_of_desktops();
-            server.desktop = get_current_desktop();
-            if (old_num_desktops != server.num_desktops) { // If number of desktop changed
-                if (server.num_desktops <= server.desktop) {
-                    server.desktop = server.num_desktops - 1;
-                }
-                cleanup_taskbar();
-                init_taskbar();
-                for (int i = 0; i < num_panels; i++) {
-                    init_taskbar_panel(&panels[i]);
-                    set_panel_items_order(&panels[i]);
-                    panels[i].area.resize_needed = 1;
-                }
-                taskbar_refresh_tasklist();
-                reset_active_task();
-                update_all_taskbars_visibility();
-                if (old_desktop != server.desktop)
-                    tooltip_trigger_hide();
-                schedule_panel_redraw();
-            } else if (old_desktop != server.desktop) {
-                tooltip_trigger_hide();
-                for (int i = 0; i < num_panels; i++) {
-                    Panel *panel = &panels[i];
-                    set_taskbar_state(&panel->taskbar[old_desktop], TASKBAR_NORMAL);
-                    set_taskbar_state(&panel->taskbar[server.desktop], TASKBAR_ACTIVE);
-                    // check ALL_DESKTOPS task => resize taskbar
-                    Taskbar *taskbar;
-                    if (server.num_desktops > old_desktop) {
-                        taskbar = &panel->taskbar[old_desktop];
-                        GList *l = taskbar->area.children;
-                        if (taskbarname_enabled)
-                            l = l->next;
-                        for (; l; l = l->next) {
-                            Task *task = l->data;
-                            if (task->desktop == ALL_DESKTOPS) {
-                                task->area.on_screen = always_show_all_desktop_tasks;
-                                taskbar->area.resize_needed = 1;
-                                schedule_panel_redraw();
-                                if (taskbar_mode == MULTI_DESKTOP)
-                                    panel->area.resize_needed = 1;
-                            }
-                        }
-                    }
-                    taskbar = &panel->taskbar[server.desktop];
-                    GList *l = taskbar->area.children;
-                    if (taskbarname_enabled)
-                        l = l->next;
-                    for (; l; l = l->next) {
-                        Task *task = l->data;
-                        if (task->desktop == ALL_DESKTOPS) {
-                            task->area.on_screen = TRUE;
-                            taskbar->area.resize_needed = 1;
-                            if (taskbar_mode == MULTI_DESKTOP)
-                                panel->area.resize_needed = 1;
-                        }
-                    }
-
-                    if (server.viewports) {
-                        GList *need_update = NULL;
-
-                        GHashTableIter iter;
-                        gpointer key, value;
-
-                        g_hash_table_iter_init(&iter, win_to_task);
-                        while (g_hash_table_iter_next(&iter, &key, &value)) {
-                            Window task_win = *(Window *)key;
-                            Task *task = get_task(task_win);
-                            if (task) {
-                                int desktop = get_window_desktop(task_win);
-                                if (desktop != task->desktop) {
-                                    need_update = g_list_append(need_update, task);
-                                }
-                            }
-                        }
-                        for (l = need_update; l; l = l->next) {
-                            Task *task = l->data;
-                            task_update_desktop(task);
-                        }
-                    }
-                }
-            }
-        }
-        // Window list
-        else if (at == server.atom._NET_CLIENT_LIST) {
-            if (debug)
-                fprintf(stderr, "tint2: %s %d: win = root, atom = _NET_CLIENT_LIST\n", __func__, __LINE__);
-            taskbar_refresh_tasklist();
-            update_all_taskbars_visibility();
-            schedule_panel_redraw();
-        }
-        // Change active
-        else if (at == server.atom._NET_ACTIVE_WINDOW) {
-            if (debug)
-                fprintf(stderr, "tint2: %s %d: win = root, atom = _NET_ACTIVE_WINDOW\n", __func__, __LINE__);
-            reset_active_task();
-            schedule_panel_redraw();
-        } else if (at == server.atom._XROOTPMAP_ID || at == server.atom._XROOTMAP_ID) {
-            if (debug)
-                fprintf(stderr, "tint2: %s %d: win = root, atom = _XROOTPMAP_ID\n", __func__, __LINE__);
-            // change Wallpaper
-            for (int i = 0; i < num_panels; i++) {
-                set_panel_background(&panels[i]);
-            }
-            schedule_panel_redraw();
-        }
-    } else {
-        TrayWindow *traywin = systray_find_icon(win);
-        if (traywin) {
-            systray_property_notify(traywin, e);
-            return;
-        }
-
-        Task *task = get_task(win);
-        if (debug) {
-            char *atom_name = XGetAtomName(server.display, at);
-            fprintf(stderr,
-                    "%s %d: win = %ld, task = %s, atom = %s\n",
-                    __func__,
-                    __LINE__,
-                    win,
-                    task ? (task->title ? task->title : "??") : "null",
-                    atom_name);
-            XFree(atom_name);
-        }
-        if (!task) {
-            if (debug)
-                fprintf(stderr, "tint2: %s %d\n", __func__, __LINE__);
-            if (at == server.atom._NET_WM_STATE) {
-                // xfce4 sends _NET_WM_STATE after minimized to tray, so we need to check if window is mapped
-                // if it is mapped and not set as skip_taskbar, we must add it to our task list
-                XWindowAttributes wa;
-                XGetWindowAttributes(server.display, win, &wa);
-                if (wa.map_state == IsViewable && !window_is_skip_taskbar(win)) {
-                    if ((task = add_task(win)))
-                        schedule_panel_redraw();
-                }
-            }
-            return;
-        }
-        // fprintf(stderr, "tint2: atom root_win = %s, %s\n", XGetAtomName(server.display, at), task->title);
-
-        // Window title changed
-        if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
-            if (task_update_title(task)) {
-                if (g_tooltip.mapped && (g_tooltip.area == (Area *)task)) {
-                    tooltip_update_contents_for((Area *)task);
-                    tooltip_update();
-                }
-                if (taskbar_sort_method == TASKBAR_SORT_TITLE)
-                    sort_taskbar_for_win(win);
-                schedule_panel_redraw();
-            }
-        }
-        // Demand attention
-        else if (at == server.atom._NET_WM_STATE) {
-            if (debug) {
-                int count;
-                Atom *atom_state = server_get_property(win, server.atom._NET_WM_STATE, XA_ATOM, &count);
-                for (int j = 0; j < count; j++) {
-                    char *atom_state_name = XGetAtomName(server.display, atom_state[j]);
-                    fprintf(stderr, "tint2: %s %d: _NET_WM_STATE = %s\n", __func__, __LINE__, atom_state_name);
-                    XFree(atom_state_name);
-                }
-                XFree(atom_state);
-            }
-            if (window_is_urgent(win)) {
-                add_urgent(task);
-            }
-            if (window_is_skip_taskbar(win)) {
-                remove_task(task);
-                schedule_panel_redraw();
-            }
-        } else if (at == server.atom.WM_STATE) {
-            // Iconic state
-            TaskState state = (active_task && task->win == active_task->win ? TASK_ACTIVE : TASK_NORMAL);
-            if (window_is_iconified(win))
-                state = TASK_ICONIFIED;
-            set_task_state(task, state);
-            schedule_panel_redraw();
-        }
-        // Window icon changed
-        else if (at == server.atom._NET_WM_ICON) {
-            task_update_icon(task);
-            schedule_panel_redraw();
-        }
-        // Window desktop changed
-        else if (at == server.atom._NET_WM_DESKTOP) {
-            int desktop = get_window_desktop(win);
-            // fprintf(stderr, "tint2:   Window desktop changed %d, %d\n", task->desktop, desktop);
-            // bug in windowmaker : send unecessary 'desktop changed' when focus changed
-            if (desktop != task->desktop) {
-                task_update_desktop(task);
-            }
-        } else if (at == server.atom.WM_HINTS) {
-            XWMHints *wmhints = XGetWMHints(server.display, win);
-            if (wmhints && wmhints->flags & XUrgencyHint) {
-                add_urgent(task);
-            }
-            XFree(wmhints);
-            task_update_icon(task);
-            schedule_panel_redraw();
-        }
-
-        if (!server.got_root_win)
-            server.root_win = RootWindow(server.display, server.screen);
-    }
-}
-
-void handle_event_expose(XEvent *e)
-{
-    Panel *panel;
-    panel = get_panel(e->xany.window);
-    if (!panel)
-        return;
-    // TODO : one panel_refresh per panel ?
-    schedule_panel_redraw();
-}
-
-void handle_event_configure_notify(XEvent *e)
-{
-    Window win = e->xconfigure.window;
-
-    // change in root window (xrandr)
-    if (win == server.root_win) {
-        emit_self_restart("configuration change in the root window");
-        return;
-    }
-
-    TrayWindow *traywin = systray_find_icon(win);
-    if (traywin) {
-        systray_reconfigure_event(traywin, e);
-        return;
-    }
-
-    // 'win' move in another monitor
-    if (num_panels > 1 || hide_task_diff_monitor) {
-        Task *task = get_task(win);
-        if (task) {
-            Panel *p = task->area.panel;
-            int monitor = get_window_monitor(win);
-            if ((hide_task_diff_monitor && p->monitor != monitor && task->area.on_screen) ||
-                (hide_task_diff_monitor && p->monitor == monitor && !task->area.on_screen) ||
-                (p->monitor != monitor && num_panels > 1)) {
-                remove_task(task);
-                task = add_task(win);
-                if (win == get_active_window()) {
-                    set_task_state(task, TASK_ACTIVE);
-                    active_task = task;
-                }
-                schedule_panel_redraw();
-            }
-        }
-    }
-
-    if (server.viewports) {
-        Task *task = get_task(win);
-        if (task) {
-            int desktop = get_window_desktop(win);
-            if (task->desktop != desktop) {
-                task_update_desktop(task);
-            }
-        }
-    }
-
-    sort_taskbar_for_win(win);
-}
-
-gboolean handle_x_event_autohide(XEvent *e)
-{
-    Panel *panel = get_panel(e->xany.window);
-    if (panel && panel_autohide) {
-        if (e->type == EnterNotify)
-            autohide_trigger_show(panel);
-        else if (e->type == LeaveNotify)
-            autohide_trigger_hide(panel);
-        if (panel->is_hidden) {
-            if (e->type == ClientMessage && e->xclient.message_type == server.atom.XdndPosition) {
-                hidden_panel_shown_for_dnd = TRUE;
-                autohide_show(panel);
-            } else {
-                // discard further processing of this event because the panel is not visible yet
-                return TRUE;
-            }
-        } else if (hidden_panel_shown_for_dnd && e->type == ClientMessage &&
-                   e->xclient.message_type == server.atom.XdndLeave) {
-            hidden_panel_shown_for_dnd = FALSE;
-            autohide_hide(panel);
-        }
-    }
-    return FALSE;
-}
-
-void handle_x_event(XEvent *e)
-{
-#if HAVE_SN
-    if (startup_notifications)
-        sn_display_process_event(server.sn_display, e);
-#endif // HAVE_SN
-
-    if (handle_x_event_autohide(e))
-        return;
-
-    Panel *panel = get_panel(e->xany.window);
-    switch (e->type) {
-    case ButtonPress: {
-        tooltip_hide(0);
-        handle_mouse_press_event(e);
-        Area *area = find_area_under_mouse(panel, e->xbutton.x, e->xbutton.y);
-        if (panel_config.mouse_effects)
-            mouse_over(area, TRUE);
-        break;
-    }
-
-    case ButtonRelease: {
-        handle_mouse_release_event(e);
-        Area *area = find_area_under_mouse(panel, e->xbutton.x, e->xbutton.y);
-        if (panel_config.mouse_effects)
-            mouse_over(area, FALSE);
-        break;
-    }
-
-    case MotionNotify: {
-        unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
-        if (e->xmotion.state & button_mask)
-            handle_mouse_move_event(e);
-
-        Area *area = find_area_under_mouse(panel, e->xmotion.x, e->xmotion.y);
-        if (area->_get_tooltip_text)
-            tooltip_trigger_show(area, panel, e);
-        else
-            tooltip_trigger_hide();
-        if (panel_config.mouse_effects)
-            mouse_over(area, e->xmotion.state & button_mask);
-        break;
-    }
-
-    case LeaveNotify: {
-        tooltip_trigger_hide();
-        if (panel_config.mouse_effects)
-            mouse_out();
-        break;
-    }
-
-    case Expose:
-        handle_event_expose(e);
-        break;
-
-    case PropertyNotify:
-        handle_event_property_notify(e);
-        break;
-
-    case ConfigureNotify:
-        handle_event_configure_notify(e);
-        break;
-
-    case ConfigureRequest: {
-        TrayWindow *traywin = systray_find_icon(e->xany.window);
-        if (traywin)
-            systray_reconfigure_event(traywin, e);
-        break;
-    }
-
-    case ResizeRequest: {
-        TrayWindow *traywin = systray_find_icon(e->xany.window);
-        if (traywin)
-            systray_resize_request_event(traywin, e);
-        break;
-    }
-
-    case ReparentNotify: {
-        if (!systray_enabled)
-            break;
-        Panel *systray_panel = (Panel *)systray.area.panel;
-        if (e->xany.window == systray_panel->main_win) // don't care
-            break;
-        TrayWindow *traywin = systray_find_icon(e->xreparent.window);
-        if (traywin) {
-            if (traywin->win == e->xreparent.window) {
-                if (traywin->parent == e->xreparent.parent) {
-                    embed_icon(traywin);
-                } else {
-                    remove_icon(traywin);
-                }
-                break;
-            }
-        }
-        break;
-    }
-
-    case UnmapNotify:
-        break;
-
-    case DestroyNotify:
-        if (e->xany.window == server.composite_manager) {
-            // Stop real_transparency
-            emit_self_restart("compositor shutdown");
-            break;
-        }
-        if (e->xany.window == g_tooltip.window || !systray_enabled)
-            break;
-        for (GSList *it = systray.list_icons; it; it = g_slist_next(it)) {
-            if (((TrayWindow *)it->data)->win == e->xany.window) {
-                systray_destroy_event((TrayWindow *)it->data);
-                break;
-            }
-        }
-        break;
-
-    case ClientMessage: {
-        XClientMessageEvent *ev = &e->xclient;
-        if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
-            if (ev->data.l[2] == None) {
-                // Stop real_transparency
-                emit_self_restart("compositor changed");
-            } else {
-                // Start real_transparency
-                emit_self_restart("compositor changed");
-            }
-        }
-        if (systray_enabled && e->xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE &&
-            e->xclient.format == 32 && e->xclient.window == net_sel_win) {
-            handle_systray_event(&e->xclient);
-        } else if (e->xclient.message_type == server.atom.XdndEnter) {
-            handle_dnd_enter(&e->xclient);
-        } else if (e->xclient.message_type == server.atom.XdndPosition) {
-            handle_dnd_position(&e->xclient);
-        } else if (e->xclient.message_type == server.atom.XdndDrop) {
-            handle_dnd_drop(&e->xclient);
-        }
-        break;
-    }
-
-    case SelectionNotify: {
-        handle_dnd_selection_notify(&e->xselection);
-        break;
-    }
-
-    default:
-        if (e->type == server.xdamage_event_type) {
-            XDamageNotifyEvent *de = (XDamageNotifyEvent *)e;
-            TrayWindow *traywin = systray_find_icon(de->drawable);
-            if (traywin)
-                systray_render_icon(traywin);
-        }
-    }
-}
-
-void handle_x_events()
-{
-    if (XPending(server.display) > 0) {
-        XEvent e;
-        XNextEvent(server.display, &e);
-        if (debug_fps)
-            ts_event_read = get_time();
-
-        handle_x_event(&e);
-    }
-}
-
-void prepare_fd_set(fd_set *set, int *max_fd)
-{
-    FD_ZERO(set);
-    FD_SET(server.x11_fd, set);
-    *max_fd = server.x11_fd;
-    if (sigchild_pipe_valid) {
-        FD_SET(sigchild_pipe[0], set);
-        *max_fd = MAX(*max_fd, sigchild_pipe[0]);
-    }
-    for (GList *l = panel_config.execp_list; l; l = l->next) {
-        Execp *execp = (Execp *)l->data;
-        int fd = execp->backend->child_pipe_stdout;
-        if (fd > 0) {
-            FD_SET(fd, set);
-            *max_fd = MAX(*max_fd, fd);
-        }
-        fd = execp->backend->child_pipe_stderr;
-        if (fd > 0) {
-            FD_SET(fd, set);
-            *max_fd = MAX(*max_fd, fd);
-        }
-    }
-    if (uevent_fd > 0) {
-        FD_SET(uevent_fd, set);
-        *max_fd = MAX(*max_fd, uevent_fd);
-    }
-}
-
-void handle_panel_refresh()
-{
-    if (debug_fps)
-        ts_event_processed = get_time();
-    panel_refresh = FALSE;
-
-    for (int i = 0; i < num_panels; i++) {
-        Panel *panel = &panels[i];
-        if (!first_render)
-            shrink_panel(panel);
-
-        if (!panel->is_hidden || panel->area.resize_needed) {
-            if (panel->temp_pmap)
-                XFreePixmap(server.display, panel->temp_pmap);
-            panel->temp_pmap = XCreatePixmap(server.display,
-                                             server.root_win,
-                                             panel->area.width,
-                                             panel->area.height,
-                                             server.depth);
-            render_panel(panel);
-        }
-
-        if (panel->is_hidden) {
-            if (!panel->hidden_pixmap) {
-                panel->hidden_pixmap = XCreatePixmap(server.display,
-                                                     server.root_win,
-                                                     panel->hidden_width,
-                                                     panel->hidden_height,
-                                                     server.depth);
-                int xoff = 0, yoff = 0;
-                if (panel_horizontal && panel_position & BOTTOM)
-                    yoff = panel->area.height - panel->hidden_height;
-                else if (!panel_horizontal && panel_position & RIGHT)
-                    xoff = panel->area.width - panel->hidden_width;
-                XCopyArea(server.display,
-                          panel->area.pix,
-                          panel->hidden_pixmap,
-                          server.gc,
-                          xoff,
-                          yoff,
-                          panel->hidden_width,
-                          panel->hidden_height,
-                          0,
-                          0);
-            }
-            XCopyArea(server.display,
-                      panel->hidden_pixmap,
-                      panel->main_win,
-                      server.gc,
-                      0,
-                      0,
-                      panel->hidden_width,
-                      panel->hidden_height,
-                      0,
-                      0);
-            XSetWindowBackgroundPixmap(server.display, panel->main_win, panel->hidden_pixmap);
-        } else {
-            XCopyArea(server.display,
-                      panel->temp_pmap,
-                      panel->main_win,
-                      server.gc,
-                      0,
-                      0,
-                      panel->area.width,
-                      panel->area.height,
-                      0,
-                      0);
-            if (panel == (Panel *)systray.area.panel) {
-                if (refresh_systray && panel && !panel->is_hidden) {
-                    refresh_systray = FALSE;
-                    XSetWindowBackgroundPixmap(server.display, panel->main_win, panel->temp_pmap);
-                    refresh_systray_icons();
-                }
-            }
-        }
-    }
-    if (first_render) {
-        first_render = FALSE;
-        if (panel_shrink)
-            schedule_panel_redraw();
-    }
-
-    if (debug_fps)
-        ts_render_finished = get_time();
-    XFlush(server.display);
-
-    if (debug_fps && ts_event_read > 0) {
-        ts_flush_finished = get_time();
-        double period = ts_flush_finished - ts_event_read;
-        double fps = 1.0 / period;
-        sample_fps(fps);
-        double proc_ratio = (ts_event_processed - ts_event_read) / period;
-        double render_ratio = (ts_render_finished - ts_event_processed) / period;
-        double flush_ratio = (ts_flush_finished - ts_render_finished) / period;
-        double fps_low, fps_median, fps_high, fps_samples;
-        fps_compute_stats(&fps_low, &fps_median, &fps_high, &fps_samples);
-        fprintf(stderr,
-                BLUE "frame %d: fps = %.0f (low %.0f, med %.0f, high %.0f, samples %.0f) : processing %.0f%%, "
-                     "rendering %.0f%%, "
-                     "flushing %.0f%%" RESET "\n",
-                frame,
-                fps,
-                fps_low,
-                fps_median,
-                fps_high,
-                fps_samples,
-                proc_ratio * 100,
-                render_ratio * 100,
-                flush_ratio * 100);
-#ifdef HAVE_TRACING
-        stop_tracing();
-        if (fps <= tracing_fps_threshold) {
-            print_tracing_events();
-        }
-#endif
-    }
-    if (debug_frames) {
-        for (int i = 0; i < num_panels; i++) {
-            char path[256];
-            sprintf(path, "tint2-%d-panel-%d-frame-%d.png", getpid(), i, frame);
-            save_panel_screenshot(&panels[i], path);
-        }
-    }
-    frame++;
-}
-
-void run_tint2_event_loop()
-{
-    ts_event_read = 0;
-    ts_event_processed = 0;
-    ts_render_finished = 0;
-    ts_flush_finished = 0;
-    first_render = TRUE;
-
-    while (!get_signal_pending()) {
-        if (panel_refresh)
-            handle_panel_refresh();
-
-        fd_set fds;
-        int max_fd;
-        prepare_fd_set(&fds, &max_fd);
-
-        // Wait for an event and handle it
-        ts_event_read = 0;
-        if (XPending(server.display) > 0 || select(max_fd + 1, &fds, 0, 0, get_next_timeout()) >= 0) {
-#ifdef HAVE_TRACING
-            start_tracing((void*)run_tint2_event_loop);
-#endif
-            uevent_handler();
-            handle_sigchld_events();
-            handle_execp_events();
-            handle_x_events();
-        }
-
-        handle_expired_timers();
-    }
-}
-
-void tint2(int argc, char **argv, gboolean *restart)
-{
-    init(argc, argv);
-
-    if (snapshot_path) {
-        save_screenshot(snapshot_path);
-        cleanup();
-        return;
-    }
-
-    dnd_init();
-    uevent_init();
-    run_tint2_event_loop();
-
-    if (get_signal_pending()) {
-        cleanup();
-        if (get_signal_pending() == SIGUSR1) {
-            fprintf(stderr, YELLOW "tint2: %s %d: restarting tint2..." RESET "\n", __FILE__, __LINE__);
-            *restart = TRUE;
-            return;
-        } else if (get_signal_pending() == SIGUSR2) {
-            fprintf(stderr, YELLOW "tint2: %s %d: reexecuting tint2..." RESET "\n", __FILE__, __LINE__);
-            if (execvp(argv[0], argv) == -1) {
-                fprintf(stderr, RED "tint2: %s %d: failed!" RESET "\n", __FILE__, __LINE__);
-                return;
-            }
-        } else {
-            // SIGINT, SIGTERM, SIGHUP etc.
-            return;
-        }
-    }
-}
-
-int main(int argc, char **argv)
-{
-    gboolean restart;
-    do {
-        restart = FALSE;
-        tint2(argc, argv, &restart);
-    } while(restart);
-    return 0;
-}

src/mouse_actions.c

@@ -1,287 +0,0 @@
-/**************************************************************************
-* Copyright (C) 2017 tint2 authors
-*
-* 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "drag_and_drop.h"
-#include "panel.h"
-#include "server.h"
-#include "task.h"
-#include "window.h"
-
-gboolean tint2_handles_click(Panel *panel, XButtonEvent *e)
-{
-    Task *task = click_task(panel, e->x, e->y);
-    if (task) {
-        if ((e->button == 1 && mouse_left != 0) || (e->button == 2 && mouse_middle != 0) ||
-            (e->button == 3 && mouse_right != 0) || (e->button == 4 && mouse_scroll_up != 0) ||
-            (e->button == 5 && mouse_scroll_down != 0)) {
-            return TRUE;
-        } else
-            return FALSE;
-    }
-    LauncherIcon *icon = click_launcher_icon(panel, e->x, e->y);
-    if (icon) {
-        if (e->button == 1) {
-            return TRUE;
-        } else {
-            return FALSE;
-        }
-    }
-    // no launcher/task clicked --> check if taskbar clicked
-    Taskbar *taskbar = click_taskbar(panel, e->x, e->y);
-    if (taskbar && e->button == 1 && taskbar_mode == MULTI_DESKTOP)
-        return TRUE;
-    if (click_clock(panel, e->x, e->y)) {
-        if ((e->button == 1 && clock_lclick_command) || (e->button == 2 && clock_mclick_command) ||
-            (e->button == 3 && clock_rclick_command) || (e->button == 4 && clock_uwheel_command) ||
-            (e->button == 5 && clock_dwheel_command))
-            return TRUE;
-        else
-            return FALSE;
-    }
-#ifdef ENABLE_BATTERY
-    if (click_battery(panel, e->x, e->y)) {
-        if ((e->button == 1 && battery_lclick_command) || (e->button == 2 && battery_mclick_command) ||
-            (e->button == 3 && battery_rclick_command) || (e->button == 4 && battery_uwheel_command) ||
-            (e->button == 5 && battery_dwheel_command))
-            return TRUE;
-        else
-            return FALSE;
-    }
-#endif
-    if (click_execp(panel, e->x, e->y))
-        return TRUE;
-    if (click_button(panel, e->x, e->y))
-        return TRUE;
-    return FALSE;
-}
-
-void handle_mouse_press_event(XEvent *e)
-{
-    Panel *panel = get_panel(e->xany.window);
-    if (!panel)
-        return;
-
-    if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) {
-        forward_click(e);
-        return;
-    }
-    task_drag = click_task(panel, e->xbutton.x, e->xbutton.y);
-
-    if (panel_layer == BOTTOM_LAYER)
-        XLowerWindow(server.display, panel->main_win);
-}
-
-void handle_mouse_move_event(XEvent *e)
-{
-    Panel *panel = get_panel(e->xany.window);
-    if (!panel || !task_drag)
-        return;
-
-    // Find the taskbar on the event's location
-    Taskbar *event_taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y);
-    if (event_taskbar == NULL)
-        return;
-
-    // Find the task on the event's location
-    Task *event_task = click_task(panel, e->xbutton.x, e->xbutton.y);
-
-    // If the event takes place on the same taskbar as the task being dragged
-    if (&event_taskbar->area == task_drag->area.parent) {
-        if (taskbar_sort_method != TASKBAR_NOSORT) {
-            sort_tasks(event_taskbar);
-        } else {
-            // Swap the task_drag with the task on the event's location (if they differ)
-            if (event_task && event_task != task_drag) {
-                GList *drag_iter = g_list_find(event_taskbar->area.children, task_drag);
-                GList *task_iter = g_list_find(event_taskbar->area.children, event_task);
-                if (drag_iter && task_iter) {
-                    gpointer temp = task_iter->data;
-                    task_iter->data = drag_iter->data;
-                    drag_iter->data = temp;
-                    event_taskbar->area.resize_needed = 1;
-                    schedule_panel_redraw();
-                    task_dragged = 1;
-                }
-            }
-        }
-    } else { // The event is on another taskbar than the task being dragged
-        if (task_drag->desktop == ALL_DESKTOPS || taskbar_mode != MULTI_DESKTOP)
-            return;
-
-        Taskbar *drag_taskbar = (Taskbar *)task_drag->area.parent;
-        remove_area((Area *)task_drag);
-
-        if (event_taskbar->area.posx > drag_taskbar->area.posx || event_taskbar->area.posy > drag_taskbar->area.posy) {
-            int i = (taskbarname_enabled) ? 1 : 0;
-            event_taskbar->area.children = g_list_insert(event_taskbar->area.children, task_drag, i);
-        } else
-            event_taskbar->area.children = g_list_append(event_taskbar->area.children, task_drag);
-
-        // Move task to other desktop (but avoid the 'Window desktop changed' code in 'event_property_notify')
-        task_drag->area.parent = &event_taskbar->area;
-        task_drag->desktop = event_taskbar->desktop;
-
-        change_window_desktop(task_drag->win, event_taskbar->desktop);
-        if (hide_task_diff_desktop)
-            change_desktop(event_taskbar->desktop);
-
-        if (taskbar_sort_method != TASKBAR_NOSORT) {
-            sort_tasks(event_taskbar);
-        }
-
-        event_taskbar->area.resize_needed = 1;
-        drag_taskbar->area.resize_needed = 1;
-        task_dragged = 1;
-        schedule_panel_redraw();
-        panel->area.resize_needed = 1;
-    }
-}
-
-void handle_mouse_release_event(XEvent *e)
-{
-    Panel *panel = get_panel(e->xany.window);
-    if (!panel)
-        return;
-
-    if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) {
-        forward_click(e);
-        if (panel_layer == BOTTOM_LAYER)
-            XLowerWindow(server.display, panel->main_win);
-        task_drag = 0;
-        return;
-    }
-
-    MouseAction action = TOGGLE_ICONIFY;
-    switch (e->xbutton.button) {
-    case 1:
-        action = mouse_left;
-        break;
-    case 2:
-        action = mouse_middle;
-        break;
-    case 3:
-        action = mouse_right;
-        break;
-    case 4:
-        action = mouse_scroll_up;
-        break;
-    case 5:
-        action = mouse_scroll_down;
-        break;
-    case 6:
-        action = mouse_tilt_left;
-        break;
-    case 7:
-        action = mouse_tilt_right;
-        break;
-    }
-
-    Clock *clock = click_clock(panel, e->xbutton.x, e->xbutton.y);
-    if (clock) {
-        clock_action(clock, e->xbutton.button, e->xbutton.x - clock->area.posx, e->xbutton.y - clock->area.posy, e->xbutton.time);
-        if (panel_layer == BOTTOM_LAYER)
-            XLowerWindow(server.display, panel->main_win);
-        task_drag = 0;
-        return;
-    }
-
-#ifdef ENABLE_BATTERY
-    Battery *battery = click_battery(panel, e->xbutton.x, e->xbutton.y);
-    if (battery) {
-        battery_action(battery, e->xbutton.button, e->xbutton.x - battery->area.posx, e->xbutton.y - battery->area.posy, e->xbutton.time);
-        if (panel_layer == BOTTOM_LAYER)
-            XLowerWindow(server.display, panel->main_win);
-        task_drag = 0;
-        return;
-    }
-#endif
-
-    Execp *execp = click_execp(panel, e->xbutton.x, e->xbutton.y);
-    if (execp) {
-        execp_action(execp, e->xbutton.button, e->xbutton.x - execp->area.posx, e->xbutton.y - execp->area.posy, e->xbutton.time);
-        if (panel_layer == BOTTOM_LAYER)
-            XLowerWindow(server.display, panel->main_win);
-        task_drag = 0;
-        return;
-    }
-
-    Button *button = click_button(panel, e->xbutton.x, e->xbutton.y);
-    if (button) {
-        button_action(button, e->xbutton.button, e->xbutton.x - button->area.posx, e->xbutton.y - button->area.posy, e->xbutton.time);
-        if (panel_layer == BOTTOM_LAYER)
-            XLowerWindow(server.display, panel->main_win);
-        task_drag = 0;
-        return;
-    }
-
-    if (e->xbutton.button == 1 && click_launcher(panel, e->xbutton.x, e->xbutton.y)) {
-        LauncherIcon *icon = click_launcher_icon(panel, e->xbutton.x, e->xbutton.y);
-        if (icon) {
-            launcher_action(icon, e, e->xbutton.x - icon->area.posx, e->xbutton.y - icon->area.posy);
-        }
-        task_drag = 0;
-        return;
-    }
-
-    Taskbar *taskbar;
-    if (!(taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y))) {
-        // TODO: check better solution to keep window below
-        if (panel_layer == BOTTOM_LAYER)
-            XLowerWindow(server.display, panel->main_win);
-        task_drag = 0;
-        return;
-    }
-
-    // drag and drop task
-    if (task_dragged) {
-        task_drag = 0;
-        task_dragged = 0;
-        return;
-    }
-
-    // switch desktop
-    if (taskbar_mode == MULTI_DESKTOP) {
-        gboolean diff_desktop = FALSE;
-        if (taskbar->desktop != server.desktop && action != CLOSE && action != DESKTOP_LEFT &&
-            action != DESKTOP_RIGHT) {
-            diff_desktop = TRUE;
-            change_desktop(taskbar->desktop);
-        }
-        Task *task = click_task(panel, e->xbutton.x, e->xbutton.y);
-        if (task) {
-            if (diff_desktop) {
-                if (action == TOGGLE_ICONIFY) {
-                    if (!window_is_active(task->win))
-                        activate_window(task->win);
-                } else {
-                    task_handle_mouse_event(task, action);
-                }
-            } else {
-                task_handle_mouse_event(task, action);
-            }
-        }
-    } else {
-        task_handle_mouse_event(click_task(panel, e->xbutton.x, e->xbutton.y), action);
-    }
-
-    // to keep window below
-    if (panel_layer == BOTTOM_LAYER)
-        XLowerWindow(server.display, panel->main_win);
-}

src/mouse_actions.h

@@ -1,12 +0,0 @@
-#ifndef MOUSE_ACTIONS_H
-#define MOUSE_ACTIONS_H
-
-#include "panel.h"
-
-gboolean tint2_handles_click(Panel *panel, XButtonEvent *e);
-
-void handle_mouse_press_event(XEvent *e);
-void handle_mouse_move_event(XEvent *e);
-void handle_mouse_release_event(XEvent *e);
-
-#endif