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.229 by root, Mon Aug 13 16:20:17 2007 UTC vs.
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC

…		…
39	#include <SDL_endian.h>	39	#include <SDL_endian.h>
40	#include <SDL_image.h>	40	#include <SDL_image.h>
41	#include <SDL_mixer.h>	41	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	42	#include <SDL_opengl.h>
43		43
		44	/* work around os x broken headers */
		45	#ifdef __MACOSX__
		46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		47	#endif
		48
44	#define PANGO_ENABLE_BACKEND	49	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	50	#define G_DISABLE_CAST_CHECKS
46		51
47	#include <glib/gmacros.h>	52	#include <glib/gmacros.h>
48		53
49	#include <pango/pango.h>	54	#include <pango/pango.h>
		55
		56	#ifndef PANGO_VERSION_CHECK
		57	# define PANGO_VERSION_CHECK(a,b,c) 0
		58	#endif
		59
		60	#if !PANGO_VERSION_CHECK (1, 15, 2)
		61	# define pango_layout_get_line_readonly pango_layout_get_line
		62	# define pango_layout_get_lines_readonly pango_layout_get_lines
		63	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		64	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		65	#endif
50		66
51	#ifndef _WIN32	67	#ifndef _WIN32
52	# include <sys/types.h>	68	# include <sys/types.h>
53	# include <sys/socket.h>	69	# include <sys/socket.h>
54	# include <netinet/in.h>	70	# include <netinet/in.h>
55	# include <netinet/tcp.h>	71	# include <netinet/tcp.h>
56	# include <inttypes.h>	72	# include <inttypes.h>
57	#endif	73	#endif
58		74
		75	#if __GNUC__ >= 4
		76	# define expect(expr,value) __builtin_expect ((expr),(value))
		77	#else
		78	# define expect(expr,value) (expr)
		79	#endif
		80
		81	#define expect_false(expr) expect ((expr) != 0, 0)
		82	#define expect_true(expr) expect ((expr) != 0, 1)
		83
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		85
61	#define FOW_DARKNESS 32	86	#define FOW_DARKNESS 64
62		87
63	#define MAP_EXTEND_X 32	88	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	89	#define MAP_EXTEND_Y 512
65		90
66	#define MIN_FONT_HEIGHT 10	91	#define MIN_FONT_HEIGHT 10
67		92
68	#if 0	93	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	94	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70	#else	95
71	# define PARACHUTE 0	96	#define KMOD_LRAM 0x10000 // our extension
72	#endif	97
		98	#define TEXID_SPEECH 1
		99	#define TEXID_NOFACE 2
		100	#define TEXID_HIDDEN 3
73		101
74	static AV *texture_av;	102	static AV *texture_av;
75		103
76	static struct	104	static struct
77	{	105	{
…		…
120		148
121	#include "pango-font.c"	149	#include "pango-font.c"
122	#include "pango-fontmap.c"	150	#include "pango-fontmap.c"
123	#include "pango-render.c"	151	#include "pango-render.c"
124		152
125	typedef IV CFPlus__Channel;	153	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	154	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	155	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	156	typedef Mix_Music *DC__MixMusic;
129		157
130	typedef PangoFontDescription *CFPlus__Font;	158	typedef PangoFontDescription *DC__Font;
131		159
132	static int	160	static int
133	shape_attr_p (PangoLayoutRun *run)	161	shape_attr_p (PangoLayoutRun *run)
134	{	162	{
135	GSList *attrs = run->item->analysis.extra_attrs;	163	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		177
150	typedef struct cf_layout {	178	typedef struct cf_layout {
151	PangoLayout *pl;	179	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	180	float r, g, b, a; // default color for rgba mode
153	int base_height;	181	int base_height;
154	CFPlus__Font font;	182	DC__Font font;
155	rc_t *rc;	183	rc_t *rc;
156	} *CFPlus__Layout;	184	} *DC__Layout;
157		185
158	static CFPlus__Font default_font;	186	static DC__Font default_font;
159	static PangoContext *opengl_context;	187	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	188	static PangoFontMap *opengl_fontmap;
161		189
162	static void	190	static void
163	substitute_func (FcPattern *pattern, gpointer data)	191	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	196	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	197	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	198	}
171		199
172	static void	200	static void
173	layout_update_font (CFPlus__Layout self)	201	layout_update_font (DC__Layout self)
174	{	202	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	203	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	204	* reasonably well with dejavu/bistream fonts
177	*/	205	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	206	PangoFontDescription *font = self->font ? self->font : default_font;
179		207
180	pango_font_description_set_absolute_size (font,	208	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	209	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		210
183	pango_layout_set_font_description (self->pl, font);	211	pango_layout_set_font_description (self->pl, font);
184	}	212	}
185		213
186	static void	214	static void
187	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	215	layout_get_pixel_size (DC__Layout self, int *w, int *h)
188	{	216	{
189	PangoRectangle rect;	217	PangoRectangle rect;
190		218
191	// get_pixel_* wrongly rounds down	219	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	220	pango_layout_get_extents (self->pl, 0, &rect);
…		…
209	int w, h;	237	int w, h;
210	float s, t;	238	float s, t;
211	uint8_t r, g, b, a;	239	uint8_t r, g, b, a;
212	tileid smoothtile;	240	tileid smoothtile;
213	uint8_t smoothlevel;	241	uint8_t smoothlevel;
		242	uint8_t unused; /* set to zero on use */
214	} maptex;	243	} maptex;
215		244
216	typedef struct {	245	typedef struct {
217	uint32_t player;	246	uint32_t player;
218	tileid tile[3];	247	tileid tile[3];
…		…
231	int faces; tileid *face2tile; // [faceid]	260	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	261	int texs; maptex *tex; // [tileid]
233		262
234	int32_t rows;	263	int32_t rows;
235	maprow *row;	264	maprow *row;
236	} *CFPlus__Map;	265	} *DC__Map;
237		266
238	static char *	267	static char *
239	prepend (char *ptr, int sze, int inc)	268	prepend (char *ptr, int sze, int inc)
240	{	269	{
241	char *p;	270	char *p;
…		…
279	self->texs *= 2;	308	self->texs *= 2;
280	}	309	}
281	}	310	}
282		311
283	static maprow *	312	static maprow *
284	map_get_row (CFPlus__Map self, int y)	313	map_get_row (DC__Map self, int y)
285	{	314	{
286	if (0 > y)	315	if (0 > y)
287	{	316	{
288	int extend = - y + MAP_EXTEND_Y;	317	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	318	Prepend (maprow, self->row, self->rows, extend);
…		…
327		356
328	return row->col + (x - row->c0);	357	return row->col + (x - row->c0);
329	}	358	}
330		359
331	static mapcell *	360	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	361	map_get_cell (DC__Map self, int x, int y)
333	{	362	{
334	return row_get_cell (map_get_row (self, y), x);	363	return row_get_cell (map_get_row (self, y), x);
335	}	364	}
336		365
337	static void	366	static void
338	map_clear (CFPlus__Map self)	367	map_clear (DC__Map self)
339	{	368	{
340	int r;	369	int r;
341		370
342	for (r = 0; r < self->rows; r++)	371	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	372	Safefree (self->row[r].col);
…		…
350	self->oy = 0;	379	self->oy = 0;
351	self->row = 0;	380	self->row = 0;
352	self->rows = 0;	381	self->rows = 0;
353	}	382	}
354		383
		384	#define CELL_CLEAR(cell) \
		385	do { \
		386	if ((cell)->player) \
		387	(cell)->tile [2] = 0; \
		388	(cell)->darkness = 0; \
		389	(cell)->stat_hp = 0; \
		390	(cell)->flags = 0; \
		391	(cell)->player = 0; \
		392	} while (0)
		393
355	static void	394	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	395	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	396	{
358	int x, y;	397	int x, y;
359	maprow *row;	398	maprow *row;
360	mapcell *cell;	399	mapcell *cell;
361		400
…		…
373	if (x >= row->c1)	412	if (x >= row->c1)
374	break;	413	break;
375		414
376	cell = row->col + x - row->c0;	415	cell = row->col + x - row->c0;
377		416
378	cell->darkness = 0;	417	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	418	}
383	}	419	}
384	}	420	}
385		421
386	typedef struct {	422	typedef struct {
…		…
440	n |= n >> 16;	476	n |= n >> 16;
441		477
442	return n + 1;	478	return n + 1;
443	}	479	}
444		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
445	/* SDL should provide this, really. */	492	/* SDL should provide this, really. */
446	#define SDLK_MODIFIER_MIN 300	493	#define SDLK_MODIFIER_MIN 300
447	#define SDLK_MODIFIER_MAX 314	494	#define SDLK_MODIFIER_MAX 314
448		495
449	/******************************************************************************/	496	/******************************************************************************/
…		…
487	return 0;	534	return 0;
488		535
489	return 1;	536	return 1;
490	}	537	}
491		538
492	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
493		592
494	PROTOTYPES: ENABLE	593	PROTOTYPES: ENABLE
495		594
496	BOOT:	595	BOOT:
497	{	596	{
498	HV *stash = gv_stashpv ("CFPlus", 1);	597	HV *stash = gv_stashpv ("DC", 1);
499	static const struct {	598	static const struct {
500	const char *name;	599	const char *name;
501	IV iv;	600	IV iv;
502	} *civ, const_iv[] = {	601	} *civ, const_iv[] = {
503	# define const_iv(name) { # name, (IV)name }	602	# define const_iv(name) { # name, (IV)name }
…		…
525		624
526	const_iv (SDL_APPINPUTFOCUS),	625	const_iv (SDL_APPINPUTFOCUS),
527	const_iv (SDL_APPMOUSEFOCUS),	626	const_iv (SDL_APPMOUSEFOCUS),
528	const_iv (SDL_APPACTIVE),	627	const_iv (SDL_APPACTIVE),
529		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),
530	const_iv (SDLK_KP0),	681	const_iv (SDLK_KP0),
531	const_iv (SDLK_KP1),	682	const_iv (SDLK_KP1),
532	const_iv (SDLK_KP2),	683	const_iv (SDLK_KP2),
533	const_iv (SDLK_KP3),	684	const_iv (SDLK_KP3),
534	const_iv (SDLK_KP4),	685	const_iv (SDLK_KP4),
…		…
606	const_iv (KMOD_LMETA),	757	const_iv (KMOD_LMETA),
607	const_iv (KMOD_RMETA),	758	const_iv (KMOD_RMETA),
608	const_iv (KMOD_NUM),	759	const_iv (KMOD_NUM),
609	const_iv (KMOD_CAPS),	760	const_iv (KMOD_CAPS),
610	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)
611	# undef const_iv	795	# undef const_iv
612	};	796	};
613		797
614	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; )
615	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
633		817
634	NV floor (NV x)	818	NV floor (NV x)
635		819
636	NV ceil (NV x)	820	NV ceil (NV x)
637		821
		822	IV minpot (UV n)
		823
		824	IV popcount (UV n)
		825
638	void	826	void
639	pango_init ()	827	pango_init ()
640	CODE:	828	CODE:
641	{	829	{
642	opengl_fontmap = pango_opengl_font_map_new ();	830	opengl_fontmap = pango_opengl_font_map_new ();
643	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);
644	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
645	}	838	}
646		839
647	char *
648	SDL_GetError ()	840	char *SDL_GetError ()
649		841
650	int	842	void SDL_braino ()
651	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652		843
653	void	844	int SDL_Init (U32 flags)
		845
		846	int SDL_InitSubSystem (U32 flags)
		847
		848	void SDL_QuitSubSystem (U32 flags)
		849
654	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
655		860
656	void	861	void
657	SDL_ListModes (int rgb, int alpha)	862	SDL_ListModes (int rgb, int alpha)
658	PPCODE:	863	PPCODE:
659	{	864	{
…		…
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	876	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	877	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	878	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674		879
675	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	880	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);	881	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679	#endif
680		882
681	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	883	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682		884
683	if (m && m != (SDL_Rect **)-1)	885	if (m && m != (SDL_Rect **)-1)
684	while (*m)	886	while (*m)
685	{	887	{
686	if ((*m)->w >= 640 && (*m)->h >= 480)	888	if ((*m)->w >= 400 && (*m)->h >= 300)
687	{	889	{
688	AV *av = newAV ();	890	AV *av = newAV ();
689	av_push (av, newSViv ((*m)->w));	891	av_push (av, newSViv ((*m)->w));
690	av_push (av, newSViv ((*m)->h));	892	av_push (av, newSViv ((*m)->h));
691	av_push (av, newSViv (rgb));	893	av_push (av, newSViv (rgb));
…		…
715		917
716	if (RETVAL)	918	if (RETVAL)
717	{	919	{
718	av_clear (texture_av);	920	av_clear (texture_av);
719		921
720	SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");	922	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721	#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);
722	#include "glfunc.h"	924	#include "glfunc.h"
723	#undef GL_FUNC	925	#undef GL_FUNC
724	}	926	}
725	}	927	}
…		…
732	char *	934	char *
733	SDL_GetKeyName (int sym)	935	SDL_GetKeyName (int sym)
734		936
735	int	937	int
736	SDL_GetAppState ()	938	SDL_GetAppState ()
		939
		940	int
		941	SDL_GetModState ()
737		942
738	void	943	void
739	poll_events ()	944	poll_events ()
740	PPCODE:	945	PPCODE:
741	{	946	{
…		…
751	{	956	{
752	case SDL_KEYDOWN:	957	case SDL_KEYDOWN:
753	case SDL_KEYUP:	958	case SDL_KEYUP:
754	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	959	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	960	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756	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);
757	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 */
758	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	963	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759	break;	964	break;
760		965
761	case SDL_ACTIVEEVENT:	966	case SDL_ACTIVEEVENT:
762	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	967	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
780	x = ev.motion.x;	985	x = ev.motion.x;
781	y = ev.motion.y;	986	y = ev.motion.y;
782	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	987	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783	}	988	}
784		989
785	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	990	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786	hv_store (hv, "state", 5, newSViv (state), 0);	991	hv_store (hv, "state", 5, newSViv (state), 0);
787	hv_store (hv, "x", 1, newSViv (x), 0);	992	hv_store (hv, "x", 1, newSViv (x), 0);
788	hv_store (hv, "y", 1, newSViv (y), 0);	993	hv_store (hv, "y", 1, newSViv (y), 0);
789	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	994	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	995	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791	}	996	}
792	break;	997	break;
793		998
794	case SDL_MOUSEBUTTONDOWN:	999	case SDL_MOUSEBUTTONDOWN:
795	case SDL_MOUSEBUTTONUP:	1000	case SDL_MOUSEBUTTONUP:
796	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1001	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797		1002
798	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	1003	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1004	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1005	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1006	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
806	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1011	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1012	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808	break;	1013	break;
809	}	1014	}
810		1015
811	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))));
812	}	1017	}
813	}	1018	}
814		1019
815	int	1020	int
816	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)
817	POSTCALL:	1022	POSTCALL:
818	Mix_HookMusicFinished (music_finished);	1023	Mix_HookMusicFinished (music_finished);
819	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	}
820		1041
821	void	1042	void
822	Mix_CloseAudio ()	1043	Mix_CloseAudio ()
823		1044
824	int	1045	int
…		…
859	}	1080	}
860	}	1081	}
861	#endif	1082	#endif
862	}	1083	}
863		1084
864	void	1085	int
865	add_font (char *file)	1086	add_font (char *file)
866	CODE:	1087	CODE:
867	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1089	OUTPUT:
		1090	RETVAL
868		1091
869	void	1092	void
870	load_image_inline (SV *image_)	1093	load_image_inline (SV *image_)
871	ALIAS:	1094	ALIAS:
872	load_image_file = 1	1095	load_image_file = 1
…		…
958	void	1181	void
959	error (char *message)	1182	error (char *message)
960	CODE:	1183	CODE:
961	fprintf (stderr, "ERROR: %s\n", message);	1184	fprintf (stderr, "ERROR: %s\n", message);
962	#ifdef _WIN32	1185	#ifdef _WIN32
963	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1186	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964	#endif	1187	#endif
965		1188
966	void	1189	void
967	fatal (char *message)	1190	fatal (char *message)
968	CODE:	1191	CODE:
969	fprintf (stderr, "FATAL: %s\n", message);	1192	fprintf (stderr, "FATAL: %s\n", message);
970	#ifdef _WIN32	1193	#ifdef _WIN32
971	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1194	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972	#endif	1195	#endif
973	_exit (1);	1196	_exit (1);
974		1197
975	void	1198	void
976	_exit (int retval = 0)	1199	_exit (int retval = 0)
…		…
988	#if DEBUG	1211	#if DEBUG
989	VALGRIND_DO_LEAK_CHECK;	1212	VALGRIND_DO_LEAK_CHECK;
990	#endif	1213	#endif
991	}	1214	}
992		1215
993	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
994		1224
995	PROTOTYPES: DISABLE	1225	PROTOTYPES: DISABLE
996		1226
997	CFPlus::Font	1227	DC::Font
998	new_from_file (SV *class, char *path, int id = 0)	1228	new_from_file (SV *class, char *path, int id = 0)
999	CODE:	1229	CODE:
1000	{	1230	{
1001	int count;	1231	int count;
1002	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1232	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1005	}	1235	}
1006	OUTPUT:	1236	OUTPUT:
1007	RETVAL	1237	RETVAL
1008		1238
1009	void	1239	void
1010	DESTROY (CFPlus::Font self)	1240	DESTROY (DC::Font self)
1011	CODE:	1241	CODE:
1012	pango_font_description_free (self);	1242	pango_font_description_free (self);
1013		1243
1014	void	1244	void
1015	make_default (CFPlus::Font self)	1245	make_default (DC::Font self)
1016	PROTOTYPE: $	1246	PROTOTYPE: $
1017	CODE:	1247	CODE:
1018	default_font = self;	1248	default_font = self;
1019		1249
1020	MODULE = CFPlus PACKAGE = CFPlus::Layout	1250	MODULE = Deliantra::Client PACKAGE = DC::Layout
1021		1251
1022	PROTOTYPES: DISABLE	1252	PROTOTYPES: DISABLE
1023		1253
1024	void	1254	void
1025	reset_glyph_cache ()	1255	glyph_cache_backup ()
1026	PROTOTYPE:	1256	PROTOTYPE:
1027	CODE:	1257	CODE:
		1258	tc_backup ();
		1259
		1260	void
		1261	glyph_cache_restore ()
		1262	PROTOTYPE:
		1263	CODE:
1028	tc_clear ();	1264	tc_restore ();
1029		1265
1030	CFPlus::Layout	1266	DC::Layout
1031	new (SV *class)	1267	new (SV *class)
1032	CODE:	1268	CODE:
1033	New (0, RETVAL, 1, struct cf_layout);	1269	New (0, RETVAL, 1, struct cf_layout);
1034		1270
1035	RETVAL->pl = pango_layout_new (opengl_context);	1271	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1045	layout_update_font (RETVAL);	1281	layout_update_font (RETVAL);
1046	OUTPUT:	1282	OUTPUT:
1047	RETVAL	1283	RETVAL
1048		1284
1049	void	1285	void
1050	DESTROY (CFPlus::Layout self)	1286	DESTROY (DC::Layout self)
1051	CODE:	1287	CODE:
1052	g_object_unref (self->pl);	1288	g_object_unref (self->pl);
1053	rc_free (self->rc);	1289	rc_free (self->rc);
1054	Safefree (self);	1290	Safefree (self);
1055		1291
1056	void	1292	void
1057	set_text (CFPlus::Layout self, SV *text_)	1293	set_text (DC::Layout self, SV *text_)
1058	CODE:	1294	CODE:
1059	{	1295	{
1060	STRLEN textlen;	1296	STRLEN textlen;
1061	char *text = SvPVutf8 (text_, textlen);	1297	char *text = SvPVutf8 (text_, textlen);
1062		1298
1063	pango_layout_set_text (self->pl, text, textlen);	1299	pango_layout_set_text (self->pl, text, textlen);
1064	}	1300	}
1065		1301
1066	void	1302	void
1067	set_markup (CFPlus::Layout self, SV *text_)	1303	set_markup (DC::Layout self, SV *text_)
1068	CODE:	1304	CODE:
1069	{	1305	{
1070	STRLEN textlen;	1306	STRLEN textlen;
1071	char *text = SvPVutf8 (text_, textlen);	1307	char *text = SvPVutf8 (text_, textlen);
1072		1308
1073	pango_layout_set_markup (self->pl, text, textlen);	1309	pango_layout_set_markup (self->pl, text, textlen);
1074	}	1310	}
1075		1311
1076	void	1312	void
1077	set_shapes (CFPlus::Layout self, ...)	1313	set_shapes (DC::Layout self, ...)
1078	CODE:	1314	CODE:
1079	{	1315	{
1080	PangoAttrList *attrs = 0;	1316	PangoAttrList *attrs = 0;
1081	const char *text = pango_layout_get_text (self->pl);	1317	const char *text = pango_layout_get_text (self->pl);
1082	const char *pos = text;	1318	const char *pos = text;
…		…
1117	if (attrs)	1353	if (attrs)
1118	pango_layout_set_attributes (self->pl, attrs);	1354	pango_layout_set_attributes (self->pl, attrs);
1119	}	1355	}
1120		1356
1121	void	1357	void
1122	get_shapes (CFPlus::Layout self)	1358	get_shapes (DC::Layout self)
1123	PPCODE:	1359	PPCODE:
1124	{	1360	{
1125	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1361	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126		1362
1127	do	1363	do
1128	{	1364	{
1129	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1365	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130		1366
1131	if (run && shape_attr_p (run))	1367	if (run && shape_attr_p (run))
1132	{	1368	{
1133	PangoRectangle extents;	1369	PangoRectangle extents;
1134	pango_layout_iter_get_run_extents (iter, 0, &extents);	1370	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1142		1378
1143	pango_layout_iter_free (iter);	1379	pango_layout_iter_free (iter);
1144	}	1380	}
1145		1381
1146	int	1382	int
1147	has_wrapped (CFPlus::Layout self)	1383	has_wrapped (DC::Layout self)
1148	CODE:	1384	CODE:
1149	{	1385	{
1150	int lines = 1;	1386	int lines = 1;
1151	const char *text = pango_layout_get_text (self->pl);	1387	const char *text = pango_layout_get_text (self->pl);
1152		1388
…		…
1157	}	1393	}
1158	OUTPUT:	1394	OUTPUT:
1159	RETVAL	1395	RETVAL
1160		1396
1161	SV *	1397	SV *
1162	get_text (CFPlus::Layout self)	1398	get_text (DC::Layout self)
1163	CODE:	1399	CODE:
1164	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1400	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165	sv_utf8_decode (RETVAL);	1401	sv_utf8_decode (RETVAL);
1166	OUTPUT:	1402	OUTPUT:
1167	RETVAL	1403	RETVAL
1168		1404
1169	void	1405	void
1170	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.)
1171	CODE:	1407	CODE:
1172	self->r = r;	1408	self->r = r;
1173	self->g = g;	1409	self->g = g;
1174	self->b = b;	1410	self->b = b;
1175	self->a = a;	1411	self->a = a;
1176		1412
1177	void	1413	void
1178	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1414	set_font (DC::Layout self, DC::Font font = 0)
1179	CODE:	1415	CODE:
1180	if (self->font != font)	1416	if (self->font != font)
1181	{	1417	{
1182	self->font = font;	1418	self->font = font;
1183	layout_update_font (self);	1419	layout_update_font (self);
1184	}	1420	}
1185		1421
1186	void	1422	void
1187	set_height (CFPlus::Layout self, int base_height)	1423	set_height (DC::Layout self, int base_height)
1188	CODE:	1424	CODE:
1189	if (self->base_height != base_height)	1425	if (self->base_height != base_height)
1190	{	1426	{
1191	self->base_height = base_height;	1427	self->base_height = base_height;
1192	layout_update_font (self);	1428	layout_update_font (self);
1193	}	1429	}
1194		1430
1195	void	1431	void
1196	set_width (CFPlus::Layout self, int max_width = -1)	1432	set_width (DC::Layout self, int max_width = -1)
1197	CODE:	1433	CODE:
1198	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);
1199		1435
1200	void	1436	void
1201	set_indent (CFPlus::Layout self, int indent)	1437	set_indent (DC::Layout self, int indent)
1202	CODE:	1438	CODE:
1203	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1439	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204		1440
1205	void	1441	void
1206	set_spacing (CFPlus::Layout self, int spacing)	1442	set_spacing (DC::Layout self, int spacing)
1207	CODE:	1443	CODE:
1208	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1444	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209		1445
1210	void	1446	void
1211	set_ellipsise (CFPlus::Layout self, int ellipsise)	1447	set_ellipsise (DC::Layout self, int ellipsise)
1212	CODE:	1448	CODE:
1213	pango_layout_set_ellipsize (self->pl,	1449	pango_layout_set_ellipsize (self->pl,
1214	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1450	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1451	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1452	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217	: PANGO_ELLIPSIZE_NONE	1453	: PANGO_ELLIPSIZE_NONE
1218	);	1454	);
1219		1455
1220	void	1456	void
1221	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1457	set_single_paragraph_mode (DC::Layout self, int spm)
1222	CODE:	1458	CODE:
1223	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1459	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224		1460
1225	void	1461	void
1226	size (CFPlus::Layout self)	1462	size (DC::Layout self)
1227	PPCODE:	1463	PPCODE:
1228	{	1464	{
1229	int w, h;	1465	int w, h;
1230		1466
1231	layout_get_pixel_size (self, &w, &h);	1467	layout_get_pixel_size (self, &w, &h);
…		…
1234	PUSHs (sv_2mortal (newSViv (w)));	1470	PUSHs (sv_2mortal (newSViv (w)));
1235	PUSHs (sv_2mortal (newSViv (h)));	1471	PUSHs (sv_2mortal (newSViv (h)));
1236	}	1472	}
1237		1473
1238	int	1474	int
1239	descent (CFPlus::Layout self)	1475	descent (DC::Layout self)
1240	CODE:	1476	CODE:
1241	{	1477	{
1242	PangoRectangle rect;	1478	PangoRectangle rect;
1243	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1479	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244	pango_layout_line_get_pixel_extents (line, 0, &rect);	1480	pango_layout_line_get_pixel_extents (line, 0, &rect);
1245	RETVAL = PANGO_DESCENT (rect);	1481	RETVAL = PANGO_DESCENT (rect);
1246	}	1482	}
1247	OUTPUT:	1483	OUTPUT:
1248	RETVAL	1484	RETVAL
1249		1485
1250	int	1486	int
1251	xy_to_index (CFPlus::Layout self, int x, int y)	1487	xy_to_index (DC::Layout self, int x, int y)
1252	CODE:	1488	CODE:
1253	{	1489	{
1254	int index, trailing;	1490	int index, trailing;
1255	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);
1256	RETVAL = index + trailing;	1492	RETVAL = index + trailing;
1257	}	1493	}
1258	OUTPUT:	1494	OUTPUT:
1259	RETVAL	1495	RETVAL
1260		1496
1261	void	1497	void
1262	cursor_pos (CFPlus::Layout self, int index)	1498	cursor_pos (DC::Layout self, int index)
1263	PPCODE:	1499	PPCODE:
1264	{	1500	{
1265	PangoRectangle strong_pos;	1501	PangoRectangle pos;
1266	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1502	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267		1503
1268	EXTEND (SP, 3);	1504	EXTEND (SP, 3);
1269	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1505	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1506	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1507	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272	}	1508	}
1273		1509
1274	void	1510	void
1275	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)
1276	PPCODE:	1512	PPCODE:
1277	{	1513	{
1278	int line, x;	1514	int line, x;
1279		1515
1280	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)
1281	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1518	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282		1519	--line;
		1520	#endif
1283	EXTEND (SP, 2);	1521	EXTEND (SP, 2);
1284	PUSHs (sv_2mortal (newSViv (line - 1)));	1522	PUSHs (sv_2mortal (newSViv (line)));
1285	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1523	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286	}	1524	}
1287		1525
1288	void	1526	void
1289	line_x_to_index (CFPlus::Layout self, int line, int x)	1527	line_x_to_index (DC::Layout self, int line, int x)
1290	PPCODE:	1528	PPCODE:
1291	{	1529	{
1292	PangoLayoutLine *lp;	1530	PangoLayoutLine *lp;
1293	int index, trailing;	1531	int index, trailing;
1294		1532
1295	if (line < 0)	1533	if (line < 0)
1296	XSRETURN_EMPTY;	1534	XSRETURN_EMPTY;
1297		1535
1298	if (!(lp = pango_layout_get_line (self->pl, line)))	1536	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299	XSRETURN_EMPTY; /* do better */	1537	XSRETURN_EMPTY; /* do better */
1300		1538
1301	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);
1302		1540
1303	EXTEND (SP, 2);	1541	EXTEND (SP, 2);
…		…
1309	PUSHs (sv_2mortal (newSViv (trailing)));	1547	PUSHs (sv_2mortal (newSViv (trailing)));
1310	}	1548	}
1311	}	1549	}
1312		1550
1313	void	1551	void
1314	render (CFPlus::Layout self, float x, float y, int flags = 0)	1552	render (DC::Layout self, float x, float y, int flags = 0)
1315	CODE:	1553	CODE:
1316	rc_clear (self->rc);	1554	rc_clear (self->rc);
1317	pango_opengl_render_layout_subpixel (	1555	pango_opengl_render_layout_subpixel (
1318	self->pl,	1556	self->pl,
1319	self->rc,	1557	self->rc,
…		…
1324	// we assume that context_change actually clears/frees stuff	1562	// we assume that context_change actually clears/frees stuff
1325	// and does not do any recomputation...	1563	// and does not do any recomputation...
1326	pango_layout_context_changed (self->pl);	1564	pango_layout_context_changed (self->pl);
1327		1565
1328	void	1566	void
1329	draw (CFPlus::Layout self)	1567	draw (DC::Layout self)
1330	CODE:	1568	CODE:
1331	{	1569	{
1332	glEnable (GL_TEXTURE_2D);	1570	glEnable (GL_TEXTURE_2D);
1333	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1571	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334	glEnable (GL_BLEND);	1572	glEnable (GL_BLEND);
…		…
1342	glDisable (GL_ALPHA_TEST);	1580	glDisable (GL_ALPHA_TEST);
1343	glDisable (GL_BLEND);	1581	glDisable (GL_BLEND);
1344	glDisable (GL_TEXTURE_2D);	1582	glDisable (GL_TEXTURE_2D);
1345	}	1583	}
1346		1584
1347	MODULE = CFPlus PACKAGE = CFPlus::Texture	1585	MODULE = Deliantra::Client PACKAGE = DC::Texture
1348		1586
1349	PROTOTYPES: ENABLE	1587	PROTOTYPES: ENABLE
1350
1351	int minpot (int n)
1352		1588
1353	void	1589	void
1354	pad (SV *data_, int ow, int oh, int nw, int nh)	1590	pad (SV *data_, int ow, int oh, int nw, int nh)
1355	CODE:	1591	CODE:
1356	{	1592	{
…		…
1422	glDisable (GL_ALPHA_TEST);	1658	glDisable (GL_ALPHA_TEST);
1423	glDisable (GL_BLEND);	1659	glDisable (GL_BLEND);
1424	}	1660	}
1425	}	1661	}
1426		1662
		1663	void
		1664	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)
		1665	PROTOTYPE: @
		1666	CODE:
		1667	{
		1668	glEnable (GL_TEXTURE_2D);
		1669	glEnable (GL_BLEND);
		1670	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1672
		1673	glColor4f (intensity, intensity, intensity, 0.9);
		1674	glPushMatrix ();
		1675	glScalef (1./3, 1./3, 1.);
		1676
		1677	glBindTexture (GL_TEXTURE_2D, name1);
		1678
		1679	glBegin (GL_QUADS);
		1680	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
		1681	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
		1682	glTexCoord2f (s1, t1); glVertex2f (w1, h1);
		1683	glTexCoord2f (s1, 0); glVertex2f (w1, 0);
		1684	glEnd ();
		1685
		1686	glPopMatrix ();
		1687
		1688	glDisable (GL_TEXTURE_2D);
		1689	glDisable (GL_BLEND);
		1690	}
		1691
1427	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1692	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1428	CODE:	1693	CODE:
1429	{	1694	{
1430	GLint width;	1695	GLint width;
1431	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1696	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1433	RETVAL = width > 0;	1698	RETVAL = width > 0;
1434	}	1699	}
1435	OUTPUT:	1700	OUTPUT:
1436	RETVAL	1701	RETVAL
1437		1702
1438	MODULE = CFPlus PACKAGE = CFPlus::Map	1703	MODULE = Deliantra::Client PACKAGE = DC::Map
1439		1704
1440	PROTOTYPES: DISABLE	1705	PROTOTYPES: DISABLE
1441		1706
1442	CFPlus::Map	1707	DC::Map
1443	new (SV *class)	1708	new (SV *class)
1444	CODE:	1709	CODE:
1445	New (0, RETVAL, 1, struct map);	1710	New (0, RETVAL, 1, struct map);
1446	RETVAL->x = 0;	1711	RETVAL->x = 0;
1447	RETVAL->y = 0;	1712	RETVAL->y = 0;
…		…
1455	RETVAL->row = 0;	1720	RETVAL->row = 0;
1456	OUTPUT:	1721	OUTPUT:
1457	RETVAL	1722	RETVAL
1458		1723
1459	void	1724	void
1460	DESTROY (CFPlus::Map self)	1725	DESTROY (DC::Map self)
1461	CODE:	1726	CODE:
1462	{	1727	{
1463	map_clear (self);	1728	map_clear (self);
1464	Safefree (self->face2tile);	1729	Safefree (self->face2tile);
1465	Safefree (self->tex);	1730	Safefree (self->tex);
1466	Safefree (self);	1731	Safefree (self);
1467	}	1732	}
1468		1733
1469	void	1734	void
1470	resize (CFPlus::Map self, int map_width, int map_height)	1735	resize (DC::Map self, int map_width, int map_height)
1471	CODE:	1736	CODE:
1472	self->w = map_width;	1737	self->w = map_width;
1473	self->h = map_height;	1738	self->h = map_height;
1474		1739
1475	void	1740	void
1476	clear (CFPlus::Map self)	1741	clear (DC::Map self)
1477	CODE:	1742	CODE:
1478	map_clear (self);	1743	map_clear (self);
1479		1744
1480	void	1745	void
1481	set_tileid (CFPlus::Map self, int face, int tile)	1746	set_tileid (DC::Map self, int face, int tile)
1482	CODE:	1747	CODE:
1483	{	1748	{
1484	need_facenum (self, face); self->face2tile [face] = tile;	1749	need_facenum (self, face); self->face2tile [face] = tile;
1485	need_texid (self, tile);	1750	need_texid (self, tile);
1486	}	1751	}
1487		1752
1488	void	1753	void
1489	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1754	set_smooth (DC::Map self, int face, int smooth, int level)
1490	CODE:	1755	CODE:
1491	{	1756	{
1492	tileid texid;	1757	tileid texid;
1493	maptex *tex;	1758	maptex *tex;
1494		1759
…		…
1507	tex->smoothtile = self->face2tile [smooth];	1772	tex->smoothtile = self->face2tile [smooth];
1508	tex->smoothlevel = level;	1773	tex->smoothlevel = level;
1509	}	1774	}
1510		1775
1511	void	1776	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)	1777	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:	1778	CODE:
1514	{	1779	{
1515	need_texid (self, texid);	1780	need_texid (self, texid);
1516		1781
1517	{	1782	{
…		…
1536	// use uglier nearest interpolation because linear suffers	1801	// use uglier nearest interpolation because linear suffers
1537	// from transparent color bleeding and ugly wrapping effects.	1802	// from transparent color bleeding and ugly wrapping effects.
1538	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539	}	1804	}
1540		1805
		1806	void
		1807	expire_textures (DC::Map self, int texid, int count)
		1808	PPCODE:
		1809	for (; texid < self->texs && count; ++texid, --count)
		1810	{
		1811	maptex *tex = self->tex + texid;
		1812
		1813	if (tex->name)
		1814	{
		1815	if (tex->unused)
		1816	{
		1817	tex->name = 0;
		1818	tex->unused = 0;
		1819	XPUSHs (sv_2mortal (newSViv (texid)));
		1820	}
		1821	else
		1822	tex->unused = 1;
		1823	}
		1824	}
		1825
1541	int	1826	int
1542	ox (CFPlus::Map self)	1827	ox (DC::Map self)
1543	ALIAS:	1828	ALIAS:
1544	oy = 1	1829	oy = 1
1545	x = 2	1830	x = 2
1546	y = 3	1831	y = 3
1547	w = 4	1832	w = 4
…		…
1558	}	1843	}
1559	OUTPUT:	1844	OUTPUT:
1560	RETVAL	1845	RETVAL
1561		1846
1562	void	1847	void
1563	scroll (CFPlus::Map self, int dx, int dy)	1848	scroll (DC::Map self, int dx, int dy)
1564	CODE:	1849	CODE:
1565	{	1850	{
1566	if (dx > 0)	1851	if (dx > 0)
1567	map_blank (self, self->x, self->y, dx, self->h);	1852	map_blank (self, self->x, self->y, dx, self->h);
1568	else if (dx < 0)	1853	else if (dx < 0)
…		…
1584	self->y += MAP_EXTEND_Y;	1869	self->y += MAP_EXTEND_Y;
1585	}	1870	}
1586	}	1871	}
1587		1872
1588	SV *	1873	SV *
1589	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1874	map1a_update (DC::Map self, SV *data_, int extmap)
1590	CODE:	1875	CODE:
1591	{	1876	{
1592	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1877	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593	uint8_t *data_end = (uint8_t *)SvEND (data_);	1878	uint8_t *data_end = (uint8_t *)SvEND (data_);
1594	mapcell *cell;	1879	mapcell *cell;
…		…
1622	uint8_t ext, cmd;	1907	uint8_t ext, cmd;
1623		1908
1624	do	1909	do
1625	{	1910	{
1626	ext = *data++;	1911	ext = *data++;
1627	cmd = ext & 0x3f;	1912	cmd = ext & 0x7f;
1628		1913
1629	if (cmd < 4)	1914	if (cmd < 4)
1630	cell->darkness = 255 - ext * 64 + 1;	1915	cell->darkness = 255 - ext * 64 + 1;
1631	else if (cmd == 5) // health	1916	else if (cmd == 5) // health
1632	{	1917	{
…		…
1635	}	1920	}
1636	else if (cmd == 6) // monster width	1921	else if (cmd == 6) // monster width
1637	cell->stat_width = *data++ + 1;	1922	cell->stat_width = *data++ + 1;
1638	else if (cmd == 0x47)	1923	else if (cmd == 0x47)
1639	{	1924	{
1640	if (*data == 4)	1925	if (*data == 1) cell->player = data [1];
1641	; // decode player count	1926	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1927	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1928	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642		1929
1643	data += *data + 1;	1930	data += *data + 1;
1644	}	1931	}
1645	else if (cmd == 8) // cell flags	1932	else if (cmd == 8) // cell flags
1646	cell->flags = *data++;	1933	cell->flags = *data++;
…		…
1663	cell->tile [z] = self->face2tile [face];	1950	cell->tile [z] = self->face2tile [face];
1664		1951
1665	if (cell->tile [z])	1952	if (cell->tile [z])
1666	{	1953	{
1667	maptex *tex = self->tex + cell->tile [z];	1954	maptex *tex = self->tex + cell->tile [z];
		1955	tex->unused = 0;
1668	if (!tex->name)	1956	if (!tex->name)
1669	av_push (missing, newSViv (cell->tile [z]));	1957	av_push (missing, newSViv (cell->tile [z]));
1670		1958
1671	if (tex->smoothtile)	1959	if (tex->smoothtile)
1672	{	1960	{
1673	maptex *smooth = self->tex + tex->smoothtile;	1961	maptex *smooth = self->tex + tex->smoothtile;
		1962	smooth->unused = 0;
1674	if (!smooth->name)	1963	if (!smooth->name)
1675	av_push (missing, newSViv (tex->smoothtile));	1964	av_push (missing, newSViv (tex->smoothtile));
1676	}	1965	}
1677	}	1966	}
1678	}	1967	}
1679	}	1968	}
1680	else	1969	else
1681	cell->darkness = 0;	1970	CELL_CLEAR (cell);
1682	}	1971	}
1683	}	1972	}
1684	OUTPUT:	1973	OUTPUT:
1685	RETVAL	1974	RETVAL
1686		1975
1687	SV *	1976	SV *
1688	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1977	mapmap (DC::Map self, int x0, int y0, int w, int h)
1689	CODE:	1978	CODE:
1690	{	1979	{
1691	int x1, x;	1980	int x1, x;
1692	int y1, y;	1981	int y1, y;
1693	int z;	1982	int z;
…		…
1738	}	2027	}
1739	OUTPUT:	2028	OUTPUT:
1740	RETVAL	2029	RETVAL
1741		2030
1742	void	2031	void
1743	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	2032	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:	2033	CODE:
1745	{	2034	{
1746	int x, y, z;	2035	int x, y, z;
1747		2036
1748	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2037	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2038	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2039	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751	smooth_key skey;	2040	smooth_key skey;
1752		2041	int pl_x, pl_y;
		2042	maptex pl_tex;
1753	rc_t *rc = rc_alloc ();	2043	rc_t *rc = rc_alloc ();
		2044	rc_t *rc_ov = rc_alloc ();
1754	rc_key_t key;	2045	rc_key_t key;
1755	rc_array_t *arr;	2046	rc_array_t *arr, *arr_hidden;
1756		2047
		2048	pl_tex.name = 0;
		2049
1757	// thats current max. sorry.	2050	// that's current max. sorry.
1758	if (sw > 255) sw = 255;	2051	if (sw > 255) sw = 255;
1759	if (sh > 255) sh = 255;	2052	if (sh > 255) sh = 255;
1760		2053
1761	// clear key, in case of extra padding	2054	// clear key, in case of extra padding
1762	memset (&skey, 0, sizeof (skey));	2055	memset (&skey, 0, sizeof (skey));
…		…
1766	key.g = 255;	2059	key.g = 255;
1767	key.b = 255;	2060	key.b = 255;
1768	key.a = 255;	2061	key.a = 255;
1769	key.mode = GL_QUADS;	2062	key.mode = GL_QUADS;
1770	key.format = GL_T2F_V3F;	2063	key.format = GL_T2F_V3F;
1771	key.texname = -1;
1772		2064
1773	mx += self->x;	2065	mx += self->x;
1774	my += self->y;	2066	my += self->y;
1775		2067
1776	// first pass: determine smooth_max	2068	// first pass: determine smooth_max
…		…
1797		2089
1798	glEnable (GL_BLEND);	2090	glEnable (GL_BLEND);
1799	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2091	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1800	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2092	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801		2093
		2094	key.texname = self->tex [TEXID_HIDDEN].name;
		2095	arr_hidden = rc_array (rc_ov, &key);
		2096
1802	for (z = 0; z <= 2; z++)	2097	for (z = 0; z <= 2; z++)
1803	{	2098	{
1804	memset (smooth_level, 0, sizeof (smooth_level));	2099	memset (smooth_level, 0, sizeof (smooth_level));
		2100	key.texname = -1;
1805		2101
1806	for (y = 0; y < sh; y++)	2102	for (y = 0; y < sh; y++)
1807	if (0 <= y + my && y + my < self->rows)	2103	if (0 <= y + my && y + my < self->rows)
1808	{	2104	{
1809	maprow *row = self->row + (y + my);	2105	maprow *row = self->row + (y + my);
…		…
1819	maptex tex = self->tex [tile];	2115	maptex tex = self->tex [tile];
1820	int px, py;	2116	int px, py;
1821		2117
1822	if (key.texname != tex.name)	2118	if (key.texname != tex.name)
1823	{	2119	{
		2120	self->tex [tile].unused = 0;
		2121
1824	if (!tex.name)	2122	if (!tex.name)
1825	tex = self->tex [2]; /* missing, replace by noface */	2123	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1826		2124
1827	key.texname = tex.name;	2125	key.texname = tex.name;
1828	arr = rc_array (rc, &key);	2126	arr = rc_array (rc, &key);
1829	}	2127	}
1830		2128
1831	px = (x + 1) * T - tex.w;	2129	px = (x + 1) * T - tex.w;
1832	py = (y + 1) * T - tex.h;	2130	py = (y + 1) * T - tex.h;
		2131
		2132	if (expect_false (cell->player == player) && expect_false (z == 2))
		2133	{
		2134	pl_x = px;
		2135	pl_y = py;
		2136	pl_tex = tex;
		2137	continue;
		2138	}
1833		2139
1834	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2140	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2141	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1836	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2142	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1837	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2143	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1838
1839	if (cell->flags && z == 2)
1840	{
1841	// overlays such as the speech bubble, probably more to come
1842	if (cell->flags & 1)
1843	{
1844	maptex tex = self->tex [1];
1845	int px = x * T + T * 2 / 32;
1846	int py = y * T - T * 6 / 32;
1847
1848	if (tex.name)
1849	{
1850	if (key.texname != tex.name)
1851	{
1852	key.texname = tex.name;
1853	arr = rc_array (rc, &key);
1854	}
1855
1856	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1857	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1858	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1859	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1860	}
1861	}
1862	}
1863		2144
1864	// update smooth hash	2145	// update smooth hash
1865	if (tex.smoothtile)	2146	if (tex.smoothtile)
1866	{	2147	{
1867	skey.tile = tex.smoothtile;	2148	skey.tile = tex.smoothtile;
…		…
1896	// corners	2177	// corners
1897	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2178	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1898	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2179	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1899	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2180	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1900	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2181	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2182	}
		2183	}
		2184
		2185	if (expect_false (z == 2))
		2186	{
		2187	/* draw question marks on top of hidden spaces */
		2188	if (!cell->darkness)
		2189	{
		2190	maptex tex = self->tex [TEXID_HIDDEN];
		2191	int px = (x + 1) * T - tex.w;
		2192	int py = (y + 1) * T - tex.h;
		2193
		2194	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
		2195	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
		2196	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2197	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
		2198	}
		2199
		2200	if (expect_false (cell->flags))
		2201	{
		2202	// overlays such as the speech bubble, probably more to come
		2203	if (cell->flags & 1)
		2204	{
		2205	rc_key_t key_ov = key;
		2206	maptex tex = self->tex [TEXID_SPEECH];
		2207	rc_array_t *arr;
		2208	int px = x * T + T * 2 / 32;
		2209	int py = y * T - T * 6 / 32;
		2210
		2211	key_ov.texname = tex.name;
		2212	arr = rc_array (rc_ov, &key_ov);
		2213
		2214	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2215	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2216	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2217	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
		2218	}
1901	}	2219	}
1902	}	2220	}
1903	}	2221	}
1904	}	2222	}
1905		2223
…		…
1945	{	2263	{
1946	// this time avoiding texture state changes	2264	// this time avoiding texture state changes
1947	// save gobs of state changes.	2265	// save gobs of state changes.
1948	if (key.texname != tex.name)	2266	if (key.texname != tex.name)
1949	{	2267	{
		2268	self->tex [skey->tile].unused = 0;
		2269
1950	glEnd ();	2270	glEnd ();
1951	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2271	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1952	glBegin (GL_QUADS);	2272	glBegin (GL_QUADS);
1953	}	2273	}
1954		2274
…		…
1983	}	2303	}
1984		2304
1985	hv_clear (smooth);	2305	hv_clear (smooth);
1986	}	2306	}
1987		2307
		2308	if (pl_tex.name)
		2309	{
		2310	maptex tex = pl_tex;
		2311	int px = pl_x + sdx;
		2312	int py = pl_y + sdy;
		2313
		2314	key.texname = tex.name;
		2315	arr = rc_array (rc, &key);
		2316
		2317	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2318	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2319	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2320	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2321
		2322	rc_draw (rc);
		2323	}
		2324
		2325	rc_draw (rc_ov);
		2326	rc_clear (rc_ov);
		2327
1988	glDisable (GL_BLEND);	2328	glDisable (GL_BLEND);
1989	rc_free (rc);	2329	rc_free (rc);
		2330	rc_free (rc_ov);
1990		2331
1991	// top layer: overlays such as the health bar	2332	// top layer: overlays such as the health bar
1992	for (y = 0; y < sh; y++)	2333	for (y = 0; y < sh; y++)
1993	if (0 <= y + my && y + my < self->rows)	2334	if (0 <= y + my && y + my < self->rows)
1994	{	2335	{
…		…
1999	{	2340	{
2000	mapcell *cell = row->col + (x + mx - row->c0);	2341	mapcell *cell = row->col + (x + mx - row->c0);
2001		2342
2002	int px = x * T;	2343	int px = x * T;
2003	int py = y * T;	2344	int py = y * T;
		2345
		2346	if (expect_false (cell->player == player))
		2347	{
		2348	px += sdx;
		2349	py += sdy;
		2350	}
2004		2351
2005	if (cell->stat_hp)	2352	if (cell->stat_hp)
2006	{	2353	{
2007	int width = cell->stat_width * T;	2354	int width = cell->stat_width * T;
2008	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2355	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2019	}	2366	}
2020	}	2367	}
2021	}	2368	}
2022		2369
2023	void	2370	void
2024	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2371	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2025	CODE:	2372	CODE:
2026	{	2373	{
2027	static float color[16][3] = {	2374	static float color[16][3] = {
2028	{ 0.00F, 0.00F, 0.00F },	2375	{ 0.00F, 0.00F, 0.00F },
2029	{ 1.00F, 1.00F, 1.00F },	2376	{ 1.00F, 1.00F, 1.00F },
…		…
2048	};	2395	};
2049		2396
2050	int x, y;	2397	int x, y;
2051		2398
2052	glEnable (GL_TEXTURE_2D);	2399	glEnable (GL_TEXTURE_2D);
		2400	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2401	* but the nvidia driver (185.18.14) mishandles alpha textures
		2402	* ansd takes the colour from god knows where instead of using
		2403	* Cp. MODULATE results in the same colour, but slightly different
		2404	* alpha, but atcually gives us the correct colour with nvidia.
		2405	*/
2053	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2406	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2054	glEnable (GL_BLEND);	2407	glEnable (GL_BLEND);
2055	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2408	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2056	glBegin (GL_QUADS);	2409	glBegin (GL_QUADS);
2057		2410
2058	for (y = 0; y < h; y++)	2411	for (y = 0; y < h; y++)
…		…
2065	float *c = color [m & 15];	2418	float *c = color [m & 15];
2066		2419
2067	float tx1 = m & 0x40 ? 0.5 : 0.;	2420	float tx1 = m & 0x40 ? 0.5 : 0.;
2068	float tx2 = tx1 + 0.5;	2421	float tx2 = tx1 + 0.5;
2069		2422
2070	glColor4f (c[0], c[1], c[2], 0.75);	2423	glColor4f (c[0], c[1], c[2], 1);
2071	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2424	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2072	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2425	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2073	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2426	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2074	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2427	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2075	}	2428	}
…		…
2079	glDisable (GL_BLEND);	2432	glDisable (GL_BLEND);
2080	glDisable (GL_TEXTURE_2D);	2433	glDisable (GL_TEXTURE_2D);
2081	}	2434	}
2082		2435
2083	void	2436	void
2084	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2437	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085	PPCODE:	2438	PPCODE:
2086	{	2439	{
2087	int x, y;	2440	int x, y;
2088	int sw1 = sw + 2;	2441	int sw1 = sw + 2;
2089	int sh1 = sh + 2;	2442	int sh1 = sh + 2;
…		…
2097	SvCUR_set (darkness3_sv, sw34 * sh3);	2450	SvCUR_set (darkness3_sv, sw34 * sh3);
2098		2451
2099	mx += self->x - 1;	2452	mx += self->x - 1;
2100	my += self->y - 1;	2453	my += self->y - 1;
2101		2454
2102	memset (darkness1, 255, sw1 * sh1);	2455	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2103		2456
2104	for (y = 0; y < sh1; y++)	2457	for (y = 0; y < sh1; y++)
2105	if (0 <= y + my && y + my < self->rows)	2458	if (0 <= y + my && y + my < self->rows)
2106	{	2459	{
2107	maprow *row = self->row + (y + my);	2460	maprow *row = self->row + (y + my);
…		…
2160	PUSHs (sv_2mortal (newSViv (sh3)));	2513	PUSHs (sv_2mortal (newSViv (sh3)));
2161	PUSHs (darkness3_sv);	2514	PUSHs (darkness3_sv);
2162	}	2515	}
2163		2516
2164	SV *	2517	SV *
2165	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2518	get_rect (DC::Map self, int x0, int y0, int w, int h)
2166	CODE:	2519	CODE:
2167	{	2520	{
2168	int x, y, x1, y1;	2521	int x, y, x1, y1;
2169	SV *data_sv = newSV (w * h * 7 + 5);	2522	SV *data_sv = newSV (w * h * 7 + 5);
2170	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2523	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2227	else	2580	else
2228	*data++ = 0;	2581	*data++ = 0;
2229	}	2582	}
2230	}	2583	}
2231		2584
		2585	/* if size is w*h + 5 then no data has been found */
		2586	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2587	{
2232	SvPOK_only (data_sv);	2588	SvPOK_only (data_sv);
2233	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2589	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2590	}
		2591
2234	RETVAL = data_sv;	2592	RETVAL = data_sv;
2235	}	2593	}
2236	OUTPUT:	2594	OUTPUT:
2237	RETVAL	2595	RETVAL
2238		2596
2239	void	2597	void
2240	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2598	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241	PPCODE:	2599	PPCODE:
2242	{	2600	{
2243	int x, y, z;	2601	int x, y, z;
2244	int w, h;	2602	int w, h;
2245	int x1, y1;	2603	int x1, y1;
		2604	STRLEN len;
		2605	uint8_t *data, *end;
		2606
		2607	len = SvLEN (data_sv);
		2608	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2609	data = SvPVbyte_nolen (data_sv);
		2610	end = data + len + 8;
		2611
		2612	if (len < 5)
		2613	XSRETURN_EMPTY;
2246		2614
2247	if (*data++ != 0)	2615	if (*data++ != 0)
2248	XSRETURN_EMPTY; /* version mismatch */	2616	XSRETURN_EMPTY; /* version mismatch */
2249		2617
2250	w = *data++ << 8; w |= *data++;	2618	w = *data++ << 8; w |= *data++;
…		…
2265	{	2633	{
2266	maprow *row = map_get_row (self, y);	2634	maprow *row = map_get_row (self, y);
2267		2635
2268	for (x = x0; x < x1; x++)	2636	for (x = x0; x < x1; x++)
2269	{	2637	{
		2638	uint8_t flags;
		2639
		2640	if (data + 7 >= end)
		2641	XSRETURN_EMPTY;
		2642
2270	uint8_t flags = *data++;	2643	flags = *data++;
2271		2644
2272	if (flags)	2645	if (flags)
2273	{	2646	{
2274	mapcell *cell = row_get_cell (row, x);	2647	mapcell *cell = row_get_cell (row, x);
2275	tileid tile[3] = { 0, 0, 0 };	2648	tileid tile[3] = { 0, 0, 0 };
…		…
2278	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2651	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2652	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280		2653
2281	if (cell->darkness == 0)	2654	if (cell->darkness == 0)
2282	{	2655	{
2283	cell->darkness = 0;	2656	/*cell->darkness = 0;*/
		2657	EXTEND (SP, 3);
2284		2658
2285	for (z = 0; z <= 2; z++)	2659	for (z = 0; z <= 2; z++)
2286	{	2660	{
2287	tileid t = tile [z];	2661	tileid t = tile [z];
2288		2662
2289	if (t >= self->texs || (t && !self->tex [t].name))	2663	if (t >= self->texs || (t && !self->tex [t].name))
2290	{	2664	{
2291	XPUSHs (sv_2mortal (newSViv (t)));	2665	PUSHs (sv_2mortal (newSViv (t)));
2292	need_texid (self, t);	2666	need_texid (self, t);
2293	}	2667	}
2294		2668
2295	cell->tile [z] = t;	2669	cell->tile [z] = t;
2296	}	2670	}
…		…
2298	}	2672	}
2299	}	2673	}
2300	}	2674	}
2301	}	2675	}
2302		2676
2303	MODULE = CFPlus PACKAGE = CFPlus::RW	2677	MODULE = Deliantra::Client PACKAGE = DC::RW
2304		2678
2305	CFPlus::RW	2679	DC::RW
2306	new (SV *class, SV *data_sv)	2680	new (SV *class, SV *data_sv)
2307	CODE:	2681	CODE:
2308	{	2682	{
2309	STRLEN datalen;	2683	STRLEN datalen;
2310	char *data = SvPVbyte (data_sv, datalen);	2684	char *data = SvPVbyte (data_sv, datalen);
…		…
2312	RETVAL = SDL_RWFromConstMem (data, datalen);	2686	RETVAL = SDL_RWFromConstMem (data, datalen);
2313	}	2687	}
2314	OUTPUT:	2688	OUTPUT:
2315	RETVAL	2689	RETVAL
2316		2690
2317	CFPlus::RW	2691	DC::RW
2318	new_from_file (SV *class, const char *path, const char *mode = "rb")	2692	new_from_file (SV *class, const char *path, const char *mode = "rb")
2319	CODE:	2693	CODE:
2320	RETVAL = SDL_RWFromFile (path, mode);	2694	RETVAL = SDL_RWFromFile (path, mode);
2321	OUTPUT:	2695	OUTPUT:
2322	RETVAL	2696	RETVAL
2323		2697
2324	# fails on win32:	2698	# fails on win32:
2325	# CFPlus.xs(2268) : error C2059: syntax error : '('	2699	# dc.xs(2268) : error C2059: syntax error : '('
2326	#void	2700	#void
2327	#close (CFPlus::RW self)	2701	#close (DC::RW self)
2328	# CODE:	2702	# CODE:
2329	# (self->(close)) (self);	2703	# (self->(close)) (self);
2330		2704
2331	MODULE = CFPlus PACKAGE = CFPlus::Channel	2705	MODULE = Deliantra::Client PACKAGE = DC::Channel
2332		2706
2333	PROTOTYPES: DISABLE	2707	PROTOTYPES: DISABLE
2334		2708
2335	CFPlus::Channel	2709	DC::Channel
2336	find ()	2710	find ()
2337	CODE:	2711	CODE:
2338	{	2712	{
2339	RETVAL = Mix_GroupAvailable (-1);	2713	RETVAL = Mix_GroupAvailable (-1);
2340		2714
…		…
2353	}	2727	}
2354	OUTPUT:	2728	OUTPUT:
2355	RETVAL	2729	RETVAL
2356		2730
2357	void	2731	void
2358	halt (CFPlus::Channel self)	2732	halt (DC::Channel self)
2359	CODE:	2733	CODE:
2360	Mix_HaltChannel (self);	2734	Mix_HaltChannel (self);
2361		2735
2362	void	2736	void
2363	expire (CFPlus::Channel self, int ticks = -1)	2737	expire (DC::Channel self, int ticks = -1)
2364	CODE:	2738	CODE:
2365	Mix_ExpireChannel (self, ticks);	2739	Mix_ExpireChannel (self, ticks);
2366		2740
2367	void	2741	void
2368	fade_out (CFPlus::Channel self, int ticks = -1)	2742	fade_out (DC::Channel self, int ticks = -1)
2369	CODE:	2743	CODE:
2370	Mix_FadeOutChannel (self, ticks);	2744	Mix_FadeOutChannel (self, ticks);
2371		2745
2372	int	2746	int
2373	volume (CFPlus::Channel self, int volume)	2747	volume (DC::Channel self, int volume)
2374	CODE:	2748	CODE:
2375	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2749	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376	OUTPUT:	2750	OUTPUT:
2377	RETVAL	2751	RETVAL
2378		2752
2379	void	2753	void
2380	unregister_all_effects (CFPlus::Channel self)	2754	unregister_all_effects (DC::Channel self)
2381	CODE:	2755	CODE:
2382	Mix_UnregisterAllEffects (self);	2756	Mix_UnregisterAllEffects (self);
2383		2757
2384	void	2758	void
2385	set_panning (CFPlus::Channel self, int left, int right)	2759	set_panning (DC::Channel self, int left, int right)
2386	CODE:	2760	CODE:
2387	left = CLAMP (left , 0, 255);	2761	left = CLAMP (left , 0, 255);
2388	right = CLAMP (right, 0, 255);	2762	right = CLAMP (right, 0, 255);
2389	Mix_SetPanning (self, left, right);	2763	Mix_SetPanning (self, left, right);
2390		2764
2391	void	2765	void
2392	set_distance (CFPlus::Channel self, int distance)	2766	set_distance (DC::Channel self, int distance)
2393	CODE:	2767	CODE:
2394	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2768	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395		2769
2396	void	2770	void
2397	set_position (CFPlus::Channel self, int angle, int distance)	2771	set_position (DC::Channel self, int angle, int distance)
2398	CODE:	2772	CODE:
2399		2773
2400	void	2774	void
2401	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2775	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402	CODE:	2776	CODE:
2403	{	2777	{
2404	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2778	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2405	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2779	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2406	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2780	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407	}	2781	}
2408		2782
2409	void	2783	void
2410	set_reverse_stereo (CFPlus::Channel self, int flip)	2784	set_reverse_stereo (DC::Channel self, int flip)
2411	CODE:	2785	CODE:
2412	Mix_SetReverseStereo (self, flip);	2786	Mix_SetReverseStereo (self, flip);
2413		2787
2414	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2788	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415		2789
2416	PROTOTYPES: DISABLE	2790	PROTOTYPES: DISABLE
2417		2791
2418	CFPlus::MixChunk	2792	DC::MixChunk
2419	new (SV *class, CFPlus::RW rwops)	2793	new (SV *class, DC::RW rwops)
2420	CODE:	2794	CODE:
2421	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2795	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422	OUTPUT:	2796	OUTPUT:
2423	RETVAL	2797	RETVAL
2424		2798
2425	void	2799	void
2426	DESTROY (CFPlus::MixChunk self)	2800	DESTROY (DC::MixChunk self)
2427	CODE:	2801	CODE:
2428	Mix_FreeChunk (self);	2802	Mix_FreeChunk (self);
2429		2803
2430	int	2804	int
2431	volume (CFPlus::MixChunk self, int volume = -1)	2805	volume (DC::MixChunk self, int volume = -1)
2432	CODE:	2806	CODE:
2433	if (items > 1)	2807	if (items > 1)
2434	volume = CLAMP (volume, 0, 128);	2808	volume = CLAMP (volume, 0, 128);
2435	RETVAL = Mix_VolumeChunk (self, volume);	2809	RETVAL = Mix_VolumeChunk (self, volume);
2436	OUTPUT:	2810	OUTPUT:
2437	RETVAL	2811	RETVAL
2438		2812
2439	CFPlus::Channel	2813	DC::Channel
2440	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2814	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441	CODE:	2815	CODE:
2442	{	2816	{
2443	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2817	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444		2818
2445	if (RETVAL < 0)	2819	if (RETVAL < 0)
…		…
2452	}	2826	}
2453	}	2827	}
2454	OUTPUT:	2828	OUTPUT:
2455	RETVAL	2829	RETVAL
2456		2830
2457	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2831	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458		2832
2459	int	2833	int
2460	volume (int volume = -1)	2834	volume (int volume = -1)
2461	PROTOTYPE: ;$	2835	PROTOTYPE: ;$
2462	CODE:	2836	CODE:
…		…
2474	void	2848	void
2475	halt ()	2849	halt ()
2476	CODE:	2850	CODE:
2477	Mix_HaltMusic ();	2851	Mix_HaltMusic ();
2478		2852
2479	CFPlus::MixMusic	2853	DC::MixMusic
2480	new (SV *class, CFPlus::RW rwops)	2854	new (SV *class, DC::RW rwops)
2481	CODE:	2855	CODE:
2482	RETVAL = Mix_LoadMUS_RW (rwops);	2856	RETVAL = Mix_LoadMUS_RW (rwops);
2483	OUTPUT:	2857	OUTPUT:
2484	RETVAL	2858	RETVAL
2485		2859
2486	void	2860	void
2487	DESTROY (CFPlus::MixMusic self)	2861	DESTROY (DC::MixMusic self)
2488	CODE:	2862	CODE:
2489	Mix_FreeMusic (self);	2863	Mix_FreeMusic (self);
2490		2864
2491	int	2865	int
2492	play (CFPlus::MixMusic self, int loops = -1)	2866	play (DC::MixMusic self, int loops = -1)
2493	CODE:	2867	CODE:
2494	RETVAL = Mix_PlayMusic (self, loops);	2868	RETVAL = Mix_PlayMusic (self, loops);
2495	OUTPUT:	2869	OUTPUT:
2496	RETVAL	2870	RETVAL
2497		2871
2498	void	2872	void
2499	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2873	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500	CODE:	2874	CODE:
2501	Mix_FadeInMusicPos (self, loops, ms, position);	2875	Mix_FadeInMusicPos (self, loops, ms, position);
2502		2876
2503	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2877	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504		2878
2505	PROTOTYPES: ENABLE	2879	PROTOTYPES: ENABLE
2506		2880
2507	BOOT:	2881	BOOT:
2508	{	2882	{
2509	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2883	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510	static const struct {	2884	static const struct {
2511	const char *name;	2885	const char *name;
2512	IV iv;	2886	IV iv;
2513	} *civ, const_iv[] = {	2887	} *civ, const_iv[] = {
2514	# define const_iv(name) { # name, (IV)name }	2888	# define const_iv(name) { # name, (IV)name }
2515	const_iv (GL_VENDOR),	2889	const_iv (GL_VENDOR),
2516	const_iv (GL_VERSION),	2890	const_iv (GL_VERSION),
2517	const_iv (GL_EXTENSIONS),	2891	const_iv (GL_EXTENSIONS),
		2892	const_iv (GL_MAX_TEXTURE_UNITS),
2518	const_iv (GL_COLOR_MATERIAL),	2893	const_iv (GL_COLOR_MATERIAL),
2519	const_iv (GL_SMOOTH),	2894	const_iv (GL_SMOOTH),
2520	const_iv (GL_FLAT),	2895	const_iv (GL_FLAT),
2521	const_iv (GL_DITHER),	2896	const_iv (GL_DITHER),
2522	const_iv (GL_BLEND),	2897	const_iv (GL_BLEND),
…		…
2534	const_iv (GL_ZERO),	2909	const_iv (GL_ZERO),
2535	const_iv (GL_SRC_ALPHA),	2910	const_iv (GL_SRC_ALPHA),
2536	const_iv (GL_DST_ALPHA),	2911	const_iv (GL_DST_ALPHA),
2537	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2912	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2538	const_iv (GL_ONE_MINUS_DST_ALPHA),	2913	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2914	const_iv (GL_SRC_COLOR),
		2915	const_iv (GL_DST_COLOR),
		2916	const_iv (GL_ONE_MINUS_SRC_COLOR),
		2917	const_iv (GL_ONE_MINUS_DST_COLOR),
2539	const_iv (GL_SRC_ALPHA_SATURATE),	2918	const_iv (GL_SRC_ALPHA_SATURATE),
2540	const_iv (GL_RGB),	2919	const_iv (GL_RGB),
2541	const_iv (GL_RGBA),	2920	const_iv (GL_RGBA),
2542	const_iv (GL_RGBA4),	2921	const_iv (GL_RGBA4),
2543	const_iv (GL_RGBA8),	2922	const_iv (GL_RGBA8),
…		…
2549	const_iv (GL_INTENSITY),	2928	const_iv (GL_INTENSITY),
2550	const_iv (GL_LUMINANCE),	2929	const_iv (GL_LUMINANCE),
2551	const_iv (GL_LUMINANCE_ALPHA),	2930	const_iv (GL_LUMINANCE_ALPHA),
2552	const_iv (GL_FLOAT),	2931	const_iv (GL_FLOAT),
2553	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2932	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2933	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2934	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2935	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2936	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2937	const_iv (GL_COMPRESSED_RGB_ARB),
		2938	const_iv (GL_COMPRESSED_RGBA_ARB),
2554	const_iv (GL_COMPILE),	2939	const_iv (GL_COMPILE),
2555	const_iv (GL_PROXY_TEXTURE_1D),	2940	const_iv (GL_PROXY_TEXTURE_1D),
2556	const_iv (GL_PROXY_TEXTURE_2D),	2941	const_iv (GL_PROXY_TEXTURE_2D),
2557	const_iv (GL_TEXTURE_1D),	2942	const_iv (GL_TEXTURE_1D),
2558	const_iv (GL_TEXTURE_2D),	2943	const_iv (GL_TEXTURE_2D),
…		…
2597	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2982	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598	const_iv (GL_POINT_SMOOTH_HINT),	2983	const_iv (GL_POINT_SMOOTH_HINT),
2599	const_iv (GL_LINE_SMOOTH_HINT),	2984	const_iv (GL_LINE_SMOOTH_HINT),
2600	const_iv (GL_POLYGON_SMOOTH_HINT),	2985	const_iv (GL_POLYGON_SMOOTH_HINT),
2601	const_iv (GL_GENERATE_MIPMAP_HINT),	2986	const_iv (GL_GENERATE_MIPMAP_HINT),
		2987	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2602	const_iv (GL_FASTEST),	2988	const_iv (GL_FASTEST),
2603	const_iv (GL_DONT_CARE),	2989	const_iv (GL_DONT_CARE),
2604	const_iv (GL_NICEST),	2990	const_iv (GL_NICEST),
2605	const_iv (GL_V2F),	2991	const_iv (GL_V2F),
2606	const_iv (GL_V3F),	2992	const_iv (GL_V3F),
2607	const_iv (GL_T2F_V3F),	2993	const_iv (GL_T2F_V3F),
2608	const_iv (GL_T2F_N3F_V3F),	2994	const_iv (GL_T2F_N3F_V3F),
		2995	const_iv (GL_FUNC_ADD),
		2996	const_iv (GL_FUNC_SUBTRACT),
		2997	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2609	# undef const_iv	2998	# undef const_iv
2610	};	2999	};
2611		3000
2612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3001	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2614		3003
2615	texture_av = newAV ();	3004	texture_av = newAV ();
2616	AvREAL_off (texture_av);	3005	AvREAL_off (texture_av);
2617	}	3006	}
2618		3007
		3008	void
		3009	disable_GL_EXT_blend_func_separate ()
		3010	CODE:
		3011	gl.BlendFuncSeparate = 0;
		3012	gl.BlendFuncSeparateEXT = 0;
		3013
		3014	void
		3015	apple_nvidia_bug (int enable)
		3016
2619	char *	3017	char *
2620	gl_vendor ()	3018	gl_vendor ()
2621	CODE:	3019	CODE:
2622	RETVAL = (char *)glGetString (GL_VENDOR);	3020	RETVAL = (char *)glGetString (GL_VENDOR);
2623	OUTPUT:	3021	OUTPUT:
…		…
2672		3070
2673	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3071	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2674	CODE:	3072	CODE:
2675	gl_BlendFuncSeparate (sa, da, saa, daa);	3073	gl_BlendFuncSeparate (sa, da, saa, daa);
2676		3074
		3075	# void glBlendEquation (int se)
		3076
2677	void glDepthMask (int flag)	3077	void glDepthMask (int flag)
2678		3078
2679	void glLogicOp (int opcode)	3079	void glLogicOp (int opcode)
2680		3080
2681	void glColorMask (int red, int green, int blue, int alpha)	3081	void glColorMask (int red, int green, int blue, int alpha)
…		…
2715	void glRotate (float angle, float x, float y, float z)	3115	void glRotate (float angle, float x, float y, float z)
2716	CODE:	3116	CODE:
2717	glRotatef (angle, x, y, z);	3117	glRotatef (angle, x, y, z);
2718		3118
2719	void glColor (float r, float g, float b, float a = 1.0)	3119	void glColor (float r, float g, float b, float a = 1.0)
		3120	PROTOTYPE: @
2720	ALIAS:	3121	ALIAS:
2721	glColor_premultiply = 1	3122	glColor_premultiply = 1
2722	CODE:	3123	CODE:
2723	if (ix)	3124	if (ix)
2724	{	3125	{
…		…
2744		3145
2745	void glRect (float x1, float y1, float x2, float y2)	3146	void glRect (float x1, float y1, float x2, float y2)
2746	CODE:	3147	CODE:
2747	glRectf (x1, y1, x2, y2);	3148	glRectf (x1, y1, x2, y2);
2748		3149
		3150	void glRect_lineloop (float x1, float y1, float x2, float y2)
		3151	CODE:
		3152	glBegin (GL_LINE_LOOP);
		3153	glVertex2f (x1, y1);
		3154	glVertex2f (x2, y1);
		3155	glVertex2f (x2, y2);
		3156	glVertex2f (x1, y2);
		3157	glEnd ();
		3158
2749	PROTOTYPES: ENABLE	3159	PROTOTYPES: ENABLE
2750		3160
2751	void glBegin (int mode)	3161	void glBegin (int mode)
2752		3162
2753	void glEnd ()	3163	void glEnd ()
…		…
2785	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3195	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2786	CODE:	3196	CODE:
2787	if (gl.SeparableFilter2D)	3197	if (gl.SeparableFilter2D)
2788	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3198	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2789		3199
2790	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3200	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2791		3201
2792	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3202	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2793		3203
2794	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3204	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795		3205
…		…
2821		3231
2822	void glEndList ()	3232	void glEndList ()
2823		3233
2824	void glCallList (int list)	3234	void glCallList (int list)
2825		3235
2826	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3236	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2827		3237
2828	PROTOTYPES: DISABLE	3238	PROTOTYPES: DISABLE
2829		3239
2830	void	3240	void
2831	find_widget (SV *self, NV x, NV y)	3241	find_widget (SV *self, NV x, NV y)
…		…
2835	XPUSHs (self);	3245	XPUSHs (self);
2836	}	3246	}
2837		3247
2838	BOOT:	3248	BOOT:
2839	{	3249	{
2840	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3250	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2841		3251
2842	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3252	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2843	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3253	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2844	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3254	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2845	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3255	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2846	}	3256	}
2847		3257
2848	void	3258	void
2849	draw (SV *self)	3259	draw (SV *self)
2850	CODE:	3260	CODE:
…		…
2857	SV *draw_w_sv = GvSV (draw_w_gv);	3267	SV *draw_w_sv = GvSV (draw_w_gv);
2858	SV *draw_h_sv = GvSV (draw_h_gv);	3268	SV *draw_h_sv = GvSV (draw_h_gv);
2859	double draw_x, draw_y;	3269	double draw_x, draw_y;
2860		3270
2861	if (!SvROK (self))	3271	if (!SvROK (self))
2862	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3272	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2863		3273
2864	hv = (HV *)SvRV (self);	3274	hv = (HV *)SvRV (self);
2865		3275
2866	if (SvTYPE (hv) != SVt_PVHV)	3276	if (SvTYPE (hv) != SVt_PVHV)
2867	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3277	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2868		3278
2869	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3279	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2870	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3280	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2871		3281
2872	if (!h || !w)	3282	if (!h || !w)
…		…
2905	glEnd ();	3315	glEnd ();
2906	glDisable (GL_BLEND);	3316	glDisable (GL_BLEND);
2907	}	3317	}
2908	}	3318	}
2909	#if 0	3319	#if 0
2910	if ($ENV{CFPLUS_DEBUG} & 1) {	3320	// draw borders, for debugging
2911	glPushMatrix;	3321	glPushMatrix ();
2912	glColor 1, 1, 0, 1;	3322	glColor4f (1., 1., 0., 1.);
2913	glTranslate 0.375, 0.375;	3323	glTranslatef (.5, .5, 0.);
2914	glBegin GL_LINE_LOOP;	3324	glBegin (GL_LINE_LOOP);
2915	glVertex 0 , 0;	3325	glVertex2f (0 , 0);
2916	glVertex $self->{w} - 1, 0;	3326	glVertex2f (w - 1, 0);
2917	glVertex $self->{w} - 1, $self->{h} - 1;	3327	glVertex2f (w - 1, h - 1);
2918	glVertex 0 , $self->{h} - 1;	3328	glVertex2f (0 , h - 1);
2919	glEnd;	3329	glEnd ();
2920	glPopMatrix;	3330	glPopMatrix ();
2921	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2922	}
2923	#endif	3331	#endif
2924	PUSHMARK (SP);	3332	PUSHMARK (SP);
2925	XPUSHs (self);	3333	XPUSHs (self);
2926	PUTBACK;	3334	PUTBACK;
2927	call_method ("_draw", G_VOID | G_DISCARD);	3335	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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