diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:11 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:11 +0000 |
| commit | c8a87639c7cb7aef72630978a0e5a0d92618140c (patch) | |
| tree | 862068307dff135870c4ae58be677408c4942a39 /lisp/modules/x11.c | |
| parent | 0a193e032ba1ecf3f003e027e833dc9d274cb740 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'lisp/modules/x11.c')
| -rw-r--r-- | lisp/modules/x11.c | 34 |
1 files changed, 17 insertions, 17 deletions
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", |