Update to 2020

[grrobot] / src / grr_icon.h

diff --git a/src/grr_icon.h b/src/grr_icon.h
index ca8dfef9f8299aea754e6153dd113e70f5151a9d..10a954fa030f35dfd6ca299b9574f7c3d125c2e3 100644 (file)
--- a/src/grr_icon.h
+++ b/src/grr_icon.h
@@ -1,6 +1,6 @@
 /* grrobot - Ricochet Robot using GTK+ and Xr
  *
- * Copyright © 2003 Carl Worth
+ * Copyright © 2003 Carl Worth
  *
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
@@ -28,12 +28,12 @@
 #define GRR_ICON_H
 
 #include <rr.h>
-#include <xsvg.h>
+#include <librsvg/rsvg.h>
+#include <librsvg/rsvg-cairo.h>
 
 typedef struct grr_icon {
-    xsvg_t *xsvg;
-
-    XrSurface *surface;
+    RsvgHandle *rsvg;
+    cairo_surface_t *surface;
     int surface_width;
     int surface_height;
 } grr_icon_t;
@@ -45,13 +45,13 @@ void
 grr_icon_destroy (grr_icon_t *icon);
 
 void
-grr_icon_draw (grr_icon_t *icon, XrState *xrs);
+grr_icon_draw (grr_icon_t *icon, cairo_t *xrs);
 
 void
-grr_icon_predraw (grr_icon_t *icon, XrState *xrs, int width, int height);
+grr_icon_predraw (grr_icon_t *icon, cairo_t *xrs, int width, int height);
 
 void
-grr_icon_draw_predrawn (grr_icon_t *icon, XrState *xrs);
+grr_icon_draw_predrawn (grr_icon_t *icon, cairo_t *xrs, double alpha);
 
 char *
 grr_icon_robot_name (rr_robot_t robot);