--- xbanner-1.31.orig/samples/Demo/Coin +++ xbanner-1.31/samples/Demo/Coin @@ -7,7 +7,7 @@ xbanner.foreground: #FFA501 xbanner.hiColor: yellow xbanner.label: X B a n n e r ! -xbanner.pixFile: ../../Logo_32_col.xpm +xbanner.pixFile: /usr/share/doc/xbanner-1.31/Logo_32_col.xpm xbanner.pixmapX: 500 xbanner.pixmapY: 250 xbanner.placement: TopCenter --- xbanner-1.31.orig/samples/Demo/Demo +++ xbanner-1.31/samples/Demo/Demo @@ -1,11 +1,13 @@ #!/bin/csh +cd /usr/share/doc/xbanner-1.31/examples/Demo + echo "This is the XBanner v1.3 demonstration script." echo "Please do not use CTRL-Z to suspend the demo." echo "Either let it complete, or stop with CTRL-C!" echo "" -if ( -e ../../xbanner && -e ../../freetemp ) then +if ( -e /usr/bin/xbanner && -e /usr/bin/freetemp ) then echo -n "" else echo "Please make sure that the xbanner and freetemp binaries have been" @@ -28,14 +30,14 @@ echo "The first effect is 3D-Shadow and is shown here with a Fan style" echo "background, made of a color gradient of Red,Green,Blue,Red and a " echo "repeating period of 3 times." -../../freetemp && ../../xbanner -file ./3D-Shadow +freetemp && xbanner -file ./3D-Shadow echo "Press ENTER to continue" set dummy=$< echo "Next is the Backlight effect which is shown with a TopDown style" echo "background. The text is underlined and you can see that the effect" echo "is rendered on the underline as well." -../../freetemp && ../../xbanner -file ./Backlight +freetemp && xbanner -file ./Backlight echo "Press ENTER to continue" set dummy=$< @@ -43,7 +45,7 @@ echo "example. The color gradient definition for the background used in" echo "this sample is darkblue,darkblue,black,darkgreen - which makes the" echo "entire top part seem darkblue, and only start fading into black later." -../../freetemp && ../../xbanner -file ./Backlight2 +freetemp && xbanner -file ./Backlight2 echo "Press ENTER to continue" set dummy=$< @@ -51,71 +53,71 @@ echo "made to look like the rim of a lot of coins. With a background style" echo "of LeftDiagonal and ShadowColor/HiColor selected properly this is a" echo "neat sample. The Penguin pixmap by Larry Ewing adds a nice touch." -../../freetemp && ../../xbanner -file ./Coin +freetemp && xbanner -file ./Coin echo "Press ENTER to continue" set dummy=$< echo "The Fade effect makes the letters seem to have a thickness which" echo "changes colors. Selected properly one can achieve nice results. The" echo "glinting on the letters every few seconds is a new feature of V1.3" -../../freetemp && ../../xbanner -file ./Fade +freetemp && xbanner -file ./Fade echo "Press ENTER to continue" set dummy=$< echo "This is the FatText effect. I really didn't know what to call it." -../../freetemp && ../../xbanner -file ./FatText +freetemp && xbanner -file ./FatText echo "Press ENTER to continue" set dummy=$< echo "This is another idea how to use the FatText effect. Here, a" echo "background style of Fan using the colors of the rainbow decorate" echo "it repeated twice." -../../freetemp && ../../xbanner -file ./FatText2 +freetemp && xbanner -file ./FatText2 echo "Press ENTER to continue" set dummy=$< echo "This is the FgGrad effect with a LeftRight background style and" echo "an underline under the text." -../../freetemp && ../../xbanner -file ./FgGrad +freetemp && xbanner -file ./FgGrad echo "Press ENTER to continue" set dummy=$< echo "The FgPlasma effect can take a long time. Especially combined with" echo "background style of Plasma. I hope the results are satisfying enough." -../../freetemp && ../../xbanner -file ./FgPlasma +freetemp && xbanner -file ./FgPlasma echo "Press ENTER to continue" set dummy=$< echo "The FunnyOutline effect. Combined with a LeftSplit background style." -../../freetemp && ../../xbanner -file ./FunnyOutline +freetemp && xbanner -file ./FunnyOutline echo "Press ENTER to continue" set dummy=$< echo "The PopArt effect with a RightSplit background style." -../../freetemp && ../../xbanner -file ./PopArt +freetemp && xbanner -file ./PopArt echo "Press ENTER to continue" set dummy=$< echo "The Shadowed-Outline effect with a LeftRight background." -../../freetemp && ../../xbanner -file ./Shadowed-Outline +freetemp && xbanner -file ./Shadowed-Outline echo "Press ENTER to continue" set dummy=$< echo "The Shake effect with the backgroung style BgPix - tiled pixmap." -../../freetemp && ../../xbanner -file ./Shake +freetemp && xbanner -file ./Shake echo "Press ENTER to continue" set dummy=$< echo "The StandOut effect, using the BgFill feature to fill the background" echo "instead of an external program. Glints are not done on the DownLeft" echo "corners to be consistent with the lighting angle." -../../freetemp && ../../xbanner -file ./StandOut +freetemp && xbanner -file ./StandOut echo "Press ENTER to continue" set dummy=$< echo "The Thick Effect, using a Fan background style, with a repeat period" echo "of 20, a color gradient of white->black->white and a bar-size of 1 pixel." -../../freetemp && ../../xbanner -file ./Thick +freetemp && xbanner -file ./Thick echo "Press ENTER to continue" set dummy=$< @@ -124,7 +126,7 @@ echo "type to place the second line of text. This effect is similar to the" echo "StandOut effect only the effect is rendered into the painted area of" echo "the letters instead of around them." -../../freetemp && ../../xbanner -file ./StandOut2_1 && ../../xbanner -file ./StandOut2_2 +freetemp && xbanner -file ./StandOut2_1 && xbanner -file ./StandOut2_2 echo "Press ENTER to continue" set dummy=$< @@ -137,54 +139,54 @@ echo -n "Want to try the color-cycling part of the demo? [Yes] : " set d=$< -../../freetemp +freetemp if ( "$d" == "" || "$d" == "yes" || "$d" == "Yes" || "$d" == "YES" || "$d" == "y" || "$d" == "Y" ) then echo "The FgPlasma effect in white and magenta, with the LeftSplit background" echo "style, and the colors of the FgPlasma cycling slowly." - ../../xbanner -file ./Cyc_FgPlasma || exit + xbanner -file ./Cyc_FgPlasma || exit echo "Press ENTER to continue" set dummy=$< echo "The Fade effect with a TopDown background style, repeated 8 times," echo "and color cycling is done on the Fade effect as well as the background." - ../../freetemp && ../../xbanner -file ./Cyc_Fade_TopDown + freetemp && xbanner -file ./Cyc_Fade_TopDown echo "Press ENTER to continue" set dummy=$< echo "The simple Shadow effect gets a new touch with the option to cycle the" echo "foreground color along a color gradient. The LeftSplit background also" echo "looks nice when you color-cycle it." - ../../freetemp && ../../xbanner -file ./Cyc_FGC_LeftSplit + freetemp && xbanner -file ./Cyc_FGC_LeftSplit echo "Press ENTER to continue" set dummy=$< echo "A nice FgGrad effect with a cycling LeftRight background underneath." - ../../freetemp && ../../xbanner -file ./Cyc_LeftRight + freetemp && xbanner -file ./Cyc_LeftRight echo "Press ENTER to continue" set dummy=$< echo "Here's another idea what to do with FatText effect. Here I also cycle" echo "the FatText's color gradient." - ../../freetemp && ../../xbanner -file ./Cyc_FatText + freetemp && xbanner -file ./Cyc_FatText echo "Press ENTER to continue" set dummy=$< echo "A Plasma background style color-cycled with a simple Shadowed-Outline" echo "effect as the main text render." - ../../freetemp && ../../xbanner -file ./Cyc_Plasma + freetemp && xbanner -file ./Cyc_Plasma echo "Press ENTER to continue" set dummy=$< echo "Ripples background style color-cycled with FgPlasma also cycled" echo "as the text rendering effect." - ../../freetemp && ../../xbanner -file ./Cyc_Ripples + freetemp && xbanner -file ./Cyc_Ripples echo "Press ENTER to continue" set dummy=$< echo "The Fan background style can produce things like spot-lights." - ../../freetemp && ../../xbanner -file ./Cyc_Fan + freetemp && xbanner -file ./Cyc_Fan echo "Press ENTER to continue" set dummy=$< @@ -196,7 +198,7 @@ echo "" echo "Press ENTER to stop the color cycling." set dummy=$< - ../../freetemp + freetemp endif --- xbanner-1.31.orig/samples/Demo/Demo.bash +++ xbanner-1.31/samples/Demo/Demo.bash @@ -1,11 +1,12 @@ #!/bin/sh +cd /usr/share/doc/xbanner-1.31/examples/Demo echo "This is the XBanner v1.3 demonstration script." echo "Please do not use CTRL-Z to suspend the demo." echo "Either let it complete, or stop with CTRL-C!" echo "" -if [ -x ../../xbanner -a -x ../../freetemp ]; then +if [ -x /usr/bin/xbanner -a -x /usr/bin/freetemp ]; then echo -n "" else echo "Please make sure that the xbanner and freetemp binaries have been" @@ -28,14 +29,14 @@ echo "The first effect is 3D-Shadow and is shown here with a Fan style" echo "background, made of a color gradient of Red,Green,Blue,Red and a" echo "repeating period of 3 times." -../../freetemp && ../../xbanner -file ./3D-Shadow +/usr/bin/freetemp && /usr/bin/xbanner -file ./3D-Shadow echo "Press ENTER to continue" read echo "Next is the Backlight effect which is shown with a TopDown style" echo "background. The text is underlined and you can see that the effect" echo "is rendered on the underline as well." -../../freetemp && ../../xbanner -file ./Backlight +/usr/bin/freetemp && /usr/bin/xbanner -file ./Backlight echo "Press ENTER to continue" read @@ -43,7 +44,7 @@ echo "example. The color gradient definition for the background used in" echo "this sample is darkblue,darkblue,black,darkgreen - which makes the" echo "entire top part seem darkblue, and only start fading into black later." -../../freetemp && ../../xbanner -file ./Backlight2 +/usr/bin/freetemp && /usr/bin/xbanner -file ./Backlight2 echo "Press ENTER to continue" read @@ -51,71 +52,71 @@ echo "made to look like the rim of a lot of coins. With a background style" echo "of LeftDiagonal and ShadowColor/HiColor selected properly this is a" echo "neat sample. The Penguin pixmap by Larry Ewing adds a nice touch." -../../freetemp && ../../xbanner -file ./Coin +/usr/bin/freetemp && /usr/bin/xbanner -file ./Coin echo "Press ENTER to continue" read echo "The Fade effect makes the letters seem to have a thickness which" echo "changes colors. Selected properly one can achieve nice results. The" echo "glinting on the letters every few seconds is a new feature of V1.3" -../../freetemp && ../../xbanner -file ./Fade +/usr/bin/freetemp && /usr/bin/xbanner -file ./Fade echo "Press ENTER to continue" read echo "This is the FatText effect. I really didn't know what to call it." -../../freetemp && ../../xbanner -file ./FatText +/usr/bin/freetemp && /usr/bin/xbanner -file ./FatText echo "Press ENTER to continue" read echo "This is another idea how to use the FatText effect. Here, a" echo "background style of Fan using the colors of the rainbow decorate" echo "it repeated twice." -../../freetemp && ../../xbanner -file ./FatText2 +/usr/bin/freetemp && /usr/bin/xbanner -file ./FatText2 echo "Press ENTER to continue" read echo "This is the FgGrad effect with a LeftRight background style and" echo "an underline under the text." -../../freetemp && ../../xbanner -file ./FgGrad +/usr/bin/freetemp && /usr/bin/xbanner -file ./FgGrad echo "Press ENTER to continue" read echo "The FgPlasma effect can take a long time. Especially combined with" echo "background style of Plasma. I hope the results are satisfying enough." -../../freetemp && ../../xbanner -file ./FgPlasma +/usr/bin/freetemp && /usr/bin/xbanner -file ./FgPlasma echo "Press ENTER to continue" read echo "The FunnyOutline effect. Combined with a LeftSplit background style." -../../freetemp && ../../xbanner -file ./FunnyOutline +/usr/bin/freetemp && /usr/bin/xbanner -file ./FunnyOutline echo "Press ENTER to continue" read echo "The PopArt effect with a RightSplit background style." -../../freetemp && ../../xbanner -file ./PopArt +/usr/bin/freetemp && /usr/bin/xbanner -file ./PopArt echo "Press ENTER to continue" read echo "The Shadowed-Outline effect with a LeftRight background." -../../freetemp && ../../xbanner -file ./Shadowed-Outline +/usr/bin/freetemp && /usr/bin/xbanner -file ./Shadowed-Outline echo "Press ENTER to continue" read echo "The Shake effect with the backgroung style BgPix - tiled pixmap." -../../freetemp && ../../xbanner -file ./Shake +/usr/bin/freetemp && /usr/bin/xbanner -file ./Shake echo "Press ENTER to continue" read echo "The StandOut effect, using the BgFill feature to fill the background" echo "instead of an external program. Glints are not done on the DownLeft" echo "corners to be consistent with the lighting angle." -../../freetemp && ../../xbanner -file ./StandOut +/usr/bin/freetemp && /usr/bin/xbanner -file ./StandOut echo "Press ENTER to continue" read echo "The Thick Effect, using a Fan background style, with a repeat period" echo "of 20, a color gradient of white->black->white and a bar-size of 1 pixel." -../../freetemp && ../../xbanner -file ./Thick +/usr/bin/freetemp && /usr/bin/xbanner -file ./Thick echo "Press ENTER to continue" read @@ -124,7 +125,7 @@ echo "type to place the second line of text. This effect is similar to the" echo "StandOut effect only the effect is rendered into the painted area of" echo "the letters instead of around them." -../../freetemp && ../../xbanner -file ./StandOut2_1 && ../../xbanner -file ./StandOut2_2 +/usr/bin/freetemp && /usr/bin/xbanner -file ./StandOut2_1 && /usr/bin/xbanner -file ./StandOut2_2 echo "Press ENTER to continue" read @@ -137,53 +138,53 @@ echo -n "Want to try the color-cycling part of the demo? [Yes] : " read d -../../freetemp +/usr/bin/freetemp if [ -z "$d" -o "$d" = "yes" -o "$d" = "Yes" -o "$d" = "YES" -o "$d" = "y" -o "$d" = "Y" ]; then echo "The FgPlasma effect in white and magenta, with the LeftSplit background" echo "style, and the colors of the FgPlasma cycling slowly." - ../../xbanner -file ./Cyc_FgPlasma || exit + /usr/bin/xbanner -file ./Cyc_FgPlasma || exit echo "Press ENTER to continue" read echo "The Fade effect with a TopDown background style, repeated 8 times," echo "and color cycling is done on the Fade effect as well as the background." - ../../freetemp && ../../xbanner -file ./Cyc_Fade_TopDown + /usr/bin/freetemp && /usr/bin/xbanner -file ./Cyc_Fade_TopDown echo "Press ENTER to continue" read echo "The simple Shadow effect gets a new touch with the option to cycle the" echo "foreground color along a color gradient. The LeftSplit background also" echo "looks nice when you color-cycle it." - ../../freetemp && ../../xbanner -file ./Cyc_FGC_LeftSplit + /usr/bin/freetemp && /usr/bin/xbanner -file ./Cyc_FGC_LeftSplit echo "Press ENTER to continue" read echo "A nice FgGrad effect with a cycling LeftRight background underneath." - ../../freetemp && ../../xbanner -file ./Cyc_LeftRight + /usr/bin/freetemp && /usr/bin/xbanner -file ./Cyc_LeftRight echo "Press ENTER to continue" read echo "Here's another idea what to do with FatText effect. Here I also cycle" echo "the FatText's color gradient." - ../../freetemp && ../../xbanner -file ./Cyc_FatText + /usr/bin/freetemp && /usr/bin/xbanner -file ./Cyc_FatText echo "Press ENTER to continue" read echo "A Plasma background style color-cycled with a simple Shadowed-Outline" echo "effect as the main text render." - ../../freetemp && ../../xbanner -file ./Cyc_Plasma + /usr/bin/freetemp && /usr/bin/xbanner -file ./Cyc_Plasma echo "Press ENTER to continue" read echo "Ripples background style color-cycled with FgPlasma also cycled" echo "as the text rendering effect." - ../../freetemp && ../../xbanner -file ./Cyc_Ripples + /usr/bin/freetemp && /usr/bin/xbanner -file ./Cyc_Ripples echo "Press ENTER to continue" read echo "The Fan background style can produce things like spot-lights." - ../../freetemp && ../../xbanner -file ./Cyc_Fan + /usr/bin/freetemp && /usr/bin/xbanner -file ./Cyc_Fan echo "Press ENTER to continue" read @@ -195,8 +196,9 @@ echo "" echo "Press ENTER to stop the color cycling." read - ../../freetemp + /usr/bin/freetemp fi -# EOF # \ No newline at end of file +# EOF # + --- xbanner-1.31.orig/samples/Demo/Shake +++ xbanner-1.31/samples/Demo/Shake @@ -1,4 +1,4 @@ -xbanner.bgPixFile: ../../Logo_32_col.xpm +xbanner.bgPixFile: /usr/share/doc/xbanner-1.31/Logo_32_col.xpm xbanner.bgStyle: BgPix xbanner.effect: Shake xbanner.font: -adobe-utopia-bold-i-normal--200-*-100-100-*-*-iso8859-1 --- xbanner-1.31.orig/samples/Demo/StandOut2_2 +++ xbanner-1.31/samples/Demo/StandOut2_2 @@ -8,7 +8,7 @@ xbanner.thickness: 4 xbanner.y: 140 xbanner.doPixmap: True -xbanner.pixFile: ../../Logo.xpm +xbanner.pixFile: /usr/share/doc/xbanner-1.31/Logo.xpm xbanner.pixmapX: 500 xbanner.pixmapY: 280 xbanner.glint: True --- xbanner-1.31.orig/samples/XBanner.ad +++ xbanner-1.31/samples/XBanner.ad @@ -43,7 +43,7 @@ !XBanner.Font: -bitstream-terminal-bold-r-normal--50-360-100-100-c-300-iso8859-1 !XBanner.Font: -bitstream-courier-bold-r-normal--200-*-100-100-*-*-iso8859-1 !XBanner.Font: -adobe-utopia-bold-i-normal--125-*-100-100-*-*-iso8859-1 -XBanner.Font: fixed +XBanner.Font: -bitstream-charter-bold-i-normal--150-*-100-100-*-*-iso8859-1 ! The placement of the text. Allowed values are: ! TopLeft TopCenter TopRight BottomLeft BottomCenter BottomRight XY Center --- xbanner-1.31.orig/samples/XBanner.sample +++ xbanner-1.31/samples/XBanner.sample @@ -3,6 +3,10 @@ ! specified in their Class names, so that any other resoruces will override ! this. +! Note: +! This file, /etc/X11/Xbanner.ad is used when you start up Xbanner via +! xdm. To change the look of the xdm modify this file. + ! The application class is "XBanner", the application name is the name of ! the binary. So if you make a link to xbanner and call it "mybanner2", ! you can use options like "xbanner.label: label", for when xbanner is @@ -41,7 +45,7 @@ !XBanner.Font: -bitstream-charter-bold-i-normal--200-*-100-100-*-*-iso8859-1 !XBanner.Font: -bitstream-terminal-bold-r-normal--50-360-100-100-c-300-iso8859-1 !XBanner.Font: -bitstream-courier-bold-r-normal--200-*-100-100-*-*-iso8859-1 -XBanner.Font: -adobe-utopia-bold-i-normal--125-*-100-100-*-*-iso8859-1 +XBanner.Font: -bitstream-charter-bold-i-normal--150-*-100-100-*-*-iso8859-1 ! The placement of the text. Allowed values are: ! TopLeft TopCenter TopRight BottomLeft BottomCenter BottomRight XY Center --- xbanner-1.31.orig/Imakefile +++ xbanner-1.31/Imakefile @@ -6,7 +6,7 @@ PROGRAMS=xbanner freetemp xb_check random_effect XCOMM Install directory: -LOCALBINDIR=/usr/X11/bin +XCOMM LOCALBINDIR=/usr/X11/bin ETCDIR=/etc/X11/xdm XCOMM ***** No need to touch anything below this! ***** @@ -17,12 +17,15 @@ XCOMM *** Remove following line if you don't have XPM! DEFINES=-DHAS_XPM AllTarget($(PROGRAMS)) -SingleProgramTarget(xbanner, backg.o colors.o effect.o linger.o pix.o plasma.o ripples.o util.o xbanner.o xres.o , /**/ , -lXpm -lX11 -lm ) +SingleProgramTarget(xbanner, backg.o colors.o effect.o linger.o pix.o plasma.o ripples.o util.o xbanner.o xres.o , /**/ , -lX11 -lm ) SingleProgramTarget(freetemp, freetemp.o util.o , /**/ , -lX11 ) SingleProgramTarget(xb_check, xb_check.o , /**/ , /**/ ) SingleProgramTarget(random_effect, random_effect.o , /**/ , /**/ ) XCOMM Install directives -InstallTarget(install,xbanner, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR)) -InstallTarget(install,freetemp, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR)) -InstallTarget(install,xb_check, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR)) +InstallNamedProg(xbanner,xbanner,$(BINDIR)) +InstallNamedProg(freetemp,freetemp,$(BINDIR)) +InstallNamedProg(xb_check,xb_check,$(BINDIR)) +InstallManPage(xbanner,$(MANDIR)) +InstallManPageAliases(xbanner,$(MANDIR),freetemp xb_check) +InstallNamedNonExec(xbanner.defaults,XBanner,$(XAPPLOADDIR)) --- xbanner-1.31.orig/effect.c +++ xbanner-1.31/effect.c @@ -1040,30 +1040,27 @@ break; case SHADOW: /* do we make an underline? */ - if(Underlined) - DrawUL(); XSetForeground(disp,mgc,xshdc.pixel); XDrawString(disp,rootpix,mgc, final_x+SHD_X_OFFSET, final_y+SHD_Y_OFFSET, BANNER,strlen(BANNER)); + if(Underlined) + DrawUL(); DrawFG(); break; case OUTLINE: - /* do we make an underline? */ - if(Underlined) - DrawUL(); XSetForeground(disp,mgc,xlghtc.pixel); for(i=SUR_MIN;i