Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 10:35:10 +00:00
Code Issues Releases Activity

Added Sony VAIO fanspeed info (thanks Yeon-Hyeong).

Browse Source 
Also removed the README and man page from the repo, as they don't really
need to be there and just cause conflicts.
This commit is contained in:
Yeon-Hyeong Yang 2009-05-03 21:23:59 -06:00 committed by Brenden Matthews
parent 27fff0d9cb
commit f8a6a4035c
9 changed files with 31 additions and 3712 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -34,3 +34,5 @@ conky-*.tar.*
doc/*.html
doc/*.mxml
patches/
README
doc/conky.1

3
ChangeLog
View File

@ -1,3 +1,6 @@
2009-05-03
* Added Sony VAIO fanspeed info (thanks Yeon-Hyeong)
2009-05-01
* Added diskio_avg_samples patch (thanks Yeon-Hyeong)
* Fixed $texeci regression

1975
README
View File

File diff suppressed because it is too large Load Diff

1736
doc/conky.1
View File

File diff suppressed because it is too large Load Diff

10
doc/variables.xml
View File

@ -2733,6 +2733,7 @@
Prints the song name in either the form "artist - title" or file name, depending on whats available
<para></para></listitem>
</varlistentry>
<varlistentry>
<term>
<command><option>if_xmms2_connected</option></command>
@ -2742,6 +2743,15 @@
<para></para></listitem>
</varlistentry>
<varlistentry>
<term>
<command><option>sony_fanspeed</option></command>
</term>
<listitem>
Displays the Sony VAIO fanspeed information if sony-laptop kernel support is enabled. Linux only.
<para></para></listitem>
</varlistentry>
<varlistentry>
<term>
<command><option>eve</option></command>

3
src/Makefile.am
View File

@ -64,7 +64,7 @@ xmms2 = xmms2.c
endif
if BUILD_LINUX
linux = linux.c top.c diskio.c users.c
linux = linux.c top.c diskio.c users.c sony.c
PTHREAD_LIBS = -lpthread
endif
@ -208,6 +208,7 @@ EXTRA_DIST = \
smapi.h \
ibm.c \
ibm.h \
sony.h \
users.c

8
src/conky.c
View File

@ -1223,6 +1223,9 @@ static struct text_object *construct_text_object(const char *s,
END OBJ(ibm_volume, 0)
END OBJ(ibm_brightness, 0)
#endif
/* information from sony_laptop kernel module
* /sys/devices/platform/sony-laptop */
END OBJ(sony_fanspeed, 0)
END OBJ_IF(if_gw, 0)
END OBJ(ioscheduler, 0)
if (!arg) {
@ -3415,6 +3418,11 @@ static void generate_text_internal(char *p, int p_max_size,
get_ibm_acpi_brightness(p, p_max_size);
}
#endif /* IBM */
/* information from sony_laptop kernel module
* /sys/devices/platform/sony-laptop */
OBJ(sony_fanspeed) {
get_sony_fanspeed(p, p_max_size);
}
OBJ(if_gw) {
if (!cur->gw_info.count) {
DO_JUMP;

3
src/conky.h
View File

@ -103,6 +103,9 @@ char *strndup(const char *s, size_t n);
#include "smapi.h"
#endif
/* sony support */
#include "sony.h"
/* A size for temporary, static buffers to use when
* one doesn't know what to choose. Defaults to 256. */
extern unsigned int text_buffer_size;

3
src/text_object.h
View File

@ -148,6 +148,9 @@ enum text_object_type {
OBJ_smapi_bat_power,
OBJ_if_smapi_bat_installed,
#endif /* IBM */
/* information from sony_laptop kernel module
* /sys/devices/platform/sony-laptop */
OBJ_sony_fanspeed,
OBJ_if_gw,
OBJ_ioscheduler,
OBJ_gw_iface,