aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--TODO3
-rw-r--r--hcalc.18
-rw-r--r--hcalc.rst6
4 files changed, 7 insertions, 12 deletions
diff --git a/CHANGES b/CHANGES
index 7cddba0..313ac8a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -35,3 +35,5 @@ Version 1.2u1, 2024/01/02:
sizes).
- Add a 'make install' target, which will install the binary, icons,
man page, and .desktop file (with DESTDIR support for packagers).
+- Show "err" for floating point error (e.g. divide by zero), and wait
+ for the user to press CLR to continue.
diff --git a/TODO b/TODO
index 4d91ae7..443bb43 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,3 @@
-- Handle floating point exceptions, e.g. div by zero. See
- https://wiki.sei.cmu.edu/confluence/display/c/FLP03-C.+Detect+and+handle+floating-point+errors
- and man pages fetestexcept(3) and math_error(7).
- On startup, the value is read from the config file... but it can't
be used as an argument to a binary op (only a unary one) if it's
more than one digit. Except sometimes it can. Investigate and fix.
diff --git a/hcalc.1 b/hcalc.1
index 9f91b9c..c7eddc9 100644
--- a/hcalc.1
+++ b/hcalc.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
-.TH "HCALC" 1 "2024-01-03" "1.2u1" "Urchlay's Misc Stuff"
+.TH "HCALC" 1 "2024-01-04" "1.2u1" "Urchlay's Misc Stuff"
.SH NAME
hcalc \- graphical hex calculator
.\" RST source for hcalc(1) man page. Convert with:
@@ -99,10 +99,8 @@ In hex mode, the number in the display will always be prefixed with
"0x". In octal mode, it will always be prefixed with "0". In decimal
mode, there is no prefix.
.sp
-In case of error (e.g. division by zero), the display will show a
-lowercase "f" in decimal mode, or only the prefix in hex or octal
-mode, or all 0 bits in binary mode. When this happens, you may have to
-press \fBCLR\fP or \fBEscape\fP to recover.
+In case of error (e.g. division by zero), the display will show \fBerr\fP,
+and you\(aqll have to press \fICLR\fP to continue.
.SH MOUSE
.sp
Mouse operation is simple: for the most part, just click on the
diff --git a/hcalc.rst b/hcalc.rst
index b54e6ed..3bd0bef 100644
--- a/hcalc.rst
+++ b/hcalc.rst
@@ -84,10 +84,8 @@ In hex mode, the number in the display will always be prefixed with
"0x". In octal mode, it will always be prefixed with "0". In decimal
mode, there is no prefix.
-In case of error (e.g. division by zero), the display will show a
-lowercase "f" in decimal mode, or only the prefix in hex or octal
-mode, or all 0 bits in binary mode. When this happens, you may have to
-press **CLR** or **Escape** to recover.
+In case of error (e.g. division by zero), the display will show **err**,
+and you'll have to press *CLR* to continue.
MOUSE
=====