release 0.7.5

fixed memory leak
added in-text commands:
 ^tw()
 ^c()
 ^p()

added gadgets:
 kittscanner
 gdbar
 gcpubar



git-svn-id: http://dzen.googlecode.com/svn/trunk@149 f2baff5b-bf2c-0410-a398-912abdc3d8b2

1 files changed, 154 insertions, 0 deletions

diff --git a/gadgets/gdbar.c b/gadgets/gdbar.c
new file mode 100644
index 0000000..4138770
--- /dev/null
+++ b/gadgets/gdbar.c
@@ -0,0 +1,154 @@
+/*  
+	gdbar - graphical percentage meter, to be used with dzen
+
+	Copyright (c) 2007 by Robert Manea  <rob dot manea at gmail dot com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+
+#include<stdio.h>
+#include<stdlib.h>
+#include<unistd.h>
+#include<string.h>
+#include<X11/Xlib.h>
+
+#define MAXLEN 512
+
+static void pbar (const char *, double, int, int, int);
+
+char *bg, *fg;
+
+
+static void
+pbar(const char* label, double perc, int maxc, int height, int pnl) {
+	int i, rp;
+	double l;
+
+
+	l = perc * ((double)maxc / 100);
+	if((int)(l + 0.5) >= (int)l)
+		l = l + 0.5;
+
+	if((int)(perc + 0.5) >= (int)perc)
+		rp = (int)(perc + 0.5);
+	else
+		rp = (int)perc;
+
+	printf("%s %3d%% ^fg(%s)^r(%dx%d)^fg(%s)^r(%dx%d)%s", 
+			label ? label : "", rp, 
+			fg, (int)l, height,
+			bg, maxc-(int)l, height,
+			pnl ? "\n" : "");
+}
+
+	int
+main(int argc, char *argv[])
+{
+	int i, nv;
+	double val;
+	char aval[MAXLEN], *endptr;
+
+	/* defaults */
+	int barwidth  =   80;
+	int barheight =   10;
+	double minval =    0;
+	double maxval =  100.0;
+	int print_nl  =    1;
+	const char *label = NULL;
+
+
+	for(i=1; i < argc; i++) {
+		if(!strncmp(argv[i], "-w", 3)) {
+			if(++i < argc)
+				barwidth = atoi(argv[i]);
+		}
+		else if(!strncmp(argv[i], "-h", 3)) {
+			if(++i < argc)
+				barheight = atoi(argv[i]);
+		}
+		else if(!strncmp(argv[i], "-fg", 4)) {
+			if(++i < argc)
+				fg = argv[i];
+			else {
+				fg = malloc(6);
+				strcpy(fg, "white");
+			}
+		}
+		else if(!strncmp(argv[i], "-bg", 4)) {
+			if(++i < argc)
+				bg = argv[i];
+			else {
+				bg = malloc(9);
+				strcpy(bg, "darkgrey");
+			}
+		}
+		else if(!strncmp(argv[i], "-max", 5)) {
+			if(++i < argc) {
+				maxval = strtod(argv[i], &endptr);
+				if(*endptr) {
+					fprintf(stderr, "dbar: '%s' incorrect number format", argv[i]);
+					return EXIT_FAILURE;
+				}
+			}
+		}
+		else if(!strncmp(argv[i], "-min", 5)) {
+			if(++i < argc) {
+				minval = strtod(argv[i], &endptr);
+				if(*endptr) {
+					fprintf(stderr, "dbar: '%s' incorrect number format", argv[i]);
+					return EXIT_FAILURE;
+				}
+			}
+		}
+		else if(!strncmp(argv[i], "-l", 3)) {
+			if(++i < argc)
+				label = argv[i];
+		}
+		else if(!strncmp(argv[i], "-nonl", 6)) {
+			print_nl = 0;
+		}
+		else {
+			fprintf(stderr, "usage: dbar [-w <pixel>] [-h <pixel>] [-fg <color>] [-bg <color>] [-min <minvalue>] [-max <maxvalue>] [-l <string>] [-nonl]\n");
+			return EXIT_FAILURE;
+		}
+	}
+
+	if(!fg) {
+		fg = malloc(6);
+		strcpy(fg, "white");
+	}
+	if(!bg) {
+		bg = malloc(9);
+		strcpy(bg, "darkgrey");
+	}
+
+	while(fgets(aval, MAXLEN, stdin)) {
+		nv = sscanf(aval, "%lf %lf %lf", &val, &minval, &maxval);
+		if(nv == 2) {
+			maxval = minval;
+			minval = 0;
+		}
+
+		pbar(label, (100*(val-minval))/(maxval-minval), barwidth, barheight, print_nl);
+	}
+
+	return EXIT_SUCCESS;
+}
+