[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.239 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.283 by root, Thu Dec 11 00:11:58 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 {
…		…
498	return 0;	530	return 0;
499		531
500	return 1;	532	return 1;
501	}	533	}
502		534
503	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
504		588
505	PROTOTYPES: ENABLE	589	PROTOTYPES: ENABLE
506		590
507	BOOT:	591	BOOT:
508	{	592	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	593	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	594	static const struct {
511	const char *name;	595	const char *name;
512	IV iv;	596	IV iv;
513	} *civ, const_iv[] = {	597	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	598	# define const_iv(name) { # name, (IV)name }
…		…
535	const_iv (SDL_USEREVENT),	619	const_iv (SDL_USEREVENT),
536		620
537	const_iv (SDL_APPINPUTFOCUS),	621	const_iv (SDL_APPINPUTFOCUS),
538	const_iv (SDL_APPMOUSEFOCUS),	622	const_iv (SDL_APPMOUSEFOCUS),
539	const_iv (SDL_APPACTIVE),	623	const_iv (SDL_APPACTIVE),
		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),
540		674
541	const_iv (SDLK_FIRST),	675	const_iv (SDLK_FIRST),
542	const_iv (SDLK_LAST),	676	const_iv (SDLK_LAST),
543	const_iv (SDLK_KP0),	677	const_iv (SDLK_KP0),
544	const_iv (SDLK_KP1),	678	const_iv (SDLK_KP1),
…		…
620	const_iv (KMOD_RMETA),	754	const_iv (KMOD_RMETA),
621	const_iv (KMOD_NUM),	755	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	756	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	757	const_iv (KMOD_MODE),
624		758
		759	const_iv (KMOD_LRAM),
		760
625	const_iv (MIX_DEFAULT_FORMAT),	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)
626	# undef const_iv	791	# undef const_iv
627	};	792	};
628		793
629	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; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	795	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
659	CODE:	824	CODE:
660	{	825	{
661	opengl_fontmap = pango_opengl_font_map_new ();	826	opengl_fontmap = pango_opengl_font_map_new ();
662	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);
663	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
664	}	834	}
665		835
666	char *
667	SDL_GetError ()	836	char *SDL_GetError ()
668		837
669	int	838	void SDL_braino ()
670	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
671		839
672	void	840	int SDL_Init (U32 flags)
		841
		842	int SDL_InitSubSystem (U32 flags)
		843
		844	void SDL_QuitSubSystem (U32 flags)
		845
673	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
674		856
675	void	857	void
676	SDL_ListModes (int rgb, int alpha)	858	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	859	PPCODE:
678	{	860	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	872	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	873	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	874	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		875
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	876	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695	#if SDL_VERSION_ATLEAST(1,2,10)
696	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	877	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		878
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	879	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		880
702	if (m && m != (SDL_Rect **)-1)	881	if (m && m != (SDL_Rect **)-1)
703	while (*m)	882	while (*m)
704	{	883	{
705	if ((m)->w >= 800 && (m)->h >= 600)	884	if ((m)->w >= 400 && (m)->h >= 300)
706	{	885	{
707	AV *av = newAV ();	886	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	887	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	888	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	889	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	931	SDL_GetKeyName (int sym)
753		932
754	int	933	int
755	SDL_GetAppState ()	934	SDL_GetAppState ()
756		935
		936	int
		937	SDL_GetModState ()
		938
757	void	939	void
758	poll_events ()	940	poll_events ()
759	PPCODE:	941	PPCODE:
760	{	942	{
761	SDL_Event ev;	943	SDL_Event ev;
…		…
770	{	952	{
771	case SDL_KEYDOWN:	953	case SDL_KEYDOWN:
772	case SDL_KEYUP:	954	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	955	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	956	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	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);
776	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 */
777	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	959	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	960	break;
779		961
780	case SDL_ACTIVEEVENT:	962	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	963	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	981	x = ev.motion.x;
800	y = ev.motion.y;	982	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	983	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	984	}
803		985
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	986	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	987	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	988	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	989	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	990	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	991	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	992	}
811	break;	993	break;
812		994
813	case SDL_MOUSEBUTTONDOWN:	995	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	996	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	997	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		998
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	999	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1000	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1001	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1002	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1007	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1008	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	1009	break;
828	}	1010	}
829		1011
830	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))));
831	}	1013	}
832	}	1014	}
833		1015
834	int	1016	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1017	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
894	}	1076	}
895	}	1077	}
896	#endif	1078	#endif
897	}	1079	}
898		1080
899	void	1081	int
900	add_font (char *file)	1082	add_font (char *file)
901	CODE:	1083	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1084	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1085	OUTPUT:
		1086	RETVAL
903		1087
904	void	1088	void
905	load_image_inline (SV *image_)	1089	load_image_inline (SV *image_)
906	ALIAS:	1090	ALIAS:
907	load_image_file = 1	1091	load_image_file = 1
…		…
993	void	1177	void
994	error (char *message)	1178	error (char *message)
995	CODE:	1179	CODE:
996	fprintf (stderr, "ERROR: %s\n", message);	1180	fprintf (stderr, "ERROR: %s\n", message);
997	#ifdef _WIN32	1181	#ifdef _WIN32
998	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1182	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
999	#endif	1183	#endif
1000		1184
1001	void	1185	void
1002	fatal (char *message)	1186	fatal (char *message)
1003	CODE:	1187	CODE:
1004	fprintf (stderr, "FATAL: %s\n", message);	1188	fprintf (stderr, "FATAL: %s\n", message);
1005	#ifdef _WIN32	1189	#ifdef _WIN32
1006	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1190	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
1007	#endif	1191	#endif
1008	_exit (1);	1192	_exit (1);
1009		1193
1010	void	1194	void
1011	_exit (int retval = 0)	1195	_exit (int retval = 0)
…		…
1023	#if DEBUG	1207	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1208	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1209	#endif
1026	}	1210	}
1027		1211
1028	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
1029		1220
1030	PROTOTYPES: DISABLE	1221	PROTOTYPES: DISABLE
1031		1222
1032	CFPlus::Font	1223	DC::Font
1033	new_from_file (SV class, char path, int id = 0)	1224	new_from_file (SV class, char path, int id = 0)
1034	CODE:	1225	CODE:
1035	{	1226	{
1036	int count;	1227	int count;
1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1228	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1040	}	1231	}
1041	OUTPUT:	1232	OUTPUT:
1042	RETVAL	1233	RETVAL
1043		1234
1044	void	1235	void
1045	DESTROY (CFPlus::Font self)	1236	DESTROY (DC::Font self)
1046	CODE:	1237	CODE:
1047	pango_font_description_free (self);	1238	pango_font_description_free (self);
1048		1239
1049	void	1240	void
1050	make_default (CFPlus::Font self)	1241	make_default (DC::Font self)
1051	PROTOTYPE: $	1242	PROTOTYPE: $
1052	CODE:	1243	CODE:
1053	default_font = self;	1244	default_font = self;
1054		1245
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1246	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1247
1057	PROTOTYPES: DISABLE	1248	PROTOTYPES: DISABLE
1058		1249
1059	void	1250	void
1060	glyph_cache_backup ()	1251	glyph_cache_backup ()
…		…
1066	glyph_cache_restore ()	1257	glyph_cache_restore ()
1067	PROTOTYPE:	1258	PROTOTYPE:
1068	CODE:	1259	CODE:
1069	tc_restore ();	1260	tc_restore ();
1070		1261
1071	CFPlus::Layout	1262	DC::Layout
1072	new (SV *class)	1263	new (SV *class)
1073	CODE:	1264	CODE:
1074	New (0, RETVAL, 1, struct cf_layout);	1265	New (0, RETVAL, 1, struct cf_layout);
1075		1266
1076	RETVAL->pl = pango_layout_new (opengl_context);	1267	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1086	layout_update_font (RETVAL);	1277	layout_update_font (RETVAL);
1087	OUTPUT:	1278	OUTPUT:
1088	RETVAL	1279	RETVAL
1089		1280
1090	void	1281	void
1091	DESTROY (CFPlus::Layout self)	1282	DESTROY (DC::Layout self)
1092	CODE:	1283	CODE:
1093	g_object_unref (self->pl);	1284	g_object_unref (self->pl);
1094	rc_free (self->rc);	1285	rc_free (self->rc);
1095	Safefree (self);	1286	Safefree (self);
1096		1287
1097	void	1288	void
1098	set_text (CFPlus::Layout self, SV *text_)	1289	set_text (DC::Layout self, SV *text_)
1099	CODE:	1290	CODE:
1100	{	1291	{
1101	STRLEN textlen;	1292	STRLEN textlen;
1102	char *text = SvPVutf8 (text_, textlen);	1293	char *text = SvPVutf8 (text_, textlen);
1103		1294
1104	pango_layout_set_text (self->pl, text, textlen);	1295	pango_layout_set_text (self->pl, text, textlen);
1105	}	1296	}
1106		1297
1107	void	1298	void
1108	set_markup (CFPlus::Layout self, SV *text_)	1299	set_markup (DC::Layout self, SV *text_)
1109	CODE:	1300	CODE:
1110	{	1301	{
1111	STRLEN textlen;	1302	STRLEN textlen;
1112	char *text = SvPVutf8 (text_, textlen);	1303	char *text = SvPVutf8 (text_, textlen);
1113		1304
1114	pango_layout_set_markup (self->pl, text, textlen);	1305	pango_layout_set_markup (self->pl, text, textlen);
1115	}	1306	}
1116		1307
1117	void	1308	void
1118	set_shapes (CFPlus::Layout self, ...)	1309	set_shapes (DC::Layout self, ...)
1119	CODE:	1310	CODE:
1120	{	1311	{
1121	PangoAttrList *attrs = 0;	1312	PangoAttrList *attrs = 0;
1122	const char *text = pango_layout_get_text (self->pl);	1313	const char *text = pango_layout_get_text (self->pl);
1123	const char *pos = text;	1314	const char *pos = text;
…		…
1158	if (attrs)	1349	if (attrs)
1159	pango_layout_set_attributes (self->pl, attrs);	1350	pango_layout_set_attributes (self->pl, attrs);
1160	}	1351	}
1161		1352
1162	void	1353	void
1163	get_shapes (CFPlus::Layout self)	1354	get_shapes (DC::Layout self)
1164	PPCODE:	1355	PPCODE:
1165	{	1356	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1357	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1358
1168	do	1359	do
1169	{	1360	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1361	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1362
1172	if (run && shape_attr_p (run))	1363	if (run && shape_attr_p (run))
1173	{	1364	{
1174	PangoRectangle extents;	1365	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1366	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1183		1374
1184	pango_layout_iter_free (iter);	1375	pango_layout_iter_free (iter);
1185	}	1376	}
1186		1377
1187	int	1378	int
1188	has_wrapped (CFPlus::Layout self)	1379	has_wrapped (DC::Layout self)
1189	CODE:	1380	CODE:
1190	{	1381	{
1191	int lines = 1;	1382	int lines = 1;
1192	const char *text = pango_layout_get_text (self->pl);	1383	const char *text = pango_layout_get_text (self->pl);
1193		1384
…		…
1198	}	1389	}
1199	OUTPUT:	1390	OUTPUT:
1200	RETVAL	1391	RETVAL
1201		1392
1202	SV *	1393	SV *
1203	get_text (CFPlus::Layout self)	1394	get_text (DC::Layout self)
1204	CODE:	1395	CODE:
1205	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1396	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206	sv_utf8_decode (RETVAL);	1397	sv_utf8_decode (RETVAL);
1207	OUTPUT:	1398	OUTPUT:
1208	RETVAL	1399	RETVAL
1209		1400
1210	void	1401	void
1211	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.)
1212	CODE:	1403	CODE:
1213	self->r = r;	1404	self->r = r;
1214	self->g = g;	1405	self->g = g;
1215	self->b = b;	1406	self->b = b;
1216	self->a = a;	1407	self->a = a;
1217		1408
1218	void	1409	void
1219	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1410	set_font (DC::Layout self, DC::Font font = 0)
1220	CODE:	1411	CODE:
1221	if (self->font != font)	1412	if (self->font != font)
1222	{	1413	{
1223	self->font = font;	1414	self->font = font;
1224	layout_update_font (self);	1415	layout_update_font (self);
1225	}	1416	}
1226		1417
1227	void	1418	void
1228	set_height (CFPlus::Layout self, int base_height)	1419	set_height (DC::Layout self, int base_height)
1229	CODE:	1420	CODE:
1230	if (self->base_height != base_height)	1421	if (self->base_height != base_height)
1231	{	1422	{
1232	self->base_height = base_height;	1423	self->base_height = base_height;
1233	layout_update_font (self);	1424	layout_update_font (self);
1234	}	1425	}
1235		1426
1236	void	1427	void
1237	set_width (CFPlus::Layout self, int max_width = -1)	1428	set_width (DC::Layout self, int max_width = -1)
1238	CODE:	1429	CODE:
1239	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);
1240		1431
1241	void	1432	void
1242	set_indent (CFPlus::Layout self, int indent)	1433	set_indent (DC::Layout self, int indent)
1243	CODE:	1434	CODE:
1244	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1435	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245		1436
1246	void	1437	void
1247	set_spacing (CFPlus::Layout self, int spacing)	1438	set_spacing (DC::Layout self, int spacing)
1248	CODE:	1439	CODE:
1249	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1440	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250		1441
1251	void	1442	void
1252	set_ellipsise (CFPlus::Layout self, int ellipsise)	1443	set_ellipsise (DC::Layout self, int ellipsise)
1253	CODE:	1444	CODE:
1254	pango_layout_set_ellipsize (self->pl,	1445	pango_layout_set_ellipsize (self->pl,
1255	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1446	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1447	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1448	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258	: PANGO_ELLIPSIZE_NONE	1449	: PANGO_ELLIPSIZE_NONE
1259	);	1450	);
1260		1451
1261	void	1452	void
1262	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1453	set_single_paragraph_mode (DC::Layout self, int spm)
1263	CODE:	1454	CODE:
1264	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1455	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265		1456
1266	void	1457	void
1267	size (CFPlus::Layout self)	1458	size (DC::Layout self)
1268	PPCODE:	1459	PPCODE:
1269	{	1460	{
1270	int w, h;	1461	int w, h;
1271		1462
1272	layout_get_pixel_size (self, &w, &h);	1463	layout_get_pixel_size (self, &w, &h);
…		…
1275	PUSHs (sv_2mortal (newSViv (w)));	1466	PUSHs (sv_2mortal (newSViv (w)));
1276	PUSHs (sv_2mortal (newSViv (h)));	1467	PUSHs (sv_2mortal (newSViv (h)));
1277	}	1468	}
1278		1469
1279	int	1470	int
1280	descent (CFPlus::Layout self)	1471	descent (DC::Layout self)
1281	CODE:	1472	CODE:
1282	{	1473	{
1283	PangoRectangle rect;	1474	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1475	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1476	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1477	RETVAL = PANGO_DESCENT (rect);
1287	}	1478	}
1288	OUTPUT:	1479	OUTPUT:
1289	RETVAL	1480	RETVAL
1290		1481
1291	int	1482	int
1292	xy_to_index (CFPlus::Layout self, int x, int y)	1483	xy_to_index (DC::Layout self, int x, int y)
1293	CODE:	1484	CODE:
1294	{	1485	{
1295	int index, trailing;	1486	int index, trailing;
1296	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);
1297	RETVAL = index + trailing;	1488	RETVAL = index + trailing;
1298	}	1489	}
1299	OUTPUT:	1490	OUTPUT:
1300	RETVAL	1491	RETVAL
1301		1492
1302	void	1493	void
1303	cursor_pos (CFPlus::Layout self, int index)	1494	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1495	PPCODE:
1305	{	1496	{
1306	PangoRectangle strong_pos;	1497	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1498	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308		1499
1309	EXTEND (SP, 3);	1500	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1501	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1502	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1503	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1504	}
1314		1505
1315	void	1506	void
1316	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)
1317	PPCODE:	1508	PPCODE:
1318	{	1509	{
1319	int line, x;	1510	int line, x;
1320		1511
1321	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)
1322	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1514	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323		1515	--line;
		1516	#endif
1324	EXTEND (SP, 2);	1517	EXTEND (SP, 2);
1325	PUSHs (sv_2mortal (newSViv (line - 1)));	1518	PUSHs (sv_2mortal (newSViv (line)));
1326	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1519	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327	}	1520	}
1328		1521
1329	void	1522	void
1330	line_x_to_index (CFPlus::Layout self, int line, int x)	1523	line_x_to_index (DC::Layout self, int line, int x)
1331	PPCODE:	1524	PPCODE:
1332	{	1525	{
1333	PangoLayoutLine *lp;	1526	PangoLayoutLine *lp;
1334	int index, trailing;	1527	int index, trailing;
1335		1528
1336	if (line < 0)	1529	if (line < 0)
1337	XSRETURN_EMPTY;	1530	XSRETURN_EMPTY;
1338		1531
1339	if (!(lp = pango_layout_get_line (self->pl, line)))	1532	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340	XSRETURN_EMPTY; /* do better */	1533	XSRETURN_EMPTY; /* do better */
1341		1534
1342	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);
1343		1536
1344	EXTEND (SP, 2);	1537	EXTEND (SP, 2);
…		…
1350	PUSHs (sv_2mortal (newSViv (trailing)));	1543	PUSHs (sv_2mortal (newSViv (trailing)));
1351	}	1544	}
1352	}	1545	}
1353		1546
1354	void	1547	void
1355	render (CFPlus::Layout self, float x, float y, int flags = 0)	1548	render (DC::Layout self, float x, float y, int flags = 0)
1356	CODE:	1549	CODE:
1357	rc_clear (self->rc);	1550	rc_clear (self->rc);
1358	pango_opengl_render_layout_subpixel (	1551	pango_opengl_render_layout_subpixel (
1359	self->pl,	1552	self->pl,
1360	self->rc,	1553	self->rc,
…		…
1365	// we assume that context_change actually clears/frees stuff	1558	// we assume that context_change actually clears/frees stuff
1366	// and does not do any recomputation...	1559	// and does not do any recomputation...
1367	pango_layout_context_changed (self->pl);	1560	pango_layout_context_changed (self->pl);
1368		1561
1369	void	1562	void
1370	draw (CFPlus::Layout self)	1563	draw (DC::Layout self)
1371	CODE:	1564	CODE:
1372	{	1565	{
1373	glEnable (GL_TEXTURE_2D);	1566	glEnable (GL_TEXTURE_2D);
1374	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1567	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375	glEnable (GL_BLEND);	1568	glEnable (GL_BLEND);
…		…
1383	glDisable (GL_ALPHA_TEST);	1576	glDisable (GL_ALPHA_TEST);
1384	glDisable (GL_BLEND);	1577	glDisable (GL_BLEND);
1385	glDisable (GL_TEXTURE_2D);	1578	glDisable (GL_TEXTURE_2D);
1386	}	1579	}
1387		1580
1388	MODULE = CFPlus PACKAGE = CFPlus::Texture	1581	MODULE = Deliantra::Client PACKAGE = DC::Texture
1389		1582
1390	PROTOTYPES: ENABLE	1583	PROTOTYPES: ENABLE
1391		1584
1392	void	1585	void
1393	pad (SV *data_, int ow, int oh, int nw, int nh)	1586	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1472	RETVAL = width > 0;	1665	RETVAL = width > 0;
1473	}	1666	}
1474	OUTPUT:	1667	OUTPUT:
1475	RETVAL	1668	RETVAL
1476		1669
1477	MODULE = CFPlus PACKAGE = CFPlus::Map	1670	MODULE = Deliantra::Client PACKAGE = DC::Map
1478		1671
1479	PROTOTYPES: DISABLE	1672	PROTOTYPES: DISABLE
1480		1673
1481	CFPlus::Map	1674	DC::Map
1482	new (SV *class)	1675	new (SV *class)
1483	CODE:	1676	CODE:
1484	New (0, RETVAL, 1, struct map);	1677	New (0, RETVAL, 1, struct map);
1485	RETVAL->x = 0;	1678	RETVAL->x = 0;
1486	RETVAL->y = 0;	1679	RETVAL->y = 0;
…		…
1494	RETVAL->row = 0;	1687	RETVAL->row = 0;
1495	OUTPUT:	1688	OUTPUT:
1496	RETVAL	1689	RETVAL
1497		1690
1498	void	1691	void
1499	DESTROY (CFPlus::Map self)	1692	DESTROY (DC::Map self)
1500	CODE:	1693	CODE:
1501	{	1694	{
1502	map_clear (self);	1695	map_clear (self);
1503	Safefree (self->face2tile);	1696	Safefree (self->face2tile);
1504	Safefree (self->tex);	1697	Safefree (self->tex);
1505	Safefree (self);	1698	Safefree (self);
1506	}	1699	}
1507		1700
1508	void	1701	void
1509	resize (CFPlus::Map self, int map_width, int map_height)	1702	resize (DC::Map self, int map_width, int map_height)
1510	CODE:	1703	CODE:
1511	self->w = map_width;	1704	self->w = map_width;
1512	self->h = map_height;	1705	self->h = map_height;
1513		1706
1514	void	1707	void
1515	clear (CFPlus::Map self)	1708	clear (DC::Map self)
1516	CODE:	1709	CODE:
1517	map_clear (self);	1710	map_clear (self);
1518		1711
1519	void	1712	void
1520	set_tileid (CFPlus::Map self, int face, int tile)	1713	set_tileid (DC::Map self, int face, int tile)
1521	CODE:	1714	CODE:
1522	{	1715	{
1523	need_facenum (self, face); self->face2tile [face] = tile;	1716	need_facenum (self, face); self->face2tile [face] = tile;
1524	need_texid (self, tile);	1717	need_texid (self, tile);
1525	}	1718	}
1526		1719
1527	void	1720	void
1528	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1721	set_smooth (DC::Map self, int face, int smooth, int level)
1529	CODE:	1722	CODE:
1530	{	1723	{
1531	tileid texid;	1724	tileid texid;
1532	maptex *tex;	1725	maptex *tex;
1533		1726
…		…
1546	tex->smoothtile = self->face2tile [smooth];	1739	tex->smoothtile = self->face2tile [smooth];
1547	tex->smoothlevel = level;	1740	tex->smoothlevel = level;
1548	}	1741	}
1549		1742
1550	void	1743	void
1551	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)
1552	CODE:	1745	CODE:
1553	{	1746	{
1554	need_texid (self, texid);	1747	need_texid (self, texid);
1555		1748
1556	{	1749	{
…		…
1575	// use uglier nearest interpolation because linear suffers	1768	// use uglier nearest interpolation because linear suffers
1576	// from transparent color bleeding and ugly wrapping effects.	1769	// from transparent color bleeding and ugly wrapping effects.
1577	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1770	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578	}	1771	}
1579		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
1580	int	1793	int
1581	ox (CFPlus::Map self)	1794	ox (DC::Map self)
1582	ALIAS:	1795	ALIAS:
1583	oy = 1	1796	oy = 1
1584	x = 2	1797	x = 2
1585	y = 3	1798	y = 3
1586	w = 4	1799	w = 4
…		…
1597	}	1810	}
1598	OUTPUT:	1811	OUTPUT:
1599	RETVAL	1812	RETVAL
1600		1813
1601	void	1814	void
1602	scroll (CFPlus::Map self, int dx, int dy)	1815	scroll (DC::Map self, int dx, int dy)
1603	CODE:	1816	CODE:
1604	{	1817	{
1605	if (dx > 0)	1818	if (dx > 0)
1606	map_blank (self, self->x, self->y, dx, self->h);	1819	map_blank (self, self->x, self->y, dx, self->h);
1607	else if (dx < 0)	1820	else if (dx < 0)
…		…
1623	self->y += MAP_EXTEND_Y;	1836	self->y += MAP_EXTEND_Y;
1624	}	1837	}
1625	}	1838	}
1626		1839
1627	SV *	1840	SV *
1628	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1841	map1a_update (DC::Map self, SV *data_, int extmap)
1629	CODE:	1842	CODE:
1630	{	1843	{
1631	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1844	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1632	uint8_t data_end = (uint8_t )SvEND (data_);	1845	uint8_t data_end = (uint8_t )SvEND (data_);
1633	mapcell *cell;	1846	mapcell *cell;
…		…
1661	uint8_t ext, cmd;	1874	uint8_t ext, cmd;
1662		1875
1663	do	1876	do
1664	{	1877	{
1665	ext = *data++;	1878	ext = *data++;
1666	cmd = ext & 0x3f;	1879	cmd = ext & 0x7f;
1667		1880
1668	if (cmd < 4)	1881	if (cmd < 4)
1669	cell->darkness = 255 - ext * 64 + 1;	1882	cell->darkness = 255 - ext * 64 + 1;
1670	else if (cmd == 5) // health	1883	else if (cmd == 5) // health
1671	{	1884	{
…		…
1674	}	1887	}
1675	else if (cmd == 6) // monster width	1888	else if (cmd == 6) // monster width
1676	cell->stat_width = *data++ + 1;	1889	cell->stat_width = *data++ + 1;
1677	else if (cmd == 0x47)	1890	else if (cmd == 0x47)
1678	{	1891	{
1679	if (*data == 4)	1892	if (*data == 1) cell->player = data [1];
1680	; // 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);
1681		1896
1682	data += *data + 1;	1897	data += *data + 1;
1683	}	1898	}
1684	else if (cmd == 8) // cell flags	1899	else if (cmd == 8) // cell flags
1685	cell->flags = *data++;	1900	cell->flags = *data++;
…		…
1702	cell->tile [z] = self->face2tile [face];	1917	cell->tile [z] = self->face2tile [face];
1703		1918
1704	if (cell->tile [z])	1919	if (cell->tile [z])
1705	{	1920	{
1706	maptex *tex = self->tex + cell->tile [z];	1921	maptex *tex = self->tex + cell->tile [z];
		1922	tex->unused = 0;
1707	if (!tex->name)	1923	if (!tex->name)
1708	av_push (missing, newSViv (cell->tile [z]));	1924	av_push (missing, newSViv (cell->tile [z]));
1709		1925
1710	if (tex->smoothtile)	1926	if (tex->smoothtile)
1711	{	1927	{
1712	maptex *smooth = self->tex + tex->smoothtile;	1928	maptex *smooth = self->tex + tex->smoothtile;
		1929	smooth->unused = 0;
1713	if (!smooth->name)	1930	if (!smooth->name)
1714	av_push (missing, newSViv (tex->smoothtile));	1931	av_push (missing, newSViv (tex->smoothtile));
1715	}	1932	}
1716	}	1933	}
1717	}	1934	}
1718	}	1935	}
1719	else	1936	else
1720	cell->darkness = 0;	1937	CELL_CLEAR (cell);
1721	}	1938	}
1722	}	1939	}
1723	OUTPUT:	1940	OUTPUT:
1724	RETVAL	1941	RETVAL
1725		1942
1726	SV *	1943	SV *
1727	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)
1728	CODE:	1945	CODE:
1729	{	1946	{
1730	int x1, x;	1947	int x1, x;
1731	int y1, y;	1948	int y1, y;
1732	int z;	1949	int z;
…		…
1777	}	1994	}
1778	OUTPUT:	1995	OUTPUT:
1779	RETVAL	1996	RETVAL
1780		1997
1781	void	1998	void
1782	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)
1783	CODE:	2000	CODE:
1784	{	2001	{
1785	int x, y, z;	2002	int x, y, z;
1786		2003
1787	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2004	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1788	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
1789	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)
1790	smooth_key skey;	2007	smooth_key skey;
1791		2008	int pl_x, pl_y;
		2009	maptex pl_tex;
1792	rc_t *rc = rc_alloc ();	2010	rc_t *rc = rc_alloc ();
1793	rc_key_t key;	2011	rc_key_t key;
1794	rc_array_t *arr;	2012	rc_array_t *arr;
		2013
		2014	pl_tex.name = 0;
1795		2015
1796	// thats current max. sorry.	2016	// thats current max. sorry.
1797	if (sw > 255) sw = 255;	2017	if (sw > 255) sw = 255;
1798	if (sh > 255) sh = 255;	2018	if (sh > 255) sh = 255;
1799		2019
…		…
1805	key.g = 255;	2025	key.g = 255;
1806	key.b = 255;	2026	key.b = 255;
1807	key.a = 255;	2027	key.a = 255;
1808	key.mode = GL_QUADS;	2028	key.mode = GL_QUADS;
1809	key.format = GL_T2F_V3F;	2029	key.format = GL_T2F_V3F;
1810	key.texname = -1;
1811		2030
1812	mx += self->x;	2031	mx += self->x;
1813	my += self->y;	2032	my += self->y;
1814		2033
1815	// first pass: determine smooth_max	2034	// first pass: determine smooth_max
…		…
1839	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2058	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840		2059
1841	for (z = 0; z <= 2; z++)	2060	for (z = 0; z <= 2; z++)
1842	{	2061	{
1843	memset (smooth_level, 0, sizeof (smooth_level));	2062	memset (smooth_level, 0, sizeof (smooth_level));
		2063	key.texname = -1;
1844		2064
1845	for (y = 0; y < sh; y++)	2065	for (y = 0; y < sh; y++)
1846	if (0 <= y + my && y + my < self->rows)	2066	if (0 <= y + my && y + my < self->rows)
1847	{	2067	{
1848	maprow *row = self->row + (y + my);	2068	maprow *row = self->row + (y + my);
…		…
1854	tileid tile = cell->tile [z];	2074	tileid tile = cell->tile [z];
1855		2075
1856	if (tile)	2076	if (tile)
1857	{	2077	{
1858	maptex tex = self->tex [tile];	2078	maptex tex = self->tex [tile];
1859	int px, py;	2079	int px = (x + 1) * T - tex.w;
		2080	int py = (y + 1) * T - tex.h;
1860		2081
1861	if (key.texname != tex.name)	2082	if (key.texname != tex.name)
1862	{	2083	{
		2084	self->tex [tile].unused = 0;
		2085
1863	if (!tex.name)	2086	if (!tex.name)
1864	tex = self->tex [2]; /* missing, replace by noface */	2087	tex = self->tex [2]; /* missing, replace by noface */
1865		2088
1866	key.texname = tex.name;	2089	key.texname = tex.name;
1867	arr = rc_array (rc, &key);	2090	arr = rc_array (rc, &key);
1868	}	2091	}
1869		2092
1870	px = (x + 1) * T - tex.w;	2093	if (expect_false (cell->player == player) && expect_false (z == 2))
1871	py = (y + 1) * T - tex.h;	2094	{
		2095	pl_x = px;
		2096	pl_y = py;
		2097	pl_tex = tex;
		2098	continue;
		2099	}
1872		2100
1873	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2101	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874	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);
1875	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);
1876	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);
1877		2105
1878	if (cell->flags && z == 2)	2106	if (expect_false (cell->flags) && expect_false (z == 2))
1879	{	2107	{
1880	// overlays such as the speech bubble, probably more to come	2108	// overlays such as the speech bubble, probably more to come
1881	if (cell->flags & 1)	2109	if (cell->flags & 1)
1882	{	2110	{
1883	maptex tex = self->tex [1];	2111	maptex tex = self->tex [1];
…		…
1984	{	2212	{
1985	// this time avoiding texture state changes	2213	// this time avoiding texture state changes
1986	// save gobs of state changes.	2214	// save gobs of state changes.
1987	if (key.texname != tex.name)	2215	if (key.texname != tex.name)
1988	{	2216	{
		2217	self->tex [skey->tile].unused = 0;
		2218
1989	glEnd ();	2219	glEnd ();
1990	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2220	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991	glBegin (GL_QUADS);	2221	glBegin (GL_QUADS);
1992	}	2222	}
1993		2223
…		…
2022	}	2252	}
2023		2253
2024	hv_clear (smooth);	2254	hv_clear (smooth);
2025	}	2255	}
2026		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
2027	glDisable (GL_BLEND);	2274	glDisable (GL_BLEND);
2028	rc_free (rc);	2275	rc_free (rc);
2029		2276
2030	// top layer: overlays such as the health bar	2277	// top layer: overlays such as the health bar
2031	for (y = 0; y < sh; y++)	2278	for (y = 0; y < sh; y++)
…		…
2038	{	2285	{
2039	mapcell *cell = row->col + (x + mx - row->c0);	2286	mapcell *cell = row->col + (x + mx - row->c0);
2040		2287
2041	int px = x * T;	2288	int px = x * T;
2042	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	}
2043		2296
2044	if (cell->stat_hp)	2297	if (cell->stat_hp)
2045	{	2298	{
2046	int width = cell->stat_width * T;	2299	int width = cell->stat_width * T;
2047	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2300	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2058	}	2311	}
2059	}	2312	}
2060	}	2313	}
2061		2314
2062	void	2315	void
2063	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)
2064	CODE:	2317	CODE:
2065	{	2318	{
2066	static float color[16][3] = {	2319	static float color[16][3] = {
2067	{ 0.00F, 0.00F, 0.00F },	2320	{ 0.00F, 0.00F, 0.00F },
2068	{ 1.00F, 1.00F, 1.00F },	2321	{ 1.00F, 1.00F, 1.00F },
…		…
2118	glDisable (GL_BLEND);	2371	glDisable (GL_BLEND);
2119	glDisable (GL_TEXTURE_2D);	2372	glDisable (GL_TEXTURE_2D);
2120	}	2373	}
2121		2374
2122	void	2375	void
2123	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)
2124	PPCODE:	2377	PPCODE:
2125	{	2378	{
2126	int x, y;	2379	int x, y;
2127	int sw1 = sw + 2;	2380	int sw1 = sw + 2;
2128	int sh1 = sh + 2;	2381	int sh1 = sh + 2;
…		…
2136	SvCUR_set (darkness3_sv, sw34 * sh3);	2389	SvCUR_set (darkness3_sv, sw34 * sh3);
2137		2390
2138	mx += self->x - 1;	2391	mx += self->x - 1;
2139	my += self->y - 1;	2392	my += self->y - 1;
2140		2393
2141	memset (darkness1, 255, sw1 * sh1);	2394	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142		2395
2143	for (y = 0; y < sh1; y++)	2396	for (y = 0; y < sh1; y++)
2144	if (0 <= y + my && y + my < self->rows)	2397	if (0 <= y + my && y + my < self->rows)
2145	{	2398	{
2146	maprow *row = self->row + (y + my);	2399	maprow *row = self->row + (y + my);
…		…
2199	PUSHs (sv_2mortal (newSViv (sh3)));	2452	PUSHs (sv_2mortal (newSViv (sh3)));
2200	PUSHs (darkness3_sv);	2453	PUSHs (darkness3_sv);
2201	}	2454	}
2202		2455
2203	SV *	2456	SV *
2204	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)
2205	CODE:	2458	CODE:
2206	{	2459	{
2207	int x, y, x1, y1;	2460	int x, y, x1, y1;
2208	SV data_sv = newSV (w h * 7 + 5);	2461	SV data_sv = newSV (w h * 7 + 5);
2209	uint8_t data = (uint8_t )SvPVX (data_sv);	2462	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2266	else	2519	else
2267	*data++ = 0;	2520	*data++ = 0;
2268	}	2521	}
2269	}	2522	}
2270		2523
		2524	/* if size is wh + 5 then no data has been found /
		2525	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2526	{
2271	SvPOK_only (data_sv);	2527	SvPOK_only (data_sv);
2272	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2528	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2529	}
		2530
2273	RETVAL = data_sv;	2531	RETVAL = data_sv;
2274	}	2532	}
2275	OUTPUT:	2533	OUTPUT:
2276	RETVAL	2534	RETVAL
2277		2535
2278	void	2536	void
2279	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)
2280	PPCODE:	2538	PPCODE:
2281	{	2539	{
2282	int x, y, z;	2540	int x, y, z;
2283	int w, h;	2541	int w, h;
2284	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;
2285		2553
2286	if (*data++ != 0)	2554	if (*data++ != 0)
2287	XSRETURN_EMPTY; /* version mismatch */	2555	XSRETURN_EMPTY; /* version mismatch */
2288		2556
2289	w = data++ << 8; w \|= data++;	2557	w = data++ << 8; w \|= data++;
…		…
2304	{	2572	{
2305	maprow *row = map_get_row (self, y);	2573	maprow *row = map_get_row (self, y);
2306		2574
2307	for (x = x0; x < x1; x++)	2575	for (x = x0; x < x1; x++)
2308	{	2576	{
		2577	uint8_t flags;
		2578
		2579	if (data + 7 >= end)
		2580	XSRETURN_EMPTY;
		2581
2309	uint8_t flags = *data++;	2582	flags = *data++;
2310		2583
2311	if (flags)	2584	if (flags)
2312	{	2585	{
2313	mapcell *cell = row_get_cell (row, x);	2586	mapcell *cell = row_get_cell (row, x);
2314	tileid tile[3] = { 0, 0, 0 };	2587	tileid tile[3] = { 0, 0, 0 };
…		…
2317	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2590	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2318	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2591	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2319		2592
2320	if (cell->darkness == 0)	2593	if (cell->darkness == 0)
2321	{	2594	{
2322	cell->darkness = 0;	2595	/cell->darkness = 0;/
		2596	EXTEND (SP, 3);
2323		2597
2324	for (z = 0; z <= 2; z++)	2598	for (z = 0; z <= 2; z++)
2325	{	2599	{
2326	tileid t = tile [z];	2600	tileid t = tile [z];
2327		2601
2328	if (t >= self->texs \|\| (t && !self->tex [t].name))	2602	if (t >= self->texs \|\| (t && !self->tex [t].name))
2329	{	2603	{
2330	XPUSHs (sv_2mortal (newSViv (t)));	2604	PUSHs (sv_2mortal (newSViv (t)));
2331	need_texid (self, t);	2605	need_texid (self, t);
2332	}	2606	}
2333		2607
2334	cell->tile [z] = t;	2608	cell->tile [z] = t;
2335	}	2609	}
…		…
2337	}	2611	}
2338	}	2612	}
2339	}	2613	}
2340	}	2614	}
2341		2615
2342	MODULE = CFPlus PACKAGE = CFPlus::RW	2616	MODULE = Deliantra::Client PACKAGE = DC::RW
2343		2617
2344	CFPlus::RW	2618	DC::RW
2345	new (SV class, SV data_sv)	2619	new (SV class, SV data_sv)
2346	CODE:	2620	CODE:
2347	{	2621	{
2348	STRLEN datalen;	2622	STRLEN datalen;
2349	char *data = SvPVbyte (data_sv, datalen);	2623	char *data = SvPVbyte (data_sv, datalen);
…		…
2351	RETVAL = SDL_RWFromConstMem (data, datalen);	2625	RETVAL = SDL_RWFromConstMem (data, datalen);
2352	}	2626	}
2353	OUTPUT:	2627	OUTPUT:
2354	RETVAL	2628	RETVAL
2355		2629
2356	CFPlus::RW	2630	DC::RW
2357	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")
2358	CODE:	2632	CODE:
2359	RETVAL = SDL_RWFromFile (path, mode);	2633	RETVAL = SDL_RWFromFile (path, mode);
2360	OUTPUT:	2634	OUTPUT:
2361	RETVAL	2635	RETVAL
2362		2636
2363	# fails on win32:	2637	# fails on win32:
2364	# CFPlus.xs(2268) : error C2059: syntax error : '('	2638	# dc.xs(2268) : error C2059: syntax error : '('
2365	#void	2639	#void
2366	#close (CFPlus::RW self)	2640	#close (DC::RW self)
2367	# CODE:	2641	# CODE:
2368	# (self->(close)) (self);	2642	# (self->(close)) (self);
2369		2643
2370	MODULE = CFPlus PACKAGE = CFPlus::Channel	2644	MODULE = Deliantra::Client PACKAGE = DC::Channel
2371		2645
2372	PROTOTYPES: DISABLE	2646	PROTOTYPES: DISABLE
2373		2647
2374	CFPlus::Channel	2648	DC::Channel
2375	find ()	2649	find ()
2376	CODE:	2650	CODE:
2377	{	2651	{
2378	RETVAL = Mix_GroupAvailable (-1);	2652	RETVAL = Mix_GroupAvailable (-1);
2379		2653
…		…
2392	}	2666	}
2393	OUTPUT:	2667	OUTPUT:
2394	RETVAL	2668	RETVAL
2395		2669
2396	void	2670	void
2397	halt (CFPlus::Channel self)	2671	halt (DC::Channel self)
2398	CODE:	2672	CODE:
2399	Mix_HaltChannel (self);	2673	Mix_HaltChannel (self);
2400		2674
2401	void	2675	void
2402	expire (CFPlus::Channel self, int ticks = -1)	2676	expire (DC::Channel self, int ticks = -1)
2403	CODE:	2677	CODE:
2404	Mix_ExpireChannel (self, ticks);	2678	Mix_ExpireChannel (self, ticks);
2405		2679
2406	void	2680	void
2407	fade_out (CFPlus::Channel self, int ticks = -1)	2681	fade_out (DC::Channel self, int ticks = -1)
2408	CODE:	2682	CODE:
2409	Mix_FadeOutChannel (self, ticks);	2683	Mix_FadeOutChannel (self, ticks);
2410		2684
2411	int	2685	int
2412	volume (CFPlus::Channel self, int volume)	2686	volume (DC::Channel self, int volume)
2413	CODE:	2687	CODE:
2414	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2688	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415	OUTPUT:	2689	OUTPUT:
2416	RETVAL	2690	RETVAL
2417		2691
2418	void	2692	void
2419	unregister_all_effects (CFPlus::Channel self)	2693	unregister_all_effects (DC::Channel self)
2420	CODE:	2694	CODE:
2421	Mix_UnregisterAllEffects (self);	2695	Mix_UnregisterAllEffects (self);
2422		2696
2423	void	2697	void
2424	set_panning (CFPlus::Channel self, int left, int right)	2698	set_panning (DC::Channel self, int left, int right)
2425	CODE:	2699	CODE:
2426	left = CLAMP (left , 0, 255);	2700	left = CLAMP (left , 0, 255);
2427	right = CLAMP (right, 0, 255);	2701	right = CLAMP (right, 0, 255);
2428	Mix_SetPanning (self, left, right);	2702	Mix_SetPanning (self, left, right);
2429		2703
2430	void	2704	void
2431	set_distance (CFPlus::Channel self, int distance)	2705	set_distance (DC::Channel self, int distance)
2432	CODE:	2706	CODE:
2433	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2707	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434		2708
2435	void	2709	void
2436	set_position (CFPlus::Channel self, int angle, int distance)	2710	set_position (DC::Channel self, int angle, int distance)
2437	CODE:	2711	CODE:
2438		2712
2439	void	2713	void
2440	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)
2441	CODE:	2715	CODE:
2442	{	2716	{
2443	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));
2444	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);
2445	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2719	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446	}	2720	}
2447		2721
2448	void	2722	void
2449	set_reverse_stereo (CFPlus::Channel self, int flip)	2723	set_reverse_stereo (DC::Channel self, int flip)
2450	CODE:	2724	CODE:
2451	Mix_SetReverseStereo (self, flip);	2725	Mix_SetReverseStereo (self, flip);
2452		2726
2453	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2727	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454		2728
2455	PROTOTYPES: DISABLE	2729	PROTOTYPES: DISABLE
2456		2730
2457	CFPlus::MixChunk	2731	DC::MixChunk
2458	new (SV *class, CFPlus::RW rwops)	2732	new (SV *class, DC::RW rwops)
2459	CODE:	2733	CODE:
2460	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2734	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461	OUTPUT:	2735	OUTPUT:
2462	RETVAL	2736	RETVAL
2463		2737
2464	void	2738	void
2465	DESTROY (CFPlus::MixChunk self)	2739	DESTROY (DC::MixChunk self)
2466	CODE:	2740	CODE:
2467	Mix_FreeChunk (self);	2741	Mix_FreeChunk (self);
2468		2742
2469	int	2743	int
2470	volume (CFPlus::MixChunk self, int volume = -1)	2744	volume (DC::MixChunk self, int volume = -1)
2471	CODE:	2745	CODE:
2472	if (items > 1)	2746	if (items > 1)
2473	volume = CLAMP (volume, 0, 128);	2747	volume = CLAMP (volume, 0, 128);
2474	RETVAL = Mix_VolumeChunk (self, volume);	2748	RETVAL = Mix_VolumeChunk (self, volume);
2475	OUTPUT:	2749	OUTPUT:
2476	RETVAL	2750	RETVAL
2477		2751
2478	CFPlus::Channel	2752	DC::Channel
2479	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)
2480	CODE:	2754	CODE:
2481	{	2755	{
2482	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2756	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483		2757
2484	if (RETVAL < 0)	2758	if (RETVAL < 0)
…		…
2491	}	2765	}
2492	}	2766	}
2493	OUTPUT:	2767	OUTPUT:
2494	RETVAL	2768	RETVAL
2495		2769
2496	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2770	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497		2771
2498	int	2772	int
2499	volume (int volume = -1)	2773	volume (int volume = -1)
2500	PROTOTYPE: ;$	2774	PROTOTYPE: ;$
2501	CODE:	2775	CODE:
…		…
2513	void	2787	void
2514	halt ()	2788	halt ()
2515	CODE:	2789	CODE:
2516	Mix_HaltMusic ();	2790	Mix_HaltMusic ();
2517		2791
2518	CFPlus::MixMusic	2792	DC::MixMusic
2519	new (SV *class, CFPlus::RW rwops)	2793	new (SV *class, DC::RW rwops)
2520	CODE:	2794	CODE:
2521	RETVAL = Mix_LoadMUS_RW (rwops);	2795	RETVAL = Mix_LoadMUS_RW (rwops);
2522	OUTPUT:	2796	OUTPUT:
2523	RETVAL	2797	RETVAL
2524		2798
2525	void	2799	void
2526	DESTROY (CFPlus::MixMusic self)	2800	DESTROY (DC::MixMusic self)
2527	CODE:	2801	CODE:
2528	Mix_FreeMusic (self);	2802	Mix_FreeMusic (self);
2529		2803
2530	int	2804	int
2531	play (CFPlus::MixMusic self, int loops = -1)	2805	play (DC::MixMusic self, int loops = -1)
2532	CODE:	2806	CODE:
2533	RETVAL = Mix_PlayMusic (self, loops);	2807	RETVAL = Mix_PlayMusic (self, loops);
2534	OUTPUT:	2808	OUTPUT:
2535	RETVAL	2809	RETVAL
2536		2810
2537	void	2811	void
2538	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)
2539	CODE:	2813	CODE:
2540	Mix_FadeInMusicPos (self, loops, ms, position);	2814	Mix_FadeInMusicPos (self, loops, ms, position);
2541		2815
2542	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2816	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543		2817
2544	PROTOTYPES: ENABLE	2818	PROTOTYPES: ENABLE
2545		2819
2546	BOOT:	2820	BOOT:
2547	{	2821	{
2548	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2822	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549	static const struct {	2823	static const struct {
2550	const char *name;	2824	const char *name;
2551	IV iv;	2825	IV iv;
2552	} *civ, const_iv[] = {	2826	} *civ, const_iv[] = {
2553	# define const_iv(name) { # name, (IV)name }	2827	# define const_iv(name) { # name, (IV)name }
…		…
2767	void glRotate (float angle, float x, float y, float z)	3041	void glRotate (float angle, float x, float y, float z)
2768	CODE:	3042	CODE:
2769	glRotatef (angle, x, y, z);	3043	glRotatef (angle, x, y, z);
2770		3044
2771	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: @
2772	ALIAS:	3047	ALIAS:
2773	glColor_premultiply = 1	3048	glColor_premultiply = 1
2774	CODE:	3049	CODE:
2775	if (ix)	3050	if (ix)
2776	{	3051	{
…		…
2846	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)
2847	CODE:	3122	CODE:
2848	if (gl.SeparableFilter2D)	3123	if (gl.SeparableFilter2D)
2849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3124	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850		3125
2851	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)
2852		3127
2853	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)
2854		3129
2855	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)
2856		3131
…		…
2882		3157
2883	void glEndList ()	3158	void glEndList ()
2884		3159
2885	void glCallList (int list)	3160	void glCallList (int list)
2886		3161
2887	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3162	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888		3163
2889	PROTOTYPES: DISABLE	3164	PROTOTYPES: DISABLE
2890		3165
2891	void	3166	void
2892	find_widget (SV *self, NV x, NV y)	3167	find_widget (SV *self, NV x, NV y)
…		…
2896	XPUSHs (self);	3171	XPUSHs (self);
2897	}	3172	}
2898		3173
2899	BOOT:	3174	BOOT:
2900	{	3175	{
2901	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3176	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902		3177
2903	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);
2904	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);
2905	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);
2906	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);
2907	}	3182	}
2908		3183
2909	void	3184	void
2910	draw (SV *self)	3185	draw (SV *self)
2911	CODE:	3186	CODE:
…		…
2918	SV *draw_w_sv = GvSV (draw_w_gv);	3193	SV *draw_w_sv = GvSV (draw_w_gv);
2919	SV *draw_h_sv = GvSV (draw_h_gv);	3194	SV *draw_h_sv = GvSV (draw_h_gv);
2920	double draw_x, draw_y;	3195	double draw_x, draw_y;
2921		3196
2922	if (!SvROK (self))	3197	if (!SvROK (self))
2923	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3198	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924		3199
2925	hv = (HV *)SvRV (self);	3200	hv = (HV *)SvRV (self);
2926		3201
2927	if (SvTYPE (hv) != SVt_PVHV)	3202	if (SvTYPE (hv) != SVt_PVHV)
2928	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3203	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929		3204
2930	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.;
2931	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.;
2932		3207
2933	if (!h \|\| !w)	3208	if (!h \|\| !w)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.239 by root, Tue Dec 25 18:58:32 2007 UTC vs. Revision 1.283 by root, Thu Dec 11 00:11:58 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.239 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.283 by root, Thu Dec 11 00:11:58 2008 UTC