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.242 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC

… …
39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
49#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
50 66
51#ifndef _WIN32 67#ifndef _WIN32
52# include <sys/types.h> 68# include <sys/types.h>
53# include <sys/socket.h> 69# include <sys/socket.h>
54# include <netinet/in.h> 70# include <netinet/in.h>
55# include <netinet/tcp.h> 71# include <netinet/tcp.h>
56# include <inttypes.h> 72# include <inttypes.h>
57#endif 73#endif
58 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 85
61#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 95
71# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
72#endif
73 97
74static AV *texture_av; 98static AV *texture_av;
75 99
76static struct 100static struct
77{ 101{
… …
171 195
172static void 196static void
173layout_update_font (DC__Layout self) 197layout_update_font (DC__Layout self)
174{ 198{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
177 */ 201 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
179 203
180 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
350 self->oy = 0; 374 self->oy = 0;
351 self->row = 0; 375 self->row = 0;
352 self->rows = 0; 376 self->rows = 0;
353} 377}
354 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
355static void 389static void
356map_blank (DC__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 391{
358 int x, y; 392 int x, y;
359 maprow *row; 393 maprow *row;
… …
373 if (x >= row->c1) 407 if (x >= row->c1)
374 break; 408 break;
375 409
376 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
377 411
378 cell->darkness = 0; 412 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 413 }
383 } 414 }
384} 415}
385 416
386typedef struct { 417typedef struct {
… …
497 if (!svp || !SvTRUE (*svp)) 528 if (!svp || !SvTRUE (*svp))
498 return 0; 529 return 0;
499 530
500 return 1; 531 return 1;
501} 532}
533
534/* process keyboard modifiers */
535static int
536mod_munge (int mod)
537{
538 mod &= MOD_MASK;
539
540 if (mod & (KMOD_META | KMOD_ALT))
541 mod |= KMOD_LRAM;
542
543 return mod;
544}
545
546static void
547deliantra_main ()
548{
549 char *argv[] = { 0 };
550 call_argv ("::main", G_DISCARD | G_VOID, argv);
551}
552
553#ifdef __MACOSX__
554 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main()
556 * on OS X, so... we provide one and call the original main(), which,
557 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
558 * and which calls our main (== SDL_main) back.
559 */
560 extern C_LINKAGE int
561 main (int argc, char *argv[])
562 {
563 deliantra_main ();
564 }
565
566 #undef main
567
568 extern C_LINKAGE int main (int argc, char *argv[]);
569
570 static void
571 SDL_braino (void)
572 {
573 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv);
575 }
576#else
577 static void
578 SDL_braino (void)
579 {
580 deliantra_main ();
581 }
582#endif
502 583
503MODULE = Deliantra::Client PACKAGE = DC 584MODULE = Deliantra::Client PACKAGE = DC
504 585
505PROTOTYPES: ENABLE 586PROTOTYPES: ENABLE
506 587
… …
535 const_iv (SDL_USEREVENT), 616 const_iv (SDL_USEREVENT),
536 617
537 const_iv (SDL_APPINPUTFOCUS), 618 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 619 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 620 const_iv (SDL_APPACTIVE),
621
622
623 const_iv (SDLK_UNKNOWN),
624 const_iv (SDLK_FIRST),
625 const_iv (SDLK_BACKSPACE),
626 const_iv (SDLK_TAB),
627 const_iv (SDLK_CLEAR),
628 const_iv (SDLK_RETURN),
629 const_iv (SDLK_PAUSE),
630 const_iv (SDLK_ESCAPE),
631 const_iv (SDLK_SPACE),
632 const_iv (SDLK_EXCLAIM),
633 const_iv (SDLK_QUOTEDBL),
634 const_iv (SDLK_HASH),
635 const_iv (SDLK_DOLLAR),
636 const_iv (SDLK_AMPERSAND),
637 const_iv (SDLK_QUOTE),
638 const_iv (SDLK_LEFTPAREN),
639 const_iv (SDLK_RIGHTPAREN),
640 const_iv (SDLK_ASTERISK),
641 const_iv (SDLK_PLUS),
642 const_iv (SDLK_COMMA),
643 const_iv (SDLK_MINUS),
644 const_iv (SDLK_PERIOD),
645 const_iv (SDLK_SLASH),
646 const_iv (SDLK_0),
647 const_iv (SDLK_1),
648 const_iv (SDLK_2),
649 const_iv (SDLK_3),
650 const_iv (SDLK_4),
651 const_iv (SDLK_5),
652 const_iv (SDLK_6),
653 const_iv (SDLK_7),
654 const_iv (SDLK_8),
655 const_iv (SDLK_9),
656 const_iv (SDLK_COLON),
657 const_iv (SDLK_SEMICOLON),
658 const_iv (SDLK_LESS),
659 const_iv (SDLK_EQUALS),
660 const_iv (SDLK_GREATER),
661 const_iv (SDLK_QUESTION),
662 const_iv (SDLK_AT),
663
664 const_iv (SDLK_LEFTBRACKET),
665 const_iv (SDLK_BACKSLASH),
666 const_iv (SDLK_RIGHTBRACKET),
667 const_iv (SDLK_CARET),
668 const_iv (SDLK_UNDERSCORE),
669 const_iv (SDLK_BACKQUOTE),
670 const_iv (SDLK_DELETE),
540 671
541 const_iv (SDLK_FIRST), 672 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 673 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 674 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 675 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 751 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 752 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 753 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 754 const_iv (KMOD_MODE),
624 755
756 const_iv (KMOD_LRAM),
757
625 const_iv (MIX_DEFAULT_FORMAT), 758 const_iv (MIX_DEFAULT_FORMAT),
759
760 const_iv (SDL_INIT_TIMER),
761 const_iv (SDL_INIT_AUDIO),
762 const_iv (SDL_INIT_VIDEO),
763 const_iv (SDL_INIT_CDROM),
764 const_iv (SDL_INIT_JOYSTICK),
765 const_iv (SDL_INIT_EVERYTHING),
766 const_iv (SDL_INIT_NOPARACHUTE),
767 const_iv (SDL_INIT_EVENTTHREAD),
768
769 const_iv (SDL_GL_RED_SIZE),
770 const_iv (SDL_GL_GREEN_SIZE),
771 const_iv (SDL_GL_BLUE_SIZE),
772 const_iv (SDL_GL_ALPHA_SIZE),
773 const_iv (SDL_GL_DOUBLEBUFFER),
774 const_iv (SDL_GL_BUFFER_SIZE),
775 const_iv (SDL_GL_DEPTH_SIZE),
776 const_iv (SDL_GL_STENCIL_SIZE),
777 const_iv (SDL_GL_ACCUM_RED_SIZE),
778 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
779 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
780 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
781 const_iv (SDL_GL_STEREO),
782 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
783 const_iv (SDL_GL_MULTISAMPLESAMPLES),
784 const_iv (SDL_GL_ACCELERATED_VISUAL),
785 const_iv (SDL_GL_SWAP_CONTROL),
786
787 const_iv (FOW_DARKNESS)
626# undef const_iv 788# undef const_iv
627 }; 789 };
628 790
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 821 CODE:
660{ 822{
661 opengl_fontmap = pango_opengl_font_map_new (); 823 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 824 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); 825 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
826 /*pango_context_set_font_description (opengl_context, default_font);*/
827#if PANGO_VERSION_CHECK (1, 15, 2)
828 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
829 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
830#endif
664} 831}
665 832
666char *
667SDL_GetError () 833char *SDL_GetError ()
668 834
669int 835void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 836
672void 837int SDL_Init (U32 flags)
838
839int SDL_InitSubSystem (U32 flags)
840
841void SDL_QuitSubSystem (U32 flags)
842
673SDL_Quit () 843void SDL_Quit ()
844
845int SDL_GL_SetAttribute (int attr, int value)
846
847int SDL_GL_GetAttribute (int attr)
848 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL))
850 XSRETURN_UNDEF;
851 OUTPUT:
852 RETVAL
674 853
675void 854void
676SDL_ListModes (int rgb, int alpha) 855SDL_ListModes (int rgb, int alpha)
677 PPCODE: 856 PPCODE:
678{ 857{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 869 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 872
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 873 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 874 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 875
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 876 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 877
702 if (m && m != (SDL_Rect **)-1) 878 if (m && m != (SDL_Rect **)-1)
703 while (*m) 879 while (*m)
704 { 880 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 881 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 882 {
707 AV *av = newAV (); 883 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 884 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 885 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 886 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 928SDL_GetKeyName (int sym)
753 929
754int 930int
755SDL_GetAppState () 931SDL_GetAppState ()
756 932
933int
934SDL_GetModState ()
935
757void 936void
758poll_events () 937poll_events ()
759 PPCODE: 938 PPCODE:
760{ 939{
761 SDL_Event ev; 940 SDL_Event ev;
… …
770 { 949 {
771 case SDL_KEYDOWN: 950 case SDL_KEYDOWN:
772 case SDL_KEYUP: 951 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 952 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 953 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 954 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 955 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 956 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 957 break;
779 958
780 case SDL_ACTIVEEVENT: 959 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 960 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 978 x = ev.motion.x;
800 y = ev.motion.y; 979 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 980 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 981 }
803 982
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 983 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 984 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 985 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 986 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 987 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 988 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 989 }
811 break; 990 break;
812 991
813 case SDL_MOUSEBUTTONDOWN: 992 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 993 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 994 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 995
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 996 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 997 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 998 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 999 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 1073 }
895 } 1074 }
896#endif 1075#endif
897} 1076}
898 1077
899void 1078int
900add_font (char *file) 1079add_font (char *file)
901 CODE: 1080 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT:
1083 RETVAL
903 1084
904void 1085void
905load_image_inline (SV *image_) 1086load_image_inline (SV *image_)
906 ALIAS: 1087 ALIAS:
907 load_image_file = 1 1088 load_image_file = 1
… …
1165{ 1346{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1347 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1348
1168 do 1349 do
1169 { 1350 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1351 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1352
1172 if (run && shape_attr_p (run)) 1353 if (run && shape_attr_p (run))
1173 { 1354 {
1174 PangoRectangle extents; 1355 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1356 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1460int
1280descent (DC::Layout self) 1461descent (DC::Layout self)
1281 CODE: 1462 CODE:
1282{ 1463{
1283 PangoRectangle rect; 1464 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1465 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1466 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1467 RETVAL = PANGO_DESCENT (rect);
1287} 1468}
1288 OUTPUT: 1469 OUTPUT:
1289 RETVAL 1470 RETVAL
… …
1301 1482
1302void 1483void
1303cursor_pos (DC::Layout self, int index) 1484cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1485 PPCODE:
1305{ 1486{
1306 PangoRectangle strong_pos; 1487 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1488 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1489
1309 EXTEND (SP, 3); 1490 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1491 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1492 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1494}
1314 1495
1315void 1496void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1497index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1498 PPCODE:
1318{ 1499{
1319 int line, x; 1500 int line, x;
1320 1501
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1502 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1503#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1504 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1505 --line;
1506#endif
1324 EXTEND (SP, 2); 1507 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1508 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1509 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1510}
1328 1511
1329void 1512void
1330line_x_to_index (DC::Layout self, int line, int x) 1513line_x_to_index (DC::Layout self, int line, int x)
… …
1334 int index, trailing; 1517 int index, trailing;
1335 1518
1336 if (line < 0) 1519 if (line < 0)
1337 XSRETURN_EMPTY; 1520 XSRETURN_EMPTY;
1338 1521
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1522 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1523 XSRETURN_EMPTY; /* do better */
1341 1524
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1525 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1526
1344 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
… …
1661 uint8_t ext, cmd; 1844 uint8_t ext, cmd;
1662 1845
1663 do 1846 do
1664 { 1847 {
1665 ext = *data++; 1848 ext = *data++;
1666 cmd = ext & 0x3f; 1849 cmd = ext & 0x7f;
1667 1850
1668 if (cmd < 4) 1851 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1852 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1853 else if (cmd == 5) // health
1671 { 1854 {
… …
1674 } 1857 }
1675 else if (cmd == 6) // monster width 1858 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1859 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1860 else if (cmd == 0x47)
1678 { 1861 {
1679 if (*data == 4) 1862 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 1866
1682 data += *data + 1; 1867 data += *data + 1;
1683 } 1868 }
1684 else if (cmd == 8) // cell flags 1869 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1870 cell->flags = *data++;
… …
1715 } 1900 }
1716 } 1901 }
1717 } 1902 }
1718 } 1903 }
1719 else 1904 else
1720 cell->darkness = 0; 1905 CELL_CLEAR (cell);
1721 } 1906 }
1722} 1907}
1723 OUTPUT: 1908 OUTPUT:
1724 RETVAL 1909 RETVAL
1725 1910
… …
1777} 1962}
1778 OUTPUT: 1963 OUTPUT:
1779 RETVAL 1964 RETVAL
1780 1965
1781void 1966void
1782draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1967draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 1968 CODE:
1784{ 1969{
1785 int x, y, z; 1970 int x, y, z;
1786 1971
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1974 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 1975 smooth_key skey;
1791 1976 int pl_x, pl_y;
1977 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1978 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1979 rc_key_t key;
1794 rc_array_t *arr; 1980 rc_array_t *arr;
1981
1982 pl_tex.name = 0;
1795 1983
1796 // thats current max. sorry. 1984 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1985 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1986 if (sh > 255) sh = 255;
1799 1987
… …
1854 tileid tile = cell->tile [z]; 2042 tileid tile = cell->tile [z];
1855 2043
1856 if (tile) 2044 if (tile)
1857 { 2045 {
1858 maptex tex = self->tex [tile]; 2046 maptex tex = self->tex [tile];
1859 int px, py; 2047 int px = (x + 1) * T - tex.w;
2048 int py = (y + 1) * T - tex.h;
1860 2049
1861 if (key.texname != tex.name) 2050 if (key.texname != tex.name)
1862 { 2051 {
1863 if (!tex.name) 2052 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2053 tex = self->tex [2]; /* missing, replace by noface */
1865 2054
1866 key.texname = tex.name; 2055 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2056 arr = rc_array (rc, &key);
1868 } 2057 }
1869 2058
1870 px = (x + 1) * T - tex.w; 2059 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 2060 {
2061 pl_x = px;
2062 pl_y = py;
2063 pl_tex = tex;
2064 continue;
2065 }
1872 2066
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2069 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877 2071
1878 if (cell->flags && z == 2) 2072 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 2073 {
1880 // overlays such as the speech bubble, probably more to come 2074 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 2075 if (cell->flags & 1)
1882 { 2076 {
1883 maptex tex = self->tex [1]; 2077 maptex tex = self->tex [1];
… …
2022 } 2216 }
2023 2217
2024 hv_clear (smooth); 2218 hv_clear (smooth);
2025 } 2219 }
2026 2220
2221 if (pl_tex.name)
2222 {
2223 maptex tex = pl_tex;
2224 int px = pl_x + sdx;
2225 int py = pl_y + sdy;
2226
2227 key.texname = tex.name;
2228 arr = rc_array (rc, &key);
2229
2230 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2231 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2232 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2234
2235 rc_draw (rc);
2236 }
2237
2027 glDisable (GL_BLEND); 2238 glDisable (GL_BLEND);
2028 rc_free (rc); 2239 rc_free (rc);
2029 2240
2030 // top layer: overlays such as the health bar 2241 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2242 for (y = 0; y < sh; y++)
… …
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2347 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2348
2138 mx += self->x - 1; 2349 mx += self->x - 1;
2139 my += self->y - 1; 2350 my += self->y - 1;
2140 2351
2141 memset (darkness1, 255, sw1 * sh1); 2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2353
2143 for (y = 0; y < sh1; y++) 2354 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2355 if (0 <= y + my && y + my < self->rows)
2145 { 2356 {
2146 maprow *row = self->row + (y + my); 2357 maprow *row = self->row + (y + my);
… …
2266 else 2477 else
2267 *data++ = 0; 2478 *data++ = 0;
2268 } 2479 }
2269 } 2480 }
2270 2481
2482 /* if size is w*h + 5 then no data has been found */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 {
2271 SvPOK_only (data_sv); 2485 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 }
2488
2273 RETVAL = data_sv; 2489 RETVAL = data_sv;
2274} 2490}
2275 OUTPUT: 2491 OUTPUT:
2276 RETVAL 2492 RETVAL
2277 2493
2278void 2494void
2279set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2495set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2496 PPCODE:
2281{ 2497{
2282 int x, y, z; 2498 int x, y, z;
2283 int w, h; 2499 int w, h;
2284 int x1, y1; 2500 int x1, y1;
2501 STRLEN len;
2502 uint8_t *data, *end;
2503
2504 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv);
2507 end = data + len + 8;
2508
2509 if (len < 5)
2510 XSRETURN_EMPTY;
2285 2511
2286 if (*data++ != 0) 2512 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2513 XSRETURN_EMPTY; /* version mismatch */
2288 2514
2289 w = *data++ << 8; w |= *data++; 2515 w = *data++ << 8; w |= *data++;
… …
2304 { 2530 {
2305 maprow *row = map_get_row (self, y); 2531 maprow *row = map_get_row (self, y);
2306 2532
2307 for (x = x0; x < x1; x++) 2533 for (x = x0; x < x1; x++)
2308 { 2534 {
2535 uint8_t flags;
2536
2537 if (data + 7 >= end)
2538 XSRETURN_EMPTY;
2539
2309 uint8_t flags = *data++; 2540 flags = *data++;
2310 2541
2311 if (flags) 2542 if (flags)
2312 { 2543 {
2313 mapcell *cell = row_get_cell (row, x); 2544 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2545 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2548 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2549 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2550
2320 if (cell->darkness == 0) 2551 if (cell->darkness == 0)
2321 { 2552 {
2322 cell->darkness = 0; 2553 /*cell->darkness = 0;*/
2554 EXTEND (SP, 3);
2323 2555
2324 for (z = 0; z <= 2; z++) 2556 for (z = 0; z <= 2; z++)
2325 { 2557 {
2326 tileid t = tile [z]; 2558 tileid t = tile [z];
2327 2559
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2560 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2561 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2562 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2563 need_texid (self, t);
2332 } 2564 }
2333 2565
2334 cell->tile [z] = t; 2566 cell->tile [z] = t;
2335 } 2567 }
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3078void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3079 CODE:
2848 if (gl.SeparableFilter2D) 3080 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3081 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3082
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3083void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3084
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3085void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3086
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3087void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3088

Diff Legend

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