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.248 by root, Fri Dec 28 15:27:39 2007 UTC vs.
Revision 1.279 by root, Thu Oct 2 15:59:40 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/******************************************************************************/
535
536/* process keyboard modifiers */
537static int
538mod_munge (int mod)
539{
540 mod &= MOD_MASK;
541
542 if (mod & (KMOD_META | KMOD_ALT))
543 mod |= KMOD_LRAM;
544
545 return mod;
546}
547
548static void
549deliantra_main ()
550{
551 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv);
553}
554
555#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back.
561 */
562 extern C_LINKAGE int
563 main (int argc, char *argv[])
564 {
565 deliantra_main ();
566 }
567
568 #undef main
569
570 extern C_LINKAGE int main (int argc, char *argv[]);
571
572 static void
573 SDL_braino (void)
574 {
575 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv);
577 }
578#else
579 static void
580 SDL_braino (void)
581 {
582 deliantra_main ();
583 }
584#endif
502 585
503MODULE = Deliantra::Client PACKAGE = DC 586MODULE = Deliantra::Client PACKAGE = DC
504 587
505PROTOTYPES: ENABLE 588PROTOTYPES: ENABLE
506 589
… …
535 const_iv (SDL_USEREVENT), 618 const_iv (SDL_USEREVENT),
536 619
537 const_iv (SDL_APPINPUTFOCUS), 620 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 621 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 622 const_iv (SDL_APPACTIVE),
623
624
625 const_iv (SDLK_UNKNOWN),
626 const_iv (SDLK_FIRST),
627 const_iv (SDLK_BACKSPACE),
628 const_iv (SDLK_TAB),
629 const_iv (SDLK_CLEAR),
630 const_iv (SDLK_RETURN),
631 const_iv (SDLK_PAUSE),
632 const_iv (SDLK_ESCAPE),
633 const_iv (SDLK_SPACE),
634 const_iv (SDLK_EXCLAIM),
635 const_iv (SDLK_QUOTEDBL),
636 const_iv (SDLK_HASH),
637 const_iv (SDLK_DOLLAR),
638 const_iv (SDLK_AMPERSAND),
639 const_iv (SDLK_QUOTE),
640 const_iv (SDLK_LEFTPAREN),
641 const_iv (SDLK_RIGHTPAREN),
642 const_iv (SDLK_ASTERISK),
643 const_iv (SDLK_PLUS),
644 const_iv (SDLK_COMMA),
645 const_iv (SDLK_MINUS),
646 const_iv (SDLK_PERIOD),
647 const_iv (SDLK_SLASH),
648 const_iv (SDLK_0),
649 const_iv (SDLK_1),
650 const_iv (SDLK_2),
651 const_iv (SDLK_3),
652 const_iv (SDLK_4),
653 const_iv (SDLK_5),
654 const_iv (SDLK_6),
655 const_iv (SDLK_7),
656 const_iv (SDLK_8),
657 const_iv (SDLK_9),
658 const_iv (SDLK_COLON),
659 const_iv (SDLK_SEMICOLON),
660 const_iv (SDLK_LESS),
661 const_iv (SDLK_EQUALS),
662 const_iv (SDLK_GREATER),
663 const_iv (SDLK_QUESTION),
664 const_iv (SDLK_AT),
665
666 const_iv (SDLK_LEFTBRACKET),
667 const_iv (SDLK_BACKSLASH),
668 const_iv (SDLK_RIGHTBRACKET),
669 const_iv (SDLK_CARET),
670 const_iv (SDLK_UNDERSCORE),
671 const_iv (SDLK_BACKQUOTE),
672 const_iv (SDLK_DELETE),
540 673
541 const_iv (SDLK_FIRST), 674 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 675 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 676 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 677 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 753 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 754 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 755 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 756 const_iv (KMOD_MODE),
624 757
758 const_iv (KMOD_LRAM),
759
625 const_iv (MIX_DEFAULT_FORMAT), 760 const_iv (MIX_DEFAULT_FORMAT),
761
762 const_iv (SDL_INIT_TIMER),
763 const_iv (SDL_INIT_AUDIO),
764 const_iv (SDL_INIT_VIDEO),
765 const_iv (SDL_INIT_CDROM),
766 const_iv (SDL_INIT_JOYSTICK),
767 const_iv (SDL_INIT_EVERYTHING),
768 const_iv (SDL_INIT_NOPARACHUTE),
769 const_iv (SDL_INIT_EVENTTHREAD),
770
771 const_iv (SDL_GL_RED_SIZE),
772 const_iv (SDL_GL_GREEN_SIZE),
773 const_iv (SDL_GL_BLUE_SIZE),
774 const_iv (SDL_GL_ALPHA_SIZE),
775 const_iv (SDL_GL_DOUBLEBUFFER),
776 const_iv (SDL_GL_BUFFER_SIZE),
777 const_iv (SDL_GL_DEPTH_SIZE),
778 const_iv (SDL_GL_STENCIL_SIZE),
779 const_iv (SDL_GL_ACCUM_RED_SIZE),
780 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
781 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
782 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
783 const_iv (SDL_GL_STEREO),
784 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
785 const_iv (SDL_GL_MULTISAMPLESAMPLES),
786 const_iv (SDL_GL_ACCELERATED_VISUAL),
787 const_iv (SDL_GL_SWAP_CONTROL),
788
789 const_iv (FOW_DARKNESS)
626# undef const_iv 790# undef const_iv
627 }; 791 };
628 792
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 823 CODE:
660{ 824{
661 opengl_fontmap = pango_opengl_font_map_new (); 825 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 826 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); 827 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
828 /*pango_context_set_font_description (opengl_context, default_font);*/
829#if PANGO_VERSION_CHECK (1, 15, 2)
830 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
831 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
832#endif
664} 833}
665 834
666char *
667SDL_GetError () 835char *SDL_GetError ()
668 836
669int 837void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 838
672void 839int SDL_Init (U32 flags)
840
841int SDL_InitSubSystem (U32 flags)
842
843void SDL_QuitSubSystem (U32 flags)
844
673SDL_Quit () 845void SDL_Quit ()
846
847int SDL_GL_SetAttribute (int attr, int value)
848
849int SDL_GL_GetAttribute (int attr)
850 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL))
852 XSRETURN_UNDEF;
853 OUTPUT:
854 RETVAL
674 855
675void 856void
676SDL_ListModes (int rgb, int alpha) 857SDL_ListModes (int rgb, int alpha)
677 PPCODE: 858 PPCODE:
678{ 859{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 874
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 875 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); 876 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 877
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 879
702 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
703 while (*m) 881 while (*m)
704 { 882 {
705 if ((*m)->w >= 800 && (*m)->h >= 480) 883 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 884 {
707 AV *av = newAV (); 885 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 888 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 930SDL_GetKeyName (int sym)
753 931
754int 932int
755SDL_GetAppState () 933SDL_GetAppState ()
756 934
935int
936SDL_GetModState ()
937
757void 938void
758poll_events () 939poll_events ()
759 PPCODE: 940 PPCODE:
760{ 941{
761 SDL_Event ev; 942 SDL_Event ev;
… …
770 { 951 {
771 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
772 case SDL_KEYUP: 953 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 956 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 */ 957 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); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 959 break;
779 960
780 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 980 x = ev.motion.x;
800 y = ev.motion.y; 981 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 983 }
803 984
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 991 }
811 break; 992 break;
812 993
813 case SDL_MOUSEBUTTONDOWN: 994 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 995 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 997
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 998 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 999 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1000 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1001 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 1075 }
895 } 1076 }
896#endif 1077#endif
897} 1078}
898 1079
899void 1080int
900add_font (char *file) 1081add_font (char *file)
901 CODE: 1082 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT:
1085 RETVAL
903 1086
904void 1087void
905load_image_inline (SV *image_) 1088load_image_inline (SV *image_)
906 ALIAS: 1089 ALIAS:
907 load_image_file = 1 1090 load_image_file = 1
… …
1165{ 1348{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1349 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1350
1168 do 1351 do
1169 { 1352 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1353 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1354
1172 if (run && shape_attr_p (run)) 1355 if (run && shape_attr_p (run))
1173 { 1356 {
1174 PangoRectangle extents; 1357 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1358 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1462int
1280descent (DC::Layout self) 1463descent (DC::Layout self)
1281 CODE: 1464 CODE:
1282{ 1465{
1283 PangoRectangle rect; 1466 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1467 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1468 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1469 RETVAL = PANGO_DESCENT (rect);
1287} 1470}
1288 OUTPUT: 1471 OUTPUT:
1289 RETVAL 1472 RETVAL
… …
1301 1484
1302void 1485void
1303cursor_pos (DC::Layout self, int index) 1486cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1487 PPCODE:
1305{ 1488{
1306 PangoRectangle strong_pos; 1489 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1490 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1491
1309 EXTEND (SP, 3); 1492 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1494 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1495 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1496}
1314 1497
1315void 1498void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1499index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1500 PPCODE:
1318{ 1501{
1319 int line, x; 1502 int line, x;
1320 1503
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1504 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1505#if !PANGO_VERSION_CHECK (1, 17, 3)
1323 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1506 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1324 --line; 1507 --line;
1325#endif 1508#endif
1326 EXTEND (SP, 2); 1509 EXTEND (SP, 2);
1327 PUSHs (sv_2mortal (newSViv (line))); 1510 PUSHs (sv_2mortal (newSViv (line)));
… …
1336 int index, trailing; 1519 int index, trailing;
1337 1520
1338 if (line < 0) 1521 if (line < 0)
1339 XSRETURN_EMPTY; 1522 XSRETURN_EMPTY;
1340 1523
1341 if (!(lp = pango_layout_get_line (self->pl, line))) 1524 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342 XSRETURN_EMPTY; /* do better */ 1525 XSRETURN_EMPTY; /* do better */
1343 1526
1344 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1527 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345 1528
1346 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
… …
1663 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1664 1847
1665 do 1848 do
1666 { 1849 {
1667 ext = *data++; 1850 ext = *data++;
1668 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1669 1852
1670 if (cmd < 4) 1853 if (cmd < 4)
1671 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1672 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1673 { 1856 {
… …
1676 } 1859 }
1677 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1678 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1679 else if (cmd == 0x47) 1862 else if (cmd == 0x47)
1680 { 1863 {
1681 if (*data == 4) 1864 if (*data == 1) cell->player = data [1];
1682 ; // decode player count 1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1683 1868
1684 data += *data + 1; 1869 data += *data + 1;
1685 } 1870 }
1686 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1687 cell->flags = *data++; 1872 cell->flags = *data++;
… …
1717 } 1902 }
1718 } 1903 }
1719 } 1904 }
1720 } 1905 }
1721 else 1906 else
1722 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1723 } 1908 }
1724} 1909}
1725 OUTPUT: 1910 OUTPUT:
1726 RETVAL 1911 RETVAL
1727 1912
… …
1779} 1964}
1780 OUTPUT: 1965 OUTPUT:
1781 RETVAL 1966 RETVAL
1782 1967
1783void 1968void
1784draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1785 CODE: 1970 CODE:
1786{ 1971{
1787 int x, y, z; 1972 int x, y, z;
1788 1973
1789 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1790 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1975 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) 1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1792 smooth_key skey; 1977 smooth_key skey;
1793 1978 int pl_x, pl_y;
1979 maptex pl_tex;
1794 rc_t *rc = rc_alloc (); 1980 rc_t *rc = rc_alloc ();
1795 rc_key_t key; 1981 rc_key_t key;
1796 rc_array_t *arr; 1982 rc_array_t *arr;
1983
1984 pl_tex.name = 0;
1797 1985
1798 // thats current max. sorry. 1986 // thats current max. sorry.
1799 if (sw > 255) sw = 255; 1987 if (sw > 255) sw = 255;
1800 if (sh > 255) sh = 255; 1988 if (sh > 255) sh = 255;
1801 1989
… …
1856 tileid tile = cell->tile [z]; 2044 tileid tile = cell->tile [z];
1857 2045
1858 if (tile) 2046 if (tile)
1859 { 2047 {
1860 maptex tex = self->tex [tile]; 2048 maptex tex = self->tex [tile];
1861 int px, py; 2049 int px = (x + 1) * T - tex.w;
2050 int py = (y + 1) * T - tex.h;
1862 2051
1863 if (key.texname != tex.name) 2052 if (key.texname != tex.name)
1864 { 2053 {
1865 if (!tex.name) 2054 if (!tex.name)
1866 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1867 2056
1868 key.texname = tex.name; 2057 key.texname = tex.name;
1869 arr = rc_array (rc, &key); 2058 arr = rc_array (rc, &key);
1870 } 2059 }
1871 2060
1872 px = (x + 1) * T - tex.w; 2061 if (expect_false (cell->player == player) && expect_false (z == 2))
1873 py = (y + 1) * T - tex.h; 2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
1874 2068
1875 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1876 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2070 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); 2071 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); 2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1879 2073
1880 if (cell->flags && z == 2) 2074 if (expect_false (cell->flags) && expect_false (z == 2))
1881 { 2075 {
1882 // overlays such as the speech bubble, probably more to come 2076 // overlays such as the speech bubble, probably more to come
1883 if (cell->flags & 1) 2077 if (cell->flags & 1)
1884 { 2078 {
1885 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
… …
2024 } 2218 }
2025 2219
2026 hv_clear (smooth); 2220 hv_clear (smooth);
2027 } 2221 }
2028 2222
2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
2228
2229 key.texname = tex.name;
2230 arr = rc_array (rc, &key);
2231
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236
2237 rc_draw (rc);
2238 }
2239
2029 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
2030 rc_free (rc); 2241 rc_free (rc);
2031 2242
2032 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
2033 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
… …
2040 { 2251 {
2041 mapcell *cell = row->col + (x + mx - row->c0); 2252 mapcell *cell = row->col + (x + mx - row->c0);
2042 2253
2043 int px = x * T; 2254 int px = x * T;
2044 int py = y * T; 2255 int py = y * T;
2256
2257 if (expect_false (cell->player == player))
2258 {
2259 px += sdx;
2260 py += sdy;
2261 }
2045 2262
2046 if (cell->stat_hp) 2263 if (cell->stat_hp)
2047 { 2264 {
2048 int width = cell->stat_width * T; 2265 int width = cell->stat_width * T;
2049 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2138 SvCUR_set (darkness3_sv, sw34 * sh3); 2355 SvCUR_set (darkness3_sv, sw34 * sh3);
2139 2356
2140 mx += self->x - 1; 2357 mx += self->x - 1;
2141 my += self->y - 1; 2358 my += self->y - 1;
2142 2359
2143 memset (darkness1, 255, sw1 * sh1); 2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2144 2361
2145 for (y = 0; y < sh1; y++) 2362 for (y = 0; y < sh1; y++)
2146 if (0 <= y + my && y + my < self->rows) 2363 if (0 <= y + my && y + my < self->rows)
2147 { 2364 {
2148 maprow *row = self->row + (y + my); 2365 maprow *row = self->row + (y + my);
… …
2268 else 2485 else
2269 *data++ = 0; 2486 *data++ = 0;
2270 } 2487 }
2271 } 2488 }
2272 2489
2490 /* if size is w*h + 5 then no data has been found */
2491 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2492 {
2273 SvPOK_only (data_sv); 2493 SvPOK_only (data_sv);
2274 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2494 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2495 }
2496
2275 RETVAL = data_sv; 2497 RETVAL = data_sv;
2276} 2498}
2277 OUTPUT: 2499 OUTPUT:
2278 RETVAL 2500 RETVAL
2279 2501
2280void 2502void
2281set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2503set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282 PPCODE: 2504 PPCODE:
2283{ 2505{
2284 int x, y, z; 2506 int x, y, z;
2285 int w, h; 2507 int w, h;
2286 int x1, y1; 2508 int x1, y1;
2509 STRLEN len;
2510 uint8_t *data, *end;
2511
2512 len = SvLEN (data_sv);
2513 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2514 data = SvPVbyte_nolen (data_sv);
2515 end = data + len + 8;
2516
2517 if (len < 5)
2518 XSRETURN_EMPTY;
2287 2519
2288 if (*data++ != 0) 2520 if (*data++ != 0)
2289 XSRETURN_EMPTY; /* version mismatch */ 2521 XSRETURN_EMPTY; /* version mismatch */
2290 2522
2291 w = *data++ << 8; w |= *data++; 2523 w = *data++ << 8; w |= *data++;
… …
2306 { 2538 {
2307 maprow *row = map_get_row (self, y); 2539 maprow *row = map_get_row (self, y);
2308 2540
2309 for (x = x0; x < x1; x++) 2541 for (x = x0; x < x1; x++)
2310 { 2542 {
2543 uint8_t flags;
2544
2545 if (data + 7 >= end)
2546 XSRETURN_EMPTY;
2547
2311 uint8_t flags = *data++; 2548 flags = *data++;
2312 2549
2313 if (flags) 2550 if (flags)
2314 { 2551 {
2315 mapcell *cell = row_get_cell (row, x); 2552 mapcell *cell = row_get_cell (row, x);
2316 tileid tile[3] = { 0, 0, 0 }; 2553 tileid tile[3] = { 0, 0, 0 };
… …
2319 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2556 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2320 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2557 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2321 2558
2322 if (cell->darkness == 0) 2559 if (cell->darkness == 0)
2323 { 2560 {
2324 cell->darkness = 0; 2561 /*cell->darkness = 0;*/
2562 EXTEND (SP, 3);
2325 2563
2326 for (z = 0; z <= 2; z++) 2564 for (z = 0; z <= 2; z++)
2327 { 2565 {
2328 tileid t = tile [z]; 2566 tileid t = tile [z];
2329 2567
2330 if (t >= self->texs || (t && !self->tex [t].name)) 2568 if (t >= self->texs || (t && !self->tex [t].name))
2331 { 2569 {
2332 XPUSHs (sv_2mortal (newSViv (t))); 2570 PUSHs (sv_2mortal (newSViv (t)));
2333 need_texid (self, t); 2571 need_texid (self, t);
2334 } 2572 }
2335 2573
2336 cell->tile [z] = t; 2574 cell->tile [z] = t;
2337 } 2575 }
… …
2769void glRotate (float angle, float x, float y, float z) 3007void glRotate (float angle, float x, float y, float z)
2770 CODE: 3008 CODE:
2771 glRotatef (angle, x, y, z); 3009 glRotatef (angle, x, y, z);
2772 3010
2773void glColor (float r, float g, float b, float a = 1.0) 3011void glColor (float r, float g, float b, float a = 1.0)
3012 PROTOTYPE: @
2774 ALIAS: 3013 ALIAS:
2775 glColor_premultiply = 1 3014 glColor_premultiply = 1
2776 CODE: 3015 CODE:
2777 if (ix) 3016 if (ix)
2778 { 3017 {

Diff Legend

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