mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-26 12:27:52 +00:00
new files
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@84 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
parent
1180068495
commit
f61bbe400e
@ -43,7 +43,7 @@ endif
|
|||||||
|
|
||||||
conky_SOURCES = common.c fs.c top.c $(linux) mail.c mixer.c $(seti) $(mpd) \
|
conky_SOURCES = common.c fs.c top.c $(linux) mail.c mixer.c $(seti) $(mpd) \
|
||||||
$(solaris) $(freebsd) $(netbsd) $(cairo) conky.c conky.h $(x11) $(metar) \
|
$(solaris) $(freebsd) $(netbsd) $(cairo) conky.c conky.h $(x11) $(metar) \
|
||||||
$(mldonkey)
|
$(mldonkey) remoted.c remoted.h remotec.c remotec.h
|
||||||
|
|
||||||
conky_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS)
|
conky_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS)
|
||||||
|
|
||||||
|
@ -56,7 +56,8 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
|||||||
PROGRAMS = $(bin_PROGRAMS)
|
PROGRAMS = $(bin_PROGRAMS)
|
||||||
am__conky_SOURCES_DIST = common.c fs.c top.c linux.c mail.c mixer.c \
|
am__conky_SOURCES_DIST = common.c fs.c top.c linux.c mail.c mixer.c \
|
||||||
seti.c mpd.c libmpdclient.c solaris.c freebsd.c netbsd.c \
|
seti.c mpd.c libmpdclient.c solaris.c freebsd.c netbsd.c \
|
||||||
cairo.c conky.c conky.h x11.c ftp.c metarinfo.c mldonkey.c
|
cairo.c conky.c conky.h x11.c ftp.c metarinfo.c mldonkey.c \
|
||||||
|
remoted.c remoted.h remotec.c remotec.h
|
||||||
@BUILD_LINUX_TRUE@am__objects_1 = linux.$(OBJEXT)
|
@BUILD_LINUX_TRUE@am__objects_1 = linux.$(OBJEXT)
|
||||||
@BUILD_SETI_TRUE@am__objects_2 = seti.$(OBJEXT)
|
@BUILD_SETI_TRUE@am__objects_2 = seti.$(OBJEXT)
|
||||||
@BUILD_MPD_TRUE@am__objects_3 = mpd.$(OBJEXT) libmpdclient.$(OBJEXT)
|
@BUILD_MPD_TRUE@am__objects_3 = mpd.$(OBJEXT) libmpdclient.$(OBJEXT)
|
||||||
@ -72,7 +73,7 @@ am_conky_OBJECTS = common.$(OBJEXT) fs.$(OBJEXT) top.$(OBJEXT) \
|
|||||||
$(am__objects_2) $(am__objects_3) $(am__objects_4) \
|
$(am__objects_2) $(am__objects_3) $(am__objects_4) \
|
||||||
$(am__objects_5) $(am__objects_6) $(am__objects_7) \
|
$(am__objects_5) $(am__objects_6) $(am__objects_7) \
|
||||||
conky.$(OBJEXT) $(am__objects_8) $(am__objects_9) \
|
conky.$(OBJEXT) $(am__objects_8) $(am__objects_9) \
|
||||||
$(am__objects_10)
|
$(am__objects_10) remoted.$(OBJEXT) remotec.$(OBJEXT)
|
||||||
conky_OBJECTS = $(am_conky_OBJECTS)
|
conky_OBJECTS = $(am_conky_OBJECTS)
|
||||||
am__DEPENDENCIES_1 =
|
am__DEPENDENCIES_1 =
|
||||||
conky_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
conky_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||||
@ -212,7 +213,7 @@ target_alias = @target_alias@
|
|||||||
@BUILD_X11_TRUE@x11 = x11.c
|
@BUILD_X11_TRUE@x11 = x11.c
|
||||||
conky_SOURCES = common.c fs.c top.c $(linux) mail.c mixer.c $(seti) $(mpd) \
|
conky_SOURCES = common.c fs.c top.c $(linux) mail.c mixer.c $(seti) $(mpd) \
|
||||||
$(solaris) $(freebsd) $(netbsd) $(cairo) conky.c conky.h $(x11) $(metar) \
|
$(solaris) $(freebsd) $(netbsd) $(cairo) conky.c conky.h $(x11) $(metar) \
|
||||||
$(mldonkey)
|
$(mldonkey) remoted.c remoted.h remotec.c remotec.h
|
||||||
|
|
||||||
conky_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS)
|
conky_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS)
|
||||||
conky_LDADD = $(METAR_LIBS)
|
conky_LDADD = $(METAR_LIBS)
|
||||||
@ -327,6 +328,8 @@ distclean-compile:
|
|||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mldonkey.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mldonkey.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpd.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpd.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netbsd.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netbsd.Po@am__quote@
|
||||||
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remotec.Po@am__quote@
|
||||||
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remoted.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seti.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/seti.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solaris.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solaris.Po@am__quote@
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/top.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/top.Po@am__quote@
|
||||||
|
2
configure
vendored
2
configure
vendored
@ -1613,7 +1613,7 @@ fi
|
|||||||
|
|
||||||
# Define the identity of the package.
|
# Define the identity of the package.
|
||||||
PACKAGE=conky
|
PACKAGE=conky
|
||||||
VERSION=1.2
|
VERSION=1.3
|
||||||
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
AC_INIT(conky.c)
|
AC_INIT(conky.c)
|
||||||
|
|
||||||
AM_INIT_AUTOMAKE(conky, 1.2)
|
AM_INIT_AUTOMAKE(conky, 1.3)
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
uname=`uname`
|
uname=`uname`
|
||||||
|
13
remotec.c
Normal file
13
remotec.c
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
/*
|
||||||
|
* Conky, a system monitor, based on torsmo
|
||||||
|
*
|
||||||
|
* This program is licensed under BSD license, read COPYING
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
okay, nothing here right now. thanks for coming out
|
||||||
|
|
||||||
|
*/
|
13
remotec.h
Normal file
13
remotec.h
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
/*
|
||||||
|
* Conky, a system monitor, based on torsmo
|
||||||
|
*
|
||||||
|
* This program is licensed under BSD license, read COPYING
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
okay, nothing here right now. thanks for coming out
|
||||||
|
|
||||||
|
*/
|
39
remoted.c
Normal file
39
remoted.c
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* Conky, a system monitor, based on torsmo
|
||||||
|
*
|
||||||
|
* This program is licensed under BSD license, read COPYING
|
||||||
|
*
|
||||||
|
* $Id$
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <pthread.h>
|
||||||
|
|
||||||
|
static pthread_t daemon;
|
||||||
|
static int daemon_status = 0;
|
||||||
|
|
||||||
|
/* okay, heres how it will basically work.
|
||||||
|
* when something connects, it will first send the conkyrc on the local (daemonized) server
|
||||||
|
* after this, it will simply continue to send all the buffered text to the remote client
|
||||||
|
*/
|
||||||
|
|
||||||
|
void *daemon_thread()
|
||||||
|
{
|
||||||
|
/* do something */
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void daemon_loop()
|
||||||
|
{
|
||||||
|
/* create thread, keep an eye on it */
|
||||||
|
int iret;
|
||||||
|
if (!daemon_status) {
|
||||||
|
daemon_status = 1;
|
||||||
|
iret = pthread_create(&daemon, NULL, daemon_thread, NULL);
|
||||||
|
} else if (daemon_status == 1) {
|
||||||
|
/* thread is still running, we'll just wait for it to finish for now */
|
||||||
|
pthread_join(daemon, NULL);
|
||||||
|
daemon_status = 0;
|
||||||
|
} else {
|
||||||
|
/* something else */
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user