11c606a6 (kx 2023-04-11 01:18:34 +0300 1) diff -b --unified -Nr dialog-1.3-20190724-orig/checklist.c dialog-1.3-20190724/checklist.c
11c606a6 (kx 2023-04-11 01:18:34 +0300 2) --- dialog-1.3-20190724-orig/checklist.c 2019-07-25 01:17:14.000000000 +0300
11c606a6 (kx 2023-04-11 01:18:34 +0300 3) +++ dialog-1.3-20190724/checklist.c 2019-07-26 14:14:01.063282363 +0300
11c606a6 (kx 2023-04-11 01:18:34 +0300 4) @@ -29,7 +29,7 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 5) #include <dialog.h>
11c606a6 (kx 2023-04-11 01:18:34 +0300 6) #include <dlg_keys.h>
11c606a6 (kx 2023-04-11 01:18:34 +0300 7)
11c606a6 (kx 2023-04-11 01:18:34 +0300 8) -#define MIN_HIGH (1 + (5 * MARGIN))
11c606a6 (kx 2023-04-11 01:18:34 +0300 9) +#define MIN_HIGH 4
11c606a6 (kx 2023-04-11 01:18:34 +0300 10)
11c606a6 (kx 2023-04-11 01:18:34 +0300 11) typedef struct {
11c606a6 (kx 2023-04-11 01:18:34 +0300 12) /* the outer-window */
11c606a6 (kx 2023-04-11 01:18:34 +0300 13) diff -b --unified -Nr dialog-1.3-20190724-orig/dialog-config.in dialog-1.3-20190724/dialog-config.in
11c606a6 (kx 2023-04-11 01:18:34 +0300 14) --- dialog-1.3-20190724-orig/dialog-config.in 2019-07-23 11:44:33.000000000 +0300
11c606a6 (kx 2023-04-11 01:18:34 +0300 15) +++ dialog-1.3-20190724/dialog-config.in 2019-07-26 14:14:01.063282363 +0300
11c606a6 (kx 2023-04-11 01:18:34 +0300 16) @@ -73,7 +73,12 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 17) INCS="-I${prefix}/include"
11c606a6 (kx 2023-04-11 01:18:34 +0300 18) fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 19) sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
11c606a6 (kx 2023-04-11 01:18:34 +0300 20) - $INCS
11c606a6 (kx 2023-04-11 01:18:34 +0300 21) + @CFLAGS@ $INCS
11c606a6 (kx 2023-04-11 01:18:34 +0300 22) +ENDECHO
11c606a6 (kx 2023-04-11 01:18:34 +0300 23) + ;;
11c606a6 (kx 2023-04-11 01:18:34 +0300 24) + --ldflags)
11c606a6 (kx 2023-04-11 01:18:34 +0300 25) + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
11c606a6 (kx 2023-04-11 01:18:34 +0300 26) + -L@libdir@
11c606a6 (kx 2023-04-11 01:18:34 +0300 27) ENDECHO
11c606a6 (kx 2023-04-11 01:18:34 +0300 28) ;;
11c606a6 (kx 2023-04-11 01:18:34 +0300 29) --cflags-only-other)
11c606a6 (kx 2023-04-11 01:18:34 +0300 30) @@ -81,12 +86,12 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 31) ;;
11c606a6 (kx 2023-04-11 01:18:34 +0300 32) --libs)
11c606a6 (kx 2023-04-11 01:18:34 +0300 33) sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
11c606a6 (kx 2023-04-11 01:18:34 +0300 34) - -L${exec_prefix}/lib -l${THIS} @LIBS@
11c606a6 (kx 2023-04-11 01:18:34 +0300 35) + -l${THIS} @LIBS@
11c606a6 (kx 2023-04-11 01:18:34 +0300 36) ENDECHO
11c606a6 (kx 2023-04-11 01:18:34 +0300 37) ;;
11c606a6 (kx 2023-04-11 01:18:34 +0300 38) --libs-only-L)
11c606a6 (kx 2023-04-11 01:18:34 +0300 39) OPTS=
11c606a6 (kx 2023-04-11 01:18:34 +0300 40) - for opt in "$LIBS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 41) + for opt in -L@libdir@ -l${THIS} @LIBS@
11c606a6 (kx 2023-04-11 01:18:34 +0300 42) do
11c606a6 (kx 2023-04-11 01:18:34 +0300 43) case "x$opt" in
11c606a6 (kx 2023-04-11 01:18:34 +0300 44) x-L*)
11c606a6 (kx 2023-04-11 01:18:34 +0300 45) @@ -98,7 +103,7 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 46) ;;
11c606a6 (kx 2023-04-11 01:18:34 +0300 47) --libs-only-l)
11c606a6 (kx 2023-04-11 01:18:34 +0300 48) OPTS=
11c606a6 (kx 2023-04-11 01:18:34 +0300 49) - for opt in "$LIBS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 50) + for opt in -L@libdir@ -l${THIS} @LIBS@
11c606a6 (kx 2023-04-11 01:18:34 +0300 51) do
11c606a6 (kx 2023-04-11 01:18:34 +0300 52) case "x$opt" in
11c606a6 (kx 2023-04-11 01:18:34 +0300 53) x-l*)
11c606a6 (kx 2023-04-11 01:18:34 +0300 54) @@ -110,7 +115,7 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 55) ;;
11c606a6 (kx 2023-04-11 01:18:34 +0300 56) --libs-only-other)
11c606a6 (kx 2023-04-11 01:18:34 +0300 57) OPTS=
11c606a6 (kx 2023-04-11 01:18:34 +0300 58) - for opt in "$LIBS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 59) + for opt in -L@libdir@ -l${THIS} @LIBS@
11c606a6 (kx 2023-04-11 01:18:34 +0300 60) do
11c606a6 (kx 2023-04-11 01:18:34 +0300 61) case "x$opt" in
11c606a6 (kx 2023-04-11 01:18:34 +0300 62) x-[lL]*)
11c606a6 (kx 2023-04-11 01:18:34 +0300 63) @@ -154,6 +159,7 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 64) --exec-prefix=ARG sets the executable-prefix of ${THIS}
11c606a6 (kx 2023-04-11 01:18:34 +0300 65)
11c606a6 (kx 2023-04-11 01:18:34 +0300 66) --cflags echos the C compiler flags needed to compile with ${THIS}
11c606a6 (kx 2023-04-11 01:18:34 +0300 67) + --ldflags echos the linker flags needed to link with ${THIS}
11c606a6 (kx 2023-04-11 01:18:34 +0300 68) --libs echos the libraries needed to link with ${THIS}
11c606a6 (kx 2023-04-11 01:18:34 +0300 69)
11c606a6 (kx 2023-04-11 01:18:34 +0300 70) --libs-only-L echos -L linker options (search path) for ${THIS}
11c606a6 (kx 2023-04-11 01:18:34 +0300 71) diff -b --unified -Nr dialog-1.3-20190724-orig/dialog.m4 dialog-1.3-20190724/dialog.m4
11c606a6 (kx 2023-04-11 01:18:34 +0300 72) --- dialog-1.3-20190724-orig/dialog.m4 1970-01-01 03:00:00.000000000 +0300
11c606a6 (kx 2023-04-11 01:18:34 +0300 73) +++ dialog-1.3-20190724/dialog.m4 2019-07-26 14:14:01.063282363 +0300
11c606a6 (kx 2023-04-11 01:18:34 +0300 74) @@ -0,0 +1,333 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 75) +dnl #
11c606a6 (kx 2023-04-11 01:18:34 +0300 76) +dnl # /usr/share/aclocal/dialog.m4
11c606a6 (kx 2023-04-11 01:18:34 +0300 77) +dnl #
11c606a6 (kx 2023-04-11 01:18:34 +0300 78) +dnl # Configure paths for dialog
11c606a6 (kx 2023-04-11 01:18:34 +0300 79) +dnl # Andrew V.Kosteltsev
11c606a6 (kx 2023-04-11 01:18:34 +0300 80) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 81) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 82) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 83) +dnl Synopsis:
11c606a6 (kx 2023-04-11 01:18:34 +0300 84) +dnl AC_CHECK_DIALOG([MIN-VERSION [, # minimum dialog version, e.g. 1.3-20190211
11c606a6 (kx 2023-04-11 01:18:34 +0300 85) +dnl DEFAULT-WITH-DIALOG [, # default value for --with-dialog option
11c606a6 (kx 2023-04-11 01:18:34 +0300 86) +dnl DEFAULT-WITH-DIALOG-TEST [,# default value for --with-dialog-test option
11c606a6 (kx 2023-04-11 01:18:34 +0300 87) +dnl EXTEND-VARS [, # whether CFLAGS/LDFLAGS/etc are extended
11c606a6 (kx 2023-04-11 01:18:34 +0300 88) +dnl ACTION-IF-FOUND [, # action to perform if dialog was found
11c606a6 (kx 2023-04-11 01:18:34 +0300 89) +dnl ACTION-IF-NOT-FOUND # action to perform if dialog was not found
11c606a6 (kx 2023-04-11 01:18:34 +0300 90) +dnl ]]]]]])
11c606a6 (kx 2023-04-11 01:18:34 +0300 91) +dnl Examples:
11c606a6 (kx 2023-04-11 01:18:34 +0300 92) +dnl AC_CHECK_DIALOG(1.3-20190211)
11c606a6 (kx 2023-04-11 01:18:34 +0300 93) +dnl AC_CHECK_DIALOG(1.3-20190211,,,no,CFLAGS="$CFLAGS -DHAVE_DIALOG $DIALOG_CFLAGS")
11c606a6 (kx 2023-04-11 01:18:34 +0300 94) +dnl AC_CHECK_DIALOG(1.3-20190211,yes,yes,yes,CFLAGS="$CFLAGS -DHAVE_DIALOG")
11c606a6 (kx 2023-04-11 01:18:34 +0300 95) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 96) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 97) +dnl If you have to change prefix returned by dialog-config script or change
11c606a6 (kx 2023-04-11 01:18:34 +0300 98) +dnl location of dialog-config, you may set environment variable DIALOG_CONFIG,
11c606a6 (kx 2023-04-11 01:18:34 +0300 99) +dnl for example:
11c606a6 (kx 2023-04-11 01:18:34 +0300 100) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 101) +dnl # export DIALOG_CONFIG="dialog-config --prefix=/usr/local"
11c606a6 (kx 2023-04-11 01:18:34 +0300 102) +dnl # export DIALOG_CONFIG="/usr/bin/dialog-config --prefix=/usr/local"
11c606a6 (kx 2023-04-11 01:18:34 +0300 103) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 104) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 105) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 106) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 107) +dnl auxilliary macros
11c606a6 (kx 2023-04-11 01:18:34 +0300 108) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 109) +AC_DEFUN([_AC_DIALOG_ERROR], [dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 110) +AC_MSG_RESULT([*FAILED*])
11c606a6 (kx 2023-04-11 01:18:34 +0300 111) +cat <<EOT | sed -e 's/^[[ ]]*/ | /' -e 's/>>/ /' 1>&2
11c606a6 (kx 2023-04-11 01:18:34 +0300 112) +$1
11c606a6 (kx 2023-04-11 01:18:34 +0300 113) +EOT
11c606a6 (kx 2023-04-11 01:18:34 +0300 114) +exit 1
11c606a6 (kx 2023-04-11 01:18:34 +0300 115) +])
11c606a6 (kx 2023-04-11 01:18:34 +0300 116) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 117) +AC_DEFUN([_AC_DIALOG_VERBOSE], [dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 118) +if test ".$verbose" = .yes; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 119) + AC_MSG_RESULT([ $1])
11c606a6 (kx 2023-04-11 01:18:34 +0300 120) +fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 121) +])
11c606a6 (kx 2023-04-11 01:18:34 +0300 122) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 123) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 124) +dnl the user macro
11c606a6 (kx 2023-04-11 01:18:34 +0300 125) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 126) +AC_DEFUN([AC_CHECK_DIALOG], [dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 127) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 128) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 129) +dnl prerequisites
11c606a6 (kx 2023-04-11 01:18:34 +0300 130) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 131) +AC_REQUIRE([AC_PROG_CC])dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 132) +AC_REQUIRE([AC_PROG_CPP])dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 133) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 134) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 135) +dnl set DIALOG_CONFIG variable
11c606a6 (kx 2023-04-11 01:18:34 +0300 136) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 137) +if test -z "$DIALOG_CONFIG"; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 138) + DIALOG_CONFIG='dialog-config'
11c606a6 (kx 2023-04-11 01:18:34 +0300 139) +fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 140) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 141) +DIALOG_CFLAGS=''
11c606a6 (kx 2023-04-11 01:18:34 +0300 142) +DIALOG_LDFLAGS=''
11c606a6 (kx 2023-04-11 01:18:34 +0300 143) +DIALOG_LIBS=''
11c606a6 (kx 2023-04-11 01:18:34 +0300 144) +AC_SUBST(DIALOG_CFLAGS)
11c606a6 (kx 2023-04-11 01:18:34 +0300 145) +AC_SUBST(DIALOG_LDFLAGS)
11c606a6 (kx 2023-04-11 01:18:34 +0300 146) +AC_SUBST(DIALOG_LIBS)
11c606a6 (kx 2023-04-11 01:18:34 +0300 147) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 148) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 149) +dnl command line options
11c606a6 (kx 2023-04-11 01:18:34 +0300 150) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 151) +_AC_DIALOG_VERBOSE([])
11c606a6 (kx 2023-04-11 01:18:34 +0300 152) +AC_ARG_WITH(dialog,dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 153) +[ --with-dialog[=ARG] Build with dialog Library (default=]ifelse([$2],,yes,$2)[)],dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 154) +,dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 155) +with_dialog="ifelse([$2],,yes,$2)"
11c606a6 (kx 2023-04-11 01:18:34 +0300 156) +)dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 157) +AC_ARG_WITH(dialog-test,dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 158) +[ --with-dialog-test Perform dialog Sanity Test (default=]ifelse([$3],,yes,$3)[)],dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 159) +,dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 160) +with_dialog_test="ifelse([$3],,yes,$3)"
11c606a6 (kx 2023-04-11 01:18:34 +0300 161) +)dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 162) +_AC_DIALOG_VERBOSE([+ Command Line Options:])
11c606a6 (kx 2023-04-11 01:18:34 +0300 163) +_AC_DIALOG_VERBOSE([ o --with-dialog=$with_dialog])
11c606a6 (kx 2023-04-11 01:18:34 +0300 164) +_AC_DIALOG_VERBOSE([ o --with-dialog-test=$with_dialog_test])
11c606a6 (kx 2023-04-11 01:18:34 +0300 165) +dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 166) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 167) +dnl configuration
11c606a6 (kx 2023-04-11 01:18:34 +0300 168) +dnl ============================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 169) +if test ".$with_dialog" != .no; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 170) + dialog_subdir=no
11c606a6 (kx 2023-04-11 01:18:34 +0300 171) + dialog_subdir_opts=''
11c606a6 (kx 2023-04-11 01:18:34 +0300 172) + case "$with_dialog" in
11c606a6 (kx 2023-04-11 01:18:34 +0300 173) + subdir:* )
11c606a6 (kx 2023-04-11 01:18:34 +0300 174) + dialog_subdir=yes
11c606a6 (kx 2023-04-11 01:18:34 +0300 175) + changequote(, )dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 176) + dialog_subdir_opts=`echo $with_dialog | sed -e 's/^subdir:[^ ]*[ ]*//'`
11c606a6 (kx 2023-04-11 01:18:34 +0300 177) + with_dialog=`echo $with_dialog | sed -e 's/^subdir:\([^ ]*\).*$/\1/'`
11c606a6 (kx 2023-04-11 01:18:34 +0300 178) + changequote([, ])dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 179) + ;;
11c606a6 (kx 2023-04-11 01:18:34 +0300 180) + esac
11c606a6 (kx 2023-04-11 01:18:34 +0300 181) + dialog_version=""
11c606a6 (kx 2023-04-11 01:18:34 +0300 182) + dialog_location=""
11c606a6 (kx 2023-04-11 01:18:34 +0300 183) + dialog_type=""
11c606a6 (kx 2023-04-11 01:18:34 +0300 184) + dialog_cflags=""
11c606a6 (kx 2023-04-11 01:18:34 +0300 185) + dialog_ldflags=""
11c606a6 (kx 2023-04-11 01:18:34 +0300 186) + dialog_libs=""
11c606a6 (kx 2023-04-11 01:18:34 +0300 187) + if test ".$with_dialog" = .yes; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 188) + # via config script in $PATH
11c606a6 (kx 2023-04-11 01:18:34 +0300 189) + changequote(, )dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 190) + dialog_version=`($DIALOG_CONFIG --version) 2>/dev/null |\
11c606a6 (kx 2023-04-11 01:18:34 +0300 191) + sed -e 's/^.*\([0-9]\.[0-9]*[-][0-9]*\).*$/\1/'`
11c606a6 (kx 2023-04-11 01:18:34 +0300 192) + changequote([, ])dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 193) + if test ".$dialog_version" != .; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 194) + dialog_location=`$DIALOG_CONFIG --prefix`
11c606a6 (kx 2023-04-11 01:18:34 +0300 195) + dialog_type='installed'
11c606a6 (kx 2023-04-11 01:18:34 +0300 196) + dialog_cflags=`$DIALOG_CONFIG --cflags`
11c606a6 (kx 2023-04-11 01:18:34 +0300 197) + dialog_ldflags=`$DIALOG_CONFIG --ldflags`
11c606a6 (kx 2023-04-11 01:18:34 +0300 198) + dialog_libs=`$DIALOG_CONFIG --libs`
11c606a6 (kx 2023-04-11 01:18:34 +0300 199) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 200) + elif test -d "$with_dialog"; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 201) + with_dialog=`echo $with_dialog | sed -e 's;/*$;;'`
11c606a6 (kx 2023-04-11 01:18:34 +0300 202) + dialog_found=no
11c606a6 (kx 2023-04-11 01:18:34 +0300 203) + # via config script under a specified directory
11c606a6 (kx 2023-04-11 01:18:34 +0300 204) + # (a standard installation, but not a source tree)
11c606a6 (kx 2023-04-11 01:18:34 +0300 205) + if test ".$dialog_found" = .no; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 206) + for _dir in $with_dialog/bin $with_dialog; do
11c606a6 (kx 2023-04-11 01:18:34 +0300 207) + if test -f "$_dir/dialog-config"; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 208) + test -f "$_dir/dialog-config.in" && continue # dialog-config in source tree!
11c606a6 (kx 2023-04-11 01:18:34 +0300 209) + changequote(, )dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 210) + dialog_version=`($_dir/dialog-config --version) 2>/dev/null |\
11c606a6 (kx 2023-04-11 01:18:34 +0300 211) + sed -e 's/^.*\([0-9]\.[0-9]*[.][0-9]*\).*$/\1/'`
11c606a6 (kx 2023-04-11 01:18:34 +0300 212) + changequote([, ])dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 213) + if test ".$dialog_version" != .; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 214) + dialog_location=`$_dir/dialog-config --prefix`
11c606a6 (kx 2023-04-11 01:18:34 +0300 215) + dialog_type="installed"
11c606a6 (kx 2023-04-11 01:18:34 +0300 216) + dialog_cflags=`$_dir/dialog-config --cflags`
11c606a6 (kx 2023-04-11 01:18:34 +0300 217) + dialog_ldflags=`$_dir/dialog-config --ldflags`
11c606a6 (kx 2023-04-11 01:18:34 +0300 218) + dialog_libs=`$_dir/dialog-config --libs`
11c606a6 (kx 2023-04-11 01:18:34 +0300 219) + dialog_found=yes
11c606a6 (kx 2023-04-11 01:18:34 +0300 220) + break
11c606a6 (kx 2023-04-11 01:18:34 +0300 221) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 222) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 223) + done
11c606a6 (kx 2023-04-11 01:18:34 +0300 224) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 225) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 226) + _AC_DIALOG_VERBOSE([+ Determined Location:])
11c606a6 (kx 2023-04-11 01:18:34 +0300 227) + _AC_DIALOG_VERBOSE([ o path: $dialog_location])
11c606a6 (kx 2023-04-11 01:18:34 +0300 228) + _AC_DIALOG_VERBOSE([ o type: $dialog_type])
11c606a6 (kx 2023-04-11 01:18:34 +0300 229) + if test ".$dialog_version" = .; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 230) + if test ".$with_dialog" != .yes; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 231) + _AC_DIALOG_ERROR([dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 232) + Unable to locate dialog under $with_dialog.
11c606a6 (kx 2023-04-11 01:18:34 +0300 233) + Please specify the correct path to either a dialog installation tree
11c606a6 (kx 2023-04-11 01:18:34 +0300 234) + (use --with-dialog=DIR if you used --prefix=DIR for installing dialog in
11c606a6 (kx 2023-04-11 01:18:34 +0300 235) + the past).])
11c606a6 (kx 2023-04-11 01:18:34 +0300 236) + else
11c606a6 (kx 2023-04-11 01:18:34 +0300 237) + _AC_DIALOG_ERROR([dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 238) + Unable to locate dialog in any system-wide location (see \$PATH).
11c606a6 (kx 2023-04-11 01:18:34 +0300 239) + Please specify the correct path to either a dialog installation tree
11c606a6 (kx 2023-04-11 01:18:34 +0300 240) + (use --with-dialog=DIR if you used --prefix=DIR for installing dialog in
11c606a6 (kx 2023-04-11 01:18:34 +0300 241) + the past, or set the DIALOG_CONFIG environment variable to the full path
11c606a6 (kx 2023-04-11 01:18:34 +0300 242) + to dialog-config).])
11c606a6 (kx 2023-04-11 01:18:34 +0300 243) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 244) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 245) + dnl ========================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 246) + dnl Check whether the found version is sufficiently new
11c606a6 (kx 2023-04-11 01:18:34 +0300 247) + dnl ========================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 248) + _req_version="ifelse([$1],,1.0.0,$1)"
11c606a6 (kx 2023-04-11 01:18:34 +0300 249) + for _var in dialog_version _req_version; do
11c606a6 (kx 2023-04-11 01:18:34 +0300 250) + eval "_val=\"\$${_var}\""
11c606a6 (kx 2023-04-11 01:18:34 +0300 251) + _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[.]]\)\([[0-9]]*\)/\1/'`
11c606a6 (kx 2023-04-11 01:18:34 +0300 252) + _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[.]]\)\([[0-9]]*\)/\2/'`
11c606a6 (kx 2023-04-11 01:18:34 +0300 253) + _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[.]]\)\([[0-9]]*\)/\4/'`
11c606a6 (kx 2023-04-11 01:18:34 +0300 254) + _hex=`echo dummy | awk '{ printf("%d%02d%02d", major, minor, micro); }' \
11c606a6 (kx 2023-04-11 01:18:34 +0300 255) + "major=$_major" "minor=$_minor" "micro=$_micro"`
11c606a6 (kx 2023-04-11 01:18:34 +0300 256) + eval "${_var}_hex=\"\$_hex\""
11c606a6 (kx 2023-04-11 01:18:34 +0300 257) + done
11c606a6 (kx 2023-04-11 01:18:34 +0300 258) + _AC_DIALOG_VERBOSE([+ Determined Versions:])
11c606a6 (kx 2023-04-11 01:18:34 +0300 259) + _AC_DIALOG_VERBOSE([ o existing: $dialog_version -> 0x$dialog_version_hex])
11c606a6 (kx 2023-04-11 01:18:34 +0300 260) + _AC_DIALOG_VERBOSE([ o required: $_req_version -> 0x$_req_version_hex])
11c606a6 (kx 2023-04-11 01:18:34 +0300 261) + _ok=0
11c606a6 (kx 2023-04-11 01:18:34 +0300 262) + if test ".$dialog_version_hex" != .; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 263) + if test ".$_req_version_hex" != .; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 264) + if test $dialog_version_hex -ge $_req_version_hex; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 265) + _ok=1
11c606a6 (kx 2023-04-11 01:18:34 +0300 266) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 267) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 268) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 269) + if test ".$_ok" = .0; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 270) + _AC_DIALOG_ERROR([dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 271) + Found dialog version $dialog_version, but required at least version $_req_version.
11c606a6 (kx 2023-04-11 01:18:34 +0300 272) + Upgrade dialog under $dialog_location to $_req_version or higher first, please.])
11c606a6 (kx 2023-04-11 01:18:34 +0300 273) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 274) + dnl ========================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 275) + dnl Perform dialog Sanity Compile Check
11c606a6 (kx 2023-04-11 01:18:34 +0300 276) + dnl ========================================================
11c606a6 (kx 2023-04-11 01:18:34 +0300 277) + if test ".$with_dialog_test" = .yes; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 278) + _ac_save_CFLAGS="$CFLAGS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 279) + _ac_save_LDFLAGS="$LDFLAGS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 280) + _ac_save_LIBS="$LIBS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 281) + CFLAGS="$CFLAGS $dialog_cflags"
11c606a6 (kx 2023-04-11 01:18:34 +0300 282) + LDFLAGS="$LDFLAGS $dialog_ldflags"
11c606a6 (kx 2023-04-11 01:18:34 +0300 283) + LIBS="$LIBS $dialog_libs"
11c606a6 (kx 2023-04-11 01:18:34 +0300 284) + _AC_DIALOG_VERBOSE([+ Test Build Environment:])
11c606a6 (kx 2023-04-11 01:18:34 +0300 285) + _AC_DIALOG_VERBOSE([ o CFLAGS=\"$CFLAGS\"])
11c606a6 (kx 2023-04-11 01:18:34 +0300 286) + _AC_DIALOG_VERBOSE([ o LDFLAGS=\"$LDFLAGS\"])
11c606a6 (kx 2023-04-11 01:18:34 +0300 287) + _AC_DIALOG_VERBOSE([ o LIBS=\"$LIBS\"])
11c606a6 (kx 2023-04-11 01:18:34 +0300 288) + cross_compile=no
11c606a6 (kx 2023-04-11 01:18:34 +0300 289) + define(_code1, [dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 290) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 291) +#include <stdlib.h>
11c606a6 (kx 2023-04-11 01:18:34 +0300 292) +#include <stdio.h>
11c606a6 (kx 2023-04-11 01:18:34 +0300 293) +#include <strings.h> /* index(3) */
11c606a6 (kx 2023-04-11 01:18:34 +0300 294) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 295) +#include <dialog.h>
11c606a6 (kx 2023-04-11 01:18:34 +0300 296) +#include <dlg_colors.h>
11c606a6 (kx 2023-04-11 01:18:34 +0300 297) +#include <dlg_keys.h>
11c606a6 (kx 2023-04-11 01:18:34 +0300 298) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 299) + ])
11c606a6 (kx 2023-04-11 01:18:34 +0300 300) + define(_code2, [dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 301) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 302) +int main( void )
11c606a6 (kx 2023-04-11 01:18:34 +0300 303) +{
11c606a6 (kx 2023-04-11 01:18:34 +0300 304) + int status = 0;
11c606a6 (kx 2023-04-11 01:18:34 +0300 305) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 306) + bzero( (void *)&dialog_vars, sizeof(DIALOG_VARS) );
11c606a6 (kx 2023-04-11 01:18:34 +0300 307) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 308) + init_dialog(stdin, stdout);
11c606a6 (kx 2023-04-11 01:18:34 +0300 309) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 310) + dialog_vars.colors = 1;
11c606a6 (kx 2023-04-11 01:18:34 +0300 311) + dialog_vars.backtitle = "\\Z7Test\\Zn \\Z1dialog\\Zn \\Z7Library\\Zn";
11c606a6 (kx 2023-04-11 01:18:34 +0300 312) + dialog_vars.dlg_clear_screen = 1;
11c606a6 (kx 2023-04-11 01:18:34 +0300 313) + dialog_vars.sleep_secs = 1;
11c606a6 (kx 2023-04-11 01:18:34 +0300 314) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 315) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 316) + dlg_put_backtitle();
11c606a6 (kx 2023-04-11 01:18:34 +0300 317) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 318) + /*************************************************
11c606a6 (kx 2023-04-11 01:18:34 +0300 319) + Ruler: 68 characters + 2 spaces left and right:
11c606a6 (kx 2023-04-11 01:18:34 +0300 320) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 321) + | ----handy-ruler----------------------------------------------------- | */
11c606a6 (kx 2023-04-11 01:18:34 +0300 322) + status = dialog_msgbox( " \\Z4Dialog ==>\\Zn\\Z1libdialog\\Zn\\Z4<== [required]\\Zn ",
11c606a6 (kx 2023-04-11 01:18:34 +0300 323) + "\nPackage is installed and corect.\n",
11c606a6 (kx 2023-04-11 01:18:34 +0300 324) + 5, 72, 0 );
11c606a6 (kx 2023-04-11 01:18:34 +0300 325) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 326) + if( dialog_vars.sleep_secs )
11c606a6 (kx 2023-04-11 01:18:34 +0300 327) + (void)napms(dialog_vars.sleep_secs * 1000);
11c606a6 (kx 2023-04-11 01:18:34 +0300 328) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 329) + if( dialog_vars.dlg_clear_screen )
11c606a6 (kx 2023-04-11 01:18:34 +0300 330) + {
11c606a6 (kx 2023-04-11 01:18:34 +0300 331) + dlg_clear();
11c606a6 (kx 2023-04-11 01:18:34 +0300 332) + (void)refresh();
11c606a6 (kx 2023-04-11 01:18:34 +0300 333) + }
11c606a6 (kx 2023-04-11 01:18:34 +0300 334) + end_dialog();
11c606a6 (kx 2023-04-11 01:18:34 +0300 335) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 336) + exit( 0 );
11c606a6 (kx 2023-04-11 01:18:34 +0300 337) +}
11c606a6 (kx 2023-04-11 01:18:34 +0300 338) + ])
11c606a6 (kx 2023-04-11 01:18:34 +0300 339) + _AC_DIALOG_VERBOSE([+ Performing Sanity Checks:])
11c606a6 (kx 2023-04-11 01:18:34 +0300 340) + _AC_DIALOG_VERBOSE([ o pre-processor test])
11c606a6 (kx 2023-04-11 01:18:34 +0300 341) + AC_TRY_CPP(_code1, _ok=yes, _ok=no)
11c606a6 (kx 2023-04-11 01:18:34 +0300 342) + if test ".$_ok" != .yes; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 343) + _AC_DIALOG_ERROR([dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 344) + Found dialog $dialog_version under $dialog_location, but
11c606a6 (kx 2023-04-11 01:18:34 +0300 345) + was unable to perform a sanity pre-processor check. This means
11c606a6 (kx 2023-04-11 01:18:34 +0300 346) + the dialog header dialog.h was not found.
11c606a6 (kx 2023-04-11 01:18:34 +0300 347) + We used the following build environment:
11c606a6 (kx 2023-04-11 01:18:34 +0300 348) + >> CPP="$CPP"
11c606a6 (kx 2023-04-11 01:18:34 +0300 349) + See config.log for possibly more details.])
11c606a6 (kx 2023-04-11 01:18:34 +0300 350) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 351) + _AC_DIALOG_VERBOSE([ o link check])
11c606a6 (kx 2023-04-11 01:18:34 +0300 352) + AC_TRY_LINK(_code1, _code2, _ok=yes, _ok=no)
11c606a6 (kx 2023-04-11 01:18:34 +0300 353) + if test ".$_ok" != .yes; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 354) + _AC_DIALOG_ERROR([dnl
11c606a6 (kx 2023-04-11 01:18:34 +0300 355) + Found dialog $dialog_version under $dialog_location, but
11c606a6 (kx 2023-04-11 01:18:34 +0300 356) + was unable to perform a sanity linker check. This means
11c606a6 (kx 2023-04-11 01:18:34 +0300 357) + the dialog library libdialog.a was not found.
11c606a6 (kx 2023-04-11 01:18:34 +0300 358) + We used the following build environment:
11c606a6 (kx 2023-04-11 01:18:34 +0300 359) + >> CC="$CC"
11c606a6 (kx 2023-04-11 01:18:34 +0300 360) + >> CFLAGS="$CFLAGS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 361) + >> LDFLAGS="$LDFLAGS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 362) + >> LIBS="$LIBS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 363) + See config.log for possibly more details.])
11c606a6 (kx 2023-04-11 01:18:34 +0300 364) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 365) + _extendvars="ifelse([$4],,yes,$4)"
11c606a6 (kx 2023-04-11 01:18:34 +0300 366) + if test ".$_extendvars" != .yes; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 367) + CFLAGS="$_ac_save_CFLAGS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 368) + LDFLAGS="$_ac_save_LDFLAGS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 369) + LIBS="$_ac_save_LIBS"
11c606a6 (kx 2023-04-11 01:18:34 +0300 370) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 371) + else
11c606a6 (kx 2023-04-11 01:18:34 +0300 372) + _extendvars="ifelse([$4],,yes,$4)"
11c606a6 (kx 2023-04-11 01:18:34 +0300 373) + if test ".$_extendvars" = .yes; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 374) + if test ".$dialog_subdir" = .yes; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 375) + CFLAGS="$CFLAGS $dialog_cflags"
11c606a6 (kx 2023-04-11 01:18:34 +0300 376) + LDFLAGS="$LDFLAGS $dialog_ldflags"
11c606a6 (kx 2023-04-11 01:18:34 +0300 377) + LIBS="$LIBS $dialog_libs"
11c606a6 (kx 2023-04-11 01:18:34 +0300 378) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 379) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 380) + fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 381) + DIALOG_CFLAGS="$dialog_cflags"
11c606a6 (kx 2023-04-11 01:18:34 +0300 382) + DIALOG_LDFLAGS="$dialog_ldflags"
11c606a6 (kx 2023-04-11 01:18:34 +0300 383) + DIALOG_LIBS="$dialog_libs"
11c606a6 (kx 2023-04-11 01:18:34 +0300 384) + AC_SUBST(DIALOG_CFLAGS)
11c606a6 (kx 2023-04-11 01:18:34 +0300 385) + AC_SUBST(DIALOG_LDFLAGS)
11c606a6 (kx 2023-04-11 01:18:34 +0300 386) + AC_SUBST(DIALOG_LIBS)
11c606a6 (kx 2023-04-11 01:18:34 +0300 387) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 388) + AC_SUBST(HAVE_DIALOG, [1])
11c606a6 (kx 2023-04-11 01:18:34 +0300 389) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 390) + AC_CHECK_HEADERS(dialog.h dlg_colors.h dlg_keys.h)
11c606a6 (kx 2023-04-11 01:18:34 +0300 391) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 392) + _AC_DIALOG_VERBOSE([+ Final Results:])
11c606a6 (kx 2023-04-11 01:18:34 +0300 393) + _AC_DIALOG_VERBOSE([ o DIALOG_CFLAGS=\"$DIALOG_CFLAGS\"])
11c606a6 (kx 2023-04-11 01:18:34 +0300 394) + _AC_DIALOG_VERBOSE([ o DIALOG_LDFLAGS=\"$DIALOG_LDFLAGS\"])
11c606a6 (kx 2023-04-11 01:18:34 +0300 395) + _AC_DIALOG_VERBOSE([ o DIALOG_LIBS=\"$DIALOG_LIBS\"])
11c606a6 (kx 2023-04-11 01:18:34 +0300 396) +fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 397) +if test ".$with_dialog" != .no; then
11c606a6 (kx 2023-04-11 01:18:34 +0300 398) + AC_MSG_CHECKING(for libdialog)
11c606a6 (kx 2023-04-11 01:18:34 +0300 399) + AC_MSG_RESULT([version $dialog_version, $dialog_type under $dialog_location])
11c606a6 (kx 2023-04-11 01:18:34 +0300 400) + ifelse([$5], , :, [$5])
11c606a6 (kx 2023-04-11 01:18:34 +0300 401) +else
11c606a6 (kx 2023-04-11 01:18:34 +0300 402) + AC_MSG_CHECKING(for libdialog)
11c606a6 (kx 2023-04-11 01:18:34 +0300 403) + AC_MSG_RESULT([no])
11c606a6 (kx 2023-04-11 01:18:34 +0300 404) + ifelse([$6], , :, [$6])
11c606a6 (kx 2023-04-11 01:18:34 +0300 405) +fi
11c606a6 (kx 2023-04-11 01:18:34 +0300 406) +])
11c606a6 (kx 2023-04-11 01:18:34 +0300 407) +
11c606a6 (kx 2023-04-11 01:18:34 +0300 408) diff -b --unified -Nr dialog-1.3-20190724-orig/fselect.c dialog-1.3-20190724/fselect.c
11c606a6 (kx 2023-04-11 01:18:34 +0300 409) --- dialog-1.3-20190724-orig/fselect.c 2019-07-25 02:40:15.000000000 +0300
11c606a6 (kx 2023-04-11 01:18:34 +0300 410) +++ dialog-1.3-20190724/fselect.c 2019-07-26 14:14:01.063282363 +0300
11c606a6 (kx 2023-04-11 01:18:34 +0300 411) @@ -639,7 +639,7 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 412) dlg_print_size(height, width);
11c606a6 (kx 2023-04-11 01:18:34 +0300 413) dlg_ctl_size(height, width);
11c606a6 (kx 2023-04-11 01:18:34 +0300 414)
11c606a6 (kx 2023-04-11 01:18:34 +0300 415) - dialog = dlg_new_window(height, width,
11c606a6 (kx 2023-04-11 01:18:34 +0300 416) + dialog = dlg_new_window(height + 1, width,
11c606a6 (kx 2023-04-11 01:18:34 +0300 417) dlg_box_y_ordinate(height),
11c606a6 (kx 2023-04-11 01:18:34 +0300 418) dlg_box_x_ordinate(width));
11c606a6 (kx 2023-04-11 01:18:34 +0300 419) dlg_register_window(dialog, "fselect", binding);
11c606a6 (kx 2023-04-11 01:18:34 +0300 420) @@ -647,7 +647,7 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 421)
11c606a6 (kx 2023-04-11 01:18:34 +0300 422) dlg_mouse_setbase(0, 0);
11c606a6 (kx 2023-04-11 01:18:34 +0300 423)
11c606a6 (kx 2023-04-11 01:18:34 +0300 424) - dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr);
11c606a6 (kx 2023-04-11 01:18:34 +0300 425) + dlg_draw_box2(dialog, 0, 0, height + 1, width, dialog_attr, border_attr, border2_attr);
11c606a6 (kx 2023-04-11 01:18:34 +0300 426) dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr);
11c606a6 (kx 2023-04-11 01:18:34 +0300 427) dlg_draw_title(dialog, title);
11c606a6 (kx 2023-04-11 01:18:34 +0300 428)
11c606a6 (kx 2023-04-11 01:18:34 +0300 429) @@ -656,7 +656,7 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 430) /* Draw the input field box */
11c606a6 (kx 2023-04-11 01:18:34 +0300 431) tbox_height = 1;
11c606a6 (kx 2023-04-11 01:18:34 +0300 432) tbox_width = width - (4 * MARGIN + 2);
11c606a6 (kx 2023-04-11 01:18:34 +0300 433) - tbox_y = height - (BTN_HIGH * 2) + MARGIN;
11c606a6 (kx 2023-04-11 01:18:34 +0300 434) + tbox_y = height - (BTN_HIGH * 2) + MARGIN + 1;
11c606a6 (kx 2023-04-11 01:18:34 +0300 435) tbox_x = (width - tbox_width) / 2;
11c606a6 (kx 2023-04-11 01:18:34 +0300 436)
11c606a6 (kx 2023-04-11 01:18:34 +0300 437) w_text = derwin(dialog, tbox_height, tbox_width, tbox_y, tbox_x);
11c606a6 (kx 2023-04-11 01:18:34 +0300 438) @@ -683,7 +683,7 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 439) else
11c606a6 (kx 2023-04-11 01:18:34 +0300 440) dbox_width = (width - (6 * MARGIN + 2 * EXT_WIDE)) / 2;
11c606a6 (kx 2023-04-11 01:18:34 +0300 441) dbox_height = height - MIN_HIGH;
11c606a6 (kx 2023-04-11 01:18:34 +0300 442) - dbox_y = (2 * MARGIN + 1);
11c606a6 (kx 2023-04-11 01:18:34 +0300 443) + dbox_y = (2 * MARGIN + 2);
11c606a6 (kx 2023-04-11 01:18:34 +0300 444) dbox_x = tbox_x;
11c606a6 (kx 2023-04-11 01:18:34 +0300 445)
11c606a6 (kx 2023-04-11 01:18:34 +0300 446) w_work = derwin(dialog, dbox_height, dbox_width, dbox_y, dbox_x);
11c606a6 (kx 2023-04-11 01:18:34 +0300 447) @@ -743,7 +743,7 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 448) if (show_buttons) {
11c606a6 (kx 2023-04-11 01:18:34 +0300 449) show_buttons = FALSE;
11c606a6 (kx 2023-04-11 01:18:34 +0300 450) button = (state < 0) ? 0 : state;
11c606a6 (kx 2023-04-11 01:18:34 +0300 451) - dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
11c606a6 (kx 2023-04-11 01:18:34 +0300 452) + dlg_draw_buttons(dialog, height - 1, 0, buttons, button, FALSE, width);
11c606a6 (kx 2023-04-11 01:18:34 +0300 453) }
11c606a6 (kx 2023-04-11 01:18:34 +0300 454)
11c606a6 (kx 2023-04-11 01:18:34 +0300 455) if (first_trace) {
11c606a6 (kx 2023-04-11 01:18:34 +0300 456) diff -b --unified -Nr dialog-1.3-20190724-orig/menubox.c dialog-1.3-20190724/menubox.c
11c606a6 (kx 2023-04-11 01:18:34 +0300 457) --- dialog-1.3-20190724-orig/menubox.c 2019-07-25 02:42:20.000000000 +0300
11c606a6 (kx 2023-04-11 01:18:34 +0300 458) +++ dialog-1.3-20190724/menubox.c 2019-07-26 14:14:01.063282363 +0300
11c606a6 (kx 2023-04-11 01:18:34 +0300 459) @@ -48,7 +48,7 @@
11c606a6 (kx 2023-04-11 01:18:34 +0300 460) int item_no;
11c606a6 (kx 2023-04-11 01:18:34 +0300 461) } ALL_DATA;
11c606a6 (kx 2023-04-11 01:18:34 +0300 462)
11c606a6 (kx 2023-04-11 01:18:34 +0300 463) -#define MIN_HIGH (1 + (5 * MARGIN))
11c606a6 (kx 2023-04-11 01:18:34 +0300 464) +#define MIN_HIGH 4
11c606a6 (kx 2023-04-11 01:18:34 +0300 465)
11c606a6 (kx 2023-04-11 01:18:34 +0300 466) #define INPUT_ROWS 3 /* rows per inputmenu entry */
11c606a6 (kx 2023-04-11 01:18:34 +0300 467)
Radix cross Linux package tools
Package Tools – is a set of utilities to create, install, and update RcL packages
3 Commits
0 Branches
2 Tags