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.77 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.87 by root, Fri May 19 18:39:06 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
… …
428 SDL_Rect **m; 441 SDL_Rect **m;
429 442
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, 16);
447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
434 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
… …
652} 670}
653 671
654void 672void
655error (char *message) 673error (char *message)
656 CODE: 674 CODE:
675 fprintf (stderr, "ERROR: %s\n", message);
657#ifdef _WIN32 676#ifdef _WIN32
658 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 677 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659#else
660 fprintf (stderr, "ERROR: %s\n", message);
661#endif 678#endif
662 679
663void 680void
664fatal (char *message) 681fatal (char *message)
665 CODE: 682 CODE:
683 fprintf (stderr, "FATAL: %s\n", message);
666#ifdef _WIN32 684#ifdef _WIN32
667 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668#else
669 fprintf (stderr, "FATAL: %s\n", message);
670#endif 686#endif
671 exit (1); 687 exit (1);
672 688
673MODULE = CFClient PACKAGE = CFClient::Font 689MODULE = CFClient PACKAGE = CFClient::Font
674 690
… …
697MODULE = CFClient PACKAGE = CFClient::Layout 713MODULE = CFClient PACKAGE = CFClient::Layout
698 714
699CFClient::Layout 715CFClient::Layout
700new (SV *class, int rgba = 0) 716new (SV *class, int rgba = 0)
701 CODE: 717 CODE:
718#if _WIN32
719 rgba = 0;//D
720#endif
702 New (0, RETVAL, 1, struct cf_layout); 721 New (0, RETVAL, 1, struct cf_layout);
703 722
704 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 723 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
705 RETVAL->rgba = rgba; 724 RETVAL->rgba = rgba;
706 RETVAL->r = 1.; 725 RETVAL->r = 1.;
… …
786set_width (CFClient::Layout self, int max_width = -1) 805set_width (CFClient::Layout self, int max_width = -1)
787 CODE: 806 CODE:
788 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 807 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
789 808
790void 809void
810set_indent (CFClient::Layout self, int indent)
811 CODE:
812 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
813
814void
815set_spacing (CFClient::Layout self, int spacing)
816 CODE:
817 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
818
819void
820set_ellipsise (CFClient::Layout self, int ellipsise)
821 CODE:
822 pango_layout_set_ellipsize (self->pl,
823 ellipsise == 1 ? PANGO_ELLIPSIZE_START
824 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
825 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
826 : PANGO_ELLIPSIZE_NONE
827 );
828
829void
830set_single_paragraph_mode (CFClient::Layout self, int spm)
831 CODE:
832 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
833
834void
791size (CFClient::Layout self) 835size (CFClient::Layout self)
792 PPCODE: 836 PPCODE:
793{ 837{
794 int w, h; 838 int w, h;
795 839
… …
861 905
862 while (p < e) 906 while (p < e)
863 { 907 {
864 uint32_t rgba = *p; 908 uint32_t rgba = *p;
865 rgba = (rgba >> 24) | (rgba << 8); 909 rgba = (rgba >> 24) | (rgba << 8);
910#if 0
911#ifdef _WIN32
912 {//D
913 uint8_t r = rgba >> 24;
914 uint8_t g = rgba >> 16;
915 uint8_t b = rgba >> 8;
916 uint8_t a = rgba >> 0;
917
918 rgba = (rgba & 0xffffff00) | a;
919 }
920#endif
921#endif
866 rgba = SDL_SwapBE32 (rgba); 922 rgba = SDL_SwapBE32 (rgba);
867 *p++ = rgba; 923 *p++ = rgba;
868 } 924 }
869 } 925 }
870 926
… …
927 983
928 if (ix) 984 if (ix)
929 { 985 {
930 glEnable (GL_BLEND); 986 glEnable (GL_BLEND);
931 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 987 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
988 glEnable (GL_ALPHA_TEST);
989 glAlphaFunc (GL_GREATER, 0.01f);
932 } 990 }
933 991
934 glBindTexture (GL_TEXTURE_2D, name); 992 glBindTexture (GL_TEXTURE_2D, name);
935 993
936 if (wrap_mode) 994 if (wrap_mode)
… …
945 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1003 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1004 glTexCoord2f (s, 0); glVertex2f (x + w, y );
947 glEnd (); 1005 glEnd ();
948 1006
949 if (ix) 1007 if (ix)
1008 {
1009 glDisable (GL_ALPHA_TEST);
950 glDisable (GL_BLEND); 1010 glDisable (GL_BLEND);
1011 }
951} 1012}
952 1013
953MODULE = CFClient PACKAGE = CFClient::Map 1014MODULE = CFClient PACKAGE = CFClient::Map
954 1015
955CFClient::Map 1016CFClient::Map
… …
1478 const_iv (GL_ONE_MINUS_DST_ALPHA), 1539 const_iv (GL_ONE_MINUS_DST_ALPHA),
1479 const_iv (GL_RGB), 1540 const_iv (GL_RGB),
1480 const_iv (GL_RGBA), 1541 const_iv (GL_RGBA),
1481 const_iv (GL_UNSIGNED_BYTE), 1542 const_iv (GL_UNSIGNED_BYTE),
1482 const_iv (GL_ALPHA), 1543 const_iv (GL_ALPHA),
1544 const_iv (GL_INTENSITY),
1483 const_iv (GL_LUMINANCE), 1545 const_iv (GL_LUMINANCE),
1546 const_iv (GL_LUMINANCE_ALPHA),
1484 const_iv (GL_FLOAT), 1547 const_iv (GL_FLOAT),
1485 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1548 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486 const_iv (GL_COMPILE), 1549 const_iv (GL_COMPILE),
1487 const_iv (GL_TEXTURE_1D), 1550 const_iv (GL_TEXTURE_1D),
1488 const_iv (GL_TEXTURE_2D), 1551 const_iv (GL_TEXTURE_2D),
… …
1577void glEnd () 1640void glEnd ()
1578 1641
1579void glColor (float r, float g, float b, float a = 1.0) 1642void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1643 PROTOTYPE: @
1581 CODE: 1644 CODE:
1582 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 1645 glColor4ub (MIN ((int)(r * 255.f), 255),
1646 MIN ((int)(g * 255.f), 255),
1647 MIN ((int)(b * 255.f), 255),
1648 MIN ((int)(a * 255.f), 255));
1583 1649
1584void glVertex (float x, float y, float z = 0.) 1650void glVertex (float x, float y, float z = 0.)
1585 CODE: 1651 CODE:
1586 glVertex3f (x, y, z); 1652 glVertex3f (x, y, z);
1587 1653

Diff Legend

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