convert c++ comments to c comments

pull/1/head
dscho 20 years ago
parent 1589d04d50
commit 2a4a0f487e

@ -134,15 +134,15 @@ void ZRLE_ENCODE_TILE (PIXEL_T* data, int w, int h, zrleOutStream* os)
return; return;
} }
// Try to work out whether to use RLE and/or a palette. We do this by /* Try to work out whether to use RLE and/or a palette. We do this by
// estimating the number of bytes which will be generated and picking the estimating the number of bytes which will be generated and picking the
// method which results in the fewest bytes. Of course this may not result method which results in the fewest bytes. Of course this may not result
// in the fewest bytes after compression... in the fewest bytes after compression... */
useRle = FALSE; useRle = FALSE;
usePalette = FALSE; usePalette = FALSE;
estimatedBytes = w * h * (BPPOUT/8); // start assuming raw estimatedBytes = w * h * (BPPOUT/8); /* start assuming raw */
plainRleBytes = ((BPPOUT/8)+1) * (runs + singlePixels); plainRleBytes = ((BPPOUT/8)+1) * (runs + singlePixels);
@ -216,13 +216,13 @@ void ZRLE_ENCODE_TILE (PIXEL_T* data, int w, int h, zrleOutStream* os)
} else { } else {
// no RLE /* no RLE */
if (usePalette) { if (usePalette) {
int bppp; int bppp;
PIXEL_T* ptr = data; PIXEL_T* ptr = data;
// packed pixels /* packed pixels */
assert (ph->size < 17); assert (ph->size < 17);
@ -251,7 +251,7 @@ void ZRLE_ENCODE_TILE (PIXEL_T* data, int w, int h, zrleOutStream* os)
} }
} else { } else {
// raw /* raw */
#ifdef CPIXEL #ifdef CPIXEL
PIXEL_T *ptr; PIXEL_T *ptr;

@ -13,7 +13,6 @@ int main(int argc,char** argv)
server->frameBuffer=malloc(400*300*4); server->frameBuffer=malloc(400*300*4);
for(j=0;j<400*300*4;j++) for(j=0;j<400*300*4;j++)
server->frameBuffer[j]=j; server->frameBuffer[j]=j;
//server->maxRectsPerUpdate=-1;
rfbInitServer(server); rfbInitServer(server);
while(time(0)-t<20) { while(time(0)-t<20) {

@ -48,7 +48,6 @@ void do_key(rfbBool down,rfbKeySym keySym,rfbClientPtr cl)
if(keySym<0x100) { if(keySym<0x100) {
int ret; int ret;
//rfbLog("do_key: %c (0x%lx)\n",(char)keySym,keySym);
ret=ioctl(tty_inject_device,TIOCSTI,&keySym); ret=ioctl(tty_inject_device,TIOCSTI,&keySym);
if(ret<0) { if(ret<0) {
static char device[64]; static char device[64];

@ -44,7 +44,7 @@ int main(int argc, char **argv)
dup2(in[0],0); dup2(in[0],0);
dup2(out[1],1); dup2(out[1],1);
dup2(err[1],2); dup2(err[1],2);
//setbuf(stdin,NULL); /*setbuf(stdin,NULL);*/
execvp(argv[programArg0],argv+programArg0); execvp(argv[programArg0],argv+programArg0);
} }
@ -63,7 +63,7 @@ int main(int argc, char **argv)
FD_ZERO(&fs); FD_ZERO(&fs);
FD_SET(out[0],&fs); FD_SET(out[0],&fs);
FD_SET(err[0],&fs); FD_SET(err[0],&fs);
//FD_SET(0,&fs); /*FD_SET(0,&fs);*/
tv.tv_sec=0; tv.tv_usec=5000; tv.tv_sec=0; tv.tv_usec=5000;
input_pipe=fdopen(in[1],"w"); input_pipe=fdopen(in[1],"w");

@ -416,7 +416,7 @@ void vcPtrAddEventProc(int buttonMask,int x,int y,rfbClientPtr cl)
if(cy<0) cy=0; else if(cy>=c->height) cy=c->height-1; if(cy<0) cy=0; else if(cy>=c->height) cy=c->height-1;
pos=cy*c->width+cx; pos=cy*c->width+cx;
// mark /* mark */
if(!c->currentlyMarking) { if(!c->currentlyMarking) {
c->currentlyMarking=TRUE; c->currentlyMarking=TRUE;
c->markStart=pos; c->markStart=pos;

@ -19,7 +19,6 @@ int main(int argc,char **argv)
l=strlen(buffer)-1; l=strlen(buffer)-1;
while(l>=0 && buffer[l]=='\n') while(l>=0 && buffer[l]=='\n')
buffer[l]=0; buffer[l]=0;
//rfbLog("%s (%d)",buffer,strlen(buffer));
if(!strcmp(buffer,"quit")) if(!strcmp(buffer,"quit"))
return(0); return(0);
if(!strcmp(buffer,"s")) if(!strcmp(buffer,"s"))

Loading…
Cancel
Save