- gc = XCreateGC(dpy, win, 0, 0);
- cgc = XCreateGC(dpy, win, 0, 0);
- tgc = XCreateGC(dpy, win, 0, 0);
- sgc = XCreateGC(dpy, win, 0, 0);
- ugc = XCreateGC(dpy, win, 0, 0);
- logo_gc = XCreateGC(dpy, win, 0, 0);
- erase_gc = XCreateGC(dpy, win, 0, 0);
-
- gray = XCreateBitmapFromData (dpy,win,gray1_bits,gray1_width,gray1_height);
-
- bg = get_pixel_resource ("background","Background", dpy, xgwa.colormap);
- fg = get_pixel_resource ("foreground","Foreground", dpy, xgwa.colormap);
- pfg = get_pixel_resource ("liveColor", "Foreground", dpy, xgwa.colormap);
- pbg = get_pixel_resource ("deadColor", "Foreground", dpy, xgwa.colormap);
- sfg = get_pixel_resource ("skipColor", "Foreground", dpy, xgwa.colormap);
- ufg = get_pixel_resource ("surroundColor", "Foreground", dpy, xgwa.colormap);
-
- XSetForeground (dpy, gc, fg);
- XSetBackground (dpy, gc, bg);
- XSetForeground (dpy, cgc, pbg);
- XSetBackground (dpy, cgc, bg);
- XSetForeground (dpy, tgc, pfg);
- XSetBackground (dpy, tgc, bg);
- XSetForeground (dpy, sgc, sfg);
- XSetBackground (dpy, sgc, bg);
- XSetForeground (dpy, ugc, ufg);
- XSetBackground (dpy, ugc, bg);
- XSetForeground (dpy, logo_gc, fg);
- XSetBackground (dpy, logo_gc, bg);
- XSetForeground (dpy, erase_gc, bg);
- XSetBackground (dpy, erase_gc, bg);
-
- XSetStipple (dpy, cgc, gray);
- XSetFillStyle (dpy, cgc, FillOpaqueStippled);
- XSetStipple (dpy, sgc, gray);
- XSetFillStyle (dpy, sgc, FillOpaqueStippled);
- XSetStipple (dpy, ugc, gray);
- XSetFillStyle (dpy, ugc, FillOpaqueStippled);
-
-#ifdef XSCREENSAVER_LOGO
+ bg = get_pixel_resource (st->dpy, xgwa.colormap, "background","Background");
+ fg = get_pixel_resource (st->dpy, xgwa.colormap, "foreground","Foreground");
+ pfg = get_pixel_resource (st->dpy, xgwa.colormap, "liveColor", "Foreground");
+ pbg = get_pixel_resource (st->dpy, xgwa.colormap, "deadColor", "Foreground");
+ sfg = get_pixel_resource (st->dpy, xgwa.colormap, "skipColor", "Foreground");
+ ufg = get_pixel_resource (st->dpy, xgwa.colormap, "surroundColor", "Foreground");
+
+ XSetForeground (st->dpy, st->gc, fg);
+ XSetBackground (st->dpy, st->gc, bg);
+ XSetForeground (st->dpy, st->cgc, pbg);
+ XSetBackground (st->dpy, st->cgc, bg);
+ XSetForeground (st->dpy, st->tgc, pfg);
+ XSetBackground (st->dpy, st->tgc, bg);
+ XSetForeground (st->dpy, st->sgc, sfg);
+ XSetBackground (st->dpy, st->sgc, bg);
+ XSetForeground (st->dpy, st->ugc, ufg);
+ XSetBackground (st->dpy, st->ugc, bg);
+ XSetForeground (st->dpy, st->logo_gc, fg);
+ XSetBackground (st->dpy, st->logo_gc, bg);
+ XSetForeground (st->dpy, st->erase_gc, bg);
+ XSetBackground (st->dpy, st->erase_gc, bg);
+