new files

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@84 7f574dfc-610e-0410-a909-a81674777703

diff --git a/Makefile.am b/Makefile.am
index e64a818..ce0f5f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ endif
 
 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) \
-       $(mldonkey)
+       $(mldonkey) remoted.c remoted.h remotec.c remotec.h
 
 conky_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS)
 
@@ -63,4 +63,4 @@ EXTRA_DIST = conkyrc.sample conky.1 conky.x \
              app-admin/conky/conky-1.2.ebuild
 
 EXTRA_conky_SOURCES = seti.c linux.c solaris.c freebsd.c netbsd.c mpd.c libmpdclient.c \
-cairo.c libmpdclient.h top.h mldonkey.c ftp.c metarinfo.c ftp.h metarinfo.h x11.c
+cairo.c libmpdclient.h top.h mldonkey.c ftp.c metarinfo.c ftp.h metarinfo.h x11.c
\ No newline at end of file

diff --git a/Makefile.in b/Makefile.in
index c46d9a6..c617f6b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,8 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 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 \
-       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_SETI_TRUE@am__objects_2 = seti.$(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_5) $(am__objects_6) $(am__objects_7) \
        conky.$(OBJEXT) $(am__objects_8) $(am__objects_9) \
-       $(am__objects_10)
+       $(am__objects_10) remoted.$(OBJEXT) remotec.$(OBJEXT)
 conky_OBJECTS = $(am_conky_OBJECTS)
 am__DEPENDENCIES_1 =
 conky_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -212,7 +213,7 @@ target_alias = @target_alias@
 @BUILD_X11_TRUE@x11 = x11.c
 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) \
-       $(mldonkey)
+       $(mldonkey) remoted.c remoted.h remotec.c remotec.h
 
 conky_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_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)/mpd.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)/solaris.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/top.Po@am__quote@

diff --git a/configure b/configure
index 27bf029..8f0ee10 100755 (executable)
--- a/configure
+++ b/configure
@@ -1613,7 +1613,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=conky
- VERSION=1.2
+ VERSION=1.3
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.in b/configure.in
index c289796..72555e4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(conky.c)
 
-AM_INIT_AUTOMAKE(conky, 1.2)
+AM_INIT_AUTOMAKE(conky, 1.3)
 AM_CONFIG_HEADER(config.h)
 
 uname=`uname`

diff --git a/remotec.c b/remotec.c
new file mode 100644 (file)
index 0000000..26f8fee
--- /dev/null
+++ b/remotec.c
@@ -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
+ 
+ */
\ No newline at end of file

diff --git a/remotec.h b/remotec.h
new file mode 100644 (file)
index 0000000..bb5b79b
--- /dev/null
+++ b/remotec.h
@@ -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
+ 
+  */
\ No newline at end of file

diff --git a/remoted.c b/remoted.c
new file mode 100644 (file)
index 0000000..feedbb0
--- /dev/null
+++ b/remoted.c
@@ -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 */
+       }
+}

diff --git a/remoted.h b/remoted.h
new file mode 100644 (file)
index 0000000..ebb3a2a
--- /dev/null
+++ b/remoted.h
@@ -0,0 +1,9 @@
+/*
+ * Conky, a system monitor, based on torsmo
+ *
+ * This program is licensed under BSD license, read COPYING
+ *
+ *  $Id$
+ */
+
+static void daemon_loop();
\ No newline at end of file