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.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.289 by root, Wed Dec 24 04:09:26 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;
		183	rc_t *rc;
155	} *CFPlus__Layout;	184	} *DC__Layout;
156		185
157	static CFPlus__Font default_font;	186	static DC__Font default_font;
158	static PangoContext *opengl_context;	187	static PangoContext *opengl_context;
159	static PangoFontMap *opengl_fontmap;	188	static PangoFontMap *opengl_fontmap;
160		189
161	static void	190	static void
162	substitute_func (FcPattern *pattern, gpointer data)	191	substitute_func (FcPattern *pattern, gpointer data)
…		…
167	#endif	196	#endif
168	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	197	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169	}	198	}
170		199
171	static void	200	static void
172	layout_update_font (CFPlus__Layout self)	201	layout_update_font (DC__Layout self)
173	{	202	{
174	/* 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
175	* reasonably well with bitstream vera	204	* reasonably well with dejavu/bistream fonts
176	*/	205	*/
177	PangoFontDescription *font = self->font ? self->font : default_font;	206	PangoFontDescription *font = self->font ? self->font : default_font;
178		207
179	pango_font_description_set_absolute_size (font,	208	pango_font_description_set_absolute_size (font,
180	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	209	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181		210
182	pango_layout_set_font_description (self->pl, font);	211	pango_layout_set_font_description (self->pl, font);
183	}	212	}
184		213
185	static void	214	static void
186	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	215	layout_get_pixel_size (DC__Layout self, int *w, int *h)
187	{	216	{
188	PangoRectangle rect;	217	PangoRectangle rect;
189		218
190	// get_pixel_* wrongly rounds down	219	// get_pixel_* wrongly rounds down
191	pango_layout_get_extents (self->pl, 0, &rect);	220	pango_layout_get_extents (self->pl, 0, &rect);
…		…
202		231
203	typedef uint16_t tileid;	232	typedef uint16_t tileid;
204	typedef uint16_t faceid;	233	typedef uint16_t faceid;
205		234
206	typedef struct {	235	typedef struct {
207	int name;	236	GLuint name;
208	int w, h;	237	int w, h;
209	float s, t;	238	float s, t;
210	uint8_t r, g, b, a;	239	uint8_t r, g, b, a;
211	tileid smoothtile;	240	tileid smoothtile;
212	uint8_t smoothlevel;	241	uint8_t smoothlevel;
		242	uint8_t unused; /* set to zero on use */
213	} maptex;	243	} maptex;
214		244
215	typedef struct {	245	typedef struct {
216	uint32_t player;	246	uint32_t player;
217	tileid tile[3];	247	tileid tile[3];
…		…
230	int faces; tileid *face2tile; // [faceid]	260	int faces; tileid *face2tile; // [faceid]
231	int texs; maptex *tex; // [tileid]	261	int texs; maptex *tex; // [tileid]
232		262
233	int32_t rows;	263	int32_t rows;
234	maprow *row;	264	maprow *row;
235	} *CFPlus__Map;	265	} *DC__Map;
236		266
237	static char *	267	static char *
238	prepend (char *ptr, int sze, int inc)	268	prepend (char *ptr, int sze, int inc)
239	{	269	{
240	char *p;	270	char *p;
…		…
278	self->texs *= 2;	308	self->texs *= 2;
279	}	309	}
280	}	310	}
281		311
282	static maprow *	312	static maprow *
283	map_get_row (CFPlus__Map self, int y)	313	map_get_row (DC__Map self, int y)
284	{	314	{
285	if (0 > y)	315	if (0 > y)
286	{	316	{
287	int extend = - y + MAP_EXTEND_Y;	317	int extend = - y + MAP_EXTEND_Y;
288	Prepend (maprow, self->row, self->rows, extend);	318	Prepend (maprow, self->row, self->rows, extend);
…		…
326		356
327	return row->col + (x - row->c0);	357	return row->col + (x - row->c0);
328	}	358	}
329		359
330	static mapcell *	360	static mapcell *
331	map_get_cell (CFPlus__Map self, int x, int y)	361	map_get_cell (DC__Map self, int x, int y)
332	{	362	{
333	return row_get_cell (map_get_row (self, y), x);	363	return row_get_cell (map_get_row (self, y), x);
334	}	364	}
335		365
336	static void	366	static void
337	map_clear (CFPlus__Map self)	367	map_clear (DC__Map self)
338	{	368	{
339	int r;	369	int r;
340		370
341	for (r = 0; r < self->rows; r++)	371	for (r = 0; r < self->rows; r++)
342	Safefree (self->row[r].col);	372	Safefree (self->row[r].col);
…		…
349	self->oy = 0;	379	self->oy = 0;
350	self->row = 0;	380	self->row = 0;
351	self->rows = 0;	381	self->rows = 0;
352	}	382	}
353		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
354	static void	394	static void
355	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)
356	{	396	{
357	int x, y;	397	int x, y;
358	maprow *row;	398	maprow *row;
359	mapcell *cell;	399	mapcell *cell;
360		400
…		…
372	if (x >= row->c1)	412	if (x >= row->c1)
373	break;	413	break;
374		414
375	cell = row->col + x - row->c0;	415	cell = row->col + x - row->c0;
376		416
377	cell->darkness = 0;	417	CELL_CLEAR (cell);
378	cell->stat_hp = 0;
379	cell->flags = 0;
380	cell->player = 0;
381	}	418	}
382	}	419	}
383	}	420	}
384		421
385	typedef struct {	422	typedef struct {
…		…
439	n |= n >> 16;	476	n |= n >> 16;
440		477
441	return n + 1;	478	return n + 1;
442	}	479	}
443		480
		481	static unsigned int
		482	popcount (unsigned int n)
		483	{
		484	n -= (n >> 1) & 0x55555555U;
		485	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		486	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		487	n *= 0x01010101U;
		488
		489	return n >> 24;
		490	}
		491
444	/* SDL should provide this, really. */	492	/* SDL should provide this, really. */
445	#define SDLK_MODIFIER_MIN 300	493	#define SDLK_MODIFIER_MIN 300
446	#define SDLK_MODIFIER_MAX 314	494	#define SDLK_MODIFIER_MAX 314
447		495
448	/******************************************************************************/	496	/******************************************************************************/
…		…
486	return 0;	534	return 0;
487		535
488	return 1;	536	return 1;
489	}	537	}
490		538
491	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
492		592
493	PROTOTYPES: ENABLE	593	PROTOTYPES: ENABLE
494		594
495	BOOT:	595	BOOT:
496	{	596	{
497	HV *stash = gv_stashpv ("CFPlus", 1);	597	HV *stash = gv_stashpv ("DC", 1);
498	static const struct {	598	static const struct {
499	const char *name;	599	const char *name;
500	IV iv;	600	IV iv;
501	} *civ, const_iv[] = {	601	} *civ, const_iv[] = {
502	# define const_iv(name) { # name, (IV)name }	602	# define const_iv(name) { # name, (IV)name }
…		…
524		624
525	const_iv (SDL_APPINPUTFOCUS),	625	const_iv (SDL_APPINPUTFOCUS),
526	const_iv (SDL_APPMOUSEFOCUS),	626	const_iv (SDL_APPMOUSEFOCUS),
527	const_iv (SDL_APPACTIVE),	627	const_iv (SDL_APPACTIVE),
528		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),
		678
		679	const_iv (SDLK_FIRST),
		680	const_iv (SDLK_LAST),
529	const_iv (SDLK_KP0),	681	const_iv (SDLK_KP0),
530	const_iv (SDLK_KP1),	682	const_iv (SDLK_KP1),
531	const_iv (SDLK_KP2),	683	const_iv (SDLK_KP2),
532	const_iv (SDLK_KP3),	684	const_iv (SDLK_KP3),
533	const_iv (SDLK_KP4),	685	const_iv (SDLK_KP4),
…		…
605	const_iv (KMOD_LMETA),	757	const_iv (KMOD_LMETA),
606	const_iv (KMOD_RMETA),	758	const_iv (KMOD_RMETA),
607	const_iv (KMOD_NUM),	759	const_iv (KMOD_NUM),
608	const_iv (KMOD_CAPS),	760	const_iv (KMOD_CAPS),
609	const_iv (KMOD_MODE),	761	const_iv (KMOD_MODE),
		762
		763	const_iv (KMOD_LRAM),
		764
		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)
610	# undef const_iv	795	# undef const_iv
611	};	796	};
612		797
613	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; )
614	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
632		817
633	NV floor (NV x)	818	NV floor (NV x)
634		819
635	NV ceil (NV x)	820	NV ceil (NV x)
636		821
		822	IV minpot (UV n)
		823
		824	IV popcount (UV n)
		825
637	void	826	void
638	pango_init ()	827	pango_init ()
639	CODE:	828	CODE:
640	{	829	{
641	opengl_fontmap = pango_opengl_font_map_new ();	830	opengl_fontmap = pango_opengl_font_map_new ();
642	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);
643	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
644	}	838	}
645		839
646	char *
647	SDL_GetError ()	840	char *SDL_GetError ()
648		841
649	int	842	void SDL_braino ()
650	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651		843
652	void	844	int SDL_Init (U32 flags)
		845
		846	int SDL_InitSubSystem (U32 flags)
		847
		848	void SDL_QuitSubSystem (U32 flags)
		849
653	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
654		860
655	void	861	void
656	SDL_ListModes (int rgb, int alpha)	862	SDL_ListModes (int rgb, int alpha)
657	PPCODE:	863	PPCODE:
658	{	864	{
…		…
670	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	876	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	877	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	878	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673		879
674	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	880	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675	#if SDL_VERSION_ATLEAST(1,2,10)
676	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	881	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678	#endif
679		882
680	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	883	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681		884
682	if (m && m != (SDL_Rect **)-1)	885	if (m && m != (SDL_Rect **)-1)
683	while (*m)	886	while (*m)
684	{	887	{
685	if ((*m)->w >= 640 && (*m)->h >= 480)	888	if ((*m)->w >= 400 && (*m)->h >= 300)
686	{	889	{
687	AV *av = newAV ();	890	AV *av = newAV ();
688	av_push (av, newSViv ((*m)->w));	891	av_push (av, newSViv ((*m)->w));
689	av_push (av, newSViv ((*m)->h));	892	av_push (av, newSViv ((*m)->h));
690	av_push (av, newSViv (rgb));	893	av_push (av, newSViv (rgb));
…		…
714		917
715	if (RETVAL)	918	if (RETVAL)
716	{	919	{
717	av_clear (texture_av);	920	av_clear (texture_av);
718		921
719	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	922	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	923	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721	#include "glfunc.h"	924	#include "glfunc.h"
722	#undef GL_FUNC	925	#undef GL_FUNC
723	}	926	}
724	}	927	}
…		…
731	char *	934	char *
732	SDL_GetKeyName (int sym)	935	SDL_GetKeyName (int sym)
733		936
734	int	937	int
735	SDL_GetAppState ()	938	SDL_GetAppState ()
		939
		940	int
		941	SDL_GetModState ()
736		942
737	void	943	void
738	poll_events ()	944	poll_events ()
739	PPCODE:	945	PPCODE:
740	{	946	{
…		…
750	{	956	{
751	case SDL_KEYDOWN:	957	case SDL_KEYDOWN:
752	case SDL_KEYUP:	958	case SDL_KEYUP:
753	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	959	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	960	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755	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);
756	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 */
757	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	963	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758	break;	964	break;
759		965
760	case SDL_ACTIVEEVENT:	966	case SDL_ACTIVEEVENT:
761	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	967	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
779	x = ev.motion.x;	985	x = ev.motion.x;
780	y = ev.motion.y;	986	y = ev.motion.y;
781	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	987	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782	}	988	}
783		989
784	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	990	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785	hv_store (hv, "state", 5, newSViv (state), 0);	991	hv_store (hv, "state", 5, newSViv (state), 0);
786	hv_store (hv, "x", 1, newSViv (x), 0);	992	hv_store (hv, "x", 1, newSViv (x), 0);
787	hv_store (hv, "y", 1, newSViv (y), 0);	993	hv_store (hv, "y", 1, newSViv (y), 0);
788	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	994	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	995	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790	}	996	}
791	break;	997	break;
792		998
793	case SDL_MOUSEBUTTONDOWN:	999	case SDL_MOUSEBUTTONDOWN:
794	case SDL_MOUSEBUTTONUP:	1000	case SDL_MOUSEBUTTONUP:
795	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1001	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796		1002
797	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	1003	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1004	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1005	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1006	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
805	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1011	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1012	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807	break;	1013	break;
808	}	1014	}
809		1015
810	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))));
811	}	1017	}
812	}	1018	}
813		1019
814	int	1020	int
815	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	1021	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816	POSTCALL:	1022	POSTCALL:
817	Mix_HookMusicFinished (music_finished);	1023	Mix_HookMusicFinished (music_finished);
818	Mix_ChannelFinished (channel_finished);	1024	Mix_ChannelFinished (channel_finished);
		1025
		1026	void
		1027	Mix_QuerySpec ()
		1028	PPCODE:
		1029	{
		1030	int freq, channels;
		1031	Uint16 format;
		1032
		1033	if (Mix_QuerySpec (&freq, &format, &channels))
		1034	{
		1035	EXTEND (SP, 3);
		1036	PUSHs (sv_2mortal (newSViv (freq)));
		1037	PUSHs (sv_2mortal (newSViv (format)));
		1038	PUSHs (sv_2mortal (newSViv (channels)));
		1039	}
		1040	}
819		1041
820	void	1042	void
821	Mix_CloseAudio ()	1043	Mix_CloseAudio ()
822		1044
823	int	1045	int
…		…
858	}	1080	}
859	}	1081	}
860	#endif	1082	#endif
861	}	1083	}
862		1084
863	void	1085	int
864	add_font (char *file)	1086	add_font (char *file)
865	CODE:	1087	CODE:
866	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1089	OUTPUT:
		1090	RETVAL
867		1091
868	void	1092	void
869	load_image_inline (SV *image_)	1093	load_image_inline (SV *image_)
870	ALIAS:	1094	ALIAS:
871	load_image_file = 1	1095	load_image_file = 1
…		…
957	void	1181	void
958	error (char *message)	1182	error (char *message)
959	CODE:	1183	CODE:
960	fprintf (stderr, "ERROR: %s\n", message);	1184	fprintf (stderr, "ERROR: %s\n", message);
961	#ifdef _WIN32	1185	#ifdef _WIN32
962	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1186	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963	#endif	1187	#endif
964		1188
965	void	1189	void
966	fatal (char *message)	1190	fatal (char *message)
967	CODE:	1191	CODE:
968	fprintf (stderr, "FATAL: %s\n", message);	1192	fprintf (stderr, "FATAL: %s\n", message);
969	#ifdef _WIN32	1193	#ifdef _WIN32
970	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1194	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971	#endif	1195	#endif
972	_exit (1);	1196	_exit (1);
973		1197
974	void	1198	void
975	_exit (int retval = 0)	1199	_exit (int retval = 0)
…		…
987	#if DEBUG	1211	#if DEBUG
988	VALGRIND_DO_LEAK_CHECK;	1212	VALGRIND_DO_LEAK_CHECK;
989	#endif	1213	#endif
990	}	1214	}
991		1215
992	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
993		1224
994	PROTOTYPES: DISABLE	1225	PROTOTYPES: DISABLE
995		1226
996	CFPlus::Font	1227	DC::Font
997	new_from_file (SV *class, char *path, int id = 0)	1228	new_from_file (SV *class, char *path, int id = 0)
998	CODE:	1229	CODE:
999	{	1230	{
1000	int count;	1231	int count;
1001	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1232	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1004	}	1235	}
1005	OUTPUT:	1236	OUTPUT:
1006	RETVAL	1237	RETVAL
1007		1238
1008	void	1239	void
1009	DESTROY (CFPlus::Font self)	1240	DESTROY (DC::Font self)
1010	CODE:	1241	CODE:
1011	pango_font_description_free (self);	1242	pango_font_description_free (self);
1012		1243
1013	void	1244	void
1014	make_default (CFPlus::Font self)	1245	make_default (DC::Font self)
1015	PROTOTYPE: $	1246	PROTOTYPE: $
1016	CODE:	1247	CODE:
1017	default_font = self;	1248	default_font = self;
1018		1249
1019	MODULE = CFPlus PACKAGE = CFPlus::Layout	1250	MODULE = Deliantra::Client PACKAGE = DC::Layout
1020		1251
1021	PROTOTYPES: DISABLE	1252	PROTOTYPES: DISABLE
1022		1253
1023	void	1254	void
1024	reset_glyph_cache ()	1255	glyph_cache_backup ()
1025	PROTOTYPE:	1256	PROTOTYPE:
1026	CODE:	1257	CODE:
		1258	tc_backup ();
		1259
		1260	void
		1261	glyph_cache_restore ()
		1262	PROTOTYPE:
		1263	CODE:
1027	tc_clear ();	1264	tc_restore ();
1028		1265
1029	CFPlus::Layout	1266	DC::Layout
1030	new (SV *class)	1267	new (SV *class)
1031	CODE:	1268	CODE:
1032	New (0, RETVAL, 1, struct cf_layout);	1269	New (0, RETVAL, 1, struct cf_layout);
1033		1270
1034	RETVAL->pl = pango_layout_new (opengl_context);	1271	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1036	RETVAL->g = 1.;	1273	RETVAL->g = 1.;
1037	RETVAL->b = 1.;	1274	RETVAL->b = 1.;
1038	RETVAL->a = 1.;	1275	RETVAL->a = 1.;
1039	RETVAL->base_height = MIN_FONT_HEIGHT;	1276	RETVAL->base_height = MIN_FONT_HEIGHT;
1040	RETVAL->font = 0;	1277	RETVAL->font = 0;
		1278	RETVAL->rc = rc_alloc ();
1041		1279
1042	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1280	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043	layout_update_font (RETVAL);	1281	layout_update_font (RETVAL);
1044	OUTPUT:	1282	OUTPUT:
1045	RETVAL	1283	RETVAL
1046		1284
1047	void	1285	void
1048	DESTROY (CFPlus::Layout self)	1286	DESTROY (DC::Layout self)
1049	CODE:	1287	CODE:
1050	g_object_unref (self->pl);	1288	g_object_unref (self->pl);
		1289	rc_free (self->rc);
1051	Safefree (self);	1290	Safefree (self);
1052		1291
1053	void	1292	void
1054	set_text (CFPlus::Layout self, SV *text_)	1293	set_text (DC::Layout self, SV *text_)
1055	CODE:	1294	CODE:
1056	{	1295	{
1057	STRLEN textlen;	1296	STRLEN textlen;
1058	char *text = SvPVutf8 (text_, textlen);	1297	char *text = SvPVutf8 (text_, textlen);
1059		1298
1060	pango_layout_set_text (self->pl, text, textlen);	1299	pango_layout_set_text (self->pl, text, textlen);
1061	}	1300	}
1062		1301
1063	void	1302	void
1064	set_markup (CFPlus::Layout self, SV *text_)	1303	set_markup (DC::Layout self, SV *text_)
1065	CODE:	1304	CODE:
1066	{	1305	{
1067	STRLEN textlen;	1306	STRLEN textlen;
1068	char *text = SvPVutf8 (text_, textlen);	1307	char *text = SvPVutf8 (text_, textlen);
1069		1308
1070	pango_layout_set_markup (self->pl, text, textlen);	1309	pango_layout_set_markup (self->pl, text, textlen);
1071	}	1310	}
1072		1311
1073	void	1312	void
1074	set_shapes (CFPlus::Layout self, ...)	1313	set_shapes (DC::Layout self, ...)
1075	CODE:	1314	CODE:
1076	{	1315	{
1077	PangoAttrList *attrs = 0;	1316	PangoAttrList *attrs = 0;
1078	const char *text = pango_layout_get_text (self->pl);	1317	const char *text = pango_layout_get_text (self->pl);
1079	const char *pos = text;	1318	const char *pos = text;
…		…
1114	if (attrs)	1353	if (attrs)
1115	pango_layout_set_attributes (self->pl, attrs);	1354	pango_layout_set_attributes (self->pl, attrs);
1116	}	1355	}
1117		1356
1118	void	1357	void
1119	get_shapes (CFPlus::Layout self)	1358	get_shapes (DC::Layout self)
1120	PPCODE:	1359	PPCODE:
1121	{	1360	{
1122	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1361	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123		1362
1124	do	1363	do
1125	{	1364	{
1126	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1365	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127		1366
1128	if (run && shape_attr_p (run))	1367	if (run && shape_attr_p (run))
1129	{	1368	{
1130	PangoRectangle extents;	1369	PangoRectangle extents;
1131	pango_layout_iter_get_run_extents (iter, 0, &extents);	1370	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1139		1378
1140	pango_layout_iter_free (iter);	1379	pango_layout_iter_free (iter);
1141	}	1380	}
1142		1381
1143	int	1382	int
1144	has_wrapped (CFPlus::Layout self)	1383	has_wrapped (DC::Layout self)
1145	CODE:	1384	CODE:
1146	{	1385	{
1147	int lines = 1;	1386	int lines = 1;
1148	const char *text = pango_layout_get_text (self->pl);	1387	const char *text = pango_layout_get_text (self->pl);
1149		1388
…		…
1154	}	1393	}
1155	OUTPUT:	1394	OUTPUT:
1156	RETVAL	1395	RETVAL
1157		1396
1158	SV *	1397	SV *
1159	get_text (CFPlus::Layout self)	1398	get_text (DC::Layout self)
1160	CODE:	1399	CODE:
1161	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1400	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162	sv_utf8_decode (RETVAL);	1401	sv_utf8_decode (RETVAL);
1163	OUTPUT:	1402	OUTPUT:
1164	RETVAL	1403	RETVAL
1165		1404
1166	void	1405	void
1167	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.)
1168	CODE:	1407	CODE:
1169	self->r = r;	1408	self->r = r;
1170	self->g = g;	1409	self->g = g;
1171	self->b = b;	1410	self->b = b;
1172	self->a = a;	1411	self->a = a;
1173		1412
1174	void	1413	void
1175	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1414	set_font (DC::Layout self, DC::Font font = 0)
1176	CODE:	1415	CODE:
1177	if (self->font != font)	1416	if (self->font != font)
1178	{	1417	{
1179	self->font = font;	1418	self->font = font;
1180	layout_update_font (self);	1419	layout_update_font (self);
1181	}	1420	}
1182		1421
1183	void	1422	void
1184	set_height (CFPlus::Layout self, int base_height)	1423	set_height (DC::Layout self, int base_height)
1185	CODE:	1424	CODE:
1186	if (self->base_height != base_height)	1425	if (self->base_height != base_height)
1187	{	1426	{
1188	self->base_height = base_height;	1427	self->base_height = base_height;
1189	layout_update_font (self);	1428	layout_update_font (self);
1190	}	1429	}
1191		1430
1192	void	1431	void
1193	set_width (CFPlus::Layout self, int max_width = -1)	1432	set_width (DC::Layout self, int max_width = -1)
1194	CODE:	1433	CODE:
1195	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);
1196		1435
1197	void	1436	void
1198	set_indent (CFPlus::Layout self, int indent)	1437	set_indent (DC::Layout self, int indent)
1199	CODE:	1438	CODE:
1200	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1439	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201		1440
1202	void	1441	void
1203	set_spacing (CFPlus::Layout self, int spacing)	1442	set_spacing (DC::Layout self, int spacing)
1204	CODE:	1443	CODE:
1205	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1444	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206		1445
1207	void	1446	void
1208	set_ellipsise (CFPlus::Layout self, int ellipsise)	1447	set_ellipsise (DC::Layout self, int ellipsise)
1209	CODE:	1448	CODE:
1210	pango_layout_set_ellipsize (self->pl,	1449	pango_layout_set_ellipsize (self->pl,
1211	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1450	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1451	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1452	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214	: PANGO_ELLIPSIZE_NONE	1453	: PANGO_ELLIPSIZE_NONE
1215	);	1454	);
1216		1455
1217	void	1456	void
1218	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1457	set_single_paragraph_mode (DC::Layout self, int spm)
1219	CODE:	1458	CODE:
1220	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1459	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221		1460
1222	void	1461	void
1223	size (CFPlus::Layout self)	1462	size (DC::Layout self)
1224	PPCODE:	1463	PPCODE:
1225	{	1464	{
1226	int w, h;	1465	int w, h;
1227		1466
1228	layout_get_pixel_size (self, &w, &h);	1467	layout_get_pixel_size (self, &w, &h);
…		…
1231	PUSHs (sv_2mortal (newSViv (w)));	1470	PUSHs (sv_2mortal (newSViv (w)));
1232	PUSHs (sv_2mortal (newSViv (h)));	1471	PUSHs (sv_2mortal (newSViv (h)));
1233	}	1472	}
1234		1473
1235	int	1474	int
1236	descent (CFPlus::Layout self)	1475	descent (DC::Layout self)
1237	CODE:	1476	CODE:
1238	{	1477	{
1239	PangoRectangle rect;	1478	PangoRectangle rect;
1240	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1479	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241	pango_layout_line_get_pixel_extents (line, 0, &rect);	1480	pango_layout_line_get_pixel_extents (line, 0, &rect);
1242	RETVAL = PANGO_DESCENT (rect);	1481	RETVAL = PANGO_DESCENT (rect);
1243	}	1482	}
1244	OUTPUT:	1483	OUTPUT:
1245	RETVAL	1484	RETVAL
1246		1485
1247	int	1486	int
1248	xy_to_index (CFPlus::Layout self, int x, int y)	1487	xy_to_index (DC::Layout self, int x, int y)
1249	CODE:	1488	CODE:
1250	{	1489	{
1251	int index, trailing;	1490	int index, trailing;
1252	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);
1253	RETVAL = index + trailing;	1492	RETVAL = index + trailing;
1254	}	1493	}
1255	OUTPUT:	1494	OUTPUT:
1256	RETVAL	1495	RETVAL
1257		1496
1258	void	1497	void
1259	cursor_pos (CFPlus::Layout self, int index)	1498	cursor_pos (DC::Layout self, int index)
1260	PPCODE:	1499	PPCODE:
1261	{	1500	{
1262	PangoRectangle strong_pos;	1501	PangoRectangle pos;
1263	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1502	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264		1503
1265	EXTEND (SP, 3);	1504	EXTEND (SP, 3);
1266	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1505	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1506	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1507	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269	}	1508	}
1270		1509
1271	void	1510	void
1272	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)
1273	PPCODE:	1512	PPCODE:
1274	{	1513	{
1275	int line, x;	1514	int line, x;
1276		1515
1277	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)
1278	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1518	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279		1519	--line;
		1520	#endif
1280	EXTEND (SP, 2);	1521	EXTEND (SP, 2);
1281	PUSHs (sv_2mortal (newSViv (line - 1)));	1522	PUSHs (sv_2mortal (newSViv (line)));
1282	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1523	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283	}	1524	}
1284		1525
1285	void	1526	void
1286	line_x_to_index (CFPlus::Layout self, int line, int x)	1527	line_x_to_index (DC::Layout self, int line, int x)
1287	PPCODE:	1528	PPCODE:
1288	{	1529	{
1289	PangoLayoutLine *lp;	1530	PangoLayoutLine *lp;
1290	int index, trailing;	1531	int index, trailing;
1291		1532
1292	if (line < 0)	1533	if (line < 0)
1293	XSRETURN_EMPTY;	1534	XSRETURN_EMPTY;
1294		1535
1295	if (!(lp = pango_layout_get_line (self->pl, line)))	1536	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296	XSRETURN_EMPTY; /* do better */	1537	XSRETURN_EMPTY; /* do better */
1297		1538
1298	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);
1299		1540
1300	EXTEND (SP, 2);	1541	EXTEND (SP, 2);
…		…
1306	PUSHs (sv_2mortal (newSViv (trailing)));	1547	PUSHs (sv_2mortal (newSViv (trailing)));
1307	}	1548	}
1308	}	1549	}
1309		1550
1310	void	1551	void
1311	render (CFPlus::Layout self, float x, float y, int flags = 0)	1552	render (DC::Layout self, float x, float y, int flags = 0)
1312	PPCODE:	1553	CODE:
		1554	rc_clear (self->rc);
1313	pango_opengl_render_layout_subpixel (	1555	pango_opengl_render_layout_subpixel (
1314	self->pl,	1556	self->pl,
		1557	self->rc,
1315	x * PANGO_SCALE, y * PANGO_SCALE,	1558	x * PANGO_SCALE, y * PANGO_SCALE,
1316	self->r, self->g, self->b, self->a,	1559	self->r, self->g, self->b, self->a,
1317	flags	1560	flags
1318	);	1561	);
		1562	// we assume that context_change actually clears/frees stuff
		1563	// and does not do any recomputation...
		1564	pango_layout_context_changed (self->pl);
1319		1565
1320	MODULE = CFPlus PACKAGE = CFPlus::Texture	1566	void
		1567	draw (DC::Layout self)
		1568	CODE:
		1569	{
		1570	glEnable (GL_TEXTURE_2D);
		1571	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1572	glEnable (GL_BLEND);
		1573	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1574	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1575	glEnable (GL_ALPHA_TEST);
		1576	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1577
		1578	rc_draw (self->rc);
		1579
		1580	glDisable (GL_ALPHA_TEST);
		1581	glDisable (GL_BLEND);
		1582	glDisable (GL_TEXTURE_2D);
		1583	}
		1584
		1585	MODULE = Deliantra::Client PACKAGE = DC::Texture
1321		1586
1322	PROTOTYPES: ENABLE	1587	PROTOTYPES: ENABLE
1323
1324	int minpot (int n)
1325		1588
1326	void	1589	void
1327	pad (SV *data_, int ow, int oh, int nw, int nh)	1590	pad (SV *data_, int ow, int oh, int nw, int nh)
1328	CODE:	1591	CODE:
1329	{	1592	{
…		…
1406	RETVAL = width > 0;	1669	RETVAL = width > 0;
1407	}	1670	}
1408	OUTPUT:	1671	OUTPUT:
1409	RETVAL	1672	RETVAL
1410		1673
1411	MODULE = CFPlus PACKAGE = CFPlus::Map	1674	MODULE = Deliantra::Client PACKAGE = DC::Map
1412		1675
1413	PROTOTYPES: DISABLE	1676	PROTOTYPES: DISABLE
1414		1677
1415	CFPlus::Map	1678	DC::Map
1416	new (SV *class)	1679	new (SV *class)
1417	CODE:	1680	CODE:
1418	New (0, RETVAL, 1, struct map);	1681	New (0, RETVAL, 1, struct map);
1419	RETVAL->x = 0;	1682	RETVAL->x = 0;
1420	RETVAL->y = 0;	1683	RETVAL->y = 0;
…		…
1428	RETVAL->row = 0;	1691	RETVAL->row = 0;
1429	OUTPUT:	1692	OUTPUT:
1430	RETVAL	1693	RETVAL
1431		1694
1432	void	1695	void
1433	DESTROY (CFPlus::Map self)	1696	DESTROY (DC::Map self)
1434	CODE:	1697	CODE:
1435	{	1698	{
1436	map_clear (self);	1699	map_clear (self);
1437	Safefree (self->face2tile);	1700	Safefree (self->face2tile);
1438	Safefree (self->tex);	1701	Safefree (self->tex);
1439	Safefree (self);	1702	Safefree (self);
1440	}	1703	}
1441		1704
1442	void	1705	void
1443	resize (CFPlus::Map self, int map_width, int map_height)	1706	resize (DC::Map self, int map_width, int map_height)
1444	CODE:	1707	CODE:
1445	self->w = map_width;	1708	self->w = map_width;
1446	self->h = map_height;	1709	self->h = map_height;
1447		1710
1448	void	1711	void
1449	clear (CFPlus::Map self)	1712	clear (DC::Map self)
1450	CODE:	1713	CODE:
1451	map_clear (self);	1714	map_clear (self);
1452		1715
1453	void	1716	void
1454	set_tileid (CFPlus::Map self, int face, int tile)	1717	set_tileid (DC::Map self, int face, int tile)
1455	CODE:	1718	CODE:
1456	{	1719	{
1457	need_facenum (self, face); self->face2tile [face] = tile;	1720	need_facenum (self, face); self->face2tile [face] = tile;
1458	need_texid (self, tile);	1721	need_texid (self, tile);
1459	}	1722	}
1460		1723
1461	void	1724	void
1462	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1725	set_smooth (DC::Map self, int face, int smooth, int level)
1463	CODE:	1726	CODE:
1464	{	1727	{
1465	tileid texid;	1728	tileid texid;
1466	maptex *tex;	1729	maptex *tex;
1467		1730
…		…
1480	tex->smoothtile = self->face2tile [smooth];	1743	tex->smoothtile = self->face2tile [smooth];
1481	tex->smoothlevel = level;	1744	tex->smoothlevel = level;
1482	}	1745	}
1483		1746
1484	void	1747	void
1485	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)
1486	CODE:	1749	CODE:
1487	{	1750	{
1488	need_texid (self, texid);	1751	need_texid (self, texid);
1489		1752
1490	{	1753	{
…		…
1509	// use uglier nearest interpolation because linear suffers	1772	// use uglier nearest interpolation because linear suffers
1510	// from transparent color bleeding and ugly wrapping effects.	1773	// from transparent color bleeding and ugly wrapping effects.
1511	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1774	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512	}	1775	}
1513		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
1514	int	1797	int
1515	ox (CFPlus::Map self)	1798	ox (DC::Map self)
1516	ALIAS:	1799	ALIAS:
1517	oy = 1	1800	oy = 1
1518	x = 2	1801	x = 2
1519	y = 3	1802	y = 3
1520	w = 4	1803	w = 4
…		…
1531	}	1814	}
1532	OUTPUT:	1815	OUTPUT:
1533	RETVAL	1816	RETVAL
1534		1817
1535	void	1818	void
1536	scroll (CFPlus::Map self, int dx, int dy)	1819	scroll (DC::Map self, int dx, int dy)
1537	CODE:	1820	CODE:
1538	{	1821	{
1539	if (dx > 0)	1822	if (dx > 0)
1540	map_blank (self, self->x, self->y, dx, self->h);	1823	map_blank (self, self->x, self->y, dx, self->h);
1541	else if (dx < 0)	1824	else if (dx < 0)
…		…
1557	self->y += MAP_EXTEND_Y;	1840	self->y += MAP_EXTEND_Y;
1558	}	1841	}
1559	}	1842	}
1560		1843
1561	SV *	1844	SV *
1562	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1845	map1a_update (DC::Map self, SV *data_, int extmap)
1563	CODE:	1846	CODE:
1564	{	1847	{
1565	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1848	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566	uint8_t *data_end = (uint8_t *)SvEND (data_);	1849	uint8_t *data_end = (uint8_t *)SvEND (data_);
1567	mapcell *cell;	1850	mapcell *cell;
…		…
1595	uint8_t ext, cmd;	1878	uint8_t ext, cmd;
1596		1879
1597	do	1880	do
1598	{	1881	{
1599	ext = *data++;	1882	ext = *data++;
1600	cmd = ext & 0x3f;	1883	cmd = ext & 0x7f;
1601		1884
1602	if (cmd < 4)	1885	if (cmd < 4)
1603	cell->darkness = 255 - ext * 64 + 1;	1886	cell->darkness = 255 - ext * 64 + 1;
1604	else if (cmd == 5) // health	1887	else if (cmd == 5) // health
1605	{	1888	{
…		…
1608	}	1891	}
1609	else if (cmd == 6) // monster width	1892	else if (cmd == 6) // monster width
1610	cell->stat_width = *data++ + 1;	1893	cell->stat_width = *data++ + 1;
1611	else if (cmd == 0x47)	1894	else if (cmd == 0x47)
1612	{	1895	{
1613	if (*data == 4)	1896	if (*data == 1) cell->player = data [1];
1614	; // 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);
1615		1900
1616	data += *data + 1;	1901	data += *data + 1;
1617	}	1902	}
1618	else if (cmd == 8) // cell flags	1903	else if (cmd == 8) // cell flags
1619	cell->flags = *data++;	1904	cell->flags = *data++;
…		…
1636	cell->tile [z] = self->face2tile [face];	1921	cell->tile [z] = self->face2tile [face];
1637		1922
1638	if (cell->tile [z])	1923	if (cell->tile [z])
1639	{	1924	{
1640	maptex *tex = self->tex + cell->tile [z];	1925	maptex *tex = self->tex + cell->tile [z];
		1926	tex->unused = 0;
1641	if (!tex->name)	1927	if (!tex->name)
1642	av_push (missing, newSViv (cell->tile [z]));	1928	av_push (missing, newSViv (cell->tile [z]));
1643		1929
1644	if (tex->smoothtile)	1930	if (tex->smoothtile)
1645	{	1931	{
1646	maptex *smooth = self->tex + tex->smoothtile;	1932	maptex *smooth = self->tex + tex->smoothtile;
		1933	smooth->unused = 0;
1647	if (!smooth->name)	1934	if (!smooth->name)
1648	av_push (missing, newSViv (tex->smoothtile));	1935	av_push (missing, newSViv (tex->smoothtile));
1649	}	1936	}
1650	}	1937	}
1651	}	1938	}
1652	}	1939	}
1653	else	1940	else
1654	cell->darkness = 0;	1941	CELL_CLEAR (cell);
1655	}	1942	}
1656	}	1943	}
1657	OUTPUT:	1944	OUTPUT:
1658	RETVAL	1945	RETVAL
1659		1946
1660	SV *	1947	SV *
1661	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)
1662	CODE:	1949	CODE:
1663	{	1950	{
1664	int x1, x;	1951	int x1, x;
1665	int y1, y;	1952	int y1, y;
1666	int z;	1953	int z;
…		…
1711	}	1998	}
1712	OUTPUT:	1999	OUTPUT:
1713	RETVAL	2000	RETVAL
1714		2001
1715	void	2002	void
1716	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)
1717	CODE:	2004	CODE:
1718	{	2005	{
1719	int x, y, z;	2006	int x, y, z;
1720		2007
1721	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2008	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722	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
1723	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	2010	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724	smooth_key skey;	2011	smooth_key skey;
1725		2012	int pl_x, pl_y;
		2013	maptex pl_tex;
1726	rc_t *rc = rc_alloc ();	2014	rc_t *rc = rc_alloc ();
		2015	rc_t *rc_ov = rc_alloc ();
1727	rc_key_t key;	2016	rc_key_t key;
1728	rc_array_t *arr;	2017	rc_array_t *arr, *arr_hidden;
1729		2018
		2019	pl_tex.name = 0;
		2020
1730	// thats current max. sorry.	2021	// that's current max. sorry.
1731	if (sw > 255) sw = 255;	2022	if (sw > 255) sw = 255;
1732	if (sh > 255) sh = 255;	2023	if (sh > 255) sh = 255;
1733		2024
1734	// clear key, in case of extra padding	2025	// clear key, in case of extra padding
1735	memset (&skey, 0, sizeof (skey));	2026	memset (&skey, 0, sizeof (skey));
…		…
1739	key.g = 255;	2030	key.g = 255;
1740	key.b = 255;	2031	key.b = 255;
1741	key.a = 255;	2032	key.a = 255;
1742	key.mode = GL_QUADS;	2033	key.mode = GL_QUADS;
1743	key.format = GL_T2F_V3F;	2034	key.format = GL_T2F_V3F;
1744	key.texname = -1;
1745		2035
1746	mx += self->x;	2036	mx += self->x;
1747	my += self->y;	2037	my += self->y;
1748		2038
1749	// first pass: determine smooth_max	2039	// first pass: determine smooth_max
…		…
1770		2060
1771	glEnable (GL_BLEND);	2061	glEnable (GL_BLEND);
1772	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2062	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1773	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2063	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774		2064
		2065	key.texname = self->tex [TEXID_HIDDEN].name;
		2066	arr_hidden = rc_array (rc_ov, &key);
		2067
1775	for (z = 0; z <= 2; z++)	2068	for (z = 0; z <= 2; z++)
1776	{	2069	{
1777	memset (smooth_level, 0, sizeof (smooth_level));	2070	memset (smooth_level, 0, sizeof (smooth_level));
		2071	key.texname = -1;
1778		2072
1779	for (y = 0; y < sh; y++)	2073	for (y = 0; y < sh; y++)
1780	if (0 <= y + my && y + my < self->rows)	2074	if (0 <= y + my && y + my < self->rows)
1781	{	2075	{
1782	maprow *row = self->row + (y + my);	2076	maprow *row = self->row + (y + my);
…		…
1790	if (tile)	2084	if (tile)
1791	{	2085	{
1792	maptex tex = self->tex [tile];	2086	maptex tex = self->tex [tile];
1793	int px, py;	2087	int px, py;
1794		2088
1795	// suppressing texture state switches here
1796	// is only moderately effective, but worth the extra effort
1797	if (key.texname != tex.name)	2089	if (key.texname != tex.name)
1798	{	2090	{
		2091	self->tex [tile].unused = 0;
		2092
1799	if (!tex.name)	2093	if (!tex.name)
1800	tex = self->tex [2]; /* missing, replace by noface */	2094	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801		2095
1802	key.texname = tex.name;	2096	key.texname = tex.name;
1803	arr = rc_array (rc, &key);	2097	arr = rc_array (rc, &key);
1804	}	2098	}
1805		2099
1806	px = (x + 1) * T - tex.w;	2100	px = (x + 1) * T - tex.w;
1807	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	}
1808		2110
1809	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2111	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810	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);
1811	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);
1812	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);
1813
1814	if (cell->flags && z == 2)
1815	{
1816	// overlays such as the speech bubble, probably more to come
1817	if (cell->flags & 1)
1818	{
1819	maptex tex = self->tex [1];
1820	int px = x * T + T * 2 / 32;
1821	int py = y * T - T * 6 / 32;
1822
1823	if (tex.name)
1824	{
1825	if (key.texname != tex.name)
1826	{
1827	key.texname = tex.name;
1828	arr = rc_array (rc, &key);
1829	}
1830
1831	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1832	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1833	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1834	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1835	}
1836	}
1837	}
1838		2115
1839	// update smooth hash	2116	// update smooth hash
1840	if (tex.smoothtile)	2117	if (tex.smoothtile)
1841	{	2118	{
1842	skey.tile = tex.smoothtile;	2119	skey.tile = tex.smoothtile;
…		…
1873	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);
1874	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);
1875	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);
1876	}	2153	}
1877	}	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	int px = x * T + T * 2 / 32;
		2180	int py = y * T - T * 6 / 32;
		2181
		2182	key_ov.texname = tex.name;
		2183	arr = rc_array (rc_ov, &key_ov);
		2184
		2185	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2186	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2187	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2188	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
		2189	}
		2190	}
		2191	}
1878	}	2192	}
1879	}	2193	}
1880		2194
1881	rc_draw (rc);	2195	rc_draw (rc);
1882	rc_clear (rc);	2196	rc_clear (rc);
…		…
1884	// go through all smoothlevels, lowest to highest, then draw.	2198	// go through all smoothlevels, lowest to highest, then draw.
1885	// this is basically counting sort	2199	// this is basically counting sort
1886	{	2200	{
1887	int w, b;	2201	int w, b;
1888		2202
		2203	glEnable (GL_TEXTURE_2D);
		2204	glBegin (GL_QUADS);
1889	for (w = 0; w < 256 / 32; ++w)	2205	for (w = 0; w < 256 / 32; ++w)
1890	{	2206	{
1891	uint32_t smask = smooth_level [w];	2207	uint32_t smask = smooth_level [w];
1892	if (smask)	2208	if (smask)
1893	for (b = 0; b < 32; ++b)	2209	for (b = 0; b < 32; ++b)
…		…
1918	{	2234	{
1919	// this time avoiding texture state changes	2235	// this time avoiding texture state changes
1920	// save gobs of state changes.	2236	// save gobs of state changes.
1921	if (key.texname != tex.name)	2237	if (key.texname != tex.name)
1922	{	2238	{
		2239	self->tex [skey->tile].unused = 0;
		2240
		2241	glEnd ();
1923	key.texname = tex.name;	2242	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924	arr = rc_array (rc, &key);	2243	glBegin (GL_QUADS);
1925	}	2244	}
1926		2245
1927	if (border)	2246	if (border)
1928	{	2247	{
1929	float ox = border * dx;	2248	float ox = border * dx;
1930		2249
1931	rc_t2f_v3f (arr, ox , 0.f , px , py , 0);	2250	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932	rc_t2f_v3f (arr, ox , dy , px , py + T, 0);	2251	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933	rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);	2252	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934	rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);	2253	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935	}	2254	}
1936		2255
1937	if (corner)	2256	if (corner)
1938	{	2257	{
1939	float ox = corner * dx;	2258	float ox = corner * dx;
1940		2259
1941	rc_t2f_v3f (arr, ox , dy , px , py , 0);	2260	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942	rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);	2261	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943	rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);	2262	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1944	rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);	2263	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945	}	2264	}
1946	}	2265	}
1947	}	2266	}
1948	}	2267	}
1949	}	2268	}
1950	}	2269	}
		2270
		2271	glEnd ();
		2272	glDisable (GL_TEXTURE_2D);
		2273	key.texname = -1;
1951	}	2274	}
1952		2275
1953	hv_clear (smooth);	2276	hv_clear (smooth);
		2277	}
		2278
		2279	if (pl_tex.name)
		2280	{
		2281	maptex tex = pl_tex;
		2282	int px = pl_x + sdx;
		2283	int py = pl_y + sdy;
		2284
		2285	key.texname = tex.name;
		2286	arr = rc_array (rc, &key);
		2287
		2288	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2289	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2290	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2291	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2292
1954	rc_draw (rc);	2293	rc_draw (rc);
1955	rc_clear (rc);
1956	}	2294	}
		2295
		2296	rc_draw (rc_ov);
		2297	rc_clear (rc_ov);
1957		2298
1958	glDisable (GL_BLEND);	2299	glDisable (GL_BLEND);
1959	rc_free (rc);	2300	rc_free (rc);
		2301	rc_free (rc_ov);
1960		2302
1961	// top layer: overlays such as the health bar	2303	// top layer: overlays such as the health bar
1962	for (y = 0; y < sh; y++)	2304	for (y = 0; y < sh; y++)
1963	if (0 <= y + my && y + my < self->rows)	2305	if (0 <= y + my && y + my < self->rows)
1964	{	2306	{
…		…
1969	{	2311	{
1970	mapcell *cell = row->col + (x + mx - row->c0);	2312	mapcell *cell = row->col + (x + mx - row->c0);
1971		2313
1972	int px = x * T;	2314	int px = x * T;
1973	int py = y * T;	2315	int py = y * T;
		2316
		2317	if (expect_false (cell->player == player))
		2318	{
		2319	px += sdx;
		2320	py += sdy;
		2321	}
1974		2322
1975	if (cell->stat_hp)	2323	if (cell->stat_hp)
1976	{	2324	{
1977	int width = cell->stat_width * T;	2325	int width = cell->stat_width * T;
1978	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2326	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
1989	}	2337	}
1990	}	2338	}
1991	}	2339	}
1992		2340
1993	void	2341	void
1994	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2342	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1995	CODE:	2343	CODE:
1996	{	2344	{
1997	static float color[16][3] = {	2345	static float color[16][3] = {
1998	{ 0.00F, 0.00F, 0.00F },	2346	{ 0.00F, 0.00F, 0.00F },
1999	{ 1.00F, 1.00F, 1.00F },	2347	{ 1.00F, 1.00F, 1.00F },
…		…
2049	glDisable (GL_BLEND);	2397	glDisable (GL_BLEND);
2050	glDisable (GL_TEXTURE_2D);	2398	glDisable (GL_TEXTURE_2D);
2051	}	2399	}
2052		2400
2053	void	2401	void
2054	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2402	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055	PPCODE:	2403	PPCODE:
2056	{	2404	{
2057	int x, y;	2405	int x, y;
2058	int sw1 = sw + 2;	2406	int sw1 = sw + 2;
2059	int sh1 = sh + 2;	2407	int sh1 = sh + 2;
…		…
2067	SvCUR_set (darkness3_sv, sw34 * sh3);	2415	SvCUR_set (darkness3_sv, sw34 * sh3);
2068		2416
2069	mx += self->x - 1;	2417	mx += self->x - 1;
2070	my += self->y - 1;	2418	my += self->y - 1;
2071		2419
2072	memset (darkness1, 255, sw1 * sh1);	2420	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2073		2421
2074	for (y = 0; y < sh1; y++)	2422	for (y = 0; y < sh1; y++)
2075	if (0 <= y + my && y + my < self->rows)	2423	if (0 <= y + my && y + my < self->rows)
2076	{	2424	{
2077	maprow *row = self->row + (y + my);	2425	maprow *row = self->row + (y + my);
…		…
2130	PUSHs (sv_2mortal (newSViv (sh3)));	2478	PUSHs (sv_2mortal (newSViv (sh3)));
2131	PUSHs (darkness3_sv);	2479	PUSHs (darkness3_sv);
2132	}	2480	}
2133		2481
2134	SV *	2482	SV *
2135	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2483	get_rect (DC::Map self, int x0, int y0, int w, int h)
2136	CODE:	2484	CODE:
2137	{	2485	{
2138	int x, y, x1, y1;	2486	int x, y, x1, y1;
2139	SV *data_sv = newSV (w * h * 7 + 5);	2487	SV *data_sv = newSV (w * h * 7 + 5);
2140	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2488	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2197	else	2545	else
2198	*data++ = 0;	2546	*data++ = 0;
2199	}	2547	}
2200	}	2548	}
2201		2549
		2550	/* if size is w*h + 5 then no data has been found */
		2551	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2552	{
2202	SvPOK_only (data_sv);	2553	SvPOK_only (data_sv);
2203	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2554	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2555	}
		2556
2204	RETVAL = data_sv;	2557	RETVAL = data_sv;
2205	}	2558	}
2206	OUTPUT:	2559	OUTPUT:
2207	RETVAL	2560	RETVAL
2208		2561
2209	void	2562	void
2210	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2563	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211	PPCODE:	2564	PPCODE:
2212	{	2565	{
2213	int x, y, z;	2566	int x, y, z;
2214	int w, h;	2567	int w, h;
2215	int x1, y1;	2568	int x1, y1;
		2569	STRLEN len;
		2570	uint8_t *data, *end;
		2571
		2572	len = SvLEN (data_sv);
		2573	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2574	data = SvPVbyte_nolen (data_sv);
		2575	end = data + len + 8;
		2576
		2577	if (len < 5)
		2578	XSRETURN_EMPTY;
2216		2579
2217	if (*data++ != 0)	2580	if (*data++ != 0)
2218	return; /* version mismatch */	2581	XSRETURN_EMPTY; /* version mismatch */
2219		2582
2220	w = *data++ << 8; w |= *data++;	2583	w = *data++ << 8; w |= *data++;
2221	h = *data++ << 8; h |= *data++;	2584	h = *data++ << 8; h |= *data++;
2222		2585
2223	// we need to do this 'cause we don't keep an absolute coord system for rows	2586	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2235	{	2598	{
2236	maprow *row = map_get_row (self, y);	2599	maprow *row = map_get_row (self, y);
2237		2600
2238	for (x = x0; x < x1; x++)	2601	for (x = x0; x < x1; x++)
2239	{	2602	{
		2603	uint8_t flags;
		2604
		2605	if (data + 7 >= end)
		2606	XSRETURN_EMPTY;
		2607
2240	uint8_t flags = *data++;	2608	flags = *data++;
2241		2609
2242	if (flags)	2610	if (flags)
2243	{	2611	{
2244	mapcell *cell = row_get_cell (row, x);	2612	mapcell *cell = row_get_cell (row, x);
2245	tileid tile[3] = { 0, 0, 0 };	2613	tileid tile[3] = { 0, 0, 0 };
…		…
2248	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2616	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2617	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250		2618
2251	if (cell->darkness == 0)	2619	if (cell->darkness == 0)
2252	{	2620	{
2253	cell->darkness = 0;	2621	/*cell->darkness = 0;*/
		2622	EXTEND (SP, 3);
2254		2623
2255	for (z = 0; z <= 2; z++)	2624	for (z = 0; z <= 2; z++)
2256	{	2625	{
2257	tileid t = tile [z];	2626	tileid t = tile [z];
2258		2627
2259	if (t >= self->texs || (t && !self->tex [t].name))	2628	if (t >= self->texs || (t && !self->tex [t].name))
2260	{	2629	{
2261	XPUSHs (sv_2mortal (newSViv (t)));	2630	PUSHs (sv_2mortal (newSViv (t)));
2262	need_texid (self, t);	2631	need_texid (self, t);
2263	}	2632	}
2264		2633
2265	cell->tile [z] = t;	2634	cell->tile [z] = t;
2266	}	2635	}
…		…
2268	}	2637	}
2269	}	2638	}
2270	}	2639	}
2271	}	2640	}
2272		2641
2273	MODULE = CFPlus PACKAGE = CFPlus::RW	2642	MODULE = Deliantra::Client PACKAGE = DC::RW
2274		2643
2275	CFPlus::RW	2644	DC::RW
2276	new (SV *class, SV *data_sv)	2645	new (SV *class, SV *data_sv)
2277	CODE:	2646	CODE:
2278	{	2647	{
2279	STRLEN datalen;	2648	STRLEN datalen;
2280	char *data = SvPVbyte (data_sv, datalen);	2649	char *data = SvPVbyte (data_sv, datalen);
…		…
2282	RETVAL = SDL_RWFromConstMem (data, datalen);	2651	RETVAL = SDL_RWFromConstMem (data, datalen);
2283	}	2652	}
2284	OUTPUT:	2653	OUTPUT:
2285	RETVAL	2654	RETVAL
2286		2655
2287	CFPlus::RW	2656	DC::RW
2288	new_from_file (SV *class, const char *path, const char *mode = "rb")	2657	new_from_file (SV *class, const char *path, const char *mode = "rb")
2289	CODE:	2658	CODE:
2290	RETVAL = SDL_RWFromFile (path, mode);	2659	RETVAL = SDL_RWFromFile (path, mode);
2291	OUTPUT:	2660	OUTPUT:
2292	RETVAL	2661	RETVAL
2293		2662
2294	# fails on win32:	2663	# fails on win32:
2295	# CFPlus.xs(2268) : error C2059: syntax error : '('	2664	# dc.xs(2268) : error C2059: syntax error : '('
2296	#void	2665	#void
2297	#close (CFPlus::RW self)	2666	#close (DC::RW self)
2298	# CODE:	2667	# CODE:
2299	# (self->(close)) (self);	2668	# (self->(close)) (self);
2300		2669
2301	MODULE = CFPlus PACKAGE = CFPlus::Channel	2670	MODULE = Deliantra::Client PACKAGE = DC::Channel
2302		2671
2303	PROTOTYPES: DISABLE	2672	PROTOTYPES: DISABLE
2304		2673
2305	CFPlus::Channel	2674	DC::Channel
2306	find ()	2675	find ()
2307	CODE:	2676	CODE:
2308	{	2677	{
2309	RETVAL = Mix_GroupAvailable (-1);	2678	RETVAL = Mix_GroupAvailable (-1);
2310		2679
…		…
2323	}	2692	}
2324	OUTPUT:	2693	OUTPUT:
2325	RETVAL	2694	RETVAL
2326		2695
2327	void	2696	void
2328	halt (CFPlus::Channel self)	2697	halt (DC::Channel self)
2329	CODE:	2698	CODE:
2330	Mix_HaltChannel (self);	2699	Mix_HaltChannel (self);
2331		2700
2332	void	2701	void
2333	expire (CFPlus::Channel self, int ticks = -1)	2702	expire (DC::Channel self, int ticks = -1)
2334	CODE:	2703	CODE:
2335	Mix_ExpireChannel (self, ticks);	2704	Mix_ExpireChannel (self, ticks);
2336		2705
2337	void	2706	void
2338	fade_out (CFPlus::Channel self, int ticks = -1)	2707	fade_out (DC::Channel self, int ticks = -1)
2339	CODE:	2708	CODE:
2340	Mix_FadeOutChannel (self, ticks);	2709	Mix_FadeOutChannel (self, ticks);
2341		2710
2342	int	2711	int
2343	volume (CFPlus::Channel self, int volume)	2712	volume (DC::Channel self, int volume)
2344	CODE:	2713	CODE:
2345	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2714	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346	OUTPUT:	2715	OUTPUT:
2347	RETVAL	2716	RETVAL
2348		2717
2349	void	2718	void
2350	unregister_all_effects (CFPlus::Channel self)	2719	unregister_all_effects (DC::Channel self)
2351	CODE:	2720	CODE:
2352	Mix_UnregisterAllEffects (self);	2721	Mix_UnregisterAllEffects (self);
2353		2722
2354	void	2723	void
2355	set_panning (CFPlus::Channel self, int left, int right)	2724	set_panning (DC::Channel self, int left, int right)
2356	CODE:	2725	CODE:
2357	left = CLAMP (left , 0, 255);	2726	left = CLAMP (left , 0, 255);
2358	right = CLAMP (right, 0, 255);	2727	right = CLAMP (right, 0, 255);
2359	Mix_SetPanning (self, left, right);	2728	Mix_SetPanning (self, left, right);
2360		2729
2361	void	2730	void
2362	set_distance (CFPlus::Channel self, int distance)	2731	set_distance (DC::Channel self, int distance)
2363	CODE:	2732	CODE:
2364	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2733	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365		2734
2366	void	2735	void
2367	set_position (CFPlus::Channel self, int angle, int distance)	2736	set_position (DC::Channel self, int angle, int distance)
2368	CODE:	2737	CODE:
2369		2738
2370	void	2739	void
2371	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2740	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372	CODE:	2741	CODE:
2373	{	2742	{
2374	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2743	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2375	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2744	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2376	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2745	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377	}	2746	}
2378		2747
2379	void	2748	void
2380	set_reverse_stereo (CFPlus::Channel self, int flip)	2749	set_reverse_stereo (DC::Channel self, int flip)
2381	CODE:	2750	CODE:
2382	Mix_SetReverseStereo (self, flip);	2751	Mix_SetReverseStereo (self, flip);
2383		2752
2384	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2753	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385		2754
2386	PROTOTYPES: DISABLE	2755	PROTOTYPES: DISABLE
2387		2756
2388	CFPlus::MixChunk	2757	DC::MixChunk
2389	new (SV *class, CFPlus::RW rwops)	2758	new (SV *class, DC::RW rwops)
2390	CODE:	2759	CODE:
2391	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2760	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392	OUTPUT:	2761	OUTPUT:
2393	RETVAL	2762	RETVAL
2394		2763
2395	void	2764	void
2396	DESTROY (CFPlus::MixChunk self)	2765	DESTROY (DC::MixChunk self)
2397	CODE:	2766	CODE:
2398	Mix_FreeChunk (self);	2767	Mix_FreeChunk (self);
2399		2768
2400	int	2769	int
2401	volume (CFPlus::MixChunk self, int volume = -1)	2770	volume (DC::MixChunk self, int volume = -1)
2402	CODE:	2771	CODE:
2403	if (items > 1)	2772	if (items > 1)
2404	volume = CLAMP (volume, 0, 128);	2773	volume = CLAMP (volume, 0, 128);
2405	RETVAL = Mix_VolumeChunk (self, volume);	2774	RETVAL = Mix_VolumeChunk (self, volume);
2406	OUTPUT:	2775	OUTPUT:
2407	RETVAL	2776	RETVAL
2408		2777
2409	CFPlus::Channel	2778	DC::Channel
2410	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2779	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411	CODE:	2780	CODE:
2412	{	2781	{
2413	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2782	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414		2783
2415	if (RETVAL < 0)	2784	if (RETVAL < 0)
…		…
2422	}	2791	}
2423	}	2792	}
2424	OUTPUT:	2793	OUTPUT:
2425	RETVAL	2794	RETVAL
2426		2795
2427	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2796	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428		2797
2429	int	2798	int
2430	volume (int volume = -1)	2799	volume (int volume = -1)
2431	PROTOTYPE: ;$	2800	PROTOTYPE: ;$
2432	CODE:	2801	CODE:
…		…
2444	void	2813	void
2445	halt ()	2814	halt ()
2446	CODE:	2815	CODE:
2447	Mix_HaltMusic ();	2816	Mix_HaltMusic ();
2448		2817
2449	CFPlus::MixMusic	2818	DC::MixMusic
2450	new (SV *class, CFPlus::RW rwops)	2819	new (SV *class, DC::RW rwops)
2451	CODE:	2820	CODE:
2452	RETVAL = Mix_LoadMUS_RW (rwops);	2821	RETVAL = Mix_LoadMUS_RW (rwops);
2453	OUTPUT:	2822	OUTPUT:
2454	RETVAL	2823	RETVAL
2455		2824
2456	void	2825	void
2457	DESTROY (CFPlus::MixMusic self)	2826	DESTROY (DC::MixMusic self)
2458	CODE:	2827	CODE:
2459	Mix_FreeMusic (self);	2828	Mix_FreeMusic (self);
2460		2829
2461	int	2830	int
2462	play (CFPlus::MixMusic self, int loops = -1)	2831	play (DC::MixMusic self, int loops = -1)
2463	CODE:	2832	CODE:
2464	RETVAL = Mix_PlayMusic (self, loops);	2833	RETVAL = Mix_PlayMusic (self, loops);
2465	OUTPUT:	2834	OUTPUT:
2466	RETVAL	2835	RETVAL
2467		2836
2468	void	2837	void
2469	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2838	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470	CODE:	2839	CODE:
2471	Mix_FadeInMusicPos (self, loops, ms, position);	2840	Mix_FadeInMusicPos (self, loops, ms, position);
2472		2841
2473	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2842	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474		2843
2475	PROTOTYPES: ENABLE	2844	PROTOTYPES: ENABLE
2476		2845
2477	BOOT:	2846	BOOT:
2478	{	2847	{
2479	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2848	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480	static const struct {	2849	static const struct {
2481	const char *name;	2850	const char *name;
2482	IV iv;	2851	IV iv;
2483	} *civ, const_iv[] = {	2852	} *civ, const_iv[] = {
2484	# define const_iv(name) { # name, (IV)name }	2853	# define const_iv(name) { # name, (IV)name }
…		…
2519	const_iv (GL_INTENSITY),	2888	const_iv (GL_INTENSITY),
2520	const_iv (GL_LUMINANCE),	2889	const_iv (GL_LUMINANCE),
2521	const_iv (GL_LUMINANCE_ALPHA),	2890	const_iv (GL_LUMINANCE_ALPHA),
2522	const_iv (GL_FLOAT),	2891	const_iv (GL_FLOAT),
2523	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2892	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2893	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2894	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2895	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2896	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2897	const_iv (GL_COMPRESSED_RGB_ARB),
		2898	const_iv (GL_COMPRESSED_RGBA_ARB),
2524	const_iv (GL_COMPILE),	2899	const_iv (GL_COMPILE),
2525	const_iv (GL_PROXY_TEXTURE_1D),	2900	const_iv (GL_PROXY_TEXTURE_1D),
2526	const_iv (GL_PROXY_TEXTURE_2D),	2901	const_iv (GL_PROXY_TEXTURE_2D),
2527	const_iv (GL_TEXTURE_1D),	2902	const_iv (GL_TEXTURE_1D),
2528	const_iv (GL_TEXTURE_2D),	2903	const_iv (GL_TEXTURE_2D),
…		…
2567	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2942	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568	const_iv (GL_POINT_SMOOTH_HINT),	2943	const_iv (GL_POINT_SMOOTH_HINT),
2569	const_iv (GL_LINE_SMOOTH_HINT),	2944	const_iv (GL_LINE_SMOOTH_HINT),
2570	const_iv (GL_POLYGON_SMOOTH_HINT),	2945	const_iv (GL_POLYGON_SMOOTH_HINT),
2571	const_iv (GL_GENERATE_MIPMAP_HINT),	2946	const_iv (GL_GENERATE_MIPMAP_HINT),
		2947	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572	const_iv (GL_FASTEST),	2948	const_iv (GL_FASTEST),
2573	const_iv (GL_DONT_CARE),	2949	const_iv (GL_DONT_CARE),
2574	const_iv (GL_NICEST),	2950	const_iv (GL_NICEST),
2575	const_iv (GL_V2F),	2951	const_iv (GL_V2F),
2576	const_iv (GL_V3F),	2952	const_iv (GL_V3F),
…		…
2584		2960
2585	texture_av = newAV ();	2961	texture_av = newAV ();
2586	AvREAL_off (texture_av);	2962	AvREAL_off (texture_av);
2587	}	2963	}
2588		2964
		2965	void
		2966	disable_GL_EXT_blend_func_separate ()
		2967	CODE:
		2968	gl.BlendFuncSeparate = 0;
		2969	gl.BlendFuncSeparateEXT = 0;
		2970
2589	char *	2971	char *
2590	gl_vendor ()	2972	gl_vendor ()
2591	CODE:	2973	CODE:
2592	RETVAL = (char *)glGetString (GL_VENDOR);	2974	RETVAL = (char *)glGetString (GL_VENDOR);
2593	OUTPUT:	2975	OUTPUT:
…		…
2685	void glRotate (float angle, float x, float y, float z)	3067	void glRotate (float angle, float x, float y, float z)
2686	CODE:	3068	CODE:
2687	glRotatef (angle, x, y, z);	3069	glRotatef (angle, x, y, z);
2688		3070
2689	void glColor (float r, float g, float b, float a = 1.0)	3071	void glColor (float r, float g, float b, float a = 1.0)
		3072	PROTOTYPE: @
2690	ALIAS:	3073	ALIAS:
2691	glColor_premultiply = 1	3074	glColor_premultiply = 1
2692	CODE:	3075	CODE:
2693	if (ix)	3076	if (ix)
2694	{	3077	{
…		…
2714		3097
2715	void glRect (float x1, float y1, float x2, float y2)	3098	void glRect (float x1, float y1, float x2, float y2)
2716	CODE:	3099	CODE:
2717	glRectf (x1, y1, x2, y2);	3100	glRectf (x1, y1, x2, y2);
2718		3101
		3102	void glRect_lineloop (float x1, float y1, float x2, float y2)
		3103	CODE:
		3104	glBegin (GL_LINE_LOOP);
		3105	glVertex2f (x1, y1);
		3106	glVertex2f (x2, y1);
		3107	glVertex2f (x2, y2);
		3108	glVertex2f (x1, y2);
		3109	glEnd ();
		3110
2719	PROTOTYPES: ENABLE	3111	PROTOTYPES: ENABLE
2720		3112
2721	void glBegin (int mode)	3113	void glBegin (int mode)
2722		3114
2723	void glEnd ()	3115	void glEnd ()
…		…
2755	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3147	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756	CODE:	3148	CODE:
2757	if (gl.SeparableFilter2D)	3149	if (gl.SeparableFilter2D)
2758	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3150	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759		3151
2760	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3152	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761		3153
2762	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3154	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763		3155
2764	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3156	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765		3157
…		…
2791		3183
2792	void glEndList ()	3184	void glEndList ()
2793		3185
2794	void glCallList (int list)	3186	void glCallList (int list)
2795		3187
2796	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3188	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797		3189
2798	PROTOTYPES: DISABLE	3190	PROTOTYPES: DISABLE
2799		3191
2800	void	3192	void
2801	find_widget (SV *self, NV x, NV y)	3193	find_widget (SV *self, NV x, NV y)
…		…
2805	XPUSHs (self);	3197	XPUSHs (self);
2806	}	3198	}
2807		3199
2808	BOOT:	3200	BOOT:
2809	{	3201	{
2810	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3202	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811		3203
2812	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3204	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2813	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3205	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2814	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3206	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2815	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3207	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816	}	3208	}
2817		3209
2818	void	3210	void
2819	draw (SV *self)	3211	draw (SV *self)
2820	CODE:	3212	CODE:
…		…
2824	NV x, y, w, h;	3216	NV x, y, w, h;
2825	SV *draw_x_sv = GvSV (draw_x_gv);	3217	SV *draw_x_sv = GvSV (draw_x_gv);
2826	SV *draw_y_sv = GvSV (draw_y_gv);	3218	SV *draw_y_sv = GvSV (draw_y_gv);
2827	SV *draw_w_sv = GvSV (draw_w_gv);	3219	SV *draw_w_sv = GvSV (draw_w_gv);
2828	SV *draw_h_sv = GvSV (draw_h_gv);	3220	SV *draw_h_sv = GvSV (draw_h_gv);
2829	SV *hover;
2830	double draw_x, draw_y, draw_w, draw_h;	3221	double draw_x, draw_y;
2831		3222
2832	if (!SvROK (self))	3223	if (!SvROK (self))
2833	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3224	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834		3225
2835	hv = (HV *)SvRV (self);	3226	hv = (HV *)SvRV (self);
2836		3227
2837	if (SvTYPE (hv) != SVt_PVHV)	3228	if (SvTYPE (hv) != SVt_PVHV)
2838	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3229	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839		3230
2840	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3231	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2841	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3232	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842		3233
2843	if (!h || !w)	3234	if (!h || !w)
…		…
2863	{	3254	{
2864	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3255	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865		3256
2866	if (svp && SvTRUE (*svp))	3257	if (svp && SvTRUE (*svp))
2867	{	3258	{
2868	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3259	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869	glEnable (GL_BLEND);	3260	glEnable (GL_BLEND);
2870	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3261	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871	glBegin (GL_QUADS);	3262	glBegin (GL_QUADS);
2872	glVertex2f (0, 0);	3263	glVertex2f (0, 0);
2873	glVertex2f (w, 0);	3264	glVertex2f (w, 0);
…		…
2876	glEnd ();	3267	glEnd ();
2877	glDisable (GL_BLEND);	3268	glDisable (GL_BLEND);
2878	}	3269	}
2879	}	3270	}
2880	#if 0	3271	#if 0
2881	if ($ENV{CFPLUS_DEBUG} & 1) {	3272	// draw borders, for debugging
2882	glPushMatrix;	3273	glPushMatrix ();
2883	glColor 1, 1, 0, 1;	3274	glColor4f (1., 1., 0., 1.);
2884	glTranslate 0.375, 0.375;	3275	glTranslatef (.5, .5, 0.);
2885	glBegin GL_LINE_LOOP;	3276	glBegin (GL_LINE_LOOP);
2886	glVertex 0 , 0;	3277	glVertex2f (0 , 0);
2887	glVertex $self->{w} - 1, 0;	3278	glVertex2f (w - 1, 0);
2888	glVertex $self->{w} - 1, $self->{h} - 1;	3279	glVertex2f (w - 1, h - 1);
2889	glVertex 0 , $self->{h} - 1;	3280	glVertex2f (0 , h - 1);
2890	glEnd;	3281	glEnd ();
2891	glPopMatrix;	3282	glPopMatrix ();
2892	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893	}
2894	#endif	3283	#endif
2895	PUSHMARK (SP);	3284	PUSHMARK (SP);
2896	XPUSHs (self);	3285	XPUSHs (self);
2897	PUTBACK;	3286	PUTBACK;
2898	call_method ("_draw", G_VOID | G_DISCARD);	3287	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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