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

Diff Legend

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