ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.270 by root, Sun Jul 20 15:05:13 2008 UTC

…		…
46		46
47	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
48		48
49	#include <pango/pango.h>	49	#include <pango/pango.h>
50		50
		51	#ifndef PANGO_VERSION_CHECK
		52	# define PANGO_VERSION_CHECK(a,b,c) 0
		53	#endif
		54
		55	#if !PANGO_VERSION_CHECK (1, 15, 2)
		56	# define pango_layout_get_line_readonly pango_layout_get_line
		57	# define pango_layout_get_lines_readonly pango_layout_get_lines
		58	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		59	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		60	#endif
		61
51	#ifndef _WIN32	62	#ifndef _WIN32
52	# include <sys/types.h>	63	# include <sys/types.h>
53	# include <sys/socket.h>	64	# include <sys/socket.h>
54	# include <netinet/in.h>	65	# include <netinet/in.h>
55	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
56	# include <inttypes.h>	67	# include <inttypes.h>
57	#endif	68	#endif
58		69
		70	#if __GNUC__ >= 4
		71	# define expect(expr,value) __builtin_expect ((expr),(value))
		72	#else
		73	# define expect(expr,value) (expr)
		74	#endif
		75
		76	#define expect_false(expr) expect ((expr) != 0, 0)
		77	#define expect_true(expr) expect ((expr) != 0, 1)
		78
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		80
61	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
62		82
63	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
65		85
66	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
67		87
68	#if 0	88	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	89	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70	#else
71	# define PARACHUTE 0
72	#endif
73		90
74	static AV *texture_av;	91	static AV *texture_av;
75		92
76	static struct	93	static struct
77	{	94	{
…		…
120		137
121	#include "pango-font.c"	138	#include "pango-font.c"
122	#include "pango-fontmap.c"	139	#include "pango-fontmap.c"
123	#include "pango-render.c"	140	#include "pango-render.c"
124		141
125	typedef IV CFPlus__Channel;	142	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	143	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	144	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	145	typedef Mix_Music *DC__MixMusic;
129		146
130	typedef PangoFontDescription *CFPlus__Font;	147	typedef PangoFontDescription *DC__Font;
131		148
132	static int	149	static int
133	shape_attr_p (PangoLayoutRun *run)	150	shape_attr_p (PangoLayoutRun *run)
134	{	151	{
135	GSList *attrs = run->item->analysis.extra_attrs;	152	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		166
150	typedef struct cf_layout {	167	typedef struct cf_layout {
151	PangoLayout *pl;	168	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	169	float r, g, b, a; // default color for rgba mode
153	int base_height;	170	int base_height;
154	CFPlus__Font font;	171	DC__Font font;
155	rc_t *rc;	172	rc_t *rc;
156	} *CFPlus__Layout;	173	} *DC__Layout;
157		174
158	static CFPlus__Font default_font;	175	static DC__Font default_font;
159	static PangoContext *opengl_context;	176	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	177	static PangoFontMap *opengl_fontmap;
161		178
162	static void	179	static void
163	substitute_func (FcPattern *pattern, gpointer data)	180	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	185	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	186	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	187	}
171		188
172	static void	189	static void
173	layout_update_font (CFPlus__Layout self)	190	layout_update_font (DC__Layout self)
174	{	191	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	192	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
177	*/	194	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
179		196
180	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		199
183	pango_layout_set_font_description (self->pl, font);	200	pango_layout_set_font_description (self->pl, font);
184	}	201	}
185		202
186	static void	203	static void
187	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	204	layout_get_pixel_size (DC__Layout self, int *w, int *h)
188	{	205	{
189	PangoRectangle rect;	206	PangoRectangle rect;
190		207
191	// get_pixel_* wrongly rounds down	208	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	209	pango_layout_get_extents (self->pl, 0, &rect);
…		…
203		220
204	typedef uint16_t tileid;	221	typedef uint16_t tileid;
205	typedef uint16_t faceid;	222	typedef uint16_t faceid;
206		223
207	typedef struct {	224	typedef struct {
208	int name;	225	GLuint name;
209	int w, h;	226	int w, h;
210	float s, t;	227	float s, t;
211	uint8_t r, g, b, a;	228	uint8_t r, g, b, a;
212	tileid smoothtile;	229	tileid smoothtile;
213	uint8_t smoothlevel;	230	uint8_t smoothlevel;
…		…
231	int faces; tileid *face2tile; // [faceid]	248	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	249	int texs; maptex *tex; // [tileid]
233		250
234	int32_t rows;	251	int32_t rows;
235	maprow *row;	252	maprow *row;
236	} *CFPlus__Map;	253	} *DC__Map;
237		254
238	static char *	255	static char *
239	prepend (char *ptr, int sze, int inc)	256	prepend (char *ptr, int sze, int inc)
240	{	257	{
241	char *p;	258	char *p;
…		…
279	self->texs *= 2;	296	self->texs *= 2;
280	}	297	}
281	}	298	}
282		299
283	static maprow *	300	static maprow *
284	map_get_row (CFPlus__Map self, int y)	301	map_get_row (DC__Map self, int y)
285	{	302	{
286	if (0 > y)	303	if (0 > y)
287	{	304	{
288	int extend = - y + MAP_EXTEND_Y;	305	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	306	Prepend (maprow, self->row, self->rows, extend);
…		…
327		344
328	return row->col + (x - row->c0);	345	return row->col + (x - row->c0);
329	}	346	}
330		347
331	static mapcell *	348	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	349	map_get_cell (DC__Map self, int x, int y)
333	{	350	{
334	return row_get_cell (map_get_row (self, y), x);	351	return row_get_cell (map_get_row (self, y), x);
335	}	352	}
336		353
337	static void	354	static void
338	map_clear (CFPlus__Map self)	355	map_clear (DC__Map self)
339	{	356	{
340	int r;	357	int r;
341		358
342	for (r = 0; r < self->rows; r++)	359	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	360	Safefree (self->row[r].col);
…		…
350	self->oy = 0;	367	self->oy = 0;
351	self->row = 0;	368	self->row = 0;
352	self->rows = 0;	369	self->rows = 0;
353	}	370	}
354		371
		372	#define CELL_CLEAR(cell) \
		373	do { \
		374	if ((cell)->player) \
		375	(cell)->tile [2] = 0; \
		376	(cell)->darkness = 0; \
		377	(cell)->stat_hp = 0; \
		378	(cell)->flags = 0; \
		379	(cell)->player = 0; \
		380	} while (0)
		381
355	static void	382	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	383	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	384	{
358	int x, y;	385	int x, y;
359	maprow *row;	386	maprow *row;
360	mapcell *cell;	387	mapcell *cell;
361		388
…		…
373	if (x >= row->c1)	400	if (x >= row->c1)
374	break;	401	break;
375		402
376	cell = row->col + x - row->c0;	403	cell = row->col + x - row->c0;
377		404
378	cell->darkness = 0;	405	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	406	}
383	}	407	}
384	}	408	}
385		409
386	typedef struct {	410	typedef struct {
…		…
440	n |= n >> 16;	464	n |= n >> 16;
441		465
442	return n + 1;	466	return n + 1;
443	}	467	}
444		468
		469	static unsigned int
		470	popcount (unsigned int n)
		471	{
		472	n -= (n >> 1) & 0x55555555U;
		473	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		474	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		475	n *= 0x01010101U;
		476
		477	return n >> 24;
		478	}
		479
445	/* SDL should provide this, really. */	480	/* SDL should provide this, really. */
446	#define SDLK_MODIFIER_MIN 300	481	#define SDLK_MODIFIER_MIN 300
447	#define SDLK_MODIFIER_MAX 314	482	#define SDLK_MODIFIER_MAX 314
448		483
449	/******************************************************************************/	484	/******************************************************************************/
…		…
487	return 0;	522	return 0;
488		523
489	return 1;	524	return 1;
490	}	525	}
491		526
492	MODULE = CFPlus PACKAGE = CFPlus	527	MODULE = Deliantra::Client PACKAGE = DC
493		528
494	PROTOTYPES: ENABLE	529	PROTOTYPES: ENABLE
495		530
496	BOOT:	531	BOOT:
497	{	532	{
498	HV *stash = gv_stashpv ("CFPlus", 1);	533	HV *stash = gv_stashpv ("DC", 1);
499	static const struct {	534	static const struct {
500	const char *name;	535	const char *name;
501	IV iv;	536	IV iv;
502	} *civ, const_iv[] = {	537	} *civ, const_iv[] = {
503	# define const_iv(name) { # name, (IV)name }	538	# define const_iv(name) { # name, (IV)name }
…		…
525		560
526	const_iv (SDL_APPINPUTFOCUS),	561	const_iv (SDL_APPINPUTFOCUS),
527	const_iv (SDL_APPMOUSEFOCUS),	562	const_iv (SDL_APPMOUSEFOCUS),
528	const_iv (SDL_APPACTIVE),	563	const_iv (SDL_APPACTIVE),
529		564
		565	const_iv (SDLK_FIRST),
		566	const_iv (SDLK_LAST),
530	const_iv (SDLK_KP0),	567	const_iv (SDLK_KP0),
531	const_iv (SDLK_KP1),	568	const_iv (SDLK_KP1),
532	const_iv (SDLK_KP2),	569	const_iv (SDLK_KP2),
533	const_iv (SDLK_KP3),	570	const_iv (SDLK_KP3),
534	const_iv (SDLK_KP4),	571	const_iv (SDLK_KP4),
…		…
606	const_iv (KMOD_LMETA),	643	const_iv (KMOD_LMETA),
607	const_iv (KMOD_RMETA),	644	const_iv (KMOD_RMETA),
608	const_iv (KMOD_NUM),	645	const_iv (KMOD_NUM),
609	const_iv (KMOD_CAPS),	646	const_iv (KMOD_CAPS),
610	const_iv (KMOD_MODE),	647	const_iv (KMOD_MODE),
		648
		649	const_iv (MIX_DEFAULT_FORMAT),
		650
		651	const_iv (SDL_INIT_TIMER),
		652	const_iv (SDL_INIT_AUDIO),
		653	const_iv (SDL_INIT_VIDEO),
		654	const_iv (SDL_INIT_CDROM),
		655	const_iv (SDL_INIT_JOYSTICK),
		656	const_iv (SDL_INIT_EVERYTHING),
		657	const_iv (SDL_INIT_NOPARACHUTE),
		658	const_iv (SDL_INIT_EVENTTHREAD),
		659
		660	const_iv (SDL_GL_RED_SIZE),
		661	const_iv (SDL_GL_GREEN_SIZE),
		662	const_iv (SDL_GL_BLUE_SIZE),
		663	const_iv (SDL_GL_ALPHA_SIZE),
		664	const_iv (SDL_GL_DOUBLEBUFFER),
		665	const_iv (SDL_GL_BUFFER_SIZE),
		666	const_iv (SDL_GL_DEPTH_SIZE),
		667	const_iv (SDL_GL_STENCIL_SIZE),
		668	const_iv (SDL_GL_ACCUM_RED_SIZE),
		669	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		670	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		671	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		672	const_iv (SDL_GL_STEREO),
		673	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		674	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		675	const_iv (SDL_GL_ACCELERATED_VISUAL),
		676	const_iv (SDL_GL_SWAP_CONTROL),
		677
		678	const_iv (FOW_DARKNESS)
611	# undef const_iv	679	# undef const_iv
612	};	680	};
613		681
614	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	682	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	683	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
633		701
634	NV floor (NV x)	702	NV floor (NV x)
635		703
636	NV ceil (NV x)	704	NV ceil (NV x)
637		705
		706	NV ceilabs (NV x)
		707	CODE:
		708	RETVAL = x < 0. ? - ceil (-x) : ceil (x);
		709	OUTPUT:
		710	RETVAL
		711
		712	IV minpot (UV n)
		713
		714	IV popcount (UV n)
		715
638	void	716	void
639	pango_init ()	717	pango_init ()
640	CODE:	718	CODE:
641	{	719	{
642	opengl_fontmap = pango_opengl_font_map_new ();	720	opengl_fontmap = pango_opengl_font_map_new ();
643	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	721	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	722	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		723	/*pango_context_set_font_description (opengl_context, default_font);*/
		724	#if PANGO_VERSION_CHECK (1, 15, 2)
		725	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		726	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		727	#endif
645	}	728	}
646		729
647	char *
648	SDL_GetError ()	730	char *SDL_GetError ()
649		731
650	int	732	int SDL_Init (U32 flags)
651	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652		733
653	void	734	int SDL_InitSubSystem (U32 flags)
		735
		736	void SDL_QuitSubSystem (U32 flags)
		737
654	SDL_Quit ()	738	void SDL_Quit ()
		739
		740	int SDL_GL_SetAttribute (int attr, int value)
		741
		742	int SDL_GL_GetAttribute (int attr)
		743	CODE:
		744	if (SDL_GL_GetAttribute (attr, &RETVAL))
		745	XSRETURN_UNDEF;
		746	OUTPUT:
		747	RETVAL
655		748
656	void	749	void
657	SDL_ListModes (int rgb, int alpha)	750	SDL_ListModes (int rgb, int alpha)
658	PPCODE:	751	PPCODE:
659	{	752	{
…		…
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	764	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	765	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	766	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674		767
675	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	768	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676	#if SDL_VERSION_ATLEAST(1,2,10)
677	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	769	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679	#endif
680		770
681	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	771	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682		772
683	if (m && m != (SDL_Rect **)-1)	773	if (m && m != (SDL_Rect **)-1)
684	while (*m)	774	while (*m)
685	{	775	{
686	if ((*m)->w >= 640 && (*m)->h >= 480)	776	if ((*m)->w >= 400 && (*m)->h >= 300)
687	{	777	{
688	AV *av = newAV ();	778	AV *av = newAV ();
689	av_push (av, newSViv ((*m)->w));	779	av_push (av, newSViv ((*m)->w));
690	av_push (av, newSViv ((*m)->h));	780	av_push (av, newSViv ((*m)->h));
691	av_push (av, newSViv (rgb));	781	av_push (av, newSViv (rgb));
…		…
715		805
716	if (RETVAL)	806	if (RETVAL)
717	{	807	{
718	av_clear (texture_av);	808	av_clear (texture_av);
719		809
720	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	810	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	811	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722	#include "glfunc.h"	812	#include "glfunc.h"
723	#undef GL_FUNC	813	#undef GL_FUNC
724	}	814	}
725	}	815	}
…		…
732	char *	822	char *
733	SDL_GetKeyName (int sym)	823	SDL_GetKeyName (int sym)
734		824
735	int	825	int
736	SDL_GetAppState ()	826	SDL_GetAppState ()
		827
		828	int
		829	SDL_GetModState ()
737		830
738	void	831	void
739	poll_events ()	832	poll_events ()
740	PPCODE:	833	PPCODE:
741	{	834	{
…		…
751	{	844	{
752	case SDL_KEYDOWN:	845	case SDL_KEYDOWN:
753	case SDL_KEYUP:	846	case SDL_KEYUP:
754	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	847	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	848	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	849	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
757	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	850	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
758	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	851	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759	break;	852	break;
760		853
761	case SDL_ACTIVEEVENT:	854	case SDL_ACTIVEEVENT:
762	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	855	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
780	x = ev.motion.x;	873	x = ev.motion.x;
781	y = ev.motion.y;	874	y = ev.motion.y;
782	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	875	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783	}	876	}
784		877
785	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	878	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786	hv_store (hv, "state", 5, newSViv (state), 0);	879	hv_store (hv, "state", 5, newSViv (state), 0);
787	hv_store (hv, "x", 1, newSViv (x), 0);	880	hv_store (hv, "x", 1, newSViv (x), 0);
788	hv_store (hv, "y", 1, newSViv (y), 0);	881	hv_store (hv, "y", 1, newSViv (y), 0);
789	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	882	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	883	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791	}	884	}
792	break;	885	break;
793		886
794	case SDL_MOUSEBUTTONDOWN:	887	case SDL_MOUSEBUTTONDOWN:
795	case SDL_MOUSEBUTTONUP:	888	case SDL_MOUSEBUTTONUP:
796	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	889	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797		890
798	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	891	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	892	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	893	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	894	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
806	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	899	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	900	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808	break;	901	break;
809	}	902	}
810		903
811	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	904	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812	}	905	}
813	}	906	}
814		907
815	int	908	int
816	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	909	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817	POSTCALL:	910	POSTCALL:
818	Mix_HookMusicFinished (music_finished);	911	Mix_HookMusicFinished (music_finished);
819	Mix_ChannelFinished (channel_finished);	912	Mix_ChannelFinished (channel_finished);
		913
		914	void
		915	Mix_QuerySpec ()
		916	PPCODE:
		917	{
		918	int freq, channels;
		919	Uint16 format;
		920
		921	if (Mix_QuerySpec (&freq, &format, &channels))
		922	{
		923	EXTEND (SP, 3);
		924	PUSHs (sv_2mortal (newSViv (freq)));
		925	PUSHs (sv_2mortal (newSViv (format)));
		926	PUSHs (sv_2mortal (newSViv (channels)));
		927	}
		928	}
820		929
821	void	930	void
822	Mix_CloseAudio ()	931	Mix_CloseAudio ()
823		932
824	int	933	int
…		…
859	}	968	}
860	}	969	}
861	#endif	970	#endif
862	}	971	}
863		972
864	void	973	int
865	add_font (char *file)	974	add_font (char *file)
866	CODE:	975	CODE:
867	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	976	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		977	OUTPUT:
		978	RETVAL
868		979
869	void	980	void
870	load_image_inline (SV *image_)	981	load_image_inline (SV *image_)
871	ALIAS:	982	ALIAS:
872	load_image_file = 1	983	load_image_file = 1
…		…
958	void	1069	void
959	error (char *message)	1070	error (char *message)
960	CODE:	1071	CODE:
961	fprintf (stderr, "ERROR: %s\n", message);	1072	fprintf (stderr, "ERROR: %s\n", message);
962	#ifdef _WIN32	1073	#ifdef _WIN32
963	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1074	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964	#endif	1075	#endif
965		1076
966	void	1077	void
967	fatal (char *message)	1078	fatal (char *message)
968	CODE:	1079	CODE:
969	fprintf (stderr, "FATAL: %s\n", message);	1080	fprintf (stderr, "FATAL: %s\n", message);
970	#ifdef _WIN32	1081	#ifdef _WIN32
971	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1082	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972	#endif	1083	#endif
973	_exit (1);	1084	_exit (1);
974		1085
975	void	1086	void
976	_exit (int retval = 0)	1087	_exit (int retval = 0)
…		…
988	#if DEBUG	1099	#if DEBUG
989	VALGRIND_DO_LEAK_CHECK;	1100	VALGRIND_DO_LEAK_CHECK;
990	#endif	1101	#endif
991	}	1102	}
992		1103
993	MODULE = CFPlus PACKAGE = CFPlus::Font	1104	MODULE = Deliantra::Client PACKAGE = DC::Font
994		1105
995	PROTOTYPES: DISABLE	1106	PROTOTYPES: DISABLE
996		1107
997	CFPlus::Font	1108	DC::Font
998	new_from_file (SV *class, char *path, int id = 0)	1109	new_from_file (SV *class, char *path, int id = 0)
999	CODE:	1110	CODE:
1000	{	1111	{
1001	int count;	1112	int count;
1002	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1113	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1005	}	1116	}
1006	OUTPUT:	1117	OUTPUT:
1007	RETVAL	1118	RETVAL
1008		1119
1009	void	1120	void
1010	DESTROY (CFPlus::Font self)	1121	DESTROY (DC::Font self)
1011	CODE:	1122	CODE:
1012	pango_font_description_free (self);	1123	pango_font_description_free (self);
1013		1124
1014	void	1125	void
1015	make_default (CFPlus::Font self)	1126	make_default (DC::Font self)
1016	PROTOTYPE: $	1127	PROTOTYPE: $
1017	CODE:	1128	CODE:
1018	default_font = self;	1129	default_font = self;
1019		1130
1020	MODULE = CFPlus PACKAGE = CFPlus::Layout	1131	MODULE = Deliantra::Client PACKAGE = DC::Layout
1021		1132
1022	PROTOTYPES: DISABLE	1133	PROTOTYPES: DISABLE
1023		1134
1024	void	1135	void
1025	reset_glyph_cache ()	1136	glyph_cache_backup ()
1026	PROTOTYPE:	1137	PROTOTYPE:
1027	CODE:	1138	CODE:
		1139	tc_backup ();
		1140
		1141	void
		1142	glyph_cache_restore ()
		1143	PROTOTYPE:
		1144	CODE:
1028	tc_clear ();	1145	tc_restore ();
1029		1146
1030	CFPlus::Layout	1147	DC::Layout
1031	new (SV *class)	1148	new (SV *class)
1032	CODE:	1149	CODE:
1033	New (0, RETVAL, 1, struct cf_layout);	1150	New (0, RETVAL, 1, struct cf_layout);
1034		1151
1035	RETVAL->pl = pango_layout_new (opengl_context);	1152	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1045	layout_update_font (RETVAL);	1162	layout_update_font (RETVAL);
1046	OUTPUT:	1163	OUTPUT:
1047	RETVAL	1164	RETVAL
1048		1165
1049	void	1166	void
1050	DESTROY (CFPlus::Layout self)	1167	DESTROY (DC::Layout self)
1051	CODE:	1168	CODE:
1052	g_object_unref (self->pl);	1169	g_object_unref (self->pl);
1053	rc_free (self->rc);	1170	rc_free (self->rc);
1054	Safefree (self);	1171	Safefree (self);
1055		1172
1056	void	1173	void
1057	set_text (CFPlus::Layout self, SV *text_)	1174	set_text (DC::Layout self, SV *text_)
1058	CODE:	1175	CODE:
1059	{	1176	{
1060	STRLEN textlen;	1177	STRLEN textlen;
1061	char *text = SvPVutf8 (text_, textlen);	1178	char *text = SvPVutf8 (text_, textlen);
1062		1179
1063	pango_layout_set_text (self->pl, text, textlen);	1180	pango_layout_set_text (self->pl, text, textlen);
1064	}	1181	}
1065		1182
1066	void	1183	void
1067	set_markup (CFPlus::Layout self, SV *text_)	1184	set_markup (DC::Layout self, SV *text_)
1068	CODE:	1185	CODE:
1069	{	1186	{
1070	STRLEN textlen;	1187	STRLEN textlen;
1071	char *text = SvPVutf8 (text_, textlen);	1188	char *text = SvPVutf8 (text_, textlen);
1072		1189
1073	pango_layout_set_markup (self->pl, text, textlen);	1190	pango_layout_set_markup (self->pl, text, textlen);
1074	}	1191	}
1075		1192
1076	void	1193	void
1077	set_shapes (CFPlus::Layout self, ...)	1194	set_shapes (DC::Layout self, ...)
1078	CODE:	1195	CODE:
1079	{	1196	{
1080	PangoAttrList *attrs = 0;	1197	PangoAttrList *attrs = 0;
1081	const char *text = pango_layout_get_text (self->pl);	1198	const char *text = pango_layout_get_text (self->pl);
1082	const char *pos = text;	1199	const char *pos = text;
…		…
1117	if (attrs)	1234	if (attrs)
1118	pango_layout_set_attributes (self->pl, attrs);	1235	pango_layout_set_attributes (self->pl, attrs);
1119	}	1236	}
1120		1237
1121	void	1238	void
1122	get_shapes (CFPlus::Layout self)	1239	get_shapes (DC::Layout self)
1123	PPCODE:	1240	PPCODE:
1124	{	1241	{
1125	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1242	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126		1243
1127	do	1244	do
1128	{	1245	{
1129	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1246	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130		1247
1131	if (run && shape_attr_p (run))	1248	if (run && shape_attr_p (run))
1132	{	1249	{
1133	PangoRectangle extents;	1250	PangoRectangle extents;
1134	pango_layout_iter_get_run_extents (iter, 0, &extents);	1251	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1142		1259
1143	pango_layout_iter_free (iter);	1260	pango_layout_iter_free (iter);
1144	}	1261	}
1145		1262
1146	int	1263	int
1147	has_wrapped (CFPlus::Layout self)	1264	has_wrapped (DC::Layout self)
1148	CODE:	1265	CODE:
1149	{	1266	{
1150	int lines = 1;	1267	int lines = 1;
1151	const char *text = pango_layout_get_text (self->pl);	1268	const char *text = pango_layout_get_text (self->pl);
1152		1269
…		…
1157	}	1274	}
1158	OUTPUT:	1275	OUTPUT:
1159	RETVAL	1276	RETVAL
1160		1277
1161	SV *	1278	SV *
1162	get_text (CFPlus::Layout self)	1279	get_text (DC::Layout self)
1163	CODE:	1280	CODE:
1164	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1281	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165	sv_utf8_decode (RETVAL);	1282	sv_utf8_decode (RETVAL);
1166	OUTPUT:	1283	OUTPUT:
1167	RETVAL	1284	RETVAL
1168		1285
1169	void	1286	void
1170	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1287	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171	CODE:	1288	CODE:
1172	self->r = r;	1289	self->r = r;
1173	self->g = g;	1290	self->g = g;
1174	self->b = b;	1291	self->b = b;
1175	self->a = a;	1292	self->a = a;
1176		1293
1177	void	1294	void
1178	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1295	set_font (DC::Layout self, DC::Font font = 0)
1179	CODE:	1296	CODE:
1180	if (self->font != font)	1297	if (self->font != font)
1181	{	1298	{
1182	self->font = font;	1299	self->font = font;
1183	layout_update_font (self);	1300	layout_update_font (self);
1184	}	1301	}
1185		1302
1186	void	1303	void
1187	set_height (CFPlus::Layout self, int base_height)	1304	set_height (DC::Layout self, int base_height)
1188	CODE:	1305	CODE:
1189	if (self->base_height != base_height)	1306	if (self->base_height != base_height)
1190	{	1307	{
1191	self->base_height = base_height;	1308	self->base_height = base_height;
1192	layout_update_font (self);	1309	layout_update_font (self);
1193	}	1310	}
1194		1311
1195	void	1312	void
1196	set_width (CFPlus::Layout self, int max_width = -1)	1313	set_width (DC::Layout self, int max_width = -1)
1197	CODE:	1314	CODE:
1198	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1315	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199		1316
1200	void	1317	void
1201	set_indent (CFPlus::Layout self, int indent)	1318	set_indent (DC::Layout self, int indent)
1202	CODE:	1319	CODE:
1203	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1320	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204		1321
1205	void	1322	void
1206	set_spacing (CFPlus::Layout self, int spacing)	1323	set_spacing (DC::Layout self, int spacing)
1207	CODE:	1324	CODE:
1208	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1325	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209		1326
1210	void	1327	void
1211	set_ellipsise (CFPlus::Layout self, int ellipsise)	1328	set_ellipsise (DC::Layout self, int ellipsise)
1212	CODE:	1329	CODE:
1213	pango_layout_set_ellipsize (self->pl,	1330	pango_layout_set_ellipsize (self->pl,
1214	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1331	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1332	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1333	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217	: PANGO_ELLIPSIZE_NONE	1334	: PANGO_ELLIPSIZE_NONE
1218	);	1335	);
1219		1336
1220	void	1337	void
1221	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1338	set_single_paragraph_mode (DC::Layout self, int spm)
1222	CODE:	1339	CODE:
1223	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1340	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224		1341
1225	void	1342	void
1226	size (CFPlus::Layout self)	1343	size (DC::Layout self)
1227	PPCODE:	1344	PPCODE:
1228	{	1345	{
1229	int w, h;	1346	int w, h;
1230		1347
1231	layout_get_pixel_size (self, &w, &h);	1348	layout_get_pixel_size (self, &w, &h);
…		…
1234	PUSHs (sv_2mortal (newSViv (w)));	1351	PUSHs (sv_2mortal (newSViv (w)));
1235	PUSHs (sv_2mortal (newSViv (h)));	1352	PUSHs (sv_2mortal (newSViv (h)));
1236	}	1353	}
1237		1354
1238	int	1355	int
1239	descent (CFPlus::Layout self)	1356	descent (DC::Layout self)
1240	CODE:	1357	CODE:
1241	{	1358	{
1242	PangoRectangle rect;	1359	PangoRectangle rect;
1243	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1360	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244	pango_layout_line_get_pixel_extents (line, 0, &rect);	1361	pango_layout_line_get_pixel_extents (line, 0, &rect);
1245	RETVAL = PANGO_DESCENT (rect);	1362	RETVAL = PANGO_DESCENT (rect);
1246	}	1363	}
1247	OUTPUT:	1364	OUTPUT:
1248	RETVAL	1365	RETVAL
1249		1366
1250	int	1367	int
1251	xy_to_index (CFPlus::Layout self, int x, int y)	1368	xy_to_index (DC::Layout self, int x, int y)
1252	CODE:	1369	CODE:
1253	{	1370	{
1254	int index, trailing;	1371	int index, trailing;
1255	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1372	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256	RETVAL = index + trailing;	1373	RETVAL = index + trailing;
1257	}	1374	}
1258	OUTPUT:	1375	OUTPUT:
1259	RETVAL	1376	RETVAL
1260		1377
1261	void	1378	void
1262	cursor_pos (CFPlus::Layout self, int index)	1379	cursor_pos (DC::Layout self, int index)
1263	PPCODE:	1380	PPCODE:
1264	{	1381	{
1265	PangoRectangle strong_pos;	1382	PangoRectangle pos;
1266	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1383	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267		1384
1268	EXTEND (SP, 3);	1385	EXTEND (SP, 3);
1269	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1386	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1387	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1388	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272	}	1389	}
1273		1390
1274	void	1391	void
1275	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1392	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276	PPCODE:	1393	PPCODE:
1277	{	1394	{
1278	int line, x;	1395	int line, x;
1279		1396
1280	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1397	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1398	#if !PANGO_VERSION_CHECK (1, 17, 3)
1281	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1399	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282		1400	--line;
		1401	#endif
1283	EXTEND (SP, 2);	1402	EXTEND (SP, 2);
1284	PUSHs (sv_2mortal (newSViv (line - 1)));	1403	PUSHs (sv_2mortal (newSViv (line)));
1285	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1404	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286	}	1405	}
1287		1406
1288	void	1407	void
1289	line_x_to_index (CFPlus::Layout self, int line, int x)	1408	line_x_to_index (DC::Layout self, int line, int x)
1290	PPCODE:	1409	PPCODE:
1291	{	1410	{
1292	PangoLayoutLine *lp;	1411	PangoLayoutLine *lp;
1293	int index, trailing;	1412	int index, trailing;
1294		1413
1295	if (line < 0)	1414	if (line < 0)
1296	XSRETURN_EMPTY;	1415	XSRETURN_EMPTY;
1297		1416
1298	if (!(lp = pango_layout_get_line (self->pl, line)))	1417	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299	XSRETURN_EMPTY; /* do better */	1418	XSRETURN_EMPTY; /* do better */
1300		1419
1301	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1420	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302		1421
1303	EXTEND (SP, 2);	1422	EXTEND (SP, 2);
…		…
1309	PUSHs (sv_2mortal (newSViv (trailing)));	1428	PUSHs (sv_2mortal (newSViv (trailing)));
1310	}	1429	}
1311	}	1430	}
1312		1431
1313	void	1432	void
1314	render (CFPlus::Layout self, float x, float y, int flags = 0)	1433	render (DC::Layout self, float x, float y, int flags = 0)
1315	CODE:	1434	CODE:
1316	rc_clear (self->rc);	1435	rc_clear (self->rc);
1317	pango_opengl_render_layout_subpixel (	1436	pango_opengl_render_layout_subpixel (
1318	self->pl,	1437	self->pl,
1319	self->rc,	1438	self->rc,
…		…
1324	// we assume that context_change actually clears/frees stuff	1443	// we assume that context_change actually clears/frees stuff
1325	// and does not do any recomputation...	1444	// and does not do any recomputation...
1326	pango_layout_context_changed (self->pl);	1445	pango_layout_context_changed (self->pl);
1327		1446
1328	void	1447	void
1329	draw (CFPlus::Layout self)	1448	draw (DC::Layout self)
1330	CODE:	1449	CODE:
1331	{	1450	{
1332	glEnable (GL_TEXTURE_2D);	1451	glEnable (GL_TEXTURE_2D);
1333	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1452	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334	glEnable (GL_BLEND);	1453	glEnable (GL_BLEND);
…		…
1342	glDisable (GL_ALPHA_TEST);	1461	glDisable (GL_ALPHA_TEST);
1343	glDisable (GL_BLEND);	1462	glDisable (GL_BLEND);
1344	glDisable (GL_TEXTURE_2D);	1463	glDisable (GL_TEXTURE_2D);
1345	}	1464	}
1346		1465
1347	MODULE = CFPlus PACKAGE = CFPlus::Texture	1466	MODULE = Deliantra::Client PACKAGE = DC::Texture
1348		1467
1349	PROTOTYPES: ENABLE	1468	PROTOTYPES: ENABLE
1350
1351	int minpot (int n)
1352		1469
1353	void	1470	void
1354	pad (SV *data_, int ow, int oh, int nw, int nh)	1471	pad (SV *data_, int ow, int oh, int nw, int nh)
1355	CODE:	1472	CODE:
1356	{	1473	{
…		…
1433	RETVAL = width > 0;	1550	RETVAL = width > 0;
1434	}	1551	}
1435	OUTPUT:	1552	OUTPUT:
1436	RETVAL	1553	RETVAL
1437		1554
1438	MODULE = CFPlus PACKAGE = CFPlus::Map	1555	MODULE = Deliantra::Client PACKAGE = DC::Map
1439		1556
1440	PROTOTYPES: DISABLE	1557	PROTOTYPES: DISABLE
1441		1558
1442	CFPlus::Map	1559	DC::Map
1443	new (SV *class)	1560	new (SV *class)
1444	CODE:	1561	CODE:
1445	New (0, RETVAL, 1, struct map);	1562	New (0, RETVAL, 1, struct map);
1446	RETVAL->x = 0;	1563	RETVAL->x = 0;
1447	RETVAL->y = 0;	1564	RETVAL->y = 0;
…		…
1455	RETVAL->row = 0;	1572	RETVAL->row = 0;
1456	OUTPUT:	1573	OUTPUT:
1457	RETVAL	1574	RETVAL
1458		1575
1459	void	1576	void
1460	DESTROY (CFPlus::Map self)	1577	DESTROY (DC::Map self)
1461	CODE:	1578	CODE:
1462	{	1579	{
1463	map_clear (self);	1580	map_clear (self);
1464	Safefree (self->face2tile);	1581	Safefree (self->face2tile);
1465	Safefree (self->tex);	1582	Safefree (self->tex);
1466	Safefree (self);	1583	Safefree (self);
1467	}	1584	}
1468		1585
1469	void	1586	void
1470	resize (CFPlus::Map self, int map_width, int map_height)	1587	resize (DC::Map self, int map_width, int map_height)
1471	CODE:	1588	CODE:
1472	self->w = map_width;	1589	self->w = map_width;
1473	self->h = map_height;	1590	self->h = map_height;
1474		1591
1475	void	1592	void
1476	clear (CFPlus::Map self)	1593	clear (DC::Map self)
1477	CODE:	1594	CODE:
1478	map_clear (self);	1595	map_clear (self);
1479		1596
1480	void	1597	void
1481	set_tileid (CFPlus::Map self, int face, int tile)	1598	set_tileid (DC::Map self, int face, int tile)
1482	CODE:	1599	CODE:
1483	{	1600	{
1484	need_facenum (self, face); self->face2tile [face] = tile;	1601	need_facenum (self, face); self->face2tile [face] = tile;
1485	need_texid (self, tile);	1602	need_texid (self, tile);
1486	}	1603	}
1487		1604
1488	void	1605	void
1489	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1606	set_smooth (DC::Map self, int face, int smooth, int level)
1490	CODE:	1607	CODE:
1491	{	1608	{
1492	tileid texid;	1609	tileid texid;
1493	maptex *tex;	1610	maptex *tex;
1494		1611
…		…
1507	tex->smoothtile = self->face2tile [smooth];	1624	tex->smoothtile = self->face2tile [smooth];
1508	tex->smoothlevel = level;	1625	tex->smoothlevel = level;
1509	}	1626	}
1510		1627
1511	void	1628	void
1512	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1629	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1513	CODE:	1630	CODE:
1514	{	1631	{
1515	need_texid (self, texid);	1632	need_texid (self, texid);
1516		1633
1517	{	1634	{
…		…
1537	// from transparent color bleeding and ugly wrapping effects.	1654	// from transparent color bleeding and ugly wrapping effects.
1538	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1655	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539	}	1656	}
1540		1657
1541	int	1658	int
1542	ox (CFPlus::Map self)	1659	ox (DC::Map self)
1543	ALIAS:	1660	ALIAS:
1544	oy = 1	1661	oy = 1
1545	x = 2	1662	x = 2
1546	y = 3	1663	y = 3
1547	w = 4	1664	w = 4
…		…
1558	}	1675	}
1559	OUTPUT:	1676	OUTPUT:
1560	RETVAL	1677	RETVAL
1561		1678
1562	void	1679	void
1563	scroll (CFPlus::Map self, int dx, int dy)	1680	scroll (DC::Map self, int dx, int dy)
1564	CODE:	1681	CODE:
1565	{	1682	{
1566	if (dx > 0)	1683	if (dx > 0)
1567	map_blank (self, self->x, self->y, dx, self->h);	1684	map_blank (self, self->x, self->y, dx, self->h);
1568	else if (dx < 0)	1685	else if (dx < 0)
…		…
1584	self->y += MAP_EXTEND_Y;	1701	self->y += MAP_EXTEND_Y;
1585	}	1702	}
1586	}	1703	}
1587		1704
1588	SV *	1705	SV *
1589	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1706	map1a_update (DC::Map self, SV *data_, int extmap)
1590	CODE:	1707	CODE:
1591	{	1708	{
1592	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1709	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593	uint8_t *data_end = (uint8_t *)SvEND (data_);	1710	uint8_t *data_end = (uint8_t *)SvEND (data_);
1594	mapcell *cell;	1711	mapcell *cell;
…		…
1622	uint8_t ext, cmd;	1739	uint8_t ext, cmd;
1623		1740
1624	do	1741	do
1625	{	1742	{
1626	ext = *data++;	1743	ext = *data++;
1627	cmd = ext & 0x3f;	1744	cmd = ext & 0x7f;
1628		1745
1629	if (cmd < 4)	1746	if (cmd < 4)
1630	cell->darkness = 255 - ext * 64 + 1;	1747	cell->darkness = 255 - ext * 64 + 1;
1631	else if (cmd == 5) // health	1748	else if (cmd == 5) // health
1632	{	1749	{
…		…
1635	}	1752	}
1636	else if (cmd == 6) // monster width	1753	else if (cmd == 6) // monster width
1637	cell->stat_width = *data++ + 1;	1754	cell->stat_width = *data++ + 1;
1638	else if (cmd == 0x47)	1755	else if (cmd == 0x47)
1639	{	1756	{
1640	if (*data == 4)	1757	if (*data == 1) cell->player = data [1];
1641	; // decode player count	1758	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1759	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1760	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642		1761
1643	data += *data + 1;	1762	data += *data + 1;
1644	}	1763	}
1645	else if (cmd == 8) // cell flags	1764	else if (cmd == 8) // cell flags
1646	cell->flags = *data++;	1765	cell->flags = *data++;
…		…
1676	}	1795	}
1677	}	1796	}
1678	}	1797	}
1679	}	1798	}
1680	else	1799	else
1681	cell->darkness = 0;	1800	CELL_CLEAR (cell);
1682	}	1801	}
1683	}	1802	}
1684	OUTPUT:	1803	OUTPUT:
1685	RETVAL	1804	RETVAL
1686		1805
1687	SV *	1806	SV *
1688	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1807	mapmap (DC::Map self, int x0, int y0, int w, int h)
1689	CODE:	1808	CODE:
1690	{	1809	{
1691	int x1, x;	1810	int x1, x;
1692	int y1, y;	1811	int y1, y;
1693	int z;	1812	int z;
…		…
1738	}	1857	}
1739	OUTPUT:	1858	OUTPUT:
1740	RETVAL	1859	RETVAL
1741		1860
1742	void	1861	void
1743	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1862	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744	CODE:	1863	CODE:
1745	{	1864	{
1746	int x, y, z;	1865	int x, y, z;
1747		1866
1748	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1867	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1868	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1869	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751	smooth_key skey;	1870	smooth_key skey;
1752		1871	int pl_x, pl_y;
		1872	maptex pl_tex;
1753	rc_t *rc = rc_alloc ();	1873	rc_t *rc = rc_alloc ();
1754	rc_key_t key;	1874	rc_key_t key;
1755	rc_array_t *arr;	1875	rc_array_t *arr;
		1876
		1877	pl_tex.name = 0;
1756		1878
1757	// thats current max. sorry.	1879	// thats current max. sorry.
1758	if (sw > 255) sw = 255;	1880	if (sw > 255) sw = 255;
1759	if (sh > 255) sh = 255;	1881	if (sh > 255) sh = 255;
1760		1882
…		…
1815	tileid tile = cell->tile [z];	1937	tileid tile = cell->tile [z];
1816		1938
1817	if (tile)	1939	if (tile)
1818	{	1940	{
1819	maptex tex = self->tex [tile];	1941	maptex tex = self->tex [tile];
1820	int px, py;	1942	int px = (x + 1) * T - tex.w;
		1943	int py = (y + 1) * T - tex.h;
1821		1944
1822	// suppressing texture state switches here
1823	// is only moderately effective, but worth the extra effort
1824	if (key.texname != tex.name)	1945	if (key.texname != tex.name)
1825	{	1946	{
1826	if (!tex.name)	1947	if (!tex.name)
1827	tex = self->tex [2]; /* missing, replace by noface */	1948	tex = self->tex [2]; /* missing, replace by noface */
1828		1949
1829	key.texname = tex.name;	1950	key.texname = tex.name;
1830	arr = rc_array (rc, &key);	1951	arr = rc_array (rc, &key);
1831	}	1952	}
1832		1953
1833	px = (x + 1) * T - tex.w;	1954	if (expect_false (cell->player == player) && expect_false (z == 2))
1834	py = (y + 1) * T - tex.h;	1955	{
		1956	pl_x = px;
		1957	pl_y = py;
		1958	pl_tex = tex;
		1959	continue;
		1960	}
1835		1961
1836	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1962	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1837	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1963	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1838	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1964	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1839	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1965	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1840		1966
1841	if (cell->flags && z == 2)	1967	if (expect_false (cell->flags) && expect_false (z == 2))
1842	{	1968	{
1843	// overlays such as the speech bubble, probably more to come	1969	// overlays such as the speech bubble, probably more to come
1844	if (cell->flags & 1)	1970	if (cell->flags & 1)
1845	{	1971	{
1846	maptex tex = self->tex [1];	1972	maptex tex = self->tex [1];
…		…
1911	// go through all smoothlevels, lowest to highest, then draw.	2037	// go through all smoothlevels, lowest to highest, then draw.
1912	// this is basically counting sort	2038	// this is basically counting sort
1913	{	2039	{
1914	int w, b;	2040	int w, b;
1915		2041
		2042	glEnable (GL_TEXTURE_2D);
		2043	glBegin (GL_QUADS);
1916	for (w = 0; w < 256 / 32; ++w)	2044	for (w = 0; w < 256 / 32; ++w)
1917	{	2045	{
1918	uint32_t smask = smooth_level [w];	2046	uint32_t smask = smooth_level [w];
1919	if (smask)	2047	if (smask)
1920	for (b = 0; b < 32; ++b)	2048	for (b = 0; b < 32; ++b)
…		…
1945	{	2073	{
1946	// this time avoiding texture state changes	2074	// this time avoiding texture state changes
1947	// save gobs of state changes.	2075	// save gobs of state changes.
1948	if (key.texname != tex.name)	2076	if (key.texname != tex.name)
1949	{	2077	{
		2078	glEnd ();
1950	key.texname = tex.name;	2079	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1951	arr = rc_array (rc, &key);	2080	glBegin (GL_QUADS);
1952	}	2081	}
1953		2082
1954	if (border)	2083	if (border)
1955	{	2084	{
1956	float ox = border * dx;	2085	float ox = border * dx;
1957		2086
1958	rc_t2f_v3f (arr, ox , 0.f , px , py , 0);	2087	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1959	rc_t2f_v3f (arr, ox , dy , px , py + T, 0);	2088	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1960	rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);	2089	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1961	rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);	2090	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1962	}	2091	}
1963		2092
1964	if (corner)	2093	if (corner)
1965	{	2094	{
1966	float ox = corner * dx;	2095	float ox = corner * dx;
1967		2096
1968	rc_t2f_v3f (arr, ox , dy , px , py , 0);	2097	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1969	rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);	2098	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1970	rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);	2099	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1971	rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);	2100	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1972	}	2101	}
1973	}	2102	}
1974	}	2103	}
1975	}	2104	}
1976	}	2105	}
1977	}	2106	}
		2107
		2108	glEnd ();
		2109	glDisable (GL_TEXTURE_2D);
		2110	key.texname = -1;
1978	}	2111	}
1979		2112
1980	hv_clear (smooth);	2113	hv_clear (smooth);
		2114	}
		2115
		2116	if (pl_tex.name)
		2117	{
		2118	maptex tex = pl_tex;
		2119	int px = pl_x + sdx;
		2120	int py = pl_y + sdy;
		2121
		2122	key.texname = tex.name;
		2123	arr = rc_array (rc, &key);
		2124
		2125	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2126	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2127	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2128	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2129
1981	rc_draw (rc);	2130	rc_draw (rc);
1982	rc_clear (rc);
1983	}	2131	}
1984		2132
1985	glDisable (GL_BLEND);	2133	glDisable (GL_BLEND);
1986	rc_free (rc);	2134	rc_free (rc);
1987		2135
…		…
2016	}	2164	}
2017	}	2165	}
2018	}	2166	}
2019		2167
2020	void	2168	void
2021	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2169	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2022	CODE:	2170	CODE:
2023	{	2171	{
2024	static float color[16][3] = {	2172	static float color[16][3] = {
2025	{ 0.00F, 0.00F, 0.00F },	2173	{ 0.00F, 0.00F, 0.00F },
2026	{ 1.00F, 1.00F, 1.00F },	2174	{ 1.00F, 1.00F, 1.00F },
…		…
2076	glDisable (GL_BLEND);	2224	glDisable (GL_BLEND);
2077	glDisable (GL_TEXTURE_2D);	2225	glDisable (GL_TEXTURE_2D);
2078	}	2226	}
2079		2227
2080	void	2228	void
2081	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2229	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2082	PPCODE:	2230	PPCODE:
2083	{	2231	{
2084	int x, y;	2232	int x, y;
2085	int sw1 = sw + 2;	2233	int sw1 = sw + 2;
2086	int sh1 = sh + 2;	2234	int sh1 = sh + 2;
…		…
2094	SvCUR_set (darkness3_sv, sw34 * sh3);	2242	SvCUR_set (darkness3_sv, sw34 * sh3);
2095		2243
2096	mx += self->x - 1;	2244	mx += self->x - 1;
2097	my += self->y - 1;	2245	my += self->y - 1;
2098		2246
2099	memset (darkness1, 255, sw1 * sh1);	2247	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2100		2248
2101	for (y = 0; y < sh1; y++)	2249	for (y = 0; y < sh1; y++)
2102	if (0 <= y + my && y + my < self->rows)	2250	if (0 <= y + my && y + my < self->rows)
2103	{	2251	{
2104	maprow *row = self->row + (y + my);	2252	maprow *row = self->row + (y + my);
…		…
2157	PUSHs (sv_2mortal (newSViv (sh3)));	2305	PUSHs (sv_2mortal (newSViv (sh3)));
2158	PUSHs (darkness3_sv);	2306	PUSHs (darkness3_sv);
2159	}	2307	}
2160		2308
2161	SV *	2309	SV *
2162	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2310	get_rect (DC::Map self, int x0, int y0, int w, int h)
2163	CODE:	2311	CODE:
2164	{	2312	{
2165	int x, y, x1, y1;	2313	int x, y, x1, y1;
2166	SV *data_sv = newSV (w * h * 7 + 5);	2314	SV *data_sv = newSV (w * h * 7 + 5);
2167	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2315	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2224	else	2372	else
2225	*data++ = 0;	2373	*data++ = 0;
2226	}	2374	}
2227	}	2375	}
2228		2376
		2377	/* if size is w*h + 5 then no data has been found */
		2378	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2379	{
2229	SvPOK_only (data_sv);	2380	SvPOK_only (data_sv);
2230	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2381	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2382	}
		2383
2231	RETVAL = data_sv;	2384	RETVAL = data_sv;
2232	}	2385	}
2233	OUTPUT:	2386	OUTPUT:
2234	RETVAL	2387	RETVAL
2235		2388
2236	void	2389	void
2237	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2390	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2238	PPCODE:	2391	PPCODE:
2239	{	2392	{
2240	int x, y, z;	2393	int x, y, z;
2241	int w, h;	2394	int w, h;
2242	int x1, y1;	2395	int x1, y1;
		2396	STRLEN len;
		2397	uint8_t *data, *end;
		2398
		2399	len = SvLEN (data_sv);
		2400	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2401	data = SvPVbyte_nolen (data_sv);
		2402	end = data + len + 8;
		2403
		2404	if (len < 5)
		2405	XSRETURN_EMPTY;
2243		2406
2244	if (*data++ != 0)	2407	if (*data++ != 0)
2245	return; /* version mismatch */	2408	XSRETURN_EMPTY; /* version mismatch */
2246		2409
2247	w = *data++ << 8; w |= *data++;	2410	w = *data++ << 8; w |= *data++;
2248	h = *data++ << 8; h |= *data++;	2411	h = *data++ << 8; h |= *data++;
2249		2412
2250	// we need to do this 'cause we don't keep an absolute coord system for rows	2413	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2262	{	2425	{
2263	maprow *row = map_get_row (self, y);	2426	maprow *row = map_get_row (self, y);
2264		2427
2265	for (x = x0; x < x1; x++)	2428	for (x = x0; x < x1; x++)
2266	{	2429	{
		2430	uint8_t flags;
		2431
		2432	if (data + 7 >= end)
		2433	XSRETURN_EMPTY;
		2434
2267	uint8_t flags = *data++;	2435	flags = *data++;
2268		2436
2269	if (flags)	2437	if (flags)
2270	{	2438	{
2271	mapcell *cell = row_get_cell (row, x);	2439	mapcell *cell = row_get_cell (row, x);
2272	tileid tile[3] = { 0, 0, 0 };	2440	tileid tile[3] = { 0, 0, 0 };
…		…
2275	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2443	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2276	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2444	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2277		2445
2278	if (cell->darkness == 0)	2446	if (cell->darkness == 0)
2279	{	2447	{
2280	cell->darkness = 0;	2448	/*cell->darkness = 0;*/
		2449	EXTEND (SP, 3);
2281		2450
2282	for (z = 0; z <= 2; z++)	2451	for (z = 0; z <= 2; z++)
2283	{	2452	{
2284	tileid t = tile [z];	2453	tileid t = tile [z];
2285		2454
2286	if (t >= self->texs || (t && !self->tex [t].name))	2455	if (t >= self->texs || (t && !self->tex [t].name))
2287	{	2456	{
2288	XPUSHs (sv_2mortal (newSViv (t)));	2457	PUSHs (sv_2mortal (newSViv (t)));
2289	need_texid (self, t);	2458	need_texid (self, t);
2290	}	2459	}
2291		2460
2292	cell->tile [z] = t;	2461	cell->tile [z] = t;
2293	}	2462	}
…		…
2295	}	2464	}
2296	}	2465	}
2297	}	2466	}
2298	}	2467	}
2299		2468
2300	MODULE = CFPlus PACKAGE = CFPlus::RW	2469	MODULE = Deliantra::Client PACKAGE = DC::RW
2301		2470
2302	CFPlus::RW	2471	DC::RW
2303	new (SV *class, SV *data_sv)	2472	new (SV *class, SV *data_sv)
2304	CODE:	2473	CODE:
2305	{	2474	{
2306	STRLEN datalen;	2475	STRLEN datalen;
2307	char *data = SvPVbyte (data_sv, datalen);	2476	char *data = SvPVbyte (data_sv, datalen);
…		…
2309	RETVAL = SDL_RWFromConstMem (data, datalen);	2478	RETVAL = SDL_RWFromConstMem (data, datalen);
2310	}	2479	}
2311	OUTPUT:	2480	OUTPUT:
2312	RETVAL	2481	RETVAL
2313		2482
2314	CFPlus::RW	2483	DC::RW
2315	new_from_file (SV *class, const char *path, const char *mode = "rb")	2484	new_from_file (SV *class, const char *path, const char *mode = "rb")
2316	CODE:	2485	CODE:
2317	RETVAL = SDL_RWFromFile (path, mode);	2486	RETVAL = SDL_RWFromFile (path, mode);
2318	OUTPUT:	2487	OUTPUT:
2319	RETVAL	2488	RETVAL
2320		2489
2321	# fails on win32:	2490	# fails on win32:
2322	# CFPlus.xs(2268) : error C2059: syntax error : '('	2491	# dc.xs(2268) : error C2059: syntax error : '('
2323	#void	2492	#void
2324	#close (CFPlus::RW self)	2493	#close (DC::RW self)
2325	# CODE:	2494	# CODE:
2326	# (self->(close)) (self);	2495	# (self->(close)) (self);
2327		2496
2328	MODULE = CFPlus PACKAGE = CFPlus::Channel	2497	MODULE = Deliantra::Client PACKAGE = DC::Channel
2329		2498
2330	PROTOTYPES: DISABLE	2499	PROTOTYPES: DISABLE
2331		2500
2332	CFPlus::Channel	2501	DC::Channel
2333	find ()	2502	find ()
2334	CODE:	2503	CODE:
2335	{	2504	{
2336	RETVAL = Mix_GroupAvailable (-1);	2505	RETVAL = Mix_GroupAvailable (-1);
2337		2506
…		…
2350	}	2519	}
2351	OUTPUT:	2520	OUTPUT:
2352	RETVAL	2521	RETVAL
2353		2522
2354	void	2523	void
2355	halt (CFPlus::Channel self)	2524	halt (DC::Channel self)
2356	CODE:	2525	CODE:
2357	Mix_HaltChannel (self);	2526	Mix_HaltChannel (self);
2358		2527
2359	void	2528	void
2360	expire (CFPlus::Channel self, int ticks = -1)	2529	expire (DC::Channel self, int ticks = -1)
2361	CODE:	2530	CODE:
2362	Mix_ExpireChannel (self, ticks);	2531	Mix_ExpireChannel (self, ticks);
2363		2532
2364	void	2533	void
2365	fade_out (CFPlus::Channel self, int ticks = -1)	2534	fade_out (DC::Channel self, int ticks = -1)
2366	CODE:	2535	CODE:
2367	Mix_FadeOutChannel (self, ticks);	2536	Mix_FadeOutChannel (self, ticks);
2368		2537
2369	int	2538	int
2370	volume (CFPlus::Channel self, int volume)	2539	volume (DC::Channel self, int volume)
2371	CODE:	2540	CODE:
2372	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2541	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373	OUTPUT:	2542	OUTPUT:
2374	RETVAL	2543	RETVAL
2375		2544
2376	void	2545	void
2377	unregister_all_effects (CFPlus::Channel self)	2546	unregister_all_effects (DC::Channel self)
2378	CODE:	2547	CODE:
2379	Mix_UnregisterAllEffects (self);	2548	Mix_UnregisterAllEffects (self);
2380		2549
2381	void	2550	void
2382	set_panning (CFPlus::Channel self, int left, int right)	2551	set_panning (DC::Channel self, int left, int right)
2383	CODE:	2552	CODE:
2384	left = CLAMP (left , 0, 255);	2553	left = CLAMP (left , 0, 255);
2385	right = CLAMP (right, 0, 255);	2554	right = CLAMP (right, 0, 255);
2386	Mix_SetPanning (self, left, right);	2555	Mix_SetPanning (self, left, right);
2387		2556
2388	void	2557	void
2389	set_distance (CFPlus::Channel self, int distance)	2558	set_distance (DC::Channel self, int distance)
2390	CODE:	2559	CODE:
2391	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2560	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392		2561
2393	void	2562	void
2394	set_position (CFPlus::Channel self, int angle, int distance)	2563	set_position (DC::Channel self, int angle, int distance)
2395	CODE:	2564	CODE:
2396		2565
2397	void	2566	void
2398	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2567	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399	CODE:	2568	CODE:
2400	{	2569	{
2401	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2570	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2402	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2571	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2403	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2572	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404	}	2573	}
2405		2574
2406	void	2575	void
2407	set_reverse_stereo (CFPlus::Channel self, int flip)	2576	set_reverse_stereo (DC::Channel self, int flip)
2408	CODE:	2577	CODE:
2409	Mix_SetReverseStereo (self, flip);	2578	Mix_SetReverseStereo (self, flip);
2410		2579
2411	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2580	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412		2581
2413	PROTOTYPES: DISABLE	2582	PROTOTYPES: DISABLE
2414		2583
2415	CFPlus::MixChunk	2584	DC::MixChunk
2416	new (SV *class, CFPlus::RW rwops)	2585	new (SV *class, DC::RW rwops)
2417	CODE:	2586	CODE:
2418	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2587	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419	OUTPUT:	2588	OUTPUT:
2420	RETVAL	2589	RETVAL
2421		2590
2422	void	2591	void
2423	DESTROY (CFPlus::MixChunk self)	2592	DESTROY (DC::MixChunk self)
2424	CODE:	2593	CODE:
2425	Mix_FreeChunk (self);	2594	Mix_FreeChunk (self);
2426		2595
2427	int	2596	int
2428	volume (CFPlus::MixChunk self, int volume = -1)	2597	volume (DC::MixChunk self, int volume = -1)
2429	CODE:	2598	CODE:
2430	if (items > 1)	2599	if (items > 1)
2431	volume = CLAMP (volume, 0, 128);	2600	volume = CLAMP (volume, 0, 128);
2432	RETVAL = Mix_VolumeChunk (self, volume);	2601	RETVAL = Mix_VolumeChunk (self, volume);
2433	OUTPUT:	2602	OUTPUT:
2434	RETVAL	2603	RETVAL
2435		2604
2436	CFPlus::Channel	2605	DC::Channel
2437	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2606	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2438	CODE:	2607	CODE:
2439	{	2608	{
2440	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2609	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441		2610
2442	if (RETVAL < 0)	2611	if (RETVAL < 0)
…		…
2449	}	2618	}
2450	}	2619	}
2451	OUTPUT:	2620	OUTPUT:
2452	RETVAL	2621	RETVAL
2453		2622
2454	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2623	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2455		2624
2456	int	2625	int
2457	volume (int volume = -1)	2626	volume (int volume = -1)
2458	PROTOTYPE: ;$	2627	PROTOTYPE: ;$
2459	CODE:	2628	CODE:
…		…
2471	void	2640	void
2472	halt ()	2641	halt ()
2473	CODE:	2642	CODE:
2474	Mix_HaltMusic ();	2643	Mix_HaltMusic ();
2475		2644
2476	CFPlus::MixMusic	2645	DC::MixMusic
2477	new (SV *class, CFPlus::RW rwops)	2646	new (SV *class, DC::RW rwops)
2478	CODE:	2647	CODE:
2479	RETVAL = Mix_LoadMUS_RW (rwops);	2648	RETVAL = Mix_LoadMUS_RW (rwops);
2480	OUTPUT:	2649	OUTPUT:
2481	RETVAL	2650	RETVAL
2482		2651
2483	void	2652	void
2484	DESTROY (CFPlus::MixMusic self)	2653	DESTROY (DC::MixMusic self)
2485	CODE:	2654	CODE:
2486	Mix_FreeMusic (self);	2655	Mix_FreeMusic (self);
2487		2656
2488	int	2657	int
2489	play (CFPlus::MixMusic self, int loops = -1)	2658	play (DC::MixMusic self, int loops = -1)
2490	CODE:	2659	CODE:
2491	RETVAL = Mix_PlayMusic (self, loops);	2660	RETVAL = Mix_PlayMusic (self, loops);
2492	OUTPUT:	2661	OUTPUT:
2493	RETVAL	2662	RETVAL
2494		2663
2495	void	2664	void
2496	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2665	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497	CODE:	2666	CODE:
2498	Mix_FadeInMusicPos (self, loops, ms, position);	2667	Mix_FadeInMusicPos (self, loops, ms, position);
2499		2668
2500	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2669	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501		2670
2502	PROTOTYPES: ENABLE	2671	PROTOTYPES: ENABLE
2503		2672
2504	BOOT:	2673	BOOT:
2505	{	2674	{
2506	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2675	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507	static const struct {	2676	static const struct {
2508	const char *name;	2677	const char *name;
2509	IV iv;	2678	IV iv;
2510	} *civ, const_iv[] = {	2679	} *civ, const_iv[] = {
2511	# define const_iv(name) { # name, (IV)name }	2680	# define const_iv(name) { # name, (IV)name }
…		…
2546	const_iv (GL_INTENSITY),	2715	const_iv (GL_INTENSITY),
2547	const_iv (GL_LUMINANCE),	2716	const_iv (GL_LUMINANCE),
2548	const_iv (GL_LUMINANCE_ALPHA),	2717	const_iv (GL_LUMINANCE_ALPHA),
2549	const_iv (GL_FLOAT),	2718	const_iv (GL_FLOAT),
2550	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2719	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2720	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2721	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2722	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2723	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2724	const_iv (GL_COMPRESSED_RGB_ARB),
		2725	const_iv (GL_COMPRESSED_RGBA_ARB),
2551	const_iv (GL_COMPILE),	2726	const_iv (GL_COMPILE),
2552	const_iv (GL_PROXY_TEXTURE_1D),	2727	const_iv (GL_PROXY_TEXTURE_1D),
2553	const_iv (GL_PROXY_TEXTURE_2D),	2728	const_iv (GL_PROXY_TEXTURE_2D),
2554	const_iv (GL_TEXTURE_1D),	2729	const_iv (GL_TEXTURE_1D),
2555	const_iv (GL_TEXTURE_2D),	2730	const_iv (GL_TEXTURE_2D),
…		…
2594	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2769	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595	const_iv (GL_POINT_SMOOTH_HINT),	2770	const_iv (GL_POINT_SMOOTH_HINT),
2596	const_iv (GL_LINE_SMOOTH_HINT),	2771	const_iv (GL_LINE_SMOOTH_HINT),
2597	const_iv (GL_POLYGON_SMOOTH_HINT),	2772	const_iv (GL_POLYGON_SMOOTH_HINT),
2598	const_iv (GL_GENERATE_MIPMAP_HINT),	2773	const_iv (GL_GENERATE_MIPMAP_HINT),
		2774	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599	const_iv (GL_FASTEST),	2775	const_iv (GL_FASTEST),
2600	const_iv (GL_DONT_CARE),	2776	const_iv (GL_DONT_CARE),
2601	const_iv (GL_NICEST),	2777	const_iv (GL_NICEST),
2602	const_iv (GL_V2F),	2778	const_iv (GL_V2F),
2603	const_iv (GL_V3F),	2779	const_iv (GL_V3F),
…		…
2611		2787
2612	texture_av = newAV ();	2788	texture_av = newAV ();
2613	AvREAL_off (texture_av);	2789	AvREAL_off (texture_av);
2614	}	2790	}
2615		2791
		2792	void
		2793	disable_GL_EXT_blend_func_separate ()
		2794	CODE:
		2795	gl.BlendFuncSeparate = 0;
		2796	gl.BlendFuncSeparateEXT = 0;
		2797
2616	char *	2798	char *
2617	gl_vendor ()	2799	gl_vendor ()
2618	CODE:	2800	CODE:
2619	RETVAL = (char *)glGetString (GL_VENDOR);	2801	RETVAL = (char *)glGetString (GL_VENDOR);
2620	OUTPUT:	2802	OUTPUT:
…		…
2741		2923
2742	void glRect (float x1, float y1, float x2, float y2)	2924	void glRect (float x1, float y1, float x2, float y2)
2743	CODE:	2925	CODE:
2744	glRectf (x1, y1, x2, y2);	2926	glRectf (x1, y1, x2, y2);
2745		2927
		2928	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2929	CODE:
		2930	glBegin (GL_LINE_LOOP);
		2931	glVertex2f (x1, y1);
		2932	glVertex2f (x2, y1);
		2933	glVertex2f (x2, y2);
		2934	glVertex2f (x1, y2);
		2935	glEnd ();
		2936
2746	PROTOTYPES: ENABLE	2937	PROTOTYPES: ENABLE
2747		2938
2748	void glBegin (int mode)	2939	void glBegin (int mode)
2749		2940
2750	void glEnd ()	2941	void glEnd ()
…		…
2782	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2973	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2783	CODE:	2974	CODE:
2784	if (gl.SeparableFilter2D)	2975	if (gl.SeparableFilter2D)
2785	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2976	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786		2977
2787	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2978	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2788		2979
2789	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2980	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2790		2981
2791	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2982	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792		2983
…		…
2818		3009
2819	void glEndList ()	3010	void glEndList ()
2820		3011
2821	void glCallList (int list)	3012	void glCallList (int list)
2822		3013
2823	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3014	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2824		3015
2825	PROTOTYPES: DISABLE	3016	PROTOTYPES: DISABLE
2826		3017
2827	void	3018	void
2828	find_widget (SV *self, NV x, NV y)	3019	find_widget (SV *self, NV x, NV y)
…		…
2832	XPUSHs (self);	3023	XPUSHs (self);
2833	}	3024	}
2834		3025
2835	BOOT:	3026	BOOT:
2836	{	3027	{
2837	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3028	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838		3029
2839	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3030	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2840	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3031	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2841	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3032	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2842	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3033	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2843	}	3034	}
2844		3035
2845	void	3036	void
2846	draw (SV *self)	3037	draw (SV *self)
2847	CODE:	3038	CODE:
…		…
2851	NV x, y, w, h;	3042	NV x, y, w, h;
2852	SV *draw_x_sv = GvSV (draw_x_gv);	3043	SV *draw_x_sv = GvSV (draw_x_gv);
2853	SV *draw_y_sv = GvSV (draw_y_gv);	3044	SV *draw_y_sv = GvSV (draw_y_gv);
2854	SV *draw_w_sv = GvSV (draw_w_gv);	3045	SV *draw_w_sv = GvSV (draw_w_gv);
2855	SV *draw_h_sv = GvSV (draw_h_gv);	3046	SV *draw_h_sv = GvSV (draw_h_gv);
2856	SV *hover;
2857	double draw_x, draw_y, draw_w, draw_h;	3047	double draw_x, draw_y;
2858		3048
2859	if (!SvROK (self))	3049	if (!SvROK (self))
2860	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3050	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861		3051
2862	hv = (HV *)SvRV (self);	3052	hv = (HV *)SvRV (self);
2863		3053
2864	if (SvTYPE (hv) != SVt_PVHV)	3054	if (SvTYPE (hv) != SVt_PVHV)
2865	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3055	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866		3056
2867	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3057	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2868	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3058	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2869		3059
2870	if (!h || !w)	3060	if (!h || !w)
…		…
2890	{	3080	{
2891	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3081	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892		3082
2893	if (svp && SvTRUE (*svp))	3083	if (svp && SvTRUE (*svp))
2894	{	3084	{
2895	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3085	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2896	glEnable (GL_BLEND);	3086	glEnable (GL_BLEND);
2897	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3087	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898	glBegin (GL_QUADS);	3088	glBegin (GL_QUADS);
2899	glVertex2f (0, 0);	3089	glVertex2f (0, 0);
2900	glVertex2f (w, 0);	3090	glVertex2f (w, 0);
…		…
2903	glEnd ();	3093	glEnd ();
2904	glDisable (GL_BLEND);	3094	glDisable (GL_BLEND);
2905	}	3095	}
2906	}	3096	}
2907	#if 0	3097	#if 0
2908	if ($ENV{CFPLUS_DEBUG} & 1) {	3098	// draw borders, for debugging
2909	glPushMatrix;	3099	glPushMatrix ();
2910	glColor 1, 1, 0, 1;	3100	glColor4f (1., 1., 0., 1.);
2911	glTranslate 0.375, 0.375;	3101	glTranslatef (.5, .5, 0.);
2912	glBegin GL_LINE_LOOP;	3102	glBegin (GL_LINE_LOOP);
2913	glVertex 0 , 0;	3103	glVertex2f (0 , 0);
2914	glVertex $self->{w} - 1, 0;	3104	glVertex2f (w - 1, 0);
2915	glVertex $self->{w} - 1, $self->{h} - 1;	3105	glVertex2f (w - 1, h - 1);
2916	glVertex 0 , $self->{h} - 1;	3106	glVertex2f (0 , h - 1);
2917	glEnd;	3107	glEnd ();
2918	glPopMatrix;	3108	glPopMatrix ();
2919	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920	}
2921	#endif	3109	#endif
2922	PUSHMARK (SP);	3110	PUSHMARK (SP);
2923	XPUSHs (self);	3111	XPUSHs (self);
2924	PUTBACK;	3112	PUTBACK;
2925	call_method ("_draw", G_VOID | G_DISCARD);	3113	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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