Index: trunk/minix/lib/curses/Makedepend-ack =================================================================== --- trunk/minix/lib/curses/Makedepend-ack (revision 9) +++ (revision ) @@ -1,41 +1,0 @@ -depend-ack: - rm .depend-ack - touch .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' beep.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' charpick.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' curs_set.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' cursesio.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' endwin.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' flash.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' initscr.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' longname.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' move.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' mvcursor.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' newwin.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' options.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' overlay.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' prntscan.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' refresh.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' scrreg.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' setterm.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' tabsize.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' termmisc.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' unctrl.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' update.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' waddch.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' waddstr.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' wbox.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' wclear.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' wclrtobot.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' wclrtoeol.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' wdelch.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' wdeleteln.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' werase.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' wgetch.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' wgetstr.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' windel.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' winmove.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' winsch.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' winscrol.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' winsertln.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack - mkdep 'cc -O -D_MINIX -D_POSIX_SOURCE -E' wintouch.c | sed -e 's:^\(.\):../obj-ack//./curses/\1:' >> .depend-ack Index: trunk/minix/lib/curses/Makedepend-gnu =================================================================== --- trunk/minix/lib/curses/Makedepend-gnu (revision 9) +++ (revision ) @@ -1,41 +1,0 @@ -depend-gnu: - rm .depend-gnu - touch .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' beep.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' charpick.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' curs_set.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' cursesio.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' endwin.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' flash.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' initscr.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' longname.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' move.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' mvcursor.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' newwin.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' options.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' overlay.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' prntscan.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' refresh.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' scrreg.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' setterm.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' tabsize.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' termmisc.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' unctrl.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' update.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' waddch.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' waddstr.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' wbox.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' wclear.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' wclrtobot.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' wclrtoeol.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' wdelch.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' wdeleteln.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' werase.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' wgetch.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' wgetstr.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' windel.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' winmove.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' winsch.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' winscrol.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' winsertln.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu - mkdep 'gcc -O -D_MINIX -D_POSIX_SOURCE -E' wintouch.c | sed -e '//d' -e '//d' -e 's:^\(.\):../obj-gnu/./curses/\1:' >> .depend-gnu Index: trunk/minix/lib/curses/Makefile =================================================================== --- trunk/minix/lib/curses/Makefile (revision 9) +++ (revision ) @@ -1,311 +1,0 @@ -#Generated from ./curses/Makefile.in -all: all-ack - -all-ack: -all-gnu: - -makefiles: Makefile -Makedepend-ack Makedepend-gnu: - sh ../generate.sh ./curses ../obj-ack/ ../obj-gnu - -Makefile: Makefile.in Makedepend-ack Makedepend-gnu - sh ../generate.sh ./curses ../obj-ack/ ../obj-gnu - @echo - @echo *Attention* - @echo Makefile is regenerated... rerun command to see changes - @echo *Attention* - @echo - -depend: depend-ack -all-ack: ../obj-ack//libcurses.a - -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(beep.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(charpick.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(curs_set.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(cursesio.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(endwin.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(flash.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(initscr.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(longname.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(move.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(mvcursor.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(newwin.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(options.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(overlay.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(prntscan.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(refresh.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(scrreg.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(setterm.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(tabsize.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(termmisc.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(unctrl.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(update.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(waddch.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(waddstr.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(wbox.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(wclear.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(wclrtobot.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(wclrtoeol.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(wdelch.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(wdeleteln.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(werase.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(wgetch.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(wgetstr.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(windel.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(winmove.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(winsch.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(winscrol.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(winsertln.o) -../obj-ack//libcurses.a: ../obj-ack//libcurses.a(wintouch.o) - -../obj-ack//libcurses.a: - ar cr ../obj-ack//libcurses.a ../obj-ack//./curses/*.o - rm ../obj-ack//./curses/*.o - -../obj-ack//libcurses.a(beep.o): beep.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/beep.o beep.c -../obj-ack//libcurses.a(charpick.o): charpick.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/charpick.o charpick.c -../obj-ack//libcurses.a(curs_set.o): curs_set.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/curs_set.o curs_set.c -../obj-ack//libcurses.a(cursesio.o): cursesio.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/cursesio.o cursesio.c -../obj-ack//libcurses.a(endwin.o): endwin.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/endwin.o endwin.c -../obj-ack//libcurses.a(flash.o): flash.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/flash.o flash.c -../obj-ack//libcurses.a(initscr.o): initscr.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/initscr.o initscr.c -../obj-ack//libcurses.a(longname.o): longname.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/longname.o longname.c -../obj-ack//libcurses.a(move.o): move.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/move.o move.c -../obj-ack//libcurses.a(mvcursor.o): mvcursor.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/mvcursor.o mvcursor.c -../obj-ack//libcurses.a(newwin.o): newwin.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/newwin.o newwin.c -../obj-ack//libcurses.a(options.o): options.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/options.o options.c -../obj-ack//libcurses.a(overlay.o): overlay.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/overlay.o overlay.c -../obj-ack//libcurses.a(prntscan.o): prntscan.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/prntscan.o prntscan.c -../obj-ack//libcurses.a(refresh.o): refresh.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/refresh.o refresh.c -../obj-ack//libcurses.a(scrreg.o): scrreg.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/scrreg.o scrreg.c -../obj-ack//libcurses.a(setterm.o): setterm.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/setterm.o setterm.c -../obj-ack//libcurses.a(tabsize.o): tabsize.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/tabsize.o tabsize.c -../obj-ack//libcurses.a(termmisc.o): termmisc.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/termmisc.o termmisc.c -../obj-ack//libcurses.a(unctrl.o): unctrl.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/unctrl.o unctrl.c -../obj-ack//libcurses.a(update.o): update.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/update.o update.c -../obj-ack//libcurses.a(waddch.o): waddch.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/waddch.o waddch.c -../obj-ack//libcurses.a(waddstr.o): waddstr.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/waddstr.o waddstr.c -../obj-ack//libcurses.a(wbox.o): wbox.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/wbox.o wbox.c -../obj-ack//libcurses.a(wclear.o): wclear.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/wclear.o wclear.c -../obj-ack//libcurses.a(wclrtobot.o): wclrtobot.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/wclrtobot.o wclrtobot.c -../obj-ack//libcurses.a(wclrtoeol.o): wclrtoeol.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/wclrtoeol.o wclrtoeol.c -../obj-ack//libcurses.a(wdelch.o): wdelch.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/wdelch.o wdelch.c -../obj-ack//libcurses.a(wdeleteln.o): wdeleteln.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/wdeleteln.o wdeleteln.c -../obj-ack//libcurses.a(werase.o): werase.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/werase.o werase.c -../obj-ack//libcurses.a(wgetch.o): wgetch.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/wgetch.o wgetch.c -../obj-ack//libcurses.a(wgetstr.o): wgetstr.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/wgetstr.o wgetstr.c -../obj-ack//libcurses.a(windel.o): windel.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/windel.o windel.c -../obj-ack//libcurses.a(winmove.o): winmove.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/winmove.o winmove.c -../obj-ack//libcurses.a(winsch.o): winsch.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/winsch.o winsch.c -../obj-ack//libcurses.a(winscrol.o): winscrol.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/winscrol.o winscrol.c -../obj-ack//libcurses.a(winsertln.o): winsertln.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/winsertln.o winsertln.c -../obj-ack//libcurses.a(wintouch.o): wintouch.c - cc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-ack//./curses/wintouch.o wintouch.c - -all-gnu: ../obj-gnu/libcurses.a - -../obj-gnu/libcurses.a: ../obj-gnu/./curses/beep.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/charpick.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/curs_set.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/cursesio.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/endwin.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/flash.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/initscr.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/longname.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/move.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/mvcursor.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/newwin.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/options.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/overlay.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/prntscan.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/refresh.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/scrreg.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/setterm.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/tabsize.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/termmisc.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/unctrl.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/update.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/waddch.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/waddstr.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/wbox.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/wclear.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/wclrtobot.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/wclrtoeol.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/wdelch.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/wdeleteln.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/werase.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/wgetch.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/wgetstr.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/windel.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/winmove.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/winsch.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/winscrol.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/winsertln.o -../obj-gnu/libcurses.a: ../obj-gnu/./curses/wintouch.o - -../obj-gnu/libcurses.a: - gar cr ../obj-gnu/libcurses.a $? - -../obj-gnu/./curses/beep.o: beep.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/beep.o beep.c - -../obj-gnu/./curses/charpick.o: charpick.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/charpick.o charpick.c - -../obj-gnu/./curses/curs_set.o: curs_set.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/curs_set.o curs_set.c - -../obj-gnu/./curses/cursesio.o: cursesio.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/cursesio.o cursesio.c - -../obj-gnu/./curses/endwin.o: endwin.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/endwin.o endwin.c - -../obj-gnu/./curses/flash.o: flash.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/flash.o flash.c - -../obj-gnu/./curses/initscr.o: initscr.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/initscr.o initscr.c - -../obj-gnu/./curses/longname.o: longname.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/longname.o longname.c - -../obj-gnu/./curses/move.o: move.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/move.o move.c - -../obj-gnu/./curses/mvcursor.o: mvcursor.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/mvcursor.o mvcursor.c - -../obj-gnu/./curses/newwin.o: newwin.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/newwin.o newwin.c - -../obj-gnu/./curses/options.o: options.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/options.o options.c - -../obj-gnu/./curses/overlay.o: overlay.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/overlay.o overlay.c - -../obj-gnu/./curses/prntscan.o: prntscan.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/prntscan.o prntscan.c - -../obj-gnu/./curses/refresh.o: refresh.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/refresh.o refresh.c - -../obj-gnu/./curses/scrreg.o: scrreg.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/scrreg.o scrreg.c - -../obj-gnu/./curses/setterm.o: setterm.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/setterm.o setterm.c - -../obj-gnu/./curses/tabsize.o: tabsize.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/tabsize.o tabsize.c - -../obj-gnu/./curses/termmisc.o: termmisc.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/termmisc.o termmisc.c - -../obj-gnu/./curses/unctrl.o: unctrl.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/unctrl.o unctrl.c - -../obj-gnu/./curses/update.o: update.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/update.o update.c - -../obj-gnu/./curses/waddch.o: waddch.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/waddch.o waddch.c - -../obj-gnu/./curses/waddstr.o: waddstr.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/waddstr.o waddstr.c - -../obj-gnu/./curses/wbox.o: wbox.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/wbox.o wbox.c - -../obj-gnu/./curses/wclear.o: wclear.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/wclear.o wclear.c - -../obj-gnu/./curses/wclrtobot.o: wclrtobot.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/wclrtobot.o wclrtobot.c - -../obj-gnu/./curses/wclrtoeol.o: wclrtoeol.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/wclrtoeol.o wclrtoeol.c - -../obj-gnu/./curses/wdelch.o: wdelch.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/wdelch.o wdelch.c - -../obj-gnu/./curses/wdeleteln.o: wdeleteln.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/wdeleteln.o wdeleteln.c - -../obj-gnu/./curses/werase.o: werase.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/werase.o werase.c - -../obj-gnu/./curses/wgetch.o: wgetch.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/wgetch.o wgetch.c - -../obj-gnu/./curses/wgetstr.o: wgetstr.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/wgetstr.o wgetstr.c - -../obj-gnu/./curses/windel.o: windel.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/windel.o windel.c - -../obj-gnu/./curses/winmove.o: winmove.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/winmove.o winmove.c - -../obj-gnu/./curses/winsch.o: winsch.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/winsch.o winsch.c - -../obj-gnu/./curses/winscrol.o: winscrol.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/winscrol.o winscrol.c - -../obj-gnu/./curses/winsertln.o: winsertln.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/winsertln.o winsertln.c - -../obj-gnu/./curses/wintouch.o: wintouch.c - gcc -O -D_MINIX -D_POSIX_SOURCE -c -o ../obj-gnu/./curses/wintouch.o wintouch.c - - - - -clean:: - rm -f ../obj-ack//./curses/* - rm -f ../obj-gnu/./curses/* - -include Makedepend-ack -include .depend-ack - -include Makedepend-gnu -include .depend-gnu Index: trunk/minix/lib/curses/Makefile.in =================================================================== --- trunk/minix/lib/curses/Makefile.in (revision 9) +++ (revision ) @@ -1,47 +1,0 @@ -# Makefile for lib/curses. - -CFLAGS="-O -D_MINIX -D_POSIX_SOURCE" - -LIBRARIES=libcurses - -libcurses_FILES=" \ - beep.c \ - charpick.c \ - curs_set.c \ - cursesio.c \ - endwin.c \ - flash.c \ - initscr.c \ - longname.c \ - move.c \ - mvcursor.c \ - newwin.c \ - options.c \ - overlay.c \ - prntscan.c \ - refresh.c \ - scrreg.c \ - setterm.c \ - tabsize.c \ - termmisc.c \ - unctrl.c \ - update.c \ - waddch.c \ - waddstr.c \ - wbox.c \ - wclear.c \ - wclrtobot.c \ - wclrtoeol.c \ - wdelch.c \ - wdeleteln.c \ - werase.c \ - wgetch.c \ - wgetstr.c \ - windel.c \ - winmove.c \ - winsch.c \ - winscrol.c \ - winsertln.c \ - wintouch.c" - -TYPE=both Index: trunk/minix/lib/curses/beep.c =================================================================== --- trunk/minix/lib/curses/beep.c (revision 9) +++ (revision ) @@ -1,14 +1,0 @@ -#include -#include "curspriv.h" -#include - -extern char *bl, *vb; - -/* Beep() sounds the terminal bell. */ -void beep() -{ - if (bl) - tputs(bl, 1, outc); - else if (vb) - tputs(vb, 1, outc); -} Index: trunk/minix/lib/curses/charpick.c =================================================================== --- trunk/minix/lib/curses/charpick.c (revision 9) +++ (revision ) @@ -1,40 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Winch(win) returns the character at the current position in */ -/* Window 'win'. */ -/****************************************************************/ - -int winch(win) -WINDOW *win; -{ - return((win->_line[win->_cury][win->_curx]) & 0xff); -} /* winch */ - -/****************************************************************/ -/* Mvinch() moves the stdscr cursor to a new position, then */ -/* Returns the character at that position. */ -/****************************************************************/ - -int mvinch(y, x) -int y; -int x; -{ - if (wmove(stdscr, y, x) == ERR) return(ERR); - return((stdscr->_line[stdscr->_cury][stdscr->_curx]) & 0xff); -} - -/****************************************************************/ -/* Mvwinch() moves the cursor of window 'win' to a new posi- */ -/* Tion, then returns the character at that position. */ -/****************************************************************/ - -int mvwinch(win, y, x) -WINDOW *win; -int y; -int x; -{ - if (wmove(win, y, x) == ERR) return(ERR); - return((win->_line[win->_cury][win->_curx]) & 0xff); -} Index: trunk/minix/lib/curses/curs_set.c =================================================================== --- trunk/minix/lib/curses/curs_set.c (revision 9) +++ (revision ) @@ -1,26 +1,0 @@ -#include -#include "curspriv.h" -#include - -extern char *vi, *ve, *vs; - -/* Sets cursor visibility to unvisible=0; normal visible=1 or very good - * visible=2. -*/ -void curs_set(visibility) -int visibility; -{ - switch (visibility) { - case 0: - if (vi) tputs(vi, 1, outc); - break; - case 1: - if (ve) tputs(ve, 1, outc); - break; - case 2: - if (vs) - tputs(vs, 1, outc); - else if (ve) - tputs(ve, 1, outc); - } -} Index: trunk/minix/lib/curses/cursesio.c =================================================================== --- trunk/minix/lib/curses/cursesio.c (revision 9) +++ (revision ) @@ -1,223 +1,0 @@ -#include -#include -#include -#include -#include -#include "curspriv.h" - -struct termios _orig_tty, _tty; -cursv _cursvar; - -WINDOW *stdscr, *curscr; -int LINES, COLS; -bool NONL; - -char termcap[1024]; /* termcap buffer */ -char tc[200]; /* area to hold string capabilities */ -char *ttytype; /* terminal type from env */ -static char *arp; /* pointer for use in tgetstr */ -char *cp; /* character pointer */ - -char *cl; /* clear screen capability */ -char *cm; /* cursor motion capability */ -char *so; /* start standout capability */ -char *se; /* end standout capability */ -char *mr; /* start of reverse */ -char *me; /* revert to normal */ -char *mb; /* start of blink */ -char *md; /* start of bold */ -char *us; /* start of underscore */ -char *ue; /* end of underscore */ -char *vi; /* cursor invisible */ -char *ve; /* cursor normal */ -char *vs; /* cursor good visible */ -char *as; /* alternative charset start */ -char *ae; /* alternative charset end */ -char *bl; /* ring the bell */ -char *vb; /* visual bell */ - -/* fatal - report error and die. Never returns */ -void fatal(s) -char *s; -{ - (void) fprintf(stderr, "curses: %s\n", s); - exit(1); -} - -/* Outc - call putchar, necessary because putchar is a macro. */ -void outc(c) -int c; -{ - putchar(c); -} - -/* Move cursor to r,c */ -void poscur(r, c) -int r, c; -{ - tputs(tgoto(cm, c, r), 1, outc); -} - -/* Clear the screen */ -void clrscr() -{ - tputs(cl, 1, outc); -} - -/* This are terminal independent characters which can be used in curses */ - -unsigned int ACS_ULCORNER; -unsigned int ACS_LLCORNER; -unsigned int ACS_URCORNER; -unsigned int ACS_LRCORNER; -unsigned int ACS_RTEE; -unsigned int ACS_LTEE; -unsigned int ACS_BTEE; -unsigned int ACS_TTEE; -unsigned int ACS_HLINE; -unsigned int ACS_VLINE; -unsigned int ACS_PLUS; -unsigned int ACS_S1; -unsigned int ACS_S9; -unsigned int ACS_DIAMOND; -unsigned int ACS_CKBOARD; -unsigned int ACS_DEGREE; -unsigned int ACS_PLMINUS; -unsigned int ACS_BULLET; -unsigned int ACS_LARROW; -unsigned int ACS_RARROW; -unsigned int ACS_DARROW; -unsigned int ACS_UARROW; -unsigned int ACS_BOARD; -unsigned int ACS_LANTERN; -unsigned int ACS_BLOCK; - -/* These defines describe the full set of grafic block characters which - * can be defined via termcap. - */ - -#define RIGHTARROW 0 -#define LEFTARROW 1 -#define DOWNARROW 2 -#define UPARROW 3 -#define FULLSQUARE 4 -#define GREYSQUARE 5 -#define EMPTYSQUARE 6 -#define LATERN 7 -#define DIAMOND 8 -#define DEGREE 9 -#define PLUSMINUS 10 -#define DOWNRIGHT 11 -#define UPRIGHT 12 -#define UPLEFT 13 -#define DOWNLEFT 14 -#define CROSS 15 -#define UPLINE 16 -#define UPMIDLINE 17 -#define MIDLINE 18 -#define DOMIDLINE 19 -#define DOWNLINE 20 -#define TEELEFT 21 -#define TEERIGHT 22 -#define TEEHEAD 23 -#define TEENORMAL 24 -#define VERTLINE 25 -#define PARAGRAPH 26 - -unsigned int _cursgraftable[27] = -{ - '>', '<', 'v', '^', '#', ':', ' ', '#', '+', '\'', '#', '+', '+', - '+', '+', '+', '-', ' ', '-', ' ', '_', '+', '+', '+', '+', '|' -}; -char _cursident[28] = "+,.-0ahI`fgjklmnopqrstuvwx~"; - -int setterm(type) -char *type; -{ - unsigned char *ac; - int i; -#ifdef TIOCGWINSZ - struct winsize wsize; -#endif - - if (tgetent(termcap, type) != 1) return ERR; - -#ifdef TIOCGWINSZ - if (ioctl(0, TIOCGWINSZ, &wsize) == 0) { - LINES = wsize.ws_row != 0 ? wsize.ws_row : tgetnum("li"); - COLS = wsize.ws_col != 0 ? wsize.ws_col : tgetnum("co"); - } else { -#endif - LINES = tgetnum("li"); - COLS = tgetnum("co"); -#ifdef TIOCGWINSZ - } -#endif - arp = tc; - cl = tgetstr("cl", &arp); - so = tgetstr("so", &arp); - se = tgetstr("se", &arp); - cm = tgetstr("cm", &arp); - mr = tgetstr("mr", &arp); - me = tgetstr("me", &arp); - mb = tgetstr("mb", &arp); - md = tgetstr("md", &arp); - us = tgetstr("us", &arp); - ue = tgetstr("ue", &arp); - vi = tgetstr("vi", &arp); - ve = tgetstr("ve", &arp); - vs = tgetstr("vs", &arp); - as = tgetstr("as", &arp); - ae = tgetstr("ae", &arp); - ac = (unsigned char *) tgetstr("ac", &arp); - bl = tgetstr("bl", &arp); - vb = tgetstr("vb", &arp); - - if (ac) { - while (*ac) { - i = 0; - while (*ac != _cursident[i]) i++; - _cursgraftable[i] = *++ac | A_ALTCHARSET; - ac++; - } - } - - ACS_ULCORNER = _cursgraftable[UPLEFT]; - ACS_LLCORNER = _cursgraftable[DOWNLEFT]; - ACS_URCORNER = _cursgraftable[UPRIGHT]; - ACS_LRCORNER = _cursgraftable[DOWNRIGHT]; - ACS_RTEE = _cursgraftable[TEERIGHT]; - ACS_LTEE = _cursgraftable[TEELEFT]; - ACS_BTEE = _cursgraftable[TEEHEAD]; - ACS_TTEE = _cursgraftable[TEENORMAL]; - ACS_HLINE = _cursgraftable[MIDLINE]; - ACS_VLINE = _cursgraftable[VERTLINE]; - ACS_PLUS = _cursgraftable[CROSS]; - ACS_S1 = _cursgraftable[UPLINE]; - ACS_S9 = _cursgraftable[DOWNLINE]; - ACS_DIAMOND = _cursgraftable[DIAMOND]; - ACS_CKBOARD = _cursgraftable[GREYSQUARE]; - ACS_DEGREE = _cursgraftable[DEGREE]; - ACS_PLMINUS = _cursgraftable[PLUSMINUS]; - ACS_BULLET = 'o'; /* where the hell is a bullet defined in - * termcap ??? */ - ACS_LARROW = _cursgraftable[LEFTARROW]; - ACS_RARROW = _cursgraftable[RIGHTARROW]; - ACS_DARROW = _cursgraftable[DOWNARROW]; - ACS_UARROW = _cursgraftable[UPARROW]; - ACS_BOARD = _cursgraftable[EMPTYSQUARE]; - ACS_LANTERN = _cursgraftable[LATERN]; - ACS_BLOCK = _cursgraftable[FULLSQUARE]; - /* Wow, I got it! */ - return OK; -} - -void gettmode() -{ - tcgetattr(0, &_orig_tty); - tcgetattr(0, &_tty); - _cursvar.echoit = (_tty.c_lflag & ECHO) != 0; - _cursvar.rawmode = (_tty.c_lflag & (ICANON|ISIG)) == 0; - _cursvar.cbrkmode = (_tty.c_lflag & (ICANON|ISIG)) == ISIG; - NONL = (_tty.c_iflag & ICRNL) != 0; -} Index: trunk/minix/lib/curses/curspriv.h =================================================================== --- trunk/minix/lib/curses/curspriv.h (revision 9) +++ (revision ) @@ -1,36 +1,0 @@ -/* Constants */ -#define _SUBWIN 1 /* window is a subwindow */ -#define _ENDLINE 2 /* last winline is last screen line */ -#define _FULLWIN 4 /* window fills screen */ -#define _SCROLLWIN 8 /* window lwr rgt is screen lwr rgt */ - -#define _NO_CHANGE -1 /* flags line edge unchanged */ -#define _BREAKCHAR 0x03 /* ^C character */ -#define _DCCHAR 0x08 /* Delete Char char (BS) */ -#define _DLCHAR 0x1b /* Delete Line char (ESC) */ -#define _GOCHAR 0x11 /* ^Q character */ -#define _PRINTCHAR 0x10 /* ^P character */ -#define _STOPCHAR 0x13 /* ^S character */ -#define NUNGETCH 10 /* max # chars to ungetch() */ - -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#define min(a,b) (((a) < (b)) ? (a) : (b)) - -/* Character mask definitions. */ -#define CHR_MSK ((int) 0x00ff) /* ASCIIZ character mask */ -#define ATR_MSK ((int) 0xff00) /* attribute mask */ -#define ATR_NRM ((int) 0x0000) /* no special attributes */ - -/* Type declarations. */ - -typedef struct { - WINDOW *tmpwin; /* window used for updates */ - int cursrow; /* position of physical cursor */ - int curscol; - bool rawmode; - bool cbrkmode; - bool echoit; -} cursv; - -/* External variables */ -extern cursv _cursvar; /* curses variables */ Index: trunk/minix/lib/curses/endwin.c =================================================================== --- trunk/minix/lib/curses/endwin.c (revision 9) +++ (revision ) @@ -1,18 +1,0 @@ -#include -#include "curspriv.h" -#include - -int endwin() -{ - extern char *me; - - curs_set(1); - poscur(LINES - 1, 0); - refresh(); - tputs(me, 1, outc); - delwin(stdscr); - delwin(curscr); - delwin(_cursvar.tmpwin); - resetty(); - return(OK); -} Index: trunk/minix/lib/curses/flash.c =================================================================== --- trunk/minix/lib/curses/flash.c (revision 9) +++ (revision ) @@ -1,14 +1,0 @@ -#include -#include "curspriv.h" -#include - -extern char *bl, *vb; - -/* Flash() flashes the terminal screen. */ -void flash() -{ - if (vb) - tputs(vb, 1, outc); - else if (bl) - tputs(bl, 1, outc); -} Index: trunk/minix/lib/curses/initscr.c =================================================================== --- trunk/minix/lib/curses/initscr.c (revision 9) +++ (revision ) @@ -1,19 +1,0 @@ -/* initscr.c - initialize the curses library */ - -#include -#include -#include "curspriv.h" - -WINDOW *initscr() -{ - char *term; - - if ((term = getenv("TERM")) == NULL) return NULL; - setterm(term); - gettmode(); - if ((_cursvar.tmpwin = newwin(LINES, COLS, 0, 0)) == NULL) return NULL; - if ((curscr = newwin(LINES, COLS, 0, 0)) == NULL) return NULL; - if ((stdscr = newwin(LINES, COLS, 0, 0)) == NULL) return NULL; - clearok(curscr, TRUE); - return(stdscr); -} Index: trunk/minix/lib/curses/longname.c =================================================================== --- trunk/minix/lib/curses/longname.c (revision 9) +++ (revision ) @@ -1,12 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Longname() returns a pointer to a string describing the */ -/* User terminal. */ -/****************************************************************/ - -char *longname() -{ - return("not implemented"); -} Index: trunk/minix/lib/curses/move.c =================================================================== --- trunk/minix/lib/curses/move.c (revision 9) +++ (revision ) @@ -1,18 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Wmove() moves the cursor in window 'win' to position (x,y). */ -/****************************************************************/ - -int wmove(win, y, x) -WINDOW *win; -int y; -int x; -{ - if ((x<0) || (x>win->_maxx) || (y_regtop) || (y>win->_regbottom)) - return(ERR); - win->_curx = x; - win->_cury = y; - return(OK); -} Index: trunk/minix/lib/curses/mvcursor.c =================================================================== --- trunk/minix/lib/curses/mvcursor.c (revision 9) +++ (revision ) @@ -1,20 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Mvcur(oldy,oldx,newy,newx) the display cursor to */ -/****************************************************************/ - -int mvcur(oldy, oldx, newy, newx) -int oldy; -int oldx; -int newy; -int newx; -{ - if ((newy >= LINES) || (newx >= COLS) || (newy < 0) || (newx < 0)) - return(ERR); - poscur(newy, newx); - _cursvar.cursrow = newy; - _cursvar.curscol = newx; - return(OK); -} Index: trunk/minix/lib/curses/newwin.c =================================================================== --- trunk/minix/lib/curses/newwin.c (revision 9) +++ (revision ) @@ -1,144 +1,0 @@ -#include -#include -#include "curspriv.h" - -/****************************************************************/ -/* Makenew() allocates all data for a new window except the */ -/* Actual lines themselves. */ -/****************************************************************/ - -_PROTOTYPE(static WINDOW *makenew, (int nlines, int ncols, int begy,int begx)); - -static WINDOW *makenew(num_lines, num_columns, begy, begx) -int num_lines, num_columns, begy, begx; -{ - int i; - WINDOW *win; - - /* Allocate the window structure itself */ - if ((win = (WINDOW *) malloc(sizeof(WINDOW))) == NULL) - return((WINDOW *) ERR); - - /* Allocate the line pointer array */ - if ((win->_line = (int **) calloc(num_lines, sizeof(int *))) == NULL) { - free(win); - return((WINDOW *) ERR); - } - - /* Allocate the minchng and maxchng arrays */ - if ((win->_minchng = (int *) calloc(num_lines, sizeof(int))) == NULL) { - free(win); - free(win->_line); - return((WINDOW *) ERR); - } - if ((win->_maxchng = (int *) calloc(num_lines, sizeof(int))) == NULL) { - free(win); - free(win->_line); - free(win->_minchng); - return((WINDOW *) ERR); - } - - /* Initialize window variables */ - win->_curx = 0; - win->_cury = 0; - win->_maxy = num_lines - 1; - win->_maxx = num_columns - 1; - win->_begy = begy; - win->_begx = begx; - win->_flags = 0; - win->_attrs = ATR_NRM; - win->_tabsize = 8; - win->_clear = FALSE; - win->_leave = FALSE; - win->_scroll = FALSE; - win->_nodelay = FALSE; - win->_keypad = FALSE; - win->_regtop = 0; - win->_regbottom = num_lines - 1; - - /* Init to say window unchanged */ - for (i = 0; i < num_lines; i++) { - win->_minchng[i] = 0; - win->_maxchng[i] = num_columns - 1; - } - - /* Set flags for window properties */ - if ((begy + num_lines) == LINES) { - win->_flags |= _ENDLINE; - if ((begx == 0) && (num_columns == COLS) && (begy == 0)) - win->_flags |= _FULLWIN; - } /* if */ - if (((begy + num_lines) == LINES) && ((begx + num_columns) == COLS)) - win->_flags |= _SCROLLWIN; - return(win); -} - - -/****************************************************************/ -/* Newwin() creates a new window with size num_lines * num_co- */ -/* Lumns, and origin begx,begy relative to the SCREEN. Special */ -/* Case: if num_lines and/or num_columns is 0, the remainder of */ -/* The screen is used. */ -/****************************************************************/ -WINDOW *newwin(num_lines, num_columns, begy, begx) -int num_lines, num_columns, begy, begx; -{ - WINDOW *win; - int *ptr; - int i, j; - - if (num_lines == 0) num_lines = LINES - begy; - if (num_columns == 0) num_columns = COLS - begx; - if ((win = makenew(num_lines, num_columns, begy, begx)) == (WINDOW *) ERR) - return((WINDOW *) ERR); - for (i = 0; i < num_lines; i++) { /* make and clear the lines */ - if ((win->_line[i] = (int *)calloc(num_columns, sizeof(int))) == NULL){ - for (j = 0; j < i; j++) /* if error, free all the data */ - free(win->_line[j]); - free(win->_minchng); - free(win->_maxchng); - free(win->_line); - free(win); - return((WINDOW *) ERR); - } else { - for (ptr = win->_line[i]; ptr < win->_line[i] + num_columns;) - *ptr++ = ' ' | ATR_NRM; - } - } - return(win); -} - - -/****************************************************************/ -/* Subwin() creates a sub-window in the 'orig' window, with */ -/* Size num_lines * num_columns, and with origin begx, begy */ -/* Relative to the SCREEN. Special case: if num_lines and/or */ -/* Num_columns is 0, the remainder of the original window is */ -/* Used. The subwindow uses the original window's line buffers */ -/* To store it's own lines. */ -/****************************************************************/ -WINDOW *subwin(orig, num_lines, num_columns, begy, begx) -WINDOW *orig; -int num_lines, num_columns, begy, begx; -{ - WINDOW *win; - int i, j, k; - - /* Make sure window fits inside the original one */ - if (begy < orig->_begy || begx < orig->_begx || - (begy + num_lines) > (orig->_begy + orig->_maxy) || - (begx + num_columns) > (orig->_begx + orig->_maxx) ) - return((WINDOW *) ERR); - - if (num_lines == 0) num_lines = orig->_maxy - (begy - orig->_begy); - if (num_columns == 0) num_columns = orig->_maxx - (begx - orig->_begx); - if ((win = makenew(num_lines, num_columns, begy, begx)) == (WINDOW *) ERR) - return((WINDOW *) ERR); - - /* Set line pointers the same as in the original window */ - j = begy - orig->_begy; - k = begx - orig->_begx; - for (i = 0; i < num_lines; i++) win->_line[i] = (orig->_line[j++]) + k; - win->_flags |= _SUBWIN; - return(win); -} Index: trunk/minix/lib/curses/options.c =================================================================== --- trunk/minix/lib/curses/options.c (revision 9) +++ (revision ) @@ -1,87 +1,0 @@ -#include -#include "curspriv.h" - -static bool hasold = FALSE; /* for remembering old cursor type */ -static int oldmode; - -/****************************************************************/ -/* Idlok() is used to set flag for using the terminal insert/ */ -/* Delete line capabilities. This is not relevant for the PC */ -/* Version of curses, and thus nothing is done. */ -/****************************************************************/ -void idlok(win, flag) -WINDOW *win; -bool flag; -{ -} - -/****************************************************************/ -/* Clearok() marks window 'win' to cause screen clearing and */ -/* Redraw the next time a refresh is done. */ -/****************************************************************/ -void clearok(win, flag) -WINDOW *win; -bool flag; -{ - if (win == curscr) - _cursvar.tmpwin->_clear = flag; - else - win->_clear = flag; -} - -/****************************************************************/ -/* Leaveok() marks window 'win' to allow the update routines */ -/* To leave the hardware cursor where it happens to be at the */ -/* End of update. Usually used in combination with cursoff(). */ -/****************************************************************/ - -void leaveok(win, flag) -WINDOW *win; -bool flag; -{ - win->_leave = flag; -} - -/****************************************************************/ -/* Scrollok() marks window 'win' to allow the scrolling region */ -/* Of it to actually scroll. */ -/****************************************************************/ -void scrollok(win, flag) -WINDOW *win; -bool flag; -{ - win->_scroll = flag; -} - -/****************************************************************/ -/* Nodelay() marks the window to make character input non- */ -/* Waiting, i.e. if there is no character to get, -1 will be */ -/* Returned. */ -/****************************************************************/ -void nodelay(win, flag) -WINDOW *win; -bool flag; -{ - win->_nodelay = flag; -} - -/****************************************************************/ -/* Keypad() marks window 'win' to use the special keypad mode. */ -/****************************************************************/ -void keypad(win, flag) -WINDOW *win; -bool flag; -{ - win->_keypad = flag; -} - -/****************************************************************/ -/* Meta() allows use of any alternate character set allowed by */ -/* The terminal. We always allow this on the PC, so this one */ -/* Does nothing. */ -/****************************************************************/ -void meta(win, flag) -WINDOW *win; -bool flag; -{ -} Index: trunk/minix/lib/curses/overlay.c =================================================================== --- trunk/minix/lib/curses/overlay.c (revision 9) +++ (revision ) @@ -1,124 +1,0 @@ -/****************************************************************/ -/* Overlay() and overwrite() functions of the PCcurses package */ -/* */ -/****************************************************************/ -/* This version of curses is based on ncurses, a curses version */ -/* Originally written by Pavel Curtis at Cornell University. */ -/* I have made substantial changes to make it run on IBM PC's, */ -/* And therefore consider myself free to make it public domain. */ -/* Bjorn Larsson (...mcvax!enea!infovax!bl) */ -/****************************************************************/ -/* 1.0: Release: 870515 */ -/****************************************************************/ -/* Modified to run under the MINIX operating system by Don Cope */ -/* These changes are also released into the public domain. */ -/* 900906 */ -/****************************************************************/ - -#include -#include "curspriv.h" - -/****************************************************************/ -/* Overlay() overwrites 'win1' upon 'win2', with origins alig- */ -/* Ned. Overlay is transparent; blanks from 'win1' are not */ -/* Copied to 'win2'. */ -/****************************************************************/ -void overlay(win1, win2) -WINDOW *win1, *win2; -{ - int *minchng; - int *maxchng; - int *w1ptr; - int *w2ptr; - int attrs; - int col; - int line; - int last_line; - int last_col; - - last_col = min(win1->_maxx, win2->_maxx); - last_line = min(win1->_maxy, win2->_maxy); - attrs = win2->_attrs & ATR_MSK; - minchng = win2->_minchng; - maxchng = win2->_maxchng; - - for (line = 0; line <= last_line; line++) { - register short fc, lc = 0; - w1ptr = win1->_line[line]; - w2ptr = win2->_line[line]; - fc = _NO_CHANGE; - for (col = 0; col <= last_col; col++) { - if ((*w1ptr & CHR_MSK) != ' ') { - *w2ptr = (*w1ptr & CHR_MSK) | attrs; - if (fc == _NO_CHANGE) fc = col; - lc = col; - } - w1ptr++; - w2ptr++; - } - - if (*minchng == _NO_CHANGE) { - *minchng = fc; - *maxchng = lc; - } else if (fc != _NO_CHANGE) { - if (fc < *minchng) *minchng = fc; - if (lc > *maxchng) *maxchng = lc; - } - minchng++; - maxchng++; - } /* for */ -} /* overlay */ - -/****************************************************************/ -/* Overwrite() overwrites 'win1' upon 'win2', with origins */ -/* Aligned. Overwrite is non-transparent; blanks from 'win1' */ -/* Are copied to 'win2'. */ -/****************************************************************/ -void overwrite(win1, win2) -WINDOW *win1, *win2; -{ - int *minchng; - int *maxchng; - int *w1ptr; - int *w2ptr; - int attrs; - int col; - int line; - int last_line; - int last_col; - - last_col = min(win1->_maxx, win2->_maxx); - last_line = min(win1->_maxy, win2->_maxy); - attrs = win2->_attrs & ATR_MSK; - minchng = win2->_minchng; - maxchng = win2->_maxchng; - - for (line = 0; line <= last_line; line++) { - register short fc, lc = 0; - - w1ptr = win1->_line[line]; - w2ptr = win2->_line[line]; - fc = _NO_CHANGE; - - for (col = 0; col <= last_col; col++) { - if ((*w1ptr & CHR_MSK) != (*w2ptr & CHR_MSK)) { - *w2ptr = (*w1ptr & CHR_MSK) | attrs; - - if (fc == _NO_CHANGE) fc = col; - lc = col; - } - w1ptr++; - w2ptr++; - } /* for */ - - if (*minchng == _NO_CHANGE) { - *minchng = fc; - *maxchng = lc; - } else if (fc != _NO_CHANGE) { - if (fc < *minchng) *minchng = fc; - if (lc > *maxchng) *maxchng = lc; - } - minchng++; - maxchng++; - } -} Index: trunk/minix/lib/curses/prntscan.c =================================================================== --- trunk/minix/lib/curses/prntscan.c (revision 9) +++ (revision ) @@ -1,129 +1,0 @@ -#include -#include -#include "curspriv.h" - -static char printscanbuf[513]; /* buffer used during I/O */ - -/****************************************************************/ -/* Wprintw(win,fmt,args) does a printf() in window 'win'. */ -/****************************************************************/ -int wprintw(WINDOW *win, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - vsprintf(printscanbuf, fmt, args); - if (waddstr(win, printscanbuf) == ERR) return(ERR); - return(strlen(printscanbuf)); -} - -/****************************************************************/ -/* Printw(fmt,args) does a printf() in stdscr. */ -/****************************************************************/ -int printw(const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - vsprintf(printscanbuf, fmt, args); - if (waddstr(stdscr, printscanbuf) == ERR) return(ERR); - return(strlen(printscanbuf)); -} /* printw */ - -/****************************************************************/ -/* Mvprintw(fmt,args) moves the stdscr cursor to a new posi- */ -/* tion, then does a printf() in stdscr. */ -/****************************************************************/ -int mvprintw(int y, int x, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - if (wmove(stdscr, y, x) == ERR) return(ERR); - vsprintf(printscanbuf, fmt, args); - if (waddstr(stdscr, printscanbuf) == ERR) return(ERR); - return(strlen(printscanbuf)); -} - -/****************************************************************/ -/* Mvwprintw(win,fmt,args) moves the window 'win's cursor to */ -/* A new position, then does a printf() in window 'win'. */ -/****************************************************************/ -int mvwprintw(WINDOW *win, int y, int x, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - if (wmove(win, y, x) == ERR) return(ERR); - vsprintf(printscanbuf, fmt, args); - if (waddstr(win, printscanbuf) == ERR) return(ERR); - return(strlen(printscanbuf)); -} /* mvwprintw */ - -/****************************************************************/ -/* Wscanw(win,fmt,args) gets a string via window 'win', then */ -/* Scans the string using format 'fmt' to extract the values */ -/* And put them in the variables pointed to the arguments. */ -/****************************************************************/ -int wscanw(WINDOW *win, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - wrefresh(win); /* set cursor */ - if (wgetstr(win, printscanbuf) == ERR) /* get string */ - return(ERR); - return(vsscanf(printscanbuf, fmt, args)); -} /* wscanw */ - -/****************************************************************/ -/* Scanw(fmt,args) gets a string via stdscr, then scans the */ -/* String using format 'fmt' to extract the values and put them */ -/* In the variables pointed to the arguments. */ -/****************************************************************/ -int scanw(const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - wrefresh(stdscr); /* set cursor */ - if (wgetstr(stdscr, printscanbuf) == ERR) /* get string */ - return(ERR); - return(vsscanf(printscanbuf, fmt, args)); -} /* scanw */ - -/****************************************************************/ -/* Mvscanw(y,x,fmt,args) moves stdscr's cursor to a new posi- */ -/* Tion, then gets a string via stdscr and scans the string */ -/* Using format 'fmt' to extract the values and put them in the */ -/* Variables pointed to the arguments. */ -/****************************************************************/ -int mvscanw(int y, int x, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - if (wmove(stdscr, y, x) == ERR) return(ERR); - wrefresh(stdscr); /* set cursor */ - if (wgetstr(stdscr, printscanbuf) == ERR) /* get string */ - return(ERR); - return(vsscanf(printscanbuf, fmt, args)); -} /* mvscanw */ - -/****************************************************************/ -/* Mvwscanw(win,y,x,fmt,args) moves window 'win's cursor to a */ -/* New position, then gets a string via 'win' and scans the */ -/* String using format 'fmt' to extract the values and put them */ -/* In the variables pointed to the arguments. */ -/****************************************************************/ -int mvwscanw(WINDOW *win, int y, int x, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - if (wmove(win, y, x) == ERR) return(ERR); - wrefresh(win); /* set cursor */ - if (wgetstr(win, printscanbuf) == ERR) /* get string */ - return(ERR); - return(vsscanf(printscanbuf, fmt, args)); -} /* mvwscanw */ Index: trunk/minix/lib/curses/refresh.c =================================================================== --- trunk/minix/lib/curses/refresh.c (revision 9) +++ (revision ) @@ -1,72 +1,0 @@ -/* refresh.c */ - -#include -#include "curspriv.h" - -/* Wrefresh() updates window win's area of the physical screen. */ -void wrefresh(win) -WINDOW *win; -{ - if (win == curscr) - curscr->_clear = TRUE; - else - wnoutrefresh(win); - doupdate(); -} - -/****************************************************************/ -/* Wnoutrefresh() updates the image of the desired screen, */ -/* Without doing physical update (copies window win's image to */ -/* The _cursvar.tmpwin window, which is hidden from the user). */ -/****************************************************************/ - -void wnoutrefresh(win) -register WINDOW *win; -{ - register int *dst; /* start destination in temp window */ - register int *end; /* end destination in temp window */ - register int *src; /* source in user window */ - register int first; /* first changed char on line */ - register int last; /* last changed char on line */ - WINDOW *nscr; - int begy; /* window's place on screen */ - int begx; - int i; - int j; - - nscr = _cursvar.tmpwin; - begy = win->_begy; - begx = win->_begx; - - for (i = 0, j = begy; i <= win->_maxy; i++, j++) { - if (win->_minchng[i] != _NO_CHANGE) { - first = win->_minchng[i]; - last = win->_maxchng[i]; - dst = &(nscr->_line[j][begx + first]); - end = &(nscr->_line[j][begx + last]); - src = &(win->_line[i][first]); - - while (dst <= end) /* copy user line to temp window */ - *dst++ = *src++; - - first += begx; /* nscr's min/max change positions */ - last += begx; - - if ((nscr->_minchng[j] == _NO_CHANGE) || (nscr->_minchng[j] > first)) - nscr->_minchng[j] = first; - if (last > nscr->_maxchng[j]) nscr->_maxchng[j] = last; - - win->_minchng[i] = _NO_CHANGE; /* updated now */ - } /* if */ - win->_maxchng[i] = _NO_CHANGE; /* updated now */ - } /* for */ - - if (win->_clear) { - win->_clear = FALSE; - nscr->_clear = TRUE; - } /* if */ - if (!win->_leave) { - nscr->_cury = win->_cury + begy; - nscr->_curx = win->_curx + begx; - } /* if */ -} /* wnoutrefresh */ Index: trunk/minix/lib/curses/scrreg.c =================================================================== --- trunk/minix/lib/curses/scrreg.c (revision 9) +++ (revision ) @@ -1,58 +1,0 @@ -/****************************************************************/ -/* Wsetscrreg() routine of the PCcurses package */ -/* */ -/****************************************************************/ -/* This version of curses is based on ncurses, a curses version */ -/* Originally written by Pavel Curtis at Cornell University. */ -/* I have made substantial changes to make it run on IBM PC's, */ -/* And therefore consider myself free to make it public domain. */ -/* Bjorn Larsson (...mcvax!enea!infovax!bl) */ -/****************************************************************/ -/* 1.0: Release: 870515 */ -/****************************************************************/ -/* Modified to run under the MINIX operating system by Don Cope */ -/* These changes are also released into the public domain. */ -/* 900906 */ -/****************************************************************/ - -#include -#include "curspriv.h" - -/****************************************************************/ -/* Wsetscrreg() set the scrolling region of window 'win' to in- */ -/* Clude all lines between 'top' and 'bottom'. */ -/****************************************************************/ - -int wsetscrreg(win, top, bottom) -WINDOW *win; -int top; -int bottom; -{ - if ((0 <= top) && - (top <= win->_cury) - && - (win->_cury <= bottom) - && - (bottom <= win->_maxy) - ) { - win->_regtop = top; - win->_regbottom = bottom; - return(OK); - } - - /* If */ - else - return(ERR); -} /* wsetscrreg */ - -/****************************************************************/ -/* Setscrreg() set the scrolling region of stdscr to include */ -/* All lines between 'top' and 'bottom'. */ -/****************************************************************/ - -int setscrreg(top, bottom) -int top; -int bottom; -{ - return(wsetscrreg(stdscr, top, bottom)); -} /* setscrreg */ Index: trunk/minix/lib/curses/setterm.c =================================================================== --- trunk/minix/lib/curses/setterm.c (revision 9) +++ (revision ) @@ -1,76 +1,0 @@ -#include -#include "curspriv.h" - -_PROTOTYPE( static void ttysetflags, (void) ); - -static void ttysetflags() -{ - _tty.c_iflag |= ICRNL | IXON; - _tty.c_oflag |= OPOST | ONLCR; - _tty.c_lflag |= ECHO | ICANON | IEXTEN | ISIG; - - if (_cursvar.rawmode) { - _tty.c_iflag &= ~(ICRNL | IXON); - _tty.c_oflag &= ~(OPOST); - _tty.c_lflag &= ~(ICANON | IEXTEN | ISIG); - } - if (_cursvar.cbrkmode) { - _tty.c_lflag &= ~(ICANON); - } - if (!_cursvar.echoit) { - _tty.c_lflag &= ~(ECHO | ECHONL); - } - if (NONL) { - _tty.c_iflag &= ~(ICRNL); - _tty.c_oflag &= ~(ONLCR); - } - tcsetattr(0, TCSANOW, &_tty); -} /* ttysetflags */ - -void raw() -{ - _cursvar.rawmode = TRUE; - ttysetflags(); -} /* raw */ - -void noraw() -{ - _cursvar.rawmode = FALSE; - ttysetflags(); -} /* noraw */ - -void echo() -{ - _cursvar.echoit = TRUE; - ttysetflags(); -} - -void noecho() -{ - _cursvar.echoit = FALSE; - ttysetflags(); -} - -void nl() -{ - NONL = FALSE; - ttysetflags(); -} /* nl */ - -void nonl() -{ - NONL = TRUE; - ttysetflags(); -} /* nonl */ - -void cbreak() -{ - _cursvar.cbrkmode = TRUE; - ttysetflags(); -} /* cbreak */ - -void nocbreak() -{ - _cursvar.cbrkmode = FALSE; - ttysetflags(); -} /* nocbreak */ Index: trunk/minix/lib/curses/tabsize.c =================================================================== --- trunk/minix/lib/curses/tabsize.c (revision 9) +++ (revision ) @@ -1,50 +1,0 @@ -/****************************************************************/ -/* Tabsize() routines of the PCcurses package */ -/* */ -/****************************************************************/ -/* This version of curses is based on ncurses, a curses version */ -/* Originally written by Pavel Curtis at Cornell University. */ -/* I have made substantial changes to make it run on IBM PC's, */ -/* And therefore consider myself free to make it public domain. */ -/* Bjorn Larsson (...mcvax!enea!infovax!bl) */ -/****************************************************************/ -/* 1.0: Release: 870515 */ -/****************************************************************/ -/* Modified to run under the MINIX operating system by Don Cope */ -/* These changes are also released into the public domain. */ -/* 900906 */ -/****************************************************************/ - -#include -#include "curspriv.h" - -/****************************************************************/ -/* Wtabsize(win,ts) sets the tabsize of window 'win' to 'ts', */ -/* And returns the original value. */ -/****************************************************************/ - -int wtabsize(win, ts) -WINDOW *win; -int ts; -{ - int origval; - - origval = win->_tabsize; - win->_tabsize = ts; - return(origval); -} /* wtabsize */ - -/****************************************************************/ -/* Tabsize(ts) sets the tabsize of stdscr to 'ts', and returns */ -/* The original value. */ -/****************************************************************/ - -int tabsize(ts) -int ts; -{ - int origval; - - origval = stdscr->_tabsize; - stdscr->_tabsize = ts; - return(origval); -} /* tabsize */ Index: trunk/minix/lib/curses/termmisc.c =================================================================== --- trunk/minix/lib/curses/termmisc.c (revision 9) +++ (revision ) @@ -1,63 +1,0 @@ -#include -#include "curspriv.h" - -/* Static variables or saving terminal modes */ - -int fixterm() -{ - return(OK); -} /* fixterm */ - -int resetterm() -{ - return(OK); -} - -int saveoldterm() -{ - return(OK); -} /* saveoldterm */ - -int saveterm() -{ - return(OK); -} /* saveterm */ - -int baudrate() -{ - return(19200); -} /* baudrate */ - -/****************************************************************/ -/* Erasechar(), killchar() returns std MSDOS erase chars. */ -/****************************************************************/ - -int erasechar() -{ - return(_DCCHAR); /* character delete char */ -} /* erasechar */ - -int killchar() -{ - return(_DLCHAR); /* line delete char */ -} /* killchar */ - -/****************************************************************/ -/* Savetty() and resetty() saves and restores the terminal I/O */ -/* Settings. */ -/****************************************************************/ - -int savetty() -{ - return(OK); -} /* savetty */ - -/****************************************************************/ -/* Setupterm() sets up the terminal. On a PC, it is always suc- */ -/* Cessful, and returns 1. */ -/****************************************************************/ - -int setupterm() -{ - return(1); -} /* setupterm */ Index: trunk/minix/lib/curses/unctrl.c =================================================================== --- trunk/minix/lib/curses/unctrl.c (revision 9) +++ (revision ) @@ -1,45 +1,0 @@ -/****************************************************************/ -/* Unctrl() routines of the PCcurses package */ -/* */ -/****************************************************************/ -/* This version of curses is based on ncurses, a curses version */ -/* Originally written by Pavel Curtis at Cornell University. */ -/* I have made substantial changes to make it run on IBM PC's, */ -/* And therefore consider myself free to make it public domain. */ -/* Bjorn Larsson (...mcvax!enea!infovax!bl) */ -/****************************************************************/ -/* 1.0: Release: 870515 */ -/****************************************************************/ -/* Modified to run under the MINIX operating system by Don Cope */ -/* These changes are also released into the public domain. */ -/* 900906 */ -/****************************************************************/ - -#include -#include "curspriv.h" - -static char strbuf[3] = {0, 0, 0}; - -/****************************************************************/ -/* Unctrl() returns a char pointer to a string corresponding to */ -/* Argument character 'c'. */ -/****************************************************************/ - -char *unctrl(c) -char c; -{ - int ic = c; - ic &= 0xff; - - if ((ic >= ' ') && (ic != 0x7f)) { /* normal characters */ - strbuf[0] = ic; - strbuf[1] = '\0'; - return(strbuf); - } /* if */ - strbuf[0] = '^'; /* '^' prefix */ - if (c == 0x7f) /* DEL */ - strbuf[1] = '?'; - else /* other control */ - strbuf[1] = ic + '@'; - return(strbuf); -} /* unctrl */ Index: trunk/minix/lib/curses/update.c =================================================================== --- trunk/minix/lib/curses/update.c (revision 9) +++ (revision ) @@ -1,173 +1,0 @@ -#include -#include "curspriv.h" -#include - -static WINDOW *twin; /* used by many routines */ - -/****************************************************************/ -/* Gotoxy() moves the physical cursor to the desired address on */ -/* The screen. We don't optimize here - on a PC, it takes more */ -/* Time to optimize than to do things directly. */ -/****************************************************************/ - -_PROTOTYPE(static void gotoxy, (int row, int col )); -_PROTOTYPE(static void newattr, (int ch )); -_PROTOTYPE(static void Putchar, (int ch )); -_PROTOTYPE(static void clrupdate, (WINDOW *scr )); -_PROTOTYPE(static void transformline, (int lineno )); - -static void gotoxy(row, col) -int row, col; -{ - poscur(row, col); - _cursvar.cursrow = row; - _cursvar.curscol = col; -} - -/* Update attributes */ -static void newattr(ch) -int ch; -{ - extern char *me, *as, *ae, *mb, *md, *mr, *so, *us; - static int lastattr = 0; - - if (lastattr != (ch &= ATR_MSK)) { - lastattr = ch; - - tputs(me, 1, outc); - if (ae) tputs(ae, 1, outc); - - if (ch & A_ALTCHARSET) - if (as) tputs(as, 1, outc); - if (ch & A_BLINK) tputs(mb, 1, outc); - if (ch & A_BOLD) tputs(md, 1, outc); - if (ch & A_REVERSE) tputs(mr, 1, outc); - if (ch & A_STANDOUT) tputs(so, 1, outc); - if (ch & A_UNDERLINE) tputs(us, 1, outc); - } -} - -/* Putchar() writes a character, with attributes, to the physical - screen, but avoids writing to the lower right screen position. - Should it care about am? -*/ - -/* Output char with attribute */ -static void Putchar(ch) -int ch; -{ - if ((_cursvar.cursrow < LINES) || (_cursvar.curscol < COLS)) { - newattr(ch); - putchar(ch); - } -} - -/****************************************************************/ -/* Clrupdate(scr) updates the screen by clearing it and then */ -/* Redraw it in it's entirety. */ -/****************************************************************/ - -static void clrupdate(scr) -WINDOW *scr; -{ - register int *src; - register int *dst; - register int i; - register int j; - WINDOW *w; - - w = curscr; - - if (scr != w) { /* copy scr to curscr */ - for (i = 0; i < LINES; i++) { - src = scr->_line[i]; - dst = w->_line[i]; - for (j = 0; j < COLS; j++) *dst++ = *src++; - } /* for */ - } /* if */ - newattr(scr->_attrs); - clrscr(); - scr->_clear = FALSE; - for (i = 0; i < LINES; i++) { /* update physical screen */ - src = w->_line[i]; - j = 0; - while (j < COLS) { - if (*src != (' ' | ATR_NRM)) { - gotoxy(i, j); - while (j < COLS && (*src != (' ' | ATR_NRM))) { - Putchar(*src++); - j++; - } - } else { - src++; - j++; - } - } /* for */ - } /* for */ - fflush(stdout); -} /* clrupdate */ - -/****************************************************************/ -/* Transformline() updates the given physical line to look */ -/* Like the corresponding line in _cursvar.tmpwin. */ -/****************************************************************/ - -static void transformline(lineno) -register int lineno; -{ - register int *dstp; - register int *srcp; - register int dstc; - register int srcc; - int x; - int endx; - - x = twin->_minchng[lineno]; - endx = twin->_maxchng[lineno]; - dstp = curscr->_line[lineno] + x; - srcp = twin->_line[lineno] + x; - - while (x <= endx) { - if ((*dstp != *srcp) || (dstc != srcc)) { - gotoxy(lineno, x); - while (x <= endx && ((*dstp != *srcp) || (dstc != srcc))) { - Putchar(*srcp); - *dstp++ = *srcp++; - x++; - } - } else { - *dstp++ = *srcp++; - x++; - } - } /* for */ - twin->_minchng[lineno] = _NO_CHANGE; - twin->_maxchng[lineno] = _NO_CHANGE; -} /* transformline */ - -/****************************************************************/ -/* Doupdate() updates the physical screen to look like _curs- */ -/* Var.tmpwin if curscr is not 'Clear-marked'. Otherwise it */ -/* Updates the screen to look like curscr. */ -/****************************************************************/ - -void doupdate() -{ - int i; - - twin = _cursvar.tmpwin; - if (curscr->_clear) - clrupdate(curscr); - else { - if (twin->_clear) - clrupdate(twin); - else { - for (i = 0; i < LINES; i++) - if (twin->_minchng[i] != _NO_CHANGE) - transformline(i); - } - } - curscr->_curx = twin->_curx; - curscr->_cury = twin->_cury; - gotoxy(curscr->_cury, curscr->_curx); - fflush(stdout); -} /* doupdate */ Index: trunk/minix/lib/curses/waddch.c =================================================================== --- trunk/minix/lib/curses/waddch.c (revision 9) +++ (revision ) @@ -1,95 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Newline() does line advance and returns the new cursor line. */ -/* If error, return -1. */ -/****************************************************************/ - -_PROTOTYPE( static short newline, (WINDOW *win, int lin)); - -static short newline(win, lin) -WINDOW *win; -int lin; -{ - if (++lin > win->_regbottom) { - lin--; - if (win->_scroll) - scroll(win); - else - return(-1); - } /* if */ - return(lin); -} /* newline */ - -/****************************************************************/ -/* Waddch() inserts character 'c' at the current cursor posi- */ -/* Tion in window 'win', and takes any actions as dictated by */ -/* The character. */ -/****************************************************************/ - -int waddch(win, c) -WINDOW *win; -int c; -{ - int x = win->_curx; - int y = win->_cury; - int newx; - int ch = c; - int ts = win->_tabsize; - - ch &= (A_ALTCHARSET | 0xff); - if (y > win->_maxy || x > win->_maxx || y < 0 || x < 0) return(ERR); - switch (ch) { - case '\t': - for (newx = ((x / ts) + 1) * ts; x < newx; x++) { - if (waddch(win, ' ') == ERR) return(ERR); - if (win->_curx == 0) /* if tab to next line */ - return(OK); /* exit the loop */ - } - return(OK); - - case '\n': - if (NONL) x = 0; - if ((y = newline(win, y)) < 0) return (ERR); - break; - - case '\r': x = 0; break; - - case '\b': - if (--x < 0) /* no back over left margin */ - x = 0; - break; - - case 0x7f: - { - if (waddch(win, '^') == ERR) return(ERR); - return(waddch(win, '?')); - } - - default: - if (ch < ' ') { /* handle control chars */ - if (waddch(win, '^') == ERR) return(ERR); - return(waddch(win, c + '@')); - } - ch |= (win->_attrs & ATR_MSK); - if (win->_line[y][x] != ch) { /* only if data change */ - if (win->_minchng[y] == _NO_CHANGE) - win->_minchng[y] = win->_maxchng[y] = x; - else if (x < win->_minchng[y]) - win->_minchng[y] = x; - else if (x > win->_maxchng[y]) - win->_maxchng[y] = x; - } /* if */ - win->_line[y][x++] = ch; - if (x > win->_maxx) { /* wrap around test */ - x = 0; - if ((y = newline(win, y)) < 0) return(ERR); - } - break; - - } /* switch */ - win->_curx = x; - win->_cury = y; - return(OK); -} Index: trunk/minix/lib/curses/waddstr.c =================================================================== --- trunk/minix/lib/curses/waddstr.c (revision 9) +++ (revision ) @@ -1,18 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Waddstr() inserts string 'str' at the current cursor posi- */ -/* Tion in window 'win', and takes any actions as dictated by */ -/* The characters. */ -/****************************************************************/ - -int waddstr(win, str) -WINDOW *win; -char *str; -{ - while (*str) { - if (waddch(win, *str++) == ERR) return(ERR); - } - return(OK); -} Index: trunk/minix/lib/curses/wbox.c =================================================================== --- trunk/minix/lib/curses/wbox.c (revision 9) +++ (revision ) @@ -1,65 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Wbox(win,ymin,xmin,ymax,xmax,v,h) draws a box in window */ -/* 'win', enclosing the area xmin-xmax and ymin-xmax. If */ -/* Xmax and/or ymax is 0, the window max value is used. 'v' and */ -/* 'h' are the vertical and horizontal characters to use. If */ -/* 'v' and 'h' are 0, wbox will use the alternate character set */ -/* In a pretty way. */ -/****************************************************************/ - -int wbox(win, ymin, xmin, ymax, xmax, v, h) -WINDOW *win; -int ymin, xmin, ymax, xmax; -unsigned int v; -unsigned int h; -{ - unsigned int vc, hc, ulc, urc, llc, lrc; /* corner chars */ - int i; - - if (ymax == 0) ymax = win->_maxy; - if (xmax == 0) xmax = win->_maxx; - - if (ymin >= win->_maxy || ymax > win->_maxy || - xmin >= win->_maxx || xmax > win->_maxx || - ymin >= ymax || xmin >= xmax) - return(ERR); - - vc = v; - hc = h; - ulc = urc = llc = lrc = vc; /* default same as vertical */ - - if (v == 0 && h == 0) { - ulc = ACS_ULCORNER; - urc = ACS_URCORNER; - llc = ACS_LLCORNER; - lrc = ACS_LRCORNER; - hc = ACS_HLINE; - vc = ACS_VLINE; - } - for (i = xmin + 1; i <= xmax - 1; i++) { - win->_line[ymin][i] = hc | win->_attrs; - win->_line[ymax][i] = hc | win->_attrs; - } - for (i = ymin + 1; i <= ymax - 1; i++) { - win->_line[i][xmin] = vc | win->_attrs; - win->_line[i][xmax] = vc | win->_attrs; - } - win->_line[ymin][xmin] = ulc | win->_attrs; - win->_line[ymin][xmax] = urc | win->_attrs; - win->_line[ymax][xmin] = llc | win->_attrs; - win->_line[ymax][xmax] = lrc | win->_attrs; - - for (i = ymin; i <= ymax; i++) { - if (win->_minchng[i] == _NO_CHANGE) { - win->_minchng[i] = xmin; - win->_maxchng[i] = xmax; - } else { - win->_minchng[i] = min(win->_minchng[i], xmin); - win->_maxchng[i] = max(win->_maxchng[i], xmax); - } - } - return(OK); -} Index: trunk/minix/lib/curses/wclear.c =================================================================== --- trunk/minix/lib/curses/wclear.c (revision 9) +++ (revision ) @@ -1,14 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Wclear() fills all lines of window 'win' with blanks, and */ -/* Marks the window to be cleared at next refresh operation. */ -/****************************************************************/ - -void wclear(win) -WINDOW *win; -{ - werase(win); - win->_clear = TRUE; -} /* wclear */ Index: trunk/minix/lib/curses/wclrtobot.c =================================================================== --- trunk/minix/lib/curses/wclrtobot.c (revision 9) +++ (revision ) @@ -1,35 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Wclrtobot() fills the right half of the cursor line of */ -/* Window 'win', and all lines below it with blanks. */ -/****************************************************************/ - -int wclrtobot(win) -WINDOW *win; -{ - int y, minx, startx, *ptr, *end, *maxx, blank; - - blank = ' ' | (win->_attrs & ATR_MSK); - startx = win->_curx; - for (y = win->_cury; y <= win->_regbottom; y++) { - minx = _NO_CHANGE; - end = &win->_line[y][win->_maxx]; - for (ptr = &win->_line[y][startx]; ptr <= end; ptr++) { - if (*ptr != blank) { - maxx = ptr; - if (minx == _NO_CHANGE) minx = ptr - win->_line[y]; - *ptr = blank; - } /* if */ - } /* for */ - if (minx != _NO_CHANGE) { - if ((win->_minchng[y] > minx) || (win->_minchng[y] == _NO_CHANGE)) - win->_minchng[y] = minx; - if (win->_maxchng[y] < maxx - win->_line[y]) - win->_maxchng[y] = maxx - win->_line[y]; - } /* if */ - startx = 0; - } - return(OK); -} Index: trunk/minix/lib/curses/wclrtoeol.c =================================================================== --- trunk/minix/lib/curses/wclrtoeol.c (revision 9) +++ (revision ) @@ -1,36 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Wclrtoeol() fills the half of the cursor line to the right */ -/* Of the cursor in window 'win' with blanks. */ -/****************************************************************/ - -int wclrtoeol(win) -WINDOW *win; -{ - int *maxx, *ptr, *end, y, x, minx, blank; - - y = win->_cury; - x = win->_curx; - blank = ' ' | (win->_attrs & ATR_MSK); - - end = &win->_line[y][win->_maxx]; - minx = _NO_CHANGE; - maxx = &win->_line[y][x]; - for (ptr = maxx; ptr <= end; ptr++) { - if (*ptr != blank) { - maxx = ptr; - if (minx == _NO_CHANGE) minx = ptr - win->_line[y]; - *ptr = blank; - } /* if */ - } /* for */ - - if (minx != _NO_CHANGE) { - if (win->_minchng[y] > minx || win->_minchng[y] == _NO_CHANGE) - win->_minchng[y] = minx; - if (win->_maxchng[y] < maxx - win->_line[y]) - win->_maxchng[y] = maxx - win->_line[y]; - } - return(OK); -} Index: trunk/minix/lib/curses/wdelch.c =================================================================== --- trunk/minix/lib/curses/wdelch.c (revision 9) +++ (revision ) @@ -1,28 +1,0 @@ -#include -#include "curspriv.h" - -/* Wdelch() deletes the character at the window cursor, and the - characters to the right of it are shifted left, inserting a - space at the last position of the line. -*/ - -int wdelch(win) -WINDOW *win; -{ - int *temp1; - int *temp2; - int *end; - int y = win->_cury; - int x = win->_curx; - int maxx = win->_maxx; - - end = &win->_line[y][maxx]; - temp1 = &win->_line[y][x]; - temp2 = temp1 + 1; - while (temp1 < end) *temp1++ = *temp2++; - *temp1 = ' ' | (win->_attrs & ATR_MSK); - win->_maxchng[y] = maxx; - if (win->_minchng[y] == _NO_CHANGE || win->_minchng[y] > x) - win->_minchng[y] = x; - return(OK); -} Index: trunk/minix/lib/curses/wdeleteln.c =================================================================== --- trunk/minix/lib/curses/wdeleteln.c (revision 9) +++ (revision ) @@ -1,28 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Wdeleteln() deletes the line at the window cursor, and the */ -/* Lines below it are shifted up, inserting a blank line at */ -/* The bottom of the window. */ -/****************************************************************/ - -int wdeleteln(win) -WINDOW *win; -{ - int *end, *temp, y, blank; - - blank = ' ' | (win->_attrs & ATR_MSK); - - temp = win->_line[win->_cury]; - for (y = win->_cury; y < win->_regbottom; y++) { - win->_line[y] = win->_line[y + 1]; - win->_minchng[y] = 0; - win->_maxchng[y] = win->_maxx; - } - win->_minchng[y] = 0; - win->_maxchng[y] = win->_maxx; - win->_line[win->_regbottom] = temp; - for (end = &(temp[win->_maxx]); temp <= end;) *temp++ = blank; - return(OK); -} Index: trunk/minix/lib/curses/werase.c =================================================================== --- trunk/minix/lib/curses/werase.c (revision 9) +++ (revision ) @@ -1,26 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Werase() fills all lines of window 'win' with blanks and po- */ -/* Sitions the cursor at home in the scroll region. */ -/****************************************************************/ - -void werase(win) -WINDOW *win; -{ - int *end, *start, y, blank; - - blank = ' ' | (win->_attrs & ATR_MSK); - - for (y = win->_regtop; y <= win->_regbottom; y++) { /* clear all lines */ - start = win->_line[y]; - end = &start[win->_maxx]; - while (start <= end) /* clear all line */ - *start++ = blank; - win->_minchng[y] = 0; - win->_maxchng[y] = win->_maxx; - } - win->_cury = win->_regtop; /* cursor home */ - win->_curx = 0; -} Index: trunk/minix/lib/curses/wgetch.c =================================================================== --- trunk/minix/lib/curses/wgetch.c (revision 9) +++ (revision ) @@ -1,26 +1,0 @@ -#include -#include -#include "curspriv.h" - -int wgetch(win) -WINDOW *win; -{ - bool weset = FALSE; - char inp; - - if (!win->_scroll && (win->_flags & _FULLWIN) - && win->_curx == win->_maxx - 1 && win->_cury == win->_maxy - 1) - return ERR; - if (_cursvar.echoit && !_cursvar.rawmode) { - cbreak(); - weset++; - } - inp = getchar(); - if (_cursvar.echoit) { - mvwaddch(curscr, win->_cury + win->_begy, - win->_curx + win->_begx, inp); - waddch(win, inp); - } - if (weset) nocbreak(); - return inp; -} Index: trunk/minix/lib/curses/wgetstr.c =================================================================== --- trunk/minix/lib/curses/wgetstr.c (revision 9) +++ (revision ) @@ -1,22 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Wgetstr(win,str) reads in a string (terminated by \n or \r) */ -/* To the buffer pointed to by 'str', and displays the input */ -/* In window 'win'. The user's erase and kill characters are */ -/* Active. */ -/****************************************************************/ - -int wgetstr(win, str) -WINDOW *win; -char *str; -{ - while ((*str = wgetch(win)) != ERR && *str != '\n') str++; - if (*str == ERR) { - *str = '\0'; - return ERR; - } - *str = '\0'; - return OK; -} Index: trunk/minix/lib/curses/windel.c =================================================================== --- trunk/minix/lib/curses/windel.c (revision 9) +++ (revision ) @@ -1,41 +1,0 @@ -/****************************************************************/ -/* Delwin() routine of the PCcurses package. */ -/* */ -/****************************************************************/ -/* This version of curses is based on ncurses, a curses version */ -/* Originally written by Pavel Curtis at Cornell University. */ -/* I have made substantial changes to make it run on IBM PC's, */ -/* And therefore consider myself free to make it public domain. */ -/* Bjorn Larsson (...mcvax!enea!infovax!bl) */ -/****************************************************************/ -/* 1.0: Release: 870515 */ -/****************************************************************/ -/* Modified to run under the MINIX operating system by Don Cope */ -/* These changes are also released into the public domain. */ -/* 900906 */ -/****************************************************************/ - -#include -#include -#include "curspriv.h" - -/****************************************************************/ -/* Delwin() deallocates all data allocated by 'win'. If 'win' */ -/* Is a subwindow, it uses the original window's lines for sto- */ -/* Rage, and thus the line arrays are not deallocated. */ -/****************************************************************/ - -void delwin(win) -WINDOW *win; -{ - int i; - - if (!(win->_flags & _SUBWIN)) { /* subwindow uses 'parent's' lines */ - for (i = 0; i <= win->_maxy && win->_line[i]; i++) - free(win->_line[i]); - } - free(win->_minchng); - free(win->_maxchng); - free(win->_line); - free(win); -} /* delwin */ Index: trunk/minix/lib/curses/winmove.c =================================================================== --- trunk/minix/lib/curses/winmove.c (revision 9) +++ (revision ) @@ -1,36 +1,0 @@ -/****************************************************************/ -/* Mvwin() routine of the PCcurses package */ -/* */ -/****************************************************************/ -/* This version of curses is based on ncurses, a curses version */ -/* Originally written by Pavel Curtis at Cornell University. */ -/* I have made substantial changes to make it run on IBM PC's, */ -/* And therefore consider myself free to make it public domain. */ -/* Bjorn Larsson (...mcvax!enea!infovax!bl) */ -/****************************************************************/ -/* 1.0: Release: 870515 */ -/****************************************************************/ -/* Modified to run under the MINIX operating system by Don Cope */ -/* These changes are also released into the public domain. */ -/* 900906 */ -/****************************************************************/ - -#include -#include "curspriv.h" - -/****************************************************************/ -/* Mvwin() moves window 'win' to position (begx, begy) on the */ -/* Screen. */ -/****************************************************************/ - -int mvwin(win, begy, begx) -WINDOW *win; -int begy, begx; -{ - if ((begy + win->_maxy) > (LINES - 1) || (begx + win->_maxx) > (COLS - 1)) - return(ERR); - win->_begy = begy; - win->_begx = begx; - touchwin(win); - return(OK); -} /* mvwin */ Index: trunk/minix/lib/curses/winsch.c =================================================================== --- trunk/minix/lib/curses/winsch.c (revision 9) +++ (revision ) @@ -1,31 +1,0 @@ -#include -#include "curspriv.h" - -/* Winsch() inserts character 'c' at the cursor position in - window 'win'. The cursor is advanced. -*/ - -int winsch(win, c) -WINDOW *win; -char c; -{ - int *temp1; - int *temp2; - int *end; - int x = win->_curx; - int y = win->_cury; - int maxx = win->_maxx; - - if ((c < ' ') && (c == '\n' || c == '\r' || c == '\t' || c == '\b')) - return(waddch(win, c)); - end = &win->_line[y][x]; - temp1 = &win->_line[y][maxx]; - temp2 = temp1 - 1; - if (c < ' ') /* if CTRL-char make space for 2 */ - temp2--; - while (temp1 > end) *temp1-- = *temp2--; - win->_maxchng[y] = maxx; - if ((win->_minchng[y] == _NO_CHANGE) || (win->_minchng[y] > x)) - win->_minchng[y] = x; - return(waddch(win, c)); /* fixes CTRL-chars too */ -} /* winsch */ Index: trunk/minix/lib/curses/winscrol.c =================================================================== --- trunk/minix/lib/curses/winscrol.c (revision 9) +++ (revision ) @@ -1,55 +1,0 @@ -/****************************************************************/ -/* Scroll() routine of the PCcurses package */ -/* */ -/****************************************************************/ -/* This version of curses is based on ncurses, a curses version */ -/* Originally written by Pavel Curtis at Cornell University. */ -/* I have made substantial changes to make it run on IBM PC's, */ -/* And therefore consider myself free to make it public domain. */ -/* Bjorn Larsson (...mcvax!enea!infovax!bl) */ -/****************************************************************/ -/* 1.0: Release: 870515 */ -/****************************************************************/ -/* Modified to run under the MINIX operating system by Don Cope */ -/* These changes are also released into the public domain. */ -/* 900906 */ -/****************************************************************/ - -#include -#include "curspriv.h" - -/****************************************************************/ -/* Scroll() scrolls the scrolling region of 'win', but only if */ -/* Scrolling is allowed and if the cursor is inside the scrol- */ -/* Ling region. */ -/****************************************************************/ - -void scroll(win) -WINDOW *win; -{ - int i; - int *ptr; - int *temp; - static int blank; - - blank = ' ' | (win->_attrs & ATR_MSK); - if ((!win->_scroll) /* check if window scrolls */ - ||(win->_cury < win->_regtop) /* and cursor in region */ - ||(win->_cury > win->_regbottom) - ) - return; - - temp = win->_line[win->_regtop]; - for (i = win->_regtop; i < win->_regbottom; i++) { - win->_line[i] = win->_line[i + 1]; /* re-arrange line pointers */ - win->_minchng[i] = 0; - win->_maxchng[i] = win->_maxx; - } - for (ptr = temp; ptr - temp <= win->_maxx; ptr++) - *ptr = blank; /* make a blank line */ - win->_line[win->_regbottom] = temp; - if (win->_cury > win->_regtop)/* if not on top line */ - win->_cury--; /* cursor scrolls too */ - win->_minchng[win->_regbottom] = 0; - win->_maxchng[win->_regbottom] = win->_maxx; -} /* scroll */ Index: trunk/minix/lib/curses/winsertln.c =================================================================== --- trunk/minix/lib/curses/winsertln.c (revision 9) +++ (revision ) @@ -1,26 +1,0 @@ -#include -#include "curspriv.h" - -/****************************************************************/ -/* Winsertln() inserts a blank line instead of the cursor line */ -/* In window 'win' and pushes other lines down. */ -/****************************************************************/ - -int winsertln(win) -WINDOW *win; -{ - int *temp, *end, y, blank; - - blank = ' ' | (win->_attrs & ATR_MSK); - temp = win->_line[win->_regbottom]; - for (y = win->_regbottom; y > win->_cury; y--) { - win->_line[y] = win->_line[y - 1]; - win->_minchng[y] = 0; - win->_maxchng[y] = win->_maxx; - } - win->_line[win->_cury] = temp; - for (end = &temp[win->_maxx]; temp <= end; temp++) *temp = blank; - win->_minchng[win->_cury] = 0; - win->_maxchng[win->_cury] = win->_maxx; - return(OK); -} Index: trunk/minix/lib/curses/wintouch.c =================================================================== --- trunk/minix/lib/curses/wintouch.c (revision 9) +++ (revision ) @@ -1,40 +1,0 @@ -/****************************************************************/ -/* Touchwin() routine of the PCcurses package */ -/* */ -/****************************************************************/ -/* This version of curses is based on ncurses, a curses version */ -/* Originally written by Pavel Curtis at Cornell University. */ -/* I have made substantial changes to make it run on IBM PC's, */ -/* And therefore consider myself free to make it public domain. */ -/* Bjorn Larsson (...mcvax!enea!infovax!bl) */ -/****************************************************************/ -/* 1.0: Release: 870515 */ -/****************************************************************/ -/* Modified to run under the MINIX operating system by Don Cope */ -/* These changes are also released into the public domain. */ -/* 900906 */ -/****************************************************************/ - -#include -#include "curspriv.h" - -/****************************************************************/ -/* Touchwin() marks all lines of window 'win' as changed, from */ -/* The first to the last character on the line. */ -/****************************************************************/ - -void touchwin(win) -WINDOW *win; -{ - int y; - int maxy; - int maxx; - - maxy = win->_maxy; - maxx = win->_maxx; - - for (y = 0; y <= maxy; y++) { - win->_minchng[y] = 0; - win->_maxchng[y] = maxx; - } /* for */ -} /* touchwin */