ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC

…		…
39	#include <SDL_endian.h>	39	#include <SDL_endian.h>
40	#include <SDL_image.h>	40	#include <SDL_image.h>
41	#include <SDL_mixer.h>	41	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	42	#include <SDL_opengl.h>
43		43
		44	/* work around os x broken headers */
		45	#ifdef __MACOSX__
		46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		47	#endif
		48
44	#define PANGO_ENABLE_BACKEND	49	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	50	#define G_DISABLE_CAST_CHECKS
46		51
47	#include <glib/gmacros.h>	52	#include <glib/gmacros.h>
48		53
49	#include <pango/pango.h>	54	#include <pango/pango.h>
		55
		56	#ifndef PANGO_VERSION_CHECK
		57	# define PANGO_VERSION_CHECK(a,b,c) 0
		58	#endif
		59
		60	#if !PANGO_VERSION_CHECK (1, 15, 2)
		61	# define pango_layout_get_line_readonly pango_layout_get_line
		62	# define pango_layout_get_lines_readonly pango_layout_get_lines
		63	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		64	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		65	#endif
50		66
51	#ifndef _WIN32	67	#ifndef _WIN32
52	# include <sys/types.h>	68	# include <sys/types.h>
53	# include <sys/socket.h>	69	# include <sys/socket.h>
54	# include <netinet/in.h>	70	# include <netinet/in.h>
55	# include <netinet/tcp.h>	71	# include <netinet/tcp.h>
56	# include <inttypes.h>	72	# include <inttypes.h>
57	#endif	73	#endif
58		74
		75	#if __GNUC__ >= 4
		76	# define expect(expr,value) __builtin_expect ((expr),(value))
		77	#else
		78	# define expect(expr,value) (expr)
		79	#endif
		80
		81	#define expect_false(expr) expect ((expr) != 0, 0)
		82	#define expect_true(expr) expect ((expr) != 0, 1)
		83
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		85
61	#define FOW_DARKNESS 32	86	#define FOW_DARKNESS 32
62		87
63	#define MAP_EXTEND_X 32	88	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	89	#define MAP_EXTEND_Y 512
65		90
66	#define MIN_FONT_HEIGHT 10	91	#define MIN_FONT_HEIGHT 10
67		92
68	#if 0	93	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	94	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70	#else
71	# define PARACHUTE 0
72	#endif
73		95
74	static AV *texture_av;	96	static AV *texture_av;
75		97
76	static struct	98	static struct
77	{	99	{
…		…
114	av_push (texture_av, (SV *)(size_t)name);	136	av_push (texture_av, (SV *)(size_t)name);
115	glDeleteTextures (1, &name);	137	glDeleteTextures (1, &name);
116	}	138	}
117		139
118	#include "texcache.c"	140	#include "texcache.c"
		141	#include "rendercache.c"
119		142
120	#include "pango-font.c"	143	#include "pango-font.c"
121	#include "pango-fontmap.c"	144	#include "pango-fontmap.c"
122	#include "pango-render.c"	145	#include "pango-render.c"
123		146
124	typedef IV CFPlus__Channel;	147	typedef IV DC__Channel;
125	typedef SDL_RWops *CFPlus__RW;	148	typedef SDL_RWops *DC__RW;
126	typedef Mix_Chunk *CFPlus__MixChunk;	149	typedef Mix_Chunk *DC__MixChunk;
127	typedef Mix_Music *CFPlus__MixMusic;	150	typedef Mix_Music *DC__MixMusic;
128		151
129	typedef PangoFontDescription *CFPlus__Font;	152	typedef PangoFontDescription *DC__Font;
130		153
131	static int	154	static int
132	shape_attr_p (PangoLayoutRun *run)	155	shape_attr_p (PangoLayoutRun *run)
133	{	156	{
134	GSList *attrs = run->item->analysis.extra_attrs;	157	GSList *attrs = run->item->analysis.extra_attrs;
…		…
148		171
149	typedef struct cf_layout {	172	typedef struct cf_layout {
150	PangoLayout *pl;	173	PangoLayout *pl;
151	float r, g, b, a; // default color for rgba mode	174	float r, g, b, a; // default color for rgba mode
152	int base_height;	175	int base_height;
153	CFPlus__Font font;	176	DC__Font font;
		177	rc_t *rc;
154	} *CFPlus__Layout;	178	} *DC__Layout;
155		179
156	static CFPlus__Font default_font;	180	static DC__Font default_font;
157	static PangoContext *opengl_context;	181	static PangoContext *opengl_context;
158	static PangoFontMap *opengl_fontmap;	182	static PangoFontMap *opengl_fontmap;
159		183
160	static void	184	static void
161	substitute_func (FcPattern *pattern, gpointer data)	185	substitute_func (FcPattern *pattern, gpointer data)
…		…
166	#endif	190	#endif
167	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	191	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168	}	192	}
169		193
170	static void	194	static void
171	layout_update_font (CFPlus__Layout self)	195	layout_update_font (DC__Layout self)
172	{	196	{
173	/* use a random scale factor to account for unknown descenders, 0.8 works	197	/* use a random scale factor to account for unknown descenders, 0.8 works
174	* reasonably well with bitstream vera	198	* reasonably well with dejavu/bistream fonts
175	*/	199	*/
176	PangoFontDescription *font = self->font ? self->font : default_font;	200	PangoFontDescription *font = self->font ? self->font : default_font;
177		201
178	pango_font_description_set_absolute_size (font,	202	pango_font_description_set_absolute_size (font,
179	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	203	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180		204
181	pango_layout_set_font_description (self->pl, font);	205	pango_layout_set_font_description (self->pl, font);
182	}	206	}
183		207
184	static void	208	static void
185	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	209	layout_get_pixel_size (DC__Layout self, int *w, int *h)
186	{	210	{
187	PangoRectangle rect;	211	PangoRectangle rect;
188		212
189	// get_pixel_* wrongly rounds down	213	// get_pixel_* wrongly rounds down
190	pango_layout_get_extents (self->pl, 0, &rect);	214	pango_layout_get_extents (self->pl, 0, &rect);
…		…
201		225
202	typedef uint16_t tileid;	226	typedef uint16_t tileid;
203	typedef uint16_t faceid;	227	typedef uint16_t faceid;
204		228
205	typedef struct {	229	typedef struct {
206	int name;	230	GLuint name;
207	int w, h;	231	int w, h;
208	float s, t;	232	float s, t;
209	uint8_t r, g, b, a;	233	uint8_t r, g, b, a;
210	tileid smoothtile;	234	tileid smoothtile;
211	uint8_t smoothlevel;	235	uint8_t smoothlevel;
…		…
229	int faces; tileid *face2tile; // [faceid]	253	int faces; tileid *face2tile; // [faceid]
230	int texs; maptex *tex; // [tileid]	254	int texs; maptex *tex; // [tileid]
231		255
232	int32_t rows;	256	int32_t rows;
233	maprow *row;	257	maprow *row;
234	} *CFPlus__Map;	258	} *DC__Map;
235		259
236	static char *	260	static char *
237	prepend (char *ptr, int sze, int inc)	261	prepend (char *ptr, int sze, int inc)
238	{	262	{
239	char *p;	263	char *p;
…		…
277	self->texs *= 2;	301	self->texs *= 2;
278	}	302	}
279	}	303	}
280		304
281	static maprow *	305	static maprow *
282	map_get_row (CFPlus__Map self, int y)	306	map_get_row (DC__Map self, int y)
283	{	307	{
284	if (0 > y)	308	if (0 > y)
285	{	309	{
286	int extend = - y + MAP_EXTEND_Y;	310	int extend = - y + MAP_EXTEND_Y;
287	Prepend (maprow, self->row, self->rows, extend);	311	Prepend (maprow, self->row, self->rows, extend);
…		…
325		349
326	return row->col + (x - row->c0);	350	return row->col + (x - row->c0);
327	}	351	}
328		352
329	static mapcell *	353	static mapcell *
330	map_get_cell (CFPlus__Map self, int x, int y)	354	map_get_cell (DC__Map self, int x, int y)
331	{	355	{
332	return row_get_cell (map_get_row (self, y), x);	356	return row_get_cell (map_get_row (self, y), x);
333	}	357	}
334		358
335	static void	359	static void
336	map_clear (CFPlus__Map self)	360	map_clear (DC__Map self)
337	{	361	{
338	int r;	362	int r;
339		363
340	for (r = 0; r < self->rows; r++)	364	for (r = 0; r < self->rows; r++)
341	Safefree (self->row[r].col);	365	Safefree (self->row[r].col);
…		…
348	self->oy = 0;	372	self->oy = 0;
349	self->row = 0;	373	self->row = 0;
350	self->rows = 0;	374	self->rows = 0;
351	}	375	}
352		376
		377	#define CELL_CLEAR(cell) \
		378	do { \
		379	if ((cell)->player) \
		380	(cell)->tile [2] = 0; \
		381	(cell)->darkness = 0; \
		382	(cell)->stat_hp = 0; \
		383	(cell)->flags = 0; \
		384	(cell)->player = 0; \
		385	} while (0)
		386
353	static void	387	static void
354	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	388	map_blank (DC__Map self, int x0, int y0, int w, int h)
355	{	389	{
356	int x, y;	390	int x, y;
357	maprow *row;	391	maprow *row;
358	mapcell *cell;	392	mapcell *cell;
359		393
…		…
371	if (x >= row->c1)	405	if (x >= row->c1)
372	break;	406	break;
373		407
374	cell = row->col + x - row->c0;	408	cell = row->col + x - row->c0;
375		409
376	cell->darkness = 0;	410	CELL_CLEAR (cell);
377	cell->stat_hp = 0;
378	cell->flags = 0;
379	cell->player = 0;
380	}	411	}
381	}	412	}
382	}	413	}
383		414
384	typedef struct {	415	typedef struct {
…		…
438	n |= n >> 16;	469	n |= n >> 16;
439		470
440	return n + 1;	471	return n + 1;
441	}	472	}
442		473
		474	static unsigned int
		475	popcount (unsigned int n)
		476	{
		477	n -= (n >> 1) & 0x55555555U;
		478	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		479	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		480	n *= 0x01010101U;
		481
		482	return n >> 24;
		483	}
		484
443	/* SDL should provide this, really. */	485	/* SDL should provide this, really. */
444	#define SDLK_MODIFIER_MIN 300	486	#define SDLK_MODIFIER_MIN 300
445	#define SDLK_MODIFIER_MAX 314	487	#define SDLK_MODIFIER_MAX 314
446		488
447	/******************************************************************************/	489	/******************************************************************************/
…		…
485	return 0;	527	return 0;
486		528
487	return 1;	529	return 1;
488	}	530	}
489		531
490	MODULE = CFPlus PACKAGE = CFPlus	532	static void
		533	deliantra_main ()
		534	{
		535	char *argv[] = { 0 };
		536	call_argv ("::main", G_DISCARD | G_VOID, argv);
		537	}
		538
		539	#ifdef __MACOSX__
		540	/* to due surprising braindamage on the side of SDL design, we
		541	* do some mind-boggling hack here: SDL requires a custom main()
		542	* on OS X, so... we provide one and call the original main(), which,
		543	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		544	* and which calls our main (== SDL_main) back.
		545	*/
		546	extern C_LINKAGE int
		547	main (int argc, char *argv[])
		548	{
		549	deliantra_main ();
		550	}
		551
		552	#undef main
		553
		554	extern C_LINKAGE int main (int argc, char *argv[]);
		555
		556	static void
		557	SDL_braino (void)
		558	{
		559	char *argv[] = { "deliantra client", 0 };
		560	(main) (1, argv);
		561	}
		562	#else
		563	static void
		564	SDL_braino (void)
		565	{
		566	deliantra_main ();
		567	}
		568	#endif
		569
		570	MODULE = Deliantra::Client PACKAGE = DC
491		571
492	PROTOTYPES: ENABLE	572	PROTOTYPES: ENABLE
493		573
494	BOOT:	574	BOOT:
495	{	575	{
496	HV *stash = gv_stashpv ("CFPlus", 1);	576	HV *stash = gv_stashpv ("DC", 1);
497	static const struct {	577	static const struct {
498	const char *name;	578	const char *name;
499	IV iv;	579	IV iv;
500	} *civ, const_iv[] = {	580	} *civ, const_iv[] = {
501	# define const_iv(name) { # name, (IV)name }	581	# define const_iv(name) { # name, (IV)name }
…		…
523		603
524	const_iv (SDL_APPINPUTFOCUS),	604	const_iv (SDL_APPINPUTFOCUS),
525	const_iv (SDL_APPMOUSEFOCUS),	605	const_iv (SDL_APPMOUSEFOCUS),
526	const_iv (SDL_APPACTIVE),	606	const_iv (SDL_APPACTIVE),
527		607
		608	const_iv (SDLK_FIRST),
		609	const_iv (SDLK_LAST),
528	const_iv (SDLK_KP0),	610	const_iv (SDLK_KP0),
529	const_iv (SDLK_KP1),	611	const_iv (SDLK_KP1),
530	const_iv (SDLK_KP2),	612	const_iv (SDLK_KP2),
531	const_iv (SDLK_KP3),	613	const_iv (SDLK_KP3),
532	const_iv (SDLK_KP4),	614	const_iv (SDLK_KP4),
…		…
604	const_iv (KMOD_LMETA),	686	const_iv (KMOD_LMETA),
605	const_iv (KMOD_RMETA),	687	const_iv (KMOD_RMETA),
606	const_iv (KMOD_NUM),	688	const_iv (KMOD_NUM),
607	const_iv (KMOD_CAPS),	689	const_iv (KMOD_CAPS),
608	const_iv (KMOD_MODE),	690	const_iv (KMOD_MODE),
		691
		692	const_iv (MIX_DEFAULT_FORMAT),
		693
		694	const_iv (SDL_INIT_TIMER),
		695	const_iv (SDL_INIT_AUDIO),
		696	const_iv (SDL_INIT_VIDEO),
		697	const_iv (SDL_INIT_CDROM),
		698	const_iv (SDL_INIT_JOYSTICK),
		699	const_iv (SDL_INIT_EVERYTHING),
		700	const_iv (SDL_INIT_NOPARACHUTE),
		701	const_iv (SDL_INIT_EVENTTHREAD),
		702
		703	const_iv (SDL_GL_RED_SIZE),
		704	const_iv (SDL_GL_GREEN_SIZE),
		705	const_iv (SDL_GL_BLUE_SIZE),
		706	const_iv (SDL_GL_ALPHA_SIZE),
		707	const_iv (SDL_GL_DOUBLEBUFFER),
		708	const_iv (SDL_GL_BUFFER_SIZE),
		709	const_iv (SDL_GL_DEPTH_SIZE),
		710	const_iv (SDL_GL_STENCIL_SIZE),
		711	const_iv (SDL_GL_ACCUM_RED_SIZE),
		712	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		713	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		714	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		715	const_iv (SDL_GL_STEREO),
		716	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		717	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		718	const_iv (SDL_GL_ACCELERATED_VISUAL),
		719	const_iv (SDL_GL_SWAP_CONTROL),
		720
		721	const_iv (FOW_DARKNESS)
609	# undef const_iv	722	# undef const_iv
610	};	723	};
611		724
612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	725	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	726	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
631		744
632	NV floor (NV x)	745	NV floor (NV x)
633		746
634	NV ceil (NV x)	747	NV ceil (NV x)
635		748
		749	IV minpot (UV n)
		750
		751	IV popcount (UV n)
		752
636	void	753	void
637	pango_init ()	754	pango_init ()
638	CODE:	755	CODE:
639	{	756	{
640	opengl_fontmap = pango_opengl_font_map_new ();	757	opengl_fontmap = pango_opengl_font_map_new ();
641	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	758	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
642	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	759	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		760	/*pango_context_set_font_description (opengl_context, default_font);*/
		761	#if PANGO_VERSION_CHECK (1, 15, 2)
		762	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		763	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		764	#endif
643	}	765	}
644		766
645	char *
646	SDL_GetError ()	767	char *SDL_GetError ()
647		768
648	int	769	void SDL_braino ()
649	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
650		770
651	void	771	int SDL_Init (U32 flags)
		772
		773	int SDL_InitSubSystem (U32 flags)
		774
		775	void SDL_QuitSubSystem (U32 flags)
		776
652	SDL_Quit ()	777	void SDL_Quit ()
		778
		779	int SDL_GL_SetAttribute (int attr, int value)
		780
		781	int SDL_GL_GetAttribute (int attr)
		782	CODE:
		783	if (SDL_GL_GetAttribute (attr, &RETVAL))
		784	XSRETURN_UNDEF;
		785	OUTPUT:
		786	RETVAL
653		787
654	void	788	void
655	SDL_ListModes (int rgb, int alpha)	789	SDL_ListModes (int rgb, int alpha)
656	PPCODE:	790	PPCODE:
657	{	791	{
…		…
669	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	803	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	804	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	805	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672		806
673	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	807	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
674	#if SDL_VERSION_ATLEAST(1,2,10)
675	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
676	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	808	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677	#endif
678		809
679	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	810	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680		811
681	if (m && m != (SDL_Rect **)-1)	812	if (m && m != (SDL_Rect **)-1)
682	while (*m)	813	while (*m)
683	{	814	{
684	if ((*m)->w >= 640 && (*m)->h >= 480)	815	if ((*m)->w >= 400 && (*m)->h >= 300)
685	{	816	{
686	AV *av = newAV ();	817	AV *av = newAV ();
687	av_push (av, newSViv ((*m)->w));	818	av_push (av, newSViv ((*m)->w));
688	av_push (av, newSViv ((*m)->h));	819	av_push (av, newSViv ((*m)->h));
689	av_push (av, newSViv (rgb));	820	av_push (av, newSViv (rgb));
…		…
713		844
714	if (RETVAL)	845	if (RETVAL)
715	{	846	{
716	av_clear (texture_av);	847	av_clear (texture_av);
717		848
718	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	849	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	850	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
720	#include "glfunc.h"	851	#include "glfunc.h"
721	#undef GL_FUNC	852	#undef GL_FUNC
722	}	853	}
723	}	854	}
…		…
730	char *	861	char *
731	SDL_GetKeyName (int sym)	862	SDL_GetKeyName (int sym)
732		863
733	int	864	int
734	SDL_GetAppState ()	865	SDL_GetAppState ()
		866
		867	int
		868	SDL_GetModState ()
735		869
736	void	870	void
737	poll_events ()	871	poll_events ()
738	PPCODE:	872	PPCODE:
739	{	873	{
…		…
749	{	883	{
750	case SDL_KEYDOWN:	884	case SDL_KEYDOWN:
751	case SDL_KEYUP:	885	case SDL_KEYUP:
752	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	886	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	887	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	888	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
755	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	889	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
756	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	890	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757	break;	891	break;
758		892
759	case SDL_ACTIVEEVENT:	893	case SDL_ACTIVEEVENT:
760	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	894	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
778	x = ev.motion.x;	912	x = ev.motion.x;
779	y = ev.motion.y;	913	y = ev.motion.y;
780	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	914	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781	}	915	}
782		916
783	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	917	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
784	hv_store (hv, "state", 5, newSViv (state), 0);	918	hv_store (hv, "state", 5, newSViv (state), 0);
785	hv_store (hv, "x", 1, newSViv (x), 0);	919	hv_store (hv, "x", 1, newSViv (x), 0);
786	hv_store (hv, "y", 1, newSViv (y), 0);	920	hv_store (hv, "y", 1, newSViv (y), 0);
787	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	921	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	922	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789	}	923	}
790	break;	924	break;
791		925
792	case SDL_MOUSEBUTTONDOWN:	926	case SDL_MOUSEBUTTONDOWN:
793	case SDL_MOUSEBUTTONUP:	927	case SDL_MOUSEBUTTONUP:
794	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	928	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795		929
796	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	930	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	931	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	932	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	933	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
804	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	938	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	939	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806	break;	940	break;
807	}	941	}
808		942
809	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	943	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
810	}	944	}
811	}	945	}
812		946
813	int	947	int
814	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	948	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815	POSTCALL:	949	POSTCALL:
816	Mix_HookMusicFinished (music_finished);	950	Mix_HookMusicFinished (music_finished);
817	Mix_ChannelFinished (channel_finished);	951	Mix_ChannelFinished (channel_finished);
		952
		953	void
		954	Mix_QuerySpec ()
		955	PPCODE:
		956	{
		957	int freq, channels;
		958	Uint16 format;
		959
		960	if (Mix_QuerySpec (&freq, &format, &channels))
		961	{
		962	EXTEND (SP, 3);
		963	PUSHs (sv_2mortal (newSViv (freq)));
		964	PUSHs (sv_2mortal (newSViv (format)));
		965	PUSHs (sv_2mortal (newSViv (channels)));
		966	}
		967	}
818		968
819	void	969	void
820	Mix_CloseAudio ()	970	Mix_CloseAudio ()
821		971
822	int	972	int
…		…
857	}	1007	}
858	}	1008	}
859	#endif	1009	#endif
860	}	1010	}
861		1011
862	void	1012	int
863	add_font (char *file)	1013	add_font (char *file)
864	CODE:	1014	CODE:
865	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1015	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1016	OUTPUT:
		1017	RETVAL
866		1018
867	void	1019	void
868	load_image_inline (SV *image_)	1020	load_image_inline (SV *image_)
869	ALIAS:	1021	ALIAS:
870	load_image_file = 1	1022	load_image_file = 1
…		…
956	void	1108	void
957	error (char *message)	1109	error (char *message)
958	CODE:	1110	CODE:
959	fprintf (stderr, "ERROR: %s\n", message);	1111	fprintf (stderr, "ERROR: %s\n", message);
960	#ifdef _WIN32	1112	#ifdef _WIN32
961	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1113	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962	#endif	1114	#endif
963		1115
964	void	1116	void
965	fatal (char *message)	1117	fatal (char *message)
966	CODE:	1118	CODE:
967	fprintf (stderr, "FATAL: %s\n", message);	1119	fprintf (stderr, "FATAL: %s\n", message);
968	#ifdef _WIN32	1120	#ifdef _WIN32
969	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1121	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970	#endif	1122	#endif
971	_exit (1);	1123	_exit (1);
972		1124
973	void	1125	void
974	_exit (int retval = 0)	1126	_exit (int retval = 0)
…		…
986	#if DEBUG	1138	#if DEBUG
987	VALGRIND_DO_LEAK_CHECK;	1139	VALGRIND_DO_LEAK_CHECK;
988	#endif	1140	#endif
989	}	1141	}
990		1142
991	MODULE = CFPlus PACKAGE = CFPlus::Font	1143	MODULE = Deliantra::Client PACKAGE = DC::Font
992		1144
993	PROTOTYPES: DISABLE	1145	PROTOTYPES: DISABLE
994		1146
995	CFPlus::Font	1147	DC::Font
996	new_from_file (SV *class, char *path, int id = 0)	1148	new_from_file (SV *class, char *path, int id = 0)
997	CODE:	1149	CODE:
998	{	1150	{
999	int count;	1151	int count;
1000	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1152	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1003	}	1155	}
1004	OUTPUT:	1156	OUTPUT:
1005	RETVAL	1157	RETVAL
1006		1158
1007	void	1159	void
1008	DESTROY (CFPlus::Font self)	1160	DESTROY (DC::Font self)
1009	CODE:	1161	CODE:
1010	pango_font_description_free (self);	1162	pango_font_description_free (self);
1011		1163
1012	void	1164	void
1013	make_default (CFPlus::Font self)	1165	make_default (DC::Font self)
1014	PROTOTYPE: $	1166	PROTOTYPE: $
1015	CODE:	1167	CODE:
1016	default_font = self;	1168	default_font = self;
1017		1169
1018	MODULE = CFPlus PACKAGE = CFPlus::Layout	1170	MODULE = Deliantra::Client PACKAGE = DC::Layout
1019		1171
1020	PROTOTYPES: DISABLE	1172	PROTOTYPES: DISABLE
1021		1173
1022	void	1174	void
1023	reset_glyph_cache ()	1175	glyph_cache_backup ()
1024	PROTOTYPE:	1176	PROTOTYPE:
1025	CODE:	1177	CODE:
		1178	tc_backup ();
		1179
		1180	void
		1181	glyph_cache_restore ()
		1182	PROTOTYPE:
		1183	CODE:
1026	tc_clear ();	1184	tc_restore ();
1027		1185
1028	CFPlus::Layout	1186	DC::Layout
1029	new (SV *class)	1187	new (SV *class)
1030	CODE:	1188	CODE:
1031	New (0, RETVAL, 1, struct cf_layout);	1189	New (0, RETVAL, 1, struct cf_layout);
1032		1190
1033	RETVAL->pl = pango_layout_new (opengl_context);	1191	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1035	RETVAL->g = 1.;	1193	RETVAL->g = 1.;
1036	RETVAL->b = 1.;	1194	RETVAL->b = 1.;
1037	RETVAL->a = 1.;	1195	RETVAL->a = 1.;
1038	RETVAL->base_height = MIN_FONT_HEIGHT;	1196	RETVAL->base_height = MIN_FONT_HEIGHT;
1039	RETVAL->font = 0;	1197	RETVAL->font = 0;
		1198	RETVAL->rc = rc_alloc ();
1040		1199
1041	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1200	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042	layout_update_font (RETVAL);	1201	layout_update_font (RETVAL);
1043	OUTPUT:	1202	OUTPUT:
1044	RETVAL	1203	RETVAL
1045		1204
1046	void	1205	void
1047	DESTROY (CFPlus::Layout self)	1206	DESTROY (DC::Layout self)
1048	CODE:	1207	CODE:
1049	g_object_unref (self->pl);	1208	g_object_unref (self->pl);
		1209	rc_free (self->rc);
1050	Safefree (self);	1210	Safefree (self);
1051		1211
1052	void	1212	void
1053	set_text (CFPlus::Layout self, SV *text_)	1213	set_text (DC::Layout self, SV *text_)
1054	CODE:	1214	CODE:
1055	{	1215	{
1056	STRLEN textlen;	1216	STRLEN textlen;
1057	char *text = SvPVutf8 (text_, textlen);	1217	char *text = SvPVutf8 (text_, textlen);
1058		1218
1059	pango_layout_set_text (self->pl, text, textlen);	1219	pango_layout_set_text (self->pl, text, textlen);
1060	}	1220	}
1061		1221
1062	void	1222	void
1063	set_markup (CFPlus::Layout self, SV *text_)	1223	set_markup (DC::Layout self, SV *text_)
1064	CODE:	1224	CODE:
1065	{	1225	{
1066	STRLEN textlen;	1226	STRLEN textlen;
1067	char *text = SvPVutf8 (text_, textlen);	1227	char *text = SvPVutf8 (text_, textlen);
1068		1228
1069	pango_layout_set_markup (self->pl, text, textlen);	1229	pango_layout_set_markup (self->pl, text, textlen);
1070	}	1230	}
1071		1231
1072	void	1232	void
1073	set_shapes (CFPlus::Layout self, ...)	1233	set_shapes (DC::Layout self, ...)
1074	CODE:	1234	CODE:
1075	{	1235	{
1076	PangoAttrList *attrs = 0;	1236	PangoAttrList *attrs = 0;
1077	const char *text = pango_layout_get_text (self->pl);	1237	const char *text = pango_layout_get_text (self->pl);
1078	const char *pos = text;	1238	const char *pos = text;
…		…
1113	if (attrs)	1273	if (attrs)
1114	pango_layout_set_attributes (self->pl, attrs);	1274	pango_layout_set_attributes (self->pl, attrs);
1115	}	1275	}
1116		1276
1117	void	1277	void
1118	get_shapes (CFPlus::Layout self)	1278	get_shapes (DC::Layout self)
1119	PPCODE:	1279	PPCODE:
1120	{	1280	{
1121	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1281	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122		1282
1123	do	1283	do
1124	{	1284	{
1125	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1285	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126		1286
1127	if (run && shape_attr_p (run))	1287	if (run && shape_attr_p (run))
1128	{	1288	{
1129	PangoRectangle extents;	1289	PangoRectangle extents;
1130	pango_layout_iter_get_run_extents (iter, 0, &extents);	1290	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1138		1298
1139	pango_layout_iter_free (iter);	1299	pango_layout_iter_free (iter);
1140	}	1300	}
1141		1301
1142	int	1302	int
1143	has_wrapped (CFPlus::Layout self)	1303	has_wrapped (DC::Layout self)
1144	CODE:	1304	CODE:
1145	{	1305	{
1146	int lines = 1;	1306	int lines = 1;
1147	const char *text = pango_layout_get_text (self->pl);	1307	const char *text = pango_layout_get_text (self->pl);
1148		1308
…		…
1153	}	1313	}
1154	OUTPUT:	1314	OUTPUT:
1155	RETVAL	1315	RETVAL
1156		1316
1157	SV *	1317	SV *
1158	get_text (CFPlus::Layout self)	1318	get_text (DC::Layout self)
1159	CODE:	1319	CODE:
1160	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1320	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161	sv_utf8_decode (RETVAL);	1321	sv_utf8_decode (RETVAL);
1162	OUTPUT:	1322	OUTPUT:
1163	RETVAL	1323	RETVAL
1164		1324
1165	void	1325	void
1166	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1326	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167	CODE:	1327	CODE:
1168	self->r = r;	1328	self->r = r;
1169	self->g = g;	1329	self->g = g;
1170	self->b = b;	1330	self->b = b;
1171	self->a = a;	1331	self->a = a;
1172		1332
1173	void	1333	void
1174	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1334	set_font (DC::Layout self, DC::Font font = 0)
1175	CODE:	1335	CODE:
1176	if (self->font != font)	1336	if (self->font != font)
1177	{	1337	{
1178	self->font = font;	1338	self->font = font;
1179	layout_update_font (self);	1339	layout_update_font (self);
1180	}	1340	}
1181		1341
1182	void	1342	void
1183	set_height (CFPlus::Layout self, int base_height)	1343	set_height (DC::Layout self, int base_height)
1184	CODE:	1344	CODE:
1185	if (self->base_height != base_height)	1345	if (self->base_height != base_height)
1186	{	1346	{
1187	self->base_height = base_height;	1347	self->base_height = base_height;
1188	layout_update_font (self);	1348	layout_update_font (self);
1189	}	1349	}
1190		1350
1191	void	1351	void
1192	set_width (CFPlus::Layout self, int max_width = -1)	1352	set_width (DC::Layout self, int max_width = -1)
1193	CODE:	1353	CODE:
1194	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1354	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195		1355
1196	void	1356	void
1197	set_indent (CFPlus::Layout self, int indent)	1357	set_indent (DC::Layout self, int indent)
1198	CODE:	1358	CODE:
1199	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1359	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200		1360
1201	void	1361	void
1202	set_spacing (CFPlus::Layout self, int spacing)	1362	set_spacing (DC::Layout self, int spacing)
1203	CODE:	1363	CODE:
1204	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1364	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205		1365
1206	void	1366	void
1207	set_ellipsise (CFPlus::Layout self, int ellipsise)	1367	set_ellipsise (DC::Layout self, int ellipsise)
1208	CODE:	1368	CODE:
1209	pango_layout_set_ellipsize (self->pl,	1369	pango_layout_set_ellipsize (self->pl,
1210	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1370	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1371	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1372	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213	: PANGO_ELLIPSIZE_NONE	1373	: PANGO_ELLIPSIZE_NONE
1214	);	1374	);
1215		1375
1216	void	1376	void
1217	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1377	set_single_paragraph_mode (DC::Layout self, int spm)
1218	CODE:	1378	CODE:
1219	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1379	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220		1380
1221	void	1381	void
1222	size (CFPlus::Layout self)	1382	size (DC::Layout self)
1223	PPCODE:	1383	PPCODE:
1224	{	1384	{
1225	int w, h;	1385	int w, h;
1226		1386
1227	layout_get_pixel_size (self, &w, &h);	1387	layout_get_pixel_size (self, &w, &h);
…		…
1230	PUSHs (sv_2mortal (newSViv (w)));	1390	PUSHs (sv_2mortal (newSViv (w)));
1231	PUSHs (sv_2mortal (newSViv (h)));	1391	PUSHs (sv_2mortal (newSViv (h)));
1232	}	1392	}
1233		1393
1234	int	1394	int
1235	descent (CFPlus::Layout self)	1395	descent (DC::Layout self)
1236	CODE:	1396	CODE:
1237	{	1397	{
1238	PangoRectangle rect;	1398	PangoRectangle rect;
1239	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1399	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240	pango_layout_line_get_pixel_extents (line, 0, &rect);	1400	pango_layout_line_get_pixel_extents (line, 0, &rect);
1241	RETVAL = PANGO_DESCENT (rect);	1401	RETVAL = PANGO_DESCENT (rect);
1242	}	1402	}
1243	OUTPUT:	1403	OUTPUT:
1244	RETVAL	1404	RETVAL
1245		1405
1246	int	1406	int
1247	xy_to_index (CFPlus::Layout self, int x, int y)	1407	xy_to_index (DC::Layout self, int x, int y)
1248	CODE:	1408	CODE:
1249	{	1409	{
1250	int index, trailing;	1410	int index, trailing;
1251	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1411	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252	RETVAL = index + trailing;	1412	RETVAL = index + trailing;
1253	}	1413	}
1254	OUTPUT:	1414	OUTPUT:
1255	RETVAL	1415	RETVAL
1256		1416
1257	void	1417	void
1258	cursor_pos (CFPlus::Layout self, int index)	1418	cursor_pos (DC::Layout self, int index)
1259	PPCODE:	1419	PPCODE:
1260	{	1420	{
1261	PangoRectangle strong_pos;	1421	PangoRectangle pos;
1262	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1422	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263		1423
1264	EXTEND (SP, 3);	1424	EXTEND (SP, 3);
1265	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1425	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1426	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1427	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268	}	1428	}
1269		1429
1270	void	1430	void
1271	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1431	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272	PPCODE:	1432	PPCODE:
1273	{	1433	{
1274	int line, x;	1434	int line, x;
1275		1435
1276	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1436	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1437	#if !PANGO_VERSION_CHECK (1, 17, 3)
1277	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1438	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278		1439	--line;
		1440	#endif
1279	EXTEND (SP, 2);	1441	EXTEND (SP, 2);
1280	PUSHs (sv_2mortal (newSViv (line - 1)));	1442	PUSHs (sv_2mortal (newSViv (line)));
1281	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1443	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282	}	1444	}
1283		1445
1284	void	1446	void
1285	line_x_to_index (CFPlus::Layout self, int line, int x)	1447	line_x_to_index (DC::Layout self, int line, int x)
1286	PPCODE:	1448	PPCODE:
1287	{	1449	{
1288	PangoLayoutLine *lp;	1450	PangoLayoutLine *lp;
1289	int index, trailing;	1451	int index, trailing;
1290		1452
1291	if (line < 0)	1453	if (line < 0)
1292	XSRETURN_EMPTY;	1454	XSRETURN_EMPTY;
1293		1455
1294	if (!(lp = pango_layout_get_line (self->pl, line)))	1456	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295	XSRETURN_EMPTY; /* do better */	1457	XSRETURN_EMPTY; /* do better */
1296		1458
1297	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1459	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1298		1460
1299	EXTEND (SP, 2);	1461	EXTEND (SP, 2);
…		…
1305	PUSHs (sv_2mortal (newSViv (trailing)));	1467	PUSHs (sv_2mortal (newSViv (trailing)));
1306	}	1468	}
1307	}	1469	}
1308		1470
1309	void	1471	void
1310	render (CFPlus::Layout self, float x, float y, int flags = 0)	1472	render (DC::Layout self, float x, float y, int flags = 0)
1311	PPCODE:	1473	CODE:
		1474	rc_clear (self->rc);
1312	pango_opengl_render_layout_subpixel (	1475	pango_opengl_render_layout_subpixel (
1313	self->pl,	1476	self->pl,
		1477	self->rc,
1314	x * PANGO_SCALE, y * PANGO_SCALE,	1478	x * PANGO_SCALE, y * PANGO_SCALE,
1315	self->r, self->g, self->b, self->a,	1479	self->r, self->g, self->b, self->a,
1316	flags	1480	flags
1317	);	1481	);
		1482	// we assume that context_change actually clears/frees stuff
		1483	// and does not do any recomputation...
		1484	pango_layout_context_changed (self->pl);
1318		1485
1319	MODULE = CFPlus PACKAGE = CFPlus::Texture	1486	void
		1487	draw (DC::Layout self)
		1488	CODE:
		1489	{
		1490	glEnable (GL_TEXTURE_2D);
		1491	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1492	glEnable (GL_BLEND);
		1493	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1494	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1495	glEnable (GL_ALPHA_TEST);
		1496	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1497
		1498	rc_draw (self->rc);
		1499
		1500	glDisable (GL_ALPHA_TEST);
		1501	glDisable (GL_BLEND);
		1502	glDisable (GL_TEXTURE_2D);
		1503	}
		1504
		1505	MODULE = Deliantra::Client PACKAGE = DC::Texture
1320		1506
1321	PROTOTYPES: ENABLE	1507	PROTOTYPES: ENABLE
1322
1323	int minpot (int n)
1324		1508
1325	void	1509	void
1326	pad (SV *data_, int ow, int oh, int nw, int nh)	1510	pad (SV *data_, int ow, int oh, int nw, int nh)
1327	CODE:	1511	CODE:
1328	{	1512	{
…		…
1405	RETVAL = width > 0;	1589	RETVAL = width > 0;
1406	}	1590	}
1407	OUTPUT:	1591	OUTPUT:
1408	RETVAL	1592	RETVAL
1409		1593
1410	MODULE = CFPlus PACKAGE = CFPlus::Map	1594	MODULE = Deliantra::Client PACKAGE = DC::Map
1411		1595
1412	PROTOTYPES: DISABLE	1596	PROTOTYPES: DISABLE
1413		1597
1414	CFPlus::Map	1598	DC::Map
1415	new (SV *class)	1599	new (SV *class)
1416	CODE:	1600	CODE:
1417	New (0, RETVAL, 1, struct map);	1601	New (0, RETVAL, 1, struct map);
1418	RETVAL->x = 0;	1602	RETVAL->x = 0;
1419	RETVAL->y = 0;	1603	RETVAL->y = 0;
…		…
1427	RETVAL->row = 0;	1611	RETVAL->row = 0;
1428	OUTPUT:	1612	OUTPUT:
1429	RETVAL	1613	RETVAL
1430		1614
1431	void	1615	void
1432	DESTROY (CFPlus::Map self)	1616	DESTROY (DC::Map self)
1433	CODE:	1617	CODE:
1434	{	1618	{
1435	map_clear (self);	1619	map_clear (self);
1436	Safefree (self->face2tile);	1620	Safefree (self->face2tile);
1437	Safefree (self->tex);	1621	Safefree (self->tex);
1438	Safefree (self);	1622	Safefree (self);
1439	}	1623	}
1440		1624
1441	void	1625	void
1442	resize (CFPlus::Map self, int map_width, int map_height)	1626	resize (DC::Map self, int map_width, int map_height)
1443	CODE:	1627	CODE:
1444	self->w = map_width;	1628	self->w = map_width;
1445	self->h = map_height;	1629	self->h = map_height;
1446		1630
1447	void	1631	void
1448	clear (CFPlus::Map self)	1632	clear (DC::Map self)
1449	CODE:	1633	CODE:
1450	map_clear (self);	1634	map_clear (self);
1451		1635
1452	void	1636	void
1453	set_tileid (CFPlus::Map self, int face, int tile)	1637	set_tileid (DC::Map self, int face, int tile)
1454	CODE:	1638	CODE:
1455	{	1639	{
1456	need_facenum (self, face); self->face2tile [face] = tile;	1640	need_facenum (self, face); self->face2tile [face] = tile;
1457	need_texid (self, tile);	1641	need_texid (self, tile);
1458	}	1642	}
1459		1643
1460	void	1644	void
1461	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1645	set_smooth (DC::Map self, int face, int smooth, int level)
1462	CODE:	1646	CODE:
1463	{	1647	{
1464	tileid texid;	1648	tileid texid;
1465	maptex *tex;	1649	maptex *tex;
1466		1650
…		…
1479	tex->smoothtile = self->face2tile [smooth];	1663	tex->smoothtile = self->face2tile [smooth];
1480	tex->smoothlevel = level;	1664	tex->smoothlevel = level;
1481	}	1665	}
1482		1666
1483	void	1667	void
1484	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1668	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1485	CODE:	1669	CODE:
1486	{	1670	{
1487	need_texid (self, texid);	1671	need_texid (self, texid);
1488		1672
1489	{	1673	{
…		…
1509	// from transparent color bleeding and ugly wrapping effects.	1693	// from transparent color bleeding and ugly wrapping effects.
1510	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1694	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511	}	1695	}
1512		1696
1513	int	1697	int
1514	ox (CFPlus::Map self)	1698	ox (DC::Map self)
1515	ALIAS:	1699	ALIAS:
1516	oy = 1	1700	oy = 1
1517	x = 2	1701	x = 2
1518	y = 3	1702	y = 3
1519	w = 4	1703	w = 4
…		…
1530	}	1714	}
1531	OUTPUT:	1715	OUTPUT:
1532	RETVAL	1716	RETVAL
1533		1717
1534	void	1718	void
1535	scroll (CFPlus::Map self, int dx, int dy)	1719	scroll (DC::Map self, int dx, int dy)
1536	CODE:	1720	CODE:
1537	{	1721	{
1538	if (dx > 0)	1722	if (dx > 0)
1539	map_blank (self, self->x, self->y, dx, self->h);	1723	map_blank (self, self->x, self->y, dx, self->h);
1540	else if (dx < 0)	1724	else if (dx < 0)
…		…
1556	self->y += MAP_EXTEND_Y;	1740	self->y += MAP_EXTEND_Y;
1557	}	1741	}
1558	}	1742	}
1559		1743
1560	SV *	1744	SV *
1561	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1745	map1a_update (DC::Map self, SV *data_, int extmap)
1562	CODE:	1746	CODE:
1563	{	1747	{
1564	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1748	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565	uint8_t *data_end = (uint8_t *)SvEND (data_);	1749	uint8_t *data_end = (uint8_t *)SvEND (data_);
1566	mapcell *cell;	1750	mapcell *cell;
…		…
1594	uint8_t ext, cmd;	1778	uint8_t ext, cmd;
1595		1779
1596	do	1780	do
1597	{	1781	{
1598	ext = *data++;	1782	ext = *data++;
1599	cmd = ext & 0x3f;	1783	cmd = ext & 0x7f;
1600		1784
1601	if (cmd < 4)	1785	if (cmd < 4)
1602	cell->darkness = 255 - ext * 64 + 1;	1786	cell->darkness = 255 - ext * 64 + 1;
1603	else if (cmd == 5) // health	1787	else if (cmd == 5) // health
1604	{	1788	{
…		…
1607	}	1791	}
1608	else if (cmd == 6) // monster width	1792	else if (cmd == 6) // monster width
1609	cell->stat_width = *data++ + 1;	1793	cell->stat_width = *data++ + 1;
1610	else if (cmd == 0x47)	1794	else if (cmd == 0x47)
1611	{	1795	{
1612	if (*data == 4)	1796	if (*data == 1) cell->player = data [1];
1613	; // decode player count	1797	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1798	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1799	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1614		1800
1615	data += *data + 1;	1801	data += *data + 1;
1616	}	1802	}
1617	else if (cmd == 8) // cell flags	1803	else if (cmd == 8) // cell flags
1618	cell->flags = *data++;	1804	cell->flags = *data++;
…		…
1648	}	1834	}
1649	}	1835	}
1650	}	1836	}
1651	}	1837	}
1652	else	1838	else
1653	cell->darkness = 0;	1839	CELL_CLEAR (cell);
1654	}	1840	}
1655	}	1841	}
1656	OUTPUT:	1842	OUTPUT:
1657	RETVAL	1843	RETVAL
1658		1844
1659	SV *	1845	SV *
1660	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1846	mapmap (DC::Map self, int x0, int y0, int w, int h)
1661	CODE:	1847	CODE:
1662	{	1848	{
1663	int x1, x;	1849	int x1, x;
1664	int y1, y;	1850	int y1, y;
1665	int z;	1851	int z;
…		…
1710	}	1896	}
1711	OUTPUT:	1897	OUTPUT:
1712	RETVAL	1898	RETVAL
1713		1899
1714	void	1900	void
1715	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1901	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1716	CODE:	1902	CODE:
1717	{	1903	{
		1904	int x, y, z;
		1905
1718	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1906	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1907	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1720	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1908	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721	smooth_key skey;	1909	smooth_key skey;
1722	int x, y, z;	1910	int pl_x, pl_y;
1723	int last_name;	1911	maptex pl_tex;
		1912	rc_t *rc = rc_alloc ();
		1913	rc_key_t key;
		1914	rc_array_t *arr;
		1915
		1916	pl_tex.name = 0;
1724		1917
1725	// thats current max. sorry.	1918	// thats current max. sorry.
1726	if (sw > 255) sw = 255;	1919	if (sw > 255) sw = 255;
1727	if (sh > 255) sh = 255;	1920	if (sh > 255) sh = 255;
1728		1921
1729	// clear key, in case of extra padding	1922	// clear key, in case of extra padding
1730	memset (&skey, 0, sizeof (skey));	1923	memset (&skey, 0, sizeof (skey));
1731		1924
1732	glColor4ub (255, 255, 255, 255);	1925	memset (&key, 0, sizeof (key));
1733		1926	key.r = 255;
1734	glEnable (GL_BLEND);	1927	key.g = 255;
1735	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1928	key.b = 255;
1736	glEnable (GL_TEXTURE_2D);	1929	key.a = 255;
1737	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1930	key.mode = GL_QUADS;
1738		1931	key.format = GL_T2F_V3F;
1739	glBegin (GL_QUADS);
1740
1741	last_name = -1;	1932	key.texname = -1;
1742		1933
1743	mx += self->x;	1934	mx += self->x;
1744	my += self->y;	1935	my += self->y;
1745		1936
1746	// first pass: determine smooth_max	1937	// first pass: determine smooth_max
…		…
1762	MAX (self->tex [cell->tile [0]].smoothlevel,	1953	MAX (self->tex [cell->tile [0]].smoothlevel,
1763	MAX (self->tex [cell->tile [1]].smoothlevel,	1954	MAX (self->tex [cell->tile [1]].smoothlevel,
1764	self->tex [cell->tile [2]].smoothlevel));	1955	self->tex [cell->tile [2]].smoothlevel));
1765	}	1956	}
1766	}	1957	}
		1958
		1959	glEnable (GL_BLEND);
		1960	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1961	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1767		1962
1768	for (z = 0; z <= 2; z++)	1963	for (z = 0; z <= 2; z++)
1769	{	1964	{
1770	memset (smooth_level, 0, sizeof (smooth_level));	1965	memset (smooth_level, 0, sizeof (smooth_level));
1771		1966
…		…
1781	tileid tile = cell->tile [z];	1976	tileid tile = cell->tile [z];
1782		1977
1783	if (tile)	1978	if (tile)
1784	{	1979	{
1785	maptex tex = self->tex [tile];	1980	maptex tex = self->tex [tile];
1786	int px, py;	1981	int px = (x + 1) * T - tex.w;
		1982	int py = (y + 1) * T - tex.h;
1787		1983
1788	// suppressing texture state switches here
1789	// is only moderately effective, but worth the extra effort
1790	if (last_name != tex.name)	1984	if (key.texname != tex.name)
1791	{	1985	{
1792	if (!tex.name)	1986	if (!tex.name)
1793	tex = self->tex [2]; /* missing, replace by noface */	1987	tex = self->tex [2]; /* missing, replace by noface */
1794		1988
1795	glEnd ();	1989	key.texname = tex.name;
1796	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1990	arr = rc_array (rc, &key);
1797	glBegin (GL_QUADS);
1798	}	1991	}
1799		1992
1800	px = (x + 1) * T - tex.w;	1993	if (expect_false (cell->player == player) && expect_false (z == 2))
1801	py = (y + 1) * T - tex.h;
1802
1803	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1804	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808	if (cell->flags && z == 2)
1809	{	1994	{
		1995	pl_x = px;
		1996	pl_y = py;
		1997	pl_tex = tex;
		1998	continue;
		1999	}
		2000
		2001	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2002	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2003	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2004	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2005
		2006	if (expect_false (cell->flags) && expect_false (z == 2))
		2007	{
		2008	// overlays such as the speech bubble, probably more to come
1810	if (cell->flags & 1)	2009	if (cell->flags & 1)
1811	{	2010	{
1812	maptex tex = self->tex [1];	2011	maptex tex = self->tex [1];
1813	int px = x * T + T * 2 / 32;	2012	int px = x * T + T * 2 / 32;
1814	int py = y * T - T * 6 / 32;	2013	int py = y * T - T * 6 / 32;
1815		2014
		2015	if (tex.name)
1816	glEnd ();	2016	{
1817	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2017	if (key.texname != tex.name)
		2018	{
		2019	key.texname = tex.name;
		2020	arr = rc_array (rc, &key);
		2021	}
		2022
		2023	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2024	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2025	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2026	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1818	glBegin (GL_QUADS);	2027	}
1819
1820	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824	}	2028	}
1825	}	2029	}
1826		2030
1827	// update smooth hash	2031	// update smooth hash
1828	if (tex.smoothtile)	2032	if (tex.smoothtile)
…		…
1864	}	2068	}
1865	}	2069	}
1866	}	2070	}
1867	}	2071	}
1868		2072
		2073	rc_draw (rc);
		2074	rc_clear (rc);
		2075
1869	// go through all smoothlevels, lowest to highest, then draw.	2076	// go through all smoothlevels, lowest to highest, then draw.
1870	// this is basically counting sort	2077	// this is basically counting sort
1871	{	2078	{
1872	int w, b;	2079	int w, b;
1873		2080
		2081	glEnable (GL_TEXTURE_2D);
		2082	glBegin (GL_QUADS);
1874	for (w = 0; w < 256 / 32; ++w)	2083	for (w = 0; w < 256 / 32; ++w)
1875	{	2084	{
1876	uint32_t smask = smooth_level [w];	2085	uint32_t smask = smooth_level [w];
1877	if (smask)	2086	if (smask)
1878	for (b = 0; b < 32; ++b)	2087	for (b = 0; b < 32; ++b)
…		…
1897	int border = bits & 15;	2106	int border = bits & 15;
1898	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2107	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899	float dx = tex.s * .0625f; // 16 images/row	2108	float dx = tex.s * .0625f; // 16 images/row
1900	float dy = tex.t * .5f ; // 2 images/column	2109	float dy = tex.t * .5f ; // 2 images/column
1901		2110
1902	// this time naively avoiding texture state changes
1903	// save gobs of state changes.
1904	if (last_name != tex.name)	2111	if (tex.name)
1905	{	2112	{
		2113	// this time avoiding texture state changes
		2114	// save gobs of state changes.
1906	if (!tex.name)	2115	if (key.texname != tex.name)
1907	continue; // smoothing not yet available	2116	{
1908
1909	glEnd ();	2117	glEnd ();
1910	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2118	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911	glBegin (GL_QUADS);	2119	glBegin (GL_QUADS);
1912	}	2120	}
1913		2121
1914	if (border)	2122	if (border)
1915	{	2123	{
1916	float ox = border * dx;	2124	float ox = border * dx;
1917		2125
1918	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2126	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2127	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2128	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2129	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922	}	2130	}
1923		2131
1924	if (corner)	2132	if (corner)
1925	{	2133	{
1926	float ox = corner * dx;	2134	float ox = corner * dx;
1927		2135
1928	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2136	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2137	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2138	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2139	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2140	}
1932	}	2141	}
1933	}	2142	}
1934	}	2143	}
1935	}	2144	}
1936	}	2145	}
		2146
		2147	glEnd ();
		2148	glDisable (GL_TEXTURE_2D);
		2149	key.texname = -1;
1937	}	2150	}
1938		2151
1939	hv_clear (smooth);	2152	hv_clear (smooth);
1940	}	2153	}
1941		2154
1942	glEnd ();	2155	if (pl_tex.name)
		2156	{
		2157	maptex tex = pl_tex;
		2158	int px = pl_x + sdx;
		2159	int py = pl_y + sdy;
1943		2160
1944	glDisable (GL_TEXTURE_2D);	2161	key.texname = tex.name;
		2162	arr = rc_array (rc, &key);
		2163
		2164	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2165	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2166	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2167	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2168
		2169	rc_draw (rc);
		2170	}
		2171
1945	glDisable (GL_BLEND);	2172	glDisable (GL_BLEND);
		2173	rc_free (rc);
1946		2174
1947	// top layer: overlays such as the health bar	2175	// top layer: overlays such as the health bar
1948	for (y = 0; y < sh; y++)	2176	for (y = 0; y < sh; y++)
1949	if (0 <= y + my && y + my < self->rows)	2177	if (0 <= y + my && y + my < self->rows)
1950	{	2178	{
…		…
1975	}	2203	}
1976	}	2204	}
1977	}	2205	}
1978		2206
1979	void	2207	void
1980	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2208	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981	CODE:	2209	CODE:
1982	{	2210	{
1983	static float color[16][3] = {	2211	static float color[16][3] = {
1984	{ 0.00F, 0.00F, 0.00F },	2212	{ 0.00F, 0.00F, 0.00F },
1985	{ 1.00F, 1.00F, 1.00F },	2213	{ 1.00F, 1.00F, 1.00F },
…		…
2035	glDisable (GL_BLEND);	2263	glDisable (GL_BLEND);
2036	glDisable (GL_TEXTURE_2D);	2264	glDisable (GL_TEXTURE_2D);
2037	}	2265	}
2038		2266
2039	void	2267	void
2040	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2268	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041	PPCODE:	2269	PPCODE:
2042	{	2270	{
2043	int x, y;	2271	int x, y;
2044	int sw1 = sw + 2;	2272	int sw1 = sw + 2;
2045	int sh1 = sh + 2;	2273	int sh1 = sh + 2;
…		…
2053	SvCUR_set (darkness3_sv, sw34 * sh3);	2281	SvCUR_set (darkness3_sv, sw34 * sh3);
2054		2282
2055	mx += self->x - 1;	2283	mx += self->x - 1;
2056	my += self->y - 1;	2284	my += self->y - 1;
2057		2285
2058	memset (darkness1, 255, sw1 * sh1);	2286	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2059		2287
2060	for (y = 0; y < sh1; y++)	2288	for (y = 0; y < sh1; y++)
2061	if (0 <= y + my && y + my < self->rows)	2289	if (0 <= y + my && y + my < self->rows)
2062	{	2290	{
2063	maprow *row = self->row + (y + my);	2291	maprow *row = self->row + (y + my);
…		…
2116	PUSHs (sv_2mortal (newSViv (sh3)));	2344	PUSHs (sv_2mortal (newSViv (sh3)));
2117	PUSHs (darkness3_sv);	2345	PUSHs (darkness3_sv);
2118	}	2346	}
2119		2347
2120	SV *	2348	SV *
2121	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2349	get_rect (DC::Map self, int x0, int y0, int w, int h)
2122	CODE:	2350	CODE:
2123	{	2351	{
2124	int x, y, x1, y1;	2352	int x, y, x1, y1;
2125	SV *data_sv = newSV (w * h * 7 + 5);	2353	SV *data_sv = newSV (w * h * 7 + 5);
2126	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2354	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2183	else	2411	else
2184	*data++ = 0;	2412	*data++ = 0;
2185	}	2413	}
2186	}	2414	}
2187		2415
		2416	/* if size is w*h + 5 then no data has been found */
		2417	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2418	{
2188	SvPOK_only (data_sv);	2419	SvPOK_only (data_sv);
2189	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2420	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2421	}
		2422
2190	RETVAL = data_sv;	2423	RETVAL = data_sv;
2191	}	2424	}
2192	OUTPUT:	2425	OUTPUT:
2193	RETVAL	2426	RETVAL
2194		2427
2195	void	2428	void
2196	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2429	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197	PPCODE:	2430	PPCODE:
2198	{	2431	{
2199	int x, y, z;	2432	int x, y, z;
2200	int w, h;	2433	int w, h;
2201	int x1, y1;	2434	int x1, y1;
		2435	STRLEN len;
		2436	uint8_t *data, *end;
		2437
		2438	len = SvLEN (data_sv);
		2439	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2440	data = SvPVbyte_nolen (data_sv);
		2441	end = data + len + 8;
		2442
		2443	if (len < 5)
		2444	XSRETURN_EMPTY;
2202		2445
2203	if (*data++ != 0)	2446	if (*data++ != 0)
2204	return; /* version mismatch */	2447	XSRETURN_EMPTY; /* version mismatch */
2205		2448
2206	w = *data++ << 8; w |= *data++;	2449	w = *data++ << 8; w |= *data++;
2207	h = *data++ << 8; h |= *data++;	2450	h = *data++ << 8; h |= *data++;
2208		2451
2209	// we need to do this 'cause we don't keep an absolute coord system for rows	2452	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2221	{	2464	{
2222	maprow *row = map_get_row (self, y);	2465	maprow *row = map_get_row (self, y);
2223		2466
2224	for (x = x0; x < x1; x++)	2467	for (x = x0; x < x1; x++)
2225	{	2468	{
		2469	uint8_t flags;
		2470
		2471	if (data + 7 >= end)
		2472	XSRETURN_EMPTY;
		2473
2226	uint8_t flags = *data++;	2474	flags = *data++;
2227		2475
2228	if (flags)	2476	if (flags)
2229	{	2477	{
2230	mapcell *cell = row_get_cell (row, x);	2478	mapcell *cell = row_get_cell (row, x);
2231	tileid tile[3] = { 0, 0, 0 };	2479	tileid tile[3] = { 0, 0, 0 };
…		…
2234	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2482	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2483	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236		2484
2237	if (cell->darkness == 0)	2485	if (cell->darkness == 0)
2238	{	2486	{
2239	cell->darkness = 0;	2487	/*cell->darkness = 0;*/
		2488	EXTEND (SP, 3);
2240		2489
2241	for (z = 0; z <= 2; z++)	2490	for (z = 0; z <= 2; z++)
2242	{	2491	{
2243	tileid t = tile [z];	2492	tileid t = tile [z];
2244		2493
2245	if (t >= self->texs || (t && !self->tex [t].name))	2494	if (t >= self->texs || (t && !self->tex [t].name))
2246	{	2495	{
2247	XPUSHs (sv_2mortal (newSViv (t)));	2496	PUSHs (sv_2mortal (newSViv (t)));
2248	need_texid (self, t);	2497	need_texid (self, t);
2249	}	2498	}
2250		2499
2251	cell->tile [z] = t;	2500	cell->tile [z] = t;
2252	}	2501	}
…		…
2254	}	2503	}
2255	}	2504	}
2256	}	2505	}
2257	}	2506	}
2258		2507
2259	MODULE = CFPlus PACKAGE = CFPlus::RW	2508	MODULE = Deliantra::Client PACKAGE = DC::RW
2260		2509
2261	CFPlus::RW	2510	DC::RW
2262	new (SV *class, SV *data_sv)	2511	new (SV *class, SV *data_sv)
2263	CODE:	2512	CODE:
2264	{	2513	{
2265	STRLEN datalen;	2514	STRLEN datalen;
2266	char *data = SvPVbyte (data_sv, datalen);	2515	char *data = SvPVbyte (data_sv, datalen);
…		…
2268	RETVAL = SDL_RWFromConstMem (data, datalen);	2517	RETVAL = SDL_RWFromConstMem (data, datalen);
2269	}	2518	}
2270	OUTPUT:	2519	OUTPUT:
2271	RETVAL	2520	RETVAL
2272		2521
2273	CFPlus::RW	2522	DC::RW
2274	new_from_file (SV *class, const char *path, const char *mode = "rb")	2523	new_from_file (SV *class, const char *path, const char *mode = "rb")
2275	CODE:	2524	CODE:
2276	RETVAL = SDL_RWFromFile (path, mode);	2525	RETVAL = SDL_RWFromFile (path, mode);
2277	OUTPUT:	2526	OUTPUT:
2278	RETVAL	2527	RETVAL
2279		2528
2280	# fails on win32:	2529	# fails on win32:
2281	# CFPlus.xs(2268) : error C2059: syntax error : '('	2530	# dc.xs(2268) : error C2059: syntax error : '('
2282	#void	2531	#void
2283	#close (CFPlus::RW self)	2532	#close (DC::RW self)
2284	# CODE:	2533	# CODE:
2285	# (self->(close)) (self);	2534	# (self->(close)) (self);
2286		2535
2287	MODULE = CFPlus PACKAGE = CFPlus::Channel	2536	MODULE = Deliantra::Client PACKAGE = DC::Channel
2288		2537
2289	PROTOTYPES: DISABLE	2538	PROTOTYPES: DISABLE
2290		2539
2291	CFPlus::Channel	2540	DC::Channel
2292	find ()	2541	find ()
2293	CODE:	2542	CODE:
2294	{	2543	{
2295	RETVAL = Mix_GroupAvailable (-1);	2544	RETVAL = Mix_GroupAvailable (-1);
2296		2545
…		…
2309	}	2558	}
2310	OUTPUT:	2559	OUTPUT:
2311	RETVAL	2560	RETVAL
2312		2561
2313	void	2562	void
2314	halt (CFPlus::Channel self)	2563	halt (DC::Channel self)
2315	CODE:	2564	CODE:
2316	Mix_HaltChannel (self);	2565	Mix_HaltChannel (self);
2317		2566
2318	void	2567	void
2319	expire (CFPlus::Channel self, int ticks = -1)	2568	expire (DC::Channel self, int ticks = -1)
2320	CODE:	2569	CODE:
2321	Mix_ExpireChannel (self, ticks);	2570	Mix_ExpireChannel (self, ticks);
2322		2571
2323	void	2572	void
2324	fade_out (CFPlus::Channel self, int ticks = -1)	2573	fade_out (DC::Channel self, int ticks = -1)
2325	CODE:	2574	CODE:
2326	Mix_FadeOutChannel (self, ticks);	2575	Mix_FadeOutChannel (self, ticks);
2327		2576
2328	int	2577	int
2329	volume (CFPlus::Channel self, int volume)	2578	volume (DC::Channel self, int volume)
2330	CODE:	2579	CODE:
2331	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2580	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332	OUTPUT:	2581	OUTPUT:
2333	RETVAL	2582	RETVAL
2334		2583
2335	void	2584	void
2336	unregister_all_effects (CFPlus::Channel self)	2585	unregister_all_effects (DC::Channel self)
2337	CODE:	2586	CODE:
2338	Mix_UnregisterAllEffects (self);	2587	Mix_UnregisterAllEffects (self);
2339		2588
2340	void	2589	void
2341	set_panning (CFPlus::Channel self, int left, int right)	2590	set_panning (DC::Channel self, int left, int right)
2342	CODE:	2591	CODE:
2343	left = CLAMP (left , 0, 255);	2592	left = CLAMP (left , 0, 255);
2344	right = CLAMP (right, 0, 255);	2593	right = CLAMP (right, 0, 255);
2345	Mix_SetPanning (self, left, right);	2594	Mix_SetPanning (self, left, right);
2346		2595
2347	void	2596	void
2348	set_distance (CFPlus::Channel self, int distance)	2597	set_distance (DC::Channel self, int distance)
2349	CODE:	2598	CODE:
2350	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2599	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351		2600
2352	void	2601	void
2353	set_position (CFPlus::Channel self, int angle, int distance)	2602	set_position (DC::Channel self, int angle, int distance)
2354	CODE:	2603	CODE:
2355		2604
2356	void	2605	void
2357	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2606	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358	CODE:	2607	CODE:
2359	{	2608	{
2360	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2609	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2610	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2611	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363	}	2612	}
2364		2613
2365	void	2614	void
2366	set_reverse_stereo (CFPlus::Channel self, int flip)	2615	set_reverse_stereo (DC::Channel self, int flip)
2367	CODE:	2616	CODE:
2368	Mix_SetReverseStereo (self, flip);	2617	Mix_SetReverseStereo (self, flip);
2369		2618
2370	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2619	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371		2620
2372	PROTOTYPES: DISABLE	2621	PROTOTYPES: DISABLE
2373		2622
2374	CFPlus::MixChunk	2623	DC::MixChunk
2375	new (SV *class, CFPlus::RW rwops)	2624	new (SV *class, DC::RW rwops)
2376	CODE:	2625	CODE:
2377	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2626	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378	OUTPUT:	2627	OUTPUT:
2379	RETVAL	2628	RETVAL
2380		2629
2381	void	2630	void
2382	DESTROY (CFPlus::MixChunk self)	2631	DESTROY (DC::MixChunk self)
2383	CODE:	2632	CODE:
2384	Mix_FreeChunk (self);	2633	Mix_FreeChunk (self);
2385		2634
2386	int	2635	int
2387	volume (CFPlus::MixChunk self, int volume = -1)	2636	volume (DC::MixChunk self, int volume = -1)
2388	CODE:	2637	CODE:
2389	if (items > 1)	2638	if (items > 1)
2390	volume = CLAMP (volume, 0, 128);	2639	volume = CLAMP (volume, 0, 128);
2391	RETVAL = Mix_VolumeChunk (self, volume);	2640	RETVAL = Mix_VolumeChunk (self, volume);
2392	OUTPUT:	2641	OUTPUT:
2393	RETVAL	2642	RETVAL
2394		2643
2395	CFPlus::Channel	2644	DC::Channel
2396	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2645	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397	CODE:	2646	CODE:
2398	{	2647	{
2399	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2648	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400		2649
2401	if (RETVAL < 0)	2650	if (RETVAL < 0)
…		…
2408	}	2657	}
2409	}	2658	}
2410	OUTPUT:	2659	OUTPUT:
2411	RETVAL	2660	RETVAL
2412		2661
2413	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2662	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414		2663
2415	int	2664	int
2416	volume (int volume = -1)	2665	volume (int volume = -1)
2417	PROTOTYPE: ;$	2666	PROTOTYPE: ;$
2418	CODE:	2667	CODE:
…		…
2430	void	2679	void
2431	halt ()	2680	halt ()
2432	CODE:	2681	CODE:
2433	Mix_HaltMusic ();	2682	Mix_HaltMusic ();
2434		2683
2435	CFPlus::MixMusic	2684	DC::MixMusic
2436	new (SV *class, CFPlus::RW rwops)	2685	new (SV *class, DC::RW rwops)
2437	CODE:	2686	CODE:
2438	RETVAL = Mix_LoadMUS_RW (rwops);	2687	RETVAL = Mix_LoadMUS_RW (rwops);
2439	OUTPUT:	2688	OUTPUT:
2440	RETVAL	2689	RETVAL
2441		2690
2442	void	2691	void
2443	DESTROY (CFPlus::MixMusic self)	2692	DESTROY (DC::MixMusic self)
2444	CODE:	2693	CODE:
2445	Mix_FreeMusic (self);	2694	Mix_FreeMusic (self);
2446		2695
2447	int	2696	int
2448	play (CFPlus::MixMusic self, int loops = -1)	2697	play (DC::MixMusic self, int loops = -1)
2449	CODE:	2698	CODE:
2450	RETVAL = Mix_PlayMusic (self, loops);	2699	RETVAL = Mix_PlayMusic (self, loops);
2451	OUTPUT:	2700	OUTPUT:
2452	RETVAL	2701	RETVAL
2453		2702
2454	void	2703	void
2455	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2704	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456	CODE:	2705	CODE:
2457	Mix_FadeInMusicPos (self, loops, ms, position);	2706	Mix_FadeInMusicPos (self, loops, ms, position);
2458		2707
2459	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2708	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460		2709
2461	PROTOTYPES: ENABLE	2710	PROTOTYPES: ENABLE
2462		2711
2463	BOOT:	2712	BOOT:
2464	{	2713	{
2465	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2714	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466	static const struct {	2715	static const struct {
2467	const char *name;	2716	const char *name;
2468	IV iv;	2717	IV iv;
2469	} *civ, const_iv[] = {	2718	} *civ, const_iv[] = {
2470	# define const_iv(name) { # name, (IV)name }	2719	# define const_iv(name) { # name, (IV)name }
…		…
2505	const_iv (GL_INTENSITY),	2754	const_iv (GL_INTENSITY),
2506	const_iv (GL_LUMINANCE),	2755	const_iv (GL_LUMINANCE),
2507	const_iv (GL_LUMINANCE_ALPHA),	2756	const_iv (GL_LUMINANCE_ALPHA),
2508	const_iv (GL_FLOAT),	2757	const_iv (GL_FLOAT),
2509	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2758	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2759	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2760	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2761	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2762	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2763	const_iv (GL_COMPRESSED_RGB_ARB),
		2764	const_iv (GL_COMPRESSED_RGBA_ARB),
2510	const_iv (GL_COMPILE),	2765	const_iv (GL_COMPILE),
2511	const_iv (GL_PROXY_TEXTURE_1D),	2766	const_iv (GL_PROXY_TEXTURE_1D),
2512	const_iv (GL_PROXY_TEXTURE_2D),	2767	const_iv (GL_PROXY_TEXTURE_2D),
2513	const_iv (GL_TEXTURE_1D),	2768	const_iv (GL_TEXTURE_1D),
2514	const_iv (GL_TEXTURE_2D),	2769	const_iv (GL_TEXTURE_2D),
…		…
2553	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2808	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554	const_iv (GL_POINT_SMOOTH_HINT),	2809	const_iv (GL_POINT_SMOOTH_HINT),
2555	const_iv (GL_LINE_SMOOTH_HINT),	2810	const_iv (GL_LINE_SMOOTH_HINT),
2556	const_iv (GL_POLYGON_SMOOTH_HINT),	2811	const_iv (GL_POLYGON_SMOOTH_HINT),
2557	const_iv (GL_GENERATE_MIPMAP_HINT),	2812	const_iv (GL_GENERATE_MIPMAP_HINT),
		2813	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558	const_iv (GL_FASTEST),	2814	const_iv (GL_FASTEST),
2559	const_iv (GL_DONT_CARE),	2815	const_iv (GL_DONT_CARE),
2560	const_iv (GL_NICEST),	2816	const_iv (GL_NICEST),
2561	const_iv (GL_V2F),	2817	const_iv (GL_V2F),
2562	const_iv (GL_V3F),	2818	const_iv (GL_V3F),
…		…
2570		2826
2571	texture_av = newAV ();	2827	texture_av = newAV ();
2572	AvREAL_off (texture_av);	2828	AvREAL_off (texture_av);
2573	}	2829	}
2574		2830
		2831	void
		2832	disable_GL_EXT_blend_func_separate ()
		2833	CODE:
		2834	gl.BlendFuncSeparate = 0;
		2835	gl.BlendFuncSeparateEXT = 0;
		2836
2575	char *	2837	char *
2576	gl_vendor ()	2838	gl_vendor ()
2577	CODE:	2839	CODE:
2578	RETVAL = (char *)glGetString (GL_VENDOR);	2840	RETVAL = (char *)glGetString (GL_VENDOR);
2579	OUTPUT:	2841	OUTPUT:
…		…
2700		2962
2701	void glRect (float x1, float y1, float x2, float y2)	2963	void glRect (float x1, float y1, float x2, float y2)
2702	CODE:	2964	CODE:
2703	glRectf (x1, y1, x2, y2);	2965	glRectf (x1, y1, x2, y2);
2704		2966
		2967	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2968	CODE:
		2969	glBegin (GL_LINE_LOOP);
		2970	glVertex2f (x1, y1);
		2971	glVertex2f (x2, y1);
		2972	glVertex2f (x2, y2);
		2973	glVertex2f (x1, y2);
		2974	glEnd ();
		2975
2705	PROTOTYPES: ENABLE	2976	PROTOTYPES: ENABLE
2706		2977
2707	void glBegin (int mode)	2978	void glBegin (int mode)
2708		2979
2709	void glEnd ()	2980	void glEnd ()
…		…
2741	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3012	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742	CODE:	3013	CODE:
2743	if (gl.SeparableFilter2D)	3014	if (gl.SeparableFilter2D)
2744	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3015	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745		3016
2746	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3017	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747		3018
2748	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3019	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749		3020
2750	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3021	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751		3022
…		…
2777		3048
2778	void glEndList ()	3049	void glEndList ()
2779		3050
2780	void glCallList (int list)	3051	void glCallList (int list)
2781		3052
2782	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3053	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783		3054
2784	PROTOTYPES: DISABLE	3055	PROTOTYPES: DISABLE
2785		3056
2786	void	3057	void
2787	find_widget (SV *self, NV x, NV y)	3058	find_widget (SV *self, NV x, NV y)
…		…
2791	XPUSHs (self);	3062	XPUSHs (self);
2792	}	3063	}
2793		3064
2794	BOOT:	3065	BOOT:
2795	{	3066	{
2796	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3067	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797		3068
2798	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3069	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3070	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3071	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3072	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802	}	3073	}
2803		3074
2804	void	3075	void
2805	draw (SV *self)	3076	draw (SV *self)
2806	CODE:	3077	CODE:
…		…
2810	NV x, y, w, h;	3081	NV x, y, w, h;
2811	SV *draw_x_sv = GvSV (draw_x_gv);	3082	SV *draw_x_sv = GvSV (draw_x_gv);
2812	SV *draw_y_sv = GvSV (draw_y_gv);	3083	SV *draw_y_sv = GvSV (draw_y_gv);
2813	SV *draw_w_sv = GvSV (draw_w_gv);	3084	SV *draw_w_sv = GvSV (draw_w_gv);
2814	SV *draw_h_sv = GvSV (draw_h_gv);	3085	SV *draw_h_sv = GvSV (draw_h_gv);
2815	SV *hover;
2816	double draw_x, draw_y, draw_w, draw_h;	3086	double draw_x, draw_y;
2817		3087
2818	if (!SvROK (self))	3088	if (!SvROK (self))
2819	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3089	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820		3090
2821	hv = (HV *)SvRV (self);	3091	hv = (HV *)SvRV (self);
2822		3092
2823	if (SvTYPE (hv) != SVt_PVHV)	3093	if (SvTYPE (hv) != SVt_PVHV)
2824	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3094	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825		3095
2826	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3096	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3097	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828		3098
2829	if (!h || !w)	3099	if (!h || !w)
…		…
2849	{	3119	{
2850	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3120	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851		3121
2852	if (svp && SvTRUE (*svp))	3122	if (svp && SvTRUE (*svp))
2853	{	3123	{
2854	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3124	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855	glEnable (GL_BLEND);	3125	glEnable (GL_BLEND);
2856	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3126	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857	glBegin (GL_QUADS);	3127	glBegin (GL_QUADS);
2858	glVertex2f (0, 0);	3128	glVertex2f (0, 0);
2859	glVertex2f (w, 0);	3129	glVertex2f (w, 0);
…		…
2862	glEnd ();	3132	glEnd ();
2863	glDisable (GL_BLEND);	3133	glDisable (GL_BLEND);
2864	}	3134	}
2865	}	3135	}
2866	#if 0	3136	#if 0
2867	if ($ENV{CFPLUS_DEBUG} & 1) {	3137	// draw borders, for debugging
2868	glPushMatrix;	3138	glPushMatrix ();
2869	glColor 1, 1, 0, 1;	3139	glColor4f (1., 1., 0., 1.);
2870	glTranslate 0.375, 0.375;	3140	glTranslatef (.5, .5, 0.);
2871	glBegin GL_LINE_LOOP;	3141	glBegin (GL_LINE_LOOP);
2872	glVertex 0 , 0;	3142	glVertex2f (0 , 0);
2873	glVertex $self->{w} - 1, 0;	3143	glVertex2f (w - 1, 0);
2874	glVertex $self->{w} - 1, $self->{h} - 1;	3144	glVertex2f (w - 1, h - 1);
2875	glVertex 0 , $self->{h} - 1;	3145	glVertex2f (0 , h - 1);
2876	glEnd;	3146	glEnd ();
2877	glPopMatrix;	3147	glPopMatrix ();
2878	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879	}
2880	#endif	3148	#endif
2881	PUSHMARK (SP);	3149	PUSHMARK (SP);
2882	XPUSHs (self);	3150	XPUSHs (self);
2883	PUTBACK;	3151	PUTBACK;
2884	call_method ("_draw", G_VOID | G_DISCARD);	3152	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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