From cb69660363a21978e1919d8f30868e6a5c94a4d4 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 25 Dec 2003 21:17:29 +0000 Subject: [PATCH] * configure.in: * ltmain.sh: * src/grr_board_view.c: * src/grr_icon.c: (_grr_icon_init), (grr_icon_draw): * src/grr_icon.h: * src/grrobot.c: Switch from xsvg to svg-cairo --- ChangeLog | 10 ++++++++++ configure.in | 2 +- ltmain.sh | 2 -- src/grr_board_view.c | 2 +- src/grr_icon.c | 16 ++++++++-------- src/grr_icon.h | 4 ++-- src/grrobot.c | 2 +- 7 files changed, 23 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1cd8b52..ae5a43b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-12-25 Keith Packard + + * configure.in: + * ltmain.sh: + * src/grr_board_view.c: + * src/grr_icon.c: (_grr_icon_init), (grr_icon_draw): + * src/grr_icon.h: + * src/grrobot.c: + Switch from xsvg to svg-cairo + 2003-11-11 Carl Worth * src/grrobot.c (grr_game_read_notices): Exit cleanly: need to diff --git a/configure.in b/configure.in index 0983fd7..0761830 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_STDC_HEADERS dnl =========================================================================== -PKG_CHECK_MODULES(GRROBOT, gtk+-2.0 libxsvg librr cairo >= 0.1.1) +PKG_CHECK_MODULES(GRROBOT, gtk+-2.0 libsvg-cairo librr cairo >= 0.1.1) AC_SUBST(GRROBOT_CFLAGS) AC_SUBST(GRROBOT_LIBS) diff --git a/ltmain.sh b/ltmain.sh index b0f592c..fe83ff4 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -24,8 +24,6 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -max_cmd_len=2049 - # Check that we have a working $echo. if test "X$1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. diff --git a/src/grr_board_view.c b/src/grr_board_view.c index 6a18441..1c918f2 100644 --- a/src/grr_board_view.c +++ b/src/grr_board_view.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/src/grr_icon.c b/src/grr_icon.c index f4515fe..c1076b9 100644 --- a/src/grr_icon.c +++ b/src/grr_icon.c @@ -127,7 +127,7 @@ grr_icon_create (char *name) static rr_status_t _grr_icon_init (grr_icon_t *icon, char *name) { - xsvg_status_t status; + svg_cairo_status_t status; char *file, *buf; int buflen; @@ -135,15 +135,15 @@ _grr_icon_init (grr_icon_t *icon, char *name) icon->surface_width = 0; icon->surface_height = 0; - status = xsvg_create (&icon->xsvg); + status = svg_cairo_create (&icon->svg_cairo); if (status) return RR_STATUS_NO_MEMORY; file = _grr_icon_find_file (name); if (file) { - status = xsvg_parse_file (icon->xsvg, file); - if (status == XSVG_STATUS_SUCCESS) { + status = svg_cairo_parse (icon->svg_cairo, file); + if (status == SVG_CAIRO_STATUS_SUCCESS) { free (file); return RR_STATUS_SUCCESS; } @@ -152,7 +152,7 @@ _grr_icon_init (grr_icon_t *icon, char *name) } _grr_icon_find_buffer (name, &buf, &buflen); - status = xsvg_parse_buffer (icon->xsvg, buf, buflen); + status = svg_cairo_parse_buffer (icon->svg_cairo, buf, buflen); if (status) { fprintf (stderr, "Error parsing built-in SVG icon for: %s\n", name); return RR_STATUS_PARSE_ERROR; @@ -225,11 +225,11 @@ grr_icon_target_name (rr_target_t target) void grr_icon_draw (grr_icon_t *icon, cairo_t *xrs) { - xsvg_status_t status; + svg_cairo_status_t status; - status = xsvg_render (icon->xsvg, xrs); + status = svg_cairo_render (icon->svg_cairo, xrs); if (status) { - fprintf (stderr, "xsvg_render error\n"); + fprintf (stderr, "svg_cairo_render error\n"); return; } } diff --git a/src/grr_icon.h b/src/grr_icon.h index e3d0579..c2d832c 100644 --- a/src/grr_icon.h +++ b/src/grr_icon.h @@ -28,10 +28,10 @@ #define GRR_ICON_H #include -#include +#include typedef struct grr_icon { - xsvg_t *xsvg; + svg_cairo_t *svg_cairo; cairo_surface_t *surface; int surface_width; diff --git a/src/grrobot.c b/src/grrobot.c index 386a163..8c42f26 100644 --- a/src/grrobot.c +++ b/src/grrobot.c @@ -1,4 +1,4 @@ -/* grrobot - Ricochet Robot using GTK+, libxsvg, and Cairo +/* grrobot - Ricochet Robot using GTK+, libsvg-cairo, and cairo * * Copyright © 2003 Carl Worth * -- 2.43.0