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.237 by root, Sun Oct 14 15:33:30 2007 UTC vs.
Revision 1.288 by pippijn, Tue Dec 23 18:52:54 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 64
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	97
		98	#define TEXID_SPEECH 1
		99	#define TEXID_NOFACE 2
		100	#define TEXID_HIDDEN 3
73		101
74	static AV *texture_av;	102	static AV *texture_av;
75		103
76	static struct	104	static struct
77	{	105	{
…		…
120		148
121	#include "pango-font.c"	149	#include "pango-font.c"
122	#include "pango-fontmap.c"	150	#include "pango-fontmap.c"
123	#include "pango-render.c"	151	#include "pango-render.c"
124		152
125	typedef IV CFPlus__Channel;	153	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	154	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	155	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	156	typedef Mix_Music *DC__MixMusic;
129		157
130	typedef PangoFontDescription *CFPlus__Font;	158	typedef PangoFontDescription *DC__Font;
131		159
132	static int	160	static int
133	shape_attr_p (PangoLayoutRun *run)	161	shape_attr_p (PangoLayoutRun *run)
134	{	162	{
135	GSList *attrs = run->item->analysis.extra_attrs;	163	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		177
150	typedef struct cf_layout {	178	typedef struct cf_layout {
151	PangoLayout *pl;	179	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	180	float r, g, b, a; // default color for rgba mode
153	int base_height;	181	int base_height;
154	CFPlus__Font font;	182	DC__Font font;
155	rc_t *rc;	183	rc_t *rc;
156	} *CFPlus__Layout;	184	} *DC__Layout;
157		185
158	static CFPlus__Font default_font;	186	static DC__Font default_font;
159	static PangoContext *opengl_context;	187	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	188	static PangoFontMap *opengl_fontmap;
161		189
162	static void	190	static void
163	substitute_func (FcPattern *pattern, gpointer data)	191	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	196	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	197	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	198	}
171		199
172	static void	200	static void
173	layout_update_font (CFPlus__Layout self)	201	layout_update_font (DC__Layout self)
174	{	202	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	203	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	204	* reasonably well with dejavu/bistream fonts
177	*/	205	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	206	PangoFontDescription *font = self->font ? self->font : default_font;
179		207
180	pango_font_description_set_absolute_size (font,	208	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	209	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		210
183	pango_layout_set_font_description (self->pl, font);	211	pango_layout_set_font_description (self->pl, font);
184	}	212	}
185		213
186	static void	214	static void
187	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	215	layout_get_pixel_size (DC__Layout self, int *w, int *h)
188	{	216	{
189	PangoRectangle rect;	217	PangoRectangle rect;
190		218
191	// get_pixel_* wrongly rounds down	219	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	220	pango_layout_get_extents (self->pl, 0, &rect);
…		…
209	int w, h;	237	int w, h;
210	float s, t;	238	float s, t;
211	uint8_t r, g, b, a;	239	uint8_t r, g, b, a;
212	tileid smoothtile;	240	tileid smoothtile;
213	uint8_t smoothlevel;	241	uint8_t smoothlevel;
		242	uint8_t unused; /* set to zero on use */
214	} maptex;	243	} maptex;
215		244
216	typedef struct {	245	typedef struct {
217	uint32_t player;	246	uint32_t player;
218	tileid tile[3];	247	tileid tile[3];
…		…
231	int faces; tileid *face2tile; // [faceid]	260	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	261	int texs; maptex *tex; // [tileid]
233		262
234	int32_t rows;	263	int32_t rows;
235	maprow *row;	264	maprow *row;
236	} *CFPlus__Map;	265	} *DC__Map;
237		266
238	static char *	267	static char *
239	prepend (char *ptr, int sze, int inc)	268	prepend (char *ptr, int sze, int inc)
240	{	269	{
241	char *p;	270	char *p;
…		…
279	self->texs *= 2;	308	self->texs *= 2;
280	}	309	}
281	}	310	}
282		311
283	static maprow *	312	static maprow *
284	map_get_row (CFPlus__Map self, int y)	313	map_get_row (DC__Map self, int y)
285	{	314	{
286	if (0 > y)	315	if (0 > y)
287	{	316	{
288	int extend = - y + MAP_EXTEND_Y;	317	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	318	Prepend (maprow, self->row, self->rows, extend);
…		…
327		356
328	return row->col + (x - row->c0);	357	return row->col + (x - row->c0);
329	}	358	}
330		359
331	static mapcell *	360	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	361	map_get_cell (DC__Map self, int x, int y)
333	{	362	{
334	return row_get_cell (map_get_row (self, y), x);	363	return row_get_cell (map_get_row (self, y), x);
335	}	364	}
336		365
337	static void	366	static void
338	map_clear (CFPlus__Map self)	367	map_clear (DC__Map self)
339	{	368	{
340	int r;	369	int r;
341		370
342	for (r = 0; r < self->rows; r++)	371	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	372	Safefree (self->row[r].col);
…		…
350	self->oy = 0;	379	self->oy = 0;
351	self->row = 0;	380	self->row = 0;
352	self->rows = 0;	381	self->rows = 0;
353	}	382	}
354		383
		384	#define CELL_CLEAR(cell) \
		385	do { \
		386	if ((cell)->player) \
		387	(cell)->tile [2] = 0; \
		388	(cell)->darkness = 0; \
		389	(cell)->stat_hp = 0; \
		390	(cell)->flags = 0; \
		391	(cell)->player = 0; \
		392	} while (0)
		393
355	static void	394	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	395	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	396	{
358	int x, y;	397	int x, y;
359	maprow *row;	398	maprow *row;
360	mapcell *cell;	399	mapcell *cell;
361		400
…		…
373	if (x >= row->c1)	412	if (x >= row->c1)
374	break;	413	break;
375		414
376	cell = row->col + x - row->c0;	415	cell = row->col + x - row->c0;
377		416
378	cell->darkness = 0;	417	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	418	}
383	}	419	}
384	}	420	}
385		421
386	typedef struct {	422	typedef struct {
…		…
498	return 0;	534	return 0;
499		535
500	return 1;	536	return 1;
501	}	537	}
502		538
503	MODULE = CFPlus PACKAGE = CFPlus	539	/******************************************************************************/
		540
		541	/* process keyboard modifiers */
		542	static int
		543	mod_munge (int mod)
		544	{
		545	mod &= MOD_MASK;
		546
		547	if (mod & (KMOD_META | KMOD_ALT))
		548	mod |= KMOD_LRAM;
		549
		550	return mod;
		551	}
		552
		553	static void
		554	deliantra_main ()
		555	{
		556	char *argv[] = { 0 };
		557	call_argv ("::main", G_DISCARD | G_VOID, argv);
		558	}
		559
		560	#ifdef __MACOSX__
		561	/* to due surprising braindamage on the side of SDL design, we
		562	* do some mind-boggling hack here: SDL requires a custom main()
		563	* on OS X, so... we provide one and call the original main(), which,
		564	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		565	* and which calls our main (== SDL_main) back.
		566	*/
		567	extern C_LINKAGE int
		568	main (int argc, char *argv[])
		569	{
		570	deliantra_main ();
		571	}
		572
		573	#undef main
		574
		575	extern C_LINKAGE int main (int argc, char *argv[]);
		576
		577	static void
		578	SDL_braino (void)
		579	{
		580	char *argv[] = { "deliantra client", 0 };
		581	(main) (1, argv);
		582	}
		583	#else
		584	static void
		585	SDL_braino (void)
		586	{
		587	deliantra_main ();
		588	}
		589	#endif
		590
		591	MODULE = Deliantra::Client PACKAGE = DC
504		592
505	PROTOTYPES: ENABLE	593	PROTOTYPES: ENABLE
506		594
507	BOOT:	595	BOOT:
508	{	596	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	597	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	598	static const struct {
511	const char *name;	599	const char *name;
512	IV iv;	600	IV iv;
513	} *civ, const_iv[] = {	601	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	602	# define const_iv(name) { # name, (IV)name }
…		…
535	const_iv (SDL_USEREVENT),	623	const_iv (SDL_USEREVENT),
536		624
537	const_iv (SDL_APPINPUTFOCUS),	625	const_iv (SDL_APPINPUTFOCUS),
538	const_iv (SDL_APPMOUSEFOCUS),	626	const_iv (SDL_APPMOUSEFOCUS),
539	const_iv (SDL_APPACTIVE),	627	const_iv (SDL_APPACTIVE),
		628
		629
		630	const_iv (SDLK_UNKNOWN),
		631	const_iv (SDLK_FIRST),
		632	const_iv (SDLK_BACKSPACE),
		633	const_iv (SDLK_TAB),
		634	const_iv (SDLK_CLEAR),
		635	const_iv (SDLK_RETURN),
		636	const_iv (SDLK_PAUSE),
		637	const_iv (SDLK_ESCAPE),
		638	const_iv (SDLK_SPACE),
		639	const_iv (SDLK_EXCLAIM),
		640	const_iv (SDLK_QUOTEDBL),
		641	const_iv (SDLK_HASH),
		642	const_iv (SDLK_DOLLAR),
		643	const_iv (SDLK_AMPERSAND),
		644	const_iv (SDLK_QUOTE),
		645	const_iv (SDLK_LEFTPAREN),
		646	const_iv (SDLK_RIGHTPAREN),
		647	const_iv (SDLK_ASTERISK),
		648	const_iv (SDLK_PLUS),
		649	const_iv (SDLK_COMMA),
		650	const_iv (SDLK_MINUS),
		651	const_iv (SDLK_PERIOD),
		652	const_iv (SDLK_SLASH),
		653	const_iv (SDLK_0),
		654	const_iv (SDLK_1),
		655	const_iv (SDLK_2),
		656	const_iv (SDLK_3),
		657	const_iv (SDLK_4),
		658	const_iv (SDLK_5),
		659	const_iv (SDLK_6),
		660	const_iv (SDLK_7),
		661	const_iv (SDLK_8),
		662	const_iv (SDLK_9),
		663	const_iv (SDLK_COLON),
		664	const_iv (SDLK_SEMICOLON),
		665	const_iv (SDLK_LESS),
		666	const_iv (SDLK_EQUALS),
		667	const_iv (SDLK_GREATER),
		668	const_iv (SDLK_QUESTION),
		669	const_iv (SDLK_AT),
		670
		671	const_iv (SDLK_LEFTBRACKET),
		672	const_iv (SDLK_BACKSLASH),
		673	const_iv (SDLK_RIGHTBRACKET),
		674	const_iv (SDLK_CARET),
		675	const_iv (SDLK_UNDERSCORE),
		676	const_iv (SDLK_BACKQUOTE),
		677	const_iv (SDLK_DELETE),
540		678
541	const_iv (SDLK_FIRST),	679	const_iv (SDLK_FIRST),
542	const_iv (SDLK_LAST),	680	const_iv (SDLK_LAST),
543	const_iv (SDLK_KP0),	681	const_iv (SDLK_KP0),
544	const_iv (SDLK_KP1),	682	const_iv (SDLK_KP1),
…		…
620	const_iv (KMOD_RMETA),	758	const_iv (KMOD_RMETA),
621	const_iv (KMOD_NUM),	759	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	760	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	761	const_iv (KMOD_MODE),
624		762
		763	const_iv (KMOD_LRAM),
		764
625	const_iv (MIX_DEFAULT_FORMAT),	765	const_iv (MIX_DEFAULT_FORMAT),
		766
		767	const_iv (SDL_INIT_TIMER),
		768	const_iv (SDL_INIT_AUDIO),
		769	const_iv (SDL_INIT_VIDEO),
		770	const_iv (SDL_INIT_CDROM),
		771	const_iv (SDL_INIT_JOYSTICK),
		772	const_iv (SDL_INIT_EVERYTHING),
		773	const_iv (SDL_INIT_NOPARACHUTE),
		774	const_iv (SDL_INIT_EVENTTHREAD),
		775
		776	const_iv (SDL_GL_RED_SIZE),
		777	const_iv (SDL_GL_GREEN_SIZE),
		778	const_iv (SDL_GL_BLUE_SIZE),
		779	const_iv (SDL_GL_ALPHA_SIZE),
		780	const_iv (SDL_GL_DOUBLEBUFFER),
		781	const_iv (SDL_GL_BUFFER_SIZE),
		782	const_iv (SDL_GL_DEPTH_SIZE),
		783	const_iv (SDL_GL_STENCIL_SIZE),
		784	const_iv (SDL_GL_ACCUM_RED_SIZE),
		785	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		786	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		787	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		788	const_iv (SDL_GL_STEREO),
		789	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		790	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		791	const_iv (SDL_GL_ACCELERATED_VISUAL),
		792	const_iv (SDL_GL_SWAP_CONTROL),
		793
		794	const_iv (FOW_DARKNESS)
626	# undef const_iv	795	# undef const_iv
627	};	796	};
628		797
629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	798	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
659	CODE:	828	CODE:
660	{	829	{
661	opengl_fontmap = pango_opengl_font_map_new ();	830	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	831	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);	832	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		833	/*pango_context_set_font_description (opengl_context, default_font);*/
		834	#if PANGO_VERSION_CHECK (1, 15, 2)
		835	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		836	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		837	#endif
664	}	838	}
665		839
666	char *
667	SDL_GetError ()	840	char *SDL_GetError ()
668		841
669	int	842	void SDL_braino ()
670	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671		843
672	void	844	int SDL_Init (U32 flags)
		845
		846	int SDL_InitSubSystem (U32 flags)
		847
		848	void SDL_QuitSubSystem (U32 flags)
		849
673	SDL_Quit ()	850	void SDL_Quit ()
		851
		852	int SDL_GL_SetAttribute (int attr, int value)
		853
		854	int SDL_GL_GetAttribute (int attr)
		855	CODE:
		856	if (SDL_GL_GetAttribute (attr, &RETVAL))
		857	XSRETURN_UNDEF;
		858	OUTPUT:
		859	RETVAL
674		860
675	void	861	void
676	SDL_ListModes (int rgb, int alpha)	862	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	863	PPCODE:
678	{	864	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	876	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	877	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	878	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		879
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	880	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);	881	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		882
700	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	883	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701		884
702	if (m && m != (SDL_Rect **)-1)	885	if (m && m != (SDL_Rect **)-1)
703	while (*m)	886	while (*m)
704	{	887	{
705	if ((*m)->w >= 640 && (*m)->h >= 480)	888	if ((*m)->w >= 400 && (*m)->h >= 300)
706	{	889	{
707	AV *av = newAV ();	890	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	891	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	892	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	893	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	935	SDL_GetKeyName (int sym)
753		936
754	int	937	int
755	SDL_GetAppState ()	938	SDL_GetAppState ()
756		939
		940	int
		941	SDL_GetModState ()
		942
757	void	943	void
758	poll_events ()	944	poll_events ()
759	PPCODE:	945	PPCODE:
760	{	946	{
761	SDL_Event ev;	947	SDL_Event ev;
…		…
770	{	956	{
771	case SDL_KEYDOWN:	957	case SDL_KEYDOWN:
772	case SDL_KEYUP:	958	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	959	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	960	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	961	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 */	962	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);	963	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	964	break;
779		965
780	case SDL_ACTIVEEVENT:	966	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	967	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	985	x = ev.motion.x;
800	y = ev.motion.y;	986	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	987	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	988	}
803		989
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	990	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	991	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	992	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	993	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	994	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	995	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	996	}
811	break;	997	break;
812		998
813	case SDL_MOUSEBUTTONDOWN:	999	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	1000	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1001	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		1002
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	1003	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1004	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1005	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1006	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1011	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1012	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	1013	break;
828	}	1014	}
829		1015
830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	1016	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831	}	1017	}
832	}	1018	}
833		1019
834	int	1020	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1021	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
894	}	1080	}
895	}	1081	}
896	#endif	1082	#endif
897	}	1083	}
898		1084
899	void	1085	int
900	add_font (char *file)	1086	add_font (char *file)
901	CODE:	1087	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1089	OUTPUT:
		1090	RETVAL
903		1091
904	void	1092	void
905	load_image_inline (SV *image_)	1093	load_image_inline (SV *image_)
906	ALIAS:	1094	ALIAS:
907	load_image_file = 1	1095	load_image_file = 1
…		…
993	void	1181	void
994	error (char *message)	1182	error (char *message)
995	CODE:	1183	CODE:
996	fprintf (stderr, "ERROR: %s\n", message);	1184	fprintf (stderr, "ERROR: %s\n", message);
997	#ifdef _WIN32	1185	#ifdef _WIN32
998	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1186	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999	#endif	1187	#endif
1000		1188
1001	void	1189	void
1002	fatal (char *message)	1190	fatal (char *message)
1003	CODE:	1191	CODE:
1004	fprintf (stderr, "FATAL: %s\n", message);	1192	fprintf (stderr, "FATAL: %s\n", message);
1005	#ifdef _WIN32	1193	#ifdef _WIN32
1006	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1194	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007	#endif	1195	#endif
1008	_exit (1);	1196	_exit (1);
1009		1197
1010	void	1198	void
1011	_exit (int retval = 0)	1199	_exit (int retval = 0)
…		…
1023	#if DEBUG	1211	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1212	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1213	#endif
1026	}	1214	}
1027		1215
1028	MODULE = CFPlus PACKAGE = CFPlus::Font	1216	int
		1217	SvREFCNT (SV *sv)
		1218	CODE:
		1219	RETVAL = SvREFCNT (sv);
		1220	OUTPUT:
		1221	RETVAL
		1222
		1223	MODULE = Deliantra::Client PACKAGE = DC::Font
1029		1224
1030	PROTOTYPES: DISABLE	1225	PROTOTYPES: DISABLE
1031		1226
1032	CFPlus::Font	1227	DC::Font
1033	new_from_file (SV *class, char *path, int id = 0)	1228	new_from_file (SV *class, char *path, int id = 0)
1034	CODE:	1229	CODE:
1035	{	1230	{
1036	int count;	1231	int count;
1037	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1232	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1040	}	1235	}
1041	OUTPUT:	1236	OUTPUT:
1042	RETVAL	1237	RETVAL
1043		1238
1044	void	1239	void
1045	DESTROY (CFPlus::Font self)	1240	DESTROY (DC::Font self)
1046	CODE:	1241	CODE:
1047	pango_font_description_free (self);	1242	pango_font_description_free (self);
1048		1243
1049	void	1244	void
1050	make_default (CFPlus::Font self)	1245	make_default (DC::Font self)
1051	PROTOTYPE: $	1246	PROTOTYPE: $
1052	CODE:	1247	CODE:
1053	default_font = self;	1248	default_font = self;
1054		1249
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1250	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1251
1057	PROTOTYPES: DISABLE	1252	PROTOTYPES: DISABLE
1058		1253
1059	void	1254	void
1060	reset_glyph_cache ()	1255	glyph_cache_backup ()
1061	PROTOTYPE:	1256	PROTOTYPE:
1062	CODE:	1257	CODE:
		1258	tc_backup ();
		1259
		1260	void
		1261	glyph_cache_restore ()
		1262	PROTOTYPE:
		1263	CODE:
1063	tc_clear ();	1264	tc_restore ();
1064		1265
1065	CFPlus::Layout	1266	DC::Layout
1066	new (SV *class)	1267	new (SV *class)
1067	CODE:	1268	CODE:
1068	New (0, RETVAL, 1, struct cf_layout);	1269	New (0, RETVAL, 1, struct cf_layout);
1069		1270
1070	RETVAL->pl = pango_layout_new (opengl_context);	1271	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1080	layout_update_font (RETVAL);	1281	layout_update_font (RETVAL);
1081	OUTPUT:	1282	OUTPUT:
1082	RETVAL	1283	RETVAL
1083		1284
1084	void	1285	void
1085	DESTROY (CFPlus::Layout self)	1286	DESTROY (DC::Layout self)
1086	CODE:	1287	CODE:
1087	g_object_unref (self->pl);	1288	g_object_unref (self->pl);
1088	rc_free (self->rc);	1289	rc_free (self->rc);
1089	Safefree (self);	1290	Safefree (self);
1090		1291
1091	void	1292	void
1092	set_text (CFPlus::Layout self, SV *text_)	1293	set_text (DC::Layout self, SV *text_)
1093	CODE:	1294	CODE:
1094	{	1295	{
1095	STRLEN textlen;	1296	STRLEN textlen;
1096	char *text = SvPVutf8 (text_, textlen);	1297	char *text = SvPVutf8 (text_, textlen);
1097		1298
1098	pango_layout_set_text (self->pl, text, textlen);	1299	pango_layout_set_text (self->pl, text, textlen);
1099	}	1300	}
1100		1301
1101	void	1302	void
1102	set_markup (CFPlus::Layout self, SV *text_)	1303	set_markup (DC::Layout self, SV *text_)
1103	CODE:	1304	CODE:
1104	{	1305	{
1105	STRLEN textlen;	1306	STRLEN textlen;
1106	char *text = SvPVutf8 (text_, textlen);	1307	char *text = SvPVutf8 (text_, textlen);
1107		1308
1108	pango_layout_set_markup (self->pl, text, textlen);	1309	pango_layout_set_markup (self->pl, text, textlen);
1109	}	1310	}
1110		1311
1111	void	1312	void
1112	set_shapes (CFPlus::Layout self, ...)	1313	set_shapes (DC::Layout self, ...)
1113	CODE:	1314	CODE:
1114	{	1315	{
1115	PangoAttrList *attrs = 0;	1316	PangoAttrList *attrs = 0;
1116	const char *text = pango_layout_get_text (self->pl);	1317	const char *text = pango_layout_get_text (self->pl);
1117	const char *pos = text;	1318	const char *pos = text;
…		…
1152	if (attrs)	1353	if (attrs)
1153	pango_layout_set_attributes (self->pl, attrs);	1354	pango_layout_set_attributes (self->pl, attrs);
1154	}	1355	}
1155		1356
1156	void	1357	void
1157	get_shapes (CFPlus::Layout self)	1358	get_shapes (DC::Layout self)
1158	PPCODE:	1359	PPCODE:
1159	{	1360	{
1160	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1361	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161		1362
1162	do	1363	do
1163	{	1364	{
1164	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1365	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165		1366
1166	if (run && shape_attr_p (run))	1367	if (run && shape_attr_p (run))
1167	{	1368	{
1168	PangoRectangle extents;	1369	PangoRectangle extents;
1169	pango_layout_iter_get_run_extents (iter, 0, &extents);	1370	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1177		1378
1178	pango_layout_iter_free (iter);	1379	pango_layout_iter_free (iter);
1179	}	1380	}
1180		1381
1181	int	1382	int
1182	has_wrapped (CFPlus::Layout self)	1383	has_wrapped (DC::Layout self)
1183	CODE:	1384	CODE:
1184	{	1385	{
1185	int lines = 1;	1386	int lines = 1;
1186	const char *text = pango_layout_get_text (self->pl);	1387	const char *text = pango_layout_get_text (self->pl);
1187		1388
…		…
1192	}	1393	}
1193	OUTPUT:	1394	OUTPUT:
1194	RETVAL	1395	RETVAL
1195		1396
1196	SV *	1397	SV *
1197	get_text (CFPlus::Layout self)	1398	get_text (DC::Layout self)
1198	CODE:	1399	CODE:
1199	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1400	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200	sv_utf8_decode (RETVAL);	1401	sv_utf8_decode (RETVAL);
1201	OUTPUT:	1402	OUTPUT:
1202	RETVAL	1403	RETVAL
1203		1404
1204	void	1405	void
1205	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1406	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206	CODE:	1407	CODE:
1207	self->r = r;	1408	self->r = r;
1208	self->g = g;	1409	self->g = g;
1209	self->b = b;	1410	self->b = b;
1210	self->a = a;	1411	self->a = a;
1211		1412
1212	void	1413	void
1213	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1414	set_font (DC::Layout self, DC::Font font = 0)
1214	CODE:	1415	CODE:
1215	if (self->font != font)	1416	if (self->font != font)
1216	{	1417	{
1217	self->font = font;	1418	self->font = font;
1218	layout_update_font (self);	1419	layout_update_font (self);
1219	}	1420	}
1220		1421
1221	void	1422	void
1222	set_height (CFPlus::Layout self, int base_height)	1423	set_height (DC::Layout self, int base_height)
1223	CODE:	1424	CODE:
1224	if (self->base_height != base_height)	1425	if (self->base_height != base_height)
1225	{	1426	{
1226	self->base_height = base_height;	1427	self->base_height = base_height;
1227	layout_update_font (self);	1428	layout_update_font (self);
1228	}	1429	}
1229		1430
1230	void	1431	void
1231	set_width (CFPlus::Layout self, int max_width = -1)	1432	set_width (DC::Layout self, int max_width = -1)
1232	CODE:	1433	CODE:
1233	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1434	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234		1435
1235	void	1436	void
1236	set_indent (CFPlus::Layout self, int indent)	1437	set_indent (DC::Layout self, int indent)
1237	CODE:	1438	CODE:
1238	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1439	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239		1440
1240	void	1441	void
1241	set_spacing (CFPlus::Layout self, int spacing)	1442	set_spacing (DC::Layout self, int spacing)
1242	CODE:	1443	CODE:
1243	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1444	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244		1445
1245	void	1446	void
1246	set_ellipsise (CFPlus::Layout self, int ellipsise)	1447	set_ellipsise (DC::Layout self, int ellipsise)
1247	CODE:	1448	CODE:
1248	pango_layout_set_ellipsize (self->pl,	1449	pango_layout_set_ellipsize (self->pl,
1249	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1450	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1451	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1452	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252	: PANGO_ELLIPSIZE_NONE	1453	: PANGO_ELLIPSIZE_NONE
1253	);	1454	);
1254		1455
1255	void	1456	void
1256	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1457	set_single_paragraph_mode (DC::Layout self, int spm)
1257	CODE:	1458	CODE:
1258	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1459	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259		1460
1260	void	1461	void
1261	size (CFPlus::Layout self)	1462	size (DC::Layout self)
1262	PPCODE:	1463	PPCODE:
1263	{	1464	{
1264	int w, h;	1465	int w, h;
1265		1466
1266	layout_get_pixel_size (self, &w, &h);	1467	layout_get_pixel_size (self, &w, &h);
…		…
1269	PUSHs (sv_2mortal (newSViv (w)));	1470	PUSHs (sv_2mortal (newSViv (w)));
1270	PUSHs (sv_2mortal (newSViv (h)));	1471	PUSHs (sv_2mortal (newSViv (h)));
1271	}	1472	}
1272		1473
1273	int	1474	int
1274	descent (CFPlus::Layout self)	1475	descent (DC::Layout self)
1275	CODE:	1476	CODE:
1276	{	1477	{
1277	PangoRectangle rect;	1478	PangoRectangle rect;
1278	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1479	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279	pango_layout_line_get_pixel_extents (line, 0, &rect);	1480	pango_layout_line_get_pixel_extents (line, 0, &rect);
1280	RETVAL = PANGO_DESCENT (rect);	1481	RETVAL = PANGO_DESCENT (rect);
1281	}	1482	}
1282	OUTPUT:	1483	OUTPUT:
1283	RETVAL	1484	RETVAL
1284		1485
1285	int	1486	int
1286	xy_to_index (CFPlus::Layout self, int x, int y)	1487	xy_to_index (DC::Layout self, int x, int y)
1287	CODE:	1488	CODE:
1288	{	1489	{
1289	int index, trailing;	1490	int index, trailing;
1290	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1491	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291	RETVAL = index + trailing;	1492	RETVAL = index + trailing;
1292	}	1493	}
1293	OUTPUT:	1494	OUTPUT:
1294	RETVAL	1495	RETVAL
1295		1496
1296	void	1497	void
1297	cursor_pos (CFPlus::Layout self, int index)	1498	cursor_pos (DC::Layout self, int index)
1298	PPCODE:	1499	PPCODE:
1299	{	1500	{
1300	PangoRectangle strong_pos;	1501	PangoRectangle pos;
1301	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1502	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302		1503
1303	EXTEND (SP, 3);	1504	EXTEND (SP, 3);
1304	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1505	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1506	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1507	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307	}	1508	}
1308		1509
1309	void	1510	void
1310	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1511	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311	PPCODE:	1512	PPCODE:
1312	{	1513	{
1313	int line, x;	1514	int line, x;
1314		1515
1315	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1516	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1517	#if !PANGO_VERSION_CHECK (1, 17, 3)
1316	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1518	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317		1519	--line;
		1520	#endif
1318	EXTEND (SP, 2);	1521	EXTEND (SP, 2);
1319	PUSHs (sv_2mortal (newSViv (line - 1)));	1522	PUSHs (sv_2mortal (newSViv (line)));
1320	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1523	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321	}	1524	}
1322		1525
1323	void	1526	void
1324	line_x_to_index (CFPlus::Layout self, int line, int x)	1527	line_x_to_index (DC::Layout self, int line, int x)
1325	PPCODE:	1528	PPCODE:
1326	{	1529	{
1327	PangoLayoutLine *lp;	1530	PangoLayoutLine *lp;
1328	int index, trailing;	1531	int index, trailing;
1329		1532
1330	if (line < 0)	1533	if (line < 0)
1331	XSRETURN_EMPTY;	1534	XSRETURN_EMPTY;
1332		1535
1333	if (!(lp = pango_layout_get_line (self->pl, line)))	1536	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334	XSRETURN_EMPTY; /* do better */	1537	XSRETURN_EMPTY; /* do better */
1335		1538
1336	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1539	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337		1540
1338	EXTEND (SP, 2);	1541	EXTEND (SP, 2);
…		…
1344	PUSHs (sv_2mortal (newSViv (trailing)));	1547	PUSHs (sv_2mortal (newSViv (trailing)));
1345	}	1548	}
1346	}	1549	}
1347		1550
1348	void	1551	void
1349	render (CFPlus::Layout self, float x, float y, int flags = 0)	1552	render (DC::Layout self, float x, float y, int flags = 0)
1350	CODE:	1553	CODE:
1351	rc_clear (self->rc);	1554	rc_clear (self->rc);
1352	pango_opengl_render_layout_subpixel (	1555	pango_opengl_render_layout_subpixel (
1353	self->pl,	1556	self->pl,
1354	self->rc,	1557	self->rc,
…		…
1359	// we assume that context_change actually clears/frees stuff	1562	// we assume that context_change actually clears/frees stuff
1360	// and does not do any recomputation...	1563	// and does not do any recomputation...
1361	pango_layout_context_changed (self->pl);	1564	pango_layout_context_changed (self->pl);
1362		1565
1363	void	1566	void
1364	draw (CFPlus::Layout self)	1567	draw (DC::Layout self)
1365	CODE:	1568	CODE:
1366	{	1569	{
1367	glEnable (GL_TEXTURE_2D);	1570	glEnable (GL_TEXTURE_2D);
1368	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1571	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369	glEnable (GL_BLEND);	1572	glEnable (GL_BLEND);
…		…
1377	glDisable (GL_ALPHA_TEST);	1580	glDisable (GL_ALPHA_TEST);
1378	glDisable (GL_BLEND);	1581	glDisable (GL_BLEND);
1379	glDisable (GL_TEXTURE_2D);	1582	glDisable (GL_TEXTURE_2D);
1380	}	1583	}
1381		1584
1382	MODULE = CFPlus PACKAGE = CFPlus::Texture	1585	MODULE = Deliantra::Client PACKAGE = DC::Texture
1383		1586
1384	PROTOTYPES: ENABLE	1587	PROTOTYPES: ENABLE
1385		1588
1386	void	1589	void
1387	pad (SV *data_, int ow, int oh, int nw, int nh)	1590	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1466	RETVAL = width > 0;	1669	RETVAL = width > 0;
1467	}	1670	}
1468	OUTPUT:	1671	OUTPUT:
1469	RETVAL	1672	RETVAL
1470		1673
1471	MODULE = CFPlus PACKAGE = CFPlus::Map	1674	MODULE = Deliantra::Client PACKAGE = DC::Map
1472		1675
1473	PROTOTYPES: DISABLE	1676	PROTOTYPES: DISABLE
1474		1677
1475	CFPlus::Map	1678	DC::Map
1476	new (SV *class)	1679	new (SV *class)
1477	CODE:	1680	CODE:
1478	New (0, RETVAL, 1, struct map);	1681	New (0, RETVAL, 1, struct map);
1479	RETVAL->x = 0;	1682	RETVAL->x = 0;
1480	RETVAL->y = 0;	1683	RETVAL->y = 0;
…		…
1488	RETVAL->row = 0;	1691	RETVAL->row = 0;
1489	OUTPUT:	1692	OUTPUT:
1490	RETVAL	1693	RETVAL
1491		1694
1492	void	1695	void
1493	DESTROY (CFPlus::Map self)	1696	DESTROY (DC::Map self)
1494	CODE:	1697	CODE:
1495	{	1698	{
1496	map_clear (self);	1699	map_clear (self);
1497	Safefree (self->face2tile);	1700	Safefree (self->face2tile);
1498	Safefree (self->tex);	1701	Safefree (self->tex);
1499	Safefree (self);	1702	Safefree (self);
1500	}	1703	}
1501		1704
1502	void	1705	void
1503	resize (CFPlus::Map self, int map_width, int map_height)	1706	resize (DC::Map self, int map_width, int map_height)
1504	CODE:	1707	CODE:
1505	self->w = map_width;	1708	self->w = map_width;
1506	self->h = map_height;	1709	self->h = map_height;
1507		1710
1508	void	1711	void
1509	clear (CFPlus::Map self)	1712	clear (DC::Map self)
1510	CODE:	1713	CODE:
1511	map_clear (self);	1714	map_clear (self);
1512		1715
1513	void	1716	void
1514	set_tileid (CFPlus::Map self, int face, int tile)	1717	set_tileid (DC::Map self, int face, int tile)
1515	CODE:	1718	CODE:
1516	{	1719	{
1517	need_facenum (self, face); self->face2tile [face] = tile;	1720	need_facenum (self, face); self->face2tile [face] = tile;
1518	need_texid (self, tile);	1721	need_texid (self, tile);
1519	}	1722	}
1520		1723
1521	void	1724	void
1522	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1725	set_smooth (DC::Map self, int face, int smooth, int level)
1523	CODE:	1726	CODE:
1524	{	1727	{
1525	tileid texid;	1728	tileid texid;
1526	maptex *tex;	1729	maptex *tex;
1527		1730
…		…
1540	tex->smoothtile = self->face2tile [smooth];	1743	tex->smoothtile = self->face2tile [smooth];
1541	tex->smoothlevel = level;	1744	tex->smoothlevel = level;
1542	}	1745	}
1543		1746
1544	void	1747	void
1545	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)	1748	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)
1546	CODE:	1749	CODE:
1547	{	1750	{
1548	need_texid (self, texid);	1751	need_texid (self, texid);
1549		1752
1550	{	1753	{
…		…
1569	// use uglier nearest interpolation because linear suffers	1772	// use uglier nearest interpolation because linear suffers
1570	// from transparent color bleeding and ugly wrapping effects.	1773	// from transparent color bleeding and ugly wrapping effects.
1571	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1774	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572	}	1775	}
1573		1776
		1777	void
		1778	expire_textures (DC::Map self, int texid, int count)
		1779	PPCODE:
		1780	for (; texid < self->texs && count; ++texid, --count)
		1781	{
		1782	maptex *tex = self->tex + texid;
		1783
		1784	if (tex->name)
		1785	{
		1786	if (tex->unused)
		1787	{
		1788	tex->name = 0;
		1789	tex->unused = 0;
		1790	XPUSHs (sv_2mortal (newSViv (texid)));
		1791	}
		1792	else
		1793	tex->unused = 1;
		1794	}
		1795	}
		1796
1574	int	1797	int
1575	ox (CFPlus::Map self)	1798	ox (DC::Map self)
1576	ALIAS:	1799	ALIAS:
1577	oy = 1	1800	oy = 1
1578	x = 2	1801	x = 2
1579	y = 3	1802	y = 3
1580	w = 4	1803	w = 4
…		…
1591	}	1814	}
1592	OUTPUT:	1815	OUTPUT:
1593	RETVAL	1816	RETVAL
1594		1817
1595	void	1818	void
1596	scroll (CFPlus::Map self, int dx, int dy)	1819	scroll (DC::Map self, int dx, int dy)
1597	CODE:	1820	CODE:
1598	{	1821	{
1599	if (dx > 0)	1822	if (dx > 0)
1600	map_blank (self, self->x, self->y, dx, self->h);	1823	map_blank (self, self->x, self->y, dx, self->h);
1601	else if (dx < 0)	1824	else if (dx < 0)
…		…
1617	self->y += MAP_EXTEND_Y;	1840	self->y += MAP_EXTEND_Y;
1618	}	1841	}
1619	}	1842	}
1620		1843
1621	SV *	1844	SV *
1622	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1845	map1a_update (DC::Map self, SV *data_, int extmap)
1623	CODE:	1846	CODE:
1624	{	1847	{
1625	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1848	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626	uint8_t *data_end = (uint8_t *)SvEND (data_);	1849	uint8_t *data_end = (uint8_t *)SvEND (data_);
1627	mapcell *cell;	1850	mapcell *cell;
…		…
1655	uint8_t ext, cmd;	1878	uint8_t ext, cmd;
1656		1879
1657	do	1880	do
1658	{	1881	{
1659	ext = *data++;	1882	ext = *data++;
1660	cmd = ext & 0x3f;	1883	cmd = ext & 0x7f;
1661		1884
1662	if (cmd < 4)	1885	if (cmd < 4)
1663	cell->darkness = 255 - ext * 64 + 1;	1886	cell->darkness = 255 - ext * 64 + 1;
1664	else if (cmd == 5) // health	1887	else if (cmd == 5) // health
1665	{	1888	{
…		…
1668	}	1891	}
1669	else if (cmd == 6) // monster width	1892	else if (cmd == 6) // monster width
1670	cell->stat_width = *data++ + 1;	1893	cell->stat_width = *data++ + 1;
1671	else if (cmd == 0x47)	1894	else if (cmd == 0x47)
1672	{	1895	{
1673	if (*data == 4)	1896	if (*data == 1) cell->player = data [1];
1674	; // decode player count	1897	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1898	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1899	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675		1900
1676	data += *data + 1;	1901	data += *data + 1;
1677	}	1902	}
1678	else if (cmd == 8) // cell flags	1903	else if (cmd == 8) // cell flags
1679	cell->flags = *data++;	1904	cell->flags = *data++;
…		…
1696	cell->tile [z] = self->face2tile [face];	1921	cell->tile [z] = self->face2tile [face];
1697		1922
1698	if (cell->tile [z])	1923	if (cell->tile [z])
1699	{	1924	{
1700	maptex *tex = self->tex + cell->tile [z];	1925	maptex *tex = self->tex + cell->tile [z];
		1926	tex->unused = 0;
1701	if (!tex->name)	1927	if (!tex->name)
1702	av_push (missing, newSViv (cell->tile [z]));	1928	av_push (missing, newSViv (cell->tile [z]));
1703		1929
1704	if (tex->smoothtile)	1930	if (tex->smoothtile)
1705	{	1931	{
1706	maptex *smooth = self->tex + tex->smoothtile;	1932	maptex *smooth = self->tex + tex->smoothtile;
		1933	smooth->unused = 0;
1707	if (!smooth->name)	1934	if (!smooth->name)
1708	av_push (missing, newSViv (tex->smoothtile));	1935	av_push (missing, newSViv (tex->smoothtile));
1709	}	1936	}
1710	}	1937	}
1711	}	1938	}
1712	}	1939	}
1713	else	1940	else
1714	cell->darkness = 0;	1941	CELL_CLEAR (cell);
1715	}	1942	}
1716	}	1943	}
1717	OUTPUT:	1944	OUTPUT:
1718	RETVAL	1945	RETVAL
1719		1946
1720	SV *	1947	SV *
1721	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1948	mapmap (DC::Map self, int x0, int y0, int w, int h)
1722	CODE:	1949	CODE:
1723	{	1950	{
1724	int x1, x;	1951	int x1, x;
1725	int y1, y;	1952	int y1, y;
1726	int z;	1953	int z;
…		…
1771	}	1998	}
1772	OUTPUT:	1999	OUTPUT:
1773	RETVAL	2000	RETVAL
1774		2001
1775	void	2002	void
1776	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	2003	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1777	CODE:	2004	CODE:
1778	{	2005	{
1779	int x, y, z;	2006	int x, y, z;
1780		2007
1781	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2008	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2009	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2010	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784	smooth_key skey;	2011	smooth_key skey;
1785		2012	int pl_x, pl_y;
		2013	maptex pl_tex;
1786	rc_t *rc = rc_alloc ();	2014	rc_t *rc = rc_alloc ();
		2015	rc_t *rc_ov = rc_alloc ();
1787	rc_key_t key;	2016	rc_key_t key;
1788	rc_array_t *arr;	2017	rc_array_t *arr, *arr_hidden;
1789		2018
		2019	pl_tex.name = 0;
		2020
1790	// thats current max. sorry.	2021	// that's current max. sorry.
1791	if (sw > 255) sw = 255;	2022	if (sw > 255) sw = 255;
1792	if (sh > 255) sh = 255;	2023	if (sh > 255) sh = 255;
1793		2024
1794	// clear key, in case of extra padding	2025	// clear key, in case of extra padding
1795	memset (&skey, 0, sizeof (skey));	2026	memset (&skey, 0, sizeof (skey));
…		…
1799	key.g = 255;	2030	key.g = 255;
1800	key.b = 255;	2031	key.b = 255;
1801	key.a = 255;	2032	key.a = 255;
1802	key.mode = GL_QUADS;	2033	key.mode = GL_QUADS;
1803	key.format = GL_T2F_V3F;	2034	key.format = GL_T2F_V3F;
1804	key.texname = -1;
1805		2035
1806	mx += self->x;	2036	mx += self->x;
1807	my += self->y;	2037	my += self->y;
1808		2038
1809	// first pass: determine smooth_max	2039	// first pass: determine smooth_max
…		…
1830		2060
1831	glEnable (GL_BLEND);	2061	glEnable (GL_BLEND);
1832	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2062	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1833	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2063	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1834		2064
		2065	key.texname = self->tex [TEXID_HIDDEN].name;
		2066	arr_hidden = rc_array (rc_ov, &key);
		2067
1835	for (z = 0; z <= 2; z++)	2068	for (z = 0; z <= 2; z++)
1836	{	2069	{
1837	memset (smooth_level, 0, sizeof (smooth_level));	2070	memset (smooth_level, 0, sizeof (smooth_level));
		2071	key.texname = -1;
1838		2072
1839	for (y = 0; y < sh; y++)	2073	for (y = 0; y < sh; y++)
1840	if (0 <= y + my && y + my < self->rows)	2074	if (0 <= y + my && y + my < self->rows)
1841	{	2075	{
1842	maprow *row = self->row + (y + my);	2076	maprow *row = self->row + (y + my);
…		…
1852	maptex tex = self->tex [tile];	2086	maptex tex = self->tex [tile];
1853	int px, py;	2087	int px, py;
1854		2088
1855	if (key.texname != tex.name)	2089	if (key.texname != tex.name)
1856	{	2090	{
		2091	self->tex [tile].unused = 0;
		2092
1857	if (!tex.name)	2093	if (!tex.name)
1858	tex = self->tex [2]; /* missing, replace by noface */	2094	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1859		2095
1860	key.texname = tex.name;	2096	key.texname = tex.name;
1861	arr = rc_array (rc, &key);	2097	arr = rc_array (rc, &key);
1862	}	2098	}
1863		2099
1864	px = (x + 1) * T - tex.w;	2100	px = (x + 1) * T - tex.w;
1865	py = (y + 1) * T - tex.h;	2101	py = (y + 1) * T - tex.h;
		2102
		2103	if (expect_false (cell->player == player) && expect_false (z == 2))
		2104	{
		2105	pl_x = px;
		2106	pl_y = py;
		2107	pl_tex = tex;
		2108	continue;
		2109	}
1866		2110
1867	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2111	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2112	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2113	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2114	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871
1872	if (cell->flags && z == 2)
1873	{
1874	// overlays such as the speech bubble, probably more to come
1875	if (cell->flags & 1)
1876	{
1877	maptex tex = self->tex [1];
1878	int px = x * T + T * 2 / 32;
1879	int py = y * T - T * 6 / 32;
1880
1881	if (tex.name)
1882	{
1883	if (key.texname != tex.name)
1884	{
1885	key.texname = tex.name;
1886	arr = rc_array (rc, &key);
1887	}
1888
1889	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1891	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1892	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1893	}
1894	}
1895	}
1896		2115
1897	// update smooth hash	2116	// update smooth hash
1898	if (tex.smoothtile)	2117	if (tex.smoothtile)
1899	{	2118	{
1900	skey.tile = tex.smoothtile;	2119	skey.tile = tex.smoothtile;
…		…
1929	// corners	2148	// corners
1930	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2149	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1931	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2150	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1932	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2151	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1933	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2152	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2153	}
		2154	}
		2155
		2156	if (expect_false (z == 2))
		2157	{
		2158	/* draw question marks on top of hidden spaces */
		2159	if (!cell->darkness)
		2160	{
		2161	maptex tex = self->tex [TEXID_HIDDEN];
		2162	int px = (x + 1) * T - tex.w;
		2163	int py = (y + 1) * T - tex.h;
		2164
		2165	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
		2166	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
		2167	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2168	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
		2169	}
		2170
		2171	if (expect_false (cell->flags))
		2172	{
		2173	// overlays such as the speech bubble, probably more to come
		2174	if (cell->flags & 1)
		2175	{
		2176	rc_key_t key_ov = key;
		2177	maptex tex = self->tex [TEXID_SPEECH];
		2178	rc_array_t *arr;
		2179
		2180	key_ov.texname = tex.name;
		2181	arr = rc_array (rc_ov, &key_ov);
		2182
		2183	int px = x * T + T * 2 / 32;
		2184	int py = y * T - T * 6 / 32;
		2185
		2186	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2187	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2188	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2189	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
		2190	}
1934	}	2191	}
1935	}	2192	}
1936	}	2193	}
1937	}	2194	}
1938		2195
…		…
1978	{	2235	{
1979	// this time avoiding texture state changes	2236	// this time avoiding texture state changes
1980	// save gobs of state changes.	2237	// save gobs of state changes.
1981	if (key.texname != tex.name)	2238	if (key.texname != tex.name)
1982	{	2239	{
		2240	self->tex [skey->tile].unused = 0;
		2241
1983	glEnd ();	2242	glEnd ();
1984	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2243	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1985	glBegin (GL_QUADS);	2244	glBegin (GL_QUADS);
1986	}	2245	}
1987		2246
…		…
2016	}	2275	}
2017		2276
2018	hv_clear (smooth);	2277	hv_clear (smooth);
2019	}	2278	}
2020		2279
		2280	if (pl_tex.name)
		2281	{
		2282	maptex tex = pl_tex;
		2283	int px = pl_x + sdx;
		2284	int py = pl_y + sdy;
		2285
		2286	key.texname = tex.name;
		2287	arr = rc_array (rc, &key);
		2288
		2289	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2290	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2291	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2292	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2293
		2294	rc_draw (rc);
		2295	}
		2296
		2297	rc_draw (rc_ov);
		2298	rc_clear (rc_ov);
		2299
2021	glDisable (GL_BLEND);	2300	glDisable (GL_BLEND);
2022	rc_free (rc);	2301	rc_free (rc);
		2302	rc_free (rc_ov);
2023		2303
2024	// top layer: overlays such as the health bar	2304	// top layer: overlays such as the health bar
2025	for (y = 0; y < sh; y++)	2305	for (y = 0; y < sh; y++)
2026	if (0 <= y + my && y + my < self->rows)	2306	if (0 <= y + my && y + my < self->rows)
2027	{	2307	{
…		…
2032	{	2312	{
2033	mapcell *cell = row->col + (x + mx - row->c0);	2313	mapcell *cell = row->col + (x + mx - row->c0);
2034		2314
2035	int px = x * T;	2315	int px = x * T;
2036	int py = y * T;	2316	int py = y * T;
		2317
		2318	if (expect_false (cell->player == player))
		2319	{
		2320	px += sdx;
		2321	py += sdy;
		2322	}
2037		2323
2038	if (cell->stat_hp)	2324	if (cell->stat_hp)
2039	{	2325	{
2040	int width = cell->stat_width * T;	2326	int width = cell->stat_width * T;
2041	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2327	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2052	}	2338	}
2053	}	2339	}
2054	}	2340	}
2055		2341
2056	void	2342	void
2057	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2343	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058	CODE:	2344	CODE:
2059	{	2345	{
2060	static float color[16][3] = {	2346	static float color[16][3] = {
2061	{ 0.00F, 0.00F, 0.00F },	2347	{ 0.00F, 0.00F, 0.00F },
2062	{ 1.00F, 1.00F, 1.00F },	2348	{ 1.00F, 1.00F, 1.00F },
…		…
2112	glDisable (GL_BLEND);	2398	glDisable (GL_BLEND);
2113	glDisable (GL_TEXTURE_2D);	2399	glDisable (GL_TEXTURE_2D);
2114	}	2400	}
2115		2401
2116	void	2402	void
2117	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2403	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118	PPCODE:	2404	PPCODE:
2119	{	2405	{
2120	int x, y;	2406	int x, y;
2121	int sw1 = sw + 2;	2407	int sw1 = sw + 2;
2122	int sh1 = sh + 2;	2408	int sh1 = sh + 2;
…		…
2130	SvCUR_set (darkness3_sv, sw34 * sh3);	2416	SvCUR_set (darkness3_sv, sw34 * sh3);
2131		2417
2132	mx += self->x - 1;	2418	mx += self->x - 1;
2133	my += self->y - 1;	2419	my += self->y - 1;
2134		2420
2135	memset (darkness1, 255, sw1 * sh1);	2421	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2136		2422
2137	for (y = 0; y < sh1; y++)	2423	for (y = 0; y < sh1; y++)
2138	if (0 <= y + my && y + my < self->rows)	2424	if (0 <= y + my && y + my < self->rows)
2139	{	2425	{
2140	maprow *row = self->row + (y + my);	2426	maprow *row = self->row + (y + my);
…		…
2193	PUSHs (sv_2mortal (newSViv (sh3)));	2479	PUSHs (sv_2mortal (newSViv (sh3)));
2194	PUSHs (darkness3_sv);	2480	PUSHs (darkness3_sv);
2195	}	2481	}
2196		2482
2197	SV *	2483	SV *
2198	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2484	get_rect (DC::Map self, int x0, int y0, int w, int h)
2199	CODE:	2485	CODE:
2200	{	2486	{
2201	int x, y, x1, y1;	2487	int x, y, x1, y1;
2202	SV *data_sv = newSV (w * h * 7 + 5);	2488	SV *data_sv = newSV (w * h * 7 + 5);
2203	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2489	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2260	else	2546	else
2261	*data++ = 0;	2547	*data++ = 0;
2262	}	2548	}
2263	}	2549	}
2264		2550
		2551	/* if size is w*h + 5 then no data has been found */
		2552	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2553	{
2265	SvPOK_only (data_sv);	2554	SvPOK_only (data_sv);
2266	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2555	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2556	}
		2557
2267	RETVAL = data_sv;	2558	RETVAL = data_sv;
2268	}	2559	}
2269	OUTPUT:	2560	OUTPUT:
2270	RETVAL	2561	RETVAL
2271		2562
2272	void	2563	void
2273	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2564	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274	PPCODE:	2565	PPCODE:
2275	{	2566	{
2276	int x, y, z;	2567	int x, y, z;
2277	int w, h;	2568	int w, h;
2278	int x1, y1;	2569	int x1, y1;
		2570	STRLEN len;
		2571	uint8_t *data, *end;
		2572
		2573	len = SvLEN (data_sv);
		2574	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2575	data = SvPVbyte_nolen (data_sv);
		2576	end = data + len + 8;
		2577
		2578	if (len < 5)
		2579	XSRETURN_EMPTY;
2279		2580
2280	if (*data++ != 0)	2581	if (*data++ != 0)
2281	XSRETURN_EMPTY; /* version mismatch */	2582	XSRETURN_EMPTY; /* version mismatch */
2282		2583
2283	w = *data++ << 8; w |= *data++;	2584	w = *data++ << 8; w |= *data++;
…		…
2298	{	2599	{
2299	maprow *row = map_get_row (self, y);	2600	maprow *row = map_get_row (self, y);
2300		2601
2301	for (x = x0; x < x1; x++)	2602	for (x = x0; x < x1; x++)
2302	{	2603	{
		2604	uint8_t flags;
		2605
		2606	if (data + 7 >= end)
		2607	XSRETURN_EMPTY;
		2608
2303	uint8_t flags = *data++;	2609	flags = *data++;
2304		2610
2305	if (flags)	2611	if (flags)
2306	{	2612	{
2307	mapcell *cell = row_get_cell (row, x);	2613	mapcell *cell = row_get_cell (row, x);
2308	tileid tile[3] = { 0, 0, 0 };	2614	tileid tile[3] = { 0, 0, 0 };
…		…
2311	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2617	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2618	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313		2619
2314	if (cell->darkness == 0)	2620	if (cell->darkness == 0)
2315	{	2621	{
2316	cell->darkness = 0;	2622	/*cell->darkness = 0;*/
		2623	EXTEND (SP, 3);
2317		2624
2318	for (z = 0; z <= 2; z++)	2625	for (z = 0; z <= 2; z++)
2319	{	2626	{
2320	tileid t = tile [z];	2627	tileid t = tile [z];
2321		2628
2322	if (t >= self->texs || (t && !self->tex [t].name))	2629	if (t >= self->texs || (t && !self->tex [t].name))
2323	{	2630	{
2324	XPUSHs (sv_2mortal (newSViv (t)));	2631	PUSHs (sv_2mortal (newSViv (t)));
2325	need_texid (self, t);	2632	need_texid (self, t);
2326	}	2633	}
2327		2634
2328	cell->tile [z] = t;	2635	cell->tile [z] = t;
2329	}	2636	}
…		…
2331	}	2638	}
2332	}	2639	}
2333	}	2640	}
2334	}	2641	}
2335		2642
2336	MODULE = CFPlus PACKAGE = CFPlus::RW	2643	MODULE = Deliantra::Client PACKAGE = DC::RW
2337		2644
2338	CFPlus::RW	2645	DC::RW
2339	new (SV *class, SV *data_sv)	2646	new (SV *class, SV *data_sv)
2340	CODE:	2647	CODE:
2341	{	2648	{
2342	STRLEN datalen;	2649	STRLEN datalen;
2343	char *data = SvPVbyte (data_sv, datalen);	2650	char *data = SvPVbyte (data_sv, datalen);
…		…
2345	RETVAL = SDL_RWFromConstMem (data, datalen);	2652	RETVAL = SDL_RWFromConstMem (data, datalen);
2346	}	2653	}
2347	OUTPUT:	2654	OUTPUT:
2348	RETVAL	2655	RETVAL
2349		2656
2350	CFPlus::RW	2657	DC::RW
2351	new_from_file (SV *class, const char *path, const char *mode = "rb")	2658	new_from_file (SV *class, const char *path, const char *mode = "rb")
2352	CODE:	2659	CODE:
2353	RETVAL = SDL_RWFromFile (path, mode);	2660	RETVAL = SDL_RWFromFile (path, mode);
2354	OUTPUT:	2661	OUTPUT:
2355	RETVAL	2662	RETVAL
2356		2663
2357	# fails on win32:	2664	# fails on win32:
2358	# CFPlus.xs(2268) : error C2059: syntax error : '('	2665	# dc.xs(2268) : error C2059: syntax error : '('
2359	#void	2666	#void
2360	#close (CFPlus::RW self)	2667	#close (DC::RW self)
2361	# CODE:	2668	# CODE:
2362	# (self->(close)) (self);	2669	# (self->(close)) (self);
2363		2670
2364	MODULE = CFPlus PACKAGE = CFPlus::Channel	2671	MODULE = Deliantra::Client PACKAGE = DC::Channel
2365		2672
2366	PROTOTYPES: DISABLE	2673	PROTOTYPES: DISABLE
2367		2674
2368	CFPlus::Channel	2675	DC::Channel
2369	find ()	2676	find ()
2370	CODE:	2677	CODE:
2371	{	2678	{
2372	RETVAL = Mix_GroupAvailable (-1);	2679	RETVAL = Mix_GroupAvailable (-1);
2373		2680
…		…
2386	}	2693	}
2387	OUTPUT:	2694	OUTPUT:
2388	RETVAL	2695	RETVAL
2389		2696
2390	void	2697	void
2391	halt (CFPlus::Channel self)	2698	halt (DC::Channel self)
2392	CODE:	2699	CODE:
2393	Mix_HaltChannel (self);	2700	Mix_HaltChannel (self);
2394		2701
2395	void	2702	void
2396	expire (CFPlus::Channel self, int ticks = -1)	2703	expire (DC::Channel self, int ticks = -1)
2397	CODE:	2704	CODE:
2398	Mix_ExpireChannel (self, ticks);	2705	Mix_ExpireChannel (self, ticks);
2399		2706
2400	void	2707	void
2401	fade_out (CFPlus::Channel self, int ticks = -1)	2708	fade_out (DC::Channel self, int ticks = -1)
2402	CODE:	2709	CODE:
2403	Mix_FadeOutChannel (self, ticks);	2710	Mix_FadeOutChannel (self, ticks);
2404		2711
2405	int	2712	int
2406	volume (CFPlus::Channel self, int volume)	2713	volume (DC::Channel self, int volume)
2407	CODE:	2714	CODE:
2408	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2715	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409	OUTPUT:	2716	OUTPUT:
2410	RETVAL	2717	RETVAL
2411		2718
2412	void	2719	void
2413	unregister_all_effects (CFPlus::Channel self)	2720	unregister_all_effects (DC::Channel self)
2414	CODE:	2721	CODE:
2415	Mix_UnregisterAllEffects (self);	2722	Mix_UnregisterAllEffects (self);
2416		2723
2417	void	2724	void
2418	set_panning (CFPlus::Channel self, int left, int right)	2725	set_panning (DC::Channel self, int left, int right)
2419	CODE:	2726	CODE:
2420	left = CLAMP (left , 0, 255);	2727	left = CLAMP (left , 0, 255);
2421	right = CLAMP (right, 0, 255);	2728	right = CLAMP (right, 0, 255);
2422	Mix_SetPanning (self, left, right);	2729	Mix_SetPanning (self, left, right);
2423		2730
2424	void	2731	void
2425	set_distance (CFPlus::Channel self, int distance)	2732	set_distance (DC::Channel self, int distance)
2426	CODE:	2733	CODE:
2427	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2734	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428		2735
2429	void	2736	void
2430	set_position (CFPlus::Channel self, int angle, int distance)	2737	set_position (DC::Channel self, int angle, int distance)
2431	CODE:	2738	CODE:
2432		2739
2433	void	2740	void
2434	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2741	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435	CODE:	2742	CODE:
2436	{	2743	{
2437	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2744	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2745	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2746	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440	}	2747	}
2441		2748
2442	void	2749	void
2443	set_reverse_stereo (CFPlus::Channel self, int flip)	2750	set_reverse_stereo (DC::Channel self, int flip)
2444	CODE:	2751	CODE:
2445	Mix_SetReverseStereo (self, flip);	2752	Mix_SetReverseStereo (self, flip);
2446		2753
2447	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2754	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448		2755
2449	PROTOTYPES: DISABLE	2756	PROTOTYPES: DISABLE
2450		2757
2451	CFPlus::MixChunk	2758	DC::MixChunk
2452	new (SV *class, CFPlus::RW rwops)	2759	new (SV *class, DC::RW rwops)
2453	CODE:	2760	CODE:
2454	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2761	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455	OUTPUT:	2762	OUTPUT:
2456	RETVAL	2763	RETVAL
2457		2764
2458	void	2765	void
2459	DESTROY (CFPlus::MixChunk self)	2766	DESTROY (DC::MixChunk self)
2460	CODE:	2767	CODE:
2461	Mix_FreeChunk (self);	2768	Mix_FreeChunk (self);
2462		2769
2463	int	2770	int
2464	volume (CFPlus::MixChunk self, int volume = -1)	2771	volume (DC::MixChunk self, int volume = -1)
2465	CODE:	2772	CODE:
2466	if (items > 1)	2773	if (items > 1)
2467	volume = CLAMP (volume, 0, 128);	2774	volume = CLAMP (volume, 0, 128);
2468	RETVAL = Mix_VolumeChunk (self, volume);	2775	RETVAL = Mix_VolumeChunk (self, volume);
2469	OUTPUT:	2776	OUTPUT:
2470	RETVAL	2777	RETVAL
2471		2778
2472	CFPlus::Channel	2779	DC::Channel
2473	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2780	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474	CODE:	2781	CODE:
2475	{	2782	{
2476	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477		2784
2478	if (RETVAL < 0)	2785	if (RETVAL < 0)
…		…
2485	}	2792	}
2486	}	2793	}
2487	OUTPUT:	2794	OUTPUT:
2488	RETVAL	2795	RETVAL
2489		2796
2490	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2797	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491		2798
2492	int	2799	int
2493	volume (int volume = -1)	2800	volume (int volume = -1)
2494	PROTOTYPE: ;$	2801	PROTOTYPE: ;$
2495	CODE:	2802	CODE:
…		…
2507	void	2814	void
2508	halt ()	2815	halt ()
2509	CODE:	2816	CODE:
2510	Mix_HaltMusic ();	2817	Mix_HaltMusic ();
2511		2818
2512	CFPlus::MixMusic	2819	DC::MixMusic
2513	new (SV *class, CFPlus::RW rwops)	2820	new (SV *class, DC::RW rwops)
2514	CODE:	2821	CODE:
2515	RETVAL = Mix_LoadMUS_RW (rwops);	2822	RETVAL = Mix_LoadMUS_RW (rwops);
2516	OUTPUT:	2823	OUTPUT:
2517	RETVAL	2824	RETVAL
2518		2825
2519	void	2826	void
2520	DESTROY (CFPlus::MixMusic self)	2827	DESTROY (DC::MixMusic self)
2521	CODE:	2828	CODE:
2522	Mix_FreeMusic (self);	2829	Mix_FreeMusic (self);
2523		2830
2524	int	2831	int
2525	play (CFPlus::MixMusic self, int loops = -1)	2832	play (DC::MixMusic self, int loops = -1)
2526	CODE:	2833	CODE:
2527	RETVAL = Mix_PlayMusic (self, loops);	2834	RETVAL = Mix_PlayMusic (self, loops);
2528	OUTPUT:	2835	OUTPUT:
2529	RETVAL	2836	RETVAL
2530		2837
2531	void	2838	void
2532	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2839	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533	CODE:	2840	CODE:
2534	Mix_FadeInMusicPos (self, loops, ms, position);	2841	Mix_FadeInMusicPos (self, loops, ms, position);
2535		2842
2536	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2843	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537		2844
2538	PROTOTYPES: ENABLE	2845	PROTOTYPES: ENABLE
2539		2846
2540	BOOT:	2847	BOOT:
2541	{	2848	{
2542	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2849	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543	static const struct {	2850	static const struct {
2544	const char *name;	2851	const char *name;
2545	IV iv;	2852	IV iv;
2546	} *civ, const_iv[] = {	2853	} *civ, const_iv[] = {
2547	# define const_iv(name) { # name, (IV)name }	2854	# define const_iv(name) { # name, (IV)name }
…		…
2761	void glRotate (float angle, float x, float y, float z)	3068	void glRotate (float angle, float x, float y, float z)
2762	CODE:	3069	CODE:
2763	glRotatef (angle, x, y, z);	3070	glRotatef (angle, x, y, z);
2764		3071
2765	void glColor (float r, float g, float b, float a = 1.0)	3072	void glColor (float r, float g, float b, float a = 1.0)
		3073	PROTOTYPE: @
2766	ALIAS:	3074	ALIAS:
2767	glColor_premultiply = 1	3075	glColor_premultiply = 1
2768	CODE:	3076	CODE:
2769	if (ix)	3077	if (ix)
2770	{	3078	{
…		…
2840	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3148	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841	CODE:	3149	CODE:
2842	if (gl.SeparableFilter2D)	3150	if (gl.SeparableFilter2D)
2843	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3151	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844		3152
2845	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3153	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846		3154
2847	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3155	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848		3156
2849	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3157	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850		3158
…		…
2876		3184
2877	void glEndList ()	3185	void glEndList ()
2878		3186
2879	void glCallList (int list)	3187	void glCallList (int list)
2880		3188
2881	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3189	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882		3190
2883	PROTOTYPES: DISABLE	3191	PROTOTYPES: DISABLE
2884		3192
2885	void	3193	void
2886	find_widget (SV *self, NV x, NV y)	3194	find_widget (SV *self, NV x, NV y)
…		…
2890	XPUSHs (self);	3198	XPUSHs (self);
2891	}	3199	}
2892		3200
2893	BOOT:	3201	BOOT:
2894	{	3202	{
2895	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3203	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896		3204
2897	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3205	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3206	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3207	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3208	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901	}	3209	}
2902		3210
2903	void	3211	void
2904	draw (SV *self)	3212	draw (SV *self)
2905	CODE:	3213	CODE:
…		…
2912	SV *draw_w_sv = GvSV (draw_w_gv);	3220	SV *draw_w_sv = GvSV (draw_w_gv);
2913	SV *draw_h_sv = GvSV (draw_h_gv);	3221	SV *draw_h_sv = GvSV (draw_h_gv);
2914	double draw_x, draw_y;	3222	double draw_x, draw_y;
2915		3223
2916	if (!SvROK (self))	3224	if (!SvROK (self))
2917	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3225	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918		3226
2919	hv = (HV *)SvRV (self);	3227	hv = (HV *)SvRV (self);
2920		3228
2921	if (SvTYPE (hv) != SVt_PVHV)	3229	if (SvTYPE (hv) != SVt_PVHV)
2922	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3230	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923		3231
2924	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3232	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3233	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926		3234
2927	if (!h || !w)	3235	if (!h || !w)

Diff Legend

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