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.261 by root, Sun Jul 13 12:17:00 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
… …
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 90
78#if 0 91#if 1
79# define PARACHUTE SDL_INIT_NOPARACHUTE 92# define PARACHUTE SDL_INIT_NOPARACHUTE
80#else 93#else
81# define PARACHUTE 0 94# define PARACHUTE 0
82#endif 95#endif
83 96
… …
181 194
182static void 195static void
183layout_update_font (DC__Layout self) 196layout_update_font (DC__Layout self)
184{ 197{
185 /* use a random scale factor to account for unknown descenders, 0.8 works 198 /* use a random scale factor to account for unknown descenders, 0.8 works
186 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
187 */ 200 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
189 202
190 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
669 CODE: 682 CODE:
670{ 683{
671 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
672 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 685 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); 686 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 687 /*pango_context_set_font_description (opengl_context, default_font);*/
688#if PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 689 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 691#endif
678} 692}
679 693
… …
766SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
767 781
768int 782int
769SDL_GetAppState () 783SDL_GetAppState ()
770 784
785int
786SDL_GetModState ()
787
771void 788void
772poll_events () 789poll_events ()
773 PPCODE: 790 PPCODE:
774{ 791{
775 SDL_Event ev; 792 SDL_Event ev;
… …
908 } 925 }
909 } 926 }
910#endif 927#endif
911} 928}
912 929
913void 930int
914add_font (char *file) 931add_font (char *file)
915 CODE: 932 CODE:
916 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
917 936
918void 937void
919load_image_inline (SV *image_) 938load_image_inline (SV *image_)
920 ALIAS: 939 ALIAS:
921 load_image_file = 1 940 load_image_file = 1
… …
1331 PPCODE: 1350 PPCODE:
1332{ 1351{
1333 int line, x; 1352 int line, x;
1334 1353
1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1354 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1355#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1357 --line;
1339#endif 1358#endif
1340 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1360 PUSHs (sv_2mortal (newSViv (line)));
… …
1677 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1678 1697
1679 do 1698 do
1680 { 1699 {
1681 ext = *data++; 1700 ext = *data++;
1682 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1683 1702
1684 if (cmd < 4) 1703 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1686 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1687 { 1706 {
… …
1690 } 1709 }
1691 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1694 { 1713 {
1695 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1696 ; // decode player count 1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1697 1718
1698 data += *data + 1; 1719 data += *data + 1;
1699 } 1720 }
1700 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1701 cell->flags = *data++; 1722 cell->flags = *data++;
… …
1793} 1814}
1794 OUTPUT: 1815 OUTPUT:
1795 RETVAL 1816 RETVAL
1796 1817
1797void 1818void
1798draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1799 CODE: 1820 CODE:
1800{ 1821{
1801 int x, y, z; 1822 int x, y, z;
1802 1823
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1825 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) 1826 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1806 smooth_key skey; 1827 smooth_key skey;
1828 int pl_x, pl_y;
1829 maptex pl_tex;
1830
1831 pl_tex.name = 0;
1807 1832
1808 rc_t *rc = rc_alloc (); 1833 rc_t *rc = rc_alloc ();
1809 rc_key_t key; 1834 rc_key_t key;
1810 rc_array_t *arr; 1835 rc_array_t *arr;
1811 1836
… …
1870 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1871 1896
1872 if (tile) 1897 if (tile)
1873 { 1898 {
1874 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1875 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1876 1902
1877 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1878 { 1904 {
1879 if (!tex.name) 1905 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1881 1907
1882 key.texname = tex.name; 1908 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1884 } 1910 }
1885 1911
1886 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1887 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1888 1919
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1921 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); 1922 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); 1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893 1924
1894 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1895 { 1926 {
1896 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1897 if (cell->flags & 1) 1928 if (cell->flags & 1)
1898 { 1929 {
1899 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
… …
2036 glDisable (GL_TEXTURE_2D); 2067 glDisable (GL_TEXTURE_2D);
2037 key.texname = -1; 2068 key.texname = -1;
2038 } 2069 }
2039 2070
2040 hv_clear (smooth); 2071 hv_clear (smooth);
2072 }
2073
2074 if (pl_tex.name)
2075 {
2076 maptex tex = pl_tex;
2077 int px = pl_x + pdx;
2078 int py = pl_y + pdy;
2079
2080 key.texname = tex.name;
2081 arr = rc_array (rc, &key);
2082
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087
2088 rc_draw (rc);
2041 } 2089 }
2042 2090
2043 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2044 rc_free (rc); 2092 rc_free (rc);
2045 2093
… …
2282 else 2330 else
2283 *data++ = 0; 2331 *data++ = 0;
2284 } 2332 }
2285 } 2333 }
2286 2334
2335 /* if size is w*h + 5 then no data has been found */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 {
2287 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2289 RETVAL = data_sv; 2342 RETVAL = data_sv;
2290} 2343}
2291 OUTPUT: 2344 OUTPUT:
2292 RETVAL 2345 RETVAL
2293 2346
2294void 2347void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2349 PPCODE:
2297{ 2350{
2298 int x, y, z; 2351 int x, y, z;
2299 int w, h; 2352 int w, h;
2300 int x1, y1; 2353 int x1, y1;
2354 STRLEN len;
2355 uint8_t *data, *end;
2356
2357 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv);
2360 end = data + len + 8;
2361
2362 if (len < 5)
2363 XSRETURN_EMPTY;
2301 2364
2302 if (*data++ != 0) 2365 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2304 2367
2305 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
… …
2320 { 2383 {
2321 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2322 2385
2323 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2324 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2325 uint8_t flags = *data++; 2393 flags = *data++;
2326 2394
2327 if (flags) 2395 if (flags)
2328 { 2396 {
2329 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
… …
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2403
2336 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2337 { 2405 {
2338 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2339 2408
2340 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2341 { 2410 {
2342 tileid t = tile [z]; 2411 tileid t = tile [z];
2343 2412
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2414 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2416 need_texid (self, t);
2348 } 2417 }
2349 2418
2350 cell->tile [z] = t; 2419 cell->tile [z] = t;
2351 } 2420 }

Diff Legend

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