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.275 by root, Thu Aug 28 00:53:53 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
71# define PARACHUTE 0
72#endif
73 95
74static AV *texture_av; 96static AV *texture_av;
75 97
76static struct 98static struct
77{ 99{
… …
171 193
172static void 194static void
173layout_update_font (DC__Layout self) 195layout_update_font (DC__Layout self)
174{ 196{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 197 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 198 * reasonably well with dejavu/bistream fonts
177 */ 199 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 200 PangoFontDescription *font = self->font ? self->font : default_font;
179 201
180 pango_font_description_set_absolute_size (font, 202 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 203 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
350 self->oy = 0; 372 self->oy = 0;
351 self->row = 0; 373 self->row = 0;
352 self->rows = 0; 374 self->rows = 0;
353} 375}
354 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
355static void 387static void
356map_blank (DC__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 389{
358 int x, y; 390 int x, y;
359 maprow *row; 391 maprow *row;
… …
373 if (x >= row->c1) 405 if (x >= row->c1)
374 break; 406 break;
375 407
376 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
377 409
378 cell->darkness = 0; 410 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 411 }
383 } 412 }
384} 413}
385 414
386typedef struct { 415typedef struct {
… …
497 if (!svp || !SvTRUE (*svp)) 526 if (!svp || !SvTRUE (*svp))
498 return 0; 527 return 0;
499 528
500 return 1; 529 return 1;
501} 530}
531
532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
502 569
503MODULE = Deliantra::Client PACKAGE = DC 570MODULE = Deliantra::Client PACKAGE = DC
504 571
505PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
506 573
… …
535 const_iv (SDL_USEREVENT), 602 const_iv (SDL_USEREVENT),
536 603
537 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
607
608
609 const_iv (SDLK_UNKNOWN),
610 const_iv (SDLK_FIRST),
611 const_iv (SDLK_BACKSPACE),
612 const_iv (SDLK_TAB),
613 const_iv (SDLK_CLEAR),
614 const_iv (SDLK_RETURN),
615 const_iv (SDLK_PAUSE),
616 const_iv (SDLK_ESCAPE),
617 const_iv (SDLK_SPACE),
618 const_iv (SDLK_EXCLAIM),
619 const_iv (SDLK_QUOTEDBL),
620 const_iv (SDLK_HASH),
621 const_iv (SDLK_DOLLAR),
622 const_iv (SDLK_AMPERSAND),
623 const_iv (SDLK_QUOTE),
624 const_iv (SDLK_LEFTPAREN),
625 const_iv (SDLK_RIGHTPAREN),
626 const_iv (SDLK_ASTERISK),
627 const_iv (SDLK_PLUS),
628 const_iv (SDLK_COMMA),
629 const_iv (SDLK_MINUS),
630 const_iv (SDLK_PERIOD),
631 const_iv (SDLK_SLASH),
632 const_iv (SDLK_0),
633 const_iv (SDLK_1),
634 const_iv (SDLK_2),
635 const_iv (SDLK_3),
636 const_iv (SDLK_4),
637 const_iv (SDLK_5),
638 const_iv (SDLK_6),
639 const_iv (SDLK_7),
640 const_iv (SDLK_8),
641 const_iv (SDLK_9),
642 const_iv (SDLK_COLON),
643 const_iv (SDLK_SEMICOLON),
644 const_iv (SDLK_LESS),
645 const_iv (SDLK_EQUALS),
646 const_iv (SDLK_GREATER),
647 const_iv (SDLK_QUESTION),
648 const_iv (SDLK_AT),
649
650 const_iv (SDLK_LEFTBRACKET),
651 const_iv (SDLK_BACKSLASH),
652 const_iv (SDLK_RIGHTBRACKET),
653 const_iv (SDLK_CARET),
654 const_iv (SDLK_UNDERSCORE),
655 const_iv (SDLK_BACKQUOTE),
656 const_iv (SDLK_DELETE),
540 657
541 const_iv (SDLK_FIRST), 658 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 659 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 660 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 661 const_iv (SDLK_KP1),
… …
621 const_iv (KMOD_NUM), 738 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 739 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 740 const_iv (KMOD_MODE),
624 741
625 const_iv (MIX_DEFAULT_FORMAT), 742 const_iv (MIX_DEFAULT_FORMAT),
743
744 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO),
747 const_iv (SDL_INIT_CDROM),
748 const_iv (SDL_INIT_JOYSTICK),
749 const_iv (SDL_INIT_EVERYTHING),
750 const_iv (SDL_INIT_NOPARACHUTE),
751 const_iv (SDL_INIT_EVENTTHREAD),
752
753 const_iv (SDL_GL_RED_SIZE),
754 const_iv (SDL_GL_GREEN_SIZE),
755 const_iv (SDL_GL_BLUE_SIZE),
756 const_iv (SDL_GL_ALPHA_SIZE),
757 const_iv (SDL_GL_DOUBLEBUFFER),
758 const_iv (SDL_GL_BUFFER_SIZE),
759 const_iv (SDL_GL_DEPTH_SIZE),
760 const_iv (SDL_GL_STENCIL_SIZE),
761 const_iv (SDL_GL_ACCUM_RED_SIZE),
762 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
763 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
764 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
765 const_iv (SDL_GL_STEREO),
766 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
767 const_iv (SDL_GL_MULTISAMPLESAMPLES),
768 const_iv (SDL_GL_ACCELERATED_VISUAL),
769 const_iv (SDL_GL_SWAP_CONTROL),
770
771 const_iv (FOW_DARKNESS)
626# undef const_iv 772# undef const_iv
627 }; 773 };
628 774
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 805 CODE:
660{ 806{
661 opengl_fontmap = pango_opengl_font_map_new (); 807 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 808 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); 809 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
810 /*pango_context_set_font_description (opengl_context, default_font);*/
811#if PANGO_VERSION_CHECK (1, 15, 2)
812 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
813 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
814#endif
664} 815}
665 816
666char *
667SDL_GetError () 817char *SDL_GetError ()
668 818
669int 819void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 820
672void 821int SDL_Init (U32 flags)
822
823int SDL_InitSubSystem (U32 flags)
824
825void SDL_QuitSubSystem (U32 flags)
826
673SDL_Quit () 827void SDL_Quit ()
828
829int SDL_GL_SetAttribute (int attr, int value)
830
831int SDL_GL_GetAttribute (int attr)
832 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL))
834 XSRETURN_UNDEF;
835 OUTPUT:
836 RETVAL
674 837
675void 838void
676SDL_ListModes (int rgb, int alpha) 839SDL_ListModes (int rgb, int alpha)
677 PPCODE: 840 PPCODE:
678{ 841{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 853 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 854 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 855 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 856
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 857 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); 858 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 859
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 860 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 861
702 if (m && m != (SDL_Rect **)-1) 862 if (m && m != (SDL_Rect **)-1)
703 while (*m) 863 while (*m)
704 { 864 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 865 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 866 {
707 AV *av = newAV (); 867 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 868 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 869 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 870 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 912SDL_GetKeyName (int sym)
753 913
754int 914int
755SDL_GetAppState () 915SDL_GetAppState ()
756 916
917int
918SDL_GetModState ()
919
757void 920void
758poll_events () 921poll_events ()
759 PPCODE: 922 PPCODE:
760{ 923{
761 SDL_Event ev; 924 SDL_Event ev;
… …
770 { 933 {
771 case SDL_KEYDOWN: 934 case SDL_KEYDOWN:
772 case SDL_KEYUP: 935 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 938 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 */ 939 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); 940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 941 break;
779 942
780 case SDL_ACTIVEEVENT: 943 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 962 x = ev.motion.x;
800 y = ev.motion.y; 963 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 965 }
803 966
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 968 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 969 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 970 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 971 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 972 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 973 }
811 break; 974 break;
812 975
813 case SDL_MOUSEBUTTONDOWN: 976 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 977 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 978 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 979
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 980 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 981 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 982 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 983 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 1057 }
895 } 1058 }
896#endif 1059#endif
897} 1060}
898 1061
899void 1062int
900add_font (char *file) 1063add_font (char *file)
901 CODE: 1064 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT:
1067 RETVAL
903 1068
904void 1069void
905load_image_inline (SV *image_) 1070load_image_inline (SV *image_)
906 ALIAS: 1071 ALIAS:
907 load_image_file = 1 1072 load_image_file = 1
… …
1165{ 1330{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1331 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1332
1168 do 1333 do
1169 { 1334 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1335 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1336
1172 if (run && shape_attr_p (run)) 1337 if (run && shape_attr_p (run))
1173 { 1338 {
1174 PangoRectangle extents; 1339 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1340 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1444int
1280descent (DC::Layout self) 1445descent (DC::Layout self)
1281 CODE: 1446 CODE:
1282{ 1447{
1283 PangoRectangle rect; 1448 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1449 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1450 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1451 RETVAL = PANGO_DESCENT (rect);
1287} 1452}
1288 OUTPUT: 1453 OUTPUT:
1289 RETVAL 1454 RETVAL
… …
1301 1466
1302void 1467void
1303cursor_pos (DC::Layout self, int index) 1468cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1469 PPCODE:
1305{ 1470{
1306 PangoRectangle strong_pos; 1471 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1472 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1473
1309 EXTEND (SP, 3); 1474 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1475 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1476 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1477 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1478}
1314 1479
1315void 1480void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1481index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1482 PPCODE:
1318{ 1483{
1319 int line, x; 1484 int line, x;
1320 1485
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1486 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1487#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1488 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1489 --line;
1490#endif
1324 EXTEND (SP, 2); 1491 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1492 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1494}
1328 1495
1329void 1496void
1330line_x_to_index (DC::Layout self, int line, int x) 1497line_x_to_index (DC::Layout self, int line, int x)
… …
1334 int index, trailing; 1501 int index, trailing;
1335 1502
1336 if (line < 0) 1503 if (line < 0)
1337 XSRETURN_EMPTY; 1504 XSRETURN_EMPTY;
1338 1505
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1506 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1507 XSRETURN_EMPTY; /* do better */
1341 1508
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1509 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1510
1344 EXTEND (SP, 2); 1511 EXTEND (SP, 2);
… …
1661 uint8_t ext, cmd; 1828 uint8_t ext, cmd;
1662 1829
1663 do 1830 do
1664 { 1831 {
1665 ext = *data++; 1832 ext = *data++;
1666 cmd = ext & 0x3f; 1833 cmd = ext & 0x7f;
1667 1834
1668 if (cmd < 4) 1835 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1836 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1837 else if (cmd == 5) // health
1671 { 1838 {
… …
1674 } 1841 }
1675 else if (cmd == 6) // monster width 1842 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1843 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1844 else if (cmd == 0x47)
1678 { 1845 {
1679 if (*data == 4) 1846 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 1850
1682 data += *data + 1; 1851 data += *data + 1;
1683 } 1852 }
1684 else if (cmd == 8) // cell flags 1853 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1854 cell->flags = *data++;
… …
1715 } 1884 }
1716 } 1885 }
1717 } 1886 }
1718 } 1887 }
1719 else 1888 else
1720 cell->darkness = 0; 1889 CELL_CLEAR (cell);
1721 } 1890 }
1722} 1891}
1723 OUTPUT: 1892 OUTPUT:
1724 RETVAL 1893 RETVAL
1725 1894
… …
1777} 1946}
1778 OUTPUT: 1947 OUTPUT:
1779 RETVAL 1948 RETVAL
1780 1949
1781void 1950void
1782draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 1952 CODE:
1784{ 1953{
1785 int x, y, z; 1954 int x, y, z;
1786 1955
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1957 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) 1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 1959 smooth_key skey;
1791 1960 int pl_x, pl_y;
1961 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1962 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1963 rc_key_t key;
1794 rc_array_t *arr; 1964 rc_array_t *arr;
1965
1966 pl_tex.name = 0;
1795 1967
1796 // thats current max. sorry. 1968 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1969 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1970 if (sh > 255) sh = 255;
1799 1971
… …
1854 tileid tile = cell->tile [z]; 2026 tileid tile = cell->tile [z];
1855 2027
1856 if (tile) 2028 if (tile)
1857 { 2029 {
1858 maptex tex = self->tex [tile]; 2030 maptex tex = self->tex [tile];
1859 int px, py; 2031 int px = (x + 1) * T - tex.w;
2032 int py = (y + 1) * T - tex.h;
1860 2033
1861 if (key.texname != tex.name) 2034 if (key.texname != tex.name)
1862 { 2035 {
1863 if (!tex.name) 2036 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2037 tex = self->tex [2]; /* missing, replace by noface */
1865 2038
1866 key.texname = tex.name; 2039 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2040 arr = rc_array (rc, &key);
1868 } 2041 }
1869 2042
1870 px = (x + 1) * T - tex.w; 2043 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 2044 {
2045 pl_x = px;
2046 pl_y = py;
2047 pl_tex = tex;
2048 continue;
2049 }
1872 2050
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2052 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); 2053 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); 2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877 2055
1878 if (cell->flags && z == 2) 2056 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 2057 {
1880 // overlays such as the speech bubble, probably more to come 2058 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 2059 if (cell->flags & 1)
1882 { 2060 {
1883 maptex tex = self->tex [1]; 2061 maptex tex = self->tex [1];
… …
2022 } 2200 }
2023 2201
2024 hv_clear (smooth); 2202 hv_clear (smooth);
2025 } 2203 }
2026 2204
2205 if (pl_tex.name)
2206 {
2207 maptex tex = pl_tex;
2208 int px = pl_x + sdx;
2209 int py = pl_y + sdy;
2210
2211 key.texname = tex.name;
2212 arr = rc_array (rc, &key);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218
2219 rc_draw (rc);
2220 }
2221
2027 glDisable (GL_BLEND); 2222 glDisable (GL_BLEND);
2028 rc_free (rc); 2223 rc_free (rc);
2029 2224
2030 // top layer: overlays such as the health bar 2225 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2226 for (y = 0; y < sh; y++)
… …
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2331 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2332
2138 mx += self->x - 1; 2333 mx += self->x - 1;
2139 my += self->y - 1; 2334 my += self->y - 1;
2140 2335
2141 memset (darkness1, 255, sw1 * sh1); 2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2337
2143 for (y = 0; y < sh1; y++) 2338 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2339 if (0 <= y + my && y + my < self->rows)
2145 { 2340 {
2146 maprow *row = self->row + (y + my); 2341 maprow *row = self->row + (y + my);
… …
2266 else 2461 else
2267 *data++ = 0; 2462 *data++ = 0;
2268 } 2463 }
2269 } 2464 }
2270 2465
2466 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 {
2271 SvPOK_only (data_sv); 2469 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 }
2472
2273 RETVAL = data_sv; 2473 RETVAL = data_sv;
2274} 2474}
2275 OUTPUT: 2475 OUTPUT:
2276 RETVAL 2476 RETVAL
2277 2477
2278void 2478void
2279set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2479set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2480 PPCODE:
2281{ 2481{
2282 int x, y, z; 2482 int x, y, z;
2283 int w, h; 2483 int w, h;
2284 int x1, y1; 2484 int x1, y1;
2485 STRLEN len;
2486 uint8_t *data, *end;
2487
2488 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv);
2491 end = data + len + 8;
2492
2493 if (len < 5)
2494 XSRETURN_EMPTY;
2285 2495
2286 if (*data++ != 0) 2496 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2497 XSRETURN_EMPTY; /* version mismatch */
2288 2498
2289 w = *data++ << 8; w |= *data++; 2499 w = *data++ << 8; w |= *data++;
… …
2304 { 2514 {
2305 maprow *row = map_get_row (self, y); 2515 maprow *row = map_get_row (self, y);
2306 2516
2307 for (x = x0; x < x1; x++) 2517 for (x = x0; x < x1; x++)
2308 { 2518 {
2519 uint8_t flags;
2520
2521 if (data + 7 >= end)
2522 XSRETURN_EMPTY;
2523
2309 uint8_t flags = *data++; 2524 flags = *data++;
2310 2525
2311 if (flags) 2526 if (flags)
2312 { 2527 {
2313 mapcell *cell = row_get_cell (row, x); 2528 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2529 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2532 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2533 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2534
2320 if (cell->darkness == 0) 2535 if (cell->darkness == 0)
2321 { 2536 {
2322 cell->darkness = 0; 2537 /*cell->darkness = 0;*/
2538 EXTEND (SP, 3);
2323 2539
2324 for (z = 0; z <= 2; z++) 2540 for (z = 0; z <= 2; z++)
2325 { 2541 {
2326 tileid t = tile [z]; 2542 tileid t = tile [z];
2327 2543
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2544 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2545 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2546 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2547 need_texid (self, t);
2332 } 2548 }
2333 2549
2334 cell->tile [z] = t; 2550 cell->tile [z] = t;
2335 } 2551 }
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3062void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 3063 CODE:
2848 if (gl.SeparableFilter2D) 3064 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3065 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3066
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3067void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 3068
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3069void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 3070
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3071void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3072

Diff Legend

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