summaryrefslogtreecommitdiff
path: root/lisp/modules
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/modules')
-rw-r--r--lisp/modules/psql.c6
-rw-r--r--lisp/modules/x11.c34
-rw-r--r--lisp/modules/xaw.c7
-rw-r--r--lisp/modules/xt.c26
4 files changed, 37 insertions, 36 deletions
diff --git a/lisp/modules/psql.c b/lisp/modules/psql.c
index 6945947..fc112fc 100644
--- a/lisp/modules/psql.c
+++ b/lisp/modules/psql.c
@@ -27,15 +27,15 @@
* Author: Paulo César Pereira de Andrade
*/
-/* $XFree86: xc/programs/xedit/lisp/modules/psql.c,v 1.12 2002/11/23 08:26:52 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/modules/psql.c,v 1.13 2003/04/27 18:17:37 tsi Exp $ */
#include <stdlib.h>
#include <libpq-fe.h>
#undef USE_SSL /* cannot get it to compile... */
#include <postgres.h>
#include <utils/geo_decls.h>
-#include "internal.h"
-#include "private.h"
+#include "lisp/internal.h"
+#include "lisp/private.h"
/*
* Prototypes
diff --git a/lisp/modules/x11.c b/lisp/modules/x11.c
index 3cdb0bc..2383e4e 100644
--- a/lisp/modules/x11.c
+++ b/lisp/modules/x11.c
@@ -27,12 +27,12 @@
* Author: Paulo César Pereira de Andrade
*/
-/* $XFree86: xc/programs/xedit/lisp/modules/x11.c,v 1.10 2002/11/23 08:26:52 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/modules/x11.c,v 1.12 2003/04/27 18:17:37 tsi Exp $ */
#include <stdlib.h>
#include <string.h>
-#include "internal.h"
-#include "private.h"
+#include "lisp/internal.h"
+#include "lisp/private.h"
#include <X11/Xlib.h>
/*
@@ -228,10 +228,10 @@ Lisp_XBlackPixel(LispBuiltin *builtin)
if (oscreen == UNSPEC)
screen = DefaultScreen(display);
- else
+ else {
CHECK_INDEX(oscreen);
- else
screen = FIXNUM_VALUE(oscreen);
+ }
if (screen >= ScreenCount(display))
LispDestroy("%s: screen index %d too large, %d screens available",
@@ -278,10 +278,10 @@ Lisp_XWhitePixel(LispBuiltin *builtin)
if (oscreen == UNSPEC)
screen = DefaultScreen(display);
- else
+ else {
CHECK_FIXNUM(oscreen);
- else
screen = FIXNUM_VALUE(oscreen);
+ }
if (screen >= ScreenCount(display))
LispDestroy("%s: screen index %d too large, %d screens available",
@@ -328,10 +328,10 @@ Lisp_XDefaultGC(LispBuiltin *builtin)
if (oscreen == UNSPEC)
screen = DefaultScreen(display);
- else
+ else {
CHECK_FIXNUM(oscreen);
- else
screen = FIXNUM_VALUE(oscreen);
+ }
if (screen >= ScreenCount(display))
LispDestroy("%s: screen index %d too large, %d screens available",
@@ -408,24 +408,24 @@ Lisp_XCreateSimpleWindow(LispBuiltin *builtin)
/* check &OPTIONAL parameters */
if (oborder_width == UNSPEC)
border_width = 1;
- else
+ else {
CHECK_INDEX(oborder_width);
- else
border_width = FIXNUM_VALUE(oborder_width);
+ }
if (oborder == UNSPEC)
border = BlackPixel(display, DefaultScreen(display));
- else
+ else {
CHECK_LONGINT(oborder);
- else
border = LONGINT_VALUE(oborder);
+ }
if (obackground == UNSPEC)
background = WhitePixel(display, DefaultScreen(display));
- else
+ else {
CHECK_LONGINT(obackground);
- else
background = LONGINT_VALUE(obackground);
+ }
return (OPAQUE(
XCreateSimpleWindow(display, parent, x, y, width, height,
@@ -588,10 +588,10 @@ Lisp_XBell(LispBuiltin *builtin)
if (opercent == UNSPEC)
percent = 0;
- else
+ else {
CHECK_FIXNUM(opercent);
- else
percent = FIXNUM_VALUE(opercent);
+ }
if (percent < -100 || percent > 100)
LispDestroy("%s: percent value %d out of range -100 to 100",
diff --git a/lisp/modules/xaw.c b/lisp/modules/xaw.c
index c2b372b..4e6bdf4 100644
--- a/lisp/modules/xaw.c
+++ b/lisp/modules/xaw.c
@@ -27,7 +27,7 @@
* Author: Paulo César Pereira de Andrade
*/
-/* $XFree86: xc/programs/xedit/lisp/modules/xaw.c,v 1.14 2002/11/23 08:26:52 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/modules/xaw.c,v 1.16 2003/04/27 18:17:37 tsi Exp $ */
#include <stdlib.h>
#include <X11/Intrinsic.h>
@@ -64,8 +64,8 @@
#include <X11/Xaw/Tree.h>
#include <X11/Xaw/Viewport.h>
#include <X11/Vendor.h>
-#include "internal.h"
-#include "private.h"
+#include "lisp/internal.h"
+#include "lisp/private.h"
/*
* Types
@@ -318,7 +318,6 @@ Lisp_XawScrollbarCoerceToReal(LispBuiltin *builtin)
xaw-scrollbar-coerce-to-real opaque
*/
{
- LispObj *result;
float *floatp;
double real;
diff --git a/lisp/modules/xt.c b/lisp/modules/xt.c
index 13c7ae7..83487b9 100644
--- a/lisp/modules/xt.c
+++ b/lisp/modules/xt.c
@@ -27,7 +27,7 @@
* Author: Paulo César Pereira de Andrade
*/
-/* $XFree86: xc/programs/xedit/lisp/modules/xt.c,v 1.19 2002/11/23 08:26:52 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/modules/xt.c,v 1.21 2003/04/27 18:17:38 tsi Exp $ */
#include <stdlib.h>
#include <stdio.h>
@@ -35,8 +35,8 @@
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
#include <X11/Shell.h>
-#include "internal.h"
-#include "private.h"
+#include "lisp/internal.h"
+#include "lisp/private.h"
/*
* Types
@@ -67,7 +67,7 @@ typedef struct {
/*
* Prototypes
*/
-int xtLoadModule(LispMac*);
+int xtLoadModule(void);
void LispXtCleanupCallback(Widget, XtPointer, XtPointer);
void LispXtCallback(Widget, XtPointer, XtPointer);
@@ -545,13 +545,13 @@ Lisp_XtAppInitialize(LispBuiltin *builtin)
int count;
CHECK_CONS(fallback_resources);
- for (string = fallback_resources, count = 0; CONS_P(string);
+ for (string = fallback_resources, count = 0; CONSP(string);
string = CDR(string), count++)
CHECK_STRING(CAR(string));
/* fallback resources was correctly specified */
fallback = LispMalloc(sizeof(String) * (count + 1));
- for (string = fallback_resources, count = 0; CONS_P(string);
+ for (string = fallback_resources, count = 0; CONSP(string);
string = CDR(string), count++)
fallback[count] = THESTR(CAR(string));
fallback[count] = NULL;
@@ -644,8 +644,8 @@ Lisp_XtAppProcessEvent(LispBuiltin *builtin)
}
if (mask != (mask & XtIMAll))
- LispDestroy("%s: %d does not fit in XtInputMask %d",
- STRFUN(builtin), mask);
+ LispDestroy("%s: %ld does not fit in XtInputMask %ld",
+ STRFUN(builtin), (long)mask, (long)XtIMAll);
if (mask)
XtAppProcessEvent(appcon, mask);
@@ -800,6 +800,8 @@ LispXtCreateWidget(LispBuiltin *builtin, int options)
STRFUN(builtin), STROBJ(oparent));
parent = (Widget)(oparent->data.opaque.data);
+ if (arguments == UNSPEC)
+ arguments = NIL;
CHECK_LIST(arguments);
if (options == SHELL)
@@ -807,7 +809,7 @@ LispXtCreateWidget(LispBuiltin *builtin, int options)
else
widget = XtCreateWidget(name, widget_class, parent, NULL, 0);
- if (arguments == UNSPEC || arguments == NIL)
+ if (arguments == NIL)
resources = NULL;
else {
resources = LispConvertResources(arguments, widget,
@@ -878,7 +880,7 @@ Lisp_XtGetValues(LispBuiltin *builtin)
GCDisable();
result = NIL;
- for (list = arguments; CONS_P(list); list = CDR(list)) {
+ for (list = arguments; CONSP(list); list = CDR(list)) {
CHECK_STRING(CAR(list));
if ((resource = GetResourceInfo(THESTR(CAR(list)), rlist, plist))
== NULL) {
@@ -928,9 +930,9 @@ Lisp_XtGetValues(LispBuiltin *builtin)
/* special resources */
if (resource->qtype == qString) {
#ifdef LONG64
- object = CONS(CAR(list), STRING(c8));
+ object = CONS(CAR(list), STRING((char*)c8));
#else
- object = CONS(CAR(list), STRING(c4));
+ object = CONS(CAR(list), STRING((char*)c4));
#endif
}
else if (resource->qtype == qCardinal || resource->qtype == qInt) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 21:13:15 +0000