#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
+#include <signal.h>
#include <sys/time.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <X11/keysym.h>
#include <X11/extensions/XShm.h>
#include "rbench.h"
+#include "util.h"
enum { QUIT = 1, REDRAW = 2 };
static void handle_event(XEvent *ev);
static int translate_keysym(KeySym sym);
static int parse_args(int argc, char **argv);
+static void sig(int s);
static int win_width, win_height;
static int mapped;
static GC gc;
static Visual *vis;
static Atom xa_wm_proto, xa_wm_delwin;
+static int no_wm;
static XImage *ximg;
static XShmSegmentInfo shm;
static int wait_putimg;
static int xshm_ev_completion;
+
int main(int argc, char **argv)
{
- int num_frames;
+ int num_frames = 0;
XEvent ev;
struct timeval tv, tv0;
+ char *env;
+
+ if((env = getenv("RBENCH_NO_WM"))) {
+ if(isdigit(env[0])) {
+ no_wm = atoi(env);
+ } else {
+ no_wm = 1;
+ }
+ }
shm.shmid = -1;
shm.shmaddr = (void*)-1;
+ signal(SIGINT, sig);
+
read_config("rbench.cfg");
if(parse_args(argc, argv) == -1) {
fb_width = opt.width;
fb_height = opt.height;
- fb_bpp = opt.bpp >= 24 ? 32 : opt.bpp;
+ if(opt.bpp >= 24) {
+ fb_bpp = ximg->bytes_per_line < fb_width * 4 ? 24 : 32;
+ } else {
+ fb_bpp = opt.bpp;
+ }
framebuf = ximg->data;
fb_pitch = ximg->bytes_per_line;
+ fb_rmask = ximg->red_mask;
+ fb_gmask = ximg->green_mask;
+ fb_bmask = ximg->blue_mask;
+ fb_rshift = mask_to_shift(fb_rmask);
+ fb_gshift = mask_to_shift(fb_gmask);
+ fb_bshift = mask_to_shift(fb_bmask);
if(init() == -1) {
goto end;
}
gettimeofday(&tv0, 0);
- num_frames = 0;
- for(;;) {
+ while(!(pending & QUIT)) {
if(mapped) {/* && !wait_putimg) { */
while(XPending(dpy)) {
XNextEvent(dpy, &ev);
if(pending & QUIT) goto end;
}
- gettimeofday(&tv, 0);
- time_msec = (tv.tv_sec - tv0.tv_sec) * 1000 + (tv.tv_usec - tv0.tv_usec) / 1000;
- num_frames++;
+ if(!wait_putimg) {
+ gettimeofday(&tv, 0);
+ time_msec = (tv.tv_sec - tv0.tv_sec) * 1000 + (tv.tv_usec - tv0.tv_usec) / 1000;
+ num_frames++;
- redraw();
+ redraw();
- XShmPutImage(dpy, win, gc, ximg, 0, 0, 0, 0, ximg->width, ximg->height, False);
- /*wait_putimg = 1;*/
+ XShmPutImage(dpy, win, gc, ximg, 0, 0, 0, 0, ximg->width, ximg->height, False);
+ XSync(dpy, False);
+ /*wait_putimg = 1;*/
+ }
} else {
XNextEvent(dpy, &ev);
handle_event(&ev);
xattr.background_pixel = BlackPixel(dpy, scr);
xattr.colormap = cmap;
+ xattr.override_redirect = no_wm ? True : False;
win = XCreateWindow(dpy, root, 0, 0, width, height, 0, vinf->depth,
- InputOutput, vis, CWColormap | CWBackPixel, &xattr);
+ InputOutput, vis, CWColormap | CWBackPixel | CWOverrideRedirect, &xattr);
if(!win) return 0;
XSelectInput(dpy, win, StructureNotifyMask | ExposureMask | KeyPressMask |
}
return 0;
}
+
+static void sig(int s)
+{
+ pending |= QUIT;
+}