diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/x11pdf.c | 114 | ||||
| -rw-r--r-- | test/ximage.c | 13 |
2 files changed, 63 insertions, 64 deletions
diff --git a/test/x11pdf.c b/test/x11pdf.c index 3d424b1c..07e1150c 100644 --- a/test/x11pdf.c +++ b/test/x11pdf.c @@ -57,32 +57,32 @@ void usage() static void xopen(void) { xdpy = XOpenDisplay(nil); - assert(xdpy != nil); + assert(xdpy != nil); - xscr = DefaultScreen(xdpy); + xscr = DefaultScreen(xdpy); - ximage_init(xdpy, xscr, DefaultVisual(xdpy, xscr)); + ximage_init(xdpy, xscr, DefaultVisual(xdpy, xscr)); - xcarrow = XCreateFontCursor(xdpy, XC_left_ptr); - xchand = XCreateFontCursor(xdpy, XC_hand2); - xcwait = XCreateFontCursor(xdpy, XC_watch); + xcarrow = XCreateFontCursor(xdpy, XC_left_ptr); + xchand = XCreateFontCursor(xdpy, XC_hand2); + xcwait = XCreateFontCursor(xdpy, XC_watch); - xwin = XCreateWindow(xdpy, DefaultRootWindow(xdpy), - 10, 10, 200, 100, 1, - ximage_get_depth(), - InputOutput, - ximage_get_visual(), - 0, - nil); + xwin = XCreateWindow(xdpy, DefaultRootWindow(xdpy), + 10, 10, 200, 100, 1, + ximage_get_depth(), + InputOutput, + ximage_get_visual(), + 0, + nil); - XSetWindowColormap(xdpy, xwin, ximage_get_colormap()); - XSelectInput(xdpy, xwin, - StructureNotifyMask | ExposureMask | KeyPressMask | - PointerMotionMask | ButtonPressMask); + XSetWindowColormap(xdpy, xwin, ximage_get_colormap()); + XSelectInput(xdpy, xwin, + StructureNotifyMask | ExposureMask | KeyPressMask | + PointerMotionMask | ButtonPressMask); - mapped = 0; + mapped = 0; - xgc = XCreateGC(xdpy, xwin, 0, nil); + xgc = XCreateGC(xdpy, xwin, 0, nil); } static void xresize(void) @@ -230,88 +230,88 @@ static void dumptext() static void handlekey(int c) { - int oldpage = pageno; - float oldzoom = zoom; - int oldrotate = rotate; + int oldpage = pageno; + float oldzoom = zoom; + int oldrotate = rotate; - if (c >= '0' && c <= '9') + if (c >= '0' && c <= '9') pagebuf[pagebufidx++] = c; - else + else if (c != 'g' && c != 'G') - pagebufidx = 0; + pagebufidx = 0; - switch (c) - { + switch (c) + { case 'd': fz_debugglyphcache(rast->cache); break; case 'a': rotate -= 5; break; case 's': rotate += 5; break; case 'x': dumptext(); break; - case 'b': + case 'b': pageno--; if (pageno < 1) - pageno = 1; + pageno = 1; break; - case 'B': + case 'B': pageno -= 10; if (pageno < 1) - pageno = 1; + pageno = 1; break; - case ' ': - case 'f': + case ' ': + case 'f': pageno++; if (pageno > count) - pageno = count; + pageno = count; break; - case 'F': + case 'F': pageno += 10; if (pageno > count) - pageno = count; + pageno = count; break; - case 't': - case 'T': + case 't': + case 'T': if (histlen > 0) - pageno = hist[--histlen]; + pageno = hist[--histlen]; break; - case '-': + case '-': zoom -= 0.1; if (zoom < 0.1) - zoom = 0.1; + zoom = 0.1; break; - case '+': + case '+': zoom += 0.1; if (zoom > 3.0) - zoom = 3.0; + zoom = 3.0; break; - case '<': + case '<': rotate -= 90; break; - case '>': + case '>': rotate += 90; break; - case 'q': + case 'q': exit(0); - case 'g': - case 'G': + case 'g': + case 'G': if (pagebufidx > 0) { - pagebuf[pagebufidx] = '\0'; - pageno = atoi(pagebuf); - pagebufidx = 0; - if (pageno < 1) + pagebuf[pagebufidx] = '\0'; + pageno = atoi(pagebuf); + pagebufidx = 0; + if (pageno < 1) pageno = 1; - if (pageno > count) + if (pageno > count) pageno = count; } else { - if (c == 'G') - { + if (c == 'G') + { pageno = count; - } + } } break; - } + } if (pageno != oldpage || zoom != oldzoom || rotate != oldrotate) showpage(); diff --git a/test/ximage.c b/test/ximage.c index abf52ac1..9c368360 100644 --- a/test/ximage.c +++ b/test/ximage.c @@ -79,8 +79,7 @@ static struct } info; static XImage * -createximage(Display *dpy, Visual *vis, XShmSegmentInfo *xsi, - int depth, int w, int h) +createximage(Display *dpy, Visual *vis, XShmSegmentInfo *xsi, int depth, int w, int h) { XImage *img; Status status; @@ -95,8 +94,8 @@ createximage(Display *dpy, Visual *vis, XShmSegmentInfo *xsi, } xsi->shmid = shmget(IPC_PRIVATE, - img->bytes_per_line * img->height, - IPC_CREAT | 0777); + img->bytes_per_line * img->height, + IPC_CREAT | 0777); if (xsi->shmid < 0) { XDestroyImage(img); @@ -127,7 +126,7 @@ createximage(Display *dpy, Visual *vis, XShmSegmentInfo *xsi, shmctl(xsi->shmid, IPC_RMID, 0); printf("make xshm w=%d h=%d id=%d data=%p\n", - w, h, xsi->shmid, xsi->shmaddr); + w, h, xsi->shmid, xsi->shmaddr); return img; @@ -266,7 +265,7 @@ create_pool(void) for (i = 0; i < POOLSIZE; i++) { info.pool[i] = createximage(info.display, - info.visual.visual, &info.shminfo[i], info.visual.depth, + info.visual.visual, &info.shminfo[i], info.visual.depth, WIDTH, HEIGHT); if (info.pool[i] == nil) { return 0; @@ -402,7 +401,7 @@ ximage_blit(Drawable d, GC gc, } else { - XPutImage(info.display, d, gc, image, + XPutImage(info.display, d, gc, image, 0, 0, dstx + ax, dsty + ay, |