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.246 by root, Fri Dec 28 15:06:02 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#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
56# include <inttypes.h> 67# include <inttypes.h>
57#endif 68#endif
58 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 80
61#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
62 82
63#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
65 85
66#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
67 87
88/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90
68#if 0 91#if 1
69# define PARACHUTE SDL_INIT_NOPARACHUTE 92# define PARACHUTE SDL_INIT_NOPARACHUTE
70#else 93#else
71# define PARACHUTE 0 94# define PARACHUTE 0
72#endif 95#endif
73 96
… …
171 194
172static void 195static void
173layout_update_font (DC__Layout self) 196layout_update_font (DC__Layout self)
174{ 197{
175 /* 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
176 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
177 */ 200 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
179 202
180 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
659 CODE: 682 CODE:
660{ 683{
661 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 686 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
687 /*pango_context_set_font_description (opengl_context, default_font);*/
688#if PANGO_VERSION_CHECK (1, 15, 2)
689 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif
664} 692}
665 693
666char * 694char *
667SDL_GetError () 695SDL_GetError ()
668 696
… …
752SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
753 781
754int 782int
755SDL_GetAppState () 783SDL_GetAppState ()
756 784
785int
786SDL_GetModState ()
787
757void 788void
758poll_events () 789poll_events ()
759 PPCODE: 790 PPCODE:
760{ 791{
761 SDL_Event ev; 792 SDL_Event ev;
… …
770 { 801 {
771 case SDL_KEYDOWN: 802 case SDL_KEYDOWN:
772 case SDL_KEYUP: 803 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 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);
776 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 */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 809 break;
779 810
780 case SDL_ACTIVEEVENT: 811 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 830 x = ev.motion.x;
800 y = ev.motion.y; 831 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 833 }
803 834
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 836 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 837 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 838 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 839 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 840 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 841 }
811 break; 842 break;
812 843
813 case SDL_MOUSEBUTTONDOWN: 844 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 845 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 846 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 847
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 848 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 849 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 850 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 851 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 925 }
895 } 926 }
896#endif 927#endif
897} 928}
898 929
899void 930int
900add_font (char *file) 931add_font (char *file)
901 CODE: 932 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
903 936
904void 937void
905load_image_inline (SV *image_) 938load_image_inline (SV *image_)
906 ALIAS: 939 ALIAS:
907 load_image_file = 1 940 load_image_file = 1
… …
1165{ 1198{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1199 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1200
1168 do 1201 do
1169 { 1202 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1203 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1204
1172 if (run && shape_attr_p (run)) 1205 if (run && shape_attr_p (run))
1173 { 1206 {
1174 PangoRectangle extents; 1207 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1208 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1312int
1280descent (DC::Layout self) 1313descent (DC::Layout self)
1281 CODE: 1314 CODE:
1282{ 1315{
1283 PangoRectangle rect; 1316 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1317 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1318 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1319 RETVAL = PANGO_DESCENT (rect);
1287} 1320}
1288 OUTPUT: 1321 OUTPUT:
1289 RETVAL 1322 RETVAL
… …
1301 1334
1302void 1335void
1303cursor_pos (DC::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1337 PPCODE:
1305{ 1338{
1306 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1341
1309 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1346}
1314 1347
1315void 1348void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1350 PPCODE:
1318{ 1351{
1319 int line, x; 1352 int line, x;
1320 1353
1321 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);
1322#if !PANGO_VERSION_CHECK (1, 17. 3) 1355#if !PANGO_VERSION_CHECK (1, 17, 3)
1323 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1324 --line; 1357 --line;
1325#endif 1358#endif
1326 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1327 PUSHs (sv_2mortal (newSViv (line))); 1360 PUSHs (sv_2mortal (newSViv (line)));
… …
1336 int index, trailing; 1369 int index, trailing;
1337 1370
1338 if (line < 0) 1371 if (line < 0)
1339 XSRETURN_EMPTY; 1372 XSRETURN_EMPTY;
1340 1373
1341 if (!(lp = pango_layout_get_line (self->pl, line))) 1374 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342 XSRETURN_EMPTY; /* do better */ 1375 XSRETURN_EMPTY; /* do better */
1343 1376
1344 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1377 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345 1378
1346 EXTEND (SP, 2); 1379 EXTEND (SP, 2);
… …
1663 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1664 1697
1665 do 1698 do
1666 { 1699 {
1667 ext = *data++; 1700 ext = *data++;
1668 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1669 1702
1670 if (cmd < 4) 1703 if (cmd < 4)
1671 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1672 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1673 { 1706 {
… …
1676 } 1709 }
1677 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1678 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1679 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1680 { 1713 {
1681 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1682 ; // 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);
1683 1718
1684 data += *data + 1; 1719 data += *data + 1;
1685 } 1720 }
1686 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1687 cell->flags = *data++; 1722 cell->flags = *data++;
… …
1779} 1814}
1780 OUTPUT: 1815 OUTPUT:
1781 RETVAL 1816 RETVAL
1782 1817
1783void 1818void
1784draw (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)
1785 CODE: 1820 CODE:
1786{ 1821{
1787 int x, y, z; 1822 int x, y, z;
1788 1823
1789 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1790 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
1791 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)
1792 smooth_key skey; 1827 smooth_key skey;
1828 int pl_x, pl_y;
1829 maptex pl_tex;
1830
1831 pl_tex.name = 0;
1793 1832
1794 rc_t *rc = rc_alloc (); 1833 rc_t *rc = rc_alloc ();
1795 rc_key_t key; 1834 rc_key_t key;
1796 rc_array_t *arr; 1835 rc_array_t *arr;
1797 1836
… …
1856 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1857 1896
1858 if (tile) 1897 if (tile)
1859 { 1898 {
1860 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1861 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1862 1902
1863 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1864 { 1904 {
1865 if (!tex.name) 1905 if (!tex.name)
1866 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1867 1907
1868 key.texname = tex.name; 1908 key.texname = tex.name;
1869 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1870 } 1910 }
1871 1911
1872 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1873 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1874 1919
1875 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1876 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);
1877 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);
1878 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);
1879 1924
1880 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1881 { 1926 {
1882 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1883 if (cell->flags & 1) 1928 if (cell->flags & 1)
1884 { 1929 {
1885 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
… …
2022 glDisable (GL_TEXTURE_2D); 2067 glDisable (GL_TEXTURE_2D);
2023 key.texname = -1; 2068 key.texname = -1;
2024 } 2069 }
2025 2070
2026 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);
2027 } 2089 }
2028 2090
2029 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2030 rc_free (rc); 2092 rc_free (rc);
2031 2093
… …
2268 else 2330 else
2269 *data++ = 0; 2331 *data++ = 0;
2270 } 2332 }
2271 } 2333 }
2272 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 {
2273 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2274 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2275 RETVAL = data_sv; 2342 RETVAL = data_sv;
2276} 2343}
2277 OUTPUT: 2344 OUTPUT:
2278 RETVAL 2345 RETVAL
2279 2346
2280void 2347void
2281set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282 PPCODE: 2349 PPCODE:
2283{ 2350{
2284 int x, y, z; 2351 int x, y, z;
2285 int w, h; 2352 int w, h;
2286 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;
2287 2364
2288 if (*data++ != 0) 2365 if (*data++ != 0)
2289 XSRETURN_EMPTY; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2290 2367
2291 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
… …
2306 { 2383 {
2307 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2308 2385
2309 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2310 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2311 uint8_t flags = *data++; 2393 flags = *data++;
2312 2394
2313 if (flags) 2395 if (flags)
2314 { 2396 {
2315 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2316 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
… …
2319 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2320 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2321 2403
2322 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2323 { 2405 {
2324 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2325 2408
2326 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2327 { 2410 {
2328 tileid t = tile [z]; 2411 tileid t = tile [z];
2329 2412
2330 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2331 { 2414 {
2332 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2333 need_texid (self, t); 2416 need_texid (self, t);
2334 } 2417 }
2335 2418
2336 cell->tile [z] = t; 2419 cell->tile [z] = t;
2337 } 2420 }

Diff Legend

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