--- deliantra/Deliantra-Client/Client.xs 2007/12/28 20:59:14 1.253 +++ deliantra/Deliantra-Client/Client.xs 2008/03/24 00:24:46 1.256 @@ -48,11 +48,15 @@ #include -#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) -# define pango_layout_get_line_readonly pango_layout_get_line_readonly -# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly -# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly -# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly +#ifndef PANGO_VERSION_CHECK +# define PANGO_VERSION_CHECK(a,b,c) 0 +#endif + +#if !PANGO_VERSION_CHECK (1, 15, 2) +# define pango_layout_get_line_readonly pango_layout_get_line +# define pango_layout_get_lines_readonly pango_layout_get_lines +# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line +# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run #endif #ifndef _WIN32 @@ -671,7 +675,7 @@ opengl_fontmap = pango_opengl_font_map_new (); pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); -#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) +#if PANGO_VERSION_CHECK (1, 15, 2) pango_context_set_language (opengl_context, pango_language_from_string ("en")); /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ #endif @@ -768,6 +772,9 @@ int SDL_GetAppState () +int +SDL_GetModState () + void poll_events () PPCODE: @@ -1333,7 +1340,7 @@ int line, x; pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); -#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) +#if !PANGO_VERSION_CHECK (1, 17, 3) /* pango bug: line is between 1..numlines, not 0..numlines-1 */ --line; #endif