X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=android%2Fjwxyz.c;fp=android%2Fjwxyz.c;h=d2ed46c867a292d072e77db11b81bdd2e10072f3;hp=b7964a6c31bbb05062a8288b4d7fe7c060a3e4b9;hb=d1ae2829ff0fd2a96c16a0c8c5420efaa47d7b30;hpb=7edd66e6bd3209013ee059819747b10b5835635b

diff --git a/android/jwxyz.c b/android/jwxyz.c
index b7964a6c..d2ed46c8 100644
--- a/android/jwxyz.c
+++ b/android/jwxyz.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1991-2015 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -73,10 +73,30 @@ struct jwxyz_Display {
 struct jwxyz_Screen {
     Display *dpy;
     Visual *visual;
+    unsigned long black, white;
     int screen_number;
 };
 
 
+Screen *
+XDefaultScreenOfDisplay (Display *dpy)
+{
+  return dpy->screen;
+}
+
+unsigned long
+XBlackPixelOfScreen(Screen *screen)
+{
+  return screen->black;
+}
+
+unsigned long
+XWhitePixelOfScreen(Screen *screen)
+{
+  return screen->white;
+}
+
+
 static void draw_rect(Display *, Drawable, GC,
 		      int x, int y, unsigned int width,
 		      unsigned int height, BOOL foreground_p, BOOL fill_p);
@@ -314,6 +334,8 @@ Display * jwxyz_make_display (void *nsview_arg, void *cgc_arg)
 
     d->screen_count = 1;
     d->screen->screen_number = 0;
+    d->screen->black = 0xFF000000;
+    d->screen->white = 0xFFFFFFFF;
 
     Visual *v = (Visual *) calloc(1, sizeof(Visual));
     v->class = TrueColor;
@@ -325,7 +347,7 @@ Display * jwxyz_make_display (void *nsview_arg, void *cgc_arg)
 
     Window w = (Window) calloc(1, sizeof(*w));
     w->type = WINDOW;
-    w->window.background = BlackPixel(0, 0);
+    w->window.background = BlackPixelOfScreen(d->screen);
 
     d->main_window = w;
 
@@ -430,3 +452,16 @@ XTextExtents16 (XFontStruct *f, const XChar2b *s, int length,
                 XCharStruct *cs)
 {
 }
+
+int
+XPutPixel (XImage *ximage, int x, int y, unsigned long pixel)
+{
+}
+
+XImage *
+XCreateImage (Display *dpy, Visual *visual, unsigned int depth,
+              int format, int offset, char *data,
+              unsigned int width, unsigned int height,
+              int bitmap_pad, int bytes_per_line)
+{
+}