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.85 by root, Fri May 19 03:49:47 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"
8#include "XSUB.h" 10#include "XSUB.h"
9 11
12#include <math.h>
10#include <string.h> 13#include <string.h>
11#include <stdio.h> 14#include <stdio.h>
12 15
13#include <SDL.h> 16#include <SDL.h>
14#include <SDL_endian.h> 17#include <SDL_endian.h>
… …
81 84
82static void 85static void
83substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
84{ 87{
85 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
86 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
87} 94}
88 95
89static void 96static void
90layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
91{ 98{
… …
404# undef const_iv 411# undef const_iv
405 }; 412 };
406 413
407 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
408 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416}
409 417
418void
419pango_init ()
420 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
410 ft2_fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
411 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 424 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); 425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413 426
414 cairo_fontmap = pango_cairo_font_map_get_default (); 427 cairo_fontmap = pango_cairo_font_map_get_default ();
415 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
416} 429}
417 430
418int 431int
419SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
420 433
… …
430 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450
435 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439 455
440 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
441 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
442 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
443 457
444 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
445 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446 460
447 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
559 573
560void 574void
561add_font (char *file) 575add_font (char *file)
562 CODE: 576 CODE:
563 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
578#ifdef _WIN32
579 // cairo... sigh... requires win2000
580 AddFontResourceEx (file, FR_PRIVATE, 0);
581#endif
564 582
565void 583void
566load_image_inline (SV *image_) 584load_image_inline (SV *image_)
567 ALIAS: 585 ALIAS:
568 load_image_file = 1 586 load_image_file = 1
… …
784 802
785void 803void
786set_width (CFClient::Layout self, int max_width = -1) 804set_width (CFClient::Layout self, int max_width = -1)
787 CODE: 805 CODE:
788 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 806 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
807
808void
809set_indent (CFClient::Layout self, int indent)
810 CODE:
811 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
812
813void
814set_spacing (CFClient::Layout self, int spacing)
815 CODE:
816 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
817
818void
819set_ellipsise (CFClient::Layout self, int ellipsise)
820 CODE:
821 pango_layout_set_ellipsize (self->pl,
822 ellipsise == 1 ? PANGO_ELLIPSIZE_START
823 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
824 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
825 : PANGO_ELLIPSIZE_NONE
826 );
827
828void
829set_single_paragraph_mode (CFClient::Layout self, int spm)
830 CODE:
831 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
789 832
790void 833void
791size (CFClient::Layout self) 834size (CFClient::Layout self)
792 PPCODE: 835 PPCODE:
793{ 836{
… …
1577void glEnd () 1620void glEnd ()
1578 1621
1579void glColor (float r, float g, float b, float a = 1.0) 1622void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1623 PROTOTYPE: @
1581 CODE: 1624 CODE:
1582 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1625 glColor4ub (MIN ((int)(r * 255.f), 255),
1626 MIN ((int)(g * 255.f), 255),
1627 MIN ((int)(b * 255.f), 255),
1628 MIN ((int)(a * 255.f), 255));
1583 1629
1584void glVertex (float x, float y, float z = 0.) 1630void glVertex (float x, float y, float z = 0.)
1585 CODE: 1631 CODE:
1586 glVertex3f (x, y, z); 1632 glVertex3f (x, y, z);
1587 1633

Diff Legend

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