From 584d05d2ad66edf1f53372382826a2416b50d9da Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sat, 3 Oct 2009 14:26:39 -0700 Subject: [PATCH] Add the -p/--pause command line option. --- doc/command_options.xml | 10 ++++++++++ lua/Makefile.am | 6 ++---- src/conky.c | 11 +++++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/doc/command_options.xml b/doc/command_options.xml index 6a0b9bfb..fd512a91 100644 --- a/doc/command_options.xml +++ b/doc/command_options.xml @@ -117,6 +117,16 @@ $uptime ' + + + + + + + + Time to pause before actually starting Conky + + diff --git a/lua/Makefile.am b/lua/Makefile.am index 8760acd6..5f344cc4 100644 --- a/lua/Makefile.am +++ b/lua/Makefile.am @@ -20,10 +20,8 @@ # along with this program. If not, see . # -libcairo_la_SOURCES = cairo.pkg -libimlib2_la_SOURCES = imlib2.pkg - -CLEANFILES = libcairo.c libimlib2.c +libcairo_la_SOURCES = libcairo.c +libimlib2_la_SOURCES = libimlib2.c if BUILD_LUA diff --git a/src/conky.c b/src/conky.c index 217ac1e8..9081c957 100644 --- a/src/conky.c +++ b/src/conky.c @@ -6340,13 +6340,14 @@ static void print_help(const char *prog_name) { #endif /* X11 */ " -t, --text=TEXT text to render, remember single quotes, like -t '$uptime'\n" " -u, --interval=SECS update interval\n" - " -i COUNT number of times to update "PACKAGE_NAME" (and quit)\n", + " -i COUNT number of times to update "PACKAGE_NAME" (and quit)\n" + " -p, --pause=SECS pause for SECS seconds at startup before doing anything\n", prog_name ); } /* : means that character before that takes an argument */ -static const char *getopt_string = "vVqdDt:u:i:hc:" +static const char *getopt_string = "vVqdDt:u:i:hc:p:" #ifdef X11 "x:y:w:a:f:X:" #ifdef OWN_WINDOW @@ -6384,6 +6385,7 @@ static const struct option longopts[] = { #endif /* X11 */ { "text", 1, NULL, 't' }, { "interval", 0, NULL, 'u' }, + { "pause", 0, NULL, 'p' }, { 0, 0, 0, 0 } }; @@ -6429,6 +6431,7 @@ void initialisation(int argc, char **argv) { while (1) { int c = getopt_long(argc, argv, getopt_string, longopts, NULL); + int startup_pause; if (c == -1) { break; @@ -6490,6 +6493,10 @@ void initialisation(int argc, char **argv) { gap_y = atoi(optarg); break; #endif /* X11 */ + case 'p': + startup_pause = atoi(optarg); + sleep(startup_pause); + break; case '?': exit(EXIT_FAILURE);