X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ftest.c;h=52221c4de5da7bf97093bfc2e24f490aff80bb91;hb=c4e4760c41f10aae6af19a4363cb247c71edee4b;hp=114819af75aa8d089564c5e41d8d48b84deb5fee;hpb=f8a47de5ec444c452093371e3db16857eb39a490;p=chaz%2Fopenbox

diff --git a/render/test.c b/render/test.c
index 114819af..52221c4d 100644
--- a/render/test.c
+++ b/render/test.c
@@ -1,7 +1,26 @@
+/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+
+   test.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003        Derek Foreman
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include <stdio.h>
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
-#include <GL/glx.h>
 #include <string.h>
 #include <stdlib.h>
 #include "render.h"
@@ -22,60 +41,57 @@ Window ob_root;
 int main()
 {
 	Window win;
-	GC gc;
-	Pixmap pm;
-	Appearance *look;
+	RrInstance *inst;
+	RrAppearance *look;
 
-	int grabbed = 0;
 	Window root;
-        XGCValues values;
 	XEvent report;
-	int h = 500, w = 500, tmp;
-	XVisualInfo *vi;
-	int i;
+	int h = 500, w = 500;
 
 	ob_display = XOpenDisplay(NULL);
 	XSetErrorHandler(x_error_handler);
 	ob_screen = DefaultScreen(ob_display);
 	ob_root = RootWindow(ob_display, ob_screen);
 	win =
-	    XCreateWindow(ob_display, RootWindow(ob_display, 0)
-                          , 10, 10, w, h, 10, 
-                          CopyFromParent,	// depth
-			  CopyFromParent,	// class
-			  CopyFromParent,	// visual
-			  0,	// valuemask
-			  0);	// attributes
+	    XCreateWindow(ob_display, RootWindow(ob_display, 0),
+					  10, 10, w, h, 10, 
+					  CopyFromParent,	/* depth */
+					  CopyFromParent,	/* class */
+					  CopyFromParent,	/* visual */
+					  0,	                /* valuemask */
+					  0);	                /* attributes */
 	XMapWindow(ob_display, win);
 	XSelectInput(ob_display, win, ExposureMask | StructureNotifyMask);
 	root = RootWindow (ob_display, DefaultScreen (ob_display));
-	render_startup();
+	inst = RrInstanceNew(ob_display, ob_screen);
 
-	look = appearance_new(Surface_Planar, 0);
-	look->surface.data.planar.grad = Background_Solid;
-	look->surface.data.planar.secondary = color_new(0xFF, 0xFF, 0xFF);
-	look->surface.data.planar.primary = color_parse("Red");
-        look->surface.data.planar.interlaced = FALSE;
+	look = RrAppearanceNew(inst, 0);
+	look->surface.grad = RR_SURFACE_PYRAMID;
+	look->surface.secondary = RrColorParse(inst, "Yellow");
+	look->surface.primary = RrColorParse(inst, "Blue");
+	look->surface.interlaced = FALSE;
 	if (ob_display == NULL) {
 		fprintf(stderr, "couldn't connect to X server :0\n");
 		return 0;
 	}
 
-	paint(win, look, 500, 500);
+	RrPaint(look, win, w, h);
 	while (1) {
 		XNextEvent(ob_display, &report);
 		switch (report.type) {
 		case Expose:
-		break;
+			break;
 		case ConfigureNotify:
-			w = report.xconfigure.width;
-			h = report.xconfigure.height;
-			paint(win, look, w, h);
-			printf("confignotify %i:%i\n", w, h);
-		break;
+			RrPaint(look, win,
+					report.xconfigure.width,
+					report.xconfigure.height);
+			break;
 		}
 
 	}
 
+	RrAppearanceFree (look);
+	RrInstanceFree (inst);
+
 	return 1;
 }