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.235 by root, Tue Aug 28 01:23:47 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 {
…		…
498	return 0;	534	return 0;
499		535
500	return 1;	536	return 1;
501	}	537	}
502		538
503	MODULE = CFPlus PACKAGE = CFPlus	539	/******************************************************************************/
		540
		541	/* process keyboard modifiers */
		542	static int
		543	mod_munge (int mod)
		544	{
		545	mod &= MOD_MASK;
		546
		547	if (mod & (KMOD_META | KMOD_ALT))
		548	mod |= KMOD_LRAM;
		549
		550	return mod;
		551	}
		552
		553	static void
		554	deliantra_main ()
		555	{
		556	char *argv[] = { 0 };
		557	call_argv ("::main", G_DISCARD | G_VOID, argv);
		558	}
		559
		560	#ifdef __MACOSX__
		561	/* to due surprising braindamage on the side of SDL design, we
		562	* do some mind-boggling hack here: SDL requires a custom main()
		563	* on OS X, so... we provide one and call the original main(), which,
		564	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		565	* and which calls our main (== SDL_main) back.
		566	*/
		567	extern C_LINKAGE int
		568	main (int argc, char *argv[])
		569	{
		570	deliantra_main ();
		571	}
		572
		573	#undef main
		574
		575	extern C_LINKAGE int main (int argc, char *argv[]);
		576
		577	static void
		578	SDL_braino (void)
		579	{
		580	char *argv[] = { "deliantra client", 0 };
		581	(main) (1, argv);
		582	}
		583	#else
		584	static void
		585	SDL_braino (void)
		586	{
		587	deliantra_main ();
		588	}
		589	#endif
		590
		591	MODULE = Deliantra::Client PACKAGE = DC
504		592
505	PROTOTYPES: ENABLE	593	PROTOTYPES: ENABLE
506		594
507	BOOT:	595	BOOT:
508	{	596	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	597	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	598	static const struct {
511	const char *name;	599	const char *name;
512	IV iv;	600	IV iv;
513	} *civ, const_iv[] = {	601	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	602	# define const_iv(name) { # name, (IV)name }
…		…
535	const_iv (SDL_USEREVENT),	623	const_iv (SDL_USEREVENT),
536		624
537	const_iv (SDL_APPINPUTFOCUS),	625	const_iv (SDL_APPINPUTFOCUS),
538	const_iv (SDL_APPMOUSEFOCUS),	626	const_iv (SDL_APPMOUSEFOCUS),
539	const_iv (SDL_APPACTIVE),	627	const_iv (SDL_APPACTIVE),
		628
		629
		630	const_iv (SDLK_UNKNOWN),
		631	const_iv (SDLK_FIRST),
		632	const_iv (SDLK_BACKSPACE),
		633	const_iv (SDLK_TAB),
		634	const_iv (SDLK_CLEAR),
		635	const_iv (SDLK_RETURN),
		636	const_iv (SDLK_PAUSE),
		637	const_iv (SDLK_ESCAPE),
		638	const_iv (SDLK_SPACE),
		639	const_iv (SDLK_EXCLAIM),
		640	const_iv (SDLK_QUOTEDBL),
		641	const_iv (SDLK_HASH),
		642	const_iv (SDLK_DOLLAR),
		643	const_iv (SDLK_AMPERSAND),
		644	const_iv (SDLK_QUOTE),
		645	const_iv (SDLK_LEFTPAREN),
		646	const_iv (SDLK_RIGHTPAREN),
		647	const_iv (SDLK_ASTERISK),
		648	const_iv (SDLK_PLUS),
		649	const_iv (SDLK_COMMA),
		650	const_iv (SDLK_MINUS),
		651	const_iv (SDLK_PERIOD),
		652	const_iv (SDLK_SLASH),
		653	const_iv (SDLK_0),
		654	const_iv (SDLK_1),
		655	const_iv (SDLK_2),
		656	const_iv (SDLK_3),
		657	const_iv (SDLK_4),
		658	const_iv (SDLK_5),
		659	const_iv (SDLK_6),
		660	const_iv (SDLK_7),
		661	const_iv (SDLK_8),
		662	const_iv (SDLK_9),
		663	const_iv (SDLK_COLON),
		664	const_iv (SDLK_SEMICOLON),
		665	const_iv (SDLK_LESS),
		666	const_iv (SDLK_EQUALS),
		667	const_iv (SDLK_GREATER),
		668	const_iv (SDLK_QUESTION),
		669	const_iv (SDLK_AT),
		670
		671	const_iv (SDLK_LEFTBRACKET),
		672	const_iv (SDLK_BACKSLASH),
		673	const_iv (SDLK_RIGHTBRACKET),
		674	const_iv (SDLK_CARET),
		675	const_iv (SDLK_UNDERSCORE),
		676	const_iv (SDLK_BACKQUOTE),
		677	const_iv (SDLK_DELETE),
540		678
541	const_iv (SDLK_FIRST),	679	const_iv (SDLK_FIRST),
542	const_iv (SDLK_LAST),	680	const_iv (SDLK_LAST),
543	const_iv (SDLK_KP0),	681	const_iv (SDLK_KP0),
544	const_iv (SDLK_KP1),	682	const_iv (SDLK_KP1),
…		…
619	const_iv (KMOD_LMETA),	757	const_iv (KMOD_LMETA),
620	const_iv (KMOD_RMETA),	758	const_iv (KMOD_RMETA),
621	const_iv (KMOD_NUM),	759	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	760	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	761	const_iv (KMOD_MODE),
		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)
624	# undef const_iv	795	# undef const_iv
625	};	796	};
626		797
627	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; )
628	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
657	CODE:	828	CODE:
658	{	829	{
659	opengl_fontmap = pango_opengl_font_map_new ();	830	opengl_fontmap = pango_opengl_font_map_new ();
660	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);
661	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
662	}	838	}
663		839
664	char *
665	SDL_GetError ()	840	char *SDL_GetError ()
666		841
667	int	842	void SDL_braino ()
668	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
669		843
670	void	844	int SDL_Init (U32 flags)
		845
		846	int SDL_InitSubSystem (U32 flags)
		847
		848	void SDL_QuitSubSystem (U32 flags)
		849
671	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
672		860
673	void	861	void
674	SDL_ListModes (int rgb, int alpha)	862	SDL_ListModes (int rgb, int alpha)
675	PPCODE:	863	PPCODE:
676	{	864	{
…		…
688	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	876	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
689	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	877	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	878	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
691		879
692	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	880	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
693	#if SDL_VERSION_ATLEAST(1,2,10)
694	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
695	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	881	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
696	#endif
697		882
698	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	883	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
699		884
700	if (m && m != (SDL_Rect **)-1)	885	if (m && m != (SDL_Rect **)-1)
701	while (*m)	886	while (*m)
702	{	887	{
703	if ((*m)->w >= 640 && (*m)->h >= 480)	888	if ((*m)->w >= 400 && (*m)->h >= 300)
704	{	889	{
705	AV *av = newAV ();	890	AV *av = newAV ();
706	av_push (av, newSViv ((*m)->w));	891	av_push (av, newSViv ((*m)->w));
707	av_push (av, newSViv ((*m)->h));	892	av_push (av, newSViv ((*m)->h));
708	av_push (av, newSViv (rgb));	893	av_push (av, newSViv (rgb));
…		…
732		917
733	if (RETVAL)	918	if (RETVAL)
734	{	919	{
735	av_clear (texture_av);	920	av_clear (texture_av);
736		921
737	SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT");	922	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
738	#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);
739	#include "glfunc.h"	924	#include "glfunc.h"
740	#undef GL_FUNC	925	#undef GL_FUNC
741	}	926	}
742	}	927	}
…		…
749	char *	934	char *
750	SDL_GetKeyName (int sym)	935	SDL_GetKeyName (int sym)
751		936
752	int	937	int
753	SDL_GetAppState ()	938	SDL_GetAppState ()
		939
		940	int
		941	SDL_GetModState ()
754		942
755	void	943	void
756	poll_events ()	944	poll_events ()
757	PPCODE:	945	PPCODE:
758	{	946	{
…		…
768	{	956	{
769	case SDL_KEYDOWN:	957	case SDL_KEYDOWN:
770	case SDL_KEYUP:	958	case SDL_KEYUP:
771	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	959	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
772	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	960	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
773	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);
774	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 */
775	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	963	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
776	break;	964	break;
777		965
778	case SDL_ACTIVEEVENT:	966	case SDL_ACTIVEEVENT:
779	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	967	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
797	x = ev.motion.x;	985	x = ev.motion.x;
798	y = ev.motion.y;	986	y = ev.motion.y;
799	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	987	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
800	}	988	}
801		989
802	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	990	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
803	hv_store (hv, "state", 5, newSViv (state), 0);	991	hv_store (hv, "state", 5, newSViv (state), 0);
804	hv_store (hv, "x", 1, newSViv (x), 0);	992	hv_store (hv, "x", 1, newSViv (x), 0);
805	hv_store (hv, "y", 1, newSViv (y), 0);	993	hv_store (hv, "y", 1, newSViv (y), 0);
806	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	994	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
807	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	995	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
808	}	996	}
809	break;	997	break;
810		998
811	case SDL_MOUSEBUTTONDOWN:	999	case SDL_MOUSEBUTTONDOWN:
812	case SDL_MOUSEBUTTONUP:	1000	case SDL_MOUSEBUTTONUP:
813	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1001	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
814		1002
815	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	1003	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
816	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1004	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
817	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1005	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
818	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1006	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
823	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1011	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
824	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1012	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
825	break;	1013	break;
826	}	1014	}
827		1015
828	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))));
829	}	1017	}
830	}	1018	}
831		1019
832	int	1020	int
833	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)
834	POSTCALL:	1022	POSTCALL:
835	Mix_HookMusicFinished (music_finished);	1023	Mix_HookMusicFinished (music_finished);
836	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	}
837		1041
838	void	1042	void
839	Mix_CloseAudio ()	1043	Mix_CloseAudio ()
840		1044
841	int	1045	int
…		…
876	}	1080	}
877	}	1081	}
878	#endif	1082	#endif
879	}	1083	}
880		1084
881	void	1085	int
882	add_font (char *file)	1086	add_font (char *file)
883	CODE:	1087	CODE:
884	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1089	OUTPUT:
		1090	RETVAL
885		1091
886	void	1092	void
887	load_image_inline (SV *image_)	1093	load_image_inline (SV *image_)
888	ALIAS:	1094	ALIAS:
889	load_image_file = 1	1095	load_image_file = 1
…		…
975	void	1181	void
976	error (char *message)	1182	error (char *message)
977	CODE:	1183	CODE:
978	fprintf (stderr, "ERROR: %s\n", message);	1184	fprintf (stderr, "ERROR: %s\n", message);
979	#ifdef _WIN32	1185	#ifdef _WIN32
980	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1186	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
981	#endif	1187	#endif
982		1188
983	void	1189	void
984	fatal (char *message)	1190	fatal (char *message)
985	CODE:	1191	CODE:
986	fprintf (stderr, "FATAL: %s\n", message);	1192	fprintf (stderr, "FATAL: %s\n", message);
987	#ifdef _WIN32	1193	#ifdef _WIN32
988	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1194	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
989	#endif	1195	#endif
990	_exit (1);	1196	_exit (1);
991		1197
992	void	1198	void
993	_exit (int retval = 0)	1199	_exit (int retval = 0)
…		…
1005	#if DEBUG	1211	#if DEBUG
1006	VALGRIND_DO_LEAK_CHECK;	1212	VALGRIND_DO_LEAK_CHECK;
1007	#endif	1213	#endif
1008	}	1214	}
1009		1215
1010	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
1011		1224
1012	PROTOTYPES: DISABLE	1225	PROTOTYPES: DISABLE
1013		1226
1014	CFPlus::Font	1227	DC::Font
1015	new_from_file (SV *class, char *path, int id = 0)	1228	new_from_file (SV *class, char *path, int id = 0)
1016	CODE:	1229	CODE:
1017	{	1230	{
1018	int count;	1231	int count;
1019	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1232	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1022	}	1235	}
1023	OUTPUT:	1236	OUTPUT:
1024	RETVAL	1237	RETVAL
1025		1238
1026	void	1239	void
1027	DESTROY (CFPlus::Font self)	1240	DESTROY (DC::Font self)
1028	CODE:	1241	CODE:
1029	pango_font_description_free (self);	1242	pango_font_description_free (self);
1030		1243
1031	void	1244	void
1032	make_default (CFPlus::Font self)	1245	make_default (DC::Font self)
1033	PROTOTYPE: $	1246	PROTOTYPE: $
1034	CODE:	1247	CODE:
1035	default_font = self;	1248	default_font = self;
1036		1249
1037	MODULE = CFPlus PACKAGE = CFPlus::Layout	1250	MODULE = Deliantra::Client PACKAGE = DC::Layout
1038		1251
1039	PROTOTYPES: DISABLE	1252	PROTOTYPES: DISABLE
1040		1253
1041	void	1254	void
1042	reset_glyph_cache ()	1255	glyph_cache_backup ()
1043	PROTOTYPE:	1256	PROTOTYPE:
1044	CODE:	1257	CODE:
		1258	tc_backup ();
		1259
		1260	void
		1261	glyph_cache_restore ()
		1262	PROTOTYPE:
		1263	CODE:
1045	tc_clear ();	1264	tc_restore ();
1046		1265
1047	CFPlus::Layout	1266	DC::Layout
1048	new (SV *class)	1267	new (SV *class)
1049	CODE:	1268	CODE:
1050	New (0, RETVAL, 1, struct cf_layout);	1269	New (0, RETVAL, 1, struct cf_layout);
1051		1270
1052	RETVAL->pl = pango_layout_new (opengl_context);	1271	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1062	layout_update_font (RETVAL);	1281	layout_update_font (RETVAL);
1063	OUTPUT:	1282	OUTPUT:
1064	RETVAL	1283	RETVAL
1065		1284
1066	void	1285	void
1067	DESTROY (CFPlus::Layout self)	1286	DESTROY (DC::Layout self)
1068	CODE:	1287	CODE:
1069	g_object_unref (self->pl);	1288	g_object_unref (self->pl);
1070	rc_free (self->rc);	1289	rc_free (self->rc);
1071	Safefree (self);	1290	Safefree (self);
1072		1291
1073	void	1292	void
1074	set_text (CFPlus::Layout self, SV *text_)	1293	set_text (DC::Layout self, SV *text_)
1075	CODE:	1294	CODE:
1076	{	1295	{
1077	STRLEN textlen;	1296	STRLEN textlen;
1078	char *text = SvPVutf8 (text_, textlen);	1297	char *text = SvPVutf8 (text_, textlen);
1079		1298
1080	pango_layout_set_text (self->pl, text, textlen);	1299	pango_layout_set_text (self->pl, text, textlen);
1081	}	1300	}
1082		1301
1083	void	1302	void
1084	set_markup (CFPlus::Layout self, SV *text_)	1303	set_markup (DC::Layout self, SV *text_)
1085	CODE:	1304	CODE:
1086	{	1305	{
1087	STRLEN textlen;	1306	STRLEN textlen;
1088	char *text = SvPVutf8 (text_, textlen);	1307	char *text = SvPVutf8 (text_, textlen);
1089		1308
1090	pango_layout_set_markup (self->pl, text, textlen);	1309	pango_layout_set_markup (self->pl, text, textlen);
1091	}	1310	}
1092		1311
1093	void	1312	void
1094	set_shapes (CFPlus::Layout self, ...)	1313	set_shapes (DC::Layout self, ...)
1095	CODE:	1314	CODE:
1096	{	1315	{
1097	PangoAttrList *attrs = 0;	1316	PangoAttrList *attrs = 0;
1098	const char *text = pango_layout_get_text (self->pl);	1317	const char *text = pango_layout_get_text (self->pl);
1099	const char *pos = text;	1318	const char *pos = text;
…		…
1134	if (attrs)	1353	if (attrs)
1135	pango_layout_set_attributes (self->pl, attrs);	1354	pango_layout_set_attributes (self->pl, attrs);
1136	}	1355	}
1137		1356
1138	void	1357	void
1139	get_shapes (CFPlus::Layout self)	1358	get_shapes (DC::Layout self)
1140	PPCODE:	1359	PPCODE:
1141	{	1360	{
1142	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1361	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1143		1362
1144	do	1363	do
1145	{	1364	{
1146	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1365	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1147		1366
1148	if (run && shape_attr_p (run))	1367	if (run && shape_attr_p (run))
1149	{	1368	{
1150	PangoRectangle extents;	1369	PangoRectangle extents;
1151	pango_layout_iter_get_run_extents (iter, 0, &extents);	1370	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1159		1378
1160	pango_layout_iter_free (iter);	1379	pango_layout_iter_free (iter);
1161	}	1380	}
1162		1381
1163	int	1382	int
1164	has_wrapped (CFPlus::Layout self)	1383	has_wrapped (DC::Layout self)
1165	CODE:	1384	CODE:
1166	{	1385	{
1167	int lines = 1;	1386	int lines = 1;
1168	const char *text = pango_layout_get_text (self->pl);	1387	const char *text = pango_layout_get_text (self->pl);
1169		1388
…		…
1174	}	1393	}
1175	OUTPUT:	1394	OUTPUT:
1176	RETVAL	1395	RETVAL
1177		1396
1178	SV *	1397	SV *
1179	get_text (CFPlus::Layout self)	1398	get_text (DC::Layout self)
1180	CODE:	1399	CODE:
1181	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1400	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1182	sv_utf8_decode (RETVAL);	1401	sv_utf8_decode (RETVAL);
1183	OUTPUT:	1402	OUTPUT:
1184	RETVAL	1403	RETVAL
1185		1404
1186	void	1405	void
1187	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.)
1188	CODE:	1407	CODE:
1189	self->r = r;	1408	self->r = r;
1190	self->g = g;	1409	self->g = g;
1191	self->b = b;	1410	self->b = b;
1192	self->a = a;	1411	self->a = a;
1193		1412
1194	void	1413	void
1195	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1414	set_font (DC::Layout self, DC::Font font = 0)
1196	CODE:	1415	CODE:
1197	if (self->font != font)	1416	if (self->font != font)
1198	{	1417	{
1199	self->font = font;	1418	self->font = font;
1200	layout_update_font (self);	1419	layout_update_font (self);
1201	}	1420	}
1202		1421
1203	void	1422	void
1204	set_height (CFPlus::Layout self, int base_height)	1423	set_height (DC::Layout self, int base_height)
1205	CODE:	1424	CODE:
1206	if (self->base_height != base_height)	1425	if (self->base_height != base_height)
1207	{	1426	{
1208	self->base_height = base_height;	1427	self->base_height = base_height;
1209	layout_update_font (self);	1428	layout_update_font (self);
1210	}	1429	}
1211		1430
1212	void	1431	void
1213	set_width (CFPlus::Layout self, int max_width = -1)	1432	set_width (DC::Layout self, int max_width = -1)
1214	CODE:	1433	CODE:
1215	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);
1216		1435
1217	void	1436	void
1218	set_indent (CFPlus::Layout self, int indent)	1437	set_indent (DC::Layout self, int indent)
1219	CODE:	1438	CODE:
1220	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1439	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1221		1440
1222	void	1441	void
1223	set_spacing (CFPlus::Layout self, int spacing)	1442	set_spacing (DC::Layout self, int spacing)
1224	CODE:	1443	CODE:
1225	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1444	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1226		1445
1227	void	1446	void
1228	set_ellipsise (CFPlus::Layout self, int ellipsise)	1447	set_ellipsise (DC::Layout self, int ellipsise)
1229	CODE:	1448	CODE:
1230	pango_layout_set_ellipsize (self->pl,	1449	pango_layout_set_ellipsize (self->pl,
1231	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1450	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1232	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1451	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1233	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1452	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1234	: PANGO_ELLIPSIZE_NONE	1453	: PANGO_ELLIPSIZE_NONE
1235	);	1454	);
1236		1455
1237	void	1456	void
1238	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1457	set_single_paragraph_mode (DC::Layout self, int spm)
1239	CODE:	1458	CODE:
1240	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1459	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1241		1460
1242	void	1461	void
1243	size (CFPlus::Layout self)	1462	size (DC::Layout self)
1244	PPCODE:	1463	PPCODE:
1245	{	1464	{
1246	int w, h;	1465	int w, h;
1247		1466
1248	layout_get_pixel_size (self, &w, &h);	1467	layout_get_pixel_size (self, &w, &h);
…		…
1251	PUSHs (sv_2mortal (newSViv (w)));	1470	PUSHs (sv_2mortal (newSViv (w)));
1252	PUSHs (sv_2mortal (newSViv (h)));	1471	PUSHs (sv_2mortal (newSViv (h)));
1253	}	1472	}
1254		1473
1255	int	1474	int
1256	descent (CFPlus::Layout self)	1475	descent (DC::Layout self)
1257	CODE:	1476	CODE:
1258	{	1477	{
1259	PangoRectangle rect;	1478	PangoRectangle rect;
1260	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1479	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1261	pango_layout_line_get_pixel_extents (line, 0, &rect);	1480	pango_layout_line_get_pixel_extents (line, 0, &rect);
1262	RETVAL = PANGO_DESCENT (rect);	1481	RETVAL = PANGO_DESCENT (rect);
1263	}	1482	}
1264	OUTPUT:	1483	OUTPUT:
1265	RETVAL	1484	RETVAL
1266		1485
1267	int	1486	int
1268	xy_to_index (CFPlus::Layout self, int x, int y)	1487	xy_to_index (DC::Layout self, int x, int y)
1269	CODE:	1488	CODE:
1270	{	1489	{
1271	int index, trailing;	1490	int index, trailing;
1272	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);
1273	RETVAL = index + trailing;	1492	RETVAL = index + trailing;
1274	}	1493	}
1275	OUTPUT:	1494	OUTPUT:
1276	RETVAL	1495	RETVAL
1277		1496
1278	void	1497	void
1279	cursor_pos (CFPlus::Layout self, int index)	1498	cursor_pos (DC::Layout self, int index)
1280	PPCODE:	1499	PPCODE:
1281	{	1500	{
1282	PangoRectangle strong_pos;	1501	PangoRectangle pos;
1283	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1502	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1284		1503
1285	EXTEND (SP, 3);	1504	EXTEND (SP, 3);
1286	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1505	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1287	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1506	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1288	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1507	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1289	}	1508	}
1290		1509
1291	void	1510	void
1292	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)
1293	PPCODE:	1512	PPCODE:
1294	{	1513	{
1295	int line, x;	1514	int line, x;
1296		1515
1297	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)
1298	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1518	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1299		1519	--line;
		1520	#endif
1300	EXTEND (SP, 2);	1521	EXTEND (SP, 2);
1301	PUSHs (sv_2mortal (newSViv (line - 1)));	1522	PUSHs (sv_2mortal (newSViv (line)));
1302	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1523	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1303	}	1524	}
1304		1525
1305	void	1526	void
1306	line_x_to_index (CFPlus::Layout self, int line, int x)	1527	line_x_to_index (DC::Layout self, int line, int x)
1307	PPCODE:	1528	PPCODE:
1308	{	1529	{
1309	PangoLayoutLine *lp;	1530	PangoLayoutLine *lp;
1310	int index, trailing;	1531	int index, trailing;
1311		1532
1312	if (line < 0)	1533	if (line < 0)
1313	XSRETURN_EMPTY;	1534	XSRETURN_EMPTY;
1314		1535
1315	if (!(lp = pango_layout_get_line (self->pl, line)))	1536	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1316	XSRETURN_EMPTY; /* do better */	1537	XSRETURN_EMPTY; /* do better */
1317		1538
1318	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);
1319		1540
1320	EXTEND (SP, 2);	1541	EXTEND (SP, 2);
…		…
1326	PUSHs (sv_2mortal (newSViv (trailing)));	1547	PUSHs (sv_2mortal (newSViv (trailing)));
1327	}	1548	}
1328	}	1549	}
1329		1550
1330	void	1551	void
1331	render (CFPlus::Layout self, float x, float y, int flags = 0)	1552	render (DC::Layout self, float x, float y, int flags = 0)
1332	CODE:	1553	CODE:
1333	rc_clear (self->rc);	1554	rc_clear (self->rc);
1334	pango_opengl_render_layout_subpixel (	1555	pango_opengl_render_layout_subpixel (
1335	self->pl,	1556	self->pl,
1336	self->rc,	1557	self->rc,
…		…
1341	// we assume that context_change actually clears/frees stuff	1562	// we assume that context_change actually clears/frees stuff
1342	// and does not do any recomputation...	1563	// and does not do any recomputation...
1343	pango_layout_context_changed (self->pl);	1564	pango_layout_context_changed (self->pl);
1344		1565
1345	void	1566	void
1346	draw (CFPlus::Layout self)	1567	draw (DC::Layout self)
1347	CODE:	1568	CODE:
1348	{	1569	{
1349	glEnable (GL_TEXTURE_2D);	1570	glEnable (GL_TEXTURE_2D);
1350	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1571	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1351	glEnable (GL_BLEND);	1572	glEnable (GL_BLEND);
…		…
1359	glDisable (GL_ALPHA_TEST);	1580	glDisable (GL_ALPHA_TEST);
1360	glDisable (GL_BLEND);	1581	glDisable (GL_BLEND);
1361	glDisable (GL_TEXTURE_2D);	1582	glDisable (GL_TEXTURE_2D);
1362	}	1583	}
1363		1584
1364	MODULE = CFPlus PACKAGE = CFPlus::Texture	1585	MODULE = Deliantra::Client PACKAGE = DC::Texture
1365		1586
1366	PROTOTYPES: ENABLE	1587	PROTOTYPES: ENABLE
1367		1588
1368	void	1589	void
1369	pad (SV *data_, int ow, int oh, int nw, int nh)	1590	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1437	glDisable (GL_ALPHA_TEST);	1658	glDisable (GL_ALPHA_TEST);
1438	glDisable (GL_BLEND);	1659	glDisable (GL_BLEND);
1439	}	1660	}
1440	}	1661	}
1441		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
1442	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)
1443	CODE:	1693	CODE:
1444	{	1694	{
1445	GLint width;	1695	GLint width;
1446	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);
…		…
1448	RETVAL = width > 0;	1698	RETVAL = width > 0;
1449	}	1699	}
1450	OUTPUT:	1700	OUTPUT:
1451	RETVAL	1701	RETVAL
1452		1702
1453	MODULE = CFPlus PACKAGE = CFPlus::Map	1703	MODULE = Deliantra::Client PACKAGE = DC::Map
1454		1704
1455	PROTOTYPES: DISABLE	1705	PROTOTYPES: DISABLE
1456		1706
1457	CFPlus::Map	1707	DC::Map
1458	new (SV *class)	1708	new (SV *class)
1459	CODE:	1709	CODE:
1460	New (0, RETVAL, 1, struct map);	1710	New (0, RETVAL, 1, struct map);
1461	RETVAL->x = 0;	1711	RETVAL->x = 0;
1462	RETVAL->y = 0;	1712	RETVAL->y = 0;
…		…
1470	RETVAL->row = 0;	1720	RETVAL->row = 0;
1471	OUTPUT:	1721	OUTPUT:
1472	RETVAL	1722	RETVAL
1473		1723
1474	void	1724	void
1475	DESTROY (CFPlus::Map self)	1725	DESTROY (DC::Map self)
1476	CODE:	1726	CODE:
1477	{	1727	{
1478	map_clear (self);	1728	map_clear (self);
1479	Safefree (self->face2tile);	1729	Safefree (self->face2tile);
1480	Safefree (self->tex);	1730	Safefree (self->tex);
1481	Safefree (self);	1731	Safefree (self);
1482	}	1732	}
1483		1733
1484	void	1734	void
1485	resize (CFPlus::Map self, int map_width, int map_height)	1735	resize (DC::Map self, int map_width, int map_height)
1486	CODE:	1736	CODE:
1487	self->w = map_width;	1737	self->w = map_width;
1488	self->h = map_height;	1738	self->h = map_height;
1489		1739
1490	void	1740	void
1491	clear (CFPlus::Map self)	1741	clear (DC::Map self)
1492	CODE:	1742	CODE:
1493	map_clear (self);	1743	map_clear (self);
1494		1744
1495	void	1745	void
1496	set_tileid (CFPlus::Map self, int face, int tile)	1746	set_tileid (DC::Map self, int face, int tile)
1497	CODE:	1747	CODE:
1498	{	1748	{
1499	need_facenum (self, face); self->face2tile [face] = tile;	1749	need_facenum (self, face); self->face2tile [face] = tile;
1500	need_texid (self, tile);	1750	need_texid (self, tile);
1501	}	1751	}
1502		1752
1503	void	1753	void
1504	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1754	set_smooth (DC::Map self, int face, int smooth, int level)
1505	CODE:	1755	CODE:
1506	{	1756	{
1507	tileid texid;	1757	tileid texid;
1508	maptex *tex;	1758	maptex *tex;
1509		1759
…		…
1522	tex->smoothtile = self->face2tile [smooth];	1772	tex->smoothtile = self->face2tile [smooth];
1523	tex->smoothlevel = level;	1773	tex->smoothlevel = level;
1524	}	1774	}
1525		1775
1526	void	1776	void
1527	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)
1528	CODE:	1778	CODE:
1529	{	1779	{
1530	need_texid (self, texid);	1780	need_texid (self, texid);
1531		1781
1532	{	1782	{
…		…
1551	// use uglier nearest interpolation because linear suffers	1801	// use uglier nearest interpolation because linear suffers
1552	// from transparent color bleeding and ugly wrapping effects.	1802	// from transparent color bleeding and ugly wrapping effects.
1553	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1554	}	1804	}
1555		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
1556	int	1826	int
1557	ox (CFPlus::Map self)	1827	ox (DC::Map self)
1558	ALIAS:	1828	ALIAS:
1559	oy = 1	1829	oy = 1
1560	x = 2	1830	x = 2
1561	y = 3	1831	y = 3
1562	w = 4	1832	w = 4
…		…
1573	}	1843	}
1574	OUTPUT:	1844	OUTPUT:
1575	RETVAL	1845	RETVAL
1576		1846
1577	void	1847	void
1578	scroll (CFPlus::Map self, int dx, int dy)	1848	scroll (DC::Map self, int dx, int dy)
1579	CODE:	1849	CODE:
1580	{	1850	{
1581	if (dx > 0)	1851	if (dx > 0)
1582	map_blank (self, self->x, self->y, dx, self->h);	1852	map_blank (self, self->x, self->y, dx, self->h);
1583	else if (dx < 0)	1853	else if (dx < 0)
…		…
1599	self->y += MAP_EXTEND_Y;	1869	self->y += MAP_EXTEND_Y;
1600	}	1870	}
1601	}	1871	}
1602		1872
1603	SV *	1873	SV *
1604	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1874	map1a_update (DC::Map self, SV *data_, int extmap)
1605	CODE:	1875	CODE:
1606	{	1876	{
1607	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1877	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1608	uint8_t *data_end = (uint8_t *)SvEND (data_);	1878	uint8_t *data_end = (uint8_t *)SvEND (data_);
1609	mapcell *cell;	1879	mapcell *cell;
…		…
1637	uint8_t ext, cmd;	1907	uint8_t ext, cmd;
1638		1908
1639	do	1909	do
1640	{	1910	{
1641	ext = *data++;	1911	ext = *data++;
1642	cmd = ext & 0x3f;	1912	cmd = ext & 0x7f;
1643		1913
1644	if (cmd < 4)	1914	if (cmd < 4)
1645	cell->darkness = 255 - ext * 64 + 1;	1915	cell->darkness = 255 - ext * 64 + 1;
1646	else if (cmd == 5) // health	1916	else if (cmd == 5) // health
1647	{	1917	{
…		…
1650	}	1920	}
1651	else if (cmd == 6) // monster width	1921	else if (cmd == 6) // monster width
1652	cell->stat_width = *data++ + 1;	1922	cell->stat_width = *data++ + 1;
1653	else if (cmd == 0x47)	1923	else if (cmd == 0x47)
1654	{	1924	{
1655	if (*data == 4)	1925	if (*data == 1) cell->player = data [1];
1656	; // 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);
1657		1929
1658	data += *data + 1;	1930	data += *data + 1;
1659	}	1931	}
1660	else if (cmd == 8) // cell flags	1932	else if (cmd == 8) // cell flags
1661	cell->flags = *data++;	1933	cell->flags = *data++;
…		…
1678	cell->tile [z] = self->face2tile [face];	1950	cell->tile [z] = self->face2tile [face];
1679		1951
1680	if (cell->tile [z])	1952	if (cell->tile [z])
1681	{	1953	{
1682	maptex *tex = self->tex + cell->tile [z];	1954	maptex *tex = self->tex + cell->tile [z];
		1955	tex->unused = 0;
1683	if (!tex->name)	1956	if (!tex->name)
1684	av_push (missing, newSViv (cell->tile [z]));	1957	av_push (missing, newSViv (cell->tile [z]));
1685		1958
1686	if (tex->smoothtile)	1959	if (tex->smoothtile)
1687	{	1960	{
1688	maptex *smooth = self->tex + tex->smoothtile;	1961	maptex *smooth = self->tex + tex->smoothtile;
		1962	smooth->unused = 0;
1689	if (!smooth->name)	1963	if (!smooth->name)
1690	av_push (missing, newSViv (tex->smoothtile));	1964	av_push (missing, newSViv (tex->smoothtile));
1691	}	1965	}
1692	}	1966	}
1693	}	1967	}
1694	}	1968	}
1695	else	1969	else
1696	cell->darkness = 0;	1970	CELL_CLEAR (cell);
1697	}	1971	}
1698	}	1972	}
1699	OUTPUT:	1973	OUTPUT:
1700	RETVAL	1974	RETVAL
1701		1975
1702	SV *	1976	SV *
1703	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)
1704	CODE:	1978	CODE:
1705	{	1979	{
1706	int x1, x;	1980	int x1, x;
1707	int y1, y;	1981	int y1, y;
1708	int z;	1982	int z;
…		…
1753	}	2027	}
1754	OUTPUT:	2028	OUTPUT:
1755	RETVAL	2029	RETVAL
1756		2030
1757	void	2031	void
1758	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)
1759	CODE:	2033	CODE:
1760	{	2034	{
1761	int x, y, z;	2035	int x, y, z;
1762		2036
1763	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2037	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1764	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
1765	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)
1766	smooth_key skey;	2040	smooth_key skey;
1767		2041	int pl_x, pl_y;
		2042	maptex pl_tex;
1768	rc_t *rc = rc_alloc ();	2043	rc_t *rc = rc_alloc ();
		2044	rc_t *rc_ov = rc_alloc ();
1769	rc_key_t key;	2045	rc_key_t key;
1770	rc_array_t *arr;	2046	rc_array_t *arr, *arr_hidden;
1771		2047
		2048	pl_tex.name = 0;
		2049
1772	// thats current max. sorry.	2050	// that's current max. sorry.
1773	if (sw > 255) sw = 255;	2051	if (sw > 255) sw = 255;
1774	if (sh > 255) sh = 255;	2052	if (sh > 255) sh = 255;
1775		2053
1776	// clear key, in case of extra padding	2054	// clear key, in case of extra padding
1777	memset (&skey, 0, sizeof (skey));	2055	memset (&skey, 0, sizeof (skey));
…		…
1781	key.g = 255;	2059	key.g = 255;
1782	key.b = 255;	2060	key.b = 255;
1783	key.a = 255;	2061	key.a = 255;
1784	key.mode = GL_QUADS;	2062	key.mode = GL_QUADS;
1785	key.format = GL_T2F_V3F;	2063	key.format = GL_T2F_V3F;
1786	key.texname = -1;
1787		2064
1788	mx += self->x;	2065	mx += self->x;
1789	my += self->y;	2066	my += self->y;
1790		2067
1791	// first pass: determine smooth_max	2068	// first pass: determine smooth_max
…		…
1812		2089
1813	glEnable (GL_BLEND);	2090	glEnable (GL_BLEND);
1814	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2091	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1815	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2092	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1816		2093
		2094	key.texname = self->tex [TEXID_HIDDEN].name;
		2095	arr_hidden = rc_array (rc_ov, &key);
		2096
1817	for (z = 0; z <= 2; z++)	2097	for (z = 0; z <= 2; z++)
1818	{	2098	{
1819	memset (smooth_level, 0, sizeof (smooth_level));	2099	memset (smooth_level, 0, sizeof (smooth_level));
		2100	key.texname = -1;
1820		2101
1821	for (y = 0; y < sh; y++)	2102	for (y = 0; y < sh; y++)
1822	if (0 <= y + my && y + my < self->rows)	2103	if (0 <= y + my && y + my < self->rows)
1823	{	2104	{
1824	maprow *row = self->row + (y + my);	2105	maprow *row = self->row + (y + my);
…		…
1834	maptex tex = self->tex [tile];	2115	maptex tex = self->tex [tile];
1835	int px, py;	2116	int px, py;
1836		2117
1837	if (key.texname != tex.name)	2118	if (key.texname != tex.name)
1838	{	2119	{
		2120	self->tex [tile].unused = 0;
		2121
1839	if (!tex.name)	2122	if (!tex.name)
1840	tex = self->tex [2]; /* missing, replace by noface */	2123	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1841		2124
1842	key.texname = tex.name;	2125	key.texname = tex.name;
1843	arr = rc_array (rc, &key);	2126	arr = rc_array (rc, &key);
1844	}	2127	}
1845		2128
1846	px = (x + 1) * T - tex.w;	2129	px = (x + 1) * T - tex.w;
1847	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	}
1848		2139
1849	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2140	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1850	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);
1851	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);
1852	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);
1853
1854	if (cell->flags && z == 2)
1855	{
1856	// overlays such as the speech bubble, probably more to come
1857	if (cell->flags & 1)
1858	{
1859	maptex tex = self->tex [1];
1860	int px = x * T + T * 2 / 32;
1861	int py = y * T - T * 6 / 32;
1862
1863	if (tex.name)
1864	{
1865	if (key.texname != tex.name)
1866	{
1867	key.texname = tex.name;
1868	arr = rc_array (rc, &key);
1869	}
1870
1871	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1872	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1873	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1874	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1875	}
1876	}
1877	}
1878		2144
1879	// update smooth hash	2145	// update smooth hash
1880	if (tex.smoothtile)	2146	if (tex.smoothtile)
1881	{	2147	{
1882	skey.tile = tex.smoothtile;	2148	skey.tile = tex.smoothtile;
…		…
1911	// corners	2177	// corners
1912	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);
1913	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);
1914	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);
1915	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	}
1916	}	2219	}
1917	}	2220	}
1918	}	2221	}
1919	}	2222	}
1920		2223
…		…
1960	{	2263	{
1961	// this time avoiding texture state changes	2264	// this time avoiding texture state changes
1962	// save gobs of state changes.	2265	// save gobs of state changes.
1963	if (key.texname != tex.name)	2266	if (key.texname != tex.name)
1964	{	2267	{
		2268	self->tex [skey->tile].unused = 0;
		2269
1965	glEnd ();	2270	glEnd ();
1966	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2271	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1967	glBegin (GL_QUADS);	2272	glBegin (GL_QUADS);
1968	}	2273	}
1969		2274
…		…
1998	}	2303	}
1999		2304
2000	hv_clear (smooth);	2305	hv_clear (smooth);
2001	}	2306	}
2002		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
2003	glDisable (GL_BLEND);	2328	glDisable (GL_BLEND);
2004	rc_free (rc);	2329	rc_free (rc);
		2330	rc_free (rc_ov);
2005		2331
2006	// top layer: overlays such as the health bar	2332	// top layer: overlays such as the health bar
2007	for (y = 0; y < sh; y++)	2333	for (y = 0; y < sh; y++)
2008	if (0 <= y + my && y + my < self->rows)	2334	if (0 <= y + my && y + my < self->rows)
2009	{	2335	{
…		…
2014	{	2340	{
2015	mapcell *cell = row->col + (x + mx - row->c0);	2341	mapcell *cell = row->col + (x + mx - row->c0);
2016		2342
2017	int px = x * T;	2343	int px = x * T;
2018	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	}
2019		2351
2020	if (cell->stat_hp)	2352	if (cell->stat_hp)
2021	{	2353	{
2022	int width = cell->stat_width * T;	2354	int width = cell->stat_width * T;
2023	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2355	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2034	}	2366	}
2035	}	2367	}
2036	}	2368	}
2037		2369
2038	void	2370	void
2039	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)
2040	CODE:	2372	CODE:
2041	{	2373	{
2042	static float color[16][3] = {	2374	static float color[16][3] = {
2043	{ 0.00F, 0.00F, 0.00F },	2375	{ 0.00F, 0.00F, 0.00F },
2044	{ 1.00F, 1.00F, 1.00F },	2376	{ 1.00F, 1.00F, 1.00F },
…		…
2063	};	2395	};
2064		2396
2065	int x, y;	2397	int x, y;
2066		2398
2067	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	*/
2068	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2406	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2069	glEnable (GL_BLEND);	2407	glEnable (GL_BLEND);
2070	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2408	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2071	glBegin (GL_QUADS);	2409	glBegin (GL_QUADS);
2072		2410
2073	for (y = 0; y < h; y++)	2411	for (y = 0; y < h; y++)
…		…
2080	float *c = color [m & 15];	2418	float *c = color [m & 15];
2081		2419
2082	float tx1 = m & 0x40 ? 0.5 : 0.;	2420	float tx1 = m & 0x40 ? 0.5 : 0.;
2083	float tx2 = tx1 + 0.5;	2421	float tx2 = tx1 + 0.5;
2084		2422
2085	glColor4f (c[0], c[1], c[2], 0.75);	2423	glColor4f (c[0], c[1], c[2], 1);
2086	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2424	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2087	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2425	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2088	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2426	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2089	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2427	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2090	}	2428	}
…		…
2094	glDisable (GL_BLEND);	2432	glDisable (GL_BLEND);
2095	glDisable (GL_TEXTURE_2D);	2433	glDisable (GL_TEXTURE_2D);
2096	}	2434	}
2097		2435
2098	void	2436	void
2099	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)
2100	PPCODE:	2438	PPCODE:
2101	{	2439	{
2102	int x, y;	2440	int x, y;
2103	int sw1 = sw + 2;	2441	int sw1 = sw + 2;
2104	int sh1 = sh + 2;	2442	int sh1 = sh + 2;
…		…
2112	SvCUR_set (darkness3_sv, sw34 * sh3);	2450	SvCUR_set (darkness3_sv, sw34 * sh3);
2113		2451
2114	mx += self->x - 1;	2452	mx += self->x - 1;
2115	my += self->y - 1;	2453	my += self->y - 1;
2116		2454
2117	memset (darkness1, 255, sw1 * sh1);	2455	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2118		2456
2119	for (y = 0; y < sh1; y++)	2457	for (y = 0; y < sh1; y++)
2120	if (0 <= y + my && y + my < self->rows)	2458	if (0 <= y + my && y + my < self->rows)
2121	{	2459	{
2122	maprow *row = self->row + (y + my);	2460	maprow *row = self->row + (y + my);
…		…
2175	PUSHs (sv_2mortal (newSViv (sh3)));	2513	PUSHs (sv_2mortal (newSViv (sh3)));
2176	PUSHs (darkness3_sv);	2514	PUSHs (darkness3_sv);
2177	}	2515	}
2178		2516
2179	SV *	2517	SV *
2180	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)
2181	CODE:	2519	CODE:
2182	{	2520	{
2183	int x, y, x1, y1;	2521	int x, y, x1, y1;
2184	SV *data_sv = newSV (w * h * 7 + 5);	2522	SV *data_sv = newSV (w * h * 7 + 5);
2185	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2523	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2242	else	2580	else
2243	*data++ = 0;	2581	*data++ = 0;
2244	}	2582	}
2245	}	2583	}
2246		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	{
2247	SvPOK_only (data_sv);	2588	SvPOK_only (data_sv);
2248	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2589	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2590	}
		2591
2249	RETVAL = data_sv;	2592	RETVAL = data_sv;
2250	}	2593	}
2251	OUTPUT:	2594	OUTPUT:
2252	RETVAL	2595	RETVAL
2253		2596
2254	void	2597	void
2255	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)
2256	PPCODE:	2599	PPCODE:
2257	{	2600	{
2258	int x, y, z;	2601	int x, y, z;
2259	int w, h;	2602	int w, h;
2260	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;
2261		2614
2262	if (*data++ != 0)	2615	if (*data++ != 0)
2263	XSRETURN_EMPTY; /* version mismatch */	2616	XSRETURN_EMPTY; /* version mismatch */
2264		2617
2265	w = *data++ << 8; w |= *data++;	2618	w = *data++ << 8; w |= *data++;
…		…
2280	{	2633	{
2281	maprow *row = map_get_row (self, y);	2634	maprow *row = map_get_row (self, y);
2282		2635
2283	for (x = x0; x < x1; x++)	2636	for (x = x0; x < x1; x++)
2284	{	2637	{
		2638	uint8_t flags;
		2639
		2640	if (data + 7 >= end)
		2641	XSRETURN_EMPTY;
		2642
2285	uint8_t flags = *data++;	2643	flags = *data++;
2286		2644
2287	if (flags)	2645	if (flags)
2288	{	2646	{
2289	mapcell *cell = row_get_cell (row, x);	2647	mapcell *cell = row_get_cell (row, x);
2290	tileid tile[3] = { 0, 0, 0 };	2648	tileid tile[3] = { 0, 0, 0 };
…		…
2293	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2651	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2294	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2652	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2295		2653
2296	if (cell->darkness == 0)	2654	if (cell->darkness == 0)
2297	{	2655	{
2298	cell->darkness = 0;	2656	/*cell->darkness = 0;*/
		2657	EXTEND (SP, 3);
2299		2658
2300	for (z = 0; z <= 2; z++)	2659	for (z = 0; z <= 2; z++)
2301	{	2660	{
2302	tileid t = tile [z];	2661	tileid t = tile [z];
2303		2662
2304	if (t >= self->texs || (t && !self->tex [t].name))	2663	if (t >= self->texs || (t && !self->tex [t].name))
2305	{	2664	{
2306	XPUSHs (sv_2mortal (newSViv (t)));	2665	PUSHs (sv_2mortal (newSViv (t)));
2307	need_texid (self, t);	2666	need_texid (self, t);
2308	}	2667	}
2309		2668
2310	cell->tile [z] = t;	2669	cell->tile [z] = t;
2311	}	2670	}
…		…
2313	}	2672	}
2314	}	2673	}
2315	}	2674	}
2316	}	2675	}
2317		2676
2318	MODULE = CFPlus PACKAGE = CFPlus::RW	2677	MODULE = Deliantra::Client PACKAGE = DC::RW
2319		2678
2320	CFPlus::RW	2679	DC::RW
2321	new (SV *class, SV *data_sv)	2680	new (SV *class, SV *data_sv)
2322	CODE:	2681	CODE:
2323	{	2682	{
2324	STRLEN datalen;	2683	STRLEN datalen;
2325	char *data = SvPVbyte (data_sv, datalen);	2684	char *data = SvPVbyte (data_sv, datalen);
…		…
2327	RETVAL = SDL_RWFromConstMem (data, datalen);	2686	RETVAL = SDL_RWFromConstMem (data, datalen);
2328	}	2687	}
2329	OUTPUT:	2688	OUTPUT:
2330	RETVAL	2689	RETVAL
2331		2690
2332	CFPlus::RW	2691	DC::RW
2333	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")
2334	CODE:	2693	CODE:
2335	RETVAL = SDL_RWFromFile (path, mode);	2694	RETVAL = SDL_RWFromFile (path, mode);
2336	OUTPUT:	2695	OUTPUT:
2337	RETVAL	2696	RETVAL
2338		2697
2339	# fails on win32:	2698	# fails on win32:
2340	# CFPlus.xs(2268) : error C2059: syntax error : '('	2699	# dc.xs(2268) : error C2059: syntax error : '('
2341	#void	2700	#void
2342	#close (CFPlus::RW self)	2701	#close (DC::RW self)
2343	# CODE:	2702	# CODE:
2344	# (self->(close)) (self);	2703	# (self->(close)) (self);
2345		2704
2346	MODULE = CFPlus PACKAGE = CFPlus::Channel	2705	MODULE = Deliantra::Client PACKAGE = DC::Channel
2347		2706
2348	PROTOTYPES: DISABLE	2707	PROTOTYPES: DISABLE
2349		2708
2350	CFPlus::Channel	2709	DC::Channel
2351	find ()	2710	find ()
2352	CODE:	2711	CODE:
2353	{	2712	{
2354	RETVAL = Mix_GroupAvailable (-1);	2713	RETVAL = Mix_GroupAvailable (-1);
2355		2714
…		…
2368	}	2727	}
2369	OUTPUT:	2728	OUTPUT:
2370	RETVAL	2729	RETVAL
2371		2730
2372	void	2731	void
2373	halt (CFPlus::Channel self)	2732	halt (DC::Channel self)
2374	CODE:	2733	CODE:
2375	Mix_HaltChannel (self);	2734	Mix_HaltChannel (self);
2376		2735
2377	void	2736	void
2378	expire (CFPlus::Channel self, int ticks = -1)	2737	expire (DC::Channel self, int ticks = -1)
2379	CODE:	2738	CODE:
2380	Mix_ExpireChannel (self, ticks);	2739	Mix_ExpireChannel (self, ticks);
2381		2740
2382	void	2741	void
2383	fade_out (CFPlus::Channel self, int ticks = -1)	2742	fade_out (DC::Channel self, int ticks = -1)
2384	CODE:	2743	CODE:
2385	Mix_FadeOutChannel (self, ticks);	2744	Mix_FadeOutChannel (self, ticks);
2386		2745
2387	int	2746	int
2388	volume (CFPlus::Channel self, int volume)	2747	volume (DC::Channel self, int volume)
2389	CODE:	2748	CODE:
2390	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2749	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2391	OUTPUT:	2750	OUTPUT:
2392	RETVAL	2751	RETVAL
2393		2752
2394	void	2753	void
2395	unregister_all_effects (CFPlus::Channel self)	2754	unregister_all_effects (DC::Channel self)
2396	CODE:	2755	CODE:
2397	Mix_UnregisterAllEffects (self);	2756	Mix_UnregisterAllEffects (self);
2398		2757
2399	void	2758	void
2400	set_panning (CFPlus::Channel self, int left, int right)	2759	set_panning (DC::Channel self, int left, int right)
2401	CODE:	2760	CODE:
2402	left = CLAMP (left , 0, 255);	2761	left = CLAMP (left , 0, 255);
2403	right = CLAMP (right, 0, 255);	2762	right = CLAMP (right, 0, 255);
2404	Mix_SetPanning (self, left, right);	2763	Mix_SetPanning (self, left, right);
2405		2764
2406	void	2765	void
2407	set_distance (CFPlus::Channel self, int distance)	2766	set_distance (DC::Channel self, int distance)
2408	CODE:	2767	CODE:
2409	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2768	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2410		2769
2411	void	2770	void
2412	set_position (CFPlus::Channel self, int angle, int distance)	2771	set_position (DC::Channel self, int angle, int distance)
2413	CODE:	2772	CODE:
2414		2773
2415	void	2774	void
2416	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)
2417	CODE:	2776	CODE:
2418	{	2777	{
2419	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));
2420	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);
2421	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2780	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2422	}	2781	}
2423		2782
2424	void	2783	void
2425	set_reverse_stereo (CFPlus::Channel self, int flip)	2784	set_reverse_stereo (DC::Channel self, int flip)
2426	CODE:	2785	CODE:
2427	Mix_SetReverseStereo (self, flip);	2786	Mix_SetReverseStereo (self, flip);
2428		2787
2429	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2788	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2430		2789
2431	PROTOTYPES: DISABLE	2790	PROTOTYPES: DISABLE
2432		2791
2433	CFPlus::MixChunk	2792	DC::MixChunk
2434	new (SV *class, CFPlus::RW rwops)	2793	new (SV *class, DC::RW rwops)
2435	CODE:	2794	CODE:
2436	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2795	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2437	OUTPUT:	2796	OUTPUT:
2438	RETVAL	2797	RETVAL
2439		2798
2440	void	2799	void
2441	DESTROY (CFPlus::MixChunk self)	2800	DESTROY (DC::MixChunk self)
2442	CODE:	2801	CODE:
2443	Mix_FreeChunk (self);	2802	Mix_FreeChunk (self);
2444		2803
2445	int	2804	int
2446	volume (CFPlus::MixChunk self, int volume = -1)	2805	volume (DC::MixChunk self, int volume = -1)
2447	CODE:	2806	CODE:
2448	if (items > 1)	2807	if (items > 1)
2449	volume = CLAMP (volume, 0, 128);	2808	volume = CLAMP (volume, 0, 128);
2450	RETVAL = Mix_VolumeChunk (self, volume);	2809	RETVAL = Mix_VolumeChunk (self, volume);
2451	OUTPUT:	2810	OUTPUT:
2452	RETVAL	2811	RETVAL
2453		2812
2454	CFPlus::Channel	2813	DC::Channel
2455	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)
2456	CODE:	2815	CODE:
2457	{	2816	{
2458	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2817	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2459		2818
2460	if (RETVAL < 0)	2819	if (RETVAL < 0)
…		…
2467	}	2826	}
2468	}	2827	}
2469	OUTPUT:	2828	OUTPUT:
2470	RETVAL	2829	RETVAL
2471		2830
2472	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2831	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2473		2832
2474	int	2833	int
2475	volume (int volume = -1)	2834	volume (int volume = -1)
2476	PROTOTYPE: ;$	2835	PROTOTYPE: ;$
2477	CODE:	2836	CODE:
…		…
2489	void	2848	void
2490	halt ()	2849	halt ()
2491	CODE:	2850	CODE:
2492	Mix_HaltMusic ();	2851	Mix_HaltMusic ();
2493		2852
2494	CFPlus::MixMusic	2853	DC::MixMusic
2495	new (SV *class, CFPlus::RW rwops)	2854	new (SV *class, DC::RW rwops)
2496	CODE:	2855	CODE:
2497	RETVAL = Mix_LoadMUS_RW (rwops);	2856	RETVAL = Mix_LoadMUS_RW (rwops);
2498	OUTPUT:	2857	OUTPUT:
2499	RETVAL	2858	RETVAL
2500		2859
2501	void	2860	void
2502	DESTROY (CFPlus::MixMusic self)	2861	DESTROY (DC::MixMusic self)
2503	CODE:	2862	CODE:
2504	Mix_FreeMusic (self);	2863	Mix_FreeMusic (self);
2505		2864
2506	int	2865	int
2507	play (CFPlus::MixMusic self, int loops = -1)	2866	play (DC::MixMusic self, int loops = -1)
2508	CODE:	2867	CODE:
2509	RETVAL = Mix_PlayMusic (self, loops);	2868	RETVAL = Mix_PlayMusic (self, loops);
2510	OUTPUT:	2869	OUTPUT:
2511	RETVAL	2870	RETVAL
2512		2871
2513	void	2872	void
2514	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)
2515	CODE:	2874	CODE:
2516	Mix_FadeInMusicPos (self, loops, ms, position);	2875	Mix_FadeInMusicPos (self, loops, ms, position);
2517		2876
2518	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2877	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2519		2878
2520	PROTOTYPES: ENABLE	2879	PROTOTYPES: ENABLE
2521		2880
2522	BOOT:	2881	BOOT:
2523	{	2882	{
2524	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2883	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2525	static const struct {	2884	static const struct {
2526	const char *name;	2885	const char *name;
2527	IV iv;	2886	IV iv;
2528	} *civ, const_iv[] = {	2887	} *civ, const_iv[] = {
2529	# define const_iv(name) { # name, (IV)name }	2888	# define const_iv(name) { # name, (IV)name }
2530	const_iv (GL_VENDOR),	2889	const_iv (GL_VENDOR),
2531	const_iv (GL_VERSION),	2890	const_iv (GL_VERSION),
2532	const_iv (GL_EXTENSIONS),	2891	const_iv (GL_EXTENSIONS),
		2892	const_iv (GL_MAX_TEXTURE_UNITS),
2533	const_iv (GL_COLOR_MATERIAL),	2893	const_iv (GL_COLOR_MATERIAL),
2534	const_iv (GL_SMOOTH),	2894	const_iv (GL_SMOOTH),
2535	const_iv (GL_FLAT),	2895	const_iv (GL_FLAT),
2536	const_iv (GL_DITHER),	2896	const_iv (GL_DITHER),
2537	const_iv (GL_BLEND),	2897	const_iv (GL_BLEND),
…		…
2549	const_iv (GL_ZERO),	2909	const_iv (GL_ZERO),
2550	const_iv (GL_SRC_ALPHA),	2910	const_iv (GL_SRC_ALPHA),
2551	const_iv (GL_DST_ALPHA),	2911	const_iv (GL_DST_ALPHA),
2552	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2912	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2553	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),
2554	const_iv (GL_SRC_ALPHA_SATURATE),	2918	const_iv (GL_SRC_ALPHA_SATURATE),
2555	const_iv (GL_RGB),	2919	const_iv (GL_RGB),
2556	const_iv (GL_RGBA),	2920	const_iv (GL_RGBA),
2557	const_iv (GL_RGBA4),	2921	const_iv (GL_RGBA4),
2558	const_iv (GL_RGBA8),	2922	const_iv (GL_RGBA8),
…		…
2626	const_iv (GL_NICEST),	2990	const_iv (GL_NICEST),
2627	const_iv (GL_V2F),	2991	const_iv (GL_V2F),
2628	const_iv (GL_V3F),	2992	const_iv (GL_V3F),
2629	const_iv (GL_T2F_V3F),	2993	const_iv (GL_T2F_V3F),
2630	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),
2631	# undef const_iv	2998	# undef const_iv
2632	};	2999	};
2633		3000
2634	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; )
2635	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2642	disable_GL_EXT_blend_func_separate ()	3009	disable_GL_EXT_blend_func_separate ()
2643	CODE:	3010	CODE:
2644	gl.BlendFuncSeparate = 0;	3011	gl.BlendFuncSeparate = 0;
2645	gl.BlendFuncSeparateEXT = 0;	3012	gl.BlendFuncSeparateEXT = 0;
2646		3013
		3014	void
		3015	apple_nvidia_bug (int enable)
		3016
2647	char *	3017	char *
2648	gl_vendor ()	3018	gl_vendor ()
2649	CODE:	3019	CODE:
2650	RETVAL = (char *)glGetString (GL_VENDOR);	3020	RETVAL = (char *)glGetString (GL_VENDOR);
2651	OUTPUT:	3021	OUTPUT:
…		…
2700		3070
2701	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3071	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2702	CODE:	3072	CODE:
2703	gl_BlendFuncSeparate (sa, da, saa, daa);	3073	gl_BlendFuncSeparate (sa, da, saa, daa);
2704		3074
		3075	# void glBlendEquation (int se)
		3076
2705	void glDepthMask (int flag)	3077	void glDepthMask (int flag)
2706		3078
2707	void glLogicOp (int opcode)	3079	void glLogicOp (int opcode)
2708		3080
2709	void glColorMask (int red, int green, int blue, int alpha)	3081	void glColorMask (int red, int green, int blue, int alpha)
…		…
2743	void glRotate (float angle, float x, float y, float z)	3115	void glRotate (float angle, float x, float y, float z)
2744	CODE:	3116	CODE:
2745	glRotatef (angle, x, y, z);	3117	glRotatef (angle, x, y, z);
2746		3118
2747	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: @
2748	ALIAS:	3121	ALIAS:
2749	glColor_premultiply = 1	3122	glColor_premultiply = 1
2750	CODE:	3123	CODE:
2751	if (ix)	3124	if (ix)
2752	{	3125	{
…		…
2822	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)
2823	CODE:	3196	CODE:
2824	if (gl.SeparableFilter2D)	3197	if (gl.SeparableFilter2D)
2825	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3198	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2826		3199
2827	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)
2828		3201
2829	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)
2830		3203
2831	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)
2832		3205
…		…
2858		3231
2859	void glEndList ()	3232	void glEndList ()
2860		3233
2861	void glCallList (int list)	3234	void glCallList (int list)
2862		3235
2863	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3236	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2864		3237
2865	PROTOTYPES: DISABLE	3238	PROTOTYPES: DISABLE
2866		3239
2867	void	3240	void
2868	find_widget (SV *self, NV x, NV y)	3241	find_widget (SV *self, NV x, NV y)
…		…
2872	XPUSHs (self);	3245	XPUSHs (self);
2873	}	3246	}
2874		3247
2875	BOOT:	3248	BOOT:
2876	{	3249	{
2877	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3250	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2878		3251
2879	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);
2880	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);
2881	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);
2882	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);
2883	}	3256	}
2884		3257
2885	void	3258	void
2886	draw (SV *self)	3259	draw (SV *self)
2887	CODE:	3260	CODE:
…		…
2894	SV *draw_w_sv = GvSV (draw_w_gv);	3267	SV *draw_w_sv = GvSV (draw_w_gv);
2895	SV *draw_h_sv = GvSV (draw_h_gv);	3268	SV *draw_h_sv = GvSV (draw_h_gv);
2896	double draw_x, draw_y;	3269	double draw_x, draw_y;
2897		3270
2898	if (!SvROK (self))	3271	if (!SvROK (self))
2899	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3272	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2900		3273
2901	hv = (HV *)SvRV (self);	3274	hv = (HV *)SvRV (self);
2902		3275
2903	if (SvTYPE (hv) != SVt_PVHV)	3276	if (SvTYPE (hv) != SVt_PVHV)
2904	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3277	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2905		3278
2906	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.;
2907	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.;
2908		3281
2909	if (!h || !w)	3282	if (!h || !w)

Diff Legend

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