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

Diff Legend

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