aboutsummaryrefslogtreecommitdiff
path: root/apps/xcalc
diff options
context:
space:
mode:
Diffstat (limited to 'apps/xcalc')
-rw-r--r--apps/xcalc/actions.h16
-rw-r--r--apps/xcalc/makefile36
-rw-r--r--apps/xcalc/xcalc.c18
3 files changed, 47 insertions, 23 deletions
diff --git a/apps/xcalc/actions.h b/apps/xcalc/actions.h
index 69f1983a5..741b36597 100644
--- a/apps/xcalc/actions.h
+++ b/apps/xcalc/actions.h
@@ -36,14 +36,14 @@ from the X Consortium.
*/
extern void
- add(), back(), bell(), clearit(), cosine(), decimal(),
- degree(), digit(), divide(), e(), enter(), epower(), equal(),
- exchange(), factorial(),
- inverse(), leftParen(), logarithm(), multiply(), naturalLog(),
- negate(), nop(), off(), pi(), power(), quit(), recall(),
- reciprocal(), rightParen(), roll(), scientific(), selection(), sine(),
- square(), squareRoot(), store(), subtract(), sum(),
- tangent(), tenpower(), XexchangeY();
+ add(Widget,XEvent*,String*,Cardinal*), back(Widget,XEvent*,String*,Cardinal*), bell(Widget,XEvent*,String*,Cardinal*), clearit(Widget,XEvent*,String*,Cardinal*), cosine(Widget,XEvent*,String*,Cardinal*), decimal(Widget,XEvent*,String*,Cardinal*),
+ degree(Widget,XEvent*,String*,Cardinal*), digit(Widget,XEvent*,String*,Cardinal*), divide(Widget,XEvent*,String*,Cardinal*), e(Widget,XEvent*,String*,Cardinal*), enter(Widget,XEvent*,String*,Cardinal*), epower(Widget,XEvent*,String*,Cardinal*), equal(Widget,XEvent*,String*,Cardinal*),
+ exchange(Widget,XEvent*,String*,Cardinal*), factorial(Widget,XEvent*,String*,Cardinal*),
+ inverse(Widget,XEvent*,String*,Cardinal*), leftParen(Widget,XEvent*,String*,Cardinal*), logarithm(Widget,XEvent*,String*,Cardinal*), multiply(Widget,XEvent*,String*,Cardinal*), naturalLog(Widget,XEvent*,String*,Cardinal*),
+ negate(Widget,XEvent*,String*,Cardinal*), nop(Widget,XEvent*,String*,Cardinal*), off(Widget,XEvent*,String*,Cardinal*), pi(Widget,XEvent*,String*,Cardinal*), power(Widget,XEvent*,String*,Cardinal*), quit(Widget,XEvent*,String*,Cardinal*), recall(Widget,XEvent*,String*,Cardinal*),
+ reciprocal(Widget,XEvent*,String*,Cardinal*), rightParen(Widget,XEvent*,String*,Cardinal*), roll(Widget,XEvent*,String*,Cardinal*), scientific(Widget,XEvent*,String*,Cardinal*), selection(Widget,XEvent*,String*,Cardinal*), sine(Widget,XEvent*,String*,Cardinal*),
+ square(Widget,XEvent*,String*,Cardinal*), squareRoot(Widget,XEvent*,String*,Cardinal*), store(Widget,XEvent*,String*,Cardinal*), subtract(Widget,XEvent*,String*,Cardinal*), sum(Widget,XEvent*,String*,Cardinal*),
+ tangent(Widget,XEvent*,String*,Cardinal*), tenpower(Widget,XEvent*,String*,Cardinal*), XexchangeY(Widget,XEvent*,String*,Cardinal*);
/*
* calculator action table
diff --git a/apps/xcalc/makefile b/apps/xcalc/makefile
new file mode 100644
index 000000000..5288e202d
--- /dev/null
+++ b/apps/xcalc/makefile
@@ -0,0 +1,36 @@
+WINAPP = xcalc
+
+DEFINES += XT_NO_SM IEEE
+
+INCLUDELIBFILES = \
+ $(MHMAKECONF)\libXt\src\$(OBJDIR)\libXt.lib \
+ $(MHMAKECONF)\libX11\src\xkb\$(OBJDIR)\libxkb.lib \
+ $(MHMAKECONF)\libX11\src\xcms\$(OBJDIR)\libxcms.lib \
+ $(MHMAKECONF)\libx11\src\xlibi18n\$(OBJDIR)\libi18n.lib \
+ $(MHMAKECONF)\libx11\modules\lc\xlocale\$(OBJDIR)\libxlocale.lib \
+ $(MHMAKECONF)\libx11\modules\lc\utf8\$(OBJDIR)\libxlcUTF8Load.lib \
+ $(MHMAKECONF)\libx11\modules\lc\def\$(OBJDIR)\libxlcDef.lib \
+ $(MHMAKECONF)\libx11\modules\om\generic\$(OBJDIR)\libxomGeneric.lib \
+ $(MHMAKECONF)\libx11\modules\lc\gen\$(OBJDIR)\liblcGenConvLoad.lib \
+ $(MHMAKECONF)\libx11\modules\im\ximcp\$(OBJDIR)\libximcp.lib \
+ $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \
+ $(MHMAKECONF)\libxpm\src\$(OBJDIR)\libxpm.lib \
+ $(MHMAKECONF)\libxau\$(OBJDIR)\libxau.lib \
+ $(MHMAKECONF)\libXaw\src\$(OBJDIR)\libXaw.lib \
+ $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \
+ $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \
+ $(MHMAKECONF)\libX11\src\$(OBJDIR)\libX11.lib
+LIBDIRS=$(dir $(INCLUDELIBFILES))
+
+load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);)
+
+ifeq ($(DEBUG),1)
+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2d.lib
+else
+LINKLIBS += $(MHMAKECONF)\pthreads\pthreadVC2.lib
+endif
+
+CSRCS = \
+ actions.c \
+ math.c \
+ xcalc.c
diff --git a/apps/xcalc/xcalc.c b/apps/xcalc/xcalc.c
index 0f943115a..5c9bc632a 100644
--- a/apps/xcalc/xcalc.c
+++ b/apps/xcalc/xcalc.c
@@ -339,14 +339,7 @@ void Syntax(argc, argv)
*/
/*ARGSUSED*/
-Boolean convert(w, selection, target, type, value, length, format)
- Widget w;
- Atom *selection;
- Atom *target;
- Atom *type;
- XtPointer *value;
- unsigned long *length;
- int *format;
+Boolean convert(Widget w, Atom *selection, Atom *target, Atom *type, XtPointer *value, unsigned long *length, int *format)
{
if (*target == XA_STRING)
{
@@ -364,9 +357,7 @@ Boolean convert(w, selection, target, type, value, length, format)
* called when xcalc loses ownership of the selection.
*/
/*ARGSUSED*/
-void lose(w, selection)
- Widget w;
- Atom *selection;
+void lose(Widget w, Atom *selection)
{
XawToggleUnsetCurrent(LCD);
}
@@ -375,10 +366,7 @@ void lose(w, selection)
* called when some other client got the selection.
*/
/*ARGSUSED*/
-void done(w, selection, target)
- Widget w;
- Atom *selection;
- Atom *target;
+void done(Widget w, Atom *selection, Atom *target)
{
selstr[0] = '\0';
}