[waimea] Minor compilation fixes against cvs head

[jserv at linux2.cc.ntu.edu.tw]

Hello all,

  I just checked out Waimea from cvs head, and I found it
failed to get built with cvs head of Cairo. So that, I
attempted to fix the problem, and my patch was attached
in this mail.

  Thanks for bringing us such a great window manager!

Regards,
Jim Huang <jserv @ kaffe.org>
-------------- next part --------------
Index: src/Event.cc
===================================================================
RCS file: /cvs/waimea/waimea/src/Event.cc,v
retrieving revision 1.4
diff -u -r1.4 Event.cc
--- src/Event.cc	4 Nov 2004 00:22:46 -0000	1.4
+++ src/Event.cc	21 Jan 2005 22:46:58 -0000
@@ -29,7 +29,8 @@
 #include <X11/Xatom.h>
 
 #include <cairo.h>
-    
+#include <cairo/cairo-xlib.h>
+
 #ifdef    SHAPE
 #  include <X11/extensions/shape.h>
 #endif // SHAPE
Index: src/Render.cc
===================================================================
RCS file: /cvs/waimea/waimea/src/Render.cc,v
retrieving revision 1.2
diff -u -r1.2 Render.cc
--- src/Render.cc	4 Nov 2004 00:22:46 -0000	1.2
+++ src/Render.cc	21 Jan 2005 22:47:01 -0000
@@ -24,7 +24,8 @@
 #endif // HAVE_CONFIG_H
 
 extern "C" {
-    
+#include <cairo/cairo-xlib.h>    
+
 #ifdef    STDC_HEADERS
 #  include <stdlib.h>
 #  include <string.h>
Index: src/Render.hh
===================================================================
RCS file: /cvs/waimea/waimea/src/Render.hh,v
retrieving revision 1.2
diff -u -r1.2 Render.hh
--- src/Render.hh	4 Nov 2004 00:22:46 -0000	1.2
+++ src/Render.hh	21 Jan 2005 22:47:02 -0000
@@ -23,6 +23,7 @@
 #define __Render_hh
 
 extern "C" {
+#include <X11/Xlib.h>
 #include <cairo.h>
 
 #ifdef    SVG
@@ -210,8 +211,8 @@
 
 class WaSurface : public RefCounted<WaSurface> {
 public:
-    WaSurface(Display *, cairo_surface_t *, Pixmap, Pixmap,
-              unsigned char *, unsigned int, unsigned int);
+    WaSurface(Display *_display, cairo_surface_t *sp, Pixmap p, Pixmap b,
+              unsigned char *_data, unsigned int w, unsigned int h);
     virtual ~WaSurface(void);
 
     Display *display;
Index: src/Resources.cc
===================================================================
RCS file: /cvs/waimea/waimea/src/Resources.cc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Resources.cc
--- src/Resources.cc	12 May 2004 08:55:06 -0000	1.1.1.1
+++ src/Resources.cc	21 Jan 2005 22:47:02 -0000
@@ -174,6 +174,7 @@
     if (value_str) {
       if (! strcasecmp("true", value_str))
         __render_thread_count = 1;      
+    }
 
     struct sched_param param;
     int policy = sched_getscheduler(0);
Index: src/Screen.cc
===================================================================
RCS file: /cvs/waimea/waimea/src/Screen.cc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Screen.cc
--- src/Screen.cc	12 May 2004 08:55:00 -0000	1.1.1.1
+++ src/Screen.cc	21 Jan 2005 22:47:04 -0000
@@ -32,6 +32,9 @@
 #  include <X11/extensions/Xrandr.h>
 #endif // RANDR
 
+#include <X11/extensions/Xrender.h>
+#include <cairo/cairo-xlib.h>
+
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
Index: src/Style.cc
===================================================================
RCS file: /cvs/waimea/waimea/src/Style.cc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Style.cc
--- src/Style.cc	12 May 2004 08:55:03 -0000	1.1.1.1
+++ src/Style.cc	21 Jan 2005 22:47:06 -0000
@@ -25,6 +25,7 @@
 
 extern "C" {
 #include <X11/Xlib.h>
+#include <cairo/cairo-xlib.h>
 
 #ifdef    STDC_HEADERS
 #  include <stdlib.h>
Index: src/Waimea.cc
===================================================================
RCS file: /cvs/waimea/waimea/src/Waimea.cc,v
retrieving revision 1.2
diff -u -r1.2 Waimea.cc
--- src/Waimea.cc	4 Nov 2004 00:22:46 -0000	1.2
+++ src/Waimea.cc	21 Jan 2005 22:47:14 -0000
@@ -30,7 +30,8 @@
 #include <X11/Xlocale.h>
 
 #include <cairo.h>
-    
+#include <cairo/cairo-xlib.h>
+
 #ifdef    SHAPE
 #  include <X11/extensions/shape.h>
 #endif // SHAPE
@@ -42,7 +43,9 @@
 #ifdef    RANDR
 #  include <X11/extensions/Xrandr.h>
 #endif // RANDR
-    
+
+#include <X11/extensions/Xrender.h>
+
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
@@ -1151,7 +1154,7 @@
 #ifdef    THREAD
 void *render_thread_func(void *) {
     sigset_t sigset;
-    cairo_state_t *cr = cairo_create();
+    cairo_t *cr = cairo_create();
 
     /* XXX: cairo need a call to this function for text support to be
        initialized, will probably dissapear soon. */