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.78 by root, Fri May 12 01:47:03 2006 UTC vs.
Revision 1.91 by root, Mon May 22 03:28:54 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, 16);
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);
… …
455 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
456 470
457 ++m; 471 ++m;
458 } 472 }
459} 473}
474
475char *
476SDL_GetError ()
460 477
461int 478int
462SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
463 CODE: 480 CODE:
464 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
… …
559 576
560void 577void
561add_font (char *file) 578add_font (char *file)
562 CODE: 579 CODE:
563 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 580 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
581#ifdef _WIN32
582 // cairo... sigh... requires win2000
583 AddFontResourceEx (file, FR_PRIVATE, 0);
584#endif
564 585
565void 586void
566load_image_inline (SV *image_) 587load_image_inline (SV *image_)
567 ALIAS: 588 ALIAS:
568 load_image_file = 1 589 load_image_file = 1
… …
652} 673}
653 674
654void 675void
655error (char *message) 676error (char *message)
656 CODE: 677 CODE:
678 fprintf (stderr, "ERROR: %s\n", message);
657#ifdef _WIN32 679#ifdef _WIN32
658 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 680 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659#else
660 fprintf (stderr, "ERROR: %s\n", message);
661#endif 681#endif
662 682
663void 683void
664fatal (char *message) 684fatal (char *message)
665 CODE: 685 CODE:
686 fprintf (stderr, "FATAL: %s\n", message);
666#ifdef _WIN32 687#ifdef _WIN32
667 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668#else
669 fprintf (stderr, "FATAL: %s\n", message);
670#endif 689#endif
671 exit (1); 690 exit (1);
672 691
673MODULE = CFClient PACKAGE = CFClient::Font 692MODULE = CFClient PACKAGE = CFClient::Font
674 693
… …
697MODULE = CFClient PACKAGE = CFClient::Layout 716MODULE = CFClient PACKAGE = CFClient::Layout
698 717
699CFClient::Layout 718CFClient::Layout
700new (SV *class, int rgba = 0) 719new (SV *class, int rgba = 0)
701 CODE: 720 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
702 New (0, RETVAL, 1, struct cf_layout); 724 New (0, RETVAL, 1, struct cf_layout);
703 725
704 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
705 RETVAL->rgba = rgba; 727 RETVAL->rgba = rgba;
706 RETVAL->r = 1.; 728 RETVAL->r = 1.;
… …
786set_width (CFClient::Layout self, int max_width = -1) 808set_width (CFClient::Layout self, int max_width = -1)
787 CODE: 809 CODE:
788 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 810 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
789 811
790void 812void
813set_indent (CFClient::Layout self, int indent)
814 CODE:
815 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816
817void
818set_spacing (CFClient::Layout self, int spacing)
819 CODE:
820 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821
822void
823set_ellipsise (CFClient::Layout self, int ellipsise)
824 CODE:
825 pango_layout_set_ellipsize (self->pl,
826 ellipsise == 1 ? PANGO_ELLIPSIZE_START
827 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
829 : PANGO_ELLIPSIZE_NONE
830 );
831
832void
833set_single_paragraph_mode (CFClient::Layout self, int spm)
834 CODE:
835 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836
837void
791size (CFClient::Layout self) 838size (CFClient::Layout self)
792 PPCODE: 839 PPCODE:
793{ 840{
794 int w, h; 841 int w, h;
795 842
… …
861 908
862 while (p < e) 909 while (p < e)
863 { 910 {
864 uint32_t rgba = *p; 911 uint32_t rgba = *p;
865 rgba = (rgba >> 24) | (rgba << 8); 912 rgba = (rgba >> 24) | (rgba << 8);
913#if 0
914#ifdef _WIN32
915 {//D
916 uint8_t r = rgba >> 24;
917 uint8_t g = rgba >> 16;
918 uint8_t b = rgba >> 8;
919 uint8_t a = rgba >> 0;
920
921 rgba = (rgba & 0xffffff00) | a;
922 }
923#endif
924#endif
866 rgba = SDL_SwapBE32 (rgba); 925 rgba = SDL_SwapBE32 (rgba);
867 *p++ = rgba; 926 *p++ = rgba;
868 } 927 }
869 } 928 }
870 929
… …
927 986
928 if (ix) 987 if (ix)
929 { 988 {
930 glEnable (GL_BLEND); 989 glEnable (GL_BLEND);
931 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 990 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
991 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f);
932 } 993 }
933 994
934 glBindTexture (GL_TEXTURE_2D, name); 995 glBindTexture (GL_TEXTURE_2D, name);
935 996
936 if (wrap_mode) 997 if (wrap_mode)
… …
945 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1007 glTexCoord2f (s, 0); glVertex2f (x + w, y );
947 glEnd (); 1008 glEnd ();
948 1009
949 if (ix) 1010 if (ix)
1011 {
1012 glDisable (GL_ALPHA_TEST);
950 glDisable (GL_BLEND); 1013 glDisable (GL_BLEND);
1014 }
951} 1015}
952 1016
953MODULE = CFClient PACKAGE = CFClient::Map 1017MODULE = CFClient PACKAGE = CFClient::Map
954 1018
955CFClient::Map 1019CFClient::Map
… …
1466 const_iv (GL_COLOR_MATERIAL), 1530 const_iv (GL_COLOR_MATERIAL),
1467 const_iv (GL_SMOOTH), 1531 const_iv (GL_SMOOTH),
1468 const_iv (GL_FLAT), 1532 const_iv (GL_FLAT),
1469 const_iv (GL_DITHER), 1533 const_iv (GL_DITHER),
1470 const_iv (GL_BLEND), 1534 const_iv (GL_BLEND),
1535 const_iv (GL_CULL_FACE),
1471 const_iv (GL_SCISSOR_TEST), 1536 const_iv (GL_SCISSOR_TEST),
1537 const_iv (GL_DEPTH_TEST),
1538 const_iv (GL_ALPHA_TEST),
1539 const_iv (GL_NORMALIZE),
1540 const_iv (GL_RESCALE_NORMAL),
1472 const_iv (GL_AND), 1541 const_iv (GL_AND),
1473 const_iv (GL_ONE), 1542 const_iv (GL_ONE),
1474 const_iv (GL_ZERO), 1543 const_iv (GL_ZERO),
1475 const_iv (GL_SRC_ALPHA), 1544 const_iv (GL_SRC_ALPHA),
1476 const_iv (GL_SRC_ALPHA_SATURATE), 1545 const_iv (GL_SRC_ALPHA_SATURATE),
1477 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1546 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478 const_iv (GL_ONE_MINUS_DST_ALPHA), 1547 const_iv (GL_ONE_MINUS_DST_ALPHA),
1479 const_iv (GL_RGB), 1548 const_iv (GL_RGB),
1480 const_iv (GL_RGBA), 1549 const_iv (GL_RGBA),
1481 const_iv (GL_UNSIGNED_BYTE), 1550 const_iv (GL_UNSIGNED_BYTE),
1551 const_iv (GL_UNSIGNED_SHORT),
1552 const_iv (GL_UNSIGNED_INT),
1482 const_iv (GL_ALPHA), 1553 const_iv (GL_ALPHA),
1554 const_iv (GL_INTENSITY),
1483 const_iv (GL_LUMINANCE), 1555 const_iv (GL_LUMINANCE),
1556 const_iv (GL_LUMINANCE_ALPHA),
1484 const_iv (GL_FLOAT), 1557 const_iv (GL_FLOAT),
1485 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1558 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486 const_iv (GL_COMPILE), 1559 const_iv (GL_COMPILE),
1487 const_iv (GL_TEXTURE_1D), 1560 const_iv (GL_TEXTURE_1D),
1488 const_iv (GL_TEXTURE_2D), 1561 const_iv (GL_TEXTURE_2D),
… …
1502 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1575 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503 const_iv (GL_GENERATE_MIPMAP), 1576 const_iv (GL_GENERATE_MIPMAP),
1504 const_iv (GL_MODULATE), 1577 const_iv (GL_MODULATE),
1505 const_iv (GL_DECAL), 1578 const_iv (GL_DECAL),
1506 const_iv (GL_REPLACE), 1579 const_iv (GL_REPLACE),
1580 const_iv (GL_DEPTH_BUFFER_BIT),
1507 const_iv (GL_COLOR_BUFFER_BIT), 1581 const_iv (GL_COLOR_BUFFER_BIT),
1508 const_iv (GL_PROJECTION), 1582 const_iv (GL_PROJECTION),
1509 const_iv (GL_MODELVIEW), 1583 const_iv (GL_MODELVIEW),
1510 const_iv (GL_COLOR_LOGIC_OP), 1584 const_iv (GL_COLOR_LOGIC_OP),
1511 const_iv (GL_SEPARABLE_2D), 1585 const_iv (GL_SEPARABLE_2D),
1512 const_iv (GL_CONVOLUTION_2D), 1586 const_iv (GL_CONVOLUTION_2D),
1513 const_iv (GL_CONVOLUTION_BORDER_MODE), 1587 const_iv (GL_CONVOLUTION_BORDER_MODE),
1514 const_iv (GL_CONSTANT_BORDER), 1588 const_iv (GL_CONSTANT_BORDER),
1515 const_iv (GL_LINES), 1589 const_iv (GL_LINES),
1590 const_iv (GL_LINE_LOOP),
1516 const_iv (GL_QUADS), 1591 const_iv (GL_QUADS),
1517 const_iv (GL_LINE_LOOP), 1592 const_iv (GL_QUAD_STRIP),
1593 const_iv (GL_TRIANGLES),
1594 const_iv (GL_TRIANGLE_STRIP),
1595 const_iv (GL_TRIANGLE_FAN),
1518 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1596 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519 const_iv (GL_FASTEST), 1597 const_iv (GL_FASTEST),
1598 const_iv (GL_V2F),
1599 const_iv (GL_V3F),
1600 const_iv (GL_T2F_V3F),
1601 const_iv (GL_T2F_N3F_V3F),
1520# undef const_iv 1602# undef const_iv
1521 }; 1603 };
1522 1604
1523 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1605 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1524 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1606 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1539 1621
1540void glHint (int target, int mode) 1622void glHint (int target, int mode)
1541 1623
1542void glBlendFunc (int sfactor, int dfactor) 1624void glBlendFunc (int sfactor, int dfactor)
1543 1625
1626void glDepthMask (int flag)
1627
1544void glLogicOp (int opcode) 1628void glLogicOp (int opcode)
1545 1629
1546void glColorMask (int red, int green, int blue, int alpha) 1630void glColorMask (int red, int green, int blue, int alpha)
1547 1631
1548void glMatrixMode (int mode) 1632void glMatrixMode (int mode)
… …
1551 1635
1552void glPopMatrix () 1636void glPopMatrix ()
1553 1637
1554void glLoadIdentity () 1638void glLoadIdentity ()
1555 1639
1556# near and far are due to microsofts buggy c compiler 1640# near_ and far_ are due to microsofts buggy "c" compiler
1641void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1642
1643# near_ and far_ are due to microsofts buggy "c" compiler
1557void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1644void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1558 1645
1559void glViewport (int x, int y, int width, int height) 1646void glViewport (int x, int y, int width, int height)
1560 1647
1561void glScissor (int x, int y, int width, int height) 1648void glScissor (int x, int y, int width, int height)
… …
1577void glEnd () 1664void glEnd ()
1578 1665
1579void glColor (float r, float g, float b, float a = 1.0) 1666void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1667 PROTOTYPE: @
1581 CODE: 1668 CODE:
1582 // 255.999 is close enough to correctness (256 and clamp) 1669 // microsoft visual "c" rounds instead of truncating...
1583 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 1670 glColor4ub (MIN ((int)(r * 255.f), 255),
1671 MIN ((int)(g * 255.f), 255),
1672 MIN ((int)(b * 255.f), 255),
1673 MIN ((int)(a * 255.f), 255));
1674
1675void glInterleavedArrays (int format, int stride, char *data)
1676
1677void glDrawElements (int mode, int count, int type, char *indices)
1678
1679# 1.2 void glDrawRangeElements (int mode, int start, int end
1680
1681void glRasterPos (float x, float y, float z = 0.)
1682 CODE:
1683 glRasterPos3f (0, 0, z);
1684 glBitmap (0, 0, 0, 0, x, y, 0);
1584 1685
1585void glVertex (float x, float y, float z = 0.) 1686void glVertex (float x, float y, float z = 0.)
1586 CODE: 1687 CODE:
1587 glVertex3f (x, y, z); 1688 glVertex3f (x, y, z);
1588 1689
… …
1616 1717
1617void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1718void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1618 1719
1619void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1720void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1620 1721
1621void glRasterPos (int x, int y) 1722void glDrawPixels (int width, int height, int format, int type, char *pixels)
1622 CODE:
1623 glRasterPos2i (x, y);
1624 1723
1625void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1724void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1626 1725
1627int glGenTexture () 1726int glGenTexture ()
1628 CODE: 1727 CODE:
… …
1655 1754
1656void glEndList () 1755void glEndList ()
1657 1756
1658void glCallList (int list) 1757void glCallList (int list)
1659 1758
1759

Diff Legend

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