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.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC

… …
10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h> 12#include <math.h>
13#include <string.h> 13#include <string.h>
14#include <stdio.h> 14#include <stdio.h>
15#include <stdlib.h>
15 16
16#include <SDL.h> 17#include <SDL.h>
17#include <SDL_endian.h> 18#include <SDL_endian.h>
18#include <SDL_image.h> 19#include <SDL_image.h>
19#include <SDL_mixer.h> 20#include <SDL_mixer.h>
… …
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 86static PangoFontMap *ft2_fontmap, *cairo_fontmap;
86 87
87static void 88static void
88substitute_func (FcPattern *pattern, gpointer data) 89substitute_func (FcPattern *pattern, gpointer data)
89{ 90{
90 FcPatternAddBool (pattern, FC_HINTING , 1); 91 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif
91#ifdef _WIN32 95#ifdef _WIN32
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
93#else 97#else
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 98 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif 99#endif
… …
418} 422}
419 423
420void 424void
421pango_init () 425pango_init ()
422 CODE: 426 CODE:
423{
424 // delayed, so it can pick up new fonts added by AddFontResourceEx 427 // delayed, so it can pick up new fonts added by AddFontResourceEx
428{
429 {
425 ft2_fontmap = pango_ft2_font_map_new (); 430 ft2_fontmap = pango_ft2_font_map_new ();
426 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 431 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
427 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 432 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
428 433 }
434 {
435 cairo_font_options_t *fopt = cairo_font_options_create ();
429 cairo_fontmap = pango_cairo_font_map_get_default (); 436 cairo_fontmap = pango_cairo_font_map_get_default ();
430 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 437 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438#ifdef _WIN32
439 // cairo looks like shit eaten twice on windows
440 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441#else
442 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443#endif
444 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446 pango_cairo_context_set_font_options (cairo_context, fopt);
447 cairo_font_options_destroy (fopt);
448 }
431} 449}
432 450
433int 451int
434SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 452SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
435 453
… …
686 CODE: 704 CODE:
687 fprintf (stderr, "FATAL: %s\n", message); 705 fprintf (stderr, "FATAL: %s\n", message);
688#ifdef _WIN32 706#ifdef _WIN32
689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 707 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690#endif 708#endif
691 exit (1); 709 _exit (1);
710
711void
712_exit (int retval)
713 CODE:
714 _exit (retval);
692 715
693MODULE = CFClient PACKAGE = CFClient::Font 716MODULE = CFClient PACKAGE = CFClient::Font
694 717
695CFClient::Font 718CFClient::Font
696new_from_file (SV *class, char *path, int id = 0) 719new_from_file (SV *class, char *path, int id = 0)
… …
717MODULE = CFClient PACKAGE = CFClient::Layout 740MODULE = CFClient PACKAGE = CFClient::Layout
718 741
719CFClient::Layout 742CFClient::Layout
720new (SV *class, int rgba = 0) 743new (SV *class, int rgba = 0)
721 CODE: 744 CODE:
722#if _WIN32
723 //rgba = 0;//D makes text nicer, breaks TextView
724#endif
725 rgba=1;//D
726 New (0, RETVAL, 1, struct cf_layout); 745 New (0, RETVAL, 1, struct cf_layout);
727 746
728 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 747 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
729 RETVAL->rgba = rgba; 748 RETVAL->rgba = rgba;
730 RETVAL->r = 1.; 749 RETVAL->r = 1.;
… …
774 793
775SV * 794SV *
776get_text (CFClient::Layout self) 795get_text (CFClient::Layout self)
777 CODE: 796 CODE:
778 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 797 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779 SvUTF8_on (RETVAL); 798 sv_utf8_decode (RETVAL);
780 OUTPUT: 799 OUTPUT:
781 RETVAL 800 RETVAL
782 801
783void 802void
784set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 803set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
… …
1040DESTROY (CFClient::Map self) 1059DESTROY (CFClient::Map self)
1041 CODE: 1060 CODE:
1042{ 1061{
1043 map_clear (self); 1062 map_clear (self);
1044 Safefree (self->face); 1063 Safefree (self->face);
1064 Safefree (self->tex);
1045 Safefree (self); 1065 Safefree (self);
1046} 1066}
1047 1067
1048void 1068void
1049clear (CFClient::Map self) 1069clear (CFClient::Map self)

Diff Legend

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