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.252 by root, Fri Dec 28 17:30:33 2007 UTC vs.
Revision 1.260 by root, Tue May 20 20:29:47 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>
… …
70#define MAP_EXTEND_X 32 74#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 75#define MAP_EXTEND_Y 512
72 76
73#define MIN_FONT_HEIGHT 10 77#define MIN_FONT_HEIGHT 10
74 78
79/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
75#if 0 82#if 0
76# define PARACHUTE SDL_INIT_NOPARACHUTE 83# define PARACHUTE SDL_INIT_NOPARACHUTE
77#else 84#else
78# define PARACHUTE 0 85# define PARACHUTE 0
79#endif 86#endif
… …
178 185
179static void 186static void
180layout_update_font (DC__Layout self) 187layout_update_font (DC__Layout self)
181{ 188{
182 /* use a random scale factor to account for unknown descenders, 0.8 works 189 /* use a random scale factor to account for unknown descenders, 0.8 works
183 * reasonably well with bitstream vera 190 * reasonably well with dejavu/bistream fonts
184 */ 191 */
185 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
186 193
187 pango_font_description_set_absolute_size (font, 194 pango_font_description_set_absolute_size (font,
188 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
666 CODE: 673 CODE:
667{ 674{
668 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 676 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); 677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 678 /*pango_context_set_font_description (opengl_context, default_font);*/
679#if PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 680 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 682#endif
675} 683}
676 684
… …
763SDL_GetKeyName (int sym) 771SDL_GetKeyName (int sym)
764 772
765int 773int
766SDL_GetAppState () 774SDL_GetAppState ()
767 775
776int
777SDL_GetModState ()
778
768void 779void
769poll_events () 780poll_events ()
770 PPCODE: 781 PPCODE:
771{ 782{
772 SDL_Event ev; 783 SDL_Event ev;
… …
781 { 792 {
782 case SDL_KEYDOWN: 793 case SDL_KEYDOWN:
783 case SDL_KEYUP: 794 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 797 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 */ 798 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); 799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 800 break;
790 801
791 case SDL_ACTIVEEVENT: 802 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
810 x = ev.motion.x; 821 x = ev.motion.x;
811 y = ev.motion.y; 822 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 824 }
814 825
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 827 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 828 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 829 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 830 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 831 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 832 }
822 break; 833 break;
823 834
824 case SDL_MOUSEBUTTONDOWN: 835 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 836 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 837 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 838
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 839 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 840 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 841 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 842 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
905 } 916 }
906 } 917 }
907#endif 918#endif
908} 919}
909 920
910void 921int
911add_font (char *file) 922add_font (char *file)
912 CODE: 923 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT:
926 RETVAL
914 927
915void 928void
916load_image_inline (SV *image_) 929load_image_inline (SV *image_)
917 ALIAS: 930 ALIAS:
918 load_image_file = 1 931 load_image_file = 1
… …
1328 PPCODE: 1341 PPCODE:
1329{ 1342{
1330 int line, x; 1343 int line, x;
1331 1344
1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1345 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1346#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1347 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1348 --line;
1336#endif 1349#endif
1337 EXTEND (SP, 2); 1350 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1351 PUSHs (sv_2mortal (newSViv (line)));
… …
2279 else 2292 else
2280 *data++ = 0; 2293 *data++ = 0;
2281 } 2294 }
2282 } 2295 }
2283 2296
2297 /* if size is w*h + 5 then no data has been found */
2298 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2299 {
2284 SvPOK_only (data_sv); 2300 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2301 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2302 }
2303
2286 RETVAL = data_sv; 2304 RETVAL = data_sv;
2287} 2305}
2288 OUTPUT: 2306 OUTPUT:
2289 RETVAL 2307 RETVAL
2290 2308
2291void 2309void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2310set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2311 PPCODE:
2294{ 2312{
2295 int x, y, z; 2313 int x, y, z;
2296 int w, h; 2314 int w, h;
2297 int x1, y1; 2315 int x1, y1;
2316 STRLEN len;
2317 uint8_t *data, *end;
2318
2319 len = SvLEN (data_sv);
2320 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2321 data = SvPVbyte_nolen (data_sv);
2322 end = data + len + 8;
2323
2324 if (len < 5)
2325 XSRETURN_EMPTY;
2298 2326
2299 if (*data++ != 0) 2327 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2328 XSRETURN_EMPTY; /* version mismatch */
2301 2329
2302 w = *data++ << 8; w |= *data++; 2330 w = *data++ << 8; w |= *data++;
… …
2317 { 2345 {
2318 maprow *row = map_get_row (self, y); 2346 maprow *row = map_get_row (self, y);
2319 2347
2320 for (x = x0; x < x1; x++) 2348 for (x = x0; x < x1; x++)
2321 { 2349 {
2350 uint8_t flags;
2351
2352 if (data + 7 >= end)
2353 XSRETURN_EMPTY;
2354
2322 uint8_t flags = *data++; 2355 flags = *data++;
2323 2356
2324 if (flags) 2357 if (flags)
2325 { 2358 {
2326 mapcell *cell = row_get_cell (row, x); 2359 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2360 tileid tile[3] = { 0, 0, 0 };
… …
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2363 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2364 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2365
2333 if (cell->darkness == 0) 2366 if (cell->darkness == 0)
2334 { 2367 {
2335 cell->darkness = 0; 2368 /*cell->darkness = 0;*/
2369 EXTEND (SP, 3);
2336 2370
2337 for (z = 0; z <= 2; z++) 2371 for (z = 0; z <= 2; z++)
2338 { 2372 {
2339 tileid t = tile [z]; 2373 tileid t = tile [z];
2340 2374
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2375 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2376 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2377 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2378 need_texid (self, t);
2345 } 2379 }
2346 2380
2347 cell->tile [z] = t; 2381 cell->tile [z] = t;
2348 } 2382 }

Diff Legend

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