--- deliantra/Deliantra-Client/Client.xs	2006/07/30 13:16:44	1.133
+++ deliantra/Deliantra-Client/Client.xs	2006/08/14 03:41:25	1.140
@@ -146,12 +146,19 @@
 static void
 layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
 {
-  pango_layout_get_pixel_size (self->pl, w, h);
+  PangoRectangle rect;
 
-  if (!*w) *w = 1;
-  if (!*h) *h = 1;
+  // get_pixel_* wrongly rounds down
+  pango_layout_get_extents (self->pl, 0, &rect);
 
-  *w = (*w + 3) & ~3;
+  rect.width  = (rect.width  + PANGO_SCALE - 1) / PANGO_SCALE;
+  rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
+
+  if (!rect.width)  rect.width  = 1;
+  if (!rect.height) rect.height = 1;
+
+  *w = rect.width;
+  *h = rect.height;
 }
 
 typedef uint16_t mapface;
@@ -514,8 +521,10 @@
         SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
 
         SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
+#if SDL_VERSION_ATLEAST(1,2,10)
         SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
         SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
+#endif
 
         SDL_EnableUNICODE (1);
         SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
@@ -1025,12 +1034,13 @@
 }
 
 void
-render (CFPlus::Layout self, float x, float y)
+render (CFPlus::Layout self, float x, float y, int flags = 0)
 	PPCODE:
         pango_opengl_render_layout_subpixel (
           self->pl,
           x * PANGO_SCALE, y * PANGO_SCALE,
-          self->r, self->g, self->b, self->a
+          self->r, self->g, self->b, self->a,
+          flags
         );
 
 MODULE = CFPlus	PACKAGE = CFPlus::Texture
@@ -1802,6 +1812,7 @@
 	const_iv (GL_CONVOLUTION_BORDER_MODE),
 	const_iv (GL_CONSTANT_BORDER),
 	const_iv (GL_LINES),
+	const_iv (GL_LINE_STRIP),
 	const_iv (GL_LINE_LOOP),
 	const_iv (GL_QUADS),
 	const_iv (GL_QUAD_STRIP),
@@ -2008,4 +2019,3 @@
 
 void glCallList (int list)
 
-