From ae2b295c7deaf2d7c18ad1ed9b6050970e56bae7 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:05:31 -0800 Subject: Import Upstream version 5e2 --- x.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'x.c') diff --git a/x.c b/x.c index 2c9041f..84c4455 100644 --- a/x.c +++ b/x.c @@ -320,7 +320,7 @@ SCM make_xwindow(display, screen_number, win, pxmp, rootp) static SCM mark_xwindow(ptr) SCM ptr; { - if CLOSEDP(ptr) return BOOL_F; + if (CLOSEDP(ptr)) return BOOL_F; return WINDOW(ptr)->display; } static sizet free_xwindow(ptr) @@ -366,7 +366,7 @@ static SCM mark_xcolormap(ptr) SCM ptr; { struct xs_Colormap *xcm; - if CLOSEDP(ptr) return BOOL_F; + if (CLOSEDP(ptr)) return BOOL_F; xcm = COLORMAP(ptr); gc_mark(CCC2SCM_P(XcmsCCCOfColormap(xcm->dpy, xcm->cm))); return xcm->display; @@ -422,7 +422,7 @@ SCM make_xdisplay(d) static SCM mark_xdisplay(ptr) SCM ptr; { - if CLOSEDP(ptr) return BOOL_F; + if (CLOSEDP(ptr)) return BOOL_F; { struct xs_Display *xsd = DISPLAY((SCM)ptr); struct xs_screen *scrns = (struct xs_screen *)(xsd + 1); @@ -524,7 +524,7 @@ SCM make_xcursor(display, cursor) static SCM mark_xcursor(ptr) SCM ptr; { - if CLOSEDP(ptr) return BOOL_F; + if (CLOSEDP(ptr)) return BOOL_F; return CURSOR(ptr)->display; } static sizet free_xcursor(ptr) @@ -601,7 +601,7 @@ SCM CCC2SCM(ccc) XcmsCCC ccc; { SCM s_ccc = CCC2SCM_P(ccc); - if FALSEP(s_ccc) { + if (FALSEP(s_ccc)) { NEWCELL(s_ccc); DEFER_INTS; CAR(s_ccc) = tc16_xccc; @@ -656,9 +656,9 @@ void scm2XPoint(signp, dat, ipr, pos, s_caller) char *pos, *s_caller; { SCM x, y; - if IMP(dat) badarg: wta(dat, pos, s_caller); - if CONSP(dat) { - if INUMP(CDR(dat)) { + if (IMP(dat)) badarg: wta(dat, pos, s_caller); + if (CONSP(dat)) { + if (INUMP(CDR(dat))) { x = CAR(dat); y = CDR(dat); } @@ -706,13 +706,13 @@ int scm2XColor(s_dat, xclr) SCM dat = s_dat; unsigned int ura[3]; int idx; -/* if INUMP(dat) { */ +/* if (INUMP(dat)) { */ /* xclr->red = (dat>>16 & 0x00ff) * 0x0101; */ /* xclr->green = (dat>>8 & 0x00ff) * 0x0101; */ /* xclr->blue = (dat & 0x00ff) * 0x0101; */ /* } */ /* else */ - if IMP(dat) return 0; + if (IMP(dat)) return 0; else if (3==ilength(dat)) for (idx = 0; idx < 3; idx++) { SCM clr = CAR(dat); @@ -754,15 +754,15 @@ void scm2display_screen(dat, optidx, dspscn, s_caller) char *s_caller; { ASRTGO(NIMP(dat), badarg); - if OPDISPLAYP(dat) { + if (OPDISPLAYP(dat)) { dspscn->display = dat; dspscn->dpy = XDISPLAY(dat); - if UNBNDP(optidx) dspscn->screen_number = DefaultScreen(dspscn->dpy); + if (UNBNDP(optidx)) dspscn->screen_number = DefaultScreen(dspscn->dpy); else if (INUMP(optidx) && (INUM(optidx) < DISPLAY(dat)->screen_count)) dspscn->screen_number = INUM(optidx); else wta(optidx, (char *)ARG2, s_caller); } - else if OPWINDOWP(dat) { + else if (OPWINDOWP(dat)) { struct xs_Window *xsw = WINDOW(dat); dspscn->display = xsw->display; dspscn->dpy = xsw->dpy; @@ -1002,7 +1002,7 @@ SCM x_open_display(dpy_name) SCM dpy_name; { Display *display; - if FALSEP(dpy_name) dpy_name = nullstr; + if (FALSEP(dpy_name)) dpy_name = nullstr; ASRTER(NIMP(dpy_name) && STRINGP(dpy_name), dpy_name, ARG1, s_x_open_display); display = XOpenDisplay(CHARS(dpy_name)); return (display ? make_xdisplay(display) : BOOL_F); @@ -1084,14 +1084,14 @@ SCM x_create_pixmap(obj, s_size, s_depth) Drawable drawable; Pixmap p; XPoint size; - if IMP(obj) badarg1: wta(obj, (char *)ARG1, s_x_create_pixmap); - if OPDISPLAYP(obj) { + if (IMP(obj)) badarg1: wta(obj, (char *)ARG1, s_x_create_pixmap); + if (OPDISPLAYP(obj)) { display = obj; dpy = XDISPLAY(display); scn = DefaultScreen(dpy); drawable = RootWindow(dpy, scn); } - else if OPWINDOWP(obj) { + else if (OPWINDOWP(obj)) { display = WINDOW(obj)->display; dpy = XDISPLAY(display); scn = WINDOW(obj)->screen_number; @@ -1200,10 +1200,10 @@ SCM x_close(obj) SCM obj; { ASRTER(NIMP(obj), obj, ARG1, s_x_close); - if WINDOWP(obj) { + if (WINDOWP(obj)) { Display *dpy; ASRTER(!(CAR((SCM)obj) & SCROOT), obj, ARG1, s_x_close); - if CLOSEDP(obj) return UNSPECIFIED; + if (CLOSEDP(obj)) return UNSPECIFIED; DEFER_INTS; dpy = XWINDISPLAY(obj); free_xwindow((CELLPTR)obj); @@ -1263,9 +1263,9 @@ SCM x_install_colormap(s_cm, s_flg) { struct xs_Colormap *xcm; ASRTER(NIMP(s_cm) && COLORMAPP(s_cm), s_cm, ARG1, s_x_install_colormap); - if UNBNDP(s_flg) s_flg = BOOL_T; + if (UNBNDP(s_flg)) s_flg = BOOL_T; xcm = COLORMAP(s_cm); - if FALSEP(s_flg) XUninstallColormap(XDISPLAY(xcm->display), xcm->cm); + if (FALSEP(s_flg)) XUninstallColormap(XDISPLAY(xcm->display), xcm->cm); XInstallColormap(XDISPLAY(xcm->display), xcm->cm); return UNSPECIFIED; } @@ -1310,7 +1310,7 @@ SCM x_alloc_color_cells(scmap, spxls, sargs) if (scm2XColor(CAR(sargs), &xclr)) { unsigned long rmask_return, gmask_return, bmask_return; sargs = CDR(sargs); - if NNULLP(sargs) contig = thebool(CAR(sargs), s_x_alloc_color_cells); + if (NNULLP(sargs)) contig = thebool(CAR(sargs), s_x_alloc_color_cells); sts = XAllocColorPlanes(xcm->dpy, xcm->cm, contig, VELTS(pxra), npixels, xclr.red, xclr.green, xclr.blue, @@ -1322,7 +1322,7 @@ SCM x_alloc_color_cells(scmap, spxls, sargs) } nplanes = theuint(CAR(sargs), s_x_alloc_color_cells); sargs = CDR(sargs); - if NNULLP(sargs) contig = thebool(CAR(sargs), s_x_alloc_color_cells); + if (NNULLP(sargs)) contig = thebool(CAR(sargs), s_x_alloc_color_cells); plra = make_uve(nplanes, MAKINUM(32L)); /* Uniform vector of long */ sts = XAllocColorCells(xcm->dpy, xcm->cm, contig, VELTS(plra), nplanes, VELTS(pxra), npixels); @@ -1607,7 +1607,7 @@ SCM x_create_cursor(sdpy, scsr, sargs) int sts; source_font = thefont(sdpy, s_x_create_cursor); GET_NEXT_INT(source_char, sargs, ARG2, s_x_create_cursor); - if FALSEP(CAR(sargs)) { + if (FALSEP(CAR(sargs))) { sargs = CDR(sargs); ASRTER(FALSEP(CAR(sargs)), sargs, ARG4, s_x_create_cursor); sargs = CDR(sargs); @@ -2110,7 +2110,7 @@ SCM x_draw_points(sdbl, sgc, sargs) ASRTER(NIMP(sdbl) && WINDOWP(sdbl), sdbl, ARG1, s_x_draw_points); ASRTER(NIMP(sgc) && GCONTEXTP(sgc), sgc, ARG2, s_x_draw_points); loop: - if NULLP(sargs) return UNSPECIFIED; + if (NULLP(sargs)) return UNSPECIFIED; sarg = CAR(sargs); sargs = CDR(sargs); if (INUMP(sarg)) { ASRTER(NNULLP(sargs), sargs, WNA, s_x_draw_points); @@ -2144,7 +2144,7 @@ SCM xldraw_lines(sdbl, sgc, sargs, funcod, s_caller) ASRTER(NIMP(sdbl) && WINDOWP(sdbl), sdbl, ARG1, s_caller); ASRTER(NIMP(sgc) && GCONTEXTP(sgc), sgc, ARG2, s_caller); loop: - if NULLP(sargs) return UNSPECIFIED; + if (NULLP(sargs)) return UNSPECIFIED; sarg = CAR(sargs); sargs = CDR(sargs); if (INUMP(sarg)) { ASRTER(NNULLP(sargs), sargs, WNA, s_caller); @@ -2302,7 +2302,7 @@ static int print_xdisplay(exp, f, writing) SCM f; int writing; { - if CLOSEDP(exp) lputs("#", f); + if (CLOSEDP(exp)) lputs("#", f); else { lputs("#