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.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.105 by root, Mon Jun 5 03:33:09 2006 UTC

48#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
50 50
51#define MIN_FONT_HEIGHT 10 51#define MIN_FONT_HEIGHT 10
52 52
53#define GL_CALL(type,func,args) \ 53static struct
54 { \ 54{
55 static int init_; \ 55#define GL_FUNC(ptr,name) ptr name;
56 static type fptr_; \ 56#include "glfunc.h"
57 \ 57#undef GL_FUNC
58 if (!init_) \ 58} gl;
59 { \ 59
60 init_ = 1; \ 60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 61{
62 } \ 62 if (gl.BlendFuncSeparate)
63 \ 63 gl.BlendFuncSeparate (sa, da, saa, daa);
64 if (fptr_) \ 64 else if (gl.BlendFuncSeparateEXT)
65 fptr_ args; \ 65 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 } 66 else
67 glBlendFunc (sa, da);
68}
67 69
68typedef Mix_Chunk *CFClient__MixChunk; 70typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 71typedef Mix_Music *CFClient__MixMusic;
70 72
71typedef PangoFontDescription *CFClient__Font; 73typedef PangoFontDescription *CFClient__Font;
84 86
85static void 87static void
86substitute_func (FcPattern *pattern, gpointer data) 88substitute_func (FcPattern *pattern, gpointer data)
87{ 89{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 90 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 91 //FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 93}
95 94
96static void 95static void
97layout_update_font (CFClient__Layout self) 96layout_update_font (CFClient__Layout self)
98{ 97{
416} 415}
417 416
418void 417void
419pango_init () 418pango_init ()
420 CODE: 419 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx 420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{
422 {
423 ft2_fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
424 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);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 }
426 427
428 {
429 cairo_font_options_t *fopt = cairo_font_options_create ();
427 cairo_fontmap = pango_cairo_font_map_get_default (); 430 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 431 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435 pango_cairo_context_set_font_options (cairo_context, fopt);
436 cairo_font_options_destroy (fopt);
437 }
429} 438}
430 439
431int 440int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 441SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 442
479SDL_SetVideoMode (int w, int h, int fullscreen) 488SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 489 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 490 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 491 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 492 );
493 if (RETVAL)
494 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 495 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
496# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
497# include "glfunc.h"
498# undef GL_FUNC
499 }
485 OUTPUT: 500 OUTPUT:
486 RETVAL 501 RETVAL
487 502
488void 503void
489SDL_GL_SwapBuffers () 504SDL_GL_SwapBuffers ()
505
506char *
507SDL_GetKeyName (int sym)
490 508
491void 509void
492SDL_PollEvent () 510SDL_PollEvent ()
493 PPCODE: 511 PPCODE:
494{ 512{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 531 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 532 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 533 break;
516 534
517 case SDL_MOUSEMOTION: 535 case SDL_MOUSEMOTION:
536 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
537
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 538 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 539 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 540 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 541 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 542 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 543 break;
524 544
525 case SDL_MOUSEBUTTONDOWN: 545 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 546 case SDL_MOUSEBUTTONUP:
547 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
548
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 549 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 550 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 551 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 552 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 553 break;
557lowdelay (int fd, int val = 1) 579lowdelay (int fd, int val = 1)
558 CODE: 580 CODE:
559#ifndef _WIN32 581#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 582 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 583#endif
562
563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_version ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VERSION);
574 OUTPUT:
575 RETVAL
576
577char *
578gl_extensions ()
579 CODE:
580 RETVAL = (char *)glGetString (GL_EXTENSIONS);
581 OUTPUT:
582 RETVAL
583 584
584void 585void
585add_font (char *file) 586add_font (char *file)
586 CODE: 587 CODE:
587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 588 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
724 725
725CFClient::Layout 726CFClient::Layout
726new (SV *class, int rgba = 0) 727new (SV *class, int rgba = 0)
727 CODE: 728 CODE:
728#if _WIN32 729#if _WIN32
729 rgba = 0;//D 730 //rgba = 0;//D makes text nicer, breaks TextView
730#endif 731#endif
732 rgba=1;//D
731 New (0, RETVAL, 1, struct cf_layout); 733 New (0, RETVAL, 1, struct cf_layout);
732 734
733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
734 RETVAL->rgba = rgba; 736 RETVAL->rgba = rgba;
735 RETVAL->r = 1.; 737 RETVAL->r = 1.;
981{ 983{
982 HV *hv = (HV *)SvRV (self); 984 HV *hv = (HV *)SvRV (self);
983 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 985 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 986 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 987 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987 988
988 if (items < 5) 989 if (items < 5)
989 { 990 {
990 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 991 w = SvNV (*hv_fetch (hv, "w", 1, 1));
991 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 992 h = SvNV (*hv_fetch (hv, "h", 1, 1));
992 } 993 }
993 994
994 if (ix) 995 if (ix)
995 { 996 {
996 glEnable (GL_BLEND); 997 glEnable (GL_BLEND);
998
999 if (ix == 2)
997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1000 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1001 else
1002 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1003 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1004
998 glEnable (GL_ALPHA_TEST); 1005 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f); 1006 glAlphaFunc (GL_GREATER, 0.01f);
1000 } 1007 }
1001 1008
1002 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
1003
1004 if (wrap_mode)
1005 {
1006 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1007 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1008 }
1009 1010
1010 glBegin (GL_QUADS); 1011 glBegin (GL_QUADS);
1011 glTexCoord2f (0, 0); glVertex2f (x , y ); 1012 glTexCoord2f (0, 0); glVertex2f (x , y );
1012 glTexCoord2f (0, t); glVertex2f (x , y + h); 1013 glTexCoord2f (0, t); glVertex2f (x , y + h);
1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1014 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1090 tex->r = r; 1091 tex->r = r;
1091 tex->g = g; 1092 tex->g = g;
1092 tex->b = b; 1093 tex->b = b;
1093 tex->a = a; 1094 tex->a = a;
1094 } 1095 }
1096
1097 // somewhat hackish, but for textures that require it, it really
1098 // improves the look, and most others don't suffer.
1099 glBindTexture (GL_TEXTURE_2D, name);
1100 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1101 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1102 // use uglier nearest interpolation because linear suffers
1103 // from transparent color bleeding and ugly wrapping effects.
1104 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1095} 1105}
1096 1106
1097int 1107int
1098ox (CFClient::Map self) 1108ox (CFClient::Map self)
1099 ALIAS: 1109 ALIAS:
1100 oy = 1 1110 oy = 1
1111 x = 2
1112 y = 3
1113 w = 4
1114 h = 5
1101 CODE: 1115 CODE:
1102 switch (ix) 1116 switch (ix)
1103 { 1117 {
1104 case 0: RETVAL = self->ox; break; 1118 case 0: RETVAL = self->ox; break;
1105 case 1: RETVAL = self->oy; break; 1119 case 1: RETVAL = self->oy; break;
1120 case 2: RETVAL = self->x; break;
1121 case 3: RETVAL = self->y; break;
1122 case 4: RETVAL = self->w; break;
1123 case 5: RETVAL = self->h; break;
1106 } 1124 }
1107 OUTPUT: 1125 OUTPUT:
1108 RETVAL 1126 RETVAL
1109 1127
1110void 1128void
1547 const_iv (GL_RESCALE_NORMAL), 1565 const_iv (GL_RESCALE_NORMAL),
1548 const_iv (GL_AND), 1566 const_iv (GL_AND),
1549 const_iv (GL_ONE), 1567 const_iv (GL_ONE),
1550 const_iv (GL_ZERO), 1568 const_iv (GL_ZERO),
1551 const_iv (GL_SRC_ALPHA), 1569 const_iv (GL_SRC_ALPHA),
1552 const_iv (GL_SRC_ALPHA_SATURATE), 1570 const_iv (GL_DST_ALPHA),
1553 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1571 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554 const_iv (GL_ONE_MINUS_DST_ALPHA), 1572 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE),
1555 const_iv (GL_RGB), 1574 const_iv (GL_RGB),
1556 const_iv (GL_RGBA), 1575 const_iv (GL_RGBA),
1557 const_iv (GL_UNSIGNED_BYTE), 1576 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT), 1577 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT), 1578 const_iv (GL_UNSIGNED_INT),
1570 const_iv (GL_TEXTURE_MAG_FILTER), 1589 const_iv (GL_TEXTURE_MAG_FILTER),
1571 const_iv (GL_TEXTURE_MIN_FILTER), 1590 const_iv (GL_TEXTURE_MIN_FILTER),
1572 const_iv (GL_TEXTURE_ENV_MODE), 1591 const_iv (GL_TEXTURE_ENV_MODE),
1573 const_iv (GL_TEXTURE_WRAP_S), 1592 const_iv (GL_TEXTURE_WRAP_S),
1574 const_iv (GL_TEXTURE_WRAP_T), 1593 const_iv (GL_TEXTURE_WRAP_T),
1594 const_iv (GL_REPEAT),
1575 const_iv (GL_CLAMP), 1595 const_iv (GL_CLAMP),
1576 const_iv (GL_REPEAT), 1596 const_iv (GL_CLAMP_TO_EDGE),
1577 const_iv (GL_NEAREST), 1597 const_iv (GL_NEAREST),
1578 const_iv (GL_LINEAR), 1598 const_iv (GL_LINEAR),
1579 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1599 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1600 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1601 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1611 1631
1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1632 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1633 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614} 1634}
1615 1635
1636char *
1637gl_vendor ()
1638 CODE:
1639 RETVAL = (char *)glGetString (GL_VENDOR);
1640 OUTPUT:
1641 RETVAL
1642
1643char *
1644gl_version ()
1645 CODE:
1646 RETVAL = (char *)glGetString (GL_VERSION);
1647 OUTPUT:
1648 RETVAL
1649
1650char *
1651gl_extensions ()
1652 CODE:
1653 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1654 OUTPUT:
1655 RETVAL
1656
1616int glGetError () 1657int glGetError ()
1617 1658
1618void glClear (int mask) 1659void glClear (int mask)
1619 1660
1620void glClearColor (float r, float g, float b, float a = 1.0) 1661void glClearColor (float r, float g, float b, float a = 1.0)
1627void glShadeModel (int mode) 1668void glShadeModel (int mode)
1628 1669
1629void glHint (int target, int mode) 1670void glHint (int target, int mode)
1630 1671
1631void glBlendFunc (int sfactor, int dfactor) 1672void glBlendFunc (int sfactor, int dfactor)
1673
1674void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1675 CODE:
1676 gl_BlendFuncSeparate (sa, da, saa, daa);
1632 1677
1633void glDepthMask (int flag) 1678void glDepthMask (int flag)
1634 1679
1635void glLogicOp (int opcode) 1680void glLogicOp (int opcode)
1636 1681
1670 1715
1671void glEnd () 1716void glEnd ()
1672 1717
1673void glColor (float r, float g, float b, float a = 1.0) 1718void glColor (float r, float g, float b, float a = 1.0)
1674 PROTOTYPE: @ 1719 PROTOTYPE: @
1720 ALIAS:
1721 glColor_premultiply = 1
1675 CODE: 1722 CODE:
1723 if (ix)
1724 {
1725 r *= a;
1726 g *= a;
1727 b *= a;
1728 }
1676 // microsoft visual "c" rounds instead of truncating... 1729 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255), 1730 glColor4ub (MIN ((int)(r * 256.f), 255),
1678 MIN ((int)(g * 255.f), 255), 1731 MIN ((int)(g * 256.f), 255),
1679 MIN ((int)(b * 255.f), 255), 1732 MIN ((int)(b * 256.f), 255),
1680 MIN ((int)(a * 255.f), 255)); 1733 MIN ((int)(a * 256.f), 255));
1681 1734
1682void glInterleavedArrays (int format, int stride, char *data) 1735void glInterleavedArrays (int format, int stride, char *data)
1683 1736
1684void glDrawElements (int mode, int count, int type, char *indices) 1737void glDrawElements (int mode, int count, int type, char *indices)
1685 1738
1708 1761
1709void glBindTexture (int target, int name) 1762void glBindTexture (int target, int name)
1710 1763
1711void glConvolutionParameter (int target, int pname, float params) 1764void glConvolutionParameter (int target, int pname, float params)
1712 CODE: 1765 CODE:
1713 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1766 if (gl.ConvolutionParameterf)
1767 gl.ConvolutionParameterf (target, pname, params);
1714 1768
1715void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1769void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1716 CODE: 1770 CODE:
1717 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1771 if (gl.ConvolutionFilter2D)
1718 (target, internalformat, width, height, format, type, data)); 1772 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719 1773
1720void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1774void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1721 CODE: 1775 CODE:
1722 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1776 if (gl.SeparableFilter2D)
1723 (target, internalformat, width, height, format, type, row, column)); 1777 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724 1778
1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1779void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1726 1780
1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1781void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1728 1782

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines