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.280 by root, Wed Nov 26 23:08:34 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;
		238	uint8_t unused; /* set to zero on use */
213	} maptex;	239	} maptex;
214		240
215	typedef struct {	241	typedef struct {
216	uint32_t player;	242	uint32_t player;
217	tileid tile[3];	243	tileid tile[3];
…		…
230	int faces; tileid *face2tile; // [faceid]	256	int faces; tileid *face2tile; // [faceid]
231	int texs; maptex *tex; // [tileid]	257	int texs; maptex *tex; // [tileid]
232		258
233	int32_t rows;	259	int32_t rows;
234	maprow *row;	260	maprow *row;
235	} *CFPlus__Map;	261	} *DC__Map;
236		262
237	static char *	263	static char *
238	prepend (char *ptr, int sze, int inc)	264	prepend (char *ptr, int sze, int inc)
239	{	265	{
240	char *p;	266	char *p;
…		…
278	self->texs *= 2;	304	self->texs *= 2;
279	}	305	}
280	}	306	}
281		307
282	static maprow *	308	static maprow *
283	map_get_row (CFPlus__Map self, int y)	309	map_get_row (DC__Map self, int y)
284	{	310	{
285	if (0 > y)	311	if (0 > y)
286	{	312	{
287	int extend = - y + MAP_EXTEND_Y;	313	int extend = - y + MAP_EXTEND_Y;
288	Prepend (maprow, self->row, self->rows, extend);	314	Prepend (maprow, self->row, self->rows, extend);
…		…
326		352
327	return row->col + (x - row->c0);	353	return row->col + (x - row->c0);
328	}	354	}
329		355
330	static mapcell *	356	static mapcell *
331	map_get_cell (CFPlus__Map self, int x, int y)	357	map_get_cell (DC__Map self, int x, int y)
332	{	358	{
333	return row_get_cell (map_get_row (self, y), x);	359	return row_get_cell (map_get_row (self, y), x);
334	}	360	}
335		361
336	static void	362	static void
337	map_clear (CFPlus__Map self)	363	map_clear (DC__Map self)
338	{	364	{
339	int r;	365	int r;
340		366
341	for (r = 0; r < self->rows; r++)	367	for (r = 0; r < self->rows; r++)
342	Safefree (self->row[r].col);	368	Safefree (self->row[r].col);
…		…
349	self->oy = 0;	375	self->oy = 0;
350	self->row = 0;	376	self->row = 0;
351	self->rows = 0;	377	self->rows = 0;
352	}	378	}
353		379
		380	#define CELL_CLEAR(cell) \
		381	do { \
		382	if ((cell)->player) \
		383	(cell)->tile [2] = 0; \
		384	(cell)->darkness = 0; \
		385	(cell)->stat_hp = 0; \
		386	(cell)->flags = 0; \
		387	(cell)->player = 0; \
		388	} while (0)
		389
354	static void	390	static void
355	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	391	map_blank (DC__Map self, int x0, int y0, int w, int h)
356	{	392	{
357	int x, y;	393	int x, y;
358	maprow *row;	394	maprow *row;
359	mapcell *cell;	395	mapcell *cell;
360		396
…		…
372	if (x >= row->c1)	408	if (x >= row->c1)
373	break;	409	break;
374		410
375	cell = row->col + x - row->c0;	411	cell = row->col + x - row->c0;
376		412
377	cell->darkness = 0;	413	CELL_CLEAR (cell);
378	cell->stat_hp = 0;
379	cell->flags = 0;
380	cell->player = 0;
381	}	414	}
382	}	415	}
383	}	416	}
384		417
385	typedef struct {	418	typedef struct {
…		…
439	n |= n >> 16;	472	n |= n >> 16;
440		473
441	return n + 1;	474	return n + 1;
442	}	475	}
443		476
		477	static unsigned int
		478	popcount (unsigned int n)
		479	{
		480	n -= (n >> 1) & 0x55555555U;
		481	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		482	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		483	n *= 0x01010101U;
		484
		485	return n >> 24;
		486	}
		487
444	/* SDL should provide this, really. */	488	/* SDL should provide this, really. */
445	#define SDLK_MODIFIER_MIN 300	489	#define SDLK_MODIFIER_MIN 300
446	#define SDLK_MODIFIER_MAX 314	490	#define SDLK_MODIFIER_MAX 314
447		491
448	/******************************************************************************/	492	/******************************************************************************/
…		…
486	return 0;	530	return 0;
487		531
488	return 1;	532	return 1;
489	}	533	}
490		534
491	MODULE = CFPlus PACKAGE = CFPlus	535	/******************************************************************************/
		536
		537	/* process keyboard modifiers */
		538	static int
		539	mod_munge (int mod)
		540	{
		541	mod &= MOD_MASK;
		542
		543	if (mod & (KMOD_META | KMOD_ALT))
		544	mod |= KMOD_LRAM;
		545
		546	return mod;
		547	}
		548
		549	static void
		550	deliantra_main ()
		551	{
		552	char *argv[] = { 0 };
		553	call_argv ("::main", G_DISCARD | G_VOID, argv);
		554	}
		555
		556	#ifdef __MACOSX__
		557	/* to due surprising braindamage on the side of SDL design, we
		558	* do some mind-boggling hack here: SDL requires a custom main()
		559	* on OS X, so... we provide one and call the original main(), which,
		560	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		561	* and which calls our main (== SDL_main) back.
		562	*/
		563	extern C_LINKAGE int
		564	main (int argc, char *argv[])
		565	{
		566	deliantra_main ();
		567	}
		568
		569	#undef main
		570
		571	extern C_LINKAGE int main (int argc, char *argv[]);
		572
		573	static void
		574	SDL_braino (void)
		575	{
		576	char *argv[] = { "deliantra client", 0 };
		577	(main) (1, argv);
		578	}
		579	#else
		580	static void
		581	SDL_braino (void)
		582	{
		583	deliantra_main ();
		584	}
		585	#endif
		586
		587	MODULE = Deliantra::Client PACKAGE = DC
492		588
493	PROTOTYPES: ENABLE	589	PROTOTYPES: ENABLE
494		590
495	BOOT:	591	BOOT:
496	{	592	{
497	HV *stash = gv_stashpv ("CFPlus", 1);	593	HV *stash = gv_stashpv ("DC", 1);
498	static const struct {	594	static const struct {
499	const char *name;	595	const char *name;
500	IV iv;	596	IV iv;
501	} *civ, const_iv[] = {	597	} *civ, const_iv[] = {
502	# define const_iv(name) { # name, (IV)name }	598	# define const_iv(name) { # name, (IV)name }
…		…
524		620
525	const_iv (SDL_APPINPUTFOCUS),	621	const_iv (SDL_APPINPUTFOCUS),
526	const_iv (SDL_APPMOUSEFOCUS),	622	const_iv (SDL_APPMOUSEFOCUS),
527	const_iv (SDL_APPACTIVE),	623	const_iv (SDL_APPACTIVE),
528		624
		625
		626	const_iv (SDLK_UNKNOWN),
		627	const_iv (SDLK_FIRST),
		628	const_iv (SDLK_BACKSPACE),
		629	const_iv (SDLK_TAB),
		630	const_iv (SDLK_CLEAR),
		631	const_iv (SDLK_RETURN),
		632	const_iv (SDLK_PAUSE),
		633	const_iv (SDLK_ESCAPE),
		634	const_iv (SDLK_SPACE),
		635	const_iv (SDLK_EXCLAIM),
		636	const_iv (SDLK_QUOTEDBL),
		637	const_iv (SDLK_HASH),
		638	const_iv (SDLK_DOLLAR),
		639	const_iv (SDLK_AMPERSAND),
		640	const_iv (SDLK_QUOTE),
		641	const_iv (SDLK_LEFTPAREN),
		642	const_iv (SDLK_RIGHTPAREN),
		643	const_iv (SDLK_ASTERISK),
		644	const_iv (SDLK_PLUS),
		645	const_iv (SDLK_COMMA),
		646	const_iv (SDLK_MINUS),
		647	const_iv (SDLK_PERIOD),
		648	const_iv (SDLK_SLASH),
		649	const_iv (SDLK_0),
		650	const_iv (SDLK_1),
		651	const_iv (SDLK_2),
		652	const_iv (SDLK_3),
		653	const_iv (SDLK_4),
		654	const_iv (SDLK_5),
		655	const_iv (SDLK_6),
		656	const_iv (SDLK_7),
		657	const_iv (SDLK_8),
		658	const_iv (SDLK_9),
		659	const_iv (SDLK_COLON),
		660	const_iv (SDLK_SEMICOLON),
		661	const_iv (SDLK_LESS),
		662	const_iv (SDLK_EQUALS),
		663	const_iv (SDLK_GREATER),
		664	const_iv (SDLK_QUESTION),
		665	const_iv (SDLK_AT),
		666
		667	const_iv (SDLK_LEFTBRACKET),
		668	const_iv (SDLK_BACKSLASH),
		669	const_iv (SDLK_RIGHTBRACKET),
		670	const_iv (SDLK_CARET),
		671	const_iv (SDLK_UNDERSCORE),
		672	const_iv (SDLK_BACKQUOTE),
		673	const_iv (SDLK_DELETE),
		674
		675	const_iv (SDLK_FIRST),
		676	const_iv (SDLK_LAST),
529	const_iv (SDLK_KP0),	677	const_iv (SDLK_KP0),
530	const_iv (SDLK_KP1),	678	const_iv (SDLK_KP1),
531	const_iv (SDLK_KP2),	679	const_iv (SDLK_KP2),
532	const_iv (SDLK_KP3),	680	const_iv (SDLK_KP3),
533	const_iv (SDLK_KP4),	681	const_iv (SDLK_KP4),
…		…
605	const_iv (KMOD_LMETA),	753	const_iv (KMOD_LMETA),
606	const_iv (KMOD_RMETA),	754	const_iv (KMOD_RMETA),
607	const_iv (KMOD_NUM),	755	const_iv (KMOD_NUM),
608	const_iv (KMOD_CAPS),	756	const_iv (KMOD_CAPS),
609	const_iv (KMOD_MODE),	757	const_iv (KMOD_MODE),
		758
		759	const_iv (KMOD_LRAM),
		760
		761	const_iv (MIX_DEFAULT_FORMAT),
		762
		763	const_iv (SDL_INIT_TIMER),
		764	const_iv (SDL_INIT_AUDIO),
		765	const_iv (SDL_INIT_VIDEO),
		766	const_iv (SDL_INIT_CDROM),
		767	const_iv (SDL_INIT_JOYSTICK),
		768	const_iv (SDL_INIT_EVERYTHING),
		769	const_iv (SDL_INIT_NOPARACHUTE),
		770	const_iv (SDL_INIT_EVENTTHREAD),
		771
		772	const_iv (SDL_GL_RED_SIZE),
		773	const_iv (SDL_GL_GREEN_SIZE),
		774	const_iv (SDL_GL_BLUE_SIZE),
		775	const_iv (SDL_GL_ALPHA_SIZE),
		776	const_iv (SDL_GL_DOUBLEBUFFER),
		777	const_iv (SDL_GL_BUFFER_SIZE),
		778	const_iv (SDL_GL_DEPTH_SIZE),
		779	const_iv (SDL_GL_STENCIL_SIZE),
		780	const_iv (SDL_GL_ACCUM_RED_SIZE),
		781	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		782	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		783	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		784	const_iv (SDL_GL_STEREO),
		785	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		786	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		787	const_iv (SDL_GL_ACCELERATED_VISUAL),
		788	const_iv (SDL_GL_SWAP_CONTROL),
		789
		790	const_iv (FOW_DARKNESS)
610	# undef const_iv	791	# undef const_iv
611	};	792	};
612		793
613	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	794	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	795	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
632		813
633	NV floor (NV x)	814	NV floor (NV x)
634		815
635	NV ceil (NV x)	816	NV ceil (NV x)
636		817
		818	IV minpot (UV n)
		819
		820	IV popcount (UV n)
		821
637	void	822	void
638	pango_init ()	823	pango_init ()
639	CODE:	824	CODE:
640	{	825	{
641	opengl_fontmap = pango_opengl_font_map_new ();	826	opengl_fontmap = pango_opengl_font_map_new ();
642	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	827	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);	828	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		829	/*pango_context_set_font_description (opengl_context, default_font);*/
		830	#if PANGO_VERSION_CHECK (1, 15, 2)
		831	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		832	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		833	#endif
644	}	834	}
645		835
646	char *
647	SDL_GetError ()	836	char *SDL_GetError ()
648		837
649	int	838	void SDL_braino ()
650	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651		839
652	void	840	int SDL_Init (U32 flags)
		841
		842	int SDL_InitSubSystem (U32 flags)
		843
		844	void SDL_QuitSubSystem (U32 flags)
		845
653	SDL_Quit ()	846	void SDL_Quit ()
		847
		848	int SDL_GL_SetAttribute (int attr, int value)
		849
		850	int SDL_GL_GetAttribute (int attr)
		851	CODE:
		852	if (SDL_GL_GetAttribute (attr, &RETVAL))
		853	XSRETURN_UNDEF;
		854	OUTPUT:
		855	RETVAL
654		856
655	void	857	void
656	SDL_ListModes (int rgb, int alpha)	858	SDL_ListModes (int rgb, int alpha)
657	PPCODE:	859	PPCODE:
658	{	860	{
…		…
670	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	872	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	873	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	874	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673		875
674	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	876	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);	877	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678	#endif
679		878
680	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	879	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681		880
682	if (m && m != (SDL_Rect **)-1)	881	if (m && m != (SDL_Rect **)-1)
683	while (*m)	882	while (*m)
684	{	883	{
685	if ((*m)->w >= 640 && (*m)->h >= 480)	884	if ((*m)->w >= 400 && (*m)->h >= 300)
686	{	885	{
687	AV *av = newAV ();	886	AV *av = newAV ();
688	av_push (av, newSViv ((*m)->w));	887	av_push (av, newSViv ((*m)->w));
689	av_push (av, newSViv ((*m)->h));	888	av_push (av, newSViv ((*m)->h));
690	av_push (av, newSViv (rgb));	889	av_push (av, newSViv (rgb));
…		…
714		913
715	if (RETVAL)	914	if (RETVAL)
716	{	915	{
717	av_clear (texture_av);	916	av_clear (texture_av);
718		917
719	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	918	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	919	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721	#include "glfunc.h"	920	#include "glfunc.h"
722	#undef GL_FUNC	921	#undef GL_FUNC
723	}	922	}
724	}	923	}
…		…
731	char *	930	char *
732	SDL_GetKeyName (int sym)	931	SDL_GetKeyName (int sym)
733		932
734	int	933	int
735	SDL_GetAppState ()	934	SDL_GetAppState ()
		935
		936	int
		937	SDL_GetModState ()
736		938
737	void	939	void
738	poll_events ()	940	poll_events ()
739	PPCODE:	941	PPCODE:
740	{	942	{
…		…
750	{	952	{
751	case SDL_KEYDOWN:	953	case SDL_KEYDOWN:
752	case SDL_KEYUP:	954	case SDL_KEYUP:
753	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	955	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	956	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	957	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 */	958	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);	959	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758	break;	960	break;
759		961
760	case SDL_ACTIVEEVENT:	962	case SDL_ACTIVEEVENT:
761	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	963	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
779	x = ev.motion.x;	981	x = ev.motion.x;
780	y = ev.motion.y;	982	y = ev.motion.y;
781	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	983	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782	}	984	}
783		985
784	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	986	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785	hv_store (hv, "state", 5, newSViv (state), 0);	987	hv_store (hv, "state", 5, newSViv (state), 0);
786	hv_store (hv, "x", 1, newSViv (x), 0);	988	hv_store (hv, "x", 1, newSViv (x), 0);
787	hv_store (hv, "y", 1, newSViv (y), 0);	989	hv_store (hv, "y", 1, newSViv (y), 0);
788	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	990	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	991	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790	}	992	}
791	break;	993	break;
792		994
793	case SDL_MOUSEBUTTONDOWN:	995	case SDL_MOUSEBUTTONDOWN:
794	case SDL_MOUSEBUTTONUP:	996	case SDL_MOUSEBUTTONUP:
795	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	997	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796		998
797	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	999	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1000	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1001	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1002	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
805	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1007	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1008	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807	break;	1009	break;
808	}	1010	}
809		1011
810	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	1012	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811	}	1013	}
812	}	1014	}
813		1015
814	int	1016	int
815	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	1017	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816	POSTCALL:	1018	POSTCALL:
817	Mix_HookMusicFinished (music_finished);	1019	Mix_HookMusicFinished (music_finished);
818	Mix_ChannelFinished (channel_finished);	1020	Mix_ChannelFinished (channel_finished);
		1021
		1022	void
		1023	Mix_QuerySpec ()
		1024	PPCODE:
		1025	{
		1026	int freq, channels;
		1027	Uint16 format;
		1028
		1029	if (Mix_QuerySpec (&freq, &format, &channels))
		1030	{
		1031	EXTEND (SP, 3);
		1032	PUSHs (sv_2mortal (newSViv (freq)));
		1033	PUSHs (sv_2mortal (newSViv (format)));
		1034	PUSHs (sv_2mortal (newSViv (channels)));
		1035	}
		1036	}
819		1037
820	void	1038	void
821	Mix_CloseAudio ()	1039	Mix_CloseAudio ()
822		1040
823	int	1041	int
…		…
858	}	1076	}
859	}	1077	}
860	#endif	1078	#endif
861	}	1079	}
862		1080
863	void	1081	int
864	add_font (char *file)	1082	add_font (char *file)
865	CODE:	1083	CODE:
866	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1084	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1085	OUTPUT:
		1086	RETVAL
867		1087
868	void	1088	void
869	load_image_inline (SV *image_)	1089	load_image_inline (SV *image_)
870	ALIAS:	1090	ALIAS:
871	load_image_file = 1	1091	load_image_file = 1
…		…
957	void	1177	void
958	error (char *message)	1178	error (char *message)
959	CODE:	1179	CODE:
960	fprintf (stderr, "ERROR: %s\n", message);	1180	fprintf (stderr, "ERROR: %s\n", message);
961	#ifdef _WIN32	1181	#ifdef _WIN32
962	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1182	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963	#endif	1183	#endif
964		1184
965	void	1185	void
966	fatal (char *message)	1186	fatal (char *message)
967	CODE:	1187	CODE:
968	fprintf (stderr, "FATAL: %s\n", message);	1188	fprintf (stderr, "FATAL: %s\n", message);
969	#ifdef _WIN32	1189	#ifdef _WIN32
970	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1190	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971	#endif	1191	#endif
972	_exit (1);	1192	_exit (1);
973		1193
974	void	1194	void
975	_exit (int retval = 0)	1195	_exit (int retval = 0)
…		…
987	#if DEBUG	1207	#if DEBUG
988	VALGRIND_DO_LEAK_CHECK;	1208	VALGRIND_DO_LEAK_CHECK;
989	#endif	1209	#endif
990	}	1210	}
991		1211
992	MODULE = CFPlus PACKAGE = CFPlus::Font	1212	int
		1213	SvREFCNT (SV *sv)
		1214	CODE:
		1215	RETVAL = SvREFCNT (sv);
		1216	OUTPUT:
		1217	RETVAL
		1218
		1219	MODULE = Deliantra::Client PACKAGE = DC::Font
993		1220
994	PROTOTYPES: DISABLE	1221	PROTOTYPES: DISABLE
995		1222
996	CFPlus::Font	1223	DC::Font
997	new_from_file (SV *class, char *path, int id = 0)	1224	new_from_file (SV *class, char *path, int id = 0)
998	CODE:	1225	CODE:
999	{	1226	{
1000	int count;	1227	int count;
1001	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1228	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1004	}	1231	}
1005	OUTPUT:	1232	OUTPUT:
1006	RETVAL	1233	RETVAL
1007		1234
1008	void	1235	void
1009	DESTROY (CFPlus::Font self)	1236	DESTROY (DC::Font self)
1010	CODE:	1237	CODE:
1011	pango_font_description_free (self);	1238	pango_font_description_free (self);
1012		1239
1013	void	1240	void
1014	make_default (CFPlus::Font self)	1241	make_default (DC::Font self)
1015	PROTOTYPE: $	1242	PROTOTYPE: $
1016	CODE:	1243	CODE:
1017	default_font = self;	1244	default_font = self;
1018		1245
1019	MODULE = CFPlus PACKAGE = CFPlus::Layout	1246	MODULE = Deliantra::Client PACKAGE = DC::Layout
1020		1247
1021	PROTOTYPES: DISABLE	1248	PROTOTYPES: DISABLE
1022		1249
1023	void	1250	void
1024	reset_glyph_cache ()	1251	glyph_cache_backup ()
1025	PROTOTYPE:	1252	PROTOTYPE:
1026	CODE:	1253	CODE:
		1254	tc_backup ();
		1255
		1256	void
		1257	glyph_cache_restore ()
		1258	PROTOTYPE:
		1259	CODE:
1027	tc_clear ();	1260	tc_restore ();
1028		1261
1029	CFPlus::Layout	1262	DC::Layout
1030	new (SV *class)	1263	new (SV *class)
1031	CODE:	1264	CODE:
1032	New (0, RETVAL, 1, struct cf_layout);	1265	New (0, RETVAL, 1, struct cf_layout);
1033		1266
1034	RETVAL->pl = pango_layout_new (opengl_context);	1267	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1036	RETVAL->g = 1.;	1269	RETVAL->g = 1.;
1037	RETVAL->b = 1.;	1270	RETVAL->b = 1.;
1038	RETVAL->a = 1.;	1271	RETVAL->a = 1.;
1039	RETVAL->base_height = MIN_FONT_HEIGHT;	1272	RETVAL->base_height = MIN_FONT_HEIGHT;
1040	RETVAL->font = 0;	1273	RETVAL->font = 0;
		1274	RETVAL->rc = rc_alloc ();
1041		1275
1042	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1276	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043	layout_update_font (RETVAL);	1277	layout_update_font (RETVAL);
1044	OUTPUT:	1278	OUTPUT:
1045	RETVAL	1279	RETVAL
1046		1280
1047	void	1281	void
1048	DESTROY (CFPlus::Layout self)	1282	DESTROY (DC::Layout self)
1049	CODE:	1283	CODE:
1050	g_object_unref (self->pl);	1284	g_object_unref (self->pl);
		1285	rc_free (self->rc);
1051	Safefree (self);	1286	Safefree (self);
1052		1287
1053	void	1288	void
1054	set_text (CFPlus::Layout self, SV *text_)	1289	set_text (DC::Layout self, SV *text_)
1055	CODE:	1290	CODE:
1056	{	1291	{
1057	STRLEN textlen;	1292	STRLEN textlen;
1058	char *text = SvPVutf8 (text_, textlen);	1293	char *text = SvPVutf8 (text_, textlen);
1059		1294
1060	pango_layout_set_text (self->pl, text, textlen);	1295	pango_layout_set_text (self->pl, text, textlen);
1061	}	1296	}
1062		1297
1063	void	1298	void
1064	set_markup (CFPlus::Layout self, SV *text_)	1299	set_markup (DC::Layout self, SV *text_)
1065	CODE:	1300	CODE:
1066	{	1301	{
1067	STRLEN textlen;	1302	STRLEN textlen;
1068	char *text = SvPVutf8 (text_, textlen);	1303	char *text = SvPVutf8 (text_, textlen);
1069		1304
1070	pango_layout_set_markup (self->pl, text, textlen);	1305	pango_layout_set_markup (self->pl, text, textlen);
1071	}	1306	}
1072		1307
1073	void	1308	void
1074	set_shapes (CFPlus::Layout self, ...)	1309	set_shapes (DC::Layout self, ...)
1075	CODE:	1310	CODE:
1076	{	1311	{
1077	PangoAttrList *attrs = 0;	1312	PangoAttrList *attrs = 0;
1078	const char *text = pango_layout_get_text (self->pl);	1313	const char *text = pango_layout_get_text (self->pl);
1079	const char *pos = text;	1314	const char *pos = text;
…		…
1114	if (attrs)	1349	if (attrs)
1115	pango_layout_set_attributes (self->pl, attrs);	1350	pango_layout_set_attributes (self->pl, attrs);
1116	}	1351	}
1117		1352
1118	void	1353	void
1119	get_shapes (CFPlus::Layout self)	1354	get_shapes (DC::Layout self)
1120	PPCODE:	1355	PPCODE:
1121	{	1356	{
1122	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1357	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123		1358
1124	do	1359	do
1125	{	1360	{
1126	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1361	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127		1362
1128	if (run && shape_attr_p (run))	1363	if (run && shape_attr_p (run))
1129	{	1364	{
1130	PangoRectangle extents;	1365	PangoRectangle extents;
1131	pango_layout_iter_get_run_extents (iter, 0, &extents);	1366	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1139		1374
1140	pango_layout_iter_free (iter);	1375	pango_layout_iter_free (iter);
1141	}	1376	}
1142		1377
1143	int	1378	int
1144	has_wrapped (CFPlus::Layout self)	1379	has_wrapped (DC::Layout self)
1145	CODE:	1380	CODE:
1146	{	1381	{
1147	int lines = 1;	1382	int lines = 1;
1148	const char *text = pango_layout_get_text (self->pl);	1383	const char *text = pango_layout_get_text (self->pl);
1149		1384
…		…
1154	}	1389	}
1155	OUTPUT:	1390	OUTPUT:
1156	RETVAL	1391	RETVAL
1157		1392
1158	SV *	1393	SV *
1159	get_text (CFPlus::Layout self)	1394	get_text (DC::Layout self)
1160	CODE:	1395	CODE:
1161	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1396	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162	sv_utf8_decode (RETVAL);	1397	sv_utf8_decode (RETVAL);
1163	OUTPUT:	1398	OUTPUT:
1164	RETVAL	1399	RETVAL
1165		1400
1166	void	1401	void
1167	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1402	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168	CODE:	1403	CODE:
1169	self->r = r;	1404	self->r = r;
1170	self->g = g;	1405	self->g = g;
1171	self->b = b;	1406	self->b = b;
1172	self->a = a;	1407	self->a = a;
1173		1408
1174	void	1409	void
1175	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1410	set_font (DC::Layout self, DC::Font font = 0)
1176	CODE:	1411	CODE:
1177	if (self->font != font)	1412	if (self->font != font)
1178	{	1413	{
1179	self->font = font;	1414	self->font = font;
1180	layout_update_font (self);	1415	layout_update_font (self);
1181	}	1416	}
1182		1417
1183	void	1418	void
1184	set_height (CFPlus::Layout self, int base_height)	1419	set_height (DC::Layout self, int base_height)
1185	CODE:	1420	CODE:
1186	if (self->base_height != base_height)	1421	if (self->base_height != base_height)
1187	{	1422	{
1188	self->base_height = base_height;	1423	self->base_height = base_height;
1189	layout_update_font (self);	1424	layout_update_font (self);
1190	}	1425	}
1191		1426
1192	void	1427	void
1193	set_width (CFPlus::Layout self, int max_width = -1)	1428	set_width (DC::Layout self, int max_width = -1)
1194	CODE:	1429	CODE:
1195	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1430	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196		1431
1197	void	1432	void
1198	set_indent (CFPlus::Layout self, int indent)	1433	set_indent (DC::Layout self, int indent)
1199	CODE:	1434	CODE:
1200	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1435	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201		1436
1202	void	1437	void
1203	set_spacing (CFPlus::Layout self, int spacing)	1438	set_spacing (DC::Layout self, int spacing)
1204	CODE:	1439	CODE:
1205	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1440	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206		1441
1207	void	1442	void
1208	set_ellipsise (CFPlus::Layout self, int ellipsise)	1443	set_ellipsise (DC::Layout self, int ellipsise)
1209	CODE:	1444	CODE:
1210	pango_layout_set_ellipsize (self->pl,	1445	pango_layout_set_ellipsize (self->pl,
1211	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1446	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1447	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1448	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214	: PANGO_ELLIPSIZE_NONE	1449	: PANGO_ELLIPSIZE_NONE
1215	);	1450	);
1216		1451
1217	void	1452	void
1218	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1453	set_single_paragraph_mode (DC::Layout self, int spm)
1219	CODE:	1454	CODE:
1220	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1455	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221		1456
1222	void	1457	void
1223	size (CFPlus::Layout self)	1458	size (DC::Layout self)
1224	PPCODE:	1459	PPCODE:
1225	{	1460	{
1226	int w, h;	1461	int w, h;
1227		1462
1228	layout_get_pixel_size (self, &w, &h);	1463	layout_get_pixel_size (self, &w, &h);
…		…
1231	PUSHs (sv_2mortal (newSViv (w)));	1466	PUSHs (sv_2mortal (newSViv (w)));
1232	PUSHs (sv_2mortal (newSViv (h)));	1467	PUSHs (sv_2mortal (newSViv (h)));
1233	}	1468	}
1234		1469
1235	int	1470	int
1236	descent (CFPlus::Layout self)	1471	descent (DC::Layout self)
1237	CODE:	1472	CODE:
1238	{	1473	{
1239	PangoRectangle rect;	1474	PangoRectangle rect;
1240	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1475	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241	pango_layout_line_get_pixel_extents (line, 0, &rect);	1476	pango_layout_line_get_pixel_extents (line, 0, &rect);
1242	RETVAL = PANGO_DESCENT (rect);	1477	RETVAL = PANGO_DESCENT (rect);
1243	}	1478	}
1244	OUTPUT:	1479	OUTPUT:
1245	RETVAL	1480	RETVAL
1246		1481
1247	int	1482	int
1248	xy_to_index (CFPlus::Layout self, int x, int y)	1483	xy_to_index (DC::Layout self, int x, int y)
1249	CODE:	1484	CODE:
1250	{	1485	{
1251	int index, trailing;	1486	int index, trailing;
1252	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1487	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253	RETVAL = index + trailing;	1488	RETVAL = index + trailing;
1254	}	1489	}
1255	OUTPUT:	1490	OUTPUT:
1256	RETVAL	1491	RETVAL
1257		1492
1258	void	1493	void
1259	cursor_pos (CFPlus::Layout self, int index)	1494	cursor_pos (DC::Layout self, int index)
1260	PPCODE:	1495	PPCODE:
1261	{	1496	{
1262	PangoRectangle strong_pos;	1497	PangoRectangle pos;
1263	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1498	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264		1499
1265	EXTEND (SP, 3);	1500	EXTEND (SP, 3);
1266	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1501	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1502	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1503	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269	}	1504	}
1270		1505
1271	void	1506	void
1272	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1507	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273	PPCODE:	1508	PPCODE:
1274	{	1509	{
1275	int line, x;	1510	int line, x;
1276		1511
1277	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1512	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1513	#if !PANGO_VERSION_CHECK (1, 17, 3)
1278	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1514	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279		1515	--line;
		1516	#endif
1280	EXTEND (SP, 2);	1517	EXTEND (SP, 2);
1281	PUSHs (sv_2mortal (newSViv (line - 1)));	1518	PUSHs (sv_2mortal (newSViv (line)));
1282	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1519	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283	}	1520	}
1284		1521
1285	void	1522	void
1286	line_x_to_index (CFPlus::Layout self, int line, int x)	1523	line_x_to_index (DC::Layout self, int line, int x)
1287	PPCODE:	1524	PPCODE:
1288	{	1525	{
1289	PangoLayoutLine *lp;	1526	PangoLayoutLine *lp;
1290	int index, trailing;	1527	int index, trailing;
1291		1528
1292	if (line < 0)	1529	if (line < 0)
1293	XSRETURN_EMPTY;	1530	XSRETURN_EMPTY;
1294		1531
1295	if (!(lp = pango_layout_get_line (self->pl, line)))	1532	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296	XSRETURN_EMPTY; /* do better */	1533	XSRETURN_EMPTY; /* do better */
1297		1534
1298	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1535	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299		1536
1300	EXTEND (SP, 2);	1537	EXTEND (SP, 2);
…		…
1306	PUSHs (sv_2mortal (newSViv (trailing)));	1543	PUSHs (sv_2mortal (newSViv (trailing)));
1307	}	1544	}
1308	}	1545	}
1309		1546
1310	void	1547	void
1311	render (CFPlus::Layout self, float x, float y, int flags = 0)	1548	render (DC::Layout self, float x, float y, int flags = 0)
1312	PPCODE:	1549	CODE:
		1550	rc_clear (self->rc);
1313	pango_opengl_render_layout_subpixel (	1551	pango_opengl_render_layout_subpixel (
1314	self->pl,	1552	self->pl,
		1553	self->rc,
1315	x * PANGO_SCALE, y * PANGO_SCALE,	1554	x * PANGO_SCALE, y * PANGO_SCALE,
1316	self->r, self->g, self->b, self->a,	1555	self->r, self->g, self->b, self->a,
1317	flags	1556	flags
1318	);	1557	);
		1558	// we assume that context_change actually clears/frees stuff
		1559	// and does not do any recomputation...
		1560	pango_layout_context_changed (self->pl);
1319		1561
1320	MODULE = CFPlus PACKAGE = CFPlus::Texture	1562	void
		1563	draw (DC::Layout self)
		1564	CODE:
		1565	{
		1566	glEnable (GL_TEXTURE_2D);
		1567	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1568	glEnable (GL_BLEND);
		1569	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1570	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1571	glEnable (GL_ALPHA_TEST);
		1572	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1573
		1574	rc_draw (self->rc);
		1575
		1576	glDisable (GL_ALPHA_TEST);
		1577	glDisable (GL_BLEND);
		1578	glDisable (GL_TEXTURE_2D);
		1579	}
		1580
		1581	MODULE = Deliantra::Client PACKAGE = DC::Texture
1321		1582
1322	PROTOTYPES: ENABLE	1583	PROTOTYPES: ENABLE
1323
1324	int minpot (int n)
1325		1584
1326	void	1585	void
1327	pad (SV *data_, int ow, int oh, int nw, int nh)	1586	pad (SV *data_, int ow, int oh, int nw, int nh)
1328	CODE:	1587	CODE:
1329	{	1588	{
…		…
1406	RETVAL = width > 0;	1665	RETVAL = width > 0;
1407	}	1666	}
1408	OUTPUT:	1667	OUTPUT:
1409	RETVAL	1668	RETVAL
1410		1669
1411	MODULE = CFPlus PACKAGE = CFPlus::Map	1670	MODULE = Deliantra::Client PACKAGE = DC::Map
1412		1671
1413	PROTOTYPES: DISABLE	1672	PROTOTYPES: DISABLE
1414		1673
1415	CFPlus::Map	1674	DC::Map
1416	new (SV *class)	1675	new (SV *class)
1417	CODE:	1676	CODE:
1418	New (0, RETVAL, 1, struct map);	1677	New (0, RETVAL, 1, struct map);
1419	RETVAL->x = 0;	1678	RETVAL->x = 0;
1420	RETVAL->y = 0;	1679	RETVAL->y = 0;
…		…
1428	RETVAL->row = 0;	1687	RETVAL->row = 0;
1429	OUTPUT:	1688	OUTPUT:
1430	RETVAL	1689	RETVAL
1431		1690
1432	void	1691	void
1433	DESTROY (CFPlus::Map self)	1692	DESTROY (DC::Map self)
1434	CODE:	1693	CODE:
1435	{	1694	{
1436	map_clear (self);	1695	map_clear (self);
1437	Safefree (self->face2tile);	1696	Safefree (self->face2tile);
1438	Safefree (self->tex);	1697	Safefree (self->tex);
1439	Safefree (self);	1698	Safefree (self);
1440	}	1699	}
1441		1700
1442	void	1701	void
1443	resize (CFPlus::Map self, int map_width, int map_height)	1702	resize (DC::Map self, int map_width, int map_height)
1444	CODE:	1703	CODE:
1445	self->w = map_width;	1704	self->w = map_width;
1446	self->h = map_height;	1705	self->h = map_height;
1447		1706
1448	void	1707	void
1449	clear (CFPlus::Map self)	1708	clear (DC::Map self)
1450	CODE:	1709	CODE:
1451	map_clear (self);	1710	map_clear (self);
1452		1711
1453	void	1712	void
1454	set_tileid (CFPlus::Map self, int face, int tile)	1713	set_tileid (DC::Map self, int face, int tile)
1455	CODE:	1714	CODE:
1456	{	1715	{
1457	need_facenum (self, face); self->face2tile [face] = tile;	1716	need_facenum (self, face); self->face2tile [face] = tile;
1458	need_texid (self, tile);	1717	need_texid (self, tile);
1459	}	1718	}
1460		1719
1461	void	1720	void
1462	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1721	set_smooth (DC::Map self, int face, int smooth, int level)
1463	CODE:	1722	CODE:
1464	{	1723	{
1465	tileid texid;	1724	tileid texid;
1466	maptex *tex;	1725	maptex *tex;
1467		1726
…		…
1480	tex->smoothtile = self->face2tile [smooth];	1739	tex->smoothtile = self->face2tile [smooth];
1481	tex->smoothlevel = level;	1740	tex->smoothlevel = level;
1482	}	1741	}
1483		1742
1484	void	1743	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)	1744	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:	1745	CODE:
1487	{	1746	{
1488	need_texid (self, texid);	1747	need_texid (self, texid);
1489		1748
1490	{	1749	{
…		…
1509	// use uglier nearest interpolation because linear suffers	1768	// use uglier nearest interpolation because linear suffers
1510	// from transparent color bleeding and ugly wrapping effects.	1769	// from transparent color bleeding and ugly wrapping effects.
1511	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1770	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512	}	1771	}
1513		1772
		1773	void
		1774	expire_textures (DC::Map self, int texid, int count)
		1775	PPCODE:
		1776	for (; texid < self->texs && count; ++texid, --count)
		1777	{
		1778	maptex *tex = self->tex + texid;
		1779
		1780	if (tex->name)
		1781	{
		1782	if (tex->unused)
		1783	{
		1784	tex->name = 0;
		1785	tex->unused = 0,
		1786	XPUSHs (sv_2mortal (newSViv (texid)));
		1787	}
		1788	else
		1789	tex->unused = 1;
		1790	}
		1791	}
		1792
1514	int	1793	int
1515	ox (CFPlus::Map self)	1794	ox (DC::Map self)
1516	ALIAS:	1795	ALIAS:
1517	oy = 1	1796	oy = 1
1518	x = 2	1797	x = 2
1519	y = 3	1798	y = 3
1520	w = 4	1799	w = 4
…		…
1531	}	1810	}
1532	OUTPUT:	1811	OUTPUT:
1533	RETVAL	1812	RETVAL
1534		1813
1535	void	1814	void
1536	scroll (CFPlus::Map self, int dx, int dy)	1815	scroll (DC::Map self, int dx, int dy)
1537	CODE:	1816	CODE:
1538	{	1817	{
1539	if (dx > 0)	1818	if (dx > 0)
1540	map_blank (self, self->x, self->y, dx, self->h);	1819	map_blank (self, self->x, self->y, dx, self->h);
1541	else if (dx < 0)	1820	else if (dx < 0)
…		…
1557	self->y += MAP_EXTEND_Y;	1836	self->y += MAP_EXTEND_Y;
1558	}	1837	}
1559	}	1838	}
1560		1839
1561	SV *	1840	SV *
1562	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1841	map1a_update (DC::Map self, SV *data_, int extmap)
1563	CODE:	1842	CODE:
1564	{	1843	{
1565	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1844	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566	uint8_t *data_end = (uint8_t *)SvEND (data_);	1845	uint8_t *data_end = (uint8_t *)SvEND (data_);
1567	mapcell *cell;	1846	mapcell *cell;
…		…
1595	uint8_t ext, cmd;	1874	uint8_t ext, cmd;
1596		1875
1597	do	1876	do
1598	{	1877	{
1599	ext = *data++;	1878	ext = *data++;
1600	cmd = ext & 0x3f;	1879	cmd = ext & 0x7f;
1601		1880
1602	if (cmd < 4)	1881	if (cmd < 4)
1603	cell->darkness = 255 - ext * 64 + 1;	1882	cell->darkness = 255 - ext * 64 + 1;
1604	else if (cmd == 5) // health	1883	else if (cmd == 5) // health
1605	{	1884	{
…		…
1608	}	1887	}
1609	else if (cmd == 6) // monster width	1888	else if (cmd == 6) // monster width
1610	cell->stat_width = *data++ + 1;	1889	cell->stat_width = *data++ + 1;
1611	else if (cmd == 0x47)	1890	else if (cmd == 0x47)
1612	{	1891	{
1613	if (*data == 4)	1892	if (*data == 1) cell->player = data [1];
1614	; // decode player count	1893	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1894	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1895	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615		1896
1616	data += *data + 1;	1897	data += *data + 1;
1617	}	1898	}
1618	else if (cmd == 8) // cell flags	1899	else if (cmd == 8) // cell flags
1619	cell->flags = *data++;	1900	cell->flags = *data++;
…		…
1636	cell->tile [z] = self->face2tile [face];	1917	cell->tile [z] = self->face2tile [face];
1637		1918
1638	if (cell->tile [z])	1919	if (cell->tile [z])
1639	{	1920	{
1640	maptex *tex = self->tex + cell->tile [z];	1921	maptex *tex = self->tex + cell->tile [z];
		1922	tex->unused = 0;
1641	if (!tex->name)	1923	if (!tex->name)
1642	av_push (missing, newSViv (cell->tile [z]));	1924	av_push (missing, newSViv (cell->tile [z]));
1643		1925
1644	if (tex->smoothtile)	1926	if (tex->smoothtile)
1645	{	1927	{
1646	maptex *smooth = self->tex + tex->smoothtile;	1928	maptex *smooth = self->tex + tex->smoothtile;
		1929	smooth->unused = 0;
1647	if (!smooth->name)	1930	if (!smooth->name)
1648	av_push (missing, newSViv (tex->smoothtile));	1931	av_push (missing, newSViv (tex->smoothtile));
1649	}	1932	}
1650	}	1933	}
1651	}	1934	}
1652	}	1935	}
1653	else	1936	else
1654	cell->darkness = 0;	1937	CELL_CLEAR (cell);
1655	}	1938	}
1656	}	1939	}
1657	OUTPUT:	1940	OUTPUT:
1658	RETVAL	1941	RETVAL
1659		1942
1660	SV *	1943	SV *
1661	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1944	mapmap (DC::Map self, int x0, int y0, int w, int h)
1662	CODE:	1945	CODE:
1663	{	1946	{
1664	int x1, x;	1947	int x1, x;
1665	int y1, y;	1948	int y1, y;
1666	int z;	1949	int z;
…		…
1711	}	1994	}
1712	OUTPUT:	1995	OUTPUT:
1713	RETVAL	1996	RETVAL
1714		1997
1715	void	1998	void
1716	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1999	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:	2000	CODE:
1718	{	2001	{
1719	int x, y, z;	2002	int x, y, z;
1720		2003
1721	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2004	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2005	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)	2006	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724	smooth_key skey;	2007	smooth_key skey;
1725		2008	int pl_x, pl_y;
		2009	maptex pl_tex;
1726	rc_t *rc = rc_alloc ();	2010	rc_t *rc = rc_alloc ();
1727	rc_key_t key;	2011	rc_key_t key;
1728	rc_array_t *arr;	2012	rc_array_t *arr;
		2013
		2014	pl_tex.name = 0;
1729		2015
1730	// thats current max. sorry.	2016	// thats current max. sorry.
1731	if (sw > 255) sw = 255;	2017	if (sw > 255) sw = 255;
1732	if (sh > 255) sh = 255;	2018	if (sh > 255) sh = 255;
1733		2019
…		…
1788	tileid tile = cell->tile [z];	2074	tileid tile = cell->tile [z];
1789		2075
1790	if (tile)	2076	if (tile)
1791	{	2077	{
1792	maptex tex = self->tex [tile];	2078	maptex tex = self->tex [tile];
1793	int px, py;	2079	int px = (x + 1) * T - tex.w;
		2080	int py = (y + 1) * T - tex.h;
1794		2081
1795	// suppressing texture state switches here
1796	// is only moderately effective, but worth the extra effort
1797	if (key.texname != tex.name)	2082	if (key.texname != tex.name)
1798	{	2083	{
		2084	self->tex [tile].unused = 0;
		2085
1799	if (!tex.name)	2086	if (!tex.name)
1800	tex = self->tex [2]; /* missing, replace by noface */	2087	tex = self->tex [2]; /* missing, replace by noface */
1801		2088
1802	key.texname = tex.name;	2089	key.texname = tex.name;
1803	arr = rc_array (rc, &key);	2090	arr = rc_array (rc, &key);
1804	}	2091	}
1805		2092
1806	px = (x + 1) * T - tex.w;	2093	if (expect_false (cell->player == player) && expect_false (z == 2))
1807	py = (y + 1) * T - tex.h;	2094	{
		2095	pl_x = px;
		2096	pl_y = py;
		2097	pl_tex = tex;
		2098	continue;
		2099	}
1808		2100
1809	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2101	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2102	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);	2103	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);	2104	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813		2105
1814	if (cell->flags && z == 2)	2106	if (expect_false (cell->flags) && expect_false (z == 2))
1815	{	2107	{
1816	// overlays such as the speech bubble, probably more to come	2108	// overlays such as the speech bubble, probably more to come
1817	if (cell->flags & 1)	2109	if (cell->flags & 1)
1818	{	2110	{
1819	maptex tex = self->tex [1];	2111	maptex tex = self->tex [1];
…		…
1884	// go through all smoothlevels, lowest to highest, then draw.	2176	// go through all smoothlevels, lowest to highest, then draw.
1885	// this is basically counting sort	2177	// this is basically counting sort
1886	{	2178	{
1887	int w, b;	2179	int w, b;
1888		2180
		2181	glEnable (GL_TEXTURE_2D);
		2182	glBegin (GL_QUADS);
1889	for (w = 0; w < 256 / 32; ++w)	2183	for (w = 0; w < 256 / 32; ++w)
1890	{	2184	{
1891	uint32_t smask = smooth_level [w];	2185	uint32_t smask = smooth_level [w];
1892	if (smask)	2186	if (smask)
1893	for (b = 0; b < 32; ++b)	2187	for (b = 0; b < 32; ++b)
…		…
1918	{	2212	{
1919	// this time avoiding texture state changes	2213	// this time avoiding texture state changes
1920	// save gobs of state changes.	2214	// save gobs of state changes.
1921	if (key.texname != tex.name)	2215	if (key.texname != tex.name)
1922	{	2216	{
		2217	self->tex [skey->tile].unused = 0;
		2218
		2219	glEnd ();
1923	key.texname = tex.name;	2220	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924	arr = rc_array (rc, &key);	2221	glBegin (GL_QUADS);
1925	}	2222	}
1926		2223
1927	if (border)	2224	if (border)
1928	{	2225	{
1929	float ox = border * dx;	2226	float ox = border * dx;
1930		2227
1931	rc_t2f_v3f (arr, ox , 0.f , px , py , 0);	2228	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932	rc_t2f_v3f (arr, ox , dy , px , py + T, 0);	2229	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933	rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);	2230	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934	rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);	2231	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935	}	2232	}
1936		2233
1937	if (corner)	2234	if (corner)
1938	{	2235	{
1939	float ox = corner * dx;	2236	float ox = corner * dx;
1940		2237
1941	rc_t2f_v3f (arr, ox , dy , px , py , 0);	2238	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942	rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);	2239	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943	rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);	2240	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1944	rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);	2241	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945	}	2242	}
1946	}	2243	}
1947	}	2244	}
1948	}	2245	}
1949	}	2246	}
1950	}	2247	}
		2248
		2249	glEnd ();
		2250	glDisable (GL_TEXTURE_2D);
		2251	key.texname = -1;
1951	}	2252	}
1952		2253
1953	hv_clear (smooth);	2254	hv_clear (smooth);
		2255	}
		2256
		2257	if (pl_tex.name)
		2258	{
		2259	maptex tex = pl_tex;
		2260	int px = pl_x + sdx;
		2261	int py = pl_y + sdy;
		2262
		2263	key.texname = tex.name;
		2264	arr = rc_array (rc, &key);
		2265
		2266	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2267	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2268	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2269	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2270
1954	rc_draw (rc);	2271	rc_draw (rc);
1955	rc_clear (rc);
1956	}	2272	}
1957		2273
1958	glDisable (GL_BLEND);	2274	glDisable (GL_BLEND);
1959	rc_free (rc);	2275	rc_free (rc);
1960		2276
…		…
1969	{	2285	{
1970	mapcell *cell = row->col + (x + mx - row->c0);	2286	mapcell *cell = row->col + (x + mx - row->c0);
1971		2287
1972	int px = x * T;	2288	int px = x * T;
1973	int py = y * T;	2289	int py = y * T;
		2290
		2291	if (expect_false (cell->player == player))
		2292	{
		2293	px += sdx;
		2294	py += sdy;
		2295	}
1974		2296
1975	if (cell->stat_hp)	2297	if (cell->stat_hp)
1976	{	2298	{
1977	int width = cell->stat_width * T;	2299	int width = cell->stat_width * T;
1978	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2300	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
1989	}	2311	}
1990	}	2312	}
1991	}	2313	}
1992		2314
1993	void	2315	void
1994	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2316	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1995	CODE:	2317	CODE:
1996	{	2318	{
1997	static float color[16][3] = {	2319	static float color[16][3] = {
1998	{ 0.00F, 0.00F, 0.00F },	2320	{ 0.00F, 0.00F, 0.00F },
1999	{ 1.00F, 1.00F, 1.00F },	2321	{ 1.00F, 1.00F, 1.00F },
…		…
2049	glDisable (GL_BLEND);	2371	glDisable (GL_BLEND);
2050	glDisable (GL_TEXTURE_2D);	2372	glDisable (GL_TEXTURE_2D);
2051	}	2373	}
2052		2374
2053	void	2375	void
2054	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2376	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055	PPCODE:	2377	PPCODE:
2056	{	2378	{
2057	int x, y;	2379	int x, y;
2058	int sw1 = sw + 2;	2380	int sw1 = sw + 2;
2059	int sh1 = sh + 2;	2381	int sh1 = sh + 2;
…		…
2067	SvCUR_set (darkness3_sv, sw34 * sh3);	2389	SvCUR_set (darkness3_sv, sw34 * sh3);
2068		2390
2069	mx += self->x - 1;	2391	mx += self->x - 1;
2070	my += self->y - 1;	2392	my += self->y - 1;
2071		2393
2072	memset (darkness1, 255, sw1 * sh1);	2394	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2073		2395
2074	for (y = 0; y < sh1; y++)	2396	for (y = 0; y < sh1; y++)
2075	if (0 <= y + my && y + my < self->rows)	2397	if (0 <= y + my && y + my < self->rows)
2076	{	2398	{
2077	maprow *row = self->row + (y + my);	2399	maprow *row = self->row + (y + my);
…		…
2130	PUSHs (sv_2mortal (newSViv (sh3)));	2452	PUSHs (sv_2mortal (newSViv (sh3)));
2131	PUSHs (darkness3_sv);	2453	PUSHs (darkness3_sv);
2132	}	2454	}
2133		2455
2134	SV *	2456	SV *
2135	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2457	get_rect (DC::Map self, int x0, int y0, int w, int h)
2136	CODE:	2458	CODE:
2137	{	2459	{
2138	int x, y, x1, y1;	2460	int x, y, x1, y1;
2139	SV *data_sv = newSV (w * h * 7 + 5);	2461	SV *data_sv = newSV (w * h * 7 + 5);
2140	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2462	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2197	else	2519	else
2198	*data++ = 0;	2520	*data++ = 0;
2199	}	2521	}
2200	}	2522	}
2201		2523
		2524	/* if size is w*h + 5 then no data has been found */
		2525	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2526	{
2202	SvPOK_only (data_sv);	2527	SvPOK_only (data_sv);
2203	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2528	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2529	}
		2530
2204	RETVAL = data_sv;	2531	RETVAL = data_sv;
2205	}	2532	}
2206	OUTPUT:	2533	OUTPUT:
2207	RETVAL	2534	RETVAL
2208		2535
2209	void	2536	void
2210	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2537	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211	PPCODE:	2538	PPCODE:
2212	{	2539	{
2213	int x, y, z;	2540	int x, y, z;
2214	int w, h;	2541	int w, h;
2215	int x1, y1;	2542	int x1, y1;
		2543	STRLEN len;
		2544	uint8_t *data, *end;
		2545
		2546	len = SvLEN (data_sv);
		2547	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2548	data = SvPVbyte_nolen (data_sv);
		2549	end = data + len + 8;
		2550
		2551	if (len < 5)
		2552	XSRETURN_EMPTY;
2216		2553
2217	if (*data++ != 0)	2554	if (*data++ != 0)
2218	return; /* version mismatch */	2555	XSRETURN_EMPTY; /* version mismatch */
2219		2556
2220	w = *data++ << 8; w |= *data++;	2557	w = *data++ << 8; w |= *data++;
2221	h = *data++ << 8; h |= *data++;	2558	h = *data++ << 8; h |= *data++;
2222		2559
2223	// we need to do this 'cause we don't keep an absolute coord system for rows	2560	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2235	{	2572	{
2236	maprow *row = map_get_row (self, y);	2573	maprow *row = map_get_row (self, y);
2237		2574
2238	for (x = x0; x < x1; x++)	2575	for (x = x0; x < x1; x++)
2239	{	2576	{
		2577	uint8_t flags;
		2578
		2579	if (data + 7 >= end)
		2580	XSRETURN_EMPTY;
		2581
2240	uint8_t flags = *data++;	2582	flags = *data++;
2241		2583
2242	if (flags)	2584	if (flags)
2243	{	2585	{
2244	mapcell *cell = row_get_cell (row, x);	2586	mapcell *cell = row_get_cell (row, x);
2245	tileid tile[3] = { 0, 0, 0 };	2587	tileid tile[3] = { 0, 0, 0 };
…		…
2248	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2590	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2591	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250		2592
2251	if (cell->darkness == 0)	2593	if (cell->darkness == 0)
2252	{	2594	{
2253	cell->darkness = 0;	2595	/*cell->darkness = 0;*/
		2596	EXTEND (SP, 3);
2254		2597
2255	for (z = 0; z <= 2; z++)	2598	for (z = 0; z <= 2; z++)
2256	{	2599	{
2257	tileid t = tile [z];	2600	tileid t = tile [z];
2258		2601
2259	if (t >= self->texs || (t && !self->tex [t].name))	2602	if (t >= self->texs || (t && !self->tex [t].name))
2260	{	2603	{
2261	XPUSHs (sv_2mortal (newSViv (t)));	2604	PUSHs (sv_2mortal (newSViv (t)));
2262	need_texid (self, t);	2605	need_texid (self, t);
2263	}	2606	}
2264		2607
2265	cell->tile [z] = t;	2608	cell->tile [z] = t;
2266	}	2609	}
…		…
2268	}	2611	}
2269	}	2612	}
2270	}	2613	}
2271	}	2614	}
2272		2615
2273	MODULE = CFPlus PACKAGE = CFPlus::RW	2616	MODULE = Deliantra::Client PACKAGE = DC::RW
2274		2617
2275	CFPlus::RW	2618	DC::RW
2276	new (SV *class, SV *data_sv)	2619	new (SV *class, SV *data_sv)
2277	CODE:	2620	CODE:
2278	{	2621	{
2279	STRLEN datalen;	2622	STRLEN datalen;
2280	char *data = SvPVbyte (data_sv, datalen);	2623	char *data = SvPVbyte (data_sv, datalen);
…		…
2282	RETVAL = SDL_RWFromConstMem (data, datalen);	2625	RETVAL = SDL_RWFromConstMem (data, datalen);
2283	}	2626	}
2284	OUTPUT:	2627	OUTPUT:
2285	RETVAL	2628	RETVAL
2286		2629
2287	CFPlus::RW	2630	DC::RW
2288	new_from_file (SV *class, const char *path, const char *mode = "rb")	2631	new_from_file (SV *class, const char *path, const char *mode = "rb")
2289	CODE:	2632	CODE:
2290	RETVAL = SDL_RWFromFile (path, mode);	2633	RETVAL = SDL_RWFromFile (path, mode);
2291	OUTPUT:	2634	OUTPUT:
2292	RETVAL	2635	RETVAL
2293		2636
2294	# fails on win32:	2637	# fails on win32:
2295	# CFPlus.xs(2268) : error C2059: syntax error : '('	2638	# dc.xs(2268) : error C2059: syntax error : '('
2296	#void	2639	#void
2297	#close (CFPlus::RW self)	2640	#close (DC::RW self)
2298	# CODE:	2641	# CODE:
2299	# (self->(close)) (self);	2642	# (self->(close)) (self);
2300		2643
2301	MODULE = CFPlus PACKAGE = CFPlus::Channel	2644	MODULE = Deliantra::Client PACKAGE = DC::Channel
2302		2645
2303	PROTOTYPES: DISABLE	2646	PROTOTYPES: DISABLE
2304		2647
2305	CFPlus::Channel	2648	DC::Channel
2306	find ()	2649	find ()
2307	CODE:	2650	CODE:
2308	{	2651	{
2309	RETVAL = Mix_GroupAvailable (-1);	2652	RETVAL = Mix_GroupAvailable (-1);
2310		2653
…		…
2323	}	2666	}
2324	OUTPUT:	2667	OUTPUT:
2325	RETVAL	2668	RETVAL
2326		2669
2327	void	2670	void
2328	halt (CFPlus::Channel self)	2671	halt (DC::Channel self)
2329	CODE:	2672	CODE:
2330	Mix_HaltChannel (self);	2673	Mix_HaltChannel (self);
2331		2674
2332	void	2675	void
2333	expire (CFPlus::Channel self, int ticks = -1)	2676	expire (DC::Channel self, int ticks = -1)
2334	CODE:	2677	CODE:
2335	Mix_ExpireChannel (self, ticks);	2678	Mix_ExpireChannel (self, ticks);
2336		2679
2337	void	2680	void
2338	fade_out (CFPlus::Channel self, int ticks = -1)	2681	fade_out (DC::Channel self, int ticks = -1)
2339	CODE:	2682	CODE:
2340	Mix_FadeOutChannel (self, ticks);	2683	Mix_FadeOutChannel (self, ticks);
2341		2684
2342	int	2685	int
2343	volume (CFPlus::Channel self, int volume)	2686	volume (DC::Channel self, int volume)
2344	CODE:	2687	CODE:
2345	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2688	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346	OUTPUT:	2689	OUTPUT:
2347	RETVAL	2690	RETVAL
2348		2691
2349	void	2692	void
2350	unregister_all_effects (CFPlus::Channel self)	2693	unregister_all_effects (DC::Channel self)
2351	CODE:	2694	CODE:
2352	Mix_UnregisterAllEffects (self);	2695	Mix_UnregisterAllEffects (self);
2353		2696
2354	void	2697	void
2355	set_panning (CFPlus::Channel self, int left, int right)	2698	set_panning (DC::Channel self, int left, int right)
2356	CODE:	2699	CODE:
2357	left = CLAMP (left , 0, 255);	2700	left = CLAMP (left , 0, 255);
2358	right = CLAMP (right, 0, 255);	2701	right = CLAMP (right, 0, 255);
2359	Mix_SetPanning (self, left, right);	2702	Mix_SetPanning (self, left, right);
2360		2703
2361	void	2704	void
2362	set_distance (CFPlus::Channel self, int distance)	2705	set_distance (DC::Channel self, int distance)
2363	CODE:	2706	CODE:
2364	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2707	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365		2708
2366	void	2709	void
2367	set_position (CFPlus::Channel self, int angle, int distance)	2710	set_position (DC::Channel self, int angle, int distance)
2368	CODE:	2711	CODE:
2369		2712
2370	void	2713	void
2371	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2714	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372	CODE:	2715	CODE:
2373	{	2716	{
2374	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2717	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);	2718	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2376	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2719	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377	}	2720	}
2378		2721
2379	void	2722	void
2380	set_reverse_stereo (CFPlus::Channel self, int flip)	2723	set_reverse_stereo (DC::Channel self, int flip)
2381	CODE:	2724	CODE:
2382	Mix_SetReverseStereo (self, flip);	2725	Mix_SetReverseStereo (self, flip);
2383		2726
2384	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2727	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385		2728
2386	PROTOTYPES: DISABLE	2729	PROTOTYPES: DISABLE
2387		2730
2388	CFPlus::MixChunk	2731	DC::MixChunk
2389	new (SV *class, CFPlus::RW rwops)	2732	new (SV *class, DC::RW rwops)
2390	CODE:	2733	CODE:
2391	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2734	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392	OUTPUT:	2735	OUTPUT:
2393	RETVAL	2736	RETVAL
2394		2737
2395	void	2738	void
2396	DESTROY (CFPlus::MixChunk self)	2739	DESTROY (DC::MixChunk self)
2397	CODE:	2740	CODE:
2398	Mix_FreeChunk (self);	2741	Mix_FreeChunk (self);
2399		2742
2400	int	2743	int
2401	volume (CFPlus::MixChunk self, int volume = -1)	2744	volume (DC::MixChunk self, int volume = -1)
2402	CODE:	2745	CODE:
2403	if (items > 1)	2746	if (items > 1)
2404	volume = CLAMP (volume, 0, 128);	2747	volume = CLAMP (volume, 0, 128);
2405	RETVAL = Mix_VolumeChunk (self, volume);	2748	RETVAL = Mix_VolumeChunk (self, volume);
2406	OUTPUT:	2749	OUTPUT:
2407	RETVAL	2750	RETVAL
2408		2751
2409	CFPlus::Channel	2752	DC::Channel
2410	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2753	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411	CODE:	2754	CODE:
2412	{	2755	{
2413	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2756	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414		2757
2415	if (RETVAL < 0)	2758	if (RETVAL < 0)
…		…
2422	}	2765	}
2423	}	2766	}
2424	OUTPUT:	2767	OUTPUT:
2425	RETVAL	2768	RETVAL
2426		2769
2427	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2770	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428		2771
2429	int	2772	int
2430	volume (int volume = -1)	2773	volume (int volume = -1)
2431	PROTOTYPE: ;$	2774	PROTOTYPE: ;$
2432	CODE:	2775	CODE:
…		…
2444	void	2787	void
2445	halt ()	2788	halt ()
2446	CODE:	2789	CODE:
2447	Mix_HaltMusic ();	2790	Mix_HaltMusic ();
2448		2791
2449	CFPlus::MixMusic	2792	DC::MixMusic
2450	new (SV *class, CFPlus::RW rwops)	2793	new (SV *class, DC::RW rwops)
2451	CODE:	2794	CODE:
2452	RETVAL = Mix_LoadMUS_RW (rwops);	2795	RETVAL = Mix_LoadMUS_RW (rwops);
2453	OUTPUT:	2796	OUTPUT:
2454	RETVAL	2797	RETVAL
2455		2798
2456	void	2799	void
2457	DESTROY (CFPlus::MixMusic self)	2800	DESTROY (DC::MixMusic self)
2458	CODE:	2801	CODE:
2459	Mix_FreeMusic (self);	2802	Mix_FreeMusic (self);
2460		2803
2461	int	2804	int
2462	play (CFPlus::MixMusic self, int loops = -1)	2805	play (DC::MixMusic self, int loops = -1)
2463	CODE:	2806	CODE:
2464	RETVAL = Mix_PlayMusic (self, loops);	2807	RETVAL = Mix_PlayMusic (self, loops);
2465	OUTPUT:	2808	OUTPUT:
2466	RETVAL	2809	RETVAL
2467		2810
2468	void	2811	void
2469	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2812	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470	CODE:	2813	CODE:
2471	Mix_FadeInMusicPos (self, loops, ms, position);	2814	Mix_FadeInMusicPos (self, loops, ms, position);
2472		2815
2473	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2816	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474		2817
2475	PROTOTYPES: ENABLE	2818	PROTOTYPES: ENABLE
2476		2819
2477	BOOT:	2820	BOOT:
2478	{	2821	{
2479	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2822	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480	static const struct {	2823	static const struct {
2481	const char *name;	2824	const char *name;
2482	IV iv;	2825	IV iv;
2483	} *civ, const_iv[] = {	2826	} *civ, const_iv[] = {
2484	# define const_iv(name) { # name, (IV)name }	2827	# define const_iv(name) { # name, (IV)name }
…		…
2519	const_iv (GL_INTENSITY),	2862	const_iv (GL_INTENSITY),
2520	const_iv (GL_LUMINANCE),	2863	const_iv (GL_LUMINANCE),
2521	const_iv (GL_LUMINANCE_ALPHA),	2864	const_iv (GL_LUMINANCE_ALPHA),
2522	const_iv (GL_FLOAT),	2865	const_iv (GL_FLOAT),
2523	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2866	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2867	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2868	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2869	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2870	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2871	const_iv (GL_COMPRESSED_RGB_ARB),
		2872	const_iv (GL_COMPRESSED_RGBA_ARB),
2524	const_iv (GL_COMPILE),	2873	const_iv (GL_COMPILE),
2525	const_iv (GL_PROXY_TEXTURE_1D),	2874	const_iv (GL_PROXY_TEXTURE_1D),
2526	const_iv (GL_PROXY_TEXTURE_2D),	2875	const_iv (GL_PROXY_TEXTURE_2D),
2527	const_iv (GL_TEXTURE_1D),	2876	const_iv (GL_TEXTURE_1D),
2528	const_iv (GL_TEXTURE_2D),	2877	const_iv (GL_TEXTURE_2D),
…		…
2567	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2916	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568	const_iv (GL_POINT_SMOOTH_HINT),	2917	const_iv (GL_POINT_SMOOTH_HINT),
2569	const_iv (GL_LINE_SMOOTH_HINT),	2918	const_iv (GL_LINE_SMOOTH_HINT),
2570	const_iv (GL_POLYGON_SMOOTH_HINT),	2919	const_iv (GL_POLYGON_SMOOTH_HINT),
2571	const_iv (GL_GENERATE_MIPMAP_HINT),	2920	const_iv (GL_GENERATE_MIPMAP_HINT),
		2921	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572	const_iv (GL_FASTEST),	2922	const_iv (GL_FASTEST),
2573	const_iv (GL_DONT_CARE),	2923	const_iv (GL_DONT_CARE),
2574	const_iv (GL_NICEST),	2924	const_iv (GL_NICEST),
2575	const_iv (GL_V2F),	2925	const_iv (GL_V2F),
2576	const_iv (GL_V3F),	2926	const_iv (GL_V3F),
…		…
2584		2934
2585	texture_av = newAV ();	2935	texture_av = newAV ();
2586	AvREAL_off (texture_av);	2936	AvREAL_off (texture_av);
2587	}	2937	}
2588		2938
		2939	void
		2940	disable_GL_EXT_blend_func_separate ()
		2941	CODE:
		2942	gl.BlendFuncSeparate = 0;
		2943	gl.BlendFuncSeparateEXT = 0;
		2944
2589	char *	2945	char *
2590	gl_vendor ()	2946	gl_vendor ()
2591	CODE:	2947	CODE:
2592	RETVAL = (char *)glGetString (GL_VENDOR);	2948	RETVAL = (char *)glGetString (GL_VENDOR);
2593	OUTPUT:	2949	OUTPUT:
…		…
2685	void glRotate (float angle, float x, float y, float z)	3041	void glRotate (float angle, float x, float y, float z)
2686	CODE:	3042	CODE:
2687	glRotatef (angle, x, y, z);	3043	glRotatef (angle, x, y, z);
2688		3044
2689	void glColor (float r, float g, float b, float a = 1.0)	3045	void glColor (float r, float g, float b, float a = 1.0)
		3046	PROTOTYPE: @
2690	ALIAS:	3047	ALIAS:
2691	glColor_premultiply = 1	3048	glColor_premultiply = 1
2692	CODE:	3049	CODE:
2693	if (ix)	3050	if (ix)
2694	{	3051	{
…		…
2714		3071
2715	void glRect (float x1, float y1, float x2, float y2)	3072	void glRect (float x1, float y1, float x2, float y2)
2716	CODE:	3073	CODE:
2717	glRectf (x1, y1, x2, y2);	3074	glRectf (x1, y1, x2, y2);
2718		3075
		3076	void glRect_lineloop (float x1, float y1, float x2, float y2)
		3077	CODE:
		3078	glBegin (GL_LINE_LOOP);
		3079	glVertex2f (x1, y1);
		3080	glVertex2f (x2, y1);
		3081	glVertex2f (x2, y2);
		3082	glVertex2f (x1, y2);
		3083	glEnd ();
		3084
2719	PROTOTYPES: ENABLE	3085	PROTOTYPES: ENABLE
2720		3086
2721	void glBegin (int mode)	3087	void glBegin (int mode)
2722		3088
2723	void glEnd ()	3089	void glEnd ()
…		…
2755	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3121	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756	CODE:	3122	CODE:
2757	if (gl.SeparableFilter2D)	3123	if (gl.SeparableFilter2D)
2758	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3124	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759		3125
2760	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3126	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761		3127
2762	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3128	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763		3129
2764	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3130	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765		3131
…		…
2791		3157
2792	void glEndList ()	3158	void glEndList ()
2793		3159
2794	void glCallList (int list)	3160	void glCallList (int list)
2795		3161
2796	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3162	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797		3163
2798	PROTOTYPES: DISABLE	3164	PROTOTYPES: DISABLE
2799		3165
2800	void	3166	void
2801	find_widget (SV *self, NV x, NV y)	3167	find_widget (SV *self, NV x, NV y)
…		…
2805	XPUSHs (self);	3171	XPUSHs (self);
2806	}	3172	}
2807		3173
2808	BOOT:	3174	BOOT:
2809	{	3175	{
2810	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3176	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811		3177
2812	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3178	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);	3179	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);	3180	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);	3181	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816	}	3182	}
2817		3183
2818	void	3184	void
2819	draw (SV *self)	3185	draw (SV *self)
2820	CODE:	3186	CODE:
…		…
2824	NV x, y, w, h;	3190	NV x, y, w, h;
2825	SV *draw_x_sv = GvSV (draw_x_gv);	3191	SV *draw_x_sv = GvSV (draw_x_gv);
2826	SV *draw_y_sv = GvSV (draw_y_gv);	3192	SV *draw_y_sv = GvSV (draw_y_gv);
2827	SV *draw_w_sv = GvSV (draw_w_gv);	3193	SV *draw_w_sv = GvSV (draw_w_gv);
2828	SV *draw_h_sv = GvSV (draw_h_gv);	3194	SV *draw_h_sv = GvSV (draw_h_gv);
2829	SV *hover;
2830	double draw_x, draw_y, draw_w, draw_h;	3195	double draw_x, draw_y;
2831		3196
2832	if (!SvROK (self))	3197	if (!SvROK (self))
2833	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3198	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834		3199
2835	hv = (HV *)SvRV (self);	3200	hv = (HV *)SvRV (self);
2836		3201
2837	if (SvTYPE (hv) != SVt_PVHV)	3202	if (SvTYPE (hv) != SVt_PVHV)
2838	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3203	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839		3204
2840	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3205	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.;	3206	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842		3207
2843	if (!h || !w)	3208	if (!h || !w)
…		…
2863	{	3228	{
2864	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3229	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865		3230
2866	if (svp && SvTRUE (*svp))	3231	if (svp && SvTRUE (*svp))
2867	{	3232	{
2868	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3233	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869	glEnable (GL_BLEND);	3234	glEnable (GL_BLEND);
2870	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3235	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871	glBegin (GL_QUADS);	3236	glBegin (GL_QUADS);
2872	glVertex2f (0, 0);	3237	glVertex2f (0, 0);
2873	glVertex2f (w, 0);	3238	glVertex2f (w, 0);
…		…
2876	glEnd ();	3241	glEnd ();
2877	glDisable (GL_BLEND);	3242	glDisable (GL_BLEND);
2878	}	3243	}
2879	}	3244	}
2880	#if 0	3245	#if 0
2881	if ($ENV{CFPLUS_DEBUG} & 1) {	3246	// draw borders, for debugging
2882	glPushMatrix;	3247	glPushMatrix ();
2883	glColor 1, 1, 0, 1;	3248	glColor4f (1., 1., 0., 1.);
2884	glTranslate 0.375, 0.375;	3249	glTranslatef (.5, .5, 0.);
2885	glBegin GL_LINE_LOOP;	3250	glBegin (GL_LINE_LOOP);
2886	glVertex 0 , 0;	3251	glVertex2f (0 , 0);
2887	glVertex $self->{w} - 1, 0;	3252	glVertex2f (w - 1, 0);
2888	glVertex $self->{w} - 1, $self->{h} - 1;	3253	glVertex2f (w - 1, h - 1);
2889	glVertex 0 , $self->{h} - 1;	3254	glVertex2f (0 , h - 1);
2890	glEnd;	3255	glEnd ();
2891	glPopMatrix;	3256	glPopMatrix ();
2892	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893	}
2894	#endif	3257	#endif
2895	PUSHMARK (SP);	3258	PUSHMARK (SP);
2896	XPUSHs (self);	3259	XPUSHs (self);
2897	PUTBACK;	3260	PUTBACK;
2898	call_method ("_draw", G_VOID | G_DISCARD);	3261	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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