Radix cross Linux Package Tools

Package Tools – is a set of utilities to create, install, and update RcL packages

8 Commits   0 Branches   2 Tags
     5         kx diff --unified -Nr dialog-1.3-20210117-orig/checklist.c dialog-1.3-20210117/checklist.c
     5         kx --- dialog-1.3-20210117-orig/checklist.c	2020-11-23 03:37:47.000000000 +0300
     5         kx +++ dialog-1.3-20210117/checklist.c	2021-02-14 20:14:51.095326506 +0300
     5         kx @@ -29,7 +29,7 @@
     5         kx  #include <dialog.h>
     5         kx  #include <dlg_keys.h>
     5         kx  
     5         kx -#define MIN_HIGH  (1 + (5 * MARGIN))
     5         kx +#define MIN_HIGH  4
     5         kx  
     5         kx  typedef struct {
     5         kx      /* the outer-window */
     5         kx diff --unified -Nr dialog-1.3-20210117-orig/dialog-config.in dialog-1.3-20210117/dialog-config.in
     5         kx --- dialog-1.3-20210117-orig/dialog-config.in	2019-09-26 03:50:46.000000000 +0300
     5         kx +++ dialog-1.3-20210117/dialog-config.in	2021-02-14 20:14:51.095326506 +0300
     5         kx @@ -79,7 +79,7 @@
     5         kx  		[ -n "$LFLAGS" ] && LDFLAGS=" $LFDLAGS"
     5         kx  		LDFLAGS="-L${libdir}$LDFLAGS"
     5         kx  	fi
     5         kx -	[ -z "$LDFLAGS" ] && LDFLAGS="-L${exec_prefix}/lib"
     5         kx +	[ -z "$LDFLAGS" ] && LDFLAGS="-L${libdir}"
     5         kx  
     5         kx  	# Ignore -L options which do not correspond to an actual directory,
     5         kx  	# or which are standard library directories (i.e., the linker is
     5         kx @@ -133,10 +133,7 @@
     5         kx  		;;
     5         kx  	# compile/link
     5         kx  	--cflags|--cflags-only-I)
     5         kx -		INCS=
     5         kx -		if test "$includedir" != /usr/include ; then
     5         kx -			INCS="-I$includedir"
     5         kx -		fi
     5         kx +		INCS="-I$includedir"
     5         kx  		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
     5         kx  			$INCS
     5         kx  ENDECHO
     5         kx @@ -145,6 +142,18 @@
     5         kx  		# no -D/-U options should be needed
     5         kx  		echo
     5         kx  		;;
     5         kx +	--ldflags)
     5         kx +		OPTS=
     5         kx +		for opt in $LDFLAGS $LIBS
     5         kx +		do
     5         kx +			case "x$opt" in
     5         kx +			x-[^l]*)
     5         kx +				OPTS="$OPTS $opt"
     5         kx +				;;
     5         kx +			esac
     5         kx +		done
     5         kx +		printf "%s\n" "$OPTS"
     5         kx +		;;
     5         kx  	--libs)
     5         kx  		OPTS=
     5         kx  		for opt in $lib_flags
     5         kx @@ -227,8 +236,9 @@
     5         kx    --exec-prefix=ARG  sets the executable-prefix of ${THIS}
     5         kx  
     5         kx    --cflags           echos the C compiler flags needed to compile with ${THIS}
     5         kx -  --libs             echos the libraries needed to link with ${THIS}
     5         kx +  --ldflags          echos the linker flags needed to link with ${THIS}
     5         kx  
     5         kx +  --libs             echos the libraries needed to link with ${THIS}
     5         kx    --libs-only-L      echos -L linker options (search path) for ${THIS}
     5         kx    --libs-only-l      echos -l linker options (libraries) for ${THIS}
     5         kx    --libs-only-other  echos linker options other than -L/-l
     5         kx diff --unified -Nr dialog-1.3-20210117-orig/dialog.m4 dialog-1.3-20210117/dialog.m4
     5         kx --- dialog-1.3-20210117-orig/dialog.m4	1970-01-01 03:00:00.000000000 +0300
     5         kx +++ dialog-1.3-20210117/dialog.m4	2021-02-14 20:14:51.095326506 +0300
     5         kx @@ -0,0 +1,332 @@
     5         kx +dnl #
     5         kx +dnl # /usr/share/aclocal/dialog.m4
     5         kx +dnl #
     5         kx +dnl # Configure paths for dialog
     5         kx +dnl # Andrew V.Kosteltsev
     5         kx +
     5         kx +dnl ============================================================
     5         kx +dnl
     5         kx +dnl  Synopsis:
     5         kx +dnl     AC_CHECK_DIALOG([MIN-VERSION [,                  # minimum dialog version, e.g. 1.3-20190211
     5         kx +dnl                           DEFAULT-WITH-DIALOG [,     # default value for --with-dialog option
     5         kx +dnl                           DEFAULT-WITH-DIALOG-TEST [,# default value for --with-dialog-test option
     5         kx +dnl                           EXTEND-VARS [,                  # whether CFLAGS/LDFLAGS/etc are extended
     5         kx +dnl                           ACTION-IF-FOUND [,              # action to perform if dialog was found
     5         kx +dnl                           ACTION-IF-NOT-FOUND             # action to perform if dialog was not found
     5         kx +dnl                          ]]]]]])
     5         kx +dnl  Examples:
     5         kx +dnl     AC_CHECK_DIALOG(1.3-20210117)
     5         kx +dnl     AC_CHECK_DIALOG(1.3-20210117,,,no,CFLAGS="$CFLAGS -DHAVE_DIALOG $DIALOG_CFLAGS")
     5         kx +dnl     AC_CHECK_DIALOG(1.3-20210117,yes,yes,yes,CFLAGS="$CFLAGS -DHAVE_DIALOG")
     5         kx +dnl
     5         kx +dnl
     5         kx +dnl  If you have to change prefix returned by dialog-config script or change
     5         kx +dnl  location of dialog-config, you may set environment variable DIALOG_CONFIG,
     5         kx +dnl  for example:
     5         kx +dnl
     5         kx +dnl  # export DIALOG_CONFIG="dialog-config --prefix=/usr/local"
     5         kx +dnl  # export DIALOG_CONFIG="/usr/bin/dialog-config --prefix=/usr/local"
     5         kx +dnl
     5         kx +dnl ============================================================
     5         kx +dnl
     5         kx +dnl ============================================================
     5         kx +dnl  auxilliary macros
     5         kx +dnl ============================================================
     5         kx +AC_DEFUN([_AC_DIALOG_ERROR], [dnl
     5         kx +AC_MSG_RESULT([*FAILED*])
     5         kx +cat <<EOT | sed -e 's/^[[ 	]]*/ | /' -e 's/>>/  /' 1>&2
     5         kx +$1
     5         kx +EOT
     5         kx +exit 1
     5         kx +])
     5         kx +
     5         kx +AC_DEFUN([_AC_DIALOG_VERBOSE], [dnl
     5         kx +if test ".$verbose" = .yes; then
     5         kx +    AC_MSG_RESULT([  $1])
     5         kx +fi
     5         kx +])
     5         kx +
     5         kx +dnl ============================================================
     5         kx +dnl  the user macro
     5         kx +dnl ============================================================
     5         kx +AC_DEFUN([AC_CHECK_DIALOG], [dnl
     5         kx +dnl
     5         kx +dnl ============================================================
     5         kx +dnl  prerequisites
     5         kx +dnl ============================================================
     5         kx +AC_REQUIRE([AC_PROG_CC])dnl
     5         kx +AC_REQUIRE([AC_PROG_CPP])dnl
     5         kx +dnl
     5         kx +dnl ============================================================
     5         kx +dnl  set DIALOG_CONFIG variable
     5         kx +dnl ============================================================
     5         kx +if test -z "$DIALOG_CONFIG"; then
     5         kx +  DIALOG_CONFIG='dialog-config'
     5         kx +fi
     5         kx +dnl
     5         kx +DIALOG_CFLAGS=''
     5         kx +DIALOG_LDFLAGS=''
     5         kx +DIALOG_LIBS=''
     5         kx +AC_SUBST(DIALOG_CFLAGS)
     5         kx +AC_SUBST(DIALOG_LDFLAGS)
     5         kx +AC_SUBST(DIALOG_LIBS)
     5         kx +dnl
     5         kx +dnl ============================================================
     5         kx +dnl  command line options
     5         kx +dnl ============================================================
     5         kx +_AC_DIALOG_VERBOSE([])
     5         kx +AC_ARG_WITH(dialog,dnl
     5         kx +[  --with-dialog[=ARG]       Build with dialog Library  (default=]ifelse([$2],,yes,$2)[)],dnl
     5         kx +,dnl
     5         kx +with_dialog="ifelse([$2],,yes,$2)"
     5         kx +)dnl
     5         kx +AC_ARG_WITH(dialog-test,dnl
     5         kx +[  --with-dialog-test      Perform dialog Sanity Test (default=]ifelse([$3],,yes,$3)[)],dnl
     5         kx +,dnl
     5         kx +with_dialog_test="ifelse([$3],,yes,$3)"
     5         kx +)dnl
     5         kx +_AC_DIALOG_VERBOSE([+ Command Line Options:])
     5         kx +_AC_DIALOG_VERBOSE([    o --with-dialog=$with_dialog])
     5         kx +_AC_DIALOG_VERBOSE([    o --with-dialog-test=$with_dialog_test])
     5         kx +dnl
     5         kx +dnl ============================================================
     5         kx +dnl  configuration
     5         kx +dnl ============================================================
     5         kx +if test ".$with_dialog" != .no; then
     5         kx +    dialog_subdir=no
     5         kx +    dialog_subdir_opts=''
     5         kx +    case "$with_dialog" in
     5         kx +        subdir:* )
     5         kx +            dialog_subdir=yes
     5         kx +            changequote(, )dnl
     5         kx +            dialog_subdir_opts=`echo $with_dialog | sed -e 's/^subdir:[^ 	]*[ 	]*//'`
     5         kx +            with_dialog=`echo $with_dialog | sed -e 's/^subdir:\([^ 	]*\).*$/\1/'`
     5         kx +            changequote([, ])dnl
     5         kx +            ;;
     5         kx +    esac
     5         kx +    dialog_version=""
     5         kx +    dialog_location=""
     5         kx +    dialog_type=""
     5         kx +    dialog_cflags=""
     5         kx +    dialog_ldflags=""
     5         kx +    dialog_libs=""
     5         kx +    if test ".$with_dialog" = .yes; then
     5         kx +        #   via config script in $PATH
     5         kx +        changequote(, )dnl
     5         kx +        dialog_version=`($DIALOG_CONFIG --version) 2>/dev/null |\
     5         kx +                      sed -e 's/^.*\([0-9]\.[0-9]*[-][0-9]*\).*$/\1/'`
     5         kx +        changequote([, ])dnl
     5         kx +        if test ".$dialog_version" != .; then
     5         kx +            dialog_location=`$DIALOG_CONFIG --prefix`
     5         kx +            dialog_type='installed'
     5         kx +            dialog_cflags=`$DIALOG_CONFIG --cflags`
     5         kx +            dialog_ldflags=`$DIALOG_CONFIG --ldflags`
     5         kx +            dialog_libs=`$DIALOG_CONFIG --libs`
     5         kx +        fi
     5         kx +    elif test -d "$with_dialog"; then
     5         kx +        with_dialog=`echo $with_dialog | sed -e 's;/*$;;'`
     5         kx +        dialog_found=no
     5         kx +        #   via config script under a specified directory
     5         kx +        #   (a standard installation, but not a source tree)
     5         kx +        if test ".$dialog_found" = .no; then
     5         kx +            for _dir in $with_dialog/bin $with_dialog; do
     5         kx +                if test -f "$_dir/dialog-config"; then
     5         kx +                    test -f "$_dir/dialog-config.in" && continue # dialog-config in source tree!
     5         kx +                    changequote(, )dnl
     5         kx +                    dialog_version=`($_dir/dialog-config --version) 2>/dev/null |\
     5         kx +                                  sed -e 's/^.*\([0-9]\.[0-9]*[.][0-9]*\).*$/\1/'`
     5         kx +                    changequote([, ])dnl
     5         kx +                    if test ".$dialog_version" != .; then
     5         kx +                        dialog_location=`$_dir/dialog-config --prefix`
     5         kx +                        dialog_type="installed"
     5         kx +                        dialog_cflags=`$_dir/dialog-config --cflags`
     5         kx +                        dialog_ldflags=`$_dir/dialog-config --ldflags`
     5         kx +                        dialog_libs=`$_dir/dialog-config --libs`
     5         kx +                        dialog_found=yes
     5         kx +                        break
     5         kx +                    fi
     5         kx +                fi
     5         kx +            done
     5         kx +        fi
     5         kx +    fi
     5         kx +    _AC_DIALOG_VERBOSE([+ Determined Location:])
     5         kx +    _AC_DIALOG_VERBOSE([    o path: $dialog_location])
     5         kx +    _AC_DIALOG_VERBOSE([    o type: $dialog_type])
     5         kx +    if test ".$dialog_version" = .; then
     5         kx +        if test ".$with_dialog" != .yes; then
     5         kx +             _AC_DIALOG_ERROR([dnl
     5         kx +             Unable to locate dialog under $with_dialog.
     5         kx +             Please specify the correct path to either a dialog installation tree
     5         kx +             (use --with-dialog=DIR if you used --prefix=DIR for installing dialog in
     5         kx +             the past).])
     5         kx +        else
     5         kx +             _AC_DIALOG_ERROR([dnl
     5         kx +             Unable to locate dialog in any system-wide location (see \$PATH).
     5         kx +             Please specify the correct path to either a dialog installation tree
     5         kx +             (use --with-dialog=DIR if you used --prefix=DIR for installing dialog in
     5         kx +             the past, or set the DIALOG_CONFIG environment variable to the full path
     5         kx +             to dialog-config).])
     5         kx +        fi
     5         kx +    fi
     5         kx +    dnl ========================================================
     5         kx +    dnl  Check whether the found version is sufficiently new
     5         kx +    dnl ========================================================
     5         kx +    _req_version="ifelse([$1],,1.0.0,$1)"
     5         kx +    for _var in dialog_version _req_version; do
     5         kx +        eval "_val=\"\$${_var}\""
     5         kx +        _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[.]]\)\([[0-9]]*\)/\1/'`
     5         kx +        _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[.]]\)\([[0-9]]*\)/\2/'`
     5         kx +        _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[.]]\)\([[0-9]]*\)/\4/'`
     5         kx +        _hex=`echo dummy | awk '{ printf("%d%02d%02d", major, minor, micro); }' \
     5         kx +              "major=$_major" "minor=$_minor" "micro=$_micro"`
     5         kx +        eval "${_var}_hex=\"\$_hex\""
     5         kx +    done
     5         kx +    _AC_DIALOG_VERBOSE([+ Determined Versions:])
     5         kx +    _AC_DIALOG_VERBOSE([    o existing: $dialog_version -> 0x$dialog_version_hex])
     5         kx +    _AC_DIALOG_VERBOSE([    o required: $_req_version -> 0x$_req_version_hex])
     5         kx +    _ok=0
     5         kx +    if test ".$dialog_version_hex" != .; then
     5         kx +        if test ".$_req_version_hex" != .; then
     5         kx +            if test $dialog_version_hex -ge $_req_version_hex; then
     5         kx +                _ok=1
     5         kx +            fi
     5         kx +        fi
     5         kx +    fi
     5         kx +    if test ".$_ok" = .0; then
     5         kx +        _AC_DIALOG_ERROR([dnl
     5         kx +        Found dialog version $dialog_version, but required at least version $_req_version.
     5         kx +        Upgrade dialog under $dialog_location to $_req_version or higher first, please.])
     5         kx +    fi
     5         kx +    dnl ========================================================
     5         kx +    dnl  Perform dialog Sanity Compile Check
     5         kx +    dnl ========================================================
     5         kx +    if test ".$with_dialog_test" = .yes; then
     5         kx +        _ac_save_CFLAGS="$CFLAGS"
     5         kx +        _ac_save_LDFLAGS="$LDFLAGS"
     5         kx +        _ac_save_LIBS="$LIBS"
     5         kx +        CFLAGS="$CFLAGS $dialog_cflags"
     5         kx +        LDFLAGS="$LDFLAGS $dialog_ldflags"
     5         kx +        LIBS="$LIBS $dialog_libs"
     5         kx +        _AC_DIALOG_VERBOSE([+ Test Build Environment:])
     5         kx +        _AC_DIALOG_VERBOSE([    o CFLAGS=\"$CFLAGS\"])
     5         kx +        _AC_DIALOG_VERBOSE([    o LDFLAGS=\"$LDFLAGS\"])
     5         kx +        _AC_DIALOG_VERBOSE([    o LIBS=\"$LIBS\"])
     5         kx +        cross_compile=no
     5         kx +        define(_code1, [dnl
     5         kx +
     5         kx +#include <stdlib.h>
     5         kx +#include <stdio.h>
     5         kx +#include <strings.h>  /* index(3)    */
     5         kx +
     5         kx +#include <dialog.h>
     5         kx +#include <dlg_colors.h>
     5         kx +#include <dlg_keys.h>
     5         kx +
     5         kx +        ])
     5         kx +        define(_code2, [dnl
     5         kx +
     5         kx +int main( void )
     5         kx +{
     5         kx +  int status = 0;
     5         kx +
     5         kx +  bzero( (void *)&dialog_vars, sizeof(DIALOG_VARS) );
     5         kx +
     5         kx +  init_dialog(stdin, stdout);
     5         kx +
     5         kx +  dialog_vars.colors = 1;
     5         kx +  dialog_vars.backtitle = "\\Z7Test\\Zn \\Z1dialog\\Zn \\Z7Library\\Zn";
     5         kx +  dialog_vars.dlg_clear_screen = 1;
     5         kx +  dialog_vars.sleep_secs = 1;
     5         kx +
     5         kx +
     5         kx +  dlg_put_backtitle();
     5         kx +
     5         kx +  /*************************************************
     5         kx +    Ruler: 68 characters + 2 spaces left and right:
     5         kx +
     5         kx +                           | ----handy-ruler----------------------------------------------------- | */
     5         kx +  status = dialog_msgbox( " \\Z4Dialog ==>\\Zn\\Z1libdialog\\Zn\\Z4<== [required]\\Zn ",
     5         kx +                          "\nPackage is installed and corect.\n",
     5         kx +                          5, 72, 0 );
     5         kx +
     5         kx +  if( dialog_vars.sleep_secs )
     5         kx +    (void)napms(dialog_vars.sleep_secs * 1000);
     5         kx +
     5         kx +  if( dialog_vars.dlg_clear_screen )
     5         kx +  {
     5         kx +    dlg_clear();
     5         kx +    (void)refresh();
     5         kx +  }
     5         kx +  end_dialog();
     5         kx +
     5         kx +  exit( 0 );
     5         kx +}
     5         kx +        ])
     5         kx +        _AC_DIALOG_VERBOSE([+ Performing Sanity Checks:])
     5         kx +        _AC_DIALOG_VERBOSE([    o pre-processor test])
     5         kx +        AC_TRY_CPP(_code1, _ok=yes, _ok=no)
     5         kx +        if test ".$_ok" != .yes; then
     5         kx +            _AC_DIALOG_ERROR([dnl
     5         kx +            Found dialog $dialog_version under $dialog_location, but
     5         kx +            was unable to perform a sanity pre-processor check. This means
     5         kx +            the dialog header dialog.h was not found.
     5         kx +            We used the following build environment:
     5         kx +            >> CPP="$CPP"
     5         kx +            See config.log for possibly more details.])
     5         kx +        fi
     5         kx +        _AC_DIALOG_VERBOSE([    o link check])
     5         kx +        AC_TRY_LINK(_code1, _code2, _ok=yes, _ok=no)
     5         kx +        if test ".$_ok" != .yes; then
     5         kx +            _AC_DIALOG_ERROR([dnl
     5         kx +            Found dialog $dialog_version under $dialog_location, but
     5         kx +            was unable to perform a sanity linker check. This means
     5         kx +            the dialog library libdialog.a was not found.
     5         kx +            We used the following build environment:
     5         kx +            >> CC="$CC"
     5         kx +            >> CFLAGS="$CFLAGS"
     5         kx +            >> LDFLAGS="$LDFLAGS"
     5         kx +            >> LIBS="$LIBS"
     5         kx +            See config.log for possibly more details.])
     5         kx +        fi
     5         kx +        _extendvars="ifelse([$4],,yes,$4)"
     5         kx +        if test ".$_extendvars" != .yes; then
     5         kx +            CFLAGS="$_ac_save_CFLAGS"
     5         kx +            LDFLAGS="$_ac_save_LDFLAGS"
     5         kx +            LIBS="$_ac_save_LIBS"
     5         kx +        fi
     5         kx +    else
     5         kx +        _extendvars="ifelse([$4],,yes,$4)"
     5         kx +        if test ".$_extendvars" = .yes; then
     5         kx +            if test ".$dialog_subdir" = .yes; then
     5         kx +                CFLAGS="$CFLAGS $dialog_cflags"
     5         kx +                LDFLAGS="$LDFLAGS $dialog_ldflags"
     5         kx +                LIBS="$LIBS $dialog_libs"
     5         kx +            fi
     5         kx +        fi
     5         kx +    fi
     5         kx +    DIALOG_CFLAGS="$dialog_cflags"
     5         kx +    DIALOG_LDFLAGS="$dialog_ldflags"
     5         kx +    DIALOG_LIBS="$dialog_libs"
     5         kx +    AC_SUBST(DIALOG_CFLAGS)
     5         kx +    AC_SUBST(DIALOG_LDFLAGS)
     5         kx +    AC_SUBST(DIALOG_LIBS)
     5         kx +
     5         kx +    AC_SUBST(HAVE_DIALOG, [1])
     5         kx +
     5         kx +    AC_CHECK_HEADERS(dialog.h dlg_colors.h dlg_keys.h)
     5         kx +
     5         kx +    _AC_DIALOG_VERBOSE([+ Final Results:])
     5         kx +    _AC_DIALOG_VERBOSE([    o DIALOG_CFLAGS=\"$DIALOG_CFLAGS\"])
     5         kx +    _AC_DIALOG_VERBOSE([    o DIALOG_LDFLAGS=\"$DIALOG_LDFLAGS\"])
     5         kx +    _AC_DIALOG_VERBOSE([    o DIALOG_LIBS=\"$DIALOG_LIBS\"])
     5         kx +fi
     5         kx +if test ".$with_dialog" != .no; then
     5         kx +    AC_MSG_CHECKING(for libdialog)
     5         kx +    AC_MSG_RESULT([version $dialog_version, $dialog_type under $dialog_location])
     5         kx +    ifelse([$5], , :, [$5])
     5         kx +else
     5         kx +    AC_MSG_CHECKING(for libdialog)
     5         kx +    AC_MSG_RESULT([no])
     5         kx +    ifelse([$6], , :, [$6])
     5         kx +fi
     5         kx +])
     5         kx diff --unified -Nr dialog-1.3-20210117-orig/fselect.c dialog-1.3-20210117/fselect.c
     5         kx --- dialog-1.3-20210117-orig/fselect.c	2021-01-16 20:19:15.000000000 +0300
     5         kx +++ dialog-1.3-20210117/fselect.c	2021-02-14 20:14:51.095326506 +0300
     5         kx @@ -650,7 +650,7 @@
     5         kx      dlg_print_size(height, width);
     5         kx      dlg_ctl_size(height, width);
     5         kx  
     5         kx -    dialog = dlg_new_window(height, width,
     5         kx +    dialog = dlg_new_window(height + 1, width,
     5         kx  			    dlg_box_y_ordinate(height),
     5         kx  			    dlg_box_x_ordinate(width));
     5         kx      dlg_register_window(dialog, "fselect", binding);
     5         kx @@ -658,7 +658,7 @@
     5         kx  
     5         kx      dlg_mouse_setbase(0, 0);
     5         kx  
     5         kx -    dlg_draw_box2(dialog, 0, 0, height, width, dialog_attr, border_attr, border2_attr);
     5         kx +    dlg_draw_box2(dialog, 0, 0, height + 1, width, dialog_attr, border_attr, border2_attr);
     5         kx      dlg_draw_bottom_box2(dialog, border_attr, border2_attr, dialog_attr);
     5         kx      dlg_draw_title(dialog, title);
     5         kx  
     5         kx @@ -667,7 +667,7 @@
     5         kx      /* Draw the input field box */
     5         kx      tbox_height = 1;
     5         kx      tbox_width = width - (4 * MARGIN + 2);
     5         kx -    tbox_y = height - (BTN_HIGH * 2) + MARGIN;
     5         kx +    tbox_y = height - (BTN_HIGH * 2) + MARGIN + 1;
     5         kx      tbox_x = (width - tbox_width) / 2;
     5         kx  
     5         kx      w_text = dlg_der_window(dialog, tbox_height, tbox_width, tbox_y, tbox_x);
     5         kx @@ -693,7 +693,7 @@
     5         kx      else
     5         kx  	dbox_width = (width - (6 * MARGIN + 2 * EXT_WIDE)) / 2;
     5         kx      dbox_height = height - MIN_HIGH;
     5         kx -    dbox_y = (2 * MARGIN + 1);
     5         kx +    dbox_y = (2 * MARGIN + 2);
     5         kx      dbox_x = tbox_x;
     5         kx  
     5         kx      w_work = dlg_der_window(dialog, dbox_height, dbox_width, dbox_y, dbox_x);
     5         kx @@ -751,7 +751,7 @@
     5         kx  	if (show_buttons) {
     5         kx  	    show_buttons = FALSE;
     5         kx  	    button = (state < 0) ? 0 : state;
     5         kx -	    dlg_draw_buttons(dialog, height - 2, 0, buttons, button, FALSE, width);
     5         kx +	    dlg_draw_buttons(dialog, height - 1, 0, buttons, button, FALSE, width);
     5         kx  	}
     5         kx  
     5         kx  	if (first_trace) {
     5         kx diff --unified -Nr dialog-1.3-20210117-orig/menubox.c dialog-1.3-20210117/menubox.c
     5         kx --- dialog-1.3-20210117-orig/menubox.c	2020-11-24 00:03:11.000000000 +0300
     5         kx +++ dialog-1.3-20210117/menubox.c	2021-02-14 20:14:51.095326506 +0300
     5         kx @@ -48,7 +48,7 @@
     5         kx      int item_no;
     5         kx  } ALL_DATA;
     5         kx  
     5         kx -#define MIN_HIGH  (1 + (5 * MARGIN))
     5         kx +#define MIN_HIGH  4
     5         kx  
     5         kx  #define INPUT_ROWS     3	/* rows per inputmenu entry */
     5         kx