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.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.96 by root, Wed May 24 22:28:43 2006 UTC

… …
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452 455
453 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456 457
457 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
458 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459 460
460 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
469 470
470 ++m; 471 ++m;
471 } 472 }
472} 473}
473 474
475char *
476SDL_GetError ()
477
474int 478int
475SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
476 CODE: 480 CODE:
477 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
478 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
… …
481 OUTPUT: 485 OUTPUT:
482 RETVAL 486 RETVAL
483 487
484void 488void
485SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
486 493
487void 494void
488SDL_PollEvent () 495SDL_PollEvent ()
489 PPCODE: 496 PPCODE:
490{ 497{
… …
509 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511 break; 518 break;
512 519
513 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
514 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519 break; 528 break;
520 529
521 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
522 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
523 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527 break; 538 break;
… …
553lowdelay (int fd, int val = 1) 564lowdelay (int fd, int val = 1)
554 CODE: 565 CODE:
555#ifndef _WIN32 566#ifndef _WIN32
556 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557#endif 568#endif
569
570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
558 576
559char * 577char *
560gl_version () 578gl_version ()
561 CODE: 579 CODE:
562 RETVAL = (char *)glGetString (GL_VERSION); 580 RETVAL = (char *)glGetString (GL_VERSION);
… …
669} 687}
670 688
671void 689void
672error (char *message) 690error (char *message)
673 CODE: 691 CODE:
692 fprintf (stderr, "ERROR: %s\n", message);
674#ifdef _WIN32 693#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 694 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif 695#endif
679 696
680void 697void
681fatal (char *message) 698fatal (char *message)
682 CODE: 699 CODE:
700 fprintf (stderr, "FATAL: %s\n", message);
683#ifdef _WIN32 701#ifdef _WIN32
684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685#else
686 fprintf (stderr, "FATAL: %s\n", message);
687#endif 703#endif
688 exit (1); 704 exit (1);
689 705
690MODULE = CFClient PACKAGE = CFClient::Font 706MODULE = CFClient PACKAGE = CFClient::Font
691 707
… …
714MODULE = CFClient PACKAGE = CFClient::Layout 730MODULE = CFClient PACKAGE = CFClient::Layout
715 731
716CFClient::Layout 732CFClient::Layout
717new (SV *class, int rgba = 0) 733new (SV *class, int rgba = 0)
718 CODE: 734 CODE:
735#if _WIN32
736 //rgba = 0;//D make stext nicer, breaks TextView
737#endif
719 New (0, RETVAL, 1, struct cf_layout); 738 New (0, RETVAL, 1, struct cf_layout);
720 739
721 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
722 RETVAL->rgba = rgba; 741 RETVAL->rgba = rgba;
723 RETVAL->r = 1.; 742 RETVAL->r = 1.;
… …
803set_width (CFClient::Layout self, int max_width = -1) 822set_width (CFClient::Layout self, int max_width = -1)
804 CODE: 823 CODE:
805 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);
806 825
807void 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
808size (CFClient::Layout self) 852size (CFClient::Layout self)
809 PPCODE: 853 PPCODE:
810{ 854{
811 int w, h; 855 int w, h;
812 856
… …
878 922
879 while (p < e) 923 while (p < e)
880 { 924 {
881 uint32_t rgba = *p; 925 uint32_t rgba = *p;
882 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
883 rgba = SDL_SwapBE32 (rgba); 939 rgba = SDL_SwapBE32 (rgba);
884 *p++ = rgba; 940 *p++ = rgba;
885 } 941 }
886 } 942 }
887 943
… …
944 1000
945 if (ix) 1001 if (ix)
946 { 1002 {
947 glEnable (GL_BLEND); 1003 glEnable (GL_BLEND);
948 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);
949 } 1007 }
950 1008
951 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
952 1010
953 if (wrap_mode) 1011 if (wrap_mode)
… …
962 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
963 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1021 glTexCoord2f (s, 0); glVertex2f (x + w, y );
964 glEnd (); 1022 glEnd ();
965 1023
966 if (ix) 1024 if (ix)
1025 {
1026 glDisable (GL_ALPHA_TEST);
967 glDisable (GL_BLEND); 1027 glDisable (GL_BLEND);
1028 }
968} 1029}
969 1030
970MODULE = CFClient PACKAGE = CFClient::Map 1031MODULE = CFClient PACKAGE = CFClient::Map
971 1032
972CFClient::Map 1033CFClient::Map
… …
1036 tex->r = r; 1097 tex->r = r;
1037 tex->g = g; 1098 tex->g = g;
1038 tex->b = b; 1099 tex->b = b;
1039 tex->a = a; 1100 tex->a = a;
1040 } 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);
1041} 1108}
1042 1109
1043int 1110int
1044ox (CFClient::Map self) 1111ox (CFClient::Map self)
1045 ALIAS: 1112 ALIAS:
… …
1483 const_iv (GL_COLOR_MATERIAL), 1550 const_iv (GL_COLOR_MATERIAL),
1484 const_iv (GL_SMOOTH), 1551 const_iv (GL_SMOOTH),
1485 const_iv (GL_FLAT), 1552 const_iv (GL_FLAT),
1486 const_iv (GL_DITHER), 1553 const_iv (GL_DITHER),
1487 const_iv (GL_BLEND), 1554 const_iv (GL_BLEND),
1555 const_iv (GL_CULL_FACE),
1488 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),
1489 const_iv (GL_AND), 1561 const_iv (GL_AND),
1490 const_iv (GL_ONE), 1562 const_iv (GL_ONE),
1491 const_iv (GL_ZERO), 1563 const_iv (GL_ZERO),
1492 const_iv (GL_SRC_ALPHA), 1564 const_iv (GL_SRC_ALPHA),
1493 const_iv (GL_SRC_ALPHA_SATURATE), 1565 const_iv (GL_SRC_ALPHA_SATURATE),
1494 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1566 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1495 const_iv (GL_ONE_MINUS_DST_ALPHA), 1567 const_iv (GL_ONE_MINUS_DST_ALPHA),
1496 const_iv (GL_RGB), 1568 const_iv (GL_RGB),
1497 const_iv (GL_RGBA), 1569 const_iv (GL_RGBA),
1498 const_iv (GL_UNSIGNED_BYTE), 1570 const_iv (GL_UNSIGNED_BYTE),
1571 const_iv (GL_UNSIGNED_SHORT),
1572 const_iv (GL_UNSIGNED_INT),
1499 const_iv (GL_ALPHA), 1573 const_iv (GL_ALPHA),
1574 const_iv (GL_INTENSITY),
1500 const_iv (GL_LUMINANCE), 1575 const_iv (GL_LUMINANCE),
1576 const_iv (GL_LUMINANCE_ALPHA),
1501 const_iv (GL_FLOAT), 1577 const_iv (GL_FLOAT),
1502 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1578 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1503 const_iv (GL_COMPILE), 1579 const_iv (GL_COMPILE),
1504 const_iv (GL_TEXTURE_1D), 1580 const_iv (GL_TEXTURE_1D),
1505 const_iv (GL_TEXTURE_2D), 1581 const_iv (GL_TEXTURE_2D),
… …
1519 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1595 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1520 const_iv (GL_GENERATE_MIPMAP), 1596 const_iv (GL_GENERATE_MIPMAP),
1521 const_iv (GL_MODULATE), 1597 const_iv (GL_MODULATE),
1522 const_iv (GL_DECAL), 1598 const_iv (GL_DECAL),
1523 const_iv (GL_REPLACE), 1599 const_iv (GL_REPLACE),
1600 const_iv (GL_DEPTH_BUFFER_BIT),
1524 const_iv (GL_COLOR_BUFFER_BIT), 1601 const_iv (GL_COLOR_BUFFER_BIT),
1525 const_iv (GL_PROJECTION), 1602 const_iv (GL_PROJECTION),
1526 const_iv (GL_MODELVIEW), 1603 const_iv (GL_MODELVIEW),
1527 const_iv (GL_COLOR_LOGIC_OP), 1604 const_iv (GL_COLOR_LOGIC_OP),
1528 const_iv (GL_SEPARABLE_2D), 1605 const_iv (GL_SEPARABLE_2D),
1529 const_iv (GL_CONVOLUTION_2D), 1606 const_iv (GL_CONVOLUTION_2D),
1530 const_iv (GL_CONVOLUTION_BORDER_MODE), 1607 const_iv (GL_CONVOLUTION_BORDER_MODE),
1531 const_iv (GL_CONSTANT_BORDER), 1608 const_iv (GL_CONSTANT_BORDER),
1532 const_iv (GL_LINES), 1609 const_iv (GL_LINES),
1610 const_iv (GL_LINE_LOOP),
1533 const_iv (GL_QUADS), 1611 const_iv (GL_QUADS),
1534 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),
1535 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1616 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1536 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),
1537# undef const_iv 1622# undef const_iv
1538 }; 1623 };
1539 1624
1540 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; )
1541 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1626 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1556 1641
1557void glHint (int target, int mode) 1642void glHint (int target, int mode)
1558 1643
1559void glBlendFunc (int sfactor, int dfactor) 1644void glBlendFunc (int sfactor, int dfactor)
1560 1645
1646void glDepthMask (int flag)
1647
1561void glLogicOp (int opcode) 1648void glLogicOp (int opcode)
1562 1649
1563void glColorMask (int red, int green, int blue, int alpha) 1650void glColorMask (int red, int green, int blue, int alpha)
1564 1651
1565void glMatrixMode (int mode) 1652void glMatrixMode (int mode)
… …
1568 1655
1569void glPopMatrix () 1656void glPopMatrix ()
1570 1657
1571void glLoadIdentity () 1658void glLoadIdentity ()
1572 1659
1573# 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
1574void 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_)
1575 1665
1576void glViewport (int x, int y, int width, int height) 1666void glViewport (int x, int y, int width, int height)
1577 1667
1578void glScissor (int x, int y, int width, int height) 1668void glScissor (int x, int y, int width, int height)
… …
1594void glEnd () 1684void glEnd ()
1595 1685
1596void glColor (float r, float g, float b, float a = 1.0) 1686void glColor (float r, float g, float b, float a = 1.0)
1597 PROTOTYPE: @ 1687 PROTOTYPE: @
1598 CODE: 1688 CODE:
1689 // microsoft visual "c" rounds instead of truncating...
1599 glColor4ub (MIN ((int)(r * 255.f), 255), 1690 glColor4ub (MIN ((int)(r * 255.f), 255),
1600 MIN ((int)(g * 255.f), 255), 1691 MIN ((int)(g * 255.f), 255),
1601 MIN ((int)(b * 255.f), 255), 1692 MIN ((int)(b * 255.f), 255),
1602 MIN ((int)(a * 255.f), 255)); 1693 MIN ((int)(a * 255.f), 255));
1603 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
1604void glVertex (float x, float y, float z = 0.) 1706void glVertex (float x, float y, float z = 0.)
1605 CODE: 1707 CODE:
1606 glVertex3f (x, y, z); 1708 glVertex3f (x, y, z);
1607 1709
1608void glTexCoord (float s, float t) 1710void glTexCoord (float s, float t)
… …
1635 1737
1636void 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)
1637 1739
1638void 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)
1639 1741
1640void glRasterPos (int x, int y) 1742void glDrawPixels (int width, int height, int format, int type, char *pixels)
1641 CODE:
1642 glRasterPos2i (x, y);
1643 1743
1644void 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)
1645 1745
1646int glGenTexture () 1746int glGenTexture ()
1647 CODE: 1747 CODE:
… …
1674 1774
1675void glEndList () 1775void glEndList ()
1676 1776
1677void glCallList (int list) 1777void glCallList (int list)
1678 1778
1779

Diff Legend

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