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.95 by root, Wed May 24 01:46:53 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);
465 470
466 ++m; 471 ++m;
467 } 472 }
468} 473}
469 474
475char *
476SDL_GetError ()
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 (
474 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
477 OUTPUT: 485 OUTPUT:
478 RETVAL 486 RETVAL
479 487
480void 488void
481SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
482 493
483void 494void
484SDL_PollEvent () 495SDL_PollEvent ()
485 PPCODE: 496 PPCODE:
486{ 497{
505 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
506 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
507 break; 518 break;
508 519
509 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
510 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
511 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
512 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
513 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
514 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
515 break; 528 break;
516 529
517 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
518 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
519 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
520 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
521 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
522 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
523 break; 538 break;
549lowdelay (int fd, int val = 1) 564lowdelay (int fd, int val = 1)
550 CODE: 565 CODE:
551#ifndef _WIN32 566#ifndef _WIN32
552 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
553#endif 568#endif
569
570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
554 576
555char * 577char *
556gl_version () 578gl_version ()
557 CODE: 579 CODE:
558 RETVAL = (char *)glGetString (GL_VERSION); 580 RETVAL = (char *)glGetString (GL_VERSION);
665} 687}
666 688
667void 689void
668error (char *message) 690error (char *message)
669 CODE: 691 CODE:
692 fprintf (stderr, "ERROR: %s\n", message);
670#ifdef _WIN32 693#ifdef _WIN32
671 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 694 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
672#else
673 fprintf (stderr, "ERROR: %s\n", message);
674#endif 695#endif
675 696
676void 697void
677fatal (char *message) 698fatal (char *message)
678 CODE: 699 CODE:
700 fprintf (stderr, "FATAL: %s\n", message);
679#ifdef _WIN32 701#ifdef _WIN32
680 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
681#else
682 fprintf (stderr, "FATAL: %s\n", message);
683#endif 703#endif
684 exit (1); 704 exit (1);
685 705
686MODULE = CFClient PACKAGE = CFClient::Font 706MODULE = CFClient PACKAGE = CFClient::Font
687 707
710MODULE = CFClient PACKAGE = CFClient::Layout 730MODULE = CFClient PACKAGE = CFClient::Layout
711 731
712CFClient::Layout 732CFClient::Layout
713new (SV *class, int rgba = 0) 733new (SV *class, int rgba = 0)
714 CODE: 734 CODE:
735#if _WIN32
736 rgba = 0;//D
737#endif
715 New (0, RETVAL, 1, struct cf_layout); 738 New (0, RETVAL, 1, struct cf_layout);
716 739
717 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
718 RETVAL->rgba = rgba; 741 RETVAL->rgba = rgba;
719 RETVAL->r = 1.; 742 RETVAL->r = 1.;
799set_width (CFClient::Layout self, int max_width = -1) 822set_width (CFClient::Layout self, int max_width = -1)
800 CODE: 823 CODE:
801 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 824 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
802 825
803void 826void
827set_indent (CFClient::Layout self, int indent)
828 CODE:
829 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830
831void
832set_spacing (CFClient::Layout self, int spacing)
833 CODE:
834 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835
836void
837set_ellipsise (CFClient::Layout self, int ellipsise)
838 CODE:
839 pango_layout_set_ellipsize (self->pl,
840 ellipsise == 1 ? PANGO_ELLIPSIZE_START
841 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
843 : PANGO_ELLIPSIZE_NONE
844 );
845
846void
847set_single_paragraph_mode (CFClient::Layout self, int spm)
848 CODE:
849 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850
851void
804size (CFClient::Layout self) 852size (CFClient::Layout self)
805 PPCODE: 853 PPCODE:
806{ 854{
807 int w, h; 855 int w, h;
808 856
874 922
875 while (p < e) 923 while (p < e)
876 { 924 {
877 uint32_t rgba = *p; 925 uint32_t rgba = *p;
878 rgba = (rgba >> 24) | (rgba << 8); 926 rgba = (rgba >> 24) | (rgba << 8);
927#if 0
928#ifdef _WIN32
929 {//D
930 uint8_t r = rgba >> 24;
931 uint8_t g = rgba >> 16;
932 uint8_t b = rgba >> 8;
933 uint8_t a = rgba >> 0;
934
935 rgba = (rgba & 0xffffff00) | a;
936 }
937#endif
938#endif
879 rgba = SDL_SwapBE32 (rgba); 939 rgba = SDL_SwapBE32 (rgba);
880 *p++ = rgba; 940 *p++ = rgba;
881 } 941 }
882 } 942 }
883 943
940 1000
941 if (ix) 1001 if (ix)
942 { 1002 {
943 glEnable (GL_BLEND); 1003 glEnable (GL_BLEND);
944 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1004 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1005 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f);
945 } 1007 }
946 1008
947 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
948 1010
949 if (wrap_mode) 1011 if (wrap_mode)
958 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1021 glTexCoord2f (s, 0); glVertex2f (x + w, y );
960 glEnd (); 1022 glEnd ();
961 1023
962 if (ix) 1024 if (ix)
1025 {
1026 glDisable (GL_ALPHA_TEST);
963 glDisable (GL_BLEND); 1027 glDisable (GL_BLEND);
1028 }
964} 1029}
965 1030
966MODULE = CFClient PACKAGE = CFClient::Map 1031MODULE = CFClient PACKAGE = CFClient::Map
967 1032
968CFClient::Map 1033CFClient::Map
1032 tex->r = r; 1097 tex->r = r;
1033 tex->g = g; 1098 tex->g = g;
1034 tex->b = b; 1099 tex->b = b;
1035 tex->a = a; 1100 tex->a = a;
1036 } 1101 }
1102
1103 // somewhat hackish, but for textures that require it, it really
1104 // improves the look, and most others don't suffer.
1105 glBindTexture (GL_TEXTURE_2D, name);
1106 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1037} 1108}
1038 1109
1039int 1110int
1040ox (CFClient::Map self) 1111ox (CFClient::Map self)
1041 ALIAS: 1112 ALIAS:
1479 const_iv (GL_COLOR_MATERIAL), 1550 const_iv (GL_COLOR_MATERIAL),
1480 const_iv (GL_SMOOTH), 1551 const_iv (GL_SMOOTH),
1481 const_iv (GL_FLAT), 1552 const_iv (GL_FLAT),
1482 const_iv (GL_DITHER), 1553 const_iv (GL_DITHER),
1483 const_iv (GL_BLEND), 1554 const_iv (GL_BLEND),
1555 const_iv (GL_CULL_FACE),
1484 const_iv (GL_SCISSOR_TEST), 1556 const_iv (GL_SCISSOR_TEST),
1557 const_iv (GL_DEPTH_TEST),
1558 const_iv (GL_ALPHA_TEST),
1559 const_iv (GL_NORMALIZE),
1560 const_iv (GL_RESCALE_NORMAL),
1485 const_iv (GL_AND), 1561 const_iv (GL_AND),
1486 const_iv (GL_ONE), 1562 const_iv (GL_ONE),
1487 const_iv (GL_ZERO), 1563 const_iv (GL_ZERO),
1488 const_iv (GL_SRC_ALPHA), 1564 const_iv (GL_SRC_ALPHA),
1489 const_iv (GL_SRC_ALPHA_SATURATE), 1565 const_iv (GL_SRC_ALPHA_SATURATE),
1490 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1566 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491 const_iv (GL_ONE_MINUS_DST_ALPHA), 1567 const_iv (GL_ONE_MINUS_DST_ALPHA),
1492 const_iv (GL_RGB), 1568 const_iv (GL_RGB),
1493 const_iv (GL_RGBA), 1569 const_iv (GL_RGBA),
1494 const_iv (GL_UNSIGNED_BYTE), 1570 const_iv (GL_UNSIGNED_BYTE),
1571 const_iv (GL_UNSIGNED_SHORT),
1572 const_iv (GL_UNSIGNED_INT),
1495 const_iv (GL_ALPHA), 1573 const_iv (GL_ALPHA),
1574 const_iv (GL_INTENSITY),
1496 const_iv (GL_LUMINANCE), 1575 const_iv (GL_LUMINANCE),
1576 const_iv (GL_LUMINANCE_ALPHA),
1497 const_iv (GL_FLOAT), 1577 const_iv (GL_FLOAT),
1498 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1578 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499 const_iv (GL_COMPILE), 1579 const_iv (GL_COMPILE),
1500 const_iv (GL_TEXTURE_1D), 1580 const_iv (GL_TEXTURE_1D),
1501 const_iv (GL_TEXTURE_2D), 1581 const_iv (GL_TEXTURE_2D),
1515 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1595 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1516 const_iv (GL_GENERATE_MIPMAP), 1596 const_iv (GL_GENERATE_MIPMAP),
1517 const_iv (GL_MODULATE), 1597 const_iv (GL_MODULATE),
1518 const_iv (GL_DECAL), 1598 const_iv (GL_DECAL),
1519 const_iv (GL_REPLACE), 1599 const_iv (GL_REPLACE),
1600 const_iv (GL_DEPTH_BUFFER_BIT),
1520 const_iv (GL_COLOR_BUFFER_BIT), 1601 const_iv (GL_COLOR_BUFFER_BIT),
1521 const_iv (GL_PROJECTION), 1602 const_iv (GL_PROJECTION),
1522 const_iv (GL_MODELVIEW), 1603 const_iv (GL_MODELVIEW),
1523 const_iv (GL_COLOR_LOGIC_OP), 1604 const_iv (GL_COLOR_LOGIC_OP),
1524 const_iv (GL_SEPARABLE_2D), 1605 const_iv (GL_SEPARABLE_2D),
1525 const_iv (GL_CONVOLUTION_2D), 1606 const_iv (GL_CONVOLUTION_2D),
1526 const_iv (GL_CONVOLUTION_BORDER_MODE), 1607 const_iv (GL_CONVOLUTION_BORDER_MODE),
1527 const_iv (GL_CONSTANT_BORDER), 1608 const_iv (GL_CONSTANT_BORDER),
1528 const_iv (GL_LINES), 1609 const_iv (GL_LINES),
1610 const_iv (GL_LINE_LOOP),
1529 const_iv (GL_QUADS), 1611 const_iv (GL_QUADS),
1530 const_iv (GL_LINE_LOOP), 1612 const_iv (GL_QUAD_STRIP),
1613 const_iv (GL_TRIANGLES),
1614 const_iv (GL_TRIANGLE_STRIP),
1615 const_iv (GL_TRIANGLE_FAN),
1531 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1616 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1532 const_iv (GL_FASTEST), 1617 const_iv (GL_FASTEST),
1618 const_iv (GL_V2F),
1619 const_iv (GL_V3F),
1620 const_iv (GL_T2F_V3F),
1621 const_iv (GL_T2F_N3F_V3F),
1533# undef const_iv 1622# undef const_iv
1534 }; 1623 };
1535 1624
1536 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1625 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1537 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1552 1641
1553void glHint (int target, int mode) 1642void glHint (int target, int mode)
1554 1643
1555void glBlendFunc (int sfactor, int dfactor) 1644void glBlendFunc (int sfactor, int dfactor)
1556 1645
1646void glDepthMask (int flag)
1647
1557void glLogicOp (int opcode) 1648void glLogicOp (int opcode)
1558 1649
1559void glColorMask (int red, int green, int blue, int alpha) 1650void glColorMask (int red, int green, int blue, int alpha)
1560 1651
1561void glMatrixMode (int mode) 1652void glMatrixMode (int mode)
1564 1655
1565void glPopMatrix () 1656void glPopMatrix ()
1566 1657
1567void glLoadIdentity () 1658void glLoadIdentity ()
1568 1659
1569# near and far are due to microsofts buggy c compiler 1660# near_ and far_ are due to microsofts buggy "c" compiler
1661void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662
1663# near_ and far_ are due to microsofts buggy "c" compiler
1570void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1664void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1571 1665
1572void glViewport (int x, int y, int width, int height) 1666void glViewport (int x, int y, int width, int height)
1573 1667
1574void glScissor (int x, int y, int width, int height) 1668void glScissor (int x, int y, int width, int height)
1590void glEnd () 1684void glEnd ()
1591 1685
1592void glColor (float r, float g, float b, float a = 1.0) 1686void glColor (float r, float g, float b, float a = 1.0)
1593 PROTOTYPE: @ 1687 PROTOTYPE: @
1594 CODE: 1688 CODE:
1689 // microsoft visual "c" rounds instead of truncating...
1595 glColor4ub (MIN ((int)(r * 255.f), 255), 1690 glColor4ub (MIN ((int)(r * 255.f), 255),
1596 MIN ((int)(g * 255.f), 255), 1691 MIN ((int)(g * 255.f), 255),
1597 MIN ((int)(b * 255.f), 255), 1692 MIN ((int)(b * 255.f), 255),
1598 MIN ((int)(a * 255.f), 255)); 1693 MIN ((int)(a * 255.f), 255));
1599 1694
1695void glInterleavedArrays (int format, int stride, char *data)
1696
1697void glDrawElements (int mode, int count, int type, char *indices)
1698
1699# 1.2 void glDrawRangeElements (int mode, int start, int end
1700
1701void glRasterPos (float x, float y, float z = 0.)
1702 CODE:
1703 glRasterPos3f (0, 0, z);
1704 glBitmap (0, 0, 0, 0, x, y, 0);
1705
1600void glVertex (float x, float y, float z = 0.) 1706void glVertex (float x, float y, float z = 0.)
1601 CODE: 1707 CODE:
1602 glVertex3f (x, y, z); 1708 glVertex3f (x, y, z);
1603 1709
1604void glTexCoord (float s, float t) 1710void glTexCoord (float s, float t)
1631 1737
1632void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1633 1739
1634void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1635 1741
1636void glRasterPos (int x, int y) 1742void glDrawPixels (int width, int height, int format, int type, char *pixels)
1637 CODE:
1638 glRasterPos2i (x, y);
1639 1743
1640void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1744void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1641 1745
1642int glGenTexture () 1746int glGenTexture ()
1643 CODE: 1747 CODE:
1670 1774
1671void glEndList () 1775void glEndList ()
1672 1776
1673void glCallList (int list) 1777void glCallList (int list)
1674 1778
1779

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines