Release 0.14.5

Update ru.po

See merge request !25

.clang-format

@@ -63,4 +63,4 @@ SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard: Cpp11
 TabWidth: 4
-UseTab: ForIndentation
+UseTab: Never

CMakeLists.txt

@@ -82,7 +82,13 @@ 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_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -D_DEFAULT_SOURCE )
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  add_definitions( -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -D_DEFAULT_SOURCE )
+else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  add_definitions( -D_WITH_GETLINE )
+endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+
 
 include_directories( ${PROJECT_BINARY_DIR}
                      src
@@ -94,6 +100,7 @@ include_directories( ${PROJECT_BINARY_DIR}
                      src/tooltip
                      src/util
                      src/execplugin
+                     src/button
                      src/freespace
                      src/separator
                      ${X11_INCLUDE_DIRS}
@@ -122,6 +129,7 @@ set( SOURCES src/config.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
@@ -249,7 +257,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasin
 install( TARGETS tint2 DESTINATION bin )
 install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
 install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
-install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
+install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
 install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
 install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
 install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )

ChangeLog

@@ -1,3 +1,35 @@
+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)

README.md

@@ -1,5 +1,5 @@
-# Latest stable release: 0.13.1
+# Latest stable release: 0.14.5
-Changes: https://gitlab.com/o9000/tint2/blob/0.13.1/ChangeLog
+Changes: https://gitlab.com/o9000/tint2/blob/0.14.5/ChangeLog
 
 Documentation: [doc/tint2.md](doc/tint2.md)
 
@@ -8,7 +8,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 0.13.1
+git checkout 0.14.5
 mkdir build
 cd build
 cmake ..
@@ -19,6 +19,8 @@ To install, 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`.
@@ -87,7 +89,7 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
 
 ## Demos
 
-* 0.13.1: [Compact panel, separator, color gradients](https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.1.0.gif)
+* [Compact panel, separator, color gradients](https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.0.gif)
-* 0.12.4: [Executor](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.4.gif)
+* [Executor](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.4.gif)
-* 0.12.3: [Mouse over effects](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.3.gif)
+* [Mouse over effects](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.3.gif)
-* 0.12: [Distribute size between taskbars, freespace](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif)
+* [Distribute size between taskbars, freespace](https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif)

doc/generate-doc.sh

@@ -2,6 +2,9 @@
 
 # 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

doc/manual.html

@@ -199,7 +199,7 @@ pre {
 </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="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.
+<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>
@@ -214,7 +214,7 @@ It was specifically made for Openbox but it should also work with other window m
 <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>
+<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>
@@ -229,6 +229,7 @@ It was specifically made for Openbox but it should also work with other window m
 <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>
@@ -359,6 +360,7 @@ gradient_id_pressed = 2
 <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>
@@ -650,6 +652,24 @@ execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | awk -F ';' '/total/ { printf
 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>
@@ -659,142 +679,7 @@ execp_interval = 1
 <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><pre class="highlight plaintext"><code>#---------------------------------------------
+<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>.
-## 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 'iconified'
-#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 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

doc/readme.html

@@ -199,15 +199,17 @@ pre {
 </style>
 </head>
 <body>
-<h1 id="latest-stable-release-0-13-1"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">0.13.1</span><a name="latest-stable-release-0-13-1" href="#latest-stable-release-0-13-1" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/0.13.1/ChangeLog">https://gitlab.com/o9000/tint2/blob/0.13.1/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
+<h1 id="latest-stable-release-0-14-5"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">0.14.5</span><a name="latest-stable-release-0-14-5" href="#latest-stable-release-0-14-5" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/0.14.5/ChangeLog">https://gitlab.com/o9000/tint2/blob/0.14.5/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 0.13.1
+git checkout 0.14.5
 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>
@@ -256,10 +258,10 @@ make -j4
 </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><p><img src="https://gitlab.com/o9000/tint2/wikis/screenshot.png" alt="screenshot"></p><h2 id="demos">Demos<a name="demos" href="#demos" class="md2man-permalink" title="permalink"></a></h2>
 <ul>
-<li>0.13.1: <a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.1.0.gif">Compact panel, separator, color gradients</a></li>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.13.0.gif">Compact panel, separator, color gradients</a></li>
-<li>0.12.4: <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.4.gif">Executor</a></li>
-<li>0.12.3: <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.3.gif">Mouse over effects</a></li>
-<li>0.12: <a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif">Distribute size between taskbars, freespace</a></li>
+<li><a href="https://gitlab.com/o9000/tint2/wikis/whats-new-0.12.gif">Distribute size between taskbars, freespace</a></li>
 </ul>
 </body>
 </html>

doc/tint2.1

@@ -1,10 +1,7 @@
-.TH TINT2 1 "2017\-03\-12"
+.TH TINT2 1 "2017\-05\-21" 0.14.5
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
-.SH SYNOPSIS
-.PP
-\fB\fCtint2 [\-c path_to_config_file]\fR
 .SH DESCRIPTION
 .PP
 tint2 is a simple panel/taskbar made for modern X window managers.
@@ -33,10 +30,19 @@ Follow the freedesktop.org specifications;
 .IP \(bu 2
 Make certain workflows, such as multi\-desktop and multi\-monitor, easy to use.
 .RE
+.SH SYNOPSIS
+.PP
+\fB\fCtint2 [OPTION...]\fR
 .SH OPTIONS
 .TP
 \fB\fC\-c path_to_config_file\fR
 Specifies 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
@@ -67,6 +73,8 @@ 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]
@@ -294,6 +302,8 @@ gradient_id_pressed = 2
 .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
@@ -800,6 +810,39 @@ 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
@@ -817,144 +860,7 @@ execp_interval = 1
 .RE
 .SS Example configuration
 .PP
-.RS
+See /etc/xdg/tint2/tint2rc.
-.nf
-#\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
-## 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 'iconified'
-#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
-.fi
-.RE
 .SH AUTHOR
 .PP
 tint2 was written by Thierry Lorthiois \[la]lorthiois@bbsoft.fr\[ra]\&.

doc/tint2.md

@@ -1,11 +1,8 @@
-# TINT2 1 "2017-03-12"
+# TINT2 1 "2017-05-21" 0.14.5
 
 ## NAME
 tint2 - lightweight panel/taskbar
 
-## SYNOPSIS
-`tint2 [-c path_to_config_file]`
-
 ## 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.).
@@ -24,10 +21,20 @@ Goals:
   * 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
@@ -58,6 +65,8 @@ Goals:
 
   * [Executor](#executor)
 
+  * [Button](#button)
+
   * [Separator](#separator)
 
   * [Example configuration](#example-configuration)
@@ -244,6 +253,7 @@ gradient_id_pressed = 2
     * `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).
@@ -671,6 +681,33 @@ 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)*
@@ -687,142 +724,7 @@ execp_interval = 1
 
 ### Example configuration
 
-```
+See /etc/xdg/tint2/tint2rc.
-#---------------------------------------------
-## 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 'iconified'
-#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
-```
 
 ## AUTHOR
 tint2 was written by Thierry Lorthiois <lorthiois@bbsoft.fr>.

format-code.sh

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

get_version.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MAJOR=0.13
+MAJOR=0.14
 DIRTY=""
 
 if git status 1>/dev/null 2>/dev/null
@@ -33,13 +33,14 @@ then
     fi
     VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY
 else
-    VERSION=$(head -n 1 ChangeLog | cut -d ' ' -f 2)
+    VERSION=$(head -n 1 ChangeLog || head -n 1 ../ChangeLog | cut -d ' ' -f 2)
     if [ $VERSION = "master" ]
     then
-        VERSION=$VERSION-$(head -n 1 ChangeLog | cut -d ' ' -f 1)
+        VERSION=$VERSION-$(head -n 1 ChangeLog || head -n 1 ../ChangeLog | cut -d ' ' -f 1)
     fi
 fi
 
+
 VERSION=$(echo "$VERSION" | sed 's/^v//')
 
 echo '#define VERSION_STRING "'$VERSION'"' > version.h

make_release.sh

@@ -2,24 +2,6 @@
 
 # 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 ]
@@ -28,21 +10,10 @@ then
     exit 1
 fi
 
-DIR=tint2-$VERSION
+ARCHIVE=tint2-$VERSION.tar.gz
-ARCHIVE=$DIR.tar.gz
-echo "Making release $DIR"
-rm -rf $DIR $ARCHIVE
 
-git checkout-index --prefix=$DIR/ -a
+echo "Making release tint2-$VERSION"
-
+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

@@ -0,0 +1,240 @@
+#!/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, major=False, minor=False, rc=False):
+  if "-rc" in v:
+    # v4.0-rc7 -> v4.0-rc8 or v4.0
+    if minor:
+      return v.split("-rc")[0]
+    else:
+      parts = v.split("-rc")
+      parts[-1] = str(int(parts[-1]) + 1)
+      return "-rc".join(parts)
+  else:
+    # v4.11 = v4, 11, 0 -> v4.11.1 or v4.12 or v.4.12-rc1 or v5.0 or v5.0-rc1
+    # v4.11.7 = v4, 11, 7 -> ...
+    parts = v.split(".")
+    while len(parts) < 3:
+      parts.append("0")
+    assert len(parts) == 3
+    if major:
+      parts[-3] = "v" + str(int(parts[-3].replace("v", "")) + 1)
+      parts[-2] = "0"
+      if rc:
+        parts[-2] += "-rc1"
+      parts[-1] = ""
+    elif minor or rc:
+      parts[-2] = str(int(parts[-2]) + 1)
+      if rc:
+        parts[-2] += "-rc1"
+      parts[-1] = ""
+    else:
+      parts[-1] = str(int(parts[-1]) + 1)
+      assert not rc
+    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("v1.0"), "v1.0.1")
+  assert_equal(inc_version("v1.0.1"), "v1.0.2")
+  assert_equal(inc_version("v1.0.2"), "v1.0.3")
+  assert_equal(inc_version("v1.0.10"), "v1.0.11")
+  assert_equal(inc_version("v1.1.10"), "v1.1.11")
+  assert_equal(inc_version("v1.1.10"), "v1.1.11")
+  # rc
+  assert_equal(inc_version("v1.0", False, False, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.1", False, False, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.2", False, False, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.10", False, False, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.1.10", False, False, True), "v1.2-rc1")
+  assert_equal(inc_version("v1.1.10", False, False, True), "v1.2-rc1")
+  # minor
+  assert_equal(inc_version("v1.0", False, True, False), "v1.1")
+  assert_equal(inc_version("v1.0.1", False, True, False), "v1.1")
+  assert_equal(inc_version("v1.0.2", False, True, False), "v1.1")
+  assert_equal(inc_version("v1.0.10", False, True, False), "v1.1")
+  assert_equal(inc_version("v1.1.10", False, True, False), "v1.2")
+  assert_equal(inc_version("v1.1.10", False, True, False), "v1.2")
+  # minor rc
+  assert_equal(inc_version("v1.0", False, True, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.1", False, True, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.2", False, True, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.0.10", False, True, True), "v1.1-rc1")
+  assert_equal(inc_version("v1.1.10", False, True, True), "v1.2-rc1")
+  assert_equal(inc_version("v1.1.10", False, True, True), "v1.2-rc1")
+  # major rc
+  assert_equal(inc_version("v1.0", True, False, True), "v2.0-rc1")
+  assert_equal(inc_version("v1.0.1", True, False, True), "v2.0-rc1")
+  assert_equal(inc_version("v1.0.2", True, False, True), "v2.0-rc1")
+  assert_equal(inc_version("v1.0.10", True, False, True), "v2.0-rc1")
+  assert_equal(inc_version("v1.1.10", True, False, True), "v2.0-rc1")
+  assert_equal(inc_version("v1.1.10", True, False, True), "v2.0-rc1")
+  # major
+  assert_equal(inc_version("v1.0", True), "v2.0")
+  assert_equal(inc_version("v1.0.1", True), "v2.0")
+  assert_equal(inc_version("v1.0.2", True), "v2.0")
+  assert_equal(inc_version("v1.0.10", True), "v2.0")
+  assert_equal(inc_version("v1.1.10", True), "v2.0")
+  assert_equal(inc_version("v1.1.10", True), "v2.0")
+  # rc auto
+  assert_equal(inc_version("v1.0-rc1"), "v1.0-rc2")
+  assert_equal(inc_version("v1.1-rc2"), "v1.1-rc3")
+  # rc minor
+  assert_equal(inc_version("v1.0-rc1", False, True), "v1.0")
+  assert_equal(inc_version("v1.1-rc2", False, True), "v1.1")
+
+
+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("--major", action="store_true")
+  parser.add_argument("--minor", action="store_true")
+  parser.add_argument("--rc", 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.major, args.minor, args.rc)
+  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")

packaging/debian/changelog

@@ -1,3 +1,35 @@
+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

packaging/debian/control

@@ -1,7 +1,7 @@
 Source: tint2
 Section: x11
 Priority: optional
-Maintainer: o9000 <mrovi9000@gmail.com>
+Maintainer: Sebastian Reichel <sre@debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
                libcairo2-dev,
@@ -16,8 +16,8 @@ Build-Depends: cmake,
                libxinerama-dev,
                libxrandr-dev
 Standards-Version: 3.9.7
-Vcs-Git: git://anonscm.debian.org/collab-maint/tint2.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/collab-maint/tint2.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/tint2.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/tint2.git
 Homepage: https://gitlab.com/o9000/tint2/
 
 Package: tint2

packaging/debian/copyright

@@ -7,6 +7,22 @@ Copyright: 2007-2008 Pål Staurland <staura@gmail.com>
            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>
@@ -43,24 +59,3 @@ License: ISC
  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.
-
-Files: debian/wiki/*
-Copyright: 2009-2012 Andreas Fink <andreas.fink85@googlemail.com>
-License: GPL-2
-
-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.
- .
- 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'.

packaging/debian/rules

@@ -11,4 +11,3 @@ override_dh_auto_install:
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=tint2
-	cp -r debian/wiki debian/tint2/usr/share/doc/tint2/html

packaging/debian/tint2.install

@@ -4,9 +4,9 @@
 /usr/share/applications/tint2.desktop
 /usr/share/applications/tint2conf.desktop
 /usr/share/man/man1/tint2.1
-/usr/share/doc/tint2/AUTHORS
+/usr/share/doc/tint2/*
-/usr/share/doc/tint2/README.md
 /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/make_ubuntu.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Requirements: devscripts
+
 set -x
 
 rm -rf tint2* 2>/dev/null || true
@@ -29,6 +31,8 @@ else
     REPO="tint2-git"
 fi
 
+set -e
+
 # Export repository contents to source directory
 DIR=tint2-$VERSION
 echo "Making release $DIR"
@@ -43,9 +47,9 @@ 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 ubuntu $DIR/debian
+cp -r debian $DIR/debian
 
-for DISTRO in precise trusty wily xenial
+for DISTRO in precise trusty xenial yakkety zesty
 do
     # Cleanup from previous builds
     rm -rf tint2_$VERSION-*

packaging/ubuntu/source/include-binaries

@@ -1,4 +0,0 @@
-debian/wiki/3265475271_81e8ed56e0.jpg
-debian/wiki/3265475337_262799ded3.jpg
-debian/wiki/3266303192_476a188196.jpg
-debian/wiki/3266303292_14d9b6b623.jpg

packaging/ubuntu/wiki/Configure.html

@@ -1,405 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>tint2 - Configure</title>
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-</head>
-
-<body class="t6">
-
-<table class="st" width="100%" cellpadding="0" cellspacing="0" align="center" border="0">
- <tbody><tr>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <td class="bevel-right" valign="top" align="right"></td>
- </tr>
-</tbody></table>
-
-
-
-<div id="maincol" style="padding: 0pt 3px 3px 0pt; margin: 0pt;">
-
- 
-<!-- IE -->
-
-
-
-
-
-
- 
-
-
-
-
- 
-
-<div id="wikipage">
-<table>
- <tbody><tr>
- 
- 
- 
- 
- <td style="vertical-align: top; padding-left: 5px;">
- 
- 
- 
- <div id="wikicontent">
- <div class="vt" id="wikimaincol">
-
- <h1>tint2 - Configure</h1>
-
- <p></p><ul><li><a href="#Background_and_border">Background and border</a></li><li><a href="#Panel">Panel</a></li><li><a href="#Launcher_SVN_Only">Launcher SVN Only</a></li><li><a href="#Taskbar_%28pager_like_capability%29">Taskbar (pager like capability)</a></li><li><a href="#Task">Task</a></li><li><a href="#System_Tray">System Tray</a></li><li><a href="#Clock">Clock</a></li><li><a href="#Tooltip">Tooltip</a></li><li><a href="#Battery">Battery</a></li><li><a href="#Mouse_action_on_task">Mouse action on task</a></li><li><a href="#Panel_autohide">Panel autohide</a></li><li><a href="#An_example_tint2rc">An example tint2rc</a></li></ul> <p></p><p>The first time you run tint2, it will create the config file in <tt>$HOME/.config/tint2/tint2rc</tt> . (this is true if you have done a clean install. running tint2 in the source directory without doing 'make install' will not create the config file.) </p><p>You can specify another file on the command line with -c option. eg. : <tt>tint2 -c $HOME/tint2.conf</tt> </p><p>When you change the config file, the command line 'killall -SIGUSR1 tint2' will force tint2 to reload it. </p><p>Configuration marked as <tt>SVN ONLY</tt> are not yet supported and could change in the next stable release. </p><h1><a name="Background_and_border"></a>Background and border<a href="#Background_and_border" class="section_anchor"></a></h1><blockquote>tint2rc config file starts with background option. 
-</blockquote><p>         </p><ul><li><tt>rounded = number_of_pixels</tt> : How rounded the borders are </li></ul><p></p><ul><li><tt>background_color = color opacity</tt> </li><ul><li><tt>opacity = 0</tt> to get background transparency </li></ul></ul><p>         </p><ul><li><tt>border_width = width</tt> </li></ul><p></p><ul><li><tt>border_color = color opacity (0 to 100)</tt> </li><ul><li><tt>opacity = 0</tt> to get border transparency </li></ul></ul><blockquote>you are free to put 1, 2, 3... background 
-<pre class="prettyprint">      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</pre>tint2 automatically identifies each background with a number (1, 2, ...). 
-then you can applied background on objects (panel, taskbar, task, clock, systray) with 
-<pre class="prettyprint">      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</pre>identifier 0 applied full transparency, identifer 1 applied the first background...   
-</blockquote><h1><a name="Panel"></a>Panel<a href="#Panel" class="section_anchor"></a></h1><ul><li><tt>panel_monitor = monitor (all, 1, 2, ...)</tt> Which monitor tint2 draws the panel on </li><ul><li>the first monitor is <tt>1</tt> </li><li>use <tt>panel_monitor = all</tt> to get one panel per monitor (unless it's included into another one) </li></ul></ul><p>   </p><blockquote><img src="3265475271_81e8ed56e0.jpg"> 
-</blockquote><p></p><p>     </p><ul><li><tt>panel_position = vertical_position horizontal_position orientation</tt> </li><ul><li><tt>value for vertical_position : bottom, top, center</tt> </li><li><tt>value for horizontal_position : left, right, center</tt> </li><li><tt>value for orientation : horizontal, vertical</tt> </li></ul></ul>   <ul><li><tt>panel_size = width height</tt> </li><ul><li><tt>width = 0</tt> to get full monitor width </li><li>Use <tt>%</tt> to adjust the panel size to monitor size. </li></ul></ul>     <blockquote>Example: 
-<p></p><pre class="prettyprint">      #The panel's width is 94% the size of the monitor
-      panel_size = 94% 30</pre></blockquote><ul><li><tt>panel_items = LTSBC</tt> define the items tint2 will show and the order of those items. panel_items = STC will show the Systray, the taskbar and the clock (from left to right). SVN ONLY. </li><ul><li>L to show Launcher </li><li>T to show Taskbar </li><li>S to show Systray (also called notification area) </li><li>B to show Battery status </li><li>C to show Clock </li></ul></ul><ul><li><tt>panel_margin = horizontal_margin vertical_margin</tt> </li><ul><li><tt>horizontal_margin = 0</tt> to get full monitor width </li></ul></ul><blockquote><img src="3266303192_476a188196.jpg"> 
-</blockquote><p>     </p><ul><li><tt>panel_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt> </li></ul><p></p><ul><li><tt>font_shadow = boolean (0 or 1)</tt> </li></ul><ul><li><tt>panel_background_id = integer</tt> : Which background to use </li></ul><ul><li><tt>wm_menu = boolean (0 or 1)</tt>               : Allow tint2 to forward mouse event to your Window Manager. </li></ul><ul><li><tt>panel_dock = boolean (0 or 1)</tt>            : Put tint2 into the window managers dock. For the openbox window manager I can advise to use also a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml). </li></ul><p>  </p><ul><li><tt>panel_layer = bottom,normal,top</tt> : Puts tint2 into the bottom/normal/top layer. Default is the bottom layer, but for real transparency normal or top layer may be a nice alternative. </li></ul><p></p><ul><li><tt>strut_policy = follow_size/minimum/none</tt> : STRUTs are used by the window manager to decide the size of maximized windows. Should the 'maximized windows' follow tint2 size (follow_size) or use the minimum size (minimum), or use the screen size (none). <tt>minimum</tt> option is interresting when used with <tt>autohide_height</tt> parameter. </li></ul><h1><a name="Launcher_SVN_Only"></a>Launcher SVN Only<a href="#Launcher_SVN_Only" class="section_anchor"></a></h1><ul><li><tt>launcher_icon_theme = name_of_theme</tt> tint2 will follow the theme of your desktop when you have an XSETTINGS manager running. Otherwise, <tt>launcher_icon_theme</tt> parameter is used. </li><li><tt>launcher_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt> </li><li><tt>launcher_background_id = integer</tt> : Which background to use </li><li><tt>launcher_icon_size = number</tt> : Set the launcher icon size to <tt>number</tt>. </li><li><tt>launcher_item_app = path_to_application</tt> : Each launcher_item_app must be a full path to a .desktop file. </li></ul><h1><a name="Taskbar_(pager_like_capability)"></a>Taskbar (pager like capability)<a href="#Taskbar_%28pager_like_capability%29" class="section_anchor"></a></h1><ul><li><tt>taskbar_mode = single_desktop or multi_desktop</tt> </li><ul><li><tt>taskbar_mode = single_desktop</tt> : Show one(1) taskbar (current desktop) </li><li><tt>taskbar_mode = multi_desktop</tt> : Pager like capability. Show one(1) taskbar per desktop </li><ul><li>You can drag-and-drop task between desktops` </li><li>And also click on an empty taskbar to switch desktops` </li></ul></ul></ul><p>   </p><ul><li><tt>taskbar_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt> </li></ul><p></p><ul><li><tt>taskbar_background_id = integer</tt> : Which background to use </li></ul><ul><li><tt>taskbar_active_background_id = integer</tt> : Which background to use for current desktop. </li></ul><blockquote><img src="3266303292_14d9b6b623.jpg"> 
-</blockquote><ul><li><tt>taskbar_name = boolean (0 or 1)</tt> :  SVN Only enabled(=1) or disabled(=0) desktop name in taskbar </li></ul><ul><li><tt>taskbar_name_padding = left_right_padding</tt>  SVN Only </li></ul><ul><li><tt>taskbar_name_background_id = integer</tt> : SVN Only Which background to use </li></ul><ul><li><tt>taskbar_name_active_background_id = integer</tt> : SVN Only Which background to use for current desktop. </li></ul><ul><li><tt>taskbar_name_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt>  SVN Only </li></ul><ul><li><tt>taskbar_name_font_color = color opacity (0 to 100)</tt>  SVN Only </li></ul><ul><li><tt>taskbar_name_active_font_color = color opacity (0 to 100)</tt> </li></ul><h1><a name="Task"></a>Task<a href="#Task" class="section_anchor"></a></h1><ul><li><tt>urgent_nb_of_blink = integer</tt>               : Number of blink on 'get attention' event </li></ul><ul><li><tt>task_icon = boolean (0 or 1)</tt>               : Display task icon or not </li></ul><ul><li><tt>task_text = boolean (0 or 1)</tt>               : Display task text or not </li></ul><ul><li><tt>task_centered = boolean (0 or 1)</tt>           : Task name centered  or not </li></ul><ul><li><tt>task_maximum_size = width height</tt>                  </li><ul><li><tt>width is used with horizontal panel. width = 0 to get full taskbar width</tt> </li><li><tt>height is used with vertical panel</tt> </li></ul></ul><p>  </p><ul><li><tt>task_padding = horizontal_padding vertical_padding</tt>    </li></ul><p></p><ul><li><tt>task_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt>               </li></ul><ul><li><tt>task_font_color = color opacity (0 to 100)</tt> </li></ul><p>                                                        </p><ul><li><tt>task_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</tt> : adjust icon's color and transparency for task. </li></ul><p></p><ul><li><tt>task_background_id = integer</tt> : Which background to use for non selected tasks </li></ul><blockquote>For the next 3 options STATUS can be <tt>active</tt> / <tt>iconified</tt>  / <tt>urgent</tt>. 
-</blockquote><ul><li><tt>task_STATUS_font_color = color opacity (0 to 100)</tt>  </li></ul><ul><li><tt>task_STATUS_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</tt> : adjust icon's color and transparency for active task </li></ul><ul><li><tt>task_STATUS_background_id = integer</tt> : Which background to use when task is selected </li></ul><ul><li><tt>task_tooltip = boolean (0 or 1)</tt>               : enabled(=1) or disabled(=0) tooltip on task </li></ul><blockquote><img src="3265475337_262799ded3.jpg"> 
-</blockquote><h1><a name="System_Tray"></a>System Tray<a href="#System_Tray" class="section_anchor"></a></h1><ul><li><tt>systray = boolean (0 or 1)</tt> : enabled(=1) or disabled(=0) systray </li></ul><ul><li><tt>systray_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt>  </li></ul><ul><li><tt>systray_background_id = integer</tt> : Which background to use for non selected tasks </li></ul><ul><li> <tt>systray_sort = ascending/descending/left2right/right2left</tt> : Sorting order for icon's systray (if left2right or right2left the order can be different on restart) </li></ul><ul><li> <tt>systray_icon_size = max_icon_size</tt>  : Set the maximum system tray icon size to <tt>number</tt>. Set to <tt>0</tt> for automatic icon size </li></ul><ul><li><tt>systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</tt> : adjust icon's color and transparency for system tray icons </li></ul><h1><a name="Clock"></a>Clock<a href="#Clock" class="section_anchor"></a></h1><ul><li><tt>time1_format = %H:%M</tt> </li><ul><li>time1_format, time2_format and clock_tooltip use 'strftime' syntax. more info on parameters on <a href="http://www.manpagez.com/man/3/strftime/" rel="nofollow">http://www.manpagez.com/man/3/strftime/</a> </li><li>comment time1_format and time2_format to hide clock </li></ul></ul><p>   </p><ul><li><tt>time1_timezone = :US/Hawaii</tt> </li><ul><li>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, i.e. time1_timezone = :/different/zoneinfo/dir/US/Hawaii (always prepend with a ':') </li></ul></ul><p></p><ul><li><tt>time1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>time2_format = %A %d %B</tt> </li></ul><ul><li><tt>time2_timezone = :Europe/Berlin</tt> </li></ul><ul><li><tt>time2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>clock_font_color = color opacity (0 to 100)</tt> </li></ul><ul><li><tt>clock_padding = horizontal_padding vertical_padding</tt> </li></ul><ul><li><tt>clock_background_id = integer</tt> : Which background to use </li></ul><ul><li><tt>clock_tooltip = %a, %d. %b %Y : clock tooltip text</tt> </li></ul><ul><li><tt>clock_tooltip_timezone = :UTC</tt> </li></ul><ul><li><tt>clock_lclick_command = text</tt> : Which command to execute on left click </li></ul><ul><li><tt>clock_rclick_command = text</tt> : Which command to execute on right click </li></ul><h1><a name="Tooltip"></a>Tooltip<a href="#Tooltip" class="section_anchor"></a></h1><ul><li><tt>tooltip_padding = horizontal_padding vertical_padding</tt> </li></ul><ul><li><tt>tooltip_show_timeout = float</tt> : delay to show tooltip in second. Use '.' as decimal separator. </li></ul><ul><li><tt>tooltip_hide_timeout = float</tt> : delay to close tooltip in second. Use '.' as decimal separator. </li></ul><ul><li><tt>tooltip_background_id = integer</tt> : Which background to use (in fake transparency the alpha channel and rounded are not respected) </li></ul><ul><li><tt>tooltip_font_color = color opacity  (0 to 100)</tt> </li></ul><ul><li><tt>tooltip_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><h1><a name="Battery"></a>Battery<a href="#Battery" class="section_anchor"></a></h1><ul><li><tt>battery = boolean (0 or 1)</tt>               : enabled(=1) or disabled(=0) battery applet </li></ul><ul><li><tt>battery_hide = never or an integer (0 to 100)</tt>: At what battery percent does the battery hide </li></ul><ul><li><tt>battery_low_status = integer</tt>: At what battery percent does the icon show battery low command </li></ul><ul><li><tt>battery_low_cmd = notify-send "battery low"</tt> :What to do when battery is low </li></ul><ul><li><tt>bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>battery_font_color = color opacity  (0 to 100)</tt> </li></ul><ul><li><tt>battery_padding = horizontal_padding vertical_padding</tt> </li></ul><ul><li><tt>battery_background_id = integer</tt> : Which background to use </li></ul><h1><a name="Mouse_action_on_task"></a>Mouse action on task<a href="#Mouse_action_on_task" class="section_anchor"></a></h1><blockquote>Customize mouse action with : <tt>none, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task</tt>. 
-</blockquote><blockquote>Sample format: 
-<pre class="prettyprint">  mouse_middle = none
-  mouse_right = close
-  mouse_scroll_up = toggle
-  mouse_scroll_down = iconify</pre></blockquote><pre class="prettyprint">  close : close the task
-  toggle : toggle the task
-  iconify : iconify the task
-  toggle_iconify : toggle or iconify the task
-  maximize_restore : maximized or minimized 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</pre><p>If a mouse action is set to <tt>none</tt> and <tt>wm_menu = 1</tt> is set, the mouse click is forwarded to the window manager </p><h1><a name="Panel_autohide"></a>Panel autohide<a href="#Panel_autohide" class="section_anchor"></a></h1><ul><li><tt>autohide = boolean (0 or 1)</tt> : enable(=1) or disable(=0) autohiding </li></ul><ul><li><tt>autohide_show_timeout = float</tt> : show timeout in seconds. Use '.' as decimal separator. </li></ul><ul><li><tt>autohide_hide_timeout = float</tt> : hide timeout in seconds. Use '.' as decimal separator. </li></ul><ul><li><tt>autohide_height = integer</tt> : panel height (width for vertical panels) in hidden mode </li></ul><h1><a name="An_example_tint2rc"></a>An example tint2rc<a href="#An_example_tint2rc" class="section_anchor"></a></h1><pre class="prettyprint">#---------------------------------------------
-# 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</pre>
- </div>
- </div>
- </td></tr><tr>
-</tr></tbody></table>
- </div>
-
-
- 
- <div id="wikicommentcol">
- 
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
-<div class="collapse">
-
-
- 
-
-
-<div id="commentlist">
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
- 
- 
- 
-
-</div>
-</div>
-
- 
-
-
- 
-
-
- </div>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
-
- 
-
-
- 
- 
-
-
-
-
-
-
-  
- 
- 
- 
- 
- 
- 
- 
- 
-</div> 
-
- <div class="hostedBy" style="margin-top: -20px;">
- 
- </div>
- 
- 
-
-
- 
- 
-
-
-
-
-
-</body></html>

packaging/ubuntu/wiki/FAQ.html

@@ -1,217 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>tint2 - FAQ</title>
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-</head>
-
-<body class="t6">
-
-<table class="st" width="100%" cellpadding="0" cellspacing="0" align="center" border="0">
- <tbody><tr>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <td class="bevel-right" valign="top" align="right"></td>
- </tr>
-</tbody></table>
-
-
-
-<div id="maincol" style="padding: 0pt 3px 3px 0pt; margin: 0pt;">
-
-<!-- IE -->
-
-
-
-
-
-
- 
-
-
-
-
- 
-
-<div id="wikipage">
-<table>
- <tbody><tr>
- 
- 
- 
- 
- <td style="vertical-align: top; padding-left: 5px;">
- 
- 
- 
- <div id="wikicontent">
- <div class="vt" id="wikimaincol">
-
- <h1>tint2 - FAQ</h1>
-
- <p></p><ul><li><a href="#What_is_tint2?">What is tint2?</a></li><li><a href="#Who_is_the_developer_of_tint2_?">Who is the developer of tint2 ?</a></li><li><a href="#Does_tint2_have_a_system_tray/notification_area?">Does tint2 have a system tray/notification area?</a></li><li><a href="#I_have_the_latest_build_of_tint2_but_still_no_system_tray">I have the latest build of tint2 but still no system tray</a></li><li><a href="#tint2_doesn%27t_show_the_systray/notification">tint2 doesn't show the systray/notification</a></li><li><a href="#Why_did_some_systray_icons_disappear_from_the_panel?">Why did some systray icons disappear from the panel?</a></li><li><a href="#Why_don%27t_some_systray_icons_appear_when_you_run_tint2_in_a">Why don't some systray icons appear when you run tint2 in a KDE session?</a></li><li><a href="#I_want_to_disable_the_tint2_systray">I want to disable the tint2 systray</a></li><li><a href="#How_to_configure_real_transparency">How to configure real transparency</a></li><li><a href="#Tint2_doesn%27t_work_on_compiz_correctly?">Tint2 doesn't work on compiz correctly?</a></li><li><a href="#I_want_to_disable_compiz_shadow_on_Tint2">I want to disable compiz shadow on Tint2</a></li><li><a href="#Adding_a_%27show_desktop%27_button">Adding a 'show desktop' button</a></li><li><a href="#Task_list_is_limited">Task list is limited</a></li><li><a href="#How_can_I_get_%27pager_like_capability%27_?">How can I get 'pager like capability' ?</a></li><li><a href="#I_want_to_hide_some_tasks_from_the_panel_?">I want to hide some tasks from the panel ?</a></li><li><a href="#The_tint2_panel_is_blank">The tint2 panel is blank</a></li><li><a href="#How_to_maximize_window_over_tint2">How to maximize window over tint2</a></li><li><a href="#I_get_errors_when_I_try_to_compile_tint2_on_my_own">I get errors when I try to compile tint2 on my own</a></li><li><a href="#I_upgraded_to_tint2_and_I_still_have_the_old_panel_with_its_bugs">I upgraded to tint2 and I still have the old panel with its bugs</a></li><li><a href="#Tint2_doesn%27t_show_in_Pekwm">Tint2 doesn't show in Pekwm</a></li><li><a href="#Is_there_an_IRC_channel?">Is there an IRC channel?</a></li></ul> <p></p><p>Frequently asked questions. Please add any extra tips to the comments. </p><h1><a name="What_is_tint2?"></a>What is tint2?<a href="#What_is_tint2?" class="section_anchor"></a></h1><ul><li>Tint2 is a panel/taskbar for modern x window managers like GNOME, KDE, XFCE, openbox, pekwm,etc.. </li></ul><h1><a name="Who_is_the_developer_of_tint2_?"></a>Who is the developer of tint2 ?<a href="#Who_is_the_developer_of_tint2_?" class="section_anchor"></a></h1><ul><li>Main developers of tint2 are Thierry Lorthiois and Andreas Fink </li></ul><h1><a name="Does_tint2_have_a_system_tray/notification_area?"></a>Does tint2 have a system tray/notification area?<a href="#Does_tint2_have_a_system_tray/notification_area?" class="section_anchor"></a></h1><ul><li>YES! Tint2 finally has system tray/notification area. Please <a href="https://code.google.com/p/tint2/wiki/Install">install</a> the latest build if your current build doesn't have it. </li></ul><h1><a name="I_have_the_latest_build_of_tint2_but_still_no_system_tray"></a>I have the latest build of tint2 but still no system tray<a href="#I_have_the_latest_build_of_tint2_but_still_no_system_tray" class="section_anchor"></a></h1><ul><li>Check your tint2rc to see if you have the systray option configured and the options are not commented out. </li><li>The systray section looks like this  </li><pre class="prettyprint">#---------------------------------------------
-# SYSTRAYBAR
-#---------------------------------------------
-systray = 1
-systray_padding = 0 3 3
-systray_background_id = 0
-systray_sort = left2right</pre></ul><h1><a name="tint2_doesn't_show_the_systray/notification"></a>tint2 doesn't show the systray/notification<a href="#tint2_doesn%27t_show_the_systray/notification" class="section_anchor"></a></h1><ul><li>Check your tint2rc to see if you have 'systray = 1' </li><li>run tint2 in a terminal. if you get 'tint2 : another systray is running' it's because you have another systray/notification and you can't run more than one at a time.  </li><ul><li>In gnome, remove the systray/notification with a right clic on the separator before your systray/notification -&gt; remove </li></ul></ul><h1><a name="Why_did_some_systray_icons_disappear_from_the_panel?"></a>Why did some systray icons disappear from the panel?<a href="#Why_did_some_systray_icons_disappear_from_the_panel?" class="section_anchor"></a></h1><ul><li>tint2 stops/restarts the systray protocol on some events (like switching theme with tint2conf). But some systray icons do not implement the stop/restart of the manager and so disappear from the panel. You can report the problem to us and also to the systray icon developer. </li></ul><h1><a name="Why_don't_some_systray_icons_appear_when_you_run_tint2_in_a"></a>Why don't some systray icons appear when you run tint2 in a KDE session?<a href="#Why_don%27t_some_systray_icons_appear_when_you_run_tint2_in_a" class="section_anchor"></a></h1><ul><li>Some KDE applications use the KDE status notifier service to show system tray icons. If you disable this service (systemsettings -&gt; Startup and Shutdown -&gt; Service Manager -&gt; uncheck "Status Notifier Manager") all the icons should appear normally in tint2. </li></ul><h1><a name="I_want_to_disable_the_tint2_systray"></a>I want to disable the tint2 systray<a href="#I_want_to_disable_the_tint2_systray" class="section_anchor"></a></h1><ul><li>To disable the systray, just put <tt>systray = 0</tt> in your tint2rc </li><li>Example: </li><pre class="prettyprint">systray = 0
-systray_padding = 0 3 3
-systray_background_id = 0</pre></ul><h1><a name="How_to_configure_real_transparency"></a>How to configure real transparency<a href="#How_to_configure_real_transparency" class="section_anchor"></a></h1><ul><li>tint2 autodetects your composite manager and uses real transparency when possible. However, xcompmgr have a little bug which prevents tint2 from detecting it.  </li><li>If you want autodetect with xcompmgr, download and apply xcompmgr's patch (in bug report). See <a href="http://bugs.freedesktop.org/show_bug.cgi?id=26090" rel="nofollow">xcompmgr patch</a> </li></ul><h1><a name="Tint2_doesn't_work_on_compiz_correctly?"></a>Tint2 doesn't work on compiz correctly?<a href="#Tint2_doesn%27t_work_on_compiz_correctly?" class="section_anchor"></a></h1><ul><li>All my tasks are on one desktop in compiz? </li><ul><li>This is a known issue in compiz. Compiz doesn't support 'Virtual desktop' specification (or you have to disabled visual effect).<br>I look like 'Desktop number' use Viewport instead of 'Virtual desktop'. So pager capabilities are not supported. <br>See <a href="https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/153322" rel="nofollow">https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/153322</a> <br>or <a href="http://forum.compiz.org/viewtopic.php?f=86&amp;t=11943" rel="nofollow">http://forum.compiz.org/viewtopic.php?f=86&amp;t=11943</a> <br>or  <a href="https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/150690" rel="nofollow">https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/150690</a>  </li></ul><li>Tint is being decorated with a window/ has a shadow /is not fully transparent </li><ul><li>Open CompizConfig Settings manager -&gt; Window Decorations Plugin    </li><ul><li>In the box for Decoration windows, put  <tt>any &amp; !type=dock</tt> </li><li>In the box for Shadow windows, put  <tt>any &amp; !type=dock</tt>   </li></ul></ul><blockquote>
-</blockquote><li>Tint has ugly white streaks </li><ul><li>Set a background for your desktop </li></ul></ul><h1><a name="I_want_to_disable_compiz_shadow_on_Tint2"></a>I want to disable compiz shadow on Tint2<a href="#I_want_to_disable_compiz_shadow_on_Tint2" class="section_anchor"></a></h1><ul><li>Run ccsm the compiz configuration tool. Go to Window Decorations. For both decoration and shadow windows, replace 'any' with 'any &amp; !name=tint2'. </li></ul><h1><a name="Adding_a_'show_desktop'_button"></a>Adding a 'show desktop' button<a href="#Adding_a_%27show_desktop%27_button" class="section_anchor"></a></h1><ul><li>tint2 doesn't implement 'show desktop' button. But here a way to get it. <br> </li></ul><p>Create a file with following text </p><pre class="prettyprint">#!/bin/sh
-if wmctrl -m | grep "mode: ON"; then
-exec wmctrl -k off
-else
-exec wmctrl -k on
-fi</pre><p>Save it in /usr/bin/show_desktop.sh and make it executable.<br> Install the package 'wmctrl'. And call the script in tint2rc config file. </p><pre class="prettyprint">time1_format = %H:%M
-time1_font = sans 8
-time2_format = %A %d %B
-time2_font = sans 6
-clock_font_color = #ffffff 76
-clock_padding = 4 4
-clock_background_id = 0
-clock_lclick_command = show_desktop.sh</pre><p>Then left click on the clock will do it. </p><h1><a name="Task_list_is_limited"></a>Task list is limited<a href="#Task_list_is_limited" class="section_anchor"></a></h1><ul><li>In your tint2rc file, check the value of <tt>taskbar_mode</tt>. If it's <tt>multi_desktop</tt>, tint2 show one taskbar per desktop. Change the value to <tt>single_desktop</tt> if you want just one taskbar. </li></ul><h1><a name="How_can_I_get_'pager_like_capability'_?"></a>How can I get 'pager like capability' ?<a href="#How_can_I_get_%27pager_like_capability%27_?" class="section_anchor"></a></h1><ul><li>In your tint2rc file, change the value of <tt>taskbar_mode</tt> to <tt>multi_desktop</tt>. This option will show one taskbar per desktop. So you can detect on witch desktop is an application and witch desktop is empty (or full). You can close an application whithout switching to the desktop. You can drag n drop application between desktop.   </li></ul><h1><a name="I_want_to_hide_some_tasks_from_the_panel_?"></a>I want to hide some tasks from the panel ?<a href="#I_want_to_hide_some_tasks_from_the_panel_?" class="section_anchor"></a></h1><ul><li>In Openbox config file 'rc.xml' you can assign the property 'skip_taskbar' to your window </li></ul><h1><a name="The_tint2_panel_is_blank"></a>The tint2 panel is blank<a href="#The_tint2_panel_is_blank" class="section_anchor"></a></h1><ul><li>A new option, called  <tt>panel_items</tt> has been added to the config file. This option defines the items tint2 will show and the order of those items(from left to right). Please define that in your tint2rc file. The format is shown below. The options are <tt>L</tt> for <tt>Launcher</tt>, <tt>S</tt> for the <tt>Systray</tt>, <tt>T</tt> for the <tt>taskbar</tt>, <tt>C</tt> for the <tt>clock</tt> and <tt>B</tt> for the <tt>battery</tt>. </li><pre class="prettyprint">panel_items = LTSBC </pre></ul><h1><a name="How_to_maximize_window_over_tint2"></a>How to maximize window over tint2<a href="#How_to_maximize_window_over_tint2" class="section_anchor"></a></h1><ul><li>You can manage interaction between tint2 and window with : </li><pre class="prettyprint">panel_layer = bottom,normal,top
-strut_policy = follow_size/minimum/none
-autohide_height = integer</pre></ul><blockquote>If you want maximized window never cover tint2: 
-<pre class="prettyprint">panel_layer = top
-strut_policy = follow_size</pre>If you want maximized window behind tint2: 
-<pre class="prettyprint">panel_layer = top
-strut_policy = none</pre>If you want maximized window behind tint2, but 2 pixels free so you can use desktop action (right click, ...): 
-<pre class="prettyprint">panel_layer = top
-strut_policy = minimum
-autohide_height = 2</pre></blockquote><h1><a name="I_get_errors_when_I_try_to_compile_tint2_on_my_own"></a>I get errors when I try to compile tint2 on my own<a href="#I_get_errors_when_I_try_to_compile_tint2_on_my_own" class="section_anchor"></a></h1><ul><li>Do you have all the dependencies installed? Please check <a href="https://code.google.com/p/tint2/wiki/Install#Dependencies">here</a> </li></ul><h1><a name="I_upgraded_to_tint2_and_I_still_have_the_old_panel_with_its_bugs"></a>I upgraded to tint2 and I still have the old panel with its bugs<a href="#I_upgraded_to_tint2_and_I_still_have_the_old_panel_with_its_bugs" class="section_anchor"></a></h1><ul><li>The tint binary was renamed tint2 to avoid a conflict with another package.So your new tint2 startup command is <strong>tint2</strong> </li><li>Since a new stable release hasn't been released yet, both the old tint and the new tint2 binaries will be on your system when you upgrade just incase you run into some problems and want to fall back on the old binary. </li></ul><h1><a name="Tint2_doesn't_show_in_Pekwm"></a>Tint2 doesn't show in Pekwm<a href="#Tint2_doesn%27t_show_in_Pekwm" class="section_anchor"></a></h1><ul><li>The problem is that pekwm defines by default edge borders, and doesn't allow a panel to get inside these edge borders. The config option is in <tt>~/.pekwm/config</tt> under <tt>Screen/EdgeSize</tt>. You can either disable the edge borders or set tint2 to a size where it doesn't enter these borders (i.e. play with <tt>panel_size</tt> and <tt>panel_margin</tt>) </li><li>Setting the margin to one pixel made it appear on my screen. With horizontal panel: </li><pre class="prettyprint">panel_size = 95% height
-panel_margin = 0 1</pre><li>With vertical panel: </li><pre class="prettyprint">panel_size = width 95%
-panel_margin = 1 0</pre></ul><h1><a name="Is_there_an_IRC_channel?"></a>Is there an IRC channel?<a href="#Is_there_an_IRC_channel?" class="section_anchor"></a></h1><ul><li>Yes. There is now an irc channel, <strong>#tint2</strong> on <a href="irc://irc.freenode.net" rel="nofollow">irc.freenode.net</a>. </li><li>Just ask your question and stay there, because we are not always watching the channel ;) </li></ul>
- </div>
- </div>
- </td></tr><tr>
-</tr></tbody></table>
- </div>
-
-
- 
- <div id="wikicommentcol">
- 
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
-<div class="collapse">
-
-
- 
-
-
-
-</div>
-
- 
-
-
- 
-
-
- </div>
- 
- 
- 
- 
- 
- <div id="commentform">
- 
- </div>
- 
- 
- 
- 
- 
-
-
- 
-
-
- 
- 
-
-
-
-
-
-
-  
- 
- 
- 
- 
- 
- 
- 
- 
-</div> 
-
- <div class="hostedBy" style="margin-top: -20px;">
- 
- </div>
- 
- 
-
-
- 
- 
-
-
-
-
-
-</body></html>

src/battery/battery.c

@@ -56,7 +56,7 @@ char *battery_uwheel_command;
 char *battery_dwheel_command;
 gboolean battery_found;
 
-char *battery_sys_prefix = (char*)"";
+char *battery_sys_prefix = (char *)"";
 
 void battery_init_fonts();
 char *battery_get_tooltip(void *obj);
@@ -65,407 +65,397 @@ void battery_dump_geometry(void *obj, int indent);
 
 void default_battery()
 {
-	battery_enabled = FALSE;
+    battery_enabled = FALSE;
-	battery_tooltip_enabled = TRUE;
+    battery_tooltip_enabled = TRUE;
-	battery_found = FALSE;
+    battery_found = FALSE;
-	percentage_hide = 101;
+    percentage_hide = 101;
-	battery_low_cmd_sent = FALSE;
+    battery_low_cmd_sent = FALSE;
-	battery_timeout = NULL;
+    battery_timeout = NULL;
-	bat1_has_font = FALSE;
+    bat1_has_font = FALSE;
-	bat1_font_desc = NULL;
+    bat1_font_desc = NULL;
-	bat2_has_font = FALSE;
+    bat2_has_font = FALSE;
-	bat2_font_desc = NULL;
+    bat2_font_desc = NULL;
-	ac_connected_cmd = NULL;
+    ac_connected_cmd = NULL;
-	ac_disconnected_cmd = NULL;
+    ac_disconnected_cmd = NULL;
-	battery_low_cmd = NULL;
+    battery_low_cmd = NULL;
-	battery_lclick_command = NULL;
+    battery_lclick_command = NULL;
-	battery_mclick_command = NULL;
+    battery_mclick_command = NULL;
-	battery_rclick_command = NULL;
+    battery_rclick_command = NULL;
-	battery_uwheel_command = NULL;
+    battery_uwheel_command = NULL;
-	battery_dwheel_command = NULL;
+    battery_dwheel_command = NULL;
-	battery_state.percentage = 0;
+    battery_state.percentage = 0;
-	battery_state.time.hours = 0;
+    battery_state.time.hours = 0;
-	battery_state.time.minutes = 0;
+    battery_state.time.minutes = 0;
-	battery_state.time.seconds = 0;
+    battery_state.time.seconds = 0;
-	battery_state.state = BATTERY_UNKNOWN;
+    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);
+    free(battery_low_cmd);
-	battery_low_cmd = NULL;
+    battery_low_cmd = NULL;
-	free(battery_lclick_command);
+    free(battery_lclick_command);
-	battery_lclick_command = NULL;
+    battery_lclick_command = NULL;
-	free(battery_mclick_command);
+    free(battery_mclick_command);
-	battery_mclick_command = NULL;
+    battery_mclick_command = NULL;
-	free(battery_rclick_command);
+    free(battery_rclick_command);
-	battery_rclick_command = NULL;
+    battery_rclick_command = NULL;
-	free(battery_uwheel_command);
+    free(battery_uwheel_command);
-	battery_uwheel_command = NULL;
+    battery_uwheel_command = NULL;
-	free(battery_dwheel_command);
+    free(battery_dwheel_command);
-	battery_dwheel_command = NULL;
+    battery_dwheel_command = NULL;
-	free(ac_connected_cmd);
+    free(ac_connected_cmd);
-	ac_connected_cmd = NULL;
+    ac_connected_cmd = NULL;
-	free(ac_disconnected_cmd);
+    free(ac_disconnected_cmd);
-	ac_disconnected_cmd = NULL;
+    ac_disconnected_cmd = NULL;
-	stop_timeout(battery_timeout);
+    stop_timeout(battery_timeout);
-	battery_timeout = NULL;
+    battery_timeout = NULL;
-	battery_found = FALSE;
+    battery_found = FALSE;
 
-	battery_os_free();
+    battery_os_free();
 }
 
 void init_battery()
 {
-	if (!battery_enabled)
+    if (!battery_enabled)
-		return;
+        return;
 
-	battery_found = battery_os_init();
+    battery_found = battery_os_init();
 
-	if (!battery_timeout)
+    if (!battery_timeout)
-		battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
+        battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
 
-	update_battery();
+    update_battery();
 }
 
 void reinit_battery()
 {
-	battery_os_free();
+    battery_os_free();
-	battery_found = battery_os_init();
+    battery_found = battery_os_init();
-	update_battery();
+    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();
+    battery_init_fonts();
 
-	if (!battery->area.bg)
+    if (!battery->area.bg)
-		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");
+    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 = LAYOUT_FIXED;
+    battery->area.size_mode = LAYOUT_FIXED;
-	battery->area._resize = resize_battery;
+    battery->area._resize = resize_battery;
-	battery->area._compute_desired_size = battery_compute_desired_size;
+    battery->area._compute_desired_size = battery_compute_desired_size;
-	battery->area._is_under_mouse = full_width_area_is_under_mouse;
+    battery->area._is_under_mouse = full_width_area_is_under_mouse;
-	battery->area.on_screen = TRUE;
+    battery->area.on_screen = TRUE;
-	battery->area.resize_needed = 1;
+    battery->area.resize_needed = 1;
-	battery->area.has_mouse_over_effect =
+    battery->area.has_mouse_over_effect =
-	    panel_config.mouse_effects && (battery_lclick_command || battery_mclick_command || battery_rclick_command ||
+        panel_config.mouse_effects && (battery_lclick_command || battery_mclick_command || battery_rclick_command ||
-	                                   battery_uwheel_command || battery_dwheel_command);
+                                       battery_uwheel_command || battery_dwheel_command);
-	battery->area.has_mouse_press_effect = battery->area.has_mouse_over_effect;
+    battery->area.has_mouse_press_effect = battery->area.has_mouse_over_effect;
-	if (battery_tooltip_enabled)
+    if (battery_tooltip_enabled)
-		battery->area._get_tooltip_text = battery_get_tooltip;
+        battery->area._get_tooltip_text = battery_get_tooltip;
-	instantiate_area_gradients(&battery->area);
+    instantiate_area_gradients(&battery->area);
 }
 
 void battery_init_fonts()
 {
-	if (!bat1_font_desc) {
+    if (!bat1_font_desc) {
-		bat1_font_desc = pango_font_description_from_string(get_default_font());
+        bat1_font_desc = pango_font_description_from_string(get_default_font());
-		pango_font_description_set_size(bat1_font_desc, pango_font_description_get_size(bat1_font_desc) - PANGO_SCALE);
+        pango_font_description_set_size(bat1_font_desc, pango_font_description_get_size(bat1_font_desc) - PANGO_SCALE);
-	}
+    }
-	if (!bat2_font_desc) {
+    if (!bat2_font_desc) {
-		bat2_font_desc = pango_font_description_from_string(get_default_font());
+        bat2_font_desc = pango_font_description_from_string(get_default_font());
-		pango_font_description_set_size(bat2_font_desc, pango_font_description_get_size(bat2_font_desc) - PANGO_SCALE);
+        pango_font_description_set_size(bat2_font_desc, pango_font_description_get_size(bat2_font_desc) - PANGO_SCALE);
-	}
+    }
 }
 
 void battery_default_font_changed()
 {
-	if (!battery_enabled)
+    if (!battery_enabled)
-		return;
+        return;
-	if (bat1_has_font && bat2_has_font)
+    if (bat1_has_font && bat2_has_font)
-		return;
+        return;
-	if (!bat1_has_font) {
+    if (!bat1_has_font) {
-		pango_font_description_free(bat1_font_desc);
+        pango_font_description_free(bat1_font_desc);
-		bat1_font_desc = NULL;
+        bat1_font_desc = NULL;
-	}
+    }
-	if (!bat2_has_font) {
+    if (!bat2_has_font) {
-		pango_font_description_free(bat2_font_desc);
+        pango_font_description_free(bat2_font_desc);
-		bat2_font_desc = NULL;
+        bat2_font_desc = NULL;
-	}
+    }
-	battery_init_fonts();
+    battery_init_fonts();
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		panels[i].battery.area.resize_needed = TRUE;
+        panels[i].battery.area.resize_needed = TRUE;
-		schedule_redraw(&panels[i].battery.area);
+        schedule_redraw(&panels[i].battery.area);
-	}
+    }
-	schedule_panel_redraw();
+    schedule_panel_redraw();
 }
 
 void update_battery_tick(void *arg)
 {
-	if (!battery_enabled)
+    if (!battery_enabled)
-		return;
+        return;
 
-	gboolean old_found = battery_found;
+    gboolean old_found = battery_found;
-	int old_percentage = battery_state.percentage;
+    int old_percentage = battery_state.percentage;
-	gboolean old_ac_connected = battery_state.ac_connected;
+    gboolean old_ac_connected = battery_state.ac_connected;
-	int16_t old_hours = battery_state.time.hours;
+    int16_t old_hours = battery_state.time.hours;
-	int8_t old_minutes = battery_state.time.minutes;
+    int8_t old_minutes = battery_state.time.minutes;
 
-	if (!battery_found) {
+    if (!battery_found) {
-		init_battery();
+        init_battery();
-		old_ac_connected = battery_state.ac_connected;
+        old_ac_connected = battery_state.ac_connected;
-	}
+    }
-	if (update_battery() != 0) {
+    if (update_battery() != 0) {
-		// Try to reconfigure on failed update
+        // Try to reconfigure on failed update
-		init_battery();
+        init_battery();
-	}
+    }
 
-	if (old_ac_connected != battery_state.ac_connected) {
+    if (old_ac_connected != battery_state.ac_connected) {
-		if (battery_state.ac_connected)
+        if (battery_state.ac_connected)
-			tint_exec(ac_connected_cmd);
+            tint_exec_no_sn(ac_connected_cmd);
-		else
+        else
-			tint_exec(ac_disconnected_cmd);
+            tint_exec_no_sn(ac_disconnected_cmd);
-	}
+    }
 
-	if (battery_state.percentage < battery_low_status && battery_state.state == BATTERY_DISCHARGING &&
+    if (battery_state.percentage < battery_low_status && battery_state.state == BATTERY_DISCHARGING &&
-	    !battery_low_cmd_sent) {
+        !battery_low_cmd_sent) {
-		tint_exec(battery_low_cmd);
+        tint_exec_no_sn(battery_low_cmd);
-		battery_low_cmd_sent = TRUE;
+        battery_low_cmd_sent = TRUE;
-	}
+    }
-	if (battery_state.percentage > battery_low_status && battery_state.state == BATTERY_CHARGING &&
+    if (battery_state.percentage > battery_low_status && battery_state.state == BATTERY_CHARGING &&
-	    battery_low_cmd_sent) {
+        battery_low_cmd_sent) {
-		battery_low_cmd_sent = FALSE;
+        battery_low_cmd_sent = FALSE;
-	}
+    }
 
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		// Show/hide if needed
+        // Show/hide if needed
-		if (!battery_found) {
+        if (!battery_found) {
-			hide(&panels[i].battery.area);
+            hide(&panels[i].battery.area);
-		} else {
+        } else {
-			if (battery_state.percentage >= percentage_hide)
+            if (battery_state.percentage >= percentage_hide)
-				hide(&panels[i].battery.area);
+                hide(&panels[i].battery.area);
-			else
+            else
-				show(&panels[i].battery.area);
+                show(&panels[i].battery.area);
-		}
+        }
-		// Redraw if needed
+        // Redraw if needed
-		if (panels[i].battery.area.on_screen) {
+        if (panels[i].battery.area.on_screen) {
-			if (old_found != battery_found || old_percentage != battery_state.percentage ||
+            if (old_found != battery_found || old_percentage != battery_state.percentage ||
-			    old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) {
+                old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) {
-				panels[i].battery.area.resize_needed = TRUE;
+                panels[i].battery.area.resize_needed = TRUE;
-				schedule_panel_redraw();
+                schedule_panel_redraw();
-			}
+            }
-		}
+        }
-	}
+    }
 }
 
 int update_battery()
 {
-	// Reset
+    // Reset
-	battery_state.state = BATTERY_UNKNOWN;
+    battery_state.state = BATTERY_UNKNOWN;
-	battery_state.percentage = 0;
+    battery_state.percentage = 0;
-	battery_state.ac_connected = FALSE;
+    battery_state.ac_connected = FALSE;
-	battery_state_set_time(&battery_state, 0);
+    battery_state_set_time(&battery_state, 0);
 
-	int err = battery_os_update(&battery_state);
+    int err = battery_os_update(&battery_state);
 
-	// Clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
+    // Clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
-	if (battery_state.percentage > 100) {
+    if (battery_state.percentage > 100) {
-		battery_state.percentage = 100;
+        battery_state.percentage = 100;
-	}
+    }
 
-	return err;
+    return err;
 }
 
 int battery_compute_desired_size(void *obj)
 {
-	Battery *battery = (Battery *)obj;
+    Battery *battery = (Battery *)obj;
-	Panel *panel = (Panel *)battery->area.panel;
+    Panel *panel = (Panel *)battery->area.panel;
-	int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
+    int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
-	int bat_time_height, bat_time_width, bat_time_height_ink;
+    int bat_time_height, bat_time_width, bat_time_height_ink;
 
-	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
+    snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
-	if (battery_state.state == BATTERY_FULL) {
+    if (battery_state.state == BATTERY_FULL) {
-		strcpy(buf_bat_time, "Full");
+        strcpy(buf_bat_time, "Full");
-	} else {
+    } else {
-		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
+        snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
-	}
+    }
-	get_text_size2(bat1_font_desc,
+    get_text_size2(bat1_font_desc,
-				   &bat_percentage_height_ink,
+                   &bat_percentage_height_ink,
-				   &bat_percentage_height,
+                   &bat_percentage_height,
-				   &bat_percentage_width,
+                   &bat_percentage_width,
-				   panel->area.height,
+                   panel->area.height,
-				   panel->area.width,
+                   panel->area.width,
-				   buf_bat_percentage,
+                   buf_bat_percentage,
-				   strlen(buf_bat_percentage),
+                   strlen(buf_bat_percentage),
-				   PANGO_WRAP_WORD_CHAR,
+                   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE,
+                   PANGO_ELLIPSIZE_NONE,
-				   FALSE);
+                   FALSE);
-	get_text_size2(bat2_font_desc,
+    get_text_size2(bat2_font_desc,
-				   &bat_time_height_ink,
+                   &bat_time_height_ink,
-				   &bat_time_height,
+                   &bat_time_height,
-				   &bat_time_width,
+                   &bat_time_width,
-				   panel->area.height,
+                   panel->area.height,
-				   panel->area.width,
+                   panel->area.width,
-				   buf_bat_time,
+                   buf_bat_time,
-				   strlen(buf_bat_time),
+                   strlen(buf_bat_time),
-				   PANGO_WRAP_WORD_CHAR,
+                   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE,
+                   PANGO_ELLIPSIZE_NONE,
-				   FALSE);
+                   FALSE);
 
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
+        int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
-		new_size += 2 * battery->area.paddingxlr + left_right_border_width(&battery->area);
+        new_size += 2 * battery->area.paddingxlr + left_right_border_width(&battery->area);
-		return new_size;
+        return new_size;
-	} else {
+    } else {
-		int new_size = bat_percentage_height + bat_time_height + 2 * battery->area.paddingxlr +
+        int new_size = bat_percentage_height + bat_time_height + 2 * battery->area.paddingxlr +
-					   top_bottom_border_width(&battery->area);
+                       top_bottom_border_width(&battery->area);
-		return new_size;
+        return new_size;
-	}
+    }
 }
 
 gboolean resize_battery(void *obj)
 {
-	Battery *battery = (Battery *)obj;
+    Battery *battery = (Battery *)obj;
-	Panel *panel = (Panel *)battery->area.panel;
+    Panel *panel = (Panel *)battery->area.panel;
-	int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
+    int bat_percentage_height, bat_percentage_width, bat_percentage_height_ink;
-	int bat_time_height, bat_time_width, bat_time_height_ink;
+    int bat_time_height, bat_time_width, bat_time_height_ink;
-	int ret = 0;
+    int ret = 0;
 
-	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
+    snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
-	if (battery_state.state == BATTERY_FULL) {
+    if (battery_state.state == BATTERY_FULL) {
-		strcpy(buf_bat_time, "Full");
+        strcpy(buf_bat_time, "Full");
-	} else {
+    } else {
-		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
+        snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
-	}
+    }
-	get_text_size2(bat1_font_desc,
+    get_text_size2(bat1_font_desc,
-	               &bat_percentage_height_ink,
+                   &bat_percentage_height_ink,
-	               &bat_percentage_height,
+                   &bat_percentage_height,
-	               &bat_percentage_width,
+                   &bat_percentage_width,
-	               panel->area.height,
+                   panel->area.height,
-	               panel->area.width,
+                   panel->area.width,
-	               buf_bat_percentage,
+                   buf_bat_percentage,
-	               strlen(buf_bat_percentage),
+                   strlen(buf_bat_percentage),
-	               PANGO_WRAP_WORD_CHAR,
+                   PANGO_WRAP_WORD_CHAR,
-	               PANGO_ELLIPSIZE_NONE,
+                   PANGO_ELLIPSIZE_NONE,
-	               FALSE);
+                   FALSE);
-	get_text_size2(bat2_font_desc,
+    get_text_size2(bat2_font_desc,
-	               &bat_time_height_ink,
+                   &bat_time_height_ink,
-	               &bat_time_height,
+                   &bat_time_height,
-	               &bat_time_width,
+                   &bat_time_width,
-	               panel->area.height,
+                   panel->area.height,
-	               panel->area.width,
+                   panel->area.width,
-	               buf_bat_time,
+                   buf_bat_time,
-	               strlen(buf_bat_time),
+                   strlen(buf_bat_time),
-	               PANGO_WRAP_WORD_CHAR,
+                   PANGO_WRAP_WORD_CHAR,
-	               PANGO_ELLIPSIZE_NONE,
+                   PANGO_ELLIPSIZE_NONE,
-	               FALSE);
+                   FALSE);
 
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
+        int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
-		new_size += 2 * battery->area.paddingxlr + left_right_border_width(&battery->area);
+        new_size += 2 * battery->area.paddingxlr + left_right_border_width(&battery->area);
-		if (new_size > battery->area.width || new_size < battery->area.width - 2) {
+        if (new_size > battery->area.width || new_size < battery->area.width - 2) {
-			// we try to limit the number of resize
+            // we try to limit the number of resize
-			battery->area.width = new_size;
+            battery->area.width = new_size;
-			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height) / 2;
+            battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height) / 2;
-			battery->bat2_posy = battery->bat1_posy + bat_percentage_height;
+            battery->bat2_posy = battery->bat1_posy + bat_percentage_height;
-			ret = 1;
+            ret = 1;
-		}
+        }
-	} else {
+    } else {
-		int new_size = bat_percentage_height + bat_time_height + 2 * battery->area.paddingxlr +
+        int new_size = bat_percentage_height + bat_time_height + 2 * battery->area.paddingxlr +
-		               top_bottom_border_width(&battery->area);
+                       top_bottom_border_width(&battery->area);
-		if (new_size > battery->area.height || new_size < battery->area.height - 2) {
+        if (new_size > battery->area.height || new_size < battery->area.height - 2) {
-			battery->area.height = new_size;
+            battery->area.height = new_size;
-			battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2) / 2;
+            battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2) / 2;
-			battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
+            battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
-			ret = 1;
+            ret = 1;
-		}
+        }
-	}
+    }
 
-	schedule_redraw(&battery->area);
+    schedule_redraw(&battery->area);
-	return ret;
+    return ret;
 }
 
 void draw_battery(void *obj, cairo_t *c)
 {
-	Battery *battery = obj;
+    Battery *battery = obj;
 
-	PangoLayout *layout = pango_cairo_create_layout(c);
+    PangoLayout *layout = pango_cairo_create_layout(c);
-	pango_layout_set_font_description(layout, bat1_font_desc);
+    pango_layout_set_font_description(layout, bat1_font_desc);
-	pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
+    pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
-	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+    pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
+    pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
 
-	cairo_set_source_rgba(c,
+    cairo_set_source_rgba(c,
-	                      battery->font_color.rgb[0],
+                          battery->font_color.rgb[0],
-	                      battery->font_color.rgb[1],
+                          battery->font_color.rgb[1],
-	                      battery->font_color.rgb[2],
+                          battery->font_color.rgb[2],
-	                      battery->font_color.alpha);
+                          battery->font_color.alpha);
 
-	pango_cairo_update_layout(c, layout);
+    pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, battery->bat1_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
+    draw_text(layout, c, 0, battery->bat1_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
 
-	pango_layout_set_font_description(layout, bat2_font_desc);
+    pango_layout_set_font_description(layout, bat2_font_desc);
-	pango_layout_set_indent(layout, 0);
+    pango_layout_set_indent(layout, 0);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	pango_layout_set_text(layout, buf_bat_time, strlen(buf_bat_time));
+    pango_layout_set_text(layout, buf_bat_time, strlen(buf_bat_time));
-	pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
+    pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
 
-	pango_cairo_update_layout(c, layout);
+    pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, battery->bat2_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
+    draw_text(layout, c, 0, battery->bat2_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
-	pango_cairo_show_layout(c, layout);
+    pango_cairo_show_layout(c, layout);
 
-	g_object_unref(layout);
+    g_object_unref(layout);
 }
 
 void battery_dump_geometry(void *obj, int indent)
 {
-	Battery *battery = obj;
+    Battery *battery = obj;
-	fprintf(stderr,
+    fprintf(stderr, "%*sText 1: y = %d, text = %s\n", indent, "", battery->bat1_posy, buf_bat_percentage);
-			"%*sText 1: y = %d, text = %s\n",
+    fprintf(stderr, "%*sText 2: y = %d, text = %s\n", indent, "", battery->bat2_posy, buf_bat_time);
-			indent,
-			"",
-			battery->bat1_posy,
-			buf_bat_percentage);
-	fprintf(stderr,
-		"%*sText 2: y = %d, text = %s\n",
-		indent,
-		"",
-		battery->bat2_posy,
-		buf_bat_time);
 }
 
 char *battery_get_tooltip(void *obj)
 {
-	return battery_os_tooltip();
+    return battery_os_tooltip();
 }
 
-void battery_action(int button)
+void battery_action(void *obj, int button, int x, int y, Time time)
 {
-	char *command = NULL;
+    char *command = NULL;
-	switch (button) {
+    switch (button) {
-	case 1:
+    case 1:
-		command = battery_lclick_command;
+        command = battery_lclick_command;
-		break;
+        break;
-	case 2:
+    case 2:
-		command = battery_mclick_command;
+        command = battery_mclick_command;
-		break;
+        break;
-	case 3:
+    case 3:
-		command = battery_rclick_command;
+        command = battery_rclick_command;
-		break;
+        break;
-	case 4:
+    case 4:
-		command = battery_uwheel_command;
+        command = battery_uwheel_command;
-		break;
+        break;
-	case 5:
+    case 5:
-		command = battery_dwheel_command;
+        command = battery_dwheel_command;
-		break;
+        break;
-	}
+    }
-	tint_exec(command);
+    tint_exec(command, NULL, NULL, time, obj, x, y);
 }

src/battery/battery.h

@@ -17,30 +17,30 @@
 #include "area.h"
 
 typedef struct Battery {
-	Area area;
+    Area area;
-	Color font_color;
+    Color font_color;
-	int bat1_posy;
+    int bat1_posy;
-	int bat2_posy;
+    int bat2_posy;
 } Battery;
 
 typedef enum ChargeState {
-	BATTERY_UNKNOWN = 0,
+    BATTERY_UNKNOWN = 0,
-	BATTERY_CHARGING,
+    BATTERY_CHARGING,
-	BATTERY_DISCHARGING,
+    BATTERY_DISCHARGING,
-	BATTERY_FULL,
+    BATTERY_FULL,
 } ChargeState;
 
 typedef struct BatteryTime {
-	int16_t hours;
+    int16_t hours;
-	int8_t minutes;
+    int8_t minutes;
-	int8_t seconds;
+    int8_t seconds;
 } BatteryTime;
 
 typedef struct BatteryState {
-	int percentage;
+    int percentage;
-	BatteryTime time;
+    BatteryTime time;
-	ChargeState state;
+    ChargeState state;
-	gboolean ac_connected;
+    gboolean ac_connected;
 } BatteryState;
 
 extern struct BatteryState battery_state;
@@ -68,26 +68,26 @@ extern char *battery_sys_prefix;
 
 static inline gchar *chargestate2str(ChargeState state)
 {
-	switch (state) {
+    switch (state) {
-	case BATTERY_CHARGING:
+    case BATTERY_CHARGING:
-		return "Charging";
+        return "Charging";
-	case BATTERY_DISCHARGING:
+    case BATTERY_DISCHARGING:
-		return "Discharging";
+        return "Discharging";
-	case BATTERY_FULL:
+    case BATTERY_FULL:
-		return "Full";
+        return "Full";
-	case BATTERY_UNKNOWN:
+    case BATTERY_UNKNOWN:
-	default:
+    default:
-		return "Unknown";
+        return "Unknown";
-	};
+    };
 }
 
 static inline void battery_state_set_time(BatteryState *state, int seconds)
 {
-	state->time.hours = seconds / 3600;
+    state->time.hours = seconds / 3600;
-	seconds -= 3600 * state->time.hours;
+    seconds -= 3600 * state->time.hours;
-	state->time.minutes = seconds / 60;
+    state->time.minutes = seconds / 60;
-	seconds -= 60 * state->time.minutes;
+    seconds -= 60 * state->time.minutes;
-	state->time.seconds = seconds;
+    state->time.seconds = seconds;
 }
 
 // default global data
@@ -108,7 +108,7 @@ void battery_default_font_changed();
 
 gboolean resize_battery(void *obj);
 
-void battery_action(int button);
+void battery_action(void *obj, int button, int x, int y, Time time);
 
 /* operating system specific functions */
 gboolean battery_os_init();

src/battery/dummy.c

@@ -25,20 +25,20 @@
 
 gboolean battery_os_init()
 {
-	return FALSE;
+    return FALSE;
 }
 
 void battery_os_free()
 {
-	return;
+    return;
 }
 
 int battery_os_update(BatteryState *state)
 {
-	return -1;
+    return -1;
 }
 
 char *battery_os_tooltip()
 {
-	return strdup("Operating System not supported");
+    return strdup("Operating System not supported");
 }

src/battery/freebsd.c

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

src/battery/linux.c

@@ -26,513 +26,514 @@
 #include "uevent.h"
 
 enum psy_type {
-	PSY_UNKNOWN,
+    PSY_UNKNOWN,
-	PSY_BATTERY,
+    PSY_BATTERY,
-	PSY_MAINS,
+    PSY_MAINS,
 };
 
 struct psy_battery {
-	/* generic properties */
+    /* generic properties */
-	gchar *name;
+    gchar *name;
-	/* monotonic time, in microseconds */
+    /* monotonic time, in microseconds */
-	gint64 timestamp;
+    gint64 timestamp;
-	/* sysfs files */
+    /* sysfs files */
-	gchar *path_present;
+    gchar *path_present;
-	gchar *path_level_now;
+    gchar *path_level_now;
-	gchar *path_level_full;
+    gchar *path_level_full;
-	gchar *path_rate_now;
+    gchar *path_rate_now;
-	gchar *path_status;
+    gchar *path_status;
-	/* values */
+    /* values */
-	gboolean present;
+    gboolean present;
-	gint level_now;
+    gint level_now;
-	gint level_full;
+    gint level_full;
-	gint rate_now;
+    gint rate_now;
-	gchar unit;
+    gchar unit;
-	ChargeState status;
+    ChargeState status;
 };
 
 struct psy_mains {
-	/* generic properties */
+    /* generic properties */
-	gchar *name;
+    gchar *name;
-	/* sysfs files */
+    /* sysfs files */
-	gchar *path_online;
+    gchar *path_online;
-	/* values */
+    /* values */
-	gboolean online;
+    gboolean online;
 };
 
 static void uevent_battery_update()
 {
-	update_battery_tick(NULL);
+    update_battery_tick(NULL);
 }
 static struct uevent_notify psy_change = {UEVENT_CHANGE, "power_supply", NULL, uevent_battery_update};
 
 static void uevent_battery_plug()
 {
-	printf("reinitialize batteries after HW change\n");
+    printf("reinitialize batteries after HW change\n");
-	reinit_battery();
+    reinit_battery();
 }
 static struct uevent_notify psy_plug = {UEVENT_ADD | UEVENT_REMOVE, "power_supply", NULL, uevent_battery_plug};
 
-#define RETURN_ON_ERROR(err) \
+#define RETURN_ON_ERROR(err)                                                 \
-	if (err) {             \
+    if (err) {                                                               \
-		g_error_free(err);   \
+        g_error_free(err);                                                   \
-		fprintf(stderr, RED "%s:%d: errror" RESET "\n", __FILE__, __LINE__); \
+        fprintf(stderr, RED "%s:%d: errror" RESET "\n", __FILE__, __LINE__); \
-		return FALSE;        \
+        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;
+    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);
+    gchar *path_type = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "type", NULL);
-	GError *error = NULL;
+    GError *error = NULL;
-	gchar *type;
+    gchar *type;
-	gsize typelen;
+    gsize typelen;
 
-	g_file_get_contents(path_type, &type, &typelen, &error);
+    g_file_get_contents(path_type, &type, &typelen, &error);
-	g_free(path_type);
+    g_free(path_type);
-	if (error) {
+    if (error) {
-		fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+        fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
-		g_error_free(error);
+        g_error_free(error);
-		return PSY_UNKNOWN;
+        return PSY_UNKNOWN;
-	}
+    }
 
-	if (!g_strcmp0(type, "Battery\n")) {
+    if (!g_strcmp0(type, "Battery\n")) {
-		g_free(type);
+        g_free(type);
-		return PSY_BATTERY;
+        return PSY_BATTERY;
-	}
+    }
 
-	if (!g_strcmp0(type, "Mains\n")) {
+    if (!g_strcmp0(type, "Mains\n")) {
-		g_free(type);
+        g_free(type);
-		return PSY_MAINS;
+        return PSY_MAINS;
-	}
+    }
 
-	g_free(type);
+    g_free(type);
 
-	return PSY_UNKNOWN;
+    return PSY_UNKNOWN;
 }
 
 static gboolean init_linux_battery(struct psy_battery *bat)
 {
-	const gchar *entryname = bat->name;
+    const gchar *entryname = bat->name;
 
-	bat->path_present = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "present", NULL);
+    bat->path_present = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "present", NULL);
-	if (!g_file_test(bat->path_present, G_FILE_TEST_EXISTS)) {
+    if (!g_file_test(bat->path_present, G_FILE_TEST_EXISTS)) {
-		fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+        fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
-		goto err0;
+        goto err0;
-	}
+    }
 
-	bat->path_level_now = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_now", NULL);
+    bat->path_level_now =
-	bat->path_level_full =
+        g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_now", NULL);
-		g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_full", NULL);
+    bat->path_level_full =
-	bat->path_rate_now = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "power_now", NULL);
+        g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "energy_full", NULL);
-	bat->unit = 'W';
+    bat->path_rate_now = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "power_now", NULL);
+    bat->unit = 'W';
 
-	if (!g_file_test(bat->path_level_now, G_FILE_TEST_EXISTS) ||
+    if (!g_file_test(bat->path_level_now, G_FILE_TEST_EXISTS) ||
-	    !g_file_test(bat->path_level_full, G_FILE_TEST_EXISTS) ||
+        !g_file_test(bat->path_level_full, G_FILE_TEST_EXISTS) ||
-	    !g_file_test(bat->path_rate_now, G_FILE_TEST_EXISTS)) {
+        !g_file_test(bat->path_rate_now, G_FILE_TEST_EXISTS)) {
-		g_free(bat->path_level_now);
+        g_free(bat->path_level_now);
-		g_free(bat->path_level_full);
+        g_free(bat->path_level_full);
-		g_free(bat->path_rate_now);
+        g_free(bat->path_rate_now);
-		bat->path_level_now =
+        bat->path_level_now =
-			g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "charge_now", NULL);
+            g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "charge_now", NULL);
-		bat->path_level_full =
+        bat->path_level_full =
-			g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "charge_full", NULL);
+            g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "charge_full", NULL);
-		bat->path_rate_now =
+        bat->path_rate_now =
-			g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "current_now", NULL);
+            g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "current_now", NULL);
-		bat->unit = 'A';
+        bat->unit = 'A';
-	}
+    }
-	if (!g_file_test(bat->path_level_now, G_FILE_TEST_EXISTS) ||
+    if (!g_file_test(bat->path_level_now, G_FILE_TEST_EXISTS) ||
-	    !g_file_test(bat->path_level_full, G_FILE_TEST_EXISTS) ||
+        !g_file_test(bat->path_level_full, G_FILE_TEST_EXISTS) ||
-	    !g_file_test(bat->path_rate_now, G_FILE_TEST_EXISTS)) {
+        !g_file_test(bat->path_rate_now, G_FILE_TEST_EXISTS)) {
-		fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+        fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
-		goto err1;
+        goto err1;
-	}
+    }
 
-	bat->path_status = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "status", NULL);
+    bat->path_status = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "status", NULL);
-	if (!g_file_test(bat->path_status, G_FILE_TEST_EXISTS)) {
+    if (!g_file_test(bat->path_status, G_FILE_TEST_EXISTS)) {
-		fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+        fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
-		goto err2;
+        goto err2;
-	}
+    }
 
-	return TRUE;
+    return TRUE;
 
 err2:
-	g_free(bat->path_status);
+    g_free(bat->path_status);
 err1:
-	g_free(bat->path_level_now);
+    g_free(bat->path_level_now);
-	g_free(bat->path_level_full);
+    g_free(bat->path_level_full);
-	g_free(bat->path_rate_now);
+    g_free(bat->path_rate_now);
 err0:
-	g_free(bat->path_present);
+    g_free(bat->path_present);
 
-	return FALSE;
+    return FALSE;
 }
 
 static gboolean init_linux_mains(struct psy_mains *ac)
 {
-	const gchar *entryname = ac->name;
+    const gchar *entryname = ac->name;
 
-	ac->path_online = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "online", NULL);
+    ac->path_online = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", entryname, "online", NULL);
-	if (!g_file_test(ac->path_online, G_FILE_TEST_EXISTS)) {
+    if (!g_file_test(ac->path_online, G_FILE_TEST_EXISTS)) {
-		fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
+        fprintf(stderr, RED "%s:%d: read failed" RESET "\n", __FILE__, __LINE__);
-		g_free(ac->path_online);
+        g_free(ac->path_online);
-		return FALSE;
+        return FALSE;
-	}
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 static void psy_battery_free(gpointer data)
 {
-	struct psy_battery *bat = data;
+    struct psy_battery *bat = data;
-	g_free(bat->name);
+    g_free(bat->name);
-	g_free(bat->path_status);
+    g_free(bat->path_status);
-	g_free(bat->path_rate_now);
+    g_free(bat->path_rate_now);
-	g_free(bat->path_level_full);
+    g_free(bat->path_level_full);
-	g_free(bat->path_level_now);
+    g_free(bat->path_level_now);
-	g_free(bat->path_present);
+    g_free(bat->path_present);
-	g_free(bat);
+    g_free(bat);
 }
 
 static void psy_mains_free(gpointer data)
 {
-	struct psy_mains *ac = data;
+    struct psy_mains *ac = data;
-	g_free(ac->name);
+    g_free(ac->name);
-	g_free(ac->path_online);
+    g_free(ac->path_online);
-	g_free(ac);
+    g_free(ac);
 }
 
 void battery_os_free()
 {
-	uevent_unregister_notifier(&psy_change);
+    uevent_unregister_notifier(&psy_change);
-	uevent_unregister_notifier(&psy_plug);
+    uevent_unregister_notifier(&psy_plug);
 
-	g_list_free_full(batteries, psy_battery_free);
+    g_list_free_full(batteries, psy_battery_free);
-	batteries = NULL;
+    batteries = NULL;
-	g_list_free_full(mains, psy_mains_free);
+    g_list_free_full(mains, psy_mains_free);
-	mains = NULL;
+    mains = NULL;
 }
 
 static void add_battery(const char *entryname)
 {
-	struct psy_battery *bat = g_malloc0(sizeof(*bat));
+    struct psy_battery *bat = g_malloc0(sizeof(*bat));
-	bat->name = g_strdup(entryname);
+    bat->name = g_strdup(entryname);
 
-	if (init_linux_battery(bat)) {
+    if (init_linux_battery(bat)) {
-		batteries = g_list_append(batteries, bat);
+        batteries = g_list_append(batteries, bat);
-		fprintf(stdout, GREEN "Found battery \"%s\"" RESET "\n", bat->name);
+        fprintf(stdout, GREEN "Found battery \"%s\"" RESET "\n", bat->name);
-	} else {
+    } else {
-		g_free(bat);
+        g_free(bat);
-		fprintf(stderr, RED "Failed to initialize battery \"%s\"" RESET "\n", entryname);
+        fprintf(stderr, RED "Failed to initialize battery \"%s\"" RESET "\n", entryname);
-	}
+    }
 }
 
 static void add_mains(const char *entryname)
 {
-	struct psy_mains *ac = g_malloc0(sizeof(*ac));
+    struct psy_mains *ac = g_malloc0(sizeof(*ac));
-	ac->name = g_strdup(entryname);
+    ac->name = g_strdup(entryname);
 
-	if (init_linux_mains(ac)) {
+    if (init_linux_mains(ac)) {
-		mains = g_list_append(mains, ac);
+        mains = g_list_append(mains, ac);
-		fprintf(stdout, GREEN "Found mains \"%s\"" RESET "\n", ac->name);
+        fprintf(stdout, GREEN "Found mains \"%s\"" RESET "\n", ac->name);
-	} else {
+    } else {
-		g_free(ac);
+        g_free(ac);
-		fprintf(stderr, RED "Failed to initialize mains \"%s\"" RESET "\n", entryname);
+        fprintf(stderr, RED "Failed to initialize mains \"%s\"" RESET "\n", entryname);
-	}
+    }
 }
 
 gboolean battery_os_init()
 {
-	GDir *directory = 0;
+    GDir *directory = 0;
-	GError *error = NULL;
+    GError *error = NULL;
-	const char *entryname;
+    const char *entryname;
 
-	battery_os_free();
+    battery_os_free();
 
-	gchar *dir_path = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", NULL);
+    gchar *dir_path = g_build_filename(battery_sys_prefix, "/sys/class/power_supply", NULL);
-	directory = g_dir_open(dir_path, 0, &error);
+    directory = g_dir_open(dir_path, 0, &error);
-	g_free(dir_path);
+    g_free(dir_path);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
 
-	while ((entryname = g_dir_read_name(directory))) {
+    while ((entryname = g_dir_read_name(directory))) {
-		fprintf(stderr, GREEN "Found power device %s" RESET "\n", entryname);
+        fprintf(stderr, GREEN "Found power device %s" RESET "\n", entryname);
-		enum psy_type type = power_supply_get_type(entryname);
+        enum psy_type type = power_supply_get_type(entryname);
 
-		switch (type) {
+        switch (type) {
-		case PSY_BATTERY:
+        case PSY_BATTERY:
-			add_battery(entryname);
+            add_battery(entryname);
-			break;
+            break;
-		case PSY_MAINS:
+        case PSY_MAINS:
-			add_mains(entryname);
+            add_mains(entryname);
-			break;
+            break;
-		default:
+        default:
-			break;
+            break;
-		}
+        }
-	}
+    }
 
-	g_dir_close(directory);
+    g_dir_close(directory);
 
-	uevent_register_notifier(&psy_change);
+    uevent_register_notifier(&psy_change);
-	uevent_register_notifier(&psy_plug);
+    uevent_register_notifier(&psy_plug);
 
-	return batteries != NULL;
+    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_level = ABS(bat->level_now - old_level_now);
-	gint64 diff_time = bat->timestamp - old_timestamp;
+    gint64 diff_time = bat->timestamp - old_timestamp;
 
-	/* µW = (µWh * 3600) / (µs / 1000000) */
+    /* µW = (µWh * 3600) / (µs / 1000000) */
-	gint rate = diff_level * 3600 * 1000000 / MAX(1, diff_time);
+    gint rate = diff_level * 3600 * 1000000 / MAX(1, diff_time);
 
-	return rate;
+    return rate;
 }
 
 static gboolean update_linux_battery(struct psy_battery *bat)
 {
-	GError *error = NULL;
+    GError *error = NULL;
-	gchar *data;
+    gchar *data;
-	gsize datalen;
+    gsize datalen;
 
-	gint64 old_timestamp = bat->timestamp;
+    gint64 old_timestamp = bat->timestamp;
-	int old_level_now = bat->level_now;
+    int old_level_now = bat->level_now;
-	gint old_rate_now = bat->rate_now;
+    gint old_rate_now = bat->rate_now;
 
-	/* reset values */
+    /* reset values */
-	bat->present = 0;
+    bat->present = 0;
-	bat->status = BATTERY_UNKNOWN;
+    bat->status = BATTERY_UNKNOWN;
-	bat->level_now = 0;
+    bat->level_now = 0;
-	bat->level_full = 0;
+    bat->level_full = 0;
-	bat->rate_now = 0;
+    bat->rate_now = 0;
-	bat->timestamp = g_get_monotonic_time();
+    bat->timestamp = g_get_monotonic_time();
 
-	/* present */
+    /* present */
-	g_file_get_contents(bat->path_present, &data, &datalen, &error);
+    g_file_get_contents(bat->path_present, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
-	bat->present = (atoi(data) == 1);
+    bat->present = (atoi(data) == 1);
-	g_free(data);
+    g_free(data);
 
-	/* we are done, if battery is not present */
+    /* we are done, if battery is not present */
-	if (!bat->present)
+    if (!bat->present)
-		return TRUE;
+        return TRUE;
 
-	/* status */
+    /* status */
-	bat->status = BATTERY_UNKNOWN;
+    bat->status = BATTERY_UNKNOWN;
-	g_file_get_contents(bat->path_status, &data, &datalen, &error);
+    g_file_get_contents(bat->path_status, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
-	if (!g_strcmp0(data, "Charging\n")) {
+    if (!g_strcmp0(data, "Charging\n")) {
-		bat->status = BATTERY_CHARGING;
+        bat->status = BATTERY_CHARGING;
-	} else if (!g_strcmp0(data, "Discharging\n")) {
+    } else if (!g_strcmp0(data, "Discharging\n")) {
-		bat->status = BATTERY_DISCHARGING;
+        bat->status = BATTERY_DISCHARGING;
-	} else if (!g_strcmp0(data, "Full\n")) {
+    } else if (!g_strcmp0(data, "Full\n")) {
-		bat->status = BATTERY_FULL;
+        bat->status = BATTERY_FULL;
-	}
+    }
-	g_free(data);
+    g_free(data);
 
-	/* level now */
+    /* level now */
-	g_file_get_contents(bat->path_level_now, &data, &datalen, &error);
+    g_file_get_contents(bat->path_level_now, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
-	bat->level_now = atoi(data);
+    bat->level_now = atoi(data);
-	g_free(data);
+    g_free(data);
 
-	/* level full */
+    /* level full */
-	g_file_get_contents(bat->path_level_full, &data, &datalen, &error);
+    g_file_get_contents(bat->path_level_full, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
-	bat->level_full = atoi(data);
+    bat->level_full = atoi(data);
-	g_free(data);
+    g_free(data);
 
-	/* rate now */
+    /* rate now */
-	g_file_get_contents(bat->path_rate_now, &data, &datalen, &error);
+    g_file_get_contents(bat->path_rate_now, &data, &datalen, &error);
-	if (g_error_matches(error, G_FILE_ERROR, G_FILE_ERROR_NODEV)) {
+    if (g_error_matches(error, G_FILE_ERROR, G_FILE_ERROR_NODEV)) {
-		/* some hardware does not support reading current rate consumption */
+        /* some hardware does not support reading current rate consumption */
-		g_error_free(error);
+        g_error_free(error);
-		bat->rate_now = estimate_rate_usage(bat, old_level_now, old_timestamp);
+        bat->rate_now = estimate_rate_usage(bat, old_level_now, old_timestamp);
-		if (bat->rate_now == 0 && bat->status != BATTERY_FULL) {
+        if (bat->rate_now == 0 && bat->status != BATTERY_FULL) {
-			/* If the hardware updates the level slower than our sampling period,
+            /* If the hardware updates the level slower than our sampling period,
-			 * we need to sample more rarely */
+             * we need to sample more rarely */
-			bat->rate_now = old_rate_now;
+            bat->rate_now = old_rate_now;
-			bat->timestamp = old_timestamp;
+            bat->timestamp = old_timestamp;
-		}
+        }
-	} else if (error) {
+    } else if (error) {
-		g_error_free(error);
+        g_error_free(error);
-		return FALSE;
+        return FALSE;
-	} else {
+    } else {
-		bat->rate_now = atoi(data);
+        bat->rate_now = atoi(data);
-		g_free(data);
+        g_free(data);
-	}
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 static gboolean update_linux_mains(struct psy_mains *ac)
 {
-	GError *error = NULL;
+    GError *error = NULL;
-	gchar *data;
+    gchar *data;
-	gsize datalen;
+    gsize datalen;
-	ac->online = FALSE;
+    ac->online = FALSE;
 
-	/* online */
+    /* online */
-	g_file_get_contents(ac->path_online, &data, &datalen, &error);
+    g_file_get_contents(ac->path_online, &data, &datalen, &error);
-	RETURN_ON_ERROR(error);
+    RETURN_ON_ERROR(error);
-	ac->online = (atoi(data) == 1);
+    ac->online = (atoi(data) == 1);
-	g_free(data);
+    g_free(data);
 
-	return TRUE;
+    return TRUE;
 }
 
 int battery_os_update(BatteryState *state)
 {
-	GList *l;
+    GList *l;
 
-	gint64 total_level_now = 0;
+    gint64 total_level_now = 0;
-	gint64 total_level_full = 0;
+    gint64 total_level_full = 0;
-	gint64 total_rate_now = 0;
+    gint64 total_rate_now = 0;
-	gint seconds = 0;
+    gint seconds = 0;
 
-	gboolean charging = FALSE;
+    gboolean charging = FALSE;
-	gboolean discharging = FALSE;
+    gboolean discharging = FALSE;
-	gboolean full = FALSE;
+    gboolean full = FALSE;
-	gboolean ac_connected = FALSE;
+    gboolean ac_connected = FALSE;
 
-	for (l = batteries; l != NULL; l = l->next) {
+    for (l = batteries; l != NULL; l = l->next) {
-		struct psy_battery *bat = l->data;
+        struct psy_battery *bat = l->data;
-		update_linux_battery(bat);
+        update_linux_battery(bat);
 
-		total_level_now += bat->level_now;
+        total_level_now += bat->level_now;
-		total_level_full += bat->level_full;
+        total_level_full += bat->level_full;
-		total_rate_now += bat->rate_now;
+        total_rate_now += bat->rate_now;
 
-		charging |= (bat->status == BATTERY_CHARGING);
+        charging |= (bat->status == BATTERY_CHARGING);
-		discharging |= (bat->status == BATTERY_DISCHARGING);
+        discharging |= (bat->status == BATTERY_DISCHARGING);
-		full |= (bat->status == BATTERY_FULL);
+        full |= (bat->status == BATTERY_FULL);
-	}
+    }
 
-	for (l = mains; l != NULL; l = l->next) {
+    for (l = mains; l != NULL; l = l->next) {
-		struct psy_mains *ac = l->data;
+        struct psy_mains *ac = l->data;
-		update_linux_mains(ac);
+        update_linux_mains(ac);
-		ac_connected |= (ac->online);
+        ac_connected |= (ac->online);
-	}
+    }
 
-	/* build global state */
+    /* build global state */
-	if (charging && !discharging)
+    if (charging && !discharging)
-		state->state = BATTERY_CHARGING;
+        state->state = BATTERY_CHARGING;
-	else if (!charging && discharging)
+    else if (!charging && discharging)
-		state->state = BATTERY_DISCHARGING;
+        state->state = BATTERY_DISCHARGING;
-	else if (!charging && !discharging && full)
+    else if (!charging && !discharging && full)
-		state->state = BATTERY_FULL;
+        state->state = BATTERY_FULL;
 
-	/* calculate seconds */
+    /* calculate seconds */
-	if (total_rate_now > 0) {
+    if (total_rate_now > 0) {
-		if (state->state == BATTERY_CHARGING)
+        if (state->state == BATTERY_CHARGING)
-			seconds = 3600 * (total_level_full - total_level_now) / total_rate_now;
+            seconds = 3600 * (total_level_full - total_level_now) / total_rate_now;
-		else if (state->state == BATTERY_DISCHARGING)
+        else if (state->state == BATTERY_DISCHARGING)
-			seconds = 3600 * total_level_now / total_rate_now;
+            seconds = 3600 * total_level_now / total_rate_now;
-		seconds = MAX(0, seconds);
+        seconds = MAX(0, seconds);
-	}
+    }
-	battery_state_set_time(state, seconds);
+    battery_state_set_time(state, seconds);
 
-	/* calculate percentage */
+    /* calculate percentage */
-	state->percentage = level_to_percent(total_level_now, total_level_full);
+    state->percentage = level_to_percent(total_level_now, total_level_full);
 
-	/* AC state */
+    /* AC state */
-	state->ac_connected = ac_connected;
+    state->ac_connected = ac_connected;
 
-	return 0;
+    return 0;
 }
 
 static gchar *level_human_readable(struct psy_battery *bat)
 {
-	gint now = bat->level_now;
+    gint now = bat->level_now;
-	gint full = bat->level_full;
+    gint full = bat->level_full;
 
-	if (full >= 1000000) {
+    if (full >= 1000000) {
-		return g_strdup_printf("%d.%d / %d.%d %ch",
+        return g_strdup_printf("%d.%d / %d.%d %ch",
-		                       now / 1000000,
+                               now / 1000000,
-		                       (now % 1000000) / 100000,
+                               (now % 1000000) / 100000,
-		                       full / 1000000,
+                               full / 1000000,
-		                       (full % 1000000) / 100000,
+                               (full % 1000000) / 100000,
-							   bat->unit);
+                               bat->unit);
-	} else if (full >= 1000) {
+    } else if (full >= 1000) {
-		return g_strdup_printf("%d.%d / %d.%d m%ch",
+        return g_strdup_printf("%d.%d / %d.%d m%ch",
-		                       now / 1000,
+                               now / 1000,
-		                       (now % 1000) / 100,
+                               (now % 1000) / 100,
-		                       full / 1000,
+                               full / 1000,
-		                       (full % 1000) / 100,
+                               (full % 1000) / 100,
-							   bat->unit);
+                               bat->unit);
-	} else {
+    } else {
-		return g_strdup_printf("%d / %d µ%ch", now, full, bat->unit);
+        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;
+    gint rate = bat->rate_now;
-	gchar unit = bat->unit;
+    gchar unit = bat->unit;
 
-	if (rate >= 1000000) {
+    if (rate >= 1000000) {
-		return g_strdup_printf("%d.%d %c", rate / 1000000, (rate % 1000000) / 100000, unit);
+        return g_strdup_printf("%d.%d %c", rate / 1000000, (rate % 1000000) / 100000, unit);
-	} else if (rate >= 1000) {
+    } else if (rate >= 1000) {
-		return g_strdup_printf("%d.%d m%c", rate / 1000, (rate % 1000) / 100, unit);
+        return g_strdup_printf("%d.%d m%c", rate / 1000, (rate % 1000) / 100, unit);
-	} else if (rate > 0) {
+    } else if (rate > 0) {
-		return g_strdup_printf("%d µ%c", rate, unit);
+        return g_strdup_printf("%d µ%c", rate, unit);
-	} else {
+    } else {
-		return g_strdup_printf("0 %c", unit);
+        return g_strdup_printf("0 %c", unit);
-	}
+    }
 }
 
 char *battery_os_tooltip()
 {
-	GList *l;
+    GList *l;
-	GString *tooltip = g_string_new("");
+    GString *tooltip = g_string_new("");
-	gchar *result;
+    gchar *result;
 
-	for (l = batteries; l != NULL; l = l->next) {
+    for (l = batteries; l != NULL; l = l->next) {
-		struct psy_battery *bat = l->data;
+        struct psy_battery *bat = l->data;
 
-		if (tooltip->len)
+        if (tooltip->len)
-			g_string_append_c(tooltip, '\n');
+            g_string_append_c(tooltip, '\n');
 
-		g_string_append_printf(tooltip, "%s\n", bat->name);
+        g_string_append_printf(tooltip, "%s\n", bat->name);
 
-		if (!bat->present) {
+        if (!bat->present) {
-			g_string_append_printf(tooltip, "\tnot connected");
+            g_string_append_printf(tooltip, "\tnot connected");
-			continue;
+            continue;
-		}
+        }
 
-		gchar *rate = rate_human_readable(bat);
+        gchar *rate = rate_human_readable(bat);
-		gchar *level = level_human_readable(bat);
+        gchar *level = level_human_readable(bat);
-		gchar *state = (bat->status == BATTERY_UNKNOWN) ? "energy" : chargestate2str(bat->status);
+        gchar *state = (bat->status == BATTERY_UNKNOWN) ? "energy" : chargestate2str(bat->status);
 
-		guint8 percentage = level_to_percent(bat->level_now, bat->level_full);
+        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_string_append_printf(tooltip, "\t%s: %s (%u %%)\n\trate: %s", state, level, percentage, rate);
 
-		g_free(rate);
+        g_free(rate);
-		g_free(level);
+        g_free(level);
-	}
+    }
 
-	for (l = mains; l != NULL; l = l->next) {
+    for (l = mains; l != NULL; l = l->next) {
-		struct psy_mains *ac = l->data;
+        struct psy_mains *ac = l->data;
 
-		if (tooltip->len)
+        if (tooltip->len)
-			g_string_append_c(tooltip, '\n');
+            g_string_append_c(tooltip, '\n');
 
-		g_string_append_printf(tooltip, "%s\n", ac->name);
+        g_string_append_printf(tooltip, "%s\n", ac->name);
-		g_string_append_printf(tooltip, ac->online ? "\tConnected" : "\tDisconnected");
+        g_string_append_printf(tooltip, ac->online ? "\tConnected" : "\tDisconnected");
-	}
+    }
 
-	result = tooltip->str;
+    result = tooltip->str;
-	g_string_free(tooltip, FALSE);
+    g_string_free(tooltip, FALSE);
 
-	return result;
+    return result;
 }
 
 #endif

src/battery/openbsd.c

@@ -31,78 +31,78 @@ int apm_fd = -1;
 
 gboolean battery_os_init()
 {
-	if (apm_fd > 0)
+    if (apm_fd > 0)
-		close(apm_fd);
+        close(apm_fd);
 
-	apm_fd = open("/dev/apm", O_RDONLY);
+    apm_fd = open("/dev/apm", O_RDONLY);
 
-	if (apm_fd < 0) {
+    if (apm_fd < 0) {
-		warn("ERROR: battery applet cannot open /dev/apm.");
+        warn("ERROR: battery applet cannot open /dev/apm.");
-		return FALSE;
+        return FALSE;
-	} else {
+    } else {
-		return TRUE;
+        return TRUE;
-	}
+    }
 }
 
 void battery_os_free()
 {
-	if ((apm_fd != -1) && (close(apm_fd) == -1))
+    if ((apm_fd != -1) && (close(apm_fd) == -1))
-		warn("cannot close /dev/apm");
+        warn("cannot close /dev/apm");
-	apm_fd = -1;
+    apm_fd = -1;
 }
 
 int battery_os_update(BatteryState *state)
 {
-	struct apm_power_info info;
+    struct apm_power_info info;
 
-	if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
+    if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
-		// best attempt at mapping to Linux battery states
+        // best attempt at mapping to Linux battery states
-		switch (info.battery_state) {
+        switch (info.battery_state) {
-		case APM_BATT_CHARGING:
+        case APM_BATT_CHARGING:
-			state->state = BATTERY_CHARGING;
+            state->state = BATTERY_CHARGING;
-			break;
+            break;
-		default:
+        default:
-			state->state = BATTERY_DISCHARGING;
+            state->state = BATTERY_DISCHARGING;
-			break;
+            break;
-		}
+        }
 
-		if (info.battery_life > 100)
+        if (info.battery_life > 100)
-			info.battery_life = 100;
+            info.battery_life = 100;
-		if (info.battery_life == 100)
+        if (info.battery_life == 100)
-			state->state = BATTERY_FULL;
+            state->state = BATTERY_FULL;
 
-		state->percentage = info.battery_life;
+        state->percentage = info.battery_life;
-		if (info.minutes_left != -1)
+        if (info.minutes_left != -1)
-			battery_state_set_time(state, info.minutes_left * 60);
+            battery_state_set_time(state, info.minutes_left * 60);
 
-		state->ac_connected = info.ac_state == APM_AC_ON;
+        state->ac_connected = info.ac_state == APM_AC_ON;
-	} else {
+    } else {
-		warn("power update: APM_IOC_GETPOWER");
+        warn("power update: APM_IOC_GETPOWER");
-		return -1;
+        return -1;
-	}
+    }
 
-	return 0;
+    return 0;
 }
 
 char *battery_os_tooltip()
 {
-	GString *tooltip = g_string_new("");
+    GString *tooltip = g_string_new("");
-	gchar *result;
+    gchar *result;
 
-	g_string_append_printf(tooltip, "Battery\n");
+    g_string_append_printf(tooltip, "Battery\n");
 
-	gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
+    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_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
 
-	g_string_append_c(tooltip, '\n');
+    g_string_append_c(tooltip, '\n');
-	g_string_append_printf(tooltip, "AC\n");
+    g_string_append_printf(tooltip, "AC\n");
-	g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
+    g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
 
-	result = tooltip->str;
+    result = tooltip->str;
-	g_string_free(tooltip, FALSE);
+    g_string_free(tooltip, FALSE);
 
-	return result;
+    return result;
 }
 
 #endif

src/button/button.c

@@ -0,0 +1,547 @@
+#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
+        if (button->frontend->icon) {
+            imlib_context_set_image(button->frontend->icon);
+            imlib_free_image();
+            button->frontend->icon = NULL;
+        }
+        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, "Error: Attempt to destroy backend while there are still frontend instances!\n");
+            exit(-1);
+        }
+        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;
+    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 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;
+    }
+
+    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,
+                "%*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,
+            "%*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);
+}
+
+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

@@ -0,0 +1,113 @@
+#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

@@ -60,105 +60,105 @@ 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_has_font = FALSE;
-	time1_font_desc = NULL;
+    time1_font_desc = NULL;
-	time2_has_font = FALSE;
+    time2_has_font = FALSE;
-	time2_font_desc = NULL;
+    time2_font_desc = NULL;
 }
 
 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;
 }
 
 void update_clocks_sec(void *arg)
 {
-	gettimeofday(&time_clock, 0);
+    gettimeofday(&time_clock, 0);
-	if (time1_format) {
+    if (time1_format) {
-		for (int i = 0; i < num_panels; i++)
+        for (int i = 0; i < num_panels; i++)
-			panels[i].clock.area.resize_needed = 1;
+            panels[i].clock.area.resize_needed = 1;
-	}
+    }
-	schedule_panel_redraw();
+    schedule_panel_redraw();
 }
 
 void update_clocks_min(void *arg)
 {
-	// remember old_sec because after suspend/hibernate the clock should be updated directly, and not
+    // remember old_sec because after suspend/hibernate the clock should be updated directly, and not
-	// on next minute change
+    // on next minute change
-	time_t old_sec = time_clock.tv_sec;
+    time_t old_sec = time_clock.tv_sec;
-	gettimeofday(&time_clock, 0);
+    gettimeofday(&time_clock, 0);
-	if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) {
+    if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) {
-		if (time1_format) {
+        if (time1_format) {
-			for (int i = 0; i < num_panels; i++)
+            for (int i = 0; i < num_panels; i++)
-				panels[i].clock.area.resize_needed = 1;
+                panels[i].clock.area.resize_needed = 1;
-		}
+        }
-		schedule_panel_redraw();
+        schedule_panel_redraw();
-	}
+    }
 }
 
 struct tm *clock_gettime_for_tz(const char *timezone)
 {
-	if (timezone) {
+    if (timezone) {
-		const char *old_tz = getenv("TZ");
+        const char *old_tz = getenv("TZ");
-		setenv("TZ", timezone, 1);
+        setenv("TZ", timezone, 1);
-		struct tm *result = localtime(&time_clock.tv_sec);
+        struct tm *result = localtime(&time_clock.tv_sec);
-		if (old_tz)
+        if (old_tz)
-			setenv("TZ", old_tz, 1);
+            setenv("TZ", old_tz, 1);
-		else
+        else
-			unsetenv("TZ");
+            unsetenv("TZ");
-		return result;
+        return result;
-	} else {
+    } else {
-		return localtime(&time_clock.tv_sec);
+        return localtime(&time_clock.tv_sec);
-	}
+    }
 }
 
 gboolean time_format_needs_sec_ticks(char *time_format)
 {
-	if (!time_format)
+    if (!time_format)
-		return FALSE;
+        return FALSE;
-	if (strchr(time_format, 'S') || strchr(time_format, 'T') || strchr(time_format, 'r'))
+    if (strchr(time_format, 'S') || strchr(time_format, 'T') || strchr(time_format, 'r'))
-		return TRUE;
+        return TRUE;
-	return FALSE;
+    return FALSE;
 }
 
 void init_clock()
@@ -167,80 +167,80 @@ void init_clock()
 
 void init_clock_panel(void *p)
 {
-	Panel *panel = (Panel *)p;
+    Panel *panel = (Panel *)p;
-	Clock *clock = &panel->clock;
+    Clock *clock = &panel->clock;
 
-	if (!clock_timeout) {
+    if (!clock_timeout) {
-		if (time_format_needs_sec_ticks(time1_format) || time_format_needs_sec_ticks(time2_format)) {
+        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);
+            clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0, &clock_timeout);
-		} else {
+        } else {
-			clock_timeout = add_timeout(10, 1000, update_clocks_min, 0, &clock_timeout);
+            clock_timeout = add_timeout(10, 1000, update_clocks_min, 0, &clock_timeout);
-		}
+        }
-	}
+    }
 
-	if (!clock->area.bg)
+    if (!clock->area.bg)
-		clock->area.bg = &g_array_index(backgrounds, Background, 0);
+        clock->area.bg = &g_array_index(backgrounds, Background, 0);
-	clock_init_fonts();
+    clock_init_fonts();
-	clock->area.parent = p;
+    clock->area.parent = p;
-	clock->area.panel = p;
+    clock->area.panel = p;
-	snprintf(clock->area.name, sizeof(clock->area.name), "Clock");
+    snprintf(clock->area.name, sizeof(clock->area.name), "Clock");
-	clock->area._is_under_mouse = full_width_area_is_under_mouse;
+    clock->area._is_under_mouse = full_width_area_is_under_mouse;
-	clock->area.has_mouse_press_effect = clock->area.has_mouse_over_effect =
+    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 ||
+        panel_config.mouse_effects && (clock_lclick_command || clock_mclick_command || clock_rclick_command ||
-	                                   clock_uwheel_command || clock_dwheel_command);
+                                       clock_uwheel_command || clock_dwheel_command);
-	clock->area._draw_foreground = draw_clock;
+    clock->area._draw_foreground = draw_clock;
-	clock->area.size_mode = LAYOUT_FIXED;
+    clock->area.size_mode = LAYOUT_FIXED;
-	clock->area._resize = resize_clock;
+    clock->area._resize = resize_clock;
-	clock->area._compute_desired_size = clock_compute_desired_size;
+    clock->area._compute_desired_size = clock_compute_desired_size;
-	clock->area._dump_geometry = clock_dump_geometry;
+    clock->area._dump_geometry = clock_dump_geometry;
-	// check consistency
+    // check consistency
-	if (!time1_format)
+    if (!time1_format)
-		return;
+        return;
 
-	clock->area.resize_needed = 1;
+    clock->area.resize_needed = 1;
-	clock->area.on_screen = TRUE;
+    clock->area.on_screen = TRUE;
-	instantiate_area_gradients(&clock->area);
+    instantiate_area_gradients(&clock->area);
 
-	if (time_tooltip_format) {
+    if (time_tooltip_format) {
-		clock->area._get_tooltip_text = clock_get_tooltip;
+        clock->area._get_tooltip_text = clock_get_tooltip;
-		strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
+        strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
-	}
+    }
 }
 
 void clock_init_fonts()
 {
-	if (!time1_font_desc) {
+    if (!time1_font_desc) {
-		time1_font_desc = pango_font_description_from_string(get_default_font());
+        time1_font_desc = pango_font_description_from_string(get_default_font());
-		pango_font_description_set_weight(time1_font_desc, PANGO_WEIGHT_BOLD);
+        pango_font_description_set_weight(time1_font_desc, PANGO_WEIGHT_BOLD);
-		pango_font_description_set_size(time1_font_desc, pango_font_description_get_size(time1_font_desc));
+        pango_font_description_set_size(time1_font_desc, pango_font_description_get_size(time1_font_desc));
-	}
+    }
-	if (!time2_font_desc) {
+    if (!time2_font_desc) {
-		time2_font_desc = pango_font_description_from_string(get_default_font());
+        time2_font_desc = pango_font_description_from_string(get_default_font());
-		pango_font_description_set_size(time2_font_desc,
+        pango_font_description_set_size(time2_font_desc,
-		                                pango_font_description_get_size(time2_font_desc) - PANGO_SCALE);
+                                        pango_font_description_get_size(time2_font_desc) - PANGO_SCALE);
-	}
+    }
 }
 
 void clock_default_font_changed()
 {
-	if (!clock_enabled)
+    if (!clock_enabled)
-		return;
+        return;
-	if (time1_has_font && time2_has_font)
+    if (time1_has_font && time2_has_font)
-		return;
+        return;
-	if (!time1_has_font) {
+    if (!time1_has_font) {
-		pango_font_description_free(time1_font_desc);
+        pango_font_description_free(time1_font_desc);
-		time1_font_desc = NULL;
+        time1_font_desc = NULL;
-	}
+    }
-	if (!time2_has_font) {
+    if (!time2_has_font) {
-		pango_font_description_free(time2_font_desc);
+        pango_font_description_free(time2_font_desc);
-		time2_font_desc = NULL;
+        time2_font_desc = NULL;
-	}
+    }
-	clock_init_fonts();
+    clock_init_fonts();
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		panels[i].clock.area.resize_needed = TRUE;
+        panels[i].clock.area.resize_needed = TRUE;
-		schedule_redraw(&panels[i].clock.area);
+        schedule_redraw(&panels[i].clock.area);
-	}
+    }
-	schedule_panel_redraw();
+    schedule_panel_redraw();
 }
 
 void clock_compute_text_geometry(Panel *panel,
@@ -251,167 +251,167 @@ void clock_compute_text_geometry(Panel *panel,
                                  int *date_height,
                                  int *date_width)
 {
-	*date_height = *date_width = 0;
+    *date_height = *date_width = 0;
-	strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
+    strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
-	get_text_size2(time1_font_desc,
+    get_text_size2(time1_font_desc,
-	               time_height_ink,
+                   time_height_ink,
-	               time_height,
+                   time_height,
-	               time_width,
+                   time_width,
-	               panel->area.height,
+                   panel->area.height,
-	               panel->area.width,
+                   panel->area.width,
-	               buf_time,
+                   buf_time,
-	               strlen(buf_time),
+                   strlen(buf_time),
-	               PANGO_WRAP_WORD_CHAR,
+                   PANGO_WRAP_WORD_CHAR,
-	               PANGO_ELLIPSIZE_NONE,
+                   PANGO_ELLIPSIZE_NONE,
-	               FALSE);
+                   FALSE);
-	if (time2_format) {
+    if (time2_format) {
-		strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
+        strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
-		get_text_size2(time2_font_desc,
+        get_text_size2(time2_font_desc,
-		               date_height_ink,
+                       date_height_ink,
-		               date_height,
+                       date_height,
-		               date_width,
+                       date_width,
-		               panel->area.height,
+                       panel->area.height,
-		               panel->area.width,
+                       panel->area.width,
-		               buf_date,
+                       buf_date,
-		               strlen(buf_date),
+                       strlen(buf_date),
-		               PANGO_WRAP_WORD_CHAR,
+                       PANGO_WRAP_WORD_CHAR,
-		               PANGO_ELLIPSIZE_NONE,
+                       PANGO_ELLIPSIZE_NONE,
-		               FALSE);
+                       FALSE);
-	}
+    }
 }
 
 int clock_compute_desired_size(void *obj)
 {
-	Clock *clock = (Clock *)obj;
+    Clock *clock = (Clock *)obj;
-	Panel *panel = (Panel *)clock->area.panel;
+    Panel *panel = (Panel *)clock->area.panel;
-	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
+    int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
-	clock_compute_text_geometry(panel,
+    clock_compute_text_geometry(panel,
-	                            &time_height_ink,
+                                &time_height_ink,
-	                            &time_height,
+                                &time_height,
-	                            &time_width,
+                                &time_width,
-	                            &date_height_ink,
+                                &date_height_ink,
-	                            &date_height,
+                                &date_height,
-	                            &date_width);
+                                &date_width);
 
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		int new_size = (time_width > date_width) ? time_width : date_width;
+        int new_size = (time_width > date_width) ? time_width : date_width;
-		new_size += 2 * clock->area.paddingxlr + left_right_border_width(&clock->area);
+        new_size += 2 * clock->area.paddingxlr + left_right_border_width(&clock->area);
-		return new_size;
+        return new_size;
-	} else {
+    } else {
-		int new_size = time_height + date_height + 2 * clock->area.paddingxlr + top_bottom_border_width(&clock->area);
+        int new_size = time_height + date_height + 2 * clock->area.paddingxlr + top_bottom_border_width(&clock->area);
-		return new_size;
+        return new_size;
-	}
+    }
 }
 
 gboolean resize_clock(void *obj)
 {
-	Clock *clock = (Clock *)obj;
+    Clock *clock = (Clock *)obj;
-	Panel *panel = (Panel *)clock->area.panel;
+    Panel *panel = (Panel *)clock->area.panel;
-	gboolean result = FALSE;
+    gboolean result = FALSE;
 
-	schedule_redraw(&clock->area);
+    schedule_redraw(&clock->area);
 
-	int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
+    int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
-	clock_compute_text_geometry(panel,
+    clock_compute_text_geometry(panel,
-	                            &time_height_ink,
+                                &time_height_ink,
-	                            &time_height,
+                                &time_height,
-	                            &time_width,
+                                &time_width,
-	                            &date_height_ink,
+                                &date_height_ink,
-	                            &date_height,
+                                &date_height,
-	                            &date_width);
+                                &date_width);
 
-	int new_size = clock_compute_desired_size(clock);
+    int new_size = clock_compute_desired_size(clock);
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		if (new_size > clock->area.width || new_size < (clock->area.width - 6)) {
+        if (new_size > clock->area.width || new_size < (clock->area.width - 6)) {
-			// we try to limit the number of resizes
+            // we try to limit the number of resizes
-			clock->area.width = new_size + 1;
+            clock->area.width = new_size + 1;
-			clock->time1_posy = (clock->area.height - time_height) / 2;
+            clock->time1_posy = (clock->area.height - time_height) / 2;
-			if (time2_format) {
+            if (time2_format) {
-				clock->time1_posy -= (date_height) / 2;
+                clock->time1_posy -= (date_height) / 2;
-				clock->time2_posy = clock->time1_posy + time_height;
+                clock->time2_posy = clock->time1_posy + time_height;
-			}
+            }
-			result = TRUE;
+            result = TRUE;
-		}
+        }
-	} else {
+    } else {
-		if (new_size != clock->area.height) {
+        if (new_size != clock->area.height) {
-			// we try to limit the number of resizes
+            // we try to limit the number of resizes
-			clock->area.height = new_size;
+            clock->area.height = new_size;
-			clock->time1_posy = (clock->area.height - time_height) / 2;
+            clock->time1_posy = (clock->area.height - time_height) / 2;
-			if (time2_format) {
+            if (time2_format) {
-				clock->time1_posy -= (date_height) / 2;
+                clock->time1_posy -= (date_height) / 2;
-				clock->time2_posy = clock->time1_posy + time_height;
+                clock->time2_posy = clock->time1_posy + time_height;
-			}
+            }
-			result = TRUE;
+            result = TRUE;
-		}
+        }
-	}
+    }
 
-	return result;
+    return result;
 }
 
 void draw_clock(void *obj, cairo_t *c)
 {
-	Clock *clock = obj;
+    Clock *clock = obj;
-	PangoLayout *layout = pango_cairo_create_layout(c);
+    PangoLayout *layout = pango_cairo_create_layout(c);
 
-	pango_layout_set_font_description(layout, time1_font_desc);
+    pango_layout_set_font_description(layout, time1_font_desc);
-	pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
+    pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
-	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+    pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	pango_layout_set_text(layout, buf_time, strlen(buf_time));
+    pango_layout_set_text(layout, buf_time, strlen(buf_time));
 
-	cairo_set_source_rgba(c, clock->font.rgb[0], clock->font.rgb[1], clock->font.rgb[2], clock->font.alpha);
+    cairo_set_source_rgba(c, clock->font.rgb[0], clock->font.rgb[1], clock->font.rgb[2], clock->font.alpha);
 
-	pango_cairo_update_layout(c, layout);
+    pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, clock->time1_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
+    draw_text(layout, c, 0, clock->time1_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
 
-	if (time2_format) {
+    if (time2_format) {
-		pango_layout_set_font_description(layout, time2_font_desc);
+        pango_layout_set_font_description(layout, time2_font_desc);
-		pango_layout_set_indent(layout, 0);
+        pango_layout_set_indent(layout, 0);
-		pango_layout_set_text(layout, buf_date, strlen(buf_date));
+        pango_layout_set_text(layout, buf_date, strlen(buf_date));
-		pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
+        pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
 
-		pango_cairo_update_layout(c, layout);
+        pango_cairo_update_layout(c, layout);
-		draw_text(layout, c, 0, clock->time2_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
+        draw_text(layout, c, 0, clock->time2_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
-	}
+    }
 
-	g_object_unref(layout);
+    g_object_unref(layout);
 }
 
 void clock_dump_geometry(void *obj, int indent)
 {
-	Clock *clock = (Clock *)obj;
+    Clock *clock = (Clock *)obj;
-	fprintf(stderr, "%*sText 1: y = %d, text = %s\n", indent, "", clock->time1_posy, buf_time);
+    fprintf(stderr, "%*sText 1: y = %d, text = %s\n", indent, "", clock->time1_posy, buf_time);
-	if (time2_format) {
+    if (time2_format) {
-		fprintf(stderr, "%*sText 2: y = %d, text = %s\n", indent, "", clock->time2_posy, buf_date);
+        fprintf(stderr, "%*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));
+    strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
-	return strdup(buf_tooltip);
+    return strdup(buf_tooltip);
 }
 
-void clock_action(int button)
+void clock_action(void *obj, int button, int x, int y, Time time)
 {
-	char *command = NULL;
+    char *command = NULL;
-	switch (button) {
+    switch (button) {
-	case 1:
+    case 1:
-		command = clock_lclick_command;
+        command = clock_lclick_command;
-		break;
+        break;
-	case 2:
+    case 2:
-		command = clock_mclick_command;
+        command = clock_mclick_command;
-		break;
+        break;
-	case 3:
+    case 3:
-		command = clock_rclick_command;
+        command = clock_rclick_command;
-		break;
+        break;
-	case 4:
+    case 4:
-		command = clock_uwheel_command;
+        command = clock_uwheel_command;
-		break;
+        break;
-	case 5:
+    case 5:
-		command = clock_dwheel_command;
+        command = clock_dwheel_command;
-		break;
+        break;
-	}
+    }
-	tint_exec(command);
+    tint_exec(command, NULL, NULL, time, obj, x, y);
 }

src/clock/clock.h

@@ -14,12 +14,12 @@
 #include "area.h"
 
 typedef struct Clock {
-	// always start with area
+    // always start with area
-	Area area;
+    Area area;
 
-	Color font;
+    Color font;
-	int time1_posy;
+    int time1_posy;
-	int time2_posy;
+    int time2_posy;
 } Clock;
 
 extern char *time1_format;
@@ -54,6 +54,6 @@ void draw_clock(void *obj, cairo_t *c);
 
 gboolean resize_clock(void *obj);
 
-void clock_action(int button);
+void clock_action(void *obj, int button, int x, int y, Time time);
 
 #endif

src/execplugin/execplugin.h

@@ -17,78 +17,78 @@
 // backend's config and state variables.
 
 typedef struct ExecpBackend {
-	// Config:
+    // Config:
-	// Command to execute at a specified interval
+    // Command to execute at a specified interval
-	char *command;
+    char *command;
-	// Interval in seconds
+    // Interval in seconds
-	int interval;
+    int interval;
-	// 1 if first line of output is an icon path
+    // 1 if first line of output is an icon path
-	gboolean has_icon;
+    gboolean has_icon;
-	gboolean cache_icon;
+    gboolean cache_icon;
-	int icon_w;
+    int icon_w;
-	int icon_h;
+    int icon_h;
-	char *tooltip;
+    char *tooltip;
-	gboolean centered;
+    gboolean centered;
-	gboolean has_font;
+    gboolean has_font;
-	PangoFontDescription *font_desc;
+    PangoFontDescription *font_desc;
-	Color font_color;
+    Color font_color;
-	int continuous;
+    int continuous;
-	gboolean has_markup;
+    gboolean has_markup;
-	char *lclick_command;
+    char *lclick_command;
-	char *mclick_command;
+    char *mclick_command;
-	char *rclick_command;
+    char *rclick_command;
-	char *uwheel_command;
+    char *uwheel_command;
-	char *dwheel_command;
+    char *dwheel_command;
-	// paddingxlr = horizontal padding left/right
+    // paddingxlr = horizontal padding left/right
-	// paddingx = horizontal padding between childs
+    // paddingx = horizontal padding between childs
-	int paddingxlr, paddingx, paddingy;
+    int paddingxlr, paddingx, paddingy;
-	Background *bg;
+    Background *bg;
 
-	// Backend state:
+    // Backend state:
-	timeout *timer;
+    timeout *timer;
-	int child_pipe;
+    int child_pipe;
-	pid_t child;
+    pid_t child;
 
-	// Command output buffer
+    // Command output buffer
-	char *buf_output;
+    char *buf_output;
-	int buf_length;
+    int buf_length;
-	int buf_capacity;
+    int buf_capacity;
 
-	// Text extracted from the output buffer
+    // Text extracted from the output buffer
-	char *text;
+    char *text;
-	// Icon path extracted from the output buffer
+    // Icon path extracted from the output buffer
-	char *icon_path;
+    char *icon_path;
-	Imlib_Image icon;
+    Imlib_Image icon;
-	char tooltip_text[512];
+    char tooltip_text[512];
 
-	// The time the last command was started
+    // The time the last command was started
-	time_t last_update_start_time;
+    time_t last_update_start_time;
-	// The time the last output was obtained
+    // The time the last output was obtained
-	time_t last_update_finish_time;
+    time_t last_update_finish_time;
-	// The time it took to execute last command
+    // The time it took to execute last command
-	time_t last_update_duration;
+    time_t last_update_duration;
 
-	// List of Execp which are frontends for this backend, one for each panel
+    // List of Execp which are frontends for this backend, one for each panel
-	GList *instances;
+    GList *instances;
-	GTree *cmd_pids;
+    GTree *cmd_pids;
 } ExecpBackend;
 
 typedef struct ExecpFrontend {
-	// Frontend state:
+    // Frontend state:
-	int iconx;
+    int iconx;
-	int icony;
+    int icony;
-	int textx;
+    int textx;
-	int texty;
+    int texty;
-	int textw;
+    int textw;
-	int texth;
+    int texth;
 } ExecpFrontend;
 
 typedef struct Execp {
-	Area area;
+    Area area;
-	// All elements have the backend pointer set. However only backend elements have ownership.
+    // All elements have the backend pointer set. However only backend elements have ownership.
-	ExecpBackend *backend;
+    ExecpBackend *backend;
-	// Set only for frontend Execp items.
+    // Set only for frontend Execp items.
-	ExecpFrontend *frontend;
+    ExecpFrontend *frontend;
 } Execp;
 
 // Called before the config is read and panel_config/panels are created.
@@ -129,7 +129,7 @@ void draw_execp(void *obj, cairo_t *c);
 gboolean resize_execp(void *obj);
 
 // Called on mouse click event.
-void execp_action(void *obj, int button, int x, int y);
+void execp_action(void *obj, int button, int x, int y, Time time);
 
 void execp_cmd_completed(Execp *obj, pid_t pid);
 

src/freespace/freespace.c

@@ -34,93 +34,93 @@ int freespace_area_compute_desired_size(void *obj);
 
 void init_freespace_panel(void *p)
 {
-	Panel *panel = (Panel *)p;
+    Panel *panel = (Panel *)p;
 
-	// Make sure this is only done once if there are multiple items
+    // Make sure this is only done once if there are multiple items
-	if (panel->freespace_list)
+    if (panel->freespace_list)
-		return;
+        return;
 
-	for (size_t k = 0; k < strlen(panel_items_order); k++) {
+    for (size_t k = 0; k < strlen(panel_items_order); k++) {
-		if (panel_items_order[k] == 'F') {
+        if (panel_items_order[k] == 'F') {
-			FreeSpace *freespace = (FreeSpace *) calloc(1, sizeof(FreeSpace));
+            FreeSpace *freespace = (FreeSpace *)calloc(1, sizeof(FreeSpace));
-			panel->freespace_list = g_list_append(panel->freespace_list, freespace);
+            panel->freespace_list = g_list_append(panel->freespace_list, freespace);
-			if (!freespace->area.bg)
+            if (!freespace->area.bg)
-				freespace->area.bg = &g_array_index(backgrounds, Background, 0);
+                freespace->area.bg = &g_array_index(backgrounds, Background, 0);
-			freespace->area.parent = p;
+            freespace->area.parent = p;
-			freespace->area.panel = p;
+            freespace->area.panel = p;
-			snprintf(freespace->area.name, sizeof(freespace->area.name), "Freespace");
+            snprintf(freespace->area.name, sizeof(freespace->area.name), "Freespace");
-			freespace->area.size_mode = LAYOUT_FIXED;
+            freespace->area.size_mode = LAYOUT_FIXED;
-			freespace->area.resize_needed = 1;
+            freespace->area.resize_needed = 1;
-			freespace->area.on_screen = TRUE;
+            freespace->area.on_screen = TRUE;
-			freespace->area._resize = resize_freespace;
+            freespace->area._resize = resize_freespace;
-			freespace->area._compute_desired_size = freespace_area_compute_desired_size;
+            freespace->area._compute_desired_size = freespace_area_compute_desired_size;
-		}
+        }
-	}
+    }
 }
 
 void cleanup_freespace(Panel *panel)
 {
-	if (panel->freespace_list)
+    if (panel->freespace_list)
-		g_list_free_full(panel->freespace_list, free);
+        g_list_free_full(panel->freespace_list, free);
-	panel->freespace_list = NULL;
+    panel->freespace_list = NULL;
 }
 
 int freespace_get_max_size(Panel *p)
 {
-	if (panel_shrink)
+    if (panel_shrink)
-		return 0;
+        return 0;
-	// Get space used by every element except the freespace
+    // Get space used by every element except the freespace
-	int size = 0;
+    int size = 0;
-	int spacers = 0;
+    int spacers = 0;
-	for (GList *walk = p->area.children; walk; walk = g_list_next(walk)) {
+    for (GList *walk = p->area.children; walk; walk = g_list_next(walk)) {
-		Area *a = (Area *)walk->data;
+        Area *a = (Area *)walk->data;
 
-		if (!a->on_screen)
+        if (!a->on_screen)
-			continue;
+            continue;
-		if (a->_resize == resize_freespace) {
+        if (a->_resize == resize_freespace) {
-			spacers++;
+            spacers++;
-			continue;
+            continue;
-		}
+        }
 
-		if (panel_horizontal)
+        if (panel_horizontal)
-			size += a->width + p->area.paddingx;
+            size += a->width + p->area.paddingx;
-		else
+        else
-			size += a->height + p->area.paddingy;
+            size += a->height + p->area.paddingy;
-	}
+    }
 
-	if (panel_horizontal)
+    if (panel_horizontal)
-		size = p->area.width - size - left_right_border_width(&p->area) - p->area.paddingxlr;
+        size = p->area.width - size - left_right_border_width(&p->area) - p->area.paddingxlr;
-	else
+    else
-		size = p->area.height - size - top_bottom_border_width(&p->area) - p->area.paddingxlr;
+        size = p->area.height - size - top_bottom_border_width(&p->area) - p->area.paddingxlr;
 
-	return size / spacers;
+    return size / spacers;
 }
 
 int freespace_area_compute_desired_size(void *obj)
 {
-	FreeSpace *freespace = (FreeSpace *) obj;
+    FreeSpace *freespace = (FreeSpace *)obj;
-	return freespace_get_max_size((Panel *)freespace->area.panel);
+    return freespace_get_max_size((Panel *)freespace->area.panel);
 }
 
 gboolean resize_freespace(void *obj)
 {
-	FreeSpace *freespace = (FreeSpace *)obj;
+    FreeSpace *freespace = (FreeSpace *)obj;
-	Panel *panel = (Panel *)freespace->area.panel;
+    Panel *panel = (Panel *)freespace->area.panel;
-	if (!freespace->area.on_screen)
+    if (!freespace->area.on_screen)
-		return FALSE;
+        return FALSE;
 
-	int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
+    int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
-	int size = freespace_get_max_size(panel);
+    int size = freespace_get_max_size(panel);
-	if (old_size == size)
+    if (old_size == size)
-		return FALSE;
+        return FALSE;
 
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		freespace->area.width = size;
+        freespace->area.width = size;
-	} else {
+    } else {
-		freespace->area.height = size;
+        freespace->area.height = size;
-	}
+    }
 
-	schedule_redraw(&freespace->area);
+    schedule_redraw(&freespace->area);
-	schedule_panel_redraw();
+    schedule_panel_redraw();
-	return TRUE;
+    return TRUE;
 }

src/freespace/freespace.h

@@ -9,7 +9,7 @@
 #include "area.h"
 
 typedef struct FreeSpace {
-	Area area;
+    Area area;
 } FreeSpace;
 
 struct Panel;

src/launcher/apps-common.c

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

src/launcher/apps-common.h

@@ -10,13 +10,13 @@
 #include <glib.h>
 
 typedef struct DesktopEntry {
-	char *name;
+    char *name;
-	char *generic_name;
+    char *generic_name;
-	char *exec;
+    char *exec;
-	char *icon;
+    char *icon;
-	char *path;
+    char *path;
-	char *cwd;
+    char *cwd;
-	gboolean hidden_from_menus;
+    gboolean hidden_from_menus;
 } DesktopEntry;
 
 // Parses a line of the form "key = value". Modifies the line.

src/launcher/icon-theme-common.h

@@ -10,27 +10,27 @@
 #include "cache.h"
 
 typedef struct IconThemeWrapper {
-	// The icon theme name for which this wrapper was created
+    // The icon theme name for which this wrapper was created
-	char *icon_theme_name;
+    char *icon_theme_name;
-	// List of IconTheme*
+    // List of IconTheme*
-	GSList *themes;
+    GSList *themes;
-	// Themes are loaded lazily when needed.
+    // Themes are loaded lazily when needed.
-	gboolean _themes_loaded;
+    gboolean _themes_loaded;
-	// List of IconTheme*
+    // List of IconTheme*
-	GSList *themes_fallback;
+    GSList *themes_fallback;
-	// Fallback themes are loaded lazily when needed.
+    // Fallback themes are loaded lazily when needed.
-	gboolean _fallback_loaded;
+    gboolean _fallback_loaded;
-	Cache _cache;
+    Cache _cache;
-	// List of icon theme names that have been queued for loading.
+    // List of icon theme names that have been queued for loading.
-	// Used to avoid loading the same theme twice, and to avoid cycles.
+    // Used to avoid loading the same theme twice, and to avoid cycles.
-	GSList *_queued;
+    GSList *_queued;
 } IconThemeWrapper;
 
 typedef struct IconTheme {
-	char *name;
+    char *name;
-	char *description;
+    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.
@@ -51,7 +51,7 @@ void free_icon_theme(IconTheme *theme);
 
 // 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);
+char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size, gboolean use_fallbacks);
 
 // Returns a list of the directories used to store icons.
 // Do not free the result, it is cached.

src/launcher/launcher.c

@@ -50,10 +50,11 @@ int launcher_brightness;
 char *icon_theme_name_config;
 char *icon_theme_name_xsettings;
 int launcher_icon_theme_override;
-int startup_notifications;
 Background *launcher_icon_bg;
 GList *launcher_icon_gradients;
 
+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);
@@ -65,18 +66,18 @@ int launcher_compute_desired_size(void *obj);
 
 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;
+    startup_notifications = 0;
-	launcher_icon_bg = NULL;
+    launcher_icon_bg = NULL;
-	launcher_icon_gradients = NULL;
+    launcher_icon_gradients = NULL;
 }
 
 void init_launcher()
@@ -85,94 +86,97 @@ void init_launcher()
 
 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");
+    snprintf(launcher->area.name, sizeof(launcher->area.name), "Launcher");
-	launcher->area._draw_foreground = NULL;
+    launcher->area._draw_foreground = NULL;
-	launcher->area.size_mode = LAYOUT_FIXED;
+    launcher->area.size_mode = LAYOUT_FIXED;
-	launcher->area._resize = resize_launcher;
+    launcher->area._resize = resize_launcher;
-	launcher->area._compute_desired_size = launcher_compute_desired_size;
+    launcher->area._compute_desired_size = launcher_compute_desired_size;
-	launcher->area.resize_needed = 1;
+    launcher->area.resize_needed = 1;
-	schedule_redraw(&launcher->area);
+    schedule_redraw(&launcher->area);
-	if (!launcher->area.bg)
+    if (!launcher->area.bg)
-		launcher->area.bg = &g_array_index(backgrounds, Background, 0);
+        launcher->area.bg = &g_array_index(backgrounds, Background, 0);
 
-	if (!launcher_icon_bg)
+    if (!launcher_icon_bg)
-		launcher_icon_bg = &g_array_index(backgrounds, Background, 0);
+        launcher_icon_bg = &g_array_index(backgrounds, Background, 0);
 
-	// check consistency
+    // check consistency
-	if (launcher->list_apps == NULL)
+    if (launcher->list_apps == NULL)
-		return;
+        return;
 
-	// This will be recomputed on resize, we just initialize to a non-zero value
+    // This will be recomputed on resize, we just initialize to a non-zero value
-	launcher->icon_size = launcher_max_icon_size > 0 ? launcher_max_icon_size : 24;
+    launcher->icon_size = launcher_max_icon_size > 0 ? launcher_max_icon_size : 24;
 
-	launcher->area.on_screen = TRUE;
+    launcher->area.on_screen = TRUE;
-	schedule_panel_redraw();
+    schedule_panel_redraw();
-	instantiate_area_gradients(&launcher->area);
+    instantiate_area_gradients(&launcher->area);
 
-	launcher_load_themes(launcher);
+    load_icon_themes();
-	launcher_load_icons(launcher);
+    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++) {
+    for (int i = 0; i < num_panels; i++) {
-		Panel *panel = &panels[i];
+        Panel *panel = &panels[i];
-		Launcher *launcher = &panel->launcher;
+        Launcher *launcher = &panel->launcher;
-		cleanup_launcher_theme(launcher);
+        cleanup_launcher_theme(launcher);
-	}
+    }
 
-	for (GSList *l = panel_config.launcher.list_apps; l; l = l->next) {
+    for (GSList *l = panel_config.launcher.list_apps; l; l = l->next) {
-		free(l->data);
+        free(l->data);
-	}
+    }
-	g_slist_free(panel_config.launcher.list_apps);
+    g_slist_free(panel_config.launcher.list_apps);
-	panel_config.launcher.list_apps = NULL;
+    panel_config.launcher.list_apps = NULL;
 
-	free(icon_theme_name_config);
+    free(icon_theme_name_config);
-	icon_theme_name_config = NULL;
+    icon_theme_name_config = NULL;
 
-	free(icon_theme_name_xsettings);
+    free(icon_theme_name_xsettings);
-	icon_theme_name_xsettings = NULL;
+    icon_theme_name_xsettings = NULL;
 
-	launcher_enabled = FALSE;
+    launcher_enabled = FALSE;
 }
 
 void cleanup_launcher_theme(Launcher *launcher)
 {
-	free_area(&launcher->area);
+    free_area(&launcher->area);
-	for (GSList *l = launcher->list_icons; l; l = l->next) {
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (launcherIcon) {
+        if (launcherIcon) {
-			free_icon(launcherIcon->image);
+            free_icon(launcherIcon->image);
-			free_icon(launcherIcon->image_hover);
+            free_icon(launcherIcon->image_hover);
-			free_icon(launcherIcon->image_pressed);
+            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);
-			g_free(launcherIcon->icon_tooltip);
+            g_free(launcherIcon->icon_tooltip);
-			free(launcherIcon->config_path);
+            free(launcherIcon->config_path);
-		}
+        }
-		free(launcherIcon);
+        free(launcherIcon);
-	}
+    }
-	g_slist_free(launcher->list_icons);
+    g_slist_free(launcher->list_icons);
-	launcher->list_icons = NULL;
+    launcher->list_icons = NULL;
-
-	free_themes(launcher->icon_theme_wrapper);
-	launcher->icon_theme_wrapper = NULL;
 }
 
 int launcher_compute_icon_size(Launcher *launcher)
 {
-	int icon_size = panel_horizontal ? launcher->area.height : launcher->area.width;
+    int icon_size = panel_horizontal ? launcher->area.height : launcher->area.width;
-	icon_size = icon_size - MAX(left_right_border_width(&launcher->area), top_bottom_border_width(&launcher->area)) -
+    icon_size = icon_size - MAX(left_right_border_width(&launcher->area), top_bottom_border_width(&launcher->area)) -
-	            (2 * launcher->area.paddingy);
+                (2 * launcher->area.paddingy);
-	if (launcher_max_icon_size > 0 && icon_size > launcher_max_icon_size)
+    if (launcher_max_icon_size > 0 && icon_size > launcher_max_icon_size)
-		icon_size = launcher_max_icon_size;
+        icon_size = launcher_max_icon_size;
-	return icon_size;
+    return icon_size;
 }
 
 void launcher_compute_geometry(Launcher *launcher,
@@ -182,442 +186,385 @@ void launcher_compute_geometry(Launcher *launcher,
                                int *icons_per_row,
                                int *margin)
 {
-	int count = 0;
+    int count = 0;
-	for (GSList *l = launcher->list_icons; l; l = l->next) {
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (launcherIcon->area.on_screen)
+        if (launcherIcon->area.on_screen)
-			count++;
+            count++;
-	}
+    }
 
-	*icon_size = launcher_compute_icon_size(launcher);
+    *icon_size = launcher_compute_icon_size(launcher);
-	*icons_per_column = 1;
+    *icons_per_column = 1;
-	*icons_per_row = 1;
+    *icons_per_row = 1;
-	*margin = 0;
+    *margin = 0;
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		if (!count) {
+        if (!count) {
-			*size = 0;
+            *size = 0;
-		} else {
+        } else {
-			int height = launcher->area.height - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
+            int height = launcher->area.height - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
-			// here icons_per_column always higher than 0
+            // here icons_per_column always higher than 0
-			*icons_per_column = (height + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
+            *icons_per_column = (height + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
-			*margin = height - (*icons_per_column - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
+            *margin = height - (*icons_per_column - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
-			*icons_per_row = count / *icons_per_column + (count % *icons_per_column != 0);
+            *icons_per_row = count / *icons_per_column + (count % *icons_per_column != 0);
-			*size = left_right_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
+            *size = left_right_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
-			        (*icon_size * *icons_per_row) + ((*icons_per_row - 1) * launcher->area.paddingx);
+                    (*icon_size * *icons_per_row) + ((*icons_per_row - 1) * launcher->area.paddingx);
-		}
+        }
-	} else {
+    } else {
-		if (!count) {
+        if (!count) {
-			*size = 0;
+            *size = 0;
-		} else {
+        } else {
-			int width = launcher->area.width - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
+            int width = launcher->area.width - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
-			// here icons_per_row always higher than 0
+            // here icons_per_row always higher than 0
-			*icons_per_row = (width + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
+            *icons_per_row = (width + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
-			*margin = width - (*icons_per_row - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
+            *margin = width - (*icons_per_row - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
-			*icons_per_column = count / *icons_per_row + (count % *icons_per_row != 0);
+            *icons_per_column = count / *icons_per_row + (count % *icons_per_row != 0);
-			*size = top_bottom_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
+            *size = top_bottom_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
-			        (*icon_size * *icons_per_column) + ((*icons_per_column - 1) * launcher->area.paddingx);
+                    (*icon_size * *icons_per_column) + ((*icons_per_column - 1) * launcher->area.paddingx);
-		}
+        }
-	}
+    }
 }
 
 int launcher_compute_desired_size(void *obj)
 {
-	Launcher *launcher = (Launcher *)obj;
+    Launcher *launcher = (Launcher *)obj;
 
-	int size, icon_size, icons_per_column, icons_per_row, margin;
+    int size, icon_size, icons_per_column, icons_per_row, margin;
-	launcher_compute_geometry(launcher, &size, &icon_size, &icons_per_column, &icons_per_row, &margin);
+    launcher_compute_geometry(launcher, &size, &icon_size, &icons_per_column, &icons_per_row, &margin);
-	return size;
+    return size;
 }
 
 gboolean resize_launcher(void *obj)
 {
-	Launcher *launcher = (Launcher *)obj;
+    Launcher *launcher = (Launcher *)obj;
 
-	int size, icons_per_column, icons_per_row, margin;
+    int size, icons_per_column, icons_per_row, margin;
-	launcher_compute_geometry(launcher, &size, &launcher->icon_size, &icons_per_column, &icons_per_row, &margin);
+    launcher_compute_geometry(launcher, &size, &launcher->icon_size, &icons_per_column, &icons_per_row, &margin);
 
-	// Resize icons if necessary
+    // Resize icons if necessary
-	for (GSList *l = launcher->list_icons; l; l = l->next) {
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (launcherIcon->icon_size != launcher->icon_size || !launcherIcon->image) {
+        if (launcherIcon->icon_size != launcher->icon_size || !launcherIcon->image) {
-			launcherIcon->icon_size = launcher->icon_size;
+            launcherIcon->icon_size = launcher->icon_size;
-			launcherIcon->area.width = launcherIcon->icon_size;
+            launcherIcon->area.width = launcherIcon->icon_size;
-			launcherIcon->area.height = launcherIcon->icon_size;
+            launcherIcon->area.height = launcherIcon->icon_size;
-			launcher_reload_icon_image(launcher, launcherIcon);
+            launcher_reload_icon_image(launcher, launcherIcon);
-		}
+        }
-	}
+    }
-	save_icon_cache(launcher->icon_theme_wrapper);
+    save_icon_cache(icon_theme_wrapper);
 
-	int count = 0;
+    int count = 0;
-	gboolean needs_repositioning = FALSE;
+    gboolean needs_repositioning = FALSE;
-	for (GSList *l = launcher->list_icons; l; l = l->next) {
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (launcherIcon->area.on_screen) {
+        if (launcherIcon->area.on_screen) {
-			count++;
+            count++;
-			if (launcherIcon->area.posx < 0 || launcherIcon->area.posy < 0)
+            if (launcherIcon->area.posx < 0 || launcherIcon->area.posy < 0)
-				needs_repositioning = TRUE;
+                needs_repositioning = TRUE;
-		}
+        }
-	}
+    }
 
-	if (!needs_repositioning) {
+    if (!needs_repositioning) {
-		if (panel_horizontal) {
+        if (panel_horizontal) {
-			if (launcher->area.width == size)
+            if (launcher->area.width == size)
-				return FALSE;
+                return FALSE;
-			launcher->area.width = size;
+            launcher->area.width = size;
-		} else {
+        } else {
-			if (launcher->area.height == size)
+            if (launcher->area.height == size)
-				return FALSE;
+                return FALSE;
-			launcher->area.height = size;
+            launcher->area.height = size;
-		}
+        }
-	}
+    }
 
-	int posx, posy;
+    int posx, posy;
-	int start;
+    int start;
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		posy = start = top_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
+        posy = start = top_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
-		posx = left_border_width(&launcher->area) + launcher->area.paddingxlr;
+        posx = left_border_width(&launcher->area) + launcher->area.paddingxlr;
-	} else {
+    } else {
-		posx = start = left_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
+        posx = start = left_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
-		posy = top_border_width(&launcher->area) + launcher->area.paddingxlr;
+        posy = top_border_width(&launcher->area) + launcher->area.paddingxlr;
-	}
+    }
 
-	int i = 0;
+    int i = 0;
-	for (GSList *l = launcher->list_icons; l; l = l->next) {
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (!launcherIcon->area.on_screen)
+        if (!launcherIcon->area.on_screen)
-			continue;
+            continue;
-		i++;
+        i++;
-		launcherIcon->y = posy;
+        launcherIcon->y = posy;
-		launcherIcon->x = posx;
+        launcherIcon->x = posx;
-		launcher_icon_on_change_layout(launcherIcon);
+        launcher_icon_on_change_layout(launcherIcon);
-		// printf("launcher %d : %d,%d\n", i, posx, posy);
+        // printf("launcher %d : %d,%d\n", i, posx, posy);
-		if (panel_horizontal) {
+        if (panel_horizontal) {
-			if (i % icons_per_column) {
+            if (i % icons_per_column) {
-				posy += launcher->icon_size + launcher->area.paddingx;
+                posy += launcher->icon_size + launcher->area.paddingx;
-			} else {
+            } else {
-				posy = start;
+                posy = start;
-				posx += (launcher->icon_size + launcher->area.paddingx);
+                posx += (launcher->icon_size + launcher->area.paddingx);
-			}
+            }
-		} else {
+        } else {
-			if (i % icons_per_row) {
+            if (i % icons_per_row) {
-				posx += launcher->icon_size + launcher->area.paddingx;
+                posx += launcher->icon_size + launcher->area.paddingx;
-			} else {
+            } else {
-				posx = start;
+                posx = start;
-				posy += (launcher->icon_size + launcher->area.paddingx);
+                posy += (launcher->icon_size + launcher->area.paddingx);
-			}
+            }
-		}
+        }
-	}
+    }
 
-	if ((panel_horizontal && icons_per_column == 1) || (!panel_horizontal && icons_per_row == 1)) {
+    if ((panel_horizontal && icons_per_column == 1) || (!panel_horizontal && icons_per_row == 1)) {
-		launcher->area._is_under_mouse = full_width_area_is_under_mouse;
+        launcher->area._is_under_mouse = full_width_area_is_under_mouse;
-		for (GSList *l = launcher->list_icons; l; l = l->next)
+        for (GSList *l = launcher->list_icons; l; l = l->next)
-			((LauncherIcon *)l->data)->area._is_under_mouse = full_width_area_is_under_mouse;
+            ((LauncherIcon *)l->data)->area._is_under_mouse = full_width_area_is_under_mouse;
-	} else {
+    } else {
-		launcher->area._is_under_mouse = NULL;
+        launcher->area._is_under_mouse = NULL;
-		for (GSList *l = launcher->list_icons; l; l = l->next)
+        for (GSList *l = launcher->list_icons; l; l = l->next)
-			((LauncherIcon *)l->data)->area._is_under_mouse = NULL;
+            ((LauncherIcon *)l->data)->area._is_under_mouse = NULL;
-	}
+    }
 
-	return TRUE;
+    return TRUE;
 }
 
 // Here we override the default layout of the icons; normally Area layouts its children
 // in a stack; we need to layout them in a kind of table
 void launcher_icon_on_change_layout(void *obj)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
-	launcherIcon->area.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
+    launcherIcon->area.posy = ((Area *)launcherIcon->area.parent)->posy + launcherIcon->y;
-	launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
+    launcherIcon->area.posx = ((Area *)launcherIcon->area.parent)->posx + launcherIcon->x;
-	launcherIcon->area.width = launcherIcon->icon_size;
+    launcherIcon->area.width = launcherIcon->icon_size;
-	launcherIcon->area.height = launcherIcon->icon_size;
+    launcherIcon->area.height = launcherIcon->icon_size;
 }
 
 int launcher_icon_compute_desired_size(void *obj)
 {
-	LauncherIcon *icon = (LauncherIcon *)obj;
+    LauncherIcon *icon = (LauncherIcon *)obj;
-	return icon->icon_size;
+    return icon->icon_size;
 }
 
 char *launcher_icon_get_tooltip_text(void *obj)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
-	return strdup(launcherIcon->icon_tooltip);
+    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;
+    Imlib_Image image;
-	// Render
+    // Render
-	if (panel_config.mouse_effects) {
+    if (panel_config.mouse_effects) {
-		if (launcherIcon->area.mouse_state == MOUSE_OVER)
+        if (launcherIcon->area.mouse_state == MOUSE_OVER)
-			image = launcherIcon->image_hover ? launcherIcon->image_hover : launcherIcon->image;
+            image = launcherIcon->image_hover ? launcherIcon->image_hover : launcherIcon->image;
-		else if (launcherIcon->area.mouse_state == MOUSE_DOWN)
+        else if (launcherIcon->area.mouse_state == MOUSE_DOWN)
-			image = launcherIcon->image_pressed ? launcherIcon->image_pressed : launcherIcon->image;
+            image = launcherIcon->image_pressed ? launcherIcon->image_pressed : launcherIcon->image;
-		else
+        else
-			image = launcherIcon->image;
+            image = launcherIcon->image;
-	} else {
+    } else {
-		image = launcherIcon->image;
+        image = launcherIcon->image;
-	}
+    }
-	imlib_context_set_image(image);
+    imlib_context_set_image(image);
-	render_image(launcherIcon->area.pix, 0, 0);
+    render_image(launcherIcon->area.pix, 0, 0);
 }
 
 void launcher_icon_dump_geometry(void *obj, int indent)
 {
-	LauncherIcon *launcherIcon = (LauncherIcon *)obj;
+    LauncherIcon *launcherIcon = (LauncherIcon *)obj;
-	fprintf(stderr, "%*sIcon: w = h = %d, name = %s\n", indent, "", launcherIcon->icon_size, launcherIcon->icon_name);
+    fprintf(stderr, "%*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,
+                                                        0,
-		                                                imlib_image_get_width(),
+                                                        imlib_image_get_width(),
-		                                                imlib_image_get_height(),
+                                                        imlib_image_get_height(),
-		                                                icon_size,
+                                                        icon_size,
-		                                                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,
-		           icon_size,
+                   icon_size,
-		           launcher_alpha / 100.0,
+                   launcher_alpha / 100.0,
-		           launcher_saturation / 100.0,
+                   launcher_saturation / 100.0,
-		           launcher_brightness / 100.0);
+                   launcher_brightness / 100.0);
-		imlib_image_put_back_data(data);
+        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)
+void launcher_action(LauncherIcon *icon, XEvent *evt, int x, int y)
 {
-	launcher_reload_icon((Launcher *)icon->area.parent, icon);
+    launcher_reload_icon((Launcher *)icon->area.parent, icon);
-	launcher_reload_hidden_icons((Launcher *)icon->area.parent);
+    launcher_reload_hidden_icons((Launcher *)icon->area.parent);
-	char *cmd = calloc(strlen(icon->cmd) + 10, 1);
+
-	sprintf(cmd, "(%s&)", icon->cmd);
+    if (evt->type == ButtonPress || evt->type == ButtonRelease)
-#if HAVE_SN
+        tint_exec(icon->cmd, icon->cwd, icon->icon_tooltip, evt->xbutton.time, &icon->area, x, y);
-	SnLauncherContext *ctx = 0;
-	Time time;
-	if (startup_notifications) {
-		ctx = sn_launcher_context_new(server.sn_display, server.screen);
-		sn_launcher_context_set_name(ctx, icon->icon_tooltip);
-		sn_launcher_context_set_description(ctx, "Application launched from tint2");
-		sn_launcher_context_set_binary_name(ctx, icon->cmd);
-		// Get a timestamp from the X event
-		if (evt->type == ButtonPress || evt->type == ButtonRelease) {
-			time = evt->xbutton.time;
-		} else {
-			fprintf(stderr, "Unknown X event: %d\n", evt->type);
-			free(cmd);
-			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
-		if (icon->cwd)
-			chdir(icon->cwd);
-		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;
+    int index = 0;
-	while (app != NULL) {
+    while (app != NULL) {
-		index++;
+        index++;
-		LauncherIcon *launcherIcon = (LauncherIcon *)calloc(1, sizeof(LauncherIcon));
+        LauncherIcon *launcherIcon = (LauncherIcon *)calloc(1, sizeof(LauncherIcon));
-		launcherIcon->area.panel = launcher->area.panel;
+        launcherIcon->area.panel = launcher->area.panel;
-		launcherIcon->area._draw_foreground = draw_launcher_icon;
+        launcherIcon->area._draw_foreground = draw_launcher_icon;
-		launcherIcon->area.size_mode = LAYOUT_FIXED;
+        launcherIcon->area.size_mode = LAYOUT_FIXED;
-		launcherIcon->area._resize = NULL;
+        launcherIcon->area._resize = NULL;
-		launcherIcon->area._compute_desired_size = launcher_icon_compute_desired_size;
+        launcherIcon->area._compute_desired_size = launcher_icon_compute_desired_size;
-		sprintf(launcherIcon->area.name, "LauncherIcon %d", index);
+        sprintf(launcherIcon->area.name, "LauncherIcon %d", index);
-		launcherIcon->area.resize_needed = 0;
+        launcherIcon->area.resize_needed = 0;
-		launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
+        launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
-		launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
+        launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
-		launcherIcon->area.bg = launcher_icon_bg;
+        launcherIcon->area.bg = launcher_icon_bg;
-		launcherIcon->area.on_screen = TRUE;
+        launcherIcon->area.on_screen = TRUE;
-		launcherIcon->area.posx = -1;
+        launcherIcon->area.posx = -1;
-		launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
+        launcherIcon->area._on_change_layout = launcher_icon_on_change_layout;
-		launcherIcon->area._dump_geometry = launcher_icon_dump_geometry;
+        launcherIcon->area._dump_geometry = launcher_icon_dump_geometry;
-		if (launcher_tooltip_enabled) {
+        if (launcher_tooltip_enabled) {
-			launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
+            launcherIcon->area._get_tooltip_text = launcher_icon_get_tooltip_text;
-		} else {
+        } else {
-			launcherIcon->area._get_tooltip_text = NULL;
+            launcherIcon->area._get_tooltip_text = NULL;
-		}
+        }
-		launcherIcon->config_path = strdup(app->data);
+        launcherIcon->config_path = strdup(app->data);
-		add_area(&launcherIcon->area, (Area *)launcher);
+        add_area(&launcherIcon->area, (Area *)launcher);
-		launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
+        launcher->list_icons = g_slist_append(launcher->list_icons, launcherIcon);
-		launcherIcon->icon_size = launcher->icon_size;
+        launcherIcon->icon_size = launcher->icon_size;
-		launcher_reload_icon(launcher, launcherIcon);
+        launcher_reload_icon(launcher, launcherIcon);
-		instantiate_area_gradients(&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)
 {
-	DesktopEntry entry;
+    DesktopEntry entry;
-	if (read_desktop_file(launcherIcon->config_path, &entry) && entry.exec) {
+    if (read_desktop_file(launcherIcon->config_path, &entry) && entry.exec) {
-		schedule_redraw(&launcherIcon->area);
+        schedule_redraw(&launcherIcon->area);
-		if (launcherIcon->cmd)
+        if (launcherIcon->cmd)
-			free(launcherIcon->cmd);
+            free(launcherIcon->cmd);
-		launcherIcon->cmd = strdup(entry.exec);
+        launcherIcon->cmd = strdup(entry.exec);
-		if (launcherIcon->cwd) 
+        if (launcherIcon->cwd)
-			free(launcherIcon->cwd);
+            free(launcherIcon->cwd);
-		if (entry.cwd)
+        if (entry.cwd)
-			launcherIcon->cwd = strdup(entry.cwd);
+            launcherIcon->cwd = strdup(entry.cwd);
-		else
+        else
-			launcherIcon->cwd = NULL;
+            launcherIcon->cwd = NULL;
-		if (launcherIcon->icon_name)
+        if (launcherIcon->icon_name)
-			free(launcherIcon->icon_name);
+            free(launcherIcon->icon_name);
-		launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(DEFAULT_ICON);
+        launcherIcon->icon_name = entry.icon ? strdup(entry.icon) : strdup(DEFAULT_ICON);
-		if (entry.name) {
+        if (entry.name) {
-			if (entry.generic_name) {
+            if (entry.generic_name) {
-				launcherIcon->icon_tooltip = g_strdup_printf("%s (%s)", entry.name, entry.generic_name);
+                launcherIcon->icon_tooltip = g_strdup_printf("%s (%s)", entry.name, entry.generic_name);
-			} else {
+            } else {
-				launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.name);
+                launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.name);
-			}
+            }
-		} else {
+        } else {
-			if (entry.generic_name) {
+            if (entry.generic_name) {
-				launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.generic_name);
+                launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.generic_name);
-			} else if (entry.exec) {
+            } else if (entry.exec) {
-				launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.exec);
+                launcherIcon->icon_tooltip = g_strdup_printf("%s", entry.exec);
-			}
+            }
-		}
+        }
-		launcher_reload_icon_image(launcher, launcherIcon);
+        launcher_reload_icon_image(launcher, launcherIcon);
-		show(&launcherIcon->area);
+        show(&launcherIcon->area);
-	} else {
+    } else {
-		hide(&launcherIcon->area);
+        hide(&launcherIcon->area);
-	}
+    }
-	free_desktop_entry(&entry);
+    free_desktop_entry(&entry);
 }
 
 void launcher_reload_hidden_icons(Launcher *launcher)
 {
-	for (GSList *l = launcher->list_icons; l; l = l->next) {
+    for (GSList *l = launcher->list_icons; l; l = l->next) {
-		LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
+        LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
-		if (!launcherIcon->area.on_screen)
+        if (!launcherIcon->area.on_screen)
-			launcher_reload_icon(launcher, launcherIcon);
+            launcher_reload_icon(launcher, launcherIcon);
-	}
+    }
 }
 
 void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon)
 {
-	free_icon(launcherIcon->image);
+    free_icon(launcherIcon->image);
-	free_icon(launcherIcon->image_hover);
+    free_icon(launcherIcon->image_hover);
-	free_icon(launcherIcon->image_pressed);
+    free_icon(launcherIcon->image_pressed);
-	launcherIcon->image = NULL;
+    launcherIcon->image = NULL;
 
-	char *new_icon_path = get_icon_path(launcher->icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size);
+    char *new_icon_path = get_icon_path(icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size, TRUE);
-	if (new_icon_path)
+    if (new_icon_path)
-		launcherIcon->image = load_image(new_icon_path, 1);
+        launcherIcon->image = load_image(new_icon_path, TRUE);
-	// On loading error, fallback to default
+    // On loading error, fallback to default
-	if (!launcherIcon->image) {
+    if (!launcherIcon->image) {
-		free(new_icon_path);
+        free(new_icon_path);
-		new_icon_path = get_icon_path(launcher->icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size);
+        new_icon_path = get_icon_path(icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size, TRUE);
-		if (new_icon_path)
+        if (new_icon_path)
-			launcherIcon->image = imlib_load_image_immediately(new_icon_path);
+            launcherIcon->image = load_image(new_icon_path, TRUE);
-	}
+    }
-	Imlib_Image original = launcherIcon->image;
+    Imlib_Image original = launcherIcon->image;
-	launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);
+    launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);
-	free_icon(original);
+    free_icon(original);
-	free(launcherIcon->icon_path);
+    free(launcherIcon->icon_path);
-	launcherIcon->icon_path = new_icon_path;
+    launcherIcon->icon_path = new_icon_path;
-	// fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
+    // fprintf(stderr, "launcher.c %d: Using icon %s\n", __LINE__, launcherIcon->icon_path);
 
-	if (panel_config.mouse_effects) {
+    if (panel_config.mouse_effects) {
-		launcherIcon->image_hover = adjust_icon(launcherIcon->image,
+        launcherIcon->image_hover = adjust_icon(launcherIcon->image,
-		                                        panel_config.mouse_over_alpha,
+                                                panel_config.mouse_over_alpha,
-		                                        panel_config.mouse_over_saturation,
+                                                panel_config.mouse_over_saturation,
-		                                        panel_config.mouse_over_brightness);
+                                                panel_config.mouse_over_brightness);
-		launcherIcon->image_pressed = adjust_icon(launcherIcon->image,
+        launcherIcon->image_pressed = adjust_icon(launcherIcon->image,
-		                                          panel_config.mouse_pressed_alpha,
+                                                  panel_config.mouse_pressed_alpha,
-		                                          panel_config.mouse_pressed_saturation,
+                                                  panel_config.mouse_pressed_saturation,
-		                                          panel_config.mouse_pressed_brightness);
+                                                  panel_config.mouse_pressed_brightness);
-	}
+    }
-	schedule_redraw(&launcherIcon->area);
+    schedule_redraw(&launcherIcon->area);
 }
 
-// Populates the icon_theme_wrapper list
+void load_icon_themes()
-void launcher_load_themes(Launcher *launcher)
 {
-	launcher->icon_theme_wrapper =
+    if (icon_theme_wrapper)
-	    load_themes(launcher_icon_theme_override
+        return;
-	                    ? (icon_theme_name_config ? icon_theme_name_config
+    icon_theme_wrapper =
-	                                              : icon_theme_name_xsettings ? icon_theme_name_xsettings : "hicolor")
+        load_themes(launcher_icon_theme_override
-	                    : (icon_theme_name_xsettings ? icon_theme_name_xsettings
+                        ? (icon_theme_name_config ? icon_theme_name_config
-	                                                 : icon_theme_name_config ? icon_theme_name_config : "hicolor"));
+                                                  : 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()
 {
-	if (!launcher_enabled)
+    for (int i = 0; i < num_panels; i++) {
-		return;
+        Launcher *launcher = &panels[i].launcher;
-	if (launcher_icon_theme_override && icon_theme_name_config)
+        cleanup_launcher_theme(launcher);
-		return;
+        launcher_load_icons(launcher);
-	for (int i = 0; i < num_panels; i++) {
+        launcher->area.resize_needed = 1;
-		Launcher *launcher = &panels[i].launcher;
+    }
-		cleanup_launcher_theme(launcher);
+    schedule_panel_redraw();
-		launcher_load_themes(launcher);
-		launcher_load_icons(launcher);
-		launcher->area.resize_needed = 1;
-	}
-	schedule_panel_redraw();
 }

src/launcher/launcher.h

@@ -12,29 +12,32 @@
 #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*
-	IconThemeWrapper *icon_theme_wrapper;
+    int icon_size;
-	int icon_size;
 } Launcher;
 
 typedef struct LauncherIcon {
-	// always start with area
+    // always start with area
-	Area area;
+    Area area;
-	char *config_path;
+    char *config_path;
-	Imlib_Image image;
+    Imlib_Image image;
-	Imlib_Image image_hover;
+    Imlib_Image image_hover;
-	Imlib_Image image_pressed;
+    Imlib_Image image_pressed;
-	char *cmd;
+    char *cmd;
-	char *cwd;
+    char *cwd;
-	char *icon_name;
+    char *icon_name;
-	char *icon_path;
+    char *icon_path;
-	char *icon_tooltip;
+    char *icon_tooltip;
-	int icon_size;
+    int icon_size;
-	int x, y;
+    int x, y;
 } LauncherIcon;
 
 extern gboolean launcher_enabled;
@@ -46,7 +49,6 @@ extern int launcher_brightness;
 extern char *icon_theme_name_xsettings; // theme name
 extern char *icon_theme_name_config;
 extern int launcher_icon_theme_override;
-extern int startup_notifications;
 extern Background *launcher_icon_bg;
 extern GList *launcher_icon_gradients;
 
@@ -65,9 +67,7 @@ void launcher_default_icon_theme_changed();
 
 // Populates the list_icons list
 void launcher_load_icons(Launcher *launcher);
-// Populates the list_themes list
+void launcher_action(LauncherIcon *icon, XEvent *e, int x, int y);
-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

@@ -34,78 +34,78 @@
 #include "launcher.h"
 
 struct _XSettingsClient {
-	Display *display;
+    Display *display;
-	int screen;
+    int screen;
-	XSettingsNotifyFunc notify;
+    XSettingsNotifyFunc notify;
-	XSettingsWatchFunc watch;
+    XSettingsWatchFunc watch;
-	void *cb_data;
+    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)
 {
-	if ((action == XSETTINGS_ACTION_NEW || action == XSETTINGS_ACTION_CHANGED) && name != NULL && setting != NULL) {
+    if ((action == XSETTINGS_ACTION_NEW || action == XSETTINGS_ACTION_CHANGED) && name != NULL && setting != NULL) {
-		if (strcmp(name, "Net/IconThemeName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
+        if (strcmp(name, "Net/IconThemeName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
-			fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
+            fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_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();
+            default_icon_theme_changed();
-		} else if (strcmp(name, "Gtk/FontName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
+        } else if (strcmp(name, "Gtk/FontName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
-			fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
+            fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
-			if (default_font) {
+            if (default_font) {
-				if (strcmp(default_font, setting->data.v_string) == 0)
+                if (strcmp(default_font, setting->data.v_string) == 0)
-					return;
+                    return;
-				free(default_font);
+                free(default_font);
-			}
+            }
-			default_font = strdup(setting->data.v_string);
+            default_font = strdup(setting->data.v_string);
-			default_font_changed();
+            default_font_changed();
-		}
+        }
-	}
+    }
 }
 
 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) {
+        } else if (cmp == 0) {
-			if (!xsettings_setting_equal(old_iter->setting, new_iter->setting))
+            if (!xsettings_setting_equal(old_iter->setting, new_iter->setting))
-				client->notify(old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
+                client->notify(old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
-		} else {
+        } else {
-			client->notify(new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
+            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)
 {
-	return True;
+    return True;
 }
 
 static char local_byte_order = '\0';
@@ -114,364 +114,364 @@ static char local_byte_order = '\0';
 
 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)
 {
-	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)
 {
-	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)
 {
-	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)))
 
 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, "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:
 
-	if (result != XSETTINGS_SUCCESS) {
+    if (result != XSETTINGS_SUCCESS) {
-		switch (result) {
+        switch (result) {
-		case XSETTINGS_NO_MEM:
+        case XSETTINGS_NO_MEM:
-			fprintf(stderr, "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, "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, "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)
 {
-	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 (*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,
+    int result = XGetWindowProperty(client->display,
-									client->manager_window,
+                                    client->manager_window,
-									server.atom._XSETTINGS_SETTINGS,
+                                    server.atom._XSETTINGS_SETTINGS,
-									0,
+                                    0,
-									LONG_MAX,
+                                    LONG_MAX,
-									False,
+                                    False,
-									server.atom._XSETTINGS_SETTINGS,
+                                    server.atom._XSETTINGS_SETTINGS,
-									&type,
+                                    &type,
-									&format,
+                                    &format,
-									&n_items,
+                                    &n_items,
-									&bytes_after,
+                                    &bytes_after,
-									&data);
+                                    &data);
-	XSetErrorHandler(old_handler);
+    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, "Invalid format for XSETTINGS property %d", format);
+            fprintf(stderr, "Invalid format for XSETTINGS property %d", format);
-		} else
+        } else
-			client->settings = parse_settings(data, n_items);
+            client->settings = parse_settings(data, n_items);
-		XFree(data);
+        XFree(data);
-	}
+    }
 
-	notify_changes(client, old_list);
+    notify_changes(client, old_list);
-	xsettings_list_free(old_list);
+    xsettings_list_free(old_list);
 }
 
 static void check_manager_window(XSettingsClient *client)
 {
-	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.display, server.atom._XSETTINGS_SCREEN);
-	if (client->manager_window)
+    if (client->manager_window)
-		XSelectInput(server.display, client->manager_window, PropertyChangeMask | StructureNotifyMask);
+        XSelectInput(server.display, client->manager_window, PropertyChangeMask | StructureNotifyMask);
 
-	XUngrabServer(client->display);
+    XUngrabServer(client->display);
-	XFlush(client->display);
+    XFlush(client->display);
 
-	if (client->manager_window && client->watch)
+    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,
+                                      int screen,
-									  XSettingsNotifyFunc notify,
+                                      XSettingsNotifyFunc notify,
-									  XSettingsWatchFunc watch,
+                                      XSettingsWatchFunc watch,
-									  void *cb_data)
+                                      void *cb_data)
 {
-	XSettingsClient *client = calloc(1, sizeof *client);
+    XSettingsClient *client = calloc(1, sizeof *client);
-	if (!client)
+    if (!client)
-		return NULL;
+        return NULL;
 
-	client->display = display;
+    client->display = display;
-	client->screen = screen;
+    client->screen = screen;
-	client->notify = notify;
+    client->notify = notify;
-	client->watch = watch;
+    client->watch = watch;
-	client->cb_data = cb_data;
+    client->cb_data = cb_data;
 
-	client->manager_window = None;
+    client->manager_window = None;
-	client->settings = NULL;
+    client->settings = NULL;
 
-	if (client->watch)
+    if (client->watch)
-		client->watch(RootWindow(display, screen), True, StructureNotifyMask, client->cb_data);
+        client->watch(RootWindow(display, screen), True, StructureNotifyMask, client->cb_data);
 
-	check_manager_window(client);
+    check_manager_window(client);
 
-	if (client->manager_window == None) {
+    if (client->manager_window == None) {
-		printf("No XSETTINGS manager, tint2 uses config option 'launcher_icon_theme'.\n");
+        printf("No XSETTINGS manager, tint2 uses config option 'launcher_icon_theme'.\n");
-		free(client);
+        free(client);
-		return NULL;
+        return NULL;
-	} else {
+    } else {
-		return client;
+        return client;
-	}
+    }
 }
 
 void xsettings_client_destroy(XSettingsClient *client)
 {
-	if (!client)
+    if (!client)
-		return;
+        return;
-	if (client->watch)
+    if (client->watch)
-		client->watch(RootWindow(client->display, client->screen), False, 0, client->cb_data);
+        client->watch(RootWindow(client->display, client->screen), False, 0, client->cb_data);
-	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);
 
-	xsettings_list_free(client->settings);
+    xsettings_list_free(client->settings);
-	free(client);
+    free(client);
 }
 
 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
+    } else
-		return XSETTINGS_NO_ENTRY;
+        return XSETTINGS_NO_ENTRY;
 }
 
 Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev)
 {
-	/* The checks here will not unlikely cause us to reread
+    /* The checks here will not unlikely cause us to reread
-	* the properties from the manager window a number of
+    * the properties from the manager window a number of
-	* times when the manager changes from A->B. But manager changes
+    * times when the manager changes from A->B. But manager changes
-	* are going to be pretty rare.
+    * are going to be pretty rare.
-	*/
+    */
-	if (xev->xany.window == RootWindow(server.display, server.screen)) {
+    if (xev->xany.window == RootWindow(server.display, server.screen)) {
-		if (xev->xany.type == ClientMessage && xev->xclient.message_type == server.atom.MANAGER) {
+        if (xev->xany.type == ClientMessage && xev->xclient.message_type == server.atom.MANAGER) {
-			check_manager_window(client);
+            check_manager_window(client);
-			return True;
+            return True;
-		}
+        }
-	} else if (xev->xany.window == client->manager_window) {
+    } else if (xev->xany.window == client->manager_window) {
-		if (xev->xany.type == DestroyNotify) {
+        if (xev->xany.type == DestroyNotify) {
-			check_manager_window(client);
+            check_manager_window(client);
-			return True;
+            return True;
-		} else if (xev->xany.type == PropertyNotify) {
+        } else if (xev->xany.type == PropertyNotify) {
-			read_settings(client);
+            read_settings(client);
-			return True;
+            return True;
-		}
+        }
-	}
+    }
 
-	return False;
+    return False;
 }

src/launcher/xsettings-client.h

@@ -38,10 +38,10 @@ typedef void (*XSettingsNotifyFunc)(const char *name, XSettingsAction action, XS
 typedef void (*XSettingsWatchFunc)(Window window, Bool is_start, long mask, void *cb_data);
 
 XSettingsClient *xsettings_client_new(Display *display,
-									  int screen,
+                                      int screen,
-									  XSettingsNotifyFunc notify,
+                                      XSettingsNotifyFunc notify,
-									  XSettingsWatchFunc watch,
+                                      XSettingsWatchFunc watch,
-									  void *cb_data);
+                                      void *cb_data);
 void xsettings_client_destroy(XSettingsClient *client);
 Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev);
 

src/launcher/xsettings-common.c

@@ -30,216 +30,216 @@
 
 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:
+    case XSETTINGS_TYPE_INT:
-		result->data.v_int = setting->data.v_int;
+        result->data.v_int = setting->data.v_int;
-		break;
+        break;
-	case XSETTINGS_TYPE_COLOR:
+    case XSETTINGS_TYPE_COLOR:
-		result->data.v_color = setting->data.v_color;
+        result->data.v_color = setting->data.v_color;
-		break;
+        break;
-	case XSETTINGS_TYPE_STRING:
+    case XSETTINGS_TYPE_STRING:
-		str_len = strlen(setting->data.v_string);
+        str_len = strlen(setting->data.v_string);
-		result->data.v_string = calloc(str_len + 1, 1);
+        result->data.v_string = calloc(str_len + 1, 1);
-		if (!result->data.v_string)
+        if (!result->data.v_string)
-			goto err;
+            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 *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);
+            free(new_node);
-			goto error;
+            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)
 {
-	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:
+    case XSETTINGS_TYPE_INT:
-		return setting_a->data.v_int == setting_b->data.v_int;
+        return setting_a->data.v_int == setting_b->data.v_int;
-	case XSETTINGS_TYPE_COLOR:
+    case XSETTINGS_TYPE_COLOR:
-		return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
+        return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
-				setting_a->data.v_color.green == setting_b->data.v_color.green &&
+                setting_a->data.v_color.green == setting_b->data.v_color.green &&
-				setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
+                setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
-				setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
+                setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
-	case XSETTINGS_TYPE_STRING:
+    case XSETTINGS_TYPE_STRING:
-		return strcmp(setting_a->data.v_string, setting_b->data.v_string) == 0;
+        return strcmp(setting_a->data.v_string, setting_b->data.v_string) == 0;
-	default:
+    default:
-		break;
+        break;
-	}
+    }
 
-	return 0;
+    return 0;
 }
 
 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)
 {
-	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)
 {
-	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);
+            free(node);
-			return XSETTINGS_DUPLICATE_ENTRY;
+            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)
 {
-	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 (strcmp(name, iter->setting->name) == 0) {
-			if (last)
+            if (last)
-				last->next = iter->next;
+                last->next = iter->next;
-			else
+            else
-				*list = iter->next;
+                *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)
 {
-	XSettingsList *iter;
+    XSettingsList *iter;
 
-	iter = list;
+    iter = list;
-	while (iter) {
+    while (iter) {
-		if (strcmp(name, iter->setting->name) == 0)
+        if (strcmp(name, iter->setting->name) == 0)
-			return iter->setting;
+            return iter->setting;
 
-		iter = iter->next;
+        iter = iter->next;
-	}
+    }
 
-	return NULL;
+    return NULL;
 }
 
 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

@@ -36,48 +36,48 @@ typedef struct _XSettingsSetting XSettingsSetting;
  * protocol values.
  */
 typedef enum {
-	XSETTINGS_TYPE_INT = 0,
+    XSETTINGS_TYPE_INT = 0,
-	XSETTINGS_TYPE_STRING = 1,
+    XSETTINGS_TYPE_STRING = 1,
-	XSETTINGS_TYPE_COLOR = 2,
+    XSETTINGS_TYPE_COLOR = 2,
-	XSETTINGS_TYPE_NONE = 0xff
+    XSETTINGS_TYPE_NONE = 0xff
 } XSettingsType;
 
 typedef enum {
-	XSETTINGS_SUCCESS,
+    XSETTINGS_SUCCESS,
-	XSETTINGS_NO_MEM,
+    XSETTINGS_NO_MEM,
-	XSETTINGS_ACCESS,
+    XSETTINGS_ACCESS,
-	XSETTINGS_FAILED,
+    XSETTINGS_FAILED,
-	XSETTINGS_NO_ENTRY,
+    XSETTINGS_NO_ENTRY,
-	XSETTINGS_DUPLICATE_ENTRY
+    XSETTINGS_DUPLICATE_ENTRY
 } XSettingsResult;
 
 struct _XSettingsBuffer {
-	char byte_order;
+    char byte_order;
-	size_t len;
+    size_t len;
-	unsigned char *data;
+    unsigned char *data;
-	unsigned char *pos;
+    unsigned char *pos;
 };
 
 struct _XSettingsColor {
-	unsigned short red, green, blue, alpha;
+    unsigned short red, green, blue, alpha;
 };
 
 struct _XSettingsList {
-	XSettingsSetting *setting;
+    XSettingsSetting *setting;
-	XSettingsList *next;
+    XSettingsList *next;
 };
 
 struct _XSettingsSetting {
-	char *name;
+    char *name;
-	XSettingsType type;
+    XSettingsType type;
 
-	union {
+    union {
-		int v_int;
+        int v_int;
-		char *v_string;
+        char *v_string;
-		XSettingsColor v_color;
+        XSettingsColor v_color;
-	} data;
+    } data;
 
-	unsigned long last_change_serial;
+    unsigned long last_change_serial;
 };
 
 XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting);

src/panel.h

@@ -23,6 +23,7 @@
 #include "freespace.h"
 #include "execplugin.h"
 #include "separator.h"
+#include "button.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
@@ -41,29 +42,29 @@ extern MouseAction mouse_tilt_right;
 
 // panel mode
 typedef enum TaskbarMode {
-	SINGLE_DESKTOP = 0,
+    SINGLE_DESKTOP = 0,
-	MULTI_DESKTOP,
+    MULTI_DESKTOP,
 } TaskbarMode;
 
 typedef enum Layer {
-	BOTTOM_LAYER,
+    BOTTOM_LAYER,
-	NORMAL_LAYER,
+    NORMAL_LAYER,
-	TOP_LAYER,
+    TOP_LAYER,
 } Layer;
 
 // panel position
 typedef enum PanelPosition {
-	LEFT = 0x01,
+    LEFT = 0x01,
-	RIGHT = 0x02,
+    RIGHT = 0x02,
-	CENTER = 0X04,
+    CENTER = 0X04,
-	TOP = 0X08,
+    TOP = 0X08,
-	BOTTOM = 0x10,
+    BOTTOM = 0x10,
 } PanelPosition;
 
 typedef enum Strut {
-	STRUT_MINIMUM,
+    STRUT_MINIMUM,
-	STRUT_FOLLOW_SIZE,
+    STRUT_FOLLOW_SIZE,
-	STRUT_NONE,
+    STRUT_NONE,
 } Strut;
 
 extern TaskbarMode taskbar_mode;
@@ -89,58 +90,60 @@ extern Imlib_Image default_icon;
 #define DEFAULT_FONT "sans 10"
 extern char *default_font;
 extern XSettingsClient *xsettings_client;
+extern gboolean startup_notifications;
 extern gboolean debug_geometry;
 extern gboolean debug_fps;
 extern gboolean debug_frames;
 
 typedef struct Panel {
-	Area area;
+    Area area;
 
-	Window main_win;
+    Window main_win;
-	Pixmap temp_pmap;
+    Pixmap temp_pmap;
 
-	// position relative to root window
+    // position relative to root window
-	int posx, posy;
+    int posx, posy;
-	int marginx, marginy;
+    int marginx, marginy;
-	gboolean fractional_width, fractional_height;
+    gboolean fractional_width, fractional_height;
-	int max_size;
+    int max_size;
-	int monitor;
+    int monitor;
-	int font_shadow;
+    int font_shadow;
-	gboolean mouse_effects;
+    gboolean mouse_effects;
-	// Mouse effects for icons
+    // Mouse effects for icons
-	int mouse_over_alpha;
+    int mouse_over_alpha;
-	int mouse_over_saturation;
+    int mouse_over_saturation;
-	int mouse_over_brightness;
+    int mouse_over_brightness;
-	int mouse_pressed_alpha;
+    int mouse_pressed_alpha;
-	int mouse_pressed_saturation;
+    int mouse_pressed_saturation;
-	int mouse_pressed_brightness;
+    int mouse_pressed_brightness;
 
-	// Per-panel parameters and states for Taskbar and Task
+    // Per-panel parameters and states for Taskbar and Task
-	GlobalTaskbar g_taskbar;
+    GlobalTaskbar g_taskbar;
-	GlobalTask g_task;
+    GlobalTask g_task;
 
-	// Array of Taskbar, with num_desktops items
+    // Array of Taskbar, with num_desktops items
-	Taskbar *taskbar;
+    Taskbar *taskbar;
-	int num_desktops;
+    int num_desktops;
-	gboolean taskbarname_has_font;
+    gboolean taskbarname_has_font;
-	PangoFontDescription *taskbarname_font_desc;
+    PangoFontDescription *taskbarname_font_desc;
 
-	Clock clock;
+    Clock clock;
 
 #ifdef ENABLE_BATTERY
-	Battery battery;
+    Battery battery;
 #endif
 
-	Launcher launcher;
+    Launcher launcher;
-	GList *freespace_list;
+    GList *freespace_list;
-	GList *separator_list;
+    GList *separator_list;
-	GList *execp_list;
+    GList *execp_list;
+    GList *button_list;
 
-	// Autohide
+    // Autohide
-	gboolean is_hidden;
+    gboolean is_hidden;
-	int hidden_width, hidden_height;
+    int hidden_width, hidden_height;
-	Pixmap hidden_pixmap;
+    Pixmap hidden_pixmap;
-	timeout *autohide_timeout;
+    timeout *autohide_timeout;
 } Panel;
 
 extern Panel panel_config;
@@ -189,6 +192,7 @@ Battery *click_battery(Panel *panel, int x, int y);
 
 Area *click_area(Panel *panel, int x, int y);
 Execp *click_execp(Panel *panel, int x, int y);
+Button *click_button(Panel *panel, int x, int y);
 
 void autohide_show(void *p);
 void autohide_hide(void *p);
@@ -200,4 +204,7 @@ const char *get_default_font();
 void default_icon_theme_changed();
 void default_font_changed();
 
+void free_icon(Imlib_Image icon);
+Imlib_Image scale_icon(Imlib_Image original, int icon_size);
+
 #endif

src/separator/separator.c

@@ -19,132 +19,132 @@ int separator_compute_desired_size(void *obj);
 
 Separator *create_separator()
 {
-	Separator *separator = (Separator *)calloc(1, sizeof(Separator));
+    Separator *separator = (Separator *)calloc(1, sizeof(Separator));
-	separator->color.rgb[0] = 0.5;
+    separator->color.rgb[0] = 0.5;
-	separator->color.rgb[1] = 0.5;
+    separator->color.rgb[1] = 0.5;
-	separator->color.rgb[2] = 0.5;
+    separator->color.rgb[2] = 0.5;
-	separator->color.alpha = 0.9;
+    separator->color.alpha = 0.9;
-	separator->style = SEPARATOR_DOTS;
+    separator->style = SEPARATOR_DOTS;
-	separator->thickness = 3;
+    separator->thickness = 3;
-	separator->area.paddingxlr = 1;
+    separator->area.paddingxlr = 1;
-	return separator;
+    return separator;
 }
 
 void destroy_separator(void *obj)
 {
-	Separator *separator = (Separator *)obj;
+    Separator *separator = (Separator *)obj;
-	remove_area(&separator->area);
+    remove_area(&separator->area);
-	free_area(&separator->area);
+    free_area(&separator->area);
-	free_and_null(separator);
+    free_and_null(separator);
 }
 
 gpointer copy_separator(gconstpointer arg, gpointer data)
 {
-	Separator *old = (Separator *)arg;
+    Separator *old = (Separator *)arg;
-	Separator *copy = (Separator *)calloc(1, sizeof(Separator));
+    Separator *copy = (Separator *)calloc(1, sizeof(Separator));
-	memcpy(copy, old, sizeof(Separator));
+    memcpy(copy, old, sizeof(Separator));
-	return copy;
+    return copy;
 }
 
 void init_separator()
 {
-	GList *to_remove = panel_config.separator_list;
+    GList *to_remove = panel_config.separator_list;
-	for (int k = 0; k < strlen(panel_items_order) && to_remove; k++) {
+    for (int k = 0; k < strlen(panel_items_order) && to_remove; k++) {
-		if (panel_items_order[k] == ':') {
+        if (panel_items_order[k] == ':') {
-			to_remove = to_remove->next;
+            to_remove = to_remove->next;
-		}
+        }
-	}
+    }
 
-	if (to_remove) {
+    if (to_remove) {
-		if (to_remove == panel_config.separator_list) {
+        if (to_remove == panel_config.separator_list) {
-			g_list_free_full(to_remove, destroy_separator);
+            g_list_free_full(to_remove, destroy_separator);
-			panel_config.separator_list = NULL;
+            panel_config.separator_list = NULL;
-		} else {
+        } else {
-			// Cut panel_config.separator_list
+            // Cut panel_config.separator_list
-			if (to_remove->prev)
+            if (to_remove->prev)
-				to_remove->prev->next = NULL;
+                to_remove->prev->next = NULL;
-			to_remove->prev = NULL;
+            to_remove->prev = NULL;
-			// Remove all elements of to_remove and to_remove itself
+            // Remove all elements of to_remove and to_remove itself
-			g_list_free_full(to_remove, destroy_separator);
+            g_list_free_full(to_remove, destroy_separator);
-		}
+        }
-	}
+    }
 }
 
 void init_separator_panel(void *p)
 {
-	Panel *panel = (Panel *)p;
+    Panel *panel = (Panel *)p;
 
-	// Make sure this is only done once if there are multiple items
+    // Make sure this is only done once if there are multiple items
-	if (panel->separator_list)
+    if (panel->separator_list)
-		return;
+        return;
 
-	// panel->separator_list is now a copy of the pointer panel_config.separator_list
+    // panel->separator_list is now a copy of the pointer panel_config.separator_list
-	// We make it a deep copy
+    // We make it a deep copy
-	panel->separator_list = g_list_copy_deep(panel_config.separator_list, copy_separator, NULL);
+    panel->separator_list = g_list_copy_deep(panel_config.separator_list, copy_separator, NULL);
 
-	for (GList *l = panel->separator_list; l; l = l->next) {
+    for (GList *l = panel->separator_list; l; l = l->next) {
-		Separator *separator = (Separator *)l->data;
+        Separator *separator = (Separator *)l->data;
-		if (!separator->area.bg)
+        if (!separator->area.bg)
-			separator->area.bg = &g_array_index(backgrounds, Background, 0);
+            separator->area.bg = &g_array_index(backgrounds, Background, 0);
-		separator->area.parent = p;
+        separator->area.parent = p;
-		separator->area.panel = p;
+        separator->area.panel = p;
-		snprintf(separator->area.name, sizeof(separator->area.name), "separator");
+        snprintf(separator->area.name, sizeof(separator->area.name), "separator");
-		separator->area.size_mode = LAYOUT_FIXED;
+        separator->area.size_mode = LAYOUT_FIXED;
-		separator->area.resize_needed = 1;
+        separator->area.resize_needed = 1;
-		separator->area.on_screen = TRUE;
+        separator->area.on_screen = TRUE;
-		separator->area._resize = resize_separator;
+        separator->area._resize = resize_separator;
-		separator->area._compute_desired_size = separator_compute_desired_size;
+        separator->area._compute_desired_size = separator_compute_desired_size;
-		separator->area._draw_foreground = draw_separator;
+        separator->area._draw_foreground = draw_separator;
-		instantiate_area_gradients(&separator->area);
+        instantiate_area_gradients(&separator->area);
-	}
+    }
 }
 
 void cleanup_separator()
 {
-	// Cleanup frontends
+    // Cleanup frontends
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		g_list_free_full(panels[i].separator_list, destroy_separator);
+        g_list_free_full(panels[i].separator_list, destroy_separator);
-		panels[i].separator_list = NULL;
+        panels[i].separator_list = NULL;
-	}
+    }
 
-	// Cleanup backends
+    // Cleanup backends
-	g_list_free_full(panel_config.separator_list, destroy_separator);
+    g_list_free_full(panel_config.separator_list, destroy_separator);
-	panel_config.separator_list = NULL;
+    panel_config.separator_list = NULL;
 }
 
 int separator_compute_desired_size(void *obj)
 {
-	Separator *separator = (Separator *)obj;
+    Separator *separator = (Separator *)obj;
-	if (!separator->area.on_screen)
+    if (!separator->area.on_screen)
-		return 0;
+        return 0;
 
-	if (panel_horizontal)
+    if (panel_horizontal)
-		return separator->thickness + 2 * separator->area.paddingxlr + left_right_border_width(&separator->area);
+        return separator->thickness + 2 * separator->area.paddingxlr + left_right_border_width(&separator->area);
-	else
+    else
-		return separator->thickness + 2 * separator->area.paddingxlr + top_bottom_border_width(&separator->area);
+        return separator->thickness + 2 * separator->area.paddingxlr + top_bottom_border_width(&separator->area);
 }
 
 gboolean resize_separator(void *obj)
 {
-	Separator *separator = (Separator *)obj;
+    Separator *separator = (Separator *)obj;
-	if (!separator->area.on_screen)
+    if (!separator->area.on_screen)
-		return FALSE;
+        return FALSE;
 
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		separator->area.width =
+        separator->area.width =
-		    separator->thickness + 2 * separator->area.paddingxlr + left_right_border_width(&separator->area);
+            separator->thickness + 2 * separator->area.paddingxlr + left_right_border_width(&separator->area);
-		separator->length =
+        separator->length =
-		    separator->area.height - 2 * separator->area.paddingy - top_bottom_border_width(&separator->area);
+            separator->area.height - 2 * separator->area.paddingy - top_bottom_border_width(&separator->area);
-	} else {
+    } else {
-		separator->area.height =
+        separator->area.height =
-		    separator->thickness + 2 * separator->area.paddingxlr + top_bottom_border_width(&separator->area);
+            separator->thickness + 2 * separator->area.paddingxlr + top_bottom_border_width(&separator->area);
-		separator->length =
+        separator->length =
-		    separator->area.width - 2 * separator->area.paddingy - left_right_border_width(&separator->area);
+            separator->area.width - 2 * separator->area.paddingy - left_right_border_width(&separator->area);
-	}
+    }
 
-	schedule_redraw(&separator->area);
+    schedule_redraw(&separator->area);
-	schedule_panel_redraw();
+    schedule_panel_redraw();
-	return TRUE;
+    return TRUE;
 }
 
 void draw_separator_line(void *obj, cairo_t *c);
@@ -152,80 +152,80 @@ void draw_separator_dots(void *obj, cairo_t *c);
 
 void draw_separator(void *obj, cairo_t *c)
 {
-	Separator *separator = (Separator *)obj;
+    Separator *separator = (Separator *)obj;
 
-	if (separator->style == SEPARATOR_EMPTY)
+    if (separator->style == SEPARATOR_EMPTY)
-		return;
+        return;
-	else if (separator->style == SEPARATOR_LINE)
+    else if (separator->style == SEPARATOR_LINE)
-		draw_separator_line(separator, c);
+        draw_separator_line(separator, c);
-	else if (separator->style == SEPARATOR_DOTS)
+    else if (separator->style == SEPARATOR_DOTS)
-		draw_separator_dots(separator, c);
+        draw_separator_dots(separator, c);
 }
 
 void draw_separator_line(void *obj, cairo_t *c)
 {
-	Separator *separator = (Separator *)obj;
+    Separator *separator = (Separator *)obj;
 
-	if (separator->thickness <= 0)
+    if (separator->thickness <= 0)
-		return;
+        return;
 
-	cairo_set_source_rgba(c,
+    cairo_set_source_rgba(c,
-	                      separator->color.rgb[0],
+                          separator->color.rgb[0],
-	                      separator->color.rgb[1],
+                          separator->color.rgb[1],
-	                      separator->color.rgb[2],
+                          separator->color.rgb[2],
-	                      separator->color.alpha);
+                          separator->color.alpha);
-	cairo_set_line_width(c, separator->thickness);
+    cairo_set_line_width(c, separator->thickness);
-	cairo_set_line_cap(c, CAIRO_LINE_CAP_ROUND);
+    cairo_set_line_cap(c, CAIRO_LINE_CAP_ROUND);
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		cairo_move_to(c, separator->area.width / 2.0, separator->area.height / 2.0 - separator->length / 2.0);
+        cairo_move_to(c, separator->area.width / 2.0, separator->area.height / 2.0 - separator->length / 2.0);
-		cairo_line_to(c, separator->area.width / 2.0, separator->area.height / 2.0 + separator->length / 2.0);
+        cairo_line_to(c, separator->area.width / 2.0, separator->area.height / 2.0 + separator->length / 2.0);
-	} else {
+    } else {
-		cairo_move_to(c, separator->area.width / 2.0 - separator->length / 2.0, separator->area.height / 2.0);
+        cairo_move_to(c, separator->area.width / 2.0 - separator->length / 2.0, separator->area.height / 2.0);
-		cairo_line_to(c, separator->area.width / 2.0 + separator->length / 2.0, separator->area.height / 2.0);
+        cairo_line_to(c, separator->area.width / 2.0 + separator->length / 2.0, separator->area.height / 2.0);
-	}
+    }
-	cairo_stroke(c);
+    cairo_stroke(c);
 }
 
 void draw_separator_dots(void *obj, cairo_t *c)
 {
-	const double PI = 3.14159265359;
+    const double PI = 3.14159265359;
-	Separator *separator = (Separator *)obj;
+    Separator *separator = (Separator *)obj;
-	if (separator->thickness <= 0)
+    if (separator->thickness <= 0)
-		return;
+        return;
 
-	cairo_set_source_rgba(c,
+    cairo_set_source_rgba(c,
-	                      separator->color.rgb[0],
+                          separator->color.rgb[0],
-	                      separator->color.rgb[1],
+                          separator->color.rgb[1],
-	                      separator->color.rgb[2],
+                          separator->color.rgb[2],
-	                      separator->color.alpha);
+                          separator->color.alpha);
-	cairo_set_line_width(c, 0);
+    cairo_set_line_width(c, 0);
 
-	int num_circles = separator->length / (1.618 * separator->thickness - 1);
+    int num_circles = separator->length / (1.618 * separator->thickness - 1);
-	double spacing = (separator->length - num_circles * separator->thickness) / MAX(1.0, num_circles - 1.0);
+    double spacing = (separator->length - num_circles * separator->thickness) / MAX(1.0, num_circles - 1.0);
-	if (spacing > separator->thickness)
+    if (spacing > separator->thickness)
-		num_circles++;
+        num_circles++;
-	spacing = (separator->length - num_circles * separator->thickness) / MAX(1.0, num_circles - 1.0);
+    spacing = (separator->length - num_circles * separator->thickness) / MAX(1.0, num_circles - 1.0);
-	double offset = (panel_horizontal ? separator->area.height : separator->area.width) / 2.0 - separator->length / 2.0;
+    double offset = (panel_horizontal ? separator->area.height : separator->area.width) / 2.0 - separator->length / 2.0;
-	if (num_circles == 1)
+    if (num_circles == 1)
-		offset += spacing / 2.0;
+        offset += spacing / 2.0;
-	for (int i = 0; i < num_circles; i++) {
+    for (int i = 0; i < num_circles; i++) {
-		if (panel_horizontal) {
+        if (panel_horizontal) {
-			cairo_arc(c,
+            cairo_arc(c,
-					  separator->area.width / 2.0,
+                      separator->area.width / 2.0,
-					  offset + separator->thickness / 2.0,
+                      offset + separator->thickness / 2.0,
-					  separator->thickness / 2.0,
+                      separator->thickness / 2.0,
-					  0,
+                      0,
-					  2 * PI);
+                      2 * PI);
-		} else {
+        } else {
-			cairo_arc(c,
+            cairo_arc(c,
-					  offset + separator->thickness / 2.0,
+                      offset + separator->thickness / 2.0,
-					  separator->area.height / 2.0,
+                      separator->area.height / 2.0,
-					  separator->thickness / 2.0,
+                      separator->thickness / 2.0,
-					  0,
+                      0,
-					  2 * PI);
+                      2 * PI);
-		}
+        }
-		cairo_stroke_preserve(c);
+        cairo_stroke_preserve(c);
-		cairo_fill(c);
+        cairo_fill(c);
-		offset += separator->thickness + spacing;
+        offset += separator->thickness + spacing;
-	}
+    }
 }

src/separator/separator.h

@@ -7,18 +7,14 @@
 #include "common.h"
 #include "area.h"
 
-typedef enum SeparatorStyle {
+typedef enum SeparatorStyle { SEPARATOR_EMPTY = 0, SEPARATOR_LINE, SEPARATOR_DOTS } SeparatorStyle;
-	SEPARATOR_EMPTY = 0,
-	SEPARATOR_LINE,
-	SEPARATOR_DOTS
-} SeparatorStyle;
 
 typedef struct Separator {
-	Area area;
+    Area area;
-	SeparatorStyle style;
+    SeparatorStyle style;
-	Color color;
+    Color color;
-	int thickness;
+    int thickness;
-	int length;
+    int length;
 } Separator;
 
 Separator *create_separator();

src/server.h

@@ -21,123 +21,123 @@
 extern gboolean primary_monitor_first;
 
 typedef struct Global_atom {
-	Atom _XROOTPMAP_ID;
+    Atom _XROOTPMAP_ID;
-	Atom _XROOTMAP_ID;
+    Atom _XROOTMAP_ID;
-	Atom _NET_CURRENT_DESKTOP;
+    Atom _NET_CURRENT_DESKTOP;
-	Atom _NET_NUMBER_OF_DESKTOPS;
+    Atom _NET_NUMBER_OF_DESKTOPS;
-	Atom _NET_DESKTOP_NAMES;
+    Atom _NET_DESKTOP_NAMES;
-	Atom _NET_DESKTOP_GEOMETRY;
+    Atom _NET_DESKTOP_GEOMETRY;
-	Atom _NET_DESKTOP_VIEWPORT;
+    Atom _NET_DESKTOP_VIEWPORT;
-	Atom _NET_WORKAREA;
+    Atom _NET_WORKAREA;
-	Atom _NET_ACTIVE_WINDOW;
+    Atom _NET_ACTIVE_WINDOW;
-	Atom _NET_WM_WINDOW_TYPE;
+    Atom _NET_WM_WINDOW_TYPE;
-	Atom _NET_WM_STATE_SKIP_PAGER;
+    Atom _NET_WM_STATE_SKIP_PAGER;
-	Atom _NET_WM_STATE_SKIP_TASKBAR;
+    Atom _NET_WM_STATE_SKIP_TASKBAR;
-	Atom _NET_WM_STATE_STICKY;
+    Atom _NET_WM_STATE_STICKY;
-	Atom _NET_WM_STATE_DEMANDS_ATTENTION;
+    Atom _NET_WM_STATE_DEMANDS_ATTENTION;
-	Atom _NET_WM_WINDOW_TYPE_DOCK;
+    Atom _NET_WM_WINDOW_TYPE_DOCK;
-	Atom _NET_WM_WINDOW_TYPE_DESKTOP;
+    Atom _NET_WM_WINDOW_TYPE_DESKTOP;
-	Atom _NET_WM_WINDOW_TYPE_TOOLBAR;
+    Atom _NET_WM_WINDOW_TYPE_TOOLBAR;
-	Atom _NET_WM_WINDOW_TYPE_MENU;
+    Atom _NET_WM_WINDOW_TYPE_MENU;
-	Atom _NET_WM_WINDOW_TYPE_SPLASH;
+    Atom _NET_WM_WINDOW_TYPE_SPLASH;
-	Atom _NET_WM_WINDOW_TYPE_DIALOG;
+    Atom _NET_WM_WINDOW_TYPE_DIALOG;
-	Atom _NET_WM_WINDOW_TYPE_NORMAL;
+    Atom _NET_WM_WINDOW_TYPE_NORMAL;
-	Atom _NET_WM_DESKTOP;
+    Atom _NET_WM_DESKTOP;
-	Atom WM_STATE;
+    Atom WM_STATE;
-	Atom _NET_WM_STATE;
+    Atom _NET_WM_STATE;
-	Atom _NET_WM_STATE_MAXIMIZED_VERT;
+    Atom _NET_WM_STATE_MAXIMIZED_VERT;
-	Atom _NET_WM_STATE_MAXIMIZED_HORZ;
+    Atom _NET_WM_STATE_MAXIMIZED_HORZ;
-	Atom _NET_WM_STATE_SHADED;
+    Atom _NET_WM_STATE_SHADED;
-	Atom _NET_WM_STATE_HIDDEN;
+    Atom _NET_WM_STATE_HIDDEN;
-	Atom _NET_WM_STATE_BELOW;
+    Atom _NET_WM_STATE_BELOW;
-	Atom _NET_WM_STATE_ABOVE;
+    Atom _NET_WM_STATE_ABOVE;
-	Atom _NET_WM_STATE_MODAL;
+    Atom _NET_WM_STATE_MODAL;
-	Atom _NET_CLIENT_LIST;
+    Atom _NET_CLIENT_LIST;
-	Atom _NET_WM_NAME;
+    Atom _NET_WM_NAME;
-	Atom _NET_WM_VISIBLE_NAME;
+    Atom _NET_WM_VISIBLE_NAME;
-	Atom _NET_WM_STRUT;
+    Atom _NET_WM_STRUT;
-	Atom _NET_WM_ICON;
+    Atom _NET_WM_ICON;
-	Atom _NET_WM_ICON_GEOMETRY;
+    Atom _NET_WM_ICON_GEOMETRY;
-	Atom _NET_WM_ICON_NAME;
+    Atom _NET_WM_ICON_NAME;
-	Atom _NET_CLOSE_WINDOW;
+    Atom _NET_CLOSE_WINDOW;
-	Atom UTF8_STRING;
+    Atom UTF8_STRING;
-	Atom _NET_SUPPORTING_WM_CHECK;
+    Atom _NET_SUPPORTING_WM_CHECK;
-	Atom _NET_WM_CM_S0;
+    Atom _NET_WM_CM_S0;
-	Atom _NET_WM_STRUT_PARTIAL;
+    Atom _NET_WM_STRUT_PARTIAL;
-	Atom WM_NAME;
+    Atom WM_NAME;
-	Atom __SWM_VROOT;
+    Atom __SWM_VROOT;
-	Atom _MOTIF_WM_HINTS;
+    Atom _MOTIF_WM_HINTS;
-	Atom WM_HINTS;
+    Atom WM_HINTS;
-	Atom _NET_SYSTEM_TRAY_SCREEN;
+    Atom _NET_SYSTEM_TRAY_SCREEN;
-	Atom _NET_SYSTEM_TRAY_OPCODE;
+    Atom _NET_SYSTEM_TRAY_OPCODE;
-	Atom MANAGER;
+    Atom MANAGER;
-	Atom _NET_SYSTEM_TRAY_MESSAGE_DATA;
+    Atom _NET_SYSTEM_TRAY_MESSAGE_DATA;
-	Atom _NET_SYSTEM_TRAY_ORIENTATION;
+    Atom _NET_SYSTEM_TRAY_ORIENTATION;
-	Atom _NET_SYSTEM_TRAY_ICON_SIZE;
+    Atom _NET_SYSTEM_TRAY_ICON_SIZE;
-	Atom _NET_SYSTEM_TRAY_PADDING;
+    Atom _NET_SYSTEM_TRAY_PADDING;
-	Atom _XEMBED;
+    Atom _XEMBED;
-	Atom _XEMBED_INFO;
+    Atom _XEMBED_INFO;
-	Atom _NET_WM_PID;
+    Atom _NET_WM_PID;
-	Atom _XSETTINGS_SCREEN;
+    Atom _XSETTINGS_SCREEN;
-	Atom _XSETTINGS_SETTINGS;
+    Atom _XSETTINGS_SETTINGS;
-	Atom XdndAware;
+    Atom XdndAware;
-	Atom XdndEnter;
+    Atom XdndEnter;
-	Atom XdndPosition;
+    Atom XdndPosition;
-	Atom XdndStatus;
+    Atom XdndStatus;
-	Atom XdndDrop;
+    Atom XdndDrop;
-	Atom XdndLeave;
+    Atom XdndLeave;
-	Atom XdndSelection;
+    Atom XdndSelection;
-	Atom XdndTypeList;
+    Atom XdndTypeList;
-	Atom XdndActionCopy;
+    Atom XdndActionCopy;
-	Atom XdndFinished;
+    Atom XdndFinished;
-	Atom TARGETS;
+    Atom TARGETS;
 } Global_atom;
 
 typedef struct Monitor {
-	int x;
+    int x;
-	int y;
+    int y;
-	int width;
+    int width;
-	int height;
+    int height;
-	gboolean primary;
+    gboolean primary;
-	gchar **names;
+    gchar **names;
 } Monitor;
 
 typedef struct Viewport {
-	int x;
+    int x;
-	int y;
+    int y;
-	int width;
+    int width;
-	int height;
+    int height;
 } Viewport;
 
 typedef struct Server {
-	Display *display;
+    Display *display;
-	Window root_win;
+    Window root_win;
-	Window composite_manager;
+    Window composite_manager;
-	gboolean real_transparency;
+    gboolean real_transparency;
-	gboolean disable_transparency;
+    gboolean disable_transparency;
-	// current desktop
+    // current desktop
-	int desktop;
+    int desktop;
-	int screen;
+    int screen;
-	int depth;
+    int depth;
-	int num_desktops;
+    int num_desktops;
-	// number of monitor (without monitor included into another one)
+    // number of monitor (without monitor included into another one)
-	int num_monitors;
+    int num_monitors;
-	// Non-null only if WM uses viewports (compiz) and number of viewports > 1.
+    // Non-null only if WM uses viewports (compiz) and number of viewports > 1.
-	// In that case there are num_desktops viewports.
+    // In that case there are num_desktops viewports.
-	Viewport *viewports;
+    Viewport *viewports;
-	Monitor *monitors;
+    Monitor *monitors;
-	gboolean got_root_win;
+    gboolean got_root_win;
-	Visual *visual;
+    Visual *visual;
-	Visual *visual32;
+    Visual *visual32;
-	// root background
+    // root background
-	Pixmap root_pmap;
+    Pixmap root_pmap;
-	GC gc;
+    GC gc;
-	Colormap colormap;
+    Colormap colormap;
-	Colormap colormap32;
+    Colormap colormap32;
-	Global_atom atom;
+    Global_atom atom;
 #ifdef HAVE_SN
-	SnDisplay *sn_display;
+    SnDisplay *sn_display;
-	GTree *pids;
+    GTree *pids;
 #endif // HAVE_SN
 } Server;
 

src/systray/systraybar.h

@@ -21,50 +21,50 @@
 #define XEMBED_MAPPED (1 << 0)
 
 typedef enum SystraySortMethod {
-	SYSTRAY_SORT_ASCENDING = 0,
+    SYSTRAY_SORT_ASCENDING = 0,
-	SYSTRAY_SORT_DESCENDING,
+    SYSTRAY_SORT_DESCENDING,
-	SYSTRAY_SORT_LEFT2RIGHT,
+    SYSTRAY_SORT_LEFT2RIGHT,
-	SYSTRAY_SORT_RIGHT2LEFT,
+    SYSTRAY_SORT_RIGHT2LEFT,
 } SystraySortMethod;
 
 typedef struct {
-	// always start with area
+    // always start with area
-	Area area;
+    Area area;
 
-	GSList *list_icons;
+    GSList *list_icons;
-	SystraySortMethod sort;
+    SystraySortMethod sort;
-	int alpha, saturation, brightness;
+    int alpha, saturation, brightness;
-	int icon_size, icons_per_column, icons_per_row, margin;
+    int icon_size, icons_per_column, icons_per_row, margin;
 } Systray;
 
 typedef struct {
-	// The actual tray icon window (created by the application)
+    // The actual tray icon window (created by the application)
-	Window win;
+    Window win;
-	// The parent window created by tint2 to embed the icon
+    // The parent window created by tint2 to embed the icon
-	Window parent;
+    Window parent;
-	int x, y;
+    int x, y;
-	int width, height;
+    int width, height;
-	int depth;
+    int depth;
-	gboolean reparented;
+    gboolean reparented;
-	gboolean embedded;
+    gboolean embedded;
-	// Process PID or zero.
+    // Process PID or zero.
-	int pid;
+    int pid;
-	// A number that is incremented for each new icon, used to sort them by the order in which they were created.
+    // A number that is incremented for each new icon, used to sort them by the order in which they were created.
-	int chrono;
+    int chrono;
-	// Name of the tray icon window.
+    // Name of the tray icon window.
-	char *name;
+    char *name;
-	// Members used for rendering
+    // Members used for rendering
-	struct timespec time_last_render;
+    struct timespec time_last_render;
-	int num_fast_renders;
+    int num_fast_renders;
-	timeout *render_timeout;
+    timeout *render_timeout;
-	// Members used for resizing
+    // Members used for resizing
-	int bad_size_counter;
+    int bad_size_counter;
-	struct timespec time_last_resize;
+    struct timespec time_last_resize;
-	timeout *resize_timeout;
+    timeout *resize_timeout;
-	// Icon contents if we are compositing the icon, otherwise null
+    // Icon contents if we are compositing the icon, otherwise null
-	Imlib_Image image;
+    Imlib_Image image;
-	// XDamage
+    // XDamage
-	Damage damage;
+    Damage damage;
 } TrayWindow;
 
 // net_sel_win != None when protocol started

src/taskbar/task.h

@@ -14,65 +14,65 @@
 #include "timer.h"
 
 typedef enum TaskState {
-	TASK_NORMAL = 0,
+    TASK_NORMAL = 0,
-	TASK_ACTIVE,
+    TASK_ACTIVE,
-	TASK_ICONIFIED,
+    TASK_ICONIFIED,
-	TASK_URGENT,
+    TASK_URGENT,
-	TASK_UNDEFINED,
+    TASK_UNDEFINED,
-	TASK_STATE_COUNT,
+    TASK_STATE_COUNT,
 } TaskState;
 
 typedef struct GlobalTask {
-	Area area;
+    Area area;
-	gboolean has_text;
+    gboolean has_text;
-	gboolean has_icon;
+    gboolean has_icon;
-	gboolean centered;
+    gboolean centered;
-	int icon_posy;
+    int icon_posy;
-	int icon_size1;
+    int icon_size1;
-	int maximum_width;
+    int maximum_width;
-	int maximum_height;
+    int maximum_height;
-	int alpha[TASK_STATE_COUNT];
+    int alpha[TASK_STATE_COUNT];
-	int saturation[TASK_STATE_COUNT];
+    int saturation[TASK_STATE_COUNT];
-	int brightness[TASK_STATE_COUNT];
+    int brightness[TASK_STATE_COUNT];
-	int config_asb_mask;
+    int config_asb_mask;
-	Background *background[TASK_STATE_COUNT];
+    Background *background[TASK_STATE_COUNT];
-	GList *gradient[TASK_STATE_COUNT];
+    GList *gradient[TASK_STATE_COUNT];
-	int config_background_mask;
+    int config_background_mask;
-	// starting position for text ~ task_padding + task_border + icon_size
+    // starting position for text ~ task_padding + task_border + icon_size
-	double text_posx, text_height;
+    double text_posx, text_height;
-	gboolean has_font;
+    gboolean has_font;
-	PangoFontDescription *font_desc;
+    PangoFontDescription *font_desc;
-	Color font[TASK_STATE_COUNT];
+    Color font[TASK_STATE_COUNT];
-	int config_font_mask;
+    int config_font_mask;
-	gboolean tooltip_enabled;
+    gboolean tooltip_enabled;
 } GlobalTask;
 
 // Stores information about a task.
 // Warning: any dynamically allocated members are shared between the Task instances created for the same window
 // (if the task appears on all desktops, there will be a different instance on each desktop's taskbar).
 typedef struct Task {
-	Area area;
+    Area area;
-	Window win;
+    Window win;
-	int desktop;
+    int desktop;
-	TaskState current_state;
+    TaskState current_state;
-	Imlib_Image icon[TASK_STATE_COUNT];
+    Imlib_Image icon[TASK_STATE_COUNT];
-	Imlib_Image icon_hover[TASK_STATE_COUNT];
+    Imlib_Image icon_hover[TASK_STATE_COUNT];
-	Imlib_Image icon_press[TASK_STATE_COUNT];
+    Imlib_Image icon_press[TASK_STATE_COUNT];
-	unsigned int icon_width;
+    unsigned int icon_width;
-	unsigned int icon_height;
+    unsigned int icon_height;
-	char *title;
+    char *title;
-	int urgent_tick;
+    int urgent_tick;
-	// These may not be up-to-date
+    // These may not be up-to-date
-	int win_x;
+    int win_x;
-	int win_y;
+    int win_y;
-	int win_w;
+    int win_w;
-	int win_h;
+    int win_h;
-	struct timespec last_activation_time;
+    struct timespec last_activation_time;
-	int _text_width;
+    int _text_width;
-	int _text_height;
+    int _text_height;
-	double _text_posy;
+    double _text_posy;
-	int _icon_x;
+    int _icon_x;
-	int _icon_y;
+    int _icon_y;
 } Task;
 
 extern timeout *urgent_timeout;

src/taskbar/taskbar.h

@@ -12,39 +12,39 @@
 #include "taskbarname.h"
 
 typedef enum TaskbarState {
-	TASKBAR_NORMAL = 0,
+    TASKBAR_NORMAL = 0,
-	TASKBAR_ACTIVE,
+    TASKBAR_ACTIVE,
-	TASKBAR_STATE_COUNT,
+    TASKBAR_STATE_COUNT,
 } TaskbarState;
 
 typedef enum TaskbarSortMethod {
-	TASKBAR_NOSORT = 0,
+    TASKBAR_NOSORT = 0,
-	TASKBAR_SORT_CENTER,
+    TASKBAR_SORT_CENTER,
-	TASKBAR_SORT_TITLE,
+    TASKBAR_SORT_TITLE,
-	TASKBAR_SORT_LRU,
+    TASKBAR_SORT_LRU,
-	TASKBAR_SORT_MRU,
+    TASKBAR_SORT_MRU,
 } TaskbarSortMethod;
 
 typedef struct {
-	Area area;
+    Area area;
-	gchar *name;
+    gchar *name;
-	int posy;
+    int posy;
 } TaskbarName;
 
 typedef struct {
-	Area area;
+    Area area;
-	int desktop;
+    int desktop;
-	TaskbarName bar_name;
+    TaskbarName bar_name;
-	int text_width;
+    int text_width;
 } Taskbar;
 
 typedef struct GlobalTaskbar {
-	Area area;
+    Area area;
-	Area area_name;
+    Area area_name;
-	Background *background[TASKBAR_STATE_COUNT];
+    Background *background[TASKBAR_STATE_COUNT];
-	Background *background_name[TASKBAR_STATE_COUNT];
+    Background *background_name[TASKBAR_STATE_COUNT];
-	GList *gradient[TASKBAR_STATE_COUNT];
+    GList *gradient[TASKBAR_STATE_COUNT];
-	GList *gradient_name[TASKBAR_STATE_COUNT];
+    GList *gradient_name[TASKBAR_STATE_COUNT];
 } GlobalTaskbar;
 
 extern gboolean taskbar_enabled;
@@ -88,6 +88,8 @@ void set_taskbar_state(Taskbar *taskbar, TaskbarState state);
 // Updates the visibility of all taskbars
 void update_all_taskbars_visibility();
 
+void update_minimized_icon_positions(void *p);
+
 // Sorts the taskbar(s) on which the window is present.
 void sort_taskbar_for_win(Window win);
 

src/taskbar/taskbarname.c

@@ -41,176 +41,176 @@ int taskbarname_compute_desired_size(void *obj);
 
 void default_taskbarname()
 {
-	taskbarname_enabled = FALSE;
+    taskbarname_enabled = FALSE;
 }
 
 void init_taskbarname_panel(void *p)
 {
-	if (!taskbarname_enabled)
+    if (!taskbarname_enabled)
-		return;
+        return;
 
-	Panel *panel = (Panel *)p;
+    Panel *panel = (Panel *)p;
 
-	taskbarname_init_fonts();
+    taskbarname_init_fonts();
 
-	GSList *list = get_desktop_names();
+    GSList *list = get_desktop_names();
-	GSList *l = list;
+    GSList *l = list;
-	for (int j = 0; j < panel->num_desktops; j++) {
+    for (int j = 0; j < panel->num_desktops; j++) {
-		Taskbar *taskbar = &panel->taskbar[j];
+        Taskbar *taskbar = &panel->taskbar[j];
-		memcpy(&taskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
+        memcpy(&taskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
-		taskbar->bar_name.area.parent = taskbar;
+        taskbar->bar_name.area.parent = taskbar;
-		taskbar->bar_name.area.has_mouse_over_effect = panel_config.mouse_effects;
+        taskbar->bar_name.area.has_mouse_over_effect = panel_config.mouse_effects;
-		taskbar->bar_name.area.has_mouse_press_effect = panel_config.mouse_effects;
+        taskbar->bar_name.area.has_mouse_press_effect = panel_config.mouse_effects;
-		taskbar->bar_name.area._compute_desired_size = taskbarname_compute_desired_size;
+        taskbar->bar_name.area._compute_desired_size = taskbarname_compute_desired_size;
-		if (j == server.desktop) {
+        if (j == server.desktop) {
-			taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
+            taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
-		} else {
+        } else {
-			taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
+            taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
-		}
+        }
 
-		// use desktop number if name is missing
+        // use desktop number if name is missing
-		if (l) {
+        if (l) {
-			taskbar->bar_name.name = g_strdup(l->data);
+            taskbar->bar_name.name = g_strdup(l->data);
-			l = l->next;
+            l = l->next;
-		} else {
+        } else {
-			taskbar->bar_name.name = g_strdup_printf("%d", j + 1);
+            taskbar->bar_name.name = g_strdup_printf("%d", j + 1);
-		}
+        }
 
-		// append the name at the beginning of taskbar
+        // append the name at the beginning of taskbar
-		taskbar->area.children = g_list_append(taskbar->area.children, &taskbar->bar_name);
+        taskbar->area.children = g_list_append(taskbar->area.children, &taskbar->bar_name);
-		instantiate_area_gradients(&taskbar->bar_name.area);
+        instantiate_area_gradients(&taskbar->bar_name.area);
-	}
+    }
 
-	for (l = list; l; l = l->next)
+    for (l = list; l; l = l->next)
-		g_free(l->data);
+        g_free(l->data);
-	g_slist_free(list);
+    g_slist_free(list);
 }
 
 void taskbarname_init_fonts()
 {
-	if (!panel_config.taskbarname_font_desc) {
+    if (!panel_config.taskbarname_font_desc) {
-		panel_config.taskbarname_font_desc = pango_font_description_from_string(get_default_font());
+        panel_config.taskbarname_font_desc = pango_font_description_from_string(get_default_font());
-		pango_font_description_set_weight(panel_config.taskbarname_font_desc, PANGO_WEIGHT_BOLD);
+        pango_font_description_set_weight(panel_config.taskbarname_font_desc, PANGO_WEIGHT_BOLD);
-	}
+    }
 }
 
 void taskbarname_default_font_changed()
 {
-	if (!taskbar_enabled)
+    if (!taskbar_enabled)
-		return;
+        return;
-	if (!taskbarname_enabled)
+    if (!taskbarname_enabled)
-		return;
+        return;
-	if (panel_config.taskbarname_has_font)
+    if (panel_config.taskbarname_has_font)
-		return;
+        return;
 
-	pango_font_description_free(panel_config.taskbarname_font_desc);
+    pango_font_description_free(panel_config.taskbarname_font_desc);
-	panel_config.taskbarname_font_desc = NULL;
+    panel_config.taskbarname_font_desc = NULL;
-	taskbarname_init_fonts();
+    taskbarname_init_fonts();
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		for (int j = 0; j < panels[i].num_desktops; j++) {
+        for (int j = 0; j < panels[i].num_desktops; j++) {
-			Taskbar *taskbar = &panels[i].taskbar[j];
+            Taskbar *taskbar = &panels[i].taskbar[j];
-			taskbar->bar_name.area.resize_needed = TRUE;
+            taskbar->bar_name.area.resize_needed = TRUE;
-			schedule_redraw(&taskbar->bar_name.area);
+            schedule_redraw(&taskbar->bar_name.area);
-		}
+        }
-	}
+    }
-	schedule_panel_redraw();
+    schedule_panel_redraw();
 }
 
 void cleanup_taskbarname()
 {
-	for (int i = 0; i < num_panels; i++) {
+    for (int i = 0; i < num_panels; i++) {
-		Panel *panel = &panels[i];
+        Panel *panel = &panels[i];
-		for (int j = 0; j < panel->num_desktops; j++) {
+        for (int j = 0; j < panel->num_desktops; j++) {
-			Taskbar *taskbar = &panel->taskbar[j];
+            Taskbar *taskbar = &panel->taskbar[j];
-			g_free(taskbar->bar_name.name);
+            g_free(taskbar->bar_name.name);
-			taskbar->bar_name.name = NULL;
+            taskbar->bar_name.name = NULL;
-			free_area(&taskbar->bar_name.area);
+            free_area(&taskbar->bar_name.area);
-			remove_area((Area *)&taskbar->bar_name);
+            remove_area((Area *)&taskbar->bar_name);
-		}
+        }
-	}
+    }
 }
 
 int taskbarname_compute_desired_size(void *obj)
 {
-	TaskbarName *taskbar_name = (TaskbarName *)obj;
+    TaskbarName *taskbar_name = (TaskbarName *)obj;
-	Panel *panel = (Panel *)taskbar_name->area.panel;
+    Panel *panel = (Panel *)taskbar_name->area.panel;
-	int name_height, name_width, name_height_ink;
+    int name_height, name_width, name_height_ink;
-	get_text_size2(panel_config.taskbarname_font_desc,
+    get_text_size2(panel_config.taskbarname_font_desc,
-				   &name_height_ink,
+                   &name_height_ink,
-				   &name_height,
+                   &name_height,
-				   &name_width,
+                   &name_width,
-				   panel->area.height,
+                   panel->area.height,
-				   panel->area.width,
+                   panel->area.width,
-				   taskbar_name->name,
+                   taskbar_name->name,
-				   strlen(taskbar_name->name),
+                   strlen(taskbar_name->name),
-				   PANGO_WRAP_WORD_CHAR,
+                   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE,
+                   PANGO_ELLIPSIZE_NONE,
-				   FALSE);
+                   FALSE);
 
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		return name_width + 2 * taskbar_name->area.paddingxlr + left_right_border_width(&taskbar_name->area);
+        return name_width + 2 * taskbar_name->area.paddingxlr + left_right_border_width(&taskbar_name->area);
-	} else {
+    } else {
-		return name_height + 2 * taskbar_name->area.paddingxlr + top_bottom_border_width(&taskbar_name->area);
+        return name_height + 2 * taskbar_name->area.paddingxlr + top_bottom_border_width(&taskbar_name->area);
-	}
+    }
 }
 
 gboolean resize_taskbarname(void *obj)
 {
-	TaskbarName *taskbar_name = (TaskbarName *)obj;
+    TaskbarName *taskbar_name = (TaskbarName *)obj;
-	Panel *panel = (Panel *)taskbar_name->area.panel;
+    Panel *panel = (Panel *)taskbar_name->area.panel;
 
-	schedule_redraw(&taskbar_name->area);
+    schedule_redraw(&taskbar_name->area);
 
-	int name_height, name_width, name_height_ink;
+    int name_height, name_width, name_height_ink;
-	get_text_size2(panel_config.taskbarname_font_desc,
+    get_text_size2(panel_config.taskbarname_font_desc,
-				   &name_height_ink,
+                   &name_height_ink,
-				   &name_height,
+                   &name_height,
-				   &name_width,
+                   &name_width,
-				   panel->area.height,
+                   panel->area.height,
-				   panel->area.width,
+                   panel->area.width,
-				   taskbar_name->name,
+                   taskbar_name->name,
-				   strlen(taskbar_name->name),
+                   strlen(taskbar_name->name),
-				   PANGO_WRAP_WORD_CHAR,
+                   PANGO_WRAP_WORD_CHAR,
-				   PANGO_ELLIPSIZE_NONE,
+                   PANGO_ELLIPSIZE_NONE,
-				   FALSE);
+                   FALSE);
 
-	gboolean result = FALSE;
+    gboolean result = FALSE;
-	int new_size = taskbarname_compute_desired_size(obj);
+    int new_size = taskbarname_compute_desired_size(obj);
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		if (new_size != taskbar_name->area.width) {
+        if (new_size != taskbar_name->area.width) {
-			taskbar_name->area.width = new_size;
+            taskbar_name->area.width = new_size;
-			taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
+            taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
-			result = TRUE;
+            result = TRUE;
-		}
+        }
-	} else {
+    } else {
-		if (new_size != taskbar_name->area.height) {
+        if (new_size != taskbar_name->area.height) {
-			taskbar_name->area.height = new_size;
+            taskbar_name->area.height = new_size;
-			taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
+            taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
-			result = TRUE;
+            result = TRUE;
-		}
+        }
-	}
+    }
-	return result;
+    return result;
 }
 
 void draw_taskbarname(void *obj, cairo_t *c)
 {
-	TaskbarName *taskbar_name = obj;
+    TaskbarName *taskbar_name = obj;
-	Taskbar *taskbar = taskbar_name->area.parent;
+    Taskbar *taskbar = taskbar_name->area.parent;
-	Color *config_text = (taskbar->desktop == server.desktop) ? &taskbarname_active_font : &taskbarname_font;
+    Color *config_text = (taskbar->desktop == server.desktop) ? &taskbarname_active_font : &taskbarname_font;
 
-	// draw content
+    // draw content
-	PangoLayout *layout = pango_cairo_create_layout(c);
+    PangoLayout *layout = pango_cairo_create_layout(c);
-	pango_layout_set_font_description(layout, panel_config.taskbarname_font_desc);
+    pango_layout_set_font_description(layout, panel_config.taskbarname_font_desc);
-	pango_layout_set_width(layout, taskbar_name->area.width * PANGO_SCALE);
+    pango_layout_set_width(layout, taskbar_name->area.width * PANGO_SCALE);
-	pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+    pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-	pango_layout_set_text(layout, taskbar_name->name, strlen(taskbar_name->name));
+    pango_layout_set_text(layout, taskbar_name->name, strlen(taskbar_name->name));
 
-	cairo_set_source_rgba(c, config_text->rgb[0], config_text->rgb[1], config_text->rgb[2], config_text->alpha);
+    cairo_set_source_rgba(c, config_text->rgb[0], config_text->rgb[1], config_text->rgb[2], config_text->alpha);
 
-	pango_cairo_update_layout(c, layout);
+    pango_cairo_update_layout(c, layout);
-	draw_text(layout, c, 0, taskbar_name->posy, config_text, ((Panel *)taskbar_name->area.panel)->font_shadow);
+    draw_text(layout, c, 0, taskbar_name->posy, config_text, ((Panel *)taskbar_name->area.panel)->font_shadow);
 
-	g_object_unref(layout);
+    g_object_unref(layout);
 }

src/tint2conf/CMakeLists.txt

@@ -71,3 +71,4 @@ add_subdirectory(po)
 install( TARGETS tint2conf DESTINATION bin )
 install( FILES tint2conf.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
 install( FILES tint2conf.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
+install( FILES tint2conf.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages )

src/tint2conf/gradient_gui.h

@@ -22,23 +22,23 @@ void gradient_stop_update_image(int index);
 void current_gradient_stop_changed(GtkWidget *widget, gpointer data);
 
 typedef enum GradientConfigType {
-	GRADIENT_CONFIG_VERTICAL = 0,
+    GRADIENT_CONFIG_VERTICAL = 0,
-	GRADIENT_CONFIG_HORIZONTAL,
+    GRADIENT_CONFIG_HORIZONTAL,
-	GRADIENT_CONFIG_RADIAL
+    GRADIENT_CONFIG_RADIAL
 } GradientConfigType;
 
 typedef struct GradientConfigColorStop {
-	Color color;
+    Color color;
-	// offset in 0-1
+    // offset in 0-1
-	double offset;
+    double offset;
 } GradientConfigColorStop;
 
 typedef struct GradientConfig {
-	GradientConfigType type;
+    GradientConfigType type;
-	GradientConfigColorStop start_color;
+    GradientConfigColorStop start_color;
-	GradientConfigColorStop end_color;
+    GradientConfigColorStop end_color;
-	// Each element is a GradientConfigColorStop
+    // Each element is a GradientConfigColorStop
-	GList *extra_color_stops;
+    GList *extra_color_stops;
 } GradientConfig;
 
 void gradient_create_new(GradientConfigType t);

src/tint2conf/main.h

@@ -15,7 +15,7 @@
 #endif
 
 #define SNAPSHOT_TICK 190
-gboolean update_snapshot();
+gboolean update_snapshot(gpointer ignored);
 void menuApply();
 void refresh_current_theme();
 extern GtkWidget *g_window;

src/tint2conf/md4.c

@@ -40,235 +40,232 @@ typedef u_int64_t u64;
 #define shash_desc md4_ctx
 #define shash_desc_ctx(x) (x)
 
-#define MD4_DIGEST_SIZE		16
+#define MD4_DIGEST_SIZE 16
-#define MD4_HMAC_BLOCK_SIZE	64
+#define MD4_HMAC_BLOCK_SIZE 64
-#define MD4_BLOCK_WORDS		16
+#define MD4_BLOCK_WORDS 16
-#define MD4_HASH_WORDS		4
+#define MD4_HASH_WORDS 4
 
 struct md4_ctx {
-	u32 hash[MD4_HASH_WORDS];
+    u32 hash[MD4_HASH_WORDS];
-	u32 block[MD4_BLOCK_WORDS];
+    u32 block[MD4_BLOCK_WORDS];
-	u64 byte_count;
+    u64 byte_count;
 };
 
 static inline u32 lshift(u32 x, unsigned int s)
 {
-	x &= 0xFFFFFFFF;
+    x &= 0xFFFFFFFF;
-	return ((x << s) & 0xFFFFFFFF) | (x >> (32 - s));
+    return ((x << s) & 0xFFFFFFFF) | (x >> (32 - s));
 }
 
 static inline u32 F(u32 x, u32 y, u32 z)
 {
-	return (x & y) | ((~x) & z);
+    return (x & y) | ((~x) & z);
 }
 
 static inline u32 G(u32 x, u32 y, u32 z)
 {
-	return (x & y) | (x & z) | (y & z);
+    return (x & y) | (x & z) | (y & z);
 }
 
 static inline u32 H(u32 x, u32 y, u32 z)
 {
-	return x ^ y ^ z;
+    return x ^ y ^ z;
 }
 
-#define ROUND1(a,b,c,d,k,s) (a = lshift(a + F(b,c,d) + k, s))
+#define ROUND1(a, b, c, d, k, s) (a = lshift(a + F(b, c, d) + k, s))
-#define ROUND2(a,b,c,d,k,s) (a = lshift(a + G(b,c,d) + k + (u32)0x5A827999,s))
+#define ROUND2(a, b, c, d, k, s) (a = lshift(a + G(b, c, d) + k + (u32)0x5A827999, s))
-#define ROUND3(a,b,c,d,k,s) (a = lshift(a + H(b,c,d) + k + (u32)0x6ED9EBA1,s))
+#define ROUND3(a, b, c, d, k, s) (a = lshift(a + H(b, c, d) + k + (u32)0x6ED9EBA1, s))
 
 /* XXX: this stuff can be optimized */
 static inline void le32_to_cpu_array(u32 *buf, unsigned int words)
 {
-	while (words--) {
+    while (words--) {
-		*buf = ntohl(*buf);
+        *buf = ntohl(*buf);
-		buf++;
+        buf++;
-	}
+    }
 }
 
 static inline void cpu_to_le32_array(u32 *buf, unsigned int words)
 {
-	while (words--) {
+    while (words--) {
-		*buf = htonl(*buf);
+        *buf = htonl(*buf);
-		buf++;
+        buf++;
-	}
+    }
 }
 
 static void md4_transform(u32 *hash, u32 const *in)
 {
-	u32 a, b, c, d;
+    u32 a, b, c, d;
 
-	a = hash[0];
+    a = hash[0];
-	b = hash[1];
+    b = hash[1];
-	c = hash[2];
+    c = hash[2];
-	d = hash[3];
+    d = hash[3];
 
-	ROUND1(a, b, c, d, in[0], 3);
+    ROUND1(a, b, c, d, in[0], 3);
-	ROUND1(d, a, b, c, in[1], 7);
+    ROUND1(d, a, b, c, in[1], 7);
-	ROUND1(c, d, a, b, in[2], 11);
+    ROUND1(c, d, a, b, in[2], 11);
-	ROUND1(b, c, d, a, in[3], 19);
+    ROUND1(b, c, d, a, in[3], 19);
-	ROUND1(a, b, c, d, in[4], 3);
+    ROUND1(a, b, c, d, in[4], 3);
-	ROUND1(d, a, b, c, in[5], 7);
+    ROUND1(d, a, b, c, in[5], 7);
-	ROUND1(c, d, a, b, in[6], 11);
+    ROUND1(c, d, a, b, in[6], 11);
-	ROUND1(b, c, d, a, in[7], 19);
+    ROUND1(b, c, d, a, in[7], 19);
-	ROUND1(a, b, c, d, in[8], 3);
+    ROUND1(a, b, c, d, in[8], 3);
-	ROUND1(d, a, b, c, in[9], 7);
+    ROUND1(d, a, b, c, in[9], 7);
-	ROUND1(c, d, a, b, in[10], 11);
+    ROUND1(c, d, a, b, in[10], 11);
-	ROUND1(b, c, d, a, in[11], 19);
+    ROUND1(b, c, d, a, in[11], 19);
-	ROUND1(a, b, c, d, in[12], 3);
+    ROUND1(a, b, c, d, in[12], 3);
-	ROUND1(d, a, b, c, in[13], 7);
+    ROUND1(d, a, b, c, in[13], 7);
-	ROUND1(c, d, a, b, in[14], 11);
+    ROUND1(c, d, a, b, in[14], 11);
-	ROUND1(b, c, d, a, in[15], 19);
+    ROUND1(b, c, d, a, in[15], 19);
 
-	ROUND2(a, b, c, d,in[ 0], 3);
+    ROUND2(a, b, c, d, in[0], 3);
-	ROUND2(d, a, b, c, in[4], 5);
+    ROUND2(d, a, b, c, in[4], 5);
-	ROUND2(c, d, a, b, in[8], 9);
+    ROUND2(c, d, a, b, in[8], 9);
-	ROUND2(b, c, d, a, in[12], 13);
+    ROUND2(b, c, d, a, in[12], 13);
-	ROUND2(a, b, c, d, in[1], 3);
+    ROUND2(a, b, c, d, in[1], 3);
-	ROUND2(d, a, b, c, in[5], 5);
+    ROUND2(d, a, b, c, in[5], 5);
-	ROUND2(c, d, a, b, in[9], 9);
+    ROUND2(c, d, a, b, in[9], 9);
-	ROUND2(b, c, d, a, in[13], 13);
+    ROUND2(b, c, d, a, in[13], 13);
-	ROUND2(a, b, c, d, in[2], 3);
+    ROUND2(a, b, c, d, in[2], 3);
-	ROUND2(d, a, b, c, in[6], 5);
+    ROUND2(d, a, b, c, in[6], 5);
-	ROUND2(c, d, a, b, in[10], 9);
+    ROUND2(c, d, a, b, in[10], 9);
-	ROUND2(b, c, d, a, in[14], 13);
+    ROUND2(b, c, d, a, in[14], 13);
-	ROUND2(a, b, c, d, in[3], 3);
+    ROUND2(a, b, c, d, in[3], 3);
-	ROUND2(d, a, b, c, in[7], 5);
+    ROUND2(d, a, b, c, in[7], 5);
-	ROUND2(c, d, a, b, in[11], 9);
+    ROUND2(c, d, a, b, in[11], 9);
-	ROUND2(b, c, d, a, in[15], 13);
+    ROUND2(b, c, d, a, in[15], 13);
 
-	ROUND3(a, b, c, d,in[ 0], 3);
+    ROUND3(a, b, c, d, in[0], 3);
-	ROUND3(d, a, b, c, in[8], 9);
+    ROUND3(d, a, b, c, in[8], 9);
-	ROUND3(c, d, a, b, in[4], 11);
+    ROUND3(c, d, a, b, in[4], 11);
-	ROUND3(b, c, d, a, in[12], 15);
+    ROUND3(b, c, d, a, in[12], 15);
-	ROUND3(a, b, c, d, in[2], 3);
+    ROUND3(a, b, c, d, in[2], 3);
-	ROUND3(d, a, b, c, in[10], 9);
+    ROUND3(d, a, b, c, in[10], 9);
-	ROUND3(c, d, a, b, in[6], 11);
+    ROUND3(c, d, a, b, in[6], 11);
-	ROUND3(b, c, d, a, in[14], 15);
+    ROUND3(b, c, d, a, in[14], 15);
-	ROUND3(a, b, c, d, in[1], 3);
+    ROUND3(a, b, c, d, in[1], 3);
-	ROUND3(d, a, b, c, in[9], 9);
+    ROUND3(d, a, b, c, in[9], 9);
-	ROUND3(c, d, a, b, in[5], 11);
+    ROUND3(c, d, a, b, in[5], 11);
-	ROUND3(b, c, d, a, in[13], 15);
+    ROUND3(b, c, d, a, in[13], 15);
-	ROUND3(a, b, c, d, in[3], 3);
+    ROUND3(a, b, c, d, in[3], 3);
-	ROUND3(d, a, b, c, in[11], 9);
+    ROUND3(d, a, b, c, in[11], 9);
-	ROUND3(c, d, a, b, in[7], 11);
+    ROUND3(c, d, a, b, in[7], 11);
-	ROUND3(b, c, d, a, in[15], 15);
+    ROUND3(b, c, d, a, in[15], 15);
 
-	hash[0] += a;
+    hash[0] += a;
-	hash[1] += b;
+    hash[1] += b;
-	hash[2] += c;
+    hash[2] += c;
-	hash[3] += d;
+    hash[3] += d;
 }
 
 static inline void md4_transform_helper(struct md4_ctx *ctx)
 {
-	le32_to_cpu_array(ctx->block, ARRAY_SIZE(ctx->block));
+    le32_to_cpu_array(ctx->block, ARRAY_SIZE(ctx->block));
-	md4_transform(ctx->hash, ctx->block);
+    md4_transform(ctx->hash, ctx->block);
 }
 
 static int md4_init(struct shash_desc *desc)
 {
-	struct md4_ctx *mctx = shash_desc_ctx(desc);
+    struct md4_ctx *mctx = shash_desc_ctx(desc);
 
-	mctx->hash[0] = 0x67452301;
+    mctx->hash[0] = 0x67452301;
-	mctx->hash[1] = 0xefcdab89;
+    mctx->hash[1] = 0xefcdab89;
-	mctx->hash[2] = 0x98badcfe;
+    mctx->hash[2] = 0x98badcfe;
-	mctx->hash[3] = 0x10325476;
+    mctx->hash[3] = 0x10325476;
-	mctx->byte_count = 0;
+    mctx->byte_count = 0;
 
-	return 0;
+    return 0;
 }
 
 static int md4_update(struct shash_desc *desc, const u8 *data, unsigned int len)
 {
-	struct md4_ctx *mctx = shash_desc_ctx(desc);
+    struct md4_ctx *mctx = shash_desc_ctx(desc);
-	const u32 avail = sizeof(mctx->block) - (mctx->byte_count & 0x3f);
+    const u32 avail = sizeof(mctx->block) - (mctx->byte_count & 0x3f);
 
-	mctx->byte_count += len;
+    mctx->byte_count += len;
 
-	if (avail > len) {
+    if (avail > len) {
-		memcpy((char *)mctx->block + (sizeof(mctx->block) - avail),
+        memcpy((char *)mctx->block + (sizeof(mctx->block) - avail), data, len);
-			   data, len);
+        return 0;
-		return 0;
+    }
-	}
 
-	memcpy((char *)mctx->block + (sizeof(mctx->block) - avail),
+    memcpy((char *)mctx->block + (sizeof(mctx->block) - avail), data, avail);
-		   data, avail);
 
-	md4_transform_helper(mctx);
+    md4_transform_helper(mctx);
-	data += avail;
+    data += avail;
-	len -= avail;
+    len -= avail;
 
-	while (len >= sizeof(mctx->block)) {
+    while (len >= sizeof(mctx->block)) {
-		memcpy(mctx->block, data, sizeof(mctx->block));
+        memcpy(mctx->block, data, sizeof(mctx->block));
-		md4_transform_helper(mctx);
+        md4_transform_helper(mctx);
-		data += sizeof(mctx->block);
+        data += sizeof(mctx->block);
-		len -= sizeof(mctx->block);
+        len -= sizeof(mctx->block);
-	}
+    }
 
-	memcpy(mctx->block, data, len);
+    memcpy(mctx->block, data, len);
 
-	return 0;
+    return 0;
 }
 
 static int md4_final(struct shash_desc *desc, u8 *out)
 {
-	struct md4_ctx *mctx = shash_desc_ctx(desc);
+    struct md4_ctx *mctx = shash_desc_ctx(desc);
-	const unsigned int offset = mctx->byte_count & 0x3f;
+    const unsigned int offset = mctx->byte_count & 0x3f;
-	char *p = (char *)mctx->block + offset;
+    char *p = (char *)mctx->block + offset;
-	int padding = 56 - (offset + 1);
+    int padding = 56 - (offset + 1);
 
-	*p++ = 0x80;
+    *p++ = 0x80;
-	if (padding < 0) {
+    if (padding < 0) {
-		memset(p, 0x00, padding + sizeof (u64));
+        memset(p, 0x00, padding + sizeof(u64));
-		md4_transform_helper(mctx);
+        md4_transform_helper(mctx);
-		p = (char *)mctx->block;
+        p = (char *)mctx->block;
-		padding = 56;
+        padding = 56;
-	}
+    }
 
-	memset(p, 0, padding);
+    memset(p, 0, padding);
-	mctx->block[14] = mctx->byte_count << 3;
+    mctx->block[14] = mctx->byte_count << 3;
-	mctx->block[15] = mctx->byte_count >> 29;
+    mctx->block[15] = mctx->byte_count >> 29;
-	le32_to_cpu_array(mctx->block, (sizeof(mctx->block) -
+    le32_to_cpu_array(mctx->block, (sizeof(mctx->block) - sizeof(u64)) / sizeof(u32));
-					  sizeof(u64)) / sizeof(u32));
+    md4_transform(mctx->hash, mctx->block);
-	md4_transform(mctx->hash, mctx->block);
+    cpu_to_le32_array(mctx->hash, ARRAY_SIZE(mctx->hash));
-	cpu_to_le32_array(mctx->hash, ARRAY_SIZE(mctx->hash));
+    memcpy(out, mctx->hash, sizeof(mctx->hash));
-	memcpy(out, mctx->hash, sizeof(mctx->hash));
+    memset(mctx, 0, sizeof(*mctx));
-	memset(mctx, 0, sizeof(*mctx));
 
-	return 0;
+    return 0;
 }
 
 static char to_hex(u8 v)
 {
-	v = v & 0xf;
+    v = v & 0xf;
-	if (v < 0xa)
+    if (v < 0xa)
-		return '0' + v;
+        return '0' + v;
-	return 'a' + v - 0xa;
+    return 'a' + v - 0xa;
 }
 
 void md4hexf(const char *path, char *hash)
 {
-	struct md4_ctx mctx;
+    struct md4_ctx mctx;
-	md4_init(&mctx);
+    md4_init(&mctx);
 
-	int fd = open(path, O_RDONLY);
+    int fd = open(path, O_RDONLY);
-	if (fd >= 0) {
+    if (fd >= 0) {
-		u8 buffer[MD4_HMAC_BLOCK_SIZE];
+        u8 buffer[MD4_HMAC_BLOCK_SIZE];
-		while (1) {
+        while (1) {
-			ssize_t count = read(fd, buffer, sizeof(buffer));
+            ssize_t count = read(fd, buffer, sizeof(buffer));
-			if (count <= 0)
+            if (count <= 0)
-				break;
+                break;
-			md4_update(&mctx, buffer, (unsigned)count);
+            md4_update(&mctx, buffer, (unsigned)count);
-		}
+        }
-		close(fd);
+        close(fd);
-	}
+    }
 
-	u8 out[MD4_DIGEST_SIZE];
+    u8 out[MD4_DIGEST_SIZE];
-	md4_final(&mctx, out);
+    md4_final(&mctx, out);
 
-	for (int i = 0; i < MD4_DIGEST_SIZE; i++) {
+    for (int i = 0; i < MD4_DIGEST_SIZE; i++) {
-		hash[2*i+0] = to_hex(out[i] >> 4);
+        hash[2 * i + 0] = to_hex(out[i] >> 4);
-		hash[2*i+1] = to_hex(out[i] & 0xf);
+        hash[2 * i + 1] = to_hex(out[i] & 0xf);
-	}
+    }
-	hash[2*MD4_DIGEST_SIZE] = 0;
+    hash[2 * MD4_DIGEST_SIZE] = 0;
 }

src/tint2conf/properties.h

@@ -8,22 +8,20 @@
 
 #include "../launcher/icon-theme-common.h"
 
-
 // panel
-extern GtkWidget *panel_width, *panel_height, *panel_margin_x, *panel_margin_y, *panel_padding_x, *panel_padding_y, *panel_spacing;
+extern GtkWidget *panel_width, *panel_height, *panel_margin_x, *panel_margin_y, *panel_padding_x, *panel_padding_y,
-extern GtkWidget *panel_wm_menu, *panel_dock, *panel_autohide, *panel_autohide_show_time, *panel_autohide_hide_time, *panel_autohide_size;
+    *panel_spacing;
-extern GtkWidget *panel_combo_strut_policy, *panel_combo_layer, *panel_combo_width_type, *panel_combo_height_type, *panel_combo_monitor;
+extern GtkWidget *panel_wm_menu, *panel_dock, *panel_autohide, *panel_autohide_show_time, *panel_autohide_hide_time,
+    *panel_autohide_size;
+extern GtkWidget *panel_combo_strut_policy, *panel_combo_layer, *panel_combo_width_type, *panel_combo_height_type,
+    *panel_combo_monitor;
 extern GtkWidget *panel_window_name, *disable_transparency;
 extern GtkWidget *panel_mouse_effects;
 extern GtkWidget *mouse_hover_icon_opacity, *mouse_hover_icon_saturation, *mouse_hover_icon_brightness;
 extern GtkWidget *mouse_pressed_icon_opacity, *mouse_pressed_icon_saturation, *mouse_pressed_icon_brightness;
 extern GtkWidget *panel_primary_monitor_first, *panel_shrink;
 
-enum {
+enum { itemsColName = 0, itemsColValue, itemsNumCols };
-	itemsColName = 0,
-	itemsColValue,
-	itemsNumCols
-};
 extern GtkListStore *panel_items, *all_items;
 extern GtkWidget *panel_items_view, *all_items_view;
 char *get_panel_items();
@@ -52,44 +50,34 @@ extern GtkWidget *panel_background;
 // taskbar
 extern GtkWidget *taskbar_show_desktop, *taskbar_show_name, *taskbar_padding_x, *taskbar_padding_y, *taskbar_spacing;
 extern GtkWidget *taskbar_hide_inactive_tasks, *taskbar_hide_diff_monitor;
-extern GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color, *taskbar_name_active_color;
+extern GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color,
+    *taskbar_name_active_color;
 extern GtkWidget *taskbar_name_font, *taskbar_name_font_set;
 extern GtkWidget *taskbar_active_background, *taskbar_inactive_background;
 extern GtkWidget *taskbar_name_active_background, *taskbar_name_inactive_background;
-extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment, *taskbar_always_show_all_desktop_tasks;
+extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment,
+    *taskbar_always_show_all_desktop_tasks;
 extern GtkWidget *taskbar_hide_empty;
 
 // task
-extern GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down;
+extern GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up,
+    *task_mouse_scroll_down;
 extern GtkWidget *task_show_icon, *task_show_text, *task_align_center, *font_shadow;
 extern GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_spacing;
 extern GtkWidget *task_font, *task_font_set;
-extern GtkWidget *task_default_color, *task_default_color_set,
+extern GtkWidget *task_default_color, *task_default_color_set, *task_default_icon_opacity, *task_default_icon_osb_set,
-		  *task_default_icon_opacity, *task_default_icon_osb_set,
+    *task_default_icon_saturation, *task_default_icon_brightness, *task_default_background,
-		  *task_default_icon_saturation,
+    *task_default_background_set;
-		  *task_default_icon_brightness,
+extern GtkWidget *task_normal_color, *task_normal_color_set, *task_normal_icon_opacity, *task_normal_icon_osb_set,
-		  *task_default_background, *task_default_background_set;
+    *task_normal_icon_saturation, *task_normal_icon_brightness, *task_normal_background, *task_normal_background_set;
-extern GtkWidget *task_normal_color, *task_normal_color_set,
+extern GtkWidget *task_active_color, *task_active_color_set, *task_active_icon_opacity, *task_active_icon_osb_set,
-		  *task_normal_icon_opacity, *task_normal_icon_osb_set,
+    *task_active_icon_saturation, *task_active_icon_brightness, *task_active_background, *task_active_background_set;
-		  *task_normal_icon_saturation,
+extern GtkWidget *task_urgent_color, *task_urgent_color_set, *task_urgent_icon_opacity, *task_urgent_icon_osb_set,
-		  *task_normal_icon_brightness,
+    *task_urgent_icon_saturation, *task_urgent_icon_brightness, *task_urgent_background, *task_urgent_background_set;
-		  *task_normal_background, *task_normal_background_set;
-extern GtkWidget *task_active_color, *task_active_color_set,
-		  *task_active_icon_opacity, *task_active_icon_osb_set,
-		  *task_active_icon_saturation,
-		  *task_active_icon_brightness,
-		  *task_active_background, *task_active_background_set;
-extern GtkWidget *task_urgent_color, *task_urgent_color_set,
-		  *task_urgent_icon_opacity, *task_urgent_icon_osb_set,
-		  *task_urgent_icon_saturation,
-		  *task_urgent_icon_brightness,
-		  *task_urgent_background, *task_urgent_background_set;
 extern GtkWidget *task_urgent_blinks;
-extern GtkWidget *task_iconified_color, *task_iconified_color_set,
+extern GtkWidget *task_iconified_color, *task_iconified_color_set, *task_iconified_icon_opacity,
-		  *task_iconified_icon_opacity, *task_iconified_icon_osb_set,
+    *task_iconified_icon_osb_set, *task_iconified_icon_saturation, *task_iconified_icon_brightness,
-		  *task_iconified_icon_saturation,
+    *task_iconified_background, *task_iconified_background_set;
-		  *task_iconified_icon_brightness,
-		  *task_iconified_background, *task_iconified_background_set;
 
 // clock
 extern GtkWidget *clock_format_line1, *clock_format_line2, *clock_tmz_line1, *clock_tmz_line2;
@@ -102,10 +90,12 @@ extern GtkWidget *clock_background;
 // battery
 extern GtkWidget *battery_hide_if_higher, *battery_alert_if_lower, *battery_alert_cmd;
 extern GtkWidget *battery_padding_x, *battery_padding_y;
-extern GtkWidget *battery_font_line1, *battery_font_line1_set, *battery_font_line2, *battery_font_line2_set, *battery_font_color;
+extern GtkWidget *battery_font_line1, *battery_font_line1_set, *battery_font_line2, *battery_font_line2_set,
+    *battery_font_color;
 extern GtkWidget *battery_background;
 extern GtkWidget *battery_tooltip;
-extern GtkWidget *battery_left_command, *battery_mclick_command, *battery_right_command, *battery_uwheel_command, *battery_dwheel_command;
+extern GtkWidget *battery_left_command, *battery_mclick_command, *battery_right_command, *battery_uwheel_command,
+    *battery_dwheel_command;
 extern GtkWidget *ac_connected_cmd, *ac_disconnected_cmd;
 
 // systray
@@ -121,45 +111,55 @@ extern GtkWidget *tooltip_background;
 
 // Separator
 typedef struct Separator {
-	char name[256];
+    char name[256];
-	GtkWidget *container;
+    GtkWidget *container;
-	GtkWidget *page_separator;
+    GtkWidget *page_separator;
-	GtkWidget *page_label;
+    GtkWidget *page_label;
-	GtkWidget *separator_background;
+    GtkWidget *separator_background;
-	GtkWidget *separator_color;
+    GtkWidget *separator_color;
-	GtkWidget *separator_style;
+    GtkWidget *separator_style;
-	GtkWidget *separator_size;
+    GtkWidget *separator_size;
-	GtkWidget *separator_padding_x;
+    GtkWidget *separator_padding_x;
-	GtkWidget *separator_padding_y;
+    GtkWidget *separator_padding_y;
 } Separator;
 
 extern GArray *separators;
 
 // Executor
 typedef struct Executor {
-	char name[256];
+    char name[256];
-	GtkWidget *container;
+    GtkWidget *container;
-	GtkWidget *page_execp;
+    GtkWidget *page_execp;
-	GtkWidget *page_label;
+    GtkWidget *page_label;
-	GtkWidget *execp_command, *execp_interval, *execp_has_icon, *execp_cache_icon, *execp_show_tooltip;
+    GtkWidget *execp_command, *execp_interval, *execp_has_icon, *execp_cache_icon, *execp_show_tooltip;
-	GtkWidget *execp_continuous, *execp_markup, *execp_tooltip;
+    GtkWidget *execp_continuous, *execp_markup, *execp_tooltip;
-	GtkWidget *execp_left_command, *execp_right_command;
+    GtkWidget *execp_left_command, *execp_right_command;
-	GtkWidget *execp_mclick_command, *execp_rclick_command, *execp_uwheel_command, *execp_dwheel_command;
+    GtkWidget *execp_mclick_command, *execp_rclick_command, *execp_uwheel_command, *execp_dwheel_command;
-	GtkWidget *execp_font, *execp_font_set, *execp_font_color, *execp_padding_x, *execp_padding_y, *execp_centered;
+    GtkWidget *execp_font, *execp_font_set, *execp_font_color, *execp_padding_x, *execp_padding_y, *execp_centered;
-	GtkWidget *execp_background, *execp_icon_w, *execp_icon_h;
+    GtkWidget *execp_background, *execp_icon_w, *execp_icon_h;
 } Executor;
 
 extern GArray *executors;
 
+// Button
+typedef struct Button {
+    char name[256];
+    GtkWidget *container;
+    GtkWidget *page_button;
+    GtkWidget *page_label;
+    GtkWidget *button_icon, *button_text, *button_tooltip;
+    GtkWidget *button_left_command, *button_right_command;
+    GtkWidget *button_mclick_command, *button_rclick_command, *button_uwheel_command, *button_dwheel_command;
+    GtkWidget *button_font, *button_font_set, *button_font_color, *button_padding_x, *button_padding_y,
+        *button_centered;
+    GtkWidget *button_background, *button_max_icon_size;
+} Button;
+
+extern GArray *buttons;
+
 // launcher
 
-enum {
+enum { appsColIcon = 0, appsColIconName, appsColText, appsColPath, appsNumCols };
-	appsColIcon = 0,
-	appsColIconName,
-	appsColText,
-	appsColPath,
-	appsNumCols
-};
 
 extern GtkListStore *launcher_apps, *all_apps;
 extern GtkWidget *launcher_apps_view, *all_apps_view;
@@ -180,73 +180,49 @@ gchar *get_current_icon_theme();
 
 // background
 enum {
-	bgColPixbuf = 0,
+    bgColPixbuf = 0,
-	bgColFillColor,
+    bgColFillColor,
-	bgColFillOpacity,
+    bgColFillOpacity,
-	bgColBorderColor,
+    bgColBorderColor,
-	bgColBorderOpacity,
+    bgColBorderOpacity,
-	bgColGradientId,
+    bgColGradientId,
-	bgColBorderWidth,
+    bgColBorderWidth,
-	bgColCornerRadius,
+    bgColCornerRadius,
-	bgColText,
+    bgColText,
-	bgColFillColorOver,
+    bgColFillColorOver,
-	bgColFillOpacityOver,
+    bgColFillOpacityOver,
-	bgColBorderColorOver,
+    bgColBorderColorOver,
-	bgColBorderOpacityOver,
+    bgColBorderOpacityOver,
-	bgColGradientIdOver,
+    bgColGradientIdOver,
-	bgColFillColorPress,
+    bgColFillColorPress,
-	bgColFillOpacityPress,
+    bgColFillOpacityPress,
-	bgColBorderColorPress,
+    bgColBorderColorPress,
-	bgColBorderOpacityPress,
+    bgColBorderOpacityPress,
-	bgColGradientIdPress,
+    bgColGradientIdPress,
     bgColBorderSidesTop,
     bgColBorderSidesBottom,
     bgColBorderSidesLeft,
     bgColBorderSidesRight,
-	bgNumCols
+    bgNumCols
 };
 
 extern GtkListStore *backgrounds;
-extern GtkWidget *current_background,
+extern GtkWidget *current_background, *background_fill_color, *background_border_color, *background_gradient,
-		  *background_fill_color,
+    *background_fill_color_over, *background_border_color_over, *background_gradient_over, *background_fill_color_press,
-		  *background_border_color,
+    *background_border_color_press, *background_gradient_press, *background_border_width, *background_border_sides_top,
-		  *background_gradient,
+    *background_border_sides_bottom, *background_border_sides_left, *background_border_sides_right,
-		  *background_fill_color_over,
+    *background_corner_radius;
-		  *background_border_color_over,
-		  *background_gradient_over,
-		  *background_fill_color_press,
-		  *background_border_color_press,
-		  *background_gradient_press,
-		  *background_border_width,
-          *background_border_sides_top,
-          *background_border_sides_bottom,
-          *background_border_sides_left,
-          *background_border_sides_right,
-		  *background_corner_radius;
 
 // gradients
-enum {
+enum { grColPixbuf = 0, grColId, grColText, grNumCols };
-	grColPixbuf = 0,
-	grColId,
-	grColText,
-	grNumCols
-};
 
 // gradient color stops
-enum {
+enum { grStopColPixbuf = 0, grStopNumCols };
-	grStopColPixbuf = 0,
-	grStopNumCols
-};
 extern GtkListStore *gradient_ids, *gradient_stop_ids;
 extern GList *gradients;
 
-extern GtkWidget *current_gradient,
+extern GtkWidget *current_gradient, *gradient_combo_type, *gradient_start_color, *gradient_end_color,
-	*gradient_combo_type,
+    *current_gradient_stop, *gradient_stop_color, *gradient_stop_offset;
-	*gradient_start_color,
-	*gradient_end_color,
-	*current_gradient_stop,
-	*gradient_stop_color,
-	*gradient_stop_offset;
 
 void background_create_new();
 void background_force_update();
@@ -264,6 +240,11 @@ Executor *execp_get_last();
 void execp_remove(int i);
 void execp_update_indices();
 
+void button_create_new();
+Button *button_get_last();
+void button_remove(int i);
+void button_update_indices();
+
 void create_please_wait(GtkWindow *parent);
 void process_events();
 void destroy_please_wait();

src/tint2conf/properties_rw.h

@@ -5,7 +5,7 @@
 
 char *get_current_theme_path();
 gboolean config_is_manual(const char *path);
-void config_read_file (const char *path);
+void config_read_file(const char *path);
 void config_save_file(const char *path);
 
 #endif

src/tint2conf/theme_view.c

@@ -34,203 +34,216 @@ gint theme_name_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpo
 
 GtkWidget *create_view()
 {
-	GtkTreeViewColumn *col;
+    GtkTreeViewColumn *col;
-	GtkCellRenderer *renderer;
+    GtkCellRenderer *renderer;
 
-	theme_list_store =
+    theme_list_store = gtk_list_store_new(NB_COL,
-		gtk_list_store_new(NB_COL, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT, G_TYPE_BOOLEAN);
+                                          G_TYPE_STRING,
+                                          G_TYPE_STRING,
+                                          GDK_TYPE_PIXBUF,
+                                          G_TYPE_INT,
+                                          G_TYPE_INT,
+                                          G_TYPE_BOOLEAN);
 
-	GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(theme_list_store));
+    GtkWidget *view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(theme_list_store));
-	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
+    gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(view), TRUE);
-	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
+    gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), FALSE);
 
-	g_object_unref(theme_list_store); // destroy store automatically with view
+    g_object_unref(theme_list_store); // destroy store automatically with view
 
-	renderer = gtk_cell_renderer_text_new();
+    renderer = gtk_cell_renderer_text_new();
-	col = gtk_tree_view_column_new();
+    col = gtk_tree_view_column_new();
-	gtk_tree_view_column_pack_start(col, renderer, TRUE);
+    gtk_tree_view_column_pack_start(col, renderer, TRUE);
-	gtk_tree_view_column_add_attribute(col, renderer, "text", COL_THEME_FILE);
+    gtk_tree_view_column_add_attribute(col, renderer, "text", COL_THEME_FILE);
-	gtk_tree_view_column_set_visible(col, FALSE);
+    gtk_tree_view_column_set_visible(col, FALSE);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
 
-	renderer = gtk_cell_renderer_text_new();
+    renderer = gtk_cell_renderer_text_new();
-	col = gtk_tree_view_column_new();
+    col = gtk_tree_view_column_new();
-	gtk_tree_view_column_pack_start(col, renderer, TRUE);
+    gtk_tree_view_column_pack_start(col, renderer, TRUE);
-	gtk_tree_view_column_add_attribute(col, renderer, "text", COL_THEME_NAME);
+    gtk_tree_view_column_add_attribute(col, renderer, "text", COL_THEME_NAME);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
 
-	g_renderer = gtk_cell_renderer_pixbuf_new();
+    g_renderer = gtk_cell_renderer_pixbuf_new();
-	g_object_set(g_renderer, "xalign", 0.0, NULL);
+    g_object_set(g_renderer, "xalign", 0.0, NULL);
-	gtk_cell_renderer_set_fixed_size(g_renderer, 200, 30);
+    gtk_cell_renderer_set_fixed_size(g_renderer, 200, 30);
-	col = gtk_tree_view_column_new();
+    col = gtk_tree_view_column_new();
-	gtk_tree_view_column_pack_start(col, g_renderer, TRUE);
+    gtk_tree_view_column_pack_start(col, g_renderer, TRUE);
-	gtk_tree_view_column_add_attribute(col, g_renderer, "pixbuf", COL_SNAPSHOT);
+    gtk_tree_view_column_add_attribute(col, g_renderer, "pixbuf", COL_SNAPSHOT);
-	gtk_tree_view_column_add_attribute(col, g_renderer, "width", COL_WIDTH);
+    gtk_tree_view_column_add_attribute(col, g_renderer, "width", COL_WIDTH);
-	gtk_tree_view_column_add_attribute(col, g_renderer, "height", COL_HEIGHT);
+    gtk_tree_view_column_add_attribute(col, g_renderer, "height", COL_HEIGHT);
-	gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);
 
-	GtkTreeSortable *sortable = GTK_TREE_SORTABLE(theme_list_store);
+    GtkTreeSortable *sortable = GTK_TREE_SORTABLE(theme_list_store);
-	gtk_tree_sortable_set_sort_column_id(sortable, COL_THEME_FILE, GTK_SORT_ASCENDING);
+    gtk_tree_sortable_set_sort_column_id(sortable, COL_THEME_FILE, GTK_SORT_ASCENDING);
-	gtk_tree_sortable_set_sort_func(sortable, COL_THEME_FILE, theme_name_compare, NULL, NULL);
+    gtk_tree_sortable_set_sort_func(sortable, COL_THEME_FILE, theme_name_compare, NULL, NULL);
-	return view;
+    return view;
 }
 
 gint theme_name_compare(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data)
 {
-	gchar *path_a, *path_b;
+    gchar *path_a, *path_b;
-	gtk_tree_model_get(model, a, COL_THEME_FILE, &path_a, -1);
+    gtk_tree_model_get(model, a, COL_THEME_FILE, &path_a, -1);
-	gtk_tree_model_get(model, b, COL_THEME_FILE, &path_b, -1);
+    gtk_tree_model_get(model, b, COL_THEME_FILE, &path_b, -1);
 
-	gboolean home_a = strstr(path_a, g_get_user_config_dir()) == path_a;
+    gboolean home_a = strstr(path_a, g_get_user_config_dir()) == path_a;
-	gboolean home_b = strstr(path_b, g_get_user_config_dir()) == path_b;
+    gboolean home_b = strstr(path_b, g_get_user_config_dir()) == path_b;
 
-	if (home_a && !home_b)
+    if (home_a && !home_b)
-		return -1;
+        return -1;
-	if (!home_a && home_b)
+    if (!home_a && home_b)
-		return 1;
+        return 1;
 
-	gchar *name_a = path_a;
+    gchar *name_a = path_a;
-	gchar *p;
+    gchar *p;
-	for (p = name_a; *p; p++) {
+    for (p = name_a; *p; p++) {
-		if (*p == '/')
+        if (*p == '/')
-			name_a = p + 1;
+            name_a = p + 1;
-	}
+    }
-	gchar *name_b = path_b;
+    gchar *name_b = path_b;
-	for (p = name_b; *p; p++) {
+    for (p = name_b; *p; p++) {
-		if (*p == '/')
+        if (*p == '/')
-			name_b = p + 1;
+            name_b = p + 1;
-	}
+    }
-	if (g_str_equal(name_a, name_b))
+    if (g_str_equal(name_a, name_b))
-		return 0;
+        return 0;
-	if (g_str_equal(name_a, "tint2rc"))
+    if (g_str_equal(name_a, "tint2rc"))
-		return -1;
+        return -1;
-	if (g_str_equal(name_b, "tint2rc"))
+    if (g_str_equal(name_b, "tint2rc"))
-		return 1;
+        return 1;
-	gint result = strnatcasecmp(name_a, name_b);
+    gint result = strnatcasecmp(name_a, name_b);
-	g_free(path_a);
+    g_free(path_a);
-	g_free(path_b);
+    g_free(path_b);
-	return result;
+    return result;
 }
 
 gboolean theme_list_contains(const char *given_path)
 {
-	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+    GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
-	GtkTreeIter iter;
+    GtkTreeIter iter;
 
-	gboolean have_iter = gtk_tree_model_get_iter_first(model, &iter);
+    gboolean have_iter = gtk_tree_model_get_iter_first(model, &iter);
-	while (have_iter) {
+    while (have_iter) {
-		gchar *filepath;
+        gchar *filepath;
-		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filepath, -1);
+        gtk_tree_model_get(model, &iter, COL_THEME_FILE, &filepath, -1);
-		if (g_str_equal(filepath, given_path)) {
+        if (g_str_equal(filepath, given_path)) {
-			gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
+            gtk_list_store_set(theme_list_store, &iter, COL_SNAPSHOT, NULL, -1);
-			g_free(filepath);
+            g_free(filepath);
-			return TRUE;
+            return TRUE;
-		}
+        }
-		g_free(filepath);
+        g_free(filepath);
-		have_iter = gtk_tree_model_iter_next(model, &iter);
+        have_iter = gtk_tree_model_iter_next(model, &iter);
-	}
+    }
-	return FALSE;
+    return FALSE;
 }
 
 void theme_list_append(const gchar *path)
 {
-	if (theme_list_contains(path))
+    if (theme_list_contains(path))
-		return;
+        return;
 
-	GtkTreeIter iter;
+    GtkTreeIter iter;
-	gtk_list_store_append(theme_list_store, &iter);
+    gtk_list_store_append(theme_list_store, &iter);
 
-	gchar *name = strrchr(path, '/') + 1;
+    gchar *name = strrchr(path, '/') + 1;
 
-	gchar *dir = g_strdup(path);
+    gchar *dir = g_strdup(path);
-	strrchr(dir, '/')[0] = 0;
+    strrchr(dir, '/')[0] = 0;
-	char *suffix = contract_tilde(dir);
+    char *suffix = contract_tilde(dir);
-	g_free(dir);
+    g_free(dir);
 
-	gchar *display_name = g_strdup_printf("%s\n(%s)", name, suffix);
+    gchar *display_name = g_strdup_printf("%s\n(%s)", name, suffix);
-	gtk_list_store_set(theme_list_store, &iter, COL_THEME_FILE, path, COL_THEME_NAME, display_name, COL_FORCE_REFRESH, FALSE, -1);
+    gtk_list_store_set(theme_list_store,
-	g_free(display_name);
+                       &iter,
-	g_free(suffix);
+                       COL_THEME_FILE,
+                       path,
+                       COL_THEME_NAME,
+                       display_name,
+                       COL_FORCE_REFRESH,
+                       FALSE,
+                       -1);
+    g_free(display_name);
+    g_free(suffix);
 }
 
-gboolean update_snapshot()
+gboolean update_snapshot(gpointer ignored)
 {
-	{
+    {
-		gchar *tint2_cache_dir = g_build_filename(g_get_user_cache_dir(), "tint2", NULL);
+        gchar *tint2_cache_dir = g_build_filename(g_get_user_cache_dir(), "tint2", NULL);
-		if (!g_file_test(tint2_cache_dir, G_FILE_TEST_IS_DIR))
+        if (!g_file_test(tint2_cache_dir, G_FILE_TEST_IS_DIR))
-			g_mkdir(tint2_cache_dir, 0700);
+            g_mkdir(tint2_cache_dir, 0700);
-		g_free(tint2_cache_dir);
+        g_free(tint2_cache_dir);
-	}
+    }
 
-	const gint PADDING = 20;
+    const gint PADDING = 20;
 
-	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
+    GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(g_theme_view));
 
-	GtkTreeIter iter;
+    GtkTreeIter iter;
-	gboolean have_iter;
+    gboolean have_iter;
 
-	int num_updates = 0;
+    int num_updates = 0;
-	gboolean need_pls_wait = FALSE;
+    gboolean need_pls_wait = FALSE;
 
-	have_iter = gtk_tree_model_get_iter_first(model, &iter);
+    have_iter = gtk_tree_model_get_iter_first(model, &iter);
-	while (have_iter) {
+    while (have_iter) {
-		GdkPixbuf *pixbuf;
+        GdkPixbuf *pixbuf;
-		gtk_tree_model_get(model, &iter, COL_SNAPSHOT, &pixbuf, -1);
+        gtk_tree_model_get(model, &iter, COL_SNAPSHOT, &pixbuf, -1);
-		if (pixbuf) {
+        if (pixbuf) {
-			g_object_unref(pixbuf);
+            g_object_unref(pixbuf);
-			have_iter = gtk_tree_model_iter_next(model, &iter);
+            have_iter = gtk_tree_model_iter_next(model, &iter);
-			continue;
+            continue;
-		}
+        }
 
-		gchar *path;
+        gchar *path;
-		gboolean force_refresh;
+        gboolean force_refresh;
-		gtk_tree_model_get(model, &iter, COL_THEME_FILE, &path, COL_FORCE_REFRESH, &force_refresh, -1);
+        gtk_tree_model_get(model, &iter, COL_THEME_FILE, &path, COL_FORCE_REFRESH, &force_refresh, -1);
 
-		char hash[MD4_HEX_SIZE + 4];
+        char hash[MD4_HEX_SIZE + 4];
-		md4hexf(path, hash);
+        md4hexf(path, hash);
-		strcat(hash, ".png");
+        strcat(hash, ".png");
 
-		gchar *snap = g_build_filename(g_get_user_cache_dir(), "tint2", hash, NULL);
+        gchar *snap = g_build_filename(g_get_user_cache_dir(), "tint2", hash, NULL);
-		pixbuf = force_refresh ? NULL : gdk_pixbuf_new_from_file(snap, NULL);
+        pixbuf = force_refresh ? NULL : gdk_pixbuf_new_from_file(snap, NULL);
-		if (!pixbuf) {
+        if (!pixbuf) {
-			gchar *cmd = g_strdup_printf("tint2 -c \'%s\' -s \'%s\' 1>/dev/null 2>/dev/null", path, snap);
+            gchar *cmd = g_strdup_printf("tint2 -c \'%s\' -s \'%s\' 1>/dev/null 2>/dev/null", path, snap);
-			num_updates++;
+            num_updates++;
-			if (num_updates > 3 && !need_pls_wait) {
+            if (num_updates > 3 && !need_pls_wait) {
-				need_pls_wait = TRUE;
+                need_pls_wait = TRUE;
-				create_please_wait(GTK_WINDOW(g_window));
+                create_please_wait(GTK_WINDOW(g_window));
-			}
+            }
-			if (system(cmd) == 0) {
+            if (system(cmd) == 0) {
-				// load
+                // load
-				pixbuf = gdk_pixbuf_new_from_file(snap, NULL);
+                pixbuf = gdk_pixbuf_new_from_file(snap, NULL);
-			}
+            }
-			g_free(cmd);
+            g_free(cmd);
-		}
+        }
 
-		g_free(snap);
+        g_free(snap);
-		g_free(path);
+        g_free(path);
 
-		gtk_list_store_set(theme_list_store,
+        gtk_list_store_set(theme_list_store,
-						   &iter,
+                           &iter,
-						   COL_SNAPSHOT,
+                           COL_SNAPSHOT,
-						   pixbuf,
+                           pixbuf,
-						   COL_WIDTH,
+                           COL_WIDTH,
-						   gdk_pixbuf_get_width(pixbuf) + PADDING,
+                           gdk_pixbuf_get_width(pixbuf) + PADDING,
-						   COL_HEIGHT,
+                           COL_HEIGHT,
-						   gdk_pixbuf_get_height(pixbuf) + PADDING,
+                           gdk_pixbuf_get_height(pixbuf) + PADDING,
-						   COL_FORCE_REFRESH,
+                           COL_FORCE_REFRESH,
-						   FALSE,
+                           FALSE,
-						   -1);
+                           -1);
-		if (pixbuf)
+        if (pixbuf)
-			g_object_unref(pixbuf);
+            g_object_unref(pixbuf);
 
-		if (need_pls_wait)
+        if (need_pls_wait)
-			process_events();
+            process_events();
 
-		have_iter = gtk_tree_model_iter_next(model, &iter);
+        have_iter = gtk_tree_model_iter_next(model, &iter);
-	}
+    }
 
-	if (need_pls_wait)
+    if (need_pls_wait)
-		destroy_please_wait();
+        destroy_please_wait();
 
-	return FALSE;
+    return FALSE;
 }

src/tint2conf/theme_view.h

@@ -5,13 +5,15 @@
 
 extern GtkWidget *g_theme_view;
 extern GtkListStore *theme_list_store;
-enum { COL_THEME_FILE = 0,
+enum {
-	   COL_THEME_NAME,
+    COL_THEME_FILE = 0,
-	   COL_SNAPSHOT,
+    COL_THEME_NAME,
-	   COL_WIDTH,
+    COL_SNAPSHOT,
-	   COL_HEIGHT,
+    COL_WIDTH,
-	   COL_FORCE_REFRESH,
+    COL_HEIGHT,
-	   NB_COL, };
+    COL_FORCE_REFRESH,
+    NB_COL,
+};
 
 GtkWidget *create_view();
 

src/tint2conf/tint2conf.desktop

@@ -113,3 +113,4 @@ Exec=tint2conf
 Icon=tint2conf
 Terminal=false
 Categories=Settings;DesktopSettings;
+MimeType=application/x-tint2-theme

src/tint2conf/tint2conf.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-tint2-theme">
+    <comment xml:lang="en">tint2 theme file</comment>
+      <sub-class-of type="text/plain"/>
+      <glob pattern="*tint2rc"/>
+  </mime-type>
+</mime-info>

src/tint2rc.c

@@ -1,411 +1,261 @@
 #include "tint2rc.h"
 
-unsigned char themes_tint2rc[] = {
+unsigned char themes_tint2rc[] =
-  0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61,
+    {0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20,
-  0x74, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x69, 0x6e, 0x74, 0x32,
+     0x74, 0x69, 0x6e, 0x74, 0x32, 0x63, 0x6f, 0x6e, 0x66, 0x20, 0x32, 0x36, 0x34, 0x31, 0x20, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x63, 0x6f, 0x6e, 0x66, 0x20, 0x32, 0x36, 0x34, 0x31, 0x20, 0x2d, 0x2d,
+     0x0a, 0x23, 0x20, 0x53, 0x65, 0x65, 0x20, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x6c,
-  0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x53, 0x65, 0x65, 0x20, 0x68, 0x74, 0x74,
+     0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x39, 0x30, 0x30, 0x30, 0x2f, 0x74, 0x69, 0x6e, 0x74, 0x32, 0x2f,
-  0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e,
+     0x77, 0x69, 0x6b, 0x69, 0x73, 0x2f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x20, 0x66, 0x6f, 0x72,
-  0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x39, 0x30, 0x30, 0x30, 0x2f, 0x74, 0x69,
+     0x20, 0x0a, 0x23, 0x20, 0x66, 0x75, 0x6c, 0x6c, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74,
-  0x6e, 0x74, 0x32, 0x2f, 0x77, 0x69, 0x6b, 0x69, 0x73, 0x2f, 0x43, 0x6f,
+     0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
-  0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x20, 0x66, 0x6f, 0x72, 0x20,
+     0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x0a, 0x23, 0x2d, 0x2d, 0x2d,
-  0x0a, 0x23, 0x20, 0x66, 0x75, 0x6c, 0x6c, 0x20, 0x64, 0x6f, 0x63, 0x75,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x42,
-  0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75,
+     0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x0a, 0x23, 0x20, 0x42, 0x61, 0x63, 0x6b, 0x67, 0x72,
-  0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x70, 0x74, 0x69, 0x6f,
+     0x6f, 0x75, 0x6e, 0x64, 0x20, 0x31, 0x3a, 0x20, 0x50, 0x61, 0x6e, 0x65, 0x6c, 0x0a, 0x72, 0x6f, 0x75, 0x6e, 0x64,
-  0x6e, 0x73, 0x2e, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x65, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x20, 0x3d, 0x20, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, 0x36, 0x30, 0x0a, 0x62, 0x6f, 0x72,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x42, 0x61, 0x63,
+     0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-  0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x73, 0x0a, 0x23, 0x20, 0x42,
+     0x20, 0x33, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f,
-  0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x31, 0x3a,
+     0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, 0x36,
-  0x20, 0x50, 0x61, 0x6e, 0x65, 0x6c, 0x0a, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+     0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65,
-  0x65, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65,
+     0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, 0x33, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b,
-  0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x3d, 0x20, 0x30, 0x0a,
+     0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65,
-  0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63,
+     0x64, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, 0x36, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64,
-  0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30,
+     0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20,
-  0x30, 0x30, 0x20, 0x36, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72,
+     0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, 0x33, 0x30, 0x0a, 0x0a, 0x23, 0x20, 0x42, 0x61, 0x63, 0x6b, 0x67,
-  0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30,
+     0x72, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x32, 0x3a, 0x20, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x74, 0x61,
-  0x30, 0x30, 0x30, 0x30, 0x20, 0x33, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b,
+     0x73, 0x6b, 0x2c, 0x20, 0x49, 0x63, 0x6f, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x74, 0x61, 0x73, 0x6b, 0x0a,
-  0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+     0x72, 0x6f, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x34, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f,
-  0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30,
+     0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e,
-  0x30, 0x30, 0x30, 0x30, 0x20, 0x36, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64,
+     0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x20, 0x32,
-  0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76,
+     0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x37,
-  0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+     0x37, 0x37, 0x37, 0x37, 0x37, 0x20, 0x33, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64,
-  0x20, 0x33, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75,
+     0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x61, 0x61,
-  0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65,
+     0x61, 0x61, 0x61, 0x20, 0x32, 0x32, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
-  0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30,
+     0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x65, 0x61, 0x65, 0x61, 0x65, 0x61, 0x20, 0x34, 0x34,
-  0x30, 0x30, 0x20, 0x36, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72,
+     0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70,
-  0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73,
+     0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x20, 0x34, 0x0a,
-  0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+     0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65,
-  0x20, 0x33, 0x30, 0x0a, 0x0a, 0x23, 0x20, 0x42, 0x61, 0x63, 0x6b, 0x67,
+     0x64, 0x20, 0x3d, 0x20, 0x23, 0x65, 0x61, 0x65, 0x61, 0x65, 0x61, 0x20, 0x34, 0x34, 0x0a, 0x0a, 0x23, 0x20, 0x42,
-  0x72, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x32, 0x3a, 0x20, 0x44, 0x65, 0x66,
+     0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x33, 0x3a, 0x20, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65,
-  0x61, 0x75, 0x6c, 0x74, 0x20, 0x74, 0x61, 0x73, 0x6b, 0x2c, 0x20, 0x49,
+     0x20, 0x74, 0x61, 0x73, 0x6b, 0x0a, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x34, 0x0a, 0x62,
-  0x63, 0x6f, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x74, 0x61, 0x73,
+     0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62, 0x61, 0x63,
-  0x6b, 0x0a, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x20, 0x3d, 0x20,
+     0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x37, 0x37,
-  0x34, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64,
+     0x37, 0x37, 0x37, 0x37, 0x20, 0x32, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f,
-  0x74, 0x68, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67,
+     0x72, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x20, 0x34, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b,
-  0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20,
+     0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20,
-  0x3d, 0x20, 0x23, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x20, 0x32, 0x30,
+     0x3d, 0x20, 0x23, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x20, 0x32, 0x32, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72,
-  0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f,
+     0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x65, 0x61, 0x65,
-  0x72, 0x20, 0x3d, 0x20, 0x23, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x20,
+     0x61, 0x65, 0x61, 0x20, 0x34, 0x34, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63,
-  0x33, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e,
+     0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x35, 0x35, 0x35,
-  0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65,
+     0x35, 0x35, 0x35, 0x20, 0x34, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f,
-  0x72, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x20,
+     0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x65, 0x61, 0x65, 0x61, 0x65, 0x61, 0x20, 0x34,
-  0x32, 0x32, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f,
+     0x34, 0x0a, 0x0a, 0x23, 0x20, 0x42, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x34, 0x3a, 0x20,
-  0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20,
+     0x55, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x20, 0x74, 0x61, 0x73, 0x6b, 0x0a, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x65, 0x64,
-  0x23, 0x65, 0x61, 0x65, 0x61, 0x65, 0x61, 0x20, 0x34, 0x34, 0x0a, 0x62,
+     0x20, 0x3d, 0x20, 0x34, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x3d,
-  0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f,
+     0x20, 0x31, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
-  0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20,
+     0x20, 0x3d, 0x20, 0x23, 0x61, 0x61, 0x34, 0x34, 0x30, 0x30, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64,
-  0x3d, 0x20, 0x23, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x20, 0x34, 0x0a,
+     0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x61, 0x37, 0x37, 0x33, 0x33, 0x20,
-  0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+     0x31, 0x30, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f,
-  0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23,
+     0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x63, 0x63, 0x37, 0x37, 0x30, 0x30, 0x20, 0x31,
-  0x65, 0x61, 0x65, 0x61, 0x65, 0x61, 0x20, 0x34, 0x34, 0x0a, 0x0a, 0x23,
+     0x30, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76,
-  0x20, 0x42, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x20,
+     0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x61, 0x37, 0x37, 0x33, 0x33, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x61,
-  0x33, 0x3a, 0x20, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x20, 0x74, 0x61,
+     0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73,
-  0x73, 0x6b, 0x0a, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x20, 0x3d,
+     0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x20, 0x34, 0x0a, 0x62, 0x6f, 0x72,
-  0x20, 0x34, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69,
+     0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d,
-  0x64, 0x74, 0x68, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62, 0x61, 0x63, 0x6b,
+     0x20, 0x23, 0x61, 0x61, 0x37, 0x37, 0x33, 0x33, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x0a, 0x23, 0x20, 0x42, 0x61, 0x63,
-  0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72,
+     0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x35, 0x3a, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x0a,
-  0x20, 0x3d, 0x20, 0x23, 0x37, 0x37, 0x37, 0x37, 0x37, 0x37, 0x20, 0x32,
+     0x72, 0x6f, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f,
-  0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c,
+     0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e,
-  0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+     0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x61, 0x61, 0x20, 0x31,
-  0x20, 0x34, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75,
+     0x30, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23,
-  0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76,
+     0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75,
-  0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61,
+     0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x66,
-  0x20, 0x32, 0x32, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63,
+     0x66, 0x66, 0x66, 0x61, 0x61, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f,
-  0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d,
+     0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
-  0x20, 0x23, 0x65, 0x61, 0x65, 0x61, 0x65, 0x61, 0x20, 0x34, 0x34, 0x0a,
+     0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c,
-  0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63,
+     0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x61,
-  0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64,
+     0x61, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f,
-  0x20, 0x3d, 0x20, 0x23, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x20, 0x34,
+     0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x20, 0x31,
-  0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f,
+     0x30, 0x30, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x23, 0x65, 0x61, 0x65, 0x61, 0x65, 0x61, 0x20, 0x34, 0x34, 0x0a, 0x0a,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x50, 0x61, 0x6e, 0x65, 0x6c, 0x0a, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f,
-  0x23, 0x20, 0x42, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+     0x69, 0x74, 0x65, 0x6d, 0x73, 0x20, 0x3d, 0x20, 0x4c, 0x54, 0x53, 0x43, 0x0a, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f,
-  0x20, 0x34, 0x3a, 0x20, 0x55, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x20, 0x74,
+     0x73, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x30, 0x25, 0x20, 0x33, 0x30, 0x0a, 0x70, 0x61, 0x6e, 0x65,
-  0x61, 0x73, 0x6b, 0x0a, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x65, 0x64, 0x20,
+     0x6c, 0x5f, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x30, 0x0a, 0x70, 0x61, 0x6e, 0x65,
-  0x3d, 0x20, 0x34, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77,
+     0x6c, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x32, 0x20, 0x30, 0x20, 0x32, 0x0a, 0x70,
-  0x69, 0x64, 0x74, 0x68, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62, 0x61, 0x63,
+     0x61, 0x6e, 0x65, 0x6c, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20,
-  0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f,
+     0x3d, 0x20, 0x31, 0x0a, 0x77, 0x6d, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x70, 0x61, 0x6e,
-  0x72, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x61, 0x34, 0x34, 0x30, 0x30, 0x20,
+     0x65, 0x6c, 0x5f, 0x64, 0x6f, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f, 0x70,
-  0x31, 0x30, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x63,
+     0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x20, 0x63, 0x65,
-  0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x61, 0x37, 0x37,
+     0x6e, 0x74, 0x65, 0x72, 0x20, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, 0x61, 0x6c, 0x0a, 0x70, 0x61, 0x6e,
-  0x33, 0x33, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67,
+     0x65, 0x6c, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x74, 0x6f, 0x70, 0x0a, 0x70, 0x61, 0x6e, 0x65,
-  0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f,
+     0x6c, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x61, 0x6c, 0x6c, 0x0a, 0x70, 0x72, 0x69,
-  0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x63, 0x63, 0x37,
+     0x6d, 0x61, 0x72, 0x79, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20,
-  0x37, 0x30, 0x30, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64,
+     0x3d, 0x20, 0x30, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x68, 0x69, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x61, 0x75,
-  0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68, 0x6f, 0x76,
+     0x74, 0x6f, 0x68, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-  0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x61, 0x37, 0x37, 0x33, 0x33,
+     0x20, 0x3d, 0x20, 0x30, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x68, 0x69, 0x64, 0x65, 0x5f, 0x68, 0x69, 0x64, 0x65, 0x5f,
-  0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f,
+     0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x2e, 0x35, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x68,
-  0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72,
+     0x69, 0x64, 0x65, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x3d, 0x20, 0x32, 0x0a, 0x73, 0x74, 0x72, 0x75,
-  0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x35, 0x35, 0x35,
+     0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x20, 0x3d, 0x20, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x73,
-  0x35, 0x35, 0x35, 0x20, 0x34, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72,
+     0x69, 0x7a, 0x65, 0x0a, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x6e, 0x61,
-  0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73,
+     0x6d, 0x65, 0x20, 0x3d, 0x20, 0x74, 0x69, 0x6e, 0x74, 0x32, 0x0a, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f,
-  0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x61, 0x61, 0x37, 0x37, 0x33, 0x33,
+     0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x6d, 0x6f,
-  0x20, 0x31, 0x30, 0x30, 0x0a, 0x0a, 0x23, 0x20, 0x42, 0x61, 0x63, 0x6b,
+     0x75, 0x73, 0x65, 0x5f, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x66, 0x6f, 0x6e,
-  0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x35, 0x3a, 0x20, 0x54, 0x6f,
+     0x74, 0x5f, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f,
-  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x0a, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x65,
+     0x68, 0x6f, 0x76, 0x65, 0x72, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x61, 0x73, 0x62, 0x20, 0x3d, 0x20, 0x31, 0x30,
-  0x64, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72,
+     0x30, 0x20, 0x30, 0x20, 0x31, 0x30, 0x0a, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65,
-  0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62,
+     0x64, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x61, 0x73, 0x62, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x30, 0x20, 0x30, 0x20,
-  0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f,
+     0x30, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x61,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x61, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72,
+     0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x54, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62,
-  0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30,
+     0x61, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x64, 0x65,
-  0x30, 0x30, 0x30, 0x30, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x61, 0x63,
+     0x73, 0x6b, 0x74, 0x6f, 0x70, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69,
-  0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f,
+     0x6e, 0x67, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x30, 0x20, 0x32, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f,
-  0x72, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x66,
+     0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74,
-  0x66, 0x66, 0x66, 0x61, 0x61, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x6f,
+     0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67,
-  0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x68,
+     0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61,
-  0x6f, 0x76, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30, 0x30, 0x30,
+     0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f,
-  0x30, 0x30, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x67,
+     0x68, 0x69, 0x64, 0x65, 0x5f, 0x69, 0x6e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x74, 0x61, 0x73, 0x6b, 0x73,
-  0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f,
+     0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x68, 0x69, 0x64, 0x65, 0x5f, 0x64,
-  0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x66,
+     0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x20, 0x3d, 0x20,
-  0x66, 0x66, 0x66, 0x61, 0x61, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x6f,
+     0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x5f, 0x73, 0x68,
-  0x72, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x5f, 0x70,
+     0x6f, 0x77, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x5f, 0x74, 0x61, 0x73, 0x6b,
-  0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x23, 0x30, 0x30,
+     0x73, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f,
-  0x30, 0x30, 0x30, 0x30, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x0a, 0x23, 0x2d,
+     0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x34, 0x20, 0x32, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f,
-  0x0a, 0x23, 0x20, 0x50, 0x61, 0x6e, 0x65, 0x6c, 0x0a, 0x70, 0x61, 0x6e,
+     0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-  0x65, 0x6c, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x20, 0x3d, 0x20, 0x4c,
+     0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x65, 0x33, 0x65, 0x33,
-  0x54, 0x53, 0x43, 0x0a, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f, 0x73, 0x69,
+     0x65, 0x33, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-  0x7a, 0x65, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x30, 0x25, 0x20, 0x33, 0x30,
+     0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20,
-  0x0a, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f, 0x6d, 0x61, 0x72, 0x67, 0x69,
+     0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62,
-  0x6e, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x30, 0x0a, 0x70, 0x61, 0x6e, 0x65,
+     0x61, 0x72, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x20,
-  0x6c, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20,
+     0x3d, 0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x73, 0x6f, 0x72, 0x74, 0x5f, 0x6f, 0x72,
-  0x32, 0x20, 0x30, 0x20, 0x32, 0x0a, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f,
+     0x64, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x61, 0x6c, 0x69,
-  0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69,
+     0x67, 0x6e, 0x20, 0x3d, 0x20, 0x6c, 0x65, 0x66, 0x74, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x64, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x77, 0x6d, 0x5f, 0x6d, 0x65, 0x6e,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x75, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x54, 0x61, 0x73, 0x6b, 0x0a,
-  0x64, 0x6f, 0x63, 0x6b, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x70, 0x61, 0x6e,
+     0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f,
-  0x65, 0x6c, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20,
+     0x69, 0x63, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x63, 0x65, 0x6e, 0x74, 0x65,
-  0x3d, 0x20, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x20, 0x63, 0x65, 0x6e,
+     0x72, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x75, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6e, 0x62, 0x5f, 0x6f,
-  0x74, 0x65, 0x72, 0x20, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74,
+     0x66, 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x0a, 0x74, 0x61,
-  0x61, 0x6c, 0x0a, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f, 0x6c, 0x61, 0x79,
+     0x73, 0x6b, 0x5f, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x20, 0x31,
-  0x65, 0x72, 0x20, 0x3d, 0x20, 0x74, 0x6f, 0x70, 0x0a, 0x70, 0x61, 0x6e,
+     0x35, 0x30, 0x20, 0x33, 0x35, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20,
-  0x65, 0x6c, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x20, 0x3d,
+     0x3d, 0x20, 0x32, 0x20, 0x32, 0x20, 0x34, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69,
-  0x20, 0x61, 0x6c, 0x6c, 0x0a, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79,
+     0x70, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c,
-  0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x5f, 0x66, 0x69, 0x72,
+     0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x74, 0x61,
-  0x73, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x68,
+     0x73, 0x6b, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20,
-  0x69, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x61, 0x75, 0x74, 0x6f,
+     0x32, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67,
-  0x68, 0x69, 0x64, 0x65, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x69,
+     0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x33, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x75,
-  0x6d, 0x65, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x61, 0x75,
+     0x72, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64,
-  0x74, 0x6f, 0x68, 0x69, 0x64, 0x65, 0x5f, 0x68, 0x69, 0x64, 0x65, 0x5f,
+     0x20, 0x3d, 0x20, 0x34, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64,
-  0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x2e,
+     0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x32, 0x0a,
-  0x35, 0x0a, 0x61, 0x75, 0x74, 0x6f, 0x68, 0x69, 0x64, 0x65, 0x5f, 0x68,
+     0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x3d, 0x20, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65,
-  0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x3d, 0x20, 0x32, 0x0a, 0x73, 0x74,
+     0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x69, 0x66, 0x79, 0x0a, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x6d, 0x69, 0x64, 0x64,
-  0x72, 0x75, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x20, 0x3d,
+     0x6c, 0x65, 0x20, 0x3d, 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x0a, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x72, 0x69, 0x67,
-  0x20, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x69, 0x7a, 0x65,
+     0x68, 0x74, 0x20, 0x3d, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x0a, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x63,
-  0x0a, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f,
+     0x72, 0x6f, 0x6c, 0x6c, 0x5f, 0x75, 0x70, 0x20, 0x3d, 0x20, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x0a, 0x6d, 0x6f,
-  0x77, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x74, 0x69, 0x6e,
+     0x75, 0x73, 0x65, 0x5f, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x20, 0x3d, 0x20, 0x69,
-  0x74, 0x32, 0x0a, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74,
+     0x63, 0x6f, 0x6e, 0x69, 0x66, 0x79, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x20,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x3d, 0x20, 0x31, 0x0a, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x65, 0x66,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x20, 0x74,
-  0x66, 0x65, 0x63, 0x74, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x66, 0x6f,
+     0x72, 0x61, 0x79, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61,
-  0x6e, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x20, 0x3d, 0x20,
+     0x72, 0x65, 0x61, 0x29, 0x0a, 0x73, 0x79, 0x73, 0x74, 0x72, 0x61, 0x79, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e,
-  0x30, 0x0a, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x6f, 0x76, 0x65,
+     0x67, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x34, 0x20, 0x32, 0x0a, 0x73, 0x79, 0x73, 0x74, 0x72, 0x61, 0x79, 0x5f, 0x62,
-  0x72, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x61, 0x73, 0x62, 0x20, 0x3d,
+     0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x73, 0x79,
-  0x20, 0x31, 0x30, 0x30, 0x20, 0x30, 0x20, 0x31, 0x30, 0x0a, 0x6d, 0x6f,
+     0x73, 0x74, 0x72, 0x61, 0x79, 0x5f, 0x73, 0x6f, 0x72, 0x74, 0x20, 0x3d, 0x20, 0x61, 0x73, 0x63, 0x65, 0x6e, 0x64,
-  0x75, 0x73, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x5f,
+     0x69, 0x6e, 0x67, 0x0a, 0x73, 0x79, 0x73, 0x74, 0x72, 0x61, 0x79, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69,
-  0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x61, 0x73, 0x62, 0x20, 0x3d, 0x20, 0x31,
+     0x7a, 0x65, 0x20, 0x3d, 0x20, 0x32, 0x34, 0x0a, 0x73, 0x79, 0x73, 0x74, 0x72, 0x61, 0x79, 0x5f, 0x69, 0x63, 0x6f,
-  0x30, 0x30, 0x20, 0x30, 0x20, 0x30, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d,
+     0x6e, 0x5f, 0x61, 0x73, 0x62, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x30, 0x20, 0x30, 0x20, 0x30, 0x0a, 0x73, 0x79, 0x73,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x74, 0x72, 0x61, 0x79, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x0a, 0x23,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a,
-  0x20, 0x54, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x0a, 0x74, 0x61, 0x73,
+     0x23, 0x20, 0x4c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x0a, 0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72,
-  0x6b, 0x62, 0x61, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x3d, 0x20,
+     0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x32, 0x20, 0x34, 0x20, 0x32, 0x0a, 0x6c, 0x61,
-  0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x64, 0x65, 0x73, 0x6b, 0x74,
+     0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69,
-  0x6f, 0x70, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x70,
+     0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x63, 0x6f, 0x6e,
-  0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x30, 0x20, 0x30,
+     0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a,
-  0x20, 0x32, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x62,
+     0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x20,
-  0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64,
+     0x3d, 0x20, 0x32, 0x34, 0x0a, 0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f,
-  0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72,
+     0x61, 0x73, 0x62, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x30, 0x20, 0x30, 0x20, 0x30, 0x0a, 0x6c, 0x61, 0x75, 0x6e, 0x63,
-  0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x62, 0x61, 0x63, 0x6b,
+     0x68, 0x65, 0x72, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x6f, 0x76, 0x65, 0x72,
-  0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20,
+     0x72, 0x69, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x5f, 0x6e, 0x6f,
-  0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x6e, 0x61,
+     0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x6c, 0x61, 0x75,
-  0x6d, 0x65, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62,
+     0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x6c,
-  0x61, 0x72, 0x5f, 0x68, 0x69, 0x64, 0x65, 0x5f, 0x69, 0x6e, 0x61, 0x63,
+     0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x70, 0x70, 0x20, 0x3d, 0x20,
-  0x74, 0x69, 0x76, 0x65, 0x5f, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x20, 0x3d,
+     0x2f, 0x75, 0x73, 0x72, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
-  0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x68,
+     0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x74, 0x69, 0x6e, 0x74, 0x32, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x64, 0x65, 0x73, 0x6b,
-  0x69, 0x64, 0x65, 0x5f, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e,
+     0x74, 0x6f, 0x70, 0x0a, 0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61,
-  0x74, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x20, 0x3d, 0x20,
+     0x70, 0x70, 0x20, 0x3d, 0x20, 0x2f, 0x75, 0x73, 0x72, 0x2f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2f, 0x73, 0x68, 0x61,
-  0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x61, 0x6c,
+     0x72, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x74, 0x69, 0x6e,
-  0x77, 0x61, 0x79, 0x73, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x61, 0x6c,
+     0x74, 0x32, 0x63, 0x6f, 0x6e, 0x66, 0x2e, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x0a, 0x6c, 0x61, 0x75, 0x6e,
-  0x6c, 0x5f, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x5f, 0x74, 0x61,
+     0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x70, 0x70, 0x20, 0x3d, 0x20, 0x2f, 0x75, 0x73,
-  0x73, 0x6b, 0x73, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b,
+     0x72, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-  0x62, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x70, 0x61, 0x64,
+     0x73, 0x2f, 0x66, 0x69, 0x72, 0x65, 0x66, 0x6f, 0x78, 0x2e, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x0a, 0x6c,
-  0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x34, 0x20, 0x32, 0x0a, 0x74,
+     0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x70, 0x70, 0x20, 0x3d, 0x20,
-  0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f,
+     0x2f, 0x75, 0x73, 0x72, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
-  0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69,
+     0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x69, 0x63, 0x65, 0x77, 0x65, 0x61, 0x73, 0x65, 0x6c, 0x2e, 0x64, 0x65, 0x73, 0x6b,
-  0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x61,
+     0x74, 0x6f, 0x70, 0x0a, 0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61,
-  0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76,
+     0x70, 0x70, 0x20, 0x3d, 0x20, 0x2f, 0x75, 0x73, 0x72, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x70,
-  0x65, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+     0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x69, 0x75, 0x6d, 0x2d,
-  0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b,
+     0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x2e, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x0a, 0x6c, 0x61, 0x75,
-  0x62, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x66, 0x6f, 0x6e,
+     0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x70, 0x70, 0x20, 0x3d, 0x20, 0x2f, 0x75,
-  0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x65,
+     0x73, 0x72, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
-  0x33, 0x65, 0x33, 0x65, 0x33, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x74, 0x61,
+     0x6e, 0x73, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2d, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x65, 0x2e, 0x64, 0x65,
-  0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x61,
+     0x73, 0x6b, 0x74, 0x6f, 0x70, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x43, 0x6c, 0x6f, 0x63, 0x6b, 0x0a, 0x74, 0x69, 0x6d,
-  0x66, 0x66, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x62,
+     0x65, 0x31, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x20, 0x3d, 0x20, 0x25, 0x48, 0x3a, 0x25, 0x4d, 0x0a, 0x74,
-  0x61, 0x72, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74,
+     0x69, 0x6d, 0x65, 0x32, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x20, 0x3d, 0x20, 0x25, 0x41, 0x20, 0x25, 0x64,
-  0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x74,
+     0x20, 0x25, 0x42, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x31, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x20,
-  0x61, 0x73, 0x6b, 0x62, 0x61, 0x72, 0x5f, 0x73, 0x6f, 0x72, 0x74, 0x5f,
+     0x3d, 0x20, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x32, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x20, 0x3d,
-  0x6f, 0x72, 0x64, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x6e, 0x6f, 0x6e, 0x65,
+     0x20, 0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20,
-  0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x20,
+     0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b,
-  0x3d, 0x20, 0x6c, 0x65, 0x66, 0x74, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d,
+     0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x32, 0x20, 0x30, 0x0a, 0x63, 0x6c, 0x6f, 0x63,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x6b, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x3d, 0x20, 0x0a, 0x63,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23,
+     0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f,
-  0x20, 0x54, 0x61, 0x73, 0x6b, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x74,
+     0x6e, 0x65, 0x20, 0x3d, 0x20, 0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6c, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f,
-  0x65, 0x78, 0x74, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x74, 0x61, 0x73, 0x6b,
+     0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x63,
-  0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x74, 0x61,
+     0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x6f, 0x72, 0x61, 0x67,
-  0x73, 0x6b, 0x5f, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x65, 0x64, 0x20,
+     0x65, 0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x6f, 0x6d, 0x6d,
-  0x3d, 0x20, 0x31, 0x0a, 0x75, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6e,
+     0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x75, 0x77, 0x68, 0x65, 0x65, 0x6c,
-  0x62, 0x5f, 0x6f, 0x66, 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x20, 0x3d,
+     0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x64,
-  0x20, 0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b,
+     0x77, 0x68, 0x65, 0x65, 0x6c, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x0a, 0x23,
-  0x5f, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x73, 0x69, 0x7a,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x65, 0x20, 0x3d, 0x20, 0x31, 0x35, 0x30, 0x20, 0x33, 0x35, 0x0a, 0x74,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a,
-  0x61, 0x73, 0x6b, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20,
+     0x23, 0x20, 0x42, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x74,
-  0x3d, 0x20, 0x32, 0x20, 0x32, 0x20, 0x34, 0x0a, 0x74, 0x61, 0x73, 0x6b,
+     0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f,
-  0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x3d, 0x20, 0x31,
+     0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x0a, 0x62, 0x61, 0x74,
-  0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63,
+     0x74, 0x65, 0x72, 0x79, 0x5f, 0x6c, 0x6f, 0x77, 0x5f, 0x63, 0x6d, 0x64, 0x20, 0x3d, 0x20, 0x6e, 0x6f, 0x74, 0x69,
-  0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66,
+     0x66, 0x79, 0x2d, 0x73, 0x65, 0x6e, 0x64, 0x20, 0x22, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x20, 0x6c, 0x6f,
-  0x66, 0x66, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f,
+     0x77, 0x22, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c,
-  0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69,
+     0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x62, 0x61,
-  0x64, 0x20, 0x3d, 0x20, 0x32, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x61,
+     0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x31, 0x20, 0x30,
-  0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72,
+     0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64,
-  0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x33, 0x0a,
+     0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x68, 0x69, 0x64,
-  0x74, 0x61, 0x73, 0x6b, 0x5f, 0x75, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x5f,
+     0x65, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x31, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x6c, 0x63, 0x6c,
-  0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69,
+     0x69, 0x63, 0x6b, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x62, 0x61, 0x74, 0x74,
-  0x64, 0x20, 0x3d, 0x20, 0x34, 0x0a, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69,
+     0x65, 0x72, 0x79, 0x5f, 0x72, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20,
-  0x63, 0x6f, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x5f, 0x62, 0x61, 0x63,
+     0x3d, 0x20, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x6d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63,
-  0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d,
+     0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x75,
-  0x20, 0x32, 0x0a, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x6c, 0x65, 0x66,
+     0x77, 0x68, 0x65, 0x65, 0x6c, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x62, 0x61,
-  0x74, 0x20, 0x3d, 0x20, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x5f, 0x69,
+     0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x64, 0x77, 0x68, 0x65, 0x65, 0x6c, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e,
-  0x63, 0x6f, 0x6e, 0x69, 0x66, 0x79, 0x0a, 0x6d, 0x6f, 0x75, 0x73, 0x65,
+     0x64, 0x20, 0x3d, 0x20, 0x0a, 0x61, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x63,
-  0x5f, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x6e, 0x6f,
+     0x6d, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x61, 0x63, 0x5f, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-  0x6e, 0x65, 0x0a, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x72, 0x69, 0x67,
+     0x65, 0x64, 0x5f, 0x63, 0x6d, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x68, 0x74, 0x20, 0x3d, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x0a, 0x6d,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x6f, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x5f,
+     0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x54, 0x6f, 0x6f, 0x6c, 0x74,
-  0x75, 0x70, 0x20, 0x3d, 0x20, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x0a,
+     0x69, 0x70, 0x0a, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x69, 0x6d,
-  0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c,
+     0x65, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x2e, 0x35, 0x0a, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f,
-  0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x20, 0x3d, 0x20, 0x69, 0x63, 0x6f, 0x6e,
+     0x68, 0x69, 0x64, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x2e, 0x31, 0x0a,
-  0x69, 0x66, 0x79, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x32,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x20, 0x32, 0x0a, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
+     0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x35, 0x0a, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x66,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x53, 0x79,
+     0x6f, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32,
-  0x73, 0x74, 0x65, 0x6d, 0x20, 0x74, 0x72, 0x61, 0x79, 0x20, 0x28, 0x6e,
+     0x20, 0x31, 0x30, 0x30, 0x0a, 0x0a};
-  0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20,
-  0x61, 0x72, 0x65, 0x61, 0x29, 0x0a, 0x73, 0x79, 0x73, 0x74, 0x72, 0x61,
-  0x79, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20,
-  0x30, 0x20, 0x34, 0x20, 0x32, 0x0a, 0x73, 0x79, 0x73, 0x74, 0x72, 0x61,
-  0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64,
-  0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x73, 0x79, 0x73, 0x74,
-  0x72, 0x61, 0x79, 0x5f, 0x73, 0x6f, 0x72, 0x74, 0x20, 0x3d, 0x20, 0x61,
-  0x73, 0x63, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x0a, 0x73, 0x79, 0x73,
-  0x74, 0x72, 0x61, 0x79, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69,
-  0x7a, 0x65, 0x20, 0x3d, 0x20, 0x32, 0x34, 0x0a, 0x73, 0x79, 0x73, 0x74,
-  0x72, 0x61, 0x79, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x61, 0x73, 0x62,
-  0x20, 0x3d, 0x20, 0x31, 0x30, 0x30, 0x20, 0x30, 0x20, 0x30, 0x0a, 0x73,
-  0x79, 0x73, 0x74, 0x72, 0x61, 0x79, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74,
-  0x6f, 0x72, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23,
-  0x20, 0x4c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x0a, 0x6c, 0x61,
-  0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69,
-  0x6e, 0x67, 0x20, 0x3d, 0x20, 0x32, 0x20, 0x34, 0x20, 0x32, 0x0a, 0x6c,
-  0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x63, 0x6b,
-  0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20,
-  0x30, 0x0a, 0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69,
-  0x63, 0x6f, 0x6e, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75,
-  0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x6c, 0x61,
-  0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f,
-  0x73, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x20, 0x32, 0x34, 0x0a, 0x6c, 0x61,
-  0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f,
-  0x61, 0x73, 0x62, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x30, 0x20, 0x30, 0x20,
-  0x30, 0x0a, 0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69,
-  0x63, 0x6f, 0x6e, 0x5f, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x6f, 0x76,
-  0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x30, 0x0a, 0x73,
-  0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x5f, 0x6e, 0x6f, 0x74, 0x69, 0x66,
-  0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x3d, 0x20, 0x31,
-  0x0a, 0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x74, 0x6f,
-  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x6c, 0x61,
-  0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f,
-  0x61, 0x70, 0x70, 0x20, 0x3d, 0x20, 0x2f, 0x75, 0x73, 0x72, 0x2f, 0x73,
-  0x68, 0x61, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61,
-  0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x74, 0x69, 0x6e, 0x74, 0x32, 0x63,
-  0x6f, 0x6e, 0x66, 0x2e, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x0a,
-  0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65,
-  0x6d, 0x5f, 0x61, 0x70, 0x70, 0x20, 0x3d, 0x20, 0x2f, 0x75, 0x73, 0x72,
-  0x2f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x65,
-  0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-  0x73, 0x2f, 0x74, 0x69, 0x6e, 0x74, 0x32, 0x63, 0x6f, 0x6e, 0x66, 0x2e,
-  0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x0a, 0x6c, 0x61, 0x75, 0x6e,
-  0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x70,
-  0x70, 0x20, 0x3d, 0x20, 0x2f, 0x75, 0x73, 0x72, 0x2f, 0x73, 0x68, 0x61,
-  0x72, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
-  0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x72, 0x65, 0x66, 0x6f, 0x78, 0x2e,
-  0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x0a, 0x6c, 0x61, 0x75, 0x6e,
-  0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x70,
-  0x70, 0x20, 0x3d, 0x20, 0x2f, 0x75, 0x73, 0x72, 0x2f, 0x73, 0x68, 0x61,
-  0x72, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
-  0x6f, 0x6e, 0x73, 0x2f, 0x69, 0x63, 0x65, 0x77, 0x65, 0x61, 0x73, 0x65,
-  0x6c, 0x2e, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x0a, 0x6c, 0x61,
-  0x75, 0x6e, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f,
-  0x61, 0x70, 0x70, 0x20, 0x3d, 0x20, 0x2f, 0x75, 0x73, 0x72, 0x2f, 0x73,
-  0x68, 0x61, 0x72, 0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61,
-  0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x63, 0x68, 0x72, 0x6f, 0x6d, 0x69,
-  0x75, 0x6d, 0x2d, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x2e, 0x64,
-  0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x0a, 0x6c, 0x61, 0x75, 0x6e, 0x63,
-  0x68, 0x65, 0x72, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x70, 0x70,
-  0x20, 0x3d, 0x20, 0x2f, 0x75, 0x73, 0x72, 0x2f, 0x73, 0x68, 0x61, 0x72,
-  0x65, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
-  0x6e, 0x73, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2d, 0x63, 0x68,
-  0x72, 0x6f, 0x6d, 0x65, 0x2e, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70,
-  0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x43, 0x6c, 0x6f, 0x63, 0x6b,
-  0x0a, 0x74, 0x69, 0x6d, 0x65, 0x31, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61,
-  0x74, 0x20, 0x3d, 0x20, 0x25, 0x48, 0x3a, 0x25, 0x4d, 0x0a, 0x74, 0x69,
-  0x6d, 0x65, 0x32, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x20, 0x3d,
-  0x20, 0x25, 0x41, 0x20, 0x25, 0x64, 0x20, 0x25, 0x42, 0x0a, 0x74, 0x69,
-  0x6d, 0x65, 0x31, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65,
-  0x20, 0x3d, 0x20, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x32, 0x5f, 0x74, 0x69,
-  0x6d, 0x65, 0x7a, 0x6f, 0x6e, 0x65, 0x20, 0x3d, 0x20, 0x0a, 0x63, 0x6c,
-  0x6f, 0x63, 0x6b, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c,
-  0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-  0x20, 0x31, 0x30, 0x30, 0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x70,
-  0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x32, 0x20, 0x30,
-  0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67,
-  0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x30,
-  0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x74,
-  0x69, 0x70, 0x20, 0x3d, 0x20, 0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f,
-  0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x69, 0x6d, 0x65,
-  0x7a, 0x6f, 0x6e, 0x65, 0x20, 0x3d, 0x20, 0x0a, 0x63, 0x6c, 0x6f, 0x63,
-  0x6b, 0x5f, 0x6c, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x6f, 0x6d,
-  0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x63, 0x6c, 0x6f, 0x63,
-  0x6b, 0x5f, 0x72, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x6f, 0x6d,
-  0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x6f, 0x72, 0x61, 0x67, 0x65,
-  0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6d, 0x63, 0x6c, 0x69, 0x63,
-  0x6b, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20,
-  0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x75, 0x77, 0x68, 0x65, 0x65,
-  0x6c, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20,
-  0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x64, 0x77, 0x68, 0x65, 0x65,
-  0x6c, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20,
-  0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x42, 0x61, 0x74, 0x74, 0x65,
-  0x72, 0x79, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x74,
-  0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x3d, 0x20, 0x31, 0x0a, 0x62,
-  0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x6c, 0x6f, 0x77, 0x5f, 0x73,
-  0x74, 0x61, 0x74, 0x75, 0x73, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x0a, 0x62,
-  0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x6c, 0x6f, 0x77, 0x5f, 0x63,
-  0x6d, 0x64, 0x20, 0x3d, 0x20, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x2d,
-  0x73, 0x65, 0x6e, 0x64, 0x20, 0x22, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72,
-  0x79, 0x20, 0x6c, 0x6f, 0x77, 0x22, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65,
-  0x72, 0x79, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x6f,
-  0x72, 0x20, 0x3d, 0x20, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x20,
-  0x31, 0x30, 0x30, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f,
-  0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x31, 0x20,
-  0x30, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x62, 0x61,
-  0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20,
-  0x3d, 0x20, 0x30, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f,
-  0x68, 0x69, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x31, 0x30, 0x31, 0x0a, 0x62,
-  0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x6c, 0x63, 0x6c, 0x69, 0x63,
-  0x6b, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20,
-  0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x72, 0x63, 0x6c,
-  0x69, 0x63, 0x6b, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20,
-  0x3d, 0x20, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x6d,
-  0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e,
-  0x64, 0x20, 0x3d, 0x20, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79,
-  0x5f, 0x75, 0x77, 0x68, 0x65, 0x65, 0x6c, 0x5f, 0x63, 0x6f, 0x6d, 0x6d,
-  0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x62, 0x61, 0x74, 0x74, 0x65,
-  0x72, 0x79, 0x5f, 0x64, 0x77, 0x68, 0x65, 0x65, 0x6c, 0x5f, 0x63, 0x6f,
-  0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x0a, 0x61, 0x63, 0x5f,
-  0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x6d,
-  0x64, 0x20, 0x3d, 0x20, 0x0a, 0x61, 0x63, 0x5f, 0x64, 0x69, 0x73, 0x63,
-  0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x6d, 0x64,
-  0x20, 0x3d, 0x20, 0x0a, 0x0a, 0x23, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-  0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x23, 0x20, 0x54, 0x6f,
-  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x0a, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69,
-  0x70, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x6f,
-  0x75, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x2e, 0x35, 0x0a, 0x74, 0x6f, 0x6f,
-  0x6c, 0x74, 0x69, 0x70, 0x5f, 0x68, 0x69, 0x64, 0x65, 0x5f, 0x74, 0x69,
-  0x6d, 0x65, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x30, 0x2e, 0x31, 0x0a,
-  0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x70, 0x61, 0x64, 0x64,
-  0x69, 0x6e, 0x67, 0x20, 0x3d, 0x20, 0x32, 0x20, 0x32, 0x0a, 0x74, 0x6f,
-  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72,
-  0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x35, 0x0a,
-  0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x66, 0x6f, 0x6e, 0x74,
-  0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x23, 0x32, 0x32,
-  0x32, 0x32, 0x32, 0x32, 0x20, 0x31, 0x30, 0x30, 0x0a, 0x0a
-};
 unsigned int themes_tint2rc_len = 4870;

src/tooltip/tooltip.c

@@ -41,290 +41,290 @@ Tooltip g_tooltip;
 
 void default_tooltip()
 {
-	// give the tooltip some reasonable default values
+    // give the tooltip some reasonable default values
-	memset(&g_tooltip, 0, sizeof(Tooltip));
+    memset(&g_tooltip, 0, sizeof(Tooltip));
 
-	g_tooltip.font_color.rgb[0] = 1;
+    g_tooltip.font_color.rgb[0] = 1;
-	g_tooltip.font_color.rgb[1] = 1;
+    g_tooltip.font_color.rgb[1] = 1;
-	g_tooltip.font_color.rgb[2] = 1;
+    g_tooltip.font_color.rgb[2] = 1;
-	g_tooltip.font_color.alpha = 1;
+    g_tooltip.font_color.alpha = 1;
-	just_shown = FALSE;
+    just_shown = FALSE;
 }
 
 void cleanup_tooltip()
 {
-	stop_tooltip_timeout();
+    stop_tooltip_timeout();
-	tooltip_hide(NULL);
+    tooltip_hide(NULL);
-	tooltip_copy_text(NULL);
+    tooltip_copy_text(NULL);
-	if (g_tooltip.window)
+    if (g_tooltip.window)
-		XDestroyWindow(server.display, g_tooltip.window);
+        XDestroyWindow(server.display, g_tooltip.window);
-	g_tooltip.window = 0;
+    g_tooltip.window = 0;
-	pango_font_description_free(g_tooltip.font_desc);
+    pango_font_description_free(g_tooltip.font_desc);
-	g_tooltip.font_desc = NULL;
+    g_tooltip.font_desc = NULL;
 }
 
 void init_tooltip()
 {
-	if (!g_tooltip.bg)
+    if (!g_tooltip.bg)
-		g_tooltip.bg = &g_array_index(backgrounds, Background, 0);
+        g_tooltip.bg = &g_array_index(backgrounds, Background, 0);
-	tooltip_init_fonts();
+    tooltip_init_fonts();
 
-	XSetWindowAttributes attr;
+    XSetWindowAttributes attr;
-	attr.override_redirect = True;
+    attr.override_redirect = True;
-	attr.event_mask = StructureNotifyMask;
+    attr.event_mask = StructureNotifyMask;
-	attr.colormap = server.colormap;
+    attr.colormap = server.colormap;
-	attr.background_pixel = 0;
+    attr.background_pixel = 0;
-	attr.border_pixel = 0;
+    attr.border_pixel = 0;
-	unsigned long mask = CWEventMask | CWColormap | CWBorderPixel | CWBackPixel | CWOverrideRedirect;
+    unsigned long mask = CWEventMask | CWColormap | CWBorderPixel | CWBackPixel | CWOverrideRedirect;
-	if (g_tooltip.window)
+    if (g_tooltip.window)
-		XDestroyWindow(server.display, g_tooltip.window);
+        XDestroyWindow(server.display, g_tooltip.window);
-	g_tooltip.window = XCreateWindow(server.display,
+    g_tooltip.window = XCreateWindow(server.display,
-	                                 server.root_win,
+                                     server.root_win,
-	                                 0,
+                                     0,
-	                                 0,
+                                     0,
-	                                 100,
+                                     100,
-	                                 20,
+                                     20,
-	                                 0,
+                                     0,
-	                                 server.depth,
+                                     server.depth,
-	                                 InputOutput,
+                                     InputOutput,
-	                                 server.visual,
+                                     server.visual,
-	                                 mask,
+                                     mask,
-	                                 &attr);
+                                     &attr);
 }
 
 void tooltip_init_fonts()
 {
-	if (!g_tooltip.font_desc)
+    if (!g_tooltip.font_desc)
-		g_tooltip.font_desc = pango_font_description_from_string(get_default_font());
+        g_tooltip.font_desc = pango_font_description_from_string(get_default_font());
 }
 
 void tooltip_default_font_changed()
 {
-	if (g_tooltip.has_font)
+    if (g_tooltip.has_font)
-		return;
+        return;
-	if (!g_tooltip.has_font) {
+    if (!g_tooltip.has_font) {
-		pango_font_description_free(g_tooltip.font_desc);
+        pango_font_description_free(g_tooltip.font_desc);
-		g_tooltip.font_desc = NULL;
+        g_tooltip.font_desc = NULL;
-	}
+    }
-	tooltip_init_fonts();
+    tooltip_init_fonts();
-	tooltip_update();
+    tooltip_update();
 }
 
 void tooltip_trigger_show(Area *area, Panel *p, XEvent *e)
 {
-	// Position the tooltip in the center of the area
+    // Position the tooltip in the center of the area
-	x = area->posx + MIN(area->width / 3, 22) + e->xmotion.x_root - e->xmotion.x;
+    x = area->posx + MIN(area->width / 3, 22) + e->xmotion.x_root - e->xmotion.x;
-	y = area->posy + area->height / 2 + e->xmotion.y_root - e->xmotion.y;
+    y = area->posy + area->height / 2 + e->xmotion.y_root - e->xmotion.y;
-	just_shown = TRUE;
+    just_shown = TRUE;
-	g_tooltip.panel = p;
+    g_tooltip.panel = p;
-	if (g_tooltip.mapped && g_tooltip.area != area) {
+    if (g_tooltip.mapped && g_tooltip.area != area) {
-		tooltip_copy_text(area);
+        tooltip_copy_text(area);
-		tooltip_update();
+        tooltip_update();
-		stop_tooltip_timeout();
+        stop_tooltip_timeout();
-	} else if (!g_tooltip.mapped) {
+    } else if (!g_tooltip.mapped) {
-		start_show_timeout();
+        start_show_timeout();
-	}
+    }
 }
 
 void tooltip_show(void *arg)
 {
-	int mx, my;
+    int mx, my;
-	Window w;
+    Window w;
-	XTranslateCoordinates(server.display, server.root_win, g_tooltip.panel->main_win, x, y, &mx, &my, &w);
+    XTranslateCoordinates(server.display, server.root_win, g_tooltip.panel->main_win, x, y, &mx, &my, &w);
-	Area *area = find_area_under_mouse(g_tooltip.panel, mx, my);
+    Area *area = find_area_under_mouse(g_tooltip.panel, mx, my);
-	if (!g_tooltip.mapped && area->_get_tooltip_text) {
+    if (!g_tooltip.mapped && area->_get_tooltip_text) {
-		tooltip_copy_text(area);
+        tooltip_copy_text(area);
-		g_tooltip.mapped = True;
+        g_tooltip.mapped = True;
-		XMapWindow(server.display, g_tooltip.window);
+        XMapWindow(server.display, g_tooltip.window);
-		tooltip_update();
+        tooltip_update();
-		XFlush(server.display);
+        XFlush(server.display);
-	}
+    }
 }
 
 void tooltip_update_geometry()
 {
-	Panel *panel = g_tooltip.panel;
+    Panel *panel = g_tooltip.panel;
-	int screen_width = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width;
+    int screen_width = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width;
 
-	cairo_surface_t *cs = cairo_xlib_surface_create(server.display, g_tooltip.window, server.visual, width, height);
+    cairo_surface_t *cs = cairo_xlib_surface_create(server.display, g_tooltip.window, server.visual, width, height);
-	cairo_t *c = cairo_create(cs);
+    cairo_t *c = cairo_create(cs);
-	PangoLayout *layout = pango_cairo_create_layout(c);
+    PangoLayout *layout = pango_cairo_create_layout(c);
 
-	pango_layout_set_font_description(layout, g_tooltip.font_desc);
+    pango_layout_set_font_description(layout, g_tooltip.font_desc);
-	PangoRectangle r1, r2;
+    PangoRectangle r1, r2;
-	pango_layout_set_text(layout, "1234567890", -1);
+    pango_layout_set_text(layout, "1234567890", -1);
-	pango_layout_get_pixel_extents(layout, &r1, &r2);
+    pango_layout_get_pixel_extents(layout, &r1, &r2);
-	int max_width = MIN(r2.width * 7, screen_width * 2 / 3);
+    int max_width = MIN(r2.width * 7, screen_width * 2 / 3);
-	pango_layout_set_width(layout, max_width * PANGO_SCALE);
+    pango_layout_set_width(layout, max_width * PANGO_SCALE);
 
-	pango_layout_set_text(layout, g_tooltip.tooltip_text, -1);
+    pango_layout_set_text(layout, g_tooltip.tooltip_text, -1);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
-	pango_layout_get_pixel_extents(layout, &r1, &r2);
+    pango_layout_get_pixel_extents(layout, &r1, &r2);
-	width = left_right_bg_border_width(g_tooltip.bg) + 2 * g_tooltip.paddingx + r2.width;
+    width = left_right_bg_border_width(g_tooltip.bg) + 2 * g_tooltip.paddingx + r2.width;
-	height = top_bottom_bg_border_width(g_tooltip.bg) + 2 * g_tooltip.paddingy + r2.height;
+    height = top_bottom_bg_border_width(g_tooltip.bg) + 2 * g_tooltip.paddingy + r2.height;
 
-	if (panel_horizontal && panel_position & BOTTOM)
+    if (panel_horizontal && panel_position & BOTTOM)
-		y = panel->posy - height;
+        y = panel->posy - height;
-	else if (panel_horizontal && panel_position & TOP)
+    else if (panel_horizontal && panel_position & TOP)
-		y = panel->posy + panel->area.height;
+        y = panel->posy + panel->area.height;
-	else if (panel_position & LEFT)
+    else if (panel_position & LEFT)
-		x = panel->posx + panel->area.width;
+        x = panel->posx + panel->area.width;
-	else
+    else
-		x = panel->posx - width;
+        x = panel->posx - width;
 
-	g_object_unref(layout);
+    g_object_unref(layout);
-	cairo_destroy(c);
+    cairo_destroy(c);
-	cairo_surface_destroy(cs);
+    cairo_surface_destroy(cs);
 }
 
 void tooltip_adjust_geometry()
 {
-	// adjust coordinates and size to not go offscreen
+    // adjust coordinates and size to not go offscreen
-	// it seems quite impossible that the height needs to be adjusted, but we do it anyway.
+    // it seems quite impossible that the height needs to be adjusted, but we do it anyway.
 
-	Panel *panel = g_tooltip.panel;
+    Panel *panel = g_tooltip.panel;
-	int screen_width = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width;
+    int screen_width = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width;
-	int screen_height = server.monitors[panel->monitor].y + server.monitors[panel->monitor].height;
+    int screen_height = server.monitors[panel->monitor].y + server.monitors[panel->monitor].height;
-	if (x + width <= screen_width && y + height <= screen_height && x >= server.monitors[panel->monitor].x &&
+    if (x + width <= screen_width && y + height <= screen_height && x >= server.monitors[panel->monitor].x &&
-		y >= server.monitors[panel->monitor].y)
+        y >= server.monitors[panel->monitor].y)
-		return; // no adjustment needed
+        return; // no adjustment needed
 
-	int min_x, min_y, max_width, max_height;
+    int min_x, min_y, max_width, max_height;
-	if (panel_horizontal) {
+    if (panel_horizontal) {
-		min_x = 0;
+        min_x = 0;
-		max_width = server.monitors[panel->monitor].width;
+        max_width = server.monitors[panel->monitor].width;
-		max_height = server.monitors[panel->monitor].height - panel->area.height;
+        max_height = server.monitors[panel->monitor].height - panel->area.height;
-		if (panel_position & BOTTOM)
+        if (panel_position & BOTTOM)
-			min_y = 0;
+            min_y = 0;
-		else
+        else
-			min_y = panel->area.height;
+            min_y = panel->area.height;
-	} else {
+    } else {
-		max_width = server.monitors[panel->monitor].width - panel->area.width;
+        max_width = server.monitors[panel->monitor].width - panel->area.width;
-		min_y = 0;
+        min_y = 0;
-		max_height = server.monitors[panel->monitor].height;
+        max_height = server.monitors[panel->monitor].height;
-		if (panel_position & LEFT)
+        if (panel_position & LEFT)
-			min_x = panel->area.width;
+            min_x = panel->area.width;
-		else
+        else
-			min_x = 0;
+            min_x = 0;
-	}
+    }
 
-	if (x + width > server.monitors[panel->monitor].x + server.monitors[panel->monitor].width)
+    if (x + width > server.monitors[panel->monitor].x + server.monitors[panel->monitor].width)
-		x = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width - width;
+        x = server.monitors[panel->monitor].x + server.monitors[panel->monitor].width - width;
-	if (y + height > server.monitors[panel->monitor].y + server.monitors[panel->monitor].height)
+    if (y + height > server.monitors[panel->monitor].y + server.monitors[panel->monitor].height)
-		y = server.monitors[panel->monitor].y + server.monitors[panel->monitor].height - height;
+        y = server.monitors[panel->monitor].y + server.monitors[panel->monitor].height - height;
 
-	if (x < min_x)
+    if (x < min_x)
-		x = min_x;
+        x = min_x;
-	if (width > max_width)
+    if (width > max_width)
-		width = max_width;
+        width = max_width;
-	if (y < min_y)
+    if (y < min_y)
-		y = min_y;
+        y = min_y;
-	if (height > max_height)
+    if (height > max_height)
-		height = max_height;
+        height = max_height;
 }
 
 void tooltip_update()
 {
-	if (!g_tooltip.tooltip_text) {
+    if (!g_tooltip.tooltip_text) {
-		tooltip_hide(0);
+        tooltip_hide(0);
-		return;
+        return;
-	}
+    }
 
-	tooltip_update_geometry();
+    tooltip_update_geometry();
-	if (just_shown) {
+    if (just_shown) {
-		if (!panel_horizontal)
+        if (!panel_horizontal)
-			y -= height / 2; // center vertically
+            y -= height / 2; // center vertically
-		just_shown = FALSE;
+        just_shown = FALSE;
-	}
+    }
-	tooltip_adjust_geometry();
+    tooltip_adjust_geometry();
-	XMoveResizeWindow(server.display, g_tooltip.window, x, y, width, height);
+    XMoveResizeWindow(server.display, g_tooltip.window, x, y, width, height);
 
-	// Stuff for drawing the tooltip
+    // Stuff for drawing the tooltip
-	cairo_surface_t *cs = cairo_xlib_surface_create(server.display, g_tooltip.window, server.visual, width, height);
+    cairo_surface_t *cs = cairo_xlib_surface_create(server.display, g_tooltip.window, server.visual, width, height);
-	cairo_t *c = cairo_create(cs);
+    cairo_t *c = cairo_create(cs);
-	Color bc = g_tooltip.bg->fill_color;
+    Color bc = g_tooltip.bg->fill_color;
-	Border b = g_tooltip.bg->border;
+    Border b = g_tooltip.bg->border;
-	if (server.real_transparency) {
+    if (server.real_transparency) {
-		clear_pixmap(g_tooltip.window, 0, 0, width, height);
+        clear_pixmap(g_tooltip.window, 0, 0, width, height);
-		draw_rect(c, b.width, b.width, width - 2 * b.width, height - 2 * b.width, b.radius - b.width / 1.571);
+        draw_rect(c, b.width, b.width, width - 2 * b.width, height - 2 * b.width, b.radius - b.width / 1.571);
-		cairo_set_source_rgba(c, bc.rgb[0], bc.rgb[1], bc.rgb[2], bc.alpha);
+        cairo_set_source_rgba(c, bc.rgb[0], bc.rgb[1], bc.rgb[2], bc.alpha);
-	} else {
+    } else {
-		cairo_rectangle(c, 0., 0, width, height);
+        cairo_rectangle(c, 0., 0, width, height);
-		cairo_set_source_rgb(c, bc.rgb[0], bc.rgb[1], bc.rgb[2]);
+        cairo_set_source_rgb(c, bc.rgb[0], bc.rgb[1], bc.rgb[2]);
-	}
+    }
-	cairo_fill(c);
+    cairo_fill(c);
-	cairo_set_line_width(c, b.width);
+    cairo_set_line_width(c, b.width);
-	if (server.real_transparency)
+    if (server.real_transparency)
-		draw_rect(c, b.width / 2.0, b.width / 2.0, width - b.width, height - b.width, b.radius);
+        draw_rect(c, b.width / 2.0, b.width / 2.0, width - b.width, height - b.width, b.radius);
-	else
+    else
-		cairo_rectangle(c, b.width / 2.0, b.width / 2.0, width - b.width, height - b.width);
+        cairo_rectangle(c, b.width / 2.0, b.width / 2.0, width - b.width, height - b.width);
-	cairo_set_source_rgba(c, b.color.rgb[0], b.color.rgb[1], b.color.rgb[2], b.color.alpha);
+    cairo_set_source_rgba(c, b.color.rgb[0], b.color.rgb[1], b.color.rgb[2], b.color.alpha);
-	cairo_stroke(c);
+    cairo_stroke(c);
 
-	Color fc = g_tooltip.font_color;
+    Color fc = g_tooltip.font_color;
-	cairo_set_source_rgba(c, fc.rgb[0], fc.rgb[1], fc.rgb[2], fc.alpha);
+    cairo_set_source_rgba(c, fc.rgb[0], fc.rgb[1], fc.rgb[2], fc.alpha);
-	PangoLayout *layout = pango_cairo_create_layout(c);
+    PangoLayout *layout = pango_cairo_create_layout(c);
-	pango_layout_set_font_description(layout, g_tooltip.font_desc);
+    pango_layout_set_font_description(layout, g_tooltip.font_desc);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
-	pango_layout_set_text(layout, g_tooltip.tooltip_text, -1);
+    pango_layout_set_text(layout, g_tooltip.tooltip_text, -1);
-	PangoRectangle r1, r2;
+    PangoRectangle r1, r2;
-	pango_layout_get_pixel_extents(layout, &r1, &r2);
+    pango_layout_get_pixel_extents(layout, &r1, &r2);
-	pango_layout_set_width(layout, width * PANGO_SCALE);
+    pango_layout_set_width(layout, width * PANGO_SCALE);
-	pango_layout_set_height(layout, height * PANGO_SCALE);
+    pango_layout_set_height(layout, height * PANGO_SCALE);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
-	// I do not know why this is the right way, but with the below cairo_move_to it seems to be centered (horiz. and
+    // I do not know why this is the right way, but with the below cairo_move_to it seems to be centered (horiz. and
-	// vert.)
+    // vert.)
-	cairo_move_to(c,
+    cairo_move_to(c,
-				  -r1.x / 2 + left_bg_border_width(g_tooltip.bg) + g_tooltip.paddingx,
+                  -r1.x / 2 + left_bg_border_width(g_tooltip.bg) + g_tooltip.paddingx,
-				  -r1.y / 2 + 1 + top_bg_border_width(g_tooltip.bg) + g_tooltip.paddingy);
+                  -r1.y / 2 + 1 + top_bg_border_width(g_tooltip.bg) + g_tooltip.paddingy);
-	pango_cairo_show_layout(c, layout);
+    pango_cairo_show_layout(c, layout);
 
-	g_object_unref(layout);
+    g_object_unref(layout);
-	cairo_destroy(c);
+    cairo_destroy(c);
-	cairo_surface_destroy(cs);
+    cairo_surface_destroy(cs);
 }
 
 void tooltip_trigger_hide()
 {
-	if (g_tooltip.mapped) {
+    if (g_tooltip.mapped) {
-		tooltip_copy_text(0);
+        tooltip_copy_text(0);
-		start_hide_timeout();
+        start_hide_timeout();
-	} else {
+    } else {
-		// tooltip not visible yet, but maybe a timeout is still pending
+        // tooltip not visible yet, but maybe a timeout is still pending
-		stop_tooltip_timeout();
+        stop_tooltip_timeout();
-	}
+    }
 }
 
 void tooltip_hide(void *arg)
 {
-	if (g_tooltip.mapped) {
+    if (g_tooltip.mapped) {
-		g_tooltip.mapped = False;
+        g_tooltip.mapped = False;
-		XUnmapWindow(server.display, g_tooltip.window);
+        XUnmapWindow(server.display, g_tooltip.window);
-		XFlush(server.display);
+        XFlush(server.display);
-	}
+    }
 }
 
 void start_show_timeout()
 {
-	change_timeout(&g_tooltip.timeout, g_tooltip.show_timeout_msec, 0, tooltip_show, 0);
+    change_timeout(&g_tooltip.timeout, g_tooltip.show_timeout_msec, 0, tooltip_show, 0);
 }
 
 void start_hide_timeout()
 {
-	change_timeout(&g_tooltip.timeout, g_tooltip.hide_timeout_msec, 0, tooltip_hide, 0);
+    change_timeout(&g_tooltip.timeout, g_tooltip.hide_timeout_msec, 0, tooltip_hide, 0);
 }
 
 void stop_tooltip_timeout()
 {
-	stop_timeout(g_tooltip.timeout);
+    stop_timeout(g_tooltip.timeout);
 }
 
 void tooltip_copy_text(Area *area)
 {
-	free(g_tooltip.tooltip_text);
+    free(g_tooltip.tooltip_text);
-	if (area && area->_get_tooltip_text)
+    if (area && area->_get_tooltip_text)
-		g_tooltip.tooltip_text = area->_get_tooltip_text(area);
+        g_tooltip.tooltip_text = area->_get_tooltip_text(area);
-	else
+    else
-		g_tooltip.tooltip_text = NULL;
+        g_tooltip.tooltip_text = NULL;
-	g_tooltip.area = area;
+    g_tooltip.area = area;
 }

src/tooltip/tooltip.h

@@ -23,20 +23,20 @@
 #include "timer.h"
 
 typedef struct {
-	Area *area; // never ever use the area attribut if you are not 100% sure that this area was not freed
+    Area *area; // never ever use the area attribut if you are not 100% sure that this area was not freed
-	char *tooltip_text;
+    char *tooltip_text;
-	Panel *panel;
+    Panel *panel;
-	Window window;
+    Window window;
-	int show_timeout_msec;
+    int show_timeout_msec;
-	int hide_timeout_msec;
+    int hide_timeout_msec;
-	Bool mapped;
+    Bool mapped;
-	int paddingx;
+    int paddingx;
-	int paddingy;
+    int paddingy;
-	gboolean has_font;
+    gboolean has_font;
-	PangoFontDescription *font_desc;
+    PangoFontDescription *font_desc;
-	Color font_color;
+    Color font_color;
-	Background *bg;
+    Background *bg;
-	timeout *timeout;
+    timeout *timeout;
 } Tooltip;
 
 extern Tooltip g_tooltip;

src/util/area.h

@@ -121,125 +121,125 @@
 //   The Area's _get_tooltip_text member must point to this function.
 
 typedef enum BorderMask {
-	BORDER_TOP     = 1 << 0,
+    BORDER_TOP = 1 << 0,
-	BORDER_BOTTOM  = 1 << 1,
+    BORDER_BOTTOM = 1 << 1,
-	BORDER_LEFT    = 1 << 2,
+    BORDER_LEFT = 1 << 2,
-	BORDER_RIGHT   = 1 << 3
+    BORDER_RIGHT = 1 << 3
 } BorderMask;
 
 #define BORDER_ALL (BORDER_TOP | BORDER_BOTTOM | BORDER_LEFT | BORDER_RIGHT)
 
 typedef struct Border {
-	// It's essential that the first member is color
+    // It's essential that the first member is color
-	Color color;
+    Color color;
-	// Width in pixels
+    // Width in pixels
-	int width;
+    int width;
-	// Corner radius
+    // Corner radius
-	int radius;
+    int radius;
-	// Mask: bitwise OR of BorderMask
+    // Mask: bitwise OR of BorderMask
-	int mask;
+    int mask;
 } Border;
 
 typedef enum MouseState { MOUSE_NORMAL = 0, MOUSE_OVER = 1, MOUSE_DOWN = 2, MOUSE_STATE_COUNT } MouseState;
 
 typedef struct Background {
-	// Normal state
+    // Normal state
-	Color fill_color;
+    Color fill_color;
-	Border border;
+    Border border;
-	// On mouse hover
+    // On mouse hover
-	Color fill_color_hover;
+    Color fill_color_hover;
-	Color border_color_hover;
+    Color border_color_hover;
-	// On mouse press
+    // On mouse press
-	Color fill_color_pressed;
+    Color fill_color_pressed;
-	Color border_color_pressed;
+    Color border_color_pressed;
-	// Pointer to a GradientClass or NULL, no ownership
+    // Pointer to a GradientClass or NULL, no ownership
-	GradientClass *gradients[MOUSE_STATE_COUNT];
+    GradientClass *gradients[MOUSE_STATE_COUNT];
 } Background;
 
 typedef enum Layout {
-	LAYOUT_DYNAMIC,
+    LAYOUT_DYNAMIC,
-	LAYOUT_FIXED,
+    LAYOUT_FIXED,
 } Layout;
 
 typedef enum Alignment {
-	ALIGN_LEFT = 0,
+    ALIGN_LEFT = 0,
-	ALIGN_CENTER = 1,
+    ALIGN_CENTER = 1,
-	ALIGN_RIGHT = 2,
+    ALIGN_RIGHT = 2,
 } Alignment;
 
 struct Panel;
 
 typedef struct Area {
-	// Position relative to the panel window
+    // Position relative to the panel window
-	int posx, posy;
+    int posx, posy;
-	// Size, including borders
+    // Size, including borders
-	int width, height;
+    int width, height;
-	int old_width, old_height;
+    int old_width, old_height;
-	Background *bg;
+    Background *bg;
-	// Each element is a GradientInstance attached to this Area (list can be empty)
+    // Each element is a GradientInstance attached to this Area (list can be empty)
-	GList *gradient_instances_by_state[MOUSE_STATE_COUNT];
+    GList *gradient_instances_by_state[MOUSE_STATE_COUNT];
-	// Each element is a GradientInstance that depends on this Area's geometry (position or size)
+    // Each element is a GradientInstance that depends on this Area's geometry (position or size)
-	GList *dependent_gradients;
+    GList *dependent_gradients;
-	// List of children, each one a pointer to Area
+    // List of children, each one a pointer to Area
-	GList *children;
+    GList *children;
-	// Pointer to the parent Area or NULL
+    // Pointer to the parent Area or NULL
-	void *parent;
+    void *parent;
-	// Pointer to the Panel that contains this Area
+    // Pointer to the Panel that contains this Area
-	void *panel;
+    void *panel;
-	Layout size_mode;
+    Layout size_mode;
-	Alignment alignment;
+    Alignment alignment;
-	gboolean has_mouse_over_effect;
+    gboolean has_mouse_over_effect;
-	gboolean has_mouse_press_effect;
+    gboolean has_mouse_press_effect;
-	// TODO padding/spacing is a clusterfuck
+    // TODO padding/spacing is a clusterfuck
-	// paddingxlr = padding
+    // paddingxlr = padding
-	// paddingy = vertical padding, sometimes
+    // paddingy = vertical padding, sometimes
-	// paddingx = spacing
+    // paddingx = spacing
-	int paddingxlr, paddingx, paddingy;
+    int paddingxlr, paddingx, paddingy;
-	MouseState mouse_state;
+    MouseState mouse_state;
-	// Set to non-zero if the Area is visible. An object may exist but stay hidden.
+    // Set to non-zero if the Area is visible. An object may exist but stay hidden.
-	gboolean on_screen;
+    gboolean on_screen;
-	// Set to non-zero if the size of the Area has to be recalculated.
+    // Set to non-zero if the size of the Area has to be recalculated.
-	gboolean resize_needed;
+    gboolean resize_needed;
-	// Set to non-zero if the Area has to be redrawn.
+    // Set to non-zero if the Area has to be redrawn.
-	// Do not set this directly; use schedule_redraw() instead.
+    // Do not set this directly; use schedule_redraw() instead.
-	gboolean _redraw_needed;
+    gboolean _redraw_needed;
-	// Set to non-zero if the position/size has changed, thus _on_change_layout needs to be called
+    // Set to non-zero if the position/size has changed, thus _on_change_layout needs to be called
-	gboolean _changed;
+    gboolean _changed;
-	// This is the pixmap on which the Area is rendered. Render to it directly if needed.
+    // This is the pixmap on which the Area is rendered. Render to it directly if needed.
-	Pixmap pix;
+    Pixmap pix;
-	Pixmap pix_by_state[MOUSE_STATE_COUNT];
+    Pixmap pix_by_state[MOUSE_STATE_COUNT];
-	char name[32];
+    char name[32];
 
-	// Callbacks
+    // Callbacks
 
-	// Called on draw before any drawing takes place, obj = pointer to the Area
+    // Called on draw before any drawing takes place, obj = pointer to the Area
-	void (*_clear)(void *obj);
+    void (*_clear)(void *obj);
 
-	// Called on draw, obj = pointer to the Area
+    // Called on draw, obj = pointer to the Area
-	void (*_draw_foreground)(void *obj, cairo_t *c);
+    void (*_draw_foreground)(void *obj, cairo_t *c);
 
-	// Called on resize, obj = pointer to the Area
+    // Called on resize, obj = pointer to the Area
-	// Returns 1 if the new size is different than the previous size.
+    // Returns 1 if the new size is different than the previous size.
-	gboolean (*_resize)(void *obj);
+    gboolean (*_resize)(void *obj);
 
-	// Called before resize, obj = pointer to the Area
+    // Called before resize, obj = pointer to the Area
-	// Returns the desired size of the Area
+    // Returns the desired size of the Area
-	int (*_compute_desired_size)(void *obj);
+    int (*_compute_desired_size)(void *obj);
 
-	// Implemented only to override the default layout algorithm for this widget.
+    // Implemented only to override the default layout algorithm for this widget.
-	// For example, if this widget is a cell in a table, its position and size should be computed here.
+    // For example, if this widget is a cell in a table, its position and size should be computed here.
-	void (*_on_change_layout)(void *obj);
+    void (*_on_change_layout)(void *obj);
 
-	// Returns a copy of the tooltip to be displayed for this widget.
+    // Returns a copy of the tooltip to be displayed for this widget.
-	// The caller takes ownership of the pointer.
+    // The caller takes ownership of the pointer.
-	char *(*_get_tooltip_text)(void *obj);
+    char *(*_get_tooltip_text)(void *obj);
 
-	// Returns true if the Area handles a mouse event at the given x, y coordinates relative to the window.
+    // Returns true if the Area handles a mouse event at the given x, y coordinates relative to the window.
-	// Leave this to NULL to use a default implementation.
+    // Leave this to NULL to use a default implementation.
-	gboolean (*_is_under_mouse)(void *obj, int x, int y);
+    gboolean (*_is_under_mouse)(void *obj, int x, int y);
 
-	// Prints the geometry of the object on stderr, with left indentation of indent spaces.
+    // Prints the geometry of the object on stderr, with left indentation of indent spaces.
-	void (*_dump_geometry)(void *obj, int indent);
+    void (*_dump_geometry)(void *obj, int indent);
 } Area;
 
 // Initializes the Background member to default values.
@@ -330,4 +330,7 @@ void mouse_out();
 void update_gradient(GradientInstance *gi);
 void update_dependent_gradients(Area *a);
 
+gboolean area_is_first(void *obj);
+gboolean area_is_last(void *obj);
+
 #endif

src/util/cache.c

@@ -32,129 +32,129 @@
 
 void init_cache(Cache *cache)
 {
-	if (cache->_table)
+    if (cache->_table)
-		free_cache(cache);
+        free_cache(cache);
-	cache->_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+    cache->_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-	cache->dirty = FALSE;
+    cache->dirty = FALSE;
-	cache->loaded = FALSE;
+    cache->loaded = FALSE;
 }
 
 void free_cache(Cache *cache)
 {
-	if (cache->_table)
+    if (cache->_table)
-		g_hash_table_destroy(cache->_table);
+        g_hash_table_destroy(cache->_table);
-	cache->_table = NULL;
+    cache->_table = NULL;
-	cache->dirty = FALSE;
+    cache->dirty = FALSE;
-	cache->loaded = FALSE;
+    cache->loaded = FALSE;
 }
 
 void load_cache(Cache *cache, const gchar *cache_path)
 {
-	init_cache(cache);
+    init_cache(cache);
 
-	cache->loaded = TRUE;
+    cache->loaded = TRUE;
 
-	int fd = open(cache_path, O_RDONLY);
+    int fd = open(cache_path, O_RDONLY);
-	if (fd == -1)
+    if (fd == -1)
-		return;
+        return;
-	flock(fd, LOCK_SH);
+    flock(fd, LOCK_SH);
 
-	FILE *f = fopen(cache_path, "rt");
+    FILE *f = fopen(cache_path, "rt");
-	if (!f)
+    if (!f)
-		goto unlock;
+        goto unlock;
 
-	char *line = NULL;
+    char *line = NULL;
-	size_t line_size;
+    size_t line_size;
 
-	while (getline(&line, &line_size, f) >= 0) {
+    while (getline(&line, &line_size, f) >= 0) {
-		char *key, *value;
+        char *key, *value;
 
-		size_t line_len = strlen(line);
+        size_t line_len = strlen(line);
-		gboolean has_newline = FALSE;
+        gboolean has_newline = FALSE;
-		if (line_len >= 1) {
+        if (line_len >= 1) {
-			if (line[line_len - 1] == '\n') {
+            if (line[line_len - 1] == '\n') {
-				line[line_len - 1] = '\0';
+                line[line_len - 1] = '\0';
-				line_len--;
+                line_len--;
-				has_newline = TRUE;
+                has_newline = TRUE;
-			}
+            }
-		}
+        }
-		if (!has_newline)
+        if (!has_newline)
-			break;
+            break;
 
-		if (line_len == 0)
+        if (line_len == 0)
-			continue;
+            continue;
 
-		if (parse_line(line, &key, &value)) {
+        if (parse_line(line, &key, &value)) {
-			g_hash_table_insert(cache->_table, g_strdup(key), g_strdup(value));
+            g_hash_table_insert(cache->_table, g_strdup(key), g_strdup(value));
-			free(key);
+            free(key);
-			free(value);
+            free(value);
-		}
+        }
-	}
+    }
-	free(line);
+    free(line);
-	fclose(f);
+    fclose(f);
 
 unlock:
-	flock(fd, LOCK_UN);
+    flock(fd, LOCK_UN);
-	close(fd);
+    close(fd);
 }
 
 void write_cache_line(gpointer key, gpointer value, gpointer user_data)
 {
-	gchar *k = key;
+    gchar *k = key;
-	gchar *v = value;
+    gchar *v = value;
-	FILE *f = user_data;
+    FILE *f = user_data;
 
-	fprintf(f, "%s=%s\n", k, v);
+    fprintf(f, "%s=%s\n", k, v);
 }
 
 void save_cache(Cache *cache, const gchar *cache_path)
 {
-	int fd = open(cache_path, O_RDONLY | O_CREAT, 0600);
+    int fd = open(cache_path, O_RDONLY | O_CREAT, 0600);
-	if (fd == -1) {
+    if (fd == -1) {
-		gchar *dir_path = g_path_get_dirname(cache_path);
+        gchar *dir_path = g_path_get_dirname(cache_path);
-		g_mkdir_with_parents(dir_path, 0700);
+        g_mkdir_with_parents(dir_path, 0700);
-		g_free(dir_path);
+        g_free(dir_path);
-		fd = open(cache_path, O_RDONLY | O_CREAT, 0600);
+        fd = open(cache_path, O_RDONLY | O_CREAT, 0600);
-	}
+    }
-	if (fd == -1) {
+    if (fd == -1) {
-		fprintf(stderr, RED "Could not save icon theme cache!" RESET "\n");
+        fprintf(stderr, RED "Could not save icon theme cache!" RESET "\n");
-		return;
+        return;
-	}
+    }
-	flock(fd, LOCK_EX);
+    flock(fd, LOCK_EX);
 
-	FILE *f = fopen(cache_path, "w");
+    FILE *f = fopen(cache_path, "w");
-	if (!f) {
+    if (!f) {
-		fprintf(stderr, RED "Could not save icon theme cache!" RESET "\n");
+        fprintf(stderr, RED "Could not save icon theme cache!" RESET "\n");
-		goto unlock;
+        goto unlock;
-	}
+    }
-	g_hash_table_foreach(cache->_table, write_cache_line, f);
+    g_hash_table_foreach(cache->_table, write_cache_line, f);
-	fclose(f);
+    fclose(f);
-	cache->dirty = FALSE;
+    cache->dirty = FALSE;
 
 unlock:
-	flock(fd, LOCK_UN);
+    flock(fd, LOCK_UN);
-	close(fd);
+    close(fd);
 }
 
 const gchar *get_from_cache(Cache *cache, const gchar *key)
 {
-	if (!cache->_table)
+    if (!cache->_table)
-		return NULL;
+        return NULL;
-	return g_hash_table_lookup(cache->_table, key);
+    return g_hash_table_lookup(cache->_table, key);
 }
 
 void add_to_cache(Cache *cache, const gchar *key, const gchar *value)
 {
-	if (!cache->_table)
+    if (!cache->_table)
-		init_cache(cache);
+        init_cache(cache);
 
-	if (!key || !value)
+    if (!key || !value)
-		return;
+        return;
 
-	gchar *old_value = g_hash_table_lookup(cache->_table, key);
+    gchar *old_value = g_hash_table_lookup(cache->_table, key);
-	if (old_value && g_str_equal(old_value, value))
+    if (old_value && g_str_equal(old_value, value))
-		return;
+        return;
 
-	g_hash_table_insert(cache->_table, g_strdup(key), g_strdup(value));
+    g_hash_table_insert(cache->_table, g_strdup(key), g_strdup(value));
-	cache->dirty = TRUE;
+    cache->dirty = TRUE;
 }