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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC

…		…
46		46
47	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
48		48
49	#include <pango/pango.h>	49	#include <pango/pango.h>
50		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
		61
51	#ifndef _WIN32	62	#ifndef _WIN32
52	# include <sys/types.h>	63	# include <sys/types.h>
53	# include <sys/socket.h>	64	# include <sys/socket.h>
54	# include <netinet/in.h>	65	# include <netinet/in.h>
55	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
56	# include <inttypes.h>	67	# include <inttypes.h>
57	#endif	68	#endif
58		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
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		80
61	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
62		82
63	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
65		85
66	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
67		87
68	#if 0	88	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	89	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70	#else
71	# define PARACHUTE 0
72	#endif
73		90
74	static AV *texture_av;	91	static AV *texture_av;
75		92
76	static struct	93	static struct
77	{	94	{
…		…
114	av_push (texture_av, (SV *)(size_t)name);	131	av_push (texture_av, (SV *)(size_t)name);
115	glDeleteTextures (1, &name);	132	glDeleteTextures (1, &name);
116	}	133	}
117		134
118	#include "texcache.c"	135	#include "texcache.c"
		136	#include "rendercache.c"
119		137
120	#include "pango-font.c"	138	#include "pango-font.c"
121	#include "pango-fontmap.c"	139	#include "pango-fontmap.c"
122	#include "pango-render.c"	140	#include "pango-render.c"
123		141
124	typedef IV CFPlus__Channel;	142	typedef IV DC__Channel;
125	typedef SDL_RWops *CFPlus__RW;	143	typedef SDL_RWops *DC__RW;
126	typedef Mix_Chunk *CFPlus__MixChunk;	144	typedef Mix_Chunk *DC__MixChunk;
127	typedef Mix_Music *CFPlus__MixMusic;	145	typedef Mix_Music *DC__MixMusic;
128		146
129	typedef PangoFontDescription *CFPlus__Font;	147	typedef PangoFontDescription *DC__Font;
130		148
131	static int	149	static int
132	shape_attr_p (PangoLayoutRun *run)	150	shape_attr_p (PangoLayoutRun *run)
133	{	151	{
134	GSList *attrs = run->item->analysis.extra_attrs;	152	GSList *attrs = run->item->analysis.extra_attrs;
…		…
148		166
149	typedef struct cf_layout {	167	typedef struct cf_layout {
150	PangoLayout *pl;	168	PangoLayout *pl;
151	float r, g, b, a; // default color for rgba mode	169	float r, g, b, a; // default color for rgba mode
152	int base_height;	170	int base_height;
153	CFPlus__Font font;	171	DC__Font font;
		172	rc_t *rc;
154	} *CFPlus__Layout;	173	} *DC__Layout;
155		174
156	static CFPlus__Font default_font;	175	static DC__Font default_font;
157	static PangoContext *opengl_context;	176	static PangoContext *opengl_context;
158	static PangoFontMap *opengl_fontmap;	177	static PangoFontMap *opengl_fontmap;
159		178
160	static void	179	static void
161	substitute_func (FcPattern *pattern, gpointer data)	180	substitute_func (FcPattern *pattern, gpointer data)
…		…
166	#endif	185	#endif
167	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	186	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168	}	187	}
169		188
170	static void	189	static void
171	layout_update_font (CFPlus__Layout self)	190	layout_update_font (DC__Layout self)
172	{	191	{
173	/* use a random scale factor to account for unknown descenders, 0.8 works	192	/* use a random scale factor to account for unknown descenders, 0.8 works
174	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
175	*/	194	*/
176	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
177		196
178	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
179	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180		199
181	pango_layout_set_font_description (self->pl, font);	200	pango_layout_set_font_description (self->pl, font);
182	}	201	}
183		202
184	static void	203	static void
185	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	204	layout_get_pixel_size (DC__Layout self, int *w, int *h)
186	{	205	{
187	PangoRectangle rect;	206	PangoRectangle rect;
188		207
189	// get_pixel_* wrongly rounds down	208	// get_pixel_* wrongly rounds down
190	pango_layout_get_extents (self->pl, 0, &rect);	209	pango_layout_get_extents (self->pl, 0, &rect);
…		…
201		220
202	typedef uint16_t tileid;	221	typedef uint16_t tileid;
203	typedef uint16_t faceid;	222	typedef uint16_t faceid;
204		223
205	typedef struct {	224	typedef struct {
206	int name;	225	GLuint name;
207	int w, h;	226	int w, h;
208	float s, t;	227	float s, t;
209	uint8_t r, g, b, a;	228	uint8_t r, g, b, a;
210	tileid smoothtile;	229	tileid smoothtile;
211	uint8_t smoothlevel;	230	uint8_t smoothlevel;
…		…
229	int faces; tileid *face2tile; // [faceid]	248	int faces; tileid *face2tile; // [faceid]
230	int texs; maptex *tex; // [tileid]	249	int texs; maptex *tex; // [tileid]
231		250
232	int32_t rows;	251	int32_t rows;
233	maprow *row;	252	maprow *row;
234	} *CFPlus__Map;	253	} *DC__Map;
235		254
236	static char *	255	static char *
237	prepend (char *ptr, int sze, int inc)	256	prepend (char *ptr, int sze, int inc)
238	{	257	{
239	char *p;	258	char *p;
…		…
277	self->texs *= 2;	296	self->texs *= 2;
278	}	297	}
279	}	298	}
280		299
281	static maprow *	300	static maprow *
282	map_get_row (CFPlus__Map self, int y)	301	map_get_row (DC__Map self, int y)
283	{	302	{
284	if (0 > y)	303	if (0 > y)
285	{	304	{
286	int extend = - y + MAP_EXTEND_Y;	305	int extend = - y + MAP_EXTEND_Y;
287	Prepend (maprow, self->row, self->rows, extend);	306	Prepend (maprow, self->row, self->rows, extend);
…		…
325		344
326	return row->col + (x - row->c0);	345	return row->col + (x - row->c0);
327	}	346	}
328		347
329	static mapcell *	348	static mapcell *
330	map_get_cell (CFPlus__Map self, int x, int y)	349	map_get_cell (DC__Map self, int x, int y)
331	{	350	{
332	return row_get_cell (map_get_row (self, y), x);	351	return row_get_cell (map_get_row (self, y), x);
333	}	352	}
334		353
335	static void	354	static void
336	map_clear (CFPlus__Map self)	355	map_clear (DC__Map self)
337	{	356	{
338	int r;	357	int r;
339		358
340	for (r = 0; r < self->rows; r++)	359	for (r = 0; r < self->rows; r++)
341	Safefree (self->row[r].col);	360	Safefree (self->row[r].col);
…		…
349	self->row = 0;	368	self->row = 0;
350	self->rows = 0;	369	self->rows = 0;
351	}	370	}
352		371
353	static void	372	static void
354	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	373	map_blank (DC__Map self, int x0, int y0, int w, int h)
355	{	374	{
356	int x, y;	375	int x, y;
357	maprow *row;	376	maprow *row;
358	mapcell *cell;	377	mapcell *cell;
359		378
…		…
438	n |= n >> 16;	457	n |= n >> 16;
439		458
440	return n + 1;	459	return n + 1;
441	}	460	}
442		461
		462	static unsigned int
		463	popcount (unsigned int n)
		464	{
		465	n -= (n >> 1) & 0x55555555U;
		466	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		467	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		468	n *= 0x01010101U;
		469
		470	return n >> 24;
		471	}
		472
443	/* SDL should provide this, really. */	473	/* SDL should provide this, really. */
444	#define SDLK_MODIFIER_MIN 300	474	#define SDLK_MODIFIER_MIN 300
445	#define SDLK_MODIFIER_MAX 314	475	#define SDLK_MODIFIER_MAX 314
446		476
447	/******************************************************************************/	477	/******************************************************************************/
…		…
485	return 0;	515	return 0;
486		516
487	return 1;	517	return 1;
488	}	518	}
489		519
490	MODULE = CFPlus PACKAGE = CFPlus	520	MODULE = Deliantra::Client PACKAGE = DC
491		521
492	PROTOTYPES: ENABLE	522	PROTOTYPES: ENABLE
493		523
494	BOOT:	524	BOOT:
495	{	525	{
496	HV *stash = gv_stashpv ("CFPlus", 1);	526	HV *stash = gv_stashpv ("DC", 1);
497	static const struct {	527	static const struct {
498	const char *name;	528	const char *name;
499	IV iv;	529	IV iv;
500	} *civ, const_iv[] = {	530	} *civ, const_iv[] = {
501	# define const_iv(name) { # name, (IV)name }	531	# define const_iv(name) { # name, (IV)name }
…		…
523		553
524	const_iv (SDL_APPINPUTFOCUS),	554	const_iv (SDL_APPINPUTFOCUS),
525	const_iv (SDL_APPMOUSEFOCUS),	555	const_iv (SDL_APPMOUSEFOCUS),
526	const_iv (SDL_APPACTIVE),	556	const_iv (SDL_APPACTIVE),
527		557
		558	const_iv (SDLK_FIRST),
		559	const_iv (SDLK_LAST),
528	const_iv (SDLK_KP0),	560	const_iv (SDLK_KP0),
529	const_iv (SDLK_KP1),	561	const_iv (SDLK_KP1),
530	const_iv (SDLK_KP2),	562	const_iv (SDLK_KP2),
531	const_iv (SDLK_KP3),	563	const_iv (SDLK_KP3),
532	const_iv (SDLK_KP4),	564	const_iv (SDLK_KP4),
…		…
604	const_iv (KMOD_LMETA),	636	const_iv (KMOD_LMETA),
605	const_iv (KMOD_RMETA),	637	const_iv (KMOD_RMETA),
606	const_iv (KMOD_NUM),	638	const_iv (KMOD_NUM),
607	const_iv (KMOD_CAPS),	639	const_iv (KMOD_CAPS),
608	const_iv (KMOD_MODE),	640	const_iv (KMOD_MODE),
		641
		642	const_iv (MIX_DEFAULT_FORMAT),
		643
		644	const_iv (SDL_INIT_TIMER),
		645	const_iv (SDL_INIT_AUDIO),
		646	const_iv (SDL_INIT_VIDEO),
		647	const_iv (SDL_INIT_CDROM),
		648	const_iv (SDL_INIT_JOYSTICK),
		649	const_iv (SDL_INIT_EVERYTHING),
		650	const_iv (SDL_INIT_NOPARACHUTE),
		651	const_iv (SDL_INIT_EVENTTHREAD),
		652
		653	const_iv (SDL_GL_RED_SIZE),
		654	const_iv (SDL_GL_GREEN_SIZE),
		655	const_iv (SDL_GL_BLUE_SIZE),
		656	const_iv (SDL_GL_ALPHA_SIZE),
		657	const_iv (SDL_GL_DOUBLEBUFFER),
		658	const_iv (SDL_GL_BUFFER_SIZE),
		659	const_iv (SDL_GL_DEPTH_SIZE),
		660	const_iv (SDL_GL_STENCIL_SIZE),
		661	const_iv (SDL_GL_ACCUM_RED_SIZE),
		662	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		663	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		664	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		665	const_iv (SDL_GL_STEREO),
		666	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		667	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		668	const_iv (SDL_GL_ACCELERATED_VISUAL),
		669	const_iv (SDL_GL_SWAP_CONTROL)
609	# undef const_iv	670	# undef const_iv
610	};	671	};
611		672
612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	673	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	674	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
631		692
632	NV floor (NV x)	693	NV floor (NV x)
633		694
634	NV ceil (NV x)	695	NV ceil (NV x)
635		696
		697	IV minpot (UV n)
		698
		699	IV popcount (UV n)
		700
636	void	701	void
637	pango_init ()	702	pango_init ()
638	CODE:	703	CODE:
639	{	704	{
640	opengl_fontmap = pango_opengl_font_map_new ();	705	opengl_fontmap = pango_opengl_font_map_new ();
641	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	706	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
642	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	707	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		708	/*pango_context_set_font_description (opengl_context, default_font);*/
		709	#if PANGO_VERSION_CHECK (1, 15, 2)
		710	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		711	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		712	#endif
643	}	713	}
644		714
645	char *
646	SDL_GetError ()	715	char *SDL_GetError ()
647		716
648	int	717	int SDL_Init (U32 flags)
649	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
650		718
651	void	719	int SDL_InitSubSystem (U32 flags)
		720
		721	void SDL_QuitSubSystem (U32 flags)
		722
652	SDL_Quit ()	723	void SDL_Quit ()
		724
		725	int SDL_GL_SetAttribute (int attr, int value)
		726
		727	int SDL_GL_GetAttribute (int attr)
		728	CODE:
		729	if (SDL_GL_GetAttribute (attr, &RETVAL))
		730	XSRETURN_UNDEF;
		731	OUTPUT:
		732	RETVAL
653		733
654	void	734	void
655	SDL_ListModes (int rgb, int alpha)	735	SDL_ListModes (int rgb, int alpha)
656	PPCODE:	736	PPCODE:
657	{	737	{
…		…
669	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	749	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	750	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	751	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672		752
673	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	753	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
674	#if SDL_VERSION_ATLEAST(1,2,10)
675	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
676	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	754	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677	#endif
678		755
679	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	756	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680		757
681	if (m && m != (SDL_Rect **)-1)	758	if (m && m != (SDL_Rect **)-1)
682	while (*m)	759	while (*m)
683	{	760	{
684	if ((*m)->w >= 640 && (*m)->h >= 480)
685	{
686	AV *av = newAV ();	761	AV *av = newAV ();
687	av_push (av, newSViv ((*m)->w));	762	av_push (av, newSViv ((*m)->w));
688	av_push (av, newSViv ((*m)->h));	763	av_push (av, newSViv ((*m)->h));
689	av_push (av, newSViv (rgb));	764	av_push (av, newSViv (rgb));
690	av_push (av, newSViv (alpha));	765	av_push (av, newSViv (alpha));
691	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	766	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
692	}
693		767
694	++m;	768	++m;
695	}	769	}
696	}	770	}
697		771
…		…
713		787
714	if (RETVAL)	788	if (RETVAL)
715	{	789	{
716	av_clear (texture_av);	790	av_clear (texture_av);
717		791
718	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	792	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	793	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
720	#include "glfunc.h"	794	#include "glfunc.h"
721	#undef GL_FUNC	795	#undef GL_FUNC
722	}	796	}
723	}	797	}
…		…
730	char *	804	char *
731	SDL_GetKeyName (int sym)	805	SDL_GetKeyName (int sym)
732		806
733	int	807	int
734	SDL_GetAppState ()	808	SDL_GetAppState ()
		809
		810	int
		811	SDL_GetModState ()
735		812
736	void	813	void
737	poll_events ()	814	poll_events ()
738	PPCODE:	815	PPCODE:
739	{	816	{
…		…
749	{	826	{
750	case SDL_KEYDOWN:	827	case SDL_KEYDOWN:
751	case SDL_KEYUP:	828	case SDL_KEYUP:
752	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	829	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	830	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	831	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
755	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	832	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
756	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	833	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757	break;	834	break;
758		835
759	case SDL_ACTIVEEVENT:	836	case SDL_ACTIVEEVENT:
760	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	837	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
778	x = ev.motion.x;	855	x = ev.motion.x;
779	y = ev.motion.y;	856	y = ev.motion.y;
780	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	857	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781	}	858	}
782		859
783	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	860	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
784	hv_store (hv, "state", 5, newSViv (state), 0);	861	hv_store (hv, "state", 5, newSViv (state), 0);
785	hv_store (hv, "x", 1, newSViv (x), 0);	862	hv_store (hv, "x", 1, newSViv (x), 0);
786	hv_store (hv, "y", 1, newSViv (y), 0);	863	hv_store (hv, "y", 1, newSViv (y), 0);
787	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	864	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	865	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789	}	866	}
790	break;	867	break;
791		868
792	case SDL_MOUSEBUTTONDOWN:	869	case SDL_MOUSEBUTTONDOWN:
793	case SDL_MOUSEBUTTONUP:	870	case SDL_MOUSEBUTTONUP:
794	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	871	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795		872
796	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	873	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	874	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	875	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	876	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
804	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	881	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	882	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806	break;	883	break;
807	}	884	}
808		885
809	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	886	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
810	}	887	}
811	}	888	}
812		889
813	int	890	int
814	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	891	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815	POSTCALL:	892	POSTCALL:
816	Mix_HookMusicFinished (music_finished);	893	Mix_HookMusicFinished (music_finished);
817	Mix_ChannelFinished (channel_finished);	894	Mix_ChannelFinished (channel_finished);
		895
		896	void
		897	Mix_QuerySpec ()
		898	PPCODE:
		899	{
		900	int freq, channels;
		901	Uint16 format;
		902
		903	if (Mix_QuerySpec (&freq, &format, &channels))
		904	{
		905	EXTEND (SP, 3);
		906	PUSHs (sv_2mortal (newSViv (freq)));
		907	PUSHs (sv_2mortal (newSViv (format)));
		908	PUSHs (sv_2mortal (newSViv (channels)));
		909	}
		910	}
818		911
819	void	912	void
820	Mix_CloseAudio ()	913	Mix_CloseAudio ()
821		914
822	int	915	int
…		…
857	}	950	}
858	}	951	}
859	#endif	952	#endif
860	}	953	}
861		954
862	void	955	int
863	add_font (char *file)	956	add_font (char *file)
864	CODE:	957	CODE:
865	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	958	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		959	OUTPUT:
		960	RETVAL
866		961
867	void	962	void
868	load_image_inline (SV *image_)	963	load_image_inline (SV *image_)
869	ALIAS:	964	ALIAS:
870	load_image_file = 1	965	load_image_file = 1
…		…
956	void	1051	void
957	error (char *message)	1052	error (char *message)
958	CODE:	1053	CODE:
959	fprintf (stderr, "ERROR: %s\n", message);	1054	fprintf (stderr, "ERROR: %s\n", message);
960	#ifdef _WIN32	1055	#ifdef _WIN32
961	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1056	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962	#endif	1057	#endif
963		1058
964	void	1059	void
965	fatal (char *message)	1060	fatal (char *message)
966	CODE:	1061	CODE:
967	fprintf (stderr, "FATAL: %s\n", message);	1062	fprintf (stderr, "FATAL: %s\n", message);
968	#ifdef _WIN32	1063	#ifdef _WIN32
969	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1064	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970	#endif	1065	#endif
971	_exit (1);	1066	_exit (1);
972		1067
973	void	1068	void
974	_exit (int retval = 0)	1069	_exit (int retval = 0)
…		…
986	#if DEBUG	1081	#if DEBUG
987	VALGRIND_DO_LEAK_CHECK;	1082	VALGRIND_DO_LEAK_CHECK;
988	#endif	1083	#endif
989	}	1084	}
990		1085
991	MODULE = CFPlus PACKAGE = CFPlus::Font	1086	MODULE = Deliantra::Client PACKAGE = DC::Font
992		1087
993	PROTOTYPES: DISABLE	1088	PROTOTYPES: DISABLE
994		1089
995	CFPlus::Font	1090	DC::Font
996	new_from_file (SV *class, char *path, int id = 0)	1091	new_from_file (SV *class, char *path, int id = 0)
997	CODE:	1092	CODE:
998	{	1093	{
999	int count;	1094	int count;
1000	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1095	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1003	}	1098	}
1004	OUTPUT:	1099	OUTPUT:
1005	RETVAL	1100	RETVAL
1006		1101
1007	void	1102	void
1008	DESTROY (CFPlus::Font self)	1103	DESTROY (DC::Font self)
1009	CODE:	1104	CODE:
1010	pango_font_description_free (self);	1105	pango_font_description_free (self);
1011		1106
1012	void	1107	void
1013	make_default (CFPlus::Font self)	1108	make_default (DC::Font self)
1014	PROTOTYPE: $	1109	PROTOTYPE: $
1015	CODE:	1110	CODE:
1016	default_font = self;	1111	default_font = self;
1017		1112
1018	MODULE = CFPlus PACKAGE = CFPlus::Layout	1113	MODULE = Deliantra::Client PACKAGE = DC::Layout
1019		1114
1020	PROTOTYPES: DISABLE	1115	PROTOTYPES: DISABLE
1021		1116
1022	void	1117	void
1023	reset_glyph_cache ()	1118	glyph_cache_backup ()
1024	PROTOTYPE:	1119	PROTOTYPE:
1025	CODE:	1120	CODE:
		1121	tc_backup ();
		1122
		1123	void
		1124	glyph_cache_restore ()
		1125	PROTOTYPE:
		1126	CODE:
1026	tc_clear ();	1127	tc_restore ();
1027		1128
1028	CFPlus::Layout	1129	DC::Layout
1029	new (SV *class)	1130	new (SV *class)
1030	CODE:	1131	CODE:
1031	New (0, RETVAL, 1, struct cf_layout);	1132	New (0, RETVAL, 1, struct cf_layout);
1032		1133
1033	RETVAL->pl = pango_layout_new (opengl_context);	1134	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1035	RETVAL->g = 1.;	1136	RETVAL->g = 1.;
1036	RETVAL->b = 1.;	1137	RETVAL->b = 1.;
1037	RETVAL->a = 1.;	1138	RETVAL->a = 1.;
1038	RETVAL->base_height = MIN_FONT_HEIGHT;	1139	RETVAL->base_height = MIN_FONT_HEIGHT;
1039	RETVAL->font = 0;	1140	RETVAL->font = 0;
		1141	RETVAL->rc = rc_alloc ();
1040		1142
1041	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1143	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042	layout_update_font (RETVAL);	1144	layout_update_font (RETVAL);
1043	OUTPUT:	1145	OUTPUT:
1044	RETVAL	1146	RETVAL
1045		1147
1046	void	1148	void
1047	DESTROY (CFPlus::Layout self)	1149	DESTROY (DC::Layout self)
1048	CODE:	1150	CODE:
1049	g_object_unref (self->pl);	1151	g_object_unref (self->pl);
		1152	rc_free (self->rc);
1050	Safefree (self);	1153	Safefree (self);
1051		1154
1052	void	1155	void
1053	set_text (CFPlus::Layout self, SV *text_)	1156	set_text (DC::Layout self, SV *text_)
1054	CODE:	1157	CODE:
1055	{	1158	{
1056	STRLEN textlen;	1159	STRLEN textlen;
1057	char *text = SvPVutf8 (text_, textlen);	1160	char *text = SvPVutf8 (text_, textlen);
1058		1161
1059	pango_layout_set_text (self->pl, text, textlen);	1162	pango_layout_set_text (self->pl, text, textlen);
1060	}	1163	}
1061		1164
1062	void	1165	void
1063	set_markup (CFPlus::Layout self, SV *text_)	1166	set_markup (DC::Layout self, SV *text_)
1064	CODE:	1167	CODE:
1065	{	1168	{
1066	STRLEN textlen;	1169	STRLEN textlen;
1067	char *text = SvPVutf8 (text_, textlen);	1170	char *text = SvPVutf8 (text_, textlen);
1068		1171
1069	pango_layout_set_markup (self->pl, text, textlen);	1172	pango_layout_set_markup (self->pl, text, textlen);
1070	}	1173	}
1071		1174
1072	void	1175	void
1073	set_shapes (CFPlus::Layout self, ...)	1176	set_shapes (DC::Layout self, ...)
1074	CODE:	1177	CODE:
1075	{	1178	{
1076	PangoAttrList *attrs = 0;	1179	PangoAttrList *attrs = 0;
1077	const char *text = pango_layout_get_text (self->pl);	1180	const char *text = pango_layout_get_text (self->pl);
1078	const char *pos = text;	1181	const char *pos = text;
…		…
1113	if (attrs)	1216	if (attrs)
1114	pango_layout_set_attributes (self->pl, attrs);	1217	pango_layout_set_attributes (self->pl, attrs);
1115	}	1218	}
1116		1219
1117	void	1220	void
1118	get_shapes (CFPlus::Layout self)	1221	get_shapes (DC::Layout self)
1119	PPCODE:	1222	PPCODE:
1120	{	1223	{
1121	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1224	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122		1225
1123	do	1226	do
1124	{	1227	{
1125	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1228	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126		1229
1127	if (run && shape_attr_p (run))	1230	if (run && shape_attr_p (run))
1128	{	1231	{
1129	PangoRectangle extents;	1232	PangoRectangle extents;
1130	pango_layout_iter_get_run_extents (iter, 0, &extents);	1233	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1138		1241
1139	pango_layout_iter_free (iter);	1242	pango_layout_iter_free (iter);
1140	}	1243	}
1141		1244
1142	int	1245	int
1143	has_wrapped (CFPlus::Layout self)	1246	has_wrapped (DC::Layout self)
1144	CODE:	1247	CODE:
1145	{	1248	{
1146	int lines = 1;	1249	int lines = 1;
1147	const char *text = pango_layout_get_text (self->pl);	1250	const char *text = pango_layout_get_text (self->pl);
1148		1251
…		…
1153	}	1256	}
1154	OUTPUT:	1257	OUTPUT:
1155	RETVAL	1258	RETVAL
1156		1259
1157	SV *	1260	SV *
1158	get_text (CFPlus::Layout self)	1261	get_text (DC::Layout self)
1159	CODE:	1262	CODE:
1160	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1263	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161	sv_utf8_decode (RETVAL);	1264	sv_utf8_decode (RETVAL);
1162	OUTPUT:	1265	OUTPUT:
1163	RETVAL	1266	RETVAL
1164		1267
1165	void	1268	void
1166	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1269	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167	CODE:	1270	CODE:
1168	self->r = r;	1271	self->r = r;
1169	self->g = g;	1272	self->g = g;
1170	self->b = b;	1273	self->b = b;
1171	self->a = a;	1274	self->a = a;
1172		1275
1173	void	1276	void
1174	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1277	set_font (DC::Layout self, DC::Font font = 0)
1175	CODE:	1278	CODE:
1176	if (self->font != font)	1279	if (self->font != font)
1177	{	1280	{
1178	self->font = font;	1281	self->font = font;
1179	layout_update_font (self);	1282	layout_update_font (self);
1180	}	1283	}
1181		1284
1182	void	1285	void
1183	set_height (CFPlus::Layout self, int base_height)	1286	set_height (DC::Layout self, int base_height)
1184	CODE:	1287	CODE:
1185	if (self->base_height != base_height)	1288	if (self->base_height != base_height)
1186	{	1289	{
1187	self->base_height = base_height;	1290	self->base_height = base_height;
1188	layout_update_font (self);	1291	layout_update_font (self);
1189	}	1292	}
1190		1293
1191	void	1294	void
1192	set_width (CFPlus::Layout self, int max_width = -1)	1295	set_width (DC::Layout self, int max_width = -1)
1193	CODE:	1296	CODE:
1194	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1297	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195		1298
1196	void	1299	void
1197	set_indent (CFPlus::Layout self, int indent)	1300	set_indent (DC::Layout self, int indent)
1198	CODE:	1301	CODE:
1199	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1302	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200		1303
1201	void	1304	void
1202	set_spacing (CFPlus::Layout self, int spacing)	1305	set_spacing (DC::Layout self, int spacing)
1203	CODE:	1306	CODE:
1204	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1307	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205		1308
1206	void	1309	void
1207	set_ellipsise (CFPlus::Layout self, int ellipsise)	1310	set_ellipsise (DC::Layout self, int ellipsise)
1208	CODE:	1311	CODE:
1209	pango_layout_set_ellipsize (self->pl,	1312	pango_layout_set_ellipsize (self->pl,
1210	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1313	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1314	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1315	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213	: PANGO_ELLIPSIZE_NONE	1316	: PANGO_ELLIPSIZE_NONE
1214	);	1317	);
1215		1318
1216	void	1319	void
1217	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1320	set_single_paragraph_mode (DC::Layout self, int spm)
1218	CODE:	1321	CODE:
1219	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1322	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220		1323
1221	void	1324	void
1222	size (CFPlus::Layout self)	1325	size (DC::Layout self)
1223	PPCODE:	1326	PPCODE:
1224	{	1327	{
1225	int w, h;	1328	int w, h;
1226		1329
1227	layout_get_pixel_size (self, &w, &h);	1330	layout_get_pixel_size (self, &w, &h);
…		…
1230	PUSHs (sv_2mortal (newSViv (w)));	1333	PUSHs (sv_2mortal (newSViv (w)));
1231	PUSHs (sv_2mortal (newSViv (h)));	1334	PUSHs (sv_2mortal (newSViv (h)));
1232	}	1335	}
1233		1336
1234	int	1337	int
1235	descent (CFPlus::Layout self)	1338	descent (DC::Layout self)
1236	CODE:	1339	CODE:
1237	{	1340	{
1238	PangoRectangle rect;	1341	PangoRectangle rect;
1239	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1342	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240	pango_layout_line_get_pixel_extents (line, 0, &rect);	1343	pango_layout_line_get_pixel_extents (line, 0, &rect);
1241	RETVAL = PANGO_DESCENT (rect);	1344	RETVAL = PANGO_DESCENT (rect);
1242	}	1345	}
1243	OUTPUT:	1346	OUTPUT:
1244	RETVAL	1347	RETVAL
1245		1348
1246	int	1349	int
1247	xy_to_index (CFPlus::Layout self, int x, int y)	1350	xy_to_index (DC::Layout self, int x, int y)
1248	CODE:	1351	CODE:
1249	{	1352	{
1250	int index, trailing;	1353	int index, trailing;
1251	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1354	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252	RETVAL = index + trailing;	1355	RETVAL = index + trailing;
1253	}	1356	}
1254	OUTPUT:	1357	OUTPUT:
1255	RETVAL	1358	RETVAL
1256		1359
1257	void	1360	void
1258	cursor_pos (CFPlus::Layout self, int index)	1361	cursor_pos (DC::Layout self, int index)
1259	PPCODE:	1362	PPCODE:
1260	{	1363	{
1261	PangoRectangle strong_pos;	1364	PangoRectangle pos;
1262	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1365	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263		1366
1264	EXTEND (SP, 3);	1367	EXTEND (SP, 3);
1265	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1368	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1369	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1370	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268	}	1371	}
1269		1372
1270	void	1373	void
1271	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1374	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272	PPCODE:	1375	PPCODE:
1273	{	1376	{
1274	int line, x;	1377	int line, x;
1275		1378
1276	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1379	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1380	#if !PANGO_VERSION_CHECK (1, 17, 3)
1277	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1381	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278		1382	--line;
		1383	#endif
1279	EXTEND (SP, 2);	1384	EXTEND (SP, 2);
1280	PUSHs (sv_2mortal (newSViv (line - 1)));	1385	PUSHs (sv_2mortal (newSViv (line)));
1281	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1386	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282	}	1387	}
1283		1388
1284	void	1389	void
1285	line_x_to_index (CFPlus::Layout self, int line, int x)	1390	line_x_to_index (DC::Layout self, int line, int x)
1286	PPCODE:	1391	PPCODE:
1287	{	1392	{
1288	PangoLayoutLine *lp;	1393	PangoLayoutLine *lp;
1289	int index, trailing;	1394	int index, trailing;
1290		1395
1291	if (line < 0)	1396	if (line < 0)
1292	XSRETURN_EMPTY;	1397	XSRETURN_EMPTY;
1293		1398
1294	if (!(lp = pango_layout_get_line (self->pl, line)))	1399	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295	XSRETURN_EMPTY; /* do better */	1400	XSRETURN_EMPTY; /* do better */
1296		1401
1297	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1402	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1298		1403
1299	EXTEND (SP, 2);	1404	EXTEND (SP, 2);
…		…
1305	PUSHs (sv_2mortal (newSViv (trailing)));	1410	PUSHs (sv_2mortal (newSViv (trailing)));
1306	}	1411	}
1307	}	1412	}
1308		1413
1309	void	1414	void
1310	render (CFPlus::Layout self, float x, float y, int flags = 0)	1415	render (DC::Layout self, float x, float y, int flags = 0)
1311	PPCODE:	1416	CODE:
		1417	rc_clear (self->rc);
1312	pango_opengl_render_layout_subpixel (	1418	pango_opengl_render_layout_subpixel (
1313	self->pl,	1419	self->pl,
		1420	self->rc,
1314	x * PANGO_SCALE, y * PANGO_SCALE,	1421	x * PANGO_SCALE, y * PANGO_SCALE,
1315	self->r, self->g, self->b, self->a,	1422	self->r, self->g, self->b, self->a,
1316	flags	1423	flags
1317	);	1424	);
		1425	// we assume that context_change actually clears/frees stuff
		1426	// and does not do any recomputation...
		1427	pango_layout_context_changed (self->pl);
1318		1428
1319	MODULE = CFPlus PACKAGE = CFPlus::Texture	1429	void
		1430	draw (DC::Layout self)
		1431	CODE:
		1432	{
		1433	glEnable (GL_TEXTURE_2D);
		1434	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1435	glEnable (GL_BLEND);
		1436	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1437	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1438	glEnable (GL_ALPHA_TEST);
		1439	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1440
		1441	rc_draw (self->rc);
		1442
		1443	glDisable (GL_ALPHA_TEST);
		1444	glDisable (GL_BLEND);
		1445	glDisable (GL_TEXTURE_2D);
		1446	}
		1447
		1448	MODULE = Deliantra::Client PACKAGE = DC::Texture
1320		1449
1321	PROTOTYPES: ENABLE	1450	PROTOTYPES: ENABLE
1322
1323	int minpot (int n)
1324		1451
1325	void	1452	void
1326	pad (SV *data_, int ow, int oh, int nw, int nh)	1453	pad (SV *data_, int ow, int oh, int nw, int nh)
1327	CODE:	1454	CODE:
1328	{	1455	{
…		…
1405	RETVAL = width > 0;	1532	RETVAL = width > 0;
1406	}	1533	}
1407	OUTPUT:	1534	OUTPUT:
1408	RETVAL	1535	RETVAL
1409		1536
1410	MODULE = CFPlus PACKAGE = CFPlus::Map	1537	MODULE = Deliantra::Client PACKAGE = DC::Map
1411		1538
1412	PROTOTYPES: DISABLE	1539	PROTOTYPES: DISABLE
1413		1540
1414	CFPlus::Map	1541	DC::Map
1415	new (SV *class)	1542	new (SV *class)
1416	CODE:	1543	CODE:
1417	New (0, RETVAL, 1, struct map);	1544	New (0, RETVAL, 1, struct map);
1418	RETVAL->x = 0;	1545	RETVAL->x = 0;
1419	RETVAL->y = 0;	1546	RETVAL->y = 0;
…		…
1427	RETVAL->row = 0;	1554	RETVAL->row = 0;
1428	OUTPUT:	1555	OUTPUT:
1429	RETVAL	1556	RETVAL
1430		1557
1431	void	1558	void
1432	DESTROY (CFPlus::Map self)	1559	DESTROY (DC::Map self)
1433	CODE:	1560	CODE:
1434	{	1561	{
1435	map_clear (self);	1562	map_clear (self);
1436	Safefree (self->face2tile);	1563	Safefree (self->face2tile);
1437	Safefree (self->tex);	1564	Safefree (self->tex);
1438	Safefree (self);	1565	Safefree (self);
1439	}	1566	}
1440		1567
1441	void	1568	void
1442	resize (CFPlus::Map self, int map_width, int map_height)	1569	resize (DC::Map self, int map_width, int map_height)
1443	CODE:	1570	CODE:
1444	self->w = map_width;	1571	self->w = map_width;
1445	self->h = map_height;	1572	self->h = map_height;
1446		1573
1447	void	1574	void
1448	clear (CFPlus::Map self)	1575	clear (DC::Map self)
1449	CODE:	1576	CODE:
1450	map_clear (self);	1577	map_clear (self);
1451		1578
1452	void	1579	void
1453	set_tileid (CFPlus::Map self, int face, int tile)	1580	set_tileid (DC::Map self, int face, int tile)
1454	CODE:	1581	CODE:
1455	{	1582	{
1456	need_facenum (self, face); self->face2tile [face] = tile;	1583	need_facenum (self, face); self->face2tile [face] = tile;
1457	need_texid (self, tile);	1584	need_texid (self, tile);
1458	}	1585	}
1459		1586
1460	void	1587	void
1461	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1588	set_smooth (DC::Map self, int face, int smooth, int level)
1462	CODE:	1589	CODE:
1463	{	1590	{
1464	tileid texid;	1591	tileid texid;
1465	maptex *tex;	1592	maptex *tex;
1466		1593
…		…
1479	tex->smoothtile = self->face2tile [smooth];	1606	tex->smoothtile = self->face2tile [smooth];
1480	tex->smoothlevel = level;	1607	tex->smoothlevel = level;
1481	}	1608	}
1482		1609
1483	void	1610	void
1484	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)	1611	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)
1485	CODE:	1612	CODE:
1486	{	1613	{
1487	need_texid (self, texid);	1614	need_texid (self, texid);
1488		1615
1489	{	1616	{
…		…
1509	// from transparent color bleeding and ugly wrapping effects.	1636	// from transparent color bleeding and ugly wrapping effects.
1510	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1637	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511	}	1638	}
1512		1639
1513	int	1640	int
1514	ox (CFPlus::Map self)	1641	ox (DC::Map self)
1515	ALIAS:	1642	ALIAS:
1516	oy = 1	1643	oy = 1
1517	x = 2	1644	x = 2
1518	y = 3	1645	y = 3
1519	w = 4	1646	w = 4
…		…
1530	}	1657	}
1531	OUTPUT:	1658	OUTPUT:
1532	RETVAL	1659	RETVAL
1533		1660
1534	void	1661	void
1535	scroll (CFPlus::Map self, int dx, int dy)	1662	scroll (DC::Map self, int dx, int dy)
1536	CODE:	1663	CODE:
1537	{	1664	{
1538	if (dx > 0)	1665	if (dx > 0)
1539	map_blank (self, self->x, self->y, dx, self->h);	1666	map_blank (self, self->x, self->y, dx, self->h);
1540	else if (dx < 0)	1667	else if (dx < 0)
…		…
1556	self->y += MAP_EXTEND_Y;	1683	self->y += MAP_EXTEND_Y;
1557	}	1684	}
1558	}	1685	}
1559		1686
1560	SV *	1687	SV *
1561	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1688	map1a_update (DC::Map self, SV *data_, int extmap)
1562	CODE:	1689	CODE:
1563	{	1690	{
1564	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1691	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565	uint8_t *data_end = (uint8_t *)SvEND (data_);	1692	uint8_t *data_end = (uint8_t *)SvEND (data_);
1566	mapcell *cell;	1693	mapcell *cell;
…		…
1594	uint8_t ext, cmd;	1721	uint8_t ext, cmd;
1595		1722
1596	do	1723	do
1597	{	1724	{
1598	ext = *data++;	1725	ext = *data++;
1599	cmd = ext & 0x3f;	1726	cmd = ext & 0x7f;
1600		1727
1601	if (cmd < 4)	1728	if (cmd < 4)
1602	cell->darkness = 255 - ext * 64 + 1;	1729	cell->darkness = 255 - ext * 64 + 1;
1603	else if (cmd == 5) // health	1730	else if (cmd == 5) // health
1604	{	1731	{
…		…
1607	}	1734	}
1608	else if (cmd == 6) // monster width	1735	else if (cmd == 6) // monster width
1609	cell->stat_width = *data++ + 1;	1736	cell->stat_width = *data++ + 1;
1610	else if (cmd == 0x47)	1737	else if (cmd == 0x47)
1611	{	1738	{
1612	if (*data == 4)	1739	if (*data == 1) cell->player = data [1];
1613	; // decode player count	1740	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1741	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1742	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1614		1743
1615	data += *data + 1;	1744	data += *data + 1;
1616	}	1745	}
1617	else if (cmd == 8) // cell flags	1746	else if (cmd == 8) // cell flags
1618	cell->flags = *data++;	1747	cell->flags = *data++;
…		…
1655	}	1784	}
1656	OUTPUT:	1785	OUTPUT:
1657	RETVAL	1786	RETVAL
1658		1787
1659	SV *	1788	SV *
1660	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1789	mapmap (DC::Map self, int x0, int y0, int w, int h)
1661	CODE:	1790	CODE:
1662	{	1791	{
1663	int x1, x;	1792	int x1, x;
1664	int y1, y;	1793	int y1, y;
1665	int z;	1794	int z;
…		…
1710	}	1839	}
1711	OUTPUT:	1840	OUTPUT:
1712	RETVAL	1841	RETVAL
1713		1842
1714	void	1843	void
1715	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1844	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1716	CODE:	1845	CODE:
1717	{	1846	{
		1847	int x, y, z;
		1848
1718	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1849	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1850	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1720	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1851	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721	smooth_key skey;	1852	smooth_key skey;
1722	int x, y, z;	1853	int pl_x, pl_y;
1723	int last_name;	1854	maptex pl_tex;
		1855	rc_t *rc = rc_alloc ();
		1856	rc_key_t key;
		1857	rc_array_t *arr;
		1858
		1859	pl_tex.name = 0;
1724		1860
1725	// thats current max. sorry.	1861	// thats current max. sorry.
1726	if (sw > 255) sw = 255;	1862	if (sw > 255) sw = 255;
1727	if (sh > 255) sh = 255;	1863	if (sh > 255) sh = 255;
1728		1864
1729	// clear key, in case of extra padding	1865	// clear key, in case of extra padding
1730	memset (&skey, 0, sizeof (skey));	1866	memset (&skey, 0, sizeof (skey));
1731		1867
1732	glColor4ub (255, 255, 255, 255);	1868	memset (&key, 0, sizeof (key));
1733		1869	key.r = 255;
1734	glEnable (GL_BLEND);	1870	key.g = 255;
1735	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1871	key.b = 255;
1736	glEnable (GL_TEXTURE_2D);	1872	key.a = 255;
1737	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1873	key.mode = GL_QUADS;
1738		1874	key.format = GL_T2F_V3F;
1739	glBegin (GL_QUADS);
1740
1741	last_name = -1;	1875	key.texname = -1;
1742		1876
1743	mx += self->x;	1877	mx += self->x;
1744	my += self->y;	1878	my += self->y;
1745		1879
1746	// first pass: determine smooth_max	1880	// first pass: determine smooth_max
…		…
1762	MAX (self->tex [cell->tile [0]].smoothlevel,	1896	MAX (self->tex [cell->tile [0]].smoothlevel,
1763	MAX (self->tex [cell->tile [1]].smoothlevel,	1897	MAX (self->tex [cell->tile [1]].smoothlevel,
1764	self->tex [cell->tile [2]].smoothlevel));	1898	self->tex [cell->tile [2]].smoothlevel));
1765	}	1899	}
1766	}	1900	}
		1901
		1902	glEnable (GL_BLEND);
		1903	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1904	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1767		1905
1768	for (z = 0; z <= 2; z++)	1906	for (z = 0; z <= 2; z++)
1769	{	1907	{
1770	memset (smooth_level, 0, sizeof (smooth_level));	1908	memset (smooth_level, 0, sizeof (smooth_level));
1771		1909
…		…
1781	tileid tile = cell->tile [z];	1919	tileid tile = cell->tile [z];
1782		1920
1783	if (tile)	1921	if (tile)
1784	{	1922	{
1785	maptex tex = self->tex [tile];	1923	maptex tex = self->tex [tile];
1786	int px, py;	1924	int px = (x + 1) * T - tex.w;
		1925	int py = (y + 1) * T - tex.h;
1787		1926
1788	// suppressing texture state switches here
1789	// is only moderately effective, but worth the extra effort
1790	if (last_name != tex.name)	1927	if (key.texname != tex.name)
1791	{	1928	{
1792	if (!tex.name)	1929	if (!tex.name)
1793	tex = self->tex [2]; /* missing, replace by noface */	1930	tex = self->tex [2]; /* missing, replace by noface */
1794		1931
1795	glEnd ();	1932	key.texname = tex.name;
1796	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1933	arr = rc_array (rc, &key);
1797	glBegin (GL_QUADS);
1798	}	1934	}
1799		1935
1800	px = (x + 1) * T - tex.w;	1936	if (expect_false (cell->player == player) && expect_false (z == 2))
1801	py = (y + 1) * T - tex.h;
1802
1803	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1804	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808	if (cell->flags && z == 2)
1809	{	1937	{
		1938	pl_x = px;
		1939	pl_y = py;
		1940	pl_tex = tex;
		1941	continue;
		1942	}
		1943
		1944	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1945	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		1946	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		1947	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		1948
		1949	if (expect_false (cell->flags) && expect_false (z == 2))
		1950	{
		1951	// overlays such as the speech bubble, probably more to come
1810	if (cell->flags & 1)	1952	if (cell->flags & 1)
1811	{	1953	{
1812	maptex tex = self->tex [1];	1954	maptex tex = self->tex [1];
1813	int px = x * T + T * 2 / 32;	1955	int px = x * T + T * 2 / 32;
1814	int py = y * T - T * 6 / 32;	1956	int py = y * T - T * 6 / 32;
1815		1957
		1958	if (tex.name)
1816	glEnd ();	1959	{
1817	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1960	if (key.texname != tex.name)
		1961	{
		1962	key.texname = tex.name;
		1963	arr = rc_array (rc, &key);
		1964	}
		1965
		1966	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1967	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		1968	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		1969	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1818	glBegin (GL_QUADS);	1970	}
1819
1820	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824	}	1971	}
1825	}	1972	}
1826		1973
1827	// update smooth hash	1974	// update smooth hash
1828	if (tex.smoothtile)	1975	if (tex.smoothtile)
…		…
1864	}	2011	}
1865	}	2012	}
1866	}	2013	}
1867	}	2014	}
1868		2015
		2016	rc_draw (rc);
		2017	rc_clear (rc);
		2018
1869	// go through all smoothlevels, lowest to highest, then draw.	2019	// go through all smoothlevels, lowest to highest, then draw.
1870	// this is basically counting sort	2020	// this is basically counting sort
1871	{	2021	{
1872	int w, b;	2022	int w, b;
1873		2023
		2024	glEnable (GL_TEXTURE_2D);
		2025	glBegin (GL_QUADS);
1874	for (w = 0; w < 256 / 32; ++w)	2026	for (w = 0; w < 256 / 32; ++w)
1875	{	2027	{
1876	uint32_t smask = smooth_level [w];	2028	uint32_t smask = smooth_level [w];
1877	if (smask)	2029	if (smask)
1878	for (b = 0; b < 32; ++b)	2030	for (b = 0; b < 32; ++b)
…		…
1897	int border = bits & 15;	2049	int border = bits & 15;
1898	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2050	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899	float dx = tex.s * .0625f; // 16 images/row	2051	float dx = tex.s * .0625f; // 16 images/row
1900	float dy = tex.t * .5f ; // 2 images/column	2052	float dy = tex.t * .5f ; // 2 images/column
1901		2053
1902	// this time naively avoiding texture state changes
1903	// save gobs of state changes.
1904	if (last_name != tex.name)	2054	if (tex.name)
1905	{	2055	{
		2056	// this time avoiding texture state changes
		2057	// save gobs of state changes.
1906	if (!tex.name)	2058	if (key.texname != tex.name)
1907	continue; // smoothing not yet available	2059	{
1908
1909	glEnd ();	2060	glEnd ();
1910	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2061	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911	glBegin (GL_QUADS);	2062	glBegin (GL_QUADS);
1912	}	2063	}
1913		2064
1914	if (border)	2065	if (border)
1915	{	2066	{
1916	float ox = border * dx;	2067	float ox = border * dx;
1917		2068
1918	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2069	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2070	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2071	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2072	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922	}	2073	}
1923		2074
1924	if (corner)	2075	if (corner)
1925	{	2076	{
1926	float ox = corner * dx;	2077	float ox = corner * dx;
1927		2078
1928	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2079	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2080	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2081	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2082	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2083	}
1932	}	2084	}
1933	}	2085	}
1934	}	2086	}
1935	}	2087	}
1936	}	2088	}
		2089
		2090	glEnd ();
		2091	glDisable (GL_TEXTURE_2D);
		2092	key.texname = -1;
1937	}	2093	}
1938		2094
1939	hv_clear (smooth);	2095	hv_clear (smooth);
1940	}	2096	}
1941		2097
1942	glEnd ();	2098	if (pl_tex.name)
		2099	{
		2100	maptex tex = pl_tex;
		2101	int px = pl_x + pdx;
		2102	int py = pl_y + pdy;
1943		2103
1944	glDisable (GL_TEXTURE_2D);	2104	key.texname = tex.name;
		2105	arr = rc_array (rc, &key);
		2106
		2107	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2108	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2109	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2110	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2111
		2112	rc_draw (rc);
		2113	}
		2114
1945	glDisable (GL_BLEND);	2115	glDisable (GL_BLEND);
		2116	rc_free (rc);
1946		2117
1947	// top layer: overlays such as the health bar	2118	// top layer: overlays such as the health bar
1948	for (y = 0; y < sh; y++)	2119	for (y = 0; y < sh; y++)
1949	if (0 <= y + my && y + my < self->rows)	2120	if (0 <= y + my && y + my < self->rows)
1950	{	2121	{
…		…
1975	}	2146	}
1976	}	2147	}
1977	}	2148	}
1978		2149
1979	void	2150	void
1980	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2151	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981	CODE:	2152	CODE:
1982	{	2153	{
1983	static float color[16][3] = {	2154	static float color[16][3] = {
1984	{ 0.00F, 0.00F, 0.00F },	2155	{ 0.00F, 0.00F, 0.00F },
1985	{ 1.00F, 1.00F, 1.00F },	2156	{ 1.00F, 1.00F, 1.00F },
…		…
2035	glDisable (GL_BLEND);	2206	glDisable (GL_BLEND);
2036	glDisable (GL_TEXTURE_2D);	2207	glDisable (GL_TEXTURE_2D);
2037	}	2208	}
2038		2209
2039	void	2210	void
2040	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2211	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041	PPCODE:	2212	PPCODE:
2042	{	2213	{
2043	int x, y;	2214	int x, y;
2044	int sw1 = sw + 2;	2215	int sw1 = sw + 2;
2045	int sh1 = sh + 2;	2216	int sh1 = sh + 2;
…		…
2116	PUSHs (sv_2mortal (newSViv (sh3)));	2287	PUSHs (sv_2mortal (newSViv (sh3)));
2117	PUSHs (darkness3_sv);	2288	PUSHs (darkness3_sv);
2118	}	2289	}
2119		2290
2120	SV *	2291	SV *
2121	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2292	get_rect (DC::Map self, int x0, int y0, int w, int h)
2122	CODE:	2293	CODE:
2123	{	2294	{
2124	int x, y, x1, y1;	2295	int x, y, x1, y1;
2125	SV *data_sv = newSV (w * h * 7 + 5);	2296	SV *data_sv = newSV (w * h * 7 + 5);
2126	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2297	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2183	else	2354	else
2184	*data++ = 0;	2355	*data++ = 0;
2185	}	2356	}
2186	}	2357	}
2187		2358
		2359	/* if size is w*h + 5 then no data has been found */
		2360	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2361	{
2188	SvPOK_only (data_sv);	2362	SvPOK_only (data_sv);
2189	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2363	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2364	}
		2365
2190	RETVAL = data_sv;	2366	RETVAL = data_sv;
2191	}	2367	}
2192	OUTPUT:	2368	OUTPUT:
2193	RETVAL	2369	RETVAL
2194		2370
2195	void	2371	void
2196	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2372	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197	PPCODE:	2373	PPCODE:
2198	{	2374	{
2199	int x, y, z;	2375	int x, y, z;
2200	int w, h;	2376	int w, h;
2201	int x1, y1;	2377	int x1, y1;
		2378	STRLEN len;
		2379	uint8_t *data, *end;
		2380
		2381	len = SvLEN (data_sv);
		2382	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2383	data = SvPVbyte_nolen (data_sv);
		2384	end = data + len + 8;
		2385
		2386	if (len < 5)
		2387	XSRETURN_EMPTY;
2202		2388
2203	if (*data++ != 0)	2389	if (*data++ != 0)
2204	return; /* version mismatch */	2390	XSRETURN_EMPTY; /* version mismatch */
2205		2391
2206	w = *data++ << 8; w |= *data++;	2392	w = *data++ << 8; w |= *data++;
2207	h = *data++ << 8; h |= *data++;	2393	h = *data++ << 8; h |= *data++;
2208		2394
2209	// we need to do this 'cause we don't keep an absolute coord system for rows	2395	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2221	{	2407	{
2222	maprow *row = map_get_row (self, y);	2408	maprow *row = map_get_row (self, y);
2223		2409
2224	for (x = x0; x < x1; x++)	2410	for (x = x0; x < x1; x++)
2225	{	2411	{
		2412	uint8_t flags;
		2413
		2414	if (data + 7 >= end)
		2415	XSRETURN_EMPTY;
		2416
2226	uint8_t flags = *data++;	2417	flags = *data++;
2227		2418
2228	if (flags)	2419	if (flags)
2229	{	2420	{
2230	mapcell *cell = row_get_cell (row, x);	2421	mapcell *cell = row_get_cell (row, x);
2231	tileid tile[3] = { 0, 0, 0 };	2422	tileid tile[3] = { 0, 0, 0 };
…		…
2234	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2425	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2426	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236		2427
2237	if (cell->darkness == 0)	2428	if (cell->darkness == 0)
2238	{	2429	{
2239	cell->darkness = 0;	2430	/*cell->darkness = 0;*/
		2431	EXTEND (SP, 3);
2240		2432
2241	for (z = 0; z <= 2; z++)	2433	for (z = 0; z <= 2; z++)
2242	{	2434	{
2243	tileid t = tile [z];	2435	tileid t = tile [z];
2244		2436
2245	if (t >= self->texs || (t && !self->tex [t].name))	2437	if (t >= self->texs || (t && !self->tex [t].name))
2246	{	2438	{
2247	XPUSHs (sv_2mortal (newSViv (t)));	2439	PUSHs (sv_2mortal (newSViv (t)));
2248	need_texid (self, t);	2440	need_texid (self, t);
2249	}	2441	}
2250		2442
2251	cell->tile [z] = t;	2443	cell->tile [z] = t;
2252	}	2444	}
…		…
2254	}	2446	}
2255	}	2447	}
2256	}	2448	}
2257	}	2449	}
2258		2450
2259	MODULE = CFPlus PACKAGE = CFPlus::RW	2451	MODULE = Deliantra::Client PACKAGE = DC::RW
2260		2452
2261	CFPlus::RW	2453	DC::RW
2262	new (SV *class, SV *data_sv)	2454	new (SV *class, SV *data_sv)
2263	CODE:	2455	CODE:
2264	{	2456	{
2265	STRLEN datalen;	2457	STRLEN datalen;
2266	char *data = SvPVbyte (data_sv, datalen);	2458	char *data = SvPVbyte (data_sv, datalen);
…		…
2268	RETVAL = SDL_RWFromConstMem (data, datalen);	2460	RETVAL = SDL_RWFromConstMem (data, datalen);
2269	}	2461	}
2270	OUTPUT:	2462	OUTPUT:
2271	RETVAL	2463	RETVAL
2272		2464
2273	CFPlus::RW	2465	DC::RW
2274	new_from_file (SV *class, const char *path, const char *mode = "rb")	2466	new_from_file (SV *class, const char *path, const char *mode = "rb")
2275	CODE:	2467	CODE:
2276	RETVAL = SDL_RWFromFile (path, mode);	2468	RETVAL = SDL_RWFromFile (path, mode);
2277	OUTPUT:	2469	OUTPUT:
2278	RETVAL	2470	RETVAL
2279		2471
2280	# fails on win32:	2472	# fails on win32:
2281	# CFPlus.xs(2268) : error C2059: syntax error : '('	2473	# dc.xs(2268) : error C2059: syntax error : '('
2282	#void	2474	#void
2283	#close (CFPlus::RW self)	2475	#close (DC::RW self)
2284	# CODE:	2476	# CODE:
2285	# (self->(close)) (self);	2477	# (self->(close)) (self);
2286		2478
2287	MODULE = CFPlus PACKAGE = CFPlus::Channel	2479	MODULE = Deliantra::Client PACKAGE = DC::Channel
2288		2480
2289	PROTOTYPES: DISABLE	2481	PROTOTYPES: DISABLE
2290		2482
2291	CFPlus::Channel	2483	DC::Channel
2292	find ()	2484	find ()
2293	CODE:	2485	CODE:
2294	{	2486	{
2295	RETVAL = Mix_GroupAvailable (-1);	2487	RETVAL = Mix_GroupAvailable (-1);
2296		2488
…		…
2309	}	2501	}
2310	OUTPUT:	2502	OUTPUT:
2311	RETVAL	2503	RETVAL
2312		2504
2313	void	2505	void
2314	halt (CFPlus::Channel self)	2506	halt (DC::Channel self)
2315	CODE:	2507	CODE:
2316	Mix_HaltChannel (self);	2508	Mix_HaltChannel (self);
2317		2509
2318	void	2510	void
2319	expire (CFPlus::Channel self, int ticks = -1)	2511	expire (DC::Channel self, int ticks = -1)
2320	CODE:	2512	CODE:
2321	Mix_ExpireChannel (self, ticks);	2513	Mix_ExpireChannel (self, ticks);
2322		2514
2323	void	2515	void
2324	fade_out (CFPlus::Channel self, int ticks = -1)	2516	fade_out (DC::Channel self, int ticks = -1)
2325	CODE:	2517	CODE:
2326	Mix_FadeOutChannel (self, ticks);	2518	Mix_FadeOutChannel (self, ticks);
2327		2519
2328	int	2520	int
2329	volume (CFPlus::Channel self, int volume)	2521	volume (DC::Channel self, int volume)
2330	CODE:	2522	CODE:
2331	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2523	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332	OUTPUT:	2524	OUTPUT:
2333	RETVAL	2525	RETVAL
2334		2526
2335	void	2527	void
2336	unregister_all_effects (CFPlus::Channel self)	2528	unregister_all_effects (DC::Channel self)
2337	CODE:	2529	CODE:
2338	Mix_UnregisterAllEffects (self);	2530	Mix_UnregisterAllEffects (self);
2339		2531
2340	void	2532	void
2341	set_panning (CFPlus::Channel self, int left, int right)	2533	set_panning (DC::Channel self, int left, int right)
2342	CODE:	2534	CODE:
2343	left = CLAMP (left , 0, 255);	2535	left = CLAMP (left , 0, 255);
2344	right = CLAMP (right, 0, 255);	2536	right = CLAMP (right, 0, 255);
2345	Mix_SetPanning (self, left, right);	2537	Mix_SetPanning (self, left, right);
2346		2538
2347	void	2539	void
2348	set_distance (CFPlus::Channel self, int distance)	2540	set_distance (DC::Channel self, int distance)
2349	CODE:	2541	CODE:
2350	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2542	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351		2543
2352	void	2544	void
2353	set_position (CFPlus::Channel self, int angle, int distance)	2545	set_position (DC::Channel self, int angle, int distance)
2354	CODE:	2546	CODE:
2355		2547
2356	void	2548	void
2357	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2549	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358	CODE:	2550	CODE:
2359	{	2551	{
2360	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2552	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2553	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2554	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363	}	2555	}
2364		2556
2365	void	2557	void
2366	set_reverse_stereo (CFPlus::Channel self, int flip)	2558	set_reverse_stereo (DC::Channel self, int flip)
2367	CODE:	2559	CODE:
2368	Mix_SetReverseStereo (self, flip);	2560	Mix_SetReverseStereo (self, flip);
2369		2561
2370	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2562	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371		2563
2372	PROTOTYPES: DISABLE	2564	PROTOTYPES: DISABLE
2373		2565
2374	CFPlus::MixChunk	2566	DC::MixChunk
2375	new (SV *class, CFPlus::RW rwops)	2567	new (SV *class, DC::RW rwops)
2376	CODE:	2568	CODE:
2377	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2569	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378	OUTPUT:	2570	OUTPUT:
2379	RETVAL	2571	RETVAL
2380		2572
2381	void	2573	void
2382	DESTROY (CFPlus::MixChunk self)	2574	DESTROY (DC::MixChunk self)
2383	CODE:	2575	CODE:
2384	Mix_FreeChunk (self);	2576	Mix_FreeChunk (self);
2385		2577
2386	int	2578	int
2387	volume (CFPlus::MixChunk self, int volume = -1)	2579	volume (DC::MixChunk self, int volume = -1)
2388	CODE:	2580	CODE:
2389	if (items > 1)	2581	if (items > 1)
2390	volume = CLAMP (volume, 0, 128);	2582	volume = CLAMP (volume, 0, 128);
2391	RETVAL = Mix_VolumeChunk (self, volume);	2583	RETVAL = Mix_VolumeChunk (self, volume);
2392	OUTPUT:	2584	OUTPUT:
2393	RETVAL	2585	RETVAL
2394		2586
2395	CFPlus::Channel	2587	DC::Channel
2396	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2588	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397	CODE:	2589	CODE:
2398	{	2590	{
2399	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2591	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400		2592
2401	if (RETVAL < 0)	2593	if (RETVAL < 0)
…		…
2408	}	2600	}
2409	}	2601	}
2410	OUTPUT:	2602	OUTPUT:
2411	RETVAL	2603	RETVAL
2412		2604
2413	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2605	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414		2606
2415	int	2607	int
2416	volume (int volume = -1)	2608	volume (int volume = -1)
2417	PROTOTYPE: ;$	2609	PROTOTYPE: ;$
2418	CODE:	2610	CODE:
…		…
2430	void	2622	void
2431	halt ()	2623	halt ()
2432	CODE:	2624	CODE:
2433	Mix_HaltMusic ();	2625	Mix_HaltMusic ();
2434		2626
2435	CFPlus::MixMusic	2627	DC::MixMusic
2436	new (SV *class, CFPlus::RW rwops)	2628	new (SV *class, DC::RW rwops)
2437	CODE:	2629	CODE:
2438	RETVAL = Mix_LoadMUS_RW (rwops);	2630	RETVAL = Mix_LoadMUS_RW (rwops);
2439	OUTPUT:	2631	OUTPUT:
2440	RETVAL	2632	RETVAL
2441		2633
2442	void	2634	void
2443	DESTROY (CFPlus::MixMusic self)	2635	DESTROY (DC::MixMusic self)
2444	CODE:	2636	CODE:
2445	Mix_FreeMusic (self);	2637	Mix_FreeMusic (self);
2446		2638
2447	int	2639	int
2448	play (CFPlus::MixMusic self, int loops = -1)	2640	play (DC::MixMusic self, int loops = -1)
2449	CODE:	2641	CODE:
2450	RETVAL = Mix_PlayMusic (self, loops);	2642	RETVAL = Mix_PlayMusic (self, loops);
2451	OUTPUT:	2643	OUTPUT:
2452	RETVAL	2644	RETVAL
2453		2645
2454	void	2646	void
2455	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2647	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456	CODE:	2648	CODE:
2457	Mix_FadeInMusicPos (self, loops, ms, position);	2649	Mix_FadeInMusicPos (self, loops, ms, position);
2458		2650
2459	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2651	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460		2652
2461	PROTOTYPES: ENABLE	2653	PROTOTYPES: ENABLE
2462		2654
2463	BOOT:	2655	BOOT:
2464	{	2656	{
2465	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2657	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466	static const struct {	2658	static const struct {
2467	const char *name;	2659	const char *name;
2468	IV iv;	2660	IV iv;
2469	} *civ, const_iv[] = {	2661	} *civ, const_iv[] = {
2470	# define const_iv(name) { # name, (IV)name }	2662	# define const_iv(name) { # name, (IV)name }
…		…
2505	const_iv (GL_INTENSITY),	2697	const_iv (GL_INTENSITY),
2506	const_iv (GL_LUMINANCE),	2698	const_iv (GL_LUMINANCE),
2507	const_iv (GL_LUMINANCE_ALPHA),	2699	const_iv (GL_LUMINANCE_ALPHA),
2508	const_iv (GL_FLOAT),	2700	const_iv (GL_FLOAT),
2509	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2701	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2702	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2703	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2704	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2705	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2706	const_iv (GL_COMPRESSED_RGB_ARB),
		2707	const_iv (GL_COMPRESSED_RGBA_ARB),
2510	const_iv (GL_COMPILE),	2708	const_iv (GL_COMPILE),
2511	const_iv (GL_PROXY_TEXTURE_1D),	2709	const_iv (GL_PROXY_TEXTURE_1D),
2512	const_iv (GL_PROXY_TEXTURE_2D),	2710	const_iv (GL_PROXY_TEXTURE_2D),
2513	const_iv (GL_TEXTURE_1D),	2711	const_iv (GL_TEXTURE_1D),
2514	const_iv (GL_TEXTURE_2D),	2712	const_iv (GL_TEXTURE_2D),
…		…
2553	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2751	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554	const_iv (GL_POINT_SMOOTH_HINT),	2752	const_iv (GL_POINT_SMOOTH_HINT),
2555	const_iv (GL_LINE_SMOOTH_HINT),	2753	const_iv (GL_LINE_SMOOTH_HINT),
2556	const_iv (GL_POLYGON_SMOOTH_HINT),	2754	const_iv (GL_POLYGON_SMOOTH_HINT),
2557	const_iv (GL_GENERATE_MIPMAP_HINT),	2755	const_iv (GL_GENERATE_MIPMAP_HINT),
		2756	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558	const_iv (GL_FASTEST),	2757	const_iv (GL_FASTEST),
2559	const_iv (GL_DONT_CARE),	2758	const_iv (GL_DONT_CARE),
2560	const_iv (GL_NICEST),	2759	const_iv (GL_NICEST),
2561	const_iv (GL_V2F),	2760	const_iv (GL_V2F),
2562	const_iv (GL_V3F),	2761	const_iv (GL_V3F),
…		…
2570		2769
2571	texture_av = newAV ();	2770	texture_av = newAV ();
2572	AvREAL_off (texture_av);	2771	AvREAL_off (texture_av);
2573	}	2772	}
2574		2773
		2774	void
		2775	disable_GL_EXT_blend_func_separate ()
		2776	CODE:
		2777	gl.BlendFuncSeparate = 0;
		2778	gl.BlendFuncSeparateEXT = 0;
		2779
2575	char *	2780	char *
2576	gl_vendor ()	2781	gl_vendor ()
2577	CODE:	2782	CODE:
2578	RETVAL = (char *)glGetString (GL_VENDOR);	2783	RETVAL = (char *)glGetString (GL_VENDOR);
2579	OUTPUT:	2784	OUTPUT:
…		…
2700		2905
2701	void glRect (float x1, float y1, float x2, float y2)	2906	void glRect (float x1, float y1, float x2, float y2)
2702	CODE:	2907	CODE:
2703	glRectf (x1, y1, x2, y2);	2908	glRectf (x1, y1, x2, y2);
2704		2909
		2910	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2911	CODE:
		2912	glBegin (GL_LINE_LOOP);
		2913	glVertex2f (x1, y1);
		2914	glVertex2f (x2, y1);
		2915	glVertex2f (x2, y2);
		2916	glVertex2f (x1, y2);
		2917	glEnd ();
		2918
2705	PROTOTYPES: ENABLE	2919	PROTOTYPES: ENABLE
2706		2920
2707	void glBegin (int mode)	2921	void glBegin (int mode)
2708		2922
2709	void glEnd ()	2923	void glEnd ()
…		…
2741	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2955	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742	CODE:	2956	CODE:
2743	if (gl.SeparableFilter2D)	2957	if (gl.SeparableFilter2D)
2744	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2958	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745		2959
2746	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2960	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747		2961
2748	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2962	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749		2963
2750	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2964	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751		2965
…		…
2777		2991
2778	void glEndList ()	2992	void glEndList ()
2779		2993
2780	void glCallList (int list)	2994	void glCallList (int list)
2781		2995
2782	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2996	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783		2997
2784	PROTOTYPES: DISABLE	2998	PROTOTYPES: DISABLE
2785		2999
2786	void	3000	void
2787	find_widget (SV *self, NV x, NV y)	3001	find_widget (SV *self, NV x, NV y)
…		…
2791	XPUSHs (self);	3005	XPUSHs (self);
2792	}	3006	}
2793		3007
2794	BOOT:	3008	BOOT:
2795	{	3009	{
2796	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3010	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797		3011
2798	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3012	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3013	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3014	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3015	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802	}	3016	}
2803		3017
2804	void	3018	void
2805	draw (SV *self)	3019	draw (SV *self)
2806	CODE:	3020	CODE:
…		…
2810	NV x, y, w, h;	3024	NV x, y, w, h;
2811	SV *draw_x_sv = GvSV (draw_x_gv);	3025	SV *draw_x_sv = GvSV (draw_x_gv);
2812	SV *draw_y_sv = GvSV (draw_y_gv);	3026	SV *draw_y_sv = GvSV (draw_y_gv);
2813	SV *draw_w_sv = GvSV (draw_w_gv);	3027	SV *draw_w_sv = GvSV (draw_w_gv);
2814	SV *draw_h_sv = GvSV (draw_h_gv);	3028	SV *draw_h_sv = GvSV (draw_h_gv);
2815	SV *hover;
2816	double draw_x, draw_y, draw_w, draw_h;	3029	double draw_x, draw_y;
2817		3030
2818	if (!SvROK (self))	3031	if (!SvROK (self))
2819	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3032	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820		3033
2821	hv = (HV *)SvRV (self);	3034	hv = (HV *)SvRV (self);
2822		3035
2823	if (SvTYPE (hv) != SVt_PVHV)	3036	if (SvTYPE (hv) != SVt_PVHV)
2824	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3037	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825		3038
2826	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3039	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3040	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828		3041
2829	if (!h || !w)	3042	if (!h || !w)
…		…
2849	{	3062	{
2850	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3063	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851		3064
2852	if (svp && SvTRUE (*svp))	3065	if (svp && SvTRUE (*svp))
2853	{	3066	{
2854	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3067	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855	glEnable (GL_BLEND);	3068	glEnable (GL_BLEND);
2856	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3069	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857	glBegin (GL_QUADS);	3070	glBegin (GL_QUADS);
2858	glVertex2f (0, 0);	3071	glVertex2f (0, 0);
2859	glVertex2f (w, 0);	3072	glVertex2f (w, 0);
…		…
2862	glEnd ();	3075	glEnd ();
2863	glDisable (GL_BLEND);	3076	glDisable (GL_BLEND);
2864	}	3077	}
2865	}	3078	}
2866	#if 0	3079	#if 0
2867	if ($ENV{CFPLUS_DEBUG} & 1) {	3080	// draw borders, for debugging
2868	glPushMatrix;	3081	glPushMatrix ();
2869	glColor 1, 1, 0, 1;	3082	glColor4f (1., 1., 0., 1.);
2870	glTranslate 0.375, 0.375;	3083	glTranslatef (.5, .5, 0.);
2871	glBegin GL_LINE_LOOP;	3084	glBegin (GL_LINE_LOOP);
2872	glVertex 0 , 0;	3085	glVertex2f (0 , 0);
2873	glVertex $self->{w} - 1, 0;	3086	glVertex2f (w - 1, 0);
2874	glVertex $self->{w} - 1, $self->{h} - 1;	3087	glVertex2f (w - 1, h - 1);
2875	glVertex 0 , $self->{h} - 1;	3088	glVertex2f (0 , h - 1);
2876	glEnd;	3089	glEnd ();
2877	glPopMatrix;	3090	glPopMatrix ();
2878	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879	}
2880	#endif	3091	#endif
2881	PUSHMARK (SP);	3092	PUSHMARK (SP);
2882	XPUSHs (self);	3093	XPUSHs (self);
2883	PUTBACK;	3094	PUTBACK;
2884	call_method ("_draw", G_VOID | G_DISCARD);	3095	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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