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.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 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)
680	{
681	AV *av = newAV ();	761	AV *av = newAV ();
682	av_push (av, newSViv ((*m)->w));	762	av_push (av, newSViv ((*m)->w));
683	av_push (av, newSViv ((*m)->h));	763	av_push (av, newSViv ((*m)->h));
684	av_push (av, newSViv (rgb));	764	av_push (av, newSViv (rgb));
685	av_push (av, newSViv (alpha));	765	av_push (av, newSViv (alpha));
686	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	766	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
687	}
688		767
689	++m;	768	++m;
690	}	769	}
691	}	770	}
692		771
…		…
708		787
709	if (RETVAL)	788	if (RETVAL)
710	{	789	{
711	av_clear (texture_av);	790	av_clear (texture_av);
712		791
713	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	792	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714	#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);
715	#include "glfunc.h"	794	#include "glfunc.h"
716	#undef GL_FUNC	795	#undef GL_FUNC
717	}	796	}
718	}	797	}
…		…
725	char *	804	char *
726	SDL_GetKeyName (int sym)	805	SDL_GetKeyName (int sym)
727		806
728	int	807	int
729	SDL_GetAppState ()	808	SDL_GetAppState ()
		809
		810	int
		811	SDL_GetModState ()
730		812
731	void	813	void
732	poll_events ()	814	poll_events ()
733	PPCODE:	815	PPCODE:
734	{	816	{
…		…
744	{	826	{
745	case SDL_KEYDOWN:	827	case SDL_KEYDOWN:
746	case SDL_KEYUP:	828	case SDL_KEYUP:
747	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	829	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	830	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749	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);
750	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 */
751	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	833	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752	break;	834	break;
753		835
754	case SDL_ACTIVEEVENT:	836	case SDL_ACTIVEEVENT:
755	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	837	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
773	x = ev.motion.x;	855	x = ev.motion.x;
774	y = ev.motion.y;	856	y = ev.motion.y;
775	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	857	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776	}	858	}
777		859
778	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	860	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779	hv_store (hv, "state", 5, newSViv (state), 0);	861	hv_store (hv, "state", 5, newSViv (state), 0);
780	hv_store (hv, "x", 1, newSViv (x), 0);	862	hv_store (hv, "x", 1, newSViv (x), 0);
781	hv_store (hv, "y", 1, newSViv (y), 0);	863	hv_store (hv, "y", 1, newSViv (y), 0);
782	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	864	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	865	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784	}	866	}
785	break;	867	break;
786		868
787	case SDL_MOUSEBUTTONDOWN:	869	case SDL_MOUSEBUTTONDOWN:
788	case SDL_MOUSEBUTTONUP:	870	case SDL_MOUSEBUTTONUP:
789	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	871	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790		872
791	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	873	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	874	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	875	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	876	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
799	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	881	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	882	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801	break;	883	break;
802	}	884	}
803		885
804	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))));
805	}	887	}
806	}	888	}
807		889
808	int	890	int
809	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)
810	POSTCALL:	892	POSTCALL:
811	Mix_HookMusicFinished (music_finished);	893	Mix_HookMusicFinished (music_finished);
812	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	}
813		911
814	void	912	void
815	Mix_CloseAudio ()	913	Mix_CloseAudio ()
816		914
817	int	915	int
…		…
852	}	950	}
853	}	951	}
854	#endif	952	#endif
855	}	953	}
856		954
857	void	955	int
858	add_font (char *file)	956	add_font (char *file)
859	CODE:	957	CODE:
860	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	958	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		959	OUTPUT:
		960	RETVAL
861		961
862	void	962	void
863	load_image_inline (SV *image_)	963	load_image_inline (SV *image_)
864	ALIAS:	964	ALIAS:
865	load_image_file = 1	965	load_image_file = 1
…		…
951	void	1051	void
952	error (char *message)	1052	error (char *message)
953	CODE:	1053	CODE:
954	fprintf (stderr, "ERROR: %s\n", message);	1054	fprintf (stderr, "ERROR: %s\n", message);
955	#ifdef _WIN32	1055	#ifdef _WIN32
956	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1056	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957	#endif	1057	#endif
958		1058
959	void	1059	void
960	fatal (char *message)	1060	fatal (char *message)
961	CODE:	1061	CODE:
962	fprintf (stderr, "FATAL: %s\n", message);	1062	fprintf (stderr, "FATAL: %s\n", message);
963	#ifdef _WIN32	1063	#ifdef _WIN32
964	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1064	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965	#endif	1065	#endif
966	_exit (1);	1066	_exit (1);
967		1067
968	void	1068	void
969	_exit (int retval = 0)	1069	_exit (int retval = 0)
…		…
981	#if DEBUG	1081	#if DEBUG
982	VALGRIND_DO_LEAK_CHECK;	1082	VALGRIND_DO_LEAK_CHECK;
983	#endif	1083	#endif
984	}	1084	}
985		1085
986	MODULE = CFPlus PACKAGE = CFPlus::Font	1086	MODULE = Deliantra::Client PACKAGE = DC::Font
987		1087
988	PROTOTYPES: DISABLE	1088	PROTOTYPES: DISABLE
989		1089
990	CFPlus::Font	1090	DC::Font
991	new_from_file (SV *class, char *path, int id = 0)	1091	new_from_file (SV *class, char *path, int id = 0)
992	CODE:	1092	CODE:
993	{	1093	{
994	int count;	1094	int count;
995	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1095	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
998	}	1098	}
999	OUTPUT:	1099	OUTPUT:
1000	RETVAL	1100	RETVAL
1001		1101
1002	void	1102	void
1003	DESTROY (CFPlus::Font self)	1103	DESTROY (DC::Font self)
1004	CODE:	1104	CODE:
1005	pango_font_description_free (self);	1105	pango_font_description_free (self);
1006		1106
1007	void	1107	void
1008	make_default (CFPlus::Font self)	1108	make_default (DC::Font self)
1009	PROTOTYPE: $	1109	PROTOTYPE: $
1010	CODE:	1110	CODE:
1011	default_font = self;	1111	default_font = self;
1012		1112
1013	MODULE = CFPlus PACKAGE = CFPlus::Layout	1113	MODULE = Deliantra::Client PACKAGE = DC::Layout
1014		1114
1015	PROTOTYPES: DISABLE	1115	PROTOTYPES: DISABLE
1016		1116
1017	void	1117	void
1018	reset_glyph_cache ()	1118	glyph_cache_backup ()
1019	PROTOTYPE:	1119	PROTOTYPE:
1020	CODE:	1120	CODE:
		1121	tc_backup ();
		1122
		1123	void
		1124	glyph_cache_restore ()
		1125	PROTOTYPE:
		1126	CODE:
1021	tc_clear ();	1127	tc_restore ();
1022		1128
1023	CFPlus::Layout	1129	DC::Layout
1024	new (SV *class)	1130	new (SV *class)
1025	CODE:	1131	CODE:
1026	New (0, RETVAL, 1, struct cf_layout);	1132	New (0, RETVAL, 1, struct cf_layout);
1027		1133
1028	RETVAL->pl = pango_layout_new (opengl_context);	1134	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1030	RETVAL->g = 1.;	1136	RETVAL->g = 1.;
1031	RETVAL->b = 1.;	1137	RETVAL->b = 1.;
1032	RETVAL->a = 1.;	1138	RETVAL->a = 1.;
1033	RETVAL->base_height = MIN_FONT_HEIGHT;	1139	RETVAL->base_height = MIN_FONT_HEIGHT;
1034	RETVAL->font = 0;	1140	RETVAL->font = 0;
		1141	RETVAL->rc = rc_alloc ();
1035		1142
1036	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1143	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037	layout_update_font (RETVAL);	1144	layout_update_font (RETVAL);
1038	OUTPUT:	1145	OUTPUT:
1039	RETVAL	1146	RETVAL
1040		1147
1041	void	1148	void
1042	DESTROY (CFPlus::Layout self)	1149	DESTROY (DC::Layout self)
1043	CODE:	1150	CODE:
1044	g_object_unref (self->pl);	1151	g_object_unref (self->pl);
		1152	rc_free (self->rc);
1045	Safefree (self);	1153	Safefree (self);
1046		1154
1047	void	1155	void
1048	set_text (CFPlus::Layout self, SV *text_)	1156	set_text (DC::Layout self, SV *text_)
1049	CODE:	1157	CODE:
1050	{	1158	{
1051	STRLEN textlen;	1159	STRLEN textlen;
1052	char *text = SvPVutf8 (text_, textlen);	1160	char *text = SvPVutf8 (text_, textlen);
1053		1161
1054	pango_layout_set_text (self->pl, text, textlen);	1162	pango_layout_set_text (self->pl, text, textlen);
1055	}	1163	}
1056		1164
1057	void	1165	void
1058	set_markup (CFPlus::Layout self, SV *text_)	1166	set_markup (DC::Layout self, SV *text_)
1059	CODE:	1167	CODE:
1060	{	1168	{
1061	STRLEN textlen;	1169	STRLEN textlen;
1062	char *text = SvPVutf8 (text_, textlen);	1170	char *text = SvPVutf8 (text_, textlen);
1063		1171
1064	pango_layout_set_markup (self->pl, text, textlen);	1172	pango_layout_set_markup (self->pl, text, textlen);
1065	}	1173	}
1066		1174
1067	void	1175	void
1068	set_shapes (CFPlus::Layout self, ...)	1176	set_shapes (DC::Layout self, ...)
1069	CODE:	1177	CODE:
1070	{	1178	{
1071	PangoAttrList *attrs = 0;	1179	PangoAttrList *attrs = 0;
1072	const char *text = pango_layout_get_text (self->pl);	1180	const char *text = pango_layout_get_text (self->pl);
1073	const char *pos = text;	1181	const char *pos = text;
…		…
1108	if (attrs)	1216	if (attrs)
1109	pango_layout_set_attributes (self->pl, attrs);	1217	pango_layout_set_attributes (self->pl, attrs);
1110	}	1218	}
1111		1219
1112	void	1220	void
1113	get_shapes (CFPlus::Layout self)	1221	get_shapes (DC::Layout self)
1114	PPCODE:	1222	PPCODE:
1115	{	1223	{
1116	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1224	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117		1225
1118	do	1226	do
1119	{	1227	{
1120	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1228	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121		1229
1122	if (run && shape_attr_p (run))	1230	if (run && shape_attr_p (run))
1123	{	1231	{
1124	PangoRectangle extents;	1232	PangoRectangle extents;
1125	pango_layout_iter_get_run_extents (iter, 0, &extents);	1233	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1133		1241
1134	pango_layout_iter_free (iter);	1242	pango_layout_iter_free (iter);
1135	}	1243	}
1136		1244
1137	int	1245	int
1138	has_wrapped (CFPlus::Layout self)	1246	has_wrapped (DC::Layout self)
1139	CODE:	1247	CODE:
1140	{	1248	{
1141	int lines = 1;	1249	int lines = 1;
1142	const char *text = pango_layout_get_text (self->pl);	1250	const char *text = pango_layout_get_text (self->pl);
1143		1251
…		…
1148	}	1256	}
1149	OUTPUT:	1257	OUTPUT:
1150	RETVAL	1258	RETVAL
1151		1259
1152	SV *	1260	SV *
1153	get_text (CFPlus::Layout self)	1261	get_text (DC::Layout self)
1154	CODE:	1262	CODE:
1155	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1263	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156	sv_utf8_decode (RETVAL);	1264	sv_utf8_decode (RETVAL);
1157	OUTPUT:	1265	OUTPUT:
1158	RETVAL	1266	RETVAL
1159		1267
1160	void	1268	void
1161	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.)
1162	CODE:	1270	CODE:
1163	self->r = r;	1271	self->r = r;
1164	self->g = g;	1272	self->g = g;
1165	self->b = b;	1273	self->b = b;
1166	self->a = a;	1274	self->a = a;
1167		1275
1168	void	1276	void
1169	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1277	set_font (DC::Layout self, DC::Font font = 0)
1170	CODE:	1278	CODE:
1171	if (self->font != font)	1279	if (self->font != font)
1172	{	1280	{
1173	self->font = font;	1281	self->font = font;
1174	layout_update_font (self);	1282	layout_update_font (self);
1175	}	1283	}
1176		1284
1177	void	1285	void
1178	set_height (CFPlus::Layout self, int base_height)	1286	set_height (DC::Layout self, int base_height)
1179	CODE:	1287	CODE:
1180	if (self->base_height != base_height)	1288	if (self->base_height != base_height)
1181	{	1289	{
1182	self->base_height = base_height;	1290	self->base_height = base_height;
1183	layout_update_font (self);	1291	layout_update_font (self);
1184	}	1292	}
1185		1293
1186	void	1294	void
1187	set_width (CFPlus::Layout self, int max_width = -1)	1295	set_width (DC::Layout self, int max_width = -1)
1188	CODE:	1296	CODE:
1189	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);
1190		1298
1191	void	1299	void
1192	set_indent (CFPlus::Layout self, int indent)	1300	set_indent (DC::Layout self, int indent)
1193	CODE:	1301	CODE:
1194	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1302	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195		1303
1196	void	1304	void
1197	set_spacing (CFPlus::Layout self, int spacing)	1305	set_spacing (DC::Layout self, int spacing)
1198	CODE:	1306	CODE:
1199	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1307	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200		1308
1201	void	1309	void
1202	set_ellipsise (CFPlus::Layout self, int ellipsise)	1310	set_ellipsise (DC::Layout self, int ellipsise)
1203	CODE:	1311	CODE:
1204	pango_layout_set_ellipsize (self->pl,	1312	pango_layout_set_ellipsize (self->pl,
1205	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1313	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1314	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1315	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208	: PANGO_ELLIPSIZE_NONE	1316	: PANGO_ELLIPSIZE_NONE
1209	);	1317	);
1210		1318
1211	void	1319	void
1212	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1320	set_single_paragraph_mode (DC::Layout self, int spm)
1213	CODE:	1321	CODE:
1214	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1322	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215		1323
1216	void	1324	void
1217	size (CFPlus::Layout self)	1325	size (DC::Layout self)
1218	PPCODE:	1326	PPCODE:
1219	{	1327	{
1220	int w, h;	1328	int w, h;
1221		1329
1222	layout_get_pixel_size (self, &w, &h);	1330	layout_get_pixel_size (self, &w, &h);
…		…
1225	PUSHs (sv_2mortal (newSViv (w)));	1333	PUSHs (sv_2mortal (newSViv (w)));
1226	PUSHs (sv_2mortal (newSViv (h)));	1334	PUSHs (sv_2mortal (newSViv (h)));
1227	}	1335	}
1228		1336
1229	int	1337	int
1230	descent (CFPlus::Layout self)	1338	descent (DC::Layout self)
1231	CODE:	1339	CODE:
1232	{	1340	{
1233	PangoRectangle rect;	1341	PangoRectangle rect;
1234	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1342	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235	pango_layout_line_get_pixel_extents (line, 0, &rect);	1343	pango_layout_line_get_pixel_extents (line, 0, &rect);
1236	RETVAL = PANGO_DESCENT (rect);	1344	RETVAL = PANGO_DESCENT (rect);
1237	}	1345	}
1238	OUTPUT:	1346	OUTPUT:
1239	RETVAL	1347	RETVAL
1240		1348
1241	int	1349	int
1242	xy_to_index (CFPlus::Layout self, int x, int y)	1350	xy_to_index (DC::Layout self, int x, int y)
1243	CODE:	1351	CODE:
1244	{	1352	{
1245	int index, trailing;	1353	int index, trailing;
1246	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);
1247	RETVAL = index + trailing;	1355	RETVAL = index + trailing;
1248	}	1356	}
1249	OUTPUT:	1357	OUTPUT:
1250	RETVAL	1358	RETVAL
1251		1359
1252	void	1360	void
1253	cursor_pos (CFPlus::Layout self, int index)	1361	cursor_pos (DC::Layout self, int index)
1254	PPCODE:	1362	PPCODE:
1255	{	1363	{
1256	PangoRectangle strong_pos;	1364	PangoRectangle pos;
1257	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1365	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258		1366
1259	EXTEND (SP, 3);	1367	EXTEND (SP, 3);
1260	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1368	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1369	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1370	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263	}	1371	}
1264		1372
1265	void	1373	void
1266	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)
1267	PPCODE:	1375	PPCODE:
1268	{	1376	{
1269	int line, x;	1377	int line, x;
1270		1378
1271	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)
1272	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1381	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273		1382	--line;
		1383	#endif
1274	EXTEND (SP, 2);	1384	EXTEND (SP, 2);
1275	PUSHs (sv_2mortal (newSViv (line - 1)));	1385	PUSHs (sv_2mortal (newSViv (line)));
1276	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1386	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277	}	1387	}
1278		1388
1279	void	1389	void
1280	line_x_to_index (CFPlus::Layout self, int line, int x)	1390	line_x_to_index (DC::Layout self, int line, int x)
1281	PPCODE:	1391	PPCODE:
1282	{	1392	{
1283	PangoLayoutLine *lp;	1393	PangoLayoutLine *lp;
1284	int index, trailing;	1394	int index, trailing;
1285		1395
1286	if (line < 0)	1396	if (line < 0)
1287	XSRETURN_EMPTY;	1397	XSRETURN_EMPTY;
1288		1398
1289	if (!(lp = pango_layout_get_line (self->pl, line)))	1399	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290	XSRETURN_EMPTY; /* do better */	1400	XSRETURN_EMPTY; /* do better */
1291		1401
1292	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);
1293		1403
1294	EXTEND (SP, 2);	1404	EXTEND (SP, 2);
…		…
1300	PUSHs (sv_2mortal (newSViv (trailing)));	1410	PUSHs (sv_2mortal (newSViv (trailing)));
1301	}	1411	}
1302	}	1412	}
1303		1413
1304	void	1414	void
1305	render (CFPlus::Layout self, float x, float y, int flags = 0)	1415	render (DC::Layout self, float x, float y, int flags = 0)
1306	PPCODE:	1416	CODE:
		1417	rc_clear (self->rc);
1307	pango_opengl_render_layout_subpixel (	1418	pango_opengl_render_layout_subpixel (
1308	self->pl,	1419	self->pl,
		1420	self->rc,
1309	x * PANGO_SCALE, y * PANGO_SCALE,	1421	x * PANGO_SCALE, y * PANGO_SCALE,
1310	self->r, self->g, self->b, self->a,	1422	self->r, self->g, self->b, self->a,
1311	flags	1423	flags
1312	);	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);
1313		1428
1314	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
1315		1449
1316	PROTOTYPES: ENABLE	1450	PROTOTYPES: ENABLE
1317
1318	int minpot (int n)
1319		1451
1320	void	1452	void
1321	pad (SV *data_, int ow, int oh, int nw, int nh)	1453	pad (SV *data_, int ow, int oh, int nw, int nh)
1322	CODE:	1454	CODE:
1323	{	1455	{
…		…
1350	HV *hv = (HV *)SvRV (self);	1482	HV *hv = (HV *)SvRV (self);
1351	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1483	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1484	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1485	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354		1486
		1487	if (name <= 0)
		1488	XSRETURN_EMPTY;
		1489
1355	if (items < 5)	1490	if (items < 5)
1356	{	1491	{
1357	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1492	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1493	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359	}	1494	}
…		…
1397	RETVAL = width > 0;	1532	RETVAL = width > 0;
1398	}	1533	}
1399	OUTPUT:	1534	OUTPUT:
1400	RETVAL	1535	RETVAL
1401		1536
1402	MODULE = CFPlus PACKAGE = CFPlus::Map	1537	MODULE = Deliantra::Client PACKAGE = DC::Map
1403		1538
1404	PROTOTYPES: DISABLE	1539	PROTOTYPES: DISABLE
1405		1540
1406	CFPlus::Map	1541	DC::Map
1407	new (SV *class)	1542	new (SV *class)
1408	CODE:	1543	CODE:
1409	New (0, RETVAL, 1, struct map);	1544	New (0, RETVAL, 1, struct map);
1410	RETVAL->x = 0;	1545	RETVAL->x = 0;
1411	RETVAL->y = 0;	1546	RETVAL->y = 0;
…		…
1419	RETVAL->row = 0;	1554	RETVAL->row = 0;
1420	OUTPUT:	1555	OUTPUT:
1421	RETVAL	1556	RETVAL
1422		1557
1423	void	1558	void
1424	DESTROY (CFPlus::Map self)	1559	DESTROY (DC::Map self)
1425	CODE:	1560	CODE:
1426	{	1561	{
1427	map_clear (self);	1562	map_clear (self);
1428	Safefree (self->face2tile);	1563	Safefree (self->face2tile);
1429	Safefree (self->tex);	1564	Safefree (self->tex);
1430	Safefree (self);	1565	Safefree (self);
1431	}	1566	}
1432		1567
1433	void	1568	void
1434	resize (CFPlus::Map self, int map_width, int map_height)	1569	resize (DC::Map self, int map_width, int map_height)
1435	CODE:	1570	CODE:
1436	self->w = map_width;	1571	self->w = map_width;
1437	self->h = map_height;	1572	self->h = map_height;
1438		1573
1439	void	1574	void
1440	clear (CFPlus::Map self)	1575	clear (DC::Map self)
1441	CODE:	1576	CODE:
1442	map_clear (self);	1577	map_clear (self);
1443		1578
1444	void	1579	void
1445	set_tileid (CFPlus::Map self, int face, int tile)	1580	set_tileid (DC::Map self, int face, int tile)
1446	CODE:	1581	CODE:
1447	{	1582	{
1448	need_facenum (self, face); self->face2tile [face] = tile;	1583	need_facenum (self, face); self->face2tile [face] = tile;
1449	need_texid (self, tile);	1584	need_texid (self, tile);
1450	}	1585	}
1451		1586
1452	void	1587	void
1453	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1588	set_smooth (DC::Map self, int face, int smooth, int level)
1454	CODE:	1589	CODE:
1455	{	1590	{
1456	tileid texid;	1591	tileid texid;
1457	maptex *tex;	1592	maptex *tex;
1458		1593
…		…
1471	tex->smoothtile = self->face2tile [smooth];	1606	tex->smoothtile = self->face2tile [smooth];
1472	tex->smoothlevel = level;	1607	tex->smoothlevel = level;
1473	}	1608	}
1474		1609
1475	void	1610	void
1476	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	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)
1477	CODE:	1612	CODE:
1478	{	1613	{
1479	need_texid (self, texid);	1614	need_texid (self, texid);
1480		1615
1481	{	1616	{
…		…
1501	// from transparent color bleeding and ugly wrapping effects.	1636	// from transparent color bleeding and ugly wrapping effects.
1502	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1637	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503	}	1638	}
1504		1639
1505	int	1640	int
1506	ox (CFPlus::Map self)	1641	ox (DC::Map self)
1507	ALIAS:	1642	ALIAS:
1508	oy = 1	1643	oy = 1
1509	x = 2	1644	x = 2
1510	y = 3	1645	y = 3
1511	w = 4	1646	w = 4
…		…
1522	}	1657	}
1523	OUTPUT:	1658	OUTPUT:
1524	RETVAL	1659	RETVAL
1525		1660
1526	void	1661	void
1527	scroll (CFPlus::Map self, int dx, int dy)	1662	scroll (DC::Map self, int dx, int dy)
1528	CODE:	1663	CODE:
1529	{	1664	{
1530	if (dx > 0)	1665	if (dx > 0)
1531	map_blank (self, self->x, self->y, dx, self->h);	1666	map_blank (self, self->x, self->y, dx, self->h);
1532	else if (dx < 0)	1667	else if (dx < 0)
…		…
1547	self->rows += MAP_EXTEND_Y;	1682	self->rows += MAP_EXTEND_Y;
1548	self->y += MAP_EXTEND_Y;	1683	self->y += MAP_EXTEND_Y;
1549	}	1684	}
1550	}	1685	}
1551		1686
1552	void	1687	SV *
1553	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1688	map1a_update (DC::Map self, SV *data_, int extmap)
1554	CODE:	1689	CODE:
1555	{	1690	{
1556	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1691	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557	uint8_t *data_end = (uint8_t *)SvEND (data_);	1692	uint8_t *data_end = (uint8_t *)SvEND (data_);
1558	mapcell *cell;	1693	mapcell *cell;
1559	int x, y, flags;	1694	int x, y, z, flags;
		1695	AV *missing = newAV ();
		1696	RETVAL = newRV_noinc ((SV *)missing);
1560		1697
1561	while (data < data_end - 1)	1698	while (data < data_end - 1)
1562	{	1699	{
1563	flags = (data [0] << 8) + data [1]; data += 2;	1700	flags = (data [0] << 8) + data [1]; data += 2;
1564		1701
…		…
1584	uint8_t ext, cmd;	1721	uint8_t ext, cmd;
1585		1722
1586	do	1723	do
1587	{	1724	{
1588	ext = *data++;	1725	ext = *data++;
1589	cmd = ext & 0x3f;	1726	cmd = ext & 0x7f;
1590		1727
1591	if (cmd < 4)	1728	if (cmd < 4)
1592	cell->darkness = 255 - ext * 64 + 1;	1729	cell->darkness = 255 - ext * 64 + 1;
1593	else if (cmd == 5) // health	1730	else if (cmd == 5) // health
1594	{	1731	{
…		…
1597	}	1734	}
1598	else if (cmd == 6) // monster width	1735	else if (cmd == 6) // monster width
1599	cell->stat_width = *data++ + 1;	1736	cell->stat_width = *data++ + 1;
1600	else if (cmd == 0x47)	1737	else if (cmd == 0x47)
1601	{	1738	{
1602	if (*data == 4)	1739	if (*data == 1) cell->player = data [1];
1603	; // 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);
1604		1743
1605	data += *data + 1;	1744	data += *data + 1;
1606	}	1745	}
1607	else if (cmd == 8) // cell flags	1746	else if (cmd == 8) // cell flags
1608	cell->flags = *data++;	1747	cell->flags = *data++;
…		…
1615	}	1754	}
1616	else	1755	else
1617	cell->darkness = *data++ + 1;	1756	cell->darkness = *data++ + 1;
1618	}	1757	}
1619		1758
		1759	for (z = 0; z <= 2; ++z)
1620	if (flags & 4)	1760	if (flags & (4 >> z))
1621	{	1761	{
1622	faceid face = (data [0] << 8) + data [1]; data += 2;	1762	faceid face = (data [0] << 8) + data [1]; data += 2;
1623	need_facenum (self, face);	1763	need_facenum (self, face);
1624	cell->tile [0] = self->face2tile [face];	1764	cell->tile [z] = self->face2tile [face];
		1765
		1766	if (cell->tile [z])
		1767	{
		1768	maptex *tex = self->tex + cell->tile [z];
		1769	if (!tex->name)
		1770	av_push (missing, newSViv (cell->tile [z]));
		1771
		1772	if (tex->smoothtile)
		1773	{
		1774	maptex *smooth = self->tex + tex->smoothtile;
		1775	if (!smooth->name)
		1776	av_push (missing, newSViv (tex->smoothtile));
		1777	}
		1778	}
1625	}	1779	}
1626
1627	if (flags & 2)
1628	{
1629	faceid face = (data [0] << 8) + data [1]; data += 2;
1630	need_facenum (self, face);
1631	cell->tile [1] = self->face2tile [face];
1632	}
1633
1634	if (flags & 1)
1635	{
1636	faceid face = (data [0] << 8) + data [1]; data += 2;
1637	need_facenum (self, face);
1638	cell->tile [2] = self->face2tile [face];
1639	}
1640	}	1780	}
1641	else	1781	else
1642	cell->darkness = 0;	1782	cell->darkness = 0;
1643	}	1783	}
1644	}	1784	}
		1785	OUTPUT:
		1786	RETVAL
1645		1787
1646	SV *	1788	SV *
1647	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)
1648	CODE:	1790	CODE:
1649	{	1791	{
1650	int x1, x;	1792	int x1, x;
1651	int y1, y;	1793	int y1, y;
1652	int z;	1794	int z;
…		…
1697	}	1839	}
1698	OUTPUT:	1840	OUTPUT:
1699	RETVAL	1841	RETVAL
1700		1842
1701	void	1843	void
1702	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)
1703	CODE:	1845	CODE:
1704	{	1846	{
		1847	int x, y, z;
		1848
1705	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1849	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706	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
1707	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)
1708	smooth_key skey;	1852	smooth_key skey;
1709	int x, y, z;	1853	int pl_x, pl_y;
1710	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;
1711		1860
1712	// thats current max. sorry.	1861	// thats current max. sorry.
1713	if (sw > 255) sw = 255;	1862	if (sw > 255) sw = 255;
1714	if (sh > 255) sh = 255;	1863	if (sh > 255) sh = 255;
1715		1864
1716	// clear key, in case of extra padding	1865	// clear key, in case of extra padding
1717	memset (&skey, 0, sizeof (skey));	1866	memset (&skey, 0, sizeof (skey));
1718		1867
1719	glColor4ub (255, 255, 255, 255);	1868	memset (&key, 0, sizeof (key));
1720		1869	key.r = 255;
1721	glEnable (GL_BLEND);	1870	key.g = 255;
1722	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1871	key.b = 255;
1723	glEnable (GL_TEXTURE_2D);	1872	key.a = 255;
1724	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1873	key.mode = GL_QUADS;
1725		1874	key.format = GL_T2F_V3F;
1726	glBegin (GL_QUADS);	1875	key.texname = -1;
1727
1728	last_name = 0;
1729		1876
1730	mx += self->x;	1877	mx += self->x;
1731	my += self->y;	1878	my += self->y;
1732		1879
1733	// first pass: determine smooth_max	1880	// first pass: determine smooth_max
…		…
1749	MAX (self->tex [cell->tile [0]].smoothlevel,	1896	MAX (self->tex [cell->tile [0]].smoothlevel,
1750	MAX (self->tex [cell->tile [1]].smoothlevel,	1897	MAX (self->tex [cell->tile [1]].smoothlevel,
1751	self->tex [cell->tile [2]].smoothlevel));	1898	self->tex [cell->tile [2]].smoothlevel));
1752	}	1899	}
1753	}	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);
1754		1905
1755	for (z = 0; z <= 2; z++)	1906	for (z = 0; z <= 2; z++)
1756	{	1907	{
1757	memset (smooth_level, 0, sizeof (smooth_level));	1908	memset (smooth_level, 0, sizeof (smooth_level));
1758		1909
…		…
1771	{	1922	{
1772	maptex tex = self->tex [tile];	1923	maptex tex = self->tex [tile];
1773	int px = (x + 1) * T - tex.w;	1924	int px = (x + 1) * T - tex.w;
1774	int py = (y + 1) * T - tex.h;	1925	int py = (y + 1) * T - tex.h;
1775		1926
1776	// suppressing texture state switches here
1777	// is only moderately effective, but worth the extra effort
1778	if (last_name != tex.name)	1927	if (key.texname != tex.name)
1779	{	1928	{
1780	if (!tex.name)	1929	if (!tex.name)
1781	tex = self->tex [2]; /* missing, replace by noface */	1930	tex = self->tex [2]; /* missing, replace by noface */
1782		1931
1783	glEnd ();	1932	key.texname = tex.name;
1784	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1933	arr = rc_array (rc, &key);
1785	glBegin (GL_QUADS);
1786	}	1934	}
1787		1935
1788	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1936	if (expect_false (cell->player == player) && expect_false (z == 2))
1789	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1790	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1792
1793	if (cell->flags && z == 2)
1794	{	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
1795	if (cell->flags & 1)	1952	if (cell->flags & 1)
1796	{	1953	{
1797	maptex tex = self->tex [1];	1954	maptex tex = self->tex [1];
1798	int px = x * T + T * 2 / 32;	1955	int px = x * T + T * 2 / 32;
1799	int py = y * T - T * 6 / 32;	1956	int py = y * T - T * 6 / 32;
1800		1957
		1958	if (tex.name)
1801	glEnd ();	1959	{
1802	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);
1803	glBegin (GL_QUADS);	1970	}
1804
1805	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809	}	1971	}
1810	}	1972	}
1811		1973
1812	// update smooth hash	1974	// update smooth hash
1813	if (tex.smoothtile)	1975	if (tex.smoothtile)
…		…
1849	}	2011	}
1850	}	2012	}
1851	}	2013	}
1852	}	2014	}
1853		2015
		2016	rc_draw (rc);
		2017	rc_clear (rc);
		2018
1854	// go through all smoothlevels, lowest to highest, then draw.	2019	// go through all smoothlevels, lowest to highest, then draw.
1855	// this is basically counting sort	2020	// this is basically counting sort
1856	{	2021	{
1857	int w, b;	2022	int w, b;
1858		2023
		2024	glEnable (GL_TEXTURE_2D);
		2025	glBegin (GL_QUADS);
1859	for (w = 0; w < 256 / 32; ++w)	2026	for (w = 0; w < 256 / 32; ++w)
1860	{	2027	{
1861	uint32_t smask = smooth_level [w];	2028	uint32_t smask = smooth_level [w];
1862	if (smask)	2029	if (smask)
1863	for (b = 0; b < 32; ++b)	2030	for (b = 0; b < 32; ++b)
…		…
1882	int border = bits & 15;	2049	int border = bits & 15;
1883	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2050	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884	float dx = tex.s * .0625f; // 16 images/row	2051	float dx = tex.s * .0625f; // 16 images/row
1885	float dy = tex.t * .5f ; // 2 images/column	2052	float dy = tex.t * .5f ; // 2 images/column
1886		2053
1887	// this time naively avoiding texture state changes
1888	// save gobs of state changes.
1889	if (last_name != tex.name)	2054	if (tex.name)
1890	{	2055	{
		2056	// this time avoiding texture state changes
		2057	// save gobs of state changes.
1891	if (!tex.name)	2058	if (key.texname != tex.name)
1892	continue; // smoothing not yet available	2059	{
1893
1894	glEnd ();	2060	glEnd ();
1895	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2061	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896	glBegin (GL_QUADS);	2062	glBegin (GL_QUADS);
1897	}	2063	}
1898		2064
1899	if (border)	2065	if (border)
1900	{	2066	{
1901	float ox = border * dx;	2067	float ox = border * dx;
1902		2068
1903	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2069	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2070	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2071	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2072	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907	}	2073	}
1908		2074
1909	if (corner)	2075	if (corner)
1910	{	2076	{
1911	float ox = corner * dx;	2077	float ox = corner * dx;
1912		2078
1913	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2079	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2080	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2081	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2082	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2083	}
1917	}	2084	}
1918	}	2085	}
1919	}	2086	}
1920	}	2087	}
1921	}	2088	}
		2089
		2090	glEnd ();
		2091	glDisable (GL_TEXTURE_2D);
		2092	key.texname = -1;
1922	}	2093	}
1923		2094
1924	hv_clear (smooth);	2095	hv_clear (smooth);
1925	}	2096	}
1926		2097
1927	glEnd ();	2098	if (pl_tex.name)
		2099	{
		2100	maptex tex = pl_tex;
		2101	int px = pl_x + pdx;
		2102	int py = pl_y + pdy;
1928		2103
1929	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
1930	glDisable (GL_BLEND);	2115	glDisable (GL_BLEND);
		2116	rc_free (rc);
1931		2117
1932	// top layer: overlays such as the health bar	2118	// top layer: overlays such as the health bar
1933	for (y = 0; y < sh; y++)	2119	for (y = 0; y < sh; y++)
1934	if (0 <= y + my && y + my < self->rows)	2120	if (0 <= y + my && y + my < self->rows)
1935	{	2121	{
…		…
1960	}	2146	}
1961	}	2147	}
1962	}	2148	}
1963		2149
1964	void	2150	void
1965	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)
1966	CODE:	2152	CODE:
1967	{	2153	{
1968	static float color[16][3] = {	2154	static float color[16][3] = {
1969	{ 0.00F, 0.00F, 0.00F },	2155	{ 0.00F, 0.00F, 0.00F },
1970	{ 1.00F, 1.00F, 1.00F },	2156	{ 1.00F, 1.00F, 1.00F },
…		…
2020	glDisable (GL_BLEND);	2206	glDisable (GL_BLEND);
2021	glDisable (GL_TEXTURE_2D);	2207	glDisable (GL_TEXTURE_2D);
2022	}	2208	}
2023		2209
2024	void	2210	void
2025	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)
2026	PPCODE:	2212	PPCODE:
2027	{	2213	{
2028	int x, y;	2214	int x, y;
2029	int sw1 = sw + 2;	2215	int sw1 = sw + 2;
2030	int sh1 = sh + 2;	2216	int sh1 = sh + 2;
…		…
2101	PUSHs (sv_2mortal (newSViv (sh3)));	2287	PUSHs (sv_2mortal (newSViv (sh3)));
2102	PUSHs (darkness3_sv);	2288	PUSHs (darkness3_sv);
2103	}	2289	}
2104		2290
2105	SV *	2291	SV *
2106	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)
2107	CODE:	2293	CODE:
2108	{	2294	{
2109	int x, y, x1, y1;	2295	int x, y, x1, y1;
2110	SV *data_sv = newSV (w * h * 7 + 5);	2296	SV *data_sv = newSV (w * h * 7 + 5);
2111	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2297	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2168	else	2354	else
2169	*data++ = 0;	2355	*data++ = 0;
2170	}	2356	}
2171	}	2357	}
2172		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	{
2173	SvPOK_only (data_sv);	2362	SvPOK_only (data_sv);
2174	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2363	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2364	}
		2365
2175	RETVAL = data_sv;	2366	RETVAL = data_sv;
2176	}	2367	}
2177	OUTPUT:	2368	OUTPUT:
2178	RETVAL	2369	RETVAL
2179		2370
2180	void	2371	void
2181	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)
2182	PPCODE:	2373	PPCODE:
2183	{	2374	{
2184	int x, y, z;	2375	int x, y, z;
2185	int w, h;	2376	int w, h;
2186	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;
2187		2388
2188	if (*data++ != 0)	2389	if (*data++ != 0)
2189	return; /* version mismatch */	2390	XSRETURN_EMPTY; /* version mismatch */
2190		2391
2191	w = *data++ << 8; w |= *data++;	2392	w = *data++ << 8; w |= *data++;
2192	h = *data++ << 8; h |= *data++;	2393	h = *data++ << 8; h |= *data++;
2193		2394
2194	// 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
…		…
2206	{	2407	{
2207	maprow *row = map_get_row (self, y);	2408	maprow *row = map_get_row (self, y);
2208		2409
2209	for (x = x0; x < x1; x++)	2410	for (x = x0; x < x1; x++)
2210	{	2411	{
		2412	uint8_t flags;
		2413
		2414	if (data + 7 >= end)
		2415	XSRETURN_EMPTY;
		2416
2211	uint8_t flags = *data++;	2417	flags = *data++;
2212		2418
2213	if (flags)	2419	if (flags)
2214	{	2420	{
2215	mapcell *cell = row_get_cell (row, x);	2421	mapcell *cell = row_get_cell (row, x);
2216	tileid tile[3] = { 0, 0, 0 };	2422	tileid tile[3] = { 0, 0, 0 };
…		…
2219	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2425	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2220	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2426	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2221		2427
2222	if (cell->darkness == 0)	2428	if (cell->darkness == 0)
2223	{	2429	{
2224	cell->darkness = 0;	2430	/*cell->darkness = 0;*/
		2431	EXTEND (SP, 3);
2225		2432
2226	for (z = 0; z <= 2; z++)	2433	for (z = 0; z <= 2; z++)
2227	{	2434	{
2228	tileid t = tile [z];	2435	tileid t = tile [z];
2229		2436
2230	if (t >= self->texs || (t && !self->tex [t].name))	2437	if (t >= self->texs || (t && !self->tex [t].name))
2231	{	2438	{
2232	XPUSHs (sv_2mortal (newSViv (t)));	2439	PUSHs (sv_2mortal (newSViv (t)));
2233	need_texid (self, t);	2440	need_texid (self, t);
2234	}	2441	}
2235		2442
2236	cell->tile [z] = t;	2443	cell->tile [z] = t;
2237	}	2444	}
…		…
2239	}	2446	}
2240	}	2447	}
2241	}	2448	}
2242	}	2449	}
2243		2450
2244	MODULE = CFPlus PACKAGE = CFPlus::RW	2451	MODULE = Deliantra::Client PACKAGE = DC::RW
2245		2452
2246	CFPlus::RW	2453	DC::RW
2247	new (SV *class, SV *data_sv)	2454	new (SV *class, SV *data_sv)
2248	CODE:	2455	CODE:
2249	{	2456	{
2250	STRLEN datalen;	2457	STRLEN datalen;
2251	char *data = SvPVbyte (data_sv, datalen);	2458	char *data = SvPVbyte (data_sv, datalen);
…		…
2253	RETVAL = SDL_RWFromConstMem (data, datalen);	2460	RETVAL = SDL_RWFromConstMem (data, datalen);
2254	}	2461	}
2255	OUTPUT:	2462	OUTPUT:
2256	RETVAL	2463	RETVAL
2257		2464
2258	CFPlus::RW	2465	DC::RW
2259	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")
2260	CODE:	2467	CODE:
2261	RETVAL = SDL_RWFromFile (path, mode);	2468	RETVAL = SDL_RWFromFile (path, mode);
2262	OUTPUT:	2469	OUTPUT:
2263	RETVAL	2470	RETVAL
2264		2471
2265	# fails on win32:	2472	# fails on win32:
2266	# CFPlus.xs(2268) : error C2059: syntax error : '('	2473	# dc.xs(2268) : error C2059: syntax error : '('
2267	#void	2474	#void
2268	#close (CFPlus::RW self)	2475	#close (DC::RW self)
2269	# CODE:	2476	# CODE:
2270	# (self->(close)) (self);	2477	# (self->(close)) (self);
2271		2478
2272	MODULE = CFPlus PACKAGE = CFPlus::Channel	2479	MODULE = Deliantra::Client PACKAGE = DC::Channel
2273		2480
2274	PROTOTYPES: DISABLE	2481	PROTOTYPES: DISABLE
2275		2482
2276	CFPlus::Channel	2483	DC::Channel
2277	find ()	2484	find ()
2278	CODE:	2485	CODE:
2279	{	2486	{
2280	RETVAL = Mix_GroupAvailable (-1);	2487	RETVAL = Mix_GroupAvailable (-1);
2281		2488
…		…
2294	}	2501	}
2295	OUTPUT:	2502	OUTPUT:
2296	RETVAL	2503	RETVAL
2297		2504
2298	void	2505	void
2299	halt (CFPlus::Channel self)	2506	halt (DC::Channel self)
2300	CODE:	2507	CODE:
2301	Mix_HaltChannel (self);	2508	Mix_HaltChannel (self);
2302		2509
2303	void	2510	void
2304	expire (CFPlus::Channel self, int ticks = -1)	2511	expire (DC::Channel self, int ticks = -1)
2305	CODE:	2512	CODE:
2306	Mix_ExpireChannel (self, ticks);	2513	Mix_ExpireChannel (self, ticks);
2307		2514
2308	void	2515	void
2309	fade_out (CFPlus::Channel self, int ticks = -1)	2516	fade_out (DC::Channel self, int ticks = -1)
2310	CODE:	2517	CODE:
2311	Mix_FadeOutChannel (self, ticks);	2518	Mix_FadeOutChannel (self, ticks);
2312		2519
2313	int	2520	int
2314	volume (CFPlus::Channel self, int volume)	2521	volume (DC::Channel self, int volume)
2315	CODE:	2522	CODE:
2316	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2523	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2317	OUTPUT:	2524	OUTPUT:
2318	RETVAL	2525	RETVAL
2319		2526
2320	void	2527	void
2321	unregister_all_effects (CFPlus::Channel self)	2528	unregister_all_effects (DC::Channel self)
2322	CODE:	2529	CODE:
2323	Mix_UnregisterAllEffects (self);	2530	Mix_UnregisterAllEffects (self);
2324		2531
2325	void	2532	void
2326	set_panning (CFPlus::Channel self, int left, int right)	2533	set_panning (DC::Channel self, int left, int right)
2327	CODE:	2534	CODE:
2328	left = CLAMP (left , 0, 255);	2535	left = CLAMP (left , 0, 255);
2329	right = CLAMP (right, 0, 255);	2536	right = CLAMP (right, 0, 255);
2330	Mix_SetPanning (self, left, right);	2537	Mix_SetPanning (self, left, right);
2331		2538
2332	void	2539	void
2333	set_distance (CFPlus::Channel self, int distance)	2540	set_distance (DC::Channel self, int distance)
2334	CODE:	2541	CODE:
2335	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2542	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2336		2543
2337	void	2544	void
2338	set_position (CFPlus::Channel self, int angle, int distance)	2545	set_position (DC::Channel self, int angle, int distance)
2339	CODE:	2546	CODE:
		2547
		2548	void
		2549	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2550	CODE:
		2551	{
		2552	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2553	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2340	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2554	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2555	}
2341		2556
2342	void	2557	void
2343	set_reverse_stereo (CFPlus::Channel self, int flip)	2558	set_reverse_stereo (DC::Channel self, int flip)
2344	CODE:	2559	CODE:
2345	Mix_SetReverseStereo (self, flip);	2560	Mix_SetReverseStereo (self, flip);
2346		2561
2347	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2562	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2348		2563
2349	PROTOTYPES: DISABLE	2564	PROTOTYPES: DISABLE
2350		2565
2351	CFPlus::MixChunk	2566	DC::MixChunk
2352	new (SV *class, CFPlus::RW rwops)	2567	new (SV *class, DC::RW rwops)
2353	CODE:	2568	CODE:
2354	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2569	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2355	OUTPUT:	2570	OUTPUT:
2356	RETVAL	2571	RETVAL
2357		2572
2358	void	2573	void
2359	DESTROY (CFPlus::MixChunk self)	2574	DESTROY (DC::MixChunk self)
2360	CODE:	2575	CODE:
2361	Mix_FreeChunk (self);	2576	Mix_FreeChunk (self);
2362		2577
2363	int	2578	int
2364	volume (CFPlus::MixChunk self, int volume = -1)	2579	volume (DC::MixChunk self, int volume = -1)
2365	CODE:	2580	CODE:
2366	if (items > 1)	2581	if (items > 1)
2367	volume = CLAMP (volume, 0, 128);	2582	volume = CLAMP (volume, 0, 128);
2368	RETVAL = Mix_VolumeChunk (self, volume);	2583	RETVAL = Mix_VolumeChunk (self, volume);
2369	OUTPUT:	2584	OUTPUT:
2370	RETVAL	2585	RETVAL
2371		2586
2372	CFPlus::Channel	2587	DC::Channel
2373	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)
2374	CODE:	2589	CODE:
2375	{	2590	{
2376	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2591	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2377		2592
2378	if (RETVAL < 0)	2593	if (RETVAL < 0)
…		…
2385	}	2600	}
2386	}	2601	}
2387	OUTPUT:	2602	OUTPUT:
2388	RETVAL	2603	RETVAL
2389		2604
2390	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2605	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2391		2606
2392	int	2607	int
2393	volume (int volume = -1)	2608	volume (int volume = -1)
2394	PROTOTYPE: ;$	2609	PROTOTYPE: ;$
2395	CODE:	2610	CODE:
…		…
2407	void	2622	void
2408	halt ()	2623	halt ()
2409	CODE:	2624	CODE:
2410	Mix_HaltMusic ();	2625	Mix_HaltMusic ();
2411		2626
2412	CFPlus::MixMusic	2627	DC::MixMusic
2413	new (SV *class, CFPlus::RW rwops)	2628	new (SV *class, DC::RW rwops)
2414	CODE:	2629	CODE:
2415	RETVAL = Mix_LoadMUS_RW (rwops);	2630	RETVAL = Mix_LoadMUS_RW (rwops);
2416	OUTPUT:	2631	OUTPUT:
2417	RETVAL	2632	RETVAL
2418		2633
2419	void	2634	void
2420	DESTROY (CFPlus::MixMusic self)	2635	DESTROY (DC::MixMusic self)
2421	CODE:	2636	CODE:
2422	Mix_FreeMusic (self);	2637	Mix_FreeMusic (self);
2423		2638
2424	int	2639	int
2425	play (CFPlus::MixMusic self, int loops = -1)	2640	play (DC::MixMusic self, int loops = -1)
2426	CODE:	2641	CODE:
2427	RETVAL = Mix_PlayMusic (self, loops);	2642	RETVAL = Mix_PlayMusic (self, loops);
2428	OUTPUT:	2643	OUTPUT:
2429	RETVAL	2644	RETVAL
2430		2645
2431	void	2646	void
2432	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)
2433	CODE:	2648	CODE:
2434	Mix_FadeInMusicPos (self, loops, ms, position);	2649	Mix_FadeInMusicPos (self, loops, ms, position);
2435		2650
2436	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2651	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2437		2652
2438	PROTOTYPES: ENABLE	2653	PROTOTYPES: ENABLE
2439		2654
2440	BOOT:	2655	BOOT:
2441	{	2656	{
2442	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2657	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2443	static const struct {	2658	static const struct {
2444	const char *name;	2659	const char *name;
2445	IV iv;	2660	IV iv;
2446	} *civ, const_iv[] = {	2661	} *civ, const_iv[] = {
2447	# define const_iv(name) { # name, (IV)name }	2662	# define const_iv(name) { # name, (IV)name }
…		…
2482	const_iv (GL_INTENSITY),	2697	const_iv (GL_INTENSITY),
2483	const_iv (GL_LUMINANCE),	2698	const_iv (GL_LUMINANCE),
2484	const_iv (GL_LUMINANCE_ALPHA),	2699	const_iv (GL_LUMINANCE_ALPHA),
2485	const_iv (GL_FLOAT),	2700	const_iv (GL_FLOAT),
2486	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),
2487	const_iv (GL_COMPILE),	2708	const_iv (GL_COMPILE),
2488	const_iv (GL_PROXY_TEXTURE_1D),	2709	const_iv (GL_PROXY_TEXTURE_1D),
2489	const_iv (GL_PROXY_TEXTURE_2D),	2710	const_iv (GL_PROXY_TEXTURE_2D),
2490	const_iv (GL_TEXTURE_1D),	2711	const_iv (GL_TEXTURE_1D),
2491	const_iv (GL_TEXTURE_2D),	2712	const_iv (GL_TEXTURE_2D),
…		…
2530	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2751	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2531	const_iv (GL_POINT_SMOOTH_HINT),	2752	const_iv (GL_POINT_SMOOTH_HINT),
2532	const_iv (GL_LINE_SMOOTH_HINT),	2753	const_iv (GL_LINE_SMOOTH_HINT),
2533	const_iv (GL_POLYGON_SMOOTH_HINT),	2754	const_iv (GL_POLYGON_SMOOTH_HINT),
2534	const_iv (GL_GENERATE_MIPMAP_HINT),	2755	const_iv (GL_GENERATE_MIPMAP_HINT),
		2756	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2535	const_iv (GL_FASTEST),	2757	const_iv (GL_FASTEST),
2536	const_iv (GL_DONT_CARE),	2758	const_iv (GL_DONT_CARE),
2537	const_iv (GL_NICEST),	2759	const_iv (GL_NICEST),
2538	const_iv (GL_V2F),	2760	const_iv (GL_V2F),
2539	const_iv (GL_V3F),	2761	const_iv (GL_V3F),
…		…
2547		2769
2548	texture_av = newAV ();	2770	texture_av = newAV ();
2549	AvREAL_off (texture_av);	2771	AvREAL_off (texture_av);
2550	}	2772	}
2551		2773
		2774	void
		2775	disable_GL_EXT_blend_func_separate ()
		2776	CODE:
		2777	gl.BlendFuncSeparate = 0;
		2778	gl.BlendFuncSeparateEXT = 0;
		2779
2552	char *	2780	char *
2553	gl_vendor ()	2781	gl_vendor ()
2554	CODE:	2782	CODE:
2555	RETVAL = (char *)glGetString (GL_VENDOR);	2783	RETVAL = (char *)glGetString (GL_VENDOR);
2556	OUTPUT:	2784	OUTPUT:
…		…
2677		2905
2678	void glRect (float x1, float y1, float x2, float y2)	2906	void glRect (float x1, float y1, float x2, float y2)
2679	CODE:	2907	CODE:
2680	glRectf (x1, y1, x2, y2);	2908	glRectf (x1, y1, x2, y2);
2681		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
2682	PROTOTYPES: ENABLE	2919	PROTOTYPES: ENABLE
2683		2920
2684	void glBegin (int mode)	2921	void glBegin (int mode)
2685		2922
2686	void glEnd ()	2923	void glEnd ()
…		…
2718	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)
2719	CODE:	2956	CODE:
2720	if (gl.SeparableFilter2D)	2957	if (gl.SeparableFilter2D)
2721	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2958	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2722		2959
2723	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)
2724		2961
2725	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)
2726		2963
2727	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)
2728		2965
…		…
2754		2991
2755	void glEndList ()	2992	void glEndList ()
2756		2993
2757	void glCallList (int list)	2994	void glCallList (int list)
2758		2995
2759	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2996	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2760		2997
2761	PROTOTYPES: DISABLE	2998	PROTOTYPES: DISABLE
2762		2999
2763	void	3000	void
2764	find_widget (SV *self, NV x, NV y)	3001	find_widget (SV *self, NV x, NV y)
…		…
2768	XPUSHs (self);	3005	XPUSHs (self);
2769	}	3006	}
2770		3007
2771	BOOT:	3008	BOOT:
2772	{	3009	{
2773	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3010	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2774		3011
2775	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);
2776	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);
2777	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);
2778	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);
2779	}	3016	}
2780		3017
2781	void	3018	void
2782	draw (SV *self)	3019	draw (SV *self)
2783	CODE:	3020	CODE:
…		…
2787	NV x, y, w, h;	3024	NV x, y, w, h;
2788	SV *draw_x_sv = GvSV (draw_x_gv);	3025	SV *draw_x_sv = GvSV (draw_x_gv);
2789	SV *draw_y_sv = GvSV (draw_y_gv);	3026	SV *draw_y_sv = GvSV (draw_y_gv);
2790	SV *draw_w_sv = GvSV (draw_w_gv);	3027	SV *draw_w_sv = GvSV (draw_w_gv);
2791	SV *draw_h_sv = GvSV (draw_h_gv);	3028	SV *draw_h_sv = GvSV (draw_h_gv);
2792	SV *hover;
2793	double draw_x, draw_y, draw_w, draw_h;	3029	double draw_x, draw_y;
2794		3030
2795	if (!SvROK (self))	3031	if (!SvROK (self))
2796	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3032	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2797		3033
2798	hv = (HV *)SvRV (self);	3034	hv = (HV *)SvRV (self);
2799		3035
2800	if (SvTYPE (hv) != SVt_PVHV)	3036	if (SvTYPE (hv) != SVt_PVHV)
2801	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3037	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2802		3038
2803	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.;
2804	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.;
2805		3041
2806	if (!h || !w)	3042	if (!h || !w)
…		…
2826	{	3062	{
2827	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3063	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2828		3064
2829	if (svp && SvTRUE (*svp))	3065	if (svp && SvTRUE (*svp))
2830	{	3066	{
2831	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);
2832	glEnable (GL_BLEND);	3068	glEnable (GL_BLEND);
2833	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3069	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2834	glBegin (GL_QUADS);	3070	glBegin (GL_QUADS);
2835	glVertex2f (0, 0);	3071	glVertex2f (0, 0);
2836	glVertex2f (w, 0);	3072	glVertex2f (w, 0);
…		…
2839	glEnd ();	3075	glEnd ();
2840	glDisable (GL_BLEND);	3076	glDisable (GL_BLEND);
2841	}	3077	}
2842	}	3078	}
2843	#if 0	3079	#if 0
2844	if ($ENV{CFPLUS_DEBUG} & 1) {	3080	// draw borders, for debugging
2845	glPushMatrix;	3081	glPushMatrix ();
2846	glColor 1, 1, 0, 1;	3082	glColor4f (1., 1., 0., 1.);
2847	glTranslate 0.375, 0.375;	3083	glTranslatef (.5, .5, 0.);
2848	glBegin GL_LINE_LOOP;	3084	glBegin (GL_LINE_LOOP);
2849	glVertex 0 , 0;	3085	glVertex2f (0 , 0);
2850	glVertex $self->{w} - 1, 0;	3086	glVertex2f (w - 1, 0);
2851	glVertex $self->{w} - 1, $self->{h} - 1;	3087	glVertex2f (w - 1, h - 1);
2852	glVertex 0 , $self->{h} - 1;	3088	glVertex2f (0 , h - 1);
2853	glEnd;	3089	glEnd ();
2854	glPopMatrix;	3090	glPopMatrix ();
2855	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2856	}
2857	#endif	3091	#endif
2858	PUSHMARK (SP);	3092	PUSHMARK (SP);
2859	XPUSHs (self);	3093	XPUSHs (self);
2860	PUTBACK;	3094	PUTBACK;
2861	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