From 6d3a7cbc3497a14a7543706bc225fb7f55ca321f Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 4 May 2008 18:51:42 +0000 Subject: [PATCH] * some minor cleanup + removal of possibly non endian safe formal param getyx functions from ncurses, closes 11012 git-svn-id: trunk@10883 - --- packages/ncurses/Makefile | 174 +++++++++++++++++++---------- packages/ncurses/src/form.pp | 46 -------- packages/ncurses/src/ncurses.pp | 192 +++++++++++++++++--------------- packages/ncurses/src/panel.pp | 11 -- 4 files changed, 219 insertions(+), 204 deletions(-) diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile index e71fe8ba5a..913d1fe3f8 100644 --- a/packages/ncurses/Makefile +++ b/packages/ncurses/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/03/20] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/05/04] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -167,6 +167,17 @@ OS_TARGET:=$(word 5,$(FPC_COMPILERINFO)) endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) +ifeq ($(CPU_TARGET),armeb) +ARCH=arm +override FPCOPT+=-Cb +else +ifeq ($(CPU_TARGET),armel) +ARCH=arm +override FPCOPT+=-CaEABI +else +ARCH=$(CPU_TARGET) +endif +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -188,7 +199,7 @@ endif ifeq ($(OS_TARGET),linux) linuxHier=1 endif -export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE +export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) @@ -377,6 +388,9 @@ endif ifeq ($(FULL_TARGET),arm-palmos) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_UNITS+=ncurses panel ncrt ocrt menu form +endif ifeq ($(FULL_TARGET),arm-wince) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif @@ -404,167 +418,182 @@ endif ifeq ($(FULL_TARGET),avr-embedded) override TARGET_UNITS+=ncurses panel ncrt ocrt menu form endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_UNITS+=ncurses panel ncrt ocrt menu form +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_UNITS+=ncurses panel ncrt ocrt menu form +endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow +endif +ifeq ($(FULL_TARGET),arm-darwin) +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow +endif +ifeq ($(FULL_TARGET),armeb-linux) +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override TARGET_EXAMPLES+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -702,6 +731,9 @@ endif ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_INCLUDEDIR+=src endif @@ -729,6 +761,12 @@ endif ifeq ($(FULL_TARGET),avr-embedded) override COMPILER_INCLUDEDIR+=src endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_INCLUDEDIR+=src +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests examples endif @@ -864,6 +902,9 @@ endif ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),arm-darwin) +override COMPILER_SOURCEDIR+=src tests examples +endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_SOURCEDIR+=src tests examples endif @@ -891,6 +932,12 @@ endif ifeq ($(FULL_TARGET),avr-embedded) override COMPILER_SOURCEDIR+=src tests examples endif +ifeq ($(FULL_TARGET),armeb-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),armeb-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1805,6 +1852,9 @@ endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),arm-darwin) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -1832,6 +1882,12 @@ endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),armeb-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),armeb-embedded) +REQUIRE_PACKAGES_RTL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1859,13 +1915,13 @@ override COMPILER_UNITDIR+=$(UNITDIR_RTL) endif endif ifndef NOCPUDEF -override FPCOPTDEF=$(CPU_TARGET) +override FPCOPTDEF=$(ARCH) endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif ifneq ($(CPU_TARGET),$(CPU_SOURCE)) -override FPCOPT+=-P$(CPU_TARGET) +override FPCOPT+=-P$(ARCH) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) diff --git a/packages/ncurses/src/form.pp b/packages/ncurses/src/form.pp index a7992da796..a930b75ada 100644 --- a/packages/ncurses/src/form.pp +++ b/packages/ncurses/src/form.pp @@ -12,16 +12,12 @@ const {$PACKRECORDS C} {$INCLUDE eti.inc} - type - //Pva_list = ^va_list; - //va_list = char; Pva_list = Pointer; FIELD_CELL = Pointer; Form_Options = Longint; Field_Options = Longint; - (* _PAGE *) _PAGE = record @@ -31,8 +27,6 @@ type smax : Smallint; { index of bottom rightmost field on page } end; - - (* FIELD *) PPFIELD = ^PFIELD; @@ -77,8 +71,6 @@ type opaque for that reason. } - - (* FIELDTYPE *) TFieldCheck = function (_para1:PFIELD; _para2:Pointer):Bool; cdecl; @@ -92,23 +84,14 @@ type ref : clong; { reference count } left : PFIELDTYPE; { ptr to operand for | } right : PFIELDTYPE; { ptr to operand for | } - //makearg : function (_para1:Pva_list):Pointer;cdecl; makearg : TMakearg; { make fieldtype arg } - //copyarg : function (_para1:Pointer):Pointer; copyarg : TCopy_arg; { copy fieldtype arg } - //freearg : procedure (_para1:Pointer); freearg : TFree_arg; { field validation } - //fcheck : function (_para1:PFIELD; _para2:Pointer):bool; fcheck : TFieldCheck; { free fieldtype arg } - //ccheck : function (_para1:Longint; _para2:Pointer):bool; ccheck : TCharCheck; { character validation } - //next : function (_para1:PFIELD; _para2:Pointer):bool; next : TFieldCheck; { enumerate next value } - //prev : function (_para1:PFIELD; _para2:Pointer):bool; prev : TFieldCheck; { enumerate prev value } end; - //typenode = FIELDTYPE; - (* FORM *) @@ -132,18 +115,11 @@ type current : PFIELD; { current field } page : ^_PAGE; { page [maxpage] } usrptr : Pointer; { user pointer } - //forminit : procedure (_para1:PFORM); cdecl; forminit : Form_Hook; - //formterm : procedure (_para1:PFORM); cdecl; formterm : Form_Hook; - //fieldinit : procedure (_para1:PFORM); cdecl; fieldinit : Form_Hook; - //fieldterm : procedure (_para1:PFORM); cdecl; fieldterm : Form_Hook; end; - //formnode = TFORM; - - (* field justification *) const @@ -152,7 +128,6 @@ const JUSTIFY_CENTER = 2; JUSTIFY_RIGHT = 3; - (* field options *) O_VISIBLE = $0001; O_ACTIVE = $0002; @@ -167,7 +142,6 @@ const O_NL_OVERLOAD = $0001; O_BS_OVERLOAD = $0002; - (* form driver commands *) REQ_NEXT_PAGE = KEY_MAX + 1; { move to next page } REQ_PREV_PAGE = KEY_MAX + 2; { move to previous page } @@ -229,7 +203,6 @@ const MIN_FORM_COMMAND = KEY_MAX + 1; { used by form_driver } MAX_FORM_COMMAND = KEY_MAX + 57; { used by form_driver } - (* standard field types *) var @@ -269,12 +242,6 @@ var {$endif darwin} (* FIELDTYPE routines *) -(* Const before declarator ignored *) -(* Const before type ignored *) -{ -function new_fieldtype(field_check:function (_para1:PFIELD;_para2:Pointer):bool; char_check:function (_para1:Longint;_para2:Pointer):bool):PFIELDTYPE;cdecl;external; -} - function new_fieldtype(field_check: TFieldCheck; char_check:TCharCheck):PFIELDTYPE; cdecl;external libform; function link_fieldtype(_para1:PFIELDTYPE; _para2:PFIELDTYPE):PFIELDTYPE; cdecl;external libform; @@ -290,22 +257,9 @@ function set_fieldtype_arg(_para1:PFIELDTYPE; make_arg:function (_para1:Pva_list } function set_fieldtype_arg(fieldtype: PFIELDTYPE; make_arg: TMakearg; copy_arg: TCopy_arg; free_arg: TFree_arg): Longint;cdecl;external libform; -{ -extern int set_fieldtype_choice (FIELDTYPE *, - bool (* const next_choice)(FIELD *,const void *), - bool (* const prev_choice)(FIELD *,const void *)); - -(* Const before declarator ignored *) -(* Const before type ignored *) -(* Const before declarator ignored *) -(* Const before type ignored *) -function set_fieldtype_choice(_para1:PFIELDTYPE; next_choice:function (_para1:PFIELD; _para2:Pointer):bool; prev_choice:function (_para1:PFIELD; _para2:Pointer):bool):Longint;cdecl;external; -} - function set_fieldtype_choice(_para1:PFIELDTYPE; next_choice:TFieldCheck; prev_choice:TFieldCheck):Longint; cdecl;external libform; (* FIELD routines *) - function new_field(_pa1,_pa2,_pa3,_pa4,_pa5,_pa6:Longint):PFIELD; cdecl;external libform; function dup_field(_para1:PFIELD; _para2:Longint; _para3:Longint):PFIELD; cdecl;external libform; function link_field(_para1:PFIELD; _para2:Longint; _para3:Longint):PFIELD; cdecl;external libform; diff --git a/packages/ncurses/src/ncurses.pp b/packages/ncurses/src/ncurses.pp index c393ae94c4..82febe486e 100644 --- a/packages/ncurses/src/ncurses.pp +++ b/packages/ncurses/src/ncurses.pp @@ -4,10 +4,9 @@ unit ncurses; interface - {$PACKRECORDS C} {$LINKLIB ncursesw} -{$LINKLIB c} +{$LINKLIB c} // should be uses initc ? {$DEFINE USE_FPC_BYTEBOOL} @@ -22,9 +21,7 @@ type Bool = Byte; {$ENDIF USE_FPC_BYTEBOOL} - type - //cint = Longint; wchar_t = Widechar; pwchar_t = ^wchar_t; @@ -44,18 +41,13 @@ const NCURSES_VERSION = '5.6'; NCURSES_MOUSE_VERSION = 1; - type pchtype = ^chtype; - //chtype = Longword; - chtype = Longint; + chtype = Longint; {longword} pmmask_t = ^mmask_t; - //mmask_t = Longword; - mmask_t = Longint; - + mmask_t = Longint; {longword} { colors } - var {$IFNDEF darwin} COLORS : Longint cvar; external; @@ -65,7 +57,6 @@ var COLOR_PAIRS : Longint external libncurses name 'COLOR_PAIRS'; {$ENDIF darwin} - const COLOR_BLACK = 0; COLOR_RED = 1; @@ -76,7 +67,6 @@ const COLOR_CYAN = 6; COLOR_WHITE = 7; - type pNC_FPC_COLOR = ^NC_FPC_COLOR; NC_FPC_COLOR = Smallint; @@ -93,7 +83,6 @@ var acs_map : tacs_map external libncurses name 'acs_map'; {$ENDIF darwin} - //function NCURSES_ACS(c : Longint) : Longint; (* VT100 symbols begin here *) function ACS_ULCORNER : chtype; inline; { upper left corner } @@ -159,7 +148,7 @@ property ACS_SSSS : chtype read ACS_PLUS; const ERR = -(1); OK = 0; - _SUBWIN = $01; { is this a sub-window? } + _SUBWIN = $01; { is this a sub-window? } _ENDLINE = $02; { is the window flush right? } _FULLWIN = $04; { is the window full-screen? } _SCROLLWIN = $08; { bottom edge is at screen bottom? } @@ -265,7 +254,6 @@ type ESCDELAY: Longint external libncurses name 'ESCDELAY'; {$ENDIF darwin} - (* * These functions are extensions - not in XSI Curses. *) @@ -365,7 +353,11 @@ function raw:Longint; cdecl;external libncurses; function resetty:Longint; cdecl;external libncurses; function reset_prog_mode:Longint; cdecl;external libncurses; function reset_shell_mode:Longint; cdecl;external libncurses; -{function ripoffline(_para1:Longint; _para2:function (_para1:PWINDOW; _para2:Longint):Longint):Longint; cdecl;external libncurses;}// ->??? + +type TWinInit = function (win: PWINDOW; ncols: Longint): Longint; cdecl; + +function ripoffline(line: Longint; init: TWinInit):Longint; cdecl;external libncurses; + function savetty:Longint; cdecl;external libncurses; function scr_dump(_para1:PChar):Longint; cdecl;external libncurses; function scr_init(_para1:PChar):Longint; cdecl;external libncurses; @@ -439,7 +431,6 @@ procedure wtimeout(_para1:PWINDOW; _para2:Longint);cdecl;external libncurses; function wtouchln(_para1:PWINDOW; _para2:Longint; _para3:Longint; _para4:Longint):Longint; cdecl;external libncurses; function wvline(_para1:PWINDOW; _para2:chtype; _para3:Longint):Longint; cdecl;external libncurses; - (* * These are also declared in : *) @@ -449,7 +440,6 @@ function tigetnum(_para1:PChar):Longint; cdecl;external libncurses; function tigetstr(_para1:PChar):PChar;cdecl;external libncurses; function putp(_para1:PChar):Longint; cdecl;external libncurses; - var {$IFNDEF darwin} ttytype : array of PChar cvar; external; { needed for backward compatibility } @@ -457,8 +447,6 @@ var ttytype : array of PChar external libncurses name 'ttytype'; {$ENDIF darwin} - - (* * Function prototypes for wide-character operations. *) @@ -499,8 +487,6 @@ function winwstr(_para1:PWINDOW; _para2:Pwchar_t):longint; cdecl;external libncu function wunctrl(_para1:Pcchar_t):Pwchar_t;cdecl;external libncurses; function wvline_set(_para1:PWINDOW; _para2:Pcchar_t; _para3:Longint):longint; cdecl;external libncurses; - - const A_NORMAL = 0; A_ATTRIBUTES = (not 0) shl 8; @@ -541,16 +527,10 @@ const WA_TOP = A_TOP; WA_VERTICAL = A_VERTICAL; - - - - function COLOR_PAIR(n: longint): longint; inline; function PAIR_NUMBER(attr: attr_t): longint; inline; function color_set(color_pair_number: Smallint; opts: Pointer): longint; inline; - - (* pseudo functions *) function wgetstr(win: PWINDOW; s: PChar): Longint; @@ -561,11 +541,20 @@ function resetterm: Longint; inline; function saveterm: Longint; inline; function crmode: Longint; inline; function nocrmode: Longint; inline; -procedure getyx (win: PWINDOW; var y,x); inline; -procedure getbegyx(win: PWINDOW; var y,x); inline; -procedure getmaxyx(win: PWINDOW; var y,x); inline; -procedure getparyx(win: PWINDOW; var y,x); inline; -procedure getsyx (var y,x); inline; + +// formal parameter versions not endiansafe? +procedure getyx (win: PWINDOW; var y,x: Smallint); inline; overload; +procedure getbegyx(win: PWINDOW; var y,x: Smallint); inline; overload; +procedure getmaxyx(win: PWINDOW; var y,x: Smallint); inline; overload; +procedure getparyx(win: PWINDOW; var y,x: Smallint); inline; overload; +procedure getsyx (var y,x: Smallint); inline; overload; + +procedure getyx (win: PWINDOW; var y,x: Longint); inline; overload; +procedure getbegyx(win: PWINDOW; var y,x: Longint); inline; overload; +procedure getmaxyx(win: PWINDOW; var y,x: Longint); inline; overload; +procedure getparyx(win: PWINDOW; var y,x: Longint); inline; overload; +procedure getsyx (var y,x: Longint); inline; overload; + procedure setsyx (y,x: Smallint); inline; function getattrs(win: PWINDOW): attr_t; inline; function getcurx(win: PWINDOW): Smallint; inline; @@ -741,7 +730,6 @@ const KEY_F11 = KEY_F0 + 11; KEY_F12 = KEY_F0 + 12; - function KEY_F(n : Byte) : chtype; inline; const @@ -829,7 +817,6 @@ const KEY_EVENT = 411; { We were interrupted by an event &0633 } KEY_MAX = 511; { Maximum key value is 0633 &0777 } - type //tnc_wacs= array [char] of cchar_t; tnc_wacs= array of cchar_t; @@ -893,12 +880,8 @@ property WACS_VLINE : cchar_t read WACS_SBSB; property WACS_PLUS : cchar_t read WACS_SSSS; {$ENDIF FPC_OBJFPC} - (* mouse interface *) - - - (* event masks *) const @@ -938,8 +921,6 @@ const ALL_MOUSE_EVENTS = REPORT_MOUSE_POSITION - 1; - - (* macros to extract single event-bits from masks *) function BUTTON_RELEASE(e,x: longint): longint; inline; @@ -950,8 +931,6 @@ function BUTTON_TRIPLE_CLICK(e,x: longint): longint; inline; function BUTTON_RESERVED_EVENT(e,x: longint): longint; inline; function mouse_trafo(pY,pX: PLongint; to_screen: Bool): Bool; inline; - - type PMEVENT = ^MEVENT; MEVENT = record @@ -960,7 +939,6 @@ type bstate : mmask_t; { button state bits } end; - function getmouse(_para1:PMEVENT):longint; cdecl;external libncurses; function ungetmouse(_para1:PMEVENT):longint; cdecl;external libncurses; function mousemask(_para1:mmask_t; _para2:Pmmask_t):mmask_t;cdecl;external; @@ -968,8 +946,6 @@ function wenclose(_para1:PWINDOW; _para2:Longint; _para3:Longint):Bool;cdecl;ext function mouseinterval(_para1:Longint):longint; cdecl;external libncurses; function wmouse_trafo(_para1:PWINDOW; _para2:PLongint; _para3:PLongint; _para4:Bool):Bool;cdecl;external; - - { wide-character (enhanced) functionality } @@ -1040,7 +1016,6 @@ function mvwins_wstr(win: PWINDOW; y,x: Smallint; wstr: pwchar_t) : longint; inl function mvwinwstr(win: PWINDOW; y,x: Smallint; wstr: pwchar_t) : longint; inline; function mvwvline_set(win: PWINDOW; y,x: Smallint; wch: pcchar_t; n: longint) : longint; inline; - function wmove(win: PWINDOW; y,x: Smallint): Longint; inline; (* C varargs procedures*) @@ -1072,7 +1047,6 @@ function printw(_para1:PChar; args:array of const):Longint; cdecl;external libnc {$ENDIF} - implementation function ACS_ULCORNER : chtype; @@ -1235,8 +1209,6 @@ begin ACS_STERLING:=acs_map['}']; end; - - function COLOR_PAIR(n : longint): longint; begin COLOR_PAIR:=n shl 8; @@ -1253,8 +1225,6 @@ begin color_set:=wcolor_set(stdscr,color_pair_number,opts); end; -(* pseudo functions *) - function wgetstr(win: PWINDOW; s: PChar): Longint; begin wgetstr := wgetnstr(win, s, -1); @@ -1301,80 +1271,131 @@ begin nocrmode:=nocbreak; end; - - - -procedure getyx(win: PWINDOW; var y,x); +procedure getyx(win: PWINDOW; var y,x: Smallint); begin if win<>nil then begin - Smallint(y) :=win^._cury; Smallint(x) :=win^._curx + y := win^._cury; x := win^._curx end else begin - Smallint(y) :=ERR; Smallint(x) :=ERR + y := ERR; x := ERR end end; -procedure getbegyx(win: PWINDOW; var y,x); +procedure getbegyx(win: PWINDOW; var y,x: Smallint); begin if win<>nil then begin - Smallint(y) :=win^._begy; Smallint(x) :=win^._begx + y := win^._begy; x := win^._begx end else begin - Smallint(y) :=ERR; Smallint(x) :=ERR + y := ERR; x := ERR end end; -procedure getmaxyx(win: PWINDOW; var y,x); +procedure getmaxyx(win: PWINDOW; var y,x: Smallint); begin if win<>nil then begin - Smallint(y) :=win^._maxy+1; Smallint(x) :=win^._maxx+1 + y := win^._maxy+1; x := win^._maxx+1 end else begin - Smallint(y) :=ERR; Smallint(x) :=ERR + y := ERR; x := ERR end end; -procedure getparyx(win: PWINDOW; var y,x); +procedure getparyx(win: PWINDOW; var y,x: Smallint); begin -{#define getparyx(win,y,x) (y = getpary(win), x = getparx(win))} if win<>nil then begin - Smallint(y) :=win^._pary; Smallint(x) :=win^._parx + y := win^._pary; x :=win^._parx end else begin - Smallint(y) :=ERR; Smallint(x) :=ERR + y := ERR; x := ERR end end; - - - -procedure getsyx(var y,x); +procedure getsyx(var y,x: Smallint); begin -(* -C macros: -#define getsyx(y,x) do { if(newscr->_leaveok) (y)=(x)=-1; \ - else getyx(newscr,(y),(x)); \ - } while(0) -*) {$IFNDEF USE_FPC_BYTEBOOL} if newscr^._leaveok = NC_FPC_TRUE then {$ELSE USE_FPC_BYTEBOOL} if newscr^._leaveok then {$ENDIF USE_FPC_BYTEBOOL} begin - Smallint(y) := -1; Smallint(x) := -1 + y := -1; x := -1 end else begin - Smallint(y) := newscr^._cury; Smallint(x) := newscr^._curx + y := newscr^._cury; x := newscr^._curx + end +end; + +procedure getyx(win: PWINDOW; var y,x: Longint); +begin + if win<>nil then + begin + y := win^._cury; x := win^._curx + end + else + begin + y := ERR; x := ERR + end +end; + +procedure getbegyx(win: PWINDOW; var y,x: Longint); +begin + if win<>nil then + begin + y := win^._begy; x := win^._begx + end + else + begin + y := ERR; x := ERR + end +end; + +procedure getmaxyx(win: PWINDOW; var y,x: Longint); +begin + if win<>nil then + begin + y := win^._maxy+1; x := win^._maxx+1 + end + else + begin + y := ERR; x := ERR + end +end; + +procedure getparyx(win: PWINDOW; var y,x: Longint); +begin + if win<>nil then + begin + y := win^._pary; x :=win^._parx + end + else + begin + y := ERR; x := ERR + end +end; + +procedure getsyx(var y,x: Longint); +begin +{$IFNDEF USE_FPC_BYTEBOOL} + if newscr^._leaveok = NC_FPC_TRUE then +{$ELSE USE_FPC_BYTEBOOL} + if newscr^._leaveok then +{$ENDIF USE_FPC_BYTEBOOL} + begin + y := -1; x := -1 + end + else + begin + y := newscr^._cury; x := newscr^._curx end end; @@ -1386,7 +1407,7 @@ C macros: else {newscr->_leaveok=FALSE;wmove(newscr,(y),(x));} \ } while(0) *) - if (x OR y >=0)AND(x<=newscr^._maxx)AND(y<=newscr^._maxy) then + if (x>=0) and (y >=0) AND (x<=newscr^._maxx) AND (y<=newscr^._maxy) then begin newscr^._curx := x; newscr^._cury := y; @@ -2780,15 +2801,10 @@ begin end; - - - - - function wmove(win: PWINDOW; y,x: Smallint): Longint; begin //if (win!=nil)AND(x>=0)AND(x<=win^._maxx)AND(y>=0)AND(y<=win^._maxy) then - if (x OR y >=0)AND(x<=win^._maxx)AND(y<=win^._maxy) then + if (x>=0) and ( y>=0)AND(x<=win^._maxx)AND(y<=win^._maxy) then begin win^._curx := x; win^._cury := y; diff --git a/packages/ncurses/src/panel.pp b/packages/ncurses/src/panel.pp index fb0e59a17f..91c7998023 100644 --- a/packages/ncurses/src/panel.pp +++ b/packages/ncurses/src/panel.pp @@ -12,7 +12,6 @@ uses const libpanel = 'panelw'; -(* Const before type ignored *) type PPANEL = ^TPANEL; TPANEL = record @@ -22,8 +21,6 @@ type user : Pointer; end; -(* Const before type ignored *) - function panel_window(_para1:PPANEL):PWINDOW; cdecl;external libpanel; procedure update_panels; cdecl;external libpanel; function hide_panel(_para1:PPANEL):Longint; cdecl;external libpanel; @@ -32,21 +29,13 @@ function del_panel(_para1:PPANEL):Longint; cdecl;external libpanel; function top_panel(_para1:PPANEL):Longint; cdecl;external libpanel; function bottom_panel(_para1:PPANEL):Longint; cdecl;external libpanel; function new_panel(_para1:PWINDOW):PPANEL; cdecl;external libpanel; -(* Const before type ignored *) function panel_above(_para1:PPANEL):PPANEL; cdecl;external libpanel; -(* Const before type ignored *) function panel_below(_para1:PPANEL):PPANEL; cdecl;external libpanel; -(* Const before type ignored *) function set_panel_userptr(_para1:PPANEL; _para2:pointer):Longint; cdecl;external libpanel; -(* Const before type ignored *) -(* Const before type ignored *) function panel_userptr(_para1:PPANEL):pointer; cdecl;external libpanel; function move_panel(_para1:PPANEL; _para2:Longint; _para3:Longint):Longint; cdecl;external libpanel; function replace_panel(_para1:PPANEL; _para2:PWINDOW):Longint; cdecl;external libpanel; -(* Const before type ignored *) function panel_hidden(_para1:PPANEL):Longint; cdecl;external libpanel; implementation - - end.