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.234 by root, Mon Aug 27 02:52:54 2007 UTC vs.
Revision 1.282 by root, Fri Dec 5 14:50:01 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 16
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;
155	rc_t *rc;	179	rc_t *rc;
156	} *CFPlus__Layout;	180	} *DC__Layout;
157		181
158	static CFPlus__Font default_font;	182	static DC__Font default_font;
159	static PangoContext *opengl_context;	183	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	184	static PangoFontMap *opengl_fontmap;
161		185
162	static void	186	static void
163	substitute_func (FcPattern *pattern, gpointer data)	187	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	192	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	193	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	194	}
171		195
172	static void	196	static void
173	layout_update_font (CFPlus__Layout self)	197	layout_update_font (DC__Layout self)
174	{	198	{
175	/* 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
176	* reasonably well with bitstream vera	200	* reasonably well with dejavu/bistream fonts
177	*/	201	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	202	PangoFontDescription *font = self->font ? self->font : default_font;
179		203
180	pango_font_description_set_absolute_size (font,	204	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	205	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		206
183	pango_layout_set_font_description (self->pl, font);	207	pango_layout_set_font_description (self->pl, font);
184	}	208	}
185		209
186	static void	210	static void
187	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	211	layout_get_pixel_size (DC__Layout self, int *w, int *h)
188	{	212	{
189	PangoRectangle rect;	213	PangoRectangle rect;
190		214
191	// get_pixel_* wrongly rounds down	215	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	216	pango_layout_get_extents (self->pl, 0, &rect);
…		…
209	int w, h;	233	int w, h;
210	float s, t;	234	float s, t;
211	uint8_t r, g, b, a;	235	uint8_t r, g, b, a;
212	tileid smoothtile;	236	tileid smoothtile;
213	uint8_t smoothlevel;	237	uint8_t smoothlevel;
		238	uint8_t unused; /* set to zero on use */
214	} maptex;	239	} maptex;
215		240
216	typedef struct {	241	typedef struct {
217	uint32_t player;	242	uint32_t player;
218	tileid tile[3];	243	tileid tile[3];
…		…
231	int faces; tileid *face2tile; // [faceid]	256	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	257	int texs; maptex *tex; // [tileid]
233		258
234	int32_t rows;	259	int32_t rows;
235	maprow *row;	260	maprow *row;
236	} *CFPlus__Map;	261	} *DC__Map;
237		262
238	static char *	263	static char *
239	prepend (char *ptr, int sze, int inc)	264	prepend (char *ptr, int sze, int inc)
240	{	265	{
241	char *p;	266	char *p;
…		…
279	self->texs *= 2;	304	self->texs *= 2;
280	}	305	}
281	}	306	}
282		307
283	static maprow *	308	static maprow *
284	map_get_row (CFPlus__Map self, int y)	309	map_get_row (DC__Map self, int y)
285	{	310	{
286	if (0 > y)	311	if (0 > y)
287	{	312	{
288	int extend = - y + MAP_EXTEND_Y;	313	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	314	Prepend (maprow, self->row, self->rows, extend);
…		…
327		352
328	return row->col + (x - row->c0);	353	return row->col + (x - row->c0);
329	}	354	}
330		355
331	static mapcell *	356	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	357	map_get_cell (DC__Map self, int x, int y)
333	{	358	{
334	return row_get_cell (map_get_row (self, y), x);	359	return row_get_cell (map_get_row (self, y), x);
335	}	360	}
336		361
337	static void	362	static void
338	map_clear (CFPlus__Map self)	363	map_clear (DC__Map self)
339	{	364	{
340	int r;	365	int r;
341		366
342	for (r = 0; r < self->rows; r++)	367	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	368	Safefree (self->row[r].col);
…		…
350	self->oy = 0;	375	self->oy = 0;
351	self->row = 0;	376	self->row = 0;
352	self->rows = 0;	377	self->rows = 0;
353	}	378	}
354		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
355	static void	390	static void
356	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)
357	{	392	{
358	int x, y;	393	int x, y;
359	maprow *row;	394	maprow *row;
360	mapcell *cell;	395	mapcell *cell;
361		396
…		…
373	if (x >= row->c1)	408	if (x >= row->c1)
374	break;	409	break;
375		410
376	cell = row->col + x - row->c0;	411	cell = row->col + x - row->c0;
377		412
378	cell->darkness = 0;	413	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	414	}
383	}	415	}
384	}	416	}
385		417
386	typedef struct {	418	typedef struct {
…		…
440	n |= n >> 16;	472	n |= n >> 16;
441		473
442	return n + 1;	474	return n + 1;
443	}	475	}
444		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
445	/* SDL should provide this, really. */	488	/* SDL should provide this, really. */
446	#define SDLK_MODIFIER_MIN 300	489	#define SDLK_MODIFIER_MIN 300
447	#define SDLK_MODIFIER_MAX 314	490	#define SDLK_MODIFIER_MAX 314
448		491
449	/******************************************************************************/	492	/******************************************************************************/
…		…
487	return 0;	530	return 0;
488		531
489	return 1;	532	return 1;
490	}	533	}
491		534
492	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
493		588
494	PROTOTYPES: ENABLE	589	PROTOTYPES: ENABLE
495		590
496	BOOT:	591	BOOT:
497	{	592	{
498	HV *stash = gv_stashpv ("CFPlus", 1);	593	HV *stash = gv_stashpv ("DC", 1);
499	static const struct {	594	static const struct {
500	const char *name;	595	const char *name;
501	IV iv;	596	IV iv;
502	} *civ, const_iv[] = {	597	} *civ, const_iv[] = {
503	# define const_iv(name) { # name, (IV)name }	598	# define const_iv(name) { # name, (IV)name }
…		…
525		620
526	const_iv (SDL_APPINPUTFOCUS),	621	const_iv (SDL_APPINPUTFOCUS),
527	const_iv (SDL_APPMOUSEFOCUS),	622	const_iv (SDL_APPMOUSEFOCUS),
528	const_iv (SDL_APPACTIVE),	623	const_iv (SDL_APPACTIVE),
529		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),
530	const_iv (SDLK_KP0),	677	const_iv (SDLK_KP0),
531	const_iv (SDLK_KP1),	678	const_iv (SDLK_KP1),
532	const_iv (SDLK_KP2),	679	const_iv (SDLK_KP2),
533	const_iv (SDLK_KP3),	680	const_iv (SDLK_KP3),
534	const_iv (SDLK_KP4),	681	const_iv (SDLK_KP4),
…		…
606	const_iv (KMOD_LMETA),	753	const_iv (KMOD_LMETA),
607	const_iv (KMOD_RMETA),	754	const_iv (KMOD_RMETA),
608	const_iv (KMOD_NUM),	755	const_iv (KMOD_NUM),
609	const_iv (KMOD_CAPS),	756	const_iv (KMOD_CAPS),
610	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)
611	# undef const_iv	791	# undef const_iv
612	};	792	};
613		793
614	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; )
615	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	795	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
633		813
634	NV floor (NV x)	814	NV floor (NV x)
635		815
636	NV ceil (NV x)	816	NV ceil (NV x)
637		817
		818	IV minpot (UV n)
		819
		820	IV popcount (UV n)
		821
638	void	822	void
639	pango_init ()	823	pango_init ()
640	CODE:	824	CODE:
641	{	825	{
642	opengl_fontmap = pango_opengl_font_map_new ();	826	opengl_fontmap = pango_opengl_font_map_new ();
643	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);
644	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
645	}	834	}
646		835
647	char *
648	SDL_GetError ()	836	char *SDL_GetError ()
649		837
650	int	838	void SDL_braino ()
651	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652		839
653	void	840	int SDL_Init (U32 flags)
		841
		842	int SDL_InitSubSystem (U32 flags)
		843
		844	void SDL_QuitSubSystem (U32 flags)
		845
654	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
655		856
656	void	857	void
657	SDL_ListModes (int rgb, int alpha)	858	SDL_ListModes (int rgb, int alpha)
658	PPCODE:	859	PPCODE:
659	{	860	{
…		…
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	872	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	873	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	874	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674		875
675	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	876	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);	877	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679	#endif
680		878
681	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	879	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682		880
683	if (m && m != (SDL_Rect **)-1)	881	if (m && m != (SDL_Rect **)-1)
684	while (*m)	882	while (*m)
685	{	883	{
686	if ((*m)->w >= 640 && (*m)->h >= 480)	884	if ((*m)->w >= 400 && (*m)->h >= 300)
687	{	885	{
688	AV *av = newAV ();	886	AV *av = newAV ();
689	av_push (av, newSViv ((*m)->w));	887	av_push (av, newSViv ((*m)->w));
690	av_push (av, newSViv ((*m)->h));	888	av_push (av, newSViv ((*m)->h));
691	av_push (av, newSViv (rgb));	889	av_push (av, newSViv (rgb));
…		…
715		913
716	if (RETVAL)	914	if (RETVAL)
717	{	915	{
718	av_clear (texture_av);	916	av_clear (texture_av);
719		917
720	SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");	918	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721	#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);
722	#include "glfunc.h"	920	#include "glfunc.h"
723	#undef GL_FUNC	921	#undef GL_FUNC
724	}	922	}
725	}	923	}
…		…
732	char *	930	char *
733	SDL_GetKeyName (int sym)	931	SDL_GetKeyName (int sym)
734		932
735	int	933	int
736	SDL_GetAppState ()	934	SDL_GetAppState ()
		935
		936	int
		937	SDL_GetModState ()
737		938
738	void	939	void
739	poll_events ()	940	poll_events ()
740	PPCODE:	941	PPCODE:
741	{	942	{
…		…
751	{	952	{
752	case SDL_KEYDOWN:	953	case SDL_KEYDOWN:
753	case SDL_KEYUP:	954	case SDL_KEYUP:
754	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	955	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	956	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756	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);
757	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 */
758	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	959	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759	break;	960	break;
760		961
761	case SDL_ACTIVEEVENT:	962	case SDL_ACTIVEEVENT:
762	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	963	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
780	x = ev.motion.x;	981	x = ev.motion.x;
781	y = ev.motion.y;	982	y = ev.motion.y;
782	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	983	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783	}	984	}
784		985
785	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	986	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786	hv_store (hv, "state", 5, newSViv (state), 0);	987	hv_store (hv, "state", 5, newSViv (state), 0);
787	hv_store (hv, "x", 1, newSViv (x), 0);	988	hv_store (hv, "x", 1, newSViv (x), 0);
788	hv_store (hv, "y", 1, newSViv (y), 0);	989	hv_store (hv, "y", 1, newSViv (y), 0);
789	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	990	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	991	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791	}	992	}
792	break;	993	break;
793		994
794	case SDL_MOUSEBUTTONDOWN:	995	case SDL_MOUSEBUTTONDOWN:
795	case SDL_MOUSEBUTTONUP:	996	case SDL_MOUSEBUTTONUP:
796	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	997	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797		998
798	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	999	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1000	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1001	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1002	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
806	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1007	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1008	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808	break;	1009	break;
809	}	1010	}
810		1011
811	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))));
812	}	1013	}
813	}	1014	}
814		1015
815	int	1016	int
816	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)
817	POSTCALL:	1018	POSTCALL:
818	Mix_HookMusicFinished (music_finished);	1019	Mix_HookMusicFinished (music_finished);
819	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	}
820		1037
821	void	1038	void
822	Mix_CloseAudio ()	1039	Mix_CloseAudio ()
823		1040
824	int	1041	int
…		…
859	}	1076	}
860	}	1077	}
861	#endif	1078	#endif
862	}	1079	}
863		1080
864	void	1081	int
865	add_font (char *file)	1082	add_font (char *file)
866	CODE:	1083	CODE:
867	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1084	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1085	OUTPUT:
		1086	RETVAL
868		1087
869	void	1088	void
870	load_image_inline (SV *image_)	1089	load_image_inline (SV *image_)
871	ALIAS:	1090	ALIAS:
872	load_image_file = 1	1091	load_image_file = 1
…		…
958	void	1177	void
959	error (char *message)	1178	error (char *message)
960	CODE:	1179	CODE:
961	fprintf (stderr, "ERROR: %s\n", message);	1180	fprintf (stderr, "ERROR: %s\n", message);
962	#ifdef _WIN32	1181	#ifdef _WIN32
963	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1182	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964	#endif	1183	#endif
965		1184
966	void	1185	void
967	fatal (char *message)	1186	fatal (char *message)
968	CODE:	1187	CODE:
969	fprintf (stderr, "FATAL: %s\n", message);	1188	fprintf (stderr, "FATAL: %s\n", message);
970	#ifdef _WIN32	1189	#ifdef _WIN32
971	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1190	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972	#endif	1191	#endif
973	_exit (1);	1192	_exit (1);
974		1193
975	void	1194	void
976	_exit (int retval = 0)	1195	_exit (int retval = 0)
…		…
988	#if DEBUG	1207	#if DEBUG
989	VALGRIND_DO_LEAK_CHECK;	1208	VALGRIND_DO_LEAK_CHECK;
990	#endif	1209	#endif
991	}	1210	}
992		1211
993	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
994		1220
995	PROTOTYPES: DISABLE	1221	PROTOTYPES: DISABLE
996		1222
997	CFPlus::Font	1223	DC::Font
998	new_from_file (SV *class, char *path, int id = 0)	1224	new_from_file (SV *class, char *path, int id = 0)
999	CODE:	1225	CODE:
1000	{	1226	{
1001	int count;	1227	int count;
1002	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1228	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1005	}	1231	}
1006	OUTPUT:	1232	OUTPUT:
1007	RETVAL	1233	RETVAL
1008		1234
1009	void	1235	void
1010	DESTROY (CFPlus::Font self)	1236	DESTROY (DC::Font self)
1011	CODE:	1237	CODE:
1012	pango_font_description_free (self);	1238	pango_font_description_free (self);
1013		1239
1014	void	1240	void
1015	make_default (CFPlus::Font self)	1241	make_default (DC::Font self)
1016	PROTOTYPE: $	1242	PROTOTYPE: $
1017	CODE:	1243	CODE:
1018	default_font = self;	1244	default_font = self;
1019		1245
1020	MODULE = CFPlus PACKAGE = CFPlus::Layout	1246	MODULE = Deliantra::Client PACKAGE = DC::Layout
1021		1247
1022	PROTOTYPES: DISABLE	1248	PROTOTYPES: DISABLE
1023		1249
1024	void	1250	void
1025	reset_glyph_cache ()	1251	glyph_cache_backup ()
1026	PROTOTYPE:	1252	PROTOTYPE:
1027	CODE:	1253	CODE:
		1254	tc_backup ();
		1255
		1256	void
		1257	glyph_cache_restore ()
		1258	PROTOTYPE:
		1259	CODE:
1028	tc_clear ();	1260	tc_restore ();
1029		1261
1030	CFPlus::Layout	1262	DC::Layout
1031	new (SV *class)	1263	new (SV *class)
1032	CODE:	1264	CODE:
1033	New (0, RETVAL, 1, struct cf_layout);	1265	New (0, RETVAL, 1, struct cf_layout);
1034		1266
1035	RETVAL->pl = pango_layout_new (opengl_context);	1267	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1045	layout_update_font (RETVAL);	1277	layout_update_font (RETVAL);
1046	OUTPUT:	1278	OUTPUT:
1047	RETVAL	1279	RETVAL
1048		1280
1049	void	1281	void
1050	DESTROY (CFPlus::Layout self)	1282	DESTROY (DC::Layout self)
1051	CODE:	1283	CODE:
1052	g_object_unref (self->pl);	1284	g_object_unref (self->pl);
1053	rc_free (self->rc);	1285	rc_free (self->rc);
1054	Safefree (self);	1286	Safefree (self);
1055		1287
1056	void	1288	void
1057	set_text (CFPlus::Layout self, SV *text_)	1289	set_text (DC::Layout self, SV *text_)
1058	CODE:	1290	CODE:
1059	{	1291	{
1060	STRLEN textlen;	1292	STRLEN textlen;
1061	char *text = SvPVutf8 (text_, textlen);	1293	char *text = SvPVutf8 (text_, textlen);
1062		1294
1063	pango_layout_set_text (self->pl, text, textlen);	1295	pango_layout_set_text (self->pl, text, textlen);
1064	}	1296	}
1065		1297
1066	void	1298	void
1067	set_markup (CFPlus::Layout self, SV *text_)	1299	set_markup (DC::Layout self, SV *text_)
1068	CODE:	1300	CODE:
1069	{	1301	{
1070	STRLEN textlen;	1302	STRLEN textlen;
1071	char *text = SvPVutf8 (text_, textlen);	1303	char *text = SvPVutf8 (text_, textlen);
1072		1304
1073	pango_layout_set_markup (self->pl, text, textlen);	1305	pango_layout_set_markup (self->pl, text, textlen);
1074	}	1306	}
1075		1307
1076	void	1308	void
1077	set_shapes (CFPlus::Layout self, ...)	1309	set_shapes (DC::Layout self, ...)
1078	CODE:	1310	CODE:
1079	{	1311	{
1080	PangoAttrList *attrs = 0;	1312	PangoAttrList *attrs = 0;
1081	const char *text = pango_layout_get_text (self->pl);	1313	const char *text = pango_layout_get_text (self->pl);
1082	const char *pos = text;	1314	const char *pos = text;
…		…
1117	if (attrs)	1349	if (attrs)
1118	pango_layout_set_attributes (self->pl, attrs);	1350	pango_layout_set_attributes (self->pl, attrs);
1119	}	1351	}
1120		1352
1121	void	1353	void
1122	get_shapes (CFPlus::Layout self)	1354	get_shapes (DC::Layout self)
1123	PPCODE:	1355	PPCODE:
1124	{	1356	{
1125	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1357	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126		1358
1127	do	1359	do
1128	{	1360	{
1129	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1361	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130		1362
1131	if (run && shape_attr_p (run))	1363	if (run && shape_attr_p (run))
1132	{	1364	{
1133	PangoRectangle extents;	1365	PangoRectangle extents;
1134	pango_layout_iter_get_run_extents (iter, 0, &extents);	1366	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1142		1374
1143	pango_layout_iter_free (iter);	1375	pango_layout_iter_free (iter);
1144	}	1376	}
1145		1377
1146	int	1378	int
1147	has_wrapped (CFPlus::Layout self)	1379	has_wrapped (DC::Layout self)
1148	CODE:	1380	CODE:
1149	{	1381	{
1150	int lines = 1;	1382	int lines = 1;
1151	const char *text = pango_layout_get_text (self->pl);	1383	const char *text = pango_layout_get_text (self->pl);
1152		1384
…		…
1157	}	1389	}
1158	OUTPUT:	1390	OUTPUT:
1159	RETVAL	1391	RETVAL
1160		1392
1161	SV *	1393	SV *
1162	get_text (CFPlus::Layout self)	1394	get_text (DC::Layout self)
1163	CODE:	1395	CODE:
1164	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1396	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165	sv_utf8_decode (RETVAL);	1397	sv_utf8_decode (RETVAL);
1166	OUTPUT:	1398	OUTPUT:
1167	RETVAL	1399	RETVAL
1168		1400
1169	void	1401	void
1170	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.)
1171	CODE:	1403	CODE:
1172	self->r = r;	1404	self->r = r;
1173	self->g = g;	1405	self->g = g;
1174	self->b = b;	1406	self->b = b;
1175	self->a = a;	1407	self->a = a;
1176		1408
1177	void	1409	void
1178	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1410	set_font (DC::Layout self, DC::Font font = 0)
1179	CODE:	1411	CODE:
1180	if (self->font != font)	1412	if (self->font != font)
1181	{	1413	{
1182	self->font = font;	1414	self->font = font;
1183	layout_update_font (self);	1415	layout_update_font (self);
1184	}	1416	}
1185		1417
1186	void	1418	void
1187	set_height (CFPlus::Layout self, int base_height)	1419	set_height (DC::Layout self, int base_height)
1188	CODE:	1420	CODE:
1189	if (self->base_height != base_height)	1421	if (self->base_height != base_height)
1190	{	1422	{
1191	self->base_height = base_height;	1423	self->base_height = base_height;
1192	layout_update_font (self);	1424	layout_update_font (self);
1193	}	1425	}
1194		1426
1195	void	1427	void
1196	set_width (CFPlus::Layout self, int max_width = -1)	1428	set_width (DC::Layout self, int max_width = -1)
1197	CODE:	1429	CODE:
1198	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);
1199		1431
1200	void	1432	void
1201	set_indent (CFPlus::Layout self, int indent)	1433	set_indent (DC::Layout self, int indent)
1202	CODE:	1434	CODE:
1203	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1435	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204		1436
1205	void	1437	void
1206	set_spacing (CFPlus::Layout self, int spacing)	1438	set_spacing (DC::Layout self, int spacing)
1207	CODE:	1439	CODE:
1208	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1440	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209		1441
1210	void	1442	void
1211	set_ellipsise (CFPlus::Layout self, int ellipsise)	1443	set_ellipsise (DC::Layout self, int ellipsise)
1212	CODE:	1444	CODE:
1213	pango_layout_set_ellipsize (self->pl,	1445	pango_layout_set_ellipsize (self->pl,
1214	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1446	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1447	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1448	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217	: PANGO_ELLIPSIZE_NONE	1449	: PANGO_ELLIPSIZE_NONE
1218	);	1450	);
1219		1451
1220	void	1452	void
1221	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1453	set_single_paragraph_mode (DC::Layout self, int spm)
1222	CODE:	1454	CODE:
1223	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1455	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224		1456
1225	void	1457	void
1226	size (CFPlus::Layout self)	1458	size (DC::Layout self)
1227	PPCODE:	1459	PPCODE:
1228	{	1460	{
1229	int w, h;	1461	int w, h;
1230		1462
1231	layout_get_pixel_size (self, &w, &h);	1463	layout_get_pixel_size (self, &w, &h);
…		…
1234	PUSHs (sv_2mortal (newSViv (w)));	1466	PUSHs (sv_2mortal (newSViv (w)));
1235	PUSHs (sv_2mortal (newSViv (h)));	1467	PUSHs (sv_2mortal (newSViv (h)));
1236	}	1468	}
1237		1469
1238	int	1470	int
1239	descent (CFPlus::Layout self)	1471	descent (DC::Layout self)
1240	CODE:	1472	CODE:
1241	{	1473	{
1242	PangoRectangle rect;	1474	PangoRectangle rect;
1243	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1475	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244	pango_layout_line_get_pixel_extents (line, 0, &rect);	1476	pango_layout_line_get_pixel_extents (line, 0, &rect);
1245	RETVAL = PANGO_DESCENT (rect);	1477	RETVAL = PANGO_DESCENT (rect);
1246	}	1478	}
1247	OUTPUT:	1479	OUTPUT:
1248	RETVAL	1480	RETVAL
1249		1481
1250	int	1482	int
1251	xy_to_index (CFPlus::Layout self, int x, int y)	1483	xy_to_index (DC::Layout self, int x, int y)
1252	CODE:	1484	CODE:
1253	{	1485	{
1254	int index, trailing;	1486	int index, trailing;
1255	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);
1256	RETVAL = index + trailing;	1488	RETVAL = index + trailing;
1257	}	1489	}
1258	OUTPUT:	1490	OUTPUT:
1259	RETVAL	1491	RETVAL
1260		1492
1261	void	1493	void
1262	cursor_pos (CFPlus::Layout self, int index)	1494	cursor_pos (DC::Layout self, int index)
1263	PPCODE:	1495	PPCODE:
1264	{	1496	{
1265	PangoRectangle strong_pos;	1497	PangoRectangle pos;
1266	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1498	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267		1499
1268	EXTEND (SP, 3);	1500	EXTEND (SP, 3);
1269	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1501	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1502	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1503	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272	}	1504	}
1273		1505
1274	void	1506	void
1275	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)
1276	PPCODE:	1508	PPCODE:
1277	{	1509	{
1278	int line, x;	1510	int line, x;
1279		1511
1280	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)
1281	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1514	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282		1515	--line;
		1516	#endif
1283	EXTEND (SP, 2);	1517	EXTEND (SP, 2);
1284	PUSHs (sv_2mortal (newSViv (line - 1)));	1518	PUSHs (sv_2mortal (newSViv (line)));
1285	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1519	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286	}	1520	}
1287		1521
1288	void	1522	void
1289	line_x_to_index (CFPlus::Layout self, int line, int x)	1523	line_x_to_index (DC::Layout self, int line, int x)
1290	PPCODE:	1524	PPCODE:
1291	{	1525	{
1292	PangoLayoutLine *lp;	1526	PangoLayoutLine *lp;
1293	int index, trailing;	1527	int index, trailing;
1294		1528
1295	if (line < 0)	1529	if (line < 0)
1296	XSRETURN_EMPTY;	1530	XSRETURN_EMPTY;
1297		1531
1298	if (!(lp = pango_layout_get_line (self->pl, line)))	1532	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299	XSRETURN_EMPTY; /* do better */	1533	XSRETURN_EMPTY; /* do better */
1300		1534
1301	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);
1302		1536
1303	EXTEND (SP, 2);	1537	EXTEND (SP, 2);
…		…
1309	PUSHs (sv_2mortal (newSViv (trailing)));	1543	PUSHs (sv_2mortal (newSViv (trailing)));
1310	}	1544	}
1311	}	1545	}
1312		1546
1313	void	1547	void
1314	render (CFPlus::Layout self, float x, float y, int flags = 0)	1548	render (DC::Layout self, float x, float y, int flags = 0)
1315	CODE:	1549	CODE:
1316	rc_clear (self->rc);	1550	rc_clear (self->rc);
1317	pango_opengl_render_layout_subpixel (	1551	pango_opengl_render_layout_subpixel (
1318	self->pl,	1552	self->pl,
1319	self->rc,	1553	self->rc,
…		…
1324	// we assume that context_change actually clears/frees stuff	1558	// we assume that context_change actually clears/frees stuff
1325	// and does not do any recomputation...	1559	// and does not do any recomputation...
1326	pango_layout_context_changed (self->pl);	1560	pango_layout_context_changed (self->pl);
1327		1561
1328	void	1562	void
1329	draw (CFPlus::Layout self)	1563	draw (DC::Layout self)
1330	CODE:	1564	CODE:
1331	{	1565	{
1332	glEnable (GL_TEXTURE_2D);	1566	glEnable (GL_TEXTURE_2D);
1333	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1567	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334	glEnable (GL_BLEND);	1568	glEnable (GL_BLEND);
…		…
1342	glDisable (GL_ALPHA_TEST);	1576	glDisable (GL_ALPHA_TEST);
1343	glDisable (GL_BLEND);	1577	glDisable (GL_BLEND);
1344	glDisable (GL_TEXTURE_2D);	1578	glDisable (GL_TEXTURE_2D);
1345	}	1579	}
1346		1580
1347	MODULE = CFPlus PACKAGE = CFPlus::Texture	1581	MODULE = Deliantra::Client PACKAGE = DC::Texture
1348		1582
1349	PROTOTYPES: ENABLE	1583	PROTOTYPES: ENABLE
1350
1351	int minpot (int n)
1352		1584
1353	void	1585	void
1354	pad (SV *data_, int ow, int oh, int nw, int nh)	1586	pad (SV *data_, int ow, int oh, int nw, int nh)
1355	CODE:	1587	CODE:
1356	{	1588	{
…		…
1433	RETVAL = width > 0;	1665	RETVAL = width > 0;
1434	}	1666	}
1435	OUTPUT:	1667	OUTPUT:
1436	RETVAL	1668	RETVAL
1437		1669
1438	MODULE = CFPlus PACKAGE = CFPlus::Map	1670	MODULE = Deliantra::Client PACKAGE = DC::Map
1439		1671
1440	PROTOTYPES: DISABLE	1672	PROTOTYPES: DISABLE
1441		1673
1442	CFPlus::Map	1674	DC::Map
1443	new (SV *class)	1675	new (SV *class)
1444	CODE:	1676	CODE:
1445	New (0, RETVAL, 1, struct map);	1677	New (0, RETVAL, 1, struct map);
1446	RETVAL->x = 0;	1678	RETVAL->x = 0;
1447	RETVAL->y = 0;	1679	RETVAL->y = 0;
…		…
1455	RETVAL->row = 0;	1687	RETVAL->row = 0;
1456	OUTPUT:	1688	OUTPUT:
1457	RETVAL	1689	RETVAL
1458		1690
1459	void	1691	void
1460	DESTROY (CFPlus::Map self)	1692	DESTROY (DC::Map self)
1461	CODE:	1693	CODE:
1462	{	1694	{
1463	map_clear (self);	1695	map_clear (self);
1464	Safefree (self->face2tile);	1696	Safefree (self->face2tile);
1465	Safefree (self->tex);	1697	Safefree (self->tex);
1466	Safefree (self);	1698	Safefree (self);
1467	}	1699	}
1468		1700
1469	void	1701	void
1470	resize (CFPlus::Map self, int map_width, int map_height)	1702	resize (DC::Map self, int map_width, int map_height)
1471	CODE:	1703	CODE:
1472	self->w = map_width;	1704	self->w = map_width;
1473	self->h = map_height;	1705	self->h = map_height;
1474		1706
1475	void	1707	void
1476	clear (CFPlus::Map self)	1708	clear (DC::Map self)
1477	CODE:	1709	CODE:
1478	map_clear (self);	1710	map_clear (self);
1479		1711
1480	void	1712	void
1481	set_tileid (CFPlus::Map self, int face, int tile)	1713	set_tileid (DC::Map self, int face, int tile)
1482	CODE:	1714	CODE:
1483	{	1715	{
1484	need_facenum (self, face); self->face2tile [face] = tile;	1716	need_facenum (self, face); self->face2tile [face] = tile;
1485	need_texid (self, tile);	1717	need_texid (self, tile);
1486	}	1718	}
1487		1719
1488	void	1720	void
1489	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1721	set_smooth (DC::Map self, int face, int smooth, int level)
1490	CODE:	1722	CODE:
1491	{	1723	{
1492	tileid texid;	1724	tileid texid;
1493	maptex *tex;	1725	maptex *tex;
1494		1726
…		…
1507	tex->smoothtile = self->face2tile [smooth];	1739	tex->smoothtile = self->face2tile [smooth];
1508	tex->smoothlevel = level;	1740	tex->smoothlevel = level;
1509	}	1741	}
1510		1742
1511	void	1743	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)	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)
1513	CODE:	1745	CODE:
1514	{	1746	{
1515	need_texid (self, texid);	1747	need_texid (self, texid);
1516		1748
1517	{	1749	{
…		…
1536	// use uglier nearest interpolation because linear suffers	1768	// use uglier nearest interpolation because linear suffers
1537	// from transparent color bleeding and ugly wrapping effects.	1769	// from transparent color bleeding and ugly wrapping effects.
1538	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1770	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539	}	1771	}
1540		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
1541	int	1793	int
1542	ox (CFPlus::Map self)	1794	ox (DC::Map self)
1543	ALIAS:	1795	ALIAS:
1544	oy = 1	1796	oy = 1
1545	x = 2	1797	x = 2
1546	y = 3	1798	y = 3
1547	w = 4	1799	w = 4
…		…
1558	}	1810	}
1559	OUTPUT:	1811	OUTPUT:
1560	RETVAL	1812	RETVAL
1561		1813
1562	void	1814	void
1563	scroll (CFPlus::Map self, int dx, int dy)	1815	scroll (DC::Map self, int dx, int dy)
1564	CODE:	1816	CODE:
1565	{	1817	{
1566	if (dx > 0)	1818	if (dx > 0)
1567	map_blank (self, self->x, self->y, dx, self->h);	1819	map_blank (self, self->x, self->y, dx, self->h);
1568	else if (dx < 0)	1820	else if (dx < 0)
…		…
1584	self->y += MAP_EXTEND_Y;	1836	self->y += MAP_EXTEND_Y;
1585	}	1837	}
1586	}	1838	}
1587		1839
1588	SV *	1840	SV *
1589	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1841	map1a_update (DC::Map self, SV *data_, int extmap)
1590	CODE:	1842	CODE:
1591	{	1843	{
1592	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1844	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593	uint8_t *data_end = (uint8_t *)SvEND (data_);	1845	uint8_t *data_end = (uint8_t *)SvEND (data_);
1594	mapcell *cell;	1846	mapcell *cell;
…		…
1622	uint8_t ext, cmd;	1874	uint8_t ext, cmd;
1623		1875
1624	do	1876	do
1625	{	1877	{
1626	ext = *data++;	1878	ext = *data++;
1627	cmd = ext & 0x3f;	1879	cmd = ext & 0x7f;
1628		1880
1629	if (cmd < 4)	1881	if (cmd < 4)
1630	cell->darkness = 255 - ext * 64 + 1;	1882	cell->darkness = 255 - ext * 64 + 1;
1631	else if (cmd == 5) // health	1883	else if (cmd == 5) // health
1632	{	1884	{
…		…
1635	}	1887	}
1636	else if (cmd == 6) // monster width	1888	else if (cmd == 6) // monster width
1637	cell->stat_width = *data++ + 1;	1889	cell->stat_width = *data++ + 1;
1638	else if (cmd == 0x47)	1890	else if (cmd == 0x47)
1639	{	1891	{
1640	if (*data == 4)	1892	if (*data == 1) cell->player = data [1];
1641	; // 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);
1642		1896
1643	data += *data + 1;	1897	data += *data + 1;
1644	}	1898	}
1645	else if (cmd == 8) // cell flags	1899	else if (cmd == 8) // cell flags
1646	cell->flags = *data++;	1900	cell->flags = *data++;
…		…
1663	cell->tile [z] = self->face2tile [face];	1917	cell->tile [z] = self->face2tile [face];
1664		1918
1665	if (cell->tile [z])	1919	if (cell->tile [z])
1666	{	1920	{
1667	maptex *tex = self->tex + cell->tile [z];	1921	maptex *tex = self->tex + cell->tile [z];
		1922	tex->unused = 0;
1668	if (!tex->name)	1923	if (!tex->name)
1669	av_push (missing, newSViv (cell->tile [z]));	1924	av_push (missing, newSViv (cell->tile [z]));
1670		1925
1671	if (tex->smoothtile)	1926	if (tex->smoothtile)
1672	{	1927	{
1673	maptex *smooth = self->tex + tex->smoothtile;	1928	maptex *smooth = self->tex + tex->smoothtile;
		1929	smooth->unused = 0;
1674	if (!smooth->name)	1930	if (!smooth->name)
1675	av_push (missing, newSViv (tex->smoothtile));	1931	av_push (missing, newSViv (tex->smoothtile));
1676	}	1932	}
1677	}	1933	}
1678	}	1934	}
1679	}	1935	}
1680	else	1936	else
1681	cell->darkness = 0;	1937	CELL_CLEAR (cell);
1682	}	1938	}
1683	}	1939	}
1684	OUTPUT:	1940	OUTPUT:
1685	RETVAL	1941	RETVAL
1686		1942
1687	SV *	1943	SV *
1688	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)
1689	CODE:	1945	CODE:
1690	{	1946	{
1691	int x1, x;	1947	int x1, x;
1692	int y1, y;	1948	int y1, y;
1693	int z;	1949	int z;
…		…
1738	}	1994	}
1739	OUTPUT:	1995	OUTPUT:
1740	RETVAL	1996	RETVAL
1741		1997
1742	void	1998	void
1743	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)
1744	CODE:	2000	CODE:
1745	{	2001	{
1746	int x, y, z;	2002	int x, y, z;
1747		2003
1748	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2004	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749	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
1750	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2006	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751	smooth_key skey;	2007	smooth_key skey;
1752		2008	int pl_x, pl_y;
		2009	maptex pl_tex;
1753	rc_t *rc = rc_alloc ();	2010	rc_t *rc = rc_alloc ();
1754	rc_key_t key;	2011	rc_key_t key;
1755	rc_array_t *arr;	2012	rc_array_t *arr;
		2013
		2014	pl_tex.name = 0;
1756		2015
1757	// thats current max. sorry.	2016	// thats current max. sorry.
1758	if (sw > 255) sw = 255;	2017	if (sw > 255) sw = 255;
1759	if (sh > 255) sh = 255;	2018	if (sh > 255) sh = 255;
1760		2019
…		…
1815	tileid tile = cell->tile [z];	2074	tileid tile = cell->tile [z];
1816		2075
1817	if (tile)	2076	if (tile)
1818	{	2077	{
1819	maptex tex = self->tex [tile];	2078	maptex tex = self->tex [tile];
1820	int px, py;	2079	int px = (x + 1) * T - tex.w;
		2080	int py = (y + 1) * T - tex.h;
1821		2081
1822	if (key.texname != tex.name)	2082	if (key.texname != tex.name)
1823	{	2083	{
		2084	self->tex [tile].unused = 0;
		2085
1824	if (!tex.name)	2086	if (!tex.name)
1825	tex = self->tex [2]; /* missing, replace by noface */	2087	tex = self->tex [2]; /* missing, replace by noface */
1826		2088
1827	key.texname = tex.name;	2089	key.texname = tex.name;
1828	arr = rc_array (rc, &key);	2090	arr = rc_array (rc, &key);
1829	}	2091	}
1830		2092
1831	px = (x + 1) * T - tex.w;	2093	if (expect_false (cell->player == player) && expect_false (z == 2))
1832	py = (y + 1) * T - tex.h;	2094	{
		2095	pl_x = px;
		2096	pl_y = py;
		2097	pl_tex = tex;
		2098	continue;
		2099	}
1833		2100
1834	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2101	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835	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);
1836	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);
1837	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);
1838		2105
1839	if (cell->flags && z == 2)	2106	if (expect_false (cell->flags) && expect_false (z == 2))
1840	{	2107	{
1841	// overlays such as the speech bubble, probably more to come	2108	// overlays such as the speech bubble, probably more to come
1842	if (cell->flags & 1)	2109	if (cell->flags & 1)
1843	{	2110	{
1844	maptex tex = self->tex [1];	2111	maptex tex = self->tex [1];
…		…
1945	{	2212	{
1946	// this time avoiding texture state changes	2213	// this time avoiding texture state changes
1947	// save gobs of state changes.	2214	// save gobs of state changes.
1948	if (key.texname != tex.name)	2215	if (key.texname != tex.name)
1949	{	2216	{
		2217	self->tex [skey->tile].unused = 0;
		2218
1950	glEnd ();	2219	glEnd ();
1951	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2220	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1952	glBegin (GL_QUADS);	2221	glBegin (GL_QUADS);
1953	}	2222	}
1954		2223
…		…
1983	}	2252	}
1984		2253
1985	hv_clear (smooth);	2254	hv_clear (smooth);
1986	}	2255	}
1987		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
		2271	rc_draw (rc);
		2272	}
		2273
1988	glDisable (GL_BLEND);	2274	glDisable (GL_BLEND);
1989	rc_free (rc);	2275	rc_free (rc);
1990		2276
1991	// top layer: overlays such as the health bar	2277	// top layer: overlays such as the health bar
1992	for (y = 0; y < sh; y++)	2278	for (y = 0; y < sh; y++)
…		…
1999	{	2285	{
2000	mapcell *cell = row->col + (x + mx - row->c0);	2286	mapcell *cell = row->col + (x + mx - row->c0);
2001		2287
2002	int px = x * T;	2288	int px = x * T;
2003	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	}
2004		2296
2005	if (cell->stat_hp)	2297	if (cell->stat_hp)
2006	{	2298	{
2007	int width = cell->stat_width * T;	2299	int width = cell->stat_width * T;
2008	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2300	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2019	}	2311	}
2020	}	2312	}
2021	}	2313	}
2022		2314
2023	void	2315	void
2024	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)
2025	CODE:	2317	CODE:
2026	{	2318	{
2027	static float color[16][3] = {	2319	static float color[16][3] = {
2028	{ 0.00F, 0.00F, 0.00F },	2320	{ 0.00F, 0.00F, 0.00F },
2029	{ 1.00F, 1.00F, 1.00F },	2321	{ 1.00F, 1.00F, 1.00F },
…		…
2079	glDisable (GL_BLEND);	2371	glDisable (GL_BLEND);
2080	glDisable (GL_TEXTURE_2D);	2372	glDisable (GL_TEXTURE_2D);
2081	}	2373	}
2082		2374
2083	void	2375	void
2084	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)
2085	PPCODE:	2377	PPCODE:
2086	{	2378	{
2087	int x, y;	2379	int x, y;
2088	int sw1 = sw + 2;	2380	int sw1 = sw + 2;
2089	int sh1 = sh + 2;	2381	int sh1 = sh + 2;
…		…
2097	SvCUR_set (darkness3_sv, sw34 * sh3);	2389	SvCUR_set (darkness3_sv, sw34 * sh3);
2098		2390
2099	mx += self->x - 1;	2391	mx += self->x - 1;
2100	my += self->y - 1;	2392	my += self->y - 1;
2101		2393
2102	memset (darkness1, 255, sw1 * sh1);	2394	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2103		2395
2104	for (y = 0; y < sh1; y++)	2396	for (y = 0; y < sh1; y++)
2105	if (0 <= y + my && y + my < self->rows)	2397	if (0 <= y + my && y + my < self->rows)
2106	{	2398	{
2107	maprow *row = self->row + (y + my);	2399	maprow *row = self->row + (y + my);
…		…
2160	PUSHs (sv_2mortal (newSViv (sh3)));	2452	PUSHs (sv_2mortal (newSViv (sh3)));
2161	PUSHs (darkness3_sv);	2453	PUSHs (darkness3_sv);
2162	}	2454	}
2163		2455
2164	SV *	2456	SV *
2165	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)
2166	CODE:	2458	CODE:
2167	{	2459	{
2168	int x, y, x1, y1;	2460	int x, y, x1, y1;
2169	SV *data_sv = newSV (w * h * 7 + 5);	2461	SV *data_sv = newSV (w * h * 7 + 5);
2170	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2462	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2227	else	2519	else
2228	*data++ = 0;	2520	*data++ = 0;
2229	}	2521	}
2230	}	2522	}
2231		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	{
2232	SvPOK_only (data_sv);	2527	SvPOK_only (data_sv);
2233	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2528	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2529	}
		2530
2234	RETVAL = data_sv;	2531	RETVAL = data_sv;
2235	}	2532	}
2236	OUTPUT:	2533	OUTPUT:
2237	RETVAL	2534	RETVAL
2238		2535
2239	void	2536	void
2240	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)
2241	PPCODE:	2538	PPCODE:
2242	{	2539	{
2243	int x, y, z;	2540	int x, y, z;
2244	int w, h;	2541	int w, h;
2245	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;
2246		2553
2247	if (*data++ != 0)	2554	if (*data++ != 0)
2248	XSRETURN_EMPTY; /* version mismatch */	2555	XSRETURN_EMPTY; /* version mismatch */
2249		2556
2250	w = *data++ << 8; w |= *data++;	2557	w = *data++ << 8; w |= *data++;
…		…
2265	{	2572	{
2266	maprow *row = map_get_row (self, y);	2573	maprow *row = map_get_row (self, y);
2267		2574
2268	for (x = x0; x < x1; x++)	2575	for (x = x0; x < x1; x++)
2269	{	2576	{
		2577	uint8_t flags;
		2578
		2579	if (data + 7 >= end)
		2580	XSRETURN_EMPTY;
		2581
2270	uint8_t flags = *data++;	2582	flags = *data++;
2271		2583
2272	if (flags)	2584	if (flags)
2273	{	2585	{
2274	mapcell *cell = row_get_cell (row, x);	2586	mapcell *cell = row_get_cell (row, x);
2275	tileid tile[3] = { 0, 0, 0 };	2587	tileid tile[3] = { 0, 0, 0 };
…		…
2278	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2590	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2591	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280		2592
2281	if (cell->darkness == 0)	2593	if (cell->darkness == 0)
2282	{	2594	{
2283	cell->darkness = 0;	2595	/*cell->darkness = 0;*/
		2596	EXTEND (SP, 3);
2284		2597
2285	for (z = 0; z <= 2; z++)	2598	for (z = 0; z <= 2; z++)
2286	{	2599	{
2287	tileid t = tile [z];	2600	tileid t = tile [z];
2288		2601
2289	if (t >= self->texs || (t && !self->tex [t].name))	2602	if (t >= self->texs || (t && !self->tex [t].name))
2290	{	2603	{
2291	XPUSHs (sv_2mortal (newSViv (t)));	2604	PUSHs (sv_2mortal (newSViv (t)));
2292	need_texid (self, t);	2605	need_texid (self, t);
2293	}	2606	}
2294		2607
2295	cell->tile [z] = t;	2608	cell->tile [z] = t;
2296	}	2609	}
…		…
2298	}	2611	}
2299	}	2612	}
2300	}	2613	}
2301	}	2614	}
2302		2615
2303	MODULE = CFPlus PACKAGE = CFPlus::RW	2616	MODULE = Deliantra::Client PACKAGE = DC::RW
2304		2617
2305	CFPlus::RW	2618	DC::RW
2306	new (SV *class, SV *data_sv)	2619	new (SV *class, SV *data_sv)
2307	CODE:	2620	CODE:
2308	{	2621	{
2309	STRLEN datalen;	2622	STRLEN datalen;
2310	char *data = SvPVbyte (data_sv, datalen);	2623	char *data = SvPVbyte (data_sv, datalen);
…		…
2312	RETVAL = SDL_RWFromConstMem (data, datalen);	2625	RETVAL = SDL_RWFromConstMem (data, datalen);
2313	}	2626	}
2314	OUTPUT:	2627	OUTPUT:
2315	RETVAL	2628	RETVAL
2316		2629
2317	CFPlus::RW	2630	DC::RW
2318	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")
2319	CODE:	2632	CODE:
2320	RETVAL = SDL_RWFromFile (path, mode);	2633	RETVAL = SDL_RWFromFile (path, mode);
2321	OUTPUT:	2634	OUTPUT:
2322	RETVAL	2635	RETVAL
2323		2636
2324	# fails on win32:	2637	# fails on win32:
2325	# CFPlus.xs(2268) : error C2059: syntax error : '('	2638	# dc.xs(2268) : error C2059: syntax error : '('
2326	#void	2639	#void
2327	#close (CFPlus::RW self)	2640	#close (DC::RW self)
2328	# CODE:	2641	# CODE:
2329	# (self->(close)) (self);	2642	# (self->(close)) (self);
2330		2643
2331	MODULE = CFPlus PACKAGE = CFPlus::Channel	2644	MODULE = Deliantra::Client PACKAGE = DC::Channel
2332		2645
2333	PROTOTYPES: DISABLE	2646	PROTOTYPES: DISABLE
2334		2647
2335	CFPlus::Channel	2648	DC::Channel
2336	find ()	2649	find ()
2337	CODE:	2650	CODE:
2338	{	2651	{
2339	RETVAL = Mix_GroupAvailable (-1);	2652	RETVAL = Mix_GroupAvailable (-1);
2340		2653
…		…
2353	}	2666	}
2354	OUTPUT:	2667	OUTPUT:
2355	RETVAL	2668	RETVAL
2356		2669
2357	void	2670	void
2358	halt (CFPlus::Channel self)	2671	halt (DC::Channel self)
2359	CODE:	2672	CODE:
2360	Mix_HaltChannel (self);	2673	Mix_HaltChannel (self);
2361		2674
2362	void	2675	void
2363	expire (CFPlus::Channel self, int ticks = -1)	2676	expire (DC::Channel self, int ticks = -1)
2364	CODE:	2677	CODE:
2365	Mix_ExpireChannel (self, ticks);	2678	Mix_ExpireChannel (self, ticks);
2366		2679
2367	void	2680	void
2368	fade_out (CFPlus::Channel self, int ticks = -1)	2681	fade_out (DC::Channel self, int ticks = -1)
2369	CODE:	2682	CODE:
2370	Mix_FadeOutChannel (self, ticks);	2683	Mix_FadeOutChannel (self, ticks);
2371		2684
2372	int	2685	int
2373	volume (CFPlus::Channel self, int volume)	2686	volume (DC::Channel self, int volume)
2374	CODE:	2687	CODE:
2375	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2688	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376	OUTPUT:	2689	OUTPUT:
2377	RETVAL	2690	RETVAL
2378		2691
2379	void	2692	void
2380	unregister_all_effects (CFPlus::Channel self)	2693	unregister_all_effects (DC::Channel self)
2381	CODE:	2694	CODE:
2382	Mix_UnregisterAllEffects (self);	2695	Mix_UnregisterAllEffects (self);
2383		2696
2384	void	2697	void
2385	set_panning (CFPlus::Channel self, int left, int right)	2698	set_panning (DC::Channel self, int left, int right)
2386	CODE:	2699	CODE:
2387	left = CLAMP (left , 0, 255);	2700	left = CLAMP (left , 0, 255);
2388	right = CLAMP (right, 0, 255);	2701	right = CLAMP (right, 0, 255);
2389	Mix_SetPanning (self, left, right);	2702	Mix_SetPanning (self, left, right);
2390		2703
2391	void	2704	void
2392	set_distance (CFPlus::Channel self, int distance)	2705	set_distance (DC::Channel self, int distance)
2393	CODE:	2706	CODE:
2394	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2707	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395		2708
2396	void	2709	void
2397	set_position (CFPlus::Channel self, int angle, int distance)	2710	set_position (DC::Channel self, int angle, int distance)
2398	CODE:	2711	CODE:
2399		2712
2400	void	2713	void
2401	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)
2402	CODE:	2715	CODE:
2403	{	2716	{
2404	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));
2405	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);
2406	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2719	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407	}	2720	}
2408		2721
2409	void	2722	void
2410	set_reverse_stereo (CFPlus::Channel self, int flip)	2723	set_reverse_stereo (DC::Channel self, int flip)
2411	CODE:	2724	CODE:
2412	Mix_SetReverseStereo (self, flip);	2725	Mix_SetReverseStereo (self, flip);
2413		2726
2414	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2727	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415		2728
2416	PROTOTYPES: DISABLE	2729	PROTOTYPES: DISABLE
2417		2730
2418	CFPlus::MixChunk	2731	DC::MixChunk
2419	new (SV *class, CFPlus::RW rwops)	2732	new (SV *class, DC::RW rwops)
2420	CODE:	2733	CODE:
2421	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2734	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422	OUTPUT:	2735	OUTPUT:
2423	RETVAL	2736	RETVAL
2424		2737
2425	void	2738	void
2426	DESTROY (CFPlus::MixChunk self)	2739	DESTROY (DC::MixChunk self)
2427	CODE:	2740	CODE:
2428	Mix_FreeChunk (self);	2741	Mix_FreeChunk (self);
2429		2742
2430	int	2743	int
2431	volume (CFPlus::MixChunk self, int volume = -1)	2744	volume (DC::MixChunk self, int volume = -1)
2432	CODE:	2745	CODE:
2433	if (items > 1)	2746	if (items > 1)
2434	volume = CLAMP (volume, 0, 128);	2747	volume = CLAMP (volume, 0, 128);
2435	RETVAL = Mix_VolumeChunk (self, volume);	2748	RETVAL = Mix_VolumeChunk (self, volume);
2436	OUTPUT:	2749	OUTPUT:
2437	RETVAL	2750	RETVAL
2438		2751
2439	CFPlus::Channel	2752	DC::Channel
2440	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)
2441	CODE:	2754	CODE:
2442	{	2755	{
2443	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2756	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444		2757
2445	if (RETVAL < 0)	2758	if (RETVAL < 0)
…		…
2452	}	2765	}
2453	}	2766	}
2454	OUTPUT:	2767	OUTPUT:
2455	RETVAL	2768	RETVAL
2456		2769
2457	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2770	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458		2771
2459	int	2772	int
2460	volume (int volume = -1)	2773	volume (int volume = -1)
2461	PROTOTYPE: ;$	2774	PROTOTYPE: ;$
2462	CODE:	2775	CODE:
…		…
2474	void	2787	void
2475	halt ()	2788	halt ()
2476	CODE:	2789	CODE:
2477	Mix_HaltMusic ();	2790	Mix_HaltMusic ();
2478		2791
2479	CFPlus::MixMusic	2792	DC::MixMusic
2480	new (SV *class, CFPlus::RW rwops)	2793	new (SV *class, DC::RW rwops)
2481	CODE:	2794	CODE:
2482	RETVAL = Mix_LoadMUS_RW (rwops);	2795	RETVAL = Mix_LoadMUS_RW (rwops);
2483	OUTPUT:	2796	OUTPUT:
2484	RETVAL	2797	RETVAL
2485		2798
2486	void	2799	void
2487	DESTROY (CFPlus::MixMusic self)	2800	DESTROY (DC::MixMusic self)
2488	CODE:	2801	CODE:
2489	Mix_FreeMusic (self);	2802	Mix_FreeMusic (self);
2490		2803
2491	int	2804	int
2492	play (CFPlus::MixMusic self, int loops = -1)	2805	play (DC::MixMusic self, int loops = -1)
2493	CODE:	2806	CODE:
2494	RETVAL = Mix_PlayMusic (self, loops);	2807	RETVAL = Mix_PlayMusic (self, loops);
2495	OUTPUT:	2808	OUTPUT:
2496	RETVAL	2809	RETVAL
2497		2810
2498	void	2811	void
2499	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)
2500	CODE:	2813	CODE:
2501	Mix_FadeInMusicPos (self, loops, ms, position);	2814	Mix_FadeInMusicPos (self, loops, ms, position);
2502		2815
2503	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2816	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504		2817
2505	PROTOTYPES: ENABLE	2818	PROTOTYPES: ENABLE
2506		2819
2507	BOOT:	2820	BOOT:
2508	{	2821	{
2509	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2822	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510	static const struct {	2823	static const struct {
2511	const char *name;	2824	const char *name;
2512	IV iv;	2825	IV iv;
2513	} *civ, const_iv[] = {	2826	} *civ, const_iv[] = {
2514	# define const_iv(name) { # name, (IV)name }	2827	# define const_iv(name) { # name, (IV)name }
…		…
2728	void glRotate (float angle, float x, float y, float z)	3041	void glRotate (float angle, float x, float y, float z)
2729	CODE:	3042	CODE:
2730	glRotatef (angle, x, y, z);	3043	glRotatef (angle, x, y, z);
2731		3044
2732	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: @
2733	ALIAS:	3047	ALIAS:
2734	glColor_premultiply = 1	3048	glColor_premultiply = 1
2735	CODE:	3049	CODE:
2736	if (ix)	3050	if (ix)
2737	{	3051	{
…		…
2807	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)
2808	CODE:	3122	CODE:
2809	if (gl.SeparableFilter2D)	3123	if (gl.SeparableFilter2D)
2810	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3124	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2811		3125
2812	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)
2813		3127
2814	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)
2815		3129
2816	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)
2817		3131
…		…
2843		3157
2844	void glEndList ()	3158	void glEndList ()
2845		3159
2846	void glCallList (int list)	3160	void glCallList (int list)
2847		3161
2848	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3162	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2849		3163
2850	PROTOTYPES: DISABLE	3164	PROTOTYPES: DISABLE
2851		3165
2852	void	3166	void
2853	find_widget (SV *self, NV x, NV y)	3167	find_widget (SV *self, NV x, NV y)
…		…
2857	XPUSHs (self);	3171	XPUSHs (self);
2858	}	3172	}
2859		3173
2860	BOOT:	3174	BOOT:
2861	{	3175	{
2862	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3176	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2863		3177
2864	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);
2865	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);
2866	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);
2867	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);
2868	}	3182	}
2869		3183
2870	void	3184	void
2871	draw (SV *self)	3185	draw (SV *self)
2872	CODE:	3186	CODE:
…		…
2879	SV *draw_w_sv = GvSV (draw_w_gv);	3193	SV *draw_w_sv = GvSV (draw_w_gv);
2880	SV *draw_h_sv = GvSV (draw_h_gv);	3194	SV *draw_h_sv = GvSV (draw_h_gv);
2881	double draw_x, draw_y;	3195	double draw_x, draw_y;
2882		3196
2883	if (!SvROK (self))	3197	if (!SvROK (self))
2884	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3198	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2885		3199
2886	hv = (HV *)SvRV (self);	3200	hv = (HV *)SvRV (self);
2887		3201
2888	if (SvTYPE (hv) != SVt_PVHV)	3202	if (SvTYPE (hv) != SVt_PVHV)
2889	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3203	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2890		3204
2891	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.;
2892	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.;
2893		3207
2894	if (!h || !w)	3208	if (!h || !w)

Diff Legend

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