# HG changeset patch
# User Dominique Corbex <domcox@slitaz.org>
# Date 1385063947 -3600
# Node ID 8ae289524b6baba4220b965c2929d6f856c75871
# Parent  781029802e4a5d39cd78948331b7476c751af6e0
conky: add wireless support

diff -r 781029802e4a -r 8ae289524b6b conky/receipt
--- a/conky/receipt	Thu Nov 21 11:34:23 2013 +0000
+++ b/conky/receipt	Thu Nov 21 20:59:07 2013 +0100
@@ -13,10 +13,10 @@
 
 DEPENDS="expat fontconfig freetype glib xorg-libX11 xorg-libXau \
 xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
-xorg-libXft xorg-libXrender zlib ncursesw"
+xorg-libXft xorg-libXrender zlib ncursesw wireless_tools"
 BUILD_DEPENDS="$DEPENDS xorg-libXdamage-dev xorg-libXft-dev fontconfig-dev \
 expat-dev glib glib-dev pkg-config zlib-dev freetype-dev xorg-xextproto \
-xorg-damageproto xorg-fixesproto ncursesw-dev"
+xorg-damageproto xorg-fixesproto ncursesw-dev wireless_tools-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -25,6 +25,7 @@
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
+		--enable-wlan \
 		--disable-lua \
 		$CONFIGURE_ARGS &&
 	make &&
@@ -34,7 +35,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/etc/conky
+	mkdir -p $fs/usr $fs/etc/conky $fs/etc/xdg/autostart
 	cp -a $install/usr/bin $fs/usr
 	cp -a $stuff/conky.conf $fs/etc/conky
+	cp -a $stuff/conky.desktop $fs/etc/xdg/autostart
 }
diff -r 781029802e4a -r 8ae289524b6b conky/stuff/conky.conf
--- a/conky/stuff/conky.conf	Thu Nov 21 11:34:23 2013 +0000
+++ b/conky/stuff/conky.conf	Thu Nov 21 20:59:07 2013 +0100
@@ -1,61 +1,150 @@
 # /etc/conky/conky.conf: SliTaz Conky default configuration file.
 #
+# For configuration settings, please see:
+# http://conky.sourceforge.net/config_settings.html
+#
+# For values to display, please see:
+# http://conky.sourceforge.net/variables.html
+#
 
-alignment top_right
+# maintain spacing between certain elements (mono fonts)
+use_spacer none
+
+# set to yes if you want conky to be forked in the background
 background no
-border_width 1
-cpu_avg_samples 2
 
-default_color white
-default_outline_color white
-default_shade_color white
+# Xft font when Xft is enabled
+use_xft yes
+xftfont Liberation Sans-9
 
-draw_borders no
-draw_graph_borders yes
-draw_outline no
+# Text alpha when using Xft
+xftalpha 1
+
+# Update interval in seconds
+update_interval 2.0
+update_interval_on_battery 5.0
+
+# Create own window instead of using desktop
+own_window yes
+own_window_transparent no
+own_window_type desktop
+
+# Use double buffering (reduces flicker, may not work for everyone)
+double_buffer yes
+
+# Minimum size of text area
+minimum_size 250 5
+
+# Draw shades?
 draw_shades no
 
-gap_x 20
-gap_y 20
+# Draw outlines?
+draw_outline no # amplifies text
 
-minimum_size 5 5
-net_avg_samples 2
+# Draw borders around text
+draw_borders no
+
+# Stippled borders?
+stippled_borders 0
+
+# border margins
+border_outer_margin 5
+
+# border width
+border_width 0
+
+# Default colors and also border colors
+default_color Dark Gray
+default_shade_color Black
+default_outline_color Dark Gray
+color1 Dark Sea Green
+color2 Dark Orange
+
+# Text alignment, other possible values are commented
+alignment top_right
+#alignment top_left
+#alignment bottom_left
+#alignment bottom_right
+
+# Gap between borders of screen and text
+gap_x 24
+gap_y 48
+
+# Subtract file system buffers from used memory?
 no_buffers yes
-out_to_console no
 
-own_window yes
-own_window_class Conky
-own_window_type desktop
+# set to yes if you want all text to be in uppercase
+uppercase no
 
-stippled_borders 0
-update_interval 3.0
-uppercase no
-use_spacer no
+# default bars size
+default_bar_size 70 6
+default_gauge_size 70 6
+default_graph_size 70 6
 
-use_xft yes
-xftfont DejaVu Sans Mono:size=9
-own_window_transparent yes
+# top name width
+top_name_width 10
 
+# how to check an interface for being up (up, link or address)
+if_up_strictness link
+
+#
+# stuff after 'TEXT' will be formatted on screen
+#
 
 TEXT
-$nodename - $sysname $kernel on $machine
-$hr
-${color grey}Uptime:$color $uptime
-${color grey}Frequency (in MHz):$color $freq
-${color grey}Frequency (in GHz):$color $freq_g
-${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4}
-${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4}
-${color grey}CPU Usage:$color $cpu% ${cpubar 4}
-${color grey}Processes:$color $processes  ${color grey}Running:$color $running_processes
-$hr
-${color grey}File systems:
- / $color${fs_free /}/${fs_size /} ${fs_bar 6 /}
-${color grey}Networking:
-Up:$color ${upspeed eth0} k/s${color grey} - Down:$color ${downspeed eth0} k/s
-$hr
-${color grey}Name                  PID   CPU%   MEM%
-${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
-${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
-${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
-${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
+${color2}SYSTEM ${hr}
 
+#$desktop_name
+$color  Slitaz release $alignr$color1${pre_exec awk '{printf "%s" $0}' /etc/slitaz-release}
+$color  Kernel $alignr$color1$sysname $kernel $machine
+$color  Hostname $alignr$color1$nodename
+$color  Uptime $alignr$color1$uptime
+${if_existing /sys/class/power_supply/BAT0}$color  Battery $alignr$color1${battery BAT0} ${battery_bar BAT0}$endif\
+${if_existing /sys/class/power_supply/BAT1}$color  Battery 2 $alignr$color1${battery BAT1} ${battery_bar BAT1}$endif
+
+${color2}RESOURCES ${hr}
+
+# CPU0 is the total usage for all CPUs
+$color  CPU $alignr$color1${cpu CPU0}% ${cpubar CPU0}
+#$color1  ${cpugraph CPU0 $color $color1}
+${if_existing /boot}$color  RAM $alignr$color1$memmax $membar\
+${else}$color  RAM $alignr$color1${fs_size /} ${fs_bar /}$endif
+${if_mounted swap}$color  Swap $swapperc%$alignr$color1$swap/$swapmax
+${else}$color  Swap $alignr$color1 Disabled$endif
+$color  Disk / $alignr$color1${fs_size /} ${fs_bar /}
+${if_mounted /home}$color  Disk /home $alignr$color1${fs_size /home} ${fs_bar /home}${endif}
+
+${color2}PROCESSING ${hr}
+
+$color  Name  ${goto 100}   PID ${goto 160} CPU%  $alignr MEM% $color1
+  ${top name 1} ${goto 100} ${top pid 1} ${goto 160} ${top cpu 1} $alignr ${top mem 1}
+  ${top name 2} ${goto 100} ${top pid 2} ${goto 160} ${top cpu 2} $alignr ${top mem 2}
+  ${top name 3} ${goto 100} ${top pid 3} ${goto 160} ${top cpu 3} $alignr ${top mem 3}
+  ${top name 4} ${goto 100} ${top pid 4} ${goto 160} ${top cpu 4} $alignr ${top mem 4}
+
+${color2}NETWORK ${hr}
+
+# eth0
+${if_up eth0}$color2  eth0 $alignr ${addr eth0}
+    $color Up $alignr$color1${upspeed eth0} ${upspeedgraph eth0 6,70}
+    $color Total $alignr$color1 ${totalup eth0}
+    $color Down $alignr$color1 ${downspeed eth0} ${downspeedgraph eth0 6,70}
+    $color Total $alignr$color1 $color1${totaldown eth0}
+$endif \
+# eth1
+${if_up eth1}$color2 eth1 $alignr ${addr eth1}
+    $color Up $alignr$color1${upspeed eth1} ${upspeedgraph eth1 6,70}
+    $color Total $alignr$color1 ${totalup eth1}
+    $color Down $alignr$color1 ${downspeed eth1} ${downspeedgraph eth1 6,70}
+    $color Total $alignr$color1 $color1${totaldown eth1}
+$endif \
+# wlan0
+${if_up wlan0}$color2 wlan0 $alignr ${addr wlan0}
+    $color Up $alignr$color1${upspeed wlan0} ${upspeedgraph wlan0 6,70}
+    $color Total $alignr$color1 ${totalup wlan0}
+    $color Down $alignr$color1 ${downspeed wlan0} ${downspeedgraph wlan0 6,70}
+    $color Total $alignr$color1 $color1${totaldown wlan0}
+    $color SSID $alignr$color1 ${wireless_essid wlan0}
+    $color Signal $alignr$color1 ${wireless_link_qual wlan0}% ${wireless_link_bar wlan0}
+    $color Bitrate $alignr$color1 ${wireless_bitrate wlan0}
+$endif
diff -r 781029802e4a -r 8ae289524b6b conky/stuff/conky.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conky/stuff/conky.desktop	Thu Nov 21 20:59:07 2013 +0100
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=Conky
+Exec=conky
+NotShowIn=XFCE;Razor;