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.250 by root, Fri Dec 28 16:09:03 2007 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 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
71#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
72 85
73#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
74 87
88/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90
75#if 0 91#if 1
76# define PARACHUTE SDL_INIT_NOPARACHUTE 92# define PARACHUTE SDL_INIT_NOPARACHUTE
77#else 93#else
78# define PARACHUTE 0 94# define PARACHUTE 0
79#endif 95#endif
80 96
… …
178 194
179static void 195static void
180layout_update_font (DC__Layout self) 196layout_update_font (DC__Layout self)
181{ 197{
182 /* 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
183 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
184 */ 200 */
185 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
186 202
187 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
188 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
666 CODE: 682 CODE:
667{ 683{
668 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
669 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);
670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 686 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#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)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 689 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 691#endif
675} 692}
676 693
… …
763SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
764 781
765int 782int
766SDL_GetAppState () 783SDL_GetAppState ()
767 784
785int
786SDL_GetModState ()
787
768void 788void
769poll_events () 789poll_events ()
770 PPCODE: 790 PPCODE:
771{ 791{
772 SDL_Event ev; 792 SDL_Event ev;
… …
781 { 801 {
782 case SDL_KEYDOWN: 802 case SDL_KEYDOWN:
783 case SDL_KEYUP: 803 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 806 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
787 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 807 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
788 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 809 break;
790 810
791 case SDL_ACTIVEEVENT: 811 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
810 x = ev.motion.x; 830 x = ev.motion.x;
811 y = ev.motion.y; 831 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 833 }
814 834
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 836 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 837 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 838 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 839 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 840 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 841 }
822 break; 842 break;
823 843
824 case SDL_MOUSEBUTTONDOWN: 844 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 845 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 846 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 847
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 848 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 849 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 850 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 851 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
905 } 925 }
906 } 926 }
907#endif 927#endif
908} 928}
909 929
910void 930int
911add_font (char *file) 931add_font (char *file)
912 CODE: 932 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
914 936
915void 937void
916load_image_inline (SV *image_) 938load_image_inline (SV *image_)
917 ALIAS: 939 ALIAS:
918 load_image_file = 1 940 load_image_file = 1
… …
1312 1334
1313void 1335void
1314cursor_pos (DC::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1315 PPCODE: 1337 PPCODE:
1316{ 1338{
1317 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1318 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319 1341
1320 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1321 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1324} 1346}
1325 1347
1326void 1348void
1327index_to_line_x (DC::Layout self, int index, int trailing = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1328 PPCODE: 1350 PPCODE:
1329{ 1351{
1330 int line, x; 1352 int line, x;
1331 1353
1332 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);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1355#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1357 --line;
1336#endif 1358#endif
1337 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1360 PUSHs (sv_2mortal (newSViv (line)));
… …
1674 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1675 1697
1676 do 1698 do
1677 { 1699 {
1678 ext = *data++; 1700 ext = *data++;
1679 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1680 1702
1681 if (cmd < 4) 1703 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1683 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1684 { 1706 {
… …
1687 } 1709 }
1688 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1691 { 1713 {
1692 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1693 ; // 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);
1694 1718
1695 data += *data + 1; 1719 data += *data + 1;
1696 } 1720 }
1697 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1698 cell->flags = *data++; 1722 cell->flags = *data++;
… …
1790} 1814}
1791 OUTPUT: 1815 OUTPUT:
1792 RETVAL 1816 RETVAL
1793 1817
1794void 1818void
1795draw (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)
1796 CODE: 1820 CODE:
1797{ 1821{
1798 int x, y, z; 1822 int x, y, z;
1799 1823
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 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
1802 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)
1803 smooth_key skey; 1827 smooth_key skey;
1804 1828 int pl_x, pl_y;
1829 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 1830 rc_t *rc = rc_alloc ();
1806 rc_key_t key; 1831 rc_key_t key;
1807 rc_array_t *arr; 1832 rc_array_t *arr;
1833
1834 pl_tex.name = 0;
1808 1835
1809 // thats current max. sorry. 1836 // thats current max. sorry.
1810 if (sw > 255) sw = 255; 1837 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 1838 if (sh > 255) sh = 255;
1812 1839
… …
1867 tileid tile = cell->tile [z]; 1894 tileid tile = cell->tile [z];
1868 1895
1869 if (tile) 1896 if (tile)
1870 { 1897 {
1871 maptex tex = self->tex [tile]; 1898 maptex tex = self->tex [tile];
1872 int px, py; 1899 int px = (x + 1) * T - tex.w;
1900 int py = (y + 1) * T - tex.h;
1873 1901
1874 if (key.texname != tex.name) 1902 if (key.texname != tex.name)
1875 { 1903 {
1876 if (!tex.name) 1904 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 1905 tex = self->tex [2]; /* missing, replace by noface */
1878 1906
1879 key.texname = tex.name; 1907 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 1908 arr = rc_array (rc, &key);
1881 } 1909 }
1882 1910
1883 px = (x + 1) * T - tex.w; 1911 if (expect_false (cell->player == player) && expect_false (z == 2))
1884 py = (y + 1) * T - tex.h; 1912 {
1913 pl_x = px;
1914 pl_y = py;
1915 pl_tex = tex;
1916 continue;
1917 }
1885 1918
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1920 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1888 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1921 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1889 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1922 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1890 1923
1891 if (cell->flags && z == 2) 1924 if (expect_false (cell->flags) && expect_false (z == 2))
1892 { 1925 {
1893 // overlays such as the speech bubble, probably more to come 1926 // overlays such as the speech bubble, probably more to come
1894 if (cell->flags & 1) 1927 if (cell->flags & 1)
1895 { 1928 {
1896 maptex tex = self->tex [1]; 1929 maptex tex = self->tex [1];
… …
2033 glDisable (GL_TEXTURE_2D); 2066 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1; 2067 key.texname = -1;
2035 } 2068 }
2036 2069
2037 hv_clear (smooth); 2070 hv_clear (smooth);
2071 }
2072
2073 if (pl_tex.name)
2074 {
2075 maptex tex = pl_tex;
2076 int px = pl_x + pdx;
2077 int py = pl_y + pdy;
2078
2079 key.texname = tex.name;
2080 arr = rc_array (rc, &key);
2081
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2083 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2084 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2086
2087 rc_draw (rc);
2038 } 2088 }
2039 2089
2040 glDisable (GL_BLEND); 2090 glDisable (GL_BLEND);
2041 rc_free (rc); 2091 rc_free (rc);
2042 2092
… …
2279 else 2329 else
2280 *data++ = 0; 2330 *data++ = 0;
2281 } 2331 }
2282 } 2332 }
2283 2333
2334 /* if size is w*h + 5 then no data has been found */
2335 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2336 {
2284 SvPOK_only (data_sv); 2337 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2338 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2339 }
2340
2286 RETVAL = data_sv; 2341 RETVAL = data_sv;
2287} 2342}
2288 OUTPUT: 2343 OUTPUT:
2289 RETVAL 2344 RETVAL
2290 2345
2291void 2346void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2347set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2348 PPCODE:
2294{ 2349{
2295 int x, y, z; 2350 int x, y, z;
2296 int w, h; 2351 int w, h;
2297 int x1, y1; 2352 int x1, y1;
2353 STRLEN len;
2354 uint8_t *data, *end;
2355
2356 len = SvLEN (data_sv);
2357 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2358 data = SvPVbyte_nolen (data_sv);
2359 end = data + len + 8;
2360
2361 if (len < 5)
2362 XSRETURN_EMPTY;
2298 2363
2299 if (*data++ != 0) 2364 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2365 XSRETURN_EMPTY; /* version mismatch */
2301 2366
2302 w = *data++ << 8; w |= *data++; 2367 w = *data++ << 8; w |= *data++;
… …
2317 { 2382 {
2318 maprow *row = map_get_row (self, y); 2383 maprow *row = map_get_row (self, y);
2319 2384
2320 for (x = x0; x < x1; x++) 2385 for (x = x0; x < x1; x++)
2321 { 2386 {
2387 uint8_t flags;
2388
2389 if (data + 7 >= end)
2390 XSRETURN_EMPTY;
2391
2322 uint8_t flags = *data++; 2392 flags = *data++;
2323 2393
2324 if (flags) 2394 if (flags)
2325 { 2395 {
2326 mapcell *cell = row_get_cell (row, x); 2396 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2397 tileid tile[3] = { 0, 0, 0 };
… …
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2400 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2401 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2402
2333 if (cell->darkness == 0) 2403 if (cell->darkness == 0)
2334 { 2404 {
2335 cell->darkness = 0; 2405 /*cell->darkness = 0;*/
2406 EXTEND (SP, 3);
2336 2407
2337 for (z = 0; z <= 2; z++) 2408 for (z = 0; z <= 2; z++)
2338 { 2409 {
2339 tileid t = tile [z]; 2410 tileid t = tile [z];
2340 2411
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2412 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2413 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2414 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2415 need_texid (self, t);
2345 } 2416 }
2346 2417
2347 cell->tile [z] = t; 2418 cell->tile [z] = t;
2348 } 2419 }

Diff Legend

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