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.302 by root, Tue Apr 20 10:53:11 2010 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
33 37
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 39
36#include <SDL.h> 40#include <SDL.h>
37#include <SDL_thread.h> 41#include <SDL_thread.h>
48#endif 52#endif
49 53
50#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
51#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
52 56
53#include <glib/gmacros.h> 57#include <glib.h>
54 58
55#include <pango/pango.h> 59#include <pango/pango.h>
56 60
57#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
100#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
101 105
102#define TEXID_SPEECH 1 106#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 107#define TEXID_NOFACE 2
104 108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
127
105static AV *texture_av; 128static AV *texture_av;
106 129
107static struct 130static struct
108{ 131{
109#define GL_FUNC(ptr,name) ptr name; 132#define GL_FUNC(ptr,name) ptr name;
165{ 188{
166 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
167 190
168 while (attrs) 191 while (attrs)
169 { 192 {
170 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
171 194
172 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
173 return 1; 196 return 1;
174 197
175 attrs = attrs->next; 198 attrs = attrs->next;
193static void 216static void
194substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
195{ 218{
196 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
197#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
198 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199#endif 222#endif
200 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201} 224}
202 225
203static void 226static void
420 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
421 } 444 }
422 } 445 }
423} 446}
424 447
425typedef struct { 448struct smooth_key
449{
426 tileid tile; 450 tileid tile;
427 uint8_t x, y, level; 451 uint8_t x, y, level;
428} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
429 471
430static void 472static void
431smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432{ 474{
433 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
434 476
435 if (SvIOK (*sv)) 477 if (it == h.end ())
436 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
437 else 479 else
438 sv_setiv (*sv, bits); 480 it->second |= bits;
439} 481}
440 482
441static void 483static void
442music_finished (void) 484music_finished (void)
443{ 485{
460 ev.code = 1; 502 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 504 ev.data2 = 0;
463 505
464 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
465} 514}
466 515
467static unsigned int 516static unsigned int
468minpot (unsigned int n) 517minpot (unsigned int n)
469{ 518{
552 601
553 return mod; 602 return mod;
554} 603}
555 604
556static void 605static void
557deliantra_main () 606deliantra_main (SV *real_main)
558{ 607{
559 char *argv[] = { 0 }; 608 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
561} 612}
562 613
563#ifdef __MACOSX__ 614#ifdef __MACOSX__
615 static SV *real_main;
616
564 /* to due surprising braindamage on the side of SDL design, we 617 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 618 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which, 619 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 621 * and which calls our main (== SDL_main) back.
569 */ 622 */
570 extern C_LINKAGE int 623 extern C_LINKAGE int
571 main (int argc, char *argv[]) 624 main (int argc, char *argv[])
572 { 625 {
573 deliantra_main (); 626 deliantra_main (real_main);
574 } 627 }
575 628
576 #undef main 629 #undef main
577 630
578 extern C_LINKAGE int main (int argc, char *argv[]); 631 extern C_LINKAGE int main (int argc, char *argv[]);
579 632
580 static void 633 static void
581 SDL_braino (void) 634 SDL_main_hack (SV *real_main_)
582 { 635 {
636 real_main = real_main_;
637
583 char *argv[] = { "deliantra client", 0 }; 638 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 639 (main) (1, argv);
585 } 640 }
586#else 641#else
587 static void 642 static void
588 SDL_braino (void) 643 SDL_main_hack (SV *real_main)
589 { 644 {
590 deliantra_main (); 645 deliantra_main (real_main);
591 } 646 }
592#endif 647#endif
593 648
594MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
595 650
796 851
797 const_iv (FOW_DARKNESS) 852 const_iv (FOW_DARKNESS)
798# undef const_iv 853# undef const_iv
799 }; 854 };
800 855
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 856 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 858
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 861}
807 862
846#endif 901#endif
847} 902}
848 903
849char *SDL_GetError () 904char *SDL_GetError ()
850 905
851void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
852 908
853int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
854 910
855int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
856 912
857void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
858 914
859void SDL_Quit () 915void SDL_Quit ()
860 916
861int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
862 919
863int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
864 CODE: 921 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
867 OUTPUT: 924 OUTPUT:
868 RETVAL 925 RETVAL
869 926
870void 927void
925 ); 982 );
926 983
927 if (RETVAL) 984 if (RETVAL)
928 { 985 {
929 av_clear (texture_av); 986 av_clear (texture_av);
930
931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933#include "glfunc.h" 988#include "glfunc.h"
934#undef GL_FUNC 989#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938 } 992 }
939} 993}
940 OUTPUT: 994 OUTPUT:
941 RETVAL 995 RETVAL
942 996
943void 997void
998SDL_WM_SetCaption (const char *title, const char *icon)
999
1000void
944SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
945 1002
946char * 1003char *
947SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
948 1006
949int 1007int
950SDL_GetAppState () 1008SDL_GetAppState ()
951 1009
952int 1010int
953SDL_GetModState () 1011SDL_GetModState ()
954 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
955void 1017void
1018SDL_PumpEvents ()
1019
1020void
956poll_events () 1021peep_events ()
957 PPCODE: 1022 PPCODE:
958{ 1023{
959 SDL_Event ev; 1024 SDL_Event ev;
960 1025
961 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
1027 1092
1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1093 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1029 } 1094 }
1030} 1095}
1031 1096
1097char *
1098SDL_AudioDriverName ()
1099 CODE:
1100{
1101 char buf [256];
1102 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1103 XSRETURN_UNDEF;
1104
1105 RETVAL = buf;
1106}
1107 OUTPUT:
1108 RETVAL
1109
1032int 1110int
1033Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1034 POSTCALL: 1112 POSTCALL:
1035 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1036 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1037 1115
1038void 1116void
1039Mix_QuerySpec () 1117Mix_QuerySpec ()
1098add_font (char *file) 1176add_font (char *file)
1099 CODE: 1177 CODE:
1100 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101 OUTPUT: 1179 OUTPUT:
1102 RETVAL 1180 RETVAL
1181
1182void
1183IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1184
1185# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1186void
1187Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1103 1188
1104void 1189void
1105load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1106 ALIAS: 1191 ALIAS:
1107 load_image_file = 1 1192 load_image_file = 1
1153 1238
1154 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1155 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1156 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1157 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1158 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1159 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1244 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1160 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1161 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1162 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1163 1248
1235MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1236 1321
1237PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1238 1323
1239DC::Font 1324DC::Font
1240new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1241 CODE: 1326 CODE:
1242{ 1327{
1243 int count; 1328 int count;
1244 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1245 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1274 PROTOTYPE: 1359 PROTOTYPE:
1275 CODE: 1360 CODE:
1276 tc_restore (); 1361 tc_restore ();
1277 1362
1278DC::Layout 1363DC::Layout
1279new (SV *class) 1364new (SV *klass)
1280 CODE: 1365 CODE:
1281 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1282 1367
1283 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1284 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1433 1518
1434void 1519void
1435set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1436 CODE: 1521 CODE:
1437 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1438 { 1523 {
1439 self->base_height = base_height; 1524 self->base_height = base_height;
1440 layout_update_font (self); 1525 layout_update_font (self);
1441 } 1526 }
1442 1527
1443void 1528void
1807MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1808 1893
1809PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1810 1895
1811DC::Map 1896DC::Map
1812new (SV *class) 1897new (SV *klass)
1813 CODE: 1898 CODE:
1814 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1815 RETVAL->x = 0; 1900 RETVAL->x = 0;
1816 RETVAL->y = 0; 1901 RETVAL->y = 0;
1817 RETVAL->w = 0; 1902 RETVAL->w = 0;
1856 1941
1857void 1942void
1858set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1859 CODE: 1944 CODE:
1860{ 1945{
1861 tileid texid; 1946 tileid texid;
1862 maptex *tex; 1947 maptex *tex;
1863 1948
1864 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1865 return; 1950 return;
1866 1951
1867 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1868 return; 1953 return;
1869 1954
1870 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1871 1956
1872 if (!texid) 1957 if (!texid)
1873 return; 1958 return;
1874 1959
1875 tex = self->tex + texid; 1960 tex = self->tex + texid;
1908} 1993}
1909 1994
1910void 1995void
1911expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1912 PPCODE: 1997 PPCODE:
1913 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1914 { 1999 {
1915 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1916 2001
1917 if (tex->name) 2002 if (tex->name)
1918 { 2003 {
1973 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1974 } 2059 }
1975} 2060}
1976 2061
1977SV * 2062SV *
1978map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1979 CODE: 2064 CODE:
1980{ 2065{
1981 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1982 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1983 mapcell *cell; 2068 mapcell *cell;
2004 2089
2005 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
2006 2091
2007 if (flags & 8) 2092 if (flags & 8)
2008 { 2093 {
2094 uint8_t ext, cmd;
2095
2009 if (extmap) 2096 do
2010 { 2097 {
2011 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
2012 2100
2013 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
2014 { 2104 {
2015 ext = *data++;
2016 cmd = ext & 0x7f;
2017
2018 if (cmd < 4)
2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2020 else if (cmd == 5) // health
2021 {
2022 cell->stat_width = 1; 2105 cell->stat_width = 1;
2023 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
2024 }
2025 else if (cmd == 6) // monster width
2026 cell->stat_width = *data++ + 1;
2027 else if (cmd == 0x47)
2028 {
2029 if (*data == 1) cell->player = data [1];
2030 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2031 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2032 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2033
2034 data += *data + 1;
2035 }
2036 else if (cmd == 8) // cell flags
2037 cell->flags = *data++;
2038 else if (ext & 0x40) // unknown, multibyte => skip
2039 data += *data + 1;
2040 else
2041 data++;
2042 } 2107 }
2043 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
2044 } 2125 }
2045 else 2126 while (ext & 0x80);
2046 cell->darkness = *data++ + 1;
2047 } 2127 }
2048 2128
2049 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
2050 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
2051 { 2131 {
2099 ? self->row + y 2179 ? self->row + y
2100 : 0; 2180 : 0;
2101 2181
2102 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
2103 { 2183 {
2104 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
2105 2185
2106 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
2107 { 2187 {
2108 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
2109 2189
2111 { 2191 {
2112 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
2113 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
2114 int a1 = tex.a; 2194 int a1 = tex.a;
2115 2195
2116 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
2117 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
2118 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
2119 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
2120 } 2200 }
2121 } 2201 }
2122 2202
2123 *map++ = (r ) 2203 *map++ = (r )
2124 | (g << 8) 2204 | (g << 8)
2125 | (b << 16) 2205 | (b << 16)
2126 | (a << 24); 2206 | (a << 24);
2127 } 2207 }
2128 } 2208 }
2129 2209
2130 RETVAL = map_sv; 2210 RETVAL = map_sv;
2131} 2211}
2132 OUTPUT: 2212 OUTPUT:
2133 RETVAL 2213 RETVAL
2134 2214
2135void 2215void
2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2137 CODE: 2217 CODE:
2138{ 2218{
2139 int x, y, z; 2219 int x, y, z;
2140 2220
2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2142 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2221 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2143 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2144 smooth_key skey; 2223 smooth_key skey;
2145 int pl_x, pl_y; 2224 int pl_x, pl_y;
2146 maptex pl_tex; 2225 maptex pl_tex;
2195 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2197 2276
2198 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
2199 { 2278 {
2279 smooth_hash smooth;
2200 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2201 key.texname = -1; 2281 key.texname = -1;
2202 2282
2203 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
2204 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
2225 2305
2226 key.texname = tex.name; 2306 key.texname = tex.name;
2227 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
2228 } 2308 }
2229 2309
2230 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
2231 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
2232 2312
2233 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2234 { 2314 {
2235 pl_x = px; 2315 pl_x = px;
2236 pl_y = py; 2316 pl_y = py;
2265 2345
2266 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2267 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2268 2348
2269 // full tile 2349 // full tile
2270 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2350 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2271 2351
2272 // borders 2352 // borders
2273 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2353 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2274 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2354 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2275 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2355 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2276 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2356 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2277 2357
2278 // corners 2358 // corners
2279 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2359 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2280 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2360 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2281 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2361 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2282 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2362 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2283 } 2363 }
2284 } 2364 }
2285 2365
2286 if (expect_false (z == 2) && expect_false (cell->flags)) 2366 if (expect_false (z == 2) && expect_false (cell->flags))
2287 { 2367 {
2289 if (cell->flags & 1) 2369 if (cell->flags & 1)
2290 { 2370 {
2291 rc_key_t key_ov = key; 2371 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH]; 2372 maptex tex = self->tex [TEXID_SPEECH];
2293 rc_array_t *arr; 2373 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32; 2374 int px = x * Tw + Tw * 2 / 32;
2295 int py = y * T - T * 6 / 32; 2375 int py = y * Th - Th * 6 / 32;
2296 2376
2297 key_ov.texname = tex.name; 2377 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov); 2378 arr = rc_array (rc_ov, &key_ov);
2299 2379
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2304 } 2384 }
2305 } 2385 }
2306 } 2386 }
2307 } 2387 }
2308 2388
2324 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2325 { 2405 {
2326 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2327 HE *he; 2407 HE *he;
2328 2408
2329 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2330 while ((he = hv_iternext (smooth)))
2331 { 2410 {
2332 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2333 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2334 2413
2335 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2336 && skey->level == level 2415 && skey.level == level
2337 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2338 { 2417 {
2339 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2340 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2341 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2342 int border = bits & 15; 2421 int border = bits & 15;
2343 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2344 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2345 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2346 2425
2348 { 2427 {
2349 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2350 // save gobs of state changes. 2429 // save gobs of state changes.
2351 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2352 { 2431 {
2353 self->tex [skey->tile].unused = 0; 2432 self->tex [skey.tile].unused = 0;
2354 2433
2355 glEnd (); 2434 glEnd ();
2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2357 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2358 } 2437 }
2359 2438
2360 if (border) 2439 if (border)
2361 { 2440 {
2362 float ox = border * dx; 2441 float ox = border * dx;
2363 2442
2364 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2365 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2366 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2367 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2368 } 2447 }
2369 2448
2370 if (corner) 2449 if (corner)
2371 { 2450 {
2372 float ox = corner * dx; 2451 float ox = corner * dx;
2373 2452
2374 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2375 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2376 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2377 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2378 } 2457 }
2379 } 2458 }
2380 } 2459 }
2381 } 2460 }
2382 } 2461 }
2384 2463
2385 glEnd (); 2464 glEnd ();
2386 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2387 key.texname = -1; 2466 key.texname = -1;
2388 } 2467 }
2389
2390 hv_clear (smooth);
2391 } 2468 }
2392 2469
2393 if (pl_tex.name) 2470 if (pl_tex.name)
2394 { 2471 {
2395 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2423 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2424 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2425 { 2502 {
2426 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2427 2504
2428 int px = x * T; 2505 int px = x * Tw;
2429 int py = y * T; 2506 int py = y * Th;
2430 2507
2431 if (expect_false (cell->player == player)) 2508 if (expect_false (cell->player == player))
2432 { 2509 {
2433 px += sdx; 2510 px += sdx;
2434 py += sdy; 2511 py += sdy;
2435 } 2512 }
2436 2513
2437 if (cell->stat_hp) 2514 if (cell->stat_hp)
2438 { 2515 {
2439 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2441 2518
2442 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2443 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2444 px + width - 1, py); 2521 px + width - 1, py);
2445 2522
2525 int x, y; 2602 int x, y;
2526 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2527 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2528 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2529 int sw3 = sw * 3; 2606 int sw3 = sw * 3;
2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2607 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2608 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2610 memset (darkness1, 0, sw1*sh1);
2533 2611
2534 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2535 SvCUR_set (darkness3_sv, sw3 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2536 2614
2537 mx += self->x - 1; 2615 mx += self->x - 1;
2663 else 2741 else
2664 *data++ = 0; 2742 *data++ = 0;
2665 } 2743 }
2666 } 2744 }
2667 2745
2668 /* if size is w*h + 5 then no data has been found */ 2746 /* if size is w*h + 5 then no data has been found */
2669 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2670 { 2748 {
2671 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673 } 2751 }
2674 2752
2675 RETVAL = data_sv; 2753 RETVAL = data_sv;
2676} 2754}
2677 OUTPUT: 2755 OUTPUT:
2678 RETVAL 2756 RETVAL
2679 2757
2680void 2758void
2687 STRLEN len; 2765 STRLEN len;
2688 uint8_t *data, *end; 2766 uint8_t *data, *end;
2689 2767
2690 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2691 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2692 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2693 end = data + len + 8; 2771 end = data + len + 8;
2694 2772
2695 if (len < 5) 2773 if (len < 5)
2696 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2697 2775
2758} 2836}
2759 2837
2760MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2761 2839
2762DC::RW 2840DC::RW
2763new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2764 CODE: 2842 CODE:
2765{ 2843{
2766 STRLEN datalen; 2844 STRLEN datalen;
2767 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2768 2846
2770} 2848}
2771 OUTPUT: 2849 OUTPUT:
2772 RETVAL 2850 RETVAL
2773 2851
2774DC::RW 2852DC::RW
2775new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2776 CODE: 2854 CODE:
2777 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2778 OUTPUT: 2856 OUTPUT:
2779 RETVAL 2857 RETVAL
2780 2858
2889#else 2967#else
2890 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2968 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2891#endif 2969#endif
2892 2970
2893DC::MixChunk 2971DC::MixChunk
2894new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2895 CODE: 2973 CODE:
2896 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2897 OUTPUT: 2975 OUTPUT:
2898 RETVAL 2976 RETVAL
2899 2977
2969 RETVAL = Mix_PlayingMusic (); 3047 RETVAL = Mix_PlayingMusic ();
2970 OUTPUT: 3048 OUTPUT:
2971 RETVAL 3049 RETVAL
2972 3050
2973DC::MixMusic 3051DC::MixMusic
2974new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2975 CODE: 3053 CODE:
2976 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2977 OUTPUT: 3055 OUTPUT:
2978 RETVAL 3056 RETVAL
2979 3057
3116 const_iv (GL_FUNC_SUBTRACT), 3194 const_iv (GL_FUNC_SUBTRACT),
3117 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3118# undef const_iv 3196# undef const_iv
3119 }; 3197 };
3120 3198
3121 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3199 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3122 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3123 3201
3124 texture_av = newAV (); 3202 texture_av = newAV ();
3125 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
3126} 3204}
3127 3205
3132 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
3133 3211
3134void 3212void
3135apple_nvidia_bug (int enable) 3213apple_nvidia_bug (int enable)
3136 3214
3137char * 3215const char *
3138gl_vendor () 3216gl_vendor ()
3139 CODE: 3217 CODE:
3140 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
3141 OUTPUT: 3219 OUTPUT:
3142 RETVAL 3220 RETVAL
3143 3221
3144char * 3222const char *
3145gl_version () 3223gl_version ()
3146 CODE: 3224 CODE:
3147 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
3148 OUTPUT: 3226 OUTPUT:
3149 RETVAL 3227 RETVAL
3150 3228
3151char * 3229const char *
3152gl_extensions () 3230gl_extensions ()
3153 CODE: 3231 CODE:
3154 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3155 OUTPUT: 3233 OUTPUT:
3156 RETVAL 3234 RETVAL
3157 3235
3158const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
3159 3241
3160GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
3161 CODE: 3243 CODE:
3162 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
3163 OUTPUT: 3245 OUTPUT:
3170 RETVAL 3252 RETVAL
3171 3253
3172int glGetError () 3254int glGetError ()
3173 3255
3174void glFinish () 3256void glFinish ()
3257
3258void glFlush ()
3175 3259
3176void glClear (int mask) 3260void glClear (int mask)
3177 3261
3178void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
3179 PROTOTYPE: @ 3263 PROTOTYPE: @
3364 3448
3365void 3449void
3366find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3367 PPCODE: 3451 PPCODE:
3368{ 3452{
3369 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3370 XPUSHs (self); 3454 XPUSHs (self);
3371} 3455}
3372 3456
3373BOOT: 3457BOOT:
3374{ 3458{
3382 3466
3383void 3467void
3384draw (SV *self) 3468draw (SV *self)
3385 CODE: 3469 CODE:
3386{ 3470{
3387 HV *hv; 3471 HV *hv;
3388 SV **svp; 3472 SV **svp;
3389 NV x, y, w, h; 3473 NV x, y, w, h;
3390 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3391 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3392 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3393 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines