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.92 by elmex, Tue May 23 17:30:18 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 (
… …
542#ifndef _WIN32 559#ifndef _WIN32
543 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544#endif 561#endif
545 562
546char * 563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
569
570char *
547gl_version () 571gl_version ()
548 CODE: 572 CODE:
549 RETVAL = (char *)glGetString (GL_VERSION); 573 RETVAL = (char *)glGetString (GL_VERSION);
550 OUTPUT: 574 OUTPUT:
551 RETVAL 575 RETVAL
… …
559 583
560void 584void
561add_font (char *file) 585add_font (char *file)
562 CODE: 586 CODE:
563 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
588#ifdef _WIN32
589 // cairo... sigh... requires win2000
590 AddFontResourceEx (file, FR_PRIVATE, 0);
591#endif
564 592
565void 593void
566load_image_inline (SV *image_) 594load_image_inline (SV *image_)
567 ALIAS: 595 ALIAS:
568 load_image_file = 1 596 load_image_file = 1
… …
652} 680}
653 681
654void 682void
655error (char *message) 683error (char *message)
656 CODE: 684 CODE:
685 fprintf (stderr, "ERROR: %s\n", message);
657#ifdef _WIN32 686#ifdef _WIN32
658 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 687 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659#else
660 fprintf (stderr, "ERROR: %s\n", message);
661#endif 688#endif
662 689
663void 690void
664fatal (char *message) 691fatal (char *message)
665 CODE: 692 CODE:
693 fprintf (stderr, "FATAL: %s\n", message);
666#ifdef _WIN32 694#ifdef _WIN32
667 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668#else
669 fprintf (stderr, "FATAL: %s\n", message);
670#endif 696#endif
671 exit (1); 697 exit (1);
672 698
673MODULE = CFClient PACKAGE = CFClient::Font 699MODULE = CFClient PACKAGE = CFClient::Font
674 700
… …
697MODULE = CFClient PACKAGE = CFClient::Layout 723MODULE = CFClient PACKAGE = CFClient::Layout
698 724
699CFClient::Layout 725CFClient::Layout
700new (SV *class, int rgba = 0) 726new (SV *class, int rgba = 0)
701 CODE: 727 CODE:
728#if _WIN32
729 rgba = 0;//D
730#endif
702 New (0, RETVAL, 1, struct cf_layout); 731 New (0, RETVAL, 1, struct cf_layout);
703 732
704 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
705 RETVAL->rgba = rgba; 734 RETVAL->rgba = rgba;
706 RETVAL->r = 1.; 735 RETVAL->r = 1.;
… …
786set_width (CFClient::Layout self, int max_width = -1) 815set_width (CFClient::Layout self, int max_width = -1)
787 CODE: 816 CODE:
788 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 817 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
789 818
790void 819void
820set_indent (CFClient::Layout self, int indent)
821 CODE:
822 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
823
824void
825set_spacing (CFClient::Layout self, int spacing)
826 CODE:
827 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
828
829void
830set_ellipsise (CFClient::Layout self, int ellipsise)
831 CODE:
832 pango_layout_set_ellipsize (self->pl,
833 ellipsise == 1 ? PANGO_ELLIPSIZE_START
834 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
835 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
836 : PANGO_ELLIPSIZE_NONE
837 );
838
839void
840set_single_paragraph_mode (CFClient::Layout self, int spm)
841 CODE:
842 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
843
844void
791size (CFClient::Layout self) 845size (CFClient::Layout self)
792 PPCODE: 846 PPCODE:
793{ 847{
794 int w, h; 848 int w, h;
795 849
… …
861 915
862 while (p < e) 916 while (p < e)
863 { 917 {
864 uint32_t rgba = *p; 918 uint32_t rgba = *p;
865 rgba = (rgba >> 24) | (rgba << 8); 919 rgba = (rgba >> 24) | (rgba << 8);
920#if 0
921#ifdef _WIN32
922 {//D
923 uint8_t r = rgba >> 24;
924 uint8_t g = rgba >> 16;
925 uint8_t b = rgba >> 8;
926 uint8_t a = rgba >> 0;
927
928 rgba = (rgba & 0xffffff00) | a;
929 }
930#endif
931#endif
866 rgba = SDL_SwapBE32 (rgba); 932 rgba = SDL_SwapBE32 (rgba);
867 *p++ = rgba; 933 *p++ = rgba;
868 } 934 }
869 } 935 }
870 936
… …
927 993
928 if (ix) 994 if (ix)
929 { 995 {
930 glEnable (GL_BLEND); 996 glEnable (GL_BLEND);
931 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
998 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f);
932 } 1000 }
933 1001
934 glBindTexture (GL_TEXTURE_2D, name); 1002 glBindTexture (GL_TEXTURE_2D, name);
935 1003
936 if (wrap_mode) 1004 if (wrap_mode)
… …
945 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1014 glTexCoord2f (s, 0); glVertex2f (x + w, y );
947 glEnd (); 1015 glEnd ();
948 1016
949 if (ix) 1017 if (ix)
1018 {
1019 glDisable (GL_ALPHA_TEST);
950 glDisable (GL_BLEND); 1020 glDisable (GL_BLEND);
1021 }
951} 1022}
952 1023
953MODULE = CFClient PACKAGE = CFClient::Map 1024MODULE = CFClient PACKAGE = CFClient::Map
954 1025
955CFClient::Map 1026CFClient::Map
… …
1466 const_iv (GL_COLOR_MATERIAL), 1537 const_iv (GL_COLOR_MATERIAL),
1467 const_iv (GL_SMOOTH), 1538 const_iv (GL_SMOOTH),
1468 const_iv (GL_FLAT), 1539 const_iv (GL_FLAT),
1469 const_iv (GL_DITHER), 1540 const_iv (GL_DITHER),
1470 const_iv (GL_BLEND), 1541 const_iv (GL_BLEND),
1542 const_iv (GL_CULL_FACE),
1471 const_iv (GL_SCISSOR_TEST), 1543 const_iv (GL_SCISSOR_TEST),
1544 const_iv (GL_DEPTH_TEST),
1545 const_iv (GL_ALPHA_TEST),
1546 const_iv (GL_NORMALIZE),
1547 const_iv (GL_RESCALE_NORMAL),
1472 const_iv (GL_AND), 1548 const_iv (GL_AND),
1473 const_iv (GL_ONE), 1549 const_iv (GL_ONE),
1474 const_iv (GL_ZERO), 1550 const_iv (GL_ZERO),
1475 const_iv (GL_SRC_ALPHA), 1551 const_iv (GL_SRC_ALPHA),
1476 const_iv (GL_SRC_ALPHA_SATURATE), 1552 const_iv (GL_SRC_ALPHA_SATURATE),
1477 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1553 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478 const_iv (GL_ONE_MINUS_DST_ALPHA), 1554 const_iv (GL_ONE_MINUS_DST_ALPHA),
1479 const_iv (GL_RGB), 1555 const_iv (GL_RGB),
1480 const_iv (GL_RGBA), 1556 const_iv (GL_RGBA),
1481 const_iv (GL_UNSIGNED_BYTE), 1557 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT),
1482 const_iv (GL_ALPHA), 1560 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY),
1483 const_iv (GL_LUMINANCE), 1562 const_iv (GL_LUMINANCE),
1563 const_iv (GL_LUMINANCE_ALPHA),
1484 const_iv (GL_FLOAT), 1564 const_iv (GL_FLOAT),
1485 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1565 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486 const_iv (GL_COMPILE), 1566 const_iv (GL_COMPILE),
1487 const_iv (GL_TEXTURE_1D), 1567 const_iv (GL_TEXTURE_1D),
1488 const_iv (GL_TEXTURE_2D), 1568 const_iv (GL_TEXTURE_2D),
… …
1502 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1582 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503 const_iv (GL_GENERATE_MIPMAP), 1583 const_iv (GL_GENERATE_MIPMAP),
1504 const_iv (GL_MODULATE), 1584 const_iv (GL_MODULATE),
1505 const_iv (GL_DECAL), 1585 const_iv (GL_DECAL),
1506 const_iv (GL_REPLACE), 1586 const_iv (GL_REPLACE),
1587 const_iv (GL_DEPTH_BUFFER_BIT),
1507 const_iv (GL_COLOR_BUFFER_BIT), 1588 const_iv (GL_COLOR_BUFFER_BIT),
1508 const_iv (GL_PROJECTION), 1589 const_iv (GL_PROJECTION),
1509 const_iv (GL_MODELVIEW), 1590 const_iv (GL_MODELVIEW),
1510 const_iv (GL_COLOR_LOGIC_OP), 1591 const_iv (GL_COLOR_LOGIC_OP),
1511 const_iv (GL_SEPARABLE_2D), 1592 const_iv (GL_SEPARABLE_2D),
1512 const_iv (GL_CONVOLUTION_2D), 1593 const_iv (GL_CONVOLUTION_2D),
1513 const_iv (GL_CONVOLUTION_BORDER_MODE), 1594 const_iv (GL_CONVOLUTION_BORDER_MODE),
1514 const_iv (GL_CONSTANT_BORDER), 1595 const_iv (GL_CONSTANT_BORDER),
1515 const_iv (GL_LINES), 1596 const_iv (GL_LINES),
1597 const_iv (GL_LINE_LOOP),
1516 const_iv (GL_QUADS), 1598 const_iv (GL_QUADS),
1517 const_iv (GL_LINE_LOOP), 1599 const_iv (GL_QUAD_STRIP),
1600 const_iv (GL_TRIANGLES),
1601 const_iv (GL_TRIANGLE_STRIP),
1602 const_iv (GL_TRIANGLE_FAN),
1518 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1603 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519 const_iv (GL_FASTEST), 1604 const_iv (GL_FASTEST),
1605 const_iv (GL_V2F),
1606 const_iv (GL_V3F),
1607 const_iv (GL_T2F_V3F),
1608 const_iv (GL_T2F_N3F_V3F),
1520# undef const_iv 1609# undef const_iv
1521 }; 1610 };
1522 1611
1523 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1524 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1539 1628
1540void glHint (int target, int mode) 1629void glHint (int target, int mode)
1541 1630
1542void glBlendFunc (int sfactor, int dfactor) 1631void glBlendFunc (int sfactor, int dfactor)
1543 1632
1633void glDepthMask (int flag)
1634
1544void glLogicOp (int opcode) 1635void glLogicOp (int opcode)
1545 1636
1546void glColorMask (int red, int green, int blue, int alpha) 1637void glColorMask (int red, int green, int blue, int alpha)
1547 1638
1548void glMatrixMode (int mode) 1639void glMatrixMode (int mode)
… …
1551 1642
1552void glPopMatrix () 1643void glPopMatrix ()
1553 1644
1554void glLoadIdentity () 1645void glLoadIdentity ()
1555 1646
1556# near and far are due to microsofts buggy c compiler 1647# near_ and far_ are due to microsofts buggy "c" compiler
1648void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649
1650# near_ and far_ are due to microsofts buggy "c" compiler
1557void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1651void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1558 1652
1559void glViewport (int x, int y, int width, int height) 1653void glViewport (int x, int y, int width, int height)
1560 1654
1561void glScissor (int x, int y, int width, int height) 1655void glScissor (int x, int y, int width, int height)
… …
1577void glEnd () 1671void glEnd ()
1578 1672
1579void glColor (float r, float g, float b, float a = 1.0) 1673void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1674 PROTOTYPE: @
1581 CODE: 1675 CODE:
1582 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1676 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255),
1678 MIN ((int)(g * 255.f), 255),
1679 MIN ((int)(b * 255.f), 255),
1680 MIN ((int)(a * 255.f), 255));
1681
1682void glInterleavedArrays (int format, int stride, char *data)
1683
1684void glDrawElements (int mode, int count, int type, char *indices)
1685
1686# 1.2 void glDrawRangeElements (int mode, int start, int end
1687
1688void glRasterPos (float x, float y, float z = 0.)
1689 CODE:
1690 glRasterPos3f (0, 0, z);
1691 glBitmap (0, 0, 0, 0, x, y, 0);
1583 1692
1584void glVertex (float x, float y, float z = 0.) 1693void glVertex (float x, float y, float z = 0.)
1585 CODE: 1694 CODE:
1586 glVertex3f (x, y, z); 1695 glVertex3f (x, y, z);
1587 1696
… …
1615 1724
1616void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1617 1726
1618void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1619 1728
1620void glRasterPos (int x, int y) 1729void glDrawPixels (int width, int height, int format, int type, char *pixels)
1621 CODE:
1622 glRasterPos2i (x, y);
1623 1730
1624void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1731void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1625 1732
1626int glGenTexture () 1733int glGenTexture ()
1627 CODE: 1734 CODE:
… …
1654 1761
1655void glEndList () 1762void glEndList ()
1656 1763
1657void glCallList (int list) 1764void glCallList (int list)
1658 1765
1766

Diff Legend

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