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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.94 by root, Tue May 23 18:57:35 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#ifndef _WIN32 89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
90 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91#endif 93#endif
92} 94}
93 95
94static void 96static void
… …
441 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450 455
451 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
452 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
453 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
454 457
455 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
456 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457 460
458 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
467 470
468 ++m; 471 ++m;
469 } 472 }
470} 473}
471 474
475char *
476SDL_GetError ()
477
472int 478int
473SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
474 CODE: 480 CODE:
475 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
476 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
… …
479 OUTPUT: 485 OUTPUT:
480 RETVAL 486 RETVAL
481 487
482void 488void
483SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
484 493
485void 494void
486SDL_PollEvent () 495SDL_PollEvent ()
487 PPCODE: 496 PPCODE:
488{ 497{
… …
507 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
508 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
509 break; 518 break;
510 519
511 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
512 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
513 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
514 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
515 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
516 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
517 break; 528 break;
518 529
519 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
520 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
521 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
522 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
523 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
524 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
525 break; 538 break;
… …
551lowdelay (int fd, int val = 1) 564lowdelay (int fd, int val = 1)
552 CODE: 565 CODE:
553#ifndef _WIN32 566#ifndef _WIN32
554 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
555#endif 568#endif
569
570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
556 576
557char * 577char *
558gl_version () 578gl_version ()
559 CODE: 579 CODE:
560 RETVAL = (char *)glGetString (GL_VERSION); 580 RETVAL = (char *)glGetString (GL_VERSION);
… …
667} 687}
668 688
669void 689void
670error (char *message) 690error (char *message)
671 CODE: 691 CODE:
692 fprintf (stderr, "ERROR: %s\n", message);
672#ifdef _WIN32 693#ifdef _WIN32
673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 694 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
674#else
675 fprintf (stderr, "ERROR: %s\n", message);
676#endif 695#endif
677 696
678void 697void
679fatal (char *message) 698fatal (char *message)
680 CODE: 699 CODE:
700 fprintf (stderr, "FATAL: %s\n", message);
681#ifdef _WIN32 701#ifdef _WIN32
682 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
683#else
684 fprintf (stderr, "FATAL: %s\n", message);
685#endif 703#endif
686 exit (1); 704 exit (1);
687 705
688MODULE = CFClient PACKAGE = CFClient::Font 706MODULE = CFClient PACKAGE = CFClient::Font
689 707
… …
712MODULE = CFClient PACKAGE = CFClient::Layout 730MODULE = CFClient PACKAGE = CFClient::Layout
713 731
714CFClient::Layout 732CFClient::Layout
715new (SV *class, int rgba = 0) 733new (SV *class, int rgba = 0)
716 CODE: 734 CODE:
735#if _WIN32
736 rgba = 0;//D
737#endif
717 New (0, RETVAL, 1, struct cf_layout); 738 New (0, RETVAL, 1, struct cf_layout);
718 739
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 741 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 742 RETVAL->r = 1.;
… …
801set_width (CFClient::Layout self, int max_width = -1) 822set_width (CFClient::Layout self, int max_width = -1)
802 CODE: 823 CODE:
803 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);
804 825
805void 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
806size (CFClient::Layout self) 852size (CFClient::Layout self)
807 PPCODE: 853 PPCODE:
808{ 854{
809 int w, h; 855 int w, h;
810 856
… …
876 922
877 while (p < e) 923 while (p < e)
878 { 924 {
879 uint32_t rgba = *p; 925 uint32_t rgba = *p;
880 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
881 rgba = SDL_SwapBE32 (rgba); 939 rgba = SDL_SwapBE32 (rgba);
882 *p++ = rgba; 940 *p++ = rgba;
883 } 941 }
884 } 942 }
885 943
… …
942 1000
943 if (ix) 1001 if (ix)
944 { 1002 {
945 glEnable (GL_BLEND); 1003 glEnable (GL_BLEND);
946 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);
947 } 1007 }
948 1008
949 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
950 1010
951 if (wrap_mode) 1011 if (wrap_mode)
… …
960 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1021 glTexCoord2f (s, 0); glVertex2f (x + w, y );
962 glEnd (); 1022 glEnd ();
963 1023
964 if (ix) 1024 if (ix)
1025 {
1026 glDisable (GL_ALPHA_TEST);
965 glDisable (GL_BLEND); 1027 glDisable (GL_BLEND);
1028 }
966} 1029}
967 1030
968MODULE = CFClient PACKAGE = CFClient::Map 1031MODULE = CFClient PACKAGE = CFClient::Map
969 1032
970CFClient::Map 1033CFClient::Map
… …
1481 const_iv (GL_COLOR_MATERIAL), 1544 const_iv (GL_COLOR_MATERIAL),
1482 const_iv (GL_SMOOTH), 1545 const_iv (GL_SMOOTH),
1483 const_iv (GL_FLAT), 1546 const_iv (GL_FLAT),
1484 const_iv (GL_DITHER), 1547 const_iv (GL_DITHER),
1485 const_iv (GL_BLEND), 1548 const_iv (GL_BLEND),
1549 const_iv (GL_CULL_FACE),
1486 const_iv (GL_SCISSOR_TEST), 1550 const_iv (GL_SCISSOR_TEST),
1551 const_iv (GL_DEPTH_TEST),
1552 const_iv (GL_ALPHA_TEST),
1553 const_iv (GL_NORMALIZE),
1554 const_iv (GL_RESCALE_NORMAL),
1487 const_iv (GL_AND), 1555 const_iv (GL_AND),
1488 const_iv (GL_ONE), 1556 const_iv (GL_ONE),
1489 const_iv (GL_ZERO), 1557 const_iv (GL_ZERO),
1490 const_iv (GL_SRC_ALPHA), 1558 const_iv (GL_SRC_ALPHA),
1491 const_iv (GL_SRC_ALPHA_SATURATE), 1559 const_iv (GL_SRC_ALPHA_SATURATE),
1492 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1560 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1493 const_iv (GL_ONE_MINUS_DST_ALPHA), 1561 const_iv (GL_ONE_MINUS_DST_ALPHA),
1494 const_iv (GL_RGB), 1562 const_iv (GL_RGB),
1495 const_iv (GL_RGBA), 1563 const_iv (GL_RGBA),
1496 const_iv (GL_UNSIGNED_BYTE), 1564 const_iv (GL_UNSIGNED_BYTE),
1565 const_iv (GL_UNSIGNED_SHORT),
1566 const_iv (GL_UNSIGNED_INT),
1497 const_iv (GL_ALPHA), 1567 const_iv (GL_ALPHA),
1568 const_iv (GL_INTENSITY),
1498 const_iv (GL_LUMINANCE), 1569 const_iv (GL_LUMINANCE),
1570 const_iv (GL_LUMINANCE_ALPHA),
1499 const_iv (GL_FLOAT), 1571 const_iv (GL_FLOAT),
1500 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1572 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501 const_iv (GL_COMPILE), 1573 const_iv (GL_COMPILE),
1502 const_iv (GL_TEXTURE_1D), 1574 const_iv (GL_TEXTURE_1D),
1503 const_iv (GL_TEXTURE_2D), 1575 const_iv (GL_TEXTURE_2D),
… …
1517 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1589 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1518 const_iv (GL_GENERATE_MIPMAP), 1590 const_iv (GL_GENERATE_MIPMAP),
1519 const_iv (GL_MODULATE), 1591 const_iv (GL_MODULATE),
1520 const_iv (GL_DECAL), 1592 const_iv (GL_DECAL),
1521 const_iv (GL_REPLACE), 1593 const_iv (GL_REPLACE),
1594 const_iv (GL_DEPTH_BUFFER_BIT),
1522 const_iv (GL_COLOR_BUFFER_BIT), 1595 const_iv (GL_COLOR_BUFFER_BIT),
1523 const_iv (GL_PROJECTION), 1596 const_iv (GL_PROJECTION),
1524 const_iv (GL_MODELVIEW), 1597 const_iv (GL_MODELVIEW),
1525 const_iv (GL_COLOR_LOGIC_OP), 1598 const_iv (GL_COLOR_LOGIC_OP),
1526 const_iv (GL_SEPARABLE_2D), 1599 const_iv (GL_SEPARABLE_2D),
1527 const_iv (GL_CONVOLUTION_2D), 1600 const_iv (GL_CONVOLUTION_2D),
1528 const_iv (GL_CONVOLUTION_BORDER_MODE), 1601 const_iv (GL_CONVOLUTION_BORDER_MODE),
1529 const_iv (GL_CONSTANT_BORDER), 1602 const_iv (GL_CONSTANT_BORDER),
1530 const_iv (GL_LINES), 1603 const_iv (GL_LINES),
1604 const_iv (GL_LINE_LOOP),
1531 const_iv (GL_QUADS), 1605 const_iv (GL_QUADS),
1532 const_iv (GL_LINE_LOOP), 1606 const_iv (GL_QUAD_STRIP),
1607 const_iv (GL_TRIANGLES),
1608 const_iv (GL_TRIANGLE_STRIP),
1609 const_iv (GL_TRIANGLE_FAN),
1533 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1610 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1534 const_iv (GL_FASTEST), 1611 const_iv (GL_FASTEST),
1612 const_iv (GL_V2F),
1613 const_iv (GL_V3F),
1614 const_iv (GL_T2F_V3F),
1615 const_iv (GL_T2F_N3F_V3F),
1535# undef const_iv 1616# undef const_iv
1536 }; 1617 };
1537 1618
1538 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1619 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1539 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1620 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1554 1635
1555void glHint (int target, int mode) 1636void glHint (int target, int mode)
1556 1637
1557void glBlendFunc (int sfactor, int dfactor) 1638void glBlendFunc (int sfactor, int dfactor)
1558 1639
1640void glDepthMask (int flag)
1641
1559void glLogicOp (int opcode) 1642void glLogicOp (int opcode)
1560 1643
1561void glColorMask (int red, int green, int blue, int alpha) 1644void glColorMask (int red, int green, int blue, int alpha)
1562 1645
1563void glMatrixMode (int mode) 1646void glMatrixMode (int mode)
… …
1566 1649
1567void glPopMatrix () 1650void glPopMatrix ()
1568 1651
1569void glLoadIdentity () 1652void glLoadIdentity ()
1570 1653
1571# near and far are due to microsofts buggy c compiler 1654# near_ and far_ are due to microsofts buggy "c" compiler
1655void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656
1657# near_ and far_ are due to microsofts buggy "c" compiler
1572void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1658void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1573 1659
1574void glViewport (int x, int y, int width, int height) 1660void glViewport (int x, int y, int width, int height)
1575 1661
1576void glScissor (int x, int y, int width, int height) 1662void glScissor (int x, int y, int width, int height)
… …
1592void glEnd () 1678void glEnd ()
1593 1679
1594void glColor (float r, float g, float b, float a = 1.0) 1680void glColor (float r, float g, float b, float a = 1.0)
1595 PROTOTYPE: @ 1681 PROTOTYPE: @
1596 CODE: 1682 CODE:
1683 // microsoft visual "c" rounds instead of truncating...
1597 glColor4ub (MIN ((int)(r * 255.f), 255), 1684 glColor4ub (MIN ((int)(r * 255.f), 255),
1598 MIN ((int)(g * 255.f), 255), 1685 MIN ((int)(g * 255.f), 255),
1599 MIN ((int)(b * 255.f), 255), 1686 MIN ((int)(b * 255.f), 255),
1600 MIN ((int)(a * 255.f), 255)); 1687 MIN ((int)(a * 255.f), 255));
1601 1688
1689void glInterleavedArrays (int format, int stride, char *data)
1690
1691void glDrawElements (int mode, int count, int type, char *indices)
1692
1693# 1.2 void glDrawRangeElements (int mode, int start, int end
1694
1695void glRasterPos (float x, float y, float z = 0.)
1696 CODE:
1697 glRasterPos3f (0, 0, z);
1698 glBitmap (0, 0, 0, 0, x, y, 0);
1699
1602void glVertex (float x, float y, float z = 0.) 1700void glVertex (float x, float y, float z = 0.)
1603 CODE: 1701 CODE:
1604 glVertex3f (x, y, z); 1702 glVertex3f (x, y, z);
1605 1703
1606void glTexCoord (float s, float t) 1704void glTexCoord (float s, float t)
… …
1633 1731
1634void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1732void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1635 1733
1636void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1734void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1637 1735
1638void glRasterPos (int x, int y) 1736void glDrawPixels (int width, int height, int format, int type, char *pixels)
1639 CODE:
1640 glRasterPos2i (x, y);
1641 1737
1642void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1738void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1643 1739
1644int glGenTexture () 1740int glGenTexture ()
1645 CODE: 1741 CODE:
… …
1672 1768
1673void glEndList () 1769void glEndList ()
1674 1770
1675void glCallList (int list) 1771void glCallList (int list)
1676 1772
1773

Diff Legend

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