summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--XCalc.ad2
-rw-r--r--math.c7
-rw-r--r--xcalc.man4
3 files changed, 6 insertions, 7 deletions
diff --git a/XCalc.ad b/XCalc.ad
index 0107978..3520633 100644
--- a/XCalc.ad
+++ b/XCalc.ad
@@ -1,4 +1,5 @@
! $XConsortium: XCalc.ad,v 1.13 94/03/03 19:19:32 converse Exp $
+! $XFree86: xc/programs/xcalc/XCalc.ad,v 1.3 2003/10/24 20:38:14 tsi Exp $
! XCalc application class resource file
XCalc.Title: Calculator
@@ -76,6 +77,7 @@ XCalc*ti.bevel.screen.LCD.translations: #replace\n\
<Key>KP_Add:add()\n\
<Key>KP_Subtract:subtract()\n\
<Key>KP_Decimal:decimal()\n\
+ <Key>KP_Separator:decimal()\n\
<Key>KP_Divide:divide()\n\
<Key>KP_Tab:equal()\n\
<Key>Clear:clear()\n\
diff --git a/math.c b/math.c
index 5823aee..c1da78e 100644
--- a/math.c
+++ b/math.c
@@ -1,5 +1,5 @@
/* $XConsortium: math.c,v 1.17 91/07/25 17:51:34 rws Exp $
- * $XFree86: xc/programs/xcalc/math.c,v 1.5 2001/10/28 03:34:26 tsi Exp $
+ * $XFree86: xc/programs/xcalc/math.c,v 1.6 2003/05/27 22:26:59 tsi Exp $
*
* math.c - mathematics functions for a hand calculator under X
*
@@ -96,10 +96,8 @@ static int entered=1; /* true if display contains a valid number.
static int lift_enabled = 0; /* for rpn mode only */
static int CLR =0; /* CLR clears display. if 1, clears acc, also */
-static int OFF =0; /* once clears mem, twice quits */
static int Dpoint=0; /* to prevent using decimal pt twice in a # */
static int clrdisp=1; /* if true clears display before entering # */
-static int accset =0;
static int lastop =kCLR;
static int memop =kCLR;
static int exponent=0;
@@ -159,7 +157,6 @@ int pre_op(keynum)
}
if (keynum != kCLR) CLR=0;
- if (keynum != kOFF) OFF=0;
return(0);
}
@@ -845,7 +842,7 @@ offf(void)
if (rpn)
for (i=1; i < XCALC_MEMORY; i++)
mem[i]=0.0;
- accset=exponent=Dpoint=0;
+ exponent=Dpoint=0;
DrawDisplay();
}
diff --git a/xcalc.man b/xcalc.man
index 3f367bd..150378a 100644
--- a/xcalc.man
+++ b/xcalc.man
@@ -25,7 +25,7 @@
.\" other dealings in this Software without prior written authorization
.\" from the X Consortium.
.\"
-.\" $XFree86: xc/programs/xcalc/xcalc.man,v 1.4 2002/10/12 16:06:46 herrb Exp $
+.\" $XFree86: xc/programs/xcalc/xcalc.man,v 1.5 2003/03/19 01:49:28 dawes Exp $
.\"
.de EX \"Begin example
.ne 5
@@ -428,7 +428,7 @@ X(__miscmansuffix__), xrdb(1), the Athena Widget Set
HP mode: A bug report claims that the sequence of keys 5, ENTER, <-
should clear the display, but it doesn't.
.SH COPYRIGHT
-Copyright ([\d,\s]*) X Consortium
+Copyright 1994 X Consortium
.br
See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
.SH AUTHORS