[brlcad-commits] SF.net SVN: brlcad:[35921] brlcad/trunk/src/libfb/if_ogl.c
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[35921] brlcad/trunk/src/libfb/if_ogl.c
|
From: <br...@us...> - 2009-09-16 14:40:27
|
Revision: 35921
http://brlcad.svn.sourceforge.net/brlcad/?rev=35921&view=rev
Author: brlcad
Date: 2009-09-16 14:40:10 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
oop, also indent and formatting consistency
Modified Paths:
--------------
brlcad/trunk/src/libfb/if_ogl.c
Modified: brlcad/trunk/src/libfb/if_ogl.c
===================================================================
--- brlcad/trunk/src/libfb/if_ogl.c 2009-09-16 14:39:22 UTC (rev 35920)
+++ brlcad/trunk/src/libfb/if_ogl.c 2009-09-16 14:40:10 UTC (rev 35921)
@@ -355,33 +355,33 @@
/* do whole visible screen */
/* Blank out area left of image */
- glColor3b( 0, 0, 0 );
- if ( clp->xscrmin < 0 ) glRecti(clp->xscrmin - CLIP_XTRA,
- clp->yscrmin - CLIP_XTRA,
- CLIP_XTRA,
- clp->yscrmax + CLIP_XTRA);
+ glColor3b(0, 0, 0 );
+ if (clp->xscrmin < 0 ) glRecti(clp->xscrmin - CLIP_XTRA,
+ clp->yscrmin - CLIP_XTRA,
+ CLIP_XTRA,
+ clp->yscrmax + CLIP_XTRA);
/* Blank out area below image */
- if ( clp->yscrmin < 0 ) glRecti(clp->xscrmin - CLIP_XTRA,
- clp->yscrmin - CLIP_XTRA,
- clp->xscrmax + CLIP_XTRA,
- CLIP_XTRA);
+ if (clp->yscrmin < 0 ) glRecti(clp->xscrmin - CLIP_XTRA,
+ clp->yscrmin - CLIP_XTRA,
+ clp->xscrmax + CLIP_XTRA,
+ CLIP_XTRA);
/* We are in copy mode, so we use vp_width rather
* than if_width
*/
/* Blank out area right of image */
- if ( clp->xscrmax >= OGL(ifp)->vp_width ) glRecti(ifp->if_width - CLIP_XTRA,
- clp->yscrmin - CLIP_XTRA,
+ if (clp->xscrmax >= OGL(ifp)->vp_width ) glRecti(ifp->if_width - CLIP_XTRA,
+ clp->yscrmin - CLIP_XTRA,
+ clp->xscrmax + CLIP_XTRA,
+ clp->yscrmax + CLIP_XTRA);
+
+ /* Blank out area above image */
+ if (clp->yscrmax >= OGL(ifp)->vp_height ) glRecti(clp->xscrmin - CLIP_XTRA,
+ OGL(ifp)->vp_height - CLIP_XTRA,
clp->xscrmax + CLIP_XTRA,
clp->yscrmax + CLIP_XTRA);
- /* Blank out area above image */
- if ( clp->yscrmax >= OGL(ifp)->vp_height ) glRecti(clp->xscrmin - CLIP_XTRA,
- OGL(ifp)->vp_height - CLIP_XTRA,
- clp->xscrmax + CLIP_XTRA,
- clp->yscrmax + CLIP_XTRA);
-
/* copy image from backbuffer */
glRasterPos2i(clp->xpixmin, clp->ypixmin);
glCopyPixels(SGI(ifp)->mi_xoff + clp->xpixmin,
@@ -422,7 +422,7 @@
clp = &(OGL(ifp)->clip);
- if ( OGL(ifp)->soft_cmap_flag && SGI(ifp)->mi_cmap_flag ) {
+ if (OGL(ifp)->soft_cmap_flag && SGI(ifp)->mi_cmap_flag ) {
sw_cmap = 1;
} else {
sw_cmap = 0;
@@ -449,30 +449,30 @@
*/
/* Blank out area left of image */
- glColor3b( 0, 0, 0 );
- if ( clp->xscrmin < 0 ) glRecti(clp->xscrmin - CLIP_XTRA,
- clp->yscrmin - CLIP_XTRA,
- CLIP_XTRA,
- clp->yscrmax + CLIP_XTRA);
+ glColor3b(0, 0, 0 );
+ if (clp->xscrmin < 0 ) glRecti(clp->xscrmin - CLIP_XTRA,
+ clp->yscrmin - CLIP_XTRA,
+ CLIP_XTRA,
+ clp->yscrmax + CLIP_XTRA);
/* Blank out area below image */
- if ( clp->yscrmin < 0 ) glRecti(clp->xscrmin - CLIP_XTRA,
- clp->yscrmin - CLIP_XTRA,
- clp->xscrmax + CLIP_XTRA,
- CLIP_XTRA);
+ if (clp->yscrmin < 0 ) glRecti(clp->xscrmin - CLIP_XTRA,
+ clp->yscrmin - CLIP_XTRA,
+ clp->xscrmax + CLIP_XTRA,
+ CLIP_XTRA);
/* Blank out area right of image */
- if ( clp->xscrmax >= ifp->if_width ) glRecti(ifp->if_width - CLIP_XTRA,
- clp->yscrmin - CLIP_XTRA,
+ if (clp->xscrmax >= ifp->if_width ) glRecti(ifp->if_width - CLIP_XTRA,
+ clp->yscrmin - CLIP_XTRA,
+ clp->xscrmax + CLIP_XTRA,
+ clp->yscrmax + CLIP_XTRA);
+
+ /* Blank out area above image */
+ if (clp->yscrmax >= ifp->if_height ) glRecti(clp->xscrmin - CLIP_XTRA,
+ ifp->if_height- CLIP_XTRA,
clp->xscrmax + CLIP_XTRA,
clp->yscrmax + CLIP_XTRA);
- /* Blank out area above image */
- if ( clp->yscrmax >= ifp->if_height ) glRecti(clp->xscrmin - CLIP_XTRA,
- ifp->if_height- CLIP_XTRA,
- clp->xscrmax + CLIP_XTRA,
- clp->yscrmax + CLIP_XTRA);
-
} else if (OGL(ifp)->front_flag) {
/* in COPY mode, always draw full sized image into backbuffer.
* backbuffer_to_screen() is used to update the front buffer
@@ -482,14 +482,14 @@
glMatrixMode(GL_PROJECTION);
glPushMatrix(); /* store current view clipping matrix*/
glLoadIdentity();
- glOrtho( -0.25, ((GLdouble) OGL(ifp)->vp_width)-0.25,
- -0.25, ((GLdouble) OGL(ifp)->vp_height)-0.25,
- -1.0, 1.0);
- glPixelZoom( 1.0, 1.0);
+ glOrtho(-0.25, ((GLdouble) OGL(ifp)->vp_width)-0.25,
+ -0.25, ((GLdouble) OGL(ifp)->vp_height)-0.25,
+ -1.0, 1.0);
+ glPixelZoom(1.0, 1.0);
}
}
- if ( sw_cmap ) {
+ if (sw_cmap ) {
/* Software colormap each line as it's transmitted */
register int x;
register struct ogl_pixel *oglp;
@@ -499,11 +499,11 @@
if (CJDEBUG) printf("Doing sw colormap xmit\n");
/* Perform software color mapping into temp scanline */
op = SGI(ifp)->mi_scanline;
- for ( n=nlines; n>0; n--, y++ ) {
+ for (n=nlines; n>0; n--, y++ ) {
oglp = (struct ogl_pixel *)&ifp->if_mem[
(y*SGI(ifp)->mi_memwidth)*
sizeof(struct ogl_pixel) ];
- for ( x=xbase+npix-1; x>=xbase; x-- ) {
+ for (x=xbase+npix-1; x>=xbase; x-- ) {
op[x].red = CMR(ifp)[oglp[x].red];
op[x].green = CMG(ifp)[oglp[x].green];
op[x].blue = CMB(ifp)[oglp[x].blue];
@@ -538,7 +538,7 @@
{
register int i;
- for ( i = 0; i < 256; i++) {
+ for (i = 0; i < 256; i++) {
CMR(ifp)[i] = i;
CMG(ifp)[i] = i;
CMB(ifp)[i] = i;
@@ -595,7 +595,7 @@
errno = 0;
- if ( (ifp->if_mode & MODE_1MASK) == MODE_1MALLOC ) {
+ if ((ifp->if_mode & MODE_1MASK) == MODE_1MALLOC ) {
/*
* In this mode, only malloc as much memory as is needed.
*/
@@ -603,8 +603,8 @@
pixsize = ifp->if_height * ifp->if_width * sizeof(struct ogl_pixel);
size = pixsize + sizeof(struct ogl_cmap);
- sp = calloc( 1, size );
- if ( sp == 0 ) {
+ sp = calloc(1, size );
+ if (sp == 0 ) {
fb_log("ogl_getmem: frame buffer memory malloc failed\n");
goto fail;
}
@@ -628,10 +628,10 @@
size = (size + getpagesize()-1) & ~(getpagesize()-1);
/* First try to attach to an existing one */
- if ( (SGI(ifp)->mi_shmid = shmget( SHMEM_KEY, size, 0 )) < 0 ) {
+ if ((SGI(ifp)->mi_shmid = shmget(SHMEM_KEY, size, 0 )) < 0 ) {
/* No existing one, create a new one */
- if ( (SGI(ifp)->mi_shmid = shmget(
- SHMEM_KEY, size, IPC_CREAT|0666 )) < 0 ) {
+ if ((SGI(ifp)->mi_shmid = shmget(
+ SHMEM_KEY, size, IPC_CREAT|0666 )) < 0 ) {
fb_log("ogl_getmem: shmget failed, errno=%d\n", errno);
goto fail;
}
@@ -643,35 +643,35 @@
/* Move up the existing break, to leave room for later malloc()s */
old_brk = sbrk(0);
new_brk = (char *)(6 * (XMAXSCREEN+1) * 1024L);
- if ( new_brk <= old_brk )
+ if (new_brk <= old_brk )
new_brk = old_brk + (XMAXSCREEN+1) * 1024;
new_brk = (char *)((((long)new_brk) + getpagesize()-1) & ~(getpagesize()-1));
- if ( brk( new_brk ) < 0 ) {
+ if (brk(new_brk ) < 0 ) {
fb_log("ogl_getmem: new brk(x%x) failure, errno=%d\n", new_brk, errno);
goto fail;
}
/* Open the segment Read/Write, near the current break */
- if ( (sp = shmat( SGI(ifp)->mi_shmid, 0, 0 )) == (char *)(-1L) ) {
+ if ((sp = shmat(SGI(ifp)->mi_shmid, 0, 0 )) == (char *)(-1L) ) {
fb_log("ogl_getmem: shmat returned x%x, errno=%d\n", sp, errno );
goto fail;
}
/* Restore the old break */
- if ( brk( old_brk ) < 0 ) {
+ if (brk(old_brk ) < 0 ) {
fb_log("ogl_getmem: restore brk(x%x) failure, errno=%d\n", old_brk, errno);
/* Take the memory and run */
}
#else
/* Open the segment Read/Write */
/* On Irix 5, this gets mapped in at a high address, no problem. */
- if ( (sp = shmat( SGI(ifp)->mi_shmid, 0, 0 )) == (char *)(-1L) ) {
+ if ((sp = shmat(SGI(ifp)->mi_shmid, 0, 0 )) == (char *)(-1L) ) {
fb_log("ogl_getmem: shmat returned x%x, errno=%d\n", sp, errno );
goto fail;
}
#endif
- success:
+success:
ifp->if_mem = sp;
ifp->if_cmap = sp + pixsize; /* cmap at end of area */
i = CMB(ifp)[255]; /* try to deref last word */
@@ -679,11 +679,11 @@
/* Provide non-black colormap on creation of new shared mem */
if (new)
- ogl_cminit( ifp );
+ ogl_cminit(ifp );
return(0);
- fail:
+fail:
fb_log("ogl_getmem: Unable to attach to shared memory.\n");
- if ( (sp = calloc( 1, size )) == NULL ) {
+ if ((sp = calloc(1, size )) == NULL ) {
fb_log("ogl_getmem: malloc failure\n");
return(-1);
}
@@ -701,13 +701,13 @@
int shmid;
int i;
- if ( (shmid = shmget( SHMEM_KEY, 0, 0 )) < 0 ) {
+ if ((shmid = shmget(SHMEM_KEY, 0, 0 )) < 0 ) {
fb_log("ogl_zapmem shmget failed, errno=%d\n", errno);
return;
}
- i = shmctl( shmid, IPC_RMID, 0 );
- if ( i < 0 ) {
+ i = shmctl(shmid, IPC_RMID, 0 );
+ if (i < 0 ) {
fb_log("ogl_zapmem shmctl failed, errno=%d\n", errno);
return;
}
@@ -758,11 +758,11 @@
clp->ypixmin = clp->yscrmin;
clp->ypixmax = clp->yscrmax;
- if ( clp->xpixmin < 0 ) {
+ if (clp->xpixmin < 0 ) {
clp->xpixmin = 0;
}
- if ( clp->ypixmin < 0 ) {
+ if (clp->ypixmin < 0 ) {
clp->ypixmin = 0;
}
@@ -771,17 +771,17 @@
* Otherwise, use size of framebuffer memory segment
*/
if (OGL(ifp)->copy_flag) {
- if ( clp->xpixmax > OGL(ifp)->vp_width-1 ) {
+ if (clp->xpixmax > OGL(ifp)->vp_width-1 ) {
clp->xpixmax = OGL(ifp)->vp_width-1;
}
- if ( clp->ypixmax > OGL(ifp)->vp_height-1 ) {
+ if (clp->ypixmax > OGL(ifp)->vp_height-1 ) {
clp->ypixmax = OGL(ifp)->vp_height-1;
}
} else {
- if ( clp->xpixmax > ifp->if_width-1 ) {
+ if (clp->xpixmax > ifp->if_width-1 ) {
clp->xpixmax = ifp->if_width-1;
}
- if ( clp->ypixmax > ifp->if_height-1 ) {
+ if (clp->ypixmax > ifp->if_height-1 ) {
clp->ypixmax = ifp->if_height-1;
}
}
@@ -795,13 +795,13 @@
XWindowAttributes xwa;
struct ogl_clip *clp;
- if ( CJDEBUG ) fb_log("entering expose_callback()\n");
+ if (CJDEBUG ) fb_log("entering expose_callback()\n");
if (glXMakeCurrent(OGL(ifp)->dispp, OGL(ifp)->wind, OGL(ifp)->glxc)==False) {
fb_log("Warning, expose_callback: glXMakeCurrent unsuccessful.\n");
}
- if ( OGL(ifp)->firstTime ) {
+ if (OGL(ifp)->firstTime ) {
OGL(ifp)->firstTime = 0;
@@ -809,17 +809,17 @@
* we want to pretend it's not
*/
- if ( !SGI(ifp)->mi_doublebuffer ) {
+ if (!SGI(ifp)->mi_doublebuffer ) {
glDrawBuffer(GL_FRONT);
}
- if ( (ifp->if_mode & MODE_4MASK) == MODE_4NODITH ) {
+ if ((ifp->if_mode & MODE_4MASK) == MODE_4NODITH ) {
glDisable(GL_DITHER);
}
/* set copy mode if possible and requested */
- if ( SGI(ifp)->mi_doublebuffer &&
- ((ifp->if_mode & MODE_11MASK)==MODE_11COPY) ) {
+ if (SGI(ifp)->mi_doublebuffer &&
+ ((ifp->if_mode & MODE_11MASK)==MODE_11COPY) ) {
/* Copy mode only works if there are two
* buffers to use. It conflicts with
* double buffering
@@ -863,13 +863,13 @@
clp = &(OGL(ifp)->clip);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
- glOrtho( clp->oleft, clp->oright, clp->obottom, clp->otop,
- -1.0, 1.0);
+ glOrtho(clp->oleft, clp->oright, clp->obottom, clp->otop,
+ -1.0, 1.0);
glPixelZoom((float) ifp->if_xzoom, (float) ifp->if_yzoom);
- } else if ( (OGL(ifp)->win_width > ifp->if_width) ||
- (OGL(ifp)->win_height > ifp->if_height) ) {
+ } else if ((OGL(ifp)->win_width > ifp->if_width) ||
+ (OGL(ifp)->win_height > ifp->if_height) ) {
/* clear whole buffer if window larger than framebuffer */
- if ( OGL(ifp)->copy_flag && !OGL(ifp)->front_flag ) {
+ if (OGL(ifp)->copy_flag && !OGL(ifp)->front_flag ) {
glDrawBuffer(GL_FRONT);
glViewport(0, 0, OGL(ifp)->win_width,
OGL(ifp)->win_height);
@@ -890,14 +890,14 @@
}
/* repaint entire image */
- ogl_xmit_scanlines( ifp, 0, ifp->if_height, 0, ifp->if_width );
- if ( SGI(ifp)->mi_doublebuffer ) {
- glXSwapBuffers( OGL(ifp)->dispp, OGL(ifp)->wind);
- } else if ( OGL(ifp)->copy_flag ) {
+ ogl_xmit_scanlines(ifp, 0, ifp->if_height, 0, ifp->if_width );
+ if (SGI(ifp)->mi_doublebuffer ) {
+ glXSwapBuffers(OGL(ifp)->dispp, OGL(ifp)->wind);
+ } else if (OGL(ifp)->copy_flag ) {
backbuffer_to_screen(ifp, -1);
}
- if ( CJDEBUG ) {
+ if (CJDEBUG ) {
int dbb, db, view[4], getster, getaux;
glGetIntegerv(GL_VIEWPORT, view);
glGetIntegerv(GL_DOUBLEBUFFER, &dbb);
@@ -953,64 +953,64 @@
expose_callback(ifp, &event);
break;
case ButtonPress:
- {
- int button = (int) event.xbutton.button;
- if (button == Button1) {
- /* Check for single button mouse remap.
- * ctrl-1 => 2
- * meta-1 => 3
- */
- if (event.xbutton.state & ControlMask)
- button = Button2;
- else if (event.xbutton.state & Mod1Mask)
- button = Button3;
- }
+ {
+ int button = (int) event.xbutton.button;
+ if (button == Button1) {
+ /* Check for single button mouse remap.
+ * ctrl-1 => 2
+ * meta-1 => 3
+ */
+ if (event.xbutton.state & ControlMask)
+ button = Button2;
+ else if (event.xbutton.state & Mod1Mask)
+ button = Button3;
+ }
- switch (button) {
- case Button1:
- break;
- case Button2:
- {
- int x, y;
- int ix, iy;
- register struct ogl_pixel *oglp;
+ switch (button) {
+ case Button1:
+ break;
+ case Button2:
+ {
+ int x, y;
+ int ix, iy;
+ register struct ogl_pixel *oglp;
- x = event.xbutton.x;
- y = ifp->if_height - event.xbutton.y - 1;
+ x = event.xbutton.x;
+ y = ifp->if_height - event.xbutton.y - 1;
- if (x < 0 || y < 0) {
- fb_log("No RGB (outside image viewport)\n");
- break;
- }
+ if (x < 0 || y < 0) {
+ fb_log("No RGB (outside image viewport)\n");
+ break;
+ }
- oglp = (struct ogl_pixel *)&ifp->if_mem[
- (y*SGI(ifp)->mi_memwidth)*
- sizeof(struct ogl_pixel) ];
+ oglp = (struct ogl_pixel *)&ifp->if_mem[
+ (y*SGI(ifp)->mi_memwidth)*
+ sizeof(struct ogl_pixel) ];
- fb_log("At image (%d, %d), real RGB=(%3d %3d %3d)\n",
- x, y, (int)oglp[x].red, (int)oglp[x].green, (int)oglp[x].blue);
+ fb_log("At image (%d, %d), real RGB=(%3d %3d %3d)\n",
+ x, y, (int)oglp[x].red, (int)oglp[x].green, (int)oglp[x].blue);
- break;
+ break;
+ }
+ case Button3:
+ OGL(ifp)->alive = 0;
+ break;
+ default:
+ fb_log("unhandled mouse event\n");
+ break;
}
- case Button3:
- OGL(ifp)->alive = 0;
- break;
- default:
- fb_log("unhandled mouse event\n");
- break;
+ break;
}
- break;
- }
case ConfigureNotify:
- {
- XConfigureEvent *conf = (XConfigureEvent *)&event;
+ {
+ XConfigureEvent *conf = (XConfigureEvent *)&event;
- if (conf->width == OGL(ifp)->win_width &&
- conf->height == OGL(ifp)->win_height)
- return;
+ if (conf->width == OGL(ifp)->win_width &&
+ conf->height == OGL(ifp)->win_height)
+ return;
- ogl_configureWindow(ifp, conf->width, conf->height);
- }
+ ogl_configureWindow(ifp, conf->width, conf->height);
+ }
default:
break;
}
@@ -1068,7 +1068,7 @@
for (i=0, j=0, vip=vibase; i<num; i++, vip++) {
/* requirements */
glXGetConfig(OGL(ifp)->dispp, vip, GLX_USE_GL, &use);
- if ( !use)
+ if (!use)
continue;
glXGetConfig(OGL(ifp)->dispp, vip, GLX_RGBA, &rgba);
if (!rgba)
@@ -1084,18 +1084,18 @@
red, green, blue masks: 0xff0000, 0xff00, 0xff
significant bits in color specification: 8 bits
*/
- if ( (m_hard_cmap) && (vip->class!=DirectColor))
+ if ((m_hard_cmap) && (vip->class!=DirectColor))
continue;
- if ( (m_hard_cmap) && (vip->colormap_size<256))
+ if ((m_hard_cmap) && (vip->colormap_size<256))
continue;
glXGetConfig(OGL(ifp)->dispp, vip, GLX_DOUBLEBUFFER, &dbfr);
- if ( (m_doub_buf) && (!dbfr) )
+ if ((m_doub_buf) && (!dbfr) )
continue;
- if ( (m_sing_buf) && (dbfr) )
+ if ((m_sing_buf) && (dbfr) )
continue;
/* this visual meets criteria */
- if ( j >= NGOOD-1 ) {
+ if (j >= NGOOD-1 ) {
fb_log("fb_ogl_open: More than %d candidate visuals!\n", NGOOD);
break;
}
@@ -1156,10 +1156,10 @@
{
register int i;
- for ( i=0; i<256; i++ ) {
- if ( CMR(ifp)[i] != i ) return(0);
- if ( CMG(ifp)[i] != i ) return(0);
- if ( CMB(ifp)[i] != i ) return(0);
+ for (i=0; i<256; i++ ) {
+ if (CMR(ifp)[i] != i ) return(0);
+ if (CMG(ifp)[i] != i ) return(0);
+ if (CMB(ifp)[i] != i ) return(0);
}
return(1);
}
@@ -1185,7 +1185,7 @@
*/
mode = MODE_2LINGERING;
- if ( file != NULL ) {
+ if (file != NULL ) {
register char *cp;
char modebuf[80];
char *mp;
@@ -1200,31 +1200,31 @@
alpha = 0;
mp = &modebuf[0];
cp = &file[8];
- while ( *cp != '\0' && !isspace(*cp) ) {
+ while (*cp != '\0' && !isspace(*cp) ) {
*mp++ = *cp; /* copy it to buffer */
- if ( isdigit(*cp) ) {
+ if (isdigit(*cp) ) {
cp++;
continue;
}
alpha++;
- for ( mfp = modeflags; mfp->c != '\0'; mfp++ ) {
- if ( mfp->c == *cp ) {
+ for (mfp = modeflags; mfp->c != '\0'; mfp++ ) {
+ if (mfp->c == *cp ) {
mode = (mode&~mfp->mask)|mfp->value;
break;
}
}
- if ( mfp->c == '\0' && *cp != '-' ) {
- fb_log( "if_ogl: unknown option '%c' ignored\n", *cp );
+ if (mfp->c == '\0' && *cp != '-' ) {
+ fb_log("if_ogl: unknown option '%c' ignored\n", *cp );
}
cp++;
}
*mp = '\0';
- if ( !alpha ) {
- mode |= atoi( modebuf );
+ if (!alpha ) {
+ mode |= atoi(modebuf );
}
}
- if ( (mode & MODE_15MASK) == MODE_15ZAP ) {
+ if ((mode & MODE_15MASK) == MODE_15ZAP ) {
/* Only task: Attempt to release shared memory segment */
ogl_zapmem();
return(-1);
@@ -1241,11 +1241,11 @@
* addressed by SGI(ifp)->mi_xxx and OGL(ifp)->xxx
*/
- if ( (SGIL(ifp) = (char *)calloc( 1, sizeof(struct sgiinfo) )) == NULL ) {
+ if ((SGIL(ifp) = (char *)calloc(1, sizeof(struct sgiinfo) )) == NULL ) {
fb_log("fb_ogl_open: sgiinfo malloc failed\n");
return(-1);
}
- if ( (OGLL(ifp) = (char *)calloc( 1, sizeof(struct oglinfo) )) == NULL ) {
+ if ((OGLL(ifp) = (char *)calloc(1, sizeof(struct oglinfo) )) == NULL ) {
fb_log("fb_ogl_open: oglinfo malloc failed\n");
return(-1);
}
@@ -1262,14 +1262,14 @@
* remain around until killed by the menu subsystem.
*/
- if ( (ifp->if_mode & MODE_2MASK) == MODE_2LINGERING ) {
+ if ((ifp->if_mode & MODE_2MASK) == MODE_2LINGERING ) {
/* save parent pid for later signalling */
SGI(ifp)->mi_parent = bu_process_id();
- signal( SIGUSR1, sigkid);
+ signal(SIGUSR1, sigkid);
#if 0
- if ( (f = fork()) != 0 ) {
+ if ((f = fork()) != 0 ) {
/* Parent process */
int k;
@@ -1283,12 +1283,12 @@
* or until the child kills us.
* Pretty vicious, this computer society.
*/
- while ( (k = wait(&status)) != -1 && k != f )
+ while ((k = wait(&status)) != -1 && k != f )
; /* NULL */
exit(0);
/* NOTREACHED */
- } else if ( f < 0 ) {
+ } else if (f < 0 ) {
fb_log("fb_ogl_open: linger-mode fork failure\n");
return(-1);
}
@@ -1296,28 +1296,28 @@
#endif
}
- if ( (ifp->if_mode & MODE_3MASK) == MODE_3FULLSCR ) {
+ if ((ifp->if_mode & MODE_3MASK) == MODE_3FULLSCR ) {
/* Bump default size up to full screen, since we have it all */
ifp->if_width = XMAXSCREEN+1; /* 1280 */
ifp->if_height = YMAXSCREEN+1; /* 1024 */
}
/* use defaults if invalid width and height specified */
- if ( width <= 0 )
+ if (width <= 0 )
width = ifp->if_width;
- if ( height <= 0 )
+ if (height <= 0 )
height = ifp->if_height;
/* use max values if width and height are greater */
- if ( width > ifp->if_max_width )
+ if (width > ifp->if_max_width )
width = ifp->if_max_width;
- if ( height > ifp->if_max_height)
+ if (height > ifp->if_max_height)
height = ifp->if_max_height;
ifp->if_width = width;
ifp->if_height = height;
- if ( (ifp->if_mode & MODE_3MASK) == MODE_3WINDOW ) {
+ if ((ifp->if_mode & MODE_3MASK) == MODE_3WINDOW ) {
SGI(ifp)->mi_curs_on = 1;
} else {
/* MODE_3MASK == MODE_3FULLSCR */
@@ -1325,13 +1325,13 @@
}
/* Build a descriptive window title bar */
- (void)snprintf( title, 128, "BRL-CAD /dev/ogl %s, %s",
- ((ifp->if_mode & MODE_2MASK) == MODE_2TRANSIENT) ?
- "Transient Win":
- "Lingering Win",
- ((ifp->if_mode & MODE_1MASK) == MODE_1MALLOC) ?
- "Private Mem" :
- "Shared Mem" );
+ (void)snprintf(title, 128, "BRL-CAD /dev/ogl %s, %s",
+ ((ifp->if_mode & MODE_2MASK) == MODE_2TRANSIENT) ?
+ "Transient Win":
+ "Lingering Win",
+ ((ifp->if_mode & MODE_1MASK) == MODE_1MALLOC) ?
+ "Private Mem" :
+ "Shared Mem" );
/* initialize window state variables before calling ogl_getmem */
@@ -1343,23 +1343,23 @@
SGI(ifp)->mi_pid = bu_process_id();
/* Attach to shared memory, potentially with a screen repaint */
- if ( ogl_getmem(ifp) < 0 )
+ if (ogl_getmem(ifp) < 0 )
return(-1);
/* Open an X connection to the display. Sending NULL to XOpenDisplay
tells it to use the DISPLAY environment variable. */
- if ( (OGL(ifp)->dispp = XOpenDisplay(NULL)) == NULL ) {
+ if ((OGL(ifp)->dispp = XOpenDisplay(NULL)) == NULL ) {
fb_log("fb_ogl_open: Failed to open display. Check DISPLAY environment variable.\n");
return (-1);
}
ifp->if_selfd = ConnectionNumber(OGL(ifp)->dispp);
- if ( CJDEBUG ) {
+ if (CJDEBUG ) {
printf("Connection opened to X display on fd %d.\n",
ConnectionNumber(OGL(ifp)->dispp));
}
/* Choose an appropriate visual. */
- if ( (OGL(ifp)->vip = fb_ogl_choose_visual(ifp)) == NULL ) {
+ if ((OGL(ifp)->vip = fb_ogl_choose_visual(ifp)) == NULL ) {
fb_log("fb_ogl_open: Couldn't find an appropriate visual. Exiting.\n");
return (-1);
}
@@ -1398,7 +1398,7 @@
XStoreColors(OGL(ifp)->dispp, OGL(ifp)->xcmap, color_cell, 256);
} else {
/* read only colormap */
- if ( CJDEBUG ) {
+ if (CJDEBUG ) {
printf("Allocating read-only colormap.");
}
OGL(ifp)->xcmap = XCreateColormap(OGL(ifp)->dispp,
@@ -1424,37 +1424,37 @@
ButtonPressMask | ButtonReleaseMask;
swa.colormap = OGL(ifp)->xcmap;
-#define XCreateWindowDebug(display, parent, x, y, width, height, \
+#define XCreateWindowDebug(display, parent, x, y, width, height, \
border_width, depth, class, visual, valuemask, \
- attributes) \
- (printf("XCreateWindow( display = %08X,\n", (long)display), \
- printf(" parent = %08X,\n", (long)parent), \
- printf(" x = %d,\n", x), \
- printf(" y = %d,\n", y), \
- printf(" width = %d,\n", width), \
- printf(" height = %d,\n", height), \
- printf(" border_width = %d,\n", border_width), \
- printf(" depth = %d,\n", depth), \
- printf(" class = %d,\n", class), \
- printf(" visual = %08X,\n", (long)visual), \
- printf(" valuemask = %08X,\n", valuemask), \
- printf(" attributes = {"), \
- (valuemask & CWBackPixmap) ? printf(" background_pixmap = %08X ", (long)((attributes)->background_pixmap)) : 0, \
- (valuemask & CWBackPixel) ? printf(" background_pixel = %08X ", (attributes)->background_pixel) : 0, \
- (valuemask & CWBorderPixmap) ? printf(" border_pixmap = %08X ", (long)((attributes)->border_pixmap)) : 0, \
- (valuemask & CWBorderPixel) ? printf(" border_pixel = %08X ", (attributes)->border_pixel) : 0, \
- (valuemask & CWBitGravity) ? printf(" bit_gravity = %d ", (attributes)->bit_gravity) : 0, \
- (valuemask & CWWinGravity) ? printf(" win_gravity = %d ", (attributes)->win_gravity) : 0, \
- (valuemask & CWBackingStore) ? printf(" backing_store = %d ", (attributes)->backing_store) : 0, \
- (valuemask & CWBackingPlanes) ? printf(" backing_planes = %d ", (attributes)->backing_planes) : 0, \
- (valuemask & CWBackingPixel) ? printf(" backing_pixel = %08X ", (attributes)->backing_pixel) : 0, \
- (valuemask & CWOverrideRedirect) ? printf(" override_redirect = %d ", (attributes)->override_redirect) : 0, \
- (valuemask & CWSaveUnder) ? printf(" save_under = %d ", (attributes)->save_under) : 0, \
- (valuemask & CWEventMask) ? printf(" event_mask = %08X ", (attributes)->event_mask) : 0, \
- (valuemask & CWDontPropagate) ? printf(" do_not_propagate_mask = %08X ", (attributes)->do_not_propagate_mask) : 0, \
- (valuemask & CWColormap) ? printf(" colormap = %08X ", (long)((attributes)->colormap)) : 0, \
- (valuemask & CWCursor) ? printf(" cursor = %08X ", (long)((attributes)->cursor)) : 0, \
- printf(" }\n")) > 0 ? XCreateWindow(display, parent, x, y, width, height, border_width, depth, class, visual, valuemask, attributes) : -1;
+ attributes) \
+ (printf("XCreateWindow(display = %08X, \n", (long)display), \
+ printf(" parent = %08X, \n", (long)parent), \
+ printf(" x = %d, \n", x), \
+ printf(" y = %d, \n", y), \
+ printf(" width = %d, \n", width), \
+ printf(" height = %d, \n", height), \
+ printf(" border_width = %d, \n", border_width), \
+ printf(" depth = %d, \n", depth), \
+ printf(" class = %d, \n", class), \
+ printf(" visual = %08X, \n", (long)visual), \
+ printf(" valuemask = %08X, \n", valuemask), \
+ printf(" attributes = {"), \
+ (valuemask & CWBackPixmap) ? printf(" background_pixmap = %08X ", (long)((attributes)->background_pixmap)) : 0, \
+ (valuemask & CWBackPixel) ? printf(" background_pixel = %08X ", (attributes)->background_pixel) : 0, \
+ (valuemask & CWBorderPixmap) ? printf(" border_pixmap = %08X ", (long)((attributes)->border_pixmap)) : 0, \
+ (valuemask & CWBorderPixel) ? printf(" border_pixel = %08X ", (attributes)->border_pixel) : 0, \
+ (valuemask & CWBitGravity) ? printf(" bit_gravity = %d ", (attributes)->bit_gravity) : 0, \
+ (valuemask & CWWinGravity) ? printf(" win_gravity = %d ", (attributes)->win_gravity) : 0, \
+ (valuemask & CWBackingStore) ? printf(" backing_store = %d ", (attributes)->backing_store) : 0, \
+ (valuemask & CWBackingPlanes) ? printf(" backing_planes = %d ", (attributes)->backing_planes) : 0, \
+ (valuemask & CWBackingPixel) ? printf(" backing_pixel = %08X ", (attributes)->backing_pixel) : 0, \
+ (valuemask & CWOverrideRedirect) ? printf(" override_redirect = %d ", (attributes)->override_redirect) : 0, \
+ (valuemask & CWSaveUnder) ? printf(" save_under = %d ", (attributes)->save_under) : 0, \
+ (valuemask & CWEventMask) ? printf(" event_mask = %08X ", (attributes)->event_mask) : 0, \
+ (valuemask & CWDontPropagate) ? printf(" do_not_propagate_mask = %08X ", (attributes)->do_not_propagate_mask) : 0, \
+ (valuemask & CWColormap) ? printf(" colormap = %08X ", (long)((attributes)->colormap)) : 0, \
+ (valuemask & CWCursor) ? printf(" cursor = %08X ", (long)((attributes)->cursor)) : 0, \
+ printf(" }\n")) > 0 ? XCreateWindow(display, parent, x, y, width, height, border_width, depth, class, visual, valuemask, attributes) : -1;
OGL(ifp)->wind = XCreateWindow(OGL(ifp)->dispp,
RootWindow(OGL(ifp)->dispp,
@@ -1542,11 +1542,11 @@
* addressed by SGI(ifp)->mi_xxx and OGL(ifp)->xxx
*/
- if ( (SGIL(ifp) = (char *)calloc( 1, sizeof(struct sgiinfo) )) == NULL ) {
+ if ((SGIL(ifp) = (char *)calloc(1, sizeof(struct sgiinfo) )) == NULL ) {
fb_log("fb_ogl_open: sgiinfo malloc failed\n");
return -1;
}
- if ( (OGLL(ifp) = (char *)calloc( 1, sizeof(struct oglinfo) )) == NULL ) {
+ if ((OGLL(ifp) = (char *)calloc(1, sizeof(struct oglinfo) )) == NULL ) {
fb_log("fb_ogl_open: oglinfo malloc failed\n");
return -1;
}
@@ -1599,7 +1599,7 @@
ogl_final_close(FBIO *ifp)
{
- if ( CJDEBUG ) {
+ if (CJDEBUG ) {
printf("ogl_final_close: All done...goodbye!\n");
}
@@ -1609,26 +1609,26 @@
XDestroyWindow(OGL(ifp)->dispp, OGL(ifp)->wind);
XFreeColormap(OGL(ifp)->dispp, OGL(ifp)->xcmap);
- if ( SGIL(ifp) != NULL ) {
+ if (SGIL(ifp) != NULL ) {
/* free up memory associated with image */
- if ( SGI(ifp)->mi_shmid != -1 ) {
+ if (SGI(ifp)->mi_shmid != -1 ) {
/* detach from shared memory */
- if ( shmdt( ifp->if_mem ) == -1 ) {
+ if (shmdt(ifp->if_mem ) == -1 ) {
fb_log("fb_ogl_close shmdt failed, errno=%d\n",
errno);
return -1;
}
} else {
/* free private memory */
- (void)free( ifp->if_mem );
+ (void)free(ifp->if_mem );
}
/* free state information */
- (void)free( (char *)SGIL(ifp) );
+ (void)free((char *)SGIL(ifp) );
SGIL(ifp) = NULL;
}
- if ( OGLL(ifp) != NULL) {
- (void) free( (char *)OGLL(ifp) );
+ if (OGLL(ifp) != NULL) {
+ (void) free((char *)OGLL(ifp) );
OGLL(ifp) = NULL;
}
@@ -1641,16 +1641,16 @@
fb_ogl_close(FBIO *ifp)
{
- ogl_flush( ifp );
+ ogl_flush(ifp );
/* only the last open window can linger -
* call final_close if not lingering
*/
- if ( ogl_nwindows > 1 ||
- (ifp->if_mode & MODE_2MASK) == MODE_2TRANSIENT )
- return ogl_final_close( ifp );
+ if (ogl_nwindows > 1 ||
+ (ifp->if_mode & MODE_2MASK) == MODE_2TRANSIENT )
+ return ogl_final_close(ifp );
- if ( CJDEBUG )
+ if (CJDEBUG )
printf("fb_ogl_close: remaining open to linger awhile.\n");
/*
@@ -1674,17 +1674,17 @@
* connections. Standard error/out may be used to print
* framebuffer debug messages, so they're kept around.
*/
- fclose( stdin );
+ fclose(stdin );
/* Ignore likely signals, perhaps in the background, from other
* typing at the keyboard
*/
- (void)signal( SIGHUP, SIG_IGN );
- (void)signal( SIGINT, SIG_IGN );
- (void)signal( SIGQUIT, SIG_IGN );
- (void)signal( SIGALRM, SIG_IGN );
+ (void)signal(SIGHUP, SIG_IGN );
+ (void)signal(SIGINT, SIG_IGN );
+ (void)signal(SIGQUIT, SIG_IGN );
+ (void)signal(SIGALRM, SIG_IGN );
- while ( 0 < OGL(ifp)->alive ) {
+ while (0 < OGL(ifp)->alive ) {
ogl_do_event(ifp);
}
@@ -1697,26 +1697,26 @@
if (OGL(ifp)->cursor)
XDestroyWindow(OGL(ifp)->dispp, OGL(ifp)->cursor);
- if ( SGIL(ifp) != NULL ) {
+ if (SGIL(ifp) != NULL ) {
/* free up memory associated with image */
- if ( SGI(ifp)->mi_shmid != -1 ) {
+ if (SGI(ifp)->mi_shmid != -1 ) {
/* detach from shared memory */
- if ( shmdt( ifp->if_mem ) == -1 ) {
+ if (shmdt(ifp->if_mem ) == -1 ) {
fb_log("fb_ogl_close: shmdt failed, errno=%d\n",
errno);
return -1;
}
} else {
/* free private memory */
- (void)free( ifp->if_mem );
+ (void)free(ifp->if_mem );
}
/* free state information */
- (void)free( (char *)SGIL(ifp) );
+ (void)free((char *)SGIL(ifp) );
SGIL(ifp) = NULL;
}
- if ( OGLL(ifp) != NULL) {
- (void) free( (char *)OGLL(ifp) );
+ if (OGLL(ifp) != NULL) {
+ (void) free((char *)OGLL(ifp) );
OGLL(ifp) = NULL;
}
@@ -1753,9 +1753,9 @@
if (CJDEBUG) printf("entering ogl_free\n");
/* Close the framebuffer */
- ret = ogl_final_close( ifp );
+ ret = ogl_final_close(ifp );
- if ( (ifp->if_mode & MODE_1MASK) == MODE_1SHARED ) {
+ if ((ifp->if_mode & MODE_1MASK) == MODE_1SHARED ) {
/* If shared mem, release the shared memory segment */
ogl_zapmem();
}
@@ -1766,39 +1766,39 @@
HIDDEN int
ogl_clear(FBIO *ifp, unsigned char *pp)
- /* pointer to beginning of memory segment*/
+/* pointer to beginning of memory segment*/
{
struct ogl_pixel bg;
register struct ogl_pixel *oglp;
register int cnt;
register int y;
- if ( CJDEBUG ) printf("entering ogl_clear\n");
+ if (CJDEBUG ) printf("entering ogl_clear\n");
if (glXMakeCurrent(OGL(ifp)->dispp, OGL(ifp)->wind, OGL(ifp)->glxc)==False) {
fb_log("Warning, ogl_clear: glXMakeCurrent unsuccessful.\n");
}
/* Set clear colors */
- if ( pp != RGBPIXEL_NULL) {
+ if (pp != RGBPIXEL_NULL) {
bg.alpha = 0;
bg.red = (pp)[RED];
bg.green = (pp)[GRN];
bg.blue = (pp)[BLU];
- glClearColor( pp[RED]/255.0, pp[GRN]/255.0, pp[BLU]/255.0, 0.0 );
+ glClearColor(pp[RED]/255.0, pp[GRN]/255.0, pp[BLU]/255.0, 0.0 );
} else {
bg.alpha = 0;
bg.red = 0;
bg.green = 0;
bg.blue = 0;
- glClearColor( 0, 0, 0, 0 );
+ glClearColor(0, 0, 0, 0 );
}
/* Flood rectangle in shared memory */
- for ( y=0; y < ifp->if_height; y++ ) {
+ for (y=0; y < ifp->if_height; y++ ) {
oglp = (struct ogl_pixel *)&ifp->if_mem[
(y*SGI(ifp)->mi_memwidth+0)*sizeof(struct ogl_pixel) ];
- for ( cnt=ifp->if_width-1; cnt >= 0; cnt-- ) {
+ for (cnt=ifp->if_width-1; cnt >= 0; cnt-- ) {
*oglp++ = bg; /* struct copy */
}
}
@@ -1808,7 +1808,7 @@
if (OGL(ifp)->use_ext_ctrl) {
glClear(GL_COLOR_BUFFER_BIT);
} else {
- if ( OGL(ifp)->copy_flag) {
+ if (OGL(ifp)->copy_flag) {
/* COPY mode: clear both buffers */
if (OGL(ifp)->front_flag) {
glDrawBuffer(GL_BACK);
@@ -1824,7 +1824,7 @@
} else {
glClear(GL_COLOR_BUFFER_BIT);
if (SGI(ifp)->mi_doublebuffer) {
- glXSwapBuffers( OGL(ifp)->dispp, OGL(ifp)->wind);
+ glXSwapBuffers(OGL(ifp)->dispp, OGL(ifp)->wind);
}
}
@@ -1847,17 +1847,17 @@
if (CJDEBUG) printf("entering ogl_view\n");
- if ( xzoom < 1 ) xzoom = 1;
- if ( yzoom < 1 ) yzoom = 1;
- if ( ifp->if_xcenter == xcenter && ifp->if_ycenter == ycenter
- && ifp->if_xzoom == xzoom && ifp->if_yzoom == yzoom )
+ if (xzoom < 1 ) xzoom = 1;
+ if (yzoom < 1 ) yzoom = 1;
+ if (ifp->if_xcenter == xcenter && ifp->if_ycenter == ycenter
+ && ifp->if_xzoom == xzoom && ifp->if_yzoom == yzoom )
return(0);
- if ( xcenter < 0 || xcenter >= ifp->if_width )
+ if (xcenter < 0 || xcenter >= ifp->if_width )
return(-1);
- if ( ycenter < 0 || ycenter >= ifp->if_height )
+ if (ycenter < 0 || ycenter >= ifp->if_height )
return(-1);
- if ( xzoom >= ifp->if_width || yzoom >= ifp->if_height )
+ if (xzoom >= ifp->if_width || yzoom >= ifp->if_height )
return(-1);
ifp->if_xcenter = xcenter;
@@ -1865,7 +1865,7 @@
ifp->if_xzoom = xzoom;
ifp->if_yzoom = yzoom;
- if ( ifp->if_xzoom > 1 || ifp->if_yzoom > 1 )
+ if (ifp->if_xzoom > 1 || ifp->if_yzoom > 1 )
ifp->if_zoomflag = 1;
else ifp->if_zoomflag = 0;
@@ -1891,15 +1891,15 @@
ogl_clipper(ifp);
clp = &(OGL(ifp)->clip);
- glOrtho( clp->oleft, clp->oright, clp->obottom, clp->otop, -1.0, 1.0);
+ glOrtho(clp->oleft, clp->oright, clp->obottom, clp->otop, -1.0, 1.0);
glPixelZoom((float) ifp->if_xzoom, (float) ifp->if_yzoom);
if (OGL(ifp)->copy_flag) {
backbuffer_to_screen(ifp, -1);
} else {
- ogl_xmit_scanlines( ifp, 0, ifp->if_height, 0, ifp->if_width );
+ ogl_xmit_scanlines(ifp, 0, ifp->if_height, 0, ifp->if_width );
if (SGI(ifp)->mi_doublebuffer) {
- glXSwapBuffers( OGL(ifp)->dispp, OGL(ifp)->wind);
+ glXSwapBuffers(OGL(ifp)->dispp, OGL(ifp)->wind);
}
}
@@ -1940,18 +1940,18 @@
if (CJDEBUG) printf("entering ogl_read\n");
- if ( x < 0 || x >= ifp->if_width ||
- y < 0 || y >= ifp->if_height)
+ if (x < 0 || x >= ifp->if_width ||
+ y < 0 || y >= ifp->if_height)
return(-1);
ret = 0;
cp = (unsigned char *)(pixelp);
- while ( count ) {
- if ( y >= ifp->if_height )
+ while (count ) {
+ if (y >= ifp->if_height )
break;
- if ( count >= ifp->if_width-x )
+ if (count >= ifp->if_width-x )
scan_count = ifp->if_width-x;
else
scan_count = count;
@@ -1960,7 +1960,7 @@
(y*SGI(ifp)->mi_memwidth+x)*sizeof(struct ogl_pixel) ];
n = scan_count;
- while ( n ) {
+ while (n ) {
cp[RED] = oglp->red;
cp[GRN] = oglp->green;
cp[BLU] = oglp->blue;
@@ -1972,7 +1972,7 @@
count -= scan_count;
x = 0;
/* Advance upwards */
- if ( ++y >= ifp->if_height )
+ if (++y >= ifp->if_height )
break;
}
return(ret);
@@ -1994,29 +1994,29 @@
if (CJDEBUG) printf("entering ogl_write\n");
/* fast exit cases */
- if ( (pix_count = count) == 0 )
+ if ((pix_count = count) == 0 )
return 0; /* OK, no pixels transferred */
- if ( pix_count < 0 )
+ if (pix_count < 0 )
return -1; /* ERROR */
x = xstart;
ybase = y = ystart;
- if ( x < 0 || x >= ifp->if_width ||
- y < 0 || y >= ifp->if_height)
+ if (x < 0 || x >= ifp->if_width ||
+ y < 0 || y >= ifp->if_height)
return(-1);
ret = 0;
cp = (unsigned char *)(pixelp);
- while ( pix_count ) {
+ while (pix_count ) {
register unsigned int n;
register struct ogl_pixel *oglp;
- if ( y >= ifp->if_height )
+ if (y >= ifp->if_height )
break;
- if ( pix_count >= ifp->if_width-x )
+ if (pix_count >= ifp->if_width-x )
scan_count = ifp->if_width-x;
else
scan_count = pix_count;
@@ -2025,9 +2025,9 @@
(y*SGI(ifp)->mi_memwidth+x)*sizeof(struct ogl_pixel) ];
n = scan_count;
- if ( (n & 3) != 0 ) {
+ if ((n & 3) != 0 ) {
/* This code uses 60% of all CPU time */
- while ( n ) {
+ while (n ) {
/* alpha channel is always zero */
oglp->red = cp[RED];
oglp->green = cp[GRN];
@@ -2037,7 +2037,7 @@
n--;
}
} else {
- while ( n ) {
+ while (n ) {
/* alpha channel is always zero */
oglp[0].red = cp[RED+0*3];
oglp[0].green = cp[GRN+0*3];
@@ -2059,11 +2059,11 @@
ret += scan_count;
pix_count -= scan_count;
x = 0;
- if ( ++y >= ifp->if_height )
+ if (++y >= ifp->if_height )
break;
}
- if ( (ifp->if_mode & MODE_12MASK) == MODE_12DELAY_WRITES_TILL_FLUSH )
+ if ((ifp->if_mode & MODE_12MASK) == MODE_12DELAY_WRITES_TILL_FLUSH )
return ret;
if (!OGL(ifp)->use_ext_ctrl) {
@@ -2072,31 +2072,31 @@
fb_log("Warning, ogl_write: glXMakeCurrent unsuccessful.\n");
}
- if ( xstart + count <= ifp->if_width ) {
+ if (xstart + count <= ifp->if_width ) {
/* "Fast path" case for writes of less than one scanline.
* The assumption is that there will be a lot of short
* writes, and it's best just to ignore the backbuffer
*/
- if ( SGI(ifp)->mi_doublebuffer ) {
+ if (SGI(ifp)->mi_doublebuffer ) {
/* "turn off" doublebuffering*/
SGI(ifp)->mi_doublebuffer = 0;
glDrawBuffer(GL_FRONT);
}
- ogl_xmit_scanlines( ifp, ybase, 1, xstart, count );
+ ogl_xmit_scanlines(ifp, ybase, 1, xstart, count );
if (OGL(ifp)->copy_flag) {
/* repaint one scanline from backbuffer */
backbuffer_to_screen(ifp, ybase);
}
} else {
/* Normal case -- multi-pixel write */
- if ( SGI(ifp)->mi_doublebuffer) {
+ if (SGI(ifp)->mi_doublebuffer) {
/* refresh whole screen */
- ogl_xmit_scanlines( ifp, 0, ifp->if_height, 0, ifp->if_width );
- glXSwapBuffers( OGL(ifp)->dispp, OGL(ifp)->wind);
+ ogl_xmit_scanlines(ifp, 0, ifp->if_height, 0, ifp->if_width );
+ glXSwapBuffers(OGL(ifp)->dispp, OGL(ifp)->wind);
}
else {
/* just write rectangle */
- ogl_xmit_scanlines( ifp, ybase, y-ybase, 0, ifp->if_width );
+ ogl_xmit_scanlines(ifp, ybase, y-ybase, 0, ifp->if_width );
if (OGL(ifp)->copy_flag) {
backbuffer_to_screen(ifp, -1);
}
@@ -2129,17 +2129,17 @@
if (CJDEBUG) printf("entering ogl_writerect\n");
- if ( width <= 0 || height <= 0 )
+ if (width <= 0 || height <= 0 )
return(0); /* do nothing */
- if ( xmin < 0 || xmin+width > ifp->if_width ||
- ymin < 0 || ymin+height > ifp->if_height )
+ if (xmin < 0 || xmin+width > ifp->if_width ||
+ ymin < 0 || ymin+height > ifp->if_height )
return(-1); /* no can do */
cp = (unsigned char *)(pp);
- for ( y = ymin; y < ymin+height; y++ ) {
+ for (y = ymin; y < ymin+height; y++ ) {
oglp = (struct ogl_pixel *)&ifp->if_mem[
(y*SGI(ifp)->mi_memwidth+xmin)*sizeof(struct ogl_pixel) ];
- for ( x = xmin; x < xmin+width; x++ ) {
+ for (x = xmin; x < xmin+width; x++ ) {
/* alpha channel is always zero */
oglp->red = cp[RED];
oglp->green = cp[GRN];
@@ -2149,7 +2149,7 @@
}
}
- if ( (ifp->if_mode & MODE_12MASK) == MODE_12DELAY_WRITES_TILL_FLUSH )
+ if ((ifp->if_mode & MODE_12MASK) == MODE_12DELAY_WRITES_TILL_FLUSH )
return width*height;
if (!OGL(ifp)->use_ext_ctrl) {
@@ -2157,14 +2157,14 @@
fb_log("Warning, ogl_writerect: glXMakeCurrent unsuccessful.\n");
}
- if ( SGI(ifp)->mi_doublebuffer) {
+ if (SGI(ifp)->mi_doublebuffer) {
/* refresh whole screen */
- ogl_xmit_scanlines( ifp, 0, ifp->if_height, 0, ifp->if_width );
- glXSwapBuffers( OGL(ifp)->dispp, OGL(ifp)->wind);
+ ogl_xmit_scanlines(ifp, 0, ifp->if_height, 0, ifp->if_width );
+ glXSwapBuffers(OGL(ifp)->dispp, OGL(ifp)->wind);
}
else {
/* just write rectangle*/
- ogl_xmit_scanlines( ifp, ymin, height, xmin, width );
+ ogl_xmit_scanlines(ifp, ymin, height, xmin, width );
if (OGL(ifp)->copy_flag) {
backbuffer_to_screen(ifp, -1);
}
@@ -2196,17 +2196,17 @@
if (CJDEBUG) printf("entering ogl_bwwriterect\n");
- if ( width <= 0 || height <= 0 )
+ if (width <= 0 || height <= 0 )
return(0); /* do nothing */
- if ( xmin < 0 || xmin+width > ifp->if_width ||
- ymin < 0 || ymin+height > ifp->if_height )
+ if (xmin < 0 || xmin+width > ifp->if_width ||
+ ymin < 0 || ymin+height > ifp->if_height )
return(-1); /* no can do */
cp = (unsigned char *)(pp);
- for ( y = ymin; y < ymin+height; y++ ) {
+ for (y = ymin; y < ymin+height; y++ ) {
oglp = (struct ogl_pixel *)&ifp->if_mem[
(y*SGI(ifp)->mi_memwidth+xmin)*sizeof(struct ogl_pixel) ];
- for ( x = xmin; x < xmin+width; x++ ) {
+ for (x = xmin; x < xmin+width; x++ ) {
register int val;
/* alpha channel is always zero */
oglp->red = (val = *cp++);
@@ -2216,7 +2216,7 @@
}
}
- if ( (ifp->if_mode & MODE_12MASK) == MODE_12DELAY_WRITES_TILL_FLUSH )
+ if ((ifp->if_mode & MODE_12MASK) == MODE_12DELAY_WRITES_TILL_FLUSH )
return width*height;
if (!OGL(ifp)->use_ext_ctrl) {
@@ -2224,14 +2224,14 @@
fb_log("Warning, ogl_writerect: glXMakeCurrent unsuccessful.\n");
}
- if ( SGI(ifp)->mi_doublebuffer) {
+ if (SGI(ifp)->mi_doublebuffer) {
/* refresh whole screen */
- ogl_xmit_scanlines( ifp, 0, ifp->if_height, 0, ifp->if_width );
- glXSwapBuffers( OGL(ifp)->dispp, OGL(ifp)->wind);
+ ogl_xmit_scanlines(ifp, 0, ifp->if_height, 0, ifp->if_width );
+ glXSwapBuffers(OGL(ifp)->dispp, OGL(ifp)->wind);
}
else {
/* just write rectangle*/
- ogl_xmit_scanlines( ifp, ymin, height, xmin, width );
+ ogl_xmit_scanlines(ifp, ymin, height, xmin, width );
if (OGL(ifp)->copy_flag) {
backbuffer_to_screen(ifp, -1);
}
@@ -2253,7 +2253,7 @@
if (CJDEBUG) printf("entering ogl_rmap\n");
/* Just parrot back the stored colormap */
- for ( i = 0; i < 256; i++) {
+ for (i = 0; i < 256; i++) {
cmp->cm_red[i] = CMR(ifp)[i]<<8;
cmp->cm_green[i] = CMG(ifp)[i]<<8;
cmp->cm_blue[i] = CMB(ifp)[i]<<8;
@@ -2274,10 +2274,10 @@
if (CJDEBUG) printf("entering ogl_wmap\n");
prev = SGI(ifp)->mi_cmap_flag;
- if ( cmp == COLORMAP_NULL) {
- ogl_cminit( ifp );
+ if (cmp == COLORMAP_NULL) {
+ ogl_cminit(ifp );
} else {
- for (i = 0; i < 256; i++) {
+ for (i = 0; i < 256; i++) {
CMR(ifp)[i] = cmp-> cm_red[i]>>8;
CMG(ifp)[i] = cmp-> cm_green[i]>>8;
CMB(ifp)[i] = cmp-> cm_blue[i]>>8;
@@ -2287,9 +2287,9 @@
if (!OGL(ifp)->use_ext_ctrl) {
- if ( OGL(ifp)->soft_cmap_flag ) {
+ if (OGL(ifp)->soft_cmap_flag ) {
/* if current and previous maps are linear, return */
- if ( SGI(ifp)->mi_cmap_flag == 0 && prev == 0 ) return(0);
+ if (SGI(ifp)->mi_cmap_flag == 0 && prev == 0 ) return(0);
/* Software color mapping, trigger a repaint */
@@ -2297,9 +2297,9 @@
fb_log("Warning, ogl_wmap: glXMakeCurrent unsuccessful.\n");
}
- ogl_xmit_scanlines( ifp, 0, ifp->if_height, 0, ifp->if_width );
+ ogl_xmit_scanlines(ifp, 0, ifp->if_height, 0, ifp->if_width );
if (SGI(ifp)->mi_doublebuffer) {
- glXSwapBuffers( OGL(ifp)->dispp, OGL(ifp)->wind);
+ glXSwapBuffers(OGL(ifp)->dispp, OGL(ifp)->wind);
} else if (OGL(ifp)->copy_flag) {
backbuffer_to_screen(ifp, -1);
}
@@ -2333,23 +2333,23 @@
struct modeflags *mfp;
XVisualInfo *visual = OGL(ifp)->vip;
- fb_log( "Description: %s\n", ifp->if_type );
- fb_log( "Device: %s\n", ifp->if_name );
- fb_log( "Max width height: %d %d\n",
- ifp->if_max_width,
- ifp->if_max_height );
- fb_log( "Default width height: %d %d\n",
- ifp->if_width,
- ifp->if_height );
- fb_log( "Usage: /dev/ogl[option letters]\n" );
- for ( mfp = modeflags; mfp->c != '\0'; mfp++ ) {
- fb_log( " %c %s\n", mfp->c, mfp->help );
+ fb_log("Description: %s\n", ifp->if_type );
+ fb_log("Device: %s\n", ifp->if_name );
+ fb_log("Max width height: %d %d\n",
+ ifp->if_max_width,
+ ifp->if_max_height );
+ fb_log("Default width height: %d %d\n",
+ ifp->if_width,
+ ifp->if_height );
+ fb_log("Usage: /dev/ogl[option letters]\n" );
+ for (mfp = modeflags; mfp->c != '\0'; mfp++ ) {
+ fb_log(" %c %s\n", mfp->c, mfp->help );
}
- fb_log( "\nCurrent internal state:\n");
- fb_log( " mi_doublebuffer=%d\n", SGI(ifp)->mi_doublebuffer );
- fb_log( " mi_cmap_flag=%d\n", SGI(ifp)->mi_cmap_flag );
- fb_log( " ogl_nwindows=%d\n", ogl_nwindows );
+ fb_log("\nCurrent internal state:\n");
+ fb_log(" mi_doublebuffer=%d\n", SGI(ifp)->mi_doublebuffer );
+ fb_log(" mi_cmap_flag=%d\n", SGI(ifp)->mi_cmap_flag );
+ fb_log(" ogl_nwindows=%d\n", ogl_nwindows );
fb_log("X11 Visual:\n");
@@ -2385,7 +2385,7 @@
fb_log("\tBits per RGB: %d\n", visual->bits_per_rgb);
fb_log("\tscreen: %d\n", visual->screen);
fb_log("\tdepth (total bits per pixel): %d\n", visual->depth);
- if ( visual->depth < 24 )
+ if (visual->depth < 24 )
fb_log("\tWARNING: unable to obtain full 24-bits of color, image will be quantized.\n");
return 0;
@@ -2465,15 +2465,15 @@
HIDDEN int
ogl_flush(FBIO *ifp)
{
- if ( (ifp->if_mode & MODE_12MASK) == MODE_12DELAY_WRITES_TILL_FLUSH ) {
+ if ((ifp->if_mode & MODE_12MASK) == MODE_12DELAY_WRITES_TILL_FLUSH ) {
if (glXMakeCurrent(OGL(ifp)->dispp, OGL(ifp)->wind, OGL(ifp)->glxc)==False) {
fb_log("Warning, ogl_flush: glXMakeCurrent unsuccessful.\n");
}
/* Send entire in-memory buffer to the screen, all at once */
- ogl_xmit_scanlines( ifp, 0, ifp->if_height, 0, ifp->if_width );
- if ( SGI(ifp)->mi_doublebuffer) {
- glXSwapBuffers( OGL(ifp)->dispp, OGL(ifp)->wind);
+ ogl_xmit_scanlines(ifp, 0, ifp->if_height, 0, ifp->if_width );
+ if (SGI(ifp)->mi_doublebuffer) {
+ glXSwapBuffers(OGL(ifp)->dispp, OGL(ifp)->wind);
} else {
if (OGL(ifp)->copy_flag) {
backbuffer_to_screen(ifp, -1);
@@ -2513,7 +2513,7 @@
ogl_clipper(ifp);
clp = &(OGL(ifp)->clip);
- glOrtho( clp->oleft, clp->oright, clp->obottom, clp->otop, -1.0, 1.0);
+ glOrtho(clp->oleft, clp->oright, clp->obottom, clp->otop, -1.0, 1.0);
glPixelZoom((float) ifp->if_xzoom, (float) ifp->if_yzoom);
glMatrixMode(GL_MODELVIEW);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|