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.76 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 3# include <malloc.h>
4# include <windows.h>
3# pragma warning(disable:4244) 5# pragma warning(disable:4244)
4#endif 6#endif
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
… …
81 83
82static void 84static void
83substitute_func (FcPattern *pattern, gpointer data) 85substitute_func (FcPattern *pattern, gpointer data)
84{ 86{
85 FcPatternAddBool (pattern, FC_HINTING , 1); 87 FcPatternAddBool (pattern, FC_HINTING , 1);
86 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 88 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
87} 89}
88 90
89static void 91static void
90layout_update_font (CFClient__Layout self) 92layout_update_font (CFClient__Layout self)
91{ 93{
… …
404# undef const_iv 406# undef const_iv
405 }; 407 };
406 408
407 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 409 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
408 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 410 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
411}
409 412
413void
414pango_init ()
415 CODE:
416{
417 // delayed, so it can pick up new fonts added by AddFontResourceEx
410 ft2_fontmap = pango_ft2_font_map_new (); 418 ft2_fontmap = pango_ft2_font_map_new ();
411 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 419 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
412 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 420 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413 421
414 cairo_fontmap = pango_cairo_font_map_get_default (); 422 cairo_fontmap = pango_cairo_font_map_get_default ();
415 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 423 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
416} 424}
417 425
418int 426int
419SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 427SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
420 428
… …
559 567
560void 568void
561add_font (char *file) 569add_font (char *file)
562 CODE: 570 CODE:
563 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 571 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
572#ifdef _WIN32
573 // cairo... sigh... requires win2000
574 AddFontResourceEx (file, FR_PRIVATE, 0);
575#endif
564 576
565void 577void
566load_image_inline (SV *image_) 578load_image_inline (SV *image_)
567 ALIAS: 579 ALIAS:
568 load_image_file = 1 580 load_image_file = 1
… …
1577void glEnd () 1589void glEnd ()
1578 1590
1579void glColor (float r, float g, float b, float a = 1.0) 1591void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1592 PROTOTYPE: @
1581 CODE: 1593 CODE:
1594 // 255.999 is close enough to correctness (256 and clamp)
1582 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1595 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);
1583 1596
1584void glVertex (float x, float y, float z = 0.) 1597void glVertex (float x, float y, float z = 0.)
1585 CODE: 1598 CODE:
1586 glVertex3f (x, y, z); 1599 glVertex3f (x, y, z);
1587 1600

Diff Legend

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