--- xosd-2.2.14.old/acinclude.m4 +++ xosd-2.2.14/acinclude.m4 @@ -0,0 +1,362 @@ +# Configure paths for gdk-pixbuf +# Elliot Lee 2000-01-10 +# stolen from Raph Levien 98-11-18 +# stolen from Manish Singh 98-9-30 +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS +dnl +AC_DEFUN([AM_PATH_GDK_PIXBUF], +[dnl +dnl Get the cflags and libraries from the gdk-pixbuf-config script +dnl +AC_ARG_WITH(gdk-pixbuf-prefix,[ --with-gdk-pixbuf-prefix=PFX Prefix where GDK_PIXBUF is installed (optional)], + gdk_pixbuf_prefix="$withval", gdk_pixbuf_prefix="") +AC_ARG_WITH(gdk-pixbuf-exec-prefix,[ --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)], + gdk_pixbuf_exec_prefix="$withval", gdk_pixbuf_exec_prefix="") +AC_ARG_ENABLE(gdk_pixbuftest, [ --disable-gdk_pixbuftest Do not try to compile and run a test GDK_PIXBUF program], + , enable_gdk_pixbuftest=yes) + + if test x$gdk_pixbuf_exec_prefix != x ; then + gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix" + if test x${GDK_PIXBUF_CONFIG+set} = xset ; then + GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config + fi + fi + if test x$gdk_pixbuf_prefix != x ; then + gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix" + if test x${GDK_PIXBUF_CONFIG+set} = xset ; then + GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config + fi + fi + + AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no) + min_gdk_pixbuf_version=ifelse([$1], ,0.2.5,$1) + AC_MSG_CHECKING(for GDK_PIXBUF - version >= $min_gdk_pixbuf_version) + no_gdk_pixbuf="" + if test "$GDK_PIXBUF_CONFIG" = "no" ; then + no_gdk_pixbuf=yes + else + GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags` + GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs` + + gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gdk_pixbuftest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" + LIBS="$LIBS $GDK_PIXBUF_LIBS" +dnl +dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity +dnl checks the results of gdk-pixbuf-config to some extent +dnl + rm -f conf.gdk_pixbuftest + AC_TRY_RUN([ +#include +#include +#include +#include + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gdk_pixbuftest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_gdk_pixbuf_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gdk_pixbuf_version"); + exit(1); + } + + if (($gdk_pixbuf_major_version > major) || + (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) || + (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version); + printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n"); + printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gdk_pixbuf" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GDK_PIXBUF_CONFIG" = "no" ; then + echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found" + echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the" + echo "*** full path to gdk-pixbuf-config." + else + if test -f conf.gdk_pixbuftest ; then + : + else + echo "*** Could not run GDK_PIXBUF test program, checking why..." + CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" + LIBS="$LIBS $GDK_PIXBUF_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong" + echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" + echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" + echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GDK_PIXBUF_CFLAGS="" + GDK_PIXBUF_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GDK_PIXBUF_CFLAGS) + AC_SUBST(GDK_PIXBUF_LIBS) + rm -f conf.gdk_pixbuftest +]) + +# Configure paths for GTK+ +# Owen Taylor 97-11-3 + +dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS +dnl +AC_DEFUN([AM_PATH_GTK], +[dnl +dnl Get the cflags and libraries from the gtk-config script +dnl +AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], + gtk_config_prefix="$withval", gtk_config_prefix="") +AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], + gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") +AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], + , enable_gtktest=yes) + + for module in . $4 + do + case "$module" in + gthread) + gtk_config_args="$gtk_config_args gthread" + ;; + esac + done + + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi + + AC_PATH_PROG(GTK_CONFIG, gtk-config, no) + min_gtk_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes + else + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` + gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gtktest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" +dnl +dnl Now check if the installed GTK is sufficiently new. (Also sanity +dnl checks the results of gtk-config to some extent +dnl + rm -f conf.gtktest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gtktest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } + + if ((gtk_major_version != $gtk_config_major_version) || + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { + printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If gtk-config was correct, then it is best\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); + printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } +#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } +#endif /* defined (GTK_MAJOR_VERSION) ... */ + else + { + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); + printf("*** correct copy of gtk-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GTK_CONFIG" = "no" ; then + echo "*** The gtk-config script installed by GTK could not be found" + echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GTK_CONFIG environment variable to the" + echo "*** full path to gtk-config." + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK test program, checking why..." + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" + echo "*** version of GTK. If it is not finding GTK, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" + echo "*** came with the system with the command" + echo "***" + echo "*** rpm --erase --nodeps gtk gtk-devel" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GTK was incorrectly installed" + echo "*** or that you have moved GTK since it was installed. In the latter case, you" + echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GTK_CFLAGS="" + GTK_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest +]) + --- xosd-2.2.14.old/configure.ac +++ xosd-2.2.14/configure.ac @@ -81,8 +81,7 @@ [disable_xinerama="yes"], [disable_xinerama="no"]) -if test x$disable_xinerama = "xno" -then +AS_IF([test "x$disable_xinerama" = "xno"], [ AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension, [X_LIBS="$X_LIBS -lXinerama_pic" @@ -96,31 +95,20 @@ ac_have_xinerama="yes"],, [$X_LIBS -lXext $X_EXTRA_LIBS]), [$X_LIBS -lXext $X_EXTRA_LIBS]) -fi - -if pkg-config --exists bmp -then - PKG_CHECK_MODULES(BMP, bmp) - BMP_GENERAL_PLUGIN_DIR=$(pkg-config --variable general_plugin_dir bmp) - AC_SUBST(BMP_GENERAL_PLUGIN_DIR) - no_bmp="yes" -else - no_bmp="no" - AC_MSG_WARN("beep media player not found") -fi - - - +]) dnl Check for xmms -AM_PATH_XMMS(1.2.7,, - AC_MSG_WARN("xmms plugins can not be built")) +dnl disabled in Debian because XMMS is not available and we need to +dnl regenerate configure +dnl AM_PATH_XMMS(1.2.7,, +dnl AC_MSG_WARN("xmms plugins can not be built")) dnl Override where to place libxmms_xosd.so AC_ARG_WITH([plugindir], AC_HELP_STRING([--with-plugindir=DIR], [Set the xmms plugin directory]), [XMMS_PLUGIN_DIR="$withval"], [XMMS_PLUGIN_DIR="$XMMS_GENERAL_PLUGIN_DIR"]) +AC_SUBST(XMMS_PLUGIN_DIR) dnl Check for gdk-pixbuf AM_PATH_GDK_PIXBUF(0.22.0,, @@ -144,20 +132,21 @@ AM_CONDITIONAL([BUILD_NEW_PLUGIN], [test x"$enable_new_plugin" = "xyes" -a x"$no_xmms" != "xyes" -a x"$no_gdk_pixbuf" != "xyes"]) +PKG_PROG_PKG_CONFIG dnl Check for Beep Media player AC_ARG_ENABLE([beep_media_player_plugin], AC_HELP_STRING([--enable-beep_media_player_plugin], [Enable beep media plugin (enabled by default)]), - [beep_media_player_plugin="$enableval"], - [beep_media_player_plugin="yes"]) -AC_MSG_CHECKING([whether beep media plugin was requested]) -AC_MSG_RESULT($beep_media_player_plugin) - -AM_CONDITIONAL([BUILD_BEEP_MEDIA_PLUGIN], - [test x"$beep_media_player_plugin" = "xyes" -a x"$no_bmp" == "xyes"]) - - + [] + [beep_media_player_plugin=check]) +AS_CASE(["$beep_media_player_plugin"], + [yes], [PKG_CHECK_MODULES([BMP], [bmp], [HAVE_BMP=1])], + [no], [], + [PKG_CHECK_MODULES([BMP], [bmp], [HAVE_BMP=1], [HAVE_BMP=0])]) +AM_CONDITIONAL([BUILD_BEEP_MEDIA_PLUGIN], [test "$beep_media_player_plugin" != no -a "$HAVE_BMP" -eq 1]) +AS_IF([test "$beep_media_player_plugin" != no -a "$HAVE_BMP" -eq 1], [BMP_GENERAL_PLUGIN_DIR=$(pkg-config --variable general_plugin_dir bmp)]) +AC_SUBST(BMP_GENERAL_PLUGIN_DIR) dnl OLD plugin --- xosd-2.2.14.old/libxosd.m4 +++ xosd-2.2.14/libxosd.m4 @@ -6,7 +6,7 @@ dnl AM_PATH_LIBXOSD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test to see if libxosd is installed, and define LIBXOSD_CFLAGS, LIBXOSDLIBS dnl -AC_DEFUN(AM_PATH_LIBXOSD, +AC_DEFUN([AM_PATH_LIBXOSD], [dnl dnl Get the cflags and libraries from the xosd-config script dnl --- xosd-2.2.14.old/man/Makefile.am +++ xosd-2.2.14/man/Makefile.am @@ -3,7 +3,7 @@ xosd_display.3 xosd_hide.3 xosd_is_onscreen.3 xosd_set_vertical_offset.3 \ xosd_set_pos.3 xosd_set_shadow_offset.3 xosd_show.3 xosd_uninit.3 xosd.3 \ xosd_get_number_lines.3 xosd_set_align.3 xosd_create.3 \ - xosd_set_horizontal_offset.3 xosd_destroy.3 xosd_create.3 xosd_is_onscreen.3 \ + xosd_set_horizontal_offset.3 xosd_destroy.3 \ xosd_set_bar_length.3 EXTRA_DIST = ${man_MANS} --- xosd-2.2.14.old/man/osd_cat.1 +++ xosd-2.2.14/man/osd_cat.1 @@ -1,5 +1,5 @@ .\" Emacs, -*- nroff -*- please -.TH XOSD 1xosd "January 2001" "X OSD cat" +.TH XOSD 1 "January 2001" "X OSD cat" .SH NAME osd_cat \- X on-screen file displayer .SH SYNOPSIS @@ -45,6 +45,15 @@ \fB\-s\fP, \fB\-\-shadow\fP=\fIOFFSET\fP This option specifies the \fIOFFSET\fP of the text shadow. The default is \fB0\fP, which means no text shadow is created. .TP +\fB\-S\fP, \fB\-\-shadowcolour\fP=\fICOLOUR\fP +This option specifies the \fICOLOUR\fP of the text shadow. The default is \fBblack\fP. +.TP +\fB\-O\fP, \fB\-\-outline\fP=\fIWIDTH\fP +This option specifies the \fIWIDTH\fP of the text outline. The default is \fB0\fP, which is no outline. +.TP +\fB\-u\fP, \fB\-\-outlinecolour\fP=\fICOLOUR\fP +This option specifies the \fICOLOUR\fP of the text outline. The default is \fBblack\fP. +.TP \fB\-a\fP, \fB\-\-age\fP[=\fISCROLL_AGE\fP] This option affects screen redrawing. If \fISCROLL_AGE\fP seconds pass before a new line is ready (for example, you're reading from a pipe), --- xosd-2.2.14.old/man/xosd-config.1 +++ xosd-2.2.14/man/xosd-config.1 @@ -11,7 +11,6 @@ to the .m4 macros for GNU autoconf that are included with \fIlibxosd\fP. . .SH OPTIONS -.l \fBxosd-config\fP accepts the following options: .TP 8 .B \-\-version --- xosd-2.2.14.old/man/xosd.3 +++ xosd-2.2.14/man/xosd.3 @@ -1,5 +1,5 @@ .\" Emacs, -*- nroff -*- please -.TH XOSD 3xosd "December 2000" "X OSD Library" +.TH XOSD 3 "December 2000" "X OSD Library" .SH NAME xosd - X on-screen display library .SH SYNOPSIS --- xosd-2.2.14.old/man/xosd_create.3 +++ xosd-2.2.14/man/xosd_create.3 @@ -17,7 +17,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "XOSD_CREATE" 3xosd "" "" "" +.TH "XOSD_CREATE" 3 "" "" "" .SH NAME xosd_create \- Create a new XOSD object .SH "SYNOPSIS" @@ -75,5 +75,4 @@ .SH "SEE ALSO" .PP - \fBxosd_destroy\fR(3xosd), \fBxosd_show\fR(3xosd), \fBxosd_set_pos\fR(3xosd), \fBxosd_set_align\fR(3xosd), \fBxosd_set_shadow_offset\fR(3xosd), \fBxosd_set_offset\fR(3xosd), \fBxosd_set_timeout\fR(3xosd), \fBxosd_set_colour\fR(3xosd), \fBxosd_set_font\fR(3xosd), \fBxosd_show\fR(3xosd), \fBxosd_scroll\fR(3xosd), - + \fBxosd_destroy\fR(3), \fBxosd_show\fR(3), \fBxosd_set_pos\fR(3), \fBxosd_set_align\fR(3), \fBxosd_set_shadow_offset\fR(3), \fBxosd_set_offset\fR(3), \fBxosd_set_timeout\fR(3), \fBxosd_set_colour\fR(3), \fBxosd_set_font\fR(3), \fBxosd_show\fR(3), \fBxosd_scroll\fR(3). --- xosd-2.2.14.old/man/xosd_destroy.3 +++ xosd-2.2.14/man/xosd_destroy.3 @@ -17,7 +17,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "XOSD_DESTROY" 3xosd "" "" "" +.TH "XOSD_DESTROY" 3 "" "" "" .SH NAME xosd_destroy \- Destroy an XOSD object .SH "SYNOPSIS" @@ -71,5 +71,4 @@ .SH "SEE ALSO" .PP - \fBxosd_create\fR(3xosd) - + \fBxosd_create\fR(3). --- xosd-2.2.14.old/man/xosd_display.3 +++ xosd-2.2.14/man/xosd_display.3 @@ -17,7 +17,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "XOSD_DISPLAY" 3xosd "" "" "" +.TH "XOSD_DISPLAY" 3 "" "" "" .SH NAME xosd_display \- Display data to an XOSD window .SH "SYNOPSIS" @@ -37,7 +37,7 @@ \fBxosd_display\fR displays either a string, a percentage bar (like a progress bar) or a slider on an X display. The data is displayed in a borderless shaped-window, so it appears to float on top of the other windows, like the on-screen displays found in many televisions. Users cannot interact with the display in any way. .PP -The data is displayed until the timeout limit, set by calling \fBxosd_set_timeout\fR(3xosd), is reached, but \fBxosd_display\fR returns immediately. If blocking is required \fBxosd_wait_until_no_display\fR(3xosd) should be called after \fBxosd_display\fR. A window that is displaying data can be hidden by calling \fBxosd_hide\fR(3xosd). +The data is displayed until the timeout limit, set by calling \fBxosd_set_timeout\fR(3), is reached, but \fBxosd_display\fR returns immediately. If blocking is required \fBxosd_wait_until_no_display\fR(3) should be called after \fBxosd_display\fR. A window that is displaying data can be hidden by calling \fBxosd_hide\fR(3). .PP The type of data displayed is determined by the \fIcommand\fR argument. There are two types of data that can be displayed: text or integers. @@ -60,7 +60,7 @@ .TP \fIline\fR -The line of the display to change. The value of \fIline\fR must be less than \fInumber_lines\fR, set in the call to \fBxosd_create\fR(3xosd). +The line of the display to change. The value of \fIline\fR must be less than \fInumber_lines\fR, set in the call to \fBxosd_create\fR(3). .TP \fIcommand\fR @@ -72,7 +72,7 @@ If the \fIcommand\fR is either \fBXOSD_percentage\fR or \fBXOSD_slider\fR then the integer value of the bar or slider is returned (between 1 and 100). For \fBXOSD_string\fR and \fBXOSD_printf\fR the number of characters written to the display is returned. .PP -On error -1 is returned and \fIxosd_error\fR is set to indicate the reason for the error. +On error \-1 is returned and \fIxosd_error\fR is set to indicate the reason for the error. .SH "ENVIRONMENT" @@ -101,5 +101,4 @@ .SH "SEE ALSO" .PP - \fBxosd_create\fR(3xosd), \fBxosd_set_timeout\fR(3xosd), \fBxosd_wait_until_no_display\fR(3xosd), \fBxosd_hide\fR(3xosd), \fBprintf\fR(3) - + \fBxosd_create\fR(3), \fBxosd_set_timeout\fR(3), \fBxosd_wait_until_no_display\fR(3), \fBxosd_hide\fR(3), \fBprintf\fR(3). --- xosd-2.2.14.old/man/xosd_get_number_lines.3 +++ xosd-2.2.14/man/xosd_get_number_lines.3 @@ -1,5 +1,5 @@ .\" Hey Emacs! This file is -*- nroff -*- source. -.TH xosd_get_number_lines 3xosd "2002-06-25" "X OSD Library" +.TH xosd_get_number_lines 3 "2002-06-25" "X OSD Library" .SH NAME xosd_get_number_lines - Retrieve the number of lines the xosd object was initialized to display @@ -15,5 +15,4 @@ .IP \fIosd\fP 1i The on-screen display object to act on. .SH "SEE ALSO" -.BR xosd_init (3xosd), - +.BR xosd_init (3). --- xosd-2.2.14.old/man/xosd_hide.3 +++ xosd-2.2.14/man/xosd_hide.3 @@ -1,5 +1,5 @@ .\" Hey Emacs! This file is -*- nroff -*- source. -.TH xosd_hide 3xosd "2002-06-25" "X OSD Library" +.TH xosd_hide 3 "2002-06-25" "X OSD Library" .SH NAME xosd_hide \- hide the XOSD window .SH SYNOPSIS @@ -13,11 +13,11 @@ .I xosd window. Call -.BI xosd_show (3xosd) +.BR xosd_show (3) to make the window visible again. When -.BI xosd_display (3xosd) +.BI xosd_display (3) is called data will be shown until the pre-set time has elapsed. By calling @@ -30,7 +30,6 @@ On success, a zero is returned. On error, \-1 is returned. .SH "SEE ALSO" -.BR xosd_init (3xosd), -.BR xosd_display (3xosd), -.BR xosd_show (3xosd) - +.BR xosd_init (3), +.BR xosd_display (3), +.BR xosd_show (3). --- xosd-2.2.14.old/man/xosd_is_onscreen.3 +++ xosd-2.2.14/man/xosd_is_onscreen.3 @@ -17,7 +17,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "XOSD_IS_ONSCREEN" 3xosd "" "" "" +.TH "XOSD_IS_ONSCREEN" 3 "" "" "" .SH NAME xosd_is_onscreen \- Returns wether the XOSD window is shown .SH "SYNOPSIS" @@ -34,10 +34,10 @@ .SH "DESCRIPTION" .PP -\fBosd_is_onscreen\fR determines weather a XOSD window, is currently being shown (is mapped to the X display). Because XOSD displays data asynchronously (see \fBxosd_display\fR(3xosd) for details) it can be difficult to know if data is being displayed, \fBxosd_is_onscreen\fR solves this problem. +\fBosd_is_onscreen\fR determines weather a XOSD window, is currently being shown (is mapped to the X display). Because XOSD displays data asynchronously (see \fBxosd_display\fR(3) for details) it can be difficult to know if data is being displayed, \fBxosd_is_onscreen\fR solves this problem. .PP -Call \fBxosd_show\fR(3xosd) or \fBxosd_hide\fR(3xosd) to alter the visibility of the XOSD window. +Call \fBxosd_show\fR(3) or \fBxosd_hide\fR(3) to alter the visibility of the XOSD window. .SH "ARGUMENTS" @@ -48,7 +48,7 @@ .SH "RETURN VALUE" .PP -A 1 is returned if the window is onscreen (mapped), or 0 if it is hidden (unmapped). On error, -1 is returned and \fIxosd_error\fR is set to indicate the reason for the error. +A 1 is returned if the window is onscreen (mapped), or 0 if it is hidden (unmapped). On error, \-1 is returned and \fIxosd_error\fR is set to indicate the reason for the error. .SH "ENVIRONMENT" @@ -74,5 +74,4 @@ .SH "SEE ALSO" .PP - \fBxosd_display\fR(3xosd), \fBxosd_show\fR(3xosd), \fBxosd_hide\fR(3xosd) - + \fBxosd_display\fR(3), \fBxosd_show\fR(3), \fBxosd_hide\fR(3). --- xosd-2.2.14.old/man/xosd_set_align.3 +++ xosd-2.2.14/man/xosd_set_align.3 @@ -1,5 +1,5 @@ .\" Hey Emacs! This file is -*- nroff -*- source. -.TH xosd_set_pos 3xosd "2002-06-25" "X OSD Library" +.TH xosd_set_pos 3 "2002-06-25" "X OSD Library" .SH NAME xosd_set_align \- Change the alignment of the XOSD window .SH SYNOPSIS @@ -25,7 +25,7 @@ On success, a zero is returned. On error, \-1 is returned. .SH "SEE ALSO" -.BR xosd_init (3xosd) -.BR xosd_set_offset (3xosd) -.BR xosd_set_pos (3xosd) -.BR xosd (3xosd) +.BR xosd_init (3), +.BR xosd_set_offset (3), +.BR xosd_set_pos (3), +.BR xosd (3). --- xosd-2.2.14.old/man/xosd_set_bar_length.3 +++ xosd-2.2.14/man/xosd_set_bar_length.3 @@ -17,7 +17,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "XOSD_SET_BAR_LENGTH" 3xosd "" "" "" +.TH "XOSD_SET_BAR_LENGTH" 3 "" "" "" .SH NAME xosd_set_bar_length \- Change the length of the percentage bar or slider .SH "SYNOPSIS" @@ -44,12 +44,12 @@ .TP \fIdisplayPercentage\fR -The percentage of the display to be used up by the slider or percentage bar, as an interger between 0 and 100. Setting \fIdisplayPercentage\fR to -1 reverts to the default behaviour. +The percentage of the display to be used up by the slider or percentage bar, as an interger between 0 and 100. Setting \fIdisplayPercentage\fR to \-1 reverts to the default behaviour. .SH "RETURN VALUE" .PP -On success, a zero is returned. On error, -1 is returned and \fIxosd_error\fR is set to indicate the reason for the error. +On success, a zero is returned. On error, \-1 is returned and \fIxosd_error\fR is set to indicate the reason for the error. .SH "ENVIRONMENT" @@ -70,5 +70,4 @@ .SH "SEE ALSO" .PP - \fBxosd_create\fR(3xosd), \fBxosd_display\fR(3xosd). - + \fBxosd_create\fR(3), \fBxosd_display\fR(3). --- xosd-2.2.14.old/man/xosd_set_horizontal_offset.3 +++ xosd-2.2.14/man/xosd_set_horizontal_offset.3 @@ -1,5 +1,5 @@ .\" Hey Emacs! This file is -*- nroff -*- source. -.TH xosd_set_horizontal_offset 3xosd "2002-06-25" "X OSD Library" +.TH xosd_set_horizontal_offset 3 "2002-06-25" "X OSD Library" .SH NAME xosd_set_horizontal_offset \- Change the indent of the XOSD window .SH SYNOPSIS @@ -19,5 +19,5 @@ On success, a zero is returned. On error, \-1 is returned. .SH "SEE ALSO" -.BR xosd_create (3xosd), -.BR xosd_set_align (3xosd) +.BR xosd_create (3), +.BR xosd_set_align (3). --- xosd-2.2.14.old/man/xosd_set_pos.3 +++ xosd-2.2.14/man/xosd_set_pos.3 @@ -1,5 +1,5 @@ .\" Hey Emacs! This file is -*- nroff -*- source. -.TH xosd_set_pos 3xosd "2002-06-25" "X OSD Library" +.TH xosd_set_pos 3 "2002-06-25" "X OSD Library" .SH NAME xosd_set_pos \- Change the position of the XOSD window .SH SYNOPSIS @@ -10,7 +10,7 @@ .SH DESCRIPTION .B xosd_set_pos changes the position of the XOSD window, which was initially set when -.BR xosd_init (3xosd) +.BR xosd_init (3) was called. .SH ARGUMENTS @@ -26,5 +26,5 @@ On success, a zero is returned. On error, \-1 is returned. .SH "SEE ALSO" -.BR xosd_init (3xosd) -.BR xosd_set_offset (3xosd) \ No newline at end of file +.BR xosd_init (3), +.BR xosd_set_offset (3). --- xosd-2.2.14.old/man/xosd_set_shadow_offset.3 +++ xosd-2.2.14/man/xosd_set_shadow_offset.3 @@ -1,5 +1,5 @@ .\" Hey Emacs! This file is -*- nroff -*- source. -.TH xosd_set_shadow_offset 3xosd "2002-06-25" "X OSD Library" +.TH xosd_set_shadow_offset 3 "2002-06-25" "X OSD Library" .SH NAME xosd_set_shadow_offset \- Change the shadow-offset of the XOSD window .SH SYNOPSIS @@ -24,5 +24,5 @@ On success, a zero is returned. On error, \-1 is returned. .SH "SEE ALSO" -.BR xosd_init (3xosd), -.BR xosd_display (3xosd) \ No newline at end of file +.BR xosd_init (3), +.BR xosd_display (3). --- xosd-2.2.14.old/man/xosd_set_vertical_offset.3 +++ xosd-2.2.14/man/xosd_set_vertical_offset.3 @@ -1,5 +1,5 @@ .\" Hey Emacs! This file is -*- nroff -*- source. -.TH xosd_set_vertical_offset 3xosd "2002-06-25" "X OSD Library" +.TH xosd_set_vertical_offset 3 "2002-06-25" "X OSD Library" .SH NAME xosd_set_vertical_offset \- Change the offset of the XOSD window .SH SYNOPSIS @@ -22,5 +22,5 @@ On success, a zero is returned. On error, \-1 is returned. .SH "SEE ALSO" -.BR xosd_init (3xosd), -.BR xosd_set_pos (3xosd) +.BR xosd_init (3), +.BR xosd_set_pos (3). --- xosd-2.2.14.old/man/xosd_show.3 +++ xosd-2.2.14/man/xosd_show.3 @@ -1,5 +1,5 @@ .\" Hey Emacs! This file is -*- nroff -*- source. -.TH xosd_show 3xosd "2002-06-25" "X OSD Library" +.TH xosd_show 3 "2002-06-25" "X OSD Library" .SH NAME xosd_show \- make the XOSD window visible .SH SYNOPSIS @@ -11,7 +11,7 @@ Call .B xosd_show to redisplay the data that has been previously displayed using -.BI xosd_display (3xosd). +.BI xosd_display (3). .SH ARGUMENTS .IP \fIosd\fP 1i @@ -20,7 +20,6 @@ On success, a zero is returned. On error, \-1 is returned. .SH "SEE ALSO" -.BR xosd_init (3xosd), -.BR xosd_display (3xosd), -.BR xosd_hide (3xosd) - +.BR xosd_init (3), +.BR xosd_display (3), +.BR xosd_hide (3). --- xosd-2.2.14.old/man/xosd_uninit.3 +++ xosd-2.2.14/man/xosd_uninit.3 @@ -1,5 +1,5 @@ .\" Hey Emacs! This file is -*- nroff -*- source. -.TH xosd_uninit 3xosd "2002-06-25" "X OSD Library" +.TH xosd_uninit 3 "2002-06-25" "X OSD Library" .SH NAME xosd_uninit \- Destroy a XOSD window .SH SYNOPSIS @@ -20,5 +20,4 @@ On success, a zero is returned. On error, \-1 is returned. .SH "SEE ALSO" -.BR xosd_init (3) - +.BR xosd_init (3).