ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC

… …
33 typedef signed char int8_t; 33 typedef signed char int8_t;
34 typedef signed short int16_t; 34 typedef signed short int16_t;
35 typedef signed int int32_t; 35 typedef signed int int32_t;
36#endif 36#endif
37 37
38#include "glext.h"
39
38#define FOW_DARKNESS 32 40#define FOW_DARKNESS 32
39 41
40#define MAP_EXTEND_X 32 42#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 43#define MAP_EXTEND_Y 512
44
45#define MIN_FONT_HEIGHT 8 * PANGO_SCALE
42 46
43typedef Mix_Chunk *CFClient__MixChunk; 47typedef Mix_Chunk *CFClient__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 48typedef Mix_Music *CFClient__MixMusic;
45 49
46static PangoContext *context; 50static PangoContext *context;
… …
62layout_update (CFClient__Layout self) 66layout_update (CFClient__Layout self)
63{ 67{
64 /* use a random scale factor to account for unknown descenders, 0.8 works 68 /* use a random scale factor to account for unknown descenders, 0.8 works
65 * reasonably well with bitstream vera 69 * reasonably well with bitstream vera
66 */ 70 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 71 PangoFontDescription *font = (PangoFontDescription *)
72 pango_layout_get_font_description (self->pl);
68 73
69 int height = self->base_height * (PANGO_SCALE * 8 / 10); 74 int height = self->base_height * (PANGO_SCALE * 8 / 10);
75
76 if (height < MIN_FONT_HEIGHT)
77 height = MIN_FONT_HEIGHT;
70 78
71 if (pango_font_description_get_size (font) != height) 79 if (pango_font_description_get_size (font) != height)
72 { 80 {
81 font = pango_font_description_copy (font);
73 pango_font_description_set_absolute_size (font, height); 82 pango_font_description_set_absolute_size (font, height);
74 pango_layout_context_changed (self->pl); 83 pango_layout_set_font_description (self->pl, font);
75 } 84 }
76} 85}
77 86
78static void 87static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 88layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
… …
249 ev.type = SDL_USEREVENT; 258 ev.type = SDL_USEREVENT;
250 ev.code = 0; 259 ev.code = 0;
251 ev.data1 = 0; 260 ev.data1 = 0;
252 ev.data2 = 0; 261 ev.data2 = 0;
253 262
254 SDL_PushEvent (&ev); 263 SDL_PushEvent ((SDL_Event *)&ev);
255} 264}
256 265
257MODULE = CFClient PACKAGE = CFClient 266MODULE = CFClient PACKAGE = CFClient
258 267
259PROTOTYPES: ENABLE 268PROTOTYPES: ENABLE
… …
519{ 528{
520 int count; 529 int count;
521 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count); 530 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
522 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0); 531 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
523 FcPatternDestroy (pattern); 532 FcPatternDestroy (pattern);
533 pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
524 pango_context_set_font_description (context, font); 534 pango_context_set_font_description (context, font);
525} 535}
526 536
527void 537void
528load_image_inline (SV *image_) 538load_image_inline (SV *image_)
… …
630 CODE: 640 CODE:
631 New (0, RETVAL, 1, struct cf_layout); 641 New (0, RETVAL, 1, struct cf_layout);
632 RETVAL->base_height = base_height; 642 RETVAL->base_height = base_height;
633 RETVAL->pl = pango_layout_new (context); 643 RETVAL->pl = pango_layout_new (context);
634 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 644 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645 pango_layout_set_font_description (RETVAL->pl,
646 pango_font_description_copy (
647 pango_context_get_font_description (context)));
635 OUTPUT: 648 OUTPUT:
636 RETVAL 649 RETVAL
637 650
638void 651void
639DESTROY (CFClient::Layout self) 652DESTROY (CFClient::Layout self)
… …
1323 const_iv (GL_TEXTURE_WRAP_T), 1336 const_iv (GL_TEXTURE_WRAP_T),
1324 const_iv (GL_CLAMP), 1337 const_iv (GL_CLAMP),
1325 const_iv (GL_REPEAT), 1338 const_iv (GL_REPEAT),
1326 const_iv (GL_NEAREST), 1339 const_iv (GL_NEAREST),
1327 const_iv (GL_LINEAR), 1340 const_iv (GL_LINEAR),
1341 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345 const_iv (GL_GENERATE_MIPMAP),
1346 const_iv (GL_LINEAR),
1328 const_iv (GL_MODULATE), 1347 const_iv (GL_MODULATE),
1329 const_iv (GL_REPLACE), 1348 const_iv (GL_REPLACE),
1330 const_iv (GL_COLOR_BUFFER_BIT), 1349 const_iv (GL_COLOR_BUFFER_BIT),
1331 const_iv (GL_PROJECTION), 1350 const_iv (GL_PROJECTION),
1332 const_iv (GL_MODELVIEW), 1351 const_iv (GL_MODELVIEW),

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines