Compare commits
1 Commits
refresh-ex
...
memtrace
| Author | SHA1 | Date | |
|---|---|---|---|
|
01f823cf79 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -1,7 +1,5 @@
|
||||
build
|
||||
*.user
|
||||
version.h
|
||||
*.pyc
|
||||
*.todo
|
||||
packaging/make_ubuntu2.sh
|
||||
test_*.log
|
||||
*.pyc
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
stages:
|
||||
- build
|
||||
- test
|
||||
- release
|
||||
|
||||
variables:
|
||||
DEBIAN_FRONTEND: 'noninteractive'
|
||||
|
||||
job-build:
|
||||
stage: build
|
||||
image: ubuntu:rolling
|
||||
script:
|
||||
- sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list
|
||||
- apt-get update
|
||||
- apt-get build-dep -y tint2
|
||||
- apt-get install -y libgtk-3-dev git
|
||||
- git clean -ffdx
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake ..
|
||||
- make -j
|
||||
|
||||
job-release:
|
||||
stage: release
|
||||
image: registry.gitlab.com/gitlab-org/release-cli:latest
|
||||
rules:
|
||||
- if: $CI_COMMIT_TAG =~ /^v.*/
|
||||
script:
|
||||
- echo 'running release_job'
|
||||
release:
|
||||
name: 'Release $CI_COMMIT_TAG'
|
||||
description: 'Release $CI_COMMIT_TAG / $CI_COMMIT_SHA'
|
||||
tag_name: '$CI_COMMIT_TAG'
|
||||
ref: '$CI_COMMIT_SHA'
|
||||
3
AUTHORS
3
AUTHORS
@@ -6,7 +6,6 @@ tint2 is developped by :
|
||||
- Ovidiu M <mrovi9000 at gmail.com> : launcher, bug fixes
|
||||
- Mishael A Sibiryakov (death@junki.org) : freespace
|
||||
- Sebastian Reichel <sre@ring0.de> : battery, various fixes, debian package maintainer
|
||||
- Chris Lee <chrlee at protonmail> : bug fixes, maintainer starting with v16.3
|
||||
|
||||
tint2 is based on the ttm source code (http://code.google.com/p/ttm/)
|
||||
- 2007-2008 Pål Staurland <staura@gmail.com>
|
||||
@@ -33,8 +32,6 @@ Contributors:
|
||||
Ryan Gray, Jeff Blake (https://gitlab.com/berkley4) : battery format
|
||||
aaaz (https://gitlab.com/aaaz) : clock fixes
|
||||
heisenbug (https://gitlab.com/heisenbugh) : taskbar button tinting with icon color
|
||||
Fabian Carlström : taskbar sort order by app name
|
||||
Chris Billington (https://gitlab.com/chrisjbillington) : panel struts pivoting
|
||||
|
||||
Translations:
|
||||
Bosnian:
|
||||
|
||||
@@ -62,17 +62,6 @@ else()
|
||||
set(BACKTRACE_L_FLAGS "")
|
||||
endif()
|
||||
|
||||
check_c_source_compiles(
|
||||
"#define print(x) _Generic((x), default : print_unknown)(x) \n void print_unknown(){} \n int main () { print(0); }"
|
||||
HAS_GENERIC)
|
||||
|
||||
if(HAS_GENERIC)
|
||||
add_definitions(-DHAS_GENERIC)
|
||||
set(CSTD "c11")
|
||||
else()
|
||||
set(CSTD "c99")
|
||||
endif(HAS_GENERIC)
|
||||
|
||||
if( ENABLE_RSVG )
|
||||
pkg_check_modules( RSVG librsvg-2.0>=2.14.0 )
|
||||
endif( ENABLE_RSVG )
|
||||
@@ -127,14 +116,13 @@ include_directories( ${PROJECT_BINARY_DIR}
|
||||
|
||||
set( SOURCES src/config.c
|
||||
src/panel.c
|
||||
src/util/server.c
|
||||
src/server.c
|
||||
src/main.c
|
||||
src/init.c
|
||||
src/util/signals.c
|
||||
src/util/tracing.c
|
||||
src/signals.c
|
||||
src/tracing.c
|
||||
src/mouse_actions.c
|
||||
src/drag_and_drop.c
|
||||
src/default_icon.c
|
||||
src/clock/clock.c
|
||||
src/systray/systraybar.c
|
||||
src/launcher/launcher.c
|
||||
@@ -152,17 +140,16 @@ set( SOURCES src/config.c
|
||||
src/separator/separator.c
|
||||
src/tint2rc.c
|
||||
src/util/area.c
|
||||
src/util/bt.c
|
||||
src/util/common.c
|
||||
src/util/fps_distribution.c
|
||||
src/util/strnatcmp.c
|
||||
src/util/timer.c
|
||||
src/util/cache.c
|
||||
src/util/color.c
|
||||
src/util/strlcat.c
|
||||
src/util/print.c
|
||||
src/util/gradient.c
|
||||
src/util/test.c
|
||||
src/util/addr2line.c
|
||||
src/util/print.c
|
||||
src/util/mem.c
|
||||
src/util/uevent.c
|
||||
src/util/window.c )
|
||||
|
||||
@@ -249,7 +236,7 @@ else()
|
||||
SET(TRACING_L_FLAGS "")
|
||||
endif()
|
||||
|
||||
add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" )
|
||||
add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" -- "\"${PROJECT_SOURCE_DIR}/\"" )
|
||||
|
||||
link_directories( ${X11_LIBRARY_DIRS}
|
||||
${PANGOCAIRO_LIBRARY_DIRS}
|
||||
@@ -281,14 +268,16 @@ if( RT_LIBRARY )
|
||||
endif( RT_LIBRARY )
|
||||
|
||||
target_link_libraries( tint2 m )
|
||||
if(ENABLE_BACKTRACE)
|
||||
target_link_libraries( tint2 dl )
|
||||
target_link_libraries( tint2 z )
|
||||
target_link_libraries( tint2 bfd )
|
||||
endif(ENABLE_BACKTRACE)
|
||||
|
||||
add_dependencies( tint2 version )
|
||||
set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=${CSTD} ${ASAN_C_FLAGS} ${TRACING_C_FLAGS}" )
|
||||
set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=c11 ${ASAN_C_FLAGS} ${TRACING_C_FLAGS}" )
|
||||
set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS} ${BACKTRACE_L_FLAGS} ${TRACING_L_FLAGS}" )
|
||||
|
||||
add_executable(tint2-send src/tint2-send/tint2-send.c)
|
||||
target_link_libraries(tint2-send ${X11_LIBRARIES})
|
||||
|
||||
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 )
|
||||
|
||||
81
ChangeLog
81
ChangeLog
@@ -1,78 +1,8 @@
|
||||
2021-12-04 17.0.2
|
||||
- Fixes:
|
||||
- On dual monitor, when minimizing Chrome window it minimizes on the wrong monitor panel (issue #818)
|
||||
2021-05-29 17.0.1
|
||||
- Fixes:
|
||||
- Crash on panel cleanup in single-monitor execp (issue #801)
|
||||
2021-04-18 17.0
|
||||
- Fixes:
|
||||
- Crash when a window icon is large (issue #786) (santouits)
|
||||
- Minute clock doesn't update (issue #786)
|
||||
- Scrollbars in tint2conf (issue #796)
|
||||
- Preserve item order when skipping executors (issue #799)
|
||||
- Image memory leak (issues #704, #721) (Adam M. Trofa)
|
||||
- Incorrect timeout microsecond computation leading to high CPU usage (issue #800)
|
||||
- Enhancements:
|
||||
- Port tint2conf to gtk3 (issue #380)
|
||||
- execp_monitor config (issue #799)
|
||||
- Improved executor examples (Nikita Zlobin)
|
||||
2019-07-14 16.7
|
||||
- Fixes:
|
||||
- Fix spacing around icons in executor without text in vertical panels (issue #716)
|
||||
- Fix Bug: Clock Only Updates Every Minute With Format %s (issue #724)
|
||||
- Fix markup drawing when font shadow enabled (issue #709)
|
||||
- Struts pivoting: workaround for panel positioning between monitors in mutter (Chris Billington)
|
||||
- Enhancements:
|
||||
- Blink battery when discharging and low (issue #723)
|
||||
- Add support for battery percentage without % sign (issue #730)
|
||||
- Expand leading ~ in icon paths
|
||||
|
||||
2018-08-05 16.6.1
|
||||
- Fix packaging regression for debian (issue #715)
|
||||
|
||||
2018-08-04 16.6
|
||||
- Fix regression in task icon brightness (issue #714)
|
||||
|
||||
2018-08-04 16.5
|
||||
- Add new build script
|
||||
- Add option to sort taskbar by application name
|
||||
- Fix regression in image loading
|
||||
|
||||
2018-05-03 16.4
|
||||
- Update AUTHORS
|
||||
- Fixes:
|
||||
- Fix leak in image loading (issue #704)
|
||||
- Executors no longer log unless env var DEBUG_EXECUTORS is set
|
||||
|
||||
2018-04-17 16.3
|
||||
- Fixes:
|
||||
- Layout in executor (issue #695)
|
||||
- Other small issues
|
||||
|
||||
2018-01-21 16.2
|
||||
- Fixes:
|
||||
- Proper fix for issue #688
|
||||
- Fix bad word wrapping (issue #693)
|
||||
- Enhancements:
|
||||
- Preliminary high DPI support
|
||||
|
||||
2017-12-30 16.1
|
||||
- Fixes:
|
||||
- Fixed several use-after-free errors in the timer code
|
||||
- Merged patches and fixed other warnings on OpenBSD
|
||||
- Task, Button, Executor: add a bit of slack in the pango text layout,
|
||||
to avoid wrapping due to rounding errors
|
||||
|
||||
2017-12-20 16.0
|
||||
- Fixes:
|
||||
- Taskbar: `taskbar_distribute_size = 1` now playes well with `task_align = center` and
|
||||
`task_align = right` (issue #688)
|
||||
2017-11-10 master
|
||||
- Enhancements:
|
||||
- Added Spanish translation (contributed by Vicmz)
|
||||
- Executor: updated tooltip documentation (issue #676)
|
||||
- Systray: warn on duplicate config option systray_name_filter (issue #652)
|
||||
- Taskbar: thumbnail support in tooltips
|
||||
- Use C11 if possible to support generic printing for unit tests (should fall back to C99)
|
||||
|
||||
2017-11-05 15.3
|
||||
- Fixes:
|
||||
@@ -1041,12 +971,3 @@ released tint-0.2
|
||||
.
|
||||
.
|
||||
.
|
||||
.
|
||||
.
|
||||
.
|
||||
.
|
||||
.
|
||||
.
|
||||
.
|
||||
.
|
||||
.
|
||||
|
||||
12
README.md
12
README.md
@@ -1,5 +1,5 @@
|
||||
# Latest stable release: 17.0.2
|
||||
Changes: https://gitlab.com/o9000/tint2/blob/17.0.2/ChangeLog
|
||||
# Latest stable release: 15.3
|
||||
Changes: https://gitlab.com/o9000/tint2/blob/15.3/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 17.0.2
|
||||
git checkout 15.3
|
||||
mkdir build
|
||||
cd build
|
||||
cmake ..
|
||||
@@ -61,9 +61,9 @@ tint2 is a simple panel/taskbar made for modern X window managers. It was specif
|
||||
|
||||
# Known issues
|
||||
|
||||
* Graphical glitches on Intel graphics cards can be avoided by changing the acceleration method to UXA ([issue 595](https://gitlab.com/o9000/tint2/issues/595))
|
||||
* Window managers that do not follow exactly the EWMH specification might not interact well with tint2 ([issue 627](https://gitlab.com/o9000/tint2/issues/627)).
|
||||
* Full transparency requires a compositor such as Compton (if not provided already by the window manager, as in Compiz/Unity, KDE or XFCE).
|
||||
* Graphic glitches on Intel graphics cards can be avoided by changing the acceleration method to UXA ([issue 595](https://gitlab.com/o9000/tint2/issues/595))
|
||||
* Window managers that do not follow exactly the EWMH specification might not interact well with tint2 (known issues for [awesome](https://gitlab.com/o9000/tint2/issues/385), [bspwm](https://gitlab.com/o9000/tint2/issues/524). [openbox-multihead](https://gitlab.com/o9000/tint2/issues/456))
|
||||
* Full transparency requires a compositor such as Compton (if not provided already by the window manager, as in Compiz/Unity, KDE or XFCE)
|
||||
|
||||
# How can I help out?
|
||||
|
||||
|
||||
@@ -273,7 +273,7 @@ Try to respect as much as possible the order of the options as given below.</p><
|
||||
<li><p><code>border_content_tint_weight = integer</code> : Mixes the border color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). <em>(since 16.0)</em></p></li>
|
||||
<li><p><code>background_content_tint_weight = integer</code> : Mixes the background color with the content color (for tasks, this is the average color of the window icon). Values must be between 0 (no mixing) and 100 (fully replaces the color). <em>(since 16.0)</em></p></li>
|
||||
</ul>
|
||||
<p>You can define as many backgrounds as you want. For example, the following config defines two backgrounds:</p><div class="highlight"><pre class="highlight plaintext"><code>rounded = 1
|
||||
<p>You can define as many backgrounds as you want. For example, the following config defines two backgrounds:</p><pre class="highlight plaintext"><code>rounded = 1
|
||||
border_width = 0
|
||||
background_color = #282828 100
|
||||
border_color = #000000 0
|
||||
@@ -282,14 +282,16 @@ rounded = 1
|
||||
border_width = 0
|
||||
background_color = #f6b655 90
|
||||
border_color = #cccccc 40
|
||||
</code></pre></div><p>tint2 automatically identifies each background with a number starting from 1 (1, 2, ...).
|
||||
Afterwards, you can apply a background to objects (panel, taskbar, task, clock, systray) using the background id, for example:</p><div class="highlight"><pre class="highlight plaintext"><code>panel_background_id = 1
|
||||
</code></pre>
|
||||
<p>tint2 automatically identifies each background with a number starting from 1 (1, 2, ...).
|
||||
Afterwards, you can apply a background to objects (panel, taskbar, task, clock, systray) using the background id, for example:</p><pre class="highlight plaintext"><code>panel_background_id = 1
|
||||
taskbar_background_id = 0
|
||||
task_background_id = 0
|
||||
task_active_background_id = 2
|
||||
systray_background_id = 0
|
||||
clock_background_id = 0
|
||||
</code></pre></div><p>Identifier 0 refers to a special background which is fully transparent, identifier 1 applies the first background defined in the config file etc.</p><h3 id="gradients">Gradients<a name="gradients" href="#gradients" class="md2man-permalink" title="permalink"></a></h3><p>(Available since 0.13.0)</p><p>Backgrounds also allow specifying gradient layers
|
||||
</code></pre>
|
||||
<p>Identifier 0 refers to a special background which is fully transparent, identifier 1 applies the first background defined in the config file etc.</p><h3 id="gradients">Gradients<a name="gradients" href="#gradients" class="md2man-permalink" title="permalink"></a></h3><p>(Available since 0.13.0)</p><p>Backgrounds also allow specifying gradient layers
|
||||
that are drawn on top of the solid color background.</p><p>First the user must define one or more gradients in the config file,
|
||||
each starting with <code>gradient = TYPE</code>. These must be added before backgrounds.</p><p>Then gradients can be added by index to backgrounds,
|
||||
using the <code>gradient_id = INDEX</code>, <code>gradient_id_hover = INDEX</code> and
|
||||
@@ -298,17 +300,21 @@ the gradient index, starting from 1.</p><h4 id="gradient-types">Gradient types<a
|
||||
* vertical gradients: top-to-bottom;
|
||||
* horizontal gradients: left-to-right;
|
||||
* radial gradients: center-to-corners.</p><p>The user must specify the start and end colors, and can optionally add extra color stops in between
|
||||
using the <code>color_stop</code> option, as explained below.</p><h5 id="vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors">Vertical gradient, with color varying from the top edge to the bottom edge, two colors<a name="vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors" href="#vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>gradient = vertical
|
||||
using the <code>color_stop</code> option, as explained below.</p><h5 id="vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors">Vertical gradient, with color varying from the top edge to the bottom edge, two colors<a name="vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors" href="#vertical-gradient-with-color-varying-from-the-top-edge-to-the-bottom-edge-two-colors" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>gradient = vertical
|
||||
start_color = #rrggbb opacity
|
||||
end_color = #rrggbb opacity
|
||||
</code></pre></div><h5 id="horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors">Horizontal gradient, with color varying from the left edge to the right edge, two colors<a name="horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors" href="#horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>gradient = horizontal
|
||||
</code></pre>
|
||||
<h5 id="horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors">Horizontal gradient, with color varying from the left edge to the right edge, two colors<a name="horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors" href="#horizontal-gradient-with-color-varying-from-the-left-edge-to-the-right-edge-two-colors" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>gradient = horizontal
|
||||
start_color = #rrggbb opacity
|
||||
end_color = #rrggbb opacity
|
||||
</code></pre></div><h5 id="radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors">Radial gradient, with color varying from the center to the corner, two colors:<a name="radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors" href="#radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>gradient = radial
|
||||
</code></pre>
|
||||
<h5 id="radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors">Radial gradient, with color varying from the center to the corner, two colors:<a name="radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors" href="#radial-gradient-with-color-varying-from-the-center-to-the-corner-two-colors" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>gradient = radial
|
||||
start_color = #rrggbb opacity
|
||||
end_color = #rrggbb opacity
|
||||
</code></pre></div><h5 id="adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points">Adding extra color stops (0% and 100% remain fixed, more colors at x% between the start and end control points)<a name="adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points" href="#adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>color_stop = percentage #rrggbb opacity
|
||||
</code></pre></div><h4 id="gradient-examples">Gradient examples<a name="gradient-examples" href="#gradient-examples" class="md2man-permalink" title="permalink"></a></h4><div class="highlight"><pre class="highlight plaintext"><code># Gradient 1: thin film effect
|
||||
</code></pre>
|
||||
<h5 id="adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points">Adding extra color stops (0% and 100% remain fixed, more colors at x% between the start and end control points)<a name="adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points" href="#adding-extra-color-stops-0-and-100-remain-fixed-more-colors-at-x-between-the-start-and-end-control-points" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>color_stop = percentage #rrggbb opacity
|
||||
</code></pre>
|
||||
<h4 id="gradient-examples">Gradient examples<a name="gradient-examples" href="#gradient-examples" class="md2man-permalink" title="permalink"></a></h4><pre class="highlight plaintext"><code># Gradient 1: thin film effect
|
||||
gradient = horizontal
|
||||
start_color = #111122 30
|
||||
end_color = #112211 30
|
||||
@@ -344,7 +350,8 @@ gradient_id_hover = 4
|
||||
gradient_id_pressed = 2
|
||||
|
||||
[...]
|
||||
</code></pre></div><h3 id="panel">Panel<a name="panel" href="#panel" class="md2man-permalink" title="permalink"></a></h3>
|
||||
</code></pre>
|
||||
<h3 id="panel">Panel<a name="panel" href="#panel" class="md2man-permalink" title="permalink"></a></h3>
|
||||
<ul>
|
||||
<li><p><code>panel_items = LTSBC</code> defines the items tint2 will show and the order of those items. Each letter refers to an item, defined as:</p>
|
||||
<ul>
|
||||
@@ -379,12 +386,11 @@ gradient_id_pressed = 2
|
||||
<li><code>width</code> and <code>height</code> can be specified without units (e.g. <code>123</code>) as pixels, or followed by <code>%</code> as percentages of the monitor size (e.g. <code>50%</code>). Use <code>100%</code> for full monitor width/height.
|
||||
Example:</li>
|
||||
</ul></li>
|
||||
<li><p><code>scale_relative_to_dpi = integer</code> : If set to a non-zero value, HiDPI scaling is enabled. Each panel is visible on a different monitor. Thus each panel has a specific scaling factor. The scaling factor is computed as the ratio between the monitor DPI (obtained from the dimensions in pixels and millimeters from RandR) and a configured reference DPI - this is the DPI for which exising user configs looked normal, for backward compatibility.</p></li>
|
||||
<li><p><code>scale_relative_to_screen_height = integer</code> : Similar to <code>scale_relative_to_dpi</code>, except the scaling factor is computed as the ratio between the monitor height and <code>scale_relative_to_screen_height</code>. The effect is cumulative with <code>scale_relative_to_dpi</code>, i.e. if both options are present, the factors are multiplied.</p></li>
|
||||
</ul>
|
||||
<div class="highlight"><pre class="highlight plaintext"><code># The panel's width is 94% the size of the monitor, the height is 30 pixels:
|
||||
<pre class="highlight plaintext"><code># The panel's width is 94% the size of the monitor, the height is 30 pixels:
|
||||
panel_size = 94% 30
|
||||
</code></pre></div>
|
||||
</code></pre>
|
||||
|
||||
<ul>
|
||||
<li><p><code>panel_shrink = boolean (0 or 1)</code> : If set to 1, the panel will shrink to a compact size dynamically. <em>(since 0.13)</em></p></li>
|
||||
<li><p><code>panel_margin = horizontal_margin vertical_margin</code> : The margins define the distance between the panel and the horizontal/vertical monitor edge. Use <code>0</code> to obtain a panel with the same size as the edge of the monitor (no margin).</p></li>
|
||||
@@ -399,9 +405,8 @@ panel_size = 94% 30
|
||||
<li><p><code>panel_background_id = integer</code> : Which background to use for the panel.</p></li>
|
||||
<li><p><code>wm_menu = boolean (0 or 1)</code> : Defines if tint2 forwards unhandled mouse events to your window manager. Useful for window managers such as openbox, which display the start menu if you right click on the desktop.</p></li>
|
||||
<li><p><code>panel_dock = boolean (0 or 1)</code> : Defines if tint2 is placed into the window manager's dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).</p></li>
|
||||
<li><p><code>panel_pivot_struts = boolean (0 or 1)</code> : Defines if tint2 lies to the window manager about its orientation (horizontal vs vertical) when requesting reserved space with STRUTs (see <code>strut_policy</code> below). On some window managers, this allows placing a panel in the middle of the virtual screen, e.g. on the bottom edge of the top monitor in a vertical dual-monitor setup. </p></li>
|
||||
<li><p><code>panel_layer = bottom/normal/top</code> : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.</p></li>
|
||||
<li><p><code>strut_policy = follow_size/minimum/none</code> : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi-monitor (Xinerama) setups, the panel generally must be placed at the edge (not in the middle) of the virtual screen for this to work correctly (though on some window managers, setting <code>panel_pivot_struts</code> may work around this limitation). </p>
|
||||
<li><p><code>strut_policy = follow_size/minimum/none</code> : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.</p>
|
||||
<ul>
|
||||
<li><code>follow_size</code> means that the maximized windows always resize to have a common edge with tint2.</li>
|
||||
<li><code>minimum</code> means that the maximized windows always expand to have a common edge with the hidden panel. This is useful if the <code>autohide</code> option is enabled.</li>
|
||||
@@ -459,7 +464,6 @@ panel_size = 94% 30
|
||||
<ul>
|
||||
<li><code>none</code> : No sorting. New tasks are simply appended at the end of the taskbar when they appear.</li>
|
||||
<li><code>title</code> : Sorts the tasks by title.</li>
|
||||
<li><code>application</code> : Sorts the tasks by application name. <em>(since 16.3)</em></li>
|
||||
<li><code>center</code> : Sorts the tasks by their window centers.</li>
|
||||
<li><code>mru</code> : Shows the most recently used tasks first. <em>(since 0.12.4)</em></li>
|
||||
<li><code>lru</code> : Shows the most recently used tasks last. <em>(since 0.12.4)</em></li>
|
||||
@@ -566,7 +570,7 @@ panel_size = 94% 30
|
||||
<ul>
|
||||
<li><p><code>battery_hide = never/integer (0 to 100)</code> : At what battery percentage the battery item is hidden.</p></li>
|
||||
<li><p><code>battery_low_status = integer</code>: At what battery percentage the low command is executed.</p></li>
|
||||
<li><p><code>battery_low_cmd = xmessage 'tint2: Battery low!'</code> : Command to execute when the battery is low.</p></li>
|
||||
<li><p><code>battery_low_cmd = notify-send "battery low"</code> : Command to execute when the battery is low.</p></li>
|
||||
<li><p><code>battery_full_cmd = notify-send "battery full"</code> : Command to execute when the battery is full.</p></li>
|
||||
<li><p><code>bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
|
||||
<li><p><code>bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code></p></li>
|
||||
@@ -578,7 +582,6 @@ panel_size = 94% 30
|
||||
<li>%h: Hours left until completely charged/discharged (estimated).</li>
|
||||
<li>%t: Time left. Shows "hrs:mins" when charging/discharging, or "Ful\" when full.</li>
|
||||
<li>%p: Percentage. Includes the % sign.</li>
|
||||
<li>%P: Percentage. Without the % sign.</li>
|
||||
</ul></li>
|
||||
<li><p><code>bat2_format = FORMAT_STRING</code> : Format for battery line 2. Default: %t. <em>(since 1.0)</em></p></li>
|
||||
<li><p><code>battery_padding = horizontal_padding vertical_padding</code></p></li>
|
||||
@@ -602,27 +605,28 @@ panel_size = 94% 30
|
||||
<li><p><code>execp_cache_icon = boolean (0 or 1)</code> : If <code>execp_cache_icon = 0</code>, the image is reloaded each time the command is executed (useful if the image file is changed on disk by the program executed by <code>execp_command</code>). <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_icon_w = integer</code> : You can use <code>execp_icon_w</code> and <code>execp_icon_h</code> to resize the image. If one of them is zero/missing, the image is rescaled proportionally. If both of them are zero/missing, the image is not rescaled. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_icon_h = integer</code> : See <code>execp_icon_w</code>. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_tooltip = text</code> : The tooltip. If left empty, no tooltip is displayed. If missing, the standard error of the command is shown as a tooltip (an ANSI clear screen sequence can reset the contents, bash: <code>printf '\e[2J'</code>, C: <code>printf("\x1b[2J");</code>). If the standard error is empty, the tooltip will show information about the time when the command was last executed. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_tooltip = text</code> : The tooltip. If left empty, no tooltip is displayed. If missing, the standard error of the command is shown as a tooltip (an ANSI clear screen sequence can reset the contents, bash: <code>printf '\e[2J'</code>, C: <code>printf("\x1b[2J");</code>). If the standard error is empty, the tooltip will show information about the time when the command was last executed. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</code> : The font used to draw the text. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_font_color = color opacity</code> : The font color. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_markup = boolean (0 or 1)</code> : If non-zero, the output of the command is treated as Pango markup, which allows rich text formatting. The format is <a href="https://developer.gnome.org/pygtk/stable/pango-markup-language.html">documented here</a>. Note that using this with commands that print data downloaded from the Internet is a possible security risk. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_background_id = integer</code> : Which background to use. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_centered = boolean (0 or 1)</code> : Whether to center the text. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text</code> <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_monitor = integer (1, 2, ...), primary or all</code> : On which monitor to draw the executor. The first monitor is <code>1</code>. <em>(since 17.0)</em></p></li>
|
||||
<li><p><code>execp_lclick_command = text</code> : Command to execute on left click. If not defined, <code>execp_command</code> is executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_mclick_command = text</code> : Command to execute on right click. If not defined, <code>execp_command</code> is executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_rclick_command = text</code> : Command to execute on middle click. If not defined, <code>execp_command</code> is executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_uwheel_command = text</code> : Command to execute on wheel scroll up. If not defined, <code>execp_command</code> is executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
|
||||
<li><p><code>execp_dwheel_command = text</code> : Command to execute on wheel scroll down. If not defined, <code>execp_command</code> is executed immediately, unless it is currently running. <em>(since 0.12.4)</em></p></li>
|
||||
</ul>
|
||||
<h4 id="executor-samples">Executor samples<a name="executor-samples" href="#executor-samples" class="md2man-permalink" title="permalink"></a></h4><h5 id="print-the-hostname">Print the hostname<a name="print-the-hostname" href="#print-the-hostname" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>execp = new
|
||||
<h4 id="executor-samples">Executor samples<a name="executor-samples" href="#executor-samples" class="md2man-permalink" title="permalink"></a></h4><h5 id="print-the-hostname">Print the hostname<a name="print-the-hostname" href="#print-the-hostname" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
|
||||
execp_command = hostname
|
||||
execp_interval = 0
|
||||
</code></pre></div><h5 id="print-disk-usage-for-the-root-partition-every-10-seconds">Print disk usage for the root partition every 10 seconds<a name="print-disk-usage-for-the-root-partition-every-10-seconds" href="#print-disk-usage-for-the-root-partition-every-10-seconds" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>execp = new
|
||||
</code></pre>
|
||||
<h5 id="print-disk-usage-for-the-root-partition-every-10-seconds">Print disk usage for the root partition every 10 seconds<a name="print-disk-usage-for-the-root-partition-every-10-seconds" href="#print-disk-usage-for-the-root-partition-every-10-seconds" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
|
||||
execp_command = df -h | awk '/\/$/ { print $6 ": " $2 " " $5}'
|
||||
execp_interval = 10
|
||||
</code></pre></div><h5 id="button-with-icon-and-rich-text-executes-command-when-clicked">Button with icon and rich text, executes command when clicked<a name="button-with-icon-and-rich-text-executes-command-when-clicked" href="#button-with-icon-and-rich-text-executes-command-when-clicked" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>execp = new
|
||||
</code></pre>
|
||||
<h5 id="button-with-icon-and-rich-text-executes-command-when-clicked">Button with icon and rich text, executes command when clicked<a name="button-with-icon-and-rich-text-executes-command-when-clicked" href="#button-with-icon-and-rich-text-executes-command-when-clicked" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
|
||||
execp_command = echo /usr/share/icons/elementary-xfce/emblems/24/emblem-colors-blue.png; echo '<span foreground="#7f7">Click</span> <span foreground="#77f">me</span> <span foreground="#f77">pls</span>'
|
||||
execp_has_icon = 1
|
||||
execp_interval = 0
|
||||
@@ -634,30 +638,36 @@ execp_padding = 2 0
|
||||
execp_tooltip = I will tell you a secret...
|
||||
execp_lclick_command = zenity --info "--text=$(uname -sr)"
|
||||
execp_background_id = 2
|
||||
</code></pre></div><h5 id="desktop-pager-with-text">Desktop pager with text<a name="desktop-pager-with-text" href="#desktop-pager-with-text" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>execp = new
|
||||
</code></pre>
|
||||
<h5 id="desktop-pager-with-text">Desktop pager with text<a name="desktop-pager-with-text" href="#desktop-pager-with-text" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
|
||||
execp_command = xprop -root -spy | awk '/^_NET_CURRENT_DESKTOP/ { print "Workspace " ($3 + 1) ; fflush(); }'
|
||||
execp_interval = 1
|
||||
execp_continuous = 1
|
||||
</code></pre></div><h5 id="desktop-pager-with-icon">Desktop pager with icon<a name="desktop-pager-with-icon" href="#desktop-pager-with-icon" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>execp_command = xprop -root -spy | awk -v home="$HOME" '/^_NET_CURRENT_DESKTOP/ { print home "/.config/myPager/" ($3 + 1) ".png\n" ; fflush(); }'
|
||||
</code></pre>
|
||||
<h5 id="desktop-pager-with-icon">Desktop pager with icon<a name="desktop-pager-with-icon" href="#desktop-pager-with-icon" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp_command = xprop -root -spy | awk -v home="$HOME" '/^_NET_CURRENT_DESKTOP/ { print home "/.config/myPager/" ($3 + 1) ".png\n" ; fflush(); }'
|
||||
execp_interval = 1
|
||||
execp_has_icon = 1
|
||||
execp_cache_icon = 1
|
||||
execp_continuous = 2
|
||||
</code></pre></div><h5 id="round-trip-time-to-the-gateway-refreshed-every-second">Round-trip time to the gateway, refreshed every second<a name="round-trip-time-to-the-gateway-refreshed-every-second" href="#round-trip-time-to-the-gateway-refreshed-every-second" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>execp = new
|
||||
</code></pre>
|
||||
<h5 id="round-trip-time-to-the-gateway-refreshed-every-second">Round-trip time to the gateway, refreshed every second<a name="round-trip-time-to-the-gateway-refreshed-every-second" href="#round-trip-time-to-the-gateway-refreshed-every-second" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
|
||||
execp_command = ping -i 1 -c 1 -W 1 -O -D -n $(ip route | grep default | grep via | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*') | awk '/no/ { print "<span foreground=\"#faa\">timeout</span>"; fflush(); }; /time=/ { gsub(/time=/, "", $8); printf "<span foreground=\"#7af\">%3.0f %s</span>\n", $8, $9; fflush(); } '
|
||||
execp_continuous = 0
|
||||
execp_interval = 1
|
||||
execp_markup = 1
|
||||
</code></pre></div><h5 id="memory-usage">Memory usage<a name="memory-usage" href="#memory-usage" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code># Note the use of "stdbuf -oL" to force the program to flush the output line by line.
|
||||
</code></pre>
|
||||
<h5 id="memory-usage">Memory usage<a name="memory-usage" href="#memory-usage" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
|
||||
execp_command = free | awk '/^-/ { printf "Mem: '$(free -h | awk '/^Mem:/ { print $2 }')' %.0f%%\n", 100*$3/($3+$4); fflush(stdout) }'
|
||||
execp_interval = 5
|
||||
execp_continuous = 0
|
||||
</code></pre>
|
||||
<h5 id="network-load">Network load<a name="network-load" href="#network-load" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code># Note the use of "stdbuf -oL" to force the program to flush the output line by line.
|
||||
execp = new
|
||||
execp_command = free -b -s1 | stdbuf -oL awk '/^Mem:/ { printf "Mem: %s %.0f%%\n", $2, 100 * ($2 - $7) / $2 }' | stdbuf -oL numfmt --to=iec-i --field=2 -d' '
|
||||
execp_interval = 1
|
||||
execp_continuous = 1
|
||||
</code></pre></div><h5 id="network-load">Network load<a name="network-load" href="#network-load" class="md2man-permalink" title="permalink"></a></h5><div class="highlight"><pre class="highlight plaintext"><code>execp = new
|
||||
execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | stdbuf -oL awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }'
|
||||
execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }; fflush(stdout)'
|
||||
execp_continuous = 1
|
||||
execp_interval = 1
|
||||
</code></pre></div><h3 id="button">Button<a name="button" href="#button" class="md2man-permalink" title="permalink"></a></h3>
|
||||
</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>
|
||||
@@ -689,7 +699,6 @@ It is based on ttm, originally written by Pål Staurland <a href="mailto:staura@
|
||||
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's default location
|
||||
for documentation files, usually <code>/usr/share/doc/tint2</code> or <code>/usr/local/share/doc/tint2</code>.
|
||||
.
|
||||
.</p>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -199,17 +199,19 @@ pre {
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h1 id="latest-stable-release-17-0-2"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">17.0.2</span><a name="latest-stable-release-17-0-2" href="#latest-stable-release-17-0-2" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/17.0.2/ChangeLog">https://gitlab.com/o9000/tint2/blob/17.0.2/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><div class="highlight"><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
|
||||
<h1 id="latest-stable-release-15-3"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">15.3</span><a name="latest-stable-release-15-3" href="#latest-stable-release-15-3" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/15.3/ChangeLog">https://gitlab.com/o9000/tint2/blob/15.3/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 17.0.2
|
||||
git checkout 15.3
|
||||
mkdir build
|
||||
cd build
|
||||
cmake ..
|
||||
make -j4
|
||||
</code></pre></div><p>To install, run (as root):</p><div class="highlight"><pre class="highlight plaintext"><code>make install
|
||||
</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></div><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>
|
||||
</code></pre>
|
||||
<p>And then you can run the panel <code>tint2</code> and the configuration program <code>tint2conf</code>.</p><p>Please report any problems to <a href="https://gitlab.com/o9000/tint2/issues">https://gitlab.com/o9000/tint2/issues</a>. Your feedback is much appreciated.</p><p>P.S. GitLab is now the official location of the tint2 project, migrated from Google Code, which is shutting down. In case you are wondering why not GitHub, BitBucket etc., we chose GitLab because it is open source, it is mature and works well, looks cool and has a very nice team.</p><h1 id="what-is-tint2">What is tint2?<a name="what-is-tint2" href="#what-is-tint2" class="md2man-permalink" title="permalink"></a></h1><p>tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm <a href="https://code.google.com/p/ttm/">https://code.google.com/p/ttm/</a>.</p><h1 id="features">Features<a name="features" href="#features" class="md2man-permalink" title="permalink"></a></h1>
|
||||
<ul>
|
||||
<li>Panel with taskbar, system tray, clock and launcher icons;</li>
|
||||
<li>Easy to customize: color/transparency on fonts, icons, borders and backgrounds;</li>
|
||||
@@ -237,9 +239,9 @@ update-mime-database /usr/local/share/mime
|
||||
</ul>
|
||||
<h1 id="known-issues">Known issues<a name="known-issues" href="#known-issues" class="md2man-permalink" title="permalink"></a></h1>
|
||||
<ul>
|
||||
<li>Graphical glitches on Intel graphics cards can be avoided by changing the acceleration method to UXA (<a href="https://gitlab.com/o9000/tint2/issues/595">issue 595</a>)</li>
|
||||
<li>Window managers that do not follow exactly the EWMH specification might not interact well with tint2 (<a href="https://gitlab.com/o9000/tint2/issues/627">issue 627</a>).</li>
|
||||
<li>Full transparency requires a compositor such as Compton (if not provided already by the window manager, as in Compiz/Unity, KDE or XFCE).</li>
|
||||
<li>Graphic glitches on Intel graphics cards can be avoided by changing the acceleration method to UXA (<a href="https://gitlab.com/o9000/tint2/issues/595">issue 595</a>)</li>
|
||||
<li>Window managers that do not follow exactly the EWMH specification might not interact well with tint2 (known issues for <a href="https://gitlab.com/o9000/tint2/issues/385">awesome</a>, <a href="https://gitlab.com/o9000/tint2/issues/524">bspwm</a>. <a href="https://gitlab.com/o9000/tint2/issues/456">openbox-multihead</a>)</li>
|
||||
<li>Full transparency requires a compositor such as Compton (if not provided already by the window manager, as in Compiz/Unity, KDE or XFCE)</li>
|
||||
</ul>
|
||||
<h1 id="how-can-i-help-out">How can I help out?<a name="how-can-i-help-out" href="#how-can-i-help-out" class="md2man-permalink" title="permalink"></a></h1>
|
||||
<ul>
|
||||
|
||||
29
doc/tint2.1
29
doc/tint2.1
@@ -1,4 +1,4 @@
|
||||
.TH TINT2 1 "2021\-12\-04" 17.0.2
|
||||
.TH TINT2 1 "2017\-11\-05" 15.3
|
||||
.SH NAME
|
||||
.PP
|
||||
tint2 \- lightweight panel/taskbar
|
||||
@@ -343,10 +343,6 @@ Use \fB\fCpanel_monitor = all\fR to get a separate panel per monitor
|
||||
\fB\fCwidth\fR and \fB\fCheight\fR can be specified without units (e.g. \fB\fC123\fR) as pixels, or followed by \fB\fC%\fR as percentages of the monitor size (e.g. \fB\fC50%\fR). Use \fB\fC100%\fR for full monitor width/height.
|
||||
Example:
|
||||
.RE
|
||||
.IP \(bu 2
|
||||
\fB\fCscale_relative_to_dpi = integer\fR : If set to a non\-zero value, HiDPI scaling is enabled. Each panel is visible on a different monitor. Thus each panel has a specific scaling factor. The scaling factor is computed as the ratio between the monitor DPI (obtained from the dimensions in pixels and millimeters from RandR) and a configured reference DPI \- this is the DPI for which exising user configs looked normal, for backward compatibility.
|
||||
.IP \(bu 2
|
||||
\fB\fCscale_relative_to_screen_height = integer\fR : Similar to \fB\fCscale_relative_to_dpi\fR, except the scaling factor is computed as the ratio between the monitor height and \fB\fCscale_relative_to_screen_height\fR\&. The effect is cumulative with \fB\fCscale_relative_to_dpi\fR, i.e. if both options are present, the factors are multiplied.
|
||||
.RE
|
||||
.PP
|
||||
.RS
|
||||
@@ -379,11 +375,9 @@ panel_size = 94% 30
|
||||
.IP \(bu 2
|
||||
\fB\fCpanel_dock = boolean (0 or 1)\fR : Defines if tint2 is placed into the window manager's dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).
|
||||
.IP \(bu 2
|
||||
\fB\fCpanel_pivot_struts = boolean (0 or 1)\fR : Defines if tint2 lies to the window manager about its orientation (horizontal vs vertical) when requesting reserved space with STRUTs (see \fB\fCstrut_policy\fR below). On some window managers, this allows placing a panel in the middle of the virtual screen, e.g. on the bottom edge of the top monitor in a vertical dual\-monitor setup.
|
||||
.IP \(bu 2
|
||||
\fB\fCpanel_layer = bottom/normal/top\fR : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.
|
||||
.IP \(bu 2
|
||||
\fB\fCstrut_policy = follow_size/minimum/none\fR : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi\-monitor (Xinerama) setups, the panel generally must be placed at the edge (not in the middle) of the virtual screen for this to work correctly (though on some window managers, setting \fB\fCpanel_pivot_struts\fR may work around this limitation).
|
||||
\fB\fCstrut_policy = follow_size/minimum/none\fR : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi\-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.
|
||||
.RS
|
||||
.IP \(bu 2
|
||||
\fB\fCfollow_size\fR means that the maximized windows always resize to have a common edge with tint2.
|
||||
@@ -482,8 +476,6 @@ You can switch between virtual desktops.
|
||||
.IP \(bu 2
|
||||
\fB\fCtitle\fR : Sorts the tasks by title.
|
||||
.IP \(bu 2
|
||||
\fB\fCapplication\fR : Sorts the tasks by application name. \fI(since 16.3)\fP
|
||||
.IP \(bu 2
|
||||
\fB\fCcenter\fR : Sorts the tasks by their window centers.
|
||||
.IP \(bu 2
|
||||
\fB\fCmru\fR : Shows the most recently used tasks first. \fI(since 0.12.4)\fP
|
||||
@@ -667,7 +659,7 @@ To hide the clock, comment \fB\fCtime1_format\fR and \fB\fCtime2_format\fR\&.
|
||||
.IP \(bu 2
|
||||
\fB\fCbattery_low_status = integer\fR: At what battery percentage the low command is executed.
|
||||
.IP \(bu 2
|
||||
\fB\fCbattery_low_cmd = xmessage 'tint2: Battery low!'\fR : Command to execute when the battery is low.
|
||||
\fB\fCbattery_low_cmd = notify\-send "battery low"\fR : Command to execute when the battery is low.
|
||||
.IP \(bu 2
|
||||
\fB\fCbattery_full_cmd = notify\-send "battery full"\fR : Command to execute when the battery is full.
|
||||
.IP \(bu 2
|
||||
@@ -689,8 +681,6 @@ To hide the clock, comment \fB\fCtime1_format\fR and \fB\fCtime2_format\fR\&.
|
||||
%t: Time left. Shows "hrs:mins" when charging/discharging, or "Ful\[rs]" when full.
|
||||
.IP \(bu 2
|
||||
%p: Percentage. Includes the % sign.
|
||||
.IP \(bu 2
|
||||
%P: Percentage. Without the % sign.
|
||||
.RE
|
||||
.IP \(bu 2
|
||||
\fB\fCbat2_format = FORMAT_STRING\fR : Format for battery line 2. Default: %t. \fI(since 1.0)\fP
|
||||
@@ -748,8 +738,6 @@ To hide the clock, comment \fB\fCtime1_format\fR and \fB\fCtime2_format\fR\&.
|
||||
.IP \(bu 2
|
||||
\fB\fCexecp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text\fR \fI(since 0.12.4)\fP
|
||||
.IP \(bu 2
|
||||
\fB\fCexecp_monitor = integer (1, 2, ...), primary or all\fR : On which monitor to draw the executor. The first monitor is \fB\fC1\fR\&. \fI(since 17.0)\fP
|
||||
.IP \(bu 2
|
||||
\fB\fCexecp_lclick_command = text\fR : Command to execute on left click. If not defined, \fB\fCexecp_command\fR is executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
|
||||
.IP \(bu 2
|
||||
\fB\fCexecp_mclick_command = text\fR : Command to execute on right click. If not defined, \fB\fCexecp_command\fR is executed immediately, unless it is currently running. \fI(since 0.12.4)\fP
|
||||
@@ -833,19 +821,19 @@ execp_markup = 1
|
||||
.PP
|
||||
.RS
|
||||
.nf
|
||||
# Note the use of "stdbuf \-oL" to force the program to flush the output line by line.
|
||||
execp = new
|
||||
execp_command = free \-b \-s1 | stdbuf \-oL awk '/^Mem:/ { printf "Mem: %s %.0f%%\\n", $2, 100 * ($2 \- $7) / $2 }' | stdbuf \-oL numfmt \-\-to=iec\-i \-\-field=2 \-d' '
|
||||
execp_interval = 1
|
||||
execp_continuous = 1
|
||||
execp_command = free | awk '/^\-/ { printf "Mem: '$(free \-h | awk '/^Mem:/ { print $2 }')' %.0f%%\\n", 100*$3/($3+$4); fflush(stdout) }'
|
||||
execp_interval = 5
|
||||
execp_continuous = 0
|
||||
.fi
|
||||
.RE
|
||||
.SS Network load
|
||||
.PP
|
||||
.RS
|
||||
.nf
|
||||
# Note the use of "stdbuf \-oL" to force the program to flush the output line by line.
|
||||
execp = new
|
||||
execp_command = stdbuf \-oL bwm\-ng \-o csv \-t 1000 | stdbuf \-oL awk \-F ';' '/total/ { printf "Net: %.0f Mb/s\\n", ($5*8/1.0e6) }'
|
||||
execp_command = stdbuf \-oL bwm\-ng \-o csv \-t 1000 | awk \-F ';' '/total/ { printf "Net: %.0f Mb/s\\n", ($5*8/1.0e6) }; fflush(stdout)'
|
||||
execp_continuous = 1
|
||||
execp_interval = 1
|
||||
.fi
|
||||
@@ -916,4 +904,3 @@ and the wiki page at \[la]https://gitlab.com/o9000/tint2/wikis/home\[ra]\&.
|
||||
This documentation is also provided in HTML and Markdown format in the system's default location
|
||||
for documentation files, usually \fB\fC/usr/share/doc/tint2\fR or \fB\fC/usr/local/share/doc/tint2\fR\&.
|
||||
\&.
|
||||
\&.
|
||||
|
||||
@@ -372,14 +372,14 @@ execp_continuous = 1
|
||||
execp_interval = 1
|
||||
execp_markup = 1
|
||||
</code></pre>
|
||||
<h5 id="memory-usage">Memory usage<a name="memory-usage" href="#memory-usage" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code># Note the use of "stdbuf -oL" to force the program to flush the output line by line.
|
||||
execp = new
|
||||
execp_command = free -b -s1 | stdbuf -oL awk '/^Mem:/ { printf "Mem: %s %.0f%%\n", $2, 100 * ($2 - $7) / $2 }' | stdbuf -oL numfmt --to=iec-i --field=2 -d' '
|
||||
<h5 id="memory-usage">Memory usage<a name="memory-usage" href="#memory-usage" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
|
||||
execp_command = free -s 2 | awk '/^-/ { printf "Mem: '$(free -h | awk '/^Mem:/ { print $2 }')' %.0f%\n", 100*$3/($3+$4); fflush(stdout) }'
|
||||
execp_interval = 1
|
||||
execp_continuous = 1
|
||||
</code></pre>
|
||||
<h5 id="network-load">Network load<a name="network-load" href="#network-load" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code>execp = new
|
||||
execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | stdbuf -oL awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }'
|
||||
<h5 id="network-load">Network load<a name="network-load" href="#network-load" class="md2man-permalink" title="permalink"></a></h5><pre class="highlight plaintext"><code># Note the use of "stdbuf -oL" to force the program to flush the output line by line.
|
||||
execp = new
|
||||
execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }; fflush(stdout)'
|
||||
execp_continuous = 1
|
||||
execp_interval = 1
|
||||
</code></pre>
|
||||
|
||||
27
doc/tint2.md
27
doc/tint2.md
@@ -1,4 +1,4 @@
|
||||
# TINT2 1 "2021-12-04" 17.0.2
|
||||
# TINT2 1 "2017-11-05" 15.3
|
||||
|
||||
## NAME
|
||||
tint2 - lightweight panel/taskbar
|
||||
@@ -279,10 +279,6 @@ gradient_id_pressed = 2
|
||||
* `width` and `height` can be specified without units (e.g. `123`) as pixels, or followed by `%` as percentages of the monitor size (e.g. `50%`). Use `100%` for full monitor width/height.
|
||||
Example:
|
||||
|
||||
* `scale_relative_to_dpi = integer` : If set to a non-zero value, HiDPI scaling is enabled. Each panel is visible on a different monitor. Thus each panel has a specific scaling factor. The scaling factor is computed as the ratio between the monitor DPI (obtained from the dimensions in pixels and millimeters from RandR) and a configured reference DPI - this is the DPI for which exising user configs looked normal, for backward compatibility.
|
||||
|
||||
* `scale_relative_to_screen_height = integer` : Similar to `scale_relative_to_dpi`, except the scaling factor is computed as the ratio between the monitor height and `scale_relative_to_screen_height`. The effect is cumulative with `scale_relative_to_dpi`, i.e. if both options are present, the factors are multiplied.
|
||||
|
||||
```
|
||||
# The panel's width is 94% the size of the monitor, the height is 30 pixels:
|
||||
panel_size = 94% 30
|
||||
@@ -306,11 +302,9 @@ panel_size = 94% 30
|
||||
|
||||
* `panel_dock = boolean (0 or 1)` : Defines if tint2 is placed into the window manager's dock. For the openbox window manager it is advised to also use a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml).
|
||||
|
||||
* `panel_pivot_struts = boolean (0 or 1)` : Defines if tint2 lies to the window manager about its orientation (horizontal vs vertical) when requesting reserved space with STRUTs (see `strut_policy` below). On some window managers, this allows placing a panel in the middle of the virtual screen, e.g. on the bottom edge of the top monitor in a vertical dual-monitor setup.
|
||||
|
||||
* `panel_layer = bottom/normal/top` : Places tint2 into the bottom/normal/top layer. This is helpful for specifying if the panel can be covered by other windows or not. The default is the bottom layer, but with real transparency normal or top layer may be a nice alternative.
|
||||
|
||||
* `strut_policy = follow_size/minimum/none` : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi-monitor (Xinerama) setups, the panel generally must be placed at the edge (not in the middle) of the virtual screen for this to work correctly (though on some window managers, setting `panel_pivot_struts` may work around this limitation).
|
||||
* `strut_policy = follow_size/minimum/none` : STRUTs are used by the window manager to decide the size of maximized windows. Note: on multi-monitor (Xinerama) setups, the panel must be placed at the edge (not in the middle) of the virtual screen for this to work correctly.
|
||||
* `follow_size` means that the maximized windows always resize to have a common edge with tint2.
|
||||
* `minimum` means that the maximized windows always expand to have a common edge with the hidden panel. This is useful if the `autohide` option is enabled.
|
||||
* `none` means that the maximized windows use the full screen size.
|
||||
@@ -387,7 +381,6 @@ panel_size = 94% 30
|
||||
* `taskbar_sort_order = none/title/center` : Specifies the sort order of the tasks on the taskbar. *(since 0.12)*
|
||||
* `none` : No sorting. New tasks are simply appended at the end of the taskbar when they appear.
|
||||
* `title` : Sorts the tasks by title.
|
||||
* `application` : Sorts the tasks by application name. *(since 16.3)*
|
||||
* `center` : Sorts the tasks by their window centers.
|
||||
* `mru` : Shows the most recently used tasks first. *(since 0.12.4)*
|
||||
* `lru` : Shows the most recently used tasks last. *(since 0.12.4)*
|
||||
@@ -549,7 +542,7 @@ The action semantics:
|
||||
|
||||
* `battery_low_status = integer`: At what battery percentage the low command is executed.
|
||||
|
||||
* `battery_low_cmd = xmessage 'tint2: Battery low!'` : Command to execute when the battery is low.
|
||||
* `battery_low_cmd = notify-send "battery low"` : Command to execute when the battery is low.
|
||||
|
||||
* `battery_full_cmd = notify-send "battery full"` : Command to execute when the battery is full.
|
||||
|
||||
@@ -565,7 +558,6 @@ The action semantics:
|
||||
* %h: Hours left until completely charged/discharged (estimated).
|
||||
* %t: Time left. Shows "hrs:mins" when charging/discharging, or "Ful\" when full.
|
||||
* %p: Percentage. Includes the % sign.
|
||||
* %P: Percentage. Without the % sign.
|
||||
|
||||
* `bat2_format = FORMAT_STRING` : Format for battery line 2. Default: %t. *(since 1.0)*
|
||||
|
||||
@@ -621,8 +613,6 @@ The action semantics:
|
||||
|
||||
* `execp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text` *(since 0.12.4)*
|
||||
|
||||
* `execp_monitor = integer (1, 2, ...), primary or all` : On which monitor to draw the executor. The first monitor is `1`. *(since 17.0)*
|
||||
|
||||
* `execp_lclick_command = text` : Command to execute on left click. If not defined, `execp_command` is executed immediately, unless it is currently running. *(since 0.12.4)*
|
||||
* `execp_mclick_command = text` : Command to execute on right click. If not defined, `execp_command` is executed immediately, unless it is currently running. *(since 0.12.4)*
|
||||
* `execp_rclick_command = text` : Command to execute on middle click. If not defined, `execp_command` is executed immediately, unless it is currently running. *(since 0.12.4)*
|
||||
@@ -696,18 +686,18 @@ execp_markup = 1
|
||||
##### Memory usage
|
||||
|
||||
```
|
||||
# Note the use of "stdbuf -oL" to force the program to flush the output line by line.
|
||||
execp = new
|
||||
execp_command = free -b -s1 | stdbuf -oL awk '/^Mem:/ { printf "Mem: %s %.0f%%\n", $2, 100 * ($2 - $7) / $2 }' | stdbuf -oL numfmt --to=iec-i --field=2 -d' '
|
||||
execp_interval = 1
|
||||
execp_continuous = 1
|
||||
execp_command = free | awk '/^-/ { printf "Mem: '$(free -h | awk '/^Mem:/ { print $2 }')' %.0f%%\n", 100*$3/($3+$4); fflush(stdout) }'
|
||||
execp_interval = 5
|
||||
execp_continuous = 0
|
||||
```
|
||||
|
||||
##### Network load
|
||||
|
||||
```
|
||||
# Note the use of "stdbuf -oL" to force the program to flush the output line by line.
|
||||
execp = new
|
||||
execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | stdbuf -oL awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }'
|
||||
execp_command = stdbuf -oL bwm-ng -o csv -t 1000 | awk -F ';' '/total/ { printf "Net: %.0f Mb/s\n", ($5*8/1.0e6) }; fflush(stdout)'
|
||||
execp_continuous = 1
|
||||
execp_interval = 1
|
||||
```
|
||||
@@ -771,4 +761,3 @@ and the wiki page at https://gitlab.com/o9000/tint2/wikis/home.
|
||||
This documentation is also provided in HTML and Markdown format in the system's default location
|
||||
for documentation files, usually `/usr/share/doc/tint2` or `/usr/local/share/doc/tint2`.
|
||||
.
|
||||
.
|
||||
|
||||
@@ -4,10 +4,7 @@ SCRIPT_DIR=$(dirname "$0")
|
||||
DIRTY=""
|
||||
VERSION=""
|
||||
|
||||
OLD_DIR=$(pwd)
|
||||
cd ${SCRIPT_DIR}
|
||||
|
||||
if [ -d .git ] && git status 1>/dev/null 2>/dev/null
|
||||
if [ -d ${SCRIPT_DIR}/.git ] && git status 1>/dev/null 2>/dev/null
|
||||
then
|
||||
git update-index -q --ignore-submodules --refresh
|
||||
# Disallow unstaged changes in the working tree
|
||||
@@ -40,10 +37,10 @@ then
|
||||
VERSION=$(git describe 2>/dev/null)$DIRTY
|
||||
elif git log -n 1 1>/dev/null 2>/dev/null
|
||||
then
|
||||
VERSION=$(head -n 1 "ChangeLog" | cut -d ' ' -f 2)
|
||||
VERSION=$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 2)
|
||||
if [ "$VERSION" = "master" ]
|
||||
then
|
||||
PREVIOUS=$(grep '^2' "ChangeLog" | head -n 2 | tail -n 1 | cut -d ' ' -f 2)
|
||||
PREVIOUS=$(grep '^2' "${SCRIPT_DIR}/ChangeLog" | head -n 2 | tail -n 1 | cut -d ' ' -f 2)
|
||||
HASH=$(git log -n 1 --pretty=format:%cI.%ct.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g' 2>/dev/null)
|
||||
VERSION=$PREVIOUS-next-$HASH
|
||||
fi
|
||||
@@ -52,15 +49,13 @@ fi
|
||||
|
||||
if [ -z "$VERSION" ]
|
||||
then
|
||||
VERSION=$(head -n 1 "ChangeLog" | cut -d ' ' -f 2)
|
||||
VERSION=$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 2)
|
||||
if [ "$VERSION" = "master" ]
|
||||
then
|
||||
VERSION=$VERSION-$(head -n 1 "ChangeLog" | cut -d ' ' -f 1)
|
||||
VERSION=$VERSION-$(head -n 1 "${SCRIPT_DIR}/ChangeLog" | cut -d ' ' -f 1)
|
||||
fi
|
||||
fi
|
||||
|
||||
cd "${OLD_DIR}"
|
||||
|
||||
VERSION=$(echo "$VERSION" | sed 's/^v//')
|
||||
|
||||
echo '#define VERSION_STRING "'$VERSION'"' > version.h
|
||||
|
||||
@@ -55,14 +55,13 @@ def cmd(s):
|
||||
|
||||
|
||||
def run(s):
|
||||
proc = subprocess.Popen(cmd(s), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
|
||||
proc = subprocess.Popen(cmd(s), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
|
||||
ret = proc.wait()
|
||||
out, err = proc.communicate()
|
||||
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:
|
||||
print(err)
|
||||
raise Exception("Command failed!")
|
||||
return out
|
||||
|
||||
@@ -77,23 +76,19 @@ def get_last_version():
|
||||
return tags[-1]
|
||||
|
||||
|
||||
def inc_version(v, feature=False, tiny=False):
|
||||
def inc_version(v, feature=False):
|
||||
if v.startswith("v0."):
|
||||
assert v == "v0.14.6"
|
||||
return "v15.0"
|
||||
# v4.11 -> v4.12 or v5.0 or v4.11.1
|
||||
# v4.11 -> v4.12 or v5.0
|
||||
parts = v.split(".")
|
||||
while len(parts) < 3:
|
||||
while len(parts) < 2:
|
||||
parts.append("0")
|
||||
assert len(parts) == 3
|
||||
assert len(parts) == 2
|
||||
if feature:
|
||||
del parts[-1]
|
||||
parts[-2] = "v" + str(int(parts[-2].replace("v", "")) + 1)
|
||||
parts[-1] = "0"
|
||||
elif tiny:
|
||||
parts[-1] = str(int(parts[-1]) + 1)
|
||||
else:
|
||||
del parts[-1]
|
||||
parts[-1] = str(int(parts[-1]) + 1)
|
||||
return ".".join([s for s in parts if s])
|
||||
|
||||
@@ -158,14 +153,23 @@ def update_log(path, version, date):
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--feature", action="store_true")
|
||||
parser.add_argument("--tiny", action="store_true")
|
||||
parser.add_argument("--undo", action="store_true")
|
||||
args = parser.parse_args()
|
||||
logging.basicConfig(format=ansi_lblue + "%(asctime)s %(pathname)s %(levelname)s" + ansi_reset + " %(message)s", level=logging.DEBUG)
|
||||
test_inc_version()
|
||||
# Read version from last tag and increment
|
||||
old_version = get_last_version()
|
||||
if args.undo:
|
||||
info("Revering last commit...")
|
||||
run("git tag -d %s" % old_version)
|
||||
run("git tag -d %s" % old_version.replace("v", ""))
|
||||
run("git reset --soft HEAD~")
|
||||
run("git reset")
|
||||
run("git stash")
|
||||
os.system("git log -1")
|
||||
sys.exit(0)
|
||||
info("Old version:", old_version)
|
||||
version = inc_version(old_version, args.feature, args.tiny)
|
||||
version = inc_version(old_version, args.feature)
|
||||
readable_version = version.replace("v", "")
|
||||
date = datetime.datetime.now().strftime("%Y-%m-%d")
|
||||
info("New version:", readable_version, version, date)
|
||||
@@ -190,9 +194,3 @@ if __name__ == '__main__':
|
||||
choice = raw_input().lower()
|
||||
if choice != "y":
|
||||
run("git reset --hard HEAD~ ; git tag -d %s ; git tag -d %s" % (version, readable_version))
|
||||
sys.exit(1)
|
||||
print "Publish? [y/n]"
|
||||
choice = raw_input().lower()
|
||||
if choice != "y":
|
||||
sys.exit(1)
|
||||
run("git push origin master && git push --tags origin master")
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
PS4='\e[99;33m${BASH_SOURCE}:$LINENO\e[0m '
|
||||
set -e
|
||||
set -x
|
||||
|
||||
sudo apt-get install ninja-build python2.7 wget
|
||||
sudo apt-get build-dep libx11-6 libxrender1 libcairo2 libglib2.0-0 libpango-1.0-0 libimlib2 librsvg2-2
|
||||
|
||||
export PKG_CONFIG_PATH=""
|
||||
|
||||
DEPS=$HOME/tint2-deps
|
||||
X11=$(pkg-config --modversion x11)
|
||||
XRENDER=$(pkg-config --modversion xrender)
|
||||
XCOMPOSITE=$(pkg-config --modversion xcomposite)
|
||||
XDAMAGE=$(pkg-config --modversion xdamage)
|
||||
XEXT=$(pkg-config --modversion xext)
|
||||
XRANDR=$(pkg-config --modversion xrandr)
|
||||
XINERAMA=$(pkg-config --modversion xinerama)
|
||||
IMLIB=$(pkg-config --modversion imlib2)
|
||||
GLIB=$(pkg-config --modversion glib-2.0)
|
||||
CAIRO=$(pkg-config --modversion cairo)
|
||||
PANGO=$(pkg-config --modversion pango)
|
||||
PIXBUF=$(pkg-config --modversion gdk-pixbuf-2.0)
|
||||
RSVG=$(pkg-config --modversion librsvg-2.0)
|
||||
|
||||
mkdir -p $DEPS/src
|
||||
|
||||
function two_digits() {
|
||||
echo "$@" | cut -d. -f 1-2
|
||||
}
|
||||
|
||||
function download_and_build() {
|
||||
URL="$1"
|
||||
shift
|
||||
CFGARGS="$@"
|
||||
ARCHIVE="$(basename "$URL")"
|
||||
NAME="$(echo "$ARCHIVE" | sed s/\.tar.*$//g)"
|
||||
|
||||
cd "$DEPS/src"
|
||||
rm -rf "$ARCHIVE"
|
||||
rm -rf "$NAME"
|
||||
wget "$URL" -O "$ARCHIVE"
|
||||
tar xf "$ARCHIVE"
|
||||
cd "$NAME"
|
||||
export PKG_CONFIG_PATH="$DEPS/lib/pkgconfig"
|
||||
export PATH="$DEPS/bin:$PATH"
|
||||
export CFLAGS="-O0 -fno-common -fno-omit-frame-pointer -rdynamic -fsanitize=address -g"
|
||||
export LDFLAGS="-Wl,--no-as-needed -Wl,-z,defs -O0 -fno-common -fno-omit-frame-pointer -rdynamic -fsanitize=address -fuse-ld=gold -g -ldl -lasan"
|
||||
if [[ -x ./configure ]]
|
||||
then
|
||||
./configure "--prefix=$DEPS" "$@"
|
||||
make -j
|
||||
make install
|
||||
elif [[ -f meson.build ]]
|
||||
then
|
||||
mkdir build
|
||||
cd build
|
||||
meson "--prefix=$DEPS" "$@" ..
|
||||
ninja install
|
||||
else
|
||||
echo "unknown build method"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
download_and_build "https://www.x.org/archive/individual/lib/libX11-$X11.tar.gz" --enable-static=no
|
||||
download_and_build "https://www.x.org/archive//individual/lib/libXrender-$XRENDER.tar.gz" --enable-static=no
|
||||
download_and_build "https://www.x.org/archive//individual/lib/libXcomposite-$XCOMPOSITE.tar.gz" --enable-static=no
|
||||
download_and_build "https://www.x.org/archive//individual/lib/libXdamage-$XDAMAGE.tar.gz" --enable-static=no
|
||||
download_and_build "https://www.x.org/archive//individual/lib/libXext-$XEXT.tar.gz" --enable-static=no
|
||||
download_and_build "https://www.x.org/archive//individual/lib/libXrandr-$XRANDR.tar.gz" --enable-static=no
|
||||
download_and_build "https://www.x.org/archive//individual/lib/libXinerama-$XINERAMA.tar.gz" --enable-static=no
|
||||
download_and_build "https://downloads.sourceforge.net/enlightenment/imlib2-$IMLIB.tar.bz2" --enable-static=no
|
||||
download_and_build "https://ftp.gnome.org/pub/gnome/sources/glib/$(two_digits "$GLIB")/glib-$GLIB.tar.xz" --enable-debug=yes
|
||||
download_and_build "https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(two_digits "$PIXBUF")/gdk-pixbuf-$PIXBUF.tar.xz"
|
||||
download_and_build "https://cairographics.org/snapshots/cairo-$CAIRO.tar.xz"
|
||||
download_and_build "https://ftp.gnome.org/pub/gnome/sources/pango/$(two_digits "$PANGO")/pango-$PANGO.tar.xz"
|
||||
download_and_build "https://ftp.gnome.org/pub/gnome/sources/librsvg/$(two_digits "$RSVG")/librsvg-$RSVG.tar.xz" --enable-pixbuf-loader
|
||||
556
packaging/configure
vendored
556
packaging/configure
vendored
@@ -1,556 +0,0 @@
|
||||
#!/usr/bin/env python2.7
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import argparse
|
||||
import errno
|
||||
import os
|
||||
import shlex
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
|
||||
def check_c_compiles(cmd, code):
|
||||
with tempfile.NamedTemporaryFile(suffix='.c') as f:
|
||||
f.write(code)
|
||||
f.flush()
|
||||
cmd += [f.name, '-o', '/dev/null']
|
||||
proc = subprocess.Popen(
|
||||
cmd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE)
|
||||
out, err = proc.communicate()
|
||||
ret = proc.returncode
|
||||
return ret == 0
|
||||
|
||||
|
||||
def makedirs(path):
|
||||
try:
|
||||
os.makedirs(path)
|
||||
except OSError as e:
|
||||
if e.errno == errno.EEXIST and os.path.isdir(path):
|
||||
pass
|
||||
else:
|
||||
raise
|
||||
|
||||
|
||||
def pkg_config(lib):
|
||||
def _pkgconfig(lib, query):
|
||||
lib = lib.replace('>=', ' >= ')
|
||||
cmd = 'pkg-config {} {}'.format(query, lib).split()
|
||||
popen = subprocess.Popen(cmd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE)
|
||||
out, err = popen.communicate()
|
||||
if popen.returncode != 0:
|
||||
print(cmd)
|
||||
print(err)
|
||||
raise ValueError("Could not find library: {}".format(lib))
|
||||
return out.split()
|
||||
|
||||
lf = _pkgconfig(lib, '--libs-only-l')
|
||||
cf = _pkgconfig(lib, '--cflags')
|
||||
ldf = _pkgconfig(lib, '--libs-only-L')
|
||||
print("Found", lib, "in:", ldf)
|
||||
return (lf, cf, ldf)
|
||||
|
||||
|
||||
def ninja_escape(s):
|
||||
s = s.replace(' ', '$ ')
|
||||
s = s.replace('\n', '$\n')
|
||||
return s
|
||||
|
||||
|
||||
def ninja_join(words):
|
||||
indent = ' '
|
||||
if len(words) > 1:
|
||||
prefix = '$\n' + indent
|
||||
else:
|
||||
prefix = ''
|
||||
spacer = ' $\n' + indent
|
||||
return prefix + spacer.join(ninja_escape(s) for s in words)
|
||||
|
||||
|
||||
def ninja_write_vars(f, **kwargs):
|
||||
for k, v in kwargs.items():
|
||||
f.write('{} = {}\n'.format(k, v))
|
||||
f.write('\n')
|
||||
|
||||
|
||||
def ninja_write_rule(f, name, **kwargs):
|
||||
f.write('rule {}\n'.format(name))
|
||||
for k, v in kwargs.items():
|
||||
f.write(' {} = {}\n'.format(k, v))
|
||||
f.write('\n')
|
||||
|
||||
|
||||
def remove_prefix(s, prefix):
|
||||
while prefix and s.startswith(prefix):
|
||||
s = s[len(prefix):]
|
||||
return s
|
||||
|
||||
|
||||
def install(prefix, suffix, dest_dir, dest_suffix=''):
|
||||
src_path = os.path.join(prefix, suffix) if suffix else prefix
|
||||
fname = os.path.basename(src_path)
|
||||
if dest_suffix:
|
||||
dest_dir = os.path.join(dest_dir, dest_suffix)
|
||||
dst_path = os.path.join(dest_dir, fname)
|
||||
return [(src_path, dst_path)]
|
||||
|
||||
|
||||
def install_dir(prefix, suffix, dest_dir, dest_suffix=''):
|
||||
result = []
|
||||
src_path = os.path.join(prefix, suffix)
|
||||
for root, dirs, files in os.walk(src_path):
|
||||
for f in files:
|
||||
fname = os.path.join(root, f)
|
||||
fsuffix = remove_prefix(remove_prefix(fname, prefix), '/')
|
||||
result += install(prefix, fsuffix, dest_dir, os.path.join(dest_suffix, os.path.dirname(fsuffix)))
|
||||
return result
|
||||
|
||||
|
||||
def remove_duplicates(ls):
|
||||
result = []
|
||||
for x in ls:
|
||||
if x not in result:
|
||||
result.append(x)
|
||||
return result
|
||||
|
||||
|
||||
class Executable(object):
|
||||
def __init__(self, name):
|
||||
self.name = name
|
||||
self.cc = 'cc'
|
||||
self.cflags = []
|
||||
self.lflags = []
|
||||
self.libs = []
|
||||
self.sources = []
|
||||
self.pos = []
|
||||
self.install_exec = []
|
||||
self.install_data = []
|
||||
|
||||
def write_ninja(self, f):
|
||||
f.write('# Executable: {}\n'.format(self.name))
|
||||
ninja_write_vars(f, **{
|
||||
'cc_' + self.name: self.cc,
|
||||
'cflags_' + self.name: ninja_join(remove_duplicates(self.cflags)),
|
||||
'lflags_' + self.name: ninja_join(remove_duplicates(self.lflags)),
|
||||
'libs_' + self.name: ninja_join(remove_duplicates(self.libs))})
|
||||
ninja_write_rule(f, 'cc_' + self.name,
|
||||
command='$cc_{} -MMD -MT $out -MF $out.d $cflags_{} -c $in -o $out'.format(self.name, self.name),
|
||||
description='CC $out',
|
||||
depfile='$out.d',
|
||||
deps='gcc')
|
||||
ninja_write_rule(f, 'link_' + self.name,
|
||||
command='$cc_{} $lflags_{} -o $out $in $libs_{}'.format(self.name, self.name, self.name),
|
||||
description='LINK $out')
|
||||
ninja_write_rule(f, 'po2mo_' + self.name,
|
||||
command='msgfmt -o $out $in',
|
||||
description='GEN $out')
|
||||
f.write('# Compilation\n')
|
||||
for src in self.sources:
|
||||
f.write('build $build_dir/{}.{}.o: cc_{} $source_dir/{}\n'.format(src, self.name, self.name, src))
|
||||
f.write('# Translation\n')
|
||||
for po in self.pos:
|
||||
f.write('build $build_dir/{}.mo: po2mo_{} $source_dir/{}\n'.format(os.path.splitext(po)[0], self.name, po))
|
||||
f.write('# Linking\n')
|
||||
f.write('build $build_dir/{}: link_{} '.format(self.name, self.name))
|
||||
f.write(ninja_join(['$build_dir/{}.{}.o'.format(src, self.name) for src in self.sources]))
|
||||
f.write('\n')
|
||||
f.write('# Installation\n')
|
||||
for fin, fout in self.install_exec:
|
||||
f.write('build {}: install_exec {}\n'.format(fout, fin))
|
||||
for fin, fout in self.install_data:
|
||||
f.write('build {}: install_data {}\n'.format(fout, fin))
|
||||
f.write('build install_{}: phony '.format(self.name))
|
||||
f.write(ninja_join([fout for fin, fout in self.install_exec + self.install_data]))
|
||||
f.write('\n')
|
||||
f.write('# Uninstallation\n')
|
||||
for fin, fout in self.install_exec + self.install_data:
|
||||
f.write('build uninstall_{}: uninstall {}\n'.format(fout, fout))
|
||||
f.write('build uninstall_{}: phony '.format(self.name))
|
||||
f.write(ninja_join(['uninstall_{}'.format(fout) for fin, fout in self.install_exec + self.install_data]))
|
||||
f.write('\n')
|
||||
f.write('\n')
|
||||
|
||||
|
||||
|
||||
def generate_ninja(targets, source_dir, build_dir):
|
||||
ninja_file_name = os.path.join(build_dir, 'build.ninja')
|
||||
f = open(ninja_file_name, 'w')
|
||||
# `deps` was introduced in ninja 1.3.
|
||||
ninja_write_vars(f, ninja_required_version='1.3')
|
||||
ninja_write_vars(f, **{
|
||||
'source_dir':source_dir,
|
||||
'build_dir':build_dir
|
||||
})
|
||||
ninja_write_rule(f, 'install_exec',
|
||||
command='install -D -m0755 $in $out',
|
||||
description='INSTALL $out')
|
||||
ninja_write_rule(f, 'install_data',
|
||||
command='install -D -m0644 $in $out',
|
||||
description='INSTALL $out')
|
||||
ninja_write_rule(f, 'uninstall',
|
||||
command='rm -f $in',
|
||||
description='RM $in')
|
||||
for t in targets:
|
||||
t.write_ninja(f)
|
||||
f.write('# Targets\n')
|
||||
f.write('build all: phony ')
|
||||
f.write(ninja_join(['$build_dir/{}'.format(t.name) for t in targets]))
|
||||
f.write('\n')
|
||||
installs = sum([(t.install_exec + t.install_data) for t in targets], [])
|
||||
if installs:
|
||||
f.write('build install: phony ')
|
||||
f.write(ninja_join(['install_{}'.format(t.name) for t in targets]))
|
||||
f.write('\n')
|
||||
f.write('build uninstall: phony ')
|
||||
f.write(ninja_join(['uninstall_{}'.format(t.name) for t in targets]))
|
||||
f.write('\n')
|
||||
f.write('\n')
|
||||
f.write('default all\n')
|
||||
f.close()
|
||||
print('Wrote {}.'.format(ninja_file_name))
|
||||
print('Run `ninja -v -C {} all` to compile.'.format(build_dir))
|
||||
print('Run `ninja -v -C {} install` to install.'.format(build_dir))
|
||||
|
||||
|
||||
# Parse CLI options
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('--uevent', dest='uevent', action='store_true',
|
||||
help='Enable uevent support. Default: on under Linux')
|
||||
parser.add_argument('--debug', dest='debug', action='store_true',
|
||||
help='Enable debug build. Default: off')
|
||||
parser.add_argument('--asan', dest='asan', action='store_true',
|
||||
help='Enable AddressSanitizer. Default: off')
|
||||
parser.add_argument('--tracing', dest='tracing', action='store_true',
|
||||
help='Enable tracing. Default: off')
|
||||
parser.add_argument('--memory-tracing', dest='memory_tracing', action='store_true',
|
||||
help='Enable memory allocation tracing. Default: off')
|
||||
parser.add_argument('--prefix', help='Prefix for constructing the file installation paths. Default: /usr/local', default=None)
|
||||
parser.add_argument('--exec_prefix', help='Prefix for binary paths. Default: $prefix', default=None)
|
||||
parser.add_argument('--bindir', help='Path where executables must be installed. Default: $exec_prefix/bin', default=None)
|
||||
parser.add_argument('--sysconfdir', help='Path where config files must be installed. Default: /etc', default=None)
|
||||
parser.add_argument('--datarootdir', help='Path where data files must be installed. Default: $prefix/share', default=None)
|
||||
parser.add_argument('--localedir', help='Path where locale files must be installed. Default: $datarootdir/locale', default=None)
|
||||
parser.add_argument('--docdir', help='Path where documentation files must be installed. Default: $datarootdir/doc/tint2', default=None)
|
||||
parser.add_argument('--htmldir', help='Path where documentation files must be installed. Default: $docdir/html', default=None)
|
||||
parser.add_argument('--mandir', help='Path where man files must be installed. Default: $datarootdir/man', default=None)
|
||||
parser.add_argument('--home', dest='home', action='store_true',
|
||||
help='Install to $HOME (sets all paths accordingly). Default: off')
|
||||
args = parser.parse_args()
|
||||
|
||||
# Get relevant environment variables
|
||||
CC = os.environ.get('CC', 'cc')
|
||||
CFLAGS = shlex.split(os.environ.get('CFLAGS', ''))
|
||||
LFLAGS = shlex.split(os.environ.get('LDFLAGS', ''))
|
||||
LIBS = []
|
||||
|
||||
# Get paths
|
||||
source_dir = os.path.realpath(os.path.dirname(os.path.realpath(__file__)) + '/..')
|
||||
build_dir = os.path.join(os.getcwd(), 'build')
|
||||
if not args.home:
|
||||
prefix = args.prefix or '/usr/local'
|
||||
exec_prefix = args.exec_prefix or prefix
|
||||
bindir = args.bindir or os.path.join(exec_prefix, 'bin')
|
||||
datarootdir = args.datarootdir or os.path.join(prefix, 'share')
|
||||
sysconfdir = args.sysconfdir or '/etc'
|
||||
docdir = args.docdir or os.path.join(datarootdir, 'doc/tint2')
|
||||
htmldir = args.htmldir or os.path.join(docdir, 'html')
|
||||
localedir = args.localedir or os.path.join(datarootdir, 'locale')
|
||||
mandir = args.mandir or os.path.join(datarootdir, 'man')
|
||||
else:
|
||||
prefix = args.prefix or os.path.expanduser("~")
|
||||
exec_prefix = args.exec_prefix or prefix
|
||||
bindir = args.bindir or os.path.join(exec_prefix, 'bin')
|
||||
datarootdir = args.datarootdir or os.path.join(prefix, '.local/share')
|
||||
sysconfdir = args.sysconfdir or os.path.expanduser("~/.config/tint2")
|
||||
docdir = args.docdir or os.path.join(datarootdir, 'doc/tint2')
|
||||
htmldir = args.htmldir or os.path.join(docdir, 'html')
|
||||
localedir = args.localedir or os.path.join(datarootdir, 'locale')
|
||||
mandir = args.mandir or os.path.join(datarootdir, 'man')
|
||||
|
||||
|
||||
# Check if C11 is supported by the compiler, fall back to C99
|
||||
if check_c_compiles([CC],
|
||||
'''#define print(x) _Generic((x), default : print_unknown)(x)
|
||||
void print_unknown() {
|
||||
}
|
||||
int main () {
|
||||
print(0);
|
||||
}'''):
|
||||
CFLAGS += ['-std=c11', '-DHAS_GENERIC']
|
||||
else:
|
||||
print("No C11 support.")
|
||||
CFLAGS += ['-std=c99']
|
||||
|
||||
# Set mandatory flags
|
||||
CFLAGS += ['-g',
|
||||
'-Wall',
|
||||
'-Wextra',
|
||||
'-Wshadow',
|
||||
'-Wpointer-arith',
|
||||
'-Wno-deprecated',
|
||||
'-Wno-missing-field-initializers',
|
||||
'-Wno-unused-parameter',
|
||||
'-Wno-sign-compare',
|
||||
'-fno-strict-aliasing',
|
||||
'-pthread',
|
||||
'-D_BSD_SOURCE',
|
||||
'-D_DEFAULT_SOURCE',
|
||||
'-D_WITH_GETLINE',
|
||||
'-DENABLE_BATTERY']
|
||||
LFLAGS += ['-fno-strict-aliasing',
|
||||
'-pthread']
|
||||
LFLAGS += ['-L' + build_dir]
|
||||
|
||||
# Set platform dependent C flags
|
||||
if sys.platform.startswith('linux'):
|
||||
CFLAGS += ['-D_POSIX_C_SOURCE=200809L']
|
||||
|
||||
if sys.platform.startswith('freebsd') or sys.platform.startswith('openbsd') or sys.platform.startswith('dragonfly'):
|
||||
CFLAGS += ['-I/usr/local/include']
|
||||
LFLAGS += ['-L/usr/local/lib']
|
||||
|
||||
if sys.platform.startswith('linux') or args.uevent:
|
||||
CFLAGS += ['-DENABLE_UEVENT']
|
||||
|
||||
# Turn on color messages if supported
|
||||
if check_c_compiles([CC, '-fdiagnostics-color', '-c', '-x', 'c'], ''):
|
||||
CFLAGS += ['-fdiagnostics-color=always']
|
||||
|
||||
# Set project-specific include dirs
|
||||
CFLAGS += ['-I.']
|
||||
for inc in ['src',
|
||||
'src/battery',
|
||||
'src/clock',
|
||||
'src/systray',
|
||||
'src/taskbar',
|
||||
'src/launcher',
|
||||
'src/tooltip',
|
||||
'src/util',
|
||||
'src/execplugin',
|
||||
'src/button',
|
||||
'src/freespace',
|
||||
'src/separator']:
|
||||
CFLAGS += ['-I' + os.path.join(source_dir, inc)]
|
||||
|
||||
# Add mandatory library dependencies
|
||||
LIBS += ['-lm', '-lrt']
|
||||
|
||||
# Add mandatory libray dependencies detected with pkg-config
|
||||
for dep in ['x11',
|
||||
'xcomposite',
|
||||
'xdamage',
|
||||
'xinerama',
|
||||
'xext',
|
||||
'xrender',
|
||||
'xrandr>=1.3',
|
||||
'gmodule-2.0',
|
||||
'gio-2.0',
|
||||
'glib-2.0',
|
||||
'gobject-2.0',
|
||||
'pangocairo',
|
||||
'pango',
|
||||
'cairo',
|
||||
'imlib2>=1.4.2']:
|
||||
lib, cf, lf = pkg_config(dep)
|
||||
LIBS += lib
|
||||
CFLAGS += cf
|
||||
LFLAGS += lf
|
||||
|
||||
# Add optional library dependencies detected with pkg-config
|
||||
try:
|
||||
lib, cf, lf = pkg_config('librsvg-2.0>=2.14.0')
|
||||
LIBS += lib
|
||||
CFLAGS += cf + ['-DHAVE_RSVG']
|
||||
LFLAGS += lf
|
||||
except:
|
||||
print("No SVG support.")
|
||||
|
||||
try:
|
||||
lib, cf, lf = pkg_config('libstartup-notification-1.0>=0.12')
|
||||
LIBS += lib
|
||||
CFLAGS += cf + ['-DHAVE_SN', '-DSN_API_NOT_YET_FROZEN']
|
||||
LFLAGS += lf
|
||||
except:
|
||||
print("No startup notification support.")
|
||||
|
||||
# Add library dependencies detected with using successful compilation test
|
||||
bt = False
|
||||
if not bt:
|
||||
try:
|
||||
lib, cf, lf = pkg_config('libunwind')
|
||||
LIBS += lib
|
||||
CFLAGS += cf + ['-DHAS_LIBUNWIND']
|
||||
LFLAGS += lf
|
||||
bt = True
|
||||
print("Backtrace support via libunwind.")
|
||||
except:
|
||||
print("No backtrace support via libunwind.")
|
||||
if not bt:
|
||||
if check_c_compiles([CC, '-lbacktrace'], '''#include <backtrace.h>
|
||||
int main() {
|
||||
return 0;
|
||||
}'''):
|
||||
CFLAGS += ['-DHAS_BACKTRACE']
|
||||
LIBS += ['-lbacktrace']
|
||||
bt = True
|
||||
print("Backtrace support via libbacktrace.")
|
||||
else:
|
||||
print("No backtrace support via libbacktrace.")
|
||||
|
||||
# Add option-dependent flags
|
||||
if not args.debug:
|
||||
CFLAGS += ['-O2']
|
||||
|
||||
if args.asan:
|
||||
asan_flags = ['-fsanitize=address']
|
||||
CFLAGS += asan_flags
|
||||
LFLAGS += asan_flags
|
||||
|
||||
if args.tracing:
|
||||
CFLAGS += ['-finstrument-functions',
|
||||
'-finstrument-functions-exclude-file-list=tracing.c',
|
||||
'-finstrument-functions-exclude-function-list=get_time,gettime']
|
||||
|
||||
if args.asan or args.memory_tracing or args.tracing:
|
||||
trace_flags = ['-O0',
|
||||
'-fno-common',
|
||||
'-fno-omit-frame-pointer',
|
||||
'-rdynamic',
|
||||
'-DUSE_REAL_MALLOC']
|
||||
CFLAGS += trace_flags
|
||||
LFLAGS += trace_flags + ['-fuse-ld=gold']
|
||||
|
||||
if args.memory_tracing:
|
||||
LIBS += ['-ldl']
|
||||
|
||||
# Define targets
|
||||
tint2 = Executable('tint2')
|
||||
tint2.cflags += CFLAGS
|
||||
tint2.lflags += LFLAGS
|
||||
tint2.libs += LIBS
|
||||
tint2.sources = ['src/config.c',
|
||||
'src/panel.c',
|
||||
'src/util/server.c',
|
||||
'src/main.c',
|
||||
'src/init.c',
|
||||
'src/util/signals.c',
|
||||
'src/util/tracing.c',
|
||||
'src/mouse_actions.c',
|
||||
'src/drag_and_drop.c',
|
||||
'src/default_icon.c',
|
||||
'src/clock/clock.c',
|
||||
'src/systray/systraybar.c',
|
||||
'src/launcher/launcher.c',
|
||||
'src/launcher/apps-common.c',
|
||||
'src/launcher/icon-theme-common.c',
|
||||
'src/launcher/xsettings-client.c',
|
||||
'src/launcher/xsettings-common.c',
|
||||
'src/taskbar/task.c',
|
||||
'src/taskbar/taskbar.c',
|
||||
'src/taskbar/taskbarname.c',
|
||||
'src/tooltip/tooltip.c',
|
||||
'src/execplugin/execplugin.c',
|
||||
'src/button/button.c',
|
||||
'src/freespace/freespace.c',
|
||||
'src/separator/separator.c',
|
||||
'src/tint2rc.c',
|
||||
'src/util/area.c',
|
||||
'src/util/bt.c',
|
||||
'src/util/common.c',
|
||||
'src/util/fps_distribution.c',
|
||||
'src/util/strnatcmp.c',
|
||||
'src/util/timer.c',
|
||||
'src/util/cache.c',
|
||||
'src/util/color.c',
|
||||
'src/util/strlcat.c',
|
||||
'src/util/print.c',
|
||||
'src/util/gradient.c',
|
||||
'src/util/test.c',
|
||||
'src/util/uevent.c',
|
||||
'src/util/window.c',
|
||||
'src/battery/battery.c']
|
||||
|
||||
# Battery implementation is platform-specific
|
||||
if sys.platform.startswith('linux'):
|
||||
tint2.sources += ['src/battery/linux.c']
|
||||
elif sys.platform.startswith('freebsd') or \
|
||||
sys.platform.startswith('dragonfly') or \
|
||||
sys.platform.startswith('gnukfreebsd'):
|
||||
tint2.sources += ['src/battery/freebsd.c']
|
||||
elif sys.platform.startswith('openbsd') or \
|
||||
sys.platform.startswith('netbsd'):
|
||||
tint2.sources += ['src/battery/openbsd.c']
|
||||
else:
|
||||
print("No battery support for platform:", sys.platform)
|
||||
tint2.sources += ['src/battery/dummy.c']
|
||||
|
||||
if args.memory_tracing:
|
||||
tint2.sources += ['src/util/mem.c']
|
||||
|
||||
tint2.install_exec = install(build_dir, 'tint2', bindir)
|
||||
tint2.install_data = (install(source_dir, 'tint2.svg', datarootdir, 'icons/hicolor/scalable/apps') +
|
||||
install(source_dir, 'tint2.desktop', datarootdir, 'applications') +
|
||||
install(source_dir, 'themes/tint2rc', sysconfdir, 'xdg/tint2') +
|
||||
install(source_dir, 'default_icon.png', datarootdir, 'tint2') +
|
||||
install(source_dir, 'AUTHORS', docdir) +
|
||||
install(source_dir, 'ChangeLog', docdir) +
|
||||
install(source_dir, 'README.md', docdir) +
|
||||
install(source_dir, 'doc/tint2.md', docdir) +
|
||||
install(source_dir, 'doc/manual.html', htmldir) +
|
||||
install(source_dir, 'doc/readme.html', htmldir) +
|
||||
install_dir(source_dir, 'doc/images', htmldir) +
|
||||
install(source_dir, 'doc/tint2.1', mandir, 'man1'))
|
||||
|
||||
tint2conf = Executable('tint2conf')
|
||||
tint2conf.cflags += CFLAGS
|
||||
tint2conf.lflags += LFLAGS
|
||||
tint2conf.libs += LIBS
|
||||
|
||||
for dep in ['gthread-2.0',
|
||||
'gtk+-x11-2.0']:
|
||||
lib, cf, lf = pkg_config(dep)
|
||||
tint2conf.libs += lib
|
||||
tint2conf.cflags += cf
|
||||
tint2conf.lflags += lf
|
||||
|
||||
tint2conf.cflags += ['-DTINT2CONF',
|
||||
'-DINSTALL_PREFIX=\\"{}\\"'.format(prefix),
|
||||
'-DLOCALEDIR=\\"{}\\"'.format(localedir),
|
||||
'-DGETTEXT_PACKAGE=\\"tint2conf\\"',
|
||||
'-DHAVE_VERSION_H',
|
||||
'-Wno-shadow']
|
||||
|
||||
tint2conf.sources = ['src/util/bt.c',
|
||||
'src/util/common.c',
|
||||
'src/util/strnatcmp.c',
|
||||
'src/util/cache.c',
|
||||
'src/util/timer.c',
|
||||
'src/util/test.c',
|
||||
'src/util/print.c',
|
||||
'src/util/signals.c',
|
||||
'src/config.c',
|
||||
'src/util/server.c',
|
||||
'src/util/strlcat.c',
|
||||
'src/launcher/apps-common.c',
|
||||
'src/launcher/icon-theme-common.c',
|
||||
'src/tint2conf/md4.c',
|
||||
'src/tint2conf/main.c',
|
||||
'src/tint2conf/properties.c',
|
||||
'src/tint2conf/properties_rw.c',
|
||||
'src/tint2conf/theme_view.c',
|
||||
'src/tint2conf/background_gui.c',
|
||||
'src/tint2conf/gradient_gui.c']
|
||||
tint2conf.pos = [os.path.join('src/tint2conf/po', f) for f in os.listdir('src/tint2conf/po') if f.endswith('.po')]
|
||||
tint2conf.install_exec = install(build_dir, 'tint2conf', bindir)
|
||||
tint2conf.install_data = (install(source_dir, 'src/tint2conf/tint2conf.svg', datarootdir, 'icons/hicolor/scalable/apps') +
|
||||
install(source_dir, 'src/tint2conf/tint2conf.desktop', datarootdir, 'applications') +
|
||||
install(source_dir, 'src/tint2conf/tint2conf.xml', datarootdir, 'mime/packages'))
|
||||
|
||||
makedirs(build_dir)
|
||||
assert 0 == os.system('cd {}; {}/get_version.sh'.format(build_dir, source_dir))
|
||||
generate_ninja([tint2, tint2conf], source_dir, build_dir)
|
||||
@@ -6,7 +6,7 @@ Build-Depends: cmake,
|
||||
debhelper (>= 9),
|
||||
libcairo2-dev,
|
||||
libglib2.0-dev,
|
||||
libgtk-3-dev,
|
||||
libgtk2.0-dev,
|
||||
libimlib2-dev,
|
||||
libpango1.0-dev,
|
||||
librsvg2-dev,
|
||||
|
||||
@@ -21,7 +21,7 @@ then
|
||||
exit 1
|
||||
fi
|
||||
rm -f version.h
|
||||
VERSION=$(false 2>/dev/null)
|
||||
VERSION=$(git describe --exact-match 2>/dev/null)
|
||||
if [ $? -eq 0 ]
|
||||
then
|
||||
VERSION=$(echo "$VERSION" | sed 's/^v//')
|
||||
@@ -49,7 +49,7 @@ echo "echo \"#define VERSION_STRING \\\"$VERSION\\\"\" > version.h" > $DIR/get_v
|
||||
# Copy the debian files into the source directory
|
||||
cp -r debian $DIR/debian
|
||||
|
||||
for DISTRO in trusty xenial artful bionic
|
||||
for DISTRO in trusty xenial zesty artful
|
||||
do
|
||||
# Cleanup from previous builds
|
||||
rm -rf tint2_$VERSION-*
|
||||
|
||||
@@ -15,7 +15,7 @@ git reset --hard
|
||||
git pull
|
||||
|
||||
|
||||
timeout -k 10 600 ~/tint2/packaging/version_status.py > packaging.tmp.md
|
||||
~/tint2/packaging/version_status.py > packaging.tmp.md
|
||||
cat packaging.tmp.md > packaging.md
|
||||
rm packaging.tmp.md
|
||||
|
||||
|
||||
@@ -289,7 +289,7 @@ def get_gentoo_versions():
|
||||
|
||||
def get_void_versions():
|
||||
print >> sys.stderr, "Void ..."
|
||||
template = http_download_txt("https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/tint2/template")
|
||||
template = http_download_txt("https://raw.githubusercontent.com/voidlinux/void-packages/master/srcpkgs/tint2/template")
|
||||
versions = []
|
||||
version = None
|
||||
maintainer = None
|
||||
@@ -367,7 +367,7 @@ def get_freebsd_versions():
|
||||
|
||||
def get_openbsd_versions():
|
||||
print >> sys.stderr, "OpenBSD ..."
|
||||
makefile = http_download_txt("http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/x11/tint2/Makefile?content-type=text/plain")
|
||||
makefile = http_download_txt("http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/x11/tint2/Makefile?rev=1.5&content-type=text/plain")
|
||||
versions = []
|
||||
version = None
|
||||
for line in makefile.split("\n"):
|
||||
|
||||
@@ -41,8 +41,7 @@ struct BatteryState battery_state;
|
||||
gboolean battery_enabled;
|
||||
gboolean battery_tooltip_enabled;
|
||||
int percentage_hide;
|
||||
static Timer battery_timer;
|
||||
static Timer battery_blink_timer;
|
||||
static timeout *battery_timeout;
|
||||
|
||||
#define BATTERY_BUF_SIZE 256
|
||||
static char buf_bat_line1[BATTERY_BUF_SIZE];
|
||||
@@ -61,8 +60,6 @@ char *battery_rclick_command;
|
||||
char *battery_uwheel_command;
|
||||
char *battery_dwheel_command;
|
||||
gboolean battery_found;
|
||||
gboolean battery_warn;
|
||||
gboolean battery_warn_red;
|
||||
|
||||
char *battery_sys_prefix = (char *)"";
|
||||
|
||||
@@ -79,10 +76,7 @@ void default_battery()
|
||||
percentage_hide = 101;
|
||||
battery_low_cmd_sent = FALSE;
|
||||
battery_full_cmd_sent = FALSE;
|
||||
INIT_TIMER(battery_timer);
|
||||
INIT_TIMER(battery_blink_timer);
|
||||
battery_warn = FALSE;
|
||||
battery_warn_red = FALSE;
|
||||
battery_timeout = NULL;
|
||||
bat1_has_font = FALSE;
|
||||
bat1_font_desc = NULL;
|
||||
bat1_format = NULL;
|
||||
@@ -133,8 +127,8 @@ void cleanup_battery()
|
||||
ac_connected_cmd = NULL;
|
||||
free(ac_disconnected_cmd);
|
||||
ac_disconnected_cmd = NULL;
|
||||
destroy_timer(&battery_timer);
|
||||
destroy_timer(&battery_blink_timer);
|
||||
stop_timeout(battery_timeout);
|
||||
battery_timeout = NULL;
|
||||
battery_found = FALSE;
|
||||
|
||||
battery_os_free();
|
||||
@@ -171,7 +165,6 @@ void battery_update_text(char *dest, char *format)
|
||||
// %h : Hours left (estimated).
|
||||
// %t : Time left. This is equivalent to the old behaviour; i.e. "(plugged in)" or "hrs:mins" otherwise.
|
||||
// %p : Percentage left. Includes the % sign.
|
||||
// %P : Percentage left without the % sign.
|
||||
if (*c == '%') {
|
||||
c++;
|
||||
o++; // Skip the format control character.
|
||||
@@ -200,10 +193,6 @@ void battery_update_text(char *dest, char *format)
|
||||
snprintf(buf, sizeof(buf), "%d%%", battery_state.percentage);
|
||||
strnappend(dest, buf, BATTERY_BUF_SIZE);
|
||||
break;
|
||||
case 'P':
|
||||
snprintf(buf, sizeof(buf), "%d", battery_state.percentage);
|
||||
strnappend(dest, buf, BATTERY_BUF_SIZE);
|
||||
break;
|
||||
case 't':
|
||||
if (battery_state.state == BATTERY_FULL) {
|
||||
snprintf(buf, sizeof(buf), "Full");
|
||||
@@ -237,8 +226,7 @@ void init_battery()
|
||||
|
||||
battery_found = battery_os_init();
|
||||
|
||||
if (!battery_timer.enabled_)
|
||||
change_timer(&battery_timer, true, 30000, 30000, update_battery_tick, 0);
|
||||
battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
|
||||
|
||||
update_battery();
|
||||
}
|
||||
@@ -285,7 +273,6 @@ void init_battery_panel(void *p)
|
||||
bat1_format = strdup("%p");
|
||||
bat2_format = strdup("%t");
|
||||
}
|
||||
update_battery_tick(NULL);
|
||||
}
|
||||
|
||||
void battery_init_fonts()
|
||||
@@ -322,18 +309,6 @@ void battery_default_font_changed()
|
||||
schedule_panel_redraw();
|
||||
}
|
||||
|
||||
void blink_battery(void *arg)
|
||||
{
|
||||
if (!battery_enabled)
|
||||
return;
|
||||
battery_warn_red = battery_warn ? !battery_warn_red : FALSE;
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
if (panels[i].battery.area.on_screen) {
|
||||
schedule_redraw(&panels[i].battery.area);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void update_battery_tick(void *arg)
|
||||
{
|
||||
if (!battery_enabled)
|
||||
@@ -344,7 +319,6 @@ void update_battery_tick(void *arg)
|
||||
gboolean old_ac_connected = battery_state.ac_connected;
|
||||
int16_t old_hours = battery_state.time.hours;
|
||||
int8_t old_minutes = battery_state.time.minutes;
|
||||
gboolean old_warn = battery_warn;
|
||||
|
||||
if (!battery_found) {
|
||||
init_battery();
|
||||
@@ -382,20 +356,6 @@ void update_battery_tick(void *arg)
|
||||
battery_full_cmd_sent = FALSE;
|
||||
}
|
||||
|
||||
if (!battery_blink_timer.enabled_) {
|
||||
if ((battery_state.percentage < battery_low_status &&
|
||||
battery_state.state == BATTERY_DISCHARGING) || debug_blink) {
|
||||
change_timer(&battery_blink_timer, true, 10, 1000, blink_battery, 0);
|
||||
battery_warn = TRUE;
|
||||
}
|
||||
} else {
|
||||
if (battery_state.percentage > battery_low_status ||
|
||||
battery_state.state != BATTERY_DISCHARGING) {
|
||||
stop_timer(&battery_blink_timer);
|
||||
battery_warn = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
// Show/hide if needed
|
||||
if (!battery_found) {
|
||||
@@ -409,11 +369,8 @@ void update_battery_tick(void *arg)
|
||||
// Redraw if needed
|
||||
if (panels[i].battery.area.on_screen) {
|
||||
if (old_found != battery_found || old_percentage != battery_state.percentage ||
|
||||
old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes ||
|
||||
old_warn != battery_warn) {
|
||||
old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) {
|
||||
panels[i].battery.area.resize_needed = TRUE;
|
||||
if (!battery_warn)
|
||||
panels[i].battery.area.bg = panel_config.battery.area.bg;
|
||||
schedule_panel_redraw();
|
||||
}
|
||||
}
|
||||
@@ -464,7 +421,6 @@ gboolean resize_battery(void *obj)
|
||||
void draw_battery(void *obj, cairo_t *c)
|
||||
{
|
||||
Battery *battery = (Battery *)obj;
|
||||
Panel *panel = (Panel *)battery->area.panel;
|
||||
draw_text_area(&battery->area,
|
||||
c,
|
||||
buf_bat_line1,
|
||||
@@ -473,14 +429,7 @@ void draw_battery(void *obj, cairo_t *c)
|
||||
bat2_font_desc,
|
||||
battery->bat1_posy,
|
||||
battery->bat2_posy,
|
||||
&battery->font_color,
|
||||
panel->scale);
|
||||
if (battery_warn && battery_warn_red) {
|
||||
cairo_set_source_rgba(c, 1, 0, 0, 1);
|
||||
cairo_set_line_width(c, 0);
|
||||
cairo_rectangle(c, 0, 0, battery->area.width, battery->area.height);
|
||||
cairo_fill(c);
|
||||
}
|
||||
&battery->font_color);
|
||||
}
|
||||
|
||||
void battery_dump_geometry(void *obj, int indent)
|
||||
|
||||
@@ -269,9 +269,9 @@ 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) * panel->scale;
|
||||
int vert_padding = (panel_horizontal ? button->area.paddingy : button->area.paddingxlr) * panel->scale;
|
||||
int interior_padding = button->area.paddingx * panel->scale;
|
||||
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) {
|
||||
@@ -280,17 +280,18 @@ int button_compute_desired_size(void *obj)
|
||||
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 * panel->scale);
|
||||
icon_h = MIN(icon_h, button->backend->max_icon_size * panel->scale);
|
||||
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, txt_width;
|
||||
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,
|
||||
@@ -299,11 +300,10 @@ int button_compute_desired_size(void *obj)
|
||||
strlen(button->backend->text),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
button->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT,
|
||||
FALSE,
|
||||
panel->scale);
|
||||
FALSE);
|
||||
} else {
|
||||
get_text_size2(button->backend->font_desc,
|
||||
&txt_height_ink,
|
||||
&txt_height,
|
||||
&txt_width,
|
||||
panel->area.height,
|
||||
@@ -313,12 +313,10 @@ int button_compute_desired_size(void *obj)
|
||||
strlen(button->backend->text),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
button->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT,
|
||||
FALSE,
|
||||
panel->scale);
|
||||
FALSE);
|
||||
}
|
||||
} else {
|
||||
txt_height = txt_width = 0;
|
||||
txt_height_ink = txt_height = txt_width = 0;
|
||||
}
|
||||
|
||||
if (panel_horizontal) {
|
||||
@@ -338,9 +336,9 @@ gboolean resize_button(void *obj)
|
||||
Button *button = (Button *)obj;
|
||||
Panel *panel = (Panel *)button->area.panel;
|
||||
Area *area = &button->area;
|
||||
int horiz_padding = (panel_horizontal ? button->area.paddingxlr : button->area.paddingy) * panel->scale;
|
||||
int vert_padding = (panel_horizontal ? button->area.paddingy : button->area.paddingxlr) * panel->scale;
|
||||
int interior_padding = button->area.paddingx * panel->scale;
|
||||
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) {
|
||||
@@ -349,8 +347,8 @@ gboolean resize_button(void *obj)
|
||||
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 * panel->scale);
|
||||
icon_h = MIN(icon_h, button->backend->max_icon_size * panel->scale);
|
||||
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;
|
||||
@@ -371,9 +369,10 @@ gboolean resize_button(void *obj)
|
||||
available_h = panel->area.height;
|
||||
}
|
||||
|
||||
int txt_height, txt_width;
|
||||
int txt_height_ink, txt_height, txt_width;
|
||||
if (button->backend->text) {
|
||||
get_text_size2(button->backend->font_desc,
|
||||
&txt_height_ink,
|
||||
&txt_height,
|
||||
&txt_width,
|
||||
available_h,
|
||||
@@ -382,11 +381,9 @@ gboolean resize_button(void *obj)
|
||||
strlen(button->backend->text),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
button->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT,
|
||||
FALSE,
|
||||
panel->scale);
|
||||
FALSE);
|
||||
} else {
|
||||
txt_height = txt_width = 0;
|
||||
txt_height_ink = txt_height = txt_width = 0;
|
||||
}
|
||||
|
||||
gboolean result = FALSE;
|
||||
@@ -439,7 +436,6 @@ gboolean resize_button(void *obj)
|
||||
void draw_button(void *obj, cairo_t *c)
|
||||
{
|
||||
Button *button = obj;
|
||||
Panel *panel = (Panel *)button->area.panel;
|
||||
|
||||
if (button->frontend->icon) {
|
||||
// Render icon
|
||||
@@ -461,12 +457,10 @@ void draw_button(void *obj, cairo_t *c)
|
||||
|
||||
// Render text
|
||||
if (button->backend->text) {
|
||||
PangoContext *context = pango_cairo_create_context(c);
|
||||
pango_cairo_context_set_resolution(context, 96 * panel->scale);
|
||||
PangoLayout *layout = pango_layout_new(context);
|
||||
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 + TINT2_PANGO_SLACK) * PANGO_SCALE);
|
||||
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);
|
||||
@@ -478,10 +472,9 @@ void draw_button(void *obj, cairo_t *c)
|
||||
button->frontend->textx,
|
||||
button->frontend->texty,
|
||||
&button->backend->font_color,
|
||||
panel_config.font_shadow ? layout : NULL);
|
||||
panel_config.font_shadow);
|
||||
|
||||
g_object_unref(layout);
|
||||
g_object_unref(context);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ static char buf_time[256];
|
||||
static char buf_date[256];
|
||||
static char buf_tooltip[512];
|
||||
int clock_enabled;
|
||||
static Timer clock_timer;
|
||||
static timeout *clock_timeout;
|
||||
|
||||
void clock_init_fonts();
|
||||
char *clock_get_tooltip(void *obj);
|
||||
@@ -61,11 +61,11 @@ void clock_dump_geometry(void *obj, int indent);
|
||||
void default_clock()
|
||||
{
|
||||
clock_enabled = 0;
|
||||
clock_timeout = NULL;
|
||||
time1_format = NULL;
|
||||
time1_timezone = NULL;
|
||||
time2_format = NULL;
|
||||
time2_timezone = NULL;
|
||||
INIT_TIMER(clock_timer);
|
||||
time_tooltip_format = NULL;
|
||||
time_tooltip_timezone = NULL;
|
||||
clock_lclick_command = NULL;
|
||||
@@ -110,7 +110,8 @@ void cleanup_clock()
|
||||
clock_uwheel_command = NULL;
|
||||
free(clock_dwheel_command);
|
||||
clock_dwheel_command = NULL;
|
||||
destroy_timer(&clock_timer);
|
||||
stop_timeout(clock_timeout);
|
||||
clock_timeout = NULL;
|
||||
}
|
||||
|
||||
struct tm *clock_gettime_for_tz(const char *timezone)
|
||||
@@ -129,28 +130,17 @@ struct tm *clock_gettime_for_tz(const char *timezone)
|
||||
}
|
||||
}
|
||||
|
||||
void update_clock_text(char *dst, size_t size, const char *format,
|
||||
const char *timezone, bool *changed)
|
||||
{
|
||||
if (!dst || !format) {
|
||||
return;
|
||||
}
|
||||
char tmp[256] = "";
|
||||
strncpy(tmp, dst, sizeof(tmp) - 1);
|
||||
strftime(dst, size, format, clock_gettime_for_tz(timezone));
|
||||
*changed = *changed || strcmp(dst, tmp) != 0;
|
||||
}
|
||||
|
||||
void update_clocks()
|
||||
{
|
||||
bool changed = false;
|
||||
update_clock_text(buf_time, sizeof(buf_time), time1_format, time1_timezone, &changed);
|
||||
update_clock_text(buf_date, sizeof(buf_date), time2_format, time2_timezone, &changed);
|
||||
if (changed) {
|
||||
if (time1_format)
|
||||
strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
|
||||
if (time2_format)
|
||||
strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
|
||||
if (time1_format || time2_format) {
|
||||
for (int i = 0; i < num_panels; i++)
|
||||
panels[i].clock.area.resize_needed = 1;
|
||||
schedule_panel_redraw();
|
||||
}
|
||||
schedule_panel_redraw();
|
||||
}
|
||||
|
||||
int ms_until_second_change(struct timeval* tm)
|
||||
@@ -165,7 +155,28 @@ void update_clocks_sec(void *arg)
|
||||
{
|
||||
gettimeofday(&time_clock, 0);
|
||||
update_clocks();
|
||||
change_timer(&clock_timer, true, ms_until_second_change(&time_clock), 0, update_clocks_sec, 0);
|
||||
clock_timeout = add_timeout(ms_until_second_change(&time_clock), 0, update_clocks_sec, 0, &clock_timeout);
|
||||
}
|
||||
|
||||
void update_clocks_min(void *arg)
|
||||
{
|
||||
// remember old_sec because after suspend/hibernate the clock should be updated directly, and not
|
||||
// on next minute change
|
||||
static time_t old_sec = 0;
|
||||
gettimeofday(&time_clock, 0);
|
||||
if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60 || (time1_format && !buf_time[0]) || (time2_format && !buf_date[0]))
|
||||
update_clocks();
|
||||
old_sec = time_clock.tv_sec;
|
||||
clock_timeout = add_timeout(ms_until_second_change(&time_clock), 0, update_clocks_min, 0, &clock_timeout);
|
||||
}
|
||||
|
||||
gboolean time_format_needs_sec_ticks(char *time_format)
|
||||
{
|
||||
if (!time_format)
|
||||
return FALSE;
|
||||
if (strchr(time_format, 'S') || strchr(time_format, 'T') || strchr(time_format, 'r'))
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void init_clock()
|
||||
@@ -205,8 +216,12 @@ void init_clock_panel(void *p)
|
||||
strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
|
||||
}
|
||||
|
||||
if (!clock_timer.enabled_) {
|
||||
update_clocks_sec(NULL);
|
||||
if (!clock_timeout) {
|
||||
if (time_format_needs_sec_ticks(time1_format) || time_format_needs_sec_ticks(time2_format)) {
|
||||
update_clocks_sec(NULL);
|
||||
} else {
|
||||
update_clocks_min(NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -247,8 +262,10 @@ void clock_default_font_changed()
|
||||
}
|
||||
|
||||
void clock_compute_text_geometry(Clock *clock,
|
||||
int *time_height_ink,
|
||||
int *time_height,
|
||||
int *time_width,
|
||||
int *date_height_ink,
|
||||
int *date_height,
|
||||
int *date_width)
|
||||
{
|
||||
@@ -257,8 +274,10 @@ void clock_compute_text_geometry(Clock *clock,
|
||||
time2_format ? buf_date : NULL,
|
||||
time1_font_desc,
|
||||
time2_font_desc,
|
||||
time_height_ink,
|
||||
time_height,
|
||||
time_width,
|
||||
date_height_ink,
|
||||
date_height,
|
||||
date_width);
|
||||
}
|
||||
@@ -288,7 +307,6 @@ gboolean resize_clock(void *obj)
|
||||
void draw_clock(void *obj, cairo_t *c)
|
||||
{
|
||||
Clock *clock = (Clock *)obj;
|
||||
Panel *panel = (Panel *)clock->area.panel;
|
||||
draw_text_area(&clock->area,
|
||||
c,
|
||||
buf_time,
|
||||
@@ -297,8 +315,7 @@ void draw_clock(void *obj, cairo_t *c)
|
||||
time2_font_desc,
|
||||
clock->time1_posy,
|
||||
clock->time2_posy,
|
||||
&clock->font,
|
||||
panel->scale);
|
||||
&clock->font);
|
||||
}
|
||||
|
||||
void clock_dump_geometry(void *obj, int indent)
|
||||
|
||||
15
src/config.c
15
src/config.c
@@ -244,11 +244,7 @@ void add_entry(char *key, char *value)
|
||||
char *value1 = 0, *value2 = 0, *value3 = 0;
|
||||
|
||||
/* Background and border */
|
||||
if (strcmp(key, "scale_relative_to_dpi") == 0) {
|
||||
ui_scale_dpi_ref = atof(value);
|
||||
} else if (strcmp(key, "scale_relative_to_screen_height") == 0) {
|
||||
ui_scale_monitor_size_ref = atof(value);
|
||||
} else if (strcmp(key, "rounded") == 0) {
|
||||
if (strcmp(key, "rounded") == 0) {
|
||||
// 'rounded' is the first parameter => alloc a new background
|
||||
if (backgrounds->len > 0) {
|
||||
Background *bg = &g_array_index(backgrounds, Background, backgrounds->len - 1);
|
||||
@@ -508,8 +504,6 @@ void add_entry(char *key, char *value)
|
||||
wm_menu = atoi(value);
|
||||
else if (strcmp(key, "panel_dock") == 0)
|
||||
panel_dock = atoi(value);
|
||||
else if (strcmp(key, "panel_pivot_struts") == 0)
|
||||
panel_pivot_struts = atoi(value);
|
||||
else if (strcmp(key, "urgent_nb_of_blink") == 0)
|
||||
max_tick_urgent = atoi(value);
|
||||
else if (strcmp(key, "panel_layer") == 0) {
|
||||
@@ -697,9 +691,6 @@ void add_entry(char *key, char *value)
|
||||
} else {
|
||||
execp->backend->interval = v;
|
||||
}
|
||||
} else if (strcmp(key, "execp_monitor") == 0) {
|
||||
Execp *execp = get_or_create_last_execp();
|
||||
execp->backend->monitor = config_get_monitor(value);
|
||||
} else if (strcmp(key, "execp_has_icon") == 0) {
|
||||
Execp *execp = get_or_create_last_execp();
|
||||
execp->backend->has_icon = atoi(value);
|
||||
@@ -797,7 +788,7 @@ void add_entry(char *key, char *value)
|
||||
} else if (strcmp(key, "button_icon") == 0) {
|
||||
if (strlen(value)) {
|
||||
Button *button = get_or_create_last_button();
|
||||
button->backend->icon_name = expand_tilde(value);
|
||||
button->backend->icon_name = strdup(value);
|
||||
}
|
||||
} else if (strcmp(key, "button_text") == 0) {
|
||||
if (strlen(value)) {
|
||||
@@ -1021,8 +1012,6 @@ void add_entry(char *key, char *value)
|
||||
taskbar_sort_method = TASKBAR_SORT_CENTER;
|
||||
} else if (strcmp(value, "title") == 0) {
|
||||
taskbar_sort_method = TASKBAR_SORT_TITLE;
|
||||
} else if (strcmp(value, "application") == 0) {
|
||||
taskbar_sort_method = TASKBAR_SORT_APPLICATION;
|
||||
} else if (strcmp(value, "lru") == 0) {
|
||||
taskbar_sort_method = TASKBAR_SORT_LRU;
|
||||
} else if (strcmp(value, "mru") == 0) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,10 +0,0 @@
|
||||
#ifndef default_icon_h
|
||||
#define default_icon_h
|
||||
|
||||
#include <Imlib2.h>
|
||||
|
||||
extern int default_icon_width;
|
||||
extern int default_icon_height;
|
||||
extern DATA32 default_icon_data[];
|
||||
|
||||
#endif
|
||||
@@ -20,8 +20,6 @@
|
||||
|
||||
#define MAX_TOOLTIP_LEN 4096
|
||||
|
||||
bool debug_executors = false;
|
||||
|
||||
void execp_timer_callback(void *arg);
|
||||
char *execp_get_tooltip(void *obj);
|
||||
void execp_init_fonts();
|
||||
@@ -43,36 +41,12 @@ Execp *create_execp()
|
||||
execp->backend->cache_icon = TRUE;
|
||||
execp->backend->centered = TRUE;
|
||||
execp->backend->font_color.alpha = 0.5;
|
||||
execp->backend->monitor = -1;
|
||||
INIT_TIMER(execp->backend->timer);
|
||||
execp->backend->bg = &g_array_index(backgrounds, Background, 0);
|
||||
execp->backend->buf_stdout_capacity = 1024;
|
||||
execp->backend->buf_stdout = calloc(execp->backend->buf_stdout_capacity, 1);
|
||||
execp->backend->buf_stderr_capacity = 1024;
|
||||
execp->backend->buf_stderr = calloc(execp->backend->buf_stderr_capacity, 1);
|
||||
execp->backend->text = strdup("");
|
||||
execp->backend->icon_path = NULL;
|
||||
return execp;
|
||||
}
|
||||
|
||||
gpointer create_execp_frontend(gconstpointer arg, gpointer data)
|
||||
{
|
||||
Execp *execp_backend = (Execp *)arg;
|
||||
Panel *panel = data;
|
||||
if (execp_backend->backend->monitor >= 0 &&
|
||||
panel->monitor != execp_backend->backend->monitor) {
|
||||
printf("Skipping executor '%s' with monitor %d for panel on monitor %d\n",
|
||||
execp_backend->backend->command,
|
||||
execp_backend->backend->monitor, panel->monitor);
|
||||
Execp *dummy = create_execp();
|
||||
dummy->frontend = (ExecpFrontend *)calloc(1, sizeof(ExecpFrontend));
|
||||
dummy->backend->instances = g_list_append(dummy->backend->instances, dummy);
|
||||
dummy->dummy = true;
|
||||
return dummy;
|
||||
}
|
||||
printf("Creating executor '%s' with monitor %d for panel on monitor %d\n",
|
||||
execp_backend->backend->command,
|
||||
execp_backend->backend->monitor, panel->monitor);
|
||||
|
||||
Execp *execp_frontend = (Execp *)calloc(1, sizeof(Execp));
|
||||
execp_frontend->backend = execp_backend->backend;
|
||||
@@ -90,14 +64,11 @@ void destroy_execp(void *obj)
|
||||
free_and_null(execp->frontend);
|
||||
remove_area(&execp->area);
|
||||
free_area(&execp->area);
|
||||
if (execp->dummy) {
|
||||
destroy_execp(execp);
|
||||
} else {
|
||||
free_and_null(execp);
|
||||
}
|
||||
free_and_null(execp);
|
||||
} else {
|
||||
// This is a backend element
|
||||
destroy_timer(&execp->backend->timer);
|
||||
stop_timeout(execp->backend->timer);
|
||||
execp->backend->timer = NULL;
|
||||
|
||||
free_icon(execp->backend->icon);
|
||||
free_and_null(execp->backend->buf_stdout);
|
||||
@@ -171,6 +142,12 @@ void init_execp()
|
||||
// Set missing config options
|
||||
if (!execp->backend->bg)
|
||||
execp->backend->bg = &g_array_index(backgrounds, Background, 0);
|
||||
execp->backend->buf_stdout_capacity = 1024;
|
||||
execp->backend->buf_stdout = calloc(execp->backend->buf_stdout_capacity, 1);
|
||||
execp->backend->buf_stderr_capacity = 1024;
|
||||
execp->backend->buf_stderr = calloc(execp->backend->buf_stderr_capacity, 1);
|
||||
execp->backend->text = strdup("");
|
||||
execp->backend->icon_path = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -184,7 +161,7 @@ void init_execp_panel(void *p)
|
||||
|
||||
// panel->execp_list is now a copy of the pointer panel_config.execp_list
|
||||
// We make it a deep copy
|
||||
panel->execp_list = g_list_copy_deep(panel_config.execp_list, create_execp_frontend, panel);
|
||||
panel->execp_list = g_list_copy_deep(panel_config.execp_list, create_execp_frontend, NULL);
|
||||
|
||||
for (GList *l = panel->execp_list; l; l = l->next) {
|
||||
Execp *execp = l->data;
|
||||
@@ -215,7 +192,7 @@ void init_execp_panel(void *p)
|
||||
execp->area.on_screen = TRUE;
|
||||
instantiate_area_gradients(&execp->area);
|
||||
|
||||
change_timer(&execp->backend->timer, true, 10, 0, execp_timer_callback, execp);
|
||||
execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
|
||||
|
||||
execp_update_post_read(execp);
|
||||
}
|
||||
@@ -327,6 +304,7 @@ void execp_compute_icon_text_geometry(Execp *execp,
|
||||
int *icon_w,
|
||||
int *icon_h,
|
||||
gboolean *text_next_line,
|
||||
int *txt_height_ink,
|
||||
int *txt_height,
|
||||
int *txt_width,
|
||||
int *new_size,
|
||||
@@ -334,9 +312,9 @@ void execp_compute_icon_text_geometry(Execp *execp,
|
||||
{
|
||||
Panel *panel = (Panel *)execp->area.panel;
|
||||
Area *area = &execp->area;
|
||||
*horiz_padding = (panel_horizontal ? area->paddingxlr : area->paddingy) * panel->scale;
|
||||
*vert_padding = (panel_horizontal ? area->paddingy : area->paddingxlr) * panel->scale;
|
||||
*interior_padding = area->paddingx * panel->scale;
|
||||
*horiz_padding = (panel_horizontal ? area->paddingxlr : area->paddingy);
|
||||
*vert_padding = (panel_horizontal ? area->paddingy : area->paddingxlr);
|
||||
*interior_padding = area->paddingx;
|
||||
|
||||
if (reload_icon(execp)) {
|
||||
if (execp->backend->icon) {
|
||||
@@ -355,7 +333,7 @@ void execp_compute_icon_text_geometry(Execp *execp,
|
||||
int available_w, available_h;
|
||||
if (panel_horizontal) {
|
||||
available_w = panel->area.width;
|
||||
available_h = area->height - 2 * *vert_padding - left_right_border_width(area);
|
||||
available_h = area->height - 2 * area->paddingy - left_right_border_width(area);
|
||||
} else {
|
||||
available_w = !text_next_line
|
||||
? area->width - *icon_w - (*icon_w ? *interior_padding : 0) - 2 * *horiz_padding -
|
||||
@@ -364,6 +342,7 @@ void execp_compute_icon_text_geometry(Execp *execp,
|
||||
available_h = panel->area.height;
|
||||
}
|
||||
get_text_size2(execp->backend->font_desc,
|
||||
txt_height_ink,
|
||||
txt_height,
|
||||
txt_width,
|
||||
available_h,
|
||||
@@ -372,9 +351,7 @@ void execp_compute_icon_text_geometry(Execp *execp,
|
||||
strlen(execp->backend->text),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
execp->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT,
|
||||
execp->backend->has_markup,
|
||||
panel->scale);
|
||||
execp->backend->has_markup);
|
||||
|
||||
*resized = FALSE;
|
||||
if (panel_horizontal) {
|
||||
@@ -394,11 +371,7 @@ void execp_compute_icon_text_geometry(Execp *execp,
|
||||
*new_size = *txt_height + 2 * *vert_padding + top_bottom_border_width(area);
|
||||
*new_size = MAX(*new_size, *icon_h + 2 * *vert_padding + top_bottom_border_width(area));
|
||||
} else {
|
||||
if (strlen(execp->backend->text)) {
|
||||
*new_size = *icon_h + *interior_padding + *txt_height + 2 * *vert_padding + top_bottom_border_width(area);
|
||||
} else {
|
||||
*new_size = *icon_h + 2 * *vert_padding + top_bottom_border_width(area);
|
||||
}
|
||||
*new_size = *icon_h + *interior_padding + *txt_height + 2 * *vert_padding + top_bottom_border_width(area);
|
||||
}
|
||||
if (*new_size != area->height) {
|
||||
*resized = TRUE;
|
||||
@@ -412,7 +385,7 @@ int execp_compute_desired_size(void *obj)
|
||||
int horiz_padding, vert_padding, interior_padding;
|
||||
int icon_w, icon_h;
|
||||
gboolean text_next_line;
|
||||
int txt_height, txt_width;
|
||||
int txt_height_ink, txt_height, txt_width;
|
||||
int new_size;
|
||||
gboolean resized;
|
||||
execp_compute_icon_text_geometry(execp,
|
||||
@@ -422,6 +395,7 @@ int execp_compute_desired_size(void *obj)
|
||||
&icon_w,
|
||||
&icon_h,
|
||||
&text_next_line,
|
||||
&txt_height_ink,
|
||||
&txt_height,
|
||||
&txt_width,
|
||||
&new_size,
|
||||
@@ -436,7 +410,7 @@ gboolean resize_execp(void *obj)
|
||||
int horiz_padding, vert_padding, interior_padding;
|
||||
int icon_w, icon_h;
|
||||
gboolean text_next_line;
|
||||
int txt_height, txt_width;
|
||||
int txt_height_ink, txt_height, txt_width;
|
||||
int new_size;
|
||||
gboolean resized;
|
||||
execp_compute_icon_text_geometry(execp,
|
||||
@@ -446,6 +420,7 @@ gboolean resize_execp(void *obj)
|
||||
&icon_w,
|
||||
&icon_h,
|
||||
&text_next_line,
|
||||
&txt_height_ink,
|
||||
&txt_height,
|
||||
&txt_width,
|
||||
&new_size,
|
||||
@@ -466,17 +441,10 @@ gboolean resize_execp(void *obj)
|
||||
execp->frontend->texty = (execp->area.height - txt_height) / 2;
|
||||
execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
|
||||
} else {
|
||||
if (strlen(execp->backend->text)) {
|
||||
execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
|
||||
execp->frontend->iconx = (execp->area.width - icon_w) / 2;
|
||||
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
|
||||
execp->frontend->textx = (execp->area.width - txt_width) / 2;
|
||||
} else {
|
||||
execp->frontend->icony = (execp->area.height - icon_h) / 2;
|
||||
execp->frontend->iconx = (execp->area.width - icon_w) / 2;
|
||||
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
|
||||
execp->frontend->textx = (execp->area.width - txt_width) / 2;
|
||||
}
|
||||
execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
|
||||
execp->frontend->iconx = (execp->area.width - icon_w) / 2;
|
||||
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
|
||||
execp->frontend->textx = (execp->area.width - txt_width) / 2;
|
||||
}
|
||||
} else {
|
||||
execp->frontend->texty = (execp->area.height - txt_height) / 2;
|
||||
@@ -490,17 +458,10 @@ gboolean resize_execp(void *obj)
|
||||
execp->frontend->texty = (execp->area.height - txt_height) / 2;
|
||||
execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
|
||||
} else {
|
||||
if (strlen(execp->backend->text)) {
|
||||
execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
|
||||
execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
|
||||
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
|
||||
execp->frontend->textx = execp->frontend->iconx;
|
||||
} else {
|
||||
execp->frontend->icony = (execp->area.height - icon_h) / 2;
|
||||
execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
|
||||
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
|
||||
execp->frontend->textx = execp->frontend->iconx;
|
||||
}
|
||||
execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
|
||||
execp->frontend->iconx = left_border_width(&execp->area) + horiz_padding;
|
||||
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
|
||||
execp->frontend->textx = execp->frontend->iconx;
|
||||
}
|
||||
} else {
|
||||
execp->frontend->texty = (execp->area.height - txt_height) / 2;
|
||||
@@ -512,27 +473,10 @@ gboolean resize_execp(void *obj)
|
||||
return resized;
|
||||
}
|
||||
|
||||
PangoLayout *create_execp_text_layout(Execp *execp, PangoContext *context)
|
||||
{
|
||||
PangoLayout *layout = pango_layout_new(context);
|
||||
pango_layout_set_font_description(layout, execp->backend->font_desc);
|
||||
pango_layout_set_width(layout, (execp->frontend->textw + TINT2_PANGO_SLACK) * PANGO_SCALE);
|
||||
pango_layout_set_height(layout, (execp->frontend->texth + TINT2_PANGO_SLACK) * PANGO_SCALE);
|
||||
pango_layout_set_alignment(layout, execp->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
|
||||
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
|
||||
return layout;
|
||||
}
|
||||
|
||||
void draw_execp(void *obj, cairo_t *c)
|
||||
{
|
||||
Execp *execp = (Execp *)obj;
|
||||
Panel *panel = (Panel *)execp->area.panel;
|
||||
|
||||
PangoContext *context = pango_cairo_create_context(c);
|
||||
pango_cairo_context_set_resolution(context, 96 * panel->scale);
|
||||
PangoLayout *layout = create_execp_text_layout(execp, context);
|
||||
PangoLayout *shadow_layout = NULL;
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
|
||||
if (execp->backend->has_icon && execp->backend->icon) {
|
||||
imlib_context_set_image(execp->backend->icon);
|
||||
@@ -541,18 +485,15 @@ void draw_execp(void *obj, cairo_t *c)
|
||||
}
|
||||
|
||||
// draw layout
|
||||
if (!execp->backend->has_markup) {
|
||||
pango_layout_set_font_description(layout, execp->backend->font_desc);
|
||||
pango_layout_set_width(layout, execp->frontend->textw * PANGO_SCALE);
|
||||
pango_layout_set_alignment(layout, execp->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
|
||||
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
|
||||
if (!execp->backend->has_markup)
|
||||
pango_layout_set_text(layout, execp->backend->text, strlen(execp->backend->text));
|
||||
} else {
|
||||
else
|
||||
pango_layout_set_markup(layout, execp->backend->text, strlen(execp->backend->text));
|
||||
if (panel_config.font_shadow) {
|
||||
shadow_layout = create_execp_text_layout(execp, context);
|
||||
if (!layout_set_markup_strip_colors(shadow_layout, execp->backend->text)) {
|
||||
g_object_unref(shadow_layout);
|
||||
shadow_layout = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pango_cairo_update_layout(c, layout);
|
||||
draw_text(layout,
|
||||
@@ -560,10 +501,9 @@ void draw_execp(void *obj, cairo_t *c)
|
||||
execp->frontend->textx,
|
||||
execp->frontend->texty,
|
||||
&execp->backend->font_color,
|
||||
shadow_layout);
|
||||
panel_config.font_shadow);
|
||||
|
||||
g_object_unref(layout);
|
||||
g_object_unref(context);
|
||||
}
|
||||
|
||||
void execp_dump_geometry(void *obj, int indent)
|
||||
@@ -585,13 +525,12 @@ void execp_dump_geometry(void *obj, int indent)
|
||||
imlib_context_set_image(tmp);
|
||||
}
|
||||
fprintf(stderr,
|
||||
"tint2: %*sText: x = %d, y = %d, w = %d, h = %d, align = %s, text = %s\n",
|
||||
"tint2: %*sText: x = %d, y = %d, w = %d, align = %s, text = %s\n",
|
||||
indent,
|
||||
"",
|
||||
execp->frontend->textx,
|
||||
execp->frontend->texty,
|
||||
execp->frontend->textw,
|
||||
execp->frontend->texth,
|
||||
execp->backend->centered ? "center" : "left",
|
||||
execp->backend->text);
|
||||
}
|
||||
@@ -601,8 +540,10 @@ void execp_force_update(Execp *execp)
|
||||
if (execp->backend->child_pipe_stdout > 0) {
|
||||
// Command currently running, nothing to do
|
||||
} else {
|
||||
if (execp->backend->timer)
|
||||
stop_timeout(execp->backend->timer);
|
||||
// Run command right away
|
||||
change_timer(&execp->backend->timer, true, 10, 0, execp_timer_callback, execp);
|
||||
execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -692,8 +633,7 @@ void execp_timer_callback(void *arg)
|
||||
close(pipe_fd_stderr[0]);
|
||||
return;
|
||||
} else if (child == 0) {
|
||||
if (debug_executors)
|
||||
fprintf(stderr, "tint2: Executing: %s\n", execp->backend->command);
|
||||
fprintf(stderr, "tint2: Executing: %s\n", execp->backend->command);
|
||||
// We are in the child
|
||||
close(pipe_fd_stdout[0]);
|
||||
dup2(pipe_fd_stdout[1], 1); // 1 is stdout
|
||||
@@ -817,7 +757,8 @@ gboolean read_execp(void *obj)
|
||||
close(execp->backend->child_pipe_stderr);
|
||||
execp->backend->child_pipe_stderr = -1;
|
||||
if (execp->backend->interval)
|
||||
change_timer(&execp->backend->timer, true, execp->backend->interval * 1000, 0, execp_timer_callback, execp);
|
||||
execp->backend->timer =
|
||||
add_timeout(execp->backend->interval * 1000, 0, execp_timer_callback, execp, &execp->backend->timer);
|
||||
}
|
||||
|
||||
char *ansi_clear_screen = (char*)"\x1b[2J";
|
||||
@@ -912,7 +853,7 @@ gboolean read_execp(void *obj)
|
||||
} else {
|
||||
execp->backend->text = strdup("");
|
||||
}
|
||||
execp->backend->icon_path = expand_tilde(execp->backend->buf_stdout);
|
||||
execp->backend->icon_path = strdup(execp->backend->buf_stdout);
|
||||
}
|
||||
size_t len = strlen(execp->backend->text);
|
||||
if (len > 0 && execp->backend->text[len - 1] == '\n')
|
||||
@@ -941,22 +882,22 @@ gboolean read_execp(void *obj)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
const char *time_to_string(int seconds, char *buffer, size_t buffer_size)
|
||||
const char *time_to_string(int seconds, char *buffer)
|
||||
{
|
||||
if (seconds < 60) {
|
||||
snprintf(buffer, buffer_size, "%ds", seconds);
|
||||
sprintf(buffer, "%ds", seconds);
|
||||
} else if (seconds < 60 * 60) {
|
||||
int m = seconds / 60;
|
||||
seconds = seconds % 60;
|
||||
int s = seconds;
|
||||
snprintf(buffer, buffer_size, "%d:%ds", m, s);
|
||||
sprintf(buffer, "%d:%ds", m, s);
|
||||
} else {
|
||||
int h = seconds / (60 * 60);
|
||||
seconds = seconds % (60 * 60);
|
||||
int m = seconds / 60;
|
||||
seconds = seconds % 60;
|
||||
int s = seconds;
|
||||
snprintf(buffer, buffer_size, "%d:%d:%ds", h, m, s);
|
||||
sprintf(buffer, "%d:%d:%ds", h, m, s);
|
||||
}
|
||||
return buffer;
|
||||
}
|
||||
@@ -982,39 +923,35 @@ char *execp_get_tooltip(void *obj)
|
||||
if (execp->backend->last_update_finish_time) {
|
||||
// We updated at least once
|
||||
if (execp->backend->interval > 0) {
|
||||
snprintf(execp->backend->tooltip_text,
|
||||
sizeof(execp->backend->tooltip_text),
|
||||
"Last update finished %s ago (took %s). Next update starting in %s.",
|
||||
time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1, sizeof(tmp_buf1)),
|
||||
time_to_string((int)execp->backend->last_update_duration, tmp_buf2, sizeof(tmp_buf2)),
|
||||
time_to_string((int)(execp->backend->interval - (now - execp->backend->last_update_finish_time)),
|
||||
tmp_buf3, sizeof(tmp_buf3)));
|
||||
sprintf(execp->backend->tooltip_text,
|
||||
"Last update finished %s ago (took %s). Next update starting in %s.",
|
||||
time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
|
||||
time_to_string((int)execp->backend->last_update_duration, tmp_buf2),
|
||||
time_to_string((int)(execp->backend->interval - (now - execp->backend->last_update_finish_time)),
|
||||
tmp_buf3));
|
||||
} else {
|
||||
snprintf(execp->backend->tooltip_text,
|
||||
sizeof(execp->backend->tooltip_text),
|
||||
"Last update finished %s ago (took %s).",
|
||||
time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1, sizeof(tmp_buf1)),
|
||||
time_to_string((int)execp->backend->last_update_duration, tmp_buf2, sizeof(tmp_buf2)));
|
||||
sprintf(execp->backend->tooltip_text,
|
||||
"Last update finished %s ago (took %s).",
|
||||
time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
|
||||
time_to_string((int)execp->backend->last_update_duration, tmp_buf2));
|
||||
}
|
||||
} else {
|
||||
// we never requested an update
|
||||
snprintf(execp->backend->tooltip_text, sizeof(execp->backend->tooltip_text), "Never updated. No update scheduled.");
|
||||
sprintf(execp->backend->tooltip_text, "Never updated. No update scheduled.");
|
||||
}
|
||||
} else {
|
||||
// Currently executing command
|
||||
if (execp->backend->last_update_finish_time) {
|
||||
// we finished updating at least once
|
||||
snprintf(execp->backend->tooltip_text,
|
||||
sizeof(execp->backend->tooltip_text),
|
||||
"Last update finished %s ago. Update in progress (started %s ago).",
|
||||
time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1, sizeof(tmp_buf1)),
|
||||
time_to_string((int)(now - execp->backend->last_update_start_time), tmp_buf3, sizeof(tmp_buf3)));
|
||||
sprintf(execp->backend->tooltip_text,
|
||||
"Last update finished %s ago. Update in progress (started %s ago).",
|
||||
time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
|
||||
time_to_string((int)(now - execp->backend->last_update_start_time), tmp_buf3));
|
||||
} else {
|
||||
// we never finished an update
|
||||
snprintf(execp->backend->tooltip_text,
|
||||
sizeof(execp->backend->tooltip_text),
|
||||
"First update in progress (started %s seconds ago).",
|
||||
time_to_string((int)(now - execp->backend->last_update_start_time), tmp_buf1, sizeof(tmp_buf1)));
|
||||
sprintf(execp->backend->tooltip_text,
|
||||
"First update in progress (started %s seconds ago).",
|
||||
time_to_string((int)(now - execp->backend->last_update_start_time), tmp_buf1));
|
||||
}
|
||||
}
|
||||
return strdup(execp->backend->tooltip_text);
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
#include "common.h"
|
||||
#include "timer.h"
|
||||
|
||||
extern bool debug_executors;
|
||||
|
||||
// Architecture:
|
||||
// Panel panel_config contains an array of Execp, each storing all config options and all the state variables.
|
||||
// Only these run commands.
|
||||
@@ -24,7 +22,6 @@ typedef struct ExecpBackend {
|
||||
char *command;
|
||||
// Interval in seconds
|
||||
int interval;
|
||||
int monitor;
|
||||
// 1 if first line of output is an icon path
|
||||
gboolean has_icon;
|
||||
gboolean cache_icon;
|
||||
@@ -49,7 +46,7 @@ typedef struct ExecpBackend {
|
||||
Background *bg;
|
||||
|
||||
// Backend state:
|
||||
Timer timer;
|
||||
timeout *timer;
|
||||
int child_pipe_stdout;
|
||||
int child_pipe_stderr;
|
||||
pid_t child;
|
||||
@@ -97,7 +94,6 @@ typedef struct Execp {
|
||||
ExecpBackend *backend;
|
||||
// Set only for frontend Execp items.
|
||||
ExecpFrontend *frontend;
|
||||
bool dummy;
|
||||
} Execp;
|
||||
|
||||
// Called before the config is read and panel_config/panels are created.
|
||||
|
||||
@@ -65,14 +65,14 @@ void cleanup_freespace(Panel *panel)
|
||||
panel->freespace_list = NULL;
|
||||
}
|
||||
|
||||
int freespace_get_max_size(Panel *panel)
|
||||
int freespace_get_max_size(Panel *p)
|
||||
{
|
||||
if (panel_shrink)
|
||||
return 0;
|
||||
// Get space used by every element except the freespace
|
||||
int size = 0;
|
||||
int spacers = 0;
|
||||
for (GList *walk = panel->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;
|
||||
|
||||
if (!a->on_screen)
|
||||
@@ -83,15 +83,15 @@ int freespace_get_max_size(Panel *panel)
|
||||
}
|
||||
|
||||
if (panel_horizontal)
|
||||
size += a->width + panel->area.paddingx * panel->scale;
|
||||
size += a->width + p->area.paddingx;
|
||||
else
|
||||
size += a->height + panel->area.paddingy * panel->scale;
|
||||
size += a->height + p->area.paddingy;
|
||||
}
|
||||
|
||||
if (panel_horizontal)
|
||||
size = panel->area.width - size - left_right_border_width(&panel->area) - panel->area.paddingxlr * panel->scale;
|
||||
size = p->area.width - size - left_right_border_width(&p->area) - p->area.paddingxlr;
|
||||
else
|
||||
size = panel->area.height - size - top_bottom_border_width(&panel->area) - panel->area.paddingxlr * panel->scale;
|
||||
size = p->area.height - size - top_bottom_border_width(&p->area) - p->area.paddingxlr;
|
||||
|
||||
return size / spacers;
|
||||
}
|
||||
|
||||
72
src/init.c
72
src/init.c
@@ -12,13 +12,11 @@
|
||||
#include <X11/extensions/XShm.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "default_icon.h"
|
||||
#include "drag_and_drop.h"
|
||||
#include "fps_distribution.h"
|
||||
#include "panel.h"
|
||||
#include "server.h"
|
||||
#include "signals.h"
|
||||
#include "test.h"
|
||||
#include "tooltip.h"
|
||||
#include "tracing.h"
|
||||
#include "uevent.h"
|
||||
@@ -50,15 +48,6 @@ void handle_cli_arguments(int argc, char **argv)
|
||||
} else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--version") == 0) {
|
||||
fprintf(stdout, "tint2 version %s\n", VERSION_STRING);
|
||||
exit(0);
|
||||
} else if (strcmp(argv[i], "--test") == 0) {
|
||||
run_all_tests(false);
|
||||
exit(0);
|
||||
} else if (strcmp(argv[i], "--test-verbose") == 0) {
|
||||
run_all_tests(true);
|
||||
exit(0);
|
||||
} else if (strcmp(argv[i], "--dump-image-data") == 0) {
|
||||
dump_image_data(argv[i+1], argv[i+2]);
|
||||
exit(0);
|
||||
} else if (strcmp(argv[i], "-c") == 0) {
|
||||
if (i + 1 < argc) {
|
||||
i++;
|
||||
@@ -105,10 +94,6 @@ void handle_env_vars()
|
||||
debug_frames = getenv("DEBUG_FRAMES") != NULL;
|
||||
debug_dnd = getenv("DEBUG_DND") != NULL;
|
||||
debug_thumbnails = getenv("DEBUG_THUMBNAILS") != NULL;
|
||||
debug_timers = getenv("DEBUG_TIMERS") != NULL;
|
||||
debug_executors = getenv("DEBUG_EXECUTORS") != NULL;
|
||||
debug_blink = getenv("DEBUG_BLINK") != NULL;
|
||||
thumb_use_shm = getenv("TINT2_THUMBNAIL_SHM") != NULL;
|
||||
if (debug_fps) {
|
||||
init_fps_distribution();
|
||||
char *s = getenv("TRACING_FPS_THRESHOLD");
|
||||
@@ -118,25 +103,25 @@ void handle_env_vars()
|
||||
}
|
||||
}
|
||||
|
||||
static Timer detect_compositor_timer = DEFAULT_TIMER;
|
||||
static timeout *detect_compositor_timer = NULL;
|
||||
static int detect_compositor_timer_counter = 0;
|
||||
|
||||
void detect_compositor(void *arg)
|
||||
{
|
||||
if (server.composite_manager) {
|
||||
stop_timer(&detect_compositor_timer);
|
||||
stop_timeout(detect_compositor_timer);
|
||||
return;
|
||||
}
|
||||
|
||||
detect_compositor_timer_counter--;
|
||||
if (detect_compositor_timer_counter < 0) {
|
||||
stop_timer(&detect_compositor_timer);
|
||||
stop_timeout(detect_compositor_timer);
|
||||
return;
|
||||
}
|
||||
|
||||
// No compositor, check for one
|
||||
if (XGetSelectionOwner(server.display, server.atom._NET_WM_CM_S0) != None) {
|
||||
stop_timer(&detect_compositor_timer);
|
||||
stop_timeout(detect_compositor_timer);
|
||||
// Restart tint2
|
||||
fprintf(stderr, "tint2: Detected compositor, restarting tint2...\n");
|
||||
kill(getpid(), SIGUSR1);
|
||||
@@ -149,15 +134,15 @@ void start_detect_compositor()
|
||||
if (server.composite_manager)
|
||||
return;
|
||||
|
||||
stop_timeout(detect_compositor_timer);
|
||||
// Check every 0.5 seconds for up to 30 seconds
|
||||
detect_compositor_timer_counter = 60;
|
||||
INIT_TIMER(detect_compositor_timer);
|
||||
change_timer(&detect_compositor_timer, true, 500, 500, detect_compositor, 0);
|
||||
detect_compositor_timer = add_timeout(500, 500, detect_compositor, 0, &detect_compositor_timer);
|
||||
}
|
||||
|
||||
void create_default_elements()
|
||||
{
|
||||
default_timers();
|
||||
default_timeout();
|
||||
default_systray();
|
||||
memset(&server, 0, sizeof(server));
|
||||
#ifdef ENABLE_BATTERY
|
||||
@@ -172,22 +157,6 @@ void create_default_elements()
|
||||
default_panel();
|
||||
}
|
||||
|
||||
void load_default_task_icon()
|
||||
{
|
||||
const gchar *const *data_dirs = g_get_system_data_dirs();
|
||||
for (int i = 0; data_dirs[i] != NULL; i++) {
|
||||
gchar *path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
|
||||
if (g_file_test(path, G_FILE_TEST_EXISTS))
|
||||
default_icon = load_image(path, TRUE);
|
||||
g_free(path);
|
||||
}
|
||||
if (!default_icon) {
|
||||
default_icon = imlib_create_image_using_data(default_icon_width,
|
||||
default_icon_height,
|
||||
default_icon_data);
|
||||
}
|
||||
}
|
||||
|
||||
void init_post_config()
|
||||
{
|
||||
server_init_visual();
|
||||
@@ -198,7 +167,20 @@ void init_post_config()
|
||||
imlib_context_set_colormap(server.colormap);
|
||||
|
||||
init_signals_postconfig();
|
||||
load_default_task_icon();
|
||||
|
||||
// load default icon
|
||||
const gchar *const *data_dirs = g_get_system_data_dirs();
|
||||
for (int i = 0; data_dirs[i] != NULL; i++) {
|
||||
gchar *path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
|
||||
if (g_file_test(path, G_FILE_TEST_EXISTS))
|
||||
default_icon = load_image(path, TRUE);
|
||||
g_free(path);
|
||||
}
|
||||
if (!default_icon) {
|
||||
fprintf(stderr,
|
||||
RED "Could not load default_icon.png. Please check that tint2 has been installed correctly!" RESET
|
||||
"\n");
|
||||
}
|
||||
|
||||
XSync(server.display, False);
|
||||
}
|
||||
@@ -211,8 +193,8 @@ void init_X11_pre_config()
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
server.x11_fd = ConnectionNumber(server.display);
|
||||
XSetErrorHandler(server_catch_error);
|
||||
XSetIOErrorHandler(x11_io_error);
|
||||
XSetErrorHandler((XErrorHandler)server_catch_error);
|
||||
XSetIOErrorHandler((XIOErrorHandler)x11_io_error);
|
||||
server_init_atoms();
|
||||
server.screen = DefaultScreen(server.display);
|
||||
server.root_win = RootWindow(server.display, server.screen);
|
||||
@@ -240,18 +222,17 @@ void init(int argc, char **argv)
|
||||
setlinebuf(stdout);
|
||||
setlinebuf(stderr);
|
||||
default_config();
|
||||
handle_env_vars();
|
||||
handle_cli_arguments(argc, argv);
|
||||
create_default_elements();
|
||||
init_signals();
|
||||
handle_env_vars();
|
||||
|
||||
init_X11_pre_config();
|
||||
if (!config_read()) {
|
||||
fprintf(stderr, "tint2: Could not read config file.\n");
|
||||
print_usage();
|
||||
warnings_for_timers = false;
|
||||
cleanup();
|
||||
exit(EXIT_FAILURE);
|
||||
return;
|
||||
}
|
||||
|
||||
init_post_config();
|
||||
@@ -278,7 +259,6 @@ void cleanup()
|
||||
cleanup_battery();
|
||||
#endif
|
||||
cleanup_separator();
|
||||
cleanup_taskbar();
|
||||
cleanup_panel();
|
||||
cleanup_config();
|
||||
|
||||
@@ -293,7 +273,7 @@ void cleanup()
|
||||
xsettings_client = NULL;
|
||||
|
||||
cleanup_server();
|
||||
cleanup_timers();
|
||||
cleanup_timeout();
|
||||
|
||||
if (server.display)
|
||||
XCloseDisplay(server.display);
|
||||
|
||||
@@ -60,9 +60,9 @@ void expand_exec(DesktopEntry *entry, const char *path)
|
||||
// %c -> Name
|
||||
// %k -> path
|
||||
if (entry->exec) {
|
||||
size_t buf_size = strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) +
|
||||
(entry->icon ? strlen(entry->icon) : 1) + 100;
|
||||
char *exec2 = calloc(buf_size, 1);
|
||||
char *exec2 = calloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) +
|
||||
(entry->icon ? strlen(entry->icon) : 1) + 100,
|
||||
1);
|
||||
char *p, *q;
|
||||
// p will never point to an escaped char
|
||||
for (p = entry->exec, q = exec2; *p; p++, q++) {
|
||||
@@ -82,30 +82,23 @@ void expand_exec(DesktopEntry *entry, const char *path)
|
||||
if (!*p)
|
||||
break;
|
||||
if (*p == 'i' && entry->icon != NULL) {
|
||||
snprintf(q, buf_size, "--icon '%s'", entry->icon);
|
||||
char *old = q;
|
||||
sprintf(q, "--icon '%s'", entry->icon);
|
||||
q += strlen("--icon ''");
|
||||
q += strlen(entry->icon);
|
||||
buf_size -= (size_t)(q - old);
|
||||
q--; // To balance the q++ in the for
|
||||
} else if (*p == 'c' && entry->name != NULL) {
|
||||
snprintf(q, buf_size, "'%s'", entry->name);
|
||||
char *old = q;
|
||||
sprintf(q, "'%s'", entry->name);
|
||||
q += strlen("''");
|
||||
q += strlen(entry->name);
|
||||
buf_size -= (size_t)(q - old);
|
||||
q--; // To balance the q++ in the for
|
||||
} else if (*p == 'c') {
|
||||
snprintf(q, buf_size, "'%s'", path);
|
||||
char *old = q;
|
||||
sprintf(q, "'%s'", path);
|
||||
q += strlen("''");
|
||||
q += strlen(path);
|
||||
buf_size -= (size_t)(q - old);
|
||||
q--; // To balance the q++ in the for
|
||||
} else if (*p == 'f' || *p == 'F') {
|
||||
snprintf(q, buf_size, "%c%c", '%', *p);
|
||||
sprintf(q, "%c%c", '%', *p);
|
||||
q += 2;
|
||||
buf_size -= 2;
|
||||
q--; // To balance the q++ in the for
|
||||
} else {
|
||||
// We don't care about other expansions
|
||||
|
||||
@@ -48,7 +48,7 @@ int parse_theme_line(char *line, char **key, char **value)
|
||||
return parse_dektop_line(line, key, value);
|
||||
}
|
||||
|
||||
static GSList *icon_locations = NULL;
|
||||
GSList *icon_locations = NULL;
|
||||
// Do not free the result.
|
||||
const GSList *get_icon_locations()
|
||||
{
|
||||
@@ -74,21 +74,6 @@ const GSList *get_icon_locations()
|
||||
return icon_locations;
|
||||
}
|
||||
|
||||
static GSList *icon_extensions = NULL;
|
||||
const GSList *get_icon_extensions()
|
||||
{
|
||||
if (icon_extensions)
|
||||
return icon_extensions;
|
||||
|
||||
icon_extensions = g_slist_append(icon_extensions, ".png");
|
||||
icon_extensions = g_slist_append(icon_extensions, ".xpm");
|
||||
#ifdef HAVE_RSVG
|
||||
icon_extensions = g_slist_append(icon_extensions, ".svg");
|
||||
#endif
|
||||
icon_extensions = g_slist_append(icon_extensions, "");
|
||||
return icon_extensions;
|
||||
}
|
||||
|
||||
IconTheme *make_theme(const char *name)
|
||||
{
|
||||
IconTheme *theme = calloc(1, sizeof(IconTheme));
|
||||
@@ -550,46 +535,41 @@ gint compare_theme_directories(gconstpointer a, gconstpointer b, gpointer size_q
|
||||
return abs(da->size - size) - abs(db->size - size);
|
||||
}
|
||||
|
||||
Bool is_full_path(const char *s)
|
||||
{
|
||||
if (!s)
|
||||
return FALSE;
|
||||
return s[0] == '/';
|
||||
}
|
||||
|
||||
Bool file_exists(const char *path)
|
||||
{
|
||||
return g_file_test(path, G_FILE_TEST_EXISTS);
|
||||
}
|
||||
|
||||
char *icon_path_from_full_path(const char *s)
|
||||
{
|
||||
if (is_full_path(s) && file_exists(s))
|
||||
return strdup(s);
|
||||
char *expanded = expand_tilde(s);
|
||||
if (is_full_path(expanded) && file_exists(expanded))
|
||||
return expanded;
|
||||
free(expanded);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
|
||||
{
|
||||
if (!icon_name)
|
||||
if (icon_name == NULL)
|
||||
return NULL;
|
||||
|
||||
char *result = icon_path_from_full_path(icon_name);
|
||||
if (result)
|
||||
return result;
|
||||
// If the icon_name is already a path and the file exists, return it
|
||||
if (strstr(icon_name, "/") == icon_name) {
|
||||
if (g_file_test(icon_name, G_FILE_TEST_EXISTS))
|
||||
return strdup(icon_name);
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const GSList *basenames = get_icon_locations();
|
||||
const GSList *extensions = get_icon_extensions();
|
||||
GSList *extensions = NULL;
|
||||
extensions = g_slist_append(extensions, ".png");
|
||||
extensions = g_slist_append(extensions, ".xpm");
|
||||
#ifdef HAVE_RSVG
|
||||
extensions = g_slist_append(extensions, ".svg");
|
||||
#endif
|
||||
// if the icon name already contains one of the extensions (e.g. vlc.png instead of vlc) add a special entry
|
||||
for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
|
||||
char *extension = (char *)ext->data;
|
||||
if (strlen(icon_name) > strlen(extension) &&
|
||||
strcmp(extension, icon_name + strlen(icon_name) - strlen(extension)) == 0) {
|
||||
extensions = g_slist_append(extensions, "");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
GSList *theme;
|
||||
|
||||
// Best size match
|
||||
// Contrary to the freedesktop spec, we are not choosing the closest icon in size, but the next larger icon
|
||||
// otherwise the quality is worse when scaling up (for size 22, if you can choose 16 or 32, you're better with 32)
|
||||
// otherwise the quality is usually crap (for size 22, if you can choose 16 or 32, you're better with 32)
|
||||
// We do fallback to the closest size if we cannot find a larger or equal icon
|
||||
|
||||
// These 3 variables are used for keeping the closest size match
|
||||
@@ -602,7 +582,7 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
|
||||
char *next_larger = NULL;
|
||||
GSList *next_larger_theme = NULL;
|
||||
|
||||
size_t file_name_size = 4096;
|
||||
int file_name_size = 4096;
|
||||
char *file_name = calloc(file_name_size, 1);
|
||||
|
||||
for (theme = themes; theme; theme = g_slist_next(theme)) {
|
||||
@@ -627,7 +607,7 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
|
||||
fprintf(stderr, "tint2: Searching directory: %s\n", ((IconThemeDir *)dir->data)->name);
|
||||
const GSList *base;
|
||||
for (base = basenames; base; base = g_slist_next(base)) {
|
||||
for (const GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
|
||||
for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
|
||||
char *base_name = (char *)base->data;
|
||||
char *theme_name = ((IconTheme *)theme->data)->name;
|
||||
char *dir_name = ((IconThemeDir *)dir->data)->name;
|
||||
@@ -641,7 +621,7 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
|
||||
}
|
||||
file_name[0] = 0;
|
||||
// filename = directory/$(themename)/subdirectory/iconname.extension
|
||||
snprintf(file_name, (size_t)file_name_size, "%s/%s/%s/%s%s", base_name, theme_name, dir_name, icon_name, extension);
|
||||
sprintf(file_name, "%s/%s/%s/%s%s", base_name, theme_name, dir_name, icon_name, extension);
|
||||
if (debug_icons)
|
||||
fprintf(stderr, "tint2: Checking %s\n", file_name);
|
||||
if (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
|
||||
@@ -682,10 +662,12 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
|
||||
free(file_name);
|
||||
file_name = NULL;
|
||||
if (next_larger) {
|
||||
g_slist_free(extensions);
|
||||
free(best_file_name);
|
||||
return next_larger;
|
||||
}
|
||||
if (best_file_name) {
|
||||
g_slist_free(extensions);
|
||||
return best_file_name;
|
||||
}
|
||||
|
||||
@@ -694,18 +676,18 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
|
||||
if (debug_icons)
|
||||
fprintf(stderr, "tint2: Searching unthemed icons\n");
|
||||
for (const GSList *base = basenames; base; base = g_slist_next(base)) {
|
||||
for (const GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
|
||||
for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
|
||||
char *base_name = (char *)base->data;
|
||||
char *extension = (char *)ext->data;
|
||||
size_t file_name_size2 = strlen(base_name) + strlen(icon_name) + strlen(extension) + 100;
|
||||
file_name = calloc(file_name_size2, 1);
|
||||
file_name = calloc(strlen(base_name) + strlen(icon_name) + strlen(extension) + 100, 1);
|
||||
// filename = directory/iconname.extension
|
||||
snprintf(file_name, file_name_size2, "%s/%s%s", base_name, icon_name, extension);
|
||||
sprintf(file_name, "%s/%s%s", base_name, icon_name, extension);
|
||||
if (debug_icons)
|
||||
fprintf(stderr, "tint2: Checking %s\n", file_name);
|
||||
if (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
|
||||
if (debug_icons)
|
||||
fprintf(stderr, "tint2: Found %s\n", file_name);
|
||||
g_slist_free(extensions);
|
||||
return file_name;
|
||||
} else {
|
||||
free(file_name);
|
||||
@@ -715,6 +697,7 @@ char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
|
||||
}
|
||||
}
|
||||
|
||||
g_slist_free(extensions);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -112,7 +112,7 @@ void init_launcher_panel(void *p)
|
||||
return;
|
||||
|
||||
// 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 * panel->scale : 24;
|
||||
launcher->icon_size = launcher_max_icon_size > 0 ? launcher_max_icon_size : 24;
|
||||
|
||||
launcher->area.on_screen = TRUE;
|
||||
schedule_panel_redraw();
|
||||
@@ -174,12 +174,11 @@ void cleanup_launcher_theme(Launcher *launcher)
|
||||
|
||||
int launcher_compute_icon_size(Launcher *launcher)
|
||||
{
|
||||
Panel *panel = launcher->area.panel;
|
||||
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)) -
|
||||
(2 * launcher->area.paddingy * panel->scale);
|
||||
if (launcher_max_icon_size)
|
||||
icon_size = MIN(icon_size, launcher_max_icon_size * panel->scale);
|
||||
(2 * launcher->area.paddingy);
|
||||
if (launcher_max_icon_size > 0 && icon_size > launcher_max_icon_size)
|
||||
icon_size = launcher_max_icon_size;
|
||||
return icon_size;
|
||||
}
|
||||
|
||||
@@ -190,7 +189,6 @@ void launcher_compute_geometry(Launcher *launcher,
|
||||
int *icons_per_row,
|
||||
int *margin)
|
||||
{
|
||||
Panel *panel = (Panel*)launcher->area.panel;
|
||||
int count = 0;
|
||||
for (GSList *l = launcher->list_icons; l; l = l->next) {
|
||||
LauncherIcon *launcherIcon = (LauncherIcon *)l->data;
|
||||
@@ -206,25 +204,25 @@ void launcher_compute_geometry(Launcher *launcher,
|
||||
if (!count) {
|
||||
*size = 0;
|
||||
} else {
|
||||
int height = launcher->area.height - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy * panel->scale;
|
||||
int height = launcher->area.height - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
|
||||
// here icons_per_column always higher than 0
|
||||
*icons_per_column = (height + launcher->area.paddingx * panel->scale) / (*icon_size + launcher->area.paddingx * panel->scale);
|
||||
*margin = height - (*icons_per_column - 1) * (*icon_size + launcher->area.paddingx * panel->scale) - *icon_size;
|
||||
*icons_per_column = (height + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
|
||||
*margin = height - (*icons_per_column - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
|
||||
*icons_per_row = count / *icons_per_column + (count % *icons_per_column != 0);
|
||||
*size = left_right_border_width(&launcher->area) + 2 * launcher->area.paddingxlr * panel->scale +
|
||||
(*icon_size * *icons_per_row) + ((*icons_per_row - 1) * launcher->area.paddingx * panel->scale);
|
||||
*size = left_right_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
|
||||
(*icon_size * *icons_per_row) + ((*icons_per_row - 1) * launcher->area.paddingx);
|
||||
}
|
||||
} else {
|
||||
if (!count) {
|
||||
*size = 0;
|
||||
} else {
|
||||
int width = launcher->area.width - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy * panel->scale;
|
||||
int width = launcher->area.width - top_bottom_border_width(&launcher->area) - 2 * launcher->area.paddingy;
|
||||
// here icons_per_row always higher than 0
|
||||
*icons_per_row = (width + launcher->area.paddingx * panel->scale) / (*icon_size + launcher->area.paddingx * panel->scale);
|
||||
*margin = width - (*icons_per_row - 1) * (*icon_size + launcher->area.paddingx * panel->scale) - *icon_size;
|
||||
*icons_per_row = (width + launcher->area.paddingx) / (*icon_size + launcher->area.paddingx);
|
||||
*margin = width - (*icons_per_row - 1) * (*icon_size + launcher->area.paddingx) - *icon_size;
|
||||
*icons_per_column = count / *icons_per_row + (count % *icons_per_row != 0);
|
||||
*size = top_bottom_border_width(&launcher->area) + 2 * launcher->area.paddingxlr * panel->scale +
|
||||
(*icon_size * *icons_per_column) + ((*icons_per_column - 1) * launcher->area.paddingx * panel->scale);
|
||||
*size = top_bottom_border_width(&launcher->area) + 2 * launcher->area.paddingxlr +
|
||||
(*icon_size * *icons_per_column) + ((*icons_per_column - 1) * launcher->area.paddingx);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -241,7 +239,6 @@ int launcher_compute_desired_size(void *obj)
|
||||
gboolean resize_launcher(void *obj)
|
||||
{
|
||||
Launcher *launcher = (Launcher *)obj;
|
||||
Panel *panel = (Panel*)launcher->area.panel;
|
||||
|
||||
int size, icons_per_column, icons_per_row, margin;
|
||||
launcher_compute_geometry(launcher, &size, &launcher->icon_size, &icons_per_column, &icons_per_row, &margin);
|
||||
@@ -284,11 +281,11 @@ gboolean resize_launcher(void *obj)
|
||||
int posx, posy;
|
||||
int start;
|
||||
if (panel_horizontal) {
|
||||
posy = start = top_border_width(&launcher->area) + launcher->area.paddingy * panel->scale + margin / 2;
|
||||
posx = left_border_width(&launcher->area) + launcher->area.paddingxlr * panel->scale;
|
||||
posy = start = top_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
|
||||
posx = left_border_width(&launcher->area) + launcher->area.paddingxlr;
|
||||
} else {
|
||||
posx = start = left_border_width(&launcher->area) + launcher->area.paddingy * panel->scale + margin / 2;
|
||||
posy = top_border_width(&launcher->area) + launcher->area.paddingxlr * panel->scale;
|
||||
posx = start = left_border_width(&launcher->area) + launcher->area.paddingy + margin / 2;
|
||||
posy = top_border_width(&launcher->area) + launcher->area.paddingxlr;
|
||||
}
|
||||
|
||||
int i = 0;
|
||||
@@ -303,17 +300,17 @@ gboolean resize_launcher(void *obj)
|
||||
// fprintf(stderr, "tint2: launcher %d : %d,%d\n", i, posx, posy);
|
||||
if (panel_horizontal) {
|
||||
if (i % icons_per_column) {
|
||||
posy += launcher->icon_size + launcher->area.paddingx * panel->scale;
|
||||
posy += launcher->icon_size + launcher->area.paddingx;
|
||||
} else {
|
||||
posy = start;
|
||||
posx += (launcher->icon_size + launcher->area.paddingx * panel->scale);
|
||||
posx += (launcher->icon_size + launcher->area.paddingx);
|
||||
}
|
||||
} else {
|
||||
if (i % icons_per_row) {
|
||||
posx += launcher->icon_size + launcher->area.paddingx * panel->scale;
|
||||
posx += launcher->icon_size + launcher->area.paddingx;
|
||||
} else {
|
||||
posx = start;
|
||||
posy += (launcher->icon_size + launcher->area.paddingx * panel->scale);
|
||||
posy += (launcher->icon_size + launcher->area.paddingx);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -399,12 +396,7 @@ void launcher_icon_dump_geometry(void *obj, int indent)
|
||||
Imlib_Image scale_icon(Imlib_Image original, int icon_size)
|
||||
{
|
||||
Imlib_Image icon_scaled;
|
||||
if (!icon_size) {
|
||||
icon_scaled = imlib_create_image(1, 1);
|
||||
imlib_context_set_image(icon_scaled);
|
||||
imlib_context_set_color(255, 255, 255, 255);
|
||||
imlib_image_fill_rectangle(0, 0, icon_size, icon_size);
|
||||
} else if (original) {
|
||||
if (original) {
|
||||
imlib_context_set_image(original);
|
||||
icon_scaled = imlib_create_cropped_scaled_image(0,
|
||||
0,
|
||||
@@ -478,7 +470,7 @@ void launcher_load_icons(Launcher *launcher)
|
||||
launcherIcon->area.size_mode = LAYOUT_FIXED;
|
||||
launcherIcon->area._resize = NULL;
|
||||
launcherIcon->area._compute_desired_size = launcher_icon_compute_desired_size;
|
||||
snprintf(launcherIcon->area.name, sizeof(launcherIcon->area.name), "LauncherIcon %d", index);
|
||||
sprintf(launcherIcon->area.name, "LauncherIcon %d", index);
|
||||
launcherIcon->area.resize_needed = 0;
|
||||
launcherIcon->area.has_mouse_over_effect = panel_config.mouse_effects;
|
||||
launcherIcon->area.has_mouse_press_effect = launcherIcon->area.has_mouse_over_effect;
|
||||
|
||||
26
src/main.c
26
src/main.c
@@ -389,9 +389,9 @@ gboolean handle_x_event_autohide(XEvent *e)
|
||||
Panel *panel = get_panel(e->xany.window);
|
||||
if (panel && panel_autohide) {
|
||||
if (e->type == EnterNotify)
|
||||
autohide_trigger_show(panel, e->xany.send_event);
|
||||
autohide_trigger_show(panel);
|
||||
else if (e->type == LeaveNotify)
|
||||
autohide_trigger_hide(panel, e->xany.send_event);
|
||||
autohide_trigger_hide(panel);
|
||||
if (panel->is_hidden) {
|
||||
if (e->type == ClientMessage && e->xclient.message_type == server.atom.XdndPosition) {
|
||||
hidden_panel_shown_for_dnd = TRUE;
|
||||
@@ -545,11 +545,6 @@ void handle_x_event(XEvent *e)
|
||||
handle_dnd_position(&e->xclient);
|
||||
} else if (e->xclient.message_type == server.atom.XdndDrop) {
|
||||
handle_dnd_drop(&e->xclient);
|
||||
} else if (e->xclient.message_type == server.atom.TINT2_REFRESH_EXECP &&
|
||||
e->xclient.format == 8) {
|
||||
char name[sizeof(e->xclient.data.b) + 1] = {};
|
||||
memcpy(name, e->xclient.data.b, sizeof(e->xclient.data.b));
|
||||
printf("TODO: refresh execp: %s\n", name);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -728,7 +723,7 @@ void handle_panel_refresh()
|
||||
if (debug_frames) {
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
char path[256];
|
||||
snprintf(path, sizeof(path), "tint2-%d-panel-%d-frame-%d.png", getpid(), i, frame);
|
||||
sprintf(path, "tint2-%d-panel-%d-frame-%d.png", getpid(), i, frame);
|
||||
save_panel_screenshot(&panels[i], path);
|
||||
}
|
||||
}
|
||||
@@ -753,7 +748,7 @@ void run_tint2_event_loop()
|
||||
|
||||
// Wait for an event and handle it
|
||||
ts_event_read = 0;
|
||||
if (XPending(server.display) > 0 || select(max_fd + 1, &fds, 0, 0, get_duration_to_next_timer_expiration()) >= 0) {
|
||||
if (XPending(server.display) > 0 || select(max_fd + 1, &fds, 0, 0, get_next_timeout()) >= 0) {
|
||||
#ifdef HAVE_TRACING
|
||||
start_tracing((void*)run_tint2_event_loop);
|
||||
#endif
|
||||
@@ -802,19 +797,6 @@ void tint2(int argc, char **argv, gboolean *restart)
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
#ifdef USE_REAL_MALLOC
|
||||
if (!getenv("G_SLICE") && setenv("G_SLICE", "always-malloc", 1) == 0) {
|
||||
fprintf(stderr,
|
||||
YELLOW "tint2: reexecuting tint2 without glib slice allocator..." RESET "\n");
|
||||
execvp(argv[0], argv);
|
||||
fprintf(stderr, RED "tint2: %s %d: execvp failed! carrying on..." RESET "\n",
|
||||
__FILE__, __LINE__);
|
||||
}
|
||||
#else
|
||||
fprintf(stderr, "tint2: Using glib slice allocator (default). "
|
||||
"Run tint2 with environment variable G_SLICE=always-malloc "
|
||||
"in case of strange behavior or crashes\n");
|
||||
#endif
|
||||
gboolean restart;
|
||||
do {
|
||||
restart = FALSE;
|
||||
|
||||
176
src/panel.c
176
src/panel.c
@@ -49,7 +49,6 @@ MouseAction mouse_tilt_right;
|
||||
TaskbarMode taskbar_mode;
|
||||
gboolean wm_menu;
|
||||
gboolean panel_dock;
|
||||
gboolean panel_pivot_struts;
|
||||
Layer panel_layer;
|
||||
PanelPosition panel_position;
|
||||
gboolean panel_horizontal;
|
||||
@@ -60,7 +59,7 @@ gboolean debug_geometry;
|
||||
gboolean debug_gradients;
|
||||
gboolean startup_notifications;
|
||||
gboolean debug_thumbnails;
|
||||
gboolean debug_blink;
|
||||
|
||||
gboolean panel_autohide;
|
||||
int panel_autohide_show_timeout;
|
||||
int panel_autohide_hide_timeout;
|
||||
@@ -80,16 +79,11 @@ int num_panels;
|
||||
GArray *backgrounds;
|
||||
GArray *gradients;
|
||||
|
||||
double ui_scale_dpi_ref;
|
||||
double ui_scale_monitor_size_ref;
|
||||
|
||||
Imlib_Image default_icon;
|
||||
char *default_font = NULL;
|
||||
|
||||
void default_panel()
|
||||
{
|
||||
ui_scale_dpi_ref = 0;
|
||||
ui_scale_monitor_size_ref = 0;
|
||||
panels = NULL;
|
||||
num_panels = 0;
|
||||
default_icon = NULL;
|
||||
@@ -104,7 +98,6 @@ void default_panel()
|
||||
panel_shrink = FALSE;
|
||||
panel_strut_policy = STRUT_FOLLOW_SIZE;
|
||||
panel_dock = FALSE; // default not in the dock
|
||||
panel_pivot_struts = FALSE;
|
||||
panel_layer = BOTTOM_LAYER; // default is bottom layer
|
||||
panel_window_name = strdup("tint2");
|
||||
wm_menu = FALSE;
|
||||
@@ -137,6 +130,8 @@ void cleanup_panel()
|
||||
if (!panels)
|
||||
return;
|
||||
|
||||
cleanup_taskbar();
|
||||
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
Panel *p = &panels[i];
|
||||
|
||||
@@ -150,7 +145,7 @@ void cleanup_panel()
|
||||
if (p->main_win)
|
||||
XDestroyWindow(server.display, p->main_win);
|
||||
p->main_win = 0;
|
||||
destroy_timer(&p->autohide_timer);
|
||||
stop_timeout(p->autohide_timeout);
|
||||
cleanup_freespace(p);
|
||||
}
|
||||
|
||||
@@ -212,7 +207,6 @@ void init_panel()
|
||||
panels = calloc(num_panels, sizeof(Panel));
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
memcpy(&panels[i], &panel_config, sizeof(Panel));
|
||||
INIT_TIMER(panels[i].autohide_timer);
|
||||
}
|
||||
|
||||
fprintf(stderr,
|
||||
@@ -225,17 +219,6 @@ void init_panel()
|
||||
|
||||
if (panel_config.monitor < 0)
|
||||
p->monitor = i;
|
||||
if (ui_scale_dpi_ref > 0 && server.monitors[p->monitor].dpi > 0)
|
||||
p->scale = server.monitors[p->monitor].dpi / ui_scale_dpi_ref;
|
||||
else
|
||||
p->scale = 1;
|
||||
if (ui_scale_monitor_size_ref > 0)
|
||||
p->scale *= server.monitors[p->monitor].height / ui_scale_monitor_size_ref;
|
||||
if (p->scale > 8 || p->scale < 1./8) {
|
||||
fprintf(stderr, RED "tint2: panel %d having scale %g outside bounds, resetting to 1.0" RESET "\n", i + 1, p->scale);
|
||||
p->scale = 1;
|
||||
}
|
||||
fprintf(stderr, BLUE "tint2: panel %d uses scale %g " RESET "\n", i + 1, p->scale);
|
||||
if (!p->area.bg)
|
||||
p->area.bg = &g_array_index(backgrounds, Background, 0);
|
||||
p->area.parent = p;
|
||||
@@ -269,9 +252,8 @@ void init_panel()
|
||||
init_freespace_panel(p);
|
||||
if (panel_items_order[k] == ':')
|
||||
init_separator_panel(p);
|
||||
if (panel_items_order[k] == 'E') {
|
||||
if (panel_items_order[k] == 'E')
|
||||
init_execp_panel(p);
|
||||
}
|
||||
if (panel_items_order[k] == 'P')
|
||||
init_button_panel(p);
|
||||
}
|
||||
@@ -317,7 +299,7 @@ void init_panel()
|
||||
}
|
||||
|
||||
if (panel_autohide)
|
||||
autohide_trigger_hide(p, false);
|
||||
autohide_trigger_hide(p);
|
||||
}
|
||||
|
||||
taskbar_refresh_tasklist();
|
||||
@@ -374,19 +356,6 @@ void panel_compute_size(Panel *panel)
|
||||
}
|
||||
}
|
||||
|
||||
if (!panel->fractional_width) {
|
||||
if (panel_horizontal)
|
||||
panel->area.width *= panel->scale;
|
||||
else
|
||||
panel->area.height *= panel->scale;
|
||||
}
|
||||
if (!panel->fractional_height) {
|
||||
if (panel_horizontal)
|
||||
panel->area.height *= panel->scale;
|
||||
else
|
||||
panel->area.width *= panel->scale;
|
||||
}
|
||||
|
||||
if (panel->area.width + panel->marginx > server.monitors[panel->monitor].width)
|
||||
panel->area.width = server.monitors[panel->monitor].width - panel->marginx;
|
||||
if (panel->area.height + panel->marginy > server.monitors[panel->monitor].height)
|
||||
@@ -481,9 +450,9 @@ gboolean resize_panel(void *obj)
|
||||
if (!taskbar->area.on_screen)
|
||||
continue;
|
||||
if (panel_horizontal)
|
||||
taskbar->area.width = 2 * taskbar->area.paddingxlr * panel->scale;
|
||||
taskbar->area.width = 2 * taskbar->area.paddingxlr;
|
||||
else
|
||||
taskbar->area.height = 2 * taskbar->area.paddingxlr * panel->scale;
|
||||
taskbar->area.height = 2 * taskbar->area.paddingxlr;
|
||||
if (taskbarname_enabled && taskbar->area.children) {
|
||||
Area *name = (Area *)taskbar->area.children->data;
|
||||
if (name->on_screen) {
|
||||
@@ -500,9 +469,9 @@ gboolean resize_panel(void *obj)
|
||||
continue;
|
||||
if (!first_child) {
|
||||
if (panel_horizontal)
|
||||
taskbar->area.width += taskbar->area.paddingx * panel->scale;
|
||||
taskbar->area.width += taskbar->area.paddingx;
|
||||
else
|
||||
taskbar->area.height += taskbar->area.paddingy * panel->scale;
|
||||
taskbar->area.height += taskbar->area.paddingy;
|
||||
}
|
||||
first_child = FALSE;
|
||||
}
|
||||
@@ -525,11 +494,9 @@ gboolean resize_panel(void *obj)
|
||||
}
|
||||
}
|
||||
|
||||
// Distribute the remaining size between taskbars
|
||||
// Distribute the remaining size between tasks
|
||||
if (num_tasks > 0) {
|
||||
int task_size = total_size / num_tasks;
|
||||
if (taskbar_alignment != ALIGN_LEFT)
|
||||
task_size = MIN(task_size, panel_horizontal ? panel_config.g_task.maximum_width : panel_config.g_task.maximum_height);
|
||||
for (int i = 0; i < panel->num_desktops; i++) {
|
||||
Taskbar *taskbar = &panel->taskbar[i];
|
||||
if (!taskbar->area.on_screen)
|
||||
@@ -546,49 +513,6 @@ gboolean resize_panel(void *obj)
|
||||
taskbar->area.height += task_size;
|
||||
}
|
||||
}
|
||||
int slack = total_size - task_size * num_tasks;
|
||||
if (taskbar_alignment == ALIGN_RIGHT) {
|
||||
for (int i = 0; i < panel->num_desktops; i++) {
|
||||
Taskbar *taskbar = &panel->taskbar[i];
|
||||
if (!taskbar->area.on_screen)
|
||||
continue;
|
||||
if (panel_horizontal)
|
||||
taskbar->area.width += slack;
|
||||
else
|
||||
taskbar->area.height += slack;
|
||||
break;
|
||||
}
|
||||
} else if (taskbar_alignment == ALIGN_CENTER) {
|
||||
slack /= 2;
|
||||
Taskbar *left_taskbar = NULL;
|
||||
Taskbar *right_taskbar = NULL;
|
||||
for (int i = 0; i < panel->num_desktops; i++) {
|
||||
Taskbar *taskbar = &panel->taskbar[i];
|
||||
if (!taskbar->area.on_screen)
|
||||
continue;
|
||||
if (panel_horizontal)
|
||||
taskbar->area.width += slack;
|
||||
else
|
||||
taskbar->area.height += slack;
|
||||
taskbar->area.alignment = ALIGN_RIGHT;
|
||||
left_taskbar = taskbar;
|
||||
break;
|
||||
}
|
||||
for (int i = panel->num_desktops - 1; i >= 0; i--) {
|
||||
Taskbar *taskbar = &panel->taskbar[i];
|
||||
if (!taskbar->area.on_screen)
|
||||
continue;
|
||||
if (panel_horizontal)
|
||||
taskbar->area.width += slack;
|
||||
else
|
||||
taskbar->area.height += slack;
|
||||
taskbar->area.alignment = ALIGN_LEFT;
|
||||
right_taskbar = taskbar;
|
||||
break;
|
||||
}
|
||||
if (left_taskbar == right_taskbar)
|
||||
left_taskbar->area.alignment = ALIGN_CENTER;
|
||||
}
|
||||
} else {
|
||||
// No tasks => expand the first visible taskbar
|
||||
for (int i = 0; i < panel->num_desktops; i++) {
|
||||
@@ -613,21 +537,6 @@ gboolean resize_panel(void *obj)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#define STRUT_LEFT 0
|
||||
#define STRUT_RIGHT 1
|
||||
#define STRUT_TOP 2
|
||||
#define STRUT_BOTTOM 3
|
||||
#define STRUT_LEFT_Y1 4
|
||||
#define STRUT_LEFT_Y2 5
|
||||
#define STRUT_RIGHT_Y1 6
|
||||
#define STRUT_RIGHT_Y2 7
|
||||
#define STRUT_TOP_X1 8
|
||||
#define STRUT_TOP_X2 9
|
||||
#define STRUT_BOTTOM_X1 10
|
||||
#define STRUT_BOTTOM_X2 11
|
||||
#define STRUT_COUNT 12
|
||||
#define STRUT_COUNT_OLD 4
|
||||
|
||||
void update_strut(Panel *p)
|
||||
{
|
||||
if (panel_strut_policy == STRUT_NONE) {
|
||||
@@ -642,36 +551,36 @@ void update_strut(Panel *p)
|
||||
int d3;
|
||||
XGetGeometry(server.display, server.root_win, &d2, &d3, &d3, &screen_width, &screen_height, &d1, &d1);
|
||||
Monitor monitor = server.monitors[p->monitor];
|
||||
long struts[STRUT_COUNT] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||
if (panel_horizontal ^ panel_pivot_struts) {
|
||||
long struts[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||
if (panel_horizontal) {
|
||||
int height = p->area.height + p->marginy;
|
||||
if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && panel_autohide && p->is_hidden))
|
||||
height = p->hidden_height;
|
||||
if (panel_position & TOP) {
|
||||
struts[STRUT_TOP] = height + monitor.y;
|
||||
struts[STRUT_TOP_X1] = p->posx;
|
||||
struts[2] = height + monitor.y;
|
||||
struts[8] = p->posx;
|
||||
// p->area.width - 1 allowed full screen on monitor 2
|
||||
struts[STRUT_TOP_X2] = p->posx + p->area.width - 1;
|
||||
struts[9] = p->posx + p->area.width - 1;
|
||||
} else {
|
||||
struts[STRUT_BOTTOM] = height + screen_height - monitor.y - monitor.height;
|
||||
struts[STRUT_BOTTOM_X1] = p->posx;
|
||||
struts[3] = height + screen_height - monitor.y - monitor.height;
|
||||
struts[10] = p->posx;
|
||||
// p->area.width - 1 allowed full screen on monitor 2
|
||||
struts[STRUT_BOTTOM_X2] = p->posx + p->area.width - 1;
|
||||
struts[11] = p->posx + p->area.width - 1;
|
||||
}
|
||||
} else {
|
||||
int width = p->area.width + p->marginx;
|
||||
if (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && panel_autohide && p->is_hidden))
|
||||
width = p->hidden_width;
|
||||
if (panel_position & LEFT) {
|
||||
struts[STRUT_LEFT] = width + monitor.x;
|
||||
struts[STRUT_LEFT_Y1] = p->posy;
|
||||
struts[0] = width + monitor.x;
|
||||
struts[4] = p->posy;
|
||||
// p->area.width - 1 allowed full screen on monitor 2
|
||||
struts[STRUT_LEFT_Y2] = p->posy + p->area.height - 1;
|
||||
struts[5] = p->posy + p->area.height - 1;
|
||||
} else {
|
||||
struts[STRUT_RIGHT] = width + screen_width - monitor.x - monitor.width;
|
||||
struts[STRUT_RIGHT_Y1] = p->posy;
|
||||
struts[1] = width + screen_width - monitor.x - monitor.width;
|
||||
struts[6] = p->posy;
|
||||
// p->area.width - 1 allowed full screen on monitor 2
|
||||
struts[STRUT_RIGHT_Y2] = p->posy + p->area.height - 1;
|
||||
struts[7] = p->posy + p->area.height - 1;
|
||||
}
|
||||
}
|
||||
// Old specification : fluxbox need _NET_WM_STRUT.
|
||||
@@ -682,7 +591,7 @@ void update_strut(Panel *p)
|
||||
32,
|
||||
PropModeReplace,
|
||||
(unsigned char *)&struts,
|
||||
STRUT_COUNT_OLD);
|
||||
4);
|
||||
XChangeProperty(server.display,
|
||||
p->main_win,
|
||||
server.atom._NET_WM_STRUT_PARTIAL,
|
||||
@@ -690,7 +599,7 @@ void update_strut(Panel *p)
|
||||
32,
|
||||
PropModeReplace,
|
||||
(unsigned char *)&struts,
|
||||
STRUT_COUNT);
|
||||
12);
|
||||
}
|
||||
|
||||
void set_panel_items_order(Panel *p)
|
||||
@@ -1112,15 +1021,15 @@ Button *click_button(Panel *panel, int x, int y)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void stop_autohide_timer(Panel *p)
|
||||
void stop_autohide_timeout(Panel *p)
|
||||
{
|
||||
stop_timer(&p->autohide_timer);
|
||||
stop_timeout(p->autohide_timeout);
|
||||
}
|
||||
|
||||
void autohide_show(void *p)
|
||||
{
|
||||
Panel *panel = (Panel *)p;
|
||||
stop_autohide_timer(panel);
|
||||
stop_autohide_timeout(panel);
|
||||
panel->is_hidden = 0;
|
||||
XMapSubwindows(server.display, panel->main_win); // systray windows
|
||||
set_panel_window_geometry(panel);
|
||||
@@ -1132,7 +1041,7 @@ void autohide_show(void *p)
|
||||
void autohide_hide(void *p)
|
||||
{
|
||||
Panel *panel = (Panel *)p;
|
||||
stop_autohide_timer(panel);
|
||||
stop_autohide_timeout(panel);
|
||||
set_panel_layer(panel, panel_layer);
|
||||
panel->is_hidden = TRUE;
|
||||
XUnmapSubwindows(server.display, panel->main_win); // systray windows
|
||||
@@ -1140,27 +1049,26 @@ void autohide_hide(void *p)
|
||||
schedule_panel_redraw();
|
||||
}
|
||||
|
||||
void autohide_trigger_show(Panel *p, bool forced)
|
||||
void autohide_trigger_show(Panel *p)
|
||||
{
|
||||
if (!p)
|
||||
return;
|
||||
change_timer(&p->autohide_timer, true, forced ? 0 : panel_autohide_show_timeout, 0, autohide_show, p);
|
||||
change_timeout(&p->autohide_timeout, panel_autohide_show_timeout, 0, autohide_show, p);
|
||||
}
|
||||
|
||||
void autohide_trigger_hide(Panel *p, bool forced)
|
||||
void autohide_trigger_hide(Panel *p)
|
||||
{
|
||||
if (!p)
|
||||
return;
|
||||
|
||||
if (!forced) {
|
||||
Window root, child;
|
||||
int xr, yr, xw, yw;
|
||||
unsigned int mask;
|
||||
if (XQueryPointer(server.display, p->main_win, &root, &child, &xr, &yr, &xw, &yw, &mask))
|
||||
if (child)
|
||||
return; // mouse over one of the system tray icons
|
||||
}
|
||||
change_timer(&p->autohide_timer, true, forced ? 0 : panel_autohide_hide_timeout, 0, autohide_hide, p);
|
||||
Window root, child;
|
||||
int xr, yr, xw, yw;
|
||||
unsigned int mask;
|
||||
if (XQueryPointer(server.display, p->main_win, &root, &child, &xr, &yr, &xw, &yw, &mask))
|
||||
if (child)
|
||||
return; // mouse over one of the system tray icons
|
||||
|
||||
change_timeout(&p->autohide_timeout, panel_autohide_hide_timeout, 0, autohide_hide, p);
|
||||
}
|
||||
|
||||
void shrink_panel(Panel *panel)
|
||||
|
||||
12
src/panel.h
12
src/panel.h
@@ -69,7 +69,6 @@ typedef enum Strut {
|
||||
extern TaskbarMode taskbar_mode;
|
||||
extern gboolean wm_menu;
|
||||
extern gboolean panel_dock;
|
||||
extern gboolean panel_pivot_struts;
|
||||
extern Layer panel_layer;
|
||||
extern char *panel_window_name;
|
||||
extern PanelPosition panel_position;
|
||||
@@ -96,10 +95,6 @@ extern gboolean debug_fps;
|
||||
extern double tracing_fps_threshold;
|
||||
extern gboolean debug_frames;
|
||||
extern gboolean debug_thumbnails;
|
||||
extern double ui_scale_dpi_ref;
|
||||
extern double ui_scale_monitor_size_ref;
|
||||
extern gboolean thumb_use_shm;
|
||||
extern gboolean debug_blink;
|
||||
|
||||
typedef struct Panel {
|
||||
Area area;
|
||||
@@ -122,7 +117,6 @@ typedef struct Panel {
|
||||
int mouse_pressed_alpha;
|
||||
int mouse_pressed_saturation;
|
||||
int mouse_pressed_brightness;
|
||||
double scale;
|
||||
|
||||
// Per-panel parameters and states for Taskbar and Task
|
||||
GlobalTaskbar g_taskbar;
|
||||
@@ -150,7 +144,7 @@ typedef struct Panel {
|
||||
gboolean is_hidden;
|
||||
int hidden_width, hidden_height;
|
||||
Pixmap hidden_pixmap;
|
||||
Timer autohide_timer;
|
||||
timeout *autohide_timeout;
|
||||
} Panel;
|
||||
|
||||
extern Panel panel_config;
|
||||
@@ -203,8 +197,8 @@ Button *click_button(Panel *panel, int x, int y);
|
||||
|
||||
void autohide_show(void *p);
|
||||
void autohide_hide(void *p);
|
||||
void autohide_trigger_show(Panel *p, bool forced);
|
||||
void autohide_trigger_hide(Panel *p, bool forced);
|
||||
void autohide_trigger_show(Panel *p);
|
||||
void autohide_trigger_hide(Panel *p);
|
||||
|
||||
const char *get_default_font();
|
||||
|
||||
|
||||
@@ -115,33 +115,31 @@ void cleanup_separator()
|
||||
int separator_compute_desired_size(void *obj)
|
||||
{
|
||||
Separator *separator = (Separator *)obj;
|
||||
Panel *panel = (Panel*)separator->area.panel;
|
||||
if (!separator->area.on_screen)
|
||||
return 0;
|
||||
|
||||
if (panel_horizontal)
|
||||
return separator->thickness + 2 * separator->area.paddingxlr * panel->scale + left_right_border_width(&separator->area);
|
||||
return separator->thickness + 2 * separator->area.paddingxlr + left_right_border_width(&separator->area);
|
||||
else
|
||||
return separator->thickness + 2 * separator->area.paddingxlr * panel->scale + 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;
|
||||
Panel *panel = (Panel*)separator->area.panel;
|
||||
if (!separator->area.on_screen)
|
||||
return FALSE;
|
||||
|
||||
if (panel_horizontal) {
|
||||
separator->area.width =
|
||||
separator->thickness + 2 * separator->area.paddingxlr * panel->scale + left_right_border_width(&separator->area);
|
||||
separator->thickness + 2 * separator->area.paddingxlr + left_right_border_width(&separator->area);
|
||||
separator->length =
|
||||
separator->area.height - 2 * separator->area.paddingy * panel->scale - top_bottom_border_width(&separator->area);
|
||||
separator->area.height - 2 * separator->area.paddingy - top_bottom_border_width(&separator->area);
|
||||
} else {
|
||||
separator->area.height =
|
||||
separator->thickness + 2 * separator->area.paddingxlr * panel->scale + top_bottom_border_width(&separator->area);
|
||||
separator->thickness + 2 * separator->area.paddingxlr + top_bottom_border_width(&separator->area);
|
||||
separator->length =
|
||||
separator->area.width - 2 * separator->area.paddingy * panel->scale - left_right_border_width(&separator->area);
|
||||
separator->area.width - 2 * separator->area.paddingy - left_right_border_width(&separator->area);
|
||||
}
|
||||
|
||||
schedule_redraw(&separator->area);
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
**************************************************************************/
|
||||
|
||||
#include <X11/extensions/Xdamage.h>
|
||||
#include <X11/extensions/Xrandr.h>
|
||||
#include <X11/extensions/Xrender.h>
|
||||
#include <X11/extensions/Xrandr.h>
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
@@ -36,9 +36,8 @@
|
||||
|
||||
Server server;
|
||||
|
||||
int server_catch_error(Display *d, XErrorEvent *ev)
|
||||
void server_catch_error(Display *d, XErrorEvent *ev)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void server_init_atoms()
|
||||
@@ -122,9 +121,6 @@ void server_init_atoms()
|
||||
server.atom.XdndActionCopy = XInternAtom(server.display, "XdndActionCopy", False);
|
||||
server.atom.XdndFinished = XInternAtom(server.display, "XdndFinished", False);
|
||||
server.atom.TARGETS = XInternAtom(server.display, "TARGETS", False);
|
||||
|
||||
// tint2 atoms
|
||||
server.atom.TINT2_REFRESH_EXECP = XInternAtom(server.display, "_TINT2_REFRESH_EXECP", False);
|
||||
}
|
||||
|
||||
const char *GetAtomName(Display *disp, Atom a)
|
||||
@@ -315,21 +311,6 @@ void sort_monitors()
|
||||
qsort(server.monitors, server.num_monitors, sizeof(Monitor), compare_monitor_pos);
|
||||
}
|
||||
|
||||
int compute_dpi(XRRCrtcInfo *crtc, XRROutputInfo *output)
|
||||
{
|
||||
double width = output->mm_width;
|
||||
double height = output->mm_height;
|
||||
double x_res = crtc->width;
|
||||
double y_res = crtc->height;
|
||||
|
||||
if (width > 0 && height > 0) {
|
||||
int dpi_x = x_res / width * 25.4;
|
||||
int dpi_y = y_res / height * 25.4;
|
||||
return MAX(dpi_x, dpi_y);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void get_monitors()
|
||||
{
|
||||
if (XineramaIsActive(server.display)) {
|
||||
@@ -358,22 +339,12 @@ void get_monitors()
|
||||
server.monitors[i_monitor].width = crtc_info->width;
|
||||
server.monitors[i_monitor].height = crtc_info->height;
|
||||
server.monitors[i_monitor].names = calloc((crtc_info->noutput + 1), sizeof(gchar *));
|
||||
server.monitors[i_monitor].dpi = 96;
|
||||
for (int j = 0; j < crtc_info->noutput; ++j) {
|
||||
XRROutputInfo *output_info = XRRGetOutputInfo(server.display, res, crtc_info->outputs[j]);
|
||||
fprintf(stderr, "tint2: xRandr: Linking output %s with crtc %d\n", output_info->name, i);
|
||||
server.monitors[i_monitor].names[j] = g_strdup(output_info->name);
|
||||
server.monitors[i_monitor].primary = crtc_info->outputs[j] == primary_output;
|
||||
int dpi = compute_dpi(crtc_info, output_info);
|
||||
if (dpi)
|
||||
server.monitors[i_monitor].dpi = dpi;
|
||||
fprintf(stderr,
|
||||
BLUE "tint2: xRandr: Linking output %s with crtc %d, resolution %dx%d, DPI %d" RESET "\n",
|
||||
output_info->name,
|
||||
i,
|
||||
server.monitors[i_monitor].width,
|
||||
server.monitors[i_monitor].height,
|
||||
server.monitors[i_monitor].dpi);
|
||||
XRRFreeOutputInfo(output_info);
|
||||
server.monitors[i_monitor].primary = crtc_info->outputs[j] == primary_output;
|
||||
}
|
||||
server.monitors[i_monitor].names[crtc_info->noutput] = NULL;
|
||||
XRRFreeCrtcInfo(crtc_info);
|
||||
@@ -386,7 +357,6 @@ void get_monitors()
|
||||
server.monitors[i].width = info[i].width;
|
||||
server.monitors[i].height = info[i].height;
|
||||
server.monitors[i].names = NULL;
|
||||
server.monitors[i].dpi = 96;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -423,7 +393,6 @@ void get_monitors()
|
||||
server.monitors[0].width = DisplayWidth(server.display, server.screen);
|
||||
server.monitors[0].height = DisplayHeight(server.display, server.screen);
|
||||
server.monitors[0].names = 0;
|
||||
server.monitors[0].dpi = 96;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -554,8 +523,7 @@ int get_current_desktop()
|
||||
// fprintf(stderr, "tint2: \n");
|
||||
// fprintf(stderr, "tint2: Work area size: %d x %d\n", work_area_width, work_area_height);
|
||||
// fprintf(stderr, "tint2: Viewport pos: %d x %d\n", viewport_x, viewport_y);
|
||||
// fprintf(stderr, "tint2: Viewport i: %d\n", (viewport_y / work_area_height) * ncols + viewport_x /
|
||||
//work_area_width);
|
||||
// fprintf(stderr, "tint2: Viewport i: %d\n", (viewport_y / work_area_height) * ncols + viewport_x / work_area_width);
|
||||
|
||||
int result = (viewport_y / work_area_height) * ncols + viewport_x / work_area_width;
|
||||
return MAX(0, MIN(server.num_desktops - 1, result));
|
||||
@@ -680,10 +648,9 @@ void handle_crash(const char *reason)
|
||||
#endif
|
||||
}
|
||||
|
||||
int x11_io_error(Display *display)
|
||||
void x11_io_error(Display *display)
|
||||
{
|
||||
handle_crash("X11 I/O error");
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef HAVE_SN
|
||||
@@ -91,7 +91,6 @@ typedef struct Global_atom {
|
||||
Atom XdndActionCopy;
|
||||
Atom XdndFinished;
|
||||
Atom TARGETS;
|
||||
Atom TINT2_REFRESH_EXECP;
|
||||
} Global_atom;
|
||||
|
||||
typedef struct Property {
|
||||
@@ -108,7 +107,6 @@ typedef struct Monitor {
|
||||
int y;
|
||||
int width;
|
||||
int height;
|
||||
int dpi;
|
||||
gboolean primary;
|
||||
gchar **names;
|
||||
} Monitor;
|
||||
@@ -165,12 +163,12 @@ void send_event32(Window win, Atom at, long data1, long data2, long data3);
|
||||
int get_property32(Window win, Atom at, Atom type);
|
||||
void *server_get_property(Window win, Atom at, Atom type, int *num_results);
|
||||
Atom server_get_atom(char *atom_name);
|
||||
int server_catch_error(Display *d, XErrorEvent *ev);
|
||||
void server_catch_error(Display *d, XErrorEvent *ev);
|
||||
void server_init_atoms();
|
||||
void server_init_visual();
|
||||
void server_init_xdamage();
|
||||
|
||||
int x11_io_error(Display *display);
|
||||
void x11_io_error(Display *display);
|
||||
void handle_crash(const char *reason);
|
||||
|
||||
// detect root background
|
||||
@@ -1,11 +1,9 @@
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <glib.h>
|
||||
#ifndef TINT2CONF
|
||||
#ifdef HAVE_SN
|
||||
#include <libsn/sn.h>
|
||||
#endif
|
||||
#endif
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -36,7 +34,6 @@ void reset_signals()
|
||||
sigprocmask(SIG_SETMASK, &signal_set, NULL);
|
||||
}
|
||||
|
||||
#ifndef TINT2CONF
|
||||
void init_signals()
|
||||
{
|
||||
// Set signal handlers
|
||||
@@ -85,6 +82,7 @@ static void sigchld_handler(int sig)
|
||||
int savedErrno = errno;
|
||||
ssize_t unused = write(sigchild_pipe[1], "x", 1);
|
||||
(void)unused;
|
||||
fsync(sigchild_pipe[1]);
|
||||
errno = savedErrno;
|
||||
}
|
||||
|
||||
@@ -166,4 +164,3 @@ int get_signal_pending()
|
||||
{
|
||||
return signal_pending;
|
||||
}
|
||||
#endif
|
||||
@@ -141,12 +141,11 @@ void init_systray_panel(void *p)
|
||||
|
||||
void systray_compute_geometry(int *size)
|
||||
{
|
||||
Panel *panel = (Panel*)systray.area.panel;
|
||||
systray.icon_size = panel_horizontal ? systray.area.height : systray.area.width;
|
||||
systray.icon_size -=
|
||||
MAX(left_right_border_width(&systray.area), top_bottom_border_width(&systray.area)) + 2 * systray.area.paddingy * panel->scale;
|
||||
MAX(left_right_border_width(&systray.area), top_bottom_border_width(&systray.area)) + 2 * systray.area.paddingy;
|
||||
if (systray_max_icon_size > 0)
|
||||
systray.icon_size = MIN(systray.icon_size, systray_max_icon_size * panel->scale);
|
||||
systray.icon_size = MIN(systray.icon_size, systray_max_icon_size);
|
||||
|
||||
int count = 0;
|
||||
for (GSList *l = systray.list_icons; l; l = l->next) {
|
||||
@@ -154,24 +153,24 @@ void systray_compute_geometry(int *size)
|
||||
}
|
||||
|
||||
if (panel_horizontal) {
|
||||
int height = systray.area.height - top_bottom_border_width(&systray.area) - 2 * systray.area.paddingy * panel->scale;
|
||||
int height = systray.area.height - top_bottom_border_width(&systray.area) - 2 * systray.area.paddingy;
|
||||
// here icons_per_column always higher than 0
|
||||
systray.icons_per_column = (height + systray.area.paddingx * panel->scale) / (systray.icon_size + systray.area.paddingx * panel->scale);
|
||||
systray.icons_per_column = (height + systray.area.paddingx) / (systray.icon_size + systray.area.paddingx);
|
||||
systray.margin =
|
||||
height - (systray.icons_per_column - 1) * (systray.icon_size + systray.area.paddingx * panel->scale) - systray.icon_size;
|
||||
height - (systray.icons_per_column - 1) * (systray.icon_size + systray.area.paddingx) - systray.icon_size;
|
||||
systray.icons_per_row = count / systray.icons_per_column + (count % systray.icons_per_column != 0);
|
||||
*size = left_right_border_width(&systray.area) + 2 * systray.area.paddingxlr * panel->scale +
|
||||
(systray.icon_size * systray.icons_per_row) + ((systray.icons_per_row - 1) * systray.area.paddingx * panel->scale);
|
||||
*size = left_right_border_width(&systray.area) + 2 * systray.area.paddingxlr +
|
||||
(systray.icon_size * systray.icons_per_row) + ((systray.icons_per_row - 1) * systray.area.paddingx);
|
||||
} else {
|
||||
int width = systray.area.width - left_right_border_width(&systray.area) - 2 * systray.area.paddingy * panel->scale;
|
||||
int width = systray.area.width - left_right_border_width(&systray.area) - 2 * systray.area.paddingy;
|
||||
// here icons_per_row always higher than 0
|
||||
systray.icons_per_row = (width + systray.area.paddingx * panel->scale) / (systray.icon_size + systray.area.paddingx * panel->scale);
|
||||
systray.icons_per_row = (width + systray.area.paddingx) / (systray.icon_size + systray.area.paddingx);
|
||||
systray.margin =
|
||||
width - (systray.icons_per_row - 1) * (systray.icon_size + systray.area.paddingx * panel->scale) - systray.icon_size;
|
||||
width - (systray.icons_per_row - 1) * (systray.icon_size + systray.area.paddingx) - systray.icon_size;
|
||||
systray.icons_per_column = count / systray.icons_per_row + (count % systray.icons_per_row != 0);
|
||||
*size = top_bottom_border_width(&systray.area) + (2 * systray.area.paddingxlr * panel->scale) +
|
||||
*size = top_bottom_border_width(&systray.area) + (2 * systray.area.paddingxlr) +
|
||||
(systray.icon_size * systray.icons_per_column) +
|
||||
((systray.icons_per_column - 1) * systray.area.paddingx * panel->scale);
|
||||
((systray.icons_per_column - 1) * systray.area.paddingx);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,13 +281,13 @@ void on_change_systray(void *obj)
|
||||
int posx, posy;
|
||||
int start;
|
||||
if (panel_horizontal) {
|
||||
posy = start = top_border_width(&panel->area) + panel->area.paddingy * panel->scale + top_border_width(&systray.area) +
|
||||
systray.area.paddingy * panel->scale + systray.margin / 2;
|
||||
posx = systray.area.posx + left_border_width(&systray.area) + systray.area.paddingxlr * panel->scale;
|
||||
posy = start = top_border_width(&panel->area) + panel->area.paddingy + top_border_width(&systray.area) +
|
||||
systray.area.paddingy + systray.margin / 2;
|
||||
posx = systray.area.posx + left_border_width(&systray.area) + systray.area.paddingxlr;
|
||||
} else {
|
||||
posx = start = left_border_width(&panel->area) + panel->area.paddingy * panel->scale + left_border_width(&systray.area) +
|
||||
systray.area.paddingy * panel->scale + systray.margin / 2;
|
||||
posy = systray.area.posy + top_border_width(&systray.area) + systray.area.paddingxlr * panel->scale;
|
||||
posx = start = left_border_width(&panel->area) + panel->area.paddingy + left_border_width(&systray.area) +
|
||||
systray.area.paddingy + systray.margin / 2;
|
||||
posy = systray.area.posy + top_border_width(&systray.area) + systray.area.paddingxlr;
|
||||
}
|
||||
|
||||
TrayWindow *traywin;
|
||||
@@ -313,17 +312,17 @@ void on_change_systray(void *obj)
|
||||
traywin->height = systray.icon_size;
|
||||
if (panel_horizontal) {
|
||||
if (i % systray.icons_per_column) {
|
||||
posy += systray.icon_size + systray.area.paddingx * panel->scale;
|
||||
posy += systray.icon_size + systray.area.paddingx;
|
||||
} else {
|
||||
posy = start;
|
||||
posx += (systray.icon_size + systray.area.paddingx * panel->scale);
|
||||
posx += (systray.icon_size + systray.area.paddingx);
|
||||
}
|
||||
} else {
|
||||
if (i % systray.icons_per_row) {
|
||||
posx += systray.icon_size + systray.area.paddingx * panel->scale;
|
||||
posx += systray.icon_size + systray.area.paddingx;
|
||||
} else {
|
||||
posx = start;
|
||||
posy += (systray.icon_size + systray.area.paddingx * panel->scale);
|
||||
posy += (systray.icon_size + systray.area.paddingx);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -544,11 +543,11 @@ static gint compare_traywindows(gconstpointer a, gconstpointer b)
|
||||
const TrayWindow *traywin_b = (const TrayWindow *)b;
|
||||
|
||||
#if 0
|
||||
// This breaks pygtk2 StatusIcon with blinking activated
|
||||
if (traywin_a->empty && !traywin_b->empty)
|
||||
return 1 * (systray.sort == SYSTRAY_SORT_RIGHT2LEFT ? -1 : 1);
|
||||
if (!traywin_a->empty && traywin_b->empty)
|
||||
return -1 * (systray.sort == SYSTRAY_SORT_RIGHT2LEFT ? -1 : 1);
|
||||
// This breaks pygtk2 StatusIcon with blinking activated
|
||||
if (traywin_a->empty && !traywin_b->empty)
|
||||
return 1 * (systray.sort == SYSTRAY_SORT_RIGHT2LEFT ? -1 : 1);
|
||||
if (!traywin_a->empty && traywin_b->empty)
|
||||
return -1 * (systray.sort == SYSTRAY_SORT_RIGHT2LEFT ? -1 : 1);
|
||||
#endif
|
||||
|
||||
if (systray.sort == SYSTRAY_SORT_ASCENDING || systray.sort == SYSTRAY_SORT_DESCENDING) {
|
||||
@@ -731,8 +730,6 @@ gboolean add_icon(Window win)
|
||||
traywin->pid = pid;
|
||||
traywin->name = name;
|
||||
traywin->chrono = chrono;
|
||||
INIT_TIMER(traywin->render_timer);
|
||||
INIT_TIMER(traywin->resize_timer);
|
||||
chrono++;
|
||||
|
||||
show(&systray.area);
|
||||
@@ -943,8 +940,8 @@ void remove_icon(TrayWindow *traywin)
|
||||
XDestroyWindow(server.display, traywin->parent);
|
||||
XSync(server.display, False);
|
||||
XSetErrorHandler(old);
|
||||
destroy_timer(&traywin->render_timer);
|
||||
destroy_timer(&traywin->resize_timer);
|
||||
stop_timeout(traywin->render_timeout);
|
||||
stop_timeout(traywin->resize_timeout);
|
||||
free(traywin->name);
|
||||
if (traywin->image) {
|
||||
imlib_context_set_image(traywin->image);
|
||||
@@ -1058,8 +1055,9 @@ void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
|
||||
if (traywin->bad_size_counter < min_bad_resize_events) {
|
||||
systray_resize_icon(traywin);
|
||||
} else {
|
||||
if (!traywin->resize_timer.enabled_)
|
||||
change_timer(&traywin->resize_timer, true, fast_resize_period, 0, systray_resize_icon, traywin);
|
||||
if (!traywin->resize_timeout)
|
||||
traywin->resize_timeout =
|
||||
add_timeout(fast_resize_period, 0, systray_resize_icon, traywin, &traywin->resize_timeout);
|
||||
}
|
||||
} else {
|
||||
if (traywin->bad_size_counter == max_bad_resize_events) {
|
||||
@@ -1073,13 +1071,14 @@ void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
|
||||
// FIXME Normally we should force the icon to resize fill_color to the size we resized it to when we
|
||||
// embedded it.
|
||||
// However this triggers a resize loop in new versions of GTK, which we must avoid.
|
||||
if (!traywin->resize_timer.enabled_)
|
||||
change_timer(&traywin->resize_timer, true, slow_resize_period, 0, systray_resize_icon, traywin);
|
||||
if (!traywin->resize_timeout)
|
||||
traywin->resize_timeout =
|
||||
add_timeout(slow_resize_period, 0, systray_resize_icon, traywin, &traywin->resize_timeout);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
// Correct size
|
||||
stop_timer(&traywin->resize_timer);
|
||||
stop_timeout(traywin->resize_timeout);
|
||||
}
|
||||
|
||||
// Resize and redraw the systray
|
||||
@@ -1136,8 +1135,9 @@ void systray_resize_request_event(TrayWindow *traywin, XEvent *e)
|
||||
if (traywin->bad_size_counter < min_bad_resize_events) {
|
||||
systray_resize_icon(traywin);
|
||||
} else {
|
||||
if (!traywin->resize_timer.enabled_)
|
||||
change_timer(&traywin->resize_timer, true, fast_resize_period, 0, systray_resize_icon, traywin);
|
||||
if (!traywin->resize_timeout)
|
||||
traywin->resize_timeout =
|
||||
add_timeout(fast_resize_period, 0, systray_resize_icon, traywin, &traywin->resize_timeout);
|
||||
}
|
||||
} else {
|
||||
if (traywin->bad_size_counter == max_bad_resize_events) {
|
||||
@@ -1150,13 +1150,14 @@ void systray_resize_request_event(TrayWindow *traywin, XEvent *e)
|
||||
// Delayed resize
|
||||
// FIXME Normally we should force the icon to resize to the size we resized it to when we embedded it.
|
||||
// However this triggers a resize loop in some versions of GTK, which we must avoid.
|
||||
if (!traywin->resize_timer.enabled_)
|
||||
change_timer(&traywin->resize_timer, true, slow_resize_period, 0, systray_resize_icon, traywin);
|
||||
if (!traywin->resize_timeout)
|
||||
traywin->resize_timeout =
|
||||
add_timeout(slow_resize_period, 0, systray_resize_icon, traywin, &traywin->resize_timeout);
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
// Correct size
|
||||
stop_timer(&traywin->resize_timer);
|
||||
stop_timeout(traywin->resize_timeout);
|
||||
}
|
||||
|
||||
// Resize and redraw the systray
|
||||
@@ -1223,7 +1224,8 @@ void systray_render_icon_composited(void *t)
|
||||
if (compare_timespecs(&earliest_render, &now) > 0) {
|
||||
traywin->num_fast_renders++;
|
||||
if (traywin->num_fast_renders > max_fast_refreshes) {
|
||||
change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon_composited, traywin);
|
||||
traywin->render_timeout =
|
||||
add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
|
||||
if (systray_profile)
|
||||
fprintf(stderr,
|
||||
YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
|
||||
@@ -1242,7 +1244,8 @@ void systray_render_icon_composited(void *t)
|
||||
|
||||
if (traywin->width == 0 || traywin->height == 0) {
|
||||
// reschedule rendering since the geometry information has not yet been processed (can happen on slow cpu)
|
||||
change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon_composited, traywin);
|
||||
traywin->render_timeout =
|
||||
add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
|
||||
if (systray_profile)
|
||||
fprintf(stderr,
|
||||
YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
|
||||
@@ -1254,7 +1257,10 @@ void systray_render_icon_composited(void *t)
|
||||
return;
|
||||
}
|
||||
|
||||
stop_timer(&traywin->render_timer);
|
||||
if (traywin->render_timeout) {
|
||||
stop_timeout(traywin->render_timeout);
|
||||
traywin->render_timeout = NULL;
|
||||
}
|
||||
|
||||
// good systray icons support 32 bit depth, but some icons are still 24 bit.
|
||||
// We create a heuristic mask for these icons, i.e. we get the rgb value in the top left corner, and
|
||||
@@ -1417,7 +1423,9 @@ void systray_render_icon(void *t)
|
||||
// __LINE__,
|
||||
// traywin->win,
|
||||
// traywin->name);
|
||||
change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon, traywin);
|
||||
stop_timeout(traywin->render_timeout);
|
||||
traywin->render_timeout =
|
||||
add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1440,13 +1448,19 @@ void systray_render_icon(void *t)
|
||||
unsigned int width, height, depth;
|
||||
Window root;
|
||||
if (!XGetGeometry(server.display, traywin->win, &root, &xpos, &ypos, &width, &height, &border_width, &depth)) {
|
||||
change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon, traywin);
|
||||
stop_timeout(traywin->render_timeout);
|
||||
if (!traywin->render_timeout)
|
||||
traywin->render_timeout =
|
||||
add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
|
||||
systray_render_icon_from_image(traywin);
|
||||
XSetErrorHandler(old);
|
||||
return;
|
||||
} else {
|
||||
if (xpos != 0 || ypos != 0 || width != traywin->width || height != traywin->height) {
|
||||
change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon, traywin);
|
||||
stop_timeout(traywin->render_timeout);
|
||||
if (!traywin->render_timeout)
|
||||
traywin->render_timeout =
|
||||
add_timeout(min_refresh_period, 0, systray_render_icon, traywin, &traywin->render_timeout);
|
||||
systray_render_icon_from_image(traywin);
|
||||
if (systray_profile)
|
||||
fprintf(stderr,
|
||||
|
||||
@@ -56,11 +56,11 @@ typedef struct {
|
||||
// Members used for rendering
|
||||
struct timespec time_last_render;
|
||||
int num_fast_renders;
|
||||
Timer render_timer;
|
||||
timeout *render_timeout;
|
||||
// Members used for resizing
|
||||
int bad_size_counter;
|
||||
struct timespec time_last_resize;
|
||||
Timer resize_timer;
|
||||
timeout *resize_timeout;
|
||||
// Icon contents if we are compositing the icon, otherwise null
|
||||
Imlib_Image image;
|
||||
// XDamage
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "tooltip.h"
|
||||
#include "window.h"
|
||||
|
||||
Timer urgent_timer;
|
||||
timeout *urgent_timeout;
|
||||
GSList *urgent_list;
|
||||
|
||||
void task_dump_geometry(void *obj, int indent);
|
||||
@@ -107,21 +107,6 @@ Task *add_task(Window win)
|
||||
(int)win,
|
||||
task_template.title ? task_template.title : "null");
|
||||
|
||||
// get application name
|
||||
// use res_class property of WM_CLASS as res_name is easily overridable by user
|
||||
XClassHint *classhint = XAllocClassHint();
|
||||
if (classhint && XGetClassHint(server.display, win, classhint))
|
||||
task_template.application = strdup(classhint->res_class);
|
||||
else
|
||||
task_template.application = strdup("Untitled");
|
||||
if (classhint) {
|
||||
if (classhint->res_name)
|
||||
XFree(classhint->res_name);
|
||||
if (classhint->res_class)
|
||||
XFree(classhint->res_class);
|
||||
XFree(classhint);
|
||||
}
|
||||
|
||||
GPtrArray *task_buttons = g_ptr_array_new();
|
||||
for (int j = 0; j < panels[monitor].num_desktops; j++) {
|
||||
if (task_template.desktop != ALL_DESKTOPS && task_template.desktop != j)
|
||||
@@ -147,7 +132,6 @@ Task *add_task(Window win)
|
||||
task_instance->area.on_screen = always_show_all_desktop_tasks;
|
||||
}
|
||||
task_instance->title = task_template.title;
|
||||
task_instance->application = task_template.application;
|
||||
if (panels[monitor].g_task.tooltip_enabled) {
|
||||
task_instance->area._get_tooltip_text = task_get_tooltip;
|
||||
task_instance->area._get_tooltip_image = task_get_thumbnail;
|
||||
@@ -224,14 +208,12 @@ void remove_task(Task *task)
|
||||
|
||||
Window win = task->win;
|
||||
|
||||
// free title, icon and application name just for the first task
|
||||
// free title and icon just for the first task
|
||||
// even with task_on_all_desktop and with task_on_all_panel
|
||||
if (task->title)
|
||||
free(task->title);
|
||||
if (task->thumbnail)
|
||||
cairo_surface_destroy(task->thumbnail);
|
||||
if (task->application)
|
||||
free(task->application);
|
||||
task_remove_icon(task);
|
||||
|
||||
GPtrArray *task_buttons = g_hash_table_lookup(win_to_task, &win);
|
||||
@@ -312,16 +294,10 @@ Imlib_Image task_get_icon(Window win, int icon_size)
|
||||
int w, h;
|
||||
gulong *tmp_data = get_best_icon(data, get_icon_count(data, len), len, &w, &h, icon_size);
|
||||
if (tmp_data) {
|
||||
int array_size = w * h;
|
||||
// imlib needs the array in DATA32 type
|
||||
// using malloc for the array to protect from stack overflow
|
||||
DATA32 *icon_data = (DATA32*) g_try_malloc(sizeof(*icon_data) * array_size);
|
||||
if (icon_data) {
|
||||
for (int j = 0; j < array_size; ++j)
|
||||
icon_data[j] = tmp_data[j];
|
||||
img = imlib_create_image_using_copied_data(w, h, icon_data);
|
||||
g_free(icon_data);
|
||||
}
|
||||
DATA32 icon_data[w * h];
|
||||
for (int j = 0; j < w * h; ++j)
|
||||
icon_data[j] = tmp_data[j];
|
||||
img = imlib_create_image_using_copied_data(w, h, icon_data);
|
||||
}
|
||||
}
|
||||
XFree(data);
|
||||
@@ -405,7 +381,7 @@ void task_update_icon(Task *task)
|
||||
task->icon[k] = adjust_icon(orig_image,
|
||||
panel->g_task.alpha[k],
|
||||
panel->g_task.saturation[k],
|
||||
panel->g_task.brightness[k]);
|
||||
panel->g_task.brightness[k] != 0);
|
||||
if (panel_config.mouse_effects) {
|
||||
task->icon_hover[k] = adjust_icon(task->icon[k],
|
||||
panel_config.mouse_over_alpha,
|
||||
@@ -453,7 +429,7 @@ void draw_task_icon(Task *task, int text_width)
|
||||
else
|
||||
task->_icon_x = (task->area.width - panel->g_task.icon_size1) / 2;
|
||||
} else {
|
||||
task->_icon_x = left_border_width(&task->area) + task->area.paddingxlr * panel->scale;
|
||||
task->_icon_x = left_border_width(&task->area) + task->area.paddingxlr;
|
||||
}
|
||||
|
||||
// Render
|
||||
@@ -483,13 +459,11 @@ void draw_task(void *obj, cairo_t *c)
|
||||
|
||||
task->_text_width = 0;
|
||||
if (panel->g_task.has_text) {
|
||||
PangoContext *context = pango_cairo_create_context(c);
|
||||
pango_cairo_context_set_resolution(context, 96 * panel->scale);
|
||||
PangoLayout *layout = pango_layout_new(context);
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
pango_layout_set_font_description(layout, panel->g_task.font_desc);
|
||||
pango_layout_set_text(layout, task->title, -1);
|
||||
|
||||
pango_layout_set_width(layout, (((Taskbar *)task->area.parent)->text_width + TINT2_PANGO_SLACK) * PANGO_SCALE);
|
||||
pango_layout_set_width(layout, ((Taskbar *)task->area.parent)->text_width * PANGO_SCALE);
|
||||
pango_layout_set_height(layout, panel->g_task.text_height * PANGO_SCALE);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
|
||||
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
|
||||
@@ -503,10 +477,9 @@ void draw_task(void *obj, cairo_t *c)
|
||||
task->_text_posy = (panel->g_task.area.height - task->_text_height) / 2.0;
|
||||
|
||||
Color *config_text = &panel->g_task.font[task->current_state];
|
||||
draw_text(layout, c, panel->g_task.text_posx, task->_text_posy, config_text, panel->font_shadow ? layout : NULL);
|
||||
draw_text(layout, c, panel->g_task.text_posx, task->_text_posy, config_text, panel->font_shadow);
|
||||
|
||||
g_object_unref(layout);
|
||||
g_object_unref(context);
|
||||
}
|
||||
|
||||
if (panel->g_task.has_icon)
|
||||
@@ -559,7 +532,7 @@ int task_compute_desired_size(void *obj)
|
||||
{
|
||||
Task *task = (Task *)obj;
|
||||
Panel *panel = (Panel *)task->area.panel;
|
||||
int size = (panel_horizontal ? panel->g_task.maximum_width : panel->g_task.maximum_height) * panel->scale;
|
||||
int size = panel_horizontal ? panel->g_task.maximum_width : panel->g_task.maximum_height;
|
||||
return size;
|
||||
}
|
||||
|
||||
@@ -679,13 +652,12 @@ void task_refresh_thumbnail(Task *task)
|
||||
return;
|
||||
if (task->current_state == TASK_ICONIFIED)
|
||||
return;
|
||||
Panel *panel = (Panel*)task->area.panel;
|
||||
double now = get_time();
|
||||
if (now - task->thumbnail_last_update < 0.1)
|
||||
return;
|
||||
if (debug_thumbnails)
|
||||
fprintf(stderr, "tint2: thumbnail for window: %s" RESET "\n", task->title ? task->title : "");
|
||||
cairo_surface_t *thumbnail = get_window_thumbnail(task->win, panel_config.g_task.thumbnail_width * panel->scale);
|
||||
cairo_surface_t *thumbnail = get_window_thumbnail(task->win, panel_config.g_task.thumbnail_width);
|
||||
if (!thumbnail)
|
||||
return;
|
||||
if (task->thumbnail)
|
||||
@@ -782,8 +754,8 @@ void blink_urgent(void *arg)
|
||||
GSList *urgent_task = urgent_list;
|
||||
while (urgent_task) {
|
||||
Task *t = urgent_task->data;
|
||||
if (t->urgent_tick <= max_tick_urgent) {
|
||||
if (++t->urgent_tick % 2)
|
||||
if (t->urgent_tick < max_tick_urgent) {
|
||||
if (t->urgent_tick++ % 2)
|
||||
set_task_state(t, TASK_URGENT);
|
||||
else
|
||||
set_task_state(t, window_is_iconified(t->win) ? TASK_ICONIFIED : TASK_NORMAL);
|
||||
@@ -810,8 +782,8 @@ void add_urgent(Task *task)
|
||||
// not yet in the list, so we have to add it
|
||||
urgent_list = g_slist_prepend(urgent_list, task);
|
||||
|
||||
if (!urgent_timer.enabled_)
|
||||
change_timer(&urgent_timer, true, 10, 1000, blink_urgent, 0);
|
||||
if (!urgent_timeout)
|
||||
urgent_timeout = add_timeout(10, 1000, blink_urgent, 0, &urgent_timeout);
|
||||
|
||||
Panel *panel = task->area.panel;
|
||||
if (panel->is_hidden)
|
||||
@@ -821,8 +793,10 @@ void add_urgent(Task *task)
|
||||
void del_urgent(Task *task)
|
||||
{
|
||||
urgent_list = g_slist_remove(urgent_list, task);
|
||||
if (!urgent_list)
|
||||
stop_timer(&urgent_timer);
|
||||
if (!urgent_list) {
|
||||
stop_timeout(urgent_timeout);
|
||||
urgent_timeout = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void task_handle_mouse_event(Task *task, MouseAction action)
|
||||
|
||||
@@ -68,7 +68,6 @@ typedef struct Task {
|
||||
Color icon_color_hover;
|
||||
Color icon_color_press;
|
||||
char *title;
|
||||
char *application;
|
||||
int urgent_tick;
|
||||
// These may not be up-to-date
|
||||
int win_x;
|
||||
@@ -85,7 +84,7 @@ typedef struct Task {
|
||||
double thumbnail_last_update;
|
||||
} Task;
|
||||
|
||||
extern Timer urgent_timer;
|
||||
extern timeout *urgent_timeout;
|
||||
extern GSList *urgent_list;
|
||||
|
||||
Task *add_task(Window win);
|
||||
|
||||
@@ -47,9 +47,9 @@ gboolean hide_taskbar_if_empty;
|
||||
gboolean always_show_all_desktop_tasks;
|
||||
TaskbarSortMethod taskbar_sort_method;
|
||||
Alignment taskbar_alignment;
|
||||
static Timer thumbnail_update_timer_all;
|
||||
static Timer thumbnail_update_timer_active;
|
||||
static Timer thumbnail_update_timer_tooltip;
|
||||
static timeout *thumbnail_update_timer_all;
|
||||
static timeout *thumbnail_update_timer_active;
|
||||
static timeout *thumbnail_update_timer_tooltip;
|
||||
|
||||
static GList *taskbar_task_orderings = NULL;
|
||||
static GList *taskbar_thumbnail_jobs_done = NULL;
|
||||
@@ -80,6 +80,7 @@ void free_ptr_array(gpointer data)
|
||||
void default_taskbar()
|
||||
{
|
||||
win_to_task = NULL;
|
||||
urgent_timeout = NULL;
|
||||
urgent_list = NULL;
|
||||
taskbar_enabled = FALSE;
|
||||
taskbar_distribute_size = FALSE;
|
||||
@@ -88,6 +89,9 @@ void default_taskbar()
|
||||
hide_task_diff_monitor = FALSE;
|
||||
hide_taskbar_if_empty = FALSE;
|
||||
always_show_all_desktop_tasks = FALSE;
|
||||
thumbnail_update_timer_all = NULL;
|
||||
thumbnail_update_timer_active = NULL;
|
||||
thumbnail_update_timer_tooltip = NULL;
|
||||
taskbar_thumbnail_jobs_done = NULL;
|
||||
taskbar_sort_method = TASKBAR_NOSORT;
|
||||
taskbar_alignment = ALIGN_LEFT;
|
||||
@@ -130,9 +134,9 @@ void taskbar_save_orderings()
|
||||
|
||||
void cleanup_taskbar()
|
||||
{
|
||||
destroy_timer(&thumbnail_update_timer_all);
|
||||
destroy_timer(&thumbnail_update_timer_active);
|
||||
destroy_timer(&thumbnail_update_timer_tooltip);
|
||||
stop_timeout(thumbnail_update_timer_all);
|
||||
stop_timeout(thumbnail_update_timer_active);
|
||||
stop_timeout(thumbnail_update_timer_tooltip);
|
||||
g_list_free(taskbar_thumbnail_jobs_done);
|
||||
taskbar_save_orderings();
|
||||
if (win_to_task) {
|
||||
@@ -166,7 +170,7 @@ void cleanup_taskbar()
|
||||
g_slist_free(urgent_list);
|
||||
urgent_list = NULL;
|
||||
|
||||
destroy_timer(&urgent_timer);
|
||||
stop_timeout(urgent_timeout);
|
||||
|
||||
for (int state = 0; state < TASK_STATE_COUNT; state++) {
|
||||
g_list_free(panel_config.g_task.gradient[state]);
|
||||
@@ -180,11 +184,6 @@ void cleanup_taskbar()
|
||||
|
||||
void init_taskbar()
|
||||
{
|
||||
INIT_TIMER(urgent_timer);
|
||||
INIT_TIMER(thumbnail_update_timer_all);
|
||||
INIT_TIMER(thumbnail_update_timer_active);
|
||||
INIT_TIMER(thumbnail_update_timer_tooltip);
|
||||
|
||||
if (!panel_config.g_task.has_text && !panel_config.g_task.has_icon) {
|
||||
panel_config.g_task.has_text = panel_config.g_task.has_icon = 1;
|
||||
}
|
||||
@@ -238,15 +237,15 @@ void init_taskbar_panel(void *p)
|
||||
panel->g_taskbar.area.resize_needed = 1;
|
||||
panel->g_taskbar.area.on_screen = TRUE;
|
||||
if (panel_horizontal) {
|
||||
panel->g_taskbar.area.posy = top_border_width(&panel->area) + panel->area.paddingy * panel->scale;
|
||||
panel->g_taskbar.area.posy = top_border_width(&panel->area) + panel->area.paddingy;
|
||||
panel->g_taskbar.area.height =
|
||||
panel->area.height - top_bottom_border_width(&panel->area) - 2 * panel->area.paddingy * panel->scale;
|
||||
panel->area.height - top_bottom_border_width(&panel->area) - 2 * panel->area.paddingy;
|
||||
panel->g_taskbar.area_name.posy = panel->g_taskbar.area.posy;
|
||||
panel->g_taskbar.area_name.height = panel->g_taskbar.area.height;
|
||||
} else {
|
||||
panel->g_taskbar.area.posx = left_border_width(&panel->area) + panel->area.paddingy * panel->scale;
|
||||
panel->g_taskbar.area.posx = left_border_width(&panel->area) + panel->area.paddingy;
|
||||
panel->g_taskbar.area.width =
|
||||
panel->area.width - left_right_border_width(&panel->area) - 2 * panel->area.paddingy * panel->scale;
|
||||
panel->area.width - left_right_border_width(&panel->area) - 2 * panel->area.paddingy;
|
||||
panel->g_taskbar.area_name.posx = panel->g_taskbar.area.posx;
|
||||
panel->g_taskbar.area_name.width = panel->g_taskbar.area.width;
|
||||
}
|
||||
@@ -304,19 +303,19 @@ void init_taskbar_panel(void *p)
|
||||
if (panel_horizontal) {
|
||||
panel->g_task.area.posy = panel->g_taskbar.area.posy +
|
||||
top_bg_border_width(panel->g_taskbar.background[TASKBAR_NORMAL]) +
|
||||
panel->g_taskbar.area.paddingy * panel->scale;
|
||||
panel->g_taskbar.area.paddingy;
|
||||
panel->g_task.area.width = panel->g_task.maximum_width;
|
||||
panel->g_task.area.height = panel->g_taskbar.area.height -
|
||||
top_bottom_bg_border_width(panel->g_taskbar.background[TASKBAR_NORMAL]) -
|
||||
2 * panel->g_taskbar.area.paddingy * panel->scale;
|
||||
2 * panel->g_taskbar.area.paddingy;
|
||||
} else {
|
||||
panel->g_task.area.posx = panel->g_taskbar.area.posx +
|
||||
left_bg_border_width(panel->g_taskbar.background[TASKBAR_NORMAL]) +
|
||||
panel->g_taskbar.area.paddingy * panel->scale;
|
||||
panel->g_taskbar.area.paddingy;
|
||||
panel->g_task.area.width = panel->g_taskbar.area.width -
|
||||
left_right_bg_border_width(panel->g_taskbar.background[TASKBAR_NORMAL]) -
|
||||
2 * panel->g_taskbar.area.paddingy * panel->scale;
|
||||
panel->g_task.area.height = panel->g_task.maximum_height * panel->scale;
|
||||
2 * panel->g_taskbar.area.paddingy;
|
||||
panel->g_task.area.height = panel->g_task.maximum_height;
|
||||
}
|
||||
|
||||
for (int j = 0; j < TASK_STATE_COUNT; ++j) {
|
||||
@@ -333,8 +332,9 @@ void init_taskbar_panel(void *p)
|
||||
}
|
||||
|
||||
// compute vertical position : text and icon
|
||||
int height, width;
|
||||
int height_ink, height, width;
|
||||
get_text_size2(panel->g_task.font_desc,
|
||||
&height_ink,
|
||||
&height,
|
||||
&width,
|
||||
panel->area.height,
|
||||
@@ -343,19 +343,17 @@ void init_taskbar_panel(void *p)
|
||||
5,
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_END,
|
||||
panel->g_task.centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT,
|
||||
FALSE,
|
||||
panel->scale);
|
||||
FALSE);
|
||||
|
||||
panel->g_task.text_posx = left_bg_border_width(panel->g_task.background[0]) + panel->g_task.area.paddingxlr * panel->scale;
|
||||
panel->g_task.text_posx = left_bg_border_width(panel->g_task.background[0]) + panel->g_task.area.paddingxlr;
|
||||
panel->g_task.text_height =
|
||||
panel->g_task.area.height - (2 * panel->g_task.area.paddingy * panel->scale) - top_bottom_border_width(&panel->g_task.area);
|
||||
panel->g_task.area.height - (2 * panel->g_task.area.paddingy) - top_bottom_border_width(&panel->g_task.area);
|
||||
if (panel->g_task.has_icon) {
|
||||
panel->g_task.icon_size1 = MIN(MIN(panel->g_task.maximum_width * panel->scale, panel->g_task.maximum_height * panel->scale),
|
||||
panel->g_task.icon_size1 = MIN(MIN(panel->g_task.maximum_width, panel->g_task.maximum_height),
|
||||
MIN(panel->g_task.area.width, panel->g_task.area.height)) -
|
||||
2 * panel->g_task.area.paddingy * panel->scale - MAX(left_right_border_width(&panel->g_task.area),
|
||||
2 * panel->g_task.area.paddingy - MAX(left_right_border_width(&panel->g_task.area),
|
||||
top_bottom_border_width(&panel->g_task.area));
|
||||
panel->g_task.text_posx += panel->g_task.icon_size1 + panel->g_task.area.paddingx * panel->scale;
|
||||
panel->g_task.text_posx += panel->g_task.icon_size1 + panel->g_task.area.paddingx;
|
||||
panel->g_task.icon_posy = (panel->g_task.area.height - panel->g_task.icon_size1) / 2;
|
||||
}
|
||||
|
||||
@@ -386,13 +384,12 @@ void taskbar_start_thumbnail_timer(ThumbnailUpdateMode mode)
|
||||
return;
|
||||
if (debug_thumbnails)
|
||||
fprintf(stderr, BLUE "tint2: taskbar_start_thumbnail_timer %s" RESET "\n", mode == THUMB_MODE_ACTIVE_WINDOW ? "active" : mode == THUMB_MODE_TOOLTIP_WINDOW ? "tooltip" : "all");
|
||||
change_timer(mode == THUMB_MODE_ALL ? &thumbnail_update_timer_all :
|
||||
change_timeout(mode == THUMB_MODE_ALL ? &thumbnail_update_timer_all :
|
||||
mode == THUMB_MODE_ACTIVE_WINDOW ? &thumbnail_update_timer_active : &thumbnail_update_timer_tooltip,
|
||||
true,
|
||||
mode == THUMB_MODE_TOOLTIP_WINDOW ? 1000 : 500,
|
||||
mode == THUMB_MODE_ALL ? 10 * 1000 : 0,
|
||||
taskbar_update_thumbnails,
|
||||
(void *)(long)mode);
|
||||
mode == THUMB_MODE_TOOLTIP_WINDOW ? 1000 : 500,
|
||||
mode == THUMB_MODE_ALL ? 10 * 1000 : 0,
|
||||
taskbar_update_thumbnails,
|
||||
(void *)(long)mode);
|
||||
}
|
||||
|
||||
void taskbar_init_fonts()
|
||||
@@ -574,12 +571,12 @@ gboolean resize_taskbar(void *obj)
|
||||
}
|
||||
}
|
||||
taskbar->text_width = text_width - panel->g_task.text_posx - right_border_width(&panel->g_task.area) -
|
||||
panel->g_task.area.paddingxlr * panel->scale;
|
||||
panel->g_task.area.paddingxlr;
|
||||
} else {
|
||||
relayout_with_constraint(&taskbar->area, panel->g_task.maximum_height * panel->scale);
|
||||
relayout_with_constraint(&taskbar->area, panel->g_task.maximum_height);
|
||||
|
||||
taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy * panel->scale) - panel->g_task.text_posx -
|
||||
right_border_width(&panel->g_task.area) - panel->g_task.area.paddingxlr * panel->scale;
|
||||
taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx -
|
||||
right_border_width(&panel->g_task.area) - panel->g_task.area.paddingxlr;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
@@ -735,14 +732,6 @@ gint compare_task_titles(Task *a, Task *b, Taskbar *taskbar)
|
||||
return strnatcasecmp(a->title ? a->title : "", b->title ? b->title : "");
|
||||
}
|
||||
|
||||
gint compare_task_applications(Task *a, Task *b, Taskbar *taskbar)
|
||||
{
|
||||
int trivial = compare_tasks_trivial(a, b, taskbar);
|
||||
if (trivial != NONTRIVIAL)
|
||||
return trivial;
|
||||
return strnatcasecmp(a->application ? a->application : "", b->application ? b->application : "");
|
||||
}
|
||||
|
||||
gint compare_tasks(Task *a, Task *b, Taskbar *taskbar)
|
||||
{
|
||||
int trivial = compare_tasks_trivial(a, b, taskbar);
|
||||
@@ -754,8 +743,6 @@ gint compare_tasks(Task *a, Task *b, Taskbar *taskbar)
|
||||
return compare_task_centers(a, b, taskbar);
|
||||
} else if (taskbar_sort_method == TASKBAR_SORT_TITLE) {
|
||||
return compare_task_titles(a, b, taskbar);
|
||||
} else if (taskbar_sort_method == TASKBAR_SORT_APPLICATION) {
|
||||
return compare_task_applications(a, b, taskbar);
|
||||
} else if (taskbar_sort_method == TASKBAR_SORT_LRU) {
|
||||
return compare_timespecs(&a->last_activation_time, &b->last_activation_time);
|
||||
} else if (taskbar_sort_method == TASKBAR_SORT_MRU) {
|
||||
@@ -845,8 +832,7 @@ void taskbar_update_thumbnails(void *arg)
|
||||
c;
|
||||
c = c->next) {
|
||||
Task *t = (Task *)c->data;
|
||||
if ((mode == THUMB_MODE_ALL && t->current_state == TASK_ACTIVE && !g_list_find(taskbar_thumbnail_jobs_done, t)) ||
|
||||
(mode == THUMB_MODE_ACTIVE_WINDOW && t->current_state == TASK_ACTIVE) ||
|
||||
if ((mode == THUMB_MODE_ALL && t->current_state == TASK_ACTIVE && !g_list_find(taskbar_thumbnail_jobs_done, t)) || (mode == THUMB_MODE_ACTIVE_WINDOW && t->current_state == TASK_ACTIVE) ||
|
||||
(mode == THUMB_MODE_TOOLTIP_WINDOW && g_tooltip.mapped && g_tooltip.area == &t->area)) {
|
||||
task_refresh_thumbnail(t);
|
||||
if (mode == THUMB_MODE_ALL)
|
||||
@@ -858,7 +844,7 @@ void taskbar_update_thumbnails(void *arg)
|
||||
if (mode == THUMB_MODE_ALL) {
|
||||
double now = get_time();
|
||||
if (now - start_time > 0.030) {
|
||||
change_timer(&thumbnail_update_timer_all, true, 50, 10 * 1000, taskbar_update_thumbnails, arg);
|
||||
change_timeout(&thumbnail_update_timer_all, 50, 10 * 1000, taskbar_update_thumbnails, arg);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -869,7 +855,7 @@ void taskbar_update_thumbnails(void *arg)
|
||||
if (taskbar_thumbnail_jobs_done) {
|
||||
g_list_free(taskbar_thumbnail_jobs_done);
|
||||
taskbar_thumbnail_jobs_done = NULL;
|
||||
change_timer(&thumbnail_update_timer_all, true, 10 * 1000, 10 * 1000, taskbar_update_thumbnails, arg);
|
||||
change_timeout(&thumbnail_update_timer_all, 10 * 1000, 10 * 1000, taskbar_update_thumbnails, arg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,6 @@ typedef enum TaskbarSortMethod {
|
||||
TASKBAR_NOSORT = 0,
|
||||
TASKBAR_SORT_CENTER,
|
||||
TASKBAR_SORT_TITLE,
|
||||
TASKBAR_SORT_APPLICATION,
|
||||
TASKBAR_SORT_LRU,
|
||||
TASKBAR_SORT_MRU,
|
||||
} TaskbarSortMethod;
|
||||
|
||||
@@ -134,8 +134,9 @@ int taskbarname_compute_desired_size(void *obj)
|
||||
{
|
||||
TaskbarName *taskbar_name = (TaskbarName *)obj;
|
||||
Panel *panel = (Panel *)taskbar_name->area.panel;
|
||||
int name_height, name_width;
|
||||
int name_height, name_width, name_height_ink;
|
||||
get_text_size2(panel_config.taskbarname_font_desc,
|
||||
&name_height_ink,
|
||||
&name_height,
|
||||
&name_width,
|
||||
panel->area.height,
|
||||
@@ -144,14 +145,12 @@ int taskbarname_compute_desired_size(void *obj)
|
||||
strlen(taskbar_name->name),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
PANGO_ALIGN_CENTER,
|
||||
FALSE,
|
||||
panel->scale);
|
||||
FALSE);
|
||||
|
||||
if (panel_horizontal) {
|
||||
return name_width + 2 * taskbar_name->area.paddingxlr * panel->scale + left_right_border_width(&taskbar_name->area);
|
||||
return name_width + 2 * taskbar_name->area.paddingxlr + left_right_border_width(&taskbar_name->area);
|
||||
} else {
|
||||
return name_height + 2 * taskbar_name->area.paddingxlr * panel->scale + top_bottom_border_width(&taskbar_name->area);
|
||||
return name_height + 2 * taskbar_name->area.paddingxlr + top_bottom_border_width(&taskbar_name->area);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,8 +161,9 @@ gboolean resize_taskbarname(void *obj)
|
||||
|
||||
schedule_redraw(&taskbar_name->area);
|
||||
|
||||
int name_height, name_width;
|
||||
int name_height, name_width, name_height_ink;
|
||||
get_text_size2(panel_config.taskbarname_font_desc,
|
||||
&name_height_ink,
|
||||
&name_height,
|
||||
&name_width,
|
||||
panel->area.height,
|
||||
@@ -172,9 +172,7 @@ gboolean resize_taskbarname(void *obj)
|
||||
strlen(taskbar_name->name),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
PANGO_ALIGN_CENTER,
|
||||
FALSE,
|
||||
panel->scale);
|
||||
FALSE);
|
||||
|
||||
gboolean result = FALSE;
|
||||
int new_size = taskbarname_compute_desired_size(obj);
|
||||
@@ -197,14 +195,11 @@ gboolean resize_taskbarname(void *obj)
|
||||
void draw_taskbarname(void *obj, cairo_t *c)
|
||||
{
|
||||
TaskbarName *taskbar_name = obj;
|
||||
Panel *panel = (Panel *)taskbar_name->area.panel;
|
||||
Taskbar *taskbar = taskbar_name->area.parent;
|
||||
Color *config_text = (taskbar->desktop == server.desktop) ? &taskbarname_active_font : &taskbarname_font;
|
||||
|
||||
// draw content
|
||||
PangoContext *context = pango_cairo_create_context(c);
|
||||
pango_cairo_context_set_resolution(context, 96 * panel->scale);
|
||||
PangoLayout *layout = pango_layout_new(context);
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
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_alignment(layout, PANGO_ALIGN_CENTER);
|
||||
@@ -215,10 +210,9 @@ void draw_taskbarname(void *obj, cairo_t *c)
|
||||
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);
|
||||
draw_text(layout, c, 0, taskbar_name->posy, config_text, ((Panel *)taskbar_name->area.panel)->font_shadow ? layout : NULL);
|
||||
draw_text(layout, c, 0, taskbar_name->posy, config_text, ((Panel *)taskbar_name->area.panel)->font_shadow);
|
||||
|
||||
g_object_unref(layout);
|
||||
g_object_unref(context);
|
||||
}
|
||||
|
||||
void update_desktop_names()
|
||||
|
||||
@@ -1,152 +0,0 @@
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
static Display *display = 0;
|
||||
|
||||
/* From wmctrl */
|
||||
char *get_property(Window window, Atom xa_prop_type, const char *prop_name) {
|
||||
Atom xa_prop_name = XInternAtom(display, prop_name, False);
|
||||
|
||||
Atom xa_ret_type;
|
||||
int ret_format;
|
||||
unsigned long ret_nitems;
|
||||
unsigned long ret_bytes_after;
|
||||
unsigned long tmp_size;
|
||||
unsigned char *ret_prop;
|
||||
if (XGetWindowProperty(display, window, xa_prop_name, 0, 1024,
|
||||
False, xa_prop_type, &xa_ret_type, &ret_format,
|
||||
&ret_nitems, &ret_bytes_after, &ret_prop) != Success) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (xa_ret_type != xa_prop_type) {
|
||||
XFree(ret_prop);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Correct 64 Architecture implementation of 32 bit data */
|
||||
tmp_size = (ret_format / 8) * ret_nitems;
|
||||
if (ret_format == 32)
|
||||
tmp_size *= sizeof(long) / 4;
|
||||
|
||||
char *ret = (char *)calloc(1, tmp_size + 1);
|
||||
memcpy(ret, ret_prop, tmp_size);
|
||||
|
||||
XFree(ret_prop);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int is_tint2(Window window)
|
||||
{
|
||||
XWindowAttributes attr = {};
|
||||
if (!XGetWindowAttributes(display, window, &attr))
|
||||
return 0;
|
||||
if (attr.map_state != IsViewable)
|
||||
return 0;
|
||||
|
||||
char *wm_class = get_property(window, XA_STRING, "WM_NAME");
|
||||
if (!wm_class) {
|
||||
return 0;
|
||||
}
|
||||
int class_match = 0;
|
||||
if (strcmp(wm_class, "tint2") == 0) {
|
||||
class_match = 1;
|
||||
}
|
||||
free(wm_class);
|
||||
return class_match;
|
||||
}
|
||||
|
||||
void handle_tint2_window(Window window, char *action, char **args)
|
||||
{
|
||||
if (!is_tint2(window))
|
||||
return;
|
||||
if (strcmp(action, "show") == 0) {
|
||||
fprintf(stderr, "Showing tint2 window: %lx\n", window);
|
||||
XEvent event = {};
|
||||
event.xcrossing.type = EnterNotify;
|
||||
event.xcrossing.window = window;
|
||||
event.xcrossing.mode = NotifyNormal;
|
||||
event.xcrossing.detail = NotifyVirtual;
|
||||
event.xcrossing.same_screen = True;
|
||||
XSendEvent(display, window, False, 0, &event);
|
||||
XFlush(display);
|
||||
} else if (strcmp(action, "hide") == 0) {
|
||||
fprintf(stderr, "Hiding tint2 window: %lx\n", window);
|
||||
XEvent event = {};
|
||||
event.xcrossing.type = LeaveNotify;
|
||||
event.xcrossing.window = window;
|
||||
event.xcrossing.mode = NotifyNormal;
|
||||
event.xcrossing.detail = NotifyVirtual;
|
||||
event.xcrossing.same_screen = True;
|
||||
XSendEvent(display, window, False, 0, &event);
|
||||
XFlush(display);
|
||||
} else if (strcmp(action, "refresh-execp") == 0) {
|
||||
XEvent event = {};
|
||||
char *name = args[0];
|
||||
if (!name) {
|
||||
fprintf(stderr, "Error: missing execp name\n");
|
||||
return;
|
||||
}
|
||||
if (!name[0]) {
|
||||
fprintf(stderr, "Error: empty execp name\n");
|
||||
return;
|
||||
}
|
||||
if (strlen(name) > sizeof(event.xclient.data.b)) {
|
||||
fprintf(stderr, "Error: execp name too long\n");
|
||||
return;
|
||||
}
|
||||
fprintf(stderr, "Refreshing execp '%s' for window: %lx\n", name, window);
|
||||
event.xclient.type = ClientMessage;
|
||||
event.xclient.window = window;
|
||||
event.xclient.send_event = True;
|
||||
event.xclient.message_type = XInternAtom(display, "_TINT2_REFRESH_EXECP", False);
|
||||
event.xclient.format = 8;
|
||||
strncpy(event.xclient.data.b, name, sizeof(event.xclient.data.b));
|
||||
XSendEvent(display, window, False, 0, &event);
|
||||
XFlush(display);
|
||||
} else {
|
||||
fprintf(stderr, "Error: unknown action %s\n", action);
|
||||
}
|
||||
}
|
||||
|
||||
typedef void window_callback_t(Window window, char *action, char **args);
|
||||
|
||||
void walk_windows(Window node, window_callback_t *callback, char *action, char **args)
|
||||
{
|
||||
callback(node, action, args);
|
||||
Window root = 0;
|
||||
Window parent = 0;
|
||||
Window *children = 0;
|
||||
unsigned int nchildren = 0;
|
||||
if (!XQueryTree(display, node,
|
||||
&root, &parent, &children, &nchildren)) {
|
||||
return;
|
||||
}
|
||||
for (unsigned int i = 0; i < nchildren; i++) {
|
||||
walk_windows(children[i], callback, action, args);
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
display = XOpenDisplay(NULL);
|
||||
if (!display ) {
|
||||
fprintf(stderr, "Failed to open X11 connection\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
argc--, argv++;
|
||||
if (!argc) {
|
||||
fprintf(stderr, "Usage: tint2-show [show|hide|refresh-execp]\n");
|
||||
exit(1);
|
||||
}
|
||||
char *action = argv[0];
|
||||
char **args = argv + 1;
|
||||
walk_windows(DefaultRootWindow(display), handle_tint2_window, action, args);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -7,7 +7,7 @@ pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
|
||||
pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )
|
||||
pkg_check_modules( IMLIB2 REQUIRED imlib2 )
|
||||
pkg_check_modules( GTHREAD2 REQUIRED gthread-2.0 )
|
||||
pkg_check_modules( GTK3 REQUIRED gtk+-x11-3.0 )
|
||||
pkg_check_modules( GTK2 REQUIRED gtk+-x11-2.0 )
|
||||
pkg_check_modules( RSVG librsvg-2.0>=2.36.0 )
|
||||
|
||||
include_directories( ../util
|
||||
@@ -16,20 +16,15 @@ include_directories( ../util
|
||||
${GOBJECT2_INCLUDE_DIRS}
|
||||
${IMLIB2_INCLUDE_DIRS}
|
||||
${GTHREAD2_INCLUDE_DIRS}
|
||||
${GTK3_INCLUDE_DIRS}
|
||||
${GTK2_INCLUDE_DIRS}
|
||||
${RSVG_INCLUDE_DIRS} )
|
||||
|
||||
set(SOURCES ../util/common.c
|
||||
../util/bt.c
|
||||
../util/strnatcmp.c
|
||||
../util/cache.c
|
||||
../util/timer.c
|
||||
../util/test.c
|
||||
../util/print.c
|
||||
../util/signals.c
|
||||
../config.c
|
||||
../util/server.c
|
||||
../util/strlcat.c
|
||||
../server.c
|
||||
../launcher/apps-common.c
|
||||
../launcher/icon-theme-common.c
|
||||
md4.c
|
||||
@@ -55,7 +50,7 @@ link_directories( ${X11_T2C_LIBRARY_DIRS}
|
||||
${GOBJECT2_LIBRARY_DIRS}
|
||||
${IMLIB2_LIBRARY_DIRS}
|
||||
${GTHREAD2_LIBRARY_DIRS}
|
||||
${GTK3_LIBRARY_DIRS}
|
||||
${GTK2_LIBRARY_DIRS}
|
||||
${RSVG_LIBRARY_DIRS} )
|
||||
add_executable( tint2conf ${SOURCES} )
|
||||
target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}
|
||||
@@ -63,14 +58,13 @@ target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}
|
||||
${GOBJECT2_LIBRARIES}
|
||||
${IMLIB2_LIBRARIES}
|
||||
${GTHREAD2_LIBRARIES}
|
||||
${GTK3_LIBRARIES}
|
||||
${GTK2_LIBRARIES}
|
||||
${RSVG_LIBRARIES} )
|
||||
|
||||
add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
|
||||
add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_FULL_LOCALEDIR}\" )
|
||||
add_definitions( -DGETTEXT_PACKAGE=\"tint2conf\" )
|
||||
add_definitions( -DDGLIB_DISABLE_DEPRECATION_WARNINGS=1 )
|
||||
set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=c99 -Werror-implicit-function-declaration -Wno-deprecated -Wno-deprecated-declarations" )
|
||||
set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread -std=c99" )
|
||||
set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )
|
||||
|
||||
add_subdirectory(po)
|
||||
|
||||
@@ -95,7 +95,7 @@ void create_background(GtkWidget *parent)
|
||||
backgrounds = gtk_list_store_new(bgNumCols,
|
||||
GDK_TYPE_PIXBUF,
|
||||
GDK_TYPE_COLOR,
|
||||
GTK_TYPE_SHADOW_TYPE,
|
||||
GTK_TYPE_INT,
|
||||
GDK_TYPE_COLOR,
|
||||
GTK_TYPE_INT,
|
||||
GTK_TYPE_INT,
|
||||
@@ -121,6 +121,7 @@ void create_background(GtkWidget *parent)
|
||||
|
||||
GtkWidget *table, *label, *button;
|
||||
int row, col;
|
||||
GtkTooltips *tooltips = gtk_tooltips_new();
|
||||
|
||||
table = gtk_table_new(1, 4, FALSE);
|
||||
gtk_widget_show(table);
|
||||
@@ -140,21 +141,21 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(current_background);
|
||||
gtk_table_attach(GTK_TABLE(table), current_background, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(current_background, _("Selects the background you would like to modify"));
|
||||
gtk_tooltips_set_tip(tooltips, current_background, _("Selects the background you would like to modify"), NULL);
|
||||
|
||||
button = gtk_button_new_from_stock("gtk-add");
|
||||
g_signal_connect(button, "clicked", G_CALLBACK(background_duplicate), NULL);
|
||||
gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(background_duplicate), NULL);
|
||||
gtk_widget_show(button);
|
||||
gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(button, _("Creates a copy of the current background"));
|
||||
gtk_tooltips_set_tip(tooltips, button, _("Creates a copy of the current background"), NULL);
|
||||
|
||||
button = gtk_button_new_from_stock("gtk-remove");
|
||||
g_signal_connect(button, "clicked", G_CALLBACK(background_delete), NULL);
|
||||
gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(background_delete), NULL);
|
||||
gtk_widget_show(button);
|
||||
gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(button, _("Deletes the current background"));
|
||||
gtk_tooltips_set_tip(tooltips, button, _("Deletes the current background"), NULL);
|
||||
|
||||
table = gtk_table_new(4, 4, FALSE);
|
||||
gtk_widget_show(table);
|
||||
@@ -174,7 +175,7 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(background_fill_color);
|
||||
gtk_table_attach(GTK_TABLE(table), background_fill_color, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(background_fill_color, _("The fill color of the current background"));
|
||||
gtk_tooltips_set_tip(tooltips, background_fill_color, _("The fill color of the current background"), NULL);
|
||||
|
||||
row++, col = 2;
|
||||
label = gtk_label_new(_("Fill tint"));
|
||||
@@ -187,7 +188,7 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(background_fill_content_tint_weight);
|
||||
gtk_table_attach(GTK_TABLE(table), background_fill_content_tint_weight, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(background_fill_content_tint_weight, _("How much the border color should be tinted with the content color"));
|
||||
gtk_tooltips_set_tip(tooltips, background_fill_content_tint_weight, _("How much the border color should be tinted with the content color"), NULL);
|
||||
|
||||
row++, col = 2;
|
||||
label = gtk_label_new(_("Border color"));
|
||||
@@ -201,7 +202,7 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(background_border_color);
|
||||
gtk_table_attach(GTK_TABLE(table), background_border_color, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(background_border_color, _("The border color of the current background"));
|
||||
gtk_tooltips_set_tip(tooltips, background_border_color, _("The border color of the current background"), NULL);
|
||||
|
||||
row++, col = 2;
|
||||
label = gtk_label_new(_("Border tint"));
|
||||
@@ -214,7 +215,7 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(background_border_content_tint_weight);
|
||||
gtk_table_attach(GTK_TABLE(table), background_border_content_tint_weight, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(background_border_content_tint_weight, _("How much the border color should be tinted with the content color"));
|
||||
gtk_tooltips_set_tip(tooltips, background_border_content_tint_weight, _("How much the border color should be tinted with the content color"), NULL);
|
||||
|
||||
row++, col = 2;
|
||||
label = gtk_label_new(_("Gradient"));
|
||||
@@ -240,8 +241,10 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(background_fill_color_over);
|
||||
gtk_table_attach(GTK_TABLE(table), background_fill_color_over, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(background_fill_color_over,
|
||||
_("The fill color of the current background on mouse over"));
|
||||
gtk_tooltips_set_tip(tooltips,
|
||||
background_fill_color_over,
|
||||
_("The fill color of the current background on mouse over"),
|
||||
NULL);
|
||||
|
||||
row++, col = 2;
|
||||
label = gtk_label_new(_("Border color (mouse over)"));
|
||||
@@ -255,9 +258,10 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(background_border_color_over);
|
||||
gtk_table_attach(GTK_TABLE(table), background_border_color_over, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(
|
||||
gtk_tooltips_set_tip(tooltips,
|
||||
background_border_color_over,
|
||||
_("The border color of the current background on mouse over"));
|
||||
_("The border color of the current background on mouse over"),
|
||||
NULL);
|
||||
|
||||
row++, col = 2;
|
||||
label = gtk_label_new(_("Gradient (mouse over)"));
|
||||
@@ -283,8 +287,10 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(background_fill_color_press);
|
||||
gtk_table_attach(GTK_TABLE(table), background_fill_color_press, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(background_fill_color_press,
|
||||
_("The fill color of the current background on mouse button press"));
|
||||
gtk_tooltips_set_tip(tooltips,
|
||||
background_fill_color_press,
|
||||
_("The fill color of the current background on mouse button press"),
|
||||
NULL);
|
||||
|
||||
row++, col = 2;
|
||||
label = gtk_label_new(_("Border color (pressed)"));
|
||||
@@ -298,8 +304,10 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(background_border_color_press);
|
||||
gtk_table_attach(GTK_TABLE(table), background_border_color_press, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(background_border_color_press,
|
||||
_("The border color of the current background on mouse button press"));
|
||||
gtk_tooltips_set_tip(tooltips,
|
||||
background_border_color_press,
|
||||
_("The border color of the current background on mouse button press"),
|
||||
NULL);
|
||||
|
||||
row++, col = 2;
|
||||
label = gtk_label_new(_("Gradient (pressed)"));
|
||||
@@ -324,8 +332,10 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(background_border_width);
|
||||
gtk_table_attach(GTK_TABLE(table), background_border_width, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(background_border_width,
|
||||
_("The width of the border of the current background, in pixels"));
|
||||
gtk_tooltips_set_tip(tooltips,
|
||||
background_border_width,
|
||||
_("The width of the border of the current background, in pixels"),
|
||||
NULL);
|
||||
|
||||
row++, col = 2;
|
||||
label = gtk_label_new(_("Corner radius"));
|
||||
@@ -338,7 +348,7 @@ void create_background(GtkWidget *parent)
|
||||
gtk_widget_show(background_corner_radius);
|
||||
gtk_table_attach(GTK_TABLE(table), background_corner_radius, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_widget_set_tooltip_text(background_corner_radius, _("The corner radius of the current background"));
|
||||
gtk_tooltips_set_tip(tooltips, background_corner_radius, _("The corner radius of the current background"), NULL);
|
||||
|
||||
row++;
|
||||
col = 2;
|
||||
@@ -702,8 +712,9 @@ void background_update_image(int index)
|
||||
g_boxed_free(GDK_TYPE_COLOR, fillColor);
|
||||
g_boxed_free(GDK_TYPE_COLOR, borderColor);
|
||||
|
||||
cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h);
|
||||
cairo_t *cr = cairo_create(s);
|
||||
GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24);
|
||||
|
||||
cairo_t *cr = gdk_cairo_create(pixmap);
|
||||
cairo_set_line_width(cr, b);
|
||||
|
||||
cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
|
||||
@@ -733,12 +744,13 @@ void background_update_image(int index)
|
||||
cairo_destroy(cr);
|
||||
cr = NULL;
|
||||
|
||||
pixbuf = gdk_pixbuf_get_from_surface(s, 0, 0, w, h);
|
||||
pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, gdk_colormap_get_system(), 0, 0, 0, 0, w, h);
|
||||
if (pixmap)
|
||||
g_object_unref(pixmap);
|
||||
|
||||
gtk_list_store_set(backgrounds, &iter, bgColPixbuf, pixbuf, -1);
|
||||
if (pixbuf)
|
||||
g_object_unref(pixbuf);
|
||||
cairo_surface_destroy(s);
|
||||
}
|
||||
|
||||
void background_force_update()
|
||||
|
||||
@@ -32,7 +32,7 @@ GtkWidget *create_gradient_combo()
|
||||
|
||||
void create_gradient(GtkWidget *parent)
|
||||
{
|
||||
gradient_ids = gtk_list_store_new(grNumCols, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_STRING);
|
||||
gradient_ids = gtk_list_store_new(grNumCols, GDK_TYPE_PIXBUF, GTK_TYPE_INT, GTK_TYPE_STRING);
|
||||
gradients = NULL;
|
||||
|
||||
gradient_stop_ids = gtk_list_store_new(grStopNumCols, GDK_TYPE_PIXBUF);
|
||||
@@ -61,13 +61,13 @@ void create_gradient(GtkWidget *parent)
|
||||
col++;
|
||||
|
||||
button = gtk_button_new_from_stock("gtk-add");
|
||||
g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_duplicate), NULL);
|
||||
gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_duplicate), NULL);
|
||||
gtk_widget_show(button);
|
||||
gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
|
||||
button = gtk_button_new_from_stock("gtk-remove");
|
||||
g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_delete), NULL);
|
||||
gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_delete), NULL);
|
||||
gtk_widget_show(button);
|
||||
gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
@@ -85,13 +85,13 @@ void create_gradient(GtkWidget *parent)
|
||||
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
|
||||
gradient_combo_type = gtk_combo_box_text_new();
|
||||
gradient_combo_type = gtk_combo_box_new_text();
|
||||
gtk_widget_show(gradient_combo_type);
|
||||
gtk_table_attach(GTK_TABLE(table), gradient_combo_type, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gradient_combo_type), _("Vertical"));
|
||||
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gradient_combo_type), _("Horizontal"));
|
||||
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gradient_combo_type), _("Radial"));
|
||||
gtk_combo_box_append_text(GTK_COMBO_BOX(gradient_combo_type), _("Vertical"));
|
||||
gtk_combo_box_append_text(GTK_COMBO_BOX(gradient_combo_type), _("Horizontal"));
|
||||
gtk_combo_box_append_text(GTK_COMBO_BOX(gradient_combo_type), _("Radial"));
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(gradient_combo_type), 0);
|
||||
|
||||
row++, col = 2;
|
||||
@@ -142,13 +142,13 @@ void create_gradient(GtkWidget *parent)
|
||||
col++;
|
||||
|
||||
button = gtk_button_new_from_stock("gtk-add");
|
||||
g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_duplicate), NULL);
|
||||
gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_duplicate), NULL);
|
||||
gtk_widget_show(button);
|
||||
gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
|
||||
button = gtk_button_new_from_stock("gtk-remove");
|
||||
g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_delete), NULL);
|
||||
gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_delete), NULL);
|
||||
gtk_widget_show(button);
|
||||
gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
|
||||
col++;
|
||||
@@ -327,17 +327,18 @@ void gradient_update_image(int index)
|
||||
|
||||
int w = 70;
|
||||
int h = 30;
|
||||
cairo_surface_t *pixmap = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h);
|
||||
GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24);
|
||||
|
||||
cairo_t *cr = cairo_create(pixmap);
|
||||
cairo_t *cr = gdk_cairo_create(pixmap);
|
||||
cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);
|
||||
cairo_rectangle(cr, 0, 0, w, h);
|
||||
cairo_fill(cr);
|
||||
|
||||
gradient_draw(cr, g, w, h, FALSE);
|
||||
|
||||
GdkPixbuf *pixbuf = gdk_pixbuf_get_from_surface(pixmap, 0, 0, w, h);
|
||||
cairo_surface_destroy(pixmap);
|
||||
GdkPixbuf *pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, gdk_colormap_get_system(), 0, 0, 0, 0, w, h);
|
||||
if (pixmap)
|
||||
g_object_unref(pixmap);
|
||||
|
||||
GtkTreePath *path;
|
||||
GtkTreeIter iter;
|
||||
@@ -527,14 +528,16 @@ void gradient_stop_update_image(int index)
|
||||
|
||||
int w = 70;
|
||||
int h = 30;
|
||||
cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h);
|
||||
cairo_t *cr = cairo_create(s);
|
||||
GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24);
|
||||
|
||||
cairo_t *cr = gdk_cairo_create(pixmap);
|
||||
cairo_set_source_rgba(cr, stop->color.rgb[0], stop->color.rgb[1], stop->color.rgb[2], stop->color.alpha);
|
||||
cairo_rectangle(cr, 0, 0, w, h);
|
||||
cairo_fill(cr);
|
||||
|
||||
GdkPixbuf *pixbuf = gdk_pixbuf_get_from_surface(s, 0, 0, w, h);
|
||||
cairo_surface_destroy(s);
|
||||
GdkPixbuf *pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, gdk_colormap_get_system(), 0, 0, 0, 0, w, h);
|
||||
if (pixmap)
|
||||
g_object_unref(pixmap);
|
||||
|
||||
GtkTreePath *path;
|
||||
GtkTreeIter iter;
|
||||
|
||||
@@ -100,7 +100,7 @@ char *file_name_from_path(const char *filepath)
|
||||
|
||||
void make_backup(const char *filepath)
|
||||
{
|
||||
gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long long)time(NULL));
|
||||
gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, time(NULL));
|
||||
copy_file(filepath, backup_path);
|
||||
g_free(backup_path);
|
||||
}
|
||||
@@ -383,11 +383,6 @@ static void menuAbout()
|
||||
|
||||
// ====== Theme import/copy/delete ======
|
||||
|
||||
static void free_data(gpointer data, gpointer userdata)
|
||||
{
|
||||
g_free(data);
|
||||
}
|
||||
|
||||
// Shows open dialog and copies the selected files to ~ without overwrite.
|
||||
static void menuImportFile()
|
||||
{
|
||||
@@ -412,7 +407,7 @@ static void menuImportFile()
|
||||
gchar *newpath = import_no_overwrite(l->data);
|
||||
g_free(newpath);
|
||||
}
|
||||
g_slist_foreach(list, free_data, NULL);
|
||||
g_slist_foreach(list, (GFunc)g_free, NULL);
|
||||
g_slist_free(list);
|
||||
gtk_widget_destroy(dialog);
|
||||
}
|
||||
|
||||
@@ -14,27 +14,6 @@
|
||||
#define GETTEXT_PACKAGE "tint2conf"
|
||||
#endif
|
||||
|
||||
#ifndef GTK_TYPE_INT
|
||||
#define GTK_TYPE_INT G_TYPE_INT
|
||||
#endif
|
||||
|
||||
#ifndef GTK_TYPE_STRING
|
||||
#define GTK_TYPE_STRING G_TYPE_STRING
|
||||
#endif
|
||||
|
||||
#ifndef GTK_TYPE_BOOL
|
||||
#define GTK_TYPE_BOOL G_TYPE_BOOLEAN
|
||||
#endif
|
||||
|
||||
#ifndef GTK_TYPE_DOUBLE
|
||||
#define GTK_TYPE_DOUBLE G_TYPE_DOUBLE
|
||||
#endif
|
||||
|
||||
#define gtk_tooltips_set_tip(t, widget, txt, arg) gtk_widget_set_tooltip_text(widget, txt)
|
||||
|
||||
#define GTK_OBJECT(x) (x)
|
||||
#define GTK_SIGNAL_FUNC G_CALLBACK
|
||||
|
||||
#define SNAPSHOT_TICK 190
|
||||
gboolean update_snapshot(gpointer ignored);
|
||||
void menuApply();
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -9,11 +9,10 @@
|
||||
#include "../launcher/icon-theme-common.h"
|
||||
|
||||
// panel
|
||||
extern GtkWidget *scale_relative_to_dpi, *scale_relative_to_screen_height;
|
||||
extern GtkWidget *panel_width, *panel_height, *panel_margin_x, *panel_margin_y, *panel_padding_x, *panel_padding_y,
|
||||
*panel_spacing;
|
||||
extern GtkWidget *panel_wm_menu, *panel_dock, *panel_pivot_struts, *panel_autohide, *panel_autohide_show_time,
|
||||
*panel_autohide_hide_time, *panel_autohide_size;
|
||||
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;
|
||||
@@ -133,7 +132,7 @@ typedef struct Executor {
|
||||
GtkWidget *page_execp;
|
||||
GtkWidget *page_label;
|
||||
GtkWidget *execp_command, *execp_interval, *execp_has_icon, *execp_cache_icon, *execp_show_tooltip;
|
||||
GtkWidget *execp_continuous, *execp_markup, *execp_tooltip, *execp_monitor;
|
||||
GtkWidget *execp_continuous, *execp_markup, *execp_tooltip;
|
||||
GtkWidget *execp_left_command, *execp_right_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;
|
||||
|
||||
@@ -69,23 +69,23 @@ void config_read_file(const char *path)
|
||||
if (!config_has_panel_items) {
|
||||
char panel_items[256];
|
||||
panel_items[0] = 0;
|
||||
strlcat(panel_items, "T", sizeof(panel_items));
|
||||
strcat(panel_items, "T");
|
||||
if (config_has_battery) {
|
||||
if (config_battery_enabled)
|
||||
strlcat(panel_items, "B", sizeof(panel_items));
|
||||
strcat(panel_items, "B");
|
||||
} else {
|
||||
if (no_items_battery_enabled)
|
||||
strlcat(panel_items, "B", sizeof(panel_items));
|
||||
strcat(panel_items, "B");
|
||||
}
|
||||
if (config_has_systray) {
|
||||
if (config_systray_enabled)
|
||||
strlcat(panel_items, "S", sizeof(panel_items));
|
||||
strcat(panel_items, "S");
|
||||
} else {
|
||||
if (no_items_systray_enabled)
|
||||
strlcat(panel_items, "S", sizeof(panel_items));
|
||||
strcat(panel_items, "S");
|
||||
}
|
||||
if (no_items_clock_enabled)
|
||||
strlcat(panel_items, "C", sizeof(panel_items));
|
||||
strcat(panel_items, "C");
|
||||
set_panel_items(panel_items);
|
||||
}
|
||||
}
|
||||
@@ -242,13 +242,13 @@ void config_write_backgrounds(FILE *fp)
|
||||
char sides[10];
|
||||
sides[0] = '\0';
|
||||
if (sideTop)
|
||||
strlcat(sides, "T", sizeof(sides));
|
||||
strcat(sides, "T");
|
||||
if (sideBottom)
|
||||
strlcat(sides, "B", sizeof(sides));
|
||||
strcat(sides, "B");
|
||||
if (sideLeft)
|
||||
strlcat(sides, "L", sizeof(sides));
|
||||
strcat(sides, "L");
|
||||
if (sideRight)
|
||||
strlcat(sides, "R", sizeof(sides));
|
||||
strcat(sides, "R");
|
||||
fprintf(fp, "border_sides = %s\n", sides);
|
||||
|
||||
fprintf(fp, "border_content_tint_weight = %d\n", (int)(border_weight));
|
||||
@@ -295,7 +295,6 @@ void config_write_panel(FILE *fp)
|
||||
fprintf(fp, "panel_background_id = %d\n", gtk_combo_box_get_active(GTK_COMBO_BOX(panel_background)));
|
||||
fprintf(fp, "wm_menu = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel_wm_menu)) ? 1 : 0);
|
||||
fprintf(fp, "panel_dock = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel_dock)) ? 1 : 0);
|
||||
fprintf(fp, "panel_pivot_struts = %d\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel_pivot_struts)) ? 1 : 0);
|
||||
|
||||
fprintf(fp, "panel_position = ");
|
||||
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(screen_position[POS_BLH]))) {
|
||||
@@ -379,13 +378,6 @@ void config_write_panel(FILE *fp)
|
||||
(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_pressed_icon_saturation)),
|
||||
(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(mouse_pressed_icon_brightness)));
|
||||
|
||||
fprintf(fp,
|
||||
"scale_relative_to_dpi = %d\n",
|
||||
(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(scale_relative_to_dpi)));
|
||||
fprintf(fp,
|
||||
"scale_relative_to_screen_height = %d\n",
|
||||
(int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(scale_relative_to_screen_height)));
|
||||
|
||||
fprintf(fp, "\n");
|
||||
}
|
||||
|
||||
@@ -458,12 +450,10 @@ void config_write_taskbar(FILE *fp)
|
||||
} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 1) {
|
||||
fprintf(fp, "title");
|
||||
} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 2) {
|
||||
fprintf(fp, "application");
|
||||
} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 3) {
|
||||
fprintf(fp, "center");
|
||||
} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 4) {
|
||||
} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 3) {
|
||||
fprintf(fp, "mru");
|
||||
} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 5) {
|
||||
} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(taskbar_sort_order)) == 4) {
|
||||
fprintf(fp, "lru");
|
||||
} else {
|
||||
fprintf(fp, "none");
|
||||
@@ -488,7 +478,7 @@ void config_write_task_font_color(FILE *fp, char *name, GtkWidget *task_color)
|
||||
GdkColor color;
|
||||
gtk_color_button_get_color(GTK_COLOR_BUTTON(task_color), &color);
|
||||
char full_name[128];
|
||||
snprintf(full_name, sizeof(full_name), "task%s_font_color", name);
|
||||
sprintf(full_name, "task%s_font_color", name);
|
||||
config_write_color(fp, full_name, color, gtk_color_button_get_alpha(GTK_COLOR_BUTTON(task_color)) * 100 / 0xffff);
|
||||
}
|
||||
|
||||
@@ -499,7 +489,7 @@ void config_write_task_icon_osb(FILE *fp,
|
||||
GtkWidget *widget_brightness)
|
||||
{
|
||||
char full_name[128];
|
||||
snprintf(full_name, sizeof(full_name), "task%s_icon_asb", name);
|
||||
sprintf(full_name, "task%s_icon_asb", name);
|
||||
fprintf(fp,
|
||||
"%s = %d %d %d\n",
|
||||
full_name,
|
||||
@@ -511,7 +501,7 @@ void config_write_task_icon_osb(FILE *fp,
|
||||
void config_write_task_background(FILE *fp, char *name, GtkWidget *task_background)
|
||||
{
|
||||
char full_name[128];
|
||||
snprintf(full_name, sizeof(full_name), "task%s_background_id", name);
|
||||
sprintf(full_name, "task%s_background_id", name);
|
||||
fprintf(fp, "%s = %d\n", full_name, gtk_combo_box_get_active(GTK_COMBO_BOX(task_background)));
|
||||
}
|
||||
|
||||
@@ -871,16 +861,6 @@ void config_write_execp(FILE *fp)
|
||||
fprintf(fp,
|
||||
"execp_markup = %d\n",
|
||||
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(executor->execp_markup)) ? 1 : 0);
|
||||
fprintf(fp, "execp_monitor = ");
|
||||
if (gtk_combo_box_get_active(GTK_COMBO_BOX(executor->execp_monitor)) <= 0) {
|
||||
fprintf(fp, "all");
|
||||
} else if (gtk_combo_box_get_active(GTK_COMBO_BOX(executor->execp_monitor)) == 1) {
|
||||
fprintf(fp, "primary");
|
||||
} else {
|
||||
fprintf(fp, "%d", MAX(1, gtk_combo_box_get_active(GTK_COMBO_BOX(executor->execp_monitor)) - 1));
|
||||
}
|
||||
fprintf(fp, "\n");
|
||||
|
||||
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(executor->execp_show_tooltip))) {
|
||||
fprintf(fp, "execp_tooltip = \n");
|
||||
} else {
|
||||
@@ -1128,13 +1108,7 @@ void add_entry(char *key, char *value)
|
||||
char *value1 = 0, *value2 = 0, *value3 = 0;
|
||||
|
||||
/* Gradients */
|
||||
if (strcmp(key, "scale_relative_to_dpi") == 0) {
|
||||
extract_values(value, &value1, &value2, &value3);
|
||||
gtk_spin_button_set_value(GTK_SPIN_BUTTON(scale_relative_to_dpi), atoi(value1));
|
||||
} else if (strcmp(key, "scale_relative_to_screen_height") == 0) {
|
||||
extract_values(value, &value1, &value2, &value3);
|
||||
gtk_spin_button_set_value(GTK_SPIN_BUTTON(scale_relative_to_screen_height), atoi(value1));
|
||||
} else if (strcmp(key, "gradient") == 0) {
|
||||
if (strcmp(key, "gradient") == 0) {
|
||||
finalize_gradient();
|
||||
GradientConfigType t;
|
||||
if (g_str_equal(value, "horizontal"))
|
||||
@@ -1395,8 +1369,6 @@ void add_entry(char *key, char *value)
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(panel_wm_menu), atoi(value));
|
||||
} else if (strcmp(key, "panel_dock") == 0) {
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(panel_dock), atoi(value));
|
||||
} else if (strcmp(key, "panel_pivot_struts") == 0) {
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(panel_pivot_struts), atoi(value));
|
||||
} else if (strcmp(key, "panel_layer") == 0) {
|
||||
if (strcmp(value, "bottom") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_layer), 2);
|
||||
@@ -1574,14 +1546,12 @@ void add_entry(char *key, char *value)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0);
|
||||
else if (strcmp(value, "title") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 1);
|
||||
else if (strcmp(value, "application") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 2);
|
||||
else if (strcmp(value, "center") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 3);
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 2);
|
||||
else if (strcmp(value, "mru") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 4);
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 3);
|
||||
else if (strcmp(value, "lru") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 5);
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 4);
|
||||
else
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0);
|
||||
} else if (strcmp(key, "task_align") == 0) {
|
||||
@@ -1865,12 +1835,10 @@ void add_entry(char *key, char *value)
|
||||
} else if (strcmp(key, "launcher_apps_dir") == 0) {
|
||||
char *path = expand_tilde(value);
|
||||
|
||||
int position = gtk_entry_get_text_length(GTK_ENTRY(launcher_apps_dirs));
|
||||
if (position > 0) {
|
||||
gtk_editable_insert_text(GTK_EDITABLE(launcher_apps_dirs), ",", 1, &position);
|
||||
if (gtk_entry_get_text_length(GTK_ENTRY(launcher_apps_dirs)) > 0) {
|
||||
gtk_entry_append_text(GTK_ENTRY(launcher_apps_dirs), ",");
|
||||
}
|
||||
position = gtk_entry_get_text_length(GTK_ENTRY(launcher_apps_dirs));
|
||||
gtk_editable_insert_text(GTK_EDITABLE(launcher_apps_dirs), path, strlen(path), &position);
|
||||
gtk_entry_append_text(GTK_ENTRY(launcher_apps_dirs), path);
|
||||
|
||||
free(path);
|
||||
} else if (strcmp(key, "launcher_icon_theme") == 0) {
|
||||
@@ -1974,23 +1942,6 @@ void add_entry(char *key, char *value)
|
||||
gtk_spin_button_set_value(GTK_SPIN_BUTTON(execp_get_last()->execp_continuous), atoi(value));
|
||||
} else if (strcmp(key, "execp_markup") == 0) {
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_get_last()->execp_markup), atoi(value));
|
||||
} else if (strcmp(key, "execp_monitor") == 0) {
|
||||
if (strcmp(value, "all") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(execp_get_last()->execp_monitor), 0);
|
||||
else if (strcmp(value, "primary") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(execp_get_last()->execp_monitor), 1);
|
||||
else if (strcmp(value, "1") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(execp_get_last()->execp_monitor), 2);
|
||||
else if (strcmp(value, "2") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(execp_get_last()->execp_monitor), 3);
|
||||
else if (strcmp(value, "3") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(execp_get_last()->execp_monitor), 4);
|
||||
else if (strcmp(value, "4") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(execp_get_last()->execp_monitor), 5);
|
||||
else if (strcmp(value, "5") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(execp_get_last()->execp_monitor), 6);
|
||||
else if (strcmp(value, "6") == 0)
|
||||
gtk_combo_box_set_active(GTK_COMBO_BOX(execp_get_last()->execp_monitor), 7);
|
||||
} else if (strcmp(key, "execp_tooltip") == 0) {
|
||||
if (strlen(value) > 0) {
|
||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(execp_get_last()->execp_show_tooltip), 1);
|
||||
|
||||
@@ -207,7 +207,7 @@ gboolean update_snapshot(gpointer ignored)
|
||||
|
||||
char hash[MD4_HEX_SIZE + 4];
|
||||
md4hexf(path, hash);
|
||||
strlcat(hash, ".png", sizeof(hash));
|
||||
strcat(hash, ".png");
|
||||
|
||||
gchar *snap = g_build_filename(g_get_user_cache_dir(), "tint2", hash, NULL);
|
||||
pixbuf = force_refresh ? NULL : gdk_pixbuf_new_from_file(snap, NULL);
|
||||
|
||||
@@ -31,9 +31,9 @@ static int x, y, width, height;
|
||||
static gboolean just_shown;
|
||||
|
||||
// the next functions are helper functions for tooltip handling
|
||||
void start_show_timer();
|
||||
void start_hide_timer();
|
||||
void stop_tooltip_timer();
|
||||
void start_show_timeout();
|
||||
void start_hide_timeout();
|
||||
void stop_tooltip_timeout();
|
||||
|
||||
void tooltip_init_fonts();
|
||||
|
||||
@@ -44,9 +44,6 @@ void default_tooltip()
|
||||
// give the tooltip some reasonable default values
|
||||
memset(&g_tooltip, 0, sizeof(Tooltip));
|
||||
|
||||
INIT_TIMER(g_tooltip.visibility_timer);
|
||||
INIT_TIMER(g_tooltip.update_timer);
|
||||
|
||||
g_tooltip.font_color.rgb[0] = 1;
|
||||
g_tooltip.font_color.rgb[1] = 1;
|
||||
g_tooltip.font_color.rgb[2] = 1;
|
||||
@@ -56,9 +53,8 @@ void default_tooltip()
|
||||
|
||||
void cleanup_tooltip()
|
||||
{
|
||||
stop_tooltip_timer();
|
||||
destroy_timer(&g_tooltip.visibility_timer);
|
||||
destroy_timer(&g_tooltip.update_timer);
|
||||
stop_tooltip_timeout();
|
||||
stop_timeout(g_tooltip.update_timeout);
|
||||
tooltip_hide(NULL);
|
||||
tooltip_update_contents_for(NULL);
|
||||
if (g_tooltip.window)
|
||||
@@ -125,9 +121,9 @@ void tooltip_trigger_show(Area *area, Panel *p, XEvent *e)
|
||||
if (g_tooltip.mapped && g_tooltip.area != area) {
|
||||
tooltip_update_contents_for(area);
|
||||
tooltip_update();
|
||||
stop_tooltip_timer();
|
||||
stop_tooltip_timeout();
|
||||
} else if (!g_tooltip.mapped) {
|
||||
start_show_timer();
|
||||
start_show_timeout();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,9 +149,7 @@ void tooltip_update_geometry()
|
||||
|
||||
cairo_surface_t *cs = cairo_xlib_surface_create(server.display, g_tooltip.window, server.visual, width, height);
|
||||
cairo_t *c = cairo_create(cs);
|
||||
PangoContext *context = pango_cairo_create_context(c);
|
||||
pango_cairo_context_set_resolution(context, 96 * panel->scale);
|
||||
PangoLayout *layout = pango_layout_new(context);
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
|
||||
pango_layout_set_font_description(layout, g_tooltip.font_desc);
|
||||
PangoRectangle r1, r2;
|
||||
@@ -163,7 +157,7 @@ void tooltip_update_geometry()
|
||||
pango_layout_get_pixel_extents(layout, &r1, &r2);
|
||||
int max_width = MIN(r2.width * 5, screen_width * 2 / 3);
|
||||
if (g_tooltip.image && cairo_image_surface_get_width(g_tooltip.image) > 0) {
|
||||
max_width = left_right_bg_border_width(g_tooltip.bg) + 2 * g_tooltip.paddingx * panel->scale +
|
||||
max_width = left_right_bg_border_width(g_tooltip.bg) + 2 * g_tooltip.paddingx +
|
||||
cairo_image_surface_get_width(g_tooltip.image);
|
||||
}
|
||||
pango_layout_set_width(layout, max_width * PANGO_SCALE);
|
||||
@@ -171,12 +165,12 @@ void tooltip_update_geometry()
|
||||
pango_layout_set_text(layout, g_tooltip.tooltip_text ? g_tooltip.tooltip_text : "1234567890abcdef", -1);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
|
||||
pango_layout_get_pixel_extents(layout, &r1, &r2);
|
||||
width = left_right_bg_border_width(g_tooltip.bg) + 2 * g_tooltip.paddingx * panel->scale + r2.width;
|
||||
height = top_bottom_bg_border_width(g_tooltip.bg) + 2 * g_tooltip.paddingy * panel->scale + r2.height;
|
||||
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;
|
||||
if (g_tooltip.image && cairo_image_surface_get_width(g_tooltip.image) > 0) {
|
||||
width = left_right_bg_border_width(g_tooltip.bg) + 2 * g_tooltip.paddingx * panel->scale +
|
||||
width = left_right_bg_border_width(g_tooltip.bg) + 2 * g_tooltip.paddingx +
|
||||
cairo_image_surface_get_width(g_tooltip.image);
|
||||
height += g_tooltip.paddingy * panel->scale + cairo_image_surface_get_height(g_tooltip.image);
|
||||
height += g_tooltip.paddingy + cairo_image_surface_get_height(g_tooltip.image);
|
||||
}
|
||||
|
||||
if (panel_horizontal && panel_position & BOTTOM)
|
||||
@@ -189,7 +183,6 @@ void tooltip_update_geometry()
|
||||
x = panel->posx - width;
|
||||
|
||||
g_object_unref(layout);
|
||||
g_object_unref(context);
|
||||
cairo_destroy(c);
|
||||
cairo_surface_destroy(cs);
|
||||
}
|
||||
@@ -246,7 +239,6 @@ void tooltip_update()
|
||||
tooltip_hide(0);
|
||||
return;
|
||||
}
|
||||
Panel *panel = g_tooltip.panel;
|
||||
|
||||
tooltip_update_geometry();
|
||||
if (just_shown) {
|
||||
@@ -281,9 +273,7 @@ void tooltip_update()
|
||||
|
||||
Color fc = g_tooltip.font_color;
|
||||
cairo_set_source_rgba(c, fc.rgb[0], fc.rgb[1], fc.rgb[2], fc.alpha);
|
||||
PangoContext *context = pango_cairo_create_context(c);
|
||||
pango_cairo_context_set_resolution(context, 96 * panel->scale);
|
||||
PangoLayout *layout = pango_layout_new(context);
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
pango_layout_set_font_description(layout, g_tooltip.font_desc);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
|
||||
pango_layout_set_text(layout, g_tooltip.tooltip_text, -1);
|
||||
@@ -295,16 +285,15 @@ void tooltip_update()
|
||||
// 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.)
|
||||
cairo_move_to(c,
|
||||
-r1.x / 2 + left_bg_border_width(g_tooltip.bg) + g_tooltip.paddingx * panel->scale,
|
||||
-r1.y / 2 + 1 + top_bg_border_width(g_tooltip.bg) + g_tooltip.paddingy * panel->scale);
|
||||
-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);
|
||||
pango_cairo_show_layout(c, layout);
|
||||
g_object_unref(layout);
|
||||
g_object_unref(context);
|
||||
|
||||
if (g_tooltip.image) {
|
||||
cairo_translate(c,
|
||||
left_bg_border_width(g_tooltip.bg) + g_tooltip.paddingx * panel->scale,
|
||||
height - bottom_bg_border_width(g_tooltip.bg) - g_tooltip.paddingy * panel->scale - cairo_image_surface_get_height(g_tooltip.image));
|
||||
left_bg_border_width(g_tooltip.bg) + g_tooltip.paddingx,
|
||||
height - bottom_bg_border_width(g_tooltip.bg) - g_tooltip.paddingy - cairo_image_surface_get_height(g_tooltip.image));
|
||||
cairo_set_source_surface(c, g_tooltip.image, 0, 0);
|
||||
cairo_paint(c);
|
||||
}
|
||||
@@ -317,10 +306,10 @@ void tooltip_trigger_hide()
|
||||
{
|
||||
if (g_tooltip.mapped) {
|
||||
tooltip_update_contents_for(NULL);
|
||||
start_hide_timer();
|
||||
start_hide_timeout();
|
||||
} else {
|
||||
// tooltip not visible yet, but maybe a timer is still pending
|
||||
stop_tooltip_timer();
|
||||
// tooltip not visible yet, but maybe a timeout is still pending
|
||||
stop_tooltip_timeout();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -334,19 +323,19 @@ void tooltip_hide(void *arg)
|
||||
g_tooltip.area = NULL;
|
||||
}
|
||||
|
||||
void start_show_timer()
|
||||
void start_show_timeout()
|
||||
{
|
||||
change_timer(&g_tooltip.visibility_timer, true, 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_timer()
|
||||
void start_hide_timeout()
|
||||
{
|
||||
change_timer(&g_tooltip.visibility_timer, true, 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_timer()
|
||||
void stop_tooltip_timeout()
|
||||
{
|
||||
stop_timer(&g_tooltip.visibility_timer);
|
||||
stop_timeout(g_tooltip.timeout);
|
||||
}
|
||||
|
||||
void tooltip_update_contents_timeout(void *arg)
|
||||
@@ -367,7 +356,7 @@ void tooltip_update_contents_for(Area *area)
|
||||
if (g_tooltip.image)
|
||||
cairo_surface_reference(g_tooltip.image);
|
||||
else
|
||||
change_timer(&g_tooltip.update_timer, true, 300, 0, tooltip_update_contents_timeout, NULL);
|
||||
change_timeout(&g_tooltip.update_timeout, 300, 0, tooltip_update_contents_timeout, NULL);
|
||||
}
|
||||
g_tooltip.area = area;
|
||||
}
|
||||
|
||||
@@ -36,8 +36,8 @@ typedef struct {
|
||||
PangoFontDescription *font_desc;
|
||||
Color font_color;
|
||||
Background *bg;
|
||||
Timer visibility_timer;
|
||||
Timer update_timer;
|
||||
timeout *timeout;
|
||||
timeout *update_timeout;
|
||||
cairo_surface_t *image;
|
||||
} Tooltip;
|
||||
|
||||
|
||||
@@ -49,9 +49,8 @@ char *addr2name(void *func)
|
||||
free(strings);
|
||||
return result;
|
||||
#else
|
||||
const size_t buf_size = 32;
|
||||
char *result = (char*) calloc(buf_size, 1);
|
||||
snprintf(result, buf_size, "%p", func);
|
||||
char *result = (char*) calloc(32, 1);
|
||||
sprintf(result, "%p", func);
|
||||
return result;
|
||||
#endif
|
||||
}
|
||||
238
src/util/addr2line.c
Normal file
238
src/util/addr2line.c
Normal file
@@ -0,0 +1,238 @@
|
||||
/* addr2line.c -- convert addresses to line number and function name
|
||||
Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
2007, 2009 Free Software Foundation, Inc.
|
||||
Contributed by Ulrich Lauther <Ulrich.Lauther@mchp.siemens.de>
|
||||
|
||||
This file is part of GNU Binutils.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3, 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, 51 Franklin Street - Fifth Floor, Boston,
|
||||
MA 02110-1301, USA. */
|
||||
|
||||
/* Derived from objdump.c and nm.c by Ulrich.Lauther@mchp.siemens.de */
|
||||
|
||||
#ifdef ENABLE_EXECINFO
|
||||
|
||||
#include <bfd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "addr2line.h"
|
||||
#include "print.h"
|
||||
|
||||
static bfd_boolean unwind_inlines = 1; /* -i, unwind inlined functions. */
|
||||
static bfd_boolean with_addresses = 0; /* -a, show addresses. */
|
||||
static bfd_boolean with_functions = 1; /* -f, show function names. */
|
||||
static bfd_boolean do_demangle = 1; /* -C, demangle names. */
|
||||
static bfd_boolean base_names = 1; /* -s, strip directory names. */
|
||||
|
||||
typedef struct Lookup {
|
||||
char *exe_file_name;
|
||||
void *address;
|
||||
char *result;
|
||||
bfd *abfd;
|
||||
asymbol **syms;
|
||||
bfd_vma pc;
|
||||
const char *filename;
|
||||
const char *functionname;
|
||||
unsigned int line;
|
||||
unsigned int discriminator;
|
||||
bfd_boolean found;
|
||||
} Lookup;
|
||||
|
||||
static asymbol **slurp_symtab(bfd *);
|
||||
static void find_address_in_section(bfd *, asection *, void *unused);
|
||||
static void translate_address(Lookup *lookup);
|
||||
|
||||
static asymbol **slurp_symtab(bfd *abfd)
|
||||
{
|
||||
if ((bfd_get_file_flags(abfd) & HAS_SYMS) == 0)
|
||||
return NULL;
|
||||
|
||||
long storage = bfd_get_symtab_upper_bound(abfd);
|
||||
bfd_boolean dynamic = FALSE;
|
||||
if (storage == 0) {
|
||||
storage = bfd_get_dynamic_symtab_upper_bound(abfd);
|
||||
dynamic = TRUE;
|
||||
}
|
||||
if (storage < 0)
|
||||
return NULL;
|
||||
|
||||
asymbol **syms = (asymbol **)malloc(storage);
|
||||
long symcount;
|
||||
if (dynamic)
|
||||
symcount = bfd_canonicalize_dynamic_symtab(abfd, syms);
|
||||
else
|
||||
symcount = bfd_canonicalize_symtab(abfd, syms);
|
||||
if (symcount < 0)
|
||||
return syms;
|
||||
|
||||
// If there are no symbols left after canonicalization and
|
||||
// we have not tried the dynamic symbols then give them a go.
|
||||
if (symcount == 0 && !dynamic && (storage = bfd_get_dynamic_symtab_upper_bound(abfd)) > 0) {
|
||||
free(syms);
|
||||
syms = (asymbol **)malloc(storage);
|
||||
symcount = bfd_canonicalize_dynamic_symtab(abfd, syms);
|
||||
}
|
||||
return syms;
|
||||
}
|
||||
|
||||
static void find_address_in_section(bfd *abfd, asection *section, void *unused)
|
||||
{
|
||||
Lookup *lookup = (Lookup *)abfd->usrdata;
|
||||
|
||||
bfd_vma vma;
|
||||
bfd_size_type size;
|
||||
|
||||
if (lookup->found)
|
||||
return;
|
||||
|
||||
if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
|
||||
return;
|
||||
|
||||
vma = bfd_get_section_vma(abfd, section);
|
||||
if (lookup->pc < vma)
|
||||
return;
|
||||
|
||||
size = bfd_get_section_size(section);
|
||||
if (lookup->pc >= vma + size)
|
||||
return;
|
||||
|
||||
lookup->found = bfd_find_nearest_line_discriminator(abfd,
|
||||
section,
|
||||
lookup->syms,
|
||||
lookup->pc - vma,
|
||||
&lookup->filename,
|
||||
&lookup->functionname,
|
||||
&lookup->line,
|
||||
&lookup->discriminator);
|
||||
}
|
||||
|
||||
static void translate_address(Lookup *lookup)
|
||||
{
|
||||
Buffer *buffer = NULL;
|
||||
lookup->pc = (bfd_vma)lookup->address;
|
||||
|
||||
if (with_addresses) {
|
||||
char tmp[256];
|
||||
bfd_sprintf_vma(lookup->abfd, tmp, lookup->pc);
|
||||
buffer = buffer_printf(buffer, "0x%s: ", tmp);
|
||||
}
|
||||
|
||||
lookup->found = FALSE;
|
||||
bfd_map_over_sections(lookup->abfd, find_address_in_section, NULL);
|
||||
|
||||
if (!lookup->found) {
|
||||
if (with_functions)
|
||||
buffer = buffer_printf(buffer, "?? ");
|
||||
buffer = buffer_printf(buffer, "??:0");
|
||||
} else {
|
||||
while (1) {
|
||||
if (with_functions) {
|
||||
const char *name;
|
||||
char *alloc = NULL;
|
||||
|
||||
name = lookup->functionname;
|
||||
if (name == NULL || *name == '\0')
|
||||
name = "??";
|
||||
else if (do_demangle) {
|
||||
alloc = bfd_demangle(lookup->abfd, name, 3);
|
||||
if (alloc != NULL)
|
||||
name = alloc;
|
||||
}
|
||||
|
||||
buffer = buffer_printf(buffer, "%s", name);
|
||||
buffer = buffer_printf(buffer, " at ");
|
||||
|
||||
if (alloc != NULL)
|
||||
free(alloc);
|
||||
}
|
||||
|
||||
if (base_names && lookup->filename != NULL) {
|
||||
const char *h = strrchr(lookup->filename, '/');
|
||||
if (h != NULL)
|
||||
lookup->filename = h + 1;
|
||||
}
|
||||
|
||||
buffer = buffer_printf(buffer, "%s:", lookup->filename ? lookup->filename : "??");
|
||||
if (lookup->line != 0) {
|
||||
if (lookup->discriminator != 0)
|
||||
buffer = buffer_printf(buffer, "%u (discriminator %u)", lookup->line, lookup->discriminator);
|
||||
else
|
||||
buffer = buffer_printf(buffer, "%u", lookup->line);
|
||||
} else {
|
||||
buffer = buffer_printf(buffer, "??");
|
||||
}
|
||||
if (!unwind_inlines)
|
||||
lookup->found = FALSE;
|
||||
else
|
||||
lookup->found =
|
||||
bfd_find_inliner_info(lookup->abfd, &lookup->filename, &lookup->functionname, &lookup->line);
|
||||
if (!lookup->found)
|
||||
break;
|
||||
buffer = buffer_printf(buffer, " (inlined by) ");
|
||||
}
|
||||
}
|
||||
if (buffer)
|
||||
lookup->result = buffer->data;
|
||||
}
|
||||
|
||||
Lookup *addr2line_init(const char *file_name)
|
||||
{
|
||||
bfd *abfd = bfd_openr(file_name, NULL);
|
||||
if (abfd == NULL)
|
||||
return NULL;
|
||||
|
||||
// Decompress sections.
|
||||
abfd->flags |= BFD_DECOMPRESS;
|
||||
|
||||
if (bfd_check_format(abfd, bfd_archive))
|
||||
goto err;
|
||||
|
||||
char **matching = NULL;
|
||||
if (!bfd_check_format_matches(abfd, bfd_object, &matching)) {
|
||||
free(matching);
|
||||
goto err;
|
||||
}
|
||||
|
||||
Lookup *lookup = (Lookup *)calloc(1, sizeof(Lookup));
|
||||
lookup->abfd = abfd;
|
||||
lookup->abfd->usrdata = lookup;
|
||||
lookup->syms = slurp_symtab(abfd);
|
||||
lookup->exe_file_name = strdup(file_name);
|
||||
return lookup;
|
||||
|
||||
err:
|
||||
bfd_close(abfd);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void addr2line_destroy(Lookup *lookup)
|
||||
{
|
||||
free(lookup->syms);
|
||||
bfd_close(lookup->abfd);
|
||||
free(lookup->exe_file_name);
|
||||
free(lookup);
|
||||
}
|
||||
|
||||
char *addr2line_lookup(Lookup *lookup, void *address)
|
||||
{
|
||||
lookup->address = address;
|
||||
lookup->result = NULL;
|
||||
translate_address(lookup);
|
||||
return lookup->result;
|
||||
}
|
||||
|
||||
#endif
|
||||
14
src/util/addr2line.h
Normal file
14
src/util/addr2line.h
Normal file
@@ -0,0 +1,14 @@
|
||||
#ifndef ADDR2LINE
|
||||
#define ADDR2LINE
|
||||
|
||||
#ifdef ENABLE_EXECINFO
|
||||
|
||||
typedef struct Lookup Lookup;
|
||||
|
||||
Lookup *addr2line_init(const char *file_name);
|
||||
void addr2line_destroy(Lookup *lookup);
|
||||
char *addr2line_lookup(Lookup *lookup, void *address);
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -929,8 +929,10 @@ void area_compute_text_geometry(Area *area,
|
||||
const char *line2,
|
||||
PangoFontDescription *line1_font_desc,
|
||||
PangoFontDescription *line2_font_desc,
|
||||
int *line1_height_ink,
|
||||
int *line1_height,
|
||||
int *line1_width,
|
||||
int *line2_height_ink,
|
||||
int *line2_height,
|
||||
int *line2_width)
|
||||
{
|
||||
@@ -939,6 +941,7 @@ void area_compute_text_geometry(Area *area,
|
||||
|
||||
if (line1 && line1[0])
|
||||
get_text_size2(line1_font_desc,
|
||||
line1_height_ink,
|
||||
line1_height,
|
||||
line1_width,
|
||||
available_h,
|
||||
@@ -947,14 +950,13 @@ void area_compute_text_geometry(Area *area,
|
||||
strlen(line1),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
PANGO_ALIGN_CENTER,
|
||||
FALSE,
|
||||
((Panel*)area->panel)->scale);
|
||||
FALSE);
|
||||
else
|
||||
*line1_width = *line1_height = 0;
|
||||
*line1_width = *line1_height_ink = *line1_height = 0;
|
||||
|
||||
if (line2 && line2[0])
|
||||
get_text_size2(line2_font_desc,
|
||||
line2_height_ink,
|
||||
line2_height,
|
||||
line2_width,
|
||||
available_h,
|
||||
@@ -963,11 +965,9 @@ void area_compute_text_geometry(Area *area,
|
||||
strlen(line2),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
PANGO_ALIGN_CENTER,
|
||||
FALSE,
|
||||
((Panel*)area->panel)->scale);
|
||||
FALSE);
|
||||
else
|
||||
*line2_width = *line2_height = 0;
|
||||
*line2_width = *line2_height_ink = *line2_height = 0;
|
||||
}
|
||||
|
||||
int text_area_compute_desired_size(Area *area,
|
||||
@@ -976,14 +976,16 @@ int text_area_compute_desired_size(Area *area,
|
||||
PangoFontDescription *line1_font_desc,
|
||||
PangoFontDescription *line2_font_desc)
|
||||
{
|
||||
int line1_height, line1_width, line2_height, line2_width;
|
||||
int line1_height_ink, line1_height, line1_width, line2_height_ink, line2_height, line2_width;
|
||||
area_compute_text_geometry(area,
|
||||
line1,
|
||||
line2,
|
||||
line1_font_desc,
|
||||
line2_font_desc,
|
||||
&line1_height_ink,
|
||||
&line1_height,
|
||||
&line1_width,
|
||||
&line2_height_ink,
|
||||
&line2_height,
|
||||
&line2_width);
|
||||
|
||||
@@ -1008,15 +1010,17 @@ gboolean resize_text_area(Area *area,
|
||||
|
||||
schedule_redraw(area);
|
||||
|
||||
int line1_height, line1_width;
|
||||
int line2_height, line2_width;
|
||||
int line1_height_ink, line1_height, line1_width;
|
||||
int line2_height_ink, line2_height, line2_width;
|
||||
area_compute_text_geometry(area,
|
||||
line1,
|
||||
line2,
|
||||
line1_font_desc,
|
||||
line2_font_desc,
|
||||
&line1_height_ink,
|
||||
&line1_height,
|
||||
&line1_width,
|
||||
&line2_height_ink,
|
||||
&line2_height,
|
||||
&line2_width);
|
||||
|
||||
@@ -1063,16 +1067,12 @@ void draw_text_area(Area *area,
|
||||
PangoFontDescription *line2_font_desc,
|
||||
int line1_posy,
|
||||
int line2_posy,
|
||||
Color *color,
|
||||
double scale)
|
||||
Color *color)
|
||||
{
|
||||
int inner_w, inner_h;
|
||||
area_compute_inner_size(area, &inner_w, &inner_h);
|
||||
|
||||
PangoContext *context = pango_cairo_create_context(c);
|
||||
pango_cairo_context_set_resolution(context, 96 * scale);
|
||||
PangoLayout *layout = pango_layout_new(context);
|
||||
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
|
||||
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
|
||||
@@ -1084,7 +1084,7 @@ void draw_text_area(Area *area,
|
||||
pango_layout_set_font_description(layout, line1_font_desc);
|
||||
pango_layout_set_text(layout, line1, strlen(line1));
|
||||
pango_cairo_update_layout(c, layout);
|
||||
draw_text(layout, c, (area->width - inner_w) / 2, line1_posy, color, ((Panel *)area->panel)->font_shadow ? layout : NULL);
|
||||
draw_text(layout, c, (area->width - inner_w) / 2, line1_posy, color, ((Panel *)area->panel)->font_shadow);
|
||||
}
|
||||
|
||||
if (line2 && line2[0]) {
|
||||
@@ -1092,11 +1092,10 @@ void draw_text_area(Area *area,
|
||||
pango_layout_set_indent(layout, 0);
|
||||
pango_layout_set_text(layout, line2, strlen(line2));
|
||||
pango_cairo_update_layout(c, layout);
|
||||
draw_text(layout, c, (area->width - inner_w) / 2, line2_posy, color, ((Panel *)area->panel)->font_shadow ? layout : NULL);
|
||||
draw_text(layout, c, (area->width - inner_w) / 2, line2_posy, color, ((Panel *)area->panel)->font_shadow);
|
||||
}
|
||||
|
||||
g_object_unref(layout);
|
||||
g_object_unref(context);
|
||||
}
|
||||
|
||||
Area *compute_element_area(Area *area, Element element)
|
||||
|
||||
@@ -273,8 +273,10 @@ void area_compute_text_geometry(Area *area,
|
||||
const char *line2,
|
||||
PangoFontDescription *line1_font_desc,
|
||||
PangoFontDescription *line2_font_desc,
|
||||
int *line1_height_ink,
|
||||
int *line1_height,
|
||||
int *line1_width,
|
||||
int *line2_height_ink,
|
||||
int *line2_height,
|
||||
int *line2_width);
|
||||
int text_area_compute_desired_size(Area *area,
|
||||
@@ -297,8 +299,7 @@ void draw_text_area(Area *area,
|
||||
PangoFontDescription *line2_font_desc,
|
||||
int line1_posy,
|
||||
int line2_posy,
|
||||
Color *color,
|
||||
double scale);
|
||||
Color *color);
|
||||
|
||||
int left_border_width(Area *a);
|
||||
int right_border_width(Area *a);
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
#ifndef BOOL_H
|
||||
#define BOOL_H
|
||||
|
||||
#ifndef bool
|
||||
#define bool int
|
||||
#define false 0
|
||||
#define true 1
|
||||
#endif
|
||||
|
||||
#define SUCCESS true
|
||||
#define FAILURE false
|
||||
|
||||
#ifndef Status
|
||||
typedef int Status;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
268
src/util/bt.c
268
src/util/bt.c
@@ -1,268 +0,0 @@
|
||||
/**************************************************************************
|
||||
*
|
||||
* Tint2 : backtrace
|
||||
*
|
||||
* Copyright (C) 2007 Pål Staurland (staura@gmail.com)
|
||||
* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
**************************************************************************/
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "bt.h"
|
||||
#include "bool.h"
|
||||
|
||||
#if defined(HAS_BACKTRACE) || defined(HAS_LIBUNWIND) || defined(HAS_EXECINFO)
|
||||
|
||||
static void bt_add_frame(struct backtrace *bt, const char *fname)
|
||||
{
|
||||
if (bt->frame_count >= BT_MAX_FRAMES)
|
||||
return;
|
||||
struct backtrace_frame *frame = &bt->frames[bt->frame_count];
|
||||
if (fname && *fname) {
|
||||
strncpy(frame->name, fname, BT_FRAME_SIZE);
|
||||
} else {
|
||||
strncpy(frame->name, "??", BT_FRAME_SIZE);
|
||||
}
|
||||
bt->frame_count++;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef HAS_BACKTRACE
|
||||
|
||||
#include <backtrace.h>
|
||||
|
||||
static const char *get_exe()
|
||||
{
|
||||
static char buf[256] = {0};
|
||||
ssize_t ret = readlink("/proc/self/exe", buf, sizeof(buf)-1);
|
||||
if (ret > 0)
|
||||
return buf;
|
||||
ret = readlink("/proc/curproc/file", buf, sizeof(buf)-1);
|
||||
if (ret > 0)
|
||||
return buf;
|
||||
return buf;
|
||||
}
|
||||
|
||||
static void bt_error_callback(void *data, const char *msg, int errnum)
|
||||
{
|
||||
}
|
||||
|
||||
static int bt_full_callback(void *data, uintptr_t pc,
|
||||
const char *filename, int lineno,
|
||||
const char *function)
|
||||
{
|
||||
struct backtrace *bt = (struct backtrace *)data;
|
||||
bt_add_frame(bt, function);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void get_backtrace(struct backtrace *bt, int skip)
|
||||
{
|
||||
static struct backtrace_state *state = NULL;
|
||||
|
||||
if (!state) {
|
||||
const char *exe = get_exe();
|
||||
if (exe)
|
||||
state = backtrace_create_state(exe, 1, bt_error_callback, NULL);
|
||||
}
|
||||
bzero(bt, sizeof(*bt));
|
||||
if (state) {
|
||||
backtrace_full(state, skip + 1, bt_full_callback, bt_error_callback, bt);
|
||||
}
|
||||
}
|
||||
|
||||
#elif HAS_LIBUNWIND
|
||||
|
||||
#define UNW_LOCAL_ONLY
|
||||
#include <libunwind.h>
|
||||
|
||||
struct bt_mapping {
|
||||
unw_word_t ip;
|
||||
char fname[BT_FRAME_SIZE];
|
||||
};
|
||||
|
||||
#define BT_BUCKET_SIZE 3
|
||||
struct bt_bucket {
|
||||
struct bt_mapping mappings[BT_BUCKET_SIZE];
|
||||
};
|
||||
|
||||
struct bt_cache {
|
||||
struct bt_bucket *buckets;
|
||||
size_t count;
|
||||
size_t size;
|
||||
};
|
||||
|
||||
static unsigned oat_hash(void *key, int len)
|
||||
{
|
||||
unsigned char *p = key;
|
||||
unsigned h = 0;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
{
|
||||
h += p[i];
|
||||
h += (h << 10);
|
||||
h ^= (h >> 6);
|
||||
}
|
||||
|
||||
h += (h << 3);
|
||||
h ^= (h >> 11);
|
||||
h += (h << 15);
|
||||
|
||||
return h;
|
||||
}
|
||||
|
||||
static struct bt_bucket *cached_proc_name_bucket(struct bt_cache *cache, unw_word_t ip)
|
||||
{
|
||||
if (!cache->size)
|
||||
return NULL;
|
||||
unsigned h = oat_hash(&ip, sizeof(ip));
|
||||
return &cache->buckets[h % cache->size];
|
||||
}
|
||||
|
||||
static void bt_cache_init(struct bt_cache *cache)
|
||||
{
|
||||
if (!cache->size) {
|
||||
cache->size = 119;
|
||||
cache->buckets = calloc(cache->size, sizeof(*cache->buckets));
|
||||
if (!cache->buckets)
|
||||
cache->size = 0;
|
||||
cache->count = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void cached_proc_name_store(struct bt_cache *cache, unw_word_t ip, const char *fname);
|
||||
|
||||
static void bt_cache_rebalance(struct bt_cache *cache)
|
||||
{
|
||||
struct bt_cache bigger = {};
|
||||
bigger.size = cache->size * 2 + 1337;
|
||||
bigger.buckets = calloc(bigger.size, sizeof(*bigger.buckets));
|
||||
bigger.count = 0;
|
||||
for (size_t b = 0; b < cache->size; b++) {
|
||||
for (size_t i = 0; i < BT_BUCKET_SIZE; i++) {
|
||||
struct bt_mapping *map = &cache->buckets[b].mappings[i];
|
||||
if (map->ip) {
|
||||
cached_proc_name_store(&bigger, map->ip, map->fname);
|
||||
}
|
||||
}
|
||||
}
|
||||
free(cache->buckets);
|
||||
*cache = bigger;
|
||||
}
|
||||
|
||||
static void cached_proc_name_store(struct bt_cache *cache, unw_word_t ip, const char *fname)
|
||||
{
|
||||
bt_cache_init(cache);
|
||||
if (!cache->size)
|
||||
return;
|
||||
struct bt_bucket *bucket = cached_proc_name_bucket(cache, ip);
|
||||
bool stored = false;
|
||||
for (size_t i = 0; i < BT_BUCKET_SIZE; i++) {
|
||||
if (bucket->mappings[i].ip == ip)
|
||||
return;
|
||||
if (bucket->mappings[i].ip != 0)
|
||||
continue;
|
||||
bucket->mappings[i].ip = ip;
|
||||
strncpy(bucket->mappings[i].fname, fname, sizeof(bucket->mappings[i].fname));
|
||||
cache->count++;
|
||||
stored = true;
|
||||
break;
|
||||
}
|
||||
if (cache->count > cache->size / 4 || !stored) {
|
||||
bt_cache_rebalance(cache);
|
||||
fprintf(stderr, "tint2: proc_name cache: ratio %f, count %lu, size %lu, (%lu bytes)\n",
|
||||
cache->count / (double)cache->size,
|
||||
cache->count, (size_t)cache->size, cache->size * sizeof(*cache->buckets));
|
||||
}
|
||||
}
|
||||
|
||||
const char *cached_proc_name_get(struct bt_cache *cache, unw_word_t ip)
|
||||
{
|
||||
struct bt_bucket *bucket = cached_proc_name_bucket(cache, ip);
|
||||
if (!bucket)
|
||||
return NULL;
|
||||
for (size_t i = 0; i < BT_BUCKET_SIZE; i++) {
|
||||
if (bucket->mappings[i].ip != ip)
|
||||
continue;
|
||||
return bucket->mappings[i].fname;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void get_backtrace(struct backtrace *bt, int skip)
|
||||
{
|
||||
static struct bt_cache bt_cache = {};
|
||||
bzero(bt, sizeof(*bt));
|
||||
|
||||
unw_cursor_t cursor;
|
||||
unw_context_t context;
|
||||
unw_getcontext(&context);
|
||||
unw_init_local(&cursor, &context);
|
||||
|
||||
while (unw_step(&cursor) > 0) {
|
||||
if (skip > 0) {
|
||||
skip--;
|
||||
continue;
|
||||
}
|
||||
unw_word_t offset;
|
||||
char fname[BT_FRAME_SIZE] = {0};
|
||||
unw_word_t ip;
|
||||
unw_get_reg(&cursor, UNW_REG_IP, &ip);
|
||||
const char *fname_cached = cached_proc_name_get(&bt_cache, ip);
|
||||
if (fname_cached) {
|
||||
bt_add_frame(bt, fname_cached);
|
||||
} else {
|
||||
unw_get_proc_name(&cursor, fname, sizeof(fname), &offset);
|
||||
cached_proc_name_store(&bt_cache, ip, fname);
|
||||
bt_add_frame(bt, fname);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#elif HAS_EXECINFO
|
||||
|
||||
#include <execinfo.h>
|
||||
|
||||
void get_backtrace(struct backtrace *bt, int skip)
|
||||
{
|
||||
bzero(bt, sizeof(*bt));
|
||||
|
||||
void *array[BT_MAX_FRAMES];
|
||||
int size = backtrace(array, BT_MAX_FRAMES);
|
||||
char **strings = backtrace_symbols(array, size);
|
||||
|
||||
for (int i = 0; i < size; i++) {
|
||||
bt_add_frame(bt, strings[i]);
|
||||
}
|
||||
|
||||
free(strings);
|
||||
}
|
||||
|
||||
|
||||
#else
|
||||
|
||||
void get_backtrace(struct backtrace *bt, int skip)
|
||||
{
|
||||
bzero(bt, sizeof(*bt));
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -1,20 +0,0 @@
|
||||
#ifndef BT_H
|
||||
#define BT_H
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#define BT_FRAME_SIZE 64
|
||||
#define BT_MAX_FRAMES 64
|
||||
|
||||
struct backtrace_frame {
|
||||
char name[BT_FRAME_SIZE];
|
||||
};
|
||||
|
||||
struct backtrace {
|
||||
struct backtrace_frame frames[BT_MAX_FRAMES];
|
||||
size_t frame_count;
|
||||
};
|
||||
|
||||
void get_backtrace(struct backtrace *bt, int skip);
|
||||
|
||||
#endif // BT_H
|
||||
@@ -1,10 +0,0 @@
|
||||
#ifndef COLORS_H
|
||||
#define COLORS_H
|
||||
|
||||
#define GREEN "\033[1;32m"
|
||||
#define YELLOW "\033[1;33m"
|
||||
#define RED "\033[1;31m"
|
||||
#define BLUE "\033[1;34m"
|
||||
#define RESET "\033[0m"
|
||||
|
||||
#endif
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <glib.h>
|
||||
#include <glib/gstdio.h>
|
||||
#include "common.h"
|
||||
#include "server.h"
|
||||
#include "../server.h"
|
||||
#include <sys/wait.h>
|
||||
#include <sys/types.h>
|
||||
#include <pwd.h>
|
||||
@@ -48,10 +48,18 @@
|
||||
#include <librsvg/rsvg.h>
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_LIBUNWIND
|
||||
#define UNW_LOCAL_ONLY
|
||||
#include <libunwind.h>
|
||||
#else
|
||||
#ifdef ENABLE_EXECINFO
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include "../panel.h"
|
||||
#include "timer.h"
|
||||
#include "signals.h"
|
||||
#include "bt.h"
|
||||
|
||||
void write_string(int fd, const char *s)
|
||||
{
|
||||
@@ -75,13 +83,39 @@ void log_string(int fd, const char *s)
|
||||
|
||||
void dump_backtrace(int log_fd)
|
||||
{
|
||||
struct backtrace bt;
|
||||
get_backtrace(&bt, 1);
|
||||
#ifndef DISABLE_BACKTRACE
|
||||
log_string(log_fd, "\n" YELLOW "Backtrace:" RESET "\n");
|
||||
for (size_t i = 0; i < bt.frame_count; i++) {
|
||||
log_string(log_fd, bt.frames[i].name);
|
||||
|
||||
#ifdef ENABLE_LIBUNWIND
|
||||
unw_cursor_t cursor;
|
||||
unw_context_t context;
|
||||
unw_getcontext(&context);
|
||||
unw_init_local(&cursor, &context);
|
||||
|
||||
while (unw_step(&cursor) > 0) {
|
||||
unw_word_t offset;
|
||||
char fname[128];
|
||||
fname[0] = '\0';
|
||||
(void)unw_get_proc_name(&cursor, fname, sizeof(fname), &offset);
|
||||
log_string(log_fd, fname);
|
||||
log_string(log_fd, "\n");
|
||||
}
|
||||
#else
|
||||
#ifdef ENABLE_EXECINFO
|
||||
#define MAX_TRACE_SIZE 128
|
||||
void *array[MAX_TRACE_SIZE];
|
||||
size_t size = backtrace(array, MAX_TRACE_SIZE);
|
||||
char **strings = backtrace_symbols(array, size);
|
||||
|
||||
for (size_t i = 0; i < size; i++) {
|
||||
log_string(log_fd, strings[i]);
|
||||
log_string(log_fd, "\n");
|
||||
}
|
||||
|
||||
free(strings);
|
||||
#endif // ENABLE_EXECINFO
|
||||
#endif // ENABLE_LIBUNWIND
|
||||
#endif // DISABLE_BACKTRACE
|
||||
}
|
||||
|
||||
// sleep() returns early when signals arrive. This function does not.
|
||||
@@ -157,7 +191,7 @@ const char *signal_name(int sig)
|
||||
return "SIGSYS: Bad system call.";
|
||||
}
|
||||
static char s[64];
|
||||
snprintf(s, sizeof(s), "SIG=%d: Unknown", sig);
|
||||
sprintf(s, "SIG=%d: Unknown", sig);
|
||||
return s;
|
||||
}
|
||||
|
||||
@@ -232,7 +266,7 @@ extern char *config_path;
|
||||
int setenvd(const char *name, const int value)
|
||||
{
|
||||
char buf[256];
|
||||
snprintf(buf, sizeof(buf), "%d", value);
|
||||
sprintf(buf, "%d", value);
|
||||
return setenv(name, buf, 1);
|
||||
}
|
||||
|
||||
@@ -362,12 +396,8 @@ pid_t tint_exec(const char *command,
|
||||
// Allow children to exist after parent destruction
|
||||
setsid();
|
||||
// Run the command
|
||||
if (dir) {
|
||||
int ret = chdir(dir);
|
||||
if (ret != 0) {
|
||||
fprintf(stderr, "tint2: failed to chdir to %s\n", dir);
|
||||
}
|
||||
}
|
||||
if (dir)
|
||||
chdir(dir);
|
||||
close_all_fds();
|
||||
reset_signals();
|
||||
if (terminal) {
|
||||
@@ -431,10 +461,9 @@ char *expand_tilde(const char *s)
|
||||
{
|
||||
const gchar *home = g_get_home_dir();
|
||||
if (home && (strcmp(s, "~") == 0 || strstr(s, "~/") == s)) {
|
||||
size_t buf_size = strlen(home) + strlen(s);
|
||||
char *result = calloc(buf_size, 1);
|
||||
strlcat(result, home, buf_size);
|
||||
strlcat(result, s + 1, buf_size);
|
||||
char *result = calloc(strlen(home) + strlen(s), 1);
|
||||
strcat(result, home);
|
||||
strcat(result, s + 1);
|
||||
return result;
|
||||
} else {
|
||||
return strdup(s);
|
||||
@@ -447,16 +476,14 @@ char *contract_tilde(const char *s)
|
||||
if (!home)
|
||||
return strdup(s);
|
||||
|
||||
size_t buf_size = strlen(home) + 2;
|
||||
char *home_slash = calloc(buf_size, 1);
|
||||
strlcat(home_slash, home, buf_size);
|
||||
strlcat(home_slash, "/", buf_size);
|
||||
char *home_slash = calloc(strlen(home) + 2, 1);
|
||||
strcat(home_slash, home);
|
||||
strcat(home_slash, "/");
|
||||
|
||||
if ((strcmp(s, home) == 0 || strstr(s, home_slash) == s)) {
|
||||
size_t buf_size2 = strlen(s) - strlen(home) + 2;
|
||||
char *result = calloc(buf_size2, 1);
|
||||
strlcat(result, "~", buf_size2);
|
||||
strlcat(result, s + strlen(home), buf_size2);
|
||||
char *result = calloc(strlen(s) - strlen(home) + 2, 1);
|
||||
strcat(result, "~");
|
||||
strcat(result, s + strlen(home));
|
||||
free(home_slash);
|
||||
return result;
|
||||
} else {
|
||||
@@ -728,60 +755,27 @@ void render_image(Drawable d, int x, int y)
|
||||
XFreePixmap(server.display, pixmap);
|
||||
}
|
||||
|
||||
gboolean is_color_attribute(PangoAttribute *attr, gpointer user_data)
|
||||
void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, int font_shadow)
|
||||
{
|
||||
return attr->klass->type == PANGO_ATTR_FOREGROUND ||
|
||||
attr->klass->type == PANGO_ATTR_BACKGROUND ||
|
||||
attr->klass->type == PANGO_ATTR_UNDERLINE_COLOR ||
|
||||
attr->klass->type == PANGO_ATTR_STRIKETHROUGH_COLOR ||
|
||||
attr->klass->type == PANGO_ATTR_FOREGROUND_ALPHA ||
|
||||
attr->klass->type == PANGO_ATTR_BACKGROUND_ALPHA;
|
||||
}
|
||||
|
||||
gboolean layout_set_markup_strip_colors(PangoLayout *layout, const char *markup)
|
||||
{
|
||||
PangoAttrList *attrs = NULL;
|
||||
char *text = NULL;
|
||||
GError *error = NULL;
|
||||
if (!pango_parse_markup(markup, -1, 0, &attrs, &text, NULL, &error)) {
|
||||
g_error_free(error);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
pango_layout_set_text(layout, text, -1);
|
||||
g_free(text);
|
||||
|
||||
pango_attr_list_filter(attrs, is_color_attribute, NULL);
|
||||
pango_layout_set_attributes(layout, attrs);
|
||||
pango_attr_list_unref(attrs);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void draw_shadow(cairo_t *c, int posx, int posy, PangoLayout *shadow_layout)
|
||||
{
|
||||
const int shadow_size = 3;
|
||||
const double shadow_edge_alpha = 0.0;
|
||||
int i, j;
|
||||
for (i = -shadow_size; i <= shadow_size; i++) {
|
||||
for (j = -shadow_size; j <= shadow_size; j++) {
|
||||
cairo_set_source_rgba(c,
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
1.0 -
|
||||
(1.0 - shadow_edge_alpha) *
|
||||
sqrt((i * i + j * j) / (double)(shadow_size * shadow_size)));
|
||||
pango_cairo_update_layout(c, shadow_layout);
|
||||
cairo_move_to(c, posx + i, posy + j);
|
||||
pango_cairo_show_layout(c, shadow_layout);
|
||||
if (font_shadow) {
|
||||
const int shadow_size = 3;
|
||||
const double shadow_edge_alpha = 0.0;
|
||||
int i, j;
|
||||
for (i = -shadow_size; i <= shadow_size; i++) {
|
||||
for (j = -shadow_size; j <= shadow_size; j++) {
|
||||
cairo_set_source_rgba(c,
|
||||
0.0,
|
||||
0.0,
|
||||
0.0,
|
||||
1.0 -
|
||||
(1.0 - shadow_edge_alpha) *
|
||||
sqrt((i * i + j * j) / (double)(shadow_size * shadow_size)));
|
||||
pango_cairo_update_layout(c, layout);
|
||||
cairo_move_to(c, posx + i, posy + j);
|
||||
pango_cairo_show_layout(c, layout);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, PangoLayout *shadow_layout)
|
||||
{
|
||||
if (shadow_layout)
|
||||
draw_shadow(c, posx, posy, shadow_layout);
|
||||
cairo_set_source_rgba(c, color->rgb[0], color->rgb[1], color->rgb[2], color->alpha);
|
||||
pango_cairo_update_layout(c, layout);
|
||||
cairo_move_to(c, posx, posy);
|
||||
@@ -791,15 +785,15 @@ void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color
|
||||
Imlib_Image load_image(const char *path, int cached)
|
||||
{
|
||||
Imlib_Image image;
|
||||
static unsigned long counter = 0;
|
||||
if (debug_icons)
|
||||
fprintf(stderr, "tint2: loading icon %s\n", path);
|
||||
image = imlib_load_image(path);
|
||||
#ifdef HAVE_RSVG
|
||||
if (cached) {
|
||||
image = imlib_load_image_immediately(path);
|
||||
} else {
|
||||
image = imlib_load_image_immediately_without_cache(path);
|
||||
}
|
||||
if (!image && g_str_has_suffix(path, ".svg")) {
|
||||
char tmp_filename[128];
|
||||
snprintf(tmp_filename, sizeof(tmp_filename), "/tmp/tint2-%d-%lu.png", (int)getpid(), counter);
|
||||
counter++;
|
||||
sprintf(tmp_filename, "/tmp/tint2-%d.png", (int)getpid());
|
||||
int fd = open(tmp_filename, O_CREAT | O_EXCL, 0600);
|
||||
if (fd >= 0) {
|
||||
// We fork here because librsvg allocates memory like crazy
|
||||
@@ -821,14 +815,19 @@ Imlib_Image load_image(const char *path, int cached)
|
||||
// Parent
|
||||
close(fd);
|
||||
waitpid(pid, 0, 0);
|
||||
image = imlib_load_image_immediately(tmp_filename);
|
||||
image = imlib_load_image_immediately_without_cache(tmp_filename);
|
||||
unlink(tmp_filename);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
imlib_context_set_image(image);
|
||||
imlib_image_set_changes_on_disk();
|
||||
{
|
||||
if (cached) {
|
||||
image = imlib_load_image_immediately(path);
|
||||
} else {
|
||||
image = imlib_load_image_immediately_without_cache(path);
|
||||
}
|
||||
}
|
||||
return image;
|
||||
}
|
||||
|
||||
@@ -922,35 +921,30 @@ void clear_pixmap(Pixmap p, int x, int y, int w, int h)
|
||||
XRenderFreePicture(server.display, pict);
|
||||
}
|
||||
|
||||
void get_text_size(const PangoFontDescription *font,
|
||||
int *height,
|
||||
int *width,
|
||||
int available_height,
|
||||
int available_width,
|
||||
const char *text,
|
||||
int text_len,
|
||||
PangoWrapMode wrap,
|
||||
PangoEllipsizeMode ellipsis,
|
||||
PangoAlignment alignment,
|
||||
gboolean markup,
|
||||
double scale)
|
||||
void get_text_size2(const PangoFontDescription *font,
|
||||
int *height_ink,
|
||||
int *height,
|
||||
int *width,
|
||||
int available_height,
|
||||
int available_width,
|
||||
const char *text,
|
||||
int text_len,
|
||||
PangoWrapMode wrap,
|
||||
PangoEllipsizeMode ellipsis,
|
||||
gboolean markup)
|
||||
{
|
||||
PangoRectangle rect_ink, rect;
|
||||
|
||||
available_width = MAX(0, available_width);
|
||||
available_height = MAX(0, available_height);
|
||||
|
||||
Pixmap pmap = XCreatePixmap(server.display, server.root_win, available_height, available_width, server.depth);
|
||||
cairo_surface_t *cs =
|
||||
cairo_xlib_surface_create(server.display, pmap, server.visual, available_height, available_width);
|
||||
cairo_image_surface_create(CAIRO_FORMAT_ARGB32, available_height, available_width);
|
||||
cairo_t *c = cairo_create(cs);
|
||||
|
||||
PangoContext *context = pango_cairo_create_context(c);
|
||||
pango_cairo_context_set_resolution(context, 96 * scale);
|
||||
PangoLayout *layout = pango_layout_new(context);
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
pango_layout_set_width(layout, available_width * PANGO_SCALE);
|
||||
pango_layout_set_height(layout, available_height * PANGO_SCALE);
|
||||
pango_layout_set_alignment(layout, alignment);
|
||||
pango_layout_set_wrap(layout, wrap);
|
||||
pango_layout_set_ellipsize(layout, ellipsis);
|
||||
pango_layout_set_font_description(layout, font);
|
||||
@@ -961,63 +955,14 @@ void get_text_size(const PangoFontDescription *font,
|
||||
pango_layout_set_markup(layout, text, text_len);
|
||||
|
||||
pango_layout_get_pixel_extents(layout, &rect_ink, &rect);
|
||||
*height_ink = rect_ink.height;
|
||||
*height = rect.height;
|
||||
*width = rect.width;
|
||||
|
||||
// fprintf(stderr, "tint2: dimension : %d - %d\n", rect_ink.height, rect.height);
|
||||
|
||||
g_object_unref(layout);
|
||||
g_object_unref(context);
|
||||
cairo_destroy(c);
|
||||
cairo_surface_destroy(cs);
|
||||
XFreePixmap(server.display, pmap);
|
||||
}
|
||||
|
||||
void get_text_size2(const PangoFontDescription *font,
|
||||
int *height,
|
||||
int *width,
|
||||
int available_height,
|
||||
int available_width,
|
||||
const char *text,
|
||||
int text_len,
|
||||
PangoWrapMode wrap,
|
||||
PangoEllipsizeMode ellipsis,
|
||||
PangoAlignment alignment,
|
||||
gboolean markup,
|
||||
double scale)
|
||||
{
|
||||
get_text_size(font, height, width, available_height, available_width, text, text_len, wrap, ellipsis, alignment, markup, scale);
|
||||
|
||||
// We do multiple passes, because pango sucks
|
||||
int actual_height, actual_width, overflow = 0;
|
||||
while (true) {
|
||||
get_text_size(font, &actual_height, &actual_width, *height, *width, text, text_len, wrap, ellipsis, alignment, markup, scale);
|
||||
if (actual_height <= *height)
|
||||
break;
|
||||
if (*width >= available_width)
|
||||
break;
|
||||
overflow = 1;
|
||||
fprintf(stderr, "tint2: text overflows, recomputing: available %dx%d, computed %dx%d, actual %dx%d: %s\n",
|
||||
available_width,
|
||||
available_height,
|
||||
*width,
|
||||
*height,
|
||||
actual_width,
|
||||
actual_height,
|
||||
text);
|
||||
(*width)++;
|
||||
}
|
||||
if (overflow) {
|
||||
*height = actual_height;
|
||||
fprintf(stderr, "tint2: text final size computed as: available %dx%d, computed %dx%d, actual %dx%d: %s\n",
|
||||
available_width,
|
||||
available_height,
|
||||
*width,
|
||||
*height,
|
||||
actual_width,
|
||||
actual_height,
|
||||
text);
|
||||
}
|
||||
}
|
||||
|
||||
#if !GLIB_CHECK_VERSION(2, 34, 0)
|
||||
@@ -1166,63 +1111,3 @@ void adjust_color(Color *color, int alpha, int saturation, int brightness)
|
||||
color->rgb[1] = g / 255.;
|
||||
color->rgb[2] = b / 255.;
|
||||
}
|
||||
|
||||
void dump_image_data(const char *file_name, const char *name)
|
||||
{
|
||||
Imlib_Image image = load_image(file_name, false);
|
||||
if (!image) {
|
||||
fprintf(stderr, "tint2: Could not load image from file\n");
|
||||
return;
|
||||
}
|
||||
|
||||
gchar *header_name = g_strdup_printf("%s.h", name);
|
||||
gchar *guard = g_strdup_printf("%s_h", name);
|
||||
FILE *header = fopen(header_name, "wt");
|
||||
fprintf(header,
|
||||
"#ifndef %s\n"
|
||||
"#define %s\n"
|
||||
"\n"
|
||||
"#include <Imlib2.h>\n"
|
||||
"\n"
|
||||
"extern int %s_width;\n"
|
||||
"extern int %s_height;\n"
|
||||
"extern DATA32 %s_data[];\n"
|
||||
"\n"
|
||||
"#endif\n",
|
||||
guard,
|
||||
guard,
|
||||
name,
|
||||
name,
|
||||
name);
|
||||
fclose(header);
|
||||
g_free(guard);
|
||||
g_free(header_name);
|
||||
|
||||
imlib_context_set_image(image);
|
||||
|
||||
gchar *source_name = g_strdup_printf("%s.c", name);
|
||||
FILE *source = fopen(source_name, "wt");
|
||||
fprintf(source,
|
||||
"#include <%s.h>\n"
|
||||
"\n"
|
||||
"int %s_width = %d;\n"
|
||||
"int %s_height = %d;\n"
|
||||
"DATA32 %s_data[] = {",
|
||||
name,
|
||||
name,
|
||||
imlib_image_get_width(),
|
||||
name,
|
||||
imlib_image_get_height(),
|
||||
name);
|
||||
|
||||
size_t size = (size_t)imlib_image_get_width() * (size_t)imlib_image_get_height();
|
||||
DATA32 *data = imlib_image_get_data_for_reading_only();
|
||||
for (size_t i = 0; i < size; i++) {
|
||||
fprintf(source, "%s%u", i == 0 ? "" : ", ", data[i]);
|
||||
}
|
||||
fprintf(source, "};\n");
|
||||
fclose(source);
|
||||
g_free(source_name);
|
||||
|
||||
imlib_free_image();
|
||||
}
|
||||
|
||||
@@ -7,14 +7,17 @@
|
||||
#define COMMON_H
|
||||
|
||||
#define WM_CLASS_TINT "panel"
|
||||
#define TINT2_PANGO_SLACK 0
|
||||
|
||||
#include <glib.h>
|
||||
#include <Imlib2.h>
|
||||
#include <pango/pangocairo.h>
|
||||
#include "area.h"
|
||||
#include "colors.h"
|
||||
#include "strlcat.h"
|
||||
|
||||
#define GREEN "\033[1;32m"
|
||||
#define YELLOW "\033[1;33m"
|
||||
#define RED "\033[1;31m"
|
||||
#define BLUE "\033[1;34m"
|
||||
#define RESET "\033[0m"
|
||||
|
||||
#define MAX3(a, b, c) MAX(MAX(a, b), c)
|
||||
#define MIN3(a, b, c) MIN(MIN(a, b), c)
|
||||
@@ -114,6 +117,7 @@ void create_heuristic_mask(DATA32 *data, int w, int h);
|
||||
void render_image(Drawable d, int x, int y);
|
||||
|
||||
void get_text_size2(const PangoFontDescription *font,
|
||||
int *height_ink,
|
||||
int *height,
|
||||
int *width,
|
||||
int available_height,
|
||||
@@ -122,12 +126,9 @@ void get_text_size2(const PangoFontDescription *font,
|
||||
int text_len,
|
||||
PangoWrapMode wrap,
|
||||
PangoEllipsizeMode ellipsis,
|
||||
PangoAlignment alignment,
|
||||
gboolean markup,
|
||||
double scale);
|
||||
gboolean markup);
|
||||
|
||||
gboolean layout_set_markup_strip_colors(PangoLayout *layout, const char *markup);
|
||||
void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, PangoLayout *shadow_layout);
|
||||
void draw_text(PangoLayout *layout, cairo_t *c, int posx, int posy, Color *color, int font_shadow);
|
||||
|
||||
// Draws a rounded rectangle
|
||||
void draw_rect(cairo_t *c, double x, double y, double w, double h, double r);
|
||||
@@ -152,8 +153,6 @@ GString *tint2_g_string_replace(GString *s, const char *from, const char *to);
|
||||
|
||||
void get_image_mean_color(const Imlib_Image image, Color *mean_color);
|
||||
|
||||
void dump_image_data(const char *file_name, const char *name);
|
||||
|
||||
#define free_and_null(p) \
|
||||
{ \
|
||||
free(p); \
|
||||
|
||||
690
src/util/mem.c
690
src/util/mem.c
@@ -1,331 +1,471 @@
|
||||
#define _GNU_SOURCE
|
||||
#ifdef ENABLE_EXECINFO
|
||||
|
||||
#include <dlfcn.h>
|
||||
#include <endian.h>
|
||||
#include <fcntl.h>
|
||||
#include <execinfo.h>
|
||||
#include <pthread.h>
|
||||
#include <stdc-predef.h>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/mman.h>
|
||||
#include <limits.h>
|
||||
#include <signal.h>
|
||||
#include <zlib.h>
|
||||
|
||||
#include "bt.h"
|
||||
#include "bool.h"
|
||||
#include "addr2line.h"
|
||||
#include "mem.h"
|
||||
#include "print.h"
|
||||
|
||||
#define UNUSED(x) ((void)x)
|
||||
#ifndef RTLD_NEXT
|
||||
# define RTLD_NEXT ((void *) -1l)
|
||||
#endif
|
||||
|
||||
void ERR(const char *s)
|
||||
#ifndef thread_local
|
||||
# if __STDC_VERSION__ >= 201112 && !defined __STDC_NO_THREADS__
|
||||
# define thread_local _Thread_local
|
||||
# elif defined _WIN32 && ( \
|
||||
defined _MSC_VER || \
|
||||
defined __ICL || \
|
||||
defined __DMC__ || \
|
||||
defined __BORLANDC__ )
|
||||
# define thread_local __declspec(thread)
|
||||
/* note that ICC (linux) and Clang are covered by __GNUC__ */
|
||||
# elif defined __GNUC__ || \
|
||||
defined __SUNPRO_C || \
|
||||
defined __xlC__
|
||||
# define thread_local __thread
|
||||
# else
|
||||
# error "Cannot define thread_local"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#define get_caller() __builtin_extract_return_addr(__builtin_return_address(0))
|
||||
|
||||
#define size_t_mul_overflow(a, b) (a > 0 && b > SIZE_MAX / a)
|
||||
|
||||
typedef struct ListItem {
|
||||
struct ListItem *next;
|
||||
struct ListItem *prev;
|
||||
void *data;
|
||||
} ListItem;
|
||||
|
||||
typedef struct List {
|
||||
ListItem *head;
|
||||
ListItem *tail;
|
||||
} List;
|
||||
|
||||
void list_append(List *list, void *data)
|
||||
{
|
||||
if (!s) {
|
||||
ERR("(null)");
|
||||
ListItem *n = (ListItem*)calloc(1, sizeof(ListItem));
|
||||
n->data = data;
|
||||
if (!list->tail) {
|
||||
list->head = list->tail = n;
|
||||
} else {
|
||||
list->tail->next = n;
|
||||
n->prev = list->tail;
|
||||
list->tail = list->tail->next;
|
||||
}
|
||||
}
|
||||
|
||||
typedef size_t (*HashFunc)(void *data);
|
||||
typedef int (*EqualFunc)(void *data1, void *data2);
|
||||
typedef void *(*CopyFunc)(void *data);
|
||||
|
||||
typedef struct HashTable {
|
||||
List *buckets;
|
||||
size_t num_buckets;
|
||||
size_t (*hash_func)(void *data);
|
||||
int (*equal_func)(void *data1, void *data2);
|
||||
void *(*copy_func)(void *data);
|
||||
} HashTable;
|
||||
|
||||
size_t hash_void(void *data)
|
||||
{
|
||||
return (size_t)data;
|
||||
}
|
||||
|
||||
int equal_void(void *data1, void *data2)
|
||||
{
|
||||
return data1 == data2;
|
||||
}
|
||||
|
||||
void *copy_void(void *data)
|
||||
{
|
||||
return data;
|
||||
}
|
||||
|
||||
void hash_table_init(HashTable *table, size_t num_buckets, HashFunc hash_func, EqualFunc equal_func, CopyFunc copy_func)
|
||||
{
|
||||
if (table->buckets)
|
||||
return;
|
||||
if (num_buckets < 1)
|
||||
num_buckets = 4096;
|
||||
table->num_buckets = num_buckets;
|
||||
table->buckets = (List*)calloc(table->num_buckets, sizeof(List));
|
||||
table->hash_func = hash_func ? hash_func : hash_void;
|
||||
table->equal_func = equal_func ? equal_func : equal_void;
|
||||
table->copy_func = copy_func ? copy_func : copy_void;
|
||||
}
|
||||
|
||||
void *hash_table_add(HashTable *table, void *data)
|
||||
{
|
||||
size_t hash = table->hash_func(data);
|
||||
size_t bucket = hash % table->num_buckets;
|
||||
for (ListItem *existing = table->buckets[bucket].head; existing; existing = existing->next) {
|
||||
if (table->equal_func(existing->data, data))
|
||||
return existing->data;
|
||||
}
|
||||
ssize_t ret = write(STDERR_FILENO, s, strlen(s));
|
||||
UNUSED(ret);
|
||||
ret = fsync(STDERR_FILENO);
|
||||
UNUSED(ret);
|
||||
list_append(&table->buckets[bucket], table->copy_func(data));
|
||||
return data;
|
||||
}
|
||||
|
||||
void utoa(unsigned long n, char *s)
|
||||
#define MAX_TRACE_SIZE 120
|
||||
|
||||
typedef struct Trace {
|
||||
void *entries[MAX_TRACE_SIZE+8];
|
||||
size_t id;
|
||||
} Trace;
|
||||
|
||||
#define LARGE_THRESH (10 * 1024 * 1024)
|
||||
|
||||
static void *(*calloc_original)(size_t count, size_t size) = NULL;
|
||||
static void *(*realloc_original)(void *p, size_t size) = NULL;
|
||||
static void *(*malloc_original)(size_t size) = NULL;
|
||||
static void *(*free_original)(void *p) = NULL;
|
||||
static gzFile mem_log = NULL;
|
||||
static pid_t mem_log_owner = 0;
|
||||
pthread_mutex_t log_mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
||||
static HashTable traces;
|
||||
static size_t next_trace_id = 0;
|
||||
pthread_mutex_t trace_mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
||||
static HashTable addr2lines;
|
||||
pthread_mutex_t addr2lines_mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
||||
thread_local int paused = 0;
|
||||
|
||||
static double get_unix_time()
|
||||
{
|
||||
if (n == 0) {
|
||||
*s++ = '0';
|
||||
*s = 0;
|
||||
return;
|
||||
struct timeval tv;
|
||||
if (gettimeofday(&tv, NULL) != 0)
|
||||
return 0;
|
||||
return tv.tv_sec + 1.0e-6 * tv.tv_usec;
|
||||
}
|
||||
|
||||
__attribute__ ((noinline))
|
||||
static void get_backtrace(Trace *trace) {
|
||||
int size = backtrace(trace->entries, MAX_TRACE_SIZE);
|
||||
trace->entries[size] = NULL;
|
||||
for (void **p = trace->entries; *p; p++) {
|
||||
*p = *(p+2);
|
||||
}
|
||||
char buffer[128] = {0};
|
||||
char *digit;
|
||||
for (digit = buffer; n; digit++, n/=10) {
|
||||
*digit = '0' + (n % 10);
|
||||
trace->id = 0;
|
||||
}
|
||||
|
||||
int trace_size(Trace *trace)
|
||||
{
|
||||
int size = 0;
|
||||
for (void **p = trace->entries; *p; p++) {
|
||||
size++;
|
||||
}
|
||||
digit--;
|
||||
while (digit >= buffer) {
|
||||
*s++ = *digit--;
|
||||
return size;
|
||||
}
|
||||
|
||||
typedef struct FilenameLookup {
|
||||
char *file_name;
|
||||
Lookup *lookup;
|
||||
} FilenameLookup;
|
||||
|
||||
size_t hash_lookup(void *data)
|
||||
{
|
||||
FilenameLookup *lookup = (FilenameLookup *)data;
|
||||
size_t seed = 14695981039346656037ULL;
|
||||
size_t hash = seed;
|
||||
for (char *p = lookup->file_name; *p; p++) {
|
||||
hash = (hash ^ (size_t)(*p)) * 1099511628211ULL;
|
||||
}
|
||||
*s = 0;
|
||||
return hash;
|
||||
}
|
||||
|
||||
unsigned long uabs(long n)
|
||||
int equal_lookup(void *data1, void *data2)
|
||||
{
|
||||
if (n == LONG_MIN)
|
||||
return ((unsigned long)LONG_MAX) + 1;
|
||||
return (unsigned long)labs(n);
|
||||
FilenameLookup *lookup1 = (FilenameLookup *)data1;
|
||||
FilenameLookup *lookup2 = (FilenameLookup *)data2;
|
||||
return strcmp(lookup1->file_name, lookup2->file_name) == 0;
|
||||
}
|
||||
|
||||
void itoa(long n, char *s)
|
||||
char *resolve_symbol(char *file_name, void *address)
|
||||
{
|
||||
if (n < 0) {
|
||||
*s++ = '-';
|
||||
FilenameLookup *lookup = (FilenameLookup *)calloc(1, sizeof(FilenameLookup));
|
||||
lookup->file_name = strdup(file_name);
|
||||
|
||||
pthread_mutex_lock(&addr2lines_mutex);
|
||||
hash_table_init(&addr2lines, 0, hash_lookup, equal_lookup, NULL);
|
||||
FilenameLookup *existing = (FilenameLookup *)hash_table_add(&addr2lines, lookup);
|
||||
if (existing == lookup) {
|
||||
lookup->lookup = addr2line_init(lookup->file_name);
|
||||
} else {
|
||||
free(lookup->file_name);
|
||||
free(lookup);
|
||||
}
|
||||
utoa(uabs(n), s);
|
||||
}
|
||||
|
||||
__attribute__((noreturn))
|
||||
static void crash(char *file, int line, char *msg)
|
||||
{
|
||||
ERR(file);
|
||||
ERR(":");
|
||||
char buf[256];
|
||||
itoa(line, buf);
|
||||
ERR(buf);
|
||||
ERR(" ");
|
||||
ERR(msg);
|
||||
_exit(1);
|
||||
}
|
||||
|
||||
#define ASSERT_OK(call) if (0 != (call)) crash(__FILE__, __LINE__, #call)
|
||||
#define ASSERT_FD(fd) if ((fd) == -1) crash(__FILE__, __LINE__, "bad file descriptor")
|
||||
#define ASSERT_PID(pid) if ((pid) == -1) crash(__FILE__, __LINE__, "bad PID")
|
||||
#define ASSERT(b) if (!(b)) crash(__FILE__, __LINE__, "assert failed")
|
||||
|
||||
void *return_null(void *x, void *y)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void load_func_or_crash(void **result, const char *name)
|
||||
{
|
||||
static int inside_loader = 0;
|
||||
if (inside_loader) {
|
||||
*result = (void*)return_null;
|
||||
return;
|
||||
} else if (*result == (void*)return_null) {
|
||||
*result = 0;
|
||||
}
|
||||
if (*result)
|
||||
return;
|
||||
dlerror();
|
||||
inside_loader++;
|
||||
*result = dlsym(RTLD_NEXT, name);
|
||||
inside_loader--;
|
||||
char *err = dlerror();
|
||||
if (err) {
|
||||
ERR("Failed to load ");
|
||||
ERR(name);
|
||||
ERR(" error: ");
|
||||
ERR(err);
|
||||
ERR("\n");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
static int fd = -1;
|
||||
static u_int64_t tstart = 0;
|
||||
static bool stop_alloc_log = false;
|
||||
|
||||
static void write_char(char c)
|
||||
{
|
||||
static char buffer[4096] = {0};
|
||||
static size_t count = 0;
|
||||
if (c) {
|
||||
buffer[count++] = c;
|
||||
}
|
||||
if (!count)
|
||||
return;
|
||||
if (c == '\n' || c == 0 || count >= sizeof(buffer)) {
|
||||
ssize_t ret = write(fd, buffer, count);
|
||||
ASSERT(ret > 0);
|
||||
count = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void write_string(const char *s)
|
||||
{
|
||||
for (; *s; s++)
|
||||
write_char(*s);
|
||||
}
|
||||
|
||||
static void write_word(const char *s)
|
||||
{
|
||||
write_string(s);
|
||||
write_string(" ");
|
||||
}
|
||||
|
||||
static char hex(u_int8_t value)
|
||||
{
|
||||
if (value < 10)
|
||||
return '0' + (char)value;
|
||||
return 'a' + (char)(value - 10);
|
||||
}
|
||||
|
||||
static void write_hex(u_int64_t v)
|
||||
{
|
||||
write_string("0x");
|
||||
if (!v) {
|
||||
write_string("0 ");
|
||||
return;
|
||||
}
|
||||
v = htobe64(v);
|
||||
int leading_zero = 1;
|
||||
while (v) {
|
||||
u_int8_t byte = v & 0xff;
|
||||
if (byte)
|
||||
leading_zero = 0;
|
||||
if (!leading_zero) {
|
||||
write_char(hex(byte >> 4));
|
||||
write_char(hex(byte & 0xf));
|
||||
}
|
||||
v = v >> 8;
|
||||
}
|
||||
write_string(" ");
|
||||
}
|
||||
|
||||
static void write_backtrace(int skip)
|
||||
{
|
||||
struct backtrace bt;
|
||||
get_backtrace(&bt, skip + 1);
|
||||
for (size_t i = 0; i < bt.frame_count; i++) {
|
||||
write_word(bt.frames[i].name);
|
||||
}
|
||||
}
|
||||
|
||||
static void log_alloc_finish(void);
|
||||
|
||||
static u_int64_t current_time_ms()
|
||||
{
|
||||
struct timespec t = {0, 0};
|
||||
clock_gettime(CLOCK_MONOTONIC, &t);
|
||||
u_int64_t result = t.tv_sec * 1000 + t.tv_nsec / 1000 / 1000;
|
||||
char *result = addr2line_lookup(existing->lookup, address);
|
||||
pthread_mutex_unlock(&addr2lines_mutex);
|
||||
return result;
|
||||
}
|
||||
|
||||
static void log_alloc_init(u_int64_t t)
|
||||
char *backtrace_to_string(Trace *trace)
|
||||
{
|
||||
if (stop_alloc_log)
|
||||
return;
|
||||
if (fd == -1) {
|
||||
int pfd[2] = {-1, -1};
|
||||
ASSERT_OK(pipe(pfd));
|
||||
pid_t child = fork();
|
||||
ASSERT_PID(child);
|
||||
if (child == 0) {
|
||||
// child
|
||||
close(pfd[1]);
|
||||
ASSERT_FD(dup2(pfd[0], STDIN_FILENO));
|
||||
ASSERT_OK(close(pfd[0]));
|
||||
int out = open("mem.log.gz", O_APPEND | O_CLOEXEC | O_CREAT | O_WRONLY | O_TRUNC, 0600);
|
||||
ASSERT_FD(out);
|
||||
ASSERT_FD(dup2(out, STDOUT_FILENO));
|
||||
sigset_t mask;
|
||||
sigfillset(&mask);
|
||||
sigprocmask(SIG_SETMASK, &mask, NULL);
|
||||
ASSERT_OK(execlp("gzip", "gzip", "-c", NULL));
|
||||
_exit(1);
|
||||
} else {
|
||||
// parent
|
||||
close(pfd[0]);
|
||||
fd = pfd[1];
|
||||
int size = trace_size(trace);
|
||||
char **strings = backtrace_symbols(trace->entries, size);
|
||||
if (!strings)
|
||||
return NULL;
|
||||
Buffer *buffer = NULL;
|
||||
buffer = buffer_printf(buffer, "t %lu ", trace->id);
|
||||
for (int i = 0; i < size; i++) {
|
||||
buffer = buffer_printf(buffer, "%s", strings[i]);
|
||||
// /lib/x86_64-linux-gnu/libglib-2.0.so.0(g_realloc+0xf) [0x7efda85c96af]
|
||||
char *func_start = strstr(strings[i], "(");
|
||||
if (func_start) {
|
||||
*func_start = 0;
|
||||
char *file_name = strings[i];
|
||||
char *resolved = resolve_symbol(file_name, trace->entries[i]);
|
||||
if (resolved) {
|
||||
buffer = buffer_printf(buffer, " %s", resolved);
|
||||
free(resolved);
|
||||
}
|
||||
}
|
||||
atexit(log_alloc_finish);
|
||||
tstart = t;
|
||||
write_string("# function time_ms result ptr size count backtrace\n");
|
||||
buffer = buffer_printf(buffer, "|");
|
||||
}
|
||||
free(strings);
|
||||
buffer = buffer_printf(buffer, "\n");
|
||||
return buffer->data;
|
||||
}
|
||||
|
||||
static void log_alloc_locked(const char *func_name, void *result, void *ptr, size_t size, size_t count)
|
||||
static size_t hash_trace(Trace *trace)
|
||||
{
|
||||
if (stop_alloc_log)
|
||||
return;
|
||||
u_int64_t t = current_time_ms();
|
||||
if (fd == -1)
|
||||
log_alloc_init(t);
|
||||
if (fd == -1)
|
||||
return;
|
||||
if (func_name) {
|
||||
write_word(func_name);
|
||||
write_hex((u_int64_t)(t - tstart));
|
||||
write_hex((u_int64_t)result);
|
||||
write_hex((u_int64_t)ptr);
|
||||
write_hex((u_int64_t)size);
|
||||
write_hex((u_int64_t)count);
|
||||
write_backtrace(2);
|
||||
write_string("\n");
|
||||
size_t seed = 14695981039346656037ULL;
|
||||
size_t hash = seed;
|
||||
for (void **p = trace->entries; *p; p++) {
|
||||
hash = (hash ^ (size_t)(*p)) * 1099511628211ULL;
|
||||
}
|
||||
return hash;
|
||||
}
|
||||
|
||||
static int equal_traces(Trace *a, Trace *b)
|
||||
{
|
||||
void **pa, **pb;
|
||||
for (pa = a->entries, pb = b->entries; *pa && *pb; pa++, pb++) {
|
||||
if (*pa != *pb)
|
||||
return 0;
|
||||
}
|
||||
if (*pa || *pb)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static Trace *copy_trace(Trace *trace)
|
||||
{
|
||||
Trace *result = (Trace*)calloc(1, sizeof(Trace));
|
||||
*result = *trace;
|
||||
return result;
|
||||
}
|
||||
|
||||
static int trace_assign_id(Trace *trace)
|
||||
{
|
||||
int created = 0;
|
||||
pthread_mutex_lock(&trace_mutex);
|
||||
hash_table_init(&traces, 1024 * 1024, (HashFunc)hash_trace, (EqualFunc)equal_traces, (CopyFunc)copy_trace);
|
||||
trace->id = 0;
|
||||
Trace *existing = (Trace*)hash_table_add(&traces, trace);
|
||||
if (!existing->id) {
|
||||
next_trace_id++;
|
||||
existing->id = trace->id = next_trace_id;
|
||||
created = 1;
|
||||
} else {
|
||||
write_string("# done\n");
|
||||
close(fd);
|
||||
fd = -1;
|
||||
stop_alloc_log = true;
|
||||
trace->id = existing->id;
|
||||
}
|
||||
pthread_mutex_unlock(&trace_mutex);
|
||||
return created;
|
||||
}
|
||||
|
||||
static void log_flush();
|
||||
|
||||
static void log_init()
|
||||
{
|
||||
char path[256];
|
||||
sprintf(path, "/tmp/tint2.%lu.memtrace", (size_t)getpid());
|
||||
pthread_mutex_lock(&log_mutex);
|
||||
if (!mem_log) {
|
||||
mem_log = gzopen(path, "w");
|
||||
mem_log_owner = getpid();
|
||||
atexit(log_flush);
|
||||
}
|
||||
pthread_mutex_unlock(&log_mutex);
|
||||
if (mem_log)
|
||||
fprintf(stderr, "Writing memory log to %s\n", path);
|
||||
}
|
||||
|
||||
static void log_write(char *buffer)
|
||||
{
|
||||
if (mem_log) {
|
||||
pthread_mutex_lock(&log_mutex);
|
||||
if (getpid() == mem_log_owner)
|
||||
gzwrite(mem_log, buffer, (unsigned)strlen(buffer));
|
||||
pthread_mutex_unlock(&log_mutex);
|
||||
}
|
||||
}
|
||||
|
||||
static int pid = -1;
|
||||
static void log_alloc(const char *func_name, void *result, void *ptr, size_t size, size_t count)
|
||||
static void log_flush()
|
||||
{
|
||||
static pthread_mutex_t mutex_global = PTHREAD_MUTEX_INITIALIZER;
|
||||
static pthread_mutex_t mutex_recursive;
|
||||
static pthread_mutex_t mutex_nonrecursive = PTHREAD_MUTEX_INITIALIZER;
|
||||
static bool mutexes_initialized = false;
|
||||
if (mem_log) {
|
||||
pthread_mutex_lock(&log_mutex);
|
||||
if (getpid() == mem_log_owner)
|
||||
gzflush(mem_log, Z_SYNC_FLUSH);
|
||||
pthread_mutex_unlock(&log_mutex);
|
||||
}
|
||||
}
|
||||
|
||||
pthread_mutex_lock(&mutex_global);
|
||||
{
|
||||
if (!mutexes_initialized) {
|
||||
pthread_mutexattr_t attr;
|
||||
pthread_mutexattr_init(&attr);
|
||||
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
|
||||
pthread_mutex_init(&mutex_recursive, &attr);
|
||||
mutexes_initialized = true;
|
||||
pid = getpid();
|
||||
static void malloc_profile_load_pointers()
|
||||
{
|
||||
realloc_original = dlsym(RTLD_NEXT, "realloc");
|
||||
malloc_original = dlsym(RTLD_NEXT, "malloc");
|
||||
calloc_original = dlsym(RTLD_NEXT, "calloc");
|
||||
free_original = dlsym(RTLD_NEXT, "free");
|
||||
int trace_mem = getenv("TRACE_MEM") != NULL;
|
||||
if (trace_mem)
|
||||
log_init();
|
||||
else
|
||||
paused = 1;
|
||||
}
|
||||
|
||||
void *calloc(size_t count, size_t size)
|
||||
{
|
||||
if (paused)
|
||||
return calloc_original ? calloc_original(count, size) : 0;
|
||||
paused = 1;
|
||||
if (!calloc_original) {
|
||||
malloc_profile_load_pointers();
|
||||
if (!calloc_original)
|
||||
return NULL;
|
||||
}
|
||||
void *result = calloc_original(count, size);
|
||||
if (mem_log) {
|
||||
Trace trace;
|
||||
get_backtrace(&trace);
|
||||
int created = trace_assign_id(&trace);
|
||||
if (created) {
|
||||
char *str = backtrace_to_string(&trace);
|
||||
if (str) {
|
||||
log_write(str);
|
||||
free(str);
|
||||
}
|
||||
}
|
||||
char buffer[1024];
|
||||
sprintf(buffer, "[%f] t %lu : %p = c %lu %lu\n", get_unix_time(), trace.id, result, count, size);
|
||||
log_write(buffer);
|
||||
if (size_t_mul_overflow(count, size) || (count * size) > LARGE_THRESH)
|
||||
log_flush();
|
||||
}
|
||||
pthread_mutex_unlock(&mutex_global);
|
||||
|
||||
// Do not log from forked processes.
|
||||
if (pid != getpid())
|
||||
return;
|
||||
|
||||
pthread_mutex_lock(&mutex_recursive);
|
||||
int ret = pthread_mutex_trylock(&mutex_nonrecursive);
|
||||
if (ret == 0) {
|
||||
log_alloc_locked(func_name, result, ptr, size, count);
|
||||
pthread_mutex_unlock(&mutex_nonrecursive);
|
||||
}
|
||||
pthread_mutex_unlock(&mutex_recursive);
|
||||
paused = 0;
|
||||
return result;
|
||||
}
|
||||
|
||||
static void log_alloc_finish()
|
||||
void *realloc(void *p, size_t size)
|
||||
{
|
||||
log_alloc(0, 0, 0, 0, 0);
|
||||
if (paused)
|
||||
return realloc_original ? realloc_original(p, size) : 0;
|
||||
paused = 1;
|
||||
if (!realloc_original) {
|
||||
malloc_profile_load_pointers();
|
||||
if (!realloc_original)
|
||||
return NULL;
|
||||
}
|
||||
void *result = realloc_original(p, size);
|
||||
if (mem_log) {
|
||||
Trace trace;
|
||||
get_backtrace(&trace);
|
||||
int created = trace_assign_id(&trace);
|
||||
if (created) {
|
||||
char *str = backtrace_to_string(&trace);
|
||||
if (str) {
|
||||
log_write(str);
|
||||
free(str);
|
||||
}
|
||||
}
|
||||
char buffer[1024];
|
||||
sprintf(buffer, "[%f] t %lu : %p = r %p %lu\n", get_unix_time(), trace.id, result, p, size);
|
||||
log_write(buffer);
|
||||
if (size > LARGE_THRESH)
|
||||
log_flush();
|
||||
}
|
||||
paused = 0;
|
||||
return result;
|
||||
}
|
||||
|
||||
void *malloc(size_t size)
|
||||
{
|
||||
static void *(*original)(size_t size) = 0;
|
||||
load_func_or_crash((void *)&original, __FUNCTION__);
|
||||
void *result = original(size);
|
||||
log_alloc(__FUNCTION__, result, 0, size, 0);
|
||||
if (paused)
|
||||
return malloc_original ? malloc_original(size) : 0;
|
||||
paused = 1;
|
||||
if (!malloc_original) {
|
||||
malloc_profile_load_pointers();
|
||||
if (!malloc_original)
|
||||
return NULL;
|
||||
}
|
||||
void *result = malloc_original(size);
|
||||
if (mem_log) {
|
||||
Trace trace;
|
||||
get_backtrace(&trace);
|
||||
int created = trace_assign_id(&trace);
|
||||
if (created) {
|
||||
char *str = backtrace_to_string(&trace);
|
||||
if (str) {
|
||||
log_write(str);
|
||||
free(str);
|
||||
}
|
||||
}
|
||||
char buffer[1024];
|
||||
sprintf(buffer, "[%f] t %lu : %p = m %lu\n", get_unix_time(), trace.id, result, size);
|
||||
log_write(buffer);
|
||||
if (size > LARGE_THRESH)
|
||||
log_flush();
|
||||
}
|
||||
paused = 0;
|
||||
return result;
|
||||
}
|
||||
|
||||
void *realloc(void *ptr, size_t size)
|
||||
void free(void *p)
|
||||
{
|
||||
static void *(*original)(void *p, size_t size) = 0;
|
||||
load_func_or_crash((void *)&original, __FUNCTION__);
|
||||
void *result = original(ptr, size);
|
||||
log_alloc(__FUNCTION__, result, ptr, size, 0);
|
||||
return result;
|
||||
}
|
||||
|
||||
void *calloc(size_t nmemb, size_t size)
|
||||
{
|
||||
static void *(*original)(size_t nmemb, size_t size) = 0;
|
||||
load_func_or_crash((void *)&original, __FUNCTION__);
|
||||
void *result = original(nmemb, size);
|
||||
log_alloc(__FUNCTION__, result, 0, size, nmemb);
|
||||
return result;
|
||||
}
|
||||
|
||||
void free(void *ptr)
|
||||
{
|
||||
static void *(*original)(void *p) = 0;
|
||||
load_func_or_crash((void *)&original, __FUNCTION__);
|
||||
if (!original) {
|
||||
if (paused) {
|
||||
if (free_original)
|
||||
free_original(p);
|
||||
return;
|
||||
}
|
||||
original(ptr);
|
||||
log_alloc(__FUNCTION__, 0, ptr, 0, 0);
|
||||
paused = 1;
|
||||
if (!free_original) {
|
||||
malloc_profile_load_pointers();
|
||||
if (!free_original)
|
||||
return;
|
||||
}
|
||||
free_original(p);
|
||||
if (mem_log) {
|
||||
Trace trace;
|
||||
get_backtrace(&trace);
|
||||
int created = trace_assign_id(&trace);
|
||||
if (created) {
|
||||
char *str = backtrace_to_string(&trace);
|
||||
if (str) {
|
||||
log_write(str);
|
||||
free(str);
|
||||
}
|
||||
}
|
||||
char buffer[1024];
|
||||
sprintf(buffer, "[%f] t %lu : 0 = f %p\n", get_unix_time(), trace.id, p);
|
||||
log_write(buffer);
|
||||
}
|
||||
paused = 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
4
src/util/mem.h
Normal file
4
src/util/mem.h
Normal file
@@ -0,0 +1,4 @@
|
||||
#ifndef MEM_H
|
||||
#define MEM_H
|
||||
|
||||
#endif
|
||||
103
src/util/print.c
103
src/util/print.c
@@ -1,83 +1,40 @@
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "print.h"
|
||||
|
||||
int print_uchar(unsigned char v)
|
||||
Buffer *vbuffer_printf(Buffer *buffer, const char *fmt, va_list ap)
|
||||
{
|
||||
return printf("%u", v);
|
||||
va_list ap1;
|
||||
va_copy(ap1, ap);
|
||||
int ret = vsnprintf(NULL, 0, fmt, ap1) + 1;
|
||||
va_end(ap1);
|
||||
if (ret < 1)
|
||||
return buffer;
|
||||
|
||||
size_t size = (size_t)ret;
|
||||
if (!buffer)
|
||||
buffer = (Buffer*)calloc(1, sizeof(Buffer));
|
||||
if (!buffer->data) {
|
||||
buffer->size = 2 * size + 128;
|
||||
buffer->data = (char*) calloc(buffer->size, 1);
|
||||
} else if (strlen(buffer->data) + size >= buffer->size + 1) {
|
||||
buffer->size = 2 * (size + buffer->size) + 128;
|
||||
buffer->data = (char*) realloc(buffer->data, buffer->size);
|
||||
}
|
||||
|
||||
vsnprintf(buffer->data + strlen(buffer->data), size, fmt, ap);
|
||||
return buffer;
|
||||
}
|
||||
|
||||
int print_char(char v)
|
||||
Buffer *buffer_printf(Buffer *buffer, const char *fmt, ...)
|
||||
{
|
||||
return printf("%c", v);
|
||||
}
|
||||
va_list ap;
|
||||
|
||||
int print_short(short v)
|
||||
{
|
||||
return printf("%d", v);
|
||||
}
|
||||
va_start(ap, fmt);
|
||||
buffer = vbuffer_printf(buffer, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
int print_ushort(unsigned short v)
|
||||
{
|
||||
return printf("%u", v);
|
||||
}
|
||||
|
||||
int print_int(int v)
|
||||
{
|
||||
return printf("%d", v);
|
||||
}
|
||||
|
||||
int print_uint(unsigned v)
|
||||
{
|
||||
return printf("%u", v);
|
||||
}
|
||||
|
||||
int print_long(long v)
|
||||
{
|
||||
return printf("%ld", v);
|
||||
}
|
||||
|
||||
int print_ulong(unsigned long v)
|
||||
{
|
||||
return printf("%lu", v);
|
||||
}
|
||||
|
||||
int print_long_long(long long v)
|
||||
{
|
||||
return printf("%lld", v);
|
||||
}
|
||||
|
||||
int print_ulong_long(unsigned long long v)
|
||||
{
|
||||
return printf("%llu", v);
|
||||
}
|
||||
|
||||
int print_float(float v)
|
||||
{
|
||||
return printf("%f", (double)v);
|
||||
}
|
||||
|
||||
int print_double(double v)
|
||||
{
|
||||
return printf("%f", v);
|
||||
}
|
||||
|
||||
int print_long_double(long double v)
|
||||
{
|
||||
return printf("%Lf", v);
|
||||
}
|
||||
|
||||
int print_string(char *s)
|
||||
{
|
||||
return printf("%s", s);
|
||||
}
|
||||
|
||||
int print_pointer(void *v)
|
||||
{
|
||||
return printf("%p", v);
|
||||
}
|
||||
|
||||
int print_unknown()
|
||||
{
|
||||
return printf("(variable of unknown type)");
|
||||
return buffer;
|
||||
}
|
||||
|
||||
@@ -1,61 +1,16 @@
|
||||
#ifndef PRINT_H
|
||||
#define PRINT_H
|
||||
|
||||
#ifdef HAS_GENERIC
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
int print_uchar(unsigned char v);
|
||||
typedef struct Buffer {
|
||||
char *data;
|
||||
size_t size;
|
||||
} Buffer;
|
||||
|
||||
int print_char(char v);
|
||||
|
||||
int print_short(short v);
|
||||
|
||||
int print_ushort(unsigned short v);
|
||||
|
||||
int print_int(int v);
|
||||
|
||||
int print_uint(unsigned v);
|
||||
|
||||
int print_long(long v);
|
||||
|
||||
int print_ulong(unsigned long v);
|
||||
|
||||
int print_long_long(long long v);
|
||||
|
||||
int print_ulong_long(unsigned long long v);
|
||||
|
||||
int print_float(float v);
|
||||
|
||||
int print_double(double v);
|
||||
|
||||
int print_long_double(long double v);
|
||||
|
||||
int print_string(char *s);
|
||||
|
||||
int print_pointer(void *v);
|
||||
|
||||
int print_unknown();
|
||||
|
||||
#define print(x) \
|
||||
_Generic((x), \
|
||||
unsigned char: print_uchar, \
|
||||
char: print_char, \
|
||||
short int: print_short, \
|
||||
unsigned short int: print_ushort, \
|
||||
int: print_int, \
|
||||
unsigned int: print_uint, \
|
||||
long int: print_long, \
|
||||
unsigned long int: print_ulong, \
|
||||
long long int: print_long_long, \
|
||||
unsigned long long int: print_ulong_long, \
|
||||
float: print_float, \
|
||||
double: print_double, \
|
||||
long double: print_long_double, \
|
||||
char *: print_string, \
|
||||
void *: print_pointer, \
|
||||
default : print_unknown)(x)
|
||||
|
||||
#else
|
||||
#define print(...) printf("Omitted, the compiler does not support C11 generics.\n")
|
||||
#endif
|
||||
Buffer *vbuffer_printf(Buffer *buffer, const char *fmt, va_list ap);
|
||||
Buffer *buffer_printf(Buffer *buffer, const char *fmt, ...);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
/* $NetBSD: strlcat.c,v 1.4 2005/05/16 06:55:48 lukem Exp $ */
|
||||
/* from NetBSD: strlcat.c,v 1.16 2003/10/27 00:12:42 lukem Exp */
|
||||
/* from OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
|
||||
* WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
|
||||
* FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
||||
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
||||
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "strlcat.h"
|
||||
|
||||
/*
|
||||
* Appends src to string dst of size siz (unlike strncat, siz is the
|
||||
* full size of dst, not space left). At most siz-1 characters
|
||||
* will be copied. Always NUL terminates (unless siz <= strlen(dst)).
|
||||
* Returns strlen(src) + MIN(siz, strlen(initial dst)).
|
||||
* If retval >= siz, truncation occurred.
|
||||
*/
|
||||
size_t
|
||||
strlcat(char *dst, const char *src, size_t siz)
|
||||
{
|
||||
char *d = dst;
|
||||
const char *s = src;
|
||||
size_t n = siz;
|
||||
size_t dlen;
|
||||
|
||||
/* Find the end of dst and adjust bytes left but don't go past end */
|
||||
while (n-- != 0 && *d != '\0')
|
||||
d++;
|
||||
dlen = d - dst;
|
||||
n = siz - dlen;
|
||||
|
||||
if (n == 0)
|
||||
return(dlen + strlen(s));
|
||||
while (*s != '\0') {
|
||||
if (n != 1) {
|
||||
*d++ = *s;
|
||||
n--;
|
||||
}
|
||||
s++;
|
||||
}
|
||||
*d = '\0';
|
||||
|
||||
return(dlen + (s - src)); /* count does not include NUL */
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
#ifndef STRLCAT_H
|
||||
#define STRLCAT_H
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
/*
|
||||
* Appends src to string dst of size siz (unlike strncat, siz is the
|
||||
* full size of dst, not space left). At most siz-1 characters
|
||||
* will be copied. Always NUL terminates (unless siz <= strlen(dst)).
|
||||
* Returns strlen(src) + MIN(siz, strlen(initial dst)).
|
||||
* If retval >= siz, truncation occurred.
|
||||
*/
|
||||
size_t strlcat(char *dst, const char *src, size_t siz);
|
||||
|
||||
#endif
|
||||
183
src/util/test.c
183
src/util/test.c
@@ -1,183 +0,0 @@
|
||||
#include <fcntl.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include "colors.h"
|
||||
#include "signals.h"
|
||||
#include "test.h"
|
||||
|
||||
typedef struct TestListItem {
|
||||
Test *test;
|
||||
const char *name;
|
||||
} TestListItem;
|
||||
|
||||
static GList *all_tests = NULL;
|
||||
|
||||
void register_test_(Test *test, const char *name)
|
||||
{
|
||||
TestListItem *item = (TestListItem *)calloc(sizeof(TestListItem), 1);
|
||||
item->test = test;
|
||||
item->name = name;
|
||||
all_tests = g_list_append(all_tests, item);
|
||||
}
|
||||
|
||||
static char *test_log_name_from_test_name(const char *test_name)
|
||||
{
|
||||
char *output_name = g_strdup_printf("test_%s.log", test_name);
|
||||
char *result = strdup(output_name);
|
||||
g_free(output_name);
|
||||
return result;
|
||||
}
|
||||
|
||||
static void redirect_test_output(const char *test_name)
|
||||
{
|
||||
char *output_name = test_log_name_from_test_name(test_name);
|
||||
int fd = open(output_name, O_WRONLY | O_CREAT | O_TRUNC, 0600);
|
||||
if (fd == -1)
|
||||
goto err;
|
||||
if (dup2(fd, STDOUT_FILENO) == -1)
|
||||
goto err;
|
||||
if (dup2(fd, STDERR_FILENO) == -1)
|
||||
goto err;
|
||||
|
||||
close(fd);
|
||||
free(output_name);
|
||||
return;
|
||||
err:
|
||||
fprintf(stderr, "tint2: Could not redirect test output to file name: %s\n", output_name);
|
||||
if (fd != -1)
|
||||
close(fd);
|
||||
free(output_name);
|
||||
}
|
||||
|
||||
static void crash(int sig)
|
||||
{
|
||||
kill(getpid(), SIGSEGV);
|
||||
}
|
||||
|
||||
__attribute__((noreturn))
|
||||
static void run_test_child(TestListItem *item)
|
||||
{
|
||||
reset_signals();
|
||||
struct sigaction sa = {.sa_handler = crash};
|
||||
sigaction(SIGINT, &sa, 0);
|
||||
redirect_test_output(item->name);
|
||||
bool result = true;
|
||||
item->test(&result);
|
||||
exit(result ? EXIT_SUCCESS : EXIT_FAILURE);
|
||||
}
|
||||
|
||||
static FILE *open_test_log(const char *test_name)
|
||||
{
|
||||
char *output_name = test_log_name_from_test_name(test_name);
|
||||
FILE *log = fopen(output_name, "a");
|
||||
free(output_name);
|
||||
return log;
|
||||
}
|
||||
|
||||
static Status run_test_parent(TestListItem *item, pid_t child)
|
||||
{
|
||||
FILE *log = open_test_log(item->name);
|
||||
if (child == -1) {
|
||||
fprintf(log, "\n" "Test failed, fork failed\n");
|
||||
fclose(log);
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
int child_status;
|
||||
pid_t ret_pid = waitpid(child, &child_status, 0);
|
||||
if (ret_pid != child) {
|
||||
fprintf(log, "\n" "Test failed, waitpid failed\n");
|
||||
fclose(log);
|
||||
return FAILURE;
|
||||
}
|
||||
if (WIFEXITED(child_status)) {
|
||||
int exit_status = WEXITSTATUS(child_status);
|
||||
if (exit_status == EXIT_SUCCESS) {
|
||||
fprintf(log, "\n" "Test succeeded.\n");
|
||||
fclose(log);
|
||||
return SUCCESS;
|
||||
} else {
|
||||
fprintf(log, "\n" "Test failed, exit status: %d.\n", exit_status);
|
||||
fclose(log);
|
||||
return FAILURE;
|
||||
}
|
||||
} else if (WIFSIGNALED(child_status)) {
|
||||
int signal = WTERMSIG(child_status);
|
||||
fprintf(log, "\n" "Test failed, child killed by signal: %d.\n", signal);
|
||||
fclose(log);
|
||||
return FAILURE;
|
||||
} else {
|
||||
fprintf(log, "\n" "Test failed, waitpid failed.\n");
|
||||
fclose(log);
|
||||
return FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
static Status run_test(TestListItem *item)
|
||||
{
|
||||
pid_t pid = fork();
|
||||
if (pid == 0)
|
||||
run_test_child(item);
|
||||
struct sigaction sa = {.sa_handler = SIG_IGN};
|
||||
sigaction(SIGINT, &sa, 0);
|
||||
return run_test_parent(item, pid);
|
||||
}
|
||||
|
||||
void run_all_tests(bool verbose)
|
||||
{
|
||||
fprintf(stdout, BLUE "tint2: Running %d tests..." RESET "\n", g_list_length(all_tests));
|
||||
size_t count = 0, succeeded = 0, failed = 0;
|
||||
for (GList *l = all_tests; l; l = l->next) {
|
||||
TestListItem *item = (TestListItem *)l->data;
|
||||
Status status = run_test(item);
|
||||
count++;
|
||||
fprintf(stdout, BLUE "tint2: Test " YELLOW "%s" BLUE ": ", item->name);
|
||||
if (status == SUCCESS) {
|
||||
fprintf(stdout, GREEN "succeeded" RESET "\n");
|
||||
succeeded++;
|
||||
} else {
|
||||
fprintf(stdout, RED "failed" RESET "\n");
|
||||
failed++;
|
||||
if (verbose) {
|
||||
char *log_name = test_log_name_from_test_name(item->name);
|
||||
FILE *log = fopen(log_name, "rt");
|
||||
if (log) {
|
||||
char buffer[4096];
|
||||
size_t num_read;
|
||||
while ((num_read = fread(buffer, 1, sizeof(buffer), log)) > 0) {
|
||||
fwrite(buffer, 1, num_read, stdout);
|
||||
}
|
||||
fclose(log);
|
||||
}
|
||||
free(log_name);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (failed == 0)
|
||||
fprintf(stdout, BLUE "tint2: " GREEN "all %lu tests succeeded." RESET "\n", count);
|
||||
else
|
||||
fprintf(stdout, BLUE "tint2: " RED "%lu" BLUE " out of %lu tests " RED "failed." RESET "\n", failed, count);
|
||||
}
|
||||
|
||||
#if 0
|
||||
TEST(dummy) {
|
||||
int x = 2;
|
||||
int y = 2;
|
||||
ASSERT_EQUAL(x, y);
|
||||
}
|
||||
|
||||
TEST(dummy_bad) {
|
||||
int x = 2;
|
||||
int y = 3;
|
||||
ASSERT_EQUAL(x, y);
|
||||
}
|
||||
#endif
|
||||
@@ -1,72 +0,0 @@
|
||||
#ifndef TEST_H
|
||||
#define TEST_H
|
||||
|
||||
#include "bool.h"
|
||||
#include "print.h"
|
||||
|
||||
typedef void Test(Status *test_result_);
|
||||
|
||||
void register_test_(Test *test, const char *name);
|
||||
|
||||
#define TEST(name) \
|
||||
void test_##name(Status *test_result_); \
|
||||
__attribute__((constructor)) void test_register_##name() \
|
||||
{ \
|
||||
register_test_(test_##name, #name); \
|
||||
} \
|
||||
void test_##name(Status *test_result_)
|
||||
|
||||
void run_all_tests(bool verbose);
|
||||
|
||||
#define FAIL_TEST_ \
|
||||
*test_result_ = FAILURE; \
|
||||
return;
|
||||
|
||||
#define ASSERT(value) \
|
||||
if (!(value)) { \
|
||||
FAIL_TEST_ \
|
||||
}
|
||||
|
||||
#define ASSERT_EQUAL(a, b) \
|
||||
if (!(a == b)) { \
|
||||
printf("%s:%d: Assertion failed: %s == %s: ", __FILE__, __LINE__, #a, #b); \
|
||||
print(a); \
|
||||
printf(" != "); \
|
||||
print(b); \
|
||||
FAIL_TEST_ \
|
||||
}
|
||||
|
||||
#define ASSERT_DIFFERENT(a, b) \
|
||||
if (a == b) { \
|
||||
printf("%s:%d: Assertion failed: %s != %s: ", __FILE__, __LINE__, #a, #b); \
|
||||
print(a); \
|
||||
printf(" == "); \
|
||||
print(b); \
|
||||
FAIL_TEST_ \
|
||||
}
|
||||
|
||||
|
||||
#define ASSERT_STR_EQUAL(a, b) \
|
||||
if (strcmp(a, b) != 0) { \
|
||||
printf("%s:%d: Assertion failed: %s == %s: ", __FILE__, __LINE__, #a, #b); \
|
||||
print(a); \
|
||||
printf(" != "); \
|
||||
print(b); \
|
||||
FAIL_TEST_ \
|
||||
}
|
||||
|
||||
#define ASSERT_STR_DIFFERENT(a, b) \
|
||||
if (strcmp(a, b) == 0) { \
|
||||
printf("%s:%d: Assertion failed: %s != %s: ", __FILE__, __LINE__, #a, #b); \
|
||||
print(a); \
|
||||
printf(" == "); \
|
||||
print(b); \
|
||||
FAIL_TEST_ \
|
||||
}
|
||||
|
||||
#define ASSERT_TRUE(value) ASSERT_EQUAL(value, 1)
|
||||
#define ASSERT_FALSE(value) ASSERT_EQUAL(value, 0)
|
||||
#define ASSERT_NULL(value) ASSERT_EQUAL(value, NULL)
|
||||
#define ASSERT_NON_NULL(value) ASSERT_DIFFERENT(value, NULL)
|
||||
|
||||
#endif
|
||||
2001
src/util/timer.c
2001
src/util/timer.c
File diff suppressed because it is too large
Load Diff
@@ -21,53 +21,45 @@
|
||||
#include <glib.h>
|
||||
#include <time.h>
|
||||
#include <sys/time.h>
|
||||
#include "bool.h"
|
||||
|
||||
extern bool warnings_for_timers;
|
||||
extern bool debug_timers;
|
||||
// Single shot timers (i.e. timers with interval_msec == 0) are deleted automatically as soon as they expire,
|
||||
// i.e. you do not need to stop them, however it is safe to call stop_timeout for these timers.
|
||||
// You can pass the address of the variable storing the pointer to the timer as 'self' in add_timeout, in which
|
||||
// case it is used to clear the pointer if the timer is destroyed automatically. This enforces the timeout pointers
|
||||
// to be either valid or NULL.
|
||||
// Periodic timeouts are aligned to each other whenever possible, i.e. one interval_msec is an
|
||||
// integral multiple of the other.
|
||||
|
||||
typedef void TimerCallback(void *arg);
|
||||
typedef struct _timeout timeout;
|
||||
|
||||
typedef struct {
|
||||
char name_[64];
|
||||
bool enabled_;
|
||||
long long expiration_time_ms_;
|
||||
int period_ms_;
|
||||
TimerCallback *callback_;
|
||||
void *arg_;
|
||||
bool handled_;
|
||||
} Timer;
|
||||
// Initializes default global data.
|
||||
void default_timeout();
|
||||
|
||||
#define DEFAULT_TIMER {"", 0, 0, 0, 0, 0, 0}
|
||||
// Cleans up: stops all timers and frees memory.
|
||||
void cleanup_timeout();
|
||||
|
||||
#define INIT_TIMER(t) init_timer(&t, #t)
|
||||
// Installs a timer with the first timeout after 'value_msec' and then an optional periodic timeout every
|
||||
// 'interval_msec' (set it to 0 to prevent periodic timeouts).
|
||||
// '_callback' is the function called when the timer reaches the timeout.
|
||||
// 'arg' is the argument passed to the callback function.
|
||||
// 'self' is an optional pointer to a timeout* variable. If non-NULL, the variable is set to NULL when the timer
|
||||
// is destroyed (with stop_timeout, cleanup_timeout or when the timer expires and it is single-shot).
|
||||
// Returns a pointer to the timer, which is needed for stopping/changing it.
|
||||
timeout *add_timeout(int value_msec, int interval_msec, void (*_callback)(void *), void *arg, timeout **self);
|
||||
|
||||
// Initialize the timer module.
|
||||
void default_timers();
|
||||
// Changes timer 't'. If it does not exist, a new timer is created, with self set to 't'.
|
||||
void change_timeout(timeout **t, int value_msec, int interval_msec, void (*_callback)(void *), void *arg);
|
||||
|
||||
// Destroy the timer module.
|
||||
void cleanup_timers();
|
||||
// Stops the timer 't'
|
||||
void stop_timeout(timeout *t);
|
||||
|
||||
// Initialize a timer. Caller keeps ownership.
|
||||
void init_timer(Timer *timer, const char *name);
|
||||
// Get the time when the next installed timer will expire, or NULL if there is no timer.
|
||||
// Do not free the pointer; but it is safe to change its contents.
|
||||
struct timeval *get_next_timeout();
|
||||
|
||||
// Destroy a timer. Does not free() the pointer.
|
||||
void destroy_timer(Timer *timer);
|
||||
|
||||
// Modify a timer.
|
||||
void change_timer(Timer *timer, bool enabled, int delay_ms, int period_ms, TimerCallback *callback, void *arg);
|
||||
|
||||
void stop_timer(Timer *timer);
|
||||
|
||||
// Get the time duration to the next expiration time, or NULL if there is no active timer.
|
||||
// Do not free the pointer; it is harmless to change its contents.
|
||||
struct timeval *get_duration_to_next_timer_expiration();
|
||||
|
||||
// Trigger all expired timers, and reschedule them if they are periodic timers
|
||||
// Callback of all expired timeouts
|
||||
void handle_expired_timers();
|
||||
|
||||
// Time helper functions.
|
||||
|
||||
// Returns -1 if t1 < t2, 0 if t1 == t2, 1 if t1 > t2
|
||||
gint compare_timespecs(const struct timespec *t1, const struct timespec *t2);
|
||||
|
||||
@@ -77,7 +69,6 @@ struct timespec add_msec_to_timespec(struct timespec ts, int msec);
|
||||
// At the first call returns zero.
|
||||
double profiling_get_time();
|
||||
|
||||
// Get current time in seconds, from an unspecified origin.
|
||||
double get_time();
|
||||
|
||||
#endif // TIMER_H
|
||||
|
||||
@@ -169,40 +169,31 @@ int get_window_desktop(Window win)
|
||||
return best_match;
|
||||
}
|
||||
|
||||
#define swap(a, b) do { __typeof__(a) _tmp = (a); (a) = (b); (b) = _tmp; } while(0)
|
||||
|
||||
int get_interval_overlap(int a1, int a2, int b1, int b2)
|
||||
{
|
||||
if (a1 > b1) {
|
||||
swap(a1, b1);
|
||||
swap(a2, b2);
|
||||
}
|
||||
if (b1 <= a2)
|
||||
return a2 - b1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int get_window_monitor(Window win)
|
||||
{
|
||||
int x, y, w, h;
|
||||
get_window_coordinates(win, &x, &y, &w, &h);
|
||||
|
||||
int best_match = 0;
|
||||
int best_area = -1;
|
||||
int best_match = -1;
|
||||
int match_right = 0;
|
||||
int match_bottom = 0;
|
||||
// There is an ambiguity when a window is right on the edge between screens.
|
||||
// In that case, prefer the monitor which is on the right and bottom of the window's top-left corner.
|
||||
for (int i = 0; i < server.num_monitors; i++) {
|
||||
int commonx = get_interval_overlap(x, x + w, server.monitors[i].x, server.monitors[i].x + server.monitors[i].width);
|
||||
int commony = get_interval_overlap(y, y + h, server.monitors[i].y, server.monitors[i].y + server.monitors[i].height);
|
||||
int area = commonx * commony;
|
||||
if (0)
|
||||
printf("Monitor %d (%dx%d+%dx%d): win (%dx%d+%dx%d) area %dx%d=%d\n",
|
||||
i, server.monitors[i].x, server.monitors[i].y, server.monitors[i].width, server.monitors[i].height,
|
||||
x, y, w, h,
|
||||
commonx, commony, area);
|
||||
if (area > best_area) {
|
||||
best_area = area;
|
||||
best_match = i;
|
||||
if (x >= server.monitors[i].x && x <= (server.monitors[i].x + server.monitors[i].width) &&
|
||||
y >= server.monitors[i].y && y <= (server.monitors[i].y + server.monitors[i].height)) {
|
||||
int current_right = x < (server.monitors[i].x + server.monitors[i].width);
|
||||
int current_bottom = y < (server.monitors[i].y + server.monitors[i].height);
|
||||
if (best_match < 0 || (!match_right && current_right) || (!match_bottom && current_bottom)) {
|
||||
best_match = i;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (best_match < 0)
|
||||
best_match = 0;
|
||||
// fprintf(stderr, "tint2: desktop %d, window %lx %s : monitor %d, (%d, %d)\n", 1 + get_current_desktop(), win,
|
||||
// get_task(win) ? get_task(win)->title : "??", best_match+1, x, y);
|
||||
return best_match;
|
||||
}
|
||||
|
||||
@@ -380,7 +371,7 @@ void smooth_thumbnail(cairo_surface_t *image_surface)
|
||||
const size_t rmask = 0xff0000;
|
||||
const size_t gmask = 0xff00;
|
||||
const size_t bmask = 0xff;
|
||||
for (size_t i = 0; i < tw * (th - 1) - 1 && i < tw * th; i++) {
|
||||
for (size_t i = 0; i < tw * (th - 1) - 1; i++) {
|
||||
u_int32_t c1 = data[i];
|
||||
u_int32_t c2 = data[i + 1];
|
||||
u_int32_t c3 = data[i + tw];
|
||||
@@ -399,27 +390,13 @@ void smooth_thumbnail(cairo_surface_t *image_surface)
|
||||
cairo_surface_t *get_window_thumbnail_ximage(Window win, size_t size, gboolean use_shm)
|
||||
{
|
||||
cairo_surface_t *result = NULL;
|
||||
XWindowAttributes wa = {};
|
||||
XWindowAttributes wa;
|
||||
if (!XGetWindowAttributes(server.display, win, &wa) || wa.width <= 0 || wa.height <= 0 ||
|
||||
wa.map_state != IsViewable) {
|
||||
if (debug_thumbnails) {
|
||||
fprintf(stderr, "tint2: could not get thumbnail, invalid geometry %d x %d\n",
|
||||
wa.width, wa.height);
|
||||
}
|
||||
wa.map_state != IsViewable)
|
||||
goto err0;
|
||||
}
|
||||
|
||||
if (window_is_iconified(win)) {
|
||||
if (debug_thumbnails) {
|
||||
fprintf(stderr, "tint2: could not get thumbnail, minimized window\n");
|
||||
}
|
||||
if (window_is_iconified(win))
|
||||
goto err0;
|
||||
}
|
||||
|
||||
if (debug_thumbnails) {
|
||||
fprintf(stderr, "tint2: getting thumbnail for window with size %d x %d\n",
|
||||
wa.width, wa.height);
|
||||
}
|
||||
|
||||
size_t w, h;
|
||||
w = (size_t)wa.width;
|
||||
@@ -437,20 +414,6 @@ cairo_surface_t *get_window_thumbnail_ximage(Window win, size_t size, gboolean u
|
||||
fw = tw;
|
||||
ox = oy = 0;
|
||||
}
|
||||
if (debug_thumbnails) {
|
||||
fprintf(stderr,
|
||||
"tint2: thumbnail size %zu x %zu, "
|
||||
"proportional width %zu, offset %zu\n",
|
||||
tw, th, fw, ox);
|
||||
}
|
||||
if (!w || !h || !tw || !th || !fw) {
|
||||
if (debug_thumbnails) {
|
||||
fprintf(stderr, "tint2: could not get thumbnail, invalid thumbnail size: "
|
||||
"%zu x %zu => %zu x %zu, %zu\n",
|
||||
w, h, tw, th, fw);
|
||||
}
|
||||
goto err0;
|
||||
}
|
||||
|
||||
XShmSegmentInfo shminfo;
|
||||
XImage *ximg;
|
||||
@@ -480,7 +443,7 @@ cairo_surface_t *get_window_thumbnail_ximage(Window win, size_t size, gboolean u
|
||||
goto err1;
|
||||
}
|
||||
shminfo.shmaddr = ximg->data = (char *)shmat(shminfo.shmid, 0, 0);
|
||||
if (shminfo.shmaddr == (void*)-1) {
|
||||
if (!shminfo.shmaddr) {
|
||||
fprintf(stderr, RED "tint2: !shmat" RESET "\n");
|
||||
goto err2;
|
||||
}
|
||||
@@ -496,18 +459,8 @@ cairo_surface_t *get_window_thumbnail_ximage(Window win, size_t size, gboolean u
|
||||
}
|
||||
|
||||
XGetWindowAttributes(server.display, win, &wa);
|
||||
if (wa.map_state != IsViewable) {
|
||||
if (debug_thumbnails) {
|
||||
fprintf(stderr, "tint2: could not get thumbnail, window not viewable\n");
|
||||
}
|
||||
if (wa.map_state != IsViewable)
|
||||
goto err4;
|
||||
}
|
||||
|
||||
if (debug_thumbnails) {
|
||||
fprintf(stderr,
|
||||
"tint2: creating cairo surface with size %zu x %zu = %zu px\n",
|
||||
tw, th, tw * th);
|
||||
}
|
||||
|
||||
result = cairo_image_surface_create(CAIRO_FORMAT_RGB24, (int)tw, (int)th);
|
||||
u_int32_t *data = (u_int32_t *)cairo_image_surface_get_data(result);
|
||||
@@ -545,25 +498,23 @@ cairo_surface_t *get_window_thumbnail_ximage(Window win, size_t size, gboolean u
|
||||
for (size_t yt = 0, y = 0; yt < th; yt++, y += ystep) {
|
||||
for (size_t xt = 0, x = 0; xt < fw; xt++, x += xstep) {
|
||||
size_t j = yt * tw + ox + xt;
|
||||
if (j < tw * th) {
|
||||
u_int32_t c1 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x1) / prec), (int)((y + offset_y1) / prec));
|
||||
u_int32_t c2 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x2) / prec), (int)((y + offset_y2) / prec));
|
||||
u_int32_t c3 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x3) / prec), (int)((y + offset_y3) / prec));
|
||||
u_int32_t c4 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x4) / prec), (int)((y + offset_y4) / prec));
|
||||
u_int32_t c5 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x5) / prec), (int)((y + offset_y5) / prec));
|
||||
u_int32_t c6 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x6) / prec), (int)((y + offset_y6) / prec));
|
||||
u_int32_t c7 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x7) / prec), (int)((y + offset_y7) / prec));
|
||||
u_int32_t b = ((c1 & bmask) + (c2 & bmask) + (c3 & bmask) + (c4 & bmask) + (c5 & bmask) * 2 + (c6 & bmask) +
|
||||
(c7 & bmask)) /
|
||||
8;
|
||||
u_int32_t g = ((c1 & gmask) + (c2 & gmask) + (c3 & gmask) + (c4 & gmask) + (c5 & gmask) * 2 + (c6 & gmask) +
|
||||
(c7 & gmask)) /
|
||||
8;
|
||||
u_int32_t r = ((c1 & rmask) + (c2 & rmask) + (c3 & rmask) + (c4 & rmask) + (c5 & rmask) * 2 + (c6 & rmask) +
|
||||
(c7 & rmask)) /
|
||||
8;
|
||||
data[j] = (r & rmask) | (g & gmask) | (b & bmask);
|
||||
}
|
||||
u_int32_t c1 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x1) / prec), (int)((y + offset_y1) / prec));
|
||||
u_int32_t c2 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x2) / prec), (int)((y + offset_y2) / prec));
|
||||
u_int32_t c3 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x3) / prec), (int)((y + offset_y3) / prec));
|
||||
u_int32_t c4 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x4) / prec), (int)((y + offset_y4) / prec));
|
||||
u_int32_t c5 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x5) / prec), (int)((y + offset_y5) / prec));
|
||||
u_int32_t c6 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x6) / prec), (int)((y + offset_y6) / prec));
|
||||
u_int32_t c7 = (u_int32_t)GetPixel(ximg, (int)((x + offset_x7) / prec), (int)((y + offset_y7) / prec));
|
||||
u_int32_t b = ((c1 & bmask) + (c2 & bmask) + (c3 & bmask) + (c4 & bmask) + (c5 & bmask) * 2 + (c6 & bmask) +
|
||||
(c7 & bmask)) /
|
||||
8;
|
||||
u_int32_t g = ((c1 & gmask) + (c2 & gmask) + (c3 & gmask) + (c4 & gmask) + (c5 & gmask) * 2 + (c6 & gmask) +
|
||||
(c7 & gmask)) /
|
||||
8;
|
||||
u_int32_t r = ((c1 & rmask) + (c2 & rmask) + (c3 & rmask) + (c4 & rmask) + (c5 & rmask) * 2 + (c6 & rmask) +
|
||||
(c7 & rmask)) /
|
||||
8;
|
||||
data[j] = (r & rmask) | (g & gmask) | (b & bmask);
|
||||
}
|
||||
}
|
||||
// Convert to argb32
|
||||
@@ -589,7 +540,6 @@ cairo_surface_t *get_window_thumbnail_ximage(Window win, size_t size, gboolean u
|
||||
|
||||
// 2nd pass
|
||||
smooth_thumbnail(result);
|
||||
cairo_surface_mark_dirty(result);
|
||||
|
||||
if (ximg) {
|
||||
XDestroyImage(ximg);
|
||||
@@ -607,7 +557,7 @@ err2:
|
||||
err1:
|
||||
if (ximg)
|
||||
XDestroyImage(ximg);
|
||||
err0:
|
||||
err0:
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -623,12 +573,11 @@ gboolean cairo_surface_is_blank(cairo_surface_t *image_surface)
|
||||
return empty;
|
||||
}
|
||||
|
||||
gboolean thumb_use_shm = FALSE;
|
||||
|
||||
cairo_surface_t *get_window_thumbnail(Window win, int size)
|
||||
{
|
||||
cairo_surface_t *image_surface = NULL;
|
||||
if (thumb_use_shm && server.has_shm && server.composite_manager) {
|
||||
const gboolean shm_allowed = FALSE;
|
||||
if (shm_allowed && server.has_shm && server.composite_manager) {
|
||||
image_surface = get_window_thumbnail_ximage(win, (size_t)size, TRUE);
|
||||
if (image_surface && cairo_surface_is_blank(image_surface)) {
|
||||
cairo_surface_destroy(image_surface);
|
||||
|
||||
165
test/memtrace-analyze.py
Executable file
165
test/memtrace-analyze.py
Executable file
@@ -0,0 +1,165 @@
|
||||
#!/usr/bin/env python2
|
||||
|
||||
import gzip
|
||||
import sys
|
||||
|
||||
|
||||
def commas(v):
|
||||
return "{:12,}".format(v)
|
||||
|
||||
|
||||
class Event:
|
||||
def __init__(self):
|
||||
self.alloc = False
|
||||
self.free = False
|
||||
self.ts = None
|
||||
self.size = None
|
||||
self.addr = None
|
||||
self.trace_name = None
|
||||
|
||||
|
||||
class Analyzer:
|
||||
def __init__(self):
|
||||
self.traces = {}
|
||||
self.events = []
|
||||
self.all_allocations = {}
|
||||
self.new_allocations = {}
|
||||
self.all_mem = 0
|
||||
self.old_mem = 0
|
||||
|
||||
def read(self, path):
|
||||
with gzip.open(path, "rb") as f:
|
||||
try:
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if line.startswith("t"):
|
||||
self.add_trace(line)
|
||||
elif line.startswith("["):
|
||||
self.add_call(line)
|
||||
except:
|
||||
pass
|
||||
|
||||
def add_trace(self, line):
|
||||
t, name, content = line.split(" ", 2)
|
||||
name = int(name)
|
||||
assert(name > 0)
|
||||
assert(name not in self.traces)
|
||||
self.traces[name] = content.split("|")
|
||||
|
||||
def add_call(self, line):
|
||||
first, second = line.split(":", 1)
|
||||
first = first.strip()
|
||||
ts, t, tname = first.split(" ")
|
||||
ts = float(ts.replace("[", "").replace("]", ""))
|
||||
assert(t == "t")
|
||||
tname = int(tname)
|
||||
assert(tname in self.traces)
|
||||
second = second.strip()
|
||||
result, eq, func, params = second.split(" ", 3)
|
||||
assert(eq == "=")
|
||||
params = params.split(" ")
|
||||
e = Event()
|
||||
e.ts = ts
|
||||
e.trace_name = tname
|
||||
if func == "m" and result != "(nil)":
|
||||
e.alloc = True
|
||||
e.addr = int(result, 16)
|
||||
e.size = int(params[0])
|
||||
elif func == "c" and result != "(nil)":
|
||||
e.alloc = True
|
||||
e.addr = int(result, 16)
|
||||
e.size = int(params[0]) * int(params[1])
|
||||
elif func == "r":
|
||||
old_addr = params[0]
|
||||
size = int(params[1])
|
||||
if old_addr == "(nil)":
|
||||
if result != "(nil)":
|
||||
e.alloc = True
|
||||
e.addr = int(result, 16)
|
||||
e.size = size
|
||||
elif old_addr != "(nil)":
|
||||
if result != "(nil)":
|
||||
e.free = True
|
||||
e.addr = int(old_addr, 16)
|
||||
self.events.append(e)
|
||||
e = Event()
|
||||
e.ts = ts
|
||||
e.trace_name = tname
|
||||
e.alloc = True
|
||||
e.addr = int(result, 16)
|
||||
e.size = size
|
||||
elif func == "f":
|
||||
addr = params[0]
|
||||
if addr != "(nil)":
|
||||
e.free = True
|
||||
e.addr = int(addr, 16)
|
||||
if e.alloc or e.free:
|
||||
self.events.append(e)
|
||||
|
||||
|
||||
def analyze(self):
|
||||
self.all_allocations = {}
|
||||
self.new_allocations = {}
|
||||
self.all_mem = 0
|
||||
self.old_mem = 0
|
||||
self.peak_mem = 0
|
||||
period = 1
|
||||
next_ts_print = self.events[0].ts
|
||||
for e in self.events:
|
||||
if e.ts >= next_ts_print:
|
||||
self.print_allocations()
|
||||
next_ts_print += period
|
||||
self.process_event(e)
|
||||
self.print_allocations()
|
||||
self.print_leaks()
|
||||
|
||||
|
||||
def print_allocations(self):
|
||||
print "Memory usage: current:", commas(self.all_mem), " | delta:", commas(self.all_mem - self.old_mem), " | peak:", commas(self.peak_mem)
|
||||
self.old_mem = self.all_mem
|
||||
self.new_alllocations = {}
|
||||
|
||||
|
||||
def print_leaks(self):
|
||||
if not self.all_allocations:
|
||||
return
|
||||
print "Memory leaked:", commas(self.all_mem)
|
||||
leaks = [e for addr, e in self.all_allocations.iteritems()]
|
||||
leaks.sort(key=lambda e: e.size)
|
||||
for e in leaks:
|
||||
print "Leak:", commas(e.size)
|
||||
print "Allocated in:\n ", "\n ".join(self.traces[e.trace_name])
|
||||
|
||||
def process_event(self, e):
|
||||
if e.alloc:
|
||||
assert(e.addr not in self.all_allocations)
|
||||
self.all_allocations[e.addr] = e
|
||||
assert(e.addr not in self.new_allocations)
|
||||
self.new_allocations[e.addr] = e
|
||||
self.all_mem += e.size
|
||||
self.peak_mem = max(self.peak_mem, self.all_mem)
|
||||
else:
|
||||
assert(e.addr in self.all_allocations)
|
||||
e_alloc = self.all_allocations[e.addr]
|
||||
if e.ts - e_alloc.ts > 1. and e_alloc.size > 1e3 and False:
|
||||
print "Long-lived alloc:", commas(e_alloc.size), "freed after", commas(e.ts - e_alloc.ts) + "s"
|
||||
print "Allocated in:\n ", "\n ".join(self.traces[e_alloc.trace_name])
|
||||
print "Freed in:\n ", "\n ".join(self.traces[e.trace_name])
|
||||
if e_alloc.addr in self.new_allocations:
|
||||
if e_alloc.size > 1e7 and False:
|
||||
print "Large alloc:", commas(e_alloc.size), "freed after", commas(e.ts - e_alloc.ts) + "s"
|
||||
print "Allocated in:\n ", "\n ".join(self.traces[e_alloc.trace_name])
|
||||
print "Freed in:\n ", "\n ".join(self.traces[e.trace_name])
|
||||
del self.new_allocations[e_alloc.addr]
|
||||
del self.all_allocations[e_alloc.addr]
|
||||
self.all_mem -= e_alloc.size
|
||||
|
||||
|
||||
def main():
|
||||
a = Analyzer()
|
||||
a.read(sys.argv[1])
|
||||
a.analyze()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -10,7 +10,6 @@ sys.setdefaultencoding('utf8')
|
||||
import argparse
|
||||
import datetime
|
||||
import os
|
||||
import re
|
||||
import signal
|
||||
import subprocess
|
||||
import time
|
||||
@@ -40,10 +39,6 @@ def print_err(*args, **kwargs):
|
||||
print(*args, file=sys.stderr, **kwargs)
|
||||
|
||||
|
||||
def clear_ansi_codes(s):
|
||||
return re.sub(r"\x1B\[[0-9;]*[a-zA-Z]", "", s)
|
||||
|
||||
|
||||
def run(cmd, output=False):
|
||||
return subprocess.Popen(cmd,
|
||||
stdin=devnull,
|
||||
@@ -193,7 +188,6 @@ def test(tint2path, config, use_asan):
|
||||
mem, mem_detail = get_mem_usage(tint2.pid)
|
||||
stop(tint2)
|
||||
out, _ = tint2.communicate()
|
||||
out = clear_ansi_codes(out)
|
||||
exitcode = tint2.returncode
|
||||
if exitcode != 0 and exitcode != 23:
|
||||
print("tint2 crashed with exit code {0}!".format(exitcode))
|
||||
@@ -228,41 +222,6 @@ def test(tint2path, config, use_asan):
|
||||
stop_xvfb()
|
||||
|
||||
|
||||
def run_unit_tests(tint2path, use_asan):
|
||||
print("# Unit tests", "(ASAN on)" if use_asan else "")
|
||||
start_xvfb()
|
||||
sleep(1)
|
||||
start_xsettings()
|
||||
start_wm()
|
||||
sleep(1)
|
||||
compton = start_compositor()
|
||||
sleep(1)
|
||||
os.environ["DEBUG_FPS"] = "1"
|
||||
os.environ["ASAN_OPTIONS"] = "detect_leaks=1:exitcode=0"
|
||||
tint2 = run([tint2path, "--test-verbose"], True)
|
||||
time_limit = time.time() + 60
|
||||
while tint2.poll() == None:
|
||||
if time.time() < time_limit:
|
||||
time.sleep(1)
|
||||
continue
|
||||
tint2.stop()
|
||||
out, _ = tint2.communicate()
|
||||
out = clear_ansi_codes(out)
|
||||
exitcode = tint2.returncode
|
||||
if exitcode != 0 and exitcode != 23:
|
||||
print("tint2 crashed with exit code {0}!".format(exitcode))
|
||||
print("Output:")
|
||||
print("```\n" + out.strip() + "\n```")
|
||||
return
|
||||
if "tests succeeded" in out:
|
||||
num_tests = [line for line in out.split("\n") if "tint2: Running" in line][0]
|
||||
print("All {0} tests succeeded.".format(num_tests))
|
||||
return
|
||||
if "tests failed" in out:
|
||||
print("```\n" + out.strip() + "\n```")
|
||||
stop_xvfb()
|
||||
|
||||
|
||||
def show_timestamp():
|
||||
utc_datetime = datetime.datetime.utcnow()
|
||||
print("Last updated:", utc_datetime.strftime("%Y-%m-%d %H:%M UTC"))
|
||||
@@ -326,29 +285,6 @@ def compile_and_report(src_dir, use_asan):
|
||||
print("Status: Succeeded in %.1f seconds" % (duration,), ok)
|
||||
|
||||
|
||||
def compile_remotely_and_report(host):
|
||||
print_err("Compiling on {0}...".format(host))
|
||||
print("# Compilation on {0}".format(host))
|
||||
start = time.time()
|
||||
c = run("ssh worker@{0} 'cd tint2 && git pull && mkdir -p build && rm -rf build && mkdir -p build && cd build && cmake .. && make && ./tint2 --version'".format(host), True)
|
||||
out, _ = c.communicate()
|
||||
duration = time.time() - start
|
||||
if c.returncode != 0:
|
||||
print("Status: Failed!", error)
|
||||
print("Output:")
|
||||
print("```\n" + out.strip() + "\n```")
|
||||
warnings = [ line for line in out.split("\n") if "warning:" in line and ".so." not in line.split(":", 1)[0] ]
|
||||
if warnings:
|
||||
print("Status: Succeeded with warnings!", warning)
|
||||
print("Warnings:")
|
||||
print("```", end="")
|
||||
for line in warnings:
|
||||
print(line, end="")
|
||||
print("```", end="")
|
||||
else:
|
||||
print("Status: Succeeded in %.1f seconds" % (duration,), ok)
|
||||
|
||||
|
||||
def run_test(config, index, use_asan):
|
||||
print_err("Running test", index, "for config", config)
|
||||
print("# Test", index, "(ASAN on)" if use_asan else "")
|
||||
@@ -414,11 +350,8 @@ def main():
|
||||
show_timestamp()
|
||||
show_git_info(args.src_dir)
|
||||
show_system_info()
|
||||
compile_remotely_and_report("FreeBSD")
|
||||
compile_remotely_and_report("OpenBSD")
|
||||
for use_asan in [True, False]:
|
||||
compile_and_report(args.src_dir, use_asan)
|
||||
run_unit_tests("./build/tint2", use_asan)
|
||||
run_tests(use_asan)
|
||||
|
||||
|
||||
|
||||
@@ -201,7 +201,7 @@ clock_dwheel_command =
|
||||
# Battery
|
||||
battery_tooltip = 1
|
||||
battery_low_status = 10
|
||||
battery_low_cmd = xmessage 'tint2: Battery low!'
|
||||
battery_low_cmd = notify-send "battery low"
|
||||
battery_full_cmd =
|
||||
bat1_font = sans 8
|
||||
bat2_font = sans 6
|
||||
|
||||
@@ -201,7 +201,7 @@ clock_dwheel_command =
|
||||
# Battery
|
||||
battery_tooltip = 1
|
||||
battery_low_status = 10
|
||||
battery_low_cmd = xmessage 'tint2: Battery low!'
|
||||
battery_low_cmd = notify-send "battery low"
|
||||
battery_full_cmd =
|
||||
bat1_font = sans 8
|
||||
bat2_font = sans 6
|
||||
|
||||
@@ -212,7 +212,7 @@ clock_dwheel_command =
|
||||
# Battery
|
||||
battery_tooltip = 1
|
||||
battery_low_status = 10
|
||||
battery_low_cmd = xmessage 'tint2: Battery low!'
|
||||
battery_low_cmd = notify-send "battery low"
|
||||
battery_full_cmd =
|
||||
bat1_font = sans 8
|
||||
bat2_font = sans 6
|
||||
|
||||
@@ -201,7 +201,7 @@ clock_dwheel_command =
|
||||
# Battery
|
||||
battery_tooltip = 1
|
||||
battery_low_status = 10
|
||||
battery_low_cmd = xmessage 'tint2: Battery low!'
|
||||
battery_low_cmd = notify-send "battery low"
|
||||
battery_full_cmd =
|
||||
bat1_font = sans 8
|
||||
bat2_font = sans 6
|
||||
|
||||
@@ -175,7 +175,7 @@ clock_dwheel_command =
|
||||
# Battery
|
||||
battery_tooltip = 1
|
||||
battery_low_status = 10
|
||||
battery_low_cmd = xmessage 'tint2: Battery low!'
|
||||
battery_low_cmd = notify-send "battery low"
|
||||
battery_full_cmd =
|
||||
battery_font_color = #ffffff 100
|
||||
bat1_format =
|
||||
|
||||
@@ -201,7 +201,7 @@ clock_dwheel_command =
|
||||
# Battery
|
||||
battery_tooltip = 1
|
||||
battery_low_status = 10
|
||||
battery_low_cmd = xmessage 'tint2: Battery low!'
|
||||
battery_low_cmd = notify-send "battery low"
|
||||
battery_full_cmd =
|
||||
bat1_font = sans 8
|
||||
bat2_font = sans 6
|
||||
|
||||
@@ -201,7 +201,7 @@ clock_dwheel_command =
|
||||
# Battery
|
||||
battery_tooltip = 1
|
||||
battery_low_status = 10
|
||||
battery_low_cmd = xmessage 'tint2: Battery low!'
|
||||
battery_low_cmd = notify-send "battery low"
|
||||
battery_full_cmd =
|
||||
bat1_font = sans 8
|
||||
bat2_font = sans 6
|
||||
|
||||
@@ -212,7 +212,7 @@ clock_dwheel_command =
|
||||
# Battery
|
||||
battery_tooltip = 1
|
||||
battery_low_status = 10
|
||||
battery_low_cmd = xmessage 'tint2: Battery low!'
|
||||
battery_low_cmd = notify-send "battery low"
|
||||
battery_full_cmd =
|
||||
bat1_font = sans 8
|
||||
bat2_font = sans 6
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user