mirror of https://codeberg.org/cage/tinmop/
- used a keyword as the value that signals that a command has been cancleled instrad of 'nil'.
This commit is contained in:
parent
0943736c81
commit
3f888888aa
|
@ -1,6 +1,6 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.71 for tinmop 0.9.9.14142135.
|
# Generated by GNU Autoconf 2.71 for tinmop 0.9.9.141421356-rc1.
|
||||||
#
|
#
|
||||||
# Report bugs to <https://codeberg.org/cage/tinmop/>.
|
# Report bugs to <https://codeberg.org/cage/tinmop/>.
|
||||||
#
|
#
|
||||||
|
@ -611,8 +611,8 @@ MAKEFLAGS=
|
||||||
# Identity of this package.
|
# Identity of this package.
|
||||||
PACKAGE_NAME='tinmop'
|
PACKAGE_NAME='tinmop'
|
||||||
PACKAGE_TARNAME='tinmop'
|
PACKAGE_TARNAME='tinmop'
|
||||||
PACKAGE_VERSION='0.9.9.14142135'
|
PACKAGE_VERSION='0.9.9.141421356-rc1'
|
||||||
PACKAGE_STRING='tinmop 0.9.9.14142135'
|
PACKAGE_STRING='tinmop 0.9.9.141421356-rc1'
|
||||||
PACKAGE_BUGREPORT='https://codeberg.org/cage/tinmop/'
|
PACKAGE_BUGREPORT='https://codeberg.org/cage/tinmop/'
|
||||||
PACKAGE_URL='https://www.autistici.org/interzona/tinmop.html'
|
PACKAGE_URL='https://www.autistici.org/interzona/tinmop.html'
|
||||||
|
|
||||||
|
@ -1318,7 +1318,7 @@ if test "$ac_init_help" = "long"; then
|
||||||
# Omit some internal or obsolete options to make the list less imposing.
|
# Omit some internal or obsolete options to make the list less imposing.
|
||||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||||
cat <<_ACEOF
|
cat <<_ACEOF
|
||||||
\`configure' configures tinmop 0.9.9.14142135 to adapt to many kinds of systems.
|
\`configure' configures tinmop 0.9.9.141421356-rc1 to adapt to many kinds of systems.
|
||||||
|
|
||||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||||
|
|
||||||
|
@ -1389,7 +1389,7 @@ fi
|
||||||
|
|
||||||
if test -n "$ac_init_help"; then
|
if test -n "$ac_init_help"; then
|
||||||
case $ac_init_help in
|
case $ac_init_help in
|
||||||
short | recursive ) echo "Configuration of tinmop 0.9.9.14142135:";;
|
short | recursive ) echo "Configuration of tinmop 0.9.9.141421356-rc1:";;
|
||||||
esac
|
esac
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
|
@ -1494,7 +1494,7 @@ fi
|
||||||
test -n "$ac_init_help" && exit $ac_status
|
test -n "$ac_init_help" && exit $ac_status
|
||||||
if $ac_init_version; then
|
if $ac_init_version; then
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
tinmop configure 0.9.9.14142135
|
tinmop configure 0.9.9.141421356-rc1
|
||||||
generated by GNU Autoconf 2.71
|
generated by GNU Autoconf 2.71
|
||||||
|
|
||||||
Copyright (C) 2021 Free Software Foundation, Inc.
|
Copyright (C) 2021 Free Software Foundation, Inc.
|
||||||
|
@ -1698,7 +1698,7 @@ cat >config.log <<_ACEOF
|
||||||
This file contains any messages produced by compilers while
|
This file contains any messages produced by compilers while
|
||||||
running configure, to aid debugging if configure makes a mistake.
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
|
|
||||||
It was created by tinmop $as_me 0.9.9.14142135, which was
|
It was created by tinmop $as_me 0.9.9.141421356-rc1, which was
|
||||||
generated by GNU Autoconf 2.71. Invocation command line was
|
generated by GNU Autoconf 2.71. Invocation command line was
|
||||||
|
|
||||||
$ $0$ac_configure_args_raw
|
$ $0$ac_configure_args_raw
|
||||||
|
@ -2960,7 +2960,7 @@ fi
|
||||||
|
|
||||||
# Define the identity of the package.
|
# Define the identity of the package.
|
||||||
PACKAGE='tinmop'
|
PACKAGE='tinmop'
|
||||||
VERSION='0.9.9.14142135'
|
VERSION='0.9.9.141421356-rc1'
|
||||||
|
|
||||||
|
|
||||||
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
|
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
|
||||||
|
@ -8446,7 +8446,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||||
# report actual input values of CONFIG_FILES etc. instead of their
|
# report actual input values of CONFIG_FILES etc. instead of their
|
||||||
# values after options handling.
|
# values after options handling.
|
||||||
ac_log="
|
ac_log="
|
||||||
This file was extended by tinmop $as_me 0.9.9.14142135, which was
|
This file was extended by tinmop $as_me 0.9.9.141421356-rc1, which was
|
||||||
generated by GNU Autoconf 2.71. Invocation command line was
|
generated by GNU Autoconf 2.71. Invocation command line was
|
||||||
|
|
||||||
CONFIG_FILES = $CONFIG_FILES
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
|
@ -8506,7 +8506,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||||
ac_cs_config='$ac_cs_config_escaped'
|
ac_cs_config='$ac_cs_config_escaped'
|
||||||
ac_cs_version="\\
|
ac_cs_version="\\
|
||||||
tinmop config.status 0.9.9.14142135
|
tinmop config.status 0.9.9.141421356-rc1
|
||||||
configured by $0, generated by GNU Autoconf 2.71,
|
configured by $0, generated by GNU Autoconf 2.71,
|
||||||
with options \\"\$ac_cs_config\\"
|
with options \\"\$ac_cs_config\\"
|
||||||
|
|
||||||
|
|
|
@ -235,7 +235,7 @@ Returns nil if the user did not provided a server in the configuration file"
|
||||||
(save-credentials ()
|
(save-credentials ()
|
||||||
(let* ((message (_ "Please enter below the file where to save the address"))
|
(let* ((message (_ "Please enter below the file where to save the address"))
|
||||||
(filepath (ui:input-dialog-immediate message)))
|
(filepath (ui:input-dialog-immediate message)))
|
||||||
(when (not (eq filepath :canceled))
|
(when (not (windows:input-dialog-canceled-p filepath))
|
||||||
(cond
|
(cond
|
||||||
((null filepath)
|
((null filepath)
|
||||||
(save-credentials))
|
(save-credentials))
|
||||||
|
|
|
@ -16,6 +16,8 @@
|
||||||
|
|
||||||
(in-package :command-window)
|
(in-package :command-window)
|
||||||
|
|
||||||
|
(define-constant +user-input-event-canceled+ :canceled :test #'eq)
|
||||||
|
|
||||||
(defclass command-window (wrapper-window point-tracker)
|
(defclass command-window (wrapper-window point-tracker)
|
||||||
((command-line
|
((command-line
|
||||||
:initform ()
|
:initform ()
|
||||||
|
@ -481,7 +483,7 @@ command line."
|
||||||
(program-events:condition-variable event-to-answer))))
|
(program-events:condition-variable event-to-answer))))
|
||||||
(setf (box:dunbox (program-events:payload input-done-event))
|
(setf (box:dunbox (program-events:payload input-done-event))
|
||||||
(if canceled
|
(if canceled
|
||||||
:canceled
|
+user-input-event-canceled+
|
||||||
command-line))
|
command-line))
|
||||||
(program-events:push-event input-done-event))))
|
(program-events:push-event input-done-event))))
|
||||||
|
|
||||||
|
|
|
@ -1999,6 +1999,7 @@
|
||||||
(:local-nicknames (:c :croatoan)
|
(:local-nicknames (:c :croatoan)
|
||||||
(:c-dlg #:de.anvi.croatoan.dialog))
|
(:c-dlg #:de.anvi.croatoan.dialog))
|
||||||
(:export
|
(:export
|
||||||
|
:input-dialog-canceled-p
|
||||||
:key-config-holder
|
:key-config-holder
|
||||||
:key-config
|
:key-config
|
||||||
:tree-holder
|
:tree-holder
|
||||||
|
@ -2658,6 +2659,7 @@
|
||||||
(:import-from :keybindings-window :update-keybindings-tree)
|
(:import-from :keybindings-window :update-keybindings-tree)
|
||||||
(:local-nicknames (:c :croatoan))
|
(:local-nicknames (:c :croatoan))
|
||||||
(:export
|
(:export
|
||||||
|
:+user-input-event-canceled+
|
||||||
:print-error
|
:print-error
|
||||||
:command-window
|
:command-window
|
||||||
:command-line
|
:command-line
|
||||||
|
|
|
@ -182,10 +182,10 @@
|
||||||
(title (_ "Error"))
|
(title (_ "Error"))
|
||||||
(append-ok-button t))
|
(append-ok-button t))
|
||||||
(let ((dialog-window (windows:make-error-message-dialog *main-window*
|
(let ((dialog-window (windows:make-error-message-dialog *main-window*
|
||||||
title
|
title
|
||||||
message
|
message
|
||||||
buttons
|
buttons
|
||||||
append-ok-button)))
|
append-ok-button)))
|
||||||
(windows:menu-select dialog-window)))
|
(windows:menu-select dialog-window)))
|
||||||
|
|
||||||
(defun input-dialog-immediate (message)
|
(defun input-dialog-immediate (message)
|
||||||
|
@ -249,9 +249,10 @@
|
||||||
(condition-wait condition-variable lock))
|
(condition-wait condition-variable lock))
|
||||||
(setf (command-window:echo-character *command-window*) nil)
|
(setf (command-window:echo-character *command-window*) nil)
|
||||||
(let ((input-string (box:dunbox (payload event))))
|
(let ((input-string (box:dunbox (payload event))))
|
||||||
(if (stringp input-string)
|
(if (eq input-string
|
||||||
(funcall on-input-complete-fn input-string)
|
command-window:+user-input-event-canceled+)
|
||||||
(info-message (_ "Command cancelled")))))))))
|
(info-message (_ "Command cancelled"))
|
||||||
|
(funcall on-input-complete-fn input-string))))))))
|
||||||
(make-thread #'thread-fn)))
|
(make-thread #'thread-fn)))
|
||||||
|
|
||||||
(defun thread-go-up ()
|
(defun thread-go-up ()
|
||||||
|
|
|
@ -16,6 +16,11 @@
|
||||||
|
|
||||||
(in-package :windows)
|
(in-package :windows)
|
||||||
|
|
||||||
|
(define-constant +input-dialog-selected-cancel+ :cancel :test #'eq)
|
||||||
|
|
||||||
|
(defun input-dialog-canceled-p (results)
|
||||||
|
(eq results +input-dialog-selected-cancel+))
|
||||||
|
|
||||||
(defclass key-config-holder ()
|
(defclass key-config-holder ()
|
||||||
((key-config
|
((key-config
|
||||||
:initform nil
|
:initform nil
|
||||||
|
@ -654,7 +659,7 @@ inserted by the user"
|
||||||
(setf (c:cursor-visible-p screen-low-level) nil)
|
(setf (c:cursor-visible-p screen-low-level) nil)
|
||||||
(win-close window)
|
(win-close window)
|
||||||
(if (null res)
|
(if (null res)
|
||||||
:canceled
|
+input-dialog-selected-cancel+
|
||||||
(c:value field))))))
|
(c:value field))))))
|
||||||
|
|
||||||
(defun make-checklist-dialog (screen parent title options)
|
(defun make-checklist-dialog (screen parent title options)
|
||||||
|
|
Loading…
Reference in New Issue