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.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC

…		…
39	#include <SDL_endian.h>	39	#include <SDL_endian.h>
40	#include <SDL_image.h>	40	#include <SDL_image.h>
41	#include <SDL_mixer.h>	41	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	42	#include <SDL_opengl.h>
43		43
		44	/* work around os x broken headers */
		45	#ifdef __MACOSX__
		46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		47	#endif
		48
44	#define PANGO_ENABLE_BACKEND	49	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	50	#define G_DISABLE_CAST_CHECKS
46		51
47	#include <glib/gmacros.h>	52	#include <glib/gmacros.h>
48		53
49	#include <pango/pango.h>	54	#include <pango/pango.h>
		55
		56	#ifndef PANGO_VERSION_CHECK
		57	# define PANGO_VERSION_CHECK(a,b,c) 0
		58	#endif
		59
		60	#if !PANGO_VERSION_CHECK (1, 15, 2)
		61	# define pango_layout_get_line_readonly pango_layout_get_line
		62	# define pango_layout_get_lines_readonly pango_layout_get_lines
		63	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		64	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		65	#endif
50		66
51	#ifndef _WIN32	67	#ifndef _WIN32
52	# include <sys/types.h>	68	# include <sys/types.h>
53	# include <sys/socket.h>	69	# include <sys/socket.h>
54	# include <netinet/in.h>	70	# include <netinet/in.h>
55	# include <netinet/tcp.h>	71	# include <netinet/tcp.h>
56	# include <inttypes.h>	72	# include <inttypes.h>
57	#endif	73	#endif
58		74
		75	#if __GNUC__ >= 4
		76	# define expect(expr,value) __builtin_expect ((expr),(value))
		77	#else
		78	# define expect(expr,value) (expr)
		79	#endif
		80
		81	#define expect_false(expr) expect ((expr) != 0, 0)
		82	#define expect_true(expr) expect ((expr) != 0, 1)
		83
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		85
61	#define FOW_DARKNESS 32	86	#define FOW_DARKNESS 32
62		87
63	#define MAP_EXTEND_X 32	88	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	89	#define MAP_EXTEND_Y 512
65		90
66	#define MIN_FONT_HEIGHT 10	91	#define MIN_FONT_HEIGHT 10
67		92
68	#if 0	93	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	94	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70	#else
71	# define PARACHUTE 0
72	#endif
73		95
74	static AV *texture_av;	96	static AV *texture_av;
75		97
76	static struct	98	static struct
77	{	99	{
…		…
120		142
121	#include "pango-font.c"	143	#include "pango-font.c"
122	#include "pango-fontmap.c"	144	#include "pango-fontmap.c"
123	#include "pango-render.c"	145	#include "pango-render.c"
124		146
125	typedef IV CFPlus__Channel;	147	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	148	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	149	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	150	typedef Mix_Music *DC__MixMusic;
129		151
130	typedef PangoFontDescription *CFPlus__Font;	152	typedef PangoFontDescription *DC__Font;
131		153
132	static int	154	static int
133	shape_attr_p (PangoLayoutRun *run)	155	shape_attr_p (PangoLayoutRun *run)
134	{	156	{
135	GSList *attrs = run->item->analysis.extra_attrs;	157	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		171
150	typedef struct cf_layout {	172	typedef struct cf_layout {
151	PangoLayout *pl;	173	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	174	float r, g, b, a; // default color for rgba mode
153	int base_height;	175	int base_height;
154	CFPlus__Font font;	176	DC__Font font;
155	rc_t *rc;	177	rc_t *rc;
156	} *CFPlus__Layout;	178	} *DC__Layout;
157		179
158	static CFPlus__Font default_font;	180	static DC__Font default_font;
159	static PangoContext *opengl_context;	181	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	182	static PangoFontMap *opengl_fontmap;
161		183
162	static void	184	static void
163	substitute_func (FcPattern *pattern, gpointer data)	185	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	190	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	191	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	192	}
171		193
172	static void	194	static void
173	layout_update_font (CFPlus__Layout self)	195	layout_update_font (DC__Layout self)
174	{	196	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	197	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	198	* reasonably well with dejavu/bistream fonts
177	*/	199	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	200	PangoFontDescription *font = self->font ? self->font : default_font;
179		201
180	pango_font_description_set_absolute_size (font,	202	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	203	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		204
183	pango_layout_set_font_description (self->pl, font);	205	pango_layout_set_font_description (self->pl, font);
184	}	206	}
185		207
186	static void	208	static void
187	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	209	layout_get_pixel_size (DC__Layout self, int *w, int *h)
188	{	210	{
189	PangoRectangle rect;	211	PangoRectangle rect;
190		212
191	// get_pixel_* wrongly rounds down	213	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	214	pango_layout_get_extents (self->pl, 0, &rect);
…		…
203		225
204	typedef uint16_t tileid;	226	typedef uint16_t tileid;
205	typedef uint16_t faceid;	227	typedef uint16_t faceid;
206		228
207	typedef struct {	229	typedef struct {
208	int name;	230	GLuint name;
209	int w, h;	231	int w, h;
210	float s, t;	232	float s, t;
211	uint8_t r, g, b, a;	233	uint8_t r, g, b, a;
212	tileid smoothtile;	234	tileid smoothtile;
213	uint8_t smoothlevel;	235	uint8_t smoothlevel;
…		…
231	int faces; tileid *face2tile; // [faceid]	253	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	254	int texs; maptex *tex; // [tileid]
233		255
234	int32_t rows;	256	int32_t rows;
235	maprow *row;	257	maprow *row;
236	} *CFPlus__Map;	258	} *DC__Map;
237		259
238	static char *	260	static char *
239	prepend (char *ptr, int sze, int inc)	261	prepend (char *ptr, int sze, int inc)
240	{	262	{
241	char *p;	263	char *p;
…		…
279	self->texs *= 2;	301	self->texs *= 2;
280	}	302	}
281	}	303	}
282		304
283	static maprow *	305	static maprow *
284	map_get_row (CFPlus__Map self, int y)	306	map_get_row (DC__Map self, int y)
285	{	307	{
286	if (0 > y)	308	if (0 > y)
287	{	309	{
288	int extend = - y + MAP_EXTEND_Y;	310	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	311	Prepend (maprow, self->row, self->rows, extend);
…		…
327		349
328	return row->col + (x - row->c0);	350	return row->col + (x - row->c0);
329	}	351	}
330		352
331	static mapcell *	353	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	354	map_get_cell (DC__Map self, int x, int y)
333	{	355	{
334	return row_get_cell (map_get_row (self, y), x);	356	return row_get_cell (map_get_row (self, y), x);
335	}	357	}
336		358
337	static void	359	static void
338	map_clear (CFPlus__Map self)	360	map_clear (DC__Map self)
339	{	361	{
340	int r;	362	int r;
341		363
342	for (r = 0; r < self->rows; r++)	364	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	365	Safefree (self->row[r].col);
…		…
350	self->oy = 0;	372	self->oy = 0;
351	self->row = 0;	373	self->row = 0;
352	self->rows = 0;	374	self->rows = 0;
353	}	375	}
354		376
		377	#define CELL_CLEAR(cell) \
		378	do { \
		379	if ((cell)->player) \
		380	(cell)->tile [2] = 0; \
		381	(cell)->darkness = 0; \
		382	(cell)->stat_hp = 0; \
		383	(cell)->flags = 0; \
		384	(cell)->player = 0; \
		385	} while (0)
		386
355	static void	387	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	388	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	389	{
358	int x, y;	390	int x, y;
359	maprow *row;	391	maprow *row;
360	mapcell *cell;	392	mapcell *cell;
361		393
…		…
373	if (x >= row->c1)	405	if (x >= row->c1)
374	break;	406	break;
375		407
376	cell = row->col + x - row->c0;	408	cell = row->col + x - row->c0;
377		409
378	cell->darkness = 0;	410	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	411	}
383	}	412	}
384	}	413	}
385		414
386	typedef struct {	415	typedef struct {
…		…
440	n |= n >> 16;	469	n |= n >> 16;
441		470
442	return n + 1;	471	return n + 1;
443	}	472	}
444		473
		474	static unsigned int
		475	popcount (unsigned int n)
		476	{
		477	n -= (n >> 1) & 0x55555555U;
		478	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		479	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		480	n *= 0x01010101U;
		481
		482	return n >> 24;
		483	}
		484
445	/* SDL should provide this, really. */	485	/* SDL should provide this, really. */
446	#define SDLK_MODIFIER_MIN 300	486	#define SDLK_MODIFIER_MIN 300
447	#define SDLK_MODIFIER_MAX 314	487	#define SDLK_MODIFIER_MAX 314
448		488
449	/******************************************************************************/	489	/******************************************************************************/
…		…
487	return 0;	527	return 0;
488		528
489	return 1;	529	return 1;
490	}	530	}
491		531
492	MODULE = CFPlus PACKAGE = CFPlus	532	static void
		533	deliantra_main ()
		534	{
		535	char *argv[] = { 0 };
		536	call_argv ("::main", G_DISCARD | G_VOID, argv);
		537	}
		538
		539	#ifdef __MACOSX__
		540	/* to due surprising braindamage on the side of SDL design, we
		541	* do some mind-boggling hack here: SDL requires a custom main()
		542	* on OS X, so... we provide one and call the original main(), which,
		543	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		544	* and which calls our main (== SDL_main) back.
		545	*/
		546	extern C_LINKAGE int
		547	main (int argc, char *argv[])
		548	{
		549	deliantra_main ();
		550	}
		551
		552	#undef main
		553
		554	extern C_LINKAGE int main (int argc, char *argv[]);
		555
		556	static void
		557	SDL_braino (void)
		558	{
		559	char *argv[] = { "deliantra client", 0 };
		560	(main) (1, argv);
		561	}
		562	#else
		563	static void
		564	SDL_braino (void)
		565	{
		566	deliantra_main ();
		567	}
		568	#endif
		569
		570	MODULE = Deliantra::Client PACKAGE = DC
493		571
494	PROTOTYPES: ENABLE	572	PROTOTYPES: ENABLE
495		573
496	BOOT:	574	BOOT:
497	{	575	{
498	HV *stash = gv_stashpv ("CFPlus", 1);	576	HV *stash = gv_stashpv ("DC", 1);
499	static const struct {	577	static const struct {
500	const char *name;	578	const char *name;
501	IV iv;	579	IV iv;
502	} *civ, const_iv[] = {	580	} *civ, const_iv[] = {
503	# define const_iv(name) { # name, (IV)name }	581	# define const_iv(name) { # name, (IV)name }
…		…
525		603
526	const_iv (SDL_APPINPUTFOCUS),	604	const_iv (SDL_APPINPUTFOCUS),
527	const_iv (SDL_APPMOUSEFOCUS),	605	const_iv (SDL_APPMOUSEFOCUS),
528	const_iv (SDL_APPACTIVE),	606	const_iv (SDL_APPACTIVE),
529		607
		608
		609	const_iv (SDLK_UNKNOWN),
		610	const_iv (SDLK_FIRST),
		611	const_iv (SDLK_BACKSPACE),
		612	const_iv (SDLK_TAB),
		613	const_iv (SDLK_CLEAR),
		614	const_iv (SDLK_RETURN),
		615	const_iv (SDLK_PAUSE),
		616	const_iv (SDLK_ESCAPE),
		617	const_iv (SDLK_SPACE),
		618	const_iv (SDLK_EXCLAIM),
		619	const_iv (SDLK_QUOTEDBL),
		620	const_iv (SDLK_HASH),
		621	const_iv (SDLK_DOLLAR),
		622	const_iv (SDLK_AMPERSAND),
		623	const_iv (SDLK_QUOTE),
		624	const_iv (SDLK_LEFTPAREN),
		625	const_iv (SDLK_RIGHTPAREN),
		626	const_iv (SDLK_ASTERISK),
		627	const_iv (SDLK_PLUS),
		628	const_iv (SDLK_COMMA),
		629	const_iv (SDLK_MINUS),
		630	const_iv (SDLK_PERIOD),
		631	const_iv (SDLK_SLASH),
		632	const_iv (SDLK_0),
		633	const_iv (SDLK_1),
		634	const_iv (SDLK_2),
		635	const_iv (SDLK_3),
		636	const_iv (SDLK_4),
		637	const_iv (SDLK_5),
		638	const_iv (SDLK_6),
		639	const_iv (SDLK_7),
		640	const_iv (SDLK_8),
		641	const_iv (SDLK_9),
		642	const_iv (SDLK_COLON),
		643	const_iv (SDLK_SEMICOLON),
		644	const_iv (SDLK_LESS),
		645	const_iv (SDLK_EQUALS),
		646	const_iv (SDLK_GREATER),
		647	const_iv (SDLK_QUESTION),
		648	const_iv (SDLK_AT),
		649
		650	const_iv (SDLK_LEFTBRACKET),
		651	const_iv (SDLK_BACKSLASH),
		652	const_iv (SDLK_RIGHTBRACKET),
		653	const_iv (SDLK_CARET),
		654	const_iv (SDLK_UNDERSCORE),
		655	const_iv (SDLK_BACKQUOTE),
		656	const_iv (SDLK_DELETE),
		657
		658	const_iv (SDLK_FIRST),
		659	const_iv (SDLK_LAST),
530	const_iv (SDLK_KP0),	660	const_iv (SDLK_KP0),
531	const_iv (SDLK_KP1),	661	const_iv (SDLK_KP1),
532	const_iv (SDLK_KP2),	662	const_iv (SDLK_KP2),
533	const_iv (SDLK_KP3),	663	const_iv (SDLK_KP3),
534	const_iv (SDLK_KP4),	664	const_iv (SDLK_KP4),
…		…
606	const_iv (KMOD_LMETA),	736	const_iv (KMOD_LMETA),
607	const_iv (KMOD_RMETA),	737	const_iv (KMOD_RMETA),
608	const_iv (KMOD_NUM),	738	const_iv (KMOD_NUM),
609	const_iv (KMOD_CAPS),	739	const_iv (KMOD_CAPS),
610	const_iv (KMOD_MODE),	740	const_iv (KMOD_MODE),
		741
		742	const_iv (MIX_DEFAULT_FORMAT),
		743
		744	const_iv (SDL_INIT_TIMER),
		745	const_iv (SDL_INIT_AUDIO),
		746	const_iv (SDL_INIT_VIDEO),
		747	const_iv (SDL_INIT_CDROM),
		748	const_iv (SDL_INIT_JOYSTICK),
		749	const_iv (SDL_INIT_EVERYTHING),
		750	const_iv (SDL_INIT_NOPARACHUTE),
		751	const_iv (SDL_INIT_EVENTTHREAD),
		752
		753	const_iv (SDL_GL_RED_SIZE),
		754	const_iv (SDL_GL_GREEN_SIZE),
		755	const_iv (SDL_GL_BLUE_SIZE),
		756	const_iv (SDL_GL_ALPHA_SIZE),
		757	const_iv (SDL_GL_DOUBLEBUFFER),
		758	const_iv (SDL_GL_BUFFER_SIZE),
		759	const_iv (SDL_GL_DEPTH_SIZE),
		760	const_iv (SDL_GL_STENCIL_SIZE),
		761	const_iv (SDL_GL_ACCUM_RED_SIZE),
		762	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		763	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		764	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		765	const_iv (SDL_GL_STEREO),
		766	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		767	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		768	const_iv (SDL_GL_ACCELERATED_VISUAL),
		769	const_iv (SDL_GL_SWAP_CONTROL),
		770
		771	const_iv (FOW_DARKNESS)
611	# undef const_iv	772	# undef const_iv
612	};	773	};
613		774
614	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	775	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	776	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
633		794
634	NV floor (NV x)	795	NV floor (NV x)
635		796
636	NV ceil (NV x)	797	NV ceil (NV x)
637		798
		799	IV minpot (UV n)
		800
		801	IV popcount (UV n)
		802
638	void	803	void
639	pango_init ()	804	pango_init ()
640	CODE:	805	CODE:
641	{	806	{
642	opengl_fontmap = pango_opengl_font_map_new ();	807	opengl_fontmap = pango_opengl_font_map_new ();
643	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	808	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	809	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		810	/*pango_context_set_font_description (opengl_context, default_font);*/
		811	#if PANGO_VERSION_CHECK (1, 15, 2)
		812	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		813	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		814	#endif
645	}	815	}
646		816
647	char *
648	SDL_GetError ()	817	char *SDL_GetError ()
649		818
650	int	819	void SDL_braino ()
651	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652		820
653	void	821	int SDL_Init (U32 flags)
		822
		823	int SDL_InitSubSystem (U32 flags)
		824
		825	void SDL_QuitSubSystem (U32 flags)
		826
654	SDL_Quit ()	827	void SDL_Quit ()
		828
		829	int SDL_GL_SetAttribute (int attr, int value)
		830
		831	int SDL_GL_GetAttribute (int attr)
		832	CODE:
		833	if (SDL_GL_GetAttribute (attr, &RETVAL))
		834	XSRETURN_UNDEF;
		835	OUTPUT:
		836	RETVAL
655		837
656	void	838	void
657	SDL_ListModes (int rgb, int alpha)	839	SDL_ListModes (int rgb, int alpha)
658	PPCODE:	840	PPCODE:
659	{	841	{
…		…
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	853	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	854	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	855	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674		856
675	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	857	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676	#if SDL_VERSION_ATLEAST(1,2,10)
677	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	858	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679	#endif
680		859
681	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	860	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682		861
683	if (m && m != (SDL_Rect **)-1)	862	if (m && m != (SDL_Rect **)-1)
684	while (*m)	863	while (*m)
685	{	864	{
686	if ((*m)->w >= 640 && (*m)->h >= 480)	865	if ((*m)->w >= 400 && (*m)->h >= 300)
687	{	866	{
688	AV *av = newAV ();	867	AV *av = newAV ();
689	av_push (av, newSViv ((*m)->w));	868	av_push (av, newSViv ((*m)->w));
690	av_push (av, newSViv ((*m)->h));	869	av_push (av, newSViv ((*m)->h));
691	av_push (av, newSViv (rgb));	870	av_push (av, newSViv (rgb));
…		…
715		894
716	if (RETVAL)	895	if (RETVAL)
717	{	896	{
718	av_clear (texture_av);	897	av_clear (texture_av);
719		898
720	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	899	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	900	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722	#include "glfunc.h"	901	#include "glfunc.h"
723	#undef GL_FUNC	902	#undef GL_FUNC
724	}	903	}
725	}	904	}
…		…
732	char *	911	char *
733	SDL_GetKeyName (int sym)	912	SDL_GetKeyName (int sym)
734		913
735	int	914	int
736	SDL_GetAppState ()	915	SDL_GetAppState ()
		916
		917	int
		918	SDL_GetModState ()
737		919
738	void	920	void
739	poll_events ()	921	poll_events ()
740	PPCODE:	922	PPCODE:
741	{	923	{
…		…
751	{	933	{
752	case SDL_KEYDOWN:	934	case SDL_KEYDOWN:
753	case SDL_KEYUP:	935	case SDL_KEYUP:
754	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	936	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	937	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	938	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
757	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	939	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
758	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	940	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759	break;	941	break;
760		942
761	case SDL_ACTIVEEVENT:	943	case SDL_ACTIVEEVENT:
762	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	944	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
780	x = ev.motion.x;	962	x = ev.motion.x;
781	y = ev.motion.y;	963	y = ev.motion.y;
782	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	964	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783	}	965	}
784		966
785	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	967	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786	hv_store (hv, "state", 5, newSViv (state), 0);	968	hv_store (hv, "state", 5, newSViv (state), 0);
787	hv_store (hv, "x", 1, newSViv (x), 0);	969	hv_store (hv, "x", 1, newSViv (x), 0);
788	hv_store (hv, "y", 1, newSViv (y), 0);	970	hv_store (hv, "y", 1, newSViv (y), 0);
789	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	971	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	972	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791	}	973	}
792	break;	974	break;
793		975
794	case SDL_MOUSEBUTTONDOWN:	976	case SDL_MOUSEBUTTONDOWN:
795	case SDL_MOUSEBUTTONUP:	977	case SDL_MOUSEBUTTONUP:
796	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	978	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797		979
798	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	980	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	981	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	982	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	983	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
806	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	988	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	989	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808	break;	990	break;
809	}	991	}
810		992
811	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	993	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812	}	994	}
813	}	995	}
814		996
815	int	997	int
816	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	998	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817	POSTCALL:	999	POSTCALL:
818	Mix_HookMusicFinished (music_finished);	1000	Mix_HookMusicFinished (music_finished);
819	Mix_ChannelFinished (channel_finished);	1001	Mix_ChannelFinished (channel_finished);
		1002
		1003	void
		1004	Mix_QuerySpec ()
		1005	PPCODE:
		1006	{
		1007	int freq, channels;
		1008	Uint16 format;
		1009
		1010	if (Mix_QuerySpec (&freq, &format, &channels))
		1011	{
		1012	EXTEND (SP, 3);
		1013	PUSHs (sv_2mortal (newSViv (freq)));
		1014	PUSHs (sv_2mortal (newSViv (format)));
		1015	PUSHs (sv_2mortal (newSViv (channels)));
		1016	}
		1017	}
820		1018
821	void	1019	void
822	Mix_CloseAudio ()	1020	Mix_CloseAudio ()
823		1021
824	int	1022	int
…		…
859	}	1057	}
860	}	1058	}
861	#endif	1059	#endif
862	}	1060	}
863		1061
864	void	1062	int
865	add_font (char *file)	1063	add_font (char *file)
866	CODE:	1064	CODE:
867	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1065	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1066	OUTPUT:
		1067	RETVAL
868		1068
869	void	1069	void
870	load_image_inline (SV *image_)	1070	load_image_inline (SV *image_)
871	ALIAS:	1071	ALIAS:
872	load_image_file = 1	1072	load_image_file = 1
…		…
958	void	1158	void
959	error (char *message)	1159	error (char *message)
960	CODE:	1160	CODE:
961	fprintf (stderr, "ERROR: %s\n", message);	1161	fprintf (stderr, "ERROR: %s\n", message);
962	#ifdef _WIN32	1162	#ifdef _WIN32
963	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1163	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964	#endif	1164	#endif
965		1165
966	void	1166	void
967	fatal (char *message)	1167	fatal (char *message)
968	CODE:	1168	CODE:
969	fprintf (stderr, "FATAL: %s\n", message);	1169	fprintf (stderr, "FATAL: %s\n", message);
970	#ifdef _WIN32	1170	#ifdef _WIN32
971	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1171	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972	#endif	1172	#endif
973	_exit (1);	1173	_exit (1);
974		1174
975	void	1175	void
976	_exit (int retval = 0)	1176	_exit (int retval = 0)
…		…
988	#if DEBUG	1188	#if DEBUG
989	VALGRIND_DO_LEAK_CHECK;	1189	VALGRIND_DO_LEAK_CHECK;
990	#endif	1190	#endif
991	}	1191	}
992		1192
993	MODULE = CFPlus PACKAGE = CFPlus::Font	1193	MODULE = Deliantra::Client PACKAGE = DC::Font
994		1194
995	PROTOTYPES: DISABLE	1195	PROTOTYPES: DISABLE
996		1196
997	CFPlus::Font	1197	DC::Font
998	new_from_file (SV *class, char *path, int id = 0)	1198	new_from_file (SV *class, char *path, int id = 0)
999	CODE:	1199	CODE:
1000	{	1200	{
1001	int count;	1201	int count;
1002	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1202	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1005	}	1205	}
1006	OUTPUT:	1206	OUTPUT:
1007	RETVAL	1207	RETVAL
1008		1208
1009	void	1209	void
1010	DESTROY (CFPlus::Font self)	1210	DESTROY (DC::Font self)
1011	CODE:	1211	CODE:
1012	pango_font_description_free (self);	1212	pango_font_description_free (self);
1013		1213
1014	void	1214	void
1015	make_default (CFPlus::Font self)	1215	make_default (DC::Font self)
1016	PROTOTYPE: $	1216	PROTOTYPE: $
1017	CODE:	1217	CODE:
1018	default_font = self;	1218	default_font = self;
1019		1219
1020	MODULE = CFPlus PACKAGE = CFPlus::Layout	1220	MODULE = Deliantra::Client PACKAGE = DC::Layout
1021		1221
1022	PROTOTYPES: DISABLE	1222	PROTOTYPES: DISABLE
1023		1223
1024	void	1224	void
1025	reset_glyph_cache ()	1225	glyph_cache_backup ()
1026	PROTOTYPE:	1226	PROTOTYPE:
1027	CODE:	1227	CODE:
		1228	tc_backup ();
		1229
		1230	void
		1231	glyph_cache_restore ()
		1232	PROTOTYPE:
		1233	CODE:
1028	tc_clear ();	1234	tc_restore ();
1029		1235
1030	CFPlus::Layout	1236	DC::Layout
1031	new (SV *class)	1237	new (SV *class)
1032	CODE:	1238	CODE:
1033	New (0, RETVAL, 1, struct cf_layout);	1239	New (0, RETVAL, 1, struct cf_layout);
1034		1240
1035	RETVAL->pl = pango_layout_new (opengl_context);	1241	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1045	layout_update_font (RETVAL);	1251	layout_update_font (RETVAL);
1046	OUTPUT:	1252	OUTPUT:
1047	RETVAL	1253	RETVAL
1048		1254
1049	void	1255	void
1050	DESTROY (CFPlus::Layout self)	1256	DESTROY (DC::Layout self)
1051	CODE:	1257	CODE:
1052	g_object_unref (self->pl);	1258	g_object_unref (self->pl);
1053	rc_free (self->rc);	1259	rc_free (self->rc);
1054	Safefree (self);	1260	Safefree (self);
1055		1261
1056	void	1262	void
1057	set_text (CFPlus::Layout self, SV *text_)	1263	set_text (DC::Layout self, SV *text_)
1058	CODE:	1264	CODE:
1059	{	1265	{
1060	STRLEN textlen;	1266	STRLEN textlen;
1061	char *text = SvPVutf8 (text_, textlen);	1267	char *text = SvPVutf8 (text_, textlen);
1062		1268
1063	pango_layout_set_text (self->pl, text, textlen);	1269	pango_layout_set_text (self->pl, text, textlen);
1064	}	1270	}
1065		1271
1066	void	1272	void
1067	set_markup (CFPlus::Layout self, SV *text_)	1273	set_markup (DC::Layout self, SV *text_)
1068	CODE:	1274	CODE:
1069	{	1275	{
1070	STRLEN textlen;	1276	STRLEN textlen;
1071	char *text = SvPVutf8 (text_, textlen);	1277	char *text = SvPVutf8 (text_, textlen);
1072		1278
1073	pango_layout_set_markup (self->pl, text, textlen);	1279	pango_layout_set_markup (self->pl, text, textlen);
1074	}	1280	}
1075		1281
1076	void	1282	void
1077	set_shapes (CFPlus::Layout self, ...)	1283	set_shapes (DC::Layout self, ...)
1078	CODE:	1284	CODE:
1079	{	1285	{
1080	PangoAttrList *attrs = 0;	1286	PangoAttrList *attrs = 0;
1081	const char *text = pango_layout_get_text (self->pl);	1287	const char *text = pango_layout_get_text (self->pl);
1082	const char *pos = text;	1288	const char *pos = text;
…		…
1117	if (attrs)	1323	if (attrs)
1118	pango_layout_set_attributes (self->pl, attrs);	1324	pango_layout_set_attributes (self->pl, attrs);
1119	}	1325	}
1120		1326
1121	void	1327	void
1122	get_shapes (CFPlus::Layout self)	1328	get_shapes (DC::Layout self)
1123	PPCODE:	1329	PPCODE:
1124	{	1330	{
1125	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1331	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126		1332
1127	do	1333	do
1128	{	1334	{
1129	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1335	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130		1336
1131	if (run && shape_attr_p (run))	1337	if (run && shape_attr_p (run))
1132	{	1338	{
1133	PangoRectangle extents;	1339	PangoRectangle extents;
1134	pango_layout_iter_get_run_extents (iter, 0, &extents);	1340	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1142		1348
1143	pango_layout_iter_free (iter);	1349	pango_layout_iter_free (iter);
1144	}	1350	}
1145		1351
1146	int	1352	int
1147	has_wrapped (CFPlus::Layout self)	1353	has_wrapped (DC::Layout self)
1148	CODE:	1354	CODE:
1149	{	1355	{
1150	int lines = 1;	1356	int lines = 1;
1151	const char *text = pango_layout_get_text (self->pl);	1357	const char *text = pango_layout_get_text (self->pl);
1152		1358
…		…
1157	}	1363	}
1158	OUTPUT:	1364	OUTPUT:
1159	RETVAL	1365	RETVAL
1160		1366
1161	SV *	1367	SV *
1162	get_text (CFPlus::Layout self)	1368	get_text (DC::Layout self)
1163	CODE:	1369	CODE:
1164	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1370	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165	sv_utf8_decode (RETVAL);	1371	sv_utf8_decode (RETVAL);
1166	OUTPUT:	1372	OUTPUT:
1167	RETVAL	1373	RETVAL
1168		1374
1169	void	1375	void
1170	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1376	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171	CODE:	1377	CODE:
1172	self->r = r;	1378	self->r = r;
1173	self->g = g;	1379	self->g = g;
1174	self->b = b;	1380	self->b = b;
1175	self->a = a;	1381	self->a = a;
1176		1382
1177	void	1383	void
1178	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1384	set_font (DC::Layout self, DC::Font font = 0)
1179	CODE:	1385	CODE:
1180	if (self->font != font)	1386	if (self->font != font)
1181	{	1387	{
1182	self->font = font;	1388	self->font = font;
1183	layout_update_font (self);	1389	layout_update_font (self);
1184	}	1390	}
1185		1391
1186	void	1392	void
1187	set_height (CFPlus::Layout self, int base_height)	1393	set_height (DC::Layout self, int base_height)
1188	CODE:	1394	CODE:
1189	if (self->base_height != base_height)	1395	if (self->base_height != base_height)
1190	{	1396	{
1191	self->base_height = base_height;	1397	self->base_height = base_height;
1192	layout_update_font (self);	1398	layout_update_font (self);
1193	}	1399	}
1194		1400
1195	void	1401	void
1196	set_width (CFPlus::Layout self, int max_width = -1)	1402	set_width (DC::Layout self, int max_width = -1)
1197	CODE:	1403	CODE:
1198	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1404	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199		1405
1200	void	1406	void
1201	set_indent (CFPlus::Layout self, int indent)	1407	set_indent (DC::Layout self, int indent)
1202	CODE:	1408	CODE:
1203	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1409	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204		1410
1205	void	1411	void
1206	set_spacing (CFPlus::Layout self, int spacing)	1412	set_spacing (DC::Layout self, int spacing)
1207	CODE:	1413	CODE:
1208	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1414	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209		1415
1210	void	1416	void
1211	set_ellipsise (CFPlus::Layout self, int ellipsise)	1417	set_ellipsise (DC::Layout self, int ellipsise)
1212	CODE:	1418	CODE:
1213	pango_layout_set_ellipsize (self->pl,	1419	pango_layout_set_ellipsize (self->pl,
1214	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1420	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1421	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1422	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217	: PANGO_ELLIPSIZE_NONE	1423	: PANGO_ELLIPSIZE_NONE
1218	);	1424	);
1219		1425
1220	void	1426	void
1221	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1427	set_single_paragraph_mode (DC::Layout self, int spm)
1222	CODE:	1428	CODE:
1223	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1429	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224		1430
1225	void	1431	void
1226	size (CFPlus::Layout self)	1432	size (DC::Layout self)
1227	PPCODE:	1433	PPCODE:
1228	{	1434	{
1229	int w, h;	1435	int w, h;
1230		1436
1231	layout_get_pixel_size (self, &w, &h);	1437	layout_get_pixel_size (self, &w, &h);
…		…
1234	PUSHs (sv_2mortal (newSViv (w)));	1440	PUSHs (sv_2mortal (newSViv (w)));
1235	PUSHs (sv_2mortal (newSViv (h)));	1441	PUSHs (sv_2mortal (newSViv (h)));
1236	}	1442	}
1237		1443
1238	int	1444	int
1239	descent (CFPlus::Layout self)	1445	descent (DC::Layout self)
1240	CODE:	1446	CODE:
1241	{	1447	{
1242	PangoRectangle rect;	1448	PangoRectangle rect;
1243	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1449	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244	pango_layout_line_get_pixel_extents (line, 0, &rect);	1450	pango_layout_line_get_pixel_extents (line, 0, &rect);
1245	RETVAL = PANGO_DESCENT (rect);	1451	RETVAL = PANGO_DESCENT (rect);
1246	}	1452	}
1247	OUTPUT:	1453	OUTPUT:
1248	RETVAL	1454	RETVAL
1249		1455
1250	int	1456	int
1251	xy_to_index (CFPlus::Layout self, int x, int y)	1457	xy_to_index (DC::Layout self, int x, int y)
1252	CODE:	1458	CODE:
1253	{	1459	{
1254	int index, trailing;	1460	int index, trailing;
1255	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1461	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256	RETVAL = index + trailing;	1462	RETVAL = index + trailing;
1257	}	1463	}
1258	OUTPUT:	1464	OUTPUT:
1259	RETVAL	1465	RETVAL
1260		1466
1261	void	1467	void
1262	cursor_pos (CFPlus::Layout self, int index)	1468	cursor_pos (DC::Layout self, int index)
1263	PPCODE:	1469	PPCODE:
1264	{	1470	{
1265	PangoRectangle strong_pos;	1471	PangoRectangle pos;
1266	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1472	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267		1473
1268	EXTEND (SP, 3);	1474	EXTEND (SP, 3);
1269	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1475	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1476	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1477	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272	}	1478	}
1273		1479
1274	void	1480	void
1275	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1481	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276	PPCODE:	1482	PPCODE:
1277	{	1483	{
1278	int line, x;	1484	int line, x;
1279		1485
1280	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1486	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1487	#if !PANGO_VERSION_CHECK (1, 17, 3)
1281	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1488	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282		1489	--line;
		1490	#endif
1283	EXTEND (SP, 2);	1491	EXTEND (SP, 2);
1284	PUSHs (sv_2mortal (newSViv (line - 1)));	1492	PUSHs (sv_2mortal (newSViv (line)));
1285	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1493	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286	}	1494	}
1287		1495
1288	void	1496	void
1289	line_x_to_index (CFPlus::Layout self, int line, int x)	1497	line_x_to_index (DC::Layout self, int line, int x)
1290	PPCODE:	1498	PPCODE:
1291	{	1499	{
1292	PangoLayoutLine *lp;	1500	PangoLayoutLine *lp;
1293	int index, trailing;	1501	int index, trailing;
1294		1502
1295	if (line < 0)	1503	if (line < 0)
1296	XSRETURN_EMPTY;	1504	XSRETURN_EMPTY;
1297		1505
1298	if (!(lp = pango_layout_get_line (self->pl, line)))	1506	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299	XSRETURN_EMPTY; /* do better */	1507	XSRETURN_EMPTY; /* do better */
1300		1508
1301	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1509	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302		1510
1303	EXTEND (SP, 2);	1511	EXTEND (SP, 2);
…		…
1309	PUSHs (sv_2mortal (newSViv (trailing)));	1517	PUSHs (sv_2mortal (newSViv (trailing)));
1310	}	1518	}
1311	}	1519	}
1312		1520
1313	void	1521	void
1314	render (CFPlus::Layout self, float x, float y, int flags = 0)	1522	render (DC::Layout self, float x, float y, int flags = 0)
1315	CODE:	1523	CODE:
1316	rc_clear (self->rc);	1524	rc_clear (self->rc);
1317	pango_opengl_render_layout_subpixel (	1525	pango_opengl_render_layout_subpixel (
1318	self->pl,	1526	self->pl,
1319	self->rc,	1527	self->rc,
…		…
1324	// we assume that context_change actually clears/frees stuff	1532	// we assume that context_change actually clears/frees stuff
1325	// and does not do any recomputation...	1533	// and does not do any recomputation...
1326	pango_layout_context_changed (self->pl);	1534	pango_layout_context_changed (self->pl);
1327		1535
1328	void	1536	void
1329	draw (CFPlus::Layout self)	1537	draw (DC::Layout self)
1330	CODE:	1538	CODE:
1331	{	1539	{
1332	glEnable (GL_TEXTURE_2D);	1540	glEnable (GL_TEXTURE_2D);
1333	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1541	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334	glEnable (GL_BLEND);	1542	glEnable (GL_BLEND);
…		…
1342	glDisable (GL_ALPHA_TEST);	1550	glDisable (GL_ALPHA_TEST);
1343	glDisable (GL_BLEND);	1551	glDisable (GL_BLEND);
1344	glDisable (GL_TEXTURE_2D);	1552	glDisable (GL_TEXTURE_2D);
1345	}	1553	}
1346		1554
1347	MODULE = CFPlus PACKAGE = CFPlus::Texture	1555	MODULE = Deliantra::Client PACKAGE = DC::Texture
1348		1556
1349	PROTOTYPES: ENABLE	1557	PROTOTYPES: ENABLE
1350
1351	int minpot (int n)
1352		1558
1353	void	1559	void
1354	pad (SV *data_, int ow, int oh, int nw, int nh)	1560	pad (SV *data_, int ow, int oh, int nw, int nh)
1355	CODE:	1561	CODE:
1356	{	1562	{
…		…
1433	RETVAL = width > 0;	1639	RETVAL = width > 0;
1434	}	1640	}
1435	OUTPUT:	1641	OUTPUT:
1436	RETVAL	1642	RETVAL
1437		1643
1438	MODULE = CFPlus PACKAGE = CFPlus::Map	1644	MODULE = Deliantra::Client PACKAGE = DC::Map
1439		1645
1440	PROTOTYPES: DISABLE	1646	PROTOTYPES: DISABLE
1441		1647
1442	CFPlus::Map	1648	DC::Map
1443	new (SV *class)	1649	new (SV *class)
1444	CODE:	1650	CODE:
1445	New (0, RETVAL, 1, struct map);	1651	New (0, RETVAL, 1, struct map);
1446	RETVAL->x = 0;	1652	RETVAL->x = 0;
1447	RETVAL->y = 0;	1653	RETVAL->y = 0;
…		…
1455	RETVAL->row = 0;	1661	RETVAL->row = 0;
1456	OUTPUT:	1662	OUTPUT:
1457	RETVAL	1663	RETVAL
1458		1664
1459	void	1665	void
1460	DESTROY (CFPlus::Map self)	1666	DESTROY (DC::Map self)
1461	CODE:	1667	CODE:
1462	{	1668	{
1463	map_clear (self);	1669	map_clear (self);
1464	Safefree (self->face2tile);	1670	Safefree (self->face2tile);
1465	Safefree (self->tex);	1671	Safefree (self->tex);
1466	Safefree (self);	1672	Safefree (self);
1467	}	1673	}
1468		1674
1469	void	1675	void
1470	resize (CFPlus::Map self, int map_width, int map_height)	1676	resize (DC::Map self, int map_width, int map_height)
1471	CODE:	1677	CODE:
1472	self->w = map_width;	1678	self->w = map_width;
1473	self->h = map_height;	1679	self->h = map_height;
1474		1680
1475	void	1681	void
1476	clear (CFPlus::Map self)	1682	clear (DC::Map self)
1477	CODE:	1683	CODE:
1478	map_clear (self);	1684	map_clear (self);
1479		1685
1480	void	1686	void
1481	set_tileid (CFPlus::Map self, int face, int tile)	1687	set_tileid (DC::Map self, int face, int tile)
1482	CODE:	1688	CODE:
1483	{	1689	{
1484	need_facenum (self, face); self->face2tile [face] = tile;	1690	need_facenum (self, face); self->face2tile [face] = tile;
1485	need_texid (self, tile);	1691	need_texid (self, tile);
1486	}	1692	}
1487		1693
1488	void	1694	void
1489	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1695	set_smooth (DC::Map self, int face, int smooth, int level)
1490	CODE:	1696	CODE:
1491	{	1697	{
1492	tileid texid;	1698	tileid texid;
1493	maptex *tex;	1699	maptex *tex;
1494		1700
…		…
1507	tex->smoothtile = self->face2tile [smooth];	1713	tex->smoothtile = self->face2tile [smooth];
1508	tex->smoothlevel = level;	1714	tex->smoothlevel = level;
1509	}	1715	}
1510		1716
1511	void	1717	void
1512	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)	1718	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)
1513	CODE:	1719	CODE:
1514	{	1720	{
1515	need_texid (self, texid);	1721	need_texid (self, texid);
1516		1722
1517	{	1723	{
…		…
1537	// from transparent color bleeding and ugly wrapping effects.	1743	// from transparent color bleeding and ugly wrapping effects.
1538	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1744	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539	}	1745	}
1540		1746
1541	int	1747	int
1542	ox (CFPlus::Map self)	1748	ox (DC::Map self)
1543	ALIAS:	1749	ALIAS:
1544	oy = 1	1750	oy = 1
1545	x = 2	1751	x = 2
1546	y = 3	1752	y = 3
1547	w = 4	1753	w = 4
…		…
1558	}	1764	}
1559	OUTPUT:	1765	OUTPUT:
1560	RETVAL	1766	RETVAL
1561		1767
1562	void	1768	void
1563	scroll (CFPlus::Map self, int dx, int dy)	1769	scroll (DC::Map self, int dx, int dy)
1564	CODE:	1770	CODE:
1565	{	1771	{
1566	if (dx > 0)	1772	if (dx > 0)
1567	map_blank (self, self->x, self->y, dx, self->h);	1773	map_blank (self, self->x, self->y, dx, self->h);
1568	else if (dx < 0)	1774	else if (dx < 0)
…		…
1584	self->y += MAP_EXTEND_Y;	1790	self->y += MAP_EXTEND_Y;
1585	}	1791	}
1586	}	1792	}
1587		1793
1588	SV *	1794	SV *
1589	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1795	map1a_update (DC::Map self, SV *data_, int extmap)
1590	CODE:	1796	CODE:
1591	{	1797	{
1592	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1798	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593	uint8_t *data_end = (uint8_t *)SvEND (data_);	1799	uint8_t *data_end = (uint8_t *)SvEND (data_);
1594	mapcell *cell;	1800	mapcell *cell;
…		…
1622	uint8_t ext, cmd;	1828	uint8_t ext, cmd;
1623		1829
1624	do	1830	do
1625	{	1831	{
1626	ext = *data++;	1832	ext = *data++;
1627	cmd = ext & 0x3f;	1833	cmd = ext & 0x7f;
1628		1834
1629	if (cmd < 4)	1835	if (cmd < 4)
1630	cell->darkness = 255 - ext * 64 + 1;	1836	cell->darkness = 255 - ext * 64 + 1;
1631	else if (cmd == 5) // health	1837	else if (cmd == 5) // health
1632	{	1838	{
…		…
1635	}	1841	}
1636	else if (cmd == 6) // monster width	1842	else if (cmd == 6) // monster width
1637	cell->stat_width = *data++ + 1;	1843	cell->stat_width = *data++ + 1;
1638	else if (cmd == 0x47)	1844	else if (cmd == 0x47)
1639	{	1845	{
1640	if (*data == 4)	1846	if (*data == 1) cell->player = data [1];
1641	; // decode player count	1847	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1848	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1849	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642		1850
1643	data += *data + 1;	1851	data += *data + 1;
1644	}	1852	}
1645	else if (cmd == 8) // cell flags	1853	else if (cmd == 8) // cell flags
1646	cell->flags = *data++;	1854	cell->flags = *data++;
…		…
1676	}	1884	}
1677	}	1885	}
1678	}	1886	}
1679	}	1887	}
1680	else	1888	else
1681	cell->darkness = 0;	1889	CELL_CLEAR (cell);
1682	}	1890	}
1683	}	1891	}
1684	OUTPUT:	1892	OUTPUT:
1685	RETVAL	1893	RETVAL
1686		1894
1687	SV *	1895	SV *
1688	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1896	mapmap (DC::Map self, int x0, int y0, int w, int h)
1689	CODE:	1897	CODE:
1690	{	1898	{
1691	int x1, x;	1899	int x1, x;
1692	int y1, y;	1900	int y1, y;
1693	int z;	1901	int z;
…		…
1738	}	1946	}
1739	OUTPUT:	1947	OUTPUT:
1740	RETVAL	1948	RETVAL
1741		1949
1742	void	1950	void
1743	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1951	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744	CODE:	1952	CODE:
1745	{	1953	{
1746	int x, y, z;	1954	int x, y, z;
1747		1955
1748	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1956	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1957	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1958	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751	smooth_key skey;	1959	smooth_key skey;
1752		1960	int pl_x, pl_y;
		1961	maptex pl_tex;
1753	rc_t *rc = rc_alloc ();	1962	rc_t *rc = rc_alloc ();
1754	rc_key_t key;	1963	rc_key_t key;
1755	rc_array_t *arr;	1964	rc_array_t *arr;
		1965
		1966	pl_tex.name = 0;
1756		1967
1757	// thats current max. sorry.	1968	// thats current max. sorry.
1758	if (sw > 255) sw = 255;	1969	if (sw > 255) sw = 255;
1759	if (sh > 255) sh = 255;	1970	if (sh > 255) sh = 255;
1760		1971
…		…
1815	tileid tile = cell->tile [z];	2026	tileid tile = cell->tile [z];
1816		2027
1817	if (tile)	2028	if (tile)
1818	{	2029	{
1819	maptex tex = self->tex [tile];	2030	maptex tex = self->tex [tile];
1820	int px, py;	2031	int px = (x + 1) * T - tex.w;
		2032	int py = (y + 1) * T - tex.h;
1821		2033
1822	// suppressing texture state switches here
1823	// is only moderately effective, but worth the extra effort
1824	if (key.texname != tex.name)	2034	if (key.texname != tex.name)
1825	{	2035	{
1826	if (!tex.name)	2036	if (!tex.name)
1827	tex = self->tex [2]; /* missing, replace by noface */	2037	tex = self->tex [2]; /* missing, replace by noface */
1828		2038
1829	key.texname = tex.name;	2039	key.texname = tex.name;
1830	arr = rc_array (rc, &key);	2040	arr = rc_array (rc, &key);
1831	}	2041	}
1832		2042
1833	px = (x + 1) * T - tex.w;	2043	if (expect_false (cell->player == player) && expect_false (z == 2))
1834	py = (y + 1) * T - tex.h;	2044	{
		2045	pl_x = px;
		2046	pl_y = py;
		2047	pl_tex = tex;
		2048	continue;
		2049	}
1835		2050
1836	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2051	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1837	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2052	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1838	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2053	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1839	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2054	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1840		2055
1841	if (cell->flags && z == 2)	2056	if (expect_false (cell->flags) && expect_false (z == 2))
1842	{	2057	{
1843	// overlays such as the speech bubble, probably more to come	2058	// overlays such as the speech bubble, probably more to come
1844	if (cell->flags & 1)	2059	if (cell->flags & 1)
1845	{	2060	{
1846	maptex tex = self->tex [1];	2061	maptex tex = self->tex [1];
…		…
1911	// go through all smoothlevels, lowest to highest, then draw.	2126	// go through all smoothlevels, lowest to highest, then draw.
1912	// this is basically counting sort	2127	// this is basically counting sort
1913	{	2128	{
1914	int w, b;	2129	int w, b;
1915		2130
		2131	glEnable (GL_TEXTURE_2D);
		2132	glBegin (GL_QUADS);
1916	for (w = 0; w < 256 / 32; ++w)	2133	for (w = 0; w < 256 / 32; ++w)
1917	{	2134	{
1918	uint32_t smask = smooth_level [w];	2135	uint32_t smask = smooth_level [w];
1919	if (smask)	2136	if (smask)
1920	for (b = 0; b < 32; ++b)	2137	for (b = 0; b < 32; ++b)
…		…
1945	{	2162	{
1946	// this time avoiding texture state changes	2163	// this time avoiding texture state changes
1947	// save gobs of state changes.	2164	// save gobs of state changes.
1948	if (key.texname != tex.name)	2165	if (key.texname != tex.name)
1949	{	2166	{
		2167	glEnd ();
1950	key.texname = tex.name;	2168	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1951	arr = rc_array (rc, &key);	2169	glBegin (GL_QUADS);
1952	}	2170	}
1953		2171
1954	if (border)	2172	if (border)
1955	{	2173	{
1956	float ox = border * dx;	2174	float ox = border * dx;
1957		2175
1958	rc_t2f_v3f (arr, ox , 0.f , px , py , 0);	2176	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1959	rc_t2f_v3f (arr, ox , dy , px , py + T, 0);	2177	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1960	rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);	2178	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1961	rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);	2179	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1962	}	2180	}
1963		2181
1964	if (corner)	2182	if (corner)
1965	{	2183	{
1966	float ox = corner * dx;	2184	float ox = corner * dx;
1967		2185
1968	rc_t2f_v3f (arr, ox , dy , px , py , 0);	2186	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1969	rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);	2187	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1970	rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);	2188	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1971	rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);	2189	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1972	}	2190	}
1973	}	2191	}
1974	}	2192	}
1975	}	2193	}
1976	}	2194	}
1977	}	2195	}
		2196
		2197	glEnd ();
		2198	glDisable (GL_TEXTURE_2D);
		2199	key.texname = -1;
1978	}	2200	}
1979		2201
1980	hv_clear (smooth);	2202	hv_clear (smooth);
		2203	}
		2204
		2205	if (pl_tex.name)
		2206	{
		2207	maptex tex = pl_tex;
		2208	int px = pl_x + sdx;
		2209	int py = pl_y + sdy;
		2210
		2211	key.texname = tex.name;
		2212	arr = rc_array (rc, &key);
		2213
		2214	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2215	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2216	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2217	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2218
1981	rc_draw (rc);	2219	rc_draw (rc);
1982	rc_clear (rc);
1983	}	2220	}
1984		2221
1985	glDisable (GL_BLEND);	2222	glDisable (GL_BLEND);
1986	rc_free (rc);	2223	rc_free (rc);
1987		2224
…		…
2016	}	2253	}
2017	}	2254	}
2018	}	2255	}
2019		2256
2020	void	2257	void
2021	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2258	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2022	CODE:	2259	CODE:
2023	{	2260	{
2024	static float color[16][3] = {	2261	static float color[16][3] = {
2025	{ 0.00F, 0.00F, 0.00F },	2262	{ 0.00F, 0.00F, 0.00F },
2026	{ 1.00F, 1.00F, 1.00F },	2263	{ 1.00F, 1.00F, 1.00F },
…		…
2076	glDisable (GL_BLEND);	2313	glDisable (GL_BLEND);
2077	glDisable (GL_TEXTURE_2D);	2314	glDisable (GL_TEXTURE_2D);
2078	}	2315	}
2079		2316
2080	void	2317	void
2081	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2318	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2082	PPCODE:	2319	PPCODE:
2083	{	2320	{
2084	int x, y;	2321	int x, y;
2085	int sw1 = sw + 2;	2322	int sw1 = sw + 2;
2086	int sh1 = sh + 2;	2323	int sh1 = sh + 2;
…		…
2094	SvCUR_set (darkness3_sv, sw34 * sh3);	2331	SvCUR_set (darkness3_sv, sw34 * sh3);
2095		2332
2096	mx += self->x - 1;	2333	mx += self->x - 1;
2097	my += self->y - 1;	2334	my += self->y - 1;
2098		2335
2099	memset (darkness1, 255, sw1 * sh1);	2336	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2100		2337
2101	for (y = 0; y < sh1; y++)	2338	for (y = 0; y < sh1; y++)
2102	if (0 <= y + my && y + my < self->rows)	2339	if (0 <= y + my && y + my < self->rows)
2103	{	2340	{
2104	maprow *row = self->row + (y + my);	2341	maprow *row = self->row + (y + my);
…		…
2157	PUSHs (sv_2mortal (newSViv (sh3)));	2394	PUSHs (sv_2mortal (newSViv (sh3)));
2158	PUSHs (darkness3_sv);	2395	PUSHs (darkness3_sv);
2159	}	2396	}
2160		2397
2161	SV *	2398	SV *
2162	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2399	get_rect (DC::Map self, int x0, int y0, int w, int h)
2163	CODE:	2400	CODE:
2164	{	2401	{
2165	int x, y, x1, y1;	2402	int x, y, x1, y1;
2166	SV *data_sv = newSV (w * h * 7 + 5);	2403	SV *data_sv = newSV (w * h * 7 + 5);
2167	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2404	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2224	else	2461	else
2225	*data++ = 0;	2462	*data++ = 0;
2226	}	2463	}
2227	}	2464	}
2228		2465
		2466	/* if size is w*h + 5 then no data has been found */
		2467	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2468	{
2229	SvPOK_only (data_sv);	2469	SvPOK_only (data_sv);
2230	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2470	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2471	}
		2472
2231	RETVAL = data_sv;	2473	RETVAL = data_sv;
2232	}	2474	}
2233	OUTPUT:	2475	OUTPUT:
2234	RETVAL	2476	RETVAL
2235		2477
2236	void	2478	void
2237	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2479	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2238	PPCODE:	2480	PPCODE:
2239	{	2481	{
2240	int x, y, z;	2482	int x, y, z;
2241	int w, h;	2483	int w, h;
2242	int x1, y1;	2484	int x1, y1;
		2485	STRLEN len;
		2486	uint8_t *data, *end;
		2487
		2488	len = SvLEN (data_sv);
		2489	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2490	data = SvPVbyte_nolen (data_sv);
		2491	end = data + len + 8;
		2492
		2493	if (len < 5)
		2494	XSRETURN_EMPTY;
2243		2495
2244	if (*data++ != 0)	2496	if (*data++ != 0)
2245	return; /* version mismatch */	2497	XSRETURN_EMPTY; /* version mismatch */
2246		2498
2247	w = *data++ << 8; w |= *data++;	2499	w = *data++ << 8; w |= *data++;
2248	h = *data++ << 8; h |= *data++;	2500	h = *data++ << 8; h |= *data++;
2249		2501
2250	// we need to do this 'cause we don't keep an absolute coord system for rows	2502	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2262	{	2514	{
2263	maprow *row = map_get_row (self, y);	2515	maprow *row = map_get_row (self, y);
2264		2516
2265	for (x = x0; x < x1; x++)	2517	for (x = x0; x < x1; x++)
2266	{	2518	{
		2519	uint8_t flags;
		2520
		2521	if (data + 7 >= end)
		2522	XSRETURN_EMPTY;
		2523
2267	uint8_t flags = *data++;	2524	flags = *data++;
2268		2525
2269	if (flags)	2526	if (flags)
2270	{	2527	{
2271	mapcell *cell = row_get_cell (row, x);	2528	mapcell *cell = row_get_cell (row, x);
2272	tileid tile[3] = { 0, 0, 0 };	2529	tileid tile[3] = { 0, 0, 0 };
…		…
2275	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2532	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2276	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2533	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2277		2534
2278	if (cell->darkness == 0)	2535	if (cell->darkness == 0)
2279	{	2536	{
2280	cell->darkness = 0;	2537	/*cell->darkness = 0;*/
		2538	EXTEND (SP, 3);
2281		2539
2282	for (z = 0; z <= 2; z++)	2540	for (z = 0; z <= 2; z++)
2283	{	2541	{
2284	tileid t = tile [z];	2542	tileid t = tile [z];
2285		2543
2286	if (t >= self->texs || (t && !self->tex [t].name))	2544	if (t >= self->texs || (t && !self->tex [t].name))
2287	{	2545	{
2288	XPUSHs (sv_2mortal (newSViv (t)));	2546	PUSHs (sv_2mortal (newSViv (t)));
2289	need_texid (self, t);	2547	need_texid (self, t);
2290	}	2548	}
2291		2549
2292	cell->tile [z] = t;	2550	cell->tile [z] = t;
2293	}	2551	}
…		…
2295	}	2553	}
2296	}	2554	}
2297	}	2555	}
2298	}	2556	}
2299		2557
2300	MODULE = CFPlus PACKAGE = CFPlus::RW	2558	MODULE = Deliantra::Client PACKAGE = DC::RW
2301		2559
2302	CFPlus::RW	2560	DC::RW
2303	new (SV *class, SV *data_sv)	2561	new (SV *class, SV *data_sv)
2304	CODE:	2562	CODE:
2305	{	2563	{
2306	STRLEN datalen;	2564	STRLEN datalen;
2307	char *data = SvPVbyte (data_sv, datalen);	2565	char *data = SvPVbyte (data_sv, datalen);
…		…
2309	RETVAL = SDL_RWFromConstMem (data, datalen);	2567	RETVAL = SDL_RWFromConstMem (data, datalen);
2310	}	2568	}
2311	OUTPUT:	2569	OUTPUT:
2312	RETVAL	2570	RETVAL
2313		2571
2314	CFPlus::RW	2572	DC::RW
2315	new_from_file (SV *class, const char *path, const char *mode = "rb")	2573	new_from_file (SV *class, const char *path, const char *mode = "rb")
2316	CODE:	2574	CODE:
2317	RETVAL = SDL_RWFromFile (path, mode);	2575	RETVAL = SDL_RWFromFile (path, mode);
2318	OUTPUT:	2576	OUTPUT:
2319	RETVAL	2577	RETVAL
2320		2578
2321	# fails on win32:	2579	# fails on win32:
2322	# CFPlus.xs(2268) : error C2059: syntax error : '('	2580	# dc.xs(2268) : error C2059: syntax error : '('
2323	#void	2581	#void
2324	#close (CFPlus::RW self)	2582	#close (DC::RW self)
2325	# CODE:	2583	# CODE:
2326	# (self->(close)) (self);	2584	# (self->(close)) (self);
2327		2585
2328	MODULE = CFPlus PACKAGE = CFPlus::Channel	2586	MODULE = Deliantra::Client PACKAGE = DC::Channel
2329		2587
2330	PROTOTYPES: DISABLE	2588	PROTOTYPES: DISABLE
2331		2589
2332	CFPlus::Channel	2590	DC::Channel
2333	find ()	2591	find ()
2334	CODE:	2592	CODE:
2335	{	2593	{
2336	RETVAL = Mix_GroupAvailable (-1);	2594	RETVAL = Mix_GroupAvailable (-1);
2337		2595
…		…
2350	}	2608	}
2351	OUTPUT:	2609	OUTPUT:
2352	RETVAL	2610	RETVAL
2353		2611
2354	void	2612	void
2355	halt (CFPlus::Channel self)	2613	halt (DC::Channel self)
2356	CODE:	2614	CODE:
2357	Mix_HaltChannel (self);	2615	Mix_HaltChannel (self);
2358		2616
2359	void	2617	void
2360	expire (CFPlus::Channel self, int ticks = -1)	2618	expire (DC::Channel self, int ticks = -1)
2361	CODE:	2619	CODE:
2362	Mix_ExpireChannel (self, ticks);	2620	Mix_ExpireChannel (self, ticks);
2363		2621
2364	void	2622	void
2365	fade_out (CFPlus::Channel self, int ticks = -1)	2623	fade_out (DC::Channel self, int ticks = -1)
2366	CODE:	2624	CODE:
2367	Mix_FadeOutChannel (self, ticks);	2625	Mix_FadeOutChannel (self, ticks);
2368		2626
2369	int	2627	int
2370	volume (CFPlus::Channel self, int volume)	2628	volume (DC::Channel self, int volume)
2371	CODE:	2629	CODE:
2372	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2630	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373	OUTPUT:	2631	OUTPUT:
2374	RETVAL	2632	RETVAL
2375		2633
2376	void	2634	void
2377	unregister_all_effects (CFPlus::Channel self)	2635	unregister_all_effects (DC::Channel self)
2378	CODE:	2636	CODE:
2379	Mix_UnregisterAllEffects (self);	2637	Mix_UnregisterAllEffects (self);
2380		2638
2381	void	2639	void
2382	set_panning (CFPlus::Channel self, int left, int right)	2640	set_panning (DC::Channel self, int left, int right)
2383	CODE:	2641	CODE:
2384	left = CLAMP (left , 0, 255);	2642	left = CLAMP (left , 0, 255);
2385	right = CLAMP (right, 0, 255);	2643	right = CLAMP (right, 0, 255);
2386	Mix_SetPanning (self, left, right);	2644	Mix_SetPanning (self, left, right);
2387		2645
2388	void	2646	void
2389	set_distance (CFPlus::Channel self, int distance)	2647	set_distance (DC::Channel self, int distance)
2390	CODE:	2648	CODE:
2391	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2649	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392		2650
2393	void	2651	void
2394	set_position (CFPlus::Channel self, int angle, int distance)	2652	set_position (DC::Channel self, int angle, int distance)
2395	CODE:	2653	CODE:
2396		2654
2397	void	2655	void
2398	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2656	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399	CODE:	2657	CODE:
2400	{	2658	{
2401	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2659	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2402	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2660	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2403	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2661	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404	}	2662	}
2405		2663
2406	void	2664	void
2407	set_reverse_stereo (CFPlus::Channel self, int flip)	2665	set_reverse_stereo (DC::Channel self, int flip)
2408	CODE:	2666	CODE:
2409	Mix_SetReverseStereo (self, flip);	2667	Mix_SetReverseStereo (self, flip);
2410		2668
2411	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2669	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412		2670
2413	PROTOTYPES: DISABLE	2671	PROTOTYPES: DISABLE
2414		2672
2415	CFPlus::MixChunk	2673	DC::MixChunk
2416	new (SV *class, CFPlus::RW rwops)	2674	new (SV *class, DC::RW rwops)
2417	CODE:	2675	CODE:
2418	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2676	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419	OUTPUT:	2677	OUTPUT:
2420	RETVAL	2678	RETVAL
2421		2679
2422	void	2680	void
2423	DESTROY (CFPlus::MixChunk self)	2681	DESTROY (DC::MixChunk self)
2424	CODE:	2682	CODE:
2425	Mix_FreeChunk (self);	2683	Mix_FreeChunk (self);
2426		2684
2427	int	2685	int
2428	volume (CFPlus::MixChunk self, int volume = -1)	2686	volume (DC::MixChunk self, int volume = -1)
2429	CODE:	2687	CODE:
2430	if (items > 1)	2688	if (items > 1)
2431	volume = CLAMP (volume, 0, 128);	2689	volume = CLAMP (volume, 0, 128);
2432	RETVAL = Mix_VolumeChunk (self, volume);	2690	RETVAL = Mix_VolumeChunk (self, volume);
2433	OUTPUT:	2691	OUTPUT:
2434	RETVAL	2692	RETVAL
2435		2693
2436	CFPlus::Channel	2694	DC::Channel
2437	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2695	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2438	CODE:	2696	CODE:
2439	{	2697	{
2440	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2698	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441		2699
2442	if (RETVAL < 0)	2700	if (RETVAL < 0)
…		…
2449	}	2707	}
2450	}	2708	}
2451	OUTPUT:	2709	OUTPUT:
2452	RETVAL	2710	RETVAL
2453		2711
2454	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2712	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2455		2713
2456	int	2714	int
2457	volume (int volume = -1)	2715	volume (int volume = -1)
2458	PROTOTYPE: ;$	2716	PROTOTYPE: ;$
2459	CODE:	2717	CODE:
…		…
2471	void	2729	void
2472	halt ()	2730	halt ()
2473	CODE:	2731	CODE:
2474	Mix_HaltMusic ();	2732	Mix_HaltMusic ();
2475		2733
2476	CFPlus::MixMusic	2734	DC::MixMusic
2477	new (SV *class, CFPlus::RW rwops)	2735	new (SV *class, DC::RW rwops)
2478	CODE:	2736	CODE:
2479	RETVAL = Mix_LoadMUS_RW (rwops);	2737	RETVAL = Mix_LoadMUS_RW (rwops);
2480	OUTPUT:	2738	OUTPUT:
2481	RETVAL	2739	RETVAL
2482		2740
2483	void	2741	void
2484	DESTROY (CFPlus::MixMusic self)	2742	DESTROY (DC::MixMusic self)
2485	CODE:	2743	CODE:
2486	Mix_FreeMusic (self);	2744	Mix_FreeMusic (self);
2487		2745
2488	int	2746	int
2489	play (CFPlus::MixMusic self, int loops = -1)	2747	play (DC::MixMusic self, int loops = -1)
2490	CODE:	2748	CODE:
2491	RETVAL = Mix_PlayMusic (self, loops);	2749	RETVAL = Mix_PlayMusic (self, loops);
2492	OUTPUT:	2750	OUTPUT:
2493	RETVAL	2751	RETVAL
2494		2752
2495	void	2753	void
2496	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2754	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497	CODE:	2755	CODE:
2498	Mix_FadeInMusicPos (self, loops, ms, position);	2756	Mix_FadeInMusicPos (self, loops, ms, position);
2499		2757
2500	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2758	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501		2759
2502	PROTOTYPES: ENABLE	2760	PROTOTYPES: ENABLE
2503		2761
2504	BOOT:	2762	BOOT:
2505	{	2763	{
2506	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2764	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507	static const struct {	2765	static const struct {
2508	const char *name;	2766	const char *name;
2509	IV iv;	2767	IV iv;
2510	} *civ, const_iv[] = {	2768	} *civ, const_iv[] = {
2511	# define const_iv(name) { # name, (IV)name }	2769	# define const_iv(name) { # name, (IV)name }
…		…
2546	const_iv (GL_INTENSITY),	2804	const_iv (GL_INTENSITY),
2547	const_iv (GL_LUMINANCE),	2805	const_iv (GL_LUMINANCE),
2548	const_iv (GL_LUMINANCE_ALPHA),	2806	const_iv (GL_LUMINANCE_ALPHA),
2549	const_iv (GL_FLOAT),	2807	const_iv (GL_FLOAT),
2550	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2808	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2809	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2810	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2811	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2812	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2813	const_iv (GL_COMPRESSED_RGB_ARB),
		2814	const_iv (GL_COMPRESSED_RGBA_ARB),
2551	const_iv (GL_COMPILE),	2815	const_iv (GL_COMPILE),
2552	const_iv (GL_PROXY_TEXTURE_1D),	2816	const_iv (GL_PROXY_TEXTURE_1D),
2553	const_iv (GL_PROXY_TEXTURE_2D),	2817	const_iv (GL_PROXY_TEXTURE_2D),
2554	const_iv (GL_TEXTURE_1D),	2818	const_iv (GL_TEXTURE_1D),
2555	const_iv (GL_TEXTURE_2D),	2819	const_iv (GL_TEXTURE_2D),
…		…
2594	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2858	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595	const_iv (GL_POINT_SMOOTH_HINT),	2859	const_iv (GL_POINT_SMOOTH_HINT),
2596	const_iv (GL_LINE_SMOOTH_HINT),	2860	const_iv (GL_LINE_SMOOTH_HINT),
2597	const_iv (GL_POLYGON_SMOOTH_HINT),	2861	const_iv (GL_POLYGON_SMOOTH_HINT),
2598	const_iv (GL_GENERATE_MIPMAP_HINT),	2862	const_iv (GL_GENERATE_MIPMAP_HINT),
		2863	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599	const_iv (GL_FASTEST),	2864	const_iv (GL_FASTEST),
2600	const_iv (GL_DONT_CARE),	2865	const_iv (GL_DONT_CARE),
2601	const_iv (GL_NICEST),	2866	const_iv (GL_NICEST),
2602	const_iv (GL_V2F),	2867	const_iv (GL_V2F),
2603	const_iv (GL_V3F),	2868	const_iv (GL_V3F),
…		…
2611		2876
2612	texture_av = newAV ();	2877	texture_av = newAV ();
2613	AvREAL_off (texture_av);	2878	AvREAL_off (texture_av);
2614	}	2879	}
2615		2880
		2881	void
		2882	disable_GL_EXT_blend_func_separate ()
		2883	CODE:
		2884	gl.BlendFuncSeparate = 0;
		2885	gl.BlendFuncSeparateEXT = 0;
		2886
2616	char *	2887	char *
2617	gl_vendor ()	2888	gl_vendor ()
2618	CODE:	2889	CODE:
2619	RETVAL = (char *)glGetString (GL_VENDOR);	2890	RETVAL = (char *)glGetString (GL_VENDOR);
2620	OUTPUT:	2891	OUTPUT:
…		…
2741		3012
2742	void glRect (float x1, float y1, float x2, float y2)	3013	void glRect (float x1, float y1, float x2, float y2)
2743	CODE:	3014	CODE:
2744	glRectf (x1, y1, x2, y2);	3015	glRectf (x1, y1, x2, y2);
2745		3016
		3017	void glRect_lineloop (float x1, float y1, float x2, float y2)
		3018	CODE:
		3019	glBegin (GL_LINE_LOOP);
		3020	glVertex2f (x1, y1);
		3021	glVertex2f (x2, y1);
		3022	glVertex2f (x2, y2);
		3023	glVertex2f (x1, y2);
		3024	glEnd ();
		3025
2746	PROTOTYPES: ENABLE	3026	PROTOTYPES: ENABLE
2747		3027
2748	void glBegin (int mode)	3028	void glBegin (int mode)
2749		3029
2750	void glEnd ()	3030	void glEnd ()
…		…
2782	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3062	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2783	CODE:	3063	CODE:
2784	if (gl.SeparableFilter2D)	3064	if (gl.SeparableFilter2D)
2785	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3065	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786		3066
2787	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3067	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2788		3068
2789	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3069	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2790		3070
2791	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3071	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792		3072
…		…
2818		3098
2819	void glEndList ()	3099	void glEndList ()
2820		3100
2821	void glCallList (int list)	3101	void glCallList (int list)
2822		3102
2823	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3103	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2824		3104
2825	PROTOTYPES: DISABLE	3105	PROTOTYPES: DISABLE
2826		3106
2827	void	3107	void
2828	find_widget (SV *self, NV x, NV y)	3108	find_widget (SV *self, NV x, NV y)
…		…
2832	XPUSHs (self);	3112	XPUSHs (self);
2833	}	3113	}
2834		3114
2835	BOOT:	3115	BOOT:
2836	{	3116	{
2837	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3117	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838		3118
2839	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3119	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2840	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3120	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2841	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3121	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2842	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3122	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2843	}	3123	}
2844		3124
2845	void	3125	void
2846	draw (SV *self)	3126	draw (SV *self)
2847	CODE:	3127	CODE:
…		…
2851	NV x, y, w, h;	3131	NV x, y, w, h;
2852	SV *draw_x_sv = GvSV (draw_x_gv);	3132	SV *draw_x_sv = GvSV (draw_x_gv);
2853	SV *draw_y_sv = GvSV (draw_y_gv);	3133	SV *draw_y_sv = GvSV (draw_y_gv);
2854	SV *draw_w_sv = GvSV (draw_w_gv);	3134	SV *draw_w_sv = GvSV (draw_w_gv);
2855	SV *draw_h_sv = GvSV (draw_h_gv);	3135	SV *draw_h_sv = GvSV (draw_h_gv);
2856	SV *hover;
2857	double draw_x, draw_y, draw_w, draw_h;	3136	double draw_x, draw_y;
2858		3137
2859	if (!SvROK (self))	3138	if (!SvROK (self))
2860	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3139	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861		3140
2862	hv = (HV *)SvRV (self);	3141	hv = (HV *)SvRV (self);
2863		3142
2864	if (SvTYPE (hv) != SVt_PVHV)	3143	if (SvTYPE (hv) != SVt_PVHV)
2865	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3144	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866		3145
2867	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3146	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2868	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3147	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2869		3148
2870	if (!h || !w)	3149	if (!h || !w)
…		…
2890	{	3169	{
2891	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3170	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892		3171
2893	if (svp && SvTRUE (*svp))	3172	if (svp && SvTRUE (*svp))
2894	{	3173	{
2895	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3174	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2896	glEnable (GL_BLEND);	3175	glEnable (GL_BLEND);
2897	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3176	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898	glBegin (GL_QUADS);	3177	glBegin (GL_QUADS);
2899	glVertex2f (0, 0);	3178	glVertex2f (0, 0);
2900	glVertex2f (w, 0);	3179	glVertex2f (w, 0);
…		…
2903	glEnd ();	3182	glEnd ();
2904	glDisable (GL_BLEND);	3183	glDisable (GL_BLEND);
2905	}	3184	}
2906	}	3185	}
2907	#if 0	3186	#if 0
2908	if ($ENV{CFPLUS_DEBUG} & 1) {	3187	// draw borders, for debugging
2909	glPushMatrix;	3188	glPushMatrix ();
2910	glColor 1, 1, 0, 1;	3189	glColor4f (1., 1., 0., 1.);
2911	glTranslate 0.375, 0.375;	3190	glTranslatef (.5, .5, 0.);
2912	glBegin GL_LINE_LOOP;	3191	glBegin (GL_LINE_LOOP);
2913	glVertex 0 , 0;	3192	glVertex2f (0 , 0);
2914	glVertex $self->{w} - 1, 0;	3193	glVertex2f (w - 1, 0);
2915	glVertex $self->{w} - 1, $self->{h} - 1;	3194	glVertex2f (w - 1, h - 1);
2916	glVertex 0 , $self->{h} - 1;	3195	glVertex2f (0 , h - 1);
2917	glEnd;	3196	glEnd ();
2918	glPopMatrix;	3197	glPopMatrix ();
2919	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920	}
2921	#endif	3198	#endif
2922	PUSHMARK (SP);	3199	PUSHMARK (SP);
2923	XPUSHs (self);	3200	XPUSHs (self);
2924	PUTBACK;	3201	PUTBACK;
2925	call_method ("_draw", G_VOID | G_DISCARD);	3202	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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