ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.217 by root, Wed Aug 1 12:43:31 2007 UTC vs.
Revision 1.261 by root, Sun Jul 13 12:17:00 2008 UTC

…		…
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
		22	// microsoft vs. C
		23	# define sqrtf(x) sqrt(x)
		24	# define roundf(x) (int)(x)
		25	# define atan2f(x,y) atan2(x,y)
		26	# define M_PI 3.14159265f
22	#endif	27	#endif
23		28
24	#include <assert.h>	29	#include <assert.h>
25	#include <math.h>	30	#include <math.h>
26	#include <string.h>	31	#include <string.h>
…		…
40	#define G_DISABLE_CAST_CHECKS	45	#define G_DISABLE_CAST_CHECKS
41		46
42	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
43		48
44	#include <pango/pango.h>	49	#include <pango/pango.h>
		50
		51	#ifndef PANGO_VERSION_CHECK
		52	# define PANGO_VERSION_CHECK(a,b,c) 0
		53	#endif
		54
		55	#if !PANGO_VERSION_CHECK (1, 15, 2)
		56	# define pango_layout_get_line_readonly pango_layout_get_line
		57	# define pango_layout_get_lines_readonly pango_layout_get_lines
		58	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		59	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		60	#endif
45		61
46	#ifndef _WIN32	62	#ifndef _WIN32
47	# include <sys/types.h>	63	# include <sys/types.h>
48	# include <sys/socket.h>	64	# include <sys/socket.h>
49	# include <netinet/in.h>	65	# include <netinet/in.h>
50	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
51	# include <inttypes.h>	67	# include <inttypes.h>
52	#endif	68	#endif
53		69
		70	#if __GNUC__ >= 4
		71	# define expect(expr,value) __builtin_expect ((expr),(value))
		72	#else
		73	# define expect(expr,value) (expr)
		74	#endif
		75
		76	#define expect_false(expr) expect ((expr) != 0, 0)
		77	#define expect_true(expr) expect ((expr) != 0, 1)
		78
54	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55		80
56	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
57		82
58	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
59	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
60		85
61	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
62		87
		88	/* mask out modifiers we are not interested in */
		89	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
		90
63	#if 0	91	#if 1
64	# define PARACHUTE SDL_INIT_NOPARACHUTE	92	# define PARACHUTE SDL_INIT_NOPARACHUTE
65	#else	93	#else
66	# define PARACHUTE 0	94	# define PARACHUTE 0
67	#endif	95	#endif
68		96
…		…
109	av_push (texture_av, (SV *)(size_t)name);	137	av_push (texture_av, (SV *)(size_t)name);
110	glDeleteTextures (1, &name);	138	glDeleteTextures (1, &name);
111	}	139	}
112		140
113	#include "texcache.c"	141	#include "texcache.c"
		142	#include "rendercache.c"
114		143
115	#include "pango-font.c"	144	#include "pango-font.c"
116	#include "pango-fontmap.c"	145	#include "pango-fontmap.c"
117	#include "pango-render.c"	146	#include "pango-render.c"
118		147
119	typedef IV CFPlus__Channel;	148	typedef IV DC__Channel;
120	typedef SDL_RWops *CFPlus__RW;	149	typedef SDL_RWops *DC__RW;
121	typedef Mix_Chunk *CFPlus__MixChunk;	150	typedef Mix_Chunk *DC__MixChunk;
122	typedef Mix_Music *CFPlus__MixMusic;	151	typedef Mix_Music *DC__MixMusic;
123		152
124	typedef PangoFontDescription *CFPlus__Font;	153	typedef PangoFontDescription *DC__Font;
125		154
126	static int	155	static int
127	shape_attr_p (PangoLayoutRun *run)	156	shape_attr_p (PangoLayoutRun *run)
128	{	157	{
129	GSList *attrs = run->item->analysis.extra_attrs;	158	GSList *attrs = run->item->analysis.extra_attrs;
…		…
143		172
144	typedef struct cf_layout {	173	typedef struct cf_layout {
145	PangoLayout *pl;	174	PangoLayout *pl;
146	float r, g, b, a; // default color for rgba mode	175	float r, g, b, a; // default color for rgba mode
147	int base_height;	176	int base_height;
148	CFPlus__Font font;	177	DC__Font font;
		178	rc_t *rc;
149	} *CFPlus__Layout;	179	} *DC__Layout;
150		180
151	static CFPlus__Font default_font;	181	static DC__Font default_font;
152	static PangoContext *opengl_context;	182	static PangoContext *opengl_context;
153	static PangoFontMap *opengl_fontmap;	183	static PangoFontMap *opengl_fontmap;
154		184
155	static void	185	static void
156	substitute_func (FcPattern *pattern, gpointer data)	186	substitute_func (FcPattern *pattern, gpointer data)
…		…
161	#endif	191	#endif
162	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	192	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163	}	193	}
164		194
165	static void	195	static void
166	layout_update_font (CFPlus__Layout self)	196	layout_update_font (DC__Layout self)
167	{	197	{
168	/* use a random scale factor to account for unknown descenders, 0.8 works	198	/* use a random scale factor to account for unknown descenders, 0.8 works
169	* reasonably well with bitstream vera	199	* reasonably well with dejavu/bistream fonts
170	*/	200	*/
171	PangoFontDescription *font = self->font ? self->font : default_font;	201	PangoFontDescription *font = self->font ? self->font : default_font;
172		202
173	pango_font_description_set_absolute_size (font,	203	pango_font_description_set_absolute_size (font,
174	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	204	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175		205
176	pango_layout_set_font_description (self->pl, font);	206	pango_layout_set_font_description (self->pl, font);
177	}	207	}
178		208
179	static void	209	static void
180	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	210	layout_get_pixel_size (DC__Layout self, int *w, int *h)
181	{	211	{
182	PangoRectangle rect;	212	PangoRectangle rect;
183		213
184	// get_pixel_* wrongly rounds down	214	// get_pixel_* wrongly rounds down
185	pango_layout_get_extents (self->pl, 0, &rect);	215	pango_layout_get_extents (self->pl, 0, &rect);
…		…
196		226
197	typedef uint16_t tileid;	227	typedef uint16_t tileid;
198	typedef uint16_t faceid;	228	typedef uint16_t faceid;
199		229
200	typedef struct {	230	typedef struct {
201	int name;	231	GLuint name;
202	int w, h;	232	int w, h;
203	float s, t;	233	float s, t;
204	uint8_t r, g, b, a;	234	uint8_t r, g, b, a;
205	tileid smoothtile;	235	tileid smoothtile;
206	uint8_t smoothlevel;	236	uint8_t smoothlevel;
…		…
224	int faces; tileid *face2tile; // [faceid]	254	int faces; tileid *face2tile; // [faceid]
225	int texs; maptex *tex; // [tileid]	255	int texs; maptex *tex; // [tileid]
226		256
227	int32_t rows;	257	int32_t rows;
228	maprow *row;	258	maprow *row;
229	} *CFPlus__Map;	259	} *DC__Map;
230		260
231	static char *	261	static char *
232	prepend (char *ptr, int sze, int inc)	262	prepend (char *ptr, int sze, int inc)
233	{	263	{
234	char *p;	264	char *p;
…		…
272	self->texs *= 2;	302	self->texs *= 2;
273	}	303	}
274	}	304	}
275		305
276	static maprow *	306	static maprow *
277	map_get_row (CFPlus__Map self, int y)	307	map_get_row (DC__Map self, int y)
278	{	308	{
279	if (0 > y)	309	if (0 > y)
280	{	310	{
281	int extend = - y + MAP_EXTEND_Y;	311	int extend = - y + MAP_EXTEND_Y;
282	Prepend (maprow, self->row, self->rows, extend);	312	Prepend (maprow, self->row, self->rows, extend);
…		…
320		350
321	return row->col + (x - row->c0);	351	return row->col + (x - row->c0);
322	}	352	}
323		353
324	static mapcell *	354	static mapcell *
325	map_get_cell (CFPlus__Map self, int x, int y)	355	map_get_cell (DC__Map self, int x, int y)
326	{	356	{
327	return row_get_cell (map_get_row (self, y), x);	357	return row_get_cell (map_get_row (self, y), x);
328	}	358	}
329		359
330	static void	360	static void
331	map_clear (CFPlus__Map self)	361	map_clear (DC__Map self)
332	{	362	{
333	int r;	363	int r;
334		364
335	for (r = 0; r < self->rows; r++)	365	for (r = 0; r < self->rows; r++)
336	Safefree (self->row[r].col);	366	Safefree (self->row[r].col);
…		…
344	self->row = 0;	374	self->row = 0;
345	self->rows = 0;	375	self->rows = 0;
346	}	376	}
347		377
348	static void	378	static void
349	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	379	map_blank (DC__Map self, int x0, int y0, int w, int h)
350	{	380	{
351	int x, y;	381	int x, y;
352	maprow *row;	382	maprow *row;
353	mapcell *cell;	383	mapcell *cell;
354		384
…		…
433	n |= n >> 16;	463	n |= n >> 16;
434		464
435	return n + 1;	465	return n + 1;
436	}	466	}
437		467
		468	static unsigned int
		469	popcount (unsigned int n)
		470	{
		471	n -= (n >> 1) & 0x55555555U;
		472	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		473	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		474	n *= 0x01010101U;
		475
		476	return n >> 24;
		477	}
		478
438	/* SDL should provide this, really. */	479	/* SDL should provide this, really. */
439	#define SDLK_MODIFIER_MIN 300	480	#define SDLK_MODIFIER_MIN 300
440	#define SDLK_MODIFIER_MAX 314	481	#define SDLK_MODIFIER_MAX 314
441		482
442	/******************************************************************************/	483	/******************************************************************************/
…		…
480	return 0;	521	return 0;
481		522
482	return 1;	523	return 1;
483	}	524	}
484		525
485	MODULE = CFPlus PACKAGE = CFPlus	526	MODULE = Deliantra::Client PACKAGE = DC
486		527
487	PROTOTYPES: ENABLE	528	PROTOTYPES: ENABLE
488		529
489	BOOT:	530	BOOT:
490	{	531	{
491	HV *stash = gv_stashpv ("CFPlus", 1);	532	HV *stash = gv_stashpv ("DC", 1);
492	static const struct {	533	static const struct {
493	const char *name;	534	const char *name;
494	IV iv;	535	IV iv;
495	} *civ, const_iv[] = {	536	} *civ, const_iv[] = {
496	# define const_iv(name) { # name, (IV)name }	537	# define const_iv(name) { # name, (IV)name }
…		…
518		559
519	const_iv (SDL_APPINPUTFOCUS),	560	const_iv (SDL_APPINPUTFOCUS),
520	const_iv (SDL_APPMOUSEFOCUS),	561	const_iv (SDL_APPMOUSEFOCUS),
521	const_iv (SDL_APPACTIVE),	562	const_iv (SDL_APPACTIVE),
522		563
		564	const_iv (SDLK_FIRST),
		565	const_iv (SDLK_LAST),
523	const_iv (SDLK_KP0),	566	const_iv (SDLK_KP0),
524	const_iv (SDLK_KP1),	567	const_iv (SDLK_KP1),
525	const_iv (SDLK_KP2),	568	const_iv (SDLK_KP2),
526	const_iv (SDLK_KP3),	569	const_iv (SDLK_KP3),
527	const_iv (SDLK_KP4),	570	const_iv (SDLK_KP4),
…		…
599	const_iv (KMOD_LMETA),	642	const_iv (KMOD_LMETA),
600	const_iv (KMOD_RMETA),	643	const_iv (KMOD_RMETA),
601	const_iv (KMOD_NUM),	644	const_iv (KMOD_NUM),
602	const_iv (KMOD_CAPS),	645	const_iv (KMOD_CAPS),
603	const_iv (KMOD_MODE),	646	const_iv (KMOD_MODE),
		647
		648	const_iv (MIX_DEFAULT_FORMAT),
604	# undef const_iv	649	# undef const_iv
605	};	650	};
606		651
607	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	652	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	653	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
626		671
627	NV floor (NV x)	672	NV floor (NV x)
628		673
629	NV ceil (NV x)	674	NV ceil (NV x)
630		675
		676	IV minpot (UV n)
		677
		678	IV popcount (UV n)
		679
631	void	680	void
632	pango_init ()	681	pango_init ()
633	CODE:	682	CODE:
634	{	683	{
635	opengl_fontmap = pango_opengl_font_map_new ();	684	opengl_fontmap = pango_opengl_font_map_new ();
636	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	685	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	686	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		687	/*pango_context_set_font_description (opengl_context, default_font);*/
		688	#if PANGO_VERSION_CHECK (1, 15, 2)
		689	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		690	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		691	#endif
638	}	692	}
639		693
640	char *	694	char *
641	SDL_GetError ()	695	SDL_GetError ()
642		696
…		…
674	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	728	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675		729
676	if (m && m != (SDL_Rect **)-1)	730	if (m && m != (SDL_Rect **)-1)
677	while (*m)	731	while (*m)
678	{	732	{
679	if ((*m)->w >= 640 && (*m)->h >= 480)	733	if ((*m)->w >= 800 && (*m)->h >= 480)
680	{	734	{
681	AV *av = newAV ();	735	AV *av = newAV ();
682	av_push (av, newSViv ((*m)->w));	736	av_push (av, newSViv ((*m)->w));
683	av_push (av, newSViv ((*m)->h));	737	av_push (av, newSViv ((*m)->h));
684	av_push (av, newSViv (rgb));	738	av_push (av, newSViv (rgb));
…		…
708		762
709	if (RETVAL)	763	if (RETVAL)
710	{	764	{
711	av_clear (texture_av);	765	av_clear (texture_av);
712		766
713	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	767	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	768	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715	#include "glfunc.h"	769	#include "glfunc.h"
716	#undef GL_FUNC	770	#undef GL_FUNC
717	}	771	}
718	}	772	}
…		…
725	char *	779	char *
726	SDL_GetKeyName (int sym)	780	SDL_GetKeyName (int sym)
727		781
728	int	782	int
729	SDL_GetAppState ()	783	SDL_GetAppState ()
		784
		785	int
		786	SDL_GetModState ()
730		787
731	void	788	void
732	poll_events ()	789	poll_events ()
733	PPCODE:	790	PPCODE:
734	{	791	{
…		…
744	{	801	{
745	case SDL_KEYDOWN:	802	case SDL_KEYDOWN:
746	case SDL_KEYUP:	803	case SDL_KEYUP:
747	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	804	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	805	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	806	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
750	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	807	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
751	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	808	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752	break;	809	break;
753		810
754	case SDL_ACTIVEEVENT:	811	case SDL_ACTIVEEVENT:
755	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	812	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
773	x = ev.motion.x;	830	x = ev.motion.x;
774	y = ev.motion.y;	831	y = ev.motion.y;
775	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	832	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776	}	833	}
777		834
778	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	835	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779	hv_store (hv, "state", 5, newSViv (state), 0);	836	hv_store (hv, "state", 5, newSViv (state), 0);
780	hv_store (hv, "x", 1, newSViv (x), 0);	837	hv_store (hv, "x", 1, newSViv (x), 0);
781	hv_store (hv, "y", 1, newSViv (y), 0);	838	hv_store (hv, "y", 1, newSViv (y), 0);
782	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	839	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	840	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784	}	841	}
785	break;	842	break;
786		843
787	case SDL_MOUSEBUTTONDOWN:	844	case SDL_MOUSEBUTTONDOWN:
788	case SDL_MOUSEBUTTONUP:	845	case SDL_MOUSEBUTTONUP:
789	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	846	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790		847
791	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	848	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	849	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	850	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	851	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
799	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	856	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	857	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801	break;	858	break;
802	}	859	}
803		860
804	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	861	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805	}	862	}
806	}	863	}
807		864
808	int	865	int
809	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	866	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810	POSTCALL:	867	POSTCALL:
811	Mix_HookMusicFinished (music_finished);	868	Mix_HookMusicFinished (music_finished);
812	Mix_ChannelFinished (channel_finished);	869	Mix_ChannelFinished (channel_finished);
		870
		871	void
		872	Mix_QuerySpec ()
		873	PPCODE:
		874	{
		875	int freq, channels;
		876	Uint16 format;
		877
		878	if (Mix_QuerySpec (&freq, &format, &channels))
		879	{
		880	EXTEND (SP, 3);
		881	PUSHs (sv_2mortal (newSViv (freq)));
		882	PUSHs (sv_2mortal (newSViv (format)));
		883	PUSHs (sv_2mortal (newSViv (channels)));
		884	}
		885	}
813		886
814	void	887	void
815	Mix_CloseAudio ()	888	Mix_CloseAudio ()
816		889
817	int	890	int
…		…
852	}	925	}
853	}	926	}
854	#endif	927	#endif
855	}	928	}
856		929
857	void	930	int
858	add_font (char *file)	931	add_font (char *file)
859	CODE:	932	CODE:
860	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	933	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		934	OUTPUT:
		935	RETVAL
861		936
862	void	937	void
863	load_image_inline (SV *image_)	938	load_image_inline (SV *image_)
864	ALIAS:	939	ALIAS:
865	load_image_file = 1	940	load_image_file = 1
…		…
951	void	1026	void
952	error (char *message)	1027	error (char *message)
953	CODE:	1028	CODE:
954	fprintf (stderr, "ERROR: %s\n", message);	1029	fprintf (stderr, "ERROR: %s\n", message);
955	#ifdef _WIN32	1030	#ifdef _WIN32
956	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1031	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957	#endif	1032	#endif
958		1033
959	void	1034	void
960	fatal (char *message)	1035	fatal (char *message)
961	CODE:	1036	CODE:
962	fprintf (stderr, "FATAL: %s\n", message);	1037	fprintf (stderr, "FATAL: %s\n", message);
963	#ifdef _WIN32	1038	#ifdef _WIN32
964	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1039	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965	#endif	1040	#endif
966	_exit (1);	1041	_exit (1);
967		1042
968	void	1043	void
969	_exit (int retval = 0)	1044	_exit (int retval = 0)
…		…
981	#if DEBUG	1056	#if DEBUG
982	VALGRIND_DO_LEAK_CHECK;	1057	VALGRIND_DO_LEAK_CHECK;
983	#endif	1058	#endif
984	}	1059	}
985		1060
986	MODULE = CFPlus PACKAGE = CFPlus::Font	1061	MODULE = Deliantra::Client PACKAGE = DC::Font
987		1062
988	PROTOTYPES: DISABLE	1063	PROTOTYPES: DISABLE
989		1064
990	CFPlus::Font	1065	DC::Font
991	new_from_file (SV *class, char *path, int id = 0)	1066	new_from_file (SV *class, char *path, int id = 0)
992	CODE:	1067	CODE:
993	{	1068	{
994	int count;	1069	int count;
995	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1070	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
998	}	1073	}
999	OUTPUT:	1074	OUTPUT:
1000	RETVAL	1075	RETVAL
1001		1076
1002	void	1077	void
1003	DESTROY (CFPlus::Font self)	1078	DESTROY (DC::Font self)
1004	CODE:	1079	CODE:
1005	pango_font_description_free (self);	1080	pango_font_description_free (self);
1006		1081
1007	void	1082	void
1008	make_default (CFPlus::Font self)	1083	make_default (DC::Font self)
1009	PROTOTYPE: $	1084	PROTOTYPE: $
1010	CODE:	1085	CODE:
1011	default_font = self;	1086	default_font = self;
1012		1087
1013	MODULE = CFPlus PACKAGE = CFPlus::Layout	1088	MODULE = Deliantra::Client PACKAGE = DC::Layout
1014		1089
1015	PROTOTYPES: DISABLE	1090	PROTOTYPES: DISABLE
1016		1091
1017	void	1092	void
1018	reset_glyph_cache ()	1093	glyph_cache_backup ()
1019	PROTOTYPE:	1094	PROTOTYPE:
1020	CODE:	1095	CODE:
		1096	tc_backup ();
		1097
		1098	void
		1099	glyph_cache_restore ()
		1100	PROTOTYPE:
		1101	CODE:
1021	tc_clear ();	1102	tc_restore ();
1022		1103
1023	CFPlus::Layout	1104	DC::Layout
1024	new (SV *class)	1105	new (SV *class)
1025	CODE:	1106	CODE:
1026	New (0, RETVAL, 1, struct cf_layout);	1107	New (0, RETVAL, 1, struct cf_layout);
1027		1108
1028	RETVAL->pl = pango_layout_new (opengl_context);	1109	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1030	RETVAL->g = 1.;	1111	RETVAL->g = 1.;
1031	RETVAL->b = 1.;	1112	RETVAL->b = 1.;
1032	RETVAL->a = 1.;	1113	RETVAL->a = 1.;
1033	RETVAL->base_height = MIN_FONT_HEIGHT;	1114	RETVAL->base_height = MIN_FONT_HEIGHT;
1034	RETVAL->font = 0;	1115	RETVAL->font = 0;
		1116	RETVAL->rc = rc_alloc ();
1035		1117
1036	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1118	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037	layout_update_font (RETVAL);	1119	layout_update_font (RETVAL);
1038	OUTPUT:	1120	OUTPUT:
1039	RETVAL	1121	RETVAL
1040		1122
1041	void	1123	void
1042	DESTROY (CFPlus::Layout self)	1124	DESTROY (DC::Layout self)
1043	CODE:	1125	CODE:
1044	g_object_unref (self->pl);	1126	g_object_unref (self->pl);
		1127	rc_free (self->rc);
1045	Safefree (self);	1128	Safefree (self);
1046		1129
1047	void	1130	void
1048	set_text (CFPlus::Layout self, SV *text_)	1131	set_text (DC::Layout self, SV *text_)
1049	CODE:	1132	CODE:
1050	{	1133	{
1051	STRLEN textlen;	1134	STRLEN textlen;
1052	char *text = SvPVutf8 (text_, textlen);	1135	char *text = SvPVutf8 (text_, textlen);
1053		1136
1054	pango_layout_set_text (self->pl, text, textlen);	1137	pango_layout_set_text (self->pl, text, textlen);
1055	}	1138	}
1056		1139
1057	void	1140	void
1058	set_markup (CFPlus::Layout self, SV *text_)	1141	set_markup (DC::Layout self, SV *text_)
1059	CODE:	1142	CODE:
1060	{	1143	{
1061	STRLEN textlen;	1144	STRLEN textlen;
1062	char *text = SvPVutf8 (text_, textlen);	1145	char *text = SvPVutf8 (text_, textlen);
1063		1146
1064	pango_layout_set_markup (self->pl, text, textlen);	1147	pango_layout_set_markup (self->pl, text, textlen);
1065	}	1148	}
1066		1149
1067	void	1150	void
1068	set_shapes (CFPlus::Layout self, ...)	1151	set_shapes (DC::Layout self, ...)
1069	CODE:	1152	CODE:
1070	{	1153	{
1071	PangoAttrList *attrs = 0;	1154	PangoAttrList *attrs = 0;
1072	const char *text = pango_layout_get_text (self->pl);	1155	const char *text = pango_layout_get_text (self->pl);
1073	const char *pos = text;	1156	const char *pos = text;
…		…
1108	if (attrs)	1191	if (attrs)
1109	pango_layout_set_attributes (self->pl, attrs);	1192	pango_layout_set_attributes (self->pl, attrs);
1110	}	1193	}
1111		1194
1112	void	1195	void
1113	get_shapes (CFPlus::Layout self)	1196	get_shapes (DC::Layout self)
1114	PPCODE:	1197	PPCODE:
1115	{	1198	{
1116	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1199	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117		1200
1118	do	1201	do
1119	{	1202	{
1120	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1203	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121		1204
1122	if (run && shape_attr_p (run))	1205	if (run && shape_attr_p (run))
1123	{	1206	{
1124	PangoRectangle extents;	1207	PangoRectangle extents;
1125	pango_layout_iter_get_run_extents (iter, 0, &extents);	1208	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1133		1216
1134	pango_layout_iter_free (iter);	1217	pango_layout_iter_free (iter);
1135	}	1218	}
1136		1219
1137	int	1220	int
1138	has_wrapped (CFPlus::Layout self)	1221	has_wrapped (DC::Layout self)
1139	CODE:	1222	CODE:
1140	{	1223	{
1141	int lines = 1;	1224	int lines = 1;
1142	const char *text = pango_layout_get_text (self->pl);	1225	const char *text = pango_layout_get_text (self->pl);
1143		1226
…		…
1148	}	1231	}
1149	OUTPUT:	1232	OUTPUT:
1150	RETVAL	1233	RETVAL
1151		1234
1152	SV *	1235	SV *
1153	get_text (CFPlus::Layout self)	1236	get_text (DC::Layout self)
1154	CODE:	1237	CODE:
1155	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1238	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156	sv_utf8_decode (RETVAL);	1239	sv_utf8_decode (RETVAL);
1157	OUTPUT:	1240	OUTPUT:
1158	RETVAL	1241	RETVAL
1159		1242
1160	void	1243	void
1161	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1244	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1162	CODE:	1245	CODE:
1163	self->r = r;	1246	self->r = r;
1164	self->g = g;	1247	self->g = g;
1165	self->b = b;	1248	self->b = b;
1166	self->a = a;	1249	self->a = a;
1167		1250
1168	void	1251	void
1169	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1252	set_font (DC::Layout self, DC::Font font = 0)
1170	CODE:	1253	CODE:
1171	if (self->font != font)	1254	if (self->font != font)
1172	{	1255	{
1173	self->font = font;	1256	self->font = font;
1174	layout_update_font (self);	1257	layout_update_font (self);
1175	}	1258	}
1176		1259
1177	void	1260	void
1178	set_height (CFPlus::Layout self, int base_height)	1261	set_height (DC::Layout self, int base_height)
1179	CODE:	1262	CODE:
1180	if (self->base_height != base_height)	1263	if (self->base_height != base_height)
1181	{	1264	{
1182	self->base_height = base_height;	1265	self->base_height = base_height;
1183	layout_update_font (self);	1266	layout_update_font (self);
1184	}	1267	}
1185		1268
1186	void	1269	void
1187	set_width (CFPlus::Layout self, int max_width = -1)	1270	set_width (DC::Layout self, int max_width = -1)
1188	CODE:	1271	CODE:
1189	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1272	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1190		1273
1191	void	1274	void
1192	set_indent (CFPlus::Layout self, int indent)	1275	set_indent (DC::Layout self, int indent)
1193	CODE:	1276	CODE:
1194	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1277	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195		1278
1196	void	1279	void
1197	set_spacing (CFPlus::Layout self, int spacing)	1280	set_spacing (DC::Layout self, int spacing)
1198	CODE:	1281	CODE:
1199	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1282	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200		1283
1201	void	1284	void
1202	set_ellipsise (CFPlus::Layout self, int ellipsise)	1285	set_ellipsise (DC::Layout self, int ellipsise)
1203	CODE:	1286	CODE:
1204	pango_layout_set_ellipsize (self->pl,	1287	pango_layout_set_ellipsize (self->pl,
1205	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1288	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1289	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1290	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208	: PANGO_ELLIPSIZE_NONE	1291	: PANGO_ELLIPSIZE_NONE
1209	);	1292	);
1210		1293
1211	void	1294	void
1212	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1295	set_single_paragraph_mode (DC::Layout self, int spm)
1213	CODE:	1296	CODE:
1214	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1297	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215		1298
1216	void	1299	void
1217	size (CFPlus::Layout self)	1300	size (DC::Layout self)
1218	PPCODE:	1301	PPCODE:
1219	{	1302	{
1220	int w, h;	1303	int w, h;
1221		1304
1222	layout_get_pixel_size (self, &w, &h);	1305	layout_get_pixel_size (self, &w, &h);
…		…
1225	PUSHs (sv_2mortal (newSViv (w)));	1308	PUSHs (sv_2mortal (newSViv (w)));
1226	PUSHs (sv_2mortal (newSViv (h)));	1309	PUSHs (sv_2mortal (newSViv (h)));
1227	}	1310	}
1228		1311
1229	int	1312	int
1230	descent (CFPlus::Layout self)	1313	descent (DC::Layout self)
1231	CODE:	1314	CODE:
1232	{	1315	{
1233	PangoRectangle rect;	1316	PangoRectangle rect;
1234	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1317	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235	pango_layout_line_get_pixel_extents (line, 0, &rect);	1318	pango_layout_line_get_pixel_extents (line, 0, &rect);
1236	RETVAL = PANGO_DESCENT (rect);	1319	RETVAL = PANGO_DESCENT (rect);
1237	}	1320	}
1238	OUTPUT:	1321	OUTPUT:
1239	RETVAL	1322	RETVAL
1240		1323
1241	int	1324	int
1242	xy_to_index (CFPlus::Layout self, int x, int y)	1325	xy_to_index (DC::Layout self, int x, int y)
1243	CODE:	1326	CODE:
1244	{	1327	{
1245	int index, trailing;	1328	int index, trailing;
1246	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1329	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1247	RETVAL = index + trailing;	1330	RETVAL = index + trailing;
1248	}	1331	}
1249	OUTPUT:	1332	OUTPUT:
1250	RETVAL	1333	RETVAL
1251		1334
1252	void	1335	void
1253	cursor_pos (CFPlus::Layout self, int index)	1336	cursor_pos (DC::Layout self, int index)
1254	PPCODE:	1337	PPCODE:
1255	{	1338	{
1256	PangoRectangle strong_pos;	1339	PangoRectangle pos;
1257	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1340	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258		1341
1259	EXTEND (SP, 3);	1342	EXTEND (SP, 3);
1260	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1343	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1344	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1345	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263	}	1346	}
1264		1347
1265	void	1348	void
1266	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1349	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267	PPCODE:	1350	PPCODE:
1268	{	1351	{
1269	int line, x;	1352	int line, x;
1270		1353
1271	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1354	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1355	#if !PANGO_VERSION_CHECK (1, 17, 3)
1272	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1356	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273		1357	--line;
		1358	#endif
1274	EXTEND (SP, 2);	1359	EXTEND (SP, 2);
1275	PUSHs (sv_2mortal (newSViv (line - 1)));	1360	PUSHs (sv_2mortal (newSViv (line)));
1276	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1361	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277	}	1362	}
1278		1363
1279	void	1364	void
1280	line_x_to_index (CFPlus::Layout self, int line, int x)	1365	line_x_to_index (DC::Layout self, int line, int x)
1281	PPCODE:	1366	PPCODE:
1282	{	1367	{
1283	PangoLayoutLine *lp;	1368	PangoLayoutLine *lp;
1284	int index, trailing;	1369	int index, trailing;
1285		1370
1286	if (line < 0)	1371	if (line < 0)
1287	XSRETURN_EMPTY;	1372	XSRETURN_EMPTY;
1288		1373
1289	if (!(lp = pango_layout_get_line (self->pl, line)))	1374	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290	XSRETURN_EMPTY; /* do better */	1375	XSRETURN_EMPTY; /* do better */
1291		1376
1292	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1377	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293		1378
1294	EXTEND (SP, 2);	1379	EXTEND (SP, 2);
…		…
1300	PUSHs (sv_2mortal (newSViv (trailing)));	1385	PUSHs (sv_2mortal (newSViv (trailing)));
1301	}	1386	}
1302	}	1387	}
1303		1388
1304	void	1389	void
1305	render (CFPlus::Layout self, float x, float y, int flags = 0)	1390	render (DC::Layout self, float x, float y, int flags = 0)
1306	PPCODE:	1391	CODE:
		1392	rc_clear (self->rc);
1307	pango_opengl_render_layout_subpixel (	1393	pango_opengl_render_layout_subpixel (
1308	self->pl,	1394	self->pl,
		1395	self->rc,
1309	x * PANGO_SCALE, y * PANGO_SCALE,	1396	x * PANGO_SCALE, y * PANGO_SCALE,
1310	self->r, self->g, self->b, self->a,	1397	self->r, self->g, self->b, self->a,
1311	flags	1398	flags
1312	);	1399	);
		1400	// we assume that context_change actually clears/frees stuff
		1401	// and does not do any recomputation...
		1402	pango_layout_context_changed (self->pl);
1313		1403
1314	MODULE = CFPlus PACKAGE = CFPlus::Texture	1404	void
		1405	draw (DC::Layout self)
		1406	CODE:
		1407	{
		1408	glEnable (GL_TEXTURE_2D);
		1409	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1410	glEnable (GL_BLEND);
		1411	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1412	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1413	glEnable (GL_ALPHA_TEST);
		1414	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1415
		1416	rc_draw (self->rc);
		1417
		1418	glDisable (GL_ALPHA_TEST);
		1419	glDisable (GL_BLEND);
		1420	glDisable (GL_TEXTURE_2D);
		1421	}
		1422
		1423	MODULE = Deliantra::Client PACKAGE = DC::Texture
1315		1424
1316	PROTOTYPES: ENABLE	1425	PROTOTYPES: ENABLE
1317
1318	int minpot (int n)
1319		1426
1320	void	1427	void
1321	pad (SV *data_, int ow, int oh, int nw, int nh)	1428	pad (SV *data_, int ow, int oh, int nw, int nh)
1322	CODE:	1429	CODE:
1323	{	1430	{
…		…
1350	HV *hv = (HV *)SvRV (self);	1457	HV *hv = (HV *)SvRV (self);
1351	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1458	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1459	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1460	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354		1461
		1462	if (name <= 0)
		1463	XSRETURN_EMPTY;
		1464
1355	if (items < 5)	1465	if (items < 5)
1356	{	1466	{
1357	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1467	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1468	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359	}	1469	}
…		…
1397	RETVAL = width > 0;	1507	RETVAL = width > 0;
1398	}	1508	}
1399	OUTPUT:	1509	OUTPUT:
1400	RETVAL	1510	RETVAL
1401		1511
1402	MODULE = CFPlus PACKAGE = CFPlus::Map	1512	MODULE = Deliantra::Client PACKAGE = DC::Map
1403		1513
1404	PROTOTYPES: DISABLE	1514	PROTOTYPES: DISABLE
1405		1515
1406	CFPlus::Map	1516	DC::Map
1407	new (SV *class)	1517	new (SV *class)
1408	CODE:	1518	CODE:
1409	New (0, RETVAL, 1, struct map);	1519	New (0, RETVAL, 1, struct map);
1410	RETVAL->x = 0;	1520	RETVAL->x = 0;
1411	RETVAL->y = 0;	1521	RETVAL->y = 0;
…		…
1419	RETVAL->row = 0;	1529	RETVAL->row = 0;
1420	OUTPUT:	1530	OUTPUT:
1421	RETVAL	1531	RETVAL
1422		1532
1423	void	1533	void
1424	DESTROY (CFPlus::Map self)	1534	DESTROY (DC::Map self)
1425	CODE:	1535	CODE:
1426	{	1536	{
1427	map_clear (self);	1537	map_clear (self);
1428	Safefree (self->face2tile);	1538	Safefree (self->face2tile);
1429	Safefree (self->tex);	1539	Safefree (self->tex);
1430	Safefree (self);	1540	Safefree (self);
1431	}	1541	}
1432		1542
1433	void	1543	void
1434	resize (CFPlus::Map self, int map_width, int map_height)	1544	resize (DC::Map self, int map_width, int map_height)
1435	CODE:	1545	CODE:
1436	self->w = map_width;	1546	self->w = map_width;
1437	self->h = map_height;	1547	self->h = map_height;
1438		1548
1439	void	1549	void
1440	clear (CFPlus::Map self)	1550	clear (DC::Map self)
1441	CODE:	1551	CODE:
1442	map_clear (self);	1552	map_clear (self);
1443		1553
1444	void	1554	void
1445	set_tileid (CFPlus::Map self, int face, int tile)	1555	set_tileid (DC::Map self, int face, int tile)
1446	CODE:	1556	CODE:
1447	{	1557	{
1448	need_facenum (self, face); self->face2tile [face] = tile;	1558	need_facenum (self, face); self->face2tile [face] = tile;
1449	need_texid (self, tile);	1559	need_texid (self, tile);
1450	}	1560	}
1451		1561
1452	void	1562	void
1453	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1563	set_smooth (DC::Map self, int face, int smooth, int level)
1454	CODE:	1564	CODE:
1455	{	1565	{
1456	tileid texid;	1566	tileid texid;
1457	maptex *tex;	1567	maptex *tex;
1458		1568
…		…
1471	tex->smoothtile = self->face2tile [smooth];	1581	tex->smoothtile = self->face2tile [smooth];
1472	tex->smoothlevel = level;	1582	tex->smoothlevel = level;
1473	}	1583	}
1474		1584
1475	void	1585	void
1476	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1586	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1477	CODE:	1587	CODE:
1478	{	1588	{
1479	need_texid (self, texid);	1589	need_texid (self, texid);
1480		1590
1481	{	1591	{
…		…
1501	// from transparent color bleeding and ugly wrapping effects.	1611	// from transparent color bleeding and ugly wrapping effects.
1502	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1612	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503	}	1613	}
1504		1614
1505	int	1615	int
1506	ox (CFPlus::Map self)	1616	ox (DC::Map self)
1507	ALIAS:	1617	ALIAS:
1508	oy = 1	1618	oy = 1
1509	x = 2	1619	x = 2
1510	y = 3	1620	y = 3
1511	w = 4	1621	w = 4
…		…
1522	}	1632	}
1523	OUTPUT:	1633	OUTPUT:
1524	RETVAL	1634	RETVAL
1525		1635
1526	void	1636	void
1527	scroll (CFPlus::Map self, int dx, int dy)	1637	scroll (DC::Map self, int dx, int dy)
1528	CODE:	1638	CODE:
1529	{	1639	{
1530	if (dx > 0)	1640	if (dx > 0)
1531	map_blank (self, self->x, self->y, dx, self->h);	1641	map_blank (self, self->x, self->y, dx, self->h);
1532	else if (dx < 0)	1642	else if (dx < 0)
…		…
1547	self->rows += MAP_EXTEND_Y;	1657	self->rows += MAP_EXTEND_Y;
1548	self->y += MAP_EXTEND_Y;	1658	self->y += MAP_EXTEND_Y;
1549	}	1659	}
1550	}	1660	}
1551		1661
1552	void	1662	SV *
1553	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1663	map1a_update (DC::Map self, SV *data_, int extmap)
1554	CODE:	1664	CODE:
1555	{	1665	{
1556	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1666	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557	uint8_t *data_end = (uint8_t *)SvEND (data_);	1667	uint8_t *data_end = (uint8_t *)SvEND (data_);
1558	mapcell *cell;	1668	mapcell *cell;
1559	int x, y, flags;	1669	int x, y, z, flags;
		1670	AV *missing = newAV ();
		1671	RETVAL = newRV_noinc ((SV *)missing);
1560		1672
1561	while (data < data_end - 1)	1673	while (data < data_end - 1)
1562	{	1674	{
1563	flags = (data [0] << 8) + data [1]; data += 2;	1675	flags = (data [0] << 8) + data [1]; data += 2;
1564		1676
…		…
1584	uint8_t ext, cmd;	1696	uint8_t ext, cmd;
1585		1697
1586	do	1698	do
1587	{	1699	{
1588	ext = *data++;	1700	ext = *data++;
1589	cmd = ext & 0x3f;	1701	cmd = ext & 0x7f;
1590		1702
1591	if (cmd < 4)	1703	if (cmd < 4)
1592	cell->darkness = 255 - ext * 64 + 1;	1704	cell->darkness = 255 - ext * 64 + 1;
1593	else if (cmd == 5) // health	1705	else if (cmd == 5) // health
1594	{	1706	{
…		…
1597	}	1709	}
1598	else if (cmd == 6) // monster width	1710	else if (cmd == 6) // monster width
1599	cell->stat_width = *data++ + 1;	1711	cell->stat_width = *data++ + 1;
1600	else if (cmd == 0x47)	1712	else if (cmd == 0x47)
1601	{	1713	{
1602	if (*data == 4)	1714	if (*data == 1) cell->player = data [1];
1603	; // decode player count	1715	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1716	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1717	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1604		1718
1605	data += *data + 1;	1719	data += *data + 1;
1606	}	1720	}
1607	else if (cmd == 8) // cell flags	1721	else if (cmd == 8) // cell flags
1608	cell->flags = *data++;	1722	cell->flags = *data++;
…		…
1615	}	1729	}
1616	else	1730	else
1617	cell->darkness = *data++ + 1;	1731	cell->darkness = *data++ + 1;
1618	}	1732	}
1619		1733
		1734	for (z = 0; z <= 2; ++z)
1620	if (flags & 4)	1735	if (flags & (4 >> z))
1621	{	1736	{
1622	faceid face = (data [0] << 8) + data [1]; data += 2;	1737	faceid face = (data [0] << 8) + data [1]; data += 2;
1623	need_facenum (self, face);	1738	need_facenum (self, face);
1624	cell->tile [0] = self->face2tile [face];	1739	cell->tile [z] = self->face2tile [face];
		1740
		1741	if (cell->tile [z])
		1742	{
		1743	maptex *tex = self->tex + cell->tile [z];
		1744	if (!tex->name)
		1745	av_push (missing, newSViv (cell->tile [z]));
		1746
		1747	if (tex->smoothtile)
		1748	{
		1749	maptex *smooth = self->tex + tex->smoothtile;
		1750	if (!smooth->name)
		1751	av_push (missing, newSViv (tex->smoothtile));
		1752	}
		1753	}
1625	}	1754	}
1626
1627	if (flags & 2)
1628	{
1629	faceid face = (data [0] << 8) + data [1]; data += 2;
1630	need_facenum (self, face);
1631	cell->tile [1] = self->face2tile [face];
1632	}
1633
1634	if (flags & 1)
1635	{
1636	faceid face = (data [0] << 8) + data [1]; data += 2;
1637	need_facenum (self, face);
1638	cell->tile [2] = self->face2tile [face];
1639	}
1640	}	1755	}
1641	else	1756	else
1642	cell->darkness = 0;	1757	cell->darkness = 0;
1643	}	1758	}
1644	}	1759	}
		1760	OUTPUT:
		1761	RETVAL
1645		1762
1646	SV *	1763	SV *
1647	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1764	mapmap (DC::Map self, int x0, int y0, int w, int h)
1648	CODE:	1765	CODE:
1649	{	1766	{
1650	int x1, x;	1767	int x1, x;
1651	int y1, y;	1768	int y1, y;
1652	int z;	1769	int z;
…		…
1697	}	1814	}
1698	OUTPUT:	1815	OUTPUT:
1699	RETVAL	1816	RETVAL
1700		1817
1701	void	1818	void
1702	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1819	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1703	CODE:	1820	CODE:
1704	{	1821	{
		1822	int x, y, z;
		1823
1705	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1824	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1825	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1707	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1826	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1708	smooth_key skey;	1827	smooth_key skey;
1709	int x, y, z;	1828	int pl_x, pl_y;
1710	int last_name;	1829	maptex pl_tex;
		1830
		1831	pl_tex.name = 0;
		1832
		1833	rc_t *rc = rc_alloc ();
		1834	rc_key_t key;
		1835	rc_array_t *arr;
1711		1836
1712	// thats current max. sorry.	1837	// thats current max. sorry.
1713	if (sw > 255) sw = 255;	1838	if (sw > 255) sw = 255;
1714	if (sh > 255) sh = 255;	1839	if (sh > 255) sh = 255;
1715		1840
1716	// clear key, in case of extra padding	1841	// clear key, in case of extra padding
1717	memset (&skey, 0, sizeof (skey));	1842	memset (&skey, 0, sizeof (skey));
1718		1843
1719	glColor4ub (255, 255, 255, 255);	1844	memset (&key, 0, sizeof (key));
1720		1845	key.r = 255;
1721	glEnable (GL_BLEND);	1846	key.g = 255;
1722	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1847	key.b = 255;
1723	glEnable (GL_TEXTURE_2D);	1848	key.a = 255;
1724	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1849	key.mode = GL_QUADS;
1725		1850	key.format = GL_T2F_V3F;
1726	glBegin (GL_QUADS);	1851	key.texname = -1;
1727
1728	last_name = 0;
1729		1852
1730	mx += self->x;	1853	mx += self->x;
1731	my += self->y;	1854	my += self->y;
1732		1855
1733	// first pass: determine smooth_max	1856	// first pass: determine smooth_max
…		…
1749	MAX (self->tex [cell->tile [0]].smoothlevel,	1872	MAX (self->tex [cell->tile [0]].smoothlevel,
1750	MAX (self->tex [cell->tile [1]].smoothlevel,	1873	MAX (self->tex [cell->tile [1]].smoothlevel,
1751	self->tex [cell->tile [2]].smoothlevel));	1874	self->tex [cell->tile [2]].smoothlevel));
1752	}	1875	}
1753	}	1876	}
		1877
		1878	glEnable (GL_BLEND);
		1879	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1880	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1754		1881
1755	for (z = 0; z <= 2; z++)	1882	for (z = 0; z <= 2; z++)
1756	{	1883	{
1757	memset (smooth_level, 0, sizeof (smooth_level));	1884	memset (smooth_level, 0, sizeof (smooth_level));
1758		1885
…		…
1771	{	1898	{
1772	maptex tex = self->tex [tile];	1899	maptex tex = self->tex [tile];
1773	int px = (x + 1) * T - tex.w;	1900	int px = (x + 1) * T - tex.w;
1774	int py = (y + 1) * T - tex.h;	1901	int py = (y + 1) * T - tex.h;
1775		1902
1776	// suppressing texture state switches here
1777	// is only moderately effective, but worth the extra effort
1778	if (last_name != tex.name)	1903	if (key.texname != tex.name)
1779	{	1904	{
1780	if (!tex.name)	1905	if (!tex.name)
1781	tex = self->tex [2]; /* missing, replace by noface */	1906	tex = self->tex [2]; /* missing, replace by noface */
1782		1907
1783	glEnd ();	1908	key.texname = tex.name;
1784	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1909	arr = rc_array (rc, &key);
1785	glBegin (GL_QUADS);
1786	}	1910	}
1787		1911
1788	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1912	if (expect_false (cell->player == player) && expect_false (z == 2))
1789	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1790	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1792
1793	if (cell->flags && z == 2)
1794	{	1913	{
		1914	pl_x = px;
		1915	pl_y = py;
		1916	pl_tex = tex;
		1917	continue;
		1918	}
		1919
		1920	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1921	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		1922	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		1923	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		1924
		1925	if (expect_false (cell->flags) && expect_false (z == 2))
		1926	{
		1927	// overlays such as the speech bubble, probably more to come
1795	if (cell->flags & 1)	1928	if (cell->flags & 1)
1796	{	1929	{
1797	maptex tex = self->tex [1];	1930	maptex tex = self->tex [1];
1798	int px = x * T + T * 2 / 32;	1931	int px = x * T + T * 2 / 32;
1799	int py = y * T - T * 6 / 32;	1932	int py = y * T - T * 6 / 32;
1800		1933
		1934	if (tex.name)
1801	glEnd ();	1935	{
1802	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1936	if (key.texname != tex.name)
		1937	{
		1938	key.texname = tex.name;
		1939	arr = rc_array (rc, &key);
		1940	}
		1941
		1942	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1943	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		1944	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		1945	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1803	glBegin (GL_QUADS);	1946	}
1804
1805	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809	}	1947	}
1810	}	1948	}
1811		1949
1812	// update smooth hash	1950	// update smooth hash
1813	if (tex.smoothtile)	1951	if (tex.smoothtile)
…		…
1849	}	1987	}
1850	}	1988	}
1851	}	1989	}
1852	}	1990	}
1853		1991
		1992	rc_draw (rc);
		1993	rc_clear (rc);
		1994
1854	// go through all smoothlevels, lowest to highest, then draw.	1995	// go through all smoothlevels, lowest to highest, then draw.
1855	// this is basically counting sort	1996	// this is basically counting sort
1856	{	1997	{
1857	int w, b;	1998	int w, b;
1858		1999
		2000	glEnable (GL_TEXTURE_2D);
		2001	glBegin (GL_QUADS);
1859	for (w = 0; w < 256 / 32; ++w)	2002	for (w = 0; w < 256 / 32; ++w)
1860	{	2003	{
1861	uint32_t smask = smooth_level [w];	2004	uint32_t smask = smooth_level [w];
1862	if (smask)	2005	if (smask)
1863	for (b = 0; b < 32; ++b)	2006	for (b = 0; b < 32; ++b)
…		…
1882	int border = bits & 15;	2025	int border = bits & 15;
1883	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2026	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884	float dx = tex.s * .0625f; // 16 images/row	2027	float dx = tex.s * .0625f; // 16 images/row
1885	float dy = tex.t * .5f ; // 2 images/column	2028	float dy = tex.t * .5f ; // 2 images/column
1886		2029
1887	// this time naively avoiding texture state changes
1888	// save gobs of state changes.
1889	if (last_name != tex.name)	2030	if (tex.name)
1890	{	2031	{
		2032	// this time avoiding texture state changes
		2033	// save gobs of state changes.
1891	if (!tex.name)	2034	if (key.texname != tex.name)
1892	continue; // smoothing not yet available	2035	{
1893
1894	glEnd ();	2036	glEnd ();
1895	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2037	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896	glBegin (GL_QUADS);	2038	glBegin (GL_QUADS);
1897	}	2039	}
1898		2040
1899	if (border)	2041	if (border)
1900	{	2042	{
1901	float ox = border * dx;	2043	float ox = border * dx;
1902		2044
1903	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2045	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2046	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2047	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2048	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907	}	2049	}
1908		2050
1909	if (corner)	2051	if (corner)
1910	{	2052	{
1911	float ox = corner * dx;	2053	float ox = corner * dx;
1912		2054
1913	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2055	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2056	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2057	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2058	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2059	}
1917	}	2060	}
1918	}	2061	}
1919	}	2062	}
1920	}	2063	}
1921	}	2064	}
		2065
		2066	glEnd ();
		2067	glDisable (GL_TEXTURE_2D);
		2068	key.texname = -1;
1922	}	2069	}
1923		2070
1924	hv_clear (smooth);	2071	hv_clear (smooth);
1925	}	2072	}
1926		2073
1927	glEnd ();	2074	if (pl_tex.name)
		2075	{
		2076	maptex tex = pl_tex;
		2077	int px = pl_x + pdx;
		2078	int py = pl_y + pdy;
1928		2079
1929	glDisable (GL_TEXTURE_2D);	2080	key.texname = tex.name;
		2081	arr = rc_array (rc, &key);
		2082
		2083	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2084	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2085	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2086	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2087
		2088	rc_draw (rc);
		2089	}
		2090
1930	glDisable (GL_BLEND);	2091	glDisable (GL_BLEND);
		2092	rc_free (rc);
1931		2093
1932	// top layer: overlays such as the health bar	2094	// top layer: overlays such as the health bar
1933	for (y = 0; y < sh; y++)	2095	for (y = 0; y < sh; y++)
1934	if (0 <= y + my && y + my < self->rows)	2096	if (0 <= y + my && y + my < self->rows)
1935	{	2097	{
…		…
1960	}	2122	}
1961	}	2123	}
1962	}	2124	}
1963		2125
1964	void	2126	void
1965	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2127	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1966	CODE:	2128	CODE:
1967	{	2129	{
1968	static float color[16][3] = {	2130	static float color[16][3] = {
1969	{ 0.00F, 0.00F, 0.00F },	2131	{ 0.00F, 0.00F, 0.00F },
1970	{ 1.00F, 1.00F, 1.00F },	2132	{ 1.00F, 1.00F, 1.00F },
…		…
2020	glDisable (GL_BLEND);	2182	glDisable (GL_BLEND);
2021	glDisable (GL_TEXTURE_2D);	2183	glDisable (GL_TEXTURE_2D);
2022	}	2184	}
2023		2185
2024	void	2186	void
2025	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2187	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2026	PPCODE:	2188	PPCODE:
2027	{	2189	{
2028	int x, y;	2190	int x, y;
2029	int sw1 = sw + 2;	2191	int sw1 = sw + 2;
2030	int sh1 = sh + 2;	2192	int sh1 = sh + 2;
…		…
2101	PUSHs (sv_2mortal (newSViv (sh3)));	2263	PUSHs (sv_2mortal (newSViv (sh3)));
2102	PUSHs (darkness3_sv);	2264	PUSHs (darkness3_sv);
2103	}	2265	}
2104		2266
2105	SV *	2267	SV *
2106	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2268	get_rect (DC::Map self, int x0, int y0, int w, int h)
2107	CODE:	2269	CODE:
2108	{	2270	{
2109	int x, y, x1, y1;	2271	int x, y, x1, y1;
2110	SV *data_sv = newSV (w * h * 7 + 5);	2272	SV *data_sv = newSV (w * h * 7 + 5);
2111	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2273	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2168	else	2330	else
2169	*data++ = 0;	2331	*data++ = 0;
2170	}	2332	}
2171	}	2333	}
2172		2334
		2335	/* if size is w*h + 5 then no data has been found */
		2336	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2337	{
2173	SvPOK_only (data_sv);	2338	SvPOK_only (data_sv);
2174	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2339	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2340	}
		2341
2175	RETVAL = data_sv;	2342	RETVAL = data_sv;
2176	}	2343	}
2177	OUTPUT:	2344	OUTPUT:
2178	RETVAL	2345	RETVAL
2179		2346
2180	void	2347	void
2181	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2348	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2182	PPCODE:	2349	PPCODE:
2183	{	2350	{
2184	int x, y, z;	2351	int x, y, z;
2185	int w, h;	2352	int w, h;
2186	int x1, y1;	2353	int x1, y1;
		2354	STRLEN len;
		2355	uint8_t *data, *end;
		2356
		2357	len = SvLEN (data_sv);
		2358	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2359	data = SvPVbyte_nolen (data_sv);
		2360	end = data + len + 8;
		2361
		2362	if (len < 5)
		2363	XSRETURN_EMPTY;
2187		2364
2188	if (*data++ != 0)	2365	if (*data++ != 0)
2189	return; /* version mismatch */	2366	XSRETURN_EMPTY; /* version mismatch */
2190		2367
2191	w = *data++ << 8; w |= *data++;	2368	w = *data++ << 8; w |= *data++;
2192	h = *data++ << 8; h |= *data++;	2369	h = *data++ << 8; h |= *data++;
2193		2370
2194	// we need to do this 'cause we don't keep an absolute coord system for rows	2371	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2206	{	2383	{
2207	maprow *row = map_get_row (self, y);	2384	maprow *row = map_get_row (self, y);
2208		2385
2209	for (x = x0; x < x1; x++)	2386	for (x = x0; x < x1; x++)
2210	{	2387	{
		2388	uint8_t flags;
		2389
		2390	if (data + 7 >= end)
		2391	XSRETURN_EMPTY;
		2392
2211	uint8_t flags = *data++;	2393	flags = *data++;
2212		2394
2213	if (flags)	2395	if (flags)
2214	{	2396	{
2215	mapcell *cell = row_get_cell (row, x);	2397	mapcell *cell = row_get_cell (row, x);
2216	tileid tile[3] = { 0, 0, 0 };	2398	tileid tile[3] = { 0, 0, 0 };
…		…
2219	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2401	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2220	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2402	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2221		2403
2222	if (cell->darkness == 0)	2404	if (cell->darkness == 0)
2223	{	2405	{
2224	cell->darkness = 0;	2406	/*cell->darkness = 0;*/
		2407	EXTEND (SP, 3);
2225		2408
2226	for (z = 0; z <= 2; z++)	2409	for (z = 0; z <= 2; z++)
2227	{	2410	{
2228	tileid t = tile [z];	2411	tileid t = tile [z];
2229		2412
2230	if (t >= self->texs || (t && !self->tex [t].name))	2413	if (t >= self->texs || (t && !self->tex [t].name))
2231	{	2414	{
2232	XPUSHs (sv_2mortal (newSViv (t)));	2415	PUSHs (sv_2mortal (newSViv (t)));
2233	need_texid (self, t);	2416	need_texid (self, t);
2234	}	2417	}
2235		2418
2236	cell->tile [z] = t;	2419	cell->tile [z] = t;
2237	}	2420	}
…		…
2239	}	2422	}
2240	}	2423	}
2241	}	2424	}
2242	}	2425	}
2243		2426
2244	MODULE = CFPlus PACKAGE = CFPlus::RW	2427	MODULE = Deliantra::Client PACKAGE = DC::RW
2245		2428
2246	CFPlus::RW	2429	DC::RW
2247	new (SV *class, SV *data_sv)	2430	new (SV *class, SV *data_sv)
2248	CODE:	2431	CODE:
2249	{	2432	{
2250	STRLEN datalen;	2433	STRLEN datalen;
2251	char *data = SvPVbyte (data_sv, datalen);	2434	char *data = SvPVbyte (data_sv, datalen);
…		…
2253	RETVAL = SDL_RWFromConstMem (data, datalen);	2436	RETVAL = SDL_RWFromConstMem (data, datalen);
2254	}	2437	}
2255	OUTPUT:	2438	OUTPUT:
2256	RETVAL	2439	RETVAL
2257		2440
2258	CFPlus::RW	2441	DC::RW
2259	new_from_file (SV *class, const char *path, const char *mode = "rb")	2442	new_from_file (SV *class, const char *path, const char *mode = "rb")
2260	CODE:	2443	CODE:
2261	RETVAL = SDL_RWFromFile (path, mode);	2444	RETVAL = SDL_RWFromFile (path, mode);
2262	OUTPUT:	2445	OUTPUT:
2263	RETVAL	2446	RETVAL
2264		2447
		2448	# fails on win32:
		2449	# dc.xs(2268) : error C2059: syntax error : '('
2265	void	2450	#void
2266	close (CFPlus::RW self)	2451	#close (DC::RW self)
2267	CODE:	2452	# CODE:
2268	SDL_RWclose (self);	2453	# (self->(close)) (self);
2269		2454
2270	MODULE = CFPlus PACKAGE = CFPlus::Channel	2455	MODULE = Deliantra::Client PACKAGE = DC::Channel
2271		2456
2272	PROTOTYPES: DISABLE	2457	PROTOTYPES: DISABLE
2273		2458
2274	CFPlus::Channel	2459	DC::Channel
2275	find ()	2460	find ()
2276	CODE:	2461	CODE:
2277	{	2462	{
2278	RETVAL = Mix_GroupAvailable (-1);	2463	RETVAL = Mix_GroupAvailable (-1);
2279		2464
…		…
2292	}	2477	}
2293	OUTPUT:	2478	OUTPUT:
2294	RETVAL	2479	RETVAL
2295		2480
2296	void	2481	void
2297	halt (CFPlus::Channel self)	2482	halt (DC::Channel self)
2298	CODE:	2483	CODE:
2299	Mix_HaltChannel (self);	2484	Mix_HaltChannel (self);
2300		2485
2301	void	2486	void
2302	expire (CFPlus::Channel self, int ticks = -1)	2487	expire (DC::Channel self, int ticks = -1)
2303	CODE:	2488	CODE:
2304	Mix_ExpireChannel (self, ticks);	2489	Mix_ExpireChannel (self, ticks);
2305		2490
2306	void	2491	void
2307	fade_out (CFPlus::Channel self, int ticks = -1)	2492	fade_out (DC::Channel self, int ticks = -1)
2308	CODE:	2493	CODE:
2309	Mix_FadeOutChannel (self, ticks);	2494	Mix_FadeOutChannel (self, ticks);
2310		2495
2311	int	2496	int
2312	volume (CFPlus::Channel self, int volume)	2497	volume (DC::Channel self, int volume)
2313	CODE:	2498	CODE:
2314	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2499	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2315	OUTPUT:	2500	OUTPUT:
2316	RETVAL	2501	RETVAL
2317		2502
2318	void	2503	void
2319	unregister_all_effects (CFPlus::Channel self)	2504	unregister_all_effects (DC::Channel self)
2320	CODE:	2505	CODE:
2321	Mix_UnregisterAllEffects (self);	2506	Mix_UnregisterAllEffects (self);
2322		2507
2323	void	2508	void
2324	set_panning (CFPlus::Channel self, int left, int right)	2509	set_panning (DC::Channel self, int left, int right)
2325	CODE:	2510	CODE:
2326	left = CLAMP (left , 0, 255);	2511	left = CLAMP (left , 0, 255);
2327	right = CLAMP (right, 0, 255);	2512	right = CLAMP (right, 0, 255);
2328	Mix_SetPanning (self, left, right);	2513	Mix_SetPanning (self, left, right);
2329		2514
2330	void	2515	void
2331	set_distance (CFPlus::Channel self, int distance)	2516	set_distance (DC::Channel self, int distance)
2332	CODE:	2517	CODE:
2333	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2518	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2334		2519
2335	void	2520	void
2336	set_position (CFPlus::Channel self, int angle, int distance)	2521	set_position (DC::Channel self, int angle, int distance)
2337	CODE:	2522	CODE:
		2523
		2524	void
		2525	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2526	CODE:
		2527	{
		2528	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2529	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2338	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2530	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2531	}
2339		2532
2340	void	2533	void
2341	set_reverse_stereo (CFPlus::Channel self, int flip)	2534	set_reverse_stereo (DC::Channel self, int flip)
2342	CODE:	2535	CODE:
2343	Mix_SetReverseStereo (self, flip);	2536	Mix_SetReverseStereo (self, flip);
2344		2537
2345	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2538	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2346		2539
2347	PROTOTYPES: DISABLE	2540	PROTOTYPES: DISABLE
2348		2541
2349	CFPlus::MixChunk	2542	DC::MixChunk
2350	new (SV *class, CFPlus::RW rwops)	2543	new (SV *class, DC::RW rwops)
2351	CODE:	2544	CODE:
2352	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2545	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2353	OUTPUT:	2546	OUTPUT:
2354	RETVAL	2547	RETVAL
2355		2548
2356	void	2549	void
2357	DESTROY (CFPlus::MixChunk self)	2550	DESTROY (DC::MixChunk self)
2358	CODE:	2551	CODE:
2359	Mix_FreeChunk (self);	2552	Mix_FreeChunk (self);
2360		2553
2361	int	2554	int
2362	volume (CFPlus::MixChunk self, int volume = -1)	2555	volume (DC::MixChunk self, int volume = -1)
2363	CODE:	2556	CODE:
2364	if (items > 1)	2557	if (items > 1)
2365	volume = CLAMP (volume, 0, 128);	2558	volume = CLAMP (volume, 0, 128);
2366	RETVAL = Mix_VolumeChunk (self, volume);	2559	RETVAL = Mix_VolumeChunk (self, volume);
2367	OUTPUT:	2560	OUTPUT:
2368	RETVAL	2561	RETVAL
2369		2562
2370	CFPlus::Channel	2563	DC::Channel
2371	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2564	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2372	CODE:	2565	CODE:
2373	{	2566	{
2374	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2567	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2375		2568
2376	if (RETVAL < 0)	2569	if (RETVAL < 0)
…		…
2383	}	2576	}
2384	}	2577	}
2385	OUTPUT:	2578	OUTPUT:
2386	RETVAL	2579	RETVAL
2387		2580
2388	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2581	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2389		2582
2390	int	2583	int
2391	volume (int volume = -1)	2584	volume (int volume = -1)
2392	PROTOTYPE: ;$	2585	PROTOTYPE: ;$
2393	CODE:	2586	CODE:
…		…
2405	void	2598	void
2406	halt ()	2599	halt ()
2407	CODE:	2600	CODE:
2408	Mix_HaltMusic ();	2601	Mix_HaltMusic ();
2409		2602
2410	CFPlus::MixMusic	2603	DC::MixMusic
2411	new (SV *class, CFPlus::RW rwops)	2604	new (SV *class, DC::RW rwops)
2412	CODE:	2605	CODE:
2413	RETVAL = Mix_LoadMUS_RW (rwops);	2606	RETVAL = Mix_LoadMUS_RW (rwops);
2414	OUTPUT:	2607	OUTPUT:
2415	RETVAL	2608	RETVAL
2416		2609
2417	void	2610	void
2418	DESTROY (CFPlus::MixMusic self)	2611	DESTROY (DC::MixMusic self)
2419	CODE:	2612	CODE:
2420	Mix_FreeMusic (self);	2613	Mix_FreeMusic (self);
2421		2614
2422	int	2615	int
2423	play (CFPlus::MixMusic self, int loops = -1)	2616	play (DC::MixMusic self, int loops = -1)
2424	CODE:	2617	CODE:
2425	RETVAL = Mix_PlayMusic (self, loops);	2618	RETVAL = Mix_PlayMusic (self, loops);
2426	OUTPUT:	2619	OUTPUT:
2427	RETVAL	2620	RETVAL
2428		2621
2429	void	2622	void
2430	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2623	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2431	CODE:	2624	CODE:
2432	Mix_FadeInMusicPos (self, loops, ms, position);	2625	Mix_FadeInMusicPos (self, loops, ms, position);
2433		2626
2434	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2627	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2435		2628
2436	PROTOTYPES: ENABLE	2629	PROTOTYPES: ENABLE
2437		2630
2438	BOOT:	2631	BOOT:
2439	{	2632	{
2440	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2633	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2441	static const struct {	2634	static const struct {
2442	const char *name;	2635	const char *name;
2443	IV iv;	2636	IV iv;
2444	} *civ, const_iv[] = {	2637	} *civ, const_iv[] = {
2445	# define const_iv(name) { # name, (IV)name }	2638	# define const_iv(name) { # name, (IV)name }
…		…
2480	const_iv (GL_INTENSITY),	2673	const_iv (GL_INTENSITY),
2481	const_iv (GL_LUMINANCE),	2674	const_iv (GL_LUMINANCE),
2482	const_iv (GL_LUMINANCE_ALPHA),	2675	const_iv (GL_LUMINANCE_ALPHA),
2483	const_iv (GL_FLOAT),	2676	const_iv (GL_FLOAT),
2484	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2677	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2678	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2679	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2680	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2681	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2682	const_iv (GL_COMPRESSED_RGB_ARB),
		2683	const_iv (GL_COMPRESSED_RGBA_ARB),
2485	const_iv (GL_COMPILE),	2684	const_iv (GL_COMPILE),
2486	const_iv (GL_PROXY_TEXTURE_1D),	2685	const_iv (GL_PROXY_TEXTURE_1D),
2487	const_iv (GL_PROXY_TEXTURE_2D),	2686	const_iv (GL_PROXY_TEXTURE_2D),
2488	const_iv (GL_TEXTURE_1D),	2687	const_iv (GL_TEXTURE_1D),
2489	const_iv (GL_TEXTURE_2D),	2688	const_iv (GL_TEXTURE_2D),
…		…
2528	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2727	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2529	const_iv (GL_POINT_SMOOTH_HINT),	2728	const_iv (GL_POINT_SMOOTH_HINT),
2530	const_iv (GL_LINE_SMOOTH_HINT),	2729	const_iv (GL_LINE_SMOOTH_HINT),
2531	const_iv (GL_POLYGON_SMOOTH_HINT),	2730	const_iv (GL_POLYGON_SMOOTH_HINT),
2532	const_iv (GL_GENERATE_MIPMAP_HINT),	2731	const_iv (GL_GENERATE_MIPMAP_HINT),
		2732	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2533	const_iv (GL_FASTEST),	2733	const_iv (GL_FASTEST),
2534	const_iv (GL_DONT_CARE),	2734	const_iv (GL_DONT_CARE),
2535	const_iv (GL_NICEST),	2735	const_iv (GL_NICEST),
2536	const_iv (GL_V2F),	2736	const_iv (GL_V2F),
2537	const_iv (GL_V3F),	2737	const_iv (GL_V3F),
…		…
2545		2745
2546	texture_av = newAV ();	2746	texture_av = newAV ();
2547	AvREAL_off (texture_av);	2747	AvREAL_off (texture_av);
2548	}	2748	}
2549		2749
		2750	void
		2751	disable_GL_EXT_blend_func_separate ()
		2752	CODE:
		2753	gl.BlendFuncSeparate = 0;
		2754	gl.BlendFuncSeparateEXT = 0;
		2755
2550	char *	2756	char *
2551	gl_vendor ()	2757	gl_vendor ()
2552	CODE:	2758	CODE:
2553	RETVAL = (char *)glGetString (GL_VENDOR);	2759	RETVAL = (char *)glGetString (GL_VENDOR);
2554	OUTPUT:	2760	OUTPUT:
…		…
2675		2881
2676	void glRect (float x1, float y1, float x2, float y2)	2882	void glRect (float x1, float y1, float x2, float y2)
2677	CODE:	2883	CODE:
2678	glRectf (x1, y1, x2, y2);	2884	glRectf (x1, y1, x2, y2);
2679		2885
		2886	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2887	CODE:
		2888	glBegin (GL_LINE_LOOP);
		2889	glVertex2f (x1, y1);
		2890	glVertex2f (x2, y1);
		2891	glVertex2f (x2, y2);
		2892	glVertex2f (x1, y2);
		2893	glEnd ();
		2894
2680	PROTOTYPES: ENABLE	2895	PROTOTYPES: ENABLE
2681		2896
2682	void glBegin (int mode)	2897	void glBegin (int mode)
2683		2898
2684	void glEnd ()	2899	void glEnd ()
…		…
2716	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2931	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2717	CODE:	2932	CODE:
2718	if (gl.SeparableFilter2D)	2933	if (gl.SeparableFilter2D)
2719	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2934	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2720		2935
2721	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2936	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2722		2937
2723	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2938	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2724		2939
2725	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2940	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2726		2941
…		…
2752		2967
2753	void glEndList ()	2968	void glEndList ()
2754		2969
2755	void glCallList (int list)	2970	void glCallList (int list)
2756		2971
2757	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2972	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2758		2973
2759	PROTOTYPES: DISABLE	2974	PROTOTYPES: DISABLE
2760		2975
2761	void	2976	void
2762	find_widget (SV *self, NV x, NV y)	2977	find_widget (SV *self, NV x, NV y)
…		…
2766	XPUSHs (self);	2981	XPUSHs (self);
2767	}	2982	}
2768		2983
2769	BOOT:	2984	BOOT:
2770	{	2985	{
2771	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2986	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2772		2987
2773	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2988	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2774	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2989	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2775	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2990	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2776	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2991	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2777	}	2992	}
2778		2993
2779	void	2994	void
2780	draw (SV *self)	2995	draw (SV *self)
2781	CODE:	2996	CODE:
…		…
2785	NV x, y, w, h;	3000	NV x, y, w, h;
2786	SV *draw_x_sv = GvSV (draw_x_gv);	3001	SV *draw_x_sv = GvSV (draw_x_gv);
2787	SV *draw_y_sv = GvSV (draw_y_gv);	3002	SV *draw_y_sv = GvSV (draw_y_gv);
2788	SV *draw_w_sv = GvSV (draw_w_gv);	3003	SV *draw_w_sv = GvSV (draw_w_gv);
2789	SV *draw_h_sv = GvSV (draw_h_gv);	3004	SV *draw_h_sv = GvSV (draw_h_gv);
2790	SV *hover;
2791	double draw_x, draw_y, draw_w, draw_h;	3005	double draw_x, draw_y;
2792		3006
2793	if (!SvROK (self))	3007	if (!SvROK (self))
2794	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3008	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2795		3009
2796	hv = (HV *)SvRV (self);	3010	hv = (HV *)SvRV (self);
2797		3011
2798	if (SvTYPE (hv) != SVt_PVHV)	3012	if (SvTYPE (hv) != SVt_PVHV)
2799	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3013	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2800		3014
2801	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3015	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2802	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3016	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2803		3017
2804	if (!h || !w)	3018	if (!h || !w)
…		…
2824	{	3038	{
2825	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3039	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2826		3040
2827	if (svp && SvTRUE (*svp))	3041	if (svp && SvTRUE (*svp))
2828	{	3042	{
2829	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3043	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2830	glEnable (GL_BLEND);	3044	glEnable (GL_BLEND);
2831	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3045	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2832	glBegin (GL_QUADS);	3046	glBegin (GL_QUADS);
2833	glVertex2f (0, 0);	3047	glVertex2f (0, 0);
2834	glVertex2f (w, 0);	3048	glVertex2f (w, 0);
…		…
2837	glEnd ();	3051	glEnd ();
2838	glDisable (GL_BLEND);	3052	glDisable (GL_BLEND);
2839	}	3053	}
2840	}	3054	}
2841	#if 0	3055	#if 0
2842	if ($ENV{CFPLUS_DEBUG} & 1) {	3056	// draw borders, for debugging
2843	glPushMatrix;	3057	glPushMatrix ();
2844	glColor 1, 1, 0, 1;	3058	glColor4f (1., 1., 0., 1.);
2845	glTranslate 0.375, 0.375;	3059	glTranslatef (.5, .5, 0.);
2846	glBegin GL_LINE_LOOP;	3060	glBegin (GL_LINE_LOOP);
2847	glVertex 0 , 0;	3061	glVertex2f (0 , 0);
2848	glVertex $self->{w} - 1, 0;	3062	glVertex2f (w - 1, 0);
2849	glVertex $self->{w} - 1, $self->{h} - 1;	3063	glVertex2f (w - 1, h - 1);
2850	glVertex 0 , $self->{h} - 1;	3064	glVertex2f (0 , h - 1);
2851	glEnd;	3065	glEnd ();
2852	glPopMatrix;	3066	glPopMatrix ();
2853	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2854	}
2855	#endif	3067	#endif
2856	PUSHMARK (SP);	3068	PUSHMARK (SP);
2857	XPUSHs (self);	3069	XPUSHs (self);
2858	PUTBACK;	3070	PUTBACK;
2859	call_method ("_draw", G_VOID | G_DISCARD);	3071	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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