From 0a276fce30337abc586307db2f56a0e777659a0e Mon Sep 17 00:00:00 2001 From: Mark Hessling Date: Mon, 24 Jun 2002 08:12:01 +0000 Subject: [PATCH] Modifications for neXtaw and scrollbars --- Makefile.in | 13 ++- common/accommon.m4 | 37 ++++++- configure | 252 ++++++++++++++++++++++++++------------------- configure.in | 7 +- x11/ScrollBox.c | 35 ++++++- x11/pdcx11.c | 32 +++--- x11/process/x11.c | 8 +- 7 files changed, 246 insertions(+), 138 deletions(-) diff --git a/Makefile.in b/Makefile.in index 690d88c2..54559516 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4,8 +4,8 @@ SHELL = /bin/sh @SET_MAKE@ -VER=26 -VER_DOT=2.6 +VER=@VER@ +VER_DOT=@VER_DOT@ PDC_DIR=PDCurses-$(VER_DOT) srcdir =@srcdir@ @@ -13,6 +13,7 @@ VPATH =@srcdir@ prefix =@prefix@ exec_prefix =@exec_prefix@ libdir =$(exec_prefix)/lib +bindir =$(exec_prefix)/bin includedir =$(exec_prefix)/include pdcursesdir=./pdcurses paneldir=./panel @@ -39,6 +40,7 @@ realclean :: install: $(INSTALL) -d -m 755 $(libdir) + $(INSTALL) -d -m 755 $(bindir) $(INSTALL) -d -m 755 $(includedir) $(INSTALL) -c -m 644 $(srcdir)/curses.h $(includedir)/xcurses.h sed -e 's/#include /#include /' < $(srcdir)/panel.h > ./xpanel.h @@ -48,6 +50,7 @@ install: $(INSTALL) -c -m 555 $(pdcursesdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) $(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) $(INSTALL) -c -m 644 $(paneldir)/libpanel.a $(libdir)/libpanel.a -$(RANLIB) $(libdir)/libpanel.a + $(INSTALL) -c -m 755 ./xcurses-config $(bindir)/xcurses-config clean :: rm -f config.log config.cache config.status @@ -60,7 +63,7 @@ manual: cd tools; $(MAKE) $(MFLAGS) $@ zip: - zip -y pdcurs$(VER) README INSTALL TODO Makefile.in config.h.in configure \ + zip -y pdcurs$(VER) README INSTALL TODO Makefile.in config.h.in configure xcurses-config.in \ configure.in config.guess config.sub install-sh aclocal.m4 pdc64.gif \ curses.h xcurses.h curspriv.h panel.h maintain.er readme.* makezip.cmd \ pdcurses/README pdcurses/*.c demos/*.c demos/*.h \ @@ -78,7 +81,7 @@ zip: dist: (cd ..; tar cvf - $(PDC_DIR)/README $(PDC_DIR)/INSTALL $(PDC_DIR)/TODO $(PDC_DIR)/Makefile.in \ - $(PDC_DIR)/config.h.in $(PDC_DIR)/configure $(PDC_DIR)/config.guess $(PDC_DIR)/aclocal.m4 $(PDC_DIR)/common/accommon.m4 \ + $(PDC_DIR)/config.h.in $(PDC_DIR)/configure $(PDC_DIR)/config.guess $(PDC_DIR)/aclocal.m4 $(PDC_DIR)/common/accommon.m4 $(PDC_DIR)/xcurses-config.in \ $(PDC_DIR)/config.sub $(PDC_DIR)/configure.in $(PDC_DIR)/install-sh $(PDC_DIR)/curses.h $(PDC_DIR)/xcurses.h \ $(PDC_DIR)/curspriv.h $(PDC_DIR)/panel.h $(PDC_DIR)/pdc64.gif \ $(PDC_DIR)/maintain.er $(PDC_DIR)/readme.* $(PDC_DIR)/makezip.cmd \ @@ -97,7 +100,7 @@ dist: tar: (cd ..; tar cvf - $(PDC_DIR)/README $(PDC_DIR)/INSTALL $(PDC_DIR)/TODO $(PDC_DIR)/Makefile.in \ - $(PDC_DIR)/config.h.in $(PDC_DIR)/configure $(PDC_DIR)/config.guess $(PDC_DIR)/aclocal.m4 $(PDC_DIR)/common/accommon.m4 \ + $(PDC_DIR)/config.h.in $(PDC_DIR)/configure $(PDC_DIR)/config.guess $(PDC_DIR)/aclocal.m4 $(PDC_DIR)/common/accommon.m4 $(PDC_DIR)/xcurses-config.in \ $(PDC_DIR)/config.sub $(PDC_DIR)/configure.in $(PDC_DIR)/install-sh $(PDC_DIR)/curses.h $(PDC_DIR)/xcurses.h \ $(PDC_DIR)/curspriv.h $(PDC_DIR)/panel.h $(PDC_DIR)/pdc64.gif \ $(PDC_DIR)/maintain.er $(PDC_DIR)/readme.* $(PDC_DIR)/makezip.cmd \ diff --git a/common/accommon.m4 b/common/accommon.m4 index ddc77408..d1c5def3 100644 --- a/common/accommon.m4 +++ b/common/accommon.m4 @@ -246,6 +246,7 @@ AC_DEFUN([MH_CHECK_X_INC], [ AC_MSG_CHECKING(for location of X headers) mh_x11_dir="" +mh_x11_xaw_dir="" dnl dnl specify latest release of X directories first dnl @@ -309,6 +310,30 @@ for ac_dir in $mh_inc_dirs ; do fi done +dnl +dnl Try to determine the directory containing Xaw headers +dnl We will append X11 to all the paths above as an extra check +dnl +if test "$with_xaw3d" = yes; then + mh_xaw_dir="Xaw3d" +else + if test "$with_nextaw" = yes; then + mh_xaw_dir="neXtaw" + else + mh_xaw_dir="Xaw" + fi +fi +for ac_dir in $mh_inc_dirs ; do + if test -r $ac_dir/$mh_xaw_dir/Box.h; then + mh_x11_xaw_dir=$ac_dir + break + fi + if test -r $ac_dir/X11/$mh_xaw_dir/Box.h; then + mh_x11_xaw_dir="$ac_dir/X11" + break + fi +done + if test "x$mh_x11_dir" != "x" ; then mh_x11_dir_no_x11=`echo $mh_x11_dir | sed 's/\/X11$//'` dnl @@ -328,11 +353,19 @@ dnl under Solaris. If so, ignore it. else MH_XINC_DIR="-I$mh_x11_dir" fi - AC_MSG_RESULT(found in $mh_x11_dir) - AC_SUBST(MH_XINC_DIR) else AC_MSG_ERROR(Cannot find required header file Intrinsic.h; XCurses cannot be configured) fi + +if test "x$mh_x11_xaw_dir" != "x" ; then + MH_XINC_DIR="-I$mh_x11_xaw_dir $MH_XINC_DIR" +else + AC_MSG_ERROR(Cannot find required Xaw header file Box.h; XCurses cannot be configured) +fi + + AC_MSG_RESULT(found in $mh_x11_dir $mh_x11_xaw_dir) + AC_SUBST(MH_XINC_DIR) + ])dnl dnl --------------------------------------------------------------------------- diff --git a/configure b/configure index bb9dad2b..78245152 100755 --- a/configure +++ b/configure @@ -533,6 +533,11 @@ fi +VER=26 +VER_DOT=2.6 + + + CC_LIST="gcc acc cc c89" @@ -541,7 +546,7 @@ mh_sysv_libdir="" all_words="$CC_LIST" ac_dir="" echo $ac_n "checking for one of the following C compilers: $all_words""... $ac_c" 1>&6 -echo "configure:545: checking for one of the following C compilers: $all_words" >&5 +echo "configure:550: checking for one of the following C compilers: $all_words" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -580,7 +585,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:584: checking for $ac_word" >&5 +echo "configure:589: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -610,7 +615,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:614: checking for $ac_word" >&5 +echo "configure:619: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -661,7 +666,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:665: checking for $ac_word" >&5 +echo "configure:670: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -693,7 +698,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:697: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:702: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -704,12 +709,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 708 "configure" +#line 713 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -735,12 +740,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:739: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:744: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:744: checking whether we are using GNU C" >&5 +echo "configure:749: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -749,7 +754,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -768,7 +773,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:772: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:777: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -800,7 +805,7 @@ else fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:804: checking for POSIXized ISC" >&5 +echo "configure:809: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -869,7 +874,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:873: checking host system type" >&5 +echo "configure:878: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -890,7 +895,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:894: checking target system type" >&5 +echo "configure:899: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -908,7 +913,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:912: checking build system type" >&5 +echo "configure:917: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -967,21 +972,21 @@ esac save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $SYS_DEFS" echo $ac_n "checking for maximum signal specifier:""... $ac_c" 1>&6 -echo "configure:971: checking for maximum signal specifier:" >&5 +echo "configure:976: checking for maximum signal specifier:" >&5 if eval "test \"`echo '$''{'mh_cv_max_signals'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else mh_found="no" for mh_sigs in NSIG __sys_nsig; do cat > conftest.$ac_ext < int main() { return $mh_sigs; ; return 0; } EOF -if { (eval echo configure:985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mh_found="yes"; mh_cv_max_signals="$mh_sigs" else @@ -1013,7 +1018,7 @@ MH_EXTRA_LIBS='' for mh_lib in dld dl; do if test "$on_qnx" = yes; then echo $ac_n "checking for library -l${mh_lib}""... $ac_c" 1>&6 -echo "configure:1017: checking for library -l${mh_lib}" >&5 +echo "configure:1022: checking for library -l${mh_lib}" >&5 if test -r /usr/lib/${mh_lib}3r.lib; then echo "$ac_t""found" 1>&6 MH_EXTRA_LIBS="${MH_EXTRA_LIBS} -l${mh_lib}" @@ -1022,7 +1027,7 @@ echo "configure:1017: checking for library -l${mh_lib}" >&5 fi else echo $ac_n "checking for main in -l$mh_lib""... $ac_c" 1>&6 -echo "configure:1026: checking for main in -l$mh_lib" >&5 +echo "configure:1031: checking for main in -l$mh_lib" >&5 ac_lib_var=`echo $mh_lib'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1030,14 +1035,14 @@ else ac_save_LIBS="$LIBS" LIBS="-l$mh_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1069,7 +1074,7 @@ SHLIBS="${MH_EXTRA_LIBS}" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1073: checking for $ac_word" >&5 +echo "configure:1078: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1108,7 +1113,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1112: checking for a BSD compatible install" >&5 +echo "configure:1117: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1161,7 +1166,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1165: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1170: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1189,7 +1194,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1193: checking how to run the C preprocessor" >&5 +echo "configure:1198: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1204,13 +1209,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1221,13 +1226,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1238,13 +1243,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1270,20 +1275,20 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for System V IPC support""... $ac_c" 1>&6 -echo "configure:1274: checking for System V IPC support" >&5 +echo "configure:1279: checking for System V IPC support" >&5 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:1277: checking for sys/ipc.h" >&5 +echo "configure:1282: checking for sys/ipc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1311,12 +1316,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1315: checking for ANSI C header files" >&5 +echo "configure:1320: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1324,7 +1329,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1341,7 +1346,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1359,7 +1364,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1380,7 +1385,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1391,7 +1396,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1430,17 +1435,17 @@ for ac_hdr in fcntl.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1434: checking for $ac_hdr" >&5 +echo "configure:1439: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1468,17 +1473,17 @@ done echo $ac_n "checking if compiler supports ANSI prototypes""... $ac_c" 1>&6 -echo "configure:1472: checking if compiler supports ANSI prototypes" >&5 +echo "configure:1477: checking if compiler supports ANSI prototypes" >&5 ac_compile='$ac_cv_prog_CC conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5' cat > conftest.$ac_ext < int main() { extern int xxx(int, char *); ; return 0; } EOF -if { (eval echo configure:1482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mh_have_proto=yes; cat >> confdefs.h <<\EOF #define HAVE_PROTO 1 @@ -1496,12 +1501,12 @@ echo "$ac_t""$mh_have_proto" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1500: checking for working const" >&5 +echo "configure:1505: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1571,12 +1576,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1575: checking for size_t" >&5 +echo "configure:1580: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1604,12 +1609,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1608: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1613: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1618,7 +1623,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1639,12 +1644,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:1643: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:1648: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1652,7 +1657,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1677,7 +1682,7 @@ MH_EXTRA_LIBS='' for mh_lib in socket nls; do if test "$on_qnx" = yes; then echo $ac_n "checking for library -l${mh_lib}""... $ac_c" 1>&6 -echo "configure:1681: checking for library -l${mh_lib}" >&5 +echo "configure:1686: checking for library -l${mh_lib}" >&5 if test -r /usr/lib/${mh_lib}3r.lib; then echo "$ac_t""found" 1>&6 MH_EXTRA_LIBS="${MH_EXTRA_LIBS} -l${mh_lib}" @@ -1686,7 +1691,7 @@ echo "configure:1681: checking for library -l${mh_lib}" >&5 fi else echo $ac_n "checking for main in -l$mh_lib""... $ac_c" 1>&6 -echo "configure:1690: checking for main in -l$mh_lib" >&5 +echo "configure:1695: checking for main in -l$mh_lib" >&5 ac_lib_var=`echo $mh_lib'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1694,14 +1699,14 @@ else ac_save_LIBS="$LIBS" LIBS="-l$mh_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1731,7 +1736,7 @@ done echo $ac_n "checking whether $CC understand -c and -o together""... $ac_c" 1>&6 -echo "configure:1735: checking whether $CC understand -c and -o together" >&5 +echo "configure:1740: checking whether $CC understand -c and -o together" >&5 set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" if eval "test \"`echo '$''{'ac_cv_prog_cc_${ac_cc}_c_o'+set}'`\" = set"; then @@ -1742,10 +1747,10 @@ else # existing .o file with -o, though they will create one. eval ac_cv_prog_cc_${ac_cc}_c_o=no ac_try='${CC-cc} -c conftest.c -o conftest.ooo 1>&5' -if { (eval echo configure:__oline__: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && test -f conftest.ooo && { (eval echo configure:1746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:__oline__: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && test -f conftest.ooo && { (eval echo configure:1751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then ac_try='${CC-cc} -c conftest.c -o conftest.ooo 1>&5' - if { (eval echo configure:__oline__: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && test -f conftest.ooo && { (eval echo configure:1749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:__oline__: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && test -f conftest.ooo && { (eval echo configure:1754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes fi @@ -1770,13 +1775,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1774: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1779: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1794,7 +1799,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1816,7 +1821,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:1820: checking for 8-bit clean memcmp" >&5 +echo "configure:1825: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1829,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -1852,12 +1857,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1856: checking return type of signal handlers" >&5 +echo "configure:1861: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1874,7 +1879,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1893,12 +1898,12 @@ EOF echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1897: checking for vprintf" >&5 +echo "configure:1902: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1945,12 +1950,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1949: checking for _doprnt" >&5 +echo "configure:1954: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2000,12 +2005,12 @@ fi for ac_func in select memmove vsscanf usleep poll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2004: checking for $ac_func" >&5 +echo "configure:2009: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2055,8 +2060,9 @@ done echo $ac_n "checking for location of X headers""... $ac_c" 1>&6 -echo "configure:2059: checking for location of X headers" >&5 +echo "configure:2064: checking for location of X headers" >&5 mh_x11_dir="" +mh_x11_xaw_dir="" mh_inc_dirs="\ $HOME/include/X11 \ $HOME/include \ @@ -2110,6 +2116,26 @@ for ac_dir in $mh_inc_dirs ; do fi done +if test "$with_xaw3d" = yes; then + mh_xaw_dir="Xaw3d" +else + if test "$with_nextaw" = yes; then + mh_xaw_dir="neXtaw" + else + mh_xaw_dir="Xaw" + fi +fi +for ac_dir in $mh_inc_dirs ; do + if test -r $ac_dir/$mh_xaw_dir/Box.h; then + mh_x11_xaw_dir=$ac_dir + break + fi + if test -r $ac_dir/X11/$mh_xaw_dir/Box.h; then + mh_x11_xaw_dir="$ac_dir/X11" + break + fi +done + if test "x$mh_x11_dir" != "x" ; then mh_x11_dir_no_x11=`echo $mh_x11_dir | sed 's/\/X11$//'` @@ -2126,12 +2152,20 @@ if test "x$mh_x11_dir" != "x" ; then else MH_XINC_DIR="-I$mh_x11_dir" fi - echo "$ac_t""found in $mh_x11_dir" 1>&6 - else { echo "configure: error: Cannot find required header file Intrinsic.h; XCurses cannot be configured" 1>&2; exit 1; } fi +if test "x$mh_x11_xaw_dir" != "x" ; then + MH_XINC_DIR="-I$mh_x11_xaw_dir $MH_XINC_DIR" +else + { echo "configure: error: Cannot find required Xaw header file Box.h; XCurses cannot be configured" 1>&2; exit 1; } +fi + + echo "$ac_t""found in $mh_x11_dir $mh_x11_xaw_dir" 1>&6 + + + mh_solaris_flag=no mh_hpux9_flag=no @@ -2159,7 +2193,7 @@ case "$target" in esac echo $ac_n "checking for location of X libraries""... $ac_c" 1>&6 -echo "configure:2163: checking for location of X libraries" >&5 +echo "configure:2197: checking for location of X libraries" >&5 if test "$with_xaw3d" = yes; then MH_X11_LIBS="Xaw3d Xmu Xt X11" else @@ -2298,17 +2332,17 @@ for mh_header in DECkeysym.h Sunkeysym.h; do do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2302: checking for $ac_hdr" >&5 +echo "configure:2336: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2343,17 +2377,17 @@ CPPFLAGS="$CPPFLAGS $MH_XINC_DIR" for mh_keydef in XK_KP_Delete XK_KP_Insert XK_KP_End XK_KP_Down XK_KP_Next \ XK_KP_Left XK_KP_Right XK_KP_Home XK_KP_Up XK_KP_Prior XK_KP_Begin; do echo $ac_n "checking for $mh_keydef in keysym.h""... $ac_c" 1>&6 -echo "configure:2347: checking for $mh_keydef in keysym.h" >&5 +echo "configure:2381: checking for $mh_keydef in keysym.h" >&5 mh_upper_name="HAVE_`echo $mh_keydef | tr 'a-z' 'A-Z'`" cat > conftest.$ac_ext < int main() { int i = $mh_keydef; ; return 0; } EOF -if { (eval echo configure:2357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mh_have_key=yes; cat >> confdefs.h <&6 -echo "configure:2379: checking if $td is typedefed:" >&5 +echo "configure:2413: checking if $td is typedefed:" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mh_td=yes else @@ -2519,7 +2553,7 @@ fi with_rexx="rexxtrans" echo $ac_n "checking shared library/external function extensions""... $ac_c" 1>&6 -echo "configure:2523: checking shared library/external function extensions" >&5 +echo "configure:2557: checking shared library/external function extensions" >&5 SHLPST=".so" MODPST=".so" @@ -2687,10 +2721,10 @@ esac if test "$DYN_COMP" = ""; then echo $ac_n "checking compiler flags for a dynamic object""... $ac_c" 1>&6 -echo "configure:2691: checking compiler flags for a dynamic object" >&5 +echo "configure:2725: checking compiler flags for a dynamic object" >&5 cat > conftest.$ac_ext <&5; (eval $mh_compile) 2>&5; }; then + if { (eval echo configure:2740: \"$mh_compile\") 1>&5; (eval $mh_compile) 2>&5; }; then DYN_COMP="" else slash="\\" @@ -2723,16 +2757,16 @@ EOF mh_compile='${CC-cc} -c $DYN_COMP conftest.$ac_ext 1>&5' cat > conftest.$ac_ext <&5; (eval $mh_compile) 2>&5; } && test -s conftest.o; then +if { (eval echo configure:2767: \"$mh_compile\") 1>&5; (eval $mh_compile) 2>&5; } && test -s conftest.o; then mh_dyn_link='ld -shared -o conftest.rxlib conftest.o -lc 1>&5' # mh_dyn_link='${CC} -Wl,-shared -o conftest.rxlib conftest.o -lc 1>&AC_FD_CC' - if { (eval echo configure:2736: \"$mh_dyn_link\") 1>&5; (eval $mh_dyn_link) 2>&5; } && test -s conftest.rxlib; then + if { (eval echo configure:2770: \"$mh_dyn_link\") 1>&5; (eval $mh_dyn_link) 2>&5; } && test -s conftest.rxlib; then LD_RXLIB1="ld -shared" # LD_RXLIB1="${CC} -Wl,-shared" LD_RXLIB2="${REXX_LIBS}" @@ -2742,7 +2776,7 @@ if { (eval echo configure:2733: \"$mh_compile\") 1>&5; (eval $mh_compile) 2>&5; else mh_dyn_link='ld -G -o conftest.rxlib conftest.o 1>&5' # mh_dyn_link='${CC} -Wl,-G -o conftest.rxlib conftest.o 1>&AC_FD_CC' - if { (eval echo configure:2746: \"$mh_dyn_link\") 1>&5; (eval $mh_dyn_link) 2>&5; } && test -s conftest.rxlib; then + if { (eval echo configure:2780: \"$mh_dyn_link\") 1>&5; (eval $mh_dyn_link) 2>&5; } && test -s conftest.rxlib; then LD_RXLIB1="ld -G" # LD_RXLIB1="${CC} -Wl,-G" LD_RXLIB2="${REXX_LIBS}" @@ -2913,7 +2947,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile pdcurses/$mymakefile demos/Makefile panel/Makefile tools/Makefile saa/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile pdcurses/$mymakefile demos/Makefile panel/Makefile tools/Makefile saa/Makefile xcurses-config config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/configure.in b/configure.in index f3b414ca..126b943d 100755 --- a/configure.in +++ b/configure.in @@ -1,6 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(curspriv.h) AC_PREFIX_DEFAULT(/usr) +VER=26 +VER_DOT=2.6 +AC_SUBST(VER) +AC_SUBST(VER_DOT) +AC_SUBST(prefix) dnl ---------------------- check for C compiler ----------------- dnl Checks for one of the C compilers below - change if yours not there. @@ -213,7 +218,7 @@ dnl Force the ability of shared library usage with_rexx="rexxtrans" MH_SHARED_LIBRARY(XCurses) -AC_OUTPUT(Makefile pdcurses/$mymakefile demos/Makefile panel/Makefile tools/Makefile saa/Makefile) +AC_OUTPUT(Makefile pdcurses/$mymakefile demos/Makefile panel/Makefile tools/Makefile saa/Makefile xcurses-config) case "$target" in *ibm-aix*) diff --git a/x11/ScrollBox.c b/x11/ScrollBox.c index 8ed496fa..67030718 100644 --- a/x11/ScrollBox.c +++ b/x11/ScrollBox.c @@ -128,10 +128,12 @@ Boolean doit; Dimension hw; /* horizontal scrollbar length (width) */ Position vx; Position hy; -#if 0 +#if 1 Dimension th; Dimension tw; #endif + long supp=0; + XSizeHints hints; int i; if (sbw->composite.num_children != 3) @@ -156,24 +158,51 @@ Boolean doit; vscroll = sbw->composite.children[1]; hscroll = sbw->composite.children[2]; +#if 1 +fprintf(stderr,"%s %d:\n",__FILE__,__LINE__); + if ( XtIsRealized(wmain) ) + { + if ( !XGetWMNormalHints( XtDisplay(wmain), XtWindow(wmain), &hints, &supp ) ) + { + hints.height_inc = 13; + hints.width_inc = 7; +fprintf(stderr,"%s %d:\n",__FILE__,__LINE__); + } + } + else + { + hints.height_inc = 13; + hints.width_inc = 7; + } +fprintf(stderr,"%s %d: height: %d width: %d\n",__FILE__,__LINE__,hints.height_inc,hints.width_inc); +#endif + /* * Size all three widgets so that space is fully utilized. */ #if 1 - mw = sbw->core.width - (2 * sbw->scrollBox.h_space) - + mw = sbw->core.width - (2 * sbw->scrollBox.h_space) - vscroll->core.width - (2 * vscroll->core.border_width) - (2 * wmain->core.border_width); - mh = sbw->core.height - (2 * sbw->scrollBox.v_space) - + + mh = sbw->core.height - (2 * sbw->scrollBox.v_space) - hscroll->core.height - (2 * hscroll->core.border_width) - (2 * wmain->core.border_width); + /* + * Force the main window to be sized to the appropriate increments + */ + mw = (mw/hints.width_inc)*hints.width_inc; + mh = ((mh/hints.height_inc)*hints.height_inc)+hints.height_inc; + vx = wmain->core.x + mw + sbw->scrollBox.h_space + wmain->core.border_width + vscroll->core.border_width; hy = wmain->core.y + mh + sbw->scrollBox.v_space + wmain->core.border_width + hscroll->core.border_width; vh = mh; /* scrollbars are always same length as main window */ hw = mw; +fprintf(stderr,"%s %d: mw %d mh %d vx %d hy %d hinc %d winc %d\n",__FILE__,__LINE__,mw,mh,vx,hy,hints.height_inc,hints.width_inc); if (doit) { XtResizeWidget(wmain, mw, mh, 1); diff --git a/x11/pdcx11.c b/x11/pdcx11.c index 869caa24..2cf751a5 100644 --- a/x11/pdcx11.c +++ b/x11/pdcx11.c @@ -1368,7 +1368,7 @@ int XCursesRefreshScrollbar() #endif if (!SP->sb_on) return(ERR); -#if 0 +#if 1 fprintf(stderr,"%s:XCursesRefreshScrollbar() - vert: %d %f %f %f %f %f\n",(XCursesProcess)?" X":"CURSES", SP->sb_total_y,total_y,viewport_y,cur_y, vtop,vlength); @@ -1376,10 +1376,10 @@ fprintf(stderr,"%s:XCursesRefreshScrollbar() - horz: %d %d %f %f %f %f %f\n",(XC SP->sb_total_x,XCursesFontWidth,total_x,viewport_x,cur_x, htop,hlength); #endif - if (SP->sb_total_y != 0) - XawScrollbarSetThumb( scrollVert, vtop, vlength ); - if (SP->sb_total_x != 0) - XawScrollbarSetThumb( scrollHoriz, htop, hlength ); + if (SP->sb_total_y != (double)0) + XawScrollbarSetThumb( scrollVert, (double)vtop, (double)vlength ); + if (SP->sb_total_x != (double)0) + XawScrollbarSetThumb( scrollHoriz, (double)htop, (double)hlength ); return(OK); } /***********************************************************************/ @@ -3119,7 +3119,7 @@ XtPointer call_data; cur_y = (total_y - viewport_y); } SP->sb_cur_y = cur_y / XCursesFontHeight; - XawScrollbarSetThumb(w,(float)((float)cur_y/(float)total_y),(float)((float)viewport_y/(float)total_y)); + XawScrollbarSetThumb(w,(double)((double)cur_y/(double)total_y),(double)((double)viewport_y/(double)total_y)); /* * Send a key: if pixels negative, send KEY_SCROLL_DOWN */ @@ -3161,7 +3161,7 @@ XtPointer call_data; cur_x = (total_x - viewport_x); } SP->sb_cur_x = cur_x / XCursesFontWidth; - XawScrollbarSetThumb(w,(float)((float)cur_x/(float)total_x),(float)((float)viewport_x/(float)total_x)); + XawScrollbarSetThumb(w,(double)((double)cur_x/(double)total_x),(double)((double)viewport_x/(double)total_x)); /* * Send a key: if pixels negative, send KEY_SCROLL_DOWN */ @@ -3181,9 +3181,9 @@ XtPointer call_data; #endif /***********************************************************************/ { - float percent = *(float *) call_data; - float total_y=(float)(SP->sb_total_y); - float viewport_y=(float)(SP->sb_viewport_y); + double percent = *(double *) call_data; + double total_y=(double)(SP->sb_total_y); + double viewport_y=(double)(SP->sb_viewport_y); int cur_y=SP->sb_cur_y; #if 0 @@ -3195,11 +3195,11 @@ fprintf(stderr,"Thumb_up_down: percent %f\n",percent); */ if (SP->sb_viewport_y >= SP->sb_total_y) return; - if ((SP->sb_cur_y = (int)((float)total_y * percent)) >= (total_y - viewport_y)) + if ((SP->sb_cur_y = (int)((double)total_y * percent)) >= (total_y - viewport_y)) SP->sb_cur_y = total_y - viewport_y; /* SP->sb_cur_y = cur_y;*/ - XawScrollbarSetThumb(w,(float)(cur_y/total_y),(float)(viewport_y/total_y)); + XawScrollbarSetThumb(w,(double)(cur_y/total_y),(double)(viewport_y/total_y)); /* * Send a key: if pixels negative, send KEY_SCROLL_DOWN */ @@ -3219,9 +3219,9 @@ XtPointer call_data; #endif /***********************************************************************/ { - float percent = *(float *) call_data; - float total_x=(float)(SP->sb_total_x); - float viewport_x=(float)(SP->sb_viewport_x); + double percent = *(double *) call_data; + double total_x=(double)(SP->sb_total_x); + double viewport_x=(double)(SP->sb_viewport_x); int cur_x=SP->sb_cur_x; #if 0 @@ -3237,7 +3237,7 @@ fprintf(stderr,"Thumb_up_down: percent %f\n",percent); SP->sb_cur_x = total_x - viewport_x; /* SP->sb_cur_x = cur_x;*/ - XawScrollbarSetThumb(w,(float)(cur_x/total_x),(float)(viewport_x/total_x)); + XawScrollbarSetThumb(w,(double)(cur_x/total_x),(double)(viewport_x/total_x)); /* * Send a key: if pixels negative, send KEY_SCROLL_DOWN */ diff --git a/x11/process/x11.c b/x11/process/x11.c index b3af0fbc..851871d5 100644 --- a/x11/process/x11.c +++ b/x11/process/x11.c @@ -645,9 +645,11 @@ printf("Width %d Height %d\n",XCURSESGEOMETRY.width,XCURSESGEOMETRY.height); NULL); } -#if 0 - fprintf(stderr,"Width: %d Height: %d\n",XCursesWindowWidth+XCURSESSCROLLBARWIDTH, - XCursesWindowHeight+XCURSESSCROLLBARWIDTH); +#if 1 + fprintf(stderr,"Width: %d Height: %d FontWidth: %d FontHeight: %d\n",XCursesWindowWidth+XCURSESSCROLLBARWIDTH, + XCursesWindowHeight+XCURSESSCROLLBARWIDTH, + XCursesFontWidth, + XCursesFontHeight); #endif /* XtVaSetValues(drawing,