debian/0000755000000000000000000000000012222267371007172 5ustar debian/docs0000644000000000000000000000003412222263027010034 0ustar README README.tkosdshconfig debian/rules0000755000000000000000000000376212222266247010263 0ustar #!/usr/bin/make -f # Created by Joachim Breitner # Based upon: # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 PACKAGE=osdsh CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. touch configure-stamp build: build-stamp build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. $(MAKE) #/usr/bin/docbook-to-man debian/osdsh.sgml > osdsh.1 touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. -$(MAKE) clean dh_clean install: build dh_testdir dh_testroot dh_clean -k mkdir -p $(CURDIR)/debian/osdsh/usr/bin install src/osdsh/osdsh $(CURDIR)/debian/osdsh/usr/bin install src/osdctl/osdctl $(CURDIR)/debian/osdsh/usr/bin mkdir -p $(CURDIR)/debian/osdsh/usr/lib/osdsh install src/osdsh/libosdsh*.so $(CURDIR)/debian/osdsh/usr/lib/osdsh install tkosdshconfig $(CURDIR)/debian/osdsh/usr/bin/osdshconfig # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs dh_installdocs dh_installexamples # dh_install dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime # dh_installinit # dh_installcron # dh_installinfo dh_installman # dh_link dh_strip dh_compress dh_fixperms # dh_perl # dh_python # dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure debian/patches/0000755000000000000000000000000012222266075010621 5ustar debian/patches/07-compile-with-rdynamic-for-powerpc.dpatch0000644000000000000000000000050212222266011020663 0ustar From: Joachim Breitner Subject: No description. --- a/src/osdsh/Makefile +++ b/src/osdsh/Makefile @@ -4,7 +4,7 @@ DOCDIR = $(PREFIX)/doc/osdsh LIBDIR = -L/usr/X11R6/lib -L/usr/lib LIBS = $(LIBDIR) -lxosd -lpthread -CFLAGS = -O3 +CFLAGS = -O3 -rdynamic #APMOBJS = apmwatch.o #APMLIBS = -lapm debian/patches/09-process-running-checks.dpatch0000644000000000000000000000426012222266011016616 0ustar From: Roman Yepishev Subject: osdctl now checks that osdsh is running, osdsh checks that another Subject: instance is not running before starting up --- a/src/osdctl/osdctl.c +++ b/src/osdctl/osdctl.c @@ -36,11 +36,31 @@ { FILE *fp; char fifo_file[PATH_MAX]; + char pid_file[PATH_MAX]; + pid_t osdsh_pid; if (strcmp(command, "")==0) return; sprintf(fifo_file, "%s.%d", OSD_FIFO_PATH, getuid()); + sprintf(pid_file, "%s.%d.pid", OSD_FIFO_PATH, getuid()); + + /* + * We need to check that osdSH is really running because writing + * to the socket without osdSH reading from it results in osdctl + * hang + */ + if((fp = fopen(pid_file, "r")) == NULL) { + perror("osdSH is not running (no pid file)"); + exit(1); + } + + if((!fscanf(fp, "%d", &osdsh_pid)) || kill(osdsh_pid, 0)) { + perror("osdSH is not running"); + exit(1); + } + + fclose(fp); if((fp = fopen(fifo_file, "w")) == NULL) { perror("Couldn't open fifo"); --- a/src/osdctl/osdctl.h +++ b/src/osdctl/osdctl.h @@ -1,3 +1,6 @@ #include #include #include +#include +#include + --- a/src/osdsh/osdsh.c +++ b/src/osdsh/osdsh.c @@ -149,6 +149,7 @@ int main(int argc, char *argv[], char *env[]) { pid_t childpid; + pid_t osdsh_pid; char pid_file[PATH_MAX+1]; FILE *fp; @@ -169,6 +170,16 @@ pppset = mixerset = settings; */ + sprintf(pid_file, "%s.%d.pid", OSD_FIFO_PATH, getuid()) ; + + if(fp = fopen(pid_file, "r")) { + if((fscanf(fp, "%d", &osdsh_pid)) && !kill(osdsh_pid, 0)) { + fprintf(stderr, "osdSH is already running (pid %d)\n", osdsh_pid); + exit(1); + } + fclose(fp); + } + if((childpid=fork())<0) { perror("fork"); exit(1); @@ -177,7 +188,6 @@ control_sh(NULL); } else { - sprintf(pid_file, "%s.%d.pid", OSD_FIFO_PATH, getuid()) ; fp=fopen(pid_file, "w"); fprintf(fp, "%d", childpid); fclose(fp); --- a/src/osdsh/osdsh.h +++ b/src/osdsh/osdsh.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include debian/patches/00-make-clean.dpatch0000644000000000000000000000154412222266011014212 0ustar --- osdsh-0.7.0.orig/src/config.h +++ osdsh-0.7.0/src/config.h @@ -11,5 +11,5 @@ #define OSD_FIFO_PATH "/tmp/osdsh" #define PPP_DEVICE "ppp0" #define PPP_PID_PATH "/var/run" -#define PLUGINSDIR "/usr/local/lib/osdsh" +#define PLUGINSDIR "/usr/lib/osdsh" #define MAX_PLUGINS 20 --- osdsh-0.7.0.orig/src/osdctl/Makefile +++ osdsh-0.7.0/src/osdctl/Makefile @@ -13,5 +13,5 @@ gcc $(LIBDIR) $(LIBS) $(CFLAGS) -o $@ $@.c clean: - rm osdctl + rm -f osdctl --- osdsh-0.7.0.orig/src/osdsh/Makefile +++ osdsh-0.7.0/src/osdsh/Makefile @@ -18,18 +18,18 @@ %.o: %.c - gcc -c $< + gcc -fPIC -c $< osdsh: $(OBJS) gcc -c $(CFLAGS) $@.c gcc $(CFLAGS) -o $@ osdsh.o $(OBJS) $(LIBS) –ldl clean: libclean - rm osdsh - rm *.o + rm -f osdsh + rm -f *.o libclean: - rm libosdsh*.so + rm -f libosdsh*.so libosdshclock.so: gcc -fPIC -c clockdisplay.c debian/patches/03-fix-powerpc-getopts.dpatch0000644000000000000000000000130612222266011016142 0ustar From: Joachim Breitner Subject: Fixes powerpc signed/unsigned problems with getopts --- a/src/osdctl/osdctl.c +++ b/src/osdctl/osdctl.c @@ -70,7 +70,7 @@ /* ============================ main () ============================== */ int main(int argc, char *argv[]) { - char c; + int c; char command[BUFSIZ]; int opt_index = 0; struct option opts[] = { --- a/src/osdsh/osdsh.c +++ b/src/osdsh/osdsh.c @@ -50,7 +50,7 @@ /* ============================ parse_args () ============================== */ void parse_args(int argc, char *argv[], settings_t * settings) { - char c; + int c; int opt_index = 0; struct option opts[] = { {"help", 0, 0, 'h'}, debian/patches/05-fix-b-l-options-docs.dpatch0000644000000000000000000000162312222266011016075 0ustar From: Joachim Breitner Subject: Fix docs for -l/-b options --- a/src/osdctl/osdctl.c +++ b/src/osdctl/osdctl.c @@ -8,8 +8,8 @@ fprintf(stderr, "osdctl ...\n\n"); fprintf(stderr, " -h display help\n"); fprintf(stderr, " -s \"string\" display a string\n"); - fprintf(stderr, " -b (name,val) display a bar up to val, named \"name\"\n"); - fprintf(stderr, " -l (name,val) display a slider at val, named \"name\"\n"); + fprintf(stderr, " -b name,val display a bar up to val, named \"name\"\n"); + fprintf(stderr, " -l name,val display a slider at val, named \"name\"\n"); fprintf(stderr, " -t int display the clock for int seconds\n"); fprintf(stderr, " -c <0|1> (de)activate the osd clock\n"); fprintf(stderr, " -m <0|1> (de)activate the mixer display\n"); debian/patches/04-fix-p-option-docs.dpatch0000644000000000000000000000151412222266011015475 0ustar From: Joachim Breitner Subject: Flips docs for -p option --- a/src/osdsh/osdsh.c +++ b/src/osdsh/osdsh.c @@ -35,8 +35,8 @@ fprintf(stderr, " -c color set color %s \n", COLOR); fprintf(stderr, " -d int set OSD delay %d \n", TIMEOUT); fprintf(stderr, " -o int set Shadow Offset %d \n", SHADOW_OFFSET); - fprintf(stderr, " -p <0|1> position of the osd, 0 for bottom,\n"); - fprintf(stderr, " 1 for top. Default 1 (top).\n"); + fprintf(stderr, " -p <0|1> position of the osd, 0 for top,\n"); + fprintf(stderr, " 1 for bottom. Default 0 (top).\n"); fprintf(stderr, " -a <0|1|2> align of the osd. left,center or right.\n"); fprintf(stderr, " -n number set the nice number so osdsh won't eat your cpu\n"); fprintf(stderr, "\n"); debian/patches/series0000644000000000000000000000053112222265216012031 0ustar 00-make-clean.dpatch 01-outline.dpatch 02-align-flag.dpatch 03-fix-powerpc-getopts.dpatch 04-fix-p-option-docs.dpatch 05-fix-b-l-options-docs.dpatch 06-fix-m-option.dpatch 07-compile-with-rdynamic-for-powerpc.dpatch 08-strn-comments-fix.dpatch 09-process-running-checks.dpatch 10-osdsh-create-fifo-before-fork.dpatch 11-fix-binutils-gold.dpatch debian/patches/06-fix-m-option.dpatch0000644000000000000000000000317012222266011014546 0ustar From: Joachim Breitner Subject: some hacks to actually enable setting mixer device via command line --- a/src/osdsh/controlsh.c +++ b/src/osdsh/controlsh.c @@ -15,6 +15,8 @@ char file[PATH_MAX+256]; char *msg = NULL; + char **mod_mixerdev; + /* getcwd(file, PATH_MAX); strcat(file, "/"); @@ -41,6 +43,9 @@ info = dlsym(module, "mynameis"); + mod_mixerdev = dlsym(module, "mixerdevice"); + *mod_mixerdev = mixerdevice; + plugins[a].module = module; plugins[a].whoami = a; plugins[a].file = file; --- a/src/osdsh/mixerwatch.c +++ b/src/osdsh/mixerwatch.c @@ -3,7 +3,8 @@ #define IAM 0 #define MYNAME "Mixer" -char mixerdevice[PATH_MAX+1] = MIXER; +// globally defined by Joachim +// char mixerdevice[PATH_MAX+1] = MIXER; int dev; settings_t mixerset; int vol[SOUND_MIXER_NRDEVICES]; --- a/src/osdsh/osdsh.c +++ b/src/osdsh/osdsh.c @@ -91,12 +91,10 @@ case 'd': settings->delay = atoi(optarg); break; -/* case 'm': - strncpy(messages.mixerdevice, optarg, BUFSIZ); - messages.mixerdevice[PATH_MAX+1] = '\0'; + strncpy(mixerdevice, optarg, PATH_MAX); + mixerdevice[PATH_MAX] = '\0'; break; -*/ case 'o': settings->soffset = atoi(optarg); break; @@ -158,6 +156,11 @@ set_defaults(&settings); initialize_osd(&settings); + /* HACK */ + strncpy(mixerdevice, MIXER, PATH_MAX); + mixerdevice[PATH_MAX] = '\0'; + + parse_args(argc, argv, &settings); /* #ifndef NOAPM --- a/src/osdsh/osdsh.h +++ b/src/osdsh/osdsh.h @@ -44,3 +44,5 @@ int (*isitmine)(); } plugininfo_t; +/* HACK */ +char mixerdevice[PATH_MAX + 1]; debian/patches/01-outline.dpatch0000644000000000000000000001326412222266075013711 0ustar From: Joachim Breitner Subject: Adds outline border and color --- a/src/config.h +++ b/src/config.h @@ -2,10 +2,12 @@ #define FONT "-*-lucidatypewriter-bold-*-*-*-*-240-*-*-*-*-*-*" #define TIMEOUT 5 #define COLOR "green" +#define OCOLOR "black" #define OSD_ALIGNMENT XOSD_left #define OSD_POSITION XOSD_top #define MIXER "/dev/mixer" #define SHADOW_OFFSET 0 +#define OUTLINE_OFFSET 0 #define DEFAULT_OFFSET 0 #define CLOCK_FORMAT "%a %b %e %G - %H : %M : %S" #define OSD_FIFO_PATH "/tmp/osdsh" --- a/src/osdsh/osdsh.c +++ b/src/osdsh/osdsh.c @@ -56,9 +56,11 @@ {"help", 0, 0, 'h'}, {"position", 1, 0, 'p'}, {"soffset", 1, 0, 'o'}, + {"ooffset", 1, 0, 'O'}, {"mixer", 1, 0, 'm'}, {"font", 1, 0, 'f'}, {"color", 1, 0, 'c'}, + {"ocolor", 1, 0, 'k'}, {"delay", 1, 0, 'd'}, {"align", 1, 0, 'a'}, {"nice", 1, 0, 'n'} @@ -76,6 +78,10 @@ strncpy(settings->color, optarg, BUFSIZ); settings->color[BUFSIZ] = '\0'; break; + case 'k': + strncpy(settings->ocolor, optarg, BUFSIZ); + settings->ocolor[BUFSIZ] = '\0'; + break; case 'p': settings->position = atoi(optarg); break; @@ -94,6 +100,9 @@ case 'o': settings->soffset = atoi(optarg); break; + case 'O': + settings->ooffset = atoi(optarg); + break; case 'n': nice(atoi(optarg)); break; --- a/src/osdsh/osdsh.h +++ b/src/osdsh/osdsh.h @@ -23,7 +23,9 @@ xosd *myosd; char font[BUFSIZ + 1]; char color[BUFSIZ + 1]; + char ocolor[BUFSIZ + 1]; int soffset; + int ooffset; int xoffset; int yoffset; xosd_align align; --- a/src/osdsh/utils.c +++ b/src/osdsh/utils.c @@ -53,6 +53,16 @@ if (setts->displaying&&xosd_set_shadow_offset(setts->myosd, setts->soffset)) fprintf(stderr, "Couldn't change Shadow Offset\n"); break; + case 'O': + setts->ooffset = atoi(argument); + if (setts->displaying&&xosd_set_outline_offset(setts->myosd, setts->ooffset)) + fprintf(stderr, "Couldn't change Outline Width\n"); + break; + case 'k': + strncpy(setts->ocolor, argument, BUFSIZ); + if (setts->displaying&&xosd_set_outline_colour(setts->myosd, argument)) + fprintf(stderr, "Couldn't change outline color\n"); + break; case 'y': setts->yoffset = atoi(argument); if (setts->displaying&&xosd_set_vertical_offset(setts->myosd, setts->yoffset)) @@ -77,6 +87,8 @@ xosd_set_horizontal_offset(setts->myosd, setts->xoffset); xosd_set_vertical_offset(setts->myosd, setts->yoffset); xosd_set_shadow_offset(setts->myosd, setts->soffset); + xosd_set_outline_offset(setts->myosd, setts->ooffset); + xosd_set_outline_colour(setts->myosd, setts->ocolor); xosd_set_timeout(setts->myosd, setts->delay); } /* ============================ set_defaults () ============================ */ @@ -86,7 +98,10 @@ setts->font[BUFSIZ] = '\0'; strncpy(setts->color, COLOR, BUFSIZ); setts->color[BUFSIZ] = '\0'; + strncpy(setts->ocolor, OCOLOR, BUFSIZ); + setts->ocolor[BUFSIZ] = '\0'; setts->soffset = SHADOW_OFFSET; + setts->ooffset = OUTLINE_OFFSET; setts->yoffset = DEFAULT_OFFSET; setts->xoffset = DEFAULT_OFFSET; setts->align= OSD_ALIGNMENT; --- a/tkosdshconfig +++ b/tkosdshconfig @@ -39,6 +39,8 @@ xside "Left" yside "Top" shad "0" + outline "0" + ocolor "black" extra "" extra2 "" extra3 "" @@ -59,15 +61,19 @@ label .$a.ypos -text "Y edge:" label .$a.yoff -text "Y distance:" label .$a.shad -text "Shadow offset:" + label .$a.outline -text "Outline width:" + label .$a.ocolor -text "Outline color:" grid .$a.delay -row 1 -column 0 -sticky nsew grid .$a.color -row 2 -column 0 -sticky nsew grid .$a.font -row 3 -column 0 -sticky nsew grid .$a.shad -row 4 -column 0 -sticky nsew + grid .$a.outline -row 5 -column 0 -sticky nsew grid .$a.xpos -row 1 -column 2 -sticky nsew grid .$a.xoff -row 2 -column 2 -sticky nsew grid .$a.ypos -row 3 -column 2 -sticky nsew grid .$a.yoff -row 4 -column 2 -sticky nsew + grid .$a.ocolor -row 5 -column 2 -sticky nsew entry .$a.delayent -textvariable $a\(delay) entry .$a.colorent -textvariable $a\(color) @@ -75,6 +81,8 @@ entry .$a.shadent -textvariable $a\(shad) entry .$a.xoffent -textvariable $a\(xoffset) entry .$a.yoffent -textvariable $a\(yoffset) + entry .$a.outlineent -textvariable $a\(outline) + entry .$a.ocolorent -textvariable $a\(ocolor) tk_optionMenu .$a.xside $a\(xside) Left Center Right tk_optionMenu .$a.yside $a\(yside) Top Bottom @@ -82,10 +90,12 @@ grid .$a.colorent -row 2 -column 1 -sticky nsew grid .$a.fontent -row 3 -column 1 -sticky nsew grid .$a.shadent -row 4 -column 1 -sticky nsew + grid .$a.outlineent -row 5 -column 1 -sticky nsew grid .$a.xside -row 1 -column 3 -sticky nsew grid .$a.xoffent -row 2 -column 3 -sticky nsew grid .$a.yside -row 3 -column 3 -sticky nsew grid .$a.yoffent -row 4 -column 3 -sticky nsew + grid .$a.ocolorent -row 5 -column 3 -sticky nsew } @@ -146,6 +156,7 @@ set argument [lindex $separate 2] switch $option { C {set option color} + k {set option ocolor} f {set option font} d {set option delay} x {set option xoffset} @@ -156,6 +167,7 @@ c {set option xside;set argument Center} r {set option xside;set argument Right} o {set option shad} + O {set option outline} } switch $command { mixr {set command smix @@ -208,7 +220,9 @@ puts $id $a\(d\,[expr \$$a\(delay)]) puts $id $a\(f\,[expr \$$a\(font)]) puts $id $a\(C\,[expr \$$a\(color)]) + puts $id $a\(k\,[expr \$$a\(ocolor)]) puts $id $a\(o\,[expr \$$a\(shad)]) + puts $id $a\(O\,[expr \$$a\(outline)]) puts $id $a\(x\,[expr \$$a\(xoffset)]) puts $id $a\(y\,[expr \$$a\(yoffset)]) if {[expr \$$a\(xside)=="Right"]} { debian/patches/08-strn-comments-fix.dpatch0000644000000000000000000000177112222266011015624 0ustar From: Roman Yepishev Subject: Fixes single-line strn() and comment handling and --- a/src/osdsh/controlsh.c +++ b/src/osdsh/controlsh.c @@ -103,20 +103,23 @@ i++; } arg_first[a] = '\0'; - i++; a = 0; - while((c=arguments[i])!='\n'&&c!='\0'&&c!=')') { - if (c=='\\') { - i++; - arg_secound[a] = arguments[i]; + if (arguments[i]==',') { + i++; + while((c=arguments[i])!='\n'&&c!='\0'&&c!=')') { + if (c=='\\') { + i++; + arg_secound[a] = arguments[i]; + } + else { + arg_secound[a] = c; + } + a++; + i++; } - else { - arg_secound[a] = c; - } - a++; - i++; } + arg_secound[a] = '\0'; /* done with the arguments */ @@ -220,7 +223,7 @@ /*Read the bufer and check that it's not a comment*/ while(fgets(readbuf, BUFSIZ, fp)) { - if (readbuf[c]=='#') continue; + if (readbuf[0]=='#') continue; /*ignore spaces*/ for (i=0; i Subject: No description. --- a/src/osdsh/Makefile +++ b/src/osdsh/Makefile @@ -22,7 +22,7 @@ osdsh: $(OBJS) gcc -c $(CFLAGS) $@.c - gcc $(CFLAGS) -o $@ osdsh.o $(OBJS) $(LIBS) –ldl + gcc $(CFLAGS) -o $@ osdsh.o $(OBJS) $(LIBS) -ldl clean: libclean rm -f osdsh debian/patches/02-align-flag.dpatch0000644000000000000000000000062512222266011014217 0ustar From: Subject: No description. --- a/src/osdsh/osdsh.c +++ b/src/osdsh/osdsh.c @@ -65,7 +65,7 @@ {"align", 1, 0, 'a'}, {"nice", 1, 0, 'n'} }; - while ((c = getopt_long(argc, argv, "hm:f:c:p:d:o:n:", opts, &opt_index)) >= 0) { + while ((c = getopt_long(argc, argv, "hm:f:c:p:d:o:a:n:", opts, &opt_index)) >= 0) { switch (c) { case 'h': usage(0, NULL, NULL); debian/patches/10-osdsh-create-fifo-before-fork.dpatch0000644000000000000000000000156312222266011017720 0ustar From: Peter Colberg Subject: No description. --- a/src/osdsh/controlsh.c +++ b/src/osdsh/controlsh.c @@ -213,10 +213,6 @@ initialize_osd(&settings); load_basic_plugins(); - /* create the fifo file*/ - unlink(fifo_file); - umask(0); - mknod(fifo_file, S_IFIFO|0600, 0); /*open and read the fifo*/ while (settings.displaying) { fp = fopen(fifo_file, "r"); --- a/src/osdsh/osdsh.c +++ b/src/osdsh/osdsh.c @@ -153,6 +153,7 @@ char pid_file[PATH_MAX+1]; FILE *fp; + char fifo_file[PATH_MAX +1]; set_defaults(&settings); initialize_osd(&settings); @@ -180,6 +181,12 @@ fclose(fp); } + /* create the fifo file*/ + sprintf(fifo_file, "%s.%d", OSD_FIFO_PATH, getuid()); + unlink(fifo_file); + umask(0); + mknod(fifo_file, S_IFIFO|0600, 0); + if((childpid=fork())<0) { perror("fork"); exit(1); debian/examples0000644000000000000000000000001112222263027010715 0ustar themes/* debian/osdshconfig.10000644000000000000000000000272212222263027011557 0ustar .\" Hey, EMACS: -*- nroff -*- .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) .TH OSDSHCONFIG 1 "August 31, 2003" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: .\" .nh disable hyphenation .\" .hy enable hyphenation .\" .ad l left justify .\" .ad b justify to both left and right margins .\" .nf disable filling .\" .fi enable filling .\" .br insert line break .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME osdshconfig \- Create themefiles for osdsh .SH SYNOPSIS .B osdshconfig .SH DESCRIPTION This script loads a file containing commands of osdsh that change the look of it. You can then change the values and save this changes. You can preview your changes also. This is like a Theme-maker program, this way you can change the look of osdsh just running a script and you can have different scripts to match your preferences for each hour of the day or day of the week. .PP To load in the saved theme file, use .I osdctl -S file. You might want to add this command to your session script, right after .I osdsh. .SH SEE ALSO .BR osdsh (1), .BR osdctl (1). .SH AUTHOR This manual page was written by Joachim Breitner , for the Debian project (but may be used by others). debian/README.Debian0000644000000000000000000000066012222263027011227 0ustar osdsh for Debian ---------------- osdshconfig ----------- Note that I changed the name of tkosdshconfig to osdshconfig. Font Outline ------------ Derek Lewis has contributed a patch that makes it possible to have the overlay surrounded by a border, using the parameters O for the width and k for the color. This is not yet supported by osdshconfig -- Joachim Breitner , Mon, 8 Dec 2003 debian/copyright0000644000000000000000000000203112222263027011113 0ustar This package was debianized by Joachim Breitner on Sat, 30 Aug 2003 22:32:25 +0200. It was downloaded from http://osdsh.sourceforge.net/ Author: "Lord Darth Moultak" Copyright: 2002 Lord Darth Moultak This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 dated June, 1991. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. debian/osdctl.10000644000000000000000000000341212222263027010536 0ustar .\" Hey, EMACS: -*- nroff -*- .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) .TH OSDCTL 1 "August 31, 2003" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: .\" .nh disable hyphenation .\" .hy enable hyphenation .\" .ad l left justify .\" .ad b justify to both left and right margins .\" .nf disable filling .\" .fi enable filling .\" .br insert line break .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME osdctl \- Controls osdsh via the command line .SH SYNOPSIS .B osdctl .RI .SH DESCRIPTION .B osdctl is the command line tool to control a running osdsh(1) .SH COMMANDS .TP .B \-h Display help .TP .B \-s "string" displays a string .TP .B \-b name,val displays a bar up to val, named "name" .TP .B \-l name,val displays a slider at val, named "name" .TP .B \-t int display the clock for int seconds .TP .B \-c <0|1> (de)activate the osd clock .TP .B \-m <0|1> (de)activate the mixer display .TP .B \-p <0|1> (de)activate the ppp watch feature .TP .B \-a <0|1|2> (de)activate the apm watch feature .br 1 for not to show percent bar, 2 to show it .TP .B \-d interface set the ppp interface .SM (Default: ppp0) .TP .B \-A int show battery status for int seconds .TP .B \-e """comm args""" tell osdsh to do "comm" with "args" .TP .B \-S scriptfile execute commands form scriptfile .TP .B \-x tell osdsh to quit .SH SEE ALSO .BR osdsh (1), .BR osdshconfig (1). .SH AUTHOR This manual page was written by Joachim Breitner , for the Debian project (but may be used by others). debian/menu0000644000000000000000000000035212222267371010061 0ustar ?package(osdsh):needs="X11" section="Applications/System/Monitoring"\ title="osdsh" command="/usr/bin/osdsh" ?package(osdsh):needs="X11" section="Applications/System/Monitoring"\ title="osdshconfig" command="/usr/bin/osdshconfig" debian/osdsh.10000644000000000000000000000405612222263027010373 0ustar .\" Hey, EMACS: -*- nroff -*- .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) .TH OSDSH 1 "August 31, 2003" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: .\" .nh disable hyphenation .\" .hy enable hyphenation .\" .ad l left justify .\" .ad b justify to both left and right margins .\" .nf disable filling .\" .fi enable filling .\" .br insert line break .\" .sp insert n+1 empty lines .\" for manpage-specific macros, see man(7) .SH NAME osdsh \- Overlays your screen with various system informations .SH SYNOPSIS .B osdsh .RI [ options ] .SH DESCRIPTION .B osdsh is a a little program that overlays system information using the XOSD library. OSDsh was originally based on osdd but got some features added, like: .br * It is able to display a clock. * Shows the volume levels of the soundcard whenever they change. * Tells you if you are on- or off-line, and the time you were connected. * Shows the battery status and * shows any message you want it to. .br .br .B osdsh forks to the background when started and should be started in the user's session scripts (like ~/.xsession) .SH OPTIONS .TP .B \-h Show summary of options. .TP .B \-m mixer Set mixer device. .SM (Default: /dev/mixer) .TP .B \-f font Set font .SM (Default: -*-lucidatypewriter-bold-*-*-*-*-240-*-*-*-*-*-*) .TP .B \-c color Set color .SM (Default: green) .TP .B \-d int Set OSD delay .SM (Default: 5) .TP .B \-o int Set shadow offset .SM (Default: 1) .TP .B \-p <0|1> Position of the osd: 0 for top, 1 for bottom. .SM (Default: 1 (bottom)) .TP .B \-a <0|1|2> align of the osd: left, center or right .TP .B \-n number set the nice number so osdsh won't eat your cpu .SH SEE ALSO .BR osdctl (1), .BR osdshconfig (1). .SH AUTHOR This manual page was written by Joachim Breitner , for the Debian project (but may be used by others). debian/manpages0000644000000000000000000000006412222263027010702 0ustar debian/osdctl.1 debian/osdsh.1 debian/osdshconfig.1 debian/compat0000644000000000000000000000000212222263027010362 0ustar 4 debian/control0000644000000000000000000000133612222266166010601 0ustar Source: osdsh Section: x11 Priority: optional Maintainer: Joachim Breitner Build-Depends: debhelper (>> 4.0.0), libxosd-dev, libapm-dev, libxosd2 Standards-Version: 3.7.2 Package: osdsh Architecture: any Depends: tk, ${shlibs:Depends}, ${misc:Depends} Description: Overlays your screen with various system information OSDsh is a little program that overlays system information using the XOSD library. OSDsh was originally based on osdd and provides features like: . * It is able to display a clock. * Shows the volume levels of the soundcard when changing. * Tells you if you are on- or off-line, and the time you were connected. * Shows the battery status and * shows any message you want it to. debian/changelog0000644000000000000000000000677612222266750011064 0ustar osdsh (0.7.0-10.1) unstable; urgency=low * Non-maintainer upload. * Change Tcl dependency from 8.4 to a versionless tcl package. * Switch to 3.0 (quilt) source package format. * Update menu file. -- Andrew Shadura Mon, 30 Sep 2013 13:59:25 +0200 osdsh (0.7.0-10) unstable; urgency=low * osdctl still hangs while trying to write to osdsh fifo (Closes: #432397). Thanks to Peter Colberg for the patch! * Fix "FTBFS with binutils-gold" by removing HTML encoded dash from Makefile (WTF?) (Closes: #555874) -- Joachim Breitner Tue, 17 Nov 2009 11:10:18 +0100 osdsh (0.7.0-9) unstable; urgency=low * fixes: osdsh displays part of previous messages (Closes: #301229) * osdsh will not start if it detects that another instance is already running. * osdctl will check that osdsh is running before trying to write to fifo - prevents hangs, useful for scripts. (All thanks to Roman Yepishev ) * Bump standards version (no change) -- Joachim Breitner Sun, 17 Jun 2007 10:00:33 +0100 osdsh (0.7.0-8) unstable; urgency=low * Closes: #301207: osdsh does not work with option "-m" + fixed by using -rdynamic, thanks to Georg Drees for hunting that one down * Fixed typo, thanks again to Georg Drees -- Joachim Breitner Fri, 1 Apr 2005 13:15:07 +0200 osdsh (0.7.0-7) unstable; urgency=low * Closes: #301210: osdsh option -p behaves flipped to documentation * Closes: #301222: clarify osdctl options "-b" and "-l" in help screen * Closes: #301207: osdsh does not work with option "-m" Fixing this was a bad hack, possible breaking compatibility with (pretty surely not existing) custom plugins. If it hits you, complain loud enough for me to hear I'll tackle the other, more serious bugs later. I am feeling kind of upstream here :-) -- Joachim Breitner Thu, 24 Mar 2005 23:38:21 +0100 osdsh (0.7.0-6) unstable; urgency=low * Closes: #299442: does not start on powerpc (thanks to Wolfram Quester for the fix) -- Joachim Breitner Tue, 22 Mar 2005 12:29:50 +0100 osdsh (0.7.0-5) unstable; urgency=low * Closes: #274245: -a: invalid option, thx to Thomas Themel * Quoted strings in menu file to make lintian happy -- Joachim Breitner Thu, 30 Sep 2004 20:02:19 +0200 osdsh (0.7.0-4) unstable; urgency=low * bumped standards version to 3.6.1 (no changes) * Fix copyright file according to weasels's suggestion -- Joachim Breitner Mon, 15 Dec 2003 18:27:48 +0100 osdsh (0.7.0-3) unstable; urgency=low * Started using dpatch * Integrated Derek Lewis' outline patch -- Joachim Breitner Mon, 8 Dec 2003 19:38:39 +0100 osdsh (0.7.0-2) unstable; urgency=low * Build with -fPIC (Closes: Bug#22062) -- Joachim Breitner Fri, 14 Nov 2003 16:24:50 +0100 osdsh (0.7.0-1) unstable; urgency=low * Minor cosmetic Suggestions from debian-mentors * Initial Upload to the debian archive (Closes: Bug#207940) -- Joachim Breitner Wed, 22 Oct 2003 17:10:20 +0200 osdsh (0.7.0-0.2) unstable; urgency=low * Fixed PLUGINDIR -- Joachim Breitner Sun, 31 Aug 2003 15:13:16 +0200 osdsh (0.7.0-0.1) unstable; urgency=low * Internal Pre-Release -- Joachim Breitner Sat, 30 Aug 2003 22:32:25 +0200 debian/source/0000755000000000000000000000000012222264071010464 5ustar debian/source/format0000644000000000000000000000001412222264071011672 0ustar 3.0 (quilt) debian/dirs0000644000000000000000000000001012222263027010037 0ustar usr/bin