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.81 by root, Sun May 14 23:19:14 2006 UTC vs.
Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC

… …
84 84
85static void 85static void
86substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
87{ 87{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
89 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
90} 94}
91 95
92static void 96static void
93layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
94{ 98{
… …
439 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
443 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
448 455
449 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452 457
453 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
454 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
455 460
456 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
464 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
465 470
466 ++m; 471 ++m;
467 } 472 }
468} 473}
474
475char *
476SDL_GetError ()
469 477
470int 478int
471SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
472 CODE: 480 CODE:
473 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
… …
665} 673}
666 674
667void 675void
668error (char *message) 676error (char *message)
669 CODE: 677 CODE:
678 fprintf (stderr, "ERROR: %s\n", message);
670#ifdef _WIN32 679#ifdef _WIN32
671 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 680 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
672#else
673 fprintf (stderr, "ERROR: %s\n", message);
674#endif 681#endif
675 682
676void 683void
677fatal (char *message) 684fatal (char *message)
678 CODE: 685 CODE:
686 fprintf (stderr, "FATAL: %s\n", message);
679#ifdef _WIN32 687#ifdef _WIN32
680 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
681#else
682 fprintf (stderr, "FATAL: %s\n", message);
683#endif 689#endif
684 exit (1); 690 exit (1);
685 691
686MODULE = CFClient PACKAGE = CFClient::Font 692MODULE = CFClient PACKAGE = CFClient::Font
687 693
… …
710MODULE = CFClient PACKAGE = CFClient::Layout 716MODULE = CFClient PACKAGE = CFClient::Layout
711 717
712CFClient::Layout 718CFClient::Layout
713new (SV *class, int rgba = 0) 719new (SV *class, int rgba = 0)
714 CODE: 720 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
715 New (0, RETVAL, 1, struct cf_layout); 724 New (0, RETVAL, 1, struct cf_layout);
716 725
717 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
718 RETVAL->rgba = rgba; 727 RETVAL->rgba = rgba;
719 RETVAL->r = 1.; 728 RETVAL->r = 1.;
… …
799set_width (CFClient::Layout self, int max_width = -1) 808set_width (CFClient::Layout self, int max_width = -1)
800 CODE: 809 CODE:
801 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);
802 811
803void 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
804size (CFClient::Layout self) 838size (CFClient::Layout self)
805 PPCODE: 839 PPCODE:
806{ 840{
807 int w, h; 841 int w, h;
808 842
… …
874 908
875 while (p < e) 909 while (p < e)
876 { 910 {
877 uint32_t rgba = *p; 911 uint32_t rgba = *p;
878 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
879 rgba = SDL_SwapBE32 (rgba); 925 rgba = SDL_SwapBE32 (rgba);
880 *p++ = rgba; 926 *p++ = rgba;
881 } 927 }
882 } 928 }
883 929
… …
940 986
941 if (ix) 987 if (ix)
942 { 988 {
943 glEnable (GL_BLEND); 989 glEnable (GL_BLEND);
944 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);
945 } 993 }
946 994
947 glBindTexture (GL_TEXTURE_2D, name); 995 glBindTexture (GL_TEXTURE_2D, name);
948 996
949 if (wrap_mode) 997 if (wrap_mode)
… …
958 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1007 glTexCoord2f (s, 0); glVertex2f (x + w, y );
960 glEnd (); 1008 glEnd ();
961 1009
962 if (ix) 1010 if (ix)
1011 {
1012 glDisable (GL_ALPHA_TEST);
963 glDisable (GL_BLEND); 1013 glDisable (GL_BLEND);
1014 }
964} 1015}
965 1016
966MODULE = CFClient PACKAGE = CFClient::Map 1017MODULE = CFClient PACKAGE = CFClient::Map
967 1018
968CFClient::Map 1019CFClient::Map
… …
1479 const_iv (GL_COLOR_MATERIAL), 1530 const_iv (GL_COLOR_MATERIAL),
1480 const_iv (GL_SMOOTH), 1531 const_iv (GL_SMOOTH),
1481 const_iv (GL_FLAT), 1532 const_iv (GL_FLAT),
1482 const_iv (GL_DITHER), 1533 const_iv (GL_DITHER),
1483 const_iv (GL_BLEND), 1534 const_iv (GL_BLEND),
1535 const_iv (GL_CULL_FACE),
1484 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),
1485 const_iv (GL_AND), 1541 const_iv (GL_AND),
1486 const_iv (GL_ONE), 1542 const_iv (GL_ONE),
1487 const_iv (GL_ZERO), 1543 const_iv (GL_ZERO),
1488 const_iv (GL_SRC_ALPHA), 1544 const_iv (GL_SRC_ALPHA),
1489 const_iv (GL_SRC_ALPHA_SATURATE), 1545 const_iv (GL_SRC_ALPHA_SATURATE),
1490 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1546 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491 const_iv (GL_ONE_MINUS_DST_ALPHA), 1547 const_iv (GL_ONE_MINUS_DST_ALPHA),
1492 const_iv (GL_RGB), 1548 const_iv (GL_RGB),
1493 const_iv (GL_RGBA), 1549 const_iv (GL_RGBA),
1494 const_iv (GL_UNSIGNED_BYTE), 1550 const_iv (GL_UNSIGNED_BYTE),
1551 const_iv (GL_UNSIGNED_SHORT),
1552 const_iv (GL_UNSIGNED_INT),
1495 const_iv (GL_ALPHA), 1553 const_iv (GL_ALPHA),
1554 const_iv (GL_INTENSITY),
1496 const_iv (GL_LUMINANCE), 1555 const_iv (GL_LUMINANCE),
1556 const_iv (GL_LUMINANCE_ALPHA),
1497 const_iv (GL_FLOAT), 1557 const_iv (GL_FLOAT),
1498 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1558 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499 const_iv (GL_COMPILE), 1559 const_iv (GL_COMPILE),
1500 const_iv (GL_TEXTURE_1D), 1560 const_iv (GL_TEXTURE_1D),
1501 const_iv (GL_TEXTURE_2D), 1561 const_iv (GL_TEXTURE_2D),
… …
1515 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1575 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1516 const_iv (GL_GENERATE_MIPMAP), 1576 const_iv (GL_GENERATE_MIPMAP),
1517 const_iv (GL_MODULATE), 1577 const_iv (GL_MODULATE),
1518 const_iv (GL_DECAL), 1578 const_iv (GL_DECAL),
1519 const_iv (GL_REPLACE), 1579 const_iv (GL_REPLACE),
1580 const_iv (GL_DEPTH_BUFFER_BIT),
1520 const_iv (GL_COLOR_BUFFER_BIT), 1581 const_iv (GL_COLOR_BUFFER_BIT),
1521 const_iv (GL_PROJECTION), 1582 const_iv (GL_PROJECTION),
1522 const_iv (GL_MODELVIEW), 1583 const_iv (GL_MODELVIEW),
1523 const_iv (GL_COLOR_LOGIC_OP), 1584 const_iv (GL_COLOR_LOGIC_OP),
1524 const_iv (GL_SEPARABLE_2D), 1585 const_iv (GL_SEPARABLE_2D),
1525 const_iv (GL_CONVOLUTION_2D), 1586 const_iv (GL_CONVOLUTION_2D),
1526 const_iv (GL_CONVOLUTION_BORDER_MODE), 1587 const_iv (GL_CONVOLUTION_BORDER_MODE),
1527 const_iv (GL_CONSTANT_BORDER), 1588 const_iv (GL_CONSTANT_BORDER),
1528 const_iv (GL_LINES), 1589 const_iv (GL_LINES),
1590 const_iv (GL_LINE_LOOP),
1529 const_iv (GL_QUADS), 1591 const_iv (GL_QUADS),
1530 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),
1531 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1596 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1532 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),
1533# undef const_iv 1602# undef const_iv
1534 }; 1603 };
1535 1604
1536 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; )
1537 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1606 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1551void glShadeModel (int mode) 1620void glShadeModel (int mode)
1552 1621
1553void glHint (int target, int mode) 1622void glHint (int target, int mode)
1554 1623
1555void glBlendFunc (int sfactor, int dfactor) 1624void glBlendFunc (int sfactor, int dfactor)
1625
1626void glDepthMask (int flag)
1556 1627
1557void glLogicOp (int opcode) 1628void glLogicOp (int opcode)
1558 1629
1559void glColorMask (int red, int green, int blue, int alpha) 1630void glColorMask (int red, int green, int blue, int alpha)
1560 1631
… …
1595 glColor4ub (MIN ((int)(r * 255.f), 255), 1666 glColor4ub (MIN ((int)(r * 255.f), 255),
1596 MIN ((int)(g * 255.f), 255), 1667 MIN ((int)(g * 255.f), 255),
1597 MIN ((int)(b * 255.f), 255), 1668 MIN ((int)(b * 255.f), 255),
1598 MIN ((int)(a * 255.f), 255)); 1669 MIN ((int)(a * 255.f), 255));
1599 1670
1671void glInterleavedArrays (int format, int stride, char *data)
1672
1673void glDrawElements (int mode, int count, int type, char *indices)
1674
1675# 1.2 void glDrawRangeElements (int mode, int start, int end
1676
1600void glVertex (float x, float y, float z = 0.) 1677void glVertex (float x, float y, float z = 0.)
1601 CODE: 1678 CODE:
1602 glVertex3f (x, y, z); 1679 glVertex3f (x, y, z);
1603 1680
1604void glTexCoord (float s, float t) 1681void glTexCoord (float s, float t)
… …
1670 1747
1671void glEndList () 1748void glEndList ()
1672 1749
1673void glCallList (int list) 1750void glCallList (int list)
1674 1751
1752

Diff Legend

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