Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-12 19:06:36 +00:00
Code Issues Releases Activity

* Added NVIDIA Graficcard support patch (thanks meissna)

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1122 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-06-03 20:46:15 +00:00
parent bd6196c6b0
commit 7ff7c1083c
12 changed files with 344 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -191,6 +191,9 @@ Lucas Brutschy <lbrutschy at users dot sourceforge dot net>
Marcus Huesgen <marcus dot huesgen at googlemail dot com>
battery_bar fix
Markus Meissner <meissna at users dot sourceforge dot net>
NVIDIA Graficcard support with libXNVCtrl patch
Michal Januszewski <spock at gentoo dot org>
hddtemp support

3
ChangeLog
View File

@ -1,5 +1,8 @@
# $Id$
2008-06-03
* Added NVIDIA Graficcard support patch (thanks meissna)
2008-05-30
* Simplified docs for color0-9 config settings and variables.
* Improved $if_up for configurable behaviour.

259
README
View File

@ -171,34 +171,9 @@ CONFIGURATION SETTINGS
Border width in pixels
color0 A color variable for use inside TEXT segments
color1 A color variable for use inside TEXT segments
color2 A color variable for use inside TEXT segments
color3 A color variable for use inside TEXT segments
color4 A color variable for use inside TEXT segments
color5 A color variable for use inside TEXT segments
color6 A color variable for use inside TEXT segments
color7 A color variable for use inside TEXT segments
color8 A color variable for use inside TEXT segments
color9 A color variable for use inside TEXT segments
colorN Predefine a color for use inside TEXT segments. Substitute N by
a digit between 0 and 9, inclusively. When specifying the color
value in hex, omit the leading hash (#).
cpu_avg_samples
@ -256,10 +231,17 @@ CONFIGURATION SETTINGS
passing -y at command line, e.g. gap_y 10.
imap Default global IMAP server. Arguments are: "host user pass [-i
interval] [-f folder] [-p port] [-e command]". Default port is
143, default folder is 'INBOX', default interval is 5 minutes.
If the password is supplied as '*', you will be prompted to en-
if_up_strictness
How strict should if_up be when testing an interface for being
up? The value is one of up, link or address, to check for the
interface being solely up, being up and having link or being up,
having link and an assigned IP address.
imap Default global IMAP server. Arguments are: "host user pass [-i
interval] [-f folder] [-p port] [-e command]". Default port is
143, default folder is 'INBOX', default interval is 5 minutes.
If the password is supplied as '*', you will be prompted to en-
ter the password when Conky starts.
@ -268,12 +250,12 @@ CONFIGURATION SETTINGS
max_port_monitor_connections
Allow each port monitor to track at most this many connections
Allow each port monitor to track at most this many connections
(if 0 or not set, default is 256)
max_specials
Maximum number of special things, e.g. fonts, offsets, aligns,
Maximum number of special things, e.g. fonts, offsets, aligns,
etc. (default is 512)
@ -283,12 +265,12 @@ CONFIGURATION SETTINGS
text_buffer_size bytes
Size of the standard text buffer (default is 256 bytes). This
buffer is used for intermediary text, such as individual lines,
output from $exec vars, and various other variables. Increasing
the size of this buffer can drastically reduce Conky's perfor-
mance, but will allow for more text display per variable. The
size of this buffer cannot be smaller than the default value of
Size of the standard text buffer (default is 256 bytes). This
buffer is used for intermediary text, such as individual lines,
output from $exec vars, and various other variables. Increasing
the size of this buffer can drastically reduce Conky's perfor-
mance, but will allow for more text display per variable. The
size of this buffer cannot be smaller than the default value of
256 bytes.
@ -313,7 +295,7 @@ CONFIGURATION SETTINGS
music_player_interval
Music player thread update interval (defaults to Conky's update
Music player thread update interval (defaults to Conky's update
interval)
@ -338,21 +320,21 @@ CONFIGURATION SETTINGS
own_window_colour colour
If own_window_transparent no, set a specified background colour
(defaults to black). Takes either a hex value (#ffffff) or a
If own_window_transparent no, set a specified background colour
(defaults to black). Takes either a hex value (#ffffff) or a
valid RGB name (see /usr/lib/X11/rgb.txt)
own_window_hints undecorated,below,above,sticky,skip_taskbar,skip_pager
If own_window is yes, you may use these window manager hints to
If own_window is yes, you may use these window manager hints to
affect the way Conky displays. Notes: Use own_window_type desk-
top as another way to implement many of these hints implicitly.
If you use own_window_type override, window manager hints have
top as another way to implement many of these hints implicitly.
If you use own_window_type override, window manager hints have
no meaning and are ignored.
own_window_title
Manually set the window name. Defaults to "<hostname> - conky".
Manually set the window name. Defaults to "<hostname> - conky".
own_window_transparent
@ -363,8 +345,8 @@ CONFIGURATION SETTINGS
if own_window is yes, you may specify type normal, desktop, dock
or override (default: normal). Desktop windows are special win-
dows that have no window decorations; are always visible on your
desktop; do not appear in your pager or taskbar; and are sticky
across all workspaces. Override windows are not under the con-
desktop; do not appear in your pager or taskbar; and are sticky
across all workspaces. Override windows are not under the con-
trol of the window manager. Hints are ignored. This type of win-
dow can be useful for certain situations.
@ -377,9 +359,9 @@ CONFIGURATION SETTINGS
Pad percentages to this many decimals (0 = no padding)
pop3 Default global POP3 server. Arguments are: "host user pass [-i
interval] [-p port] [-e command]". Default port is 110, default
interval is 5 minutes. If the password is supplied as '*', you
pop3 Default global POP3 server. Arguments are: "host user pass [-i
interval] [-p port] [-e command]". Default port is 110, default
interval is 5 minutes. If the password is supplied as '*', you
will be prompted to enter the password when Conky starts.
@ -397,7 +379,7 @@ CONFIGURATION SETTINGS
total_run_times
Total number of times for Conky to update before quitting. Zero
Total number of times for Conky to update before quitting. Zero
makes Conky run forever
@ -412,8 +394,8 @@ CONFIGURATION SETTINGS
use_spacer
Adds spaces around certain objects to stop them from moving oth-
er things around. Arguments are left, right, and none (default).
The old true/false values are deprecated and default to
right/none respectively. Note that this only helps if you are
The old true/false values are deprecated and default to
right/none respectively. Note that this only helps if you are
using a mono font, such as Bitstream Vera Sans Mono.
@ -433,8 +415,8 @@ CONFIGURATION SETTINGS
VARIABLES
Colors are parsed using XParsecolor(), there might be a list of them:
/usr/share/X11/rgb.txt. Also, <http://sedition.com/perl/rgb.html>.
Colors are parsed using XParsecolor(), there might be a list of them:
/usr/share/X11/rgb.txt. Also, <http://sedition.com/perl/rgb.html>.
Color can be also in #rrggbb format (hex).
addr interface
@ -442,7 +424,7 @@ VARIABLES
addrs interface
IP addresses for an interface (if one - works like addr). Linux
IP addresses for an interface (if one - works like addr). Linux
only.
@ -487,7 +469,7 @@ VARIABLES
apm_battery_time
Display remaining APM battery life in hh:mm:ss or "unknown" if
Display remaining APM battery life in hh:mm:ss or "unknown" if
AC adapterstatus is on-line or charging (FreeBSD only)
@ -544,8 +526,8 @@ VARIABLES
battery (num)
Battery status and remaining percentage capacity of ACPI or APM
battery. ACPI battery number can be given as argument (default
Battery status and remaining percentage capacity of ACPI or APM
battery. ACPI battery number can be given as argument (default
is BAT0).
@ -560,7 +542,7 @@ VARIABLES
battery_time (num)
Battery charge/discharge time remaining of ACPI battery. ACPI
Battery charge/discharge time remaining of ACPI battery. ACPI
battery number can be given as argument (default is BAT0).
@ -599,34 +581,8 @@ VARIABLES
Change drawing color to color
color0 Change drawing color to color0 configuration option
color1 Change drawing color to color1 configuration option
color2 Change drawing color to color2 configuration option
color3 Change drawing color to color3 configuration option
color4 Change drawing color to color4 configuration option
color5 Change drawing color to color5 configuration option
color6 Change drawing color to color6 configuration option
color7 Change drawing color to color7 configuration option
color8 Change drawing color to color8 configuration option
color9 Change drawing color to color9 configuration option
colorN Change drawing color to colorN configuration option, where N is
a digit between 0 and 9, inclusively.
conky_version
@ -1156,32 +1112,41 @@ VARIABLES
Hostname
nvidia threshold temp gpufreq memfreq imagequality
Nvidia graficcard support for the XNVCtrl library. Each option
gives back one integer value: (threshold): the thresholdtempera-
ture at which the gpu slows down (temp): gives the gpu current
temperature (gpufreq): gives the current gpu frequency (mem-
freq): gives the current mem frequency (imagequality): which im-
agequality should be choosen by OpenGL applications
outlinecolor (color)
Change outline color
pb_battery item
If running on Apple powerbook/ibook, display information on bat-
tery status. The item parameter specifies, what information to
tery status. The item parameter specifies, what information to
display. Exactly one item must be specified. Valid items are:
status: Display if battery is fully charged, charging, discharg-
ing or absent (running on AC)
percent: Display charge of battery in percent, if charging or
discharging. Nothing will be displayed, if battery is fully
percent: Display charge of battery in percent, if charging or
discharging. Nothing will be displayed, if battery is fully
charged or absent.
time: Display the time remaining until the battery will be fully
charged or discharged at current rate. Nothing is displayed, if
battery is absent or if it's present but fully charged and not
charged or discharged at current rate. Nothing is displayed, if
battery is absent or if it's present but fully charged and not
discharging.
platform (dev) type n
Platform sensor from sysfs (Linux 2.6). Parameter dev may be
omitted if you have only one platform device. Platform type is
either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp'
Platform sensor from sysfs (Linux 2.6). Parameter dev may be
omitted if you have only one platform device. Platform type is
either 'in' or 'vol' meaning voltage; 'fan' meaning fan; 'temp'
(Celsius) or 'tempf' (Fahrenheit) meaning temperature. Parameter
n is number of the sensor. See /sys/bus/platform/devices/ on
n is number of the sensor. See /sys/bus/platform/devices/ on
your local computer.
@ -1189,17 +1154,17 @@ VARIABLES
Displays the number of unseen messages in your global POP3 inbox
by default. You can define individual POP3 inboxes seperately by
passing arguments to this object. Arguments are: "host user pass
[-i interval] [-p port] [-e command]". Default port is 110, de-
[-i interval] [-p port] [-e command]". Default port is 110, de-
fault interval is 5 minutes. If the password is supplied as '*',
you will be prompted to enter the password when Conky starts.
pop3_used (args)
Displays the amount of space (in MiB, 2^20) used in your global
POP3 inbox by default. You can define individual POP3 inboxes
seperately by passing arguments to this object. Arguments are:
"host user pass [-i interval] [-p port] [-e command]". Default
port is 110, default interval is 5 minutes. If the password is
Displays the amount of space (in MiB, 2^20) used in your global
POP3 inbox by default. You can define individual POP3 inboxes
seperately by passing arguments to this object. Arguments are:
"host user pass [-i interval] [-p port] [-e command]". Default
port is 110, default interval is 5 minutes. If the password is
supplied as '*', you will be prompted to enter the password when
Conky starts.
@ -1222,21 +1187,21 @@ VARIABLES
smapi (ARGS)
when using smapi, display contents of the /sys/devices/plat-
form/smapi directory. ARGS are either '(FILENAME)' or 'bat (IN-
DEX) (FILENAME)' to display the corresponding files' content.
This is a very raw method of accessing the smapi values. When
when using smapi, display contents of the /sys/devices/plat-
form/smapi directory. ARGS are either '(FILENAME)' or 'bat (IN-
DEX) (FILENAME)' to display the corresponding files' content.
This is a very raw method of accessing the smapi values. When
available, better use one of the smapi_* variables instead.
smapi_bat_perc (INDEX)
when using smapi, display the remaining capacity in percent of
the battery with index INDEX. This is a separate variable be-
when using smapi, display the remaining capacity in percent of
the battery with index INDEX. This is a separate variable be-
cause it supports the 'use_spacer' configuration option.
smapi_bat_bar (INDEX),(height),(width)
when using smapi, display the remaining capacity of the battery
when using smapi, display the remaining capacity of the battery
with index INDEX as a bar.
@ -1280,36 +1245,36 @@ VARIABLES
The connection index provides you with access to each connection
in the port monitor. The monitor will return information for in-
dex values from 0 to n-1 connections. Values higher than n-1 are
simply ignored. For the "count" item, the connection index must
simply ignored. For the "count" item, the connection index must
be omitted. It is required for all other items.
Examples:
${tcp_portmon 6881 6999 count} - displays the number of connec-
${tcp_portmon 6881 6999 count} - displays the number of connec-
tions in the bittorrent port range
${tcp_portmon 22 22 rip 0} - displays the remote host ip of the
${tcp_portmon 22 22 rip 0} - displays the remote host ip of the
first sshd connection
${tcp_portmon 22 22 rip 9} - displays the remote host ip of the
${tcp_portmon 22 22 rip 9} - displays the remote host ip of the
tenth sshd connection
${tcp_portmon 1 1024 rhost 0} - displays the remote host name of
the first connection on a privileged port
${tcp_portmon 1 1024 rport 4} - displays the remote host port of
the fifth connection on a privileged port
${tcp_portmon 1 65535 lservice 14} - displays the local service
${tcp_portmon 1 65535 lservice 14} - displays the local service
name of the fifteenth connection in the range of all ports
Note that port monitor variables which share the same port range
actually refer to the same monitor, so many references to a sin-
gle port range for different items and different indexes all use
the same monitor internally. In other words, the program avoids
the same monitor internally. In other words, the program avoids
creating redundant monitors.
texeci interval command
Runs a command at an interval inside a thread and displays the
output. Same as $execi, except the command is run inside a
thread. Use this if you have a slow script to keep Conky updat-
ing. You should make the interval slightly longer then the time
it takes your script to execute. For example, if you have a
script that take 5 seconds to execute, you should make the in-
Runs a command at an interval inside a thread and displays the
output. Same as $execi, except the command is run inside a
thread. Use this if you have a slow script to keep Conky updat-
ing. You should make the interval slightly longer then the time
it takes your script to execute. For example, if you have a
script that take 5 seconds to execute, you should make the in-
terval at least 6 seconds. See also $execi.
@ -1318,8 +1283,8 @@ VARIABLES
rss url delay_in_minutes action item_num
Download and parse RSS feeds. Action may be one of the follow-
ing: feed_title, item_title (with num par), item_desc (with num
Download and parse RSS feeds. Action may be one of the follow-
ing: feed_title, item_title (with num par), item_desc (with num
par) and item_titles.
@ -1334,7 +1299,7 @@ VARIABLES
time (format)
Local time, see man strftime to get more information about for-
Local time, see man strftime to get more information about for-
mat
@ -1343,23 +1308,23 @@ VARIABLES
tztime (timezone) (format)
Local time for specified timezone, see man strftime to get more
information about format. The timezone argument is specified in
similar fashion as TZ environment variable. For hints, look in
Local time for specified timezone, see man strftime to get more
information about format. The timezone argument is specified in
similar fashion as TZ environment variable. For hints, look in
/usr/share/zoneinfo. e.g. US/Pacific, Europe/Zurich, etc.
totaldown net
Total download, overflows at 4 GB on Linux with 32-bit arch and
Total download, overflows at 4 GB on Linux with 32-bit arch and
there doesn't seem to be a way to know how many times it has al-
ready done that before conky has started.
top type, num
This takes arguments in the form:top (name) (number) Basically,
processes are ranked from highest to lowest in terms of cpu us-
age, which is what (num) represents. The types are: "name",
"pid", "cpu", "mem", "mem_res", "mem_vsize", and "time". There
This takes arguments in the form:top (name) (number) Basically,
processes are ranked from highest to lowest in terms of cpu us-
age, which is what (num) represents. The types are: "name",
"pid", "cpu", "mem", "mem_res", "mem_vsize", and "time". There
can be a max of 10 processes listed.
@ -1383,9 +1348,9 @@ VARIABLES
Upload speed in KiB with one decimal
upspeedgraph net (height),(width) (gradient colour 1) (gradient colour
upspeedgraph net (height),(width) (gradient colour 1) (gradient colour
2) (scale)
Upload speed graph, colours defined in hex, minus the #. If
Upload speed graph, colours defined in hex, minus the #. If
scale is non-zero, it becomes the scale for the graph.
@ -1413,12 +1378,12 @@ VARIABLES
voffset (pixels)
Change vertical offset by N pixels. Negative values will cause
Change vertical offset by N pixels. Negative values will cause
text to overlap. See also $offset.
voltage_mv (n)
Returns CPU #n's voltage in mV. CPUs are counted from 1. If
Returns CPU #n's voltage in mV. CPUs are counted from 1. If
omitted, the parameter defaults to 1.
@ -1546,13 +1511,13 @@ FILES
BUGS
Drawing to root or some other desktop window directly doesn't work with
all window managers. Especially doesn't work well with Gnome and it has
been reported that it doesn't work with KDE either. Nautilus can be
disabled from drawing to desktop with program gconf-editor. Uncheck
show_desktop in /apps/nautilus/preferences/. There is -w switch in
Conky to set some specific window id. You might find xwininfo -tree
useful to find the window to draw to. You can also use -o argument
been reported that it doesn't work with KDE either. Nautilus can be
disabled from drawing to desktop with program gconf-editor. Uncheck
show_desktop in /apps/nautilus/preferences/. There is -w switch in
Conky to set some specific window id. You might find xwininfo -tree
useful to find the window to draw to. You can also use -o argument
which makes Conky to create its own window. If you do try running Conky
in its own window, be sure to read up on the own_window_type settings
in its own window, be sure to read up on the own_window_type settings
and experiment.
SEE ALSO
@ -1563,11 +1528,11 @@ SEE ALSO
#conky on irc.freenode.net
COPYING
Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al. Any
Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al. Any
original torsmo code is licensed under the BSD license (see LICENSE.BSD
for a copy). All code written since the fork of torsmo is licensed un-
der the GPL (see LICENSE.GPL for a copy), except where noted different-
ly (such as in portmon code, timed thread code, and audacious code
ly (such as in portmon code, timed thread code, and audacious code
which are LGPL, and prss which is an MIT-style license).
AUTHORS

21
configure.ac.in
View File

@ -240,7 +240,7 @@ dnl
AC_ARG_ENABLE([wlan],
AC_HELP_STRING([--enable-wlan], [enable if you want wireless support @<:@default=no@:>@]),
[want_wlan="$enableval"], [want_wlan=no])
#
AM_CONDITIONAL(BUILD_WLAN, test x$want_wlan = xyes)
if test x$want_wlan = xyes; then
AC_CHECK_HEADERS([iwlib.h], [], AC_MSG_ERROR([iwlib.h header not found]))
@ -248,6 +248,24 @@ if test x$want_wlan = xyes; then
AC_DEFINE(HAVE_IWLIB, 1, [Define if you want wireless support])
fi
dnl
dnl NVIDIA libXNVCtrl support
dnl
AC_ARG_ENABLE([nvidia],
AC_HELP_STRING([--enable-nvidia], [enable if you want nvidia support @<:@default=no@:>@]),
[want_nvidia="$enableval"], [want_nvidia=no])
AM_CONDITIONAL(BUILD_NVIDIA, test x$want_nvidia = xyes)
if test x$want_nvidia = xyes; then
AC_CHECK_HEADERS([NVCtrl/NVCtrl.h], [], AC_MSG_ERROR([NVCtrl/NVCtrl.h header not found]))
dnl AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryVersion], [] ,[AC_MSG_ERROR([grrr])] )
dnl AC_CHECK_LIB([XNVCtrl], [XNVCTRLCheckTargetData], [], [AC_MSG_ERROR([grr])])
dnl ## am I Stupid ??
dnl ## it won't find the lib for some reason!?
LIBS="$LIBS -lXNVCtrl"
AC_DEFINE(NVIDIA, 1, [Define if you want nvidia support])
fi
dnl
dnl IMLIB2
dnl
@ -624,4 +642,5 @@ $PACKAGE $VERSION configured successfully:
RSS: $want_rss
wireless: $want_wlan
SMAPI: $want_smapi
nvidia: $want_nvidia
EOF

94
doc/conky.1
View File

@ -158,44 +158,8 @@ Border margin in pixels
Border width in pixels
.TP
\fB\*(T<\fBcolor0\fR\*(T>\fR
A color variable for use inside TEXT segments
.TP
\fB\*(T<\fBcolor1\fR\*(T>\fR
A color variable for use inside TEXT segments
.TP
\fB\*(T<\fBcolor2\fR\*(T>\fR
A color variable for use inside TEXT segments
.TP
\fB\*(T<\fBcolor3\fR\*(T>\fR
A color variable for use inside TEXT segments
.TP
\fB\*(T<\fBcolor4\fR\*(T>\fR
A color variable for use inside TEXT segments
.TP
\fB\*(T<\fBcolor5\fR\*(T>\fR
A color variable for use inside TEXT segments
.TP
\fB\*(T<\fBcolor6\fR\*(T>\fR
A color variable for use inside TEXT segments
.TP
\fB\*(T<\fBcolor7\fR\*(T>\fR
A color variable for use inside TEXT segments
.TP
\fB\*(T<\fBcolor8\fR\*(T>\fR
A color variable for use inside TEXT segments
.TP
\fB\*(T<\fBcolor9\fR\*(T>\fR
A color variable for use inside TEXT segments
\fB\*(T<\fBcolorN\fR\*(T>\fR
Predefine a color for use inside TEXT segments. Substitute N by a digit between 0 and 9, inclusively. When specifying the color value in hex, omit the leading hash (#).
.TP
\fB\*(T<\fBcpu_avg_samples\fR\*(T>\fR
@ -251,6 +215,10 @@ e.g. gap_x 10
Gap, in pixels, between top or bottom border of screen, same as passing -y at command line,
e.g. gap_y 10.
.TP
\fB\*(T<\fBif_up_strictness\fR\*(T>\fR
How strict should if_up be when testing an interface for being up? The value is one of up, link or address, to check for the interface being solely up, being up and having link or being up, having link and an assigned IP address.
.TP
\fB\*(T<\fBimap\fR\*(T>\fR
Default global IMAP server. Arguments are: "host user pass [-i interval] [-f folder] [-p port] [-e command]". Default port is 143, default folder is 'INBOX', default interval is 5 minutes. If the password is supplied as '*', you will be prompted to enter the password when Conky starts.
@ -564,44 +532,8 @@ Amount of memory cached
Change drawing color to color
.TP
\fB\*(T<\fBcolor0\fR\*(T>\fR
Change drawing color to color0 configuration option
.TP
\fB\*(T<\fBcolor1\fR\*(T>\fR
Change drawing color to color1 configuration option
.TP
\fB\*(T<\fBcolor2\fR\*(T>\fR
Change drawing color to color2 configuration option
.TP
\fB\*(T<\fBcolor3\fR\*(T>\fR
Change drawing color to color3 configuration option
.TP
\fB\*(T<\fBcolor4\fR\*(T>\fR
Change drawing color to color4 configuration option
.TP
\fB\*(T<\fBcolor5\fR\*(T>\fR
Change drawing color to color5 configuration option
.TP
\fB\*(T<\fBcolor6\fR\*(T>\fR
Change drawing color to color6 configuration option
.TP
\fB\*(T<\fBcolor7\fR\*(T>\fR
Change drawing color to color7 configuration option
.TP
\fB\*(T<\fBcolor8\fR\*(T>\fR
Change drawing color to color8 configuration option
.TP
\fB\*(T<\fBcolor9\fR\*(T>\fR
Change drawing color to color9 configuration option
\fB\*(T<\fBcolorN\fR\*(T>\fR
Change drawing color to colorN configuration option, where N is a digit between 0 and 9, inclusively.
.TP
\fB\*(T<\fBconky_version\fR\*(T>\fR
@ -1033,6 +965,16 @@ not. Both mbox and maildir type mailboxes are supported.
\fB\*(T<\fBnodename\fR\*(T>\fR
Hostname
.TP
\fB\*(T<\fBnvidia\fR\*(T>\fR \*(T<\fBthreshold\fR\*(T> \*(T<\fBtemp\fR\*(T> \*(T<\fBgpufreq\fR\*(T> \*(T<\fBmemfreq\fR\*(T> \*(T<\fBimagequality\fR\*(T>
Nvidia graficcard support for the XNVCtrl library.
Each option gives back one integer value:
(threshold): the thresholdtemperature at which the gpu slows down
(temp): gives the gpu current temperature
(gpufreq): gives the current gpu frequency
(memfreq): gives the current mem frequency
(imagequality): which imagequality should be choosen by OpenGL applications
.TP
\fB\*(T<\fBoutlinecolor\fR\*(T>\fR \*(T<\fB(color)\fR\*(T>
Change outline color

21
doc/variables.xml
View File

@ -1389,6 +1389,27 @@
<para></para></listitem>
</varlistentry>
<varlistentry>
<term>
<command><option>nvidia</option></command>
<option>threshold</option>
<option>temp</option>
<option>gpufreq</option>
<option>memfreq</option>
<option>imagequality</option>
</term>
<listitem>
Nvidia graficcard support for the XNVCtrl library.
Each option gives back one integer value:
(threshold): the thresholdtemperature at which the gpu slows down
(temp): gives the gpu current temperature
(gpufreq): gives the current gpu frequency
(memfreq): gives the current mem frequency
(imagequality): which imagequality should be choosen by OpenGL applications
<para></para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<command><option>outlinecolor</option></command>

12
src/Makefile.am
View File

@ -88,6 +88,10 @@ if BUILD_SMAPI
smapi = smapi.c smapi.h
endif
if BUILD_NVIDIA
nvidia = nvidia.c nvidia.h
endif
conky_SOURCES = \
$(audacious) \
$(bmpx) \
@ -98,6 +102,7 @@ conky_SOURCES = \
fs.c \
$(hddtemp) \
$(linux) \
$(nvidia) \
mail.c \
mixer.c \
$(mpd) \
@ -115,7 +120,7 @@ conky_SOURCES = \
$(smapi) \
users.c
AM_LDFLAGS = $(PTHREAD_LIBS) -lm
AM_LDFLAGS = $(PTHREAD_LIBS) -lm
EXTRA_DIST = \
audacious.c \
@ -130,6 +135,8 @@ EXTRA_DIST = \
libtcp-portmon.h \
mpd.c \
netbsd.c \
nvidia.c \
nvidia.h \
openbsd.c \
solaris.c \
top.h \
@ -137,6 +144,7 @@ EXTRA_DIST = \
x11.c \
xmms2.c \
smapi.c \
users.c
users.c
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

46
src/conky.c
View File

@ -126,6 +126,9 @@ static void print_version(void)
#ifdef SMAPI
" * smapi\n"
#endif /* SMAPI */
#ifdef NVIDIA
" * nvidia\n"
#endif
"", SYSTEM_CONFIG_FILE
);
@ -708,7 +711,6 @@ static void new_font(char *buf, char *args)
}
}
#endif
inline void graph_append(struct special_t *graph, double f)
{
int i;
@ -1205,6 +1207,7 @@ enum text_object_type {
OBJ_nameserver,
OBJ_new_mails,
OBJ_nodename,
OBJ_nvidia,
OBJ_pre_exec,
OBJ_processes,
OBJ_running_processes,
@ -1456,6 +1459,10 @@ struct text_object {
} rss;
#endif
struct local_mail_s local_mail;
#ifdef NVIDIA
struct nvidia_s nvidia;
#endif /* NVIDIA */
} data;
int type;
int a, b;
@ -2273,6 +2280,10 @@ static void free_text_objects(unsigned int count, struct text_object *objs)
free(objs[i].data.ifblock.str);
break;
#endif
#ifdef NVIDIA
case OBJ_nvidia:
break;
#endif
#ifdef MPD
case OBJ_mpd_title:
case OBJ_mpd_artist:
@ -3876,6 +3887,28 @@ static struct text_object *construct_text_object(const char *s,
END OBJ(entropy_poolsize, INFO_ENTROPY)
END OBJ(entropy_bar, INFO_ENTROPY)
scan_bar(arg, &obj->a, &obj->b);
#ifdef NVIDIA
END OBJ(nvidia, 0)
if (!arg){
CRIT_ERR("nvidia needs one argument "
"[temp,threshold,gpufreq,memfreq,imagequality]");
} else {
if (strcmp(arg, "temp") == 0)
obj->data.nvidia.type = NV_TEMP;
else if (strcmp(arg, "threshold") == 0)
obj->data.nvidia.type = NV_TEMP_THRESHOLD;
else if (strcmp(arg, "gpufreq") == 0)
obj->data.nvidia.type = NV_GPU_FREQ;
else if (strcmp(arg, "memfreq") == 0)
obj->data.nvidia.type = NV_MEM_FREQ;
else if (strcmp(arg, "imagequality") == 0)
obj->data.nvidia.type = NV_IMAGE_QUALITY;
else
CRIT_ERR("you have to give one of these arguments "
"[temp,threshold,gpufreq,memfreq,imagequality");
strncpy((char*)&obj->data.nvidia.arg, arg, 20);
}
#endif /* NVIDIA */
END {
char buf[256];
@ -6227,6 +6260,17 @@ head:
new_bar(p, obj->a, obj->b, 0);
}
#endif /* SMAPI */
#ifdef NVIDIA
OBJ(nvidia) {
int hol = (strcmp((char*)&obj->data.nvidia.arg, "gpufreq")) ? 1 : 0;
if(!(obj->data.nvidia.value = get_nvidia_value(obj->data.nvidia.type, display, hol)))
snprintf(p, p_max_size, "value unavailible");
else
spaced_print(p, p_max_size, "%*d", 4, "nvidia",
4, obj->data.nvidia.value);
}
#endif /* NVIDIA */
break;
}

15
src/conky.h
View File

@ -85,6 +85,10 @@ char *strndup(const char *s, size_t n);
#include "smapi.h"
#endif
#ifdef NVIDIA
#include "nvidia.h"
#endif
#include "mboxscan.h"
#include "timed_thread.h"
@ -329,6 +333,10 @@ enum {
INFO_USERS = 26,
INFO_GW = 27,
INFO_DNS = 28
#ifdef NVIDIA
, INFO_NVIDIA = 29
#endif
};
/* get_battery_stuff() item selector */
@ -733,4 +741,11 @@ void free_rss_info(void);
/* in linux.c */
/* in nvidia.c */
#ifdef NVIDIA
int get_nvidia_value(QUERY_ID qid, Display *dpy, int highorlow);
#endif /* NVIDIA */
#endif

5
src/libtcp-portmon.c
View File

@ -560,8 +560,9 @@ void update_tcp_port_monitor_collection(
(unsigned long *) &inode) != 7) {
fprintf(stderr, "/proc/net/tcp: bad file format\n");
}
if ((inode == 0) || (state != TCP_ESTABLISHED)) {
/** TCP_ESTABLISHED equals 1, but is not (always??) included **/
//if ((inode == 0) || (state != TCP_ESTABLISHED)) {
if((inode == 0) || (state != 1)) {
continue;
}

43
src/nvidia.c Normal file
View File

@ -0,0 +1,43 @@
/* Conky, a system monitor, based on torsmo
*
* Any original torsmo code is licensed under the BSD license
*
* All code written since the fork of torsmo is licensed under the GPL
*
* Please see COPYING for details
*
* Copyright (c) 2008 Markus Meissner
* Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
* 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 of the License, 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, see <http://www.gnu.org/licenses/>.
*
* $Id$
*/
#include "nvidia.h"
int get_nvidia_value(QUERY_ID qid, Display *dpy, int highorlow){
int tmp;
if(!XNVCTRLQueryAttribute(dpy, 0, 0, qid, &tmp)){
return 0;
} else if (qid == NV_GPU_FREQ){
if (highorlow == 1)
return tmp >> 16;
else
return tmp & 0x0000FFFF;
} else
return tmp;
}

51
src/nvidia.h Normal file
View File

@ -0,0 +1,51 @@
/* Conky, a system monitor, based on torsmo
*
* Any original torsmo code is licensed under the BSD license
*
* All code written since the fork of torsmo is licensed under the GPL
*
* Please see COPYING for details
*
* Copyright (c) 2008 Markus Meissner
* Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
* 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 of the License, 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, see <http://www.gnu.org/licenses/>.
*
* $Id$
*/
#include <X11/Xlib.h>
#include <NVCtrl/NVCtrlLib.h>
#ifndef NVIDIA_CONKY_H
#define NVIDIA_CONKY_H
typedef enum _QUERY_ID {
NV_TEMP = NV_CTRL_GPU_CORE_TEMPERATURE,
NV_TEMP_THRESHOLD = NV_CTRL_GPU_CORE_THRESHOLD,
NV_GPU_FREQ = NV_CTRL_GPU_CURRENT_CLOCK_FREQS,
NV_MEM_FREQ = NV_CTRL_GPU_CURRENT_CLOCK_FREQS,
NV_IMAGE_QUALITY = NV_CTRL_IMAGE_SETTINGS
} QUERY_ID;
struct nvidia_s {
int interval;
int value;
char arg[20];
QUERY_ID type;
};
#endif