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.265 by root, Fri Jul 18 22:56:11 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	{
…		…
1350	HV *hv = (HV *)SvRV (self);	1485	HV *hv = (HV *)SvRV (self);
1351	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1486	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1487	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1488	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354		1489
		1490	if (name <= 0)
		1491	XSRETURN_EMPTY;
		1492
1355	if (items < 5)	1493	if (items < 5)
1356	{	1494	{
1357	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1495	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1496	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359	}	1497	}
…		…
1397	RETVAL = width > 0;	1535	RETVAL = width > 0;
1398	}	1536	}
1399	OUTPUT:	1537	OUTPUT:
1400	RETVAL	1538	RETVAL
1401		1539
1402	MODULE = CFPlus PACKAGE = CFPlus::Map	1540	MODULE = Deliantra::Client PACKAGE = DC::Map
1403		1541
1404	PROTOTYPES: DISABLE	1542	PROTOTYPES: DISABLE
1405		1543
1406	CFPlus::Map	1544	DC::Map
1407	new (SV *class)	1545	new (SV *class)
1408	CODE:	1546	CODE:
1409	New (0, RETVAL, 1, struct map);	1547	New (0, RETVAL, 1, struct map);
1410	RETVAL->x = 0;	1548	RETVAL->x = 0;
1411	RETVAL->y = 0;	1549	RETVAL->y = 0;
…		…
1419	RETVAL->row = 0;	1557	RETVAL->row = 0;
1420	OUTPUT:	1558	OUTPUT:
1421	RETVAL	1559	RETVAL
1422		1560
1423	void	1561	void
1424	DESTROY (CFPlus::Map self)	1562	DESTROY (DC::Map self)
1425	CODE:	1563	CODE:
1426	{	1564	{
1427	map_clear (self);	1565	map_clear (self);
1428	Safefree (self->face2tile);	1566	Safefree (self->face2tile);
1429	Safefree (self->tex);	1567	Safefree (self->tex);
1430	Safefree (self);	1568	Safefree (self);
1431	}	1569	}
1432		1570
1433	void	1571	void
1434	resize (CFPlus::Map self, int map_width, int map_height)	1572	resize (DC::Map self, int map_width, int map_height)
1435	CODE:	1573	CODE:
1436	self->w = map_width;	1574	self->w = map_width;
1437	self->h = map_height;	1575	self->h = map_height;
1438		1576
1439	void	1577	void
1440	clear (CFPlus::Map self)	1578	clear (DC::Map self)
1441	CODE:	1579	CODE:
1442	map_clear (self);	1580	map_clear (self);
1443		1581
1444	void	1582	void
1445	set_tileid (CFPlus::Map self, int face, int tile)	1583	set_tileid (DC::Map self, int face, int tile)
1446	CODE:	1584	CODE:
1447	{	1585	{
1448	need_facenum (self, face); self->face2tile [face] = tile;	1586	need_facenum (self, face); self->face2tile [face] = tile;
1449	need_texid (self, tile);	1587	need_texid (self, tile);
1450	}	1588	}
1451		1589
1452	void	1590	void
1453	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1591	set_smooth (DC::Map self, int face, int smooth, int level)
1454	CODE:	1592	CODE:
1455	{	1593	{
1456	tileid texid;	1594	tileid texid;
1457	maptex *tex;	1595	maptex *tex;
1458		1596
…		…
1471	tex->smoothtile = self->face2tile [smooth];	1609	tex->smoothtile = self->face2tile [smooth];
1472	tex->smoothlevel = level;	1610	tex->smoothlevel = level;
1473	}	1611	}
1474		1612
1475	void	1613	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)	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)
1477	CODE:	1615	CODE:
1478	{	1616	{
1479	need_texid (self, texid);	1617	need_texid (self, texid);
1480		1618
1481	{	1619	{
…		…
1501	// from transparent color bleeding and ugly wrapping effects.	1639	// from transparent color bleeding and ugly wrapping effects.
1502	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1640	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503	}	1641	}
1504		1642
1505	int	1643	int
1506	ox (CFPlus::Map self)	1644	ox (DC::Map self)
1507	ALIAS:	1645	ALIAS:
1508	oy = 1	1646	oy = 1
1509	x = 2	1647	x = 2
1510	y = 3	1648	y = 3
1511	w = 4	1649	w = 4
…		…
1522	}	1660	}
1523	OUTPUT:	1661	OUTPUT:
1524	RETVAL	1662	RETVAL
1525		1663
1526	void	1664	void
1527	scroll (CFPlus::Map self, int dx, int dy)	1665	scroll (DC::Map self, int dx, int dy)
1528	CODE:	1666	CODE:
1529	{	1667	{
1530	if (dx > 0)	1668	if (dx > 0)
1531	map_blank (self, self->x, self->y, dx, self->h);	1669	map_blank (self, self->x, self->y, dx, self->h);
1532	else if (dx < 0)	1670	else if (dx < 0)
…		…
1547	self->rows += MAP_EXTEND_Y;	1685	self->rows += MAP_EXTEND_Y;
1548	self->y += MAP_EXTEND_Y;	1686	self->y += MAP_EXTEND_Y;
1549	}	1687	}
1550	}	1688	}
1551		1689
1552	void	1690	SV *
1553	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1691	map1a_update (DC::Map self, SV *data_, int extmap)
1554	CODE:	1692	CODE:
1555	{	1693	{
1556	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1694	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557	uint8_t *data_end = (uint8_t *)SvEND (data_);	1695	uint8_t *data_end = (uint8_t *)SvEND (data_);
1558	mapcell *cell;	1696	mapcell *cell;
1559	int x, y, flags;	1697	int x, y, z, flags;
		1698	AV *missing = newAV ();
		1699	RETVAL = newRV_noinc ((SV *)missing);
1560		1700
1561	while (data < data_end - 1)	1701	while (data < data_end - 1)
1562	{	1702	{
1563	flags = (data [0] << 8) + data [1]; data += 2;	1703	flags = (data [0] << 8) + data [1]; data += 2;
1564		1704
…		…
1584	uint8_t ext, cmd;	1724	uint8_t ext, cmd;
1585		1725
1586	do	1726	do
1587	{	1727	{
1588	ext = *data++;	1728	ext = *data++;
1589	cmd = ext & 0x3f;	1729	cmd = ext & 0x7f;
1590		1730
1591	if (cmd < 4)	1731	if (cmd < 4)
1592	cell->darkness = 255 - ext * 64 + 1;	1732	cell->darkness = 255 - ext * 64 + 1;
1593	else if (cmd == 5) // health	1733	else if (cmd == 5) // health
1594	{	1734	{
…		…
1597	}	1737	}
1598	else if (cmd == 6) // monster width	1738	else if (cmd == 6) // monster width
1599	cell->stat_width = *data++ + 1;	1739	cell->stat_width = *data++ + 1;
1600	else if (cmd == 0x47)	1740	else if (cmd == 0x47)
1601	{	1741	{
1602	if (*data == 4)	1742	if (*data == 1) cell->player = data [1];
1603	; // 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);
1604		1746
1605	data += *data + 1;	1747	data += *data + 1;
1606	}	1748	}
1607	else if (cmd == 8) // cell flags	1749	else if (cmd == 8) // cell flags
1608	cell->flags = *data++;	1750	cell->flags = *data++;
…		…
1615	}	1757	}
1616	else	1758	else
1617	cell->darkness = *data++ + 1;	1759	cell->darkness = *data++ + 1;
1618	}	1760	}
1619		1761
		1762	for (z = 0; z <= 2; ++z)
1620	if (flags & 4)	1763	if (flags & (4 >> z))
1621	{	1764	{
1622	faceid face = (data [0] << 8) + data [1]; data += 2;	1765	faceid face = (data [0] << 8) + data [1]; data += 2;
1623	need_facenum (self, face);	1766	need_facenum (self, face);
1624	cell->tile [0] = self->face2tile [face];	1767	cell->tile [z] = self->face2tile [face];
		1768
		1769	if (cell->tile [z])
		1770	{
		1771	maptex *tex = self->tex + cell->tile [z];
		1772	if (!tex->name)
		1773	av_push (missing, newSViv (cell->tile [z]));
		1774
		1775	if (tex->smoothtile)
		1776	{
		1777	maptex *smooth = self->tex + tex->smoothtile;
		1778	if (!smooth->name)
		1779	av_push (missing, newSViv (tex->smoothtile));
		1780	}
		1781	}
1625	}	1782	}
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	}	1783	}
1641	else	1784	else
1642	cell->darkness = 0;	1785	cell->darkness = 0;
1643	}	1786	}
1644	}	1787	}
		1788	OUTPUT:
		1789	RETVAL
1645		1790
1646	SV *	1791	SV *
1647	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1792	mapmap (DC::Map self, int x0, int y0, int w, int h)
1648	CODE:	1793	CODE:
1649	{	1794	{
1650	int x1, x;	1795	int x1, x;
1651	int y1, y;	1796	int y1, y;
1652	int z;	1797	int z;
…		…
1697	}	1842	}
1698	OUTPUT:	1843	OUTPUT:
1699	RETVAL	1844	RETVAL
1700		1845
1701	void	1846	void
1702	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1847	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:	1848	CODE:
1704	{	1849	{
		1850	int x, y, z;
		1851
1705	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1852	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1853	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)	1854	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1708	smooth_key skey;	1855	smooth_key skey;
1709	int x, y, z;	1856	int pl_x, pl_y;
1710	int last_name;	1857	maptex pl_tex;
		1858	rc_t *rc = rc_alloc ();
		1859	rc_key_t key;
		1860	rc_array_t *arr;
		1861
		1862	pl_tex.name = 0;
1711		1863
1712	// thats current max. sorry.	1864	// thats current max. sorry.
1713	if (sw > 255) sw = 255;	1865	if (sw > 255) sw = 255;
1714	if (sh > 255) sh = 255;	1866	if (sh > 255) sh = 255;
1715		1867
1716	// clear key, in case of extra padding	1868	// clear key, in case of extra padding
1717	memset (&skey, 0, sizeof (skey));	1869	memset (&skey, 0, sizeof (skey));
1718		1870
1719	glColor4ub (255, 255, 255, 255);	1871	memset (&key, 0, sizeof (key));
1720		1872	key.r = 255;
1721	glEnable (GL_BLEND);	1873	key.g = 255;
1722	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1874	key.b = 255;
1723	glEnable (GL_TEXTURE_2D);	1875	key.a = 255;
1724	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1876	key.mode = GL_QUADS;
1725		1877	key.format = GL_T2F_V3F;
1726	glBegin (GL_QUADS);	1878	key.texname = -1;
1727
1728	last_name = 0;
1729		1879
1730	mx += self->x;	1880	mx += self->x;
1731	my += self->y;	1881	my += self->y;
1732		1882
1733	// first pass: determine smooth_max	1883	// first pass: determine smooth_max
…		…
1749	MAX (self->tex [cell->tile [0]].smoothlevel,	1899	MAX (self->tex [cell->tile [0]].smoothlevel,
1750	MAX (self->tex [cell->tile [1]].smoothlevel,	1900	MAX (self->tex [cell->tile [1]].smoothlevel,
1751	self->tex [cell->tile [2]].smoothlevel));	1901	self->tex [cell->tile [2]].smoothlevel));
1752	}	1902	}
1753	}	1903	}
		1904
		1905	glEnable (GL_BLEND);
		1906	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1907	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1754		1908
1755	for (z = 0; z <= 2; z++)	1909	for (z = 0; z <= 2; z++)
1756	{	1910	{
1757	memset (smooth_level, 0, sizeof (smooth_level));	1911	memset (smooth_level, 0, sizeof (smooth_level));
1758		1912
…		…
1771	{	1925	{
1772	maptex tex = self->tex [tile];	1926	maptex tex = self->tex [tile];
1773	int px = (x + 1) * T - tex.w;	1927	int px = (x + 1) * T - tex.w;
1774	int py = (y + 1) * T - tex.h;	1928	int py = (y + 1) * T - tex.h;
1775		1929
1776	// suppressing texture state switches here
1777	// is only moderately effective, but worth the extra effort
1778	if (last_name != tex.name)	1930	if (key.texname != tex.name)
1779	{	1931	{
1780	if (!tex.name)	1932	if (!tex.name)
1781	tex = self->tex [2]; /* missing, replace by noface */	1933	tex = self->tex [2]; /* missing, replace by noface */
1782		1934
1783	glEnd ();	1935	key.texname = tex.name;
1784	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1936	arr = rc_array (rc, &key);
1785	glBegin (GL_QUADS);
1786	}	1937	}
1787		1938
1788	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1939	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	{	1940	{
		1941	pl_x = px;
		1942	pl_y = py;
		1943	pl_tex = tex;
		1944	continue;
		1945	}
		1946
		1947	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1948	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		1949	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		1950	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		1951
		1952	if (expect_false (cell->flags) && expect_false (z == 2))
		1953	{
		1954	// overlays such as the speech bubble, probably more to come
1795	if (cell->flags & 1)	1955	if (cell->flags & 1)
1796	{	1956	{
1797	maptex tex = self->tex [1];	1957	maptex tex = self->tex [1];
1798	int px = x * T + T * 2 / 32;	1958	int px = x * T + T * 2 / 32;
1799	int py = y * T - T * 6 / 32;	1959	int py = y * T - T * 6 / 32;
1800		1960
		1961	if (tex.name)
1801	glEnd ();	1962	{
1802	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1963	if (key.texname != tex.name)
		1964	{
		1965	key.texname = tex.name;
		1966	arr = rc_array (rc, &key);
		1967	}
		1968
		1969	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1970	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		1971	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		1972	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1803	glBegin (GL_QUADS);	1973	}
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	}	1974	}
1810	}	1975	}
1811		1976
1812	// update smooth hash	1977	// update smooth hash
1813	if (tex.smoothtile)	1978	if (tex.smoothtile)
…		…
1849	}	2014	}
1850	}	2015	}
1851	}	2016	}
1852	}	2017	}
1853		2018
		2019	rc_draw (rc);
		2020	rc_clear (rc);
		2021
1854	// go through all smoothlevels, lowest to highest, then draw.	2022	// go through all smoothlevels, lowest to highest, then draw.
1855	// this is basically counting sort	2023	// this is basically counting sort
1856	{	2024	{
1857	int w, b;	2025	int w, b;
1858		2026
		2027	glEnable (GL_TEXTURE_2D);
		2028	glBegin (GL_QUADS);
1859	for (w = 0; w < 256 / 32; ++w)	2029	for (w = 0; w < 256 / 32; ++w)
1860	{	2030	{
1861	uint32_t smask = smooth_level [w];	2031	uint32_t smask = smooth_level [w];
1862	if (smask)	2032	if (smask)
1863	for (b = 0; b < 32; ++b)	2033	for (b = 0; b < 32; ++b)
…		…
1882	int border = bits & 15;	2052	int border = bits & 15;
1883	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2053	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884	float dx = tex.s * .0625f; // 16 images/row	2054	float dx = tex.s * .0625f; // 16 images/row
1885	float dy = tex.t * .5f ; // 2 images/column	2055	float dy = tex.t * .5f ; // 2 images/column
1886		2056
1887	// this time naively avoiding texture state changes
1888	// save gobs of state changes.
1889	if (last_name != tex.name)	2057	if (tex.name)
1890	{	2058	{
		2059	// this time avoiding texture state changes
		2060	// save gobs of state changes.
1891	if (!tex.name)	2061	if (key.texname != tex.name)
1892	continue; // smoothing not yet available	2062	{
1893
1894	glEnd ();	2063	glEnd ();
1895	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2064	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896	glBegin (GL_QUADS);	2065	glBegin (GL_QUADS);
1897	}	2066	}
1898		2067
1899	if (border)	2068	if (border)
1900	{	2069	{
1901	float ox = border * dx;	2070	float ox = border * dx;
1902		2071
1903	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2072	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2073	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2074	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2075	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907	}	2076	}
1908		2077
1909	if (corner)	2078	if (corner)
1910	{	2079	{
1911	float ox = corner * dx;	2080	float ox = corner * dx;
1912		2081
1913	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2082	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2083	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2084	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2085	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2086	}
1917	}	2087	}
1918	}	2088	}
1919	}	2089	}
1920	}	2090	}
1921	}	2091	}
		2092
		2093	glEnd ();
		2094	glDisable (GL_TEXTURE_2D);
		2095	key.texname = -1;
1922	}	2096	}
1923		2097
1924	hv_clear (smooth);	2098	hv_clear (smooth);
1925	}	2099	}
1926		2100
1927	glEnd ();	2101	if (pl_tex.name)
		2102	{
		2103	maptex tex = pl_tex;
		2104	int px = pl_x + pdx;
		2105	int py = pl_y + pdy;
1928		2106
1929	glDisable (GL_TEXTURE_2D);	2107	key.texname = tex.name;
		2108	arr = rc_array (rc, &key);
		2109
		2110	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2111	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2112	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2113	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2114
		2115	rc_draw (rc);
		2116	}
		2117
1930	glDisable (GL_BLEND);	2118	glDisable (GL_BLEND);
		2119	rc_free (rc);
1931		2120
1932	// top layer: overlays such as the health bar	2121	// top layer: overlays such as the health bar
1933	for (y = 0; y < sh; y++)	2122	for (y = 0; y < sh; y++)
1934	if (0 <= y + my && y + my < self->rows)	2123	if (0 <= y + my && y + my < self->rows)
1935	{	2124	{
…		…
1960	}	2149	}
1961	}	2150	}
1962	}	2151	}
1963		2152
1964	void	2153	void
1965	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2154	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1966	CODE:	2155	CODE:
1967	{	2156	{
1968	static float color[16][3] = {	2157	static float color[16][3] = {
1969	{ 0.00F, 0.00F, 0.00F },	2158	{ 0.00F, 0.00F, 0.00F },
1970	{ 1.00F, 1.00F, 1.00F },	2159	{ 1.00F, 1.00F, 1.00F },
…		…
2020	glDisable (GL_BLEND);	2209	glDisable (GL_BLEND);
2021	glDisable (GL_TEXTURE_2D);	2210	glDisable (GL_TEXTURE_2D);
2022	}	2211	}
2023		2212
2024	void	2213	void
2025	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2214	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2026	PPCODE:	2215	PPCODE:
2027	{	2216	{
2028	int x, y;	2217	int x, y;
2029	int sw1 = sw + 2;	2218	int sw1 = sw + 2;
2030	int sh1 = sh + 2;	2219	int sh1 = sh + 2;
…		…
2101	PUSHs (sv_2mortal (newSViv (sh3)));	2290	PUSHs (sv_2mortal (newSViv (sh3)));
2102	PUSHs (darkness3_sv);	2291	PUSHs (darkness3_sv);
2103	}	2292	}
2104		2293
2105	SV *	2294	SV *
2106	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2295	get_rect (DC::Map self, int x0, int y0, int w, int h)
2107	CODE:	2296	CODE:
2108	{	2297	{
2109	int x, y, x1, y1;	2298	int x, y, x1, y1;
2110	SV *data_sv = newSV (w * h * 7 + 5);	2299	SV *data_sv = newSV (w * h * 7 + 5);
2111	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2300	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2168	else	2357	else
2169	*data++ = 0;	2358	*data++ = 0;
2170	}	2359	}
2171	}	2360	}
2172		2361
		2362	/* if size is w*h + 5 then no data has been found */
		2363	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2364	{
2173	SvPOK_only (data_sv);	2365	SvPOK_only (data_sv);
2174	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2366	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2367	}
		2368
2175	RETVAL = data_sv;	2369	RETVAL = data_sv;
2176	}	2370	}
2177	OUTPUT:	2371	OUTPUT:
2178	RETVAL	2372	RETVAL
2179		2373
2180	void	2374	void
2181	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2375	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2182	PPCODE:	2376	PPCODE:
2183	{	2377	{
2184	int x, y, z;	2378	int x, y, z;
2185	int w, h;	2379	int w, h;
2186	int x1, y1;	2380	int x1, y1;
		2381	STRLEN len;
		2382	uint8_t *data, *end;
		2383
		2384	len = SvLEN (data_sv);
		2385	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2386	data = SvPVbyte_nolen (data_sv);
		2387	end = data + len + 8;
		2388
		2389	if (len < 5)
		2390	XSRETURN_EMPTY;
2187		2391
2188	if (*data++ != 0)	2392	if (*data++ != 0)
2189	return; /* version mismatch */	2393	XSRETURN_EMPTY; /* version mismatch */
2190		2394
2191	w = *data++ << 8; w |= *data++;	2395	w = *data++ << 8; w |= *data++;
2192	h = *data++ << 8; h |= *data++;	2396	h = *data++ << 8; h |= *data++;
2193		2397
2194	// we need to do this 'cause we don't keep an absolute coord system for rows	2398	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2206	{	2410	{
2207	maprow *row = map_get_row (self, y);	2411	maprow *row = map_get_row (self, y);
2208		2412
2209	for (x = x0; x < x1; x++)	2413	for (x = x0; x < x1; x++)
2210	{	2414	{
		2415	uint8_t flags;
		2416
		2417	if (data + 7 >= end)
		2418	XSRETURN_EMPTY;
		2419
2211	uint8_t flags = *data++;	2420	flags = *data++;
2212		2421
2213	if (flags)	2422	if (flags)
2214	{	2423	{
2215	mapcell *cell = row_get_cell (row, x);	2424	mapcell *cell = row_get_cell (row, x);
2216	tileid tile[3] = { 0, 0, 0 };	2425	tileid tile[3] = { 0, 0, 0 };
…		…
2219	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2428	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2220	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2429	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2221		2430
2222	if (cell->darkness == 0)	2431	if (cell->darkness == 0)
2223	{	2432	{
2224	cell->darkness = 0;	2433	/*cell->darkness = 0;*/
		2434	EXTEND (SP, 3);
2225		2435
2226	for (z = 0; z <= 2; z++)	2436	for (z = 0; z <= 2; z++)
2227	{	2437	{
2228	tileid t = tile [z];	2438	tileid t = tile [z];
2229		2439
2230	if (t >= self->texs || (t && !self->tex [t].name))	2440	if (t >= self->texs || (t && !self->tex [t].name))
2231	{	2441	{
2232	XPUSHs (sv_2mortal (newSViv (t)));	2442	PUSHs (sv_2mortal (newSViv (t)));
2233	need_texid (self, t);	2443	need_texid (self, t);
2234	}	2444	}
2235		2445
2236	cell->tile [z] = t;	2446	cell->tile [z] = t;
2237	}	2447	}
…		…
2239	}	2449	}
2240	}	2450	}
2241	}	2451	}
2242	}	2452	}
2243		2453
2244	MODULE = CFPlus PACKAGE = CFPlus::RW	2454	MODULE = Deliantra::Client PACKAGE = DC::RW
2245		2455
2246	CFPlus::RW	2456	DC::RW
2247	new (SV *class, SV *data_sv)	2457	new (SV *class, SV *data_sv)
2248	CODE:	2458	CODE:
2249	{	2459	{
2250	STRLEN datalen;	2460	STRLEN datalen;
2251	char *data = SvPVbyte (data_sv, datalen);	2461	char *data = SvPVbyte (data_sv, datalen);
…		…
2253	RETVAL = SDL_RWFromConstMem (data, datalen);	2463	RETVAL = SDL_RWFromConstMem (data, datalen);
2254	}	2464	}
2255	OUTPUT:	2465	OUTPUT:
2256	RETVAL	2466	RETVAL
2257		2467
2258	CFPlus::RW	2468	DC::RW
2259	new_from_file (SV *class, const char *path, const char *mode = "rb")	2469	new_from_file (SV *class, const char *path, const char *mode = "rb")
2260	CODE:	2470	CODE:
2261	RETVAL = SDL_RWFromFile (path, mode);	2471	RETVAL = SDL_RWFromFile (path, mode);
2262	OUTPUT:	2472	OUTPUT:
2263	RETVAL	2473	RETVAL
2264		2474
2265	# fails on win32:	2475	# fails on win32:
2266	# CFPlus.xs(2268) : error C2059: syntax error : '('	2476	# dc.xs(2268) : error C2059: syntax error : '('
2267	#void	2477	#void
2268	#close (CFPlus::RW self)	2478	#close (DC::RW self)
2269	# CODE:	2479	# CODE:
2270	# (self->(close)) (self);	2480	# (self->(close)) (self);
2271		2481
2272	MODULE = CFPlus PACKAGE = CFPlus::Channel	2482	MODULE = Deliantra::Client PACKAGE = DC::Channel
2273		2483
2274	PROTOTYPES: DISABLE	2484	PROTOTYPES: DISABLE
2275		2485
2276	CFPlus::Channel	2486	DC::Channel
2277	find ()	2487	find ()
2278	CODE:	2488	CODE:
2279	{	2489	{
2280	RETVAL = Mix_GroupAvailable (-1);	2490	RETVAL = Mix_GroupAvailable (-1);
2281		2491
…		…
2294	}	2504	}
2295	OUTPUT:	2505	OUTPUT:
2296	RETVAL	2506	RETVAL
2297		2507
2298	void	2508	void
2299	halt (CFPlus::Channel self)	2509	halt (DC::Channel self)
2300	CODE:	2510	CODE:
2301	Mix_HaltChannel (self);	2511	Mix_HaltChannel (self);
2302		2512
2303	void	2513	void
2304	expire (CFPlus::Channel self, int ticks = -1)	2514	expire (DC::Channel self, int ticks = -1)
2305	CODE:	2515	CODE:
2306	Mix_ExpireChannel (self, ticks);	2516	Mix_ExpireChannel (self, ticks);
2307		2517
2308	void	2518	void
2309	fade_out (CFPlus::Channel self, int ticks = -1)	2519	fade_out (DC::Channel self, int ticks = -1)
2310	CODE:	2520	CODE:
2311	Mix_FadeOutChannel (self, ticks);	2521	Mix_FadeOutChannel (self, ticks);
2312		2522
2313	int	2523	int
2314	volume (CFPlus::Channel self, int volume)	2524	volume (DC::Channel self, int volume)
2315	CODE:	2525	CODE:
2316	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2526	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2317	OUTPUT:	2527	OUTPUT:
2318	RETVAL	2528	RETVAL
2319		2529
2320	void	2530	void
2321	unregister_all_effects (CFPlus::Channel self)	2531	unregister_all_effects (DC::Channel self)
2322	CODE:	2532	CODE:
2323	Mix_UnregisterAllEffects (self);	2533	Mix_UnregisterAllEffects (self);
2324		2534
2325	void	2535	void
2326	set_panning (CFPlus::Channel self, int left, int right)	2536	set_panning (DC::Channel self, int left, int right)
2327	CODE:	2537	CODE:
2328	left = CLAMP (left , 0, 255);	2538	left = CLAMP (left , 0, 255);
2329	right = CLAMP (right, 0, 255);	2539	right = CLAMP (right, 0, 255);
2330	Mix_SetPanning (self, left, right);	2540	Mix_SetPanning (self, left, right);
2331		2541
2332	void	2542	void
2333	set_distance (CFPlus::Channel self, int distance)	2543	set_distance (DC::Channel self, int distance)
2334	CODE:	2544	CODE:
2335	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2545	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2336		2546
2337	void	2547	void
2338	set_position (CFPlus::Channel self, int angle, int distance)	2548	set_position (DC::Channel self, int angle, int distance)
2339	CODE:	2549	CODE:
		2550
		2551	void
		2552	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2553	CODE:
		2554	{
		2555	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2556	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2340	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2557	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2558	}
2341		2559
2342	void	2560	void
2343	set_reverse_stereo (CFPlus::Channel self, int flip)	2561	set_reverse_stereo (DC::Channel self, int flip)
2344	CODE:	2562	CODE:
2345	Mix_SetReverseStereo (self, flip);	2563	Mix_SetReverseStereo (self, flip);
2346		2564
2347	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2565	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2348		2566
2349	PROTOTYPES: DISABLE	2567	PROTOTYPES: DISABLE
2350		2568
2351	CFPlus::MixChunk	2569	DC::MixChunk
2352	new (SV *class, CFPlus::RW rwops)	2570	new (SV *class, DC::RW rwops)
2353	CODE:	2571	CODE:
2354	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2572	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2355	OUTPUT:	2573	OUTPUT:
2356	RETVAL	2574	RETVAL
2357		2575
2358	void	2576	void
2359	DESTROY (CFPlus::MixChunk self)	2577	DESTROY (DC::MixChunk self)
2360	CODE:	2578	CODE:
2361	Mix_FreeChunk (self);	2579	Mix_FreeChunk (self);
2362		2580
2363	int	2581	int
2364	volume (CFPlus::MixChunk self, int volume = -1)	2582	volume (DC::MixChunk self, int volume = -1)
2365	CODE:	2583	CODE:
2366	if (items > 1)	2584	if (items > 1)
2367	volume = CLAMP (volume, 0, 128);	2585	volume = CLAMP (volume, 0, 128);
2368	RETVAL = Mix_VolumeChunk (self, volume);	2586	RETVAL = Mix_VolumeChunk (self, volume);
2369	OUTPUT:	2587	OUTPUT:
2370	RETVAL	2588	RETVAL
2371		2589
2372	CFPlus::Channel	2590	DC::Channel
2373	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2591	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2374	CODE:	2592	CODE:
2375	{	2593	{
2376	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2594	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2377		2595
2378	if (RETVAL < 0)	2596	if (RETVAL < 0)
…		…
2385	}	2603	}
2386	}	2604	}
2387	OUTPUT:	2605	OUTPUT:
2388	RETVAL	2606	RETVAL
2389		2607
2390	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2608	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2391		2609
2392	int	2610	int
2393	volume (int volume = -1)	2611	volume (int volume = -1)
2394	PROTOTYPE: ;$	2612	PROTOTYPE: ;$
2395	CODE:	2613	CODE:
…		…
2407	void	2625	void
2408	halt ()	2626	halt ()
2409	CODE:	2627	CODE:
2410	Mix_HaltMusic ();	2628	Mix_HaltMusic ();
2411		2629
2412	CFPlus::MixMusic	2630	DC::MixMusic
2413	new (SV *class, CFPlus::RW rwops)	2631	new (SV *class, DC::RW rwops)
2414	CODE:	2632	CODE:
2415	RETVAL = Mix_LoadMUS_RW (rwops);	2633	RETVAL = Mix_LoadMUS_RW (rwops);
2416	OUTPUT:	2634	OUTPUT:
2417	RETVAL	2635	RETVAL
2418		2636
2419	void	2637	void
2420	DESTROY (CFPlus::MixMusic self)	2638	DESTROY (DC::MixMusic self)
2421	CODE:	2639	CODE:
2422	Mix_FreeMusic (self);	2640	Mix_FreeMusic (self);
2423		2641
2424	int	2642	int
2425	play (CFPlus::MixMusic self, int loops = -1)	2643	play (DC::MixMusic self, int loops = -1)
2426	CODE:	2644	CODE:
2427	RETVAL = Mix_PlayMusic (self, loops);	2645	RETVAL = Mix_PlayMusic (self, loops);
2428	OUTPUT:	2646	OUTPUT:
2429	RETVAL	2647	RETVAL
2430		2648
2431	void	2649	void
2432	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2650	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2433	CODE:	2651	CODE:
2434	Mix_FadeInMusicPos (self, loops, ms, position);	2652	Mix_FadeInMusicPos (self, loops, ms, position);
2435		2653
2436	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2654	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2437		2655
2438	PROTOTYPES: ENABLE	2656	PROTOTYPES: ENABLE
2439		2657
2440	BOOT:	2658	BOOT:
2441	{	2659	{
2442	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2660	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2443	static const struct {	2661	static const struct {
2444	const char *name;	2662	const char *name;
2445	IV iv;	2663	IV iv;
2446	} *civ, const_iv[] = {	2664	} *civ, const_iv[] = {
2447	# define const_iv(name) { # name, (IV)name }	2665	# define const_iv(name) { # name, (IV)name }
…		…
2482	const_iv (GL_INTENSITY),	2700	const_iv (GL_INTENSITY),
2483	const_iv (GL_LUMINANCE),	2701	const_iv (GL_LUMINANCE),
2484	const_iv (GL_LUMINANCE_ALPHA),	2702	const_iv (GL_LUMINANCE_ALPHA),
2485	const_iv (GL_FLOAT),	2703	const_iv (GL_FLOAT),
2486	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2704	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2705	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2706	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2707	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2708	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2709	const_iv (GL_COMPRESSED_RGB_ARB),
		2710	const_iv (GL_COMPRESSED_RGBA_ARB),
2487	const_iv (GL_COMPILE),	2711	const_iv (GL_COMPILE),
2488	const_iv (GL_PROXY_TEXTURE_1D),	2712	const_iv (GL_PROXY_TEXTURE_1D),
2489	const_iv (GL_PROXY_TEXTURE_2D),	2713	const_iv (GL_PROXY_TEXTURE_2D),
2490	const_iv (GL_TEXTURE_1D),	2714	const_iv (GL_TEXTURE_1D),
2491	const_iv (GL_TEXTURE_2D),	2715	const_iv (GL_TEXTURE_2D),
…		…
2530	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2754	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2531	const_iv (GL_POINT_SMOOTH_HINT),	2755	const_iv (GL_POINT_SMOOTH_HINT),
2532	const_iv (GL_LINE_SMOOTH_HINT),	2756	const_iv (GL_LINE_SMOOTH_HINT),
2533	const_iv (GL_POLYGON_SMOOTH_HINT),	2757	const_iv (GL_POLYGON_SMOOTH_HINT),
2534	const_iv (GL_GENERATE_MIPMAP_HINT),	2758	const_iv (GL_GENERATE_MIPMAP_HINT),
		2759	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2535	const_iv (GL_FASTEST),	2760	const_iv (GL_FASTEST),
2536	const_iv (GL_DONT_CARE),	2761	const_iv (GL_DONT_CARE),
2537	const_iv (GL_NICEST),	2762	const_iv (GL_NICEST),
2538	const_iv (GL_V2F),	2763	const_iv (GL_V2F),
2539	const_iv (GL_V3F),	2764	const_iv (GL_V3F),
…		…
2547		2772
2548	texture_av = newAV ();	2773	texture_av = newAV ();
2549	AvREAL_off (texture_av);	2774	AvREAL_off (texture_av);
2550	}	2775	}
2551		2776
		2777	void
		2778	disable_GL_EXT_blend_func_separate ()
		2779	CODE:
		2780	gl.BlendFuncSeparate = 0;
		2781	gl.BlendFuncSeparateEXT = 0;
		2782
2552	char *	2783	char *
2553	gl_vendor ()	2784	gl_vendor ()
2554	CODE:	2785	CODE:
2555	RETVAL = (char *)glGetString (GL_VENDOR);	2786	RETVAL = (char *)glGetString (GL_VENDOR);
2556	OUTPUT:	2787	OUTPUT:
…		…
2677		2908
2678	void glRect (float x1, float y1, float x2, float y2)	2909	void glRect (float x1, float y1, float x2, float y2)
2679	CODE:	2910	CODE:
2680	glRectf (x1, y1, x2, y2);	2911	glRectf (x1, y1, x2, y2);
2681		2912
		2913	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2914	CODE:
		2915	glBegin (GL_LINE_LOOP);
		2916	glVertex2f (x1, y1);
		2917	glVertex2f (x2, y1);
		2918	glVertex2f (x2, y2);
		2919	glVertex2f (x1, y2);
		2920	glEnd ();
		2921
2682	PROTOTYPES: ENABLE	2922	PROTOTYPES: ENABLE
2683		2923
2684	void glBegin (int mode)	2924	void glBegin (int mode)
2685		2925
2686	void glEnd ()	2926	void glEnd ()
…		…
2718	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2958	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2719	CODE:	2959	CODE:
2720	if (gl.SeparableFilter2D)	2960	if (gl.SeparableFilter2D)
2721	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2961	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2722		2962
2723	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2963	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2724		2964
2725	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2965	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2726		2966
2727	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2967	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2728		2968
…		…
2754		2994
2755	void glEndList ()	2995	void glEndList ()
2756		2996
2757	void glCallList (int list)	2997	void glCallList (int list)
2758		2998
2759	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2999	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2760		3000
2761	PROTOTYPES: DISABLE	3001	PROTOTYPES: DISABLE
2762		3002
2763	void	3003	void
2764	find_widget (SV *self, NV x, NV y)	3004	find_widget (SV *self, NV x, NV y)
…		…
2768	XPUSHs (self);	3008	XPUSHs (self);
2769	}	3009	}
2770		3010
2771	BOOT:	3011	BOOT:
2772	{	3012	{
2773	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3013	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2774		3014
2775	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3015	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);	3016	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);	3017	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);	3018	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2779	}	3019	}
2780		3020
2781	void	3021	void
2782	draw (SV *self)	3022	draw (SV *self)
2783	CODE:	3023	CODE:
…		…
2787	NV x, y, w, h;	3027	NV x, y, w, h;
2788	SV *draw_x_sv = GvSV (draw_x_gv);	3028	SV *draw_x_sv = GvSV (draw_x_gv);
2789	SV *draw_y_sv = GvSV (draw_y_gv);	3029	SV *draw_y_sv = GvSV (draw_y_gv);
2790	SV *draw_w_sv = GvSV (draw_w_gv);	3030	SV *draw_w_sv = GvSV (draw_w_gv);
2791	SV *draw_h_sv = GvSV (draw_h_gv);	3031	SV *draw_h_sv = GvSV (draw_h_gv);
2792	SV *hover;
2793	double draw_x, draw_y, draw_w, draw_h;	3032	double draw_x, draw_y;
2794		3033
2795	if (!SvROK (self))	3034	if (!SvROK (self))
2796	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3035	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2797		3036
2798	hv = (HV *)SvRV (self);	3037	hv = (HV *)SvRV (self);
2799		3038
2800	if (SvTYPE (hv) != SVt_PVHV)	3039	if (SvTYPE (hv) != SVt_PVHV)
2801	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3040	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2802		3041
2803	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3042	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.;	3043	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2805		3044
2806	if (!h || !w)	3045	if (!h || !w)
…		…
2826	{	3065	{
2827	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3066	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2828		3067
2829	if (svp && SvTRUE (*svp))	3068	if (svp && SvTRUE (*svp))
2830	{	3069	{
2831	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3070	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2832	glEnable (GL_BLEND);	3071	glEnable (GL_BLEND);
2833	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3072	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2834	glBegin (GL_QUADS);	3073	glBegin (GL_QUADS);
2835	glVertex2f (0, 0);	3074	glVertex2f (0, 0);
2836	glVertex2f (w, 0);	3075	glVertex2f (w, 0);
…		…
2839	glEnd ();	3078	glEnd ();
2840	glDisable (GL_BLEND);	3079	glDisable (GL_BLEND);
2841	}	3080	}
2842	}	3081	}
2843	#if 0	3082	#if 0
2844	if ($ENV{CFPLUS_DEBUG} & 1) {	3083	// draw borders, for debugging
2845	glPushMatrix;	3084	glPushMatrix ();
2846	glColor 1, 1, 0, 1;	3085	glColor4f (1., 1., 0., 1.);
2847	glTranslate 0.375, 0.375;	3086	glTranslatef (.5, .5, 0.);
2848	glBegin GL_LINE_LOOP;	3087	glBegin (GL_LINE_LOOP);
2849	glVertex 0 , 0;	3088	glVertex2f (0 , 0);
2850	glVertex $self->{w} - 1, 0;	3089	glVertex2f (w - 1, 0);
2851	glVertex $self->{w} - 1, $self->{h} - 1;	3090	glVertex2f (w - 1, h - 1);
2852	glVertex 0 , $self->{h} - 1;	3091	glVertex2f (0 , h - 1);
2853	glEnd;	3092	glEnd ();
2854	glPopMatrix;	3093	glPopMatrix ();
2855	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2856	}
2857	#endif	3094	#endif
2858	PUSHMARK (SP);	3095	PUSHMARK (SP);
2859	XPUSHs (self);	3096	XPUSHs (self);
2860	PUTBACK;	3097	PUTBACK;
2861	call_method ("_draw", G_VOID | G_DISCARD);	3098	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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