diff --git a/ChangeLog b/ChangeLog index 9109426..330aa2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2021-04-18 master +2021-04-18 17.0 - Fixes: - Crash when a window icon is large (issue #786) (santouits) - Minute clock doesn't update (issue #786) @@ -1043,3 +1043,4 @@ released tint-0.2 . . . +. diff --git a/README.md b/README.md index 19f205e..b69c021 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Latest stable release: 16.7 -Changes: https://gitlab.com/o9000/tint2/blob/16.7/ChangeLog +# Latest stable release: 17.0 +Changes: https://gitlab.com/o9000/tint2/blob/17.0/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 16.7 +git checkout 17.0 mkdir build cd build cmake .. diff --git a/doc/manual.html b/doc/manual.html index 0704b14..bc493c8 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -609,6 +609,7 @@ panel_size = 94% 30

  • execp_background_id = integer : Which background to use. (since 0.12.4)

  • execp_centered = boolean (0 or 1) : Whether to center the text. (since 0.12.4)

  • execp_padding = horizontal_padding vertical_padding spacing_between_icon_and_text (since 0.12.4)

    • +

  • execp_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)

    • @@ -647,13 +648,13 @@ execp_command = ping -i 1 -c 1 -W 1 -O -D -n $(ip route | grep default | grep vi execp_continuous = 0 execp_interval = 1 execp_markup = 1 -
    Memory usage
    execp = new
-execp_command = free | awk '/^-/ { printf "Mem: '$(free -h | awk '/^Mem:/ { print $2 }')' %.0f%%\n", 100*$3/($3+$4); fflush(stdout) }'
-execp_interval = 5
-execp_continuous = 0
-
    Network load
    # Note the use of "stdbuf -oL" to force the program to flush the output line by line.
+
    Memory usage
    # 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_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
+
    Network load
    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_continuous = 1
 execp_interval = 1

    Button

    diff --git a/doc/readme.html b/doc/readme.html index b01fc56..30485a3 100644 --- a/doc/readme.html +++ b/doc/readme.html @@ -199,9 +199,9 @@ pre { -

    Latest stable release: 16.7

    Changes: https://gitlab.com/o9000/tint2/blob/16.7/ChangeLog

    Documentation: manual.html

    Compile it with (after you install the dependencies):

    git clone https://gitlab.com/o9000/tint2.git
+
    Latest stable release: 17.0
    Changes: https://gitlab.com/o9000/tint2/blob/17.0/ChangeLog
    Documentation: manual.html
    Compile it with (after you install the dependencies):
    git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 16.7
+git checkout 17.0
 mkdir build
 cd build
 cmake ..
diff --git a/doc/tint2.1 b/doc/tint2.1
index c745986..cb8c0a1 100644
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -1,4 +1,4 @@
-.TH TINT2 1 "2019\-07\-14" 16.7
+.TH TINT2 1 "2021\-04\-18" 17.0
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
@@ -748,6 +748,8 @@ 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,7 +835,7 @@ execp_markup = 1
 .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_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
 .fi
@@ -843,7 +845,7 @@ execp_continuous = 1
 .RS
 .nf
 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 | stdbuf \-oL awk \-F ';' '/total/ { printf "Net: %.0f Mb/s\\n", ($5*8/1.0e6) }'
 execp_continuous = 1
 execp_interval = 1
 .fi
diff --git a/doc/tint2.md b/doc/tint2.md
index aa70da4..1328328 100644
--- a/doc/tint2.md
+++ b/doc/tint2.md
@@ -1,4 +1,4 @@
-# TINT2 1 "2019-07-14" 16.7
+# TINT2 1 "2021-04-18" 17.0
 
 ## NAME
 tint2 - lightweight panel/taskbar