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.253 by root, Fri Dec 28 20:59:14 2007 UTC vs.
Revision 1.265 by root, Fri Jul 18 22:56:11 2008 UTC

… …
46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 56# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 57# define pango_layout_get_lines_readonly pango_layout_get_lines
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly 59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56#endif 60#endif
57 61
58#ifndef _WIN32 62#ifndef _WIN32
59# include <sys/types.h> 63# include <sys/types.h>
60# include <sys/socket.h> 64# include <sys/socket.h>
61# include <netinet/in.h> 65# include <netinet/in.h>
62# include <netinet/tcp.h> 66# include <netinet/tcp.h>
63# include <inttypes.h> 67# include <inttypes.h>
64#endif 68#endif
65 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 80
68#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
69 82
70#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
… …
72 85
73#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
74 87
75/* mask out modifiers we are not interested in */ 88/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77
78#if 0
79# define PARACHUTE SDL_INIT_NOPARACHUTE
80#else
81# define PARACHUTE 0
82#endif
83 90
84static AV *texture_av; 91static AV *texture_av;
85 92
86static struct 93static struct
87{ 94{
… …
181 188
182static void 189static void
183layout_update_font (DC__Layout self) 190layout_update_font (DC__Layout self)
184{ 191{
185 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
186 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
187 */ 194 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
189 196
190 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
631 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
632 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
633 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
634 641
635 const_iv (MIX_DEFAULT_FORMAT), 642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
652
653 const_iv (SDL_GL_RED_SIZE),
654 const_iv (SDL_GL_GREEN_SIZE),
655 const_iv (SDL_GL_BLUE_SIZE),
656 const_iv (SDL_GL_ALPHA_SIZE),
657 const_iv (SDL_GL_DOUBLEBUFFER),
658 const_iv (SDL_GL_BUFFER_SIZE),
659 const_iv (SDL_GL_DEPTH_SIZE),
660 const_iv (SDL_GL_STENCIL_SIZE),
661 const_iv (SDL_GL_ACCUM_RED_SIZE),
662 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
663 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL)
636# undef const_iv 670# undef const_iv
637 }; 671 };
638 672
639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
669 CODE: 703 CODE:
670{ 704{
671 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
672 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 706 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 707 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 708 /*pango_context_set_font_description (opengl_context, default_font);*/
709#if PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 710 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 712#endif
678} 713}
679 714
680char *
681SDL_GetError () 715char *SDL_GetError ()
682 716
683int 717int SDL_Init (U32 flags)
684SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
685 718
686void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
687SDL_Quit () 723void SDL_Quit ()
724
725int SDL_GL_SetAttribute (int attr, int value)
726
727int SDL_GL_GetAttribute (int attr)
728 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL))
730 XSRETURN_UNDEF;
731 OUTPUT:
732 RETVAL
688 733
689void 734void
690SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
691 PPCODE: 736 PPCODE:
692{ 737{
… …
704 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707 752
708 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709#if SDL_VERSION_ATLEAST(1,2,10)
710 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712#endif
713 755
714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
715 757
716 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
717 while (*m) 759 while (*m)
718 { 760 {
719 if ((*m)->w >= 800 && (*m)->h >= 480) 761 if ((*m)->w >= 400 && (*m)->h >= 300)
720 { 762 {
721 AV *av = newAV (); 763 AV *av = newAV ();
722 av_push (av, newSViv ((*m)->w)); 764 av_push (av, newSViv ((*m)->w));
723 av_push (av, newSViv ((*m)->h)); 765 av_push (av, newSViv ((*m)->h));
724 av_push (av, newSViv (rgb)); 766 av_push (av, newSViv (rgb));
… …
765char * 807char *
766SDL_GetKeyName (int sym) 808SDL_GetKeyName (int sym)
767 809
768int 810int
769SDL_GetAppState () 811SDL_GetAppState ()
812
813int
814SDL_GetModState ()
770 815
771void 816void
772poll_events () 817poll_events ()
773 PPCODE: 818 PPCODE:
774{ 819{
… …
908 } 953 }
909 } 954 }
910#endif 955#endif
911} 956}
912 957
913void 958int
914add_font (char *file) 959add_font (char *file)
915 CODE: 960 CODE:
916 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT:
963 RETVAL
917 964
918void 965void
919load_image_inline (SV *image_) 966load_image_inline (SV *image_)
920 ALIAS: 967 ALIAS:
921 load_image_file = 1 968 load_image_file = 1
… …
1331 PPCODE: 1378 PPCODE:
1332{ 1379{
1333 int line, x; 1380 int line, x;
1334 1381
1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1382 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1383#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1384 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1385 --line;
1339#endif 1386#endif
1340 EXTEND (SP, 2); 1387 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1388 PUSHs (sv_2mortal (newSViv (line)));
… …
1677 uint8_t ext, cmd; 1724 uint8_t ext, cmd;
1678 1725
1679 do 1726 do
1680 { 1727 {
1681 ext = *data++; 1728 ext = *data++;
1682 cmd = ext & 0x3f; 1729 cmd = ext & 0x7f;
1683 1730
1684 if (cmd < 4) 1731 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1; 1732 cell->darkness = 255 - ext * 64 + 1;
1686 else if (cmd == 5) // health 1733 else if (cmd == 5) // health
1687 { 1734 {
… …
1690 } 1737 }
1691 else if (cmd == 6) // monster width 1738 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1; 1739 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47) 1740 else if (cmd == 0x47)
1694 { 1741 {
1695 if (*data == 4) 1742 if (*data == 1) cell->player = data [1];
1696 ; // decode player count 1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1697 1746
1698 data += *data + 1; 1747 data += *data + 1;
1699 } 1748 }
1700 else if (cmd == 8) // cell flags 1749 else if (cmd == 8) // cell flags
1701 cell->flags = *data++; 1750 cell->flags = *data++;
… …
1793} 1842}
1794 OUTPUT: 1843 OUTPUT:
1795 RETVAL 1844 RETVAL
1796 1845
1797void 1846void
1798draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1847draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1799 CODE: 1848 CODE:
1800{ 1849{
1801 int x, y, z; 1850 int x, y, z;
1802 1851
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1853 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1805 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1854 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1806 smooth_key skey; 1855 smooth_key skey;
1807 1856 int pl_x, pl_y;
1857 maptex pl_tex;
1808 rc_t *rc = rc_alloc (); 1858 rc_t *rc = rc_alloc ();
1809 rc_key_t key; 1859 rc_key_t key;
1810 rc_array_t *arr; 1860 rc_array_t *arr;
1861
1862 pl_tex.name = 0;
1811 1863
1812 // thats current max. sorry. 1864 // thats current max. sorry.
1813 if (sw > 255) sw = 255; 1865 if (sw > 255) sw = 255;
1814 if (sh > 255) sh = 255; 1866 if (sh > 255) sh = 255;
1815 1867
… …
1870 tileid tile = cell->tile [z]; 1922 tileid tile = cell->tile [z];
1871 1923
1872 if (tile) 1924 if (tile)
1873 { 1925 {
1874 maptex tex = self->tex [tile]; 1926 maptex tex = self->tex [tile];
1875 int px, py; 1927 int px = (x + 1) * T - tex.w;
1928 int py = (y + 1) * T - tex.h;
1876 1929
1877 if (key.texname != tex.name) 1930 if (key.texname != tex.name)
1878 { 1931 {
1879 if (!tex.name) 1932 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 1933 tex = self->tex [2]; /* missing, replace by noface */
1881 1934
1882 key.texname = tex.name; 1935 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 1936 arr = rc_array (rc, &key);
1884 } 1937 }
1885 1938
1886 px = (x + 1) * T - tex.w; 1939 if (expect_false (cell->player == player) && expect_false (z == 2))
1887 py = (y + 1) * T - tex.h; 1940 {
1941 pl_x = px;
1942 pl_y = py;
1943 pl_tex = tex;
1944 continue;
1945 }
1888 1946
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1948 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1949 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1950 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893 1951
1894 if (cell->flags && z == 2) 1952 if (expect_false (cell->flags) && expect_false (z == 2))
1895 { 1953 {
1896 // overlays such as the speech bubble, probably more to come 1954 // overlays such as the speech bubble, probably more to come
1897 if (cell->flags & 1) 1955 if (cell->flags & 1)
1898 { 1956 {
1899 maptex tex = self->tex [1]; 1957 maptex tex = self->tex [1];
… …
2036 glDisable (GL_TEXTURE_2D); 2094 glDisable (GL_TEXTURE_2D);
2037 key.texname = -1; 2095 key.texname = -1;
2038 } 2096 }
2039 2097
2040 hv_clear (smooth); 2098 hv_clear (smooth);
2099 }
2100
2101 if (pl_tex.name)
2102 {
2103 maptex tex = pl_tex;
2104 int px = pl_x + pdx;
2105 int py = pl_y + pdy;
2106
2107 key.texname = tex.name;
2108 arr = rc_array (rc, &key);
2109
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2111 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2112 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2114
2115 rc_draw (rc);
2041 } 2116 }
2042 2117
2043 glDisable (GL_BLEND); 2118 glDisable (GL_BLEND);
2044 rc_free (rc); 2119 rc_free (rc);
2045 2120
… …
2282 else 2357 else
2283 *data++ = 0; 2358 *data++ = 0;
2284 } 2359 }
2285 } 2360 }
2286 2361
2362 /* if size is w*h + 5 then no data has been found */
2363 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2364 {
2287 SvPOK_only (data_sv); 2365 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2366 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2367 }
2368
2289 RETVAL = data_sv; 2369 RETVAL = data_sv;
2290} 2370}
2291 OUTPUT: 2371 OUTPUT:
2292 RETVAL 2372 RETVAL
2293 2373
2294void 2374void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2375set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2376 PPCODE:
2297{ 2377{
2298 int x, y, z; 2378 int x, y, z;
2299 int w, h; 2379 int w, h;
2300 int x1, y1; 2380 int x1, y1;
2381 STRLEN len;
2382 uint8_t *data, *end;
2383
2384 len = SvLEN (data_sv);
2385 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2386 data = SvPVbyte_nolen (data_sv);
2387 end = data + len + 8;
2388
2389 if (len < 5)
2390 XSRETURN_EMPTY;
2301 2391
2302 if (*data++ != 0) 2392 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2393 XSRETURN_EMPTY; /* version mismatch */
2304 2394
2305 w = *data++ << 8; w |= *data++; 2395 w = *data++ << 8; w |= *data++;
… …
2320 { 2410 {
2321 maprow *row = map_get_row (self, y); 2411 maprow *row = map_get_row (self, y);
2322 2412
2323 for (x = x0; x < x1; x++) 2413 for (x = x0; x < x1; x++)
2324 { 2414 {
2415 uint8_t flags;
2416
2417 if (data + 7 >= end)
2418 XSRETURN_EMPTY;
2419
2325 uint8_t flags = *data++; 2420 flags = *data++;
2326 2421
2327 if (flags) 2422 if (flags)
2328 { 2423 {
2329 mapcell *cell = row_get_cell (row, x); 2424 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2425 tileid tile[3] = { 0, 0, 0 };
… …
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2428 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2429 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2430
2336 if (cell->darkness == 0) 2431 if (cell->darkness == 0)
2337 { 2432 {
2338 cell->darkness = 0; 2433 /*cell->darkness = 0;*/
2434 EXTEND (SP, 3);
2339 2435
2340 for (z = 0; z <= 2; z++) 2436 for (z = 0; z <= 2; z++)
2341 { 2437 {
2342 tileid t = tile [z]; 2438 tileid t = tile [z];
2343 2439
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2440 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2441 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2442 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2443 need_texid (self, t);
2348 } 2444 }
2349 2445
2350 cell->tile [z] = t; 2446 cell->tile [z] = t;
2351 } 2447 }

Diff Legend

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