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.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.279 by root, Thu Oct 2 15:59:40 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	95
71	# define PARACHUTE 0	96	#define KMOD_LRAM 0x10000 // our extension
72	#endif
73		97
74	static AV *texture_av;	98	static AV *texture_av;
75		99
76	static struct	100	static struct
77	{	101	{
…		…
120		144
121	#include "pango-font.c"	145	#include "pango-font.c"
122	#include "pango-fontmap.c"	146	#include "pango-fontmap.c"
123	#include "pango-render.c"	147	#include "pango-render.c"
124		148
125	typedef IV CFPlus__Channel;	149	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	150	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	151	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	152	typedef Mix_Music *DC__MixMusic;
129		153
130	typedef PangoFontDescription *CFPlus__Font;	154	typedef PangoFontDescription *DC__Font;
131		155
132	static int	156	static int
133	shape_attr_p (PangoLayoutRun *run)	157	shape_attr_p (PangoLayoutRun *run)
134	{	158	{
135	GSList *attrs = run->item->analysis.extra_attrs;	159	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		173
150	typedef struct cf_layout {	174	typedef struct cf_layout {
151	PangoLayout *pl;	175	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	176	float r, g, b, a; // default color for rgba mode
153	int base_height;	177	int base_height;
154	CFPlus__Font font;	178	DC__Font font;
		179	rc_t *rc;
155	} *CFPlus__Layout;	180	} *DC__Layout;
156		181
157	static CFPlus__Font default_font;	182	static DC__Font default_font;
158	static PangoContext *opengl_context;	183	static PangoContext *opengl_context;
159	static PangoFontMap *opengl_fontmap;	184	static PangoFontMap *opengl_fontmap;
160		185
161	static void	186	static void
162	substitute_func (FcPattern *pattern, gpointer data)	187	substitute_func (FcPattern *pattern, gpointer data)
…		…
167	#endif	192	#endif
168	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	193	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169	}	194	}
170		195
171	static void	196	static void
172	layout_update_font (CFPlus__Layout self)	197	layout_update_font (DC__Layout self)
173	{	198	{
174	/* use a random scale factor to account for unknown descenders, 0.8 works	199	/* use a random scale factor to account for unknown descenders, 0.8 works
175	* reasonably well with bitstream vera	200	* reasonably well with dejavu/bistream fonts
176	*/	201	*/
177	PangoFontDescription *font = self->font ? self->font : default_font;	202	PangoFontDescription *font = self->font ? self->font : default_font;
178		203
179	pango_font_description_set_absolute_size (font,	204	pango_font_description_set_absolute_size (font,
180	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	205	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181		206
182	pango_layout_set_font_description (self->pl, font);	207	pango_layout_set_font_description (self->pl, font);
183	}	208	}
184		209
185	static void	210	static void
186	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	211	layout_get_pixel_size (DC__Layout self, int *w, int *h)
187	{	212	{
188	PangoRectangle rect;	213	PangoRectangle rect;
189		214
190	// get_pixel_* wrongly rounds down	215	// get_pixel_* wrongly rounds down
191	pango_layout_get_extents (self->pl, 0, &rect);	216	pango_layout_get_extents (self->pl, 0, &rect);
…		…
202		227
203	typedef uint16_t tileid;	228	typedef uint16_t tileid;
204	typedef uint16_t faceid;	229	typedef uint16_t faceid;
205		230
206	typedef struct {	231	typedef struct {
207	int name;	232	GLuint name;
208	int w, h;	233	int w, h;
209	float s, t;	234	float s, t;
210	uint8_t r, g, b, a;	235	uint8_t r, g, b, a;
211	tileid smoothtile;	236	tileid smoothtile;
212	uint8_t smoothlevel;	237	uint8_t smoothlevel;
…		…
230	int faces; tileid *face2tile; // [faceid]	255	int faces; tileid *face2tile; // [faceid]
231	int texs; maptex *tex; // [tileid]	256	int texs; maptex *tex; // [tileid]
232		257
233	int32_t rows;	258	int32_t rows;
234	maprow *row;	259	maprow *row;
235	} *CFPlus__Map;	260	} *DC__Map;
236		261
237	static char *	262	static char *
238	prepend (char *ptr, int sze, int inc)	263	prepend (char *ptr, int sze, int inc)
239	{	264	{
240	char *p;	265	char *p;
…		…
278	self->texs *= 2;	303	self->texs *= 2;
279	}	304	}
280	}	305	}
281		306
282	static maprow *	307	static maprow *
283	map_get_row (CFPlus__Map self, int y)	308	map_get_row (DC__Map self, int y)
284	{	309	{
285	if (0 > y)	310	if (0 > y)
286	{	311	{
287	int extend = - y + MAP_EXTEND_Y;	312	int extend = - y + MAP_EXTEND_Y;
288	Prepend (maprow, self->row, self->rows, extend);	313	Prepend (maprow, self->row, self->rows, extend);
…		…
326		351
327	return row->col + (x - row->c0);	352	return row->col + (x - row->c0);
328	}	353	}
329		354
330	static mapcell *	355	static mapcell *
331	map_get_cell (CFPlus__Map self, int x, int y)	356	map_get_cell (DC__Map self, int x, int y)
332	{	357	{
333	return row_get_cell (map_get_row (self, y), x);	358	return row_get_cell (map_get_row (self, y), x);
334	}	359	}
335		360
336	static void	361	static void
337	map_clear (CFPlus__Map self)	362	map_clear (DC__Map self)
338	{	363	{
339	int r;	364	int r;
340		365
341	for (r = 0; r < self->rows; r++)	366	for (r = 0; r < self->rows; r++)
342	Safefree (self->row[r].col);	367	Safefree (self->row[r].col);
…		…
349	self->oy = 0;	374	self->oy = 0;
350	self->row = 0;	375	self->row = 0;
351	self->rows = 0;	376	self->rows = 0;
352	}	377	}
353		378
		379	#define CELL_CLEAR(cell) \
		380	do { \
		381	if ((cell)->player) \
		382	(cell)->tile [2] = 0; \
		383	(cell)->darkness = 0; \
		384	(cell)->stat_hp = 0; \
		385	(cell)->flags = 0; \
		386	(cell)->player = 0; \
		387	} while (0)
		388
354	static void	389	static void
355	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	390	map_blank (DC__Map self, int x0, int y0, int w, int h)
356	{	391	{
357	int x, y;	392	int x, y;
358	maprow *row;	393	maprow *row;
359	mapcell *cell;	394	mapcell *cell;
360		395
…		…
372	if (x >= row->c1)	407	if (x >= row->c1)
373	break;	408	break;
374		409
375	cell = row->col + x - row->c0;	410	cell = row->col + x - row->c0;
376		411
377	cell->darkness = 0;	412	CELL_CLEAR (cell);
378	cell->stat_hp = 0;
379	cell->flags = 0;
380	cell->player = 0;
381	}	413	}
382	}	414	}
383	}	415	}
384		416
385	typedef struct {	417	typedef struct {
…		…
439	n |= n >> 16;	471	n |= n >> 16;
440		472
441	return n + 1;	473	return n + 1;
442	}	474	}
443		475
		476	static unsigned int
		477	popcount (unsigned int n)
		478	{
		479	n -= (n >> 1) & 0x55555555U;
		480	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		481	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		482	n *= 0x01010101U;
		483
		484	return n >> 24;
		485	}
		486
444	/* SDL should provide this, really. */	487	/* SDL should provide this, really. */
445	#define SDLK_MODIFIER_MIN 300	488	#define SDLK_MODIFIER_MIN 300
446	#define SDLK_MODIFIER_MAX 314	489	#define SDLK_MODIFIER_MAX 314
447		490
448	/******************************************************************************/	491	/******************************************************************************/
…		…
486	return 0;	529	return 0;
487		530
488	return 1;	531	return 1;
489	}	532	}
490		533
491	MODULE = CFPlus PACKAGE = CFPlus	534	/******************************************************************************/
		535
		536	/* process keyboard modifiers */
		537	static int
		538	mod_munge (int mod)
		539	{
		540	mod &= MOD_MASK;
		541
		542	if (mod & (KMOD_META | KMOD_ALT))
		543	mod |= KMOD_LRAM;
		544
		545	return mod;
		546	}
		547
		548	static void
		549	deliantra_main ()
		550	{
		551	char *argv[] = { 0 };
		552	call_argv ("::main", G_DISCARD | G_VOID, argv);
		553	}
		554
		555	#ifdef __MACOSX__
		556	/* to due surprising braindamage on the side of SDL design, we
		557	* do some mind-boggling hack here: SDL requires a custom main()
		558	* on OS X, so... we provide one and call the original main(), which,
		559	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		560	* and which calls our main (== SDL_main) back.
		561	*/
		562	extern C_LINKAGE int
		563	main (int argc, char *argv[])
		564	{
		565	deliantra_main ();
		566	}
		567
		568	#undef main
		569
		570	extern C_LINKAGE int main (int argc, char *argv[]);
		571
		572	static void
		573	SDL_braino (void)
		574	{
		575	char *argv[] = { "deliantra client", 0 };
		576	(main) (1, argv);
		577	}
		578	#else
		579	static void
		580	SDL_braino (void)
		581	{
		582	deliantra_main ();
		583	}
		584	#endif
		585
		586	MODULE = Deliantra::Client PACKAGE = DC
492		587
493	PROTOTYPES: ENABLE	588	PROTOTYPES: ENABLE
494		589
495	BOOT:	590	BOOT:
496	{	591	{
497	HV *stash = gv_stashpv ("CFPlus", 1);	592	HV *stash = gv_stashpv ("DC", 1);
498	static const struct {	593	static const struct {
499	const char *name;	594	const char *name;
500	IV iv;	595	IV iv;
501	} *civ, const_iv[] = {	596	} *civ, const_iv[] = {
502	# define const_iv(name) { # name, (IV)name }	597	# define const_iv(name) { # name, (IV)name }
…		…
524		619
525	const_iv (SDL_APPINPUTFOCUS),	620	const_iv (SDL_APPINPUTFOCUS),
526	const_iv (SDL_APPMOUSEFOCUS),	621	const_iv (SDL_APPMOUSEFOCUS),
527	const_iv (SDL_APPACTIVE),	622	const_iv (SDL_APPACTIVE),
528		623
		624
		625	const_iv (SDLK_UNKNOWN),
		626	const_iv (SDLK_FIRST),
		627	const_iv (SDLK_BACKSPACE),
		628	const_iv (SDLK_TAB),
		629	const_iv (SDLK_CLEAR),
		630	const_iv (SDLK_RETURN),
		631	const_iv (SDLK_PAUSE),
		632	const_iv (SDLK_ESCAPE),
		633	const_iv (SDLK_SPACE),
		634	const_iv (SDLK_EXCLAIM),
		635	const_iv (SDLK_QUOTEDBL),
		636	const_iv (SDLK_HASH),
		637	const_iv (SDLK_DOLLAR),
		638	const_iv (SDLK_AMPERSAND),
		639	const_iv (SDLK_QUOTE),
		640	const_iv (SDLK_LEFTPAREN),
		641	const_iv (SDLK_RIGHTPAREN),
		642	const_iv (SDLK_ASTERISK),
		643	const_iv (SDLK_PLUS),
		644	const_iv (SDLK_COMMA),
		645	const_iv (SDLK_MINUS),
		646	const_iv (SDLK_PERIOD),
		647	const_iv (SDLK_SLASH),
		648	const_iv (SDLK_0),
		649	const_iv (SDLK_1),
		650	const_iv (SDLK_2),
		651	const_iv (SDLK_3),
		652	const_iv (SDLK_4),
		653	const_iv (SDLK_5),
		654	const_iv (SDLK_6),
		655	const_iv (SDLK_7),
		656	const_iv (SDLK_8),
		657	const_iv (SDLK_9),
		658	const_iv (SDLK_COLON),
		659	const_iv (SDLK_SEMICOLON),
		660	const_iv (SDLK_LESS),
		661	const_iv (SDLK_EQUALS),
		662	const_iv (SDLK_GREATER),
		663	const_iv (SDLK_QUESTION),
		664	const_iv (SDLK_AT),
		665
		666	const_iv (SDLK_LEFTBRACKET),
		667	const_iv (SDLK_BACKSLASH),
		668	const_iv (SDLK_RIGHTBRACKET),
		669	const_iv (SDLK_CARET),
		670	const_iv (SDLK_UNDERSCORE),
		671	const_iv (SDLK_BACKQUOTE),
		672	const_iv (SDLK_DELETE),
		673
		674	const_iv (SDLK_FIRST),
		675	const_iv (SDLK_LAST),
529	const_iv (SDLK_KP0),	676	const_iv (SDLK_KP0),
530	const_iv (SDLK_KP1),	677	const_iv (SDLK_KP1),
531	const_iv (SDLK_KP2),	678	const_iv (SDLK_KP2),
532	const_iv (SDLK_KP3),	679	const_iv (SDLK_KP3),
533	const_iv (SDLK_KP4),	680	const_iv (SDLK_KP4),
…		…
605	const_iv (KMOD_LMETA),	752	const_iv (KMOD_LMETA),
606	const_iv (KMOD_RMETA),	753	const_iv (KMOD_RMETA),
607	const_iv (KMOD_NUM),	754	const_iv (KMOD_NUM),
608	const_iv (KMOD_CAPS),	755	const_iv (KMOD_CAPS),
609	const_iv (KMOD_MODE),	756	const_iv (KMOD_MODE),
		757
		758	const_iv (KMOD_LRAM),
		759
		760	const_iv (MIX_DEFAULT_FORMAT),
		761
		762	const_iv (SDL_INIT_TIMER),
		763	const_iv (SDL_INIT_AUDIO),
		764	const_iv (SDL_INIT_VIDEO),
		765	const_iv (SDL_INIT_CDROM),
		766	const_iv (SDL_INIT_JOYSTICK),
		767	const_iv (SDL_INIT_EVERYTHING),
		768	const_iv (SDL_INIT_NOPARACHUTE),
		769	const_iv (SDL_INIT_EVENTTHREAD),
		770
		771	const_iv (SDL_GL_RED_SIZE),
		772	const_iv (SDL_GL_GREEN_SIZE),
		773	const_iv (SDL_GL_BLUE_SIZE),
		774	const_iv (SDL_GL_ALPHA_SIZE),
		775	const_iv (SDL_GL_DOUBLEBUFFER),
		776	const_iv (SDL_GL_BUFFER_SIZE),
		777	const_iv (SDL_GL_DEPTH_SIZE),
		778	const_iv (SDL_GL_STENCIL_SIZE),
		779	const_iv (SDL_GL_ACCUM_RED_SIZE),
		780	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		781	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		782	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		783	const_iv (SDL_GL_STEREO),
		784	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		785	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		786	const_iv (SDL_GL_ACCELERATED_VISUAL),
		787	const_iv (SDL_GL_SWAP_CONTROL),
		788
		789	const_iv (FOW_DARKNESS)
610	# undef const_iv	790	# undef const_iv
611	};	791	};
612		792
613	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	793	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	794	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
632		812
633	NV floor (NV x)	813	NV floor (NV x)
634		814
635	NV ceil (NV x)	815	NV ceil (NV x)
636		816
		817	IV minpot (UV n)
		818
		819	IV popcount (UV n)
		820
637	void	821	void
638	pango_init ()	822	pango_init ()
639	CODE:	823	CODE:
640	{	824	{
641	opengl_fontmap = pango_opengl_font_map_new ();	825	opengl_fontmap = pango_opengl_font_map_new ();
642	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	826	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
643	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	827	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		828	/*pango_context_set_font_description (opengl_context, default_font);*/
		829	#if PANGO_VERSION_CHECK (1, 15, 2)
		830	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		831	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		832	#endif
644	}	833	}
645		834
646	char *
647	SDL_GetError ()	835	char *SDL_GetError ()
648		836
649	int	837	void SDL_braino ()
650	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651		838
652	void	839	int SDL_Init (U32 flags)
		840
		841	int SDL_InitSubSystem (U32 flags)
		842
		843	void SDL_QuitSubSystem (U32 flags)
		844
653	SDL_Quit ()	845	void SDL_Quit ()
		846
		847	int SDL_GL_SetAttribute (int attr, int value)
		848
		849	int SDL_GL_GetAttribute (int attr)
		850	CODE:
		851	if (SDL_GL_GetAttribute (attr, &RETVAL))
		852	XSRETURN_UNDEF;
		853	OUTPUT:
		854	RETVAL
654		855
655	void	856	void
656	SDL_ListModes (int rgb, int alpha)	857	SDL_ListModes (int rgb, int alpha)
657	PPCODE:	858	PPCODE:
658	{	859	{
…		…
670	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	871	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	872	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	873	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673		874
674	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	875	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675	#if SDL_VERSION_ATLEAST(1,2,10)
676	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	876	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678	#endif
679		877
680	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	878	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681		879
682	if (m && m != (SDL_Rect **)-1)	880	if (m && m != (SDL_Rect **)-1)
683	while (*m)	881	while (*m)
684	{	882	{
685	if ((*m)->w >= 640 && (*m)->h >= 480)	883	if ((*m)->w >= 400 && (*m)->h >= 300)
686	{	884	{
687	AV *av = newAV ();	885	AV *av = newAV ();
688	av_push (av, newSViv ((*m)->w));	886	av_push (av, newSViv ((*m)->w));
689	av_push (av, newSViv ((*m)->h));	887	av_push (av, newSViv ((*m)->h));
690	av_push (av, newSViv (rgb));	888	av_push (av, newSViv (rgb));
…		…
714		912
715	if (RETVAL)	913	if (RETVAL)
716	{	914	{
717	av_clear (texture_av);	915	av_clear (texture_av);
718		916
719	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	917	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	918	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721	#include "glfunc.h"	919	#include "glfunc.h"
722	#undef GL_FUNC	920	#undef GL_FUNC
723	}	921	}
724	}	922	}
…		…
731	char *	929	char *
732	SDL_GetKeyName (int sym)	930	SDL_GetKeyName (int sym)
733		931
734	int	932	int
735	SDL_GetAppState ()	933	SDL_GetAppState ()
		934
		935	int
		936	SDL_GetModState ()
736		937
737	void	938	void
738	poll_events ()	939	poll_events ()
739	PPCODE:	940	PPCODE:
740	{	941	{
…		…
750	{	951	{
751	case SDL_KEYDOWN:	952	case SDL_KEYDOWN:
752	case SDL_KEYUP:	953	case SDL_KEYUP:
753	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	954	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	955	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	956	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
756	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	957	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
757	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	958	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758	break;	959	break;
759		960
760	case SDL_ACTIVEEVENT:	961	case SDL_ACTIVEEVENT:
761	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	962	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
779	x = ev.motion.x;	980	x = ev.motion.x;
780	y = ev.motion.y;	981	y = ev.motion.y;
781	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	982	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782	}	983	}
783		984
784	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	985	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785	hv_store (hv, "state", 5, newSViv (state), 0);	986	hv_store (hv, "state", 5, newSViv (state), 0);
786	hv_store (hv, "x", 1, newSViv (x), 0);	987	hv_store (hv, "x", 1, newSViv (x), 0);
787	hv_store (hv, "y", 1, newSViv (y), 0);	988	hv_store (hv, "y", 1, newSViv (y), 0);
788	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	989	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	990	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790	}	991	}
791	break;	992	break;
792		993
793	case SDL_MOUSEBUTTONDOWN:	994	case SDL_MOUSEBUTTONDOWN:
794	case SDL_MOUSEBUTTONUP:	995	case SDL_MOUSEBUTTONUP:
795	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	996	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796		997
797	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	998	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	999	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1000	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1001	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
805	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1006	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1007	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807	break;	1008	break;
808	}	1009	}
809		1010
810	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	1011	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811	}	1012	}
812	}	1013	}
813		1014
814	int	1015	int
815	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	1016	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816	POSTCALL:	1017	POSTCALL:
817	Mix_HookMusicFinished (music_finished);	1018	Mix_HookMusicFinished (music_finished);
818	Mix_ChannelFinished (channel_finished);	1019	Mix_ChannelFinished (channel_finished);
		1020
		1021	void
		1022	Mix_QuerySpec ()
		1023	PPCODE:
		1024	{
		1025	int freq, channels;
		1026	Uint16 format;
		1027
		1028	if (Mix_QuerySpec (&freq, &format, &channels))
		1029	{
		1030	EXTEND (SP, 3);
		1031	PUSHs (sv_2mortal (newSViv (freq)));
		1032	PUSHs (sv_2mortal (newSViv (format)));
		1033	PUSHs (sv_2mortal (newSViv (channels)));
		1034	}
		1035	}
819		1036
820	void	1037	void
821	Mix_CloseAudio ()	1038	Mix_CloseAudio ()
822		1039
823	int	1040	int
…		…
858	}	1075	}
859	}	1076	}
860	#endif	1077	#endif
861	}	1078	}
862		1079
863	void	1080	int
864	add_font (char *file)	1081	add_font (char *file)
865	CODE:	1082	CODE:
866	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1083	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1084	OUTPUT:
		1085	RETVAL
867		1086
868	void	1087	void
869	load_image_inline (SV *image_)	1088	load_image_inline (SV *image_)
870	ALIAS:	1089	ALIAS:
871	load_image_file = 1	1090	load_image_file = 1
…		…
957	void	1176	void
958	error (char *message)	1177	error (char *message)
959	CODE:	1178	CODE:
960	fprintf (stderr, "ERROR: %s\n", message);	1179	fprintf (stderr, "ERROR: %s\n", message);
961	#ifdef _WIN32	1180	#ifdef _WIN32
962	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1181	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963	#endif	1182	#endif
964		1183
965	void	1184	void
966	fatal (char *message)	1185	fatal (char *message)
967	CODE:	1186	CODE:
968	fprintf (stderr, "FATAL: %s\n", message);	1187	fprintf (stderr, "FATAL: %s\n", message);
969	#ifdef _WIN32	1188	#ifdef _WIN32
970	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1189	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971	#endif	1190	#endif
972	_exit (1);	1191	_exit (1);
973		1192
974	void	1193	void
975	_exit (int retval = 0)	1194	_exit (int retval = 0)
…		…
987	#if DEBUG	1206	#if DEBUG
988	VALGRIND_DO_LEAK_CHECK;	1207	VALGRIND_DO_LEAK_CHECK;
989	#endif	1208	#endif
990	}	1209	}
991		1210
992	MODULE = CFPlus PACKAGE = CFPlus::Font	1211	MODULE = Deliantra::Client PACKAGE = DC::Font
993		1212
994	PROTOTYPES: DISABLE	1213	PROTOTYPES: DISABLE
995		1214
996	CFPlus::Font	1215	DC::Font
997	new_from_file (SV *class, char *path, int id = 0)	1216	new_from_file (SV *class, char *path, int id = 0)
998	CODE:	1217	CODE:
999	{	1218	{
1000	int count;	1219	int count;
1001	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1220	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1004	}	1223	}
1005	OUTPUT:	1224	OUTPUT:
1006	RETVAL	1225	RETVAL
1007		1226
1008	void	1227	void
1009	DESTROY (CFPlus::Font self)	1228	DESTROY (DC::Font self)
1010	CODE:	1229	CODE:
1011	pango_font_description_free (self);	1230	pango_font_description_free (self);
1012		1231
1013	void	1232	void
1014	make_default (CFPlus::Font self)	1233	make_default (DC::Font self)
1015	PROTOTYPE: $	1234	PROTOTYPE: $
1016	CODE:	1235	CODE:
1017	default_font = self;	1236	default_font = self;
1018		1237
1019	MODULE = CFPlus PACKAGE = CFPlus::Layout	1238	MODULE = Deliantra::Client PACKAGE = DC::Layout
1020		1239
1021	PROTOTYPES: DISABLE	1240	PROTOTYPES: DISABLE
1022		1241
1023	void	1242	void
1024	reset_glyph_cache ()	1243	glyph_cache_backup ()
1025	PROTOTYPE:	1244	PROTOTYPE:
1026	CODE:	1245	CODE:
		1246	tc_backup ();
		1247
		1248	void
		1249	glyph_cache_restore ()
		1250	PROTOTYPE:
		1251	CODE:
1027	tc_clear ();	1252	tc_restore ();
1028		1253
1029	CFPlus::Layout	1254	DC::Layout
1030	new (SV *class)	1255	new (SV *class)
1031	CODE:	1256	CODE:
1032	New (0, RETVAL, 1, struct cf_layout);	1257	New (0, RETVAL, 1, struct cf_layout);
1033		1258
1034	RETVAL->pl = pango_layout_new (opengl_context);	1259	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1036	RETVAL->g = 1.;	1261	RETVAL->g = 1.;
1037	RETVAL->b = 1.;	1262	RETVAL->b = 1.;
1038	RETVAL->a = 1.;	1263	RETVAL->a = 1.;
1039	RETVAL->base_height = MIN_FONT_HEIGHT;	1264	RETVAL->base_height = MIN_FONT_HEIGHT;
1040	RETVAL->font = 0;	1265	RETVAL->font = 0;
		1266	RETVAL->rc = rc_alloc ();
1041		1267
1042	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1268	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043	layout_update_font (RETVAL);	1269	layout_update_font (RETVAL);
1044	OUTPUT:	1270	OUTPUT:
1045	RETVAL	1271	RETVAL
1046		1272
1047	void	1273	void
1048	DESTROY (CFPlus::Layout self)	1274	DESTROY (DC::Layout self)
1049	CODE:	1275	CODE:
1050	g_object_unref (self->pl);	1276	g_object_unref (self->pl);
		1277	rc_free (self->rc);
1051	Safefree (self);	1278	Safefree (self);
1052		1279
1053	void	1280	void
1054	set_text (CFPlus::Layout self, SV *text_)	1281	set_text (DC::Layout self, SV *text_)
1055	CODE:	1282	CODE:
1056	{	1283	{
1057	STRLEN textlen;	1284	STRLEN textlen;
1058	char *text = SvPVutf8 (text_, textlen);	1285	char *text = SvPVutf8 (text_, textlen);
1059		1286
1060	pango_layout_set_text (self->pl, text, textlen);	1287	pango_layout_set_text (self->pl, text, textlen);
1061	}	1288	}
1062		1289
1063	void	1290	void
1064	set_markup (CFPlus::Layout self, SV *text_)	1291	set_markup (DC::Layout self, SV *text_)
1065	CODE:	1292	CODE:
1066	{	1293	{
1067	STRLEN textlen;	1294	STRLEN textlen;
1068	char *text = SvPVutf8 (text_, textlen);	1295	char *text = SvPVutf8 (text_, textlen);
1069		1296
1070	pango_layout_set_markup (self->pl, text, textlen);	1297	pango_layout_set_markup (self->pl, text, textlen);
1071	}	1298	}
1072		1299
1073	void	1300	void
1074	set_shapes (CFPlus::Layout self, ...)	1301	set_shapes (DC::Layout self, ...)
1075	CODE:	1302	CODE:
1076	{	1303	{
1077	PangoAttrList *attrs = 0;	1304	PangoAttrList *attrs = 0;
1078	const char *text = pango_layout_get_text (self->pl);	1305	const char *text = pango_layout_get_text (self->pl);
1079	const char *pos = text;	1306	const char *pos = text;
…		…
1114	if (attrs)	1341	if (attrs)
1115	pango_layout_set_attributes (self->pl, attrs);	1342	pango_layout_set_attributes (self->pl, attrs);
1116	}	1343	}
1117		1344
1118	void	1345	void
1119	get_shapes (CFPlus::Layout self)	1346	get_shapes (DC::Layout self)
1120	PPCODE:	1347	PPCODE:
1121	{	1348	{
1122	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1349	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123		1350
1124	do	1351	do
1125	{	1352	{
1126	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1353	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127		1354
1128	if (run && shape_attr_p (run))	1355	if (run && shape_attr_p (run))
1129	{	1356	{
1130	PangoRectangle extents;	1357	PangoRectangle extents;
1131	pango_layout_iter_get_run_extents (iter, 0, &extents);	1358	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1139		1366
1140	pango_layout_iter_free (iter);	1367	pango_layout_iter_free (iter);
1141	}	1368	}
1142		1369
1143	int	1370	int
1144	has_wrapped (CFPlus::Layout self)	1371	has_wrapped (DC::Layout self)
1145	CODE:	1372	CODE:
1146	{	1373	{
1147	int lines = 1;	1374	int lines = 1;
1148	const char *text = pango_layout_get_text (self->pl);	1375	const char *text = pango_layout_get_text (self->pl);
1149		1376
…		…
1154	}	1381	}
1155	OUTPUT:	1382	OUTPUT:
1156	RETVAL	1383	RETVAL
1157		1384
1158	SV *	1385	SV *
1159	get_text (CFPlus::Layout self)	1386	get_text (DC::Layout self)
1160	CODE:	1387	CODE:
1161	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1388	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162	sv_utf8_decode (RETVAL);	1389	sv_utf8_decode (RETVAL);
1163	OUTPUT:	1390	OUTPUT:
1164	RETVAL	1391	RETVAL
1165		1392
1166	void	1393	void
1167	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1394	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168	CODE:	1395	CODE:
1169	self->r = r;	1396	self->r = r;
1170	self->g = g;	1397	self->g = g;
1171	self->b = b;	1398	self->b = b;
1172	self->a = a;	1399	self->a = a;
1173		1400
1174	void	1401	void
1175	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1402	set_font (DC::Layout self, DC::Font font = 0)
1176	CODE:	1403	CODE:
1177	if (self->font != font)	1404	if (self->font != font)
1178	{	1405	{
1179	self->font = font;	1406	self->font = font;
1180	layout_update_font (self);	1407	layout_update_font (self);
1181	}	1408	}
1182		1409
1183	void	1410	void
1184	set_height (CFPlus::Layout self, int base_height)	1411	set_height (DC::Layout self, int base_height)
1185	CODE:	1412	CODE:
1186	if (self->base_height != base_height)	1413	if (self->base_height != base_height)
1187	{	1414	{
1188	self->base_height = base_height;	1415	self->base_height = base_height;
1189	layout_update_font (self);	1416	layout_update_font (self);
1190	}	1417	}
1191		1418
1192	void	1419	void
1193	set_width (CFPlus::Layout self, int max_width = -1)	1420	set_width (DC::Layout self, int max_width = -1)
1194	CODE:	1421	CODE:
1195	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1422	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196		1423
1197	void	1424	void
1198	set_indent (CFPlus::Layout self, int indent)	1425	set_indent (DC::Layout self, int indent)
1199	CODE:	1426	CODE:
1200	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1427	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201		1428
1202	void	1429	void
1203	set_spacing (CFPlus::Layout self, int spacing)	1430	set_spacing (DC::Layout self, int spacing)
1204	CODE:	1431	CODE:
1205	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1432	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206		1433
1207	void	1434	void
1208	set_ellipsise (CFPlus::Layout self, int ellipsise)	1435	set_ellipsise (DC::Layout self, int ellipsise)
1209	CODE:	1436	CODE:
1210	pango_layout_set_ellipsize (self->pl,	1437	pango_layout_set_ellipsize (self->pl,
1211	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1438	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1439	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1440	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214	: PANGO_ELLIPSIZE_NONE	1441	: PANGO_ELLIPSIZE_NONE
1215	);	1442	);
1216		1443
1217	void	1444	void
1218	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1445	set_single_paragraph_mode (DC::Layout self, int spm)
1219	CODE:	1446	CODE:
1220	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1447	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221		1448
1222	void	1449	void
1223	size (CFPlus::Layout self)	1450	size (DC::Layout self)
1224	PPCODE:	1451	PPCODE:
1225	{	1452	{
1226	int w, h;	1453	int w, h;
1227		1454
1228	layout_get_pixel_size (self, &w, &h);	1455	layout_get_pixel_size (self, &w, &h);
…		…
1231	PUSHs (sv_2mortal (newSViv (w)));	1458	PUSHs (sv_2mortal (newSViv (w)));
1232	PUSHs (sv_2mortal (newSViv (h)));	1459	PUSHs (sv_2mortal (newSViv (h)));
1233	}	1460	}
1234		1461
1235	int	1462	int
1236	descent (CFPlus::Layout self)	1463	descent (DC::Layout self)
1237	CODE:	1464	CODE:
1238	{	1465	{
1239	PangoRectangle rect;	1466	PangoRectangle rect;
1240	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1467	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241	pango_layout_line_get_pixel_extents (line, 0, &rect);	1468	pango_layout_line_get_pixel_extents (line, 0, &rect);
1242	RETVAL = PANGO_DESCENT (rect);	1469	RETVAL = PANGO_DESCENT (rect);
1243	}	1470	}
1244	OUTPUT:	1471	OUTPUT:
1245	RETVAL	1472	RETVAL
1246		1473
1247	int	1474	int
1248	xy_to_index (CFPlus::Layout self, int x, int y)	1475	xy_to_index (DC::Layout self, int x, int y)
1249	CODE:	1476	CODE:
1250	{	1477	{
1251	int index, trailing;	1478	int index, trailing;
1252	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1479	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253	RETVAL = index + trailing;	1480	RETVAL = index + trailing;
1254	}	1481	}
1255	OUTPUT:	1482	OUTPUT:
1256	RETVAL	1483	RETVAL
1257		1484
1258	void	1485	void
1259	cursor_pos (CFPlus::Layout self, int index)	1486	cursor_pos (DC::Layout self, int index)
1260	PPCODE:	1487	PPCODE:
1261	{	1488	{
1262	PangoRectangle strong_pos;	1489	PangoRectangle pos;
1263	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1490	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264		1491
1265	EXTEND (SP, 3);	1492	EXTEND (SP, 3);
1266	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1493	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1494	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1495	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269	}	1496	}
1270		1497
1271	void	1498	void
1272	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1499	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273	PPCODE:	1500	PPCODE:
1274	{	1501	{
1275	int line, x;	1502	int line, x;
1276		1503
1277	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1504	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1505	#if !PANGO_VERSION_CHECK (1, 17, 3)
1278	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1506	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279		1507	--line;
		1508	#endif
1280	EXTEND (SP, 2);	1509	EXTEND (SP, 2);
1281	PUSHs (sv_2mortal (newSViv (line - 1)));	1510	PUSHs (sv_2mortal (newSViv (line)));
1282	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1511	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283	}	1512	}
1284		1513
1285	void	1514	void
1286	line_x_to_index (CFPlus::Layout self, int line, int x)	1515	line_x_to_index (DC::Layout self, int line, int x)
1287	PPCODE:	1516	PPCODE:
1288	{	1517	{
1289	PangoLayoutLine *lp;	1518	PangoLayoutLine *lp;
1290	int index, trailing;	1519	int index, trailing;
1291		1520
1292	if (line < 0)	1521	if (line < 0)
1293	XSRETURN_EMPTY;	1522	XSRETURN_EMPTY;
1294		1523
1295	if (!(lp = pango_layout_get_line (self->pl, line)))	1524	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296	XSRETURN_EMPTY; /* do better */	1525	XSRETURN_EMPTY; /* do better */
1297		1526
1298	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1527	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299		1528
1300	EXTEND (SP, 2);	1529	EXTEND (SP, 2);
…		…
1306	PUSHs (sv_2mortal (newSViv (trailing)));	1535	PUSHs (sv_2mortal (newSViv (trailing)));
1307	}	1536	}
1308	}	1537	}
1309		1538
1310	void	1539	void
1311	render (CFPlus::Layout self, float x, float y, int flags = 0)	1540	render (DC::Layout self, float x, float y, int flags = 0)
1312	PPCODE:	1541	CODE:
		1542	rc_clear (self->rc);
1313	pango_opengl_render_layout_subpixel (	1543	pango_opengl_render_layout_subpixel (
1314	self->pl,	1544	self->pl,
		1545	self->rc,
1315	x * PANGO_SCALE, y * PANGO_SCALE,	1546	x * PANGO_SCALE, y * PANGO_SCALE,
1316	self->r, self->g, self->b, self->a,	1547	self->r, self->g, self->b, self->a,
1317	flags	1548	flags
1318	);	1549	);
		1550	// we assume that context_change actually clears/frees stuff
		1551	// and does not do any recomputation...
		1552	pango_layout_context_changed (self->pl);
1319		1553
1320	MODULE = CFPlus PACKAGE = CFPlus::Texture	1554	void
		1555	draw (DC::Layout self)
		1556	CODE:
		1557	{
		1558	glEnable (GL_TEXTURE_2D);
		1559	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1560	glEnable (GL_BLEND);
		1561	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1562	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1563	glEnable (GL_ALPHA_TEST);
		1564	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1565
		1566	rc_draw (self->rc);
		1567
		1568	glDisable (GL_ALPHA_TEST);
		1569	glDisable (GL_BLEND);
		1570	glDisable (GL_TEXTURE_2D);
		1571	}
		1572
		1573	MODULE = Deliantra::Client PACKAGE = DC::Texture
1321		1574
1322	PROTOTYPES: ENABLE	1575	PROTOTYPES: ENABLE
1323
1324	int minpot (int n)
1325		1576
1326	void	1577	void
1327	pad (SV *data_, int ow, int oh, int nw, int nh)	1578	pad (SV *data_, int ow, int oh, int nw, int nh)
1328	CODE:	1579	CODE:
1329	{	1580	{
…		…
1406	RETVAL = width > 0;	1657	RETVAL = width > 0;
1407	}	1658	}
1408	OUTPUT:	1659	OUTPUT:
1409	RETVAL	1660	RETVAL
1410		1661
1411	MODULE = CFPlus PACKAGE = CFPlus::Map	1662	MODULE = Deliantra::Client PACKAGE = DC::Map
1412		1663
1413	PROTOTYPES: DISABLE	1664	PROTOTYPES: DISABLE
1414		1665
1415	CFPlus::Map	1666	DC::Map
1416	new (SV *class)	1667	new (SV *class)
1417	CODE:	1668	CODE:
1418	New (0, RETVAL, 1, struct map);	1669	New (0, RETVAL, 1, struct map);
1419	RETVAL->x = 0;	1670	RETVAL->x = 0;
1420	RETVAL->y = 0;	1671	RETVAL->y = 0;
…		…
1428	RETVAL->row = 0;	1679	RETVAL->row = 0;
1429	OUTPUT:	1680	OUTPUT:
1430	RETVAL	1681	RETVAL
1431		1682
1432	void	1683	void
1433	DESTROY (CFPlus::Map self)	1684	DESTROY (DC::Map self)
1434	CODE:	1685	CODE:
1435	{	1686	{
1436	map_clear (self);	1687	map_clear (self);
1437	Safefree (self->face2tile);	1688	Safefree (self->face2tile);
1438	Safefree (self->tex);	1689	Safefree (self->tex);
1439	Safefree (self);	1690	Safefree (self);
1440	}	1691	}
1441		1692
1442	void	1693	void
1443	resize (CFPlus::Map self, int map_width, int map_height)	1694	resize (DC::Map self, int map_width, int map_height)
1444	CODE:	1695	CODE:
1445	self->w = map_width;	1696	self->w = map_width;
1446	self->h = map_height;	1697	self->h = map_height;
1447		1698
1448	void	1699	void
1449	clear (CFPlus::Map self)	1700	clear (DC::Map self)
1450	CODE:	1701	CODE:
1451	map_clear (self);	1702	map_clear (self);
1452		1703
1453	void	1704	void
1454	set_tileid (CFPlus::Map self, int face, int tile)	1705	set_tileid (DC::Map self, int face, int tile)
1455	CODE:	1706	CODE:
1456	{	1707	{
1457	need_facenum (self, face); self->face2tile [face] = tile;	1708	need_facenum (self, face); self->face2tile [face] = tile;
1458	need_texid (self, tile);	1709	need_texid (self, tile);
1459	}	1710	}
1460		1711
1461	void	1712	void
1462	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1713	set_smooth (DC::Map self, int face, int smooth, int level)
1463	CODE:	1714	CODE:
1464	{	1715	{
1465	tileid texid;	1716	tileid texid;
1466	maptex *tex;	1717	maptex *tex;
1467		1718
…		…
1480	tex->smoothtile = self->face2tile [smooth];	1731	tex->smoothtile = self->face2tile [smooth];
1481	tex->smoothlevel = level;	1732	tex->smoothlevel = level;
1482	}	1733	}
1483		1734
1484	void	1735	void
1485	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)	1736	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)
1486	CODE:	1737	CODE:
1487	{	1738	{
1488	need_texid (self, texid);	1739	need_texid (self, texid);
1489		1740
1490	{	1741	{
…		…
1510	// from transparent color bleeding and ugly wrapping effects.	1761	// from transparent color bleeding and ugly wrapping effects.
1511	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512	}	1763	}
1513		1764
1514	int	1765	int
1515	ox (CFPlus::Map self)	1766	ox (DC::Map self)
1516	ALIAS:	1767	ALIAS:
1517	oy = 1	1768	oy = 1
1518	x = 2	1769	x = 2
1519	y = 3	1770	y = 3
1520	w = 4	1771	w = 4
…		…
1531	}	1782	}
1532	OUTPUT:	1783	OUTPUT:
1533	RETVAL	1784	RETVAL
1534		1785
1535	void	1786	void
1536	scroll (CFPlus::Map self, int dx, int dy)	1787	scroll (DC::Map self, int dx, int dy)
1537	CODE:	1788	CODE:
1538	{	1789	{
1539	if (dx > 0)	1790	if (dx > 0)
1540	map_blank (self, self->x, self->y, dx, self->h);	1791	map_blank (self, self->x, self->y, dx, self->h);
1541	else if (dx < 0)	1792	else if (dx < 0)
…		…
1557	self->y += MAP_EXTEND_Y;	1808	self->y += MAP_EXTEND_Y;
1558	}	1809	}
1559	}	1810	}
1560		1811
1561	SV *	1812	SV *
1562	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1813	map1a_update (DC::Map self, SV *data_, int extmap)
1563	CODE:	1814	CODE:
1564	{	1815	{
1565	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1816	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566	uint8_t *data_end = (uint8_t *)SvEND (data_);	1817	uint8_t *data_end = (uint8_t *)SvEND (data_);
1567	mapcell *cell;	1818	mapcell *cell;
…		…
1595	uint8_t ext, cmd;	1846	uint8_t ext, cmd;
1596		1847
1597	do	1848	do
1598	{	1849	{
1599	ext = *data++;	1850	ext = *data++;
1600	cmd = ext & 0x3f;	1851	cmd = ext & 0x7f;
1601		1852
1602	if (cmd < 4)	1853	if (cmd < 4)
1603	cell->darkness = 255 - ext * 64 + 1;	1854	cell->darkness = 255 - ext * 64 + 1;
1604	else if (cmd == 5) // health	1855	else if (cmd == 5) // health
1605	{	1856	{
…		…
1608	}	1859	}
1609	else if (cmd == 6) // monster width	1860	else if (cmd == 6) // monster width
1610	cell->stat_width = *data++ + 1;	1861	cell->stat_width = *data++ + 1;
1611	else if (cmd == 0x47)	1862	else if (cmd == 0x47)
1612	{	1863	{
1613	if (*data == 4)	1864	if (*data == 1) cell->player = data [1];
1614	; // decode player count	1865	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1866	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1867	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615		1868
1616	data += *data + 1;	1869	data += *data + 1;
1617	}	1870	}
1618	else if (cmd == 8) // cell flags	1871	else if (cmd == 8) // cell flags
1619	cell->flags = *data++;	1872	cell->flags = *data++;
…		…
1649	}	1902	}
1650	}	1903	}
1651	}	1904	}
1652	}	1905	}
1653	else	1906	else
1654	cell->darkness = 0;	1907	CELL_CLEAR (cell);
1655	}	1908	}
1656	}	1909	}
1657	OUTPUT:	1910	OUTPUT:
1658	RETVAL	1911	RETVAL
1659		1912
1660	SV *	1913	SV *
1661	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1914	mapmap (DC::Map self, int x0, int y0, int w, int h)
1662	CODE:	1915	CODE:
1663	{	1916	{
1664	int x1, x;	1917	int x1, x;
1665	int y1, y;	1918	int y1, y;
1666	int z;	1919	int z;
…		…
1711	}	1964	}
1712	OUTPUT:	1965	OUTPUT:
1713	RETVAL	1966	RETVAL
1714		1967
1715	void	1968	void
1716	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1969	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1717	CODE:	1970	CODE:
1718	{	1971	{
1719	int x, y, z;	1972	int x, y, z;
1720		1973
1721	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1974	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1975	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1976	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724	smooth_key skey;	1977	smooth_key skey;
1725		1978	int pl_x, pl_y;
		1979	maptex pl_tex;
1726	rc_t *rc = rc_alloc ();	1980	rc_t *rc = rc_alloc ();
1727	rc_key_t key;	1981	rc_key_t key;
1728	rc_array_t *arr;	1982	rc_array_t *arr;
		1983
		1984	pl_tex.name = 0;
1729		1985
1730	// thats current max. sorry.	1986	// thats current max. sorry.
1731	if (sw > 255) sw = 255;	1987	if (sw > 255) sw = 255;
1732	if (sh > 255) sh = 255;	1988	if (sh > 255) sh = 255;
1733		1989
…		…
1788	tileid tile = cell->tile [z];	2044	tileid tile = cell->tile [z];
1789		2045
1790	if (tile)	2046	if (tile)
1791	{	2047	{
1792	maptex tex = self->tex [tile];	2048	maptex tex = self->tex [tile];
1793	int px, py;	2049	int px = (x + 1) * T - tex.w;
		2050	int py = (y + 1) * T - tex.h;
1794		2051
1795	// suppressing texture state switches here
1796	// is only moderately effective, but worth the extra effort
1797	if (key.texname != tex.name)	2052	if (key.texname != tex.name)
1798	{	2053	{
1799	if (!tex.name)	2054	if (!tex.name)
1800	tex = self->tex [2]; /* missing, replace by noface */	2055	tex = self->tex [2]; /* missing, replace by noface */
1801		2056
1802	key.texname = tex.name;	2057	key.texname = tex.name;
1803	arr = rc_array (rc, &key);	2058	arr = rc_array (rc, &key);
1804	}	2059	}
1805		2060
1806	px = (x + 1) * T - tex.w;	2061	if (expect_false (cell->player == player) && expect_false (z == 2))
1807	py = (y + 1) * T - tex.h;	2062	{
		2063	pl_x = px;
		2064	pl_y = py;
		2065	pl_tex = tex;
		2066	continue;
		2067	}
1808		2068
1809	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2069	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2070	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2071	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2072	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813		2073
1814	if (cell->flags && z == 2)	2074	if (expect_false (cell->flags) && expect_false (z == 2))
1815	{	2075	{
1816	// overlays such as the speech bubble, probably more to come	2076	// overlays such as the speech bubble, probably more to come
1817	if (cell->flags & 1)	2077	if (cell->flags & 1)
1818	{	2078	{
1819	maptex tex = self->tex [1];	2079	maptex tex = self->tex [1];
…		…
1884	// go through all smoothlevels, lowest to highest, then draw.	2144	// go through all smoothlevels, lowest to highest, then draw.
1885	// this is basically counting sort	2145	// this is basically counting sort
1886	{	2146	{
1887	int w, b;	2147	int w, b;
1888		2148
		2149	glEnable (GL_TEXTURE_2D);
		2150	glBegin (GL_QUADS);
1889	for (w = 0; w < 256 / 32; ++w)	2151	for (w = 0; w < 256 / 32; ++w)
1890	{	2152	{
1891	uint32_t smask = smooth_level [w];	2153	uint32_t smask = smooth_level [w];
1892	if (smask)	2154	if (smask)
1893	for (b = 0; b < 32; ++b)	2155	for (b = 0; b < 32; ++b)
…		…
1918	{	2180	{
1919	// this time avoiding texture state changes	2181	// this time avoiding texture state changes
1920	// save gobs of state changes.	2182	// save gobs of state changes.
1921	if (key.texname != tex.name)	2183	if (key.texname != tex.name)
1922	{	2184	{
		2185	glEnd ();
1923	key.texname = tex.name;	2186	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924	arr = rc_array (rc, &key);	2187	glBegin (GL_QUADS);
1925	}	2188	}
1926		2189
1927	if (border)	2190	if (border)
1928	{	2191	{
1929	float ox = border * dx;	2192	float ox = border * dx;
1930		2193
1931	rc_t2f_v3f (arr, ox , 0.f , px , py , 0);	2194	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932	rc_t2f_v3f (arr, ox , dy , px , py + T, 0);	2195	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933	rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);	2196	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934	rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);	2197	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935	}	2198	}
1936		2199
1937	if (corner)	2200	if (corner)
1938	{	2201	{
1939	float ox = corner * dx;	2202	float ox = corner * dx;
1940		2203
1941	rc_t2f_v3f (arr, ox , dy , px , py , 0);	2204	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942	rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);	2205	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943	rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);	2206	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1944	rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);	2207	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945	}	2208	}
1946	}	2209	}
1947	}	2210	}
1948	}	2211	}
1949	}	2212	}
1950	}	2213	}
		2214
		2215	glEnd ();
		2216	glDisable (GL_TEXTURE_2D);
		2217	key.texname = -1;
1951	}	2218	}
1952		2219
1953	hv_clear (smooth);	2220	hv_clear (smooth);
		2221	}
		2222
		2223	if (pl_tex.name)
		2224	{
		2225	maptex tex = pl_tex;
		2226	int px = pl_x + sdx;
		2227	int py = pl_y + sdy;
		2228
		2229	key.texname = tex.name;
		2230	arr = rc_array (rc, &key);
		2231
		2232	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2233	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2234	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2235	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2236
1954	rc_draw (rc);	2237	rc_draw (rc);
1955	rc_clear (rc);
1956	}	2238	}
1957		2239
1958	glDisable (GL_BLEND);	2240	glDisable (GL_BLEND);
1959	rc_free (rc);	2241	rc_free (rc);
1960		2242
…		…
1969	{	2251	{
1970	mapcell *cell = row->col + (x + mx - row->c0);	2252	mapcell *cell = row->col + (x + mx - row->c0);
1971		2253
1972	int px = x * T;	2254	int px = x * T;
1973	int py = y * T;	2255	int py = y * T;
		2256
		2257	if (expect_false (cell->player == player))
		2258	{
		2259	px += sdx;
		2260	py += sdy;
		2261	}
1974		2262
1975	if (cell->stat_hp)	2263	if (cell->stat_hp)
1976	{	2264	{
1977	int width = cell->stat_width * T;	2265	int width = cell->stat_width * T;
1978	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2266	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
1989	}	2277	}
1990	}	2278	}
1991	}	2279	}
1992		2280
1993	void	2281	void
1994	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2282	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1995	CODE:	2283	CODE:
1996	{	2284	{
1997	static float color[16][3] = {	2285	static float color[16][3] = {
1998	{ 0.00F, 0.00F, 0.00F },	2286	{ 0.00F, 0.00F, 0.00F },
1999	{ 1.00F, 1.00F, 1.00F },	2287	{ 1.00F, 1.00F, 1.00F },
…		…
2049	glDisable (GL_BLEND);	2337	glDisable (GL_BLEND);
2050	glDisable (GL_TEXTURE_2D);	2338	glDisable (GL_TEXTURE_2D);
2051	}	2339	}
2052		2340
2053	void	2341	void
2054	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2342	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055	PPCODE:	2343	PPCODE:
2056	{	2344	{
2057	int x, y;	2345	int x, y;
2058	int sw1 = sw + 2;	2346	int sw1 = sw + 2;
2059	int sh1 = sh + 2;	2347	int sh1 = sh + 2;
…		…
2067	SvCUR_set (darkness3_sv, sw34 * sh3);	2355	SvCUR_set (darkness3_sv, sw34 * sh3);
2068		2356
2069	mx += self->x - 1;	2357	mx += self->x - 1;
2070	my += self->y - 1;	2358	my += self->y - 1;
2071		2359
2072	memset (darkness1, 255, sw1 * sh1);	2360	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2073		2361
2074	for (y = 0; y < sh1; y++)	2362	for (y = 0; y < sh1; y++)
2075	if (0 <= y + my && y + my < self->rows)	2363	if (0 <= y + my && y + my < self->rows)
2076	{	2364	{
2077	maprow *row = self->row + (y + my);	2365	maprow *row = self->row + (y + my);
…		…
2130	PUSHs (sv_2mortal (newSViv (sh3)));	2418	PUSHs (sv_2mortal (newSViv (sh3)));
2131	PUSHs (darkness3_sv);	2419	PUSHs (darkness3_sv);
2132	}	2420	}
2133		2421
2134	SV *	2422	SV *
2135	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2423	get_rect (DC::Map self, int x0, int y0, int w, int h)
2136	CODE:	2424	CODE:
2137	{	2425	{
2138	int x, y, x1, y1;	2426	int x, y, x1, y1;
2139	SV *data_sv = newSV (w * h * 7 + 5);	2427	SV *data_sv = newSV (w * h * 7 + 5);
2140	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2428	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2197	else	2485	else
2198	*data++ = 0;	2486	*data++ = 0;
2199	}	2487	}
2200	}	2488	}
2201		2489
		2490	/* if size is w*h + 5 then no data has been found */
		2491	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2492	{
2202	SvPOK_only (data_sv);	2493	SvPOK_only (data_sv);
2203	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2494	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2495	}
		2496
2204	RETVAL = data_sv;	2497	RETVAL = data_sv;
2205	}	2498	}
2206	OUTPUT:	2499	OUTPUT:
2207	RETVAL	2500	RETVAL
2208		2501
2209	void	2502	void
2210	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2503	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211	PPCODE:	2504	PPCODE:
2212	{	2505	{
2213	int x, y, z;	2506	int x, y, z;
2214	int w, h;	2507	int w, h;
2215	int x1, y1;	2508	int x1, y1;
		2509	STRLEN len;
		2510	uint8_t *data, *end;
		2511
		2512	len = SvLEN (data_sv);
		2513	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2514	data = SvPVbyte_nolen (data_sv);
		2515	end = data + len + 8;
		2516
		2517	if (len < 5)
		2518	XSRETURN_EMPTY;
2216		2519
2217	if (*data++ != 0)	2520	if (*data++ != 0)
2218	return; /* version mismatch */	2521	XSRETURN_EMPTY; /* version mismatch */
2219		2522
2220	w = *data++ << 8; w |= *data++;	2523	w = *data++ << 8; w |= *data++;
2221	h = *data++ << 8; h |= *data++;	2524	h = *data++ << 8; h |= *data++;
2222		2525
2223	// we need to do this 'cause we don't keep an absolute coord system for rows	2526	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2235	{	2538	{
2236	maprow *row = map_get_row (self, y);	2539	maprow *row = map_get_row (self, y);
2237		2540
2238	for (x = x0; x < x1; x++)	2541	for (x = x0; x < x1; x++)
2239	{	2542	{
		2543	uint8_t flags;
		2544
		2545	if (data + 7 >= end)
		2546	XSRETURN_EMPTY;
		2547
2240	uint8_t flags = *data++;	2548	flags = *data++;
2241		2549
2242	if (flags)	2550	if (flags)
2243	{	2551	{
2244	mapcell *cell = row_get_cell (row, x);	2552	mapcell *cell = row_get_cell (row, x);
2245	tileid tile[3] = { 0, 0, 0 };	2553	tileid tile[3] = { 0, 0, 0 };
…		…
2248	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2556	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2557	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250		2558
2251	if (cell->darkness == 0)	2559	if (cell->darkness == 0)
2252	{	2560	{
2253	cell->darkness = 0;	2561	/*cell->darkness = 0;*/
		2562	EXTEND (SP, 3);
2254		2563
2255	for (z = 0; z <= 2; z++)	2564	for (z = 0; z <= 2; z++)
2256	{	2565	{
2257	tileid t = tile [z];	2566	tileid t = tile [z];
2258		2567
2259	if (t >= self->texs || (t && !self->tex [t].name))	2568	if (t >= self->texs || (t && !self->tex [t].name))
2260	{	2569	{
2261	XPUSHs (sv_2mortal (newSViv (t)));	2570	PUSHs (sv_2mortal (newSViv (t)));
2262	need_texid (self, t);	2571	need_texid (self, t);
2263	}	2572	}
2264		2573
2265	cell->tile [z] = t;	2574	cell->tile [z] = t;
2266	}	2575	}
…		…
2268	}	2577	}
2269	}	2578	}
2270	}	2579	}
2271	}	2580	}
2272		2581
2273	MODULE = CFPlus PACKAGE = CFPlus::RW	2582	MODULE = Deliantra::Client PACKAGE = DC::RW
2274		2583
2275	CFPlus::RW	2584	DC::RW
2276	new (SV *class, SV *data_sv)	2585	new (SV *class, SV *data_sv)
2277	CODE:	2586	CODE:
2278	{	2587	{
2279	STRLEN datalen;	2588	STRLEN datalen;
2280	char *data = SvPVbyte (data_sv, datalen);	2589	char *data = SvPVbyte (data_sv, datalen);
…		…
2282	RETVAL = SDL_RWFromConstMem (data, datalen);	2591	RETVAL = SDL_RWFromConstMem (data, datalen);
2283	}	2592	}
2284	OUTPUT:	2593	OUTPUT:
2285	RETVAL	2594	RETVAL
2286		2595
2287	CFPlus::RW	2596	DC::RW
2288	new_from_file (SV *class, const char *path, const char *mode = "rb")	2597	new_from_file (SV *class, const char *path, const char *mode = "rb")
2289	CODE:	2598	CODE:
2290	RETVAL = SDL_RWFromFile (path, mode);	2599	RETVAL = SDL_RWFromFile (path, mode);
2291	OUTPUT:	2600	OUTPUT:
2292	RETVAL	2601	RETVAL
2293		2602
2294	# fails on win32:	2603	# fails on win32:
2295	# CFPlus.xs(2268) : error C2059: syntax error : '('	2604	# dc.xs(2268) : error C2059: syntax error : '('
2296	#void	2605	#void
2297	#close (CFPlus::RW self)	2606	#close (DC::RW self)
2298	# CODE:	2607	# CODE:
2299	# (self->(close)) (self);	2608	# (self->(close)) (self);
2300		2609
2301	MODULE = CFPlus PACKAGE = CFPlus::Channel	2610	MODULE = Deliantra::Client PACKAGE = DC::Channel
2302		2611
2303	PROTOTYPES: DISABLE	2612	PROTOTYPES: DISABLE
2304		2613
2305	CFPlus::Channel	2614	DC::Channel
2306	find ()	2615	find ()
2307	CODE:	2616	CODE:
2308	{	2617	{
2309	RETVAL = Mix_GroupAvailable (-1);	2618	RETVAL = Mix_GroupAvailable (-1);
2310		2619
…		…
2323	}	2632	}
2324	OUTPUT:	2633	OUTPUT:
2325	RETVAL	2634	RETVAL
2326		2635
2327	void	2636	void
2328	halt (CFPlus::Channel self)	2637	halt (DC::Channel self)
2329	CODE:	2638	CODE:
2330	Mix_HaltChannel (self);	2639	Mix_HaltChannel (self);
2331		2640
2332	void	2641	void
2333	expire (CFPlus::Channel self, int ticks = -1)	2642	expire (DC::Channel self, int ticks = -1)
2334	CODE:	2643	CODE:
2335	Mix_ExpireChannel (self, ticks);	2644	Mix_ExpireChannel (self, ticks);
2336		2645
2337	void	2646	void
2338	fade_out (CFPlus::Channel self, int ticks = -1)	2647	fade_out (DC::Channel self, int ticks = -1)
2339	CODE:	2648	CODE:
2340	Mix_FadeOutChannel (self, ticks);	2649	Mix_FadeOutChannel (self, ticks);
2341		2650
2342	int	2651	int
2343	volume (CFPlus::Channel self, int volume)	2652	volume (DC::Channel self, int volume)
2344	CODE:	2653	CODE:
2345	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2654	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346	OUTPUT:	2655	OUTPUT:
2347	RETVAL	2656	RETVAL
2348		2657
2349	void	2658	void
2350	unregister_all_effects (CFPlus::Channel self)	2659	unregister_all_effects (DC::Channel self)
2351	CODE:	2660	CODE:
2352	Mix_UnregisterAllEffects (self);	2661	Mix_UnregisterAllEffects (self);
2353		2662
2354	void	2663	void
2355	set_panning (CFPlus::Channel self, int left, int right)	2664	set_panning (DC::Channel self, int left, int right)
2356	CODE:	2665	CODE:
2357	left = CLAMP (left , 0, 255);	2666	left = CLAMP (left , 0, 255);
2358	right = CLAMP (right, 0, 255);	2667	right = CLAMP (right, 0, 255);
2359	Mix_SetPanning (self, left, right);	2668	Mix_SetPanning (self, left, right);
2360		2669
2361	void	2670	void
2362	set_distance (CFPlus::Channel self, int distance)	2671	set_distance (DC::Channel self, int distance)
2363	CODE:	2672	CODE:
2364	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2673	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365		2674
2366	void	2675	void
2367	set_position (CFPlus::Channel self, int angle, int distance)	2676	set_position (DC::Channel self, int angle, int distance)
2368	CODE:	2677	CODE:
2369		2678
2370	void	2679	void
2371	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2680	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372	CODE:	2681	CODE:
2373	{	2682	{
2374	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2683	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2375	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2684	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2376	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2685	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377	}	2686	}
2378		2687
2379	void	2688	void
2380	set_reverse_stereo (CFPlus::Channel self, int flip)	2689	set_reverse_stereo (DC::Channel self, int flip)
2381	CODE:	2690	CODE:
2382	Mix_SetReverseStereo (self, flip);	2691	Mix_SetReverseStereo (self, flip);
2383		2692
2384	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2693	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385		2694
2386	PROTOTYPES: DISABLE	2695	PROTOTYPES: DISABLE
2387		2696
2388	CFPlus::MixChunk	2697	DC::MixChunk
2389	new (SV *class, CFPlus::RW rwops)	2698	new (SV *class, DC::RW rwops)
2390	CODE:	2699	CODE:
2391	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2700	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392	OUTPUT:	2701	OUTPUT:
2393	RETVAL	2702	RETVAL
2394		2703
2395	void	2704	void
2396	DESTROY (CFPlus::MixChunk self)	2705	DESTROY (DC::MixChunk self)
2397	CODE:	2706	CODE:
2398	Mix_FreeChunk (self);	2707	Mix_FreeChunk (self);
2399		2708
2400	int	2709	int
2401	volume (CFPlus::MixChunk self, int volume = -1)	2710	volume (DC::MixChunk self, int volume = -1)
2402	CODE:	2711	CODE:
2403	if (items > 1)	2712	if (items > 1)
2404	volume = CLAMP (volume, 0, 128);	2713	volume = CLAMP (volume, 0, 128);
2405	RETVAL = Mix_VolumeChunk (self, volume);	2714	RETVAL = Mix_VolumeChunk (self, volume);
2406	OUTPUT:	2715	OUTPUT:
2407	RETVAL	2716	RETVAL
2408		2717
2409	CFPlus::Channel	2718	DC::Channel
2410	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2719	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411	CODE:	2720	CODE:
2412	{	2721	{
2413	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2722	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414		2723
2415	if (RETVAL < 0)	2724	if (RETVAL < 0)
…		…
2422	}	2731	}
2423	}	2732	}
2424	OUTPUT:	2733	OUTPUT:
2425	RETVAL	2734	RETVAL
2426		2735
2427	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2736	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428		2737
2429	int	2738	int
2430	volume (int volume = -1)	2739	volume (int volume = -1)
2431	PROTOTYPE: ;$	2740	PROTOTYPE: ;$
2432	CODE:	2741	CODE:
…		…
2444	void	2753	void
2445	halt ()	2754	halt ()
2446	CODE:	2755	CODE:
2447	Mix_HaltMusic ();	2756	Mix_HaltMusic ();
2448		2757
2449	CFPlus::MixMusic	2758	DC::MixMusic
2450	new (SV *class, CFPlus::RW rwops)	2759	new (SV *class, DC::RW rwops)
2451	CODE:	2760	CODE:
2452	RETVAL = Mix_LoadMUS_RW (rwops);	2761	RETVAL = Mix_LoadMUS_RW (rwops);
2453	OUTPUT:	2762	OUTPUT:
2454	RETVAL	2763	RETVAL
2455		2764
2456	void	2765	void
2457	DESTROY (CFPlus::MixMusic self)	2766	DESTROY (DC::MixMusic self)
2458	CODE:	2767	CODE:
2459	Mix_FreeMusic (self);	2768	Mix_FreeMusic (self);
2460		2769
2461	int	2770	int
2462	play (CFPlus::MixMusic self, int loops = -1)	2771	play (DC::MixMusic self, int loops = -1)
2463	CODE:	2772	CODE:
2464	RETVAL = Mix_PlayMusic (self, loops);	2773	RETVAL = Mix_PlayMusic (self, loops);
2465	OUTPUT:	2774	OUTPUT:
2466	RETVAL	2775	RETVAL
2467		2776
2468	void	2777	void
2469	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2778	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470	CODE:	2779	CODE:
2471	Mix_FadeInMusicPos (self, loops, ms, position);	2780	Mix_FadeInMusicPos (self, loops, ms, position);
2472		2781
2473	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2782	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474		2783
2475	PROTOTYPES: ENABLE	2784	PROTOTYPES: ENABLE
2476		2785
2477	BOOT:	2786	BOOT:
2478	{	2787	{
2479	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2788	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480	static const struct {	2789	static const struct {
2481	const char *name;	2790	const char *name;
2482	IV iv;	2791	IV iv;
2483	} *civ, const_iv[] = {	2792	} *civ, const_iv[] = {
2484	# define const_iv(name) { # name, (IV)name }	2793	# define const_iv(name) { # name, (IV)name }
…		…
2519	const_iv (GL_INTENSITY),	2828	const_iv (GL_INTENSITY),
2520	const_iv (GL_LUMINANCE),	2829	const_iv (GL_LUMINANCE),
2521	const_iv (GL_LUMINANCE_ALPHA),	2830	const_iv (GL_LUMINANCE_ALPHA),
2522	const_iv (GL_FLOAT),	2831	const_iv (GL_FLOAT),
2523	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2832	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2833	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2834	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2835	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2836	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2837	const_iv (GL_COMPRESSED_RGB_ARB),
		2838	const_iv (GL_COMPRESSED_RGBA_ARB),
2524	const_iv (GL_COMPILE),	2839	const_iv (GL_COMPILE),
2525	const_iv (GL_PROXY_TEXTURE_1D),	2840	const_iv (GL_PROXY_TEXTURE_1D),
2526	const_iv (GL_PROXY_TEXTURE_2D),	2841	const_iv (GL_PROXY_TEXTURE_2D),
2527	const_iv (GL_TEXTURE_1D),	2842	const_iv (GL_TEXTURE_1D),
2528	const_iv (GL_TEXTURE_2D),	2843	const_iv (GL_TEXTURE_2D),
…		…
2567	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2882	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568	const_iv (GL_POINT_SMOOTH_HINT),	2883	const_iv (GL_POINT_SMOOTH_HINT),
2569	const_iv (GL_LINE_SMOOTH_HINT),	2884	const_iv (GL_LINE_SMOOTH_HINT),
2570	const_iv (GL_POLYGON_SMOOTH_HINT),	2885	const_iv (GL_POLYGON_SMOOTH_HINT),
2571	const_iv (GL_GENERATE_MIPMAP_HINT),	2886	const_iv (GL_GENERATE_MIPMAP_HINT),
		2887	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572	const_iv (GL_FASTEST),	2888	const_iv (GL_FASTEST),
2573	const_iv (GL_DONT_CARE),	2889	const_iv (GL_DONT_CARE),
2574	const_iv (GL_NICEST),	2890	const_iv (GL_NICEST),
2575	const_iv (GL_V2F),	2891	const_iv (GL_V2F),
2576	const_iv (GL_V3F),	2892	const_iv (GL_V3F),
…		…
2584		2900
2585	texture_av = newAV ();	2901	texture_av = newAV ();
2586	AvREAL_off (texture_av);	2902	AvREAL_off (texture_av);
2587	}	2903	}
2588		2904
		2905	void
		2906	disable_GL_EXT_blend_func_separate ()
		2907	CODE:
		2908	gl.BlendFuncSeparate = 0;
		2909	gl.BlendFuncSeparateEXT = 0;
		2910
2589	char *	2911	char *
2590	gl_vendor ()	2912	gl_vendor ()
2591	CODE:	2913	CODE:
2592	RETVAL = (char *)glGetString (GL_VENDOR);	2914	RETVAL = (char *)glGetString (GL_VENDOR);
2593	OUTPUT:	2915	OUTPUT:
…		…
2685	void glRotate (float angle, float x, float y, float z)	3007	void glRotate (float angle, float x, float y, float z)
2686	CODE:	3008	CODE:
2687	glRotatef (angle, x, y, z);	3009	glRotatef (angle, x, y, z);
2688		3010
2689	void glColor (float r, float g, float b, float a = 1.0)	3011	void glColor (float r, float g, float b, float a = 1.0)
		3012	PROTOTYPE: @
2690	ALIAS:	3013	ALIAS:
2691	glColor_premultiply = 1	3014	glColor_premultiply = 1
2692	CODE:	3015	CODE:
2693	if (ix)	3016	if (ix)
2694	{	3017	{
…		…
2714		3037
2715	void glRect (float x1, float y1, float x2, float y2)	3038	void glRect (float x1, float y1, float x2, float y2)
2716	CODE:	3039	CODE:
2717	glRectf (x1, y1, x2, y2);	3040	glRectf (x1, y1, x2, y2);
2718		3041
		3042	void glRect_lineloop (float x1, float y1, float x2, float y2)
		3043	CODE:
		3044	glBegin (GL_LINE_LOOP);
		3045	glVertex2f (x1, y1);
		3046	glVertex2f (x2, y1);
		3047	glVertex2f (x2, y2);
		3048	glVertex2f (x1, y2);
		3049	glEnd ();
		3050
2719	PROTOTYPES: ENABLE	3051	PROTOTYPES: ENABLE
2720		3052
2721	void glBegin (int mode)	3053	void glBegin (int mode)
2722		3054
2723	void glEnd ()	3055	void glEnd ()
…		…
2755	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3087	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756	CODE:	3088	CODE:
2757	if (gl.SeparableFilter2D)	3089	if (gl.SeparableFilter2D)
2758	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3090	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759		3091
2760	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3092	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761		3093
2762	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3094	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763		3095
2764	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3096	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765		3097
…		…
2791		3123
2792	void glEndList ()	3124	void glEndList ()
2793		3125
2794	void glCallList (int list)	3126	void glCallList (int list)
2795		3127
2796	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3128	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797		3129
2798	PROTOTYPES: DISABLE	3130	PROTOTYPES: DISABLE
2799		3131
2800	void	3132	void
2801	find_widget (SV *self, NV x, NV y)	3133	find_widget (SV *self, NV x, NV y)
…		…
2805	XPUSHs (self);	3137	XPUSHs (self);
2806	}	3138	}
2807		3139
2808	BOOT:	3140	BOOT:
2809	{	3141	{
2810	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3142	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811		3143
2812	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3144	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2813	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3145	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2814	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3146	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2815	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3147	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816	}	3148	}
2817		3149
2818	void	3150	void
2819	draw (SV *self)	3151	draw (SV *self)
2820	CODE:	3152	CODE:
…		…
2824	NV x, y, w, h;	3156	NV x, y, w, h;
2825	SV *draw_x_sv = GvSV (draw_x_gv);	3157	SV *draw_x_sv = GvSV (draw_x_gv);
2826	SV *draw_y_sv = GvSV (draw_y_gv);	3158	SV *draw_y_sv = GvSV (draw_y_gv);
2827	SV *draw_w_sv = GvSV (draw_w_gv);	3159	SV *draw_w_sv = GvSV (draw_w_gv);
2828	SV *draw_h_sv = GvSV (draw_h_gv);	3160	SV *draw_h_sv = GvSV (draw_h_gv);
2829	SV *hover;
2830	double draw_x, draw_y, draw_w, draw_h;	3161	double draw_x, draw_y;
2831		3162
2832	if (!SvROK (self))	3163	if (!SvROK (self))
2833	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3164	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834		3165
2835	hv = (HV *)SvRV (self);	3166	hv = (HV *)SvRV (self);
2836		3167
2837	if (SvTYPE (hv) != SVt_PVHV)	3168	if (SvTYPE (hv) != SVt_PVHV)
2838	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3169	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839		3170
2840	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3171	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2841	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3172	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842		3173
2843	if (!h || !w)	3174	if (!h || !w)
…		…
2863	{	3194	{
2864	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3195	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865		3196
2866	if (svp && SvTRUE (*svp))	3197	if (svp && SvTRUE (*svp))
2867	{	3198	{
2868	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3199	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869	glEnable (GL_BLEND);	3200	glEnable (GL_BLEND);
2870	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3201	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871	glBegin (GL_QUADS);	3202	glBegin (GL_QUADS);
2872	glVertex2f (0, 0);	3203	glVertex2f (0, 0);
2873	glVertex2f (w, 0);	3204	glVertex2f (w, 0);
…		…
2876	glEnd ();	3207	glEnd ();
2877	glDisable (GL_BLEND);	3208	glDisable (GL_BLEND);
2878	}	3209	}
2879	}	3210	}
2880	#if 0	3211	#if 0
2881	if ($ENV{CFPLUS_DEBUG} & 1) {	3212	// draw borders, for debugging
2882	glPushMatrix;	3213	glPushMatrix ();
2883	glColor 1, 1, 0, 1;	3214	glColor4f (1., 1., 0., 1.);
2884	glTranslate 0.375, 0.375;	3215	glTranslatef (.5, .5, 0.);
2885	glBegin GL_LINE_LOOP;	3216	glBegin (GL_LINE_LOOP);
2886	glVertex 0 , 0;	3217	glVertex2f (0 , 0);
2887	glVertex $self->{w} - 1, 0;	3218	glVertex2f (w - 1, 0);
2888	glVertex $self->{w} - 1, $self->{h} - 1;	3219	glVertex2f (w - 1, h - 1);
2889	glVertex 0 , $self->{h} - 1;	3220	glVertex2f (0 , h - 1);
2890	glEnd;	3221	glEnd ();
2891	glPopMatrix;	3222	glPopMatrix ();
2892	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893	}
2894	#endif	3223	#endif
2895	PUSHMARK (SP);	3224	PUSHMARK (SP);
2896	XPUSHs (self);	3225	XPUSHs (self);
2897	PUTBACK;	3226	PUTBACK;
2898	call_method ("_draw", G_VOID | G_DISCARD);	3227	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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