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.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.273 by root, Wed Aug 20 13:30:02 2008 UTC

…		…
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
		22	// microsoft vs. C
		23	# define sqrtf(x) sqrt(x)
		24	# define roundf(x) (int)(x)
		25	# define atan2f(x,y) atan2(x,y)
		26	# define M_PI 3.14159265f
22	#endif	27	#endif
23		28
24	#include <assert.h>	29	#include <assert.h>
25	#include <math.h>	30	#include <math.h>
26	#include <string.h>	31	#include <string.h>
…		…
34	#include <SDL_endian.h>	39	#include <SDL_endian.h>
35	#include <SDL_image.h>	40	#include <SDL_image.h>
36	#include <SDL_mixer.h>	41	#include <SDL_mixer.h>
37	#include <SDL_opengl.h>	42	#include <SDL_opengl.h>
38		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
39	#define PANGO_ENABLE_BACKEND	49	#define PANGO_ENABLE_BACKEND
40	#define G_DISABLE_CAST_CHECKS	50	#define G_DISABLE_CAST_CHECKS
41		51
42	#include <glib/gmacros.h>	52	#include <glib/gmacros.h>
43		53
44	#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
45		66
46	#ifndef _WIN32	67	#ifndef _WIN32
47	# include <sys/types.h>	68	# include <sys/types.h>
48	# include <sys/socket.h>	69	# include <sys/socket.h>
49	# include <netinet/in.h>	70	# include <netinet/in.h>
50	# include <netinet/tcp.h>	71	# include <netinet/tcp.h>
51	# include <inttypes.h>	72	# include <inttypes.h>
52	#endif	73	#endif
53		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
54	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55		85
56	#define FOW_DARKNESS 32	86	#define FOW_DARKNESS 32
57		87
58	#define MAP_EXTEND_X 32	88	#define MAP_EXTEND_X 32
59	#define MAP_EXTEND_Y 512	89	#define MAP_EXTEND_Y 512
60		90
61	#define MIN_FONT_HEIGHT 10	91	#define MIN_FONT_HEIGHT 10
62		92
63	#if 0	93	/* mask out modifiers we are not interested in */
64	# define PARACHUTE SDL_INIT_NOPARACHUTE	94	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65	#else
66	# define PARACHUTE 0
67	#endif
68		95
69	static AV *texture_av;	96	static AV *texture_av;
70		97
71	static struct	98	static struct
72	{	99	{
…		…
109	av_push (texture_av, (SV *)(size_t)name);	136	av_push (texture_av, (SV *)(size_t)name);
110	glDeleteTextures (1, &name);	137	glDeleteTextures (1, &name);
111	}	138	}
112		139
113	#include "texcache.c"	140	#include "texcache.c"
		141	#include "rendercache.c"
114		142
115	#include "pango-font.c"	143	#include "pango-font.c"
116	#include "pango-fontmap.c"	144	#include "pango-fontmap.c"
117	#include "pango-render.c"	145	#include "pango-render.c"
118		146
119	typedef IV CFPlus__Channel;	147	typedef IV DC__Channel;
120	typedef SDL_RWops *CFPlus__RW;	148	typedef SDL_RWops *DC__RW;
121	typedef Mix_Chunk *CFPlus__MixChunk;	149	typedef Mix_Chunk *DC__MixChunk;
122	typedef Mix_Music *CFPlus__MixMusic;	150	typedef Mix_Music *DC__MixMusic;
123		151
124	typedef PangoFontDescription *CFPlus__Font;	152	typedef PangoFontDescription *DC__Font;
125		153
126	static int	154	static int
127	shape_attr_p (PangoLayoutRun *run)	155	shape_attr_p (PangoLayoutRun *run)
128	{	156	{
129	GSList *attrs = run->item->analysis.extra_attrs;	157	GSList *attrs = run->item->analysis.extra_attrs;
…		…
143		171
144	typedef struct cf_layout {	172	typedef struct cf_layout {
145	PangoLayout *pl;	173	PangoLayout *pl;
146	float r, g, b, a; // default color for rgba mode	174	float r, g, b, a; // default color for rgba mode
147	int base_height;	175	int base_height;
148	CFPlus__Font font;	176	DC__Font font;
		177	rc_t *rc;
149	} *CFPlus__Layout;	178	} *DC__Layout;
150		179
151	static CFPlus__Font default_font;	180	static DC__Font default_font;
152	static PangoContext *opengl_context;	181	static PangoContext *opengl_context;
153	static PangoFontMap *opengl_fontmap;	182	static PangoFontMap *opengl_fontmap;
154		183
155	static void	184	static void
156	substitute_func (FcPattern *pattern, gpointer data)	185	substitute_func (FcPattern *pattern, gpointer data)
…		…
161	#endif	190	#endif
162	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	191	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163	}	192	}
164		193
165	static void	194	static void
166	layout_update_font (CFPlus__Layout self)	195	layout_update_font (DC__Layout self)
167	{	196	{
168	/* use a random scale factor to account for unknown descenders, 0.8 works	197	/* use a random scale factor to account for unknown descenders, 0.8 works
169	* reasonably well with bitstream vera	198	* reasonably well with dejavu/bistream fonts
170	*/	199	*/
171	PangoFontDescription *font = self->font ? self->font : default_font;	200	PangoFontDescription *font = self->font ? self->font : default_font;
172		201
173	pango_font_description_set_absolute_size (font,	202	pango_font_description_set_absolute_size (font,
174	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	203	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175		204
176	pango_layout_set_font_description (self->pl, font);	205	pango_layout_set_font_description (self->pl, font);
177	}	206	}
178		207
179	static void	208	static void
180	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	209	layout_get_pixel_size (DC__Layout self, int *w, int *h)
181	{	210	{
182	PangoRectangle rect;	211	PangoRectangle rect;
183		212
184	// get_pixel_* wrongly rounds down	213	// get_pixel_* wrongly rounds down
185	pango_layout_get_extents (self->pl, 0, &rect);	214	pango_layout_get_extents (self->pl, 0, &rect);
…		…
196		225
197	typedef uint16_t tileid;	226	typedef uint16_t tileid;
198	typedef uint16_t faceid;	227	typedef uint16_t faceid;
199		228
200	typedef struct {	229	typedef struct {
201	int name;	230	GLuint name;
202	int w, h;	231	int w, h;
203	float s, t;	232	float s, t;
204	uint8_t r, g, b, a;	233	uint8_t r, g, b, a;
205	tileid smoothtile;	234	tileid smoothtile;
206	uint8_t smoothlevel;	235	uint8_t smoothlevel;
…		…
224	int faces; tileid *face2tile; // [faceid]	253	int faces; tileid *face2tile; // [faceid]
225	int texs; maptex *tex; // [tileid]	254	int texs; maptex *tex; // [tileid]
226		255
227	int32_t rows;	256	int32_t rows;
228	maprow *row;	257	maprow *row;
229	} *CFPlus__Map;	258	} *DC__Map;
230		259
231	static char *	260	static char *
232	prepend (char *ptr, int sze, int inc)	261	prepend (char *ptr, int sze, int inc)
233	{	262	{
234	char *p;	263	char *p;
…		…
272	self->texs *= 2;	301	self->texs *= 2;
273	}	302	}
274	}	303	}
275		304
276	static maprow *	305	static maprow *
277	map_get_row (CFPlus__Map self, int y)	306	map_get_row (DC__Map self, int y)
278	{	307	{
279	if (0 > y)	308	if (0 > y)
280	{	309	{
281	int extend = - y + MAP_EXTEND_Y;	310	int extend = - y + MAP_EXTEND_Y;
282	Prepend (maprow, self->row, self->rows, extend);	311	Prepend (maprow, self->row, self->rows, extend);
…		…
320		349
321	return row->col + (x - row->c0);	350	return row->col + (x - row->c0);
322	}	351	}
323		352
324	static mapcell *	353	static mapcell *
325	map_get_cell (CFPlus__Map self, int x, int y)	354	map_get_cell (DC__Map self, int x, int y)
326	{	355	{
327	return row_get_cell (map_get_row (self, y), x);	356	return row_get_cell (map_get_row (self, y), x);
328	}	357	}
329		358
330	static void	359	static void
331	map_clear (CFPlus__Map self)	360	map_clear (DC__Map self)
332	{	361	{
333	int r;	362	int r;
334		363
335	for (r = 0; r < self->rows; r++)	364	for (r = 0; r < self->rows; r++)
336	Safefree (self->row[r].col);	365	Safefree (self->row[r].col);
…		…
343	self->oy = 0;	372	self->oy = 0;
344	self->row = 0;	373	self->row = 0;
345	self->rows = 0;	374	self->rows = 0;
346	}	375	}
347		376
		377	#define CELL_CLEAR(cell) \
		378	do { \
		379	if ((cell)->player) \
		380	(cell)->tile [2] = 0; \
		381	(cell)->darkness = 0; \
		382	(cell)->stat_hp = 0; \
		383	(cell)->flags = 0; \
		384	(cell)->player = 0; \
		385	} while (0)
		386
348	static void	387	static void
349	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	388	map_blank (DC__Map self, int x0, int y0, int w, int h)
350	{	389	{
351	int x, y;	390	int x, y;
352	maprow *row;	391	maprow *row;
353	mapcell *cell;	392	mapcell *cell;
354		393
…		…
366	if (x >= row->c1)	405	if (x >= row->c1)
367	break;	406	break;
368		407
369	cell = row->col + x - row->c0;	408	cell = row->col + x - row->c0;
370		409
371	cell->darkness = 0;	410	CELL_CLEAR (cell);
372	cell->stat_hp = 0;
373	cell->flags = 0;
374	cell->player = 0;
375	}	411	}
376	}	412	}
377	}	413	}
378		414
379	typedef struct {	415	typedef struct {
…		…
433	n |= n >> 16;	469	n |= n >> 16;
434		470
435	return n + 1;	471	return n + 1;
436	}	472	}
437		473
		474	static unsigned int
		475	popcount (unsigned int n)
		476	{
		477	n -= (n >> 1) & 0x55555555U;
		478	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		479	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		480	n *= 0x01010101U;
		481
		482	return n >> 24;
		483	}
		484
438	/* SDL should provide this, really. */	485	/* SDL should provide this, really. */
439	#define SDLK_MODIFIER_MIN 300	486	#define SDLK_MODIFIER_MIN 300
440	#define SDLK_MODIFIER_MAX 314	487	#define SDLK_MODIFIER_MAX 314
441		488
442	/******************************************************************************/	489	/******************************************************************************/
…		…
480	return 0;	527	return 0;
481		528
482	return 1;	529	return 1;
483	}	530	}
484		531
485	MODULE = CFPlus PACKAGE = CFPlus	532	static void
		533	deliantra_main ()
		534	{
		535	char *argv[] = { 0 };
		536	call_argv ("::main", G_DISCARD | G_VOID, argv);
		537	dSP;
		538	}
		539
		540	#ifdef __MACOSX__
		541	/* to due surprising braindamage on the side of SDL design, we
		542	* do some mind-boggling hack here: SDL requires a custom main()
		543	* on OS X, so... we provide one and call the original main(), which,
		544	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		545	* and which calls our main (== SDL_main) back.
		546	*/
		547	extern C_LINKAGE int
		548	main (int argc, char *argv[])
		549	{
		550	deliantra_main ();
		551	}
		552
		553	#undef main
		554
		555	extern C_LINKAGE int main (int argc, char *argv[]);
		556
		557	static void
		558	SDL_braino (void)
		559	{
		560	char *argv[] = { "deliantra client", 0 };
		561	(main) (1, argv);
		562	}
		563	#else
		564	static void
		565	SDL_braino (void)
		566	{
		567	deliantra_main ();
		568	}
		569	#endif
		570
		571	MODULE = Deliantra::Client PACKAGE = DC
486		572
487	PROTOTYPES: ENABLE	573	PROTOTYPES: ENABLE
488		574
489	BOOT:	575	BOOT:
490	{	576	{
491	HV *stash = gv_stashpv ("CFPlus", 1);	577	HV *stash = gv_stashpv ("DC", 1);
492	static const struct {	578	static const struct {
493	const char *name;	579	const char *name;
494	IV iv;	580	IV iv;
495	} *civ, const_iv[] = {	581	} *civ, const_iv[] = {
496	# define const_iv(name) { # name, (IV)name }	582	# define const_iv(name) { # name, (IV)name }
…		…
518		604
519	const_iv (SDL_APPINPUTFOCUS),	605	const_iv (SDL_APPINPUTFOCUS),
520	const_iv (SDL_APPMOUSEFOCUS),	606	const_iv (SDL_APPMOUSEFOCUS),
521	const_iv (SDL_APPACTIVE),	607	const_iv (SDL_APPACTIVE),
522		608
		609	const_iv (SDLK_FIRST),
		610	const_iv (SDLK_LAST),
523	const_iv (SDLK_KP0),	611	const_iv (SDLK_KP0),
524	const_iv (SDLK_KP1),	612	const_iv (SDLK_KP1),
525	const_iv (SDLK_KP2),	613	const_iv (SDLK_KP2),
526	const_iv (SDLK_KP3),	614	const_iv (SDLK_KP3),
527	const_iv (SDLK_KP4),	615	const_iv (SDLK_KP4),
…		…
599	const_iv (KMOD_LMETA),	687	const_iv (KMOD_LMETA),
600	const_iv (KMOD_RMETA),	688	const_iv (KMOD_RMETA),
601	const_iv (KMOD_NUM),	689	const_iv (KMOD_NUM),
602	const_iv (KMOD_CAPS),	690	const_iv (KMOD_CAPS),
603	const_iv (KMOD_MODE),	691	const_iv (KMOD_MODE),
		692
		693	const_iv (MIX_DEFAULT_FORMAT),
		694
		695	const_iv (SDL_INIT_TIMER),
		696	const_iv (SDL_INIT_AUDIO),
		697	const_iv (SDL_INIT_VIDEO),
		698	const_iv (SDL_INIT_CDROM),
		699	const_iv (SDL_INIT_JOYSTICK),
		700	const_iv (SDL_INIT_EVERYTHING),
		701	const_iv (SDL_INIT_NOPARACHUTE),
		702	const_iv (SDL_INIT_EVENTTHREAD),
		703
		704	const_iv (SDL_GL_RED_SIZE),
		705	const_iv (SDL_GL_GREEN_SIZE),
		706	const_iv (SDL_GL_BLUE_SIZE),
		707	const_iv (SDL_GL_ALPHA_SIZE),
		708	const_iv (SDL_GL_DOUBLEBUFFER),
		709	const_iv (SDL_GL_BUFFER_SIZE),
		710	const_iv (SDL_GL_DEPTH_SIZE),
		711	const_iv (SDL_GL_STENCIL_SIZE),
		712	const_iv (SDL_GL_ACCUM_RED_SIZE),
		713	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		714	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		715	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		716	const_iv (SDL_GL_STEREO),
		717	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		718	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		719	const_iv (SDL_GL_ACCELERATED_VISUAL),
		720	const_iv (SDL_GL_SWAP_CONTROL),
		721
		722	const_iv (FOW_DARKNESS)
604	# undef const_iv	723	# undef const_iv
605	};	724	};
606		725
607	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	726	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	727	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
626		745
627	NV floor (NV x)	746	NV floor (NV x)
628		747
629	NV ceil (NV x)	748	NV ceil (NV x)
630		749
		750	IV minpot (UV n)
		751
		752	IV popcount (UV n)
		753
631	void	754	void
632	pango_init ()	755	pango_init ()
633	CODE:	756	CODE:
634	{	757	{
635	opengl_fontmap = pango_opengl_font_map_new ();	758	opengl_fontmap = pango_opengl_font_map_new ();
636	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	759	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	760	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		761	/*pango_context_set_font_description (opengl_context, default_font);*/
		762	#if PANGO_VERSION_CHECK (1, 15, 2)
		763	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		764	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		765	#endif
638	}	766	}
639		767
640	char *
641	SDL_GetError ()	768	char *SDL_GetError ()
642		769
643	int	770	void SDL_braino ()
644	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645		771
646	void	772	int SDL_Init (U32 flags)
		773
		774	int SDL_InitSubSystem (U32 flags)
		775
		776	void SDL_QuitSubSystem (U32 flags)
		777
647	SDL_Quit ()	778	void SDL_Quit ()
		779
		780	int SDL_GL_SetAttribute (int attr, int value)
		781
		782	int SDL_GL_GetAttribute (int attr)
		783	CODE:
		784	if (SDL_GL_GetAttribute (attr, &RETVAL))
		785	XSRETURN_UNDEF;
		786	OUTPUT:
		787	RETVAL
648		788
649	void	789	void
650	SDL_ListModes (int rgb, int alpha)	790	SDL_ListModes (int rgb, int alpha)
651	PPCODE:	791	PPCODE:
652	{	792	{
…		…
664	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	804	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	805	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	806	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667		807
668	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	808	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669	#if SDL_VERSION_ATLEAST(1,2,10)
670	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	809	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672	#endif
673		810
674	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	811	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675		812
676	if (m && m != (SDL_Rect **)-1)	813	if (m && m != (SDL_Rect **)-1)
677	while (*m)	814	while (*m)
678	{	815	{
679	if ((*m)->w >= 640 && (*m)->h >= 480)	816	if ((*m)->w >= 400 && (*m)->h >= 300)
680	{	817	{
681	AV *av = newAV ();	818	AV *av = newAV ();
682	av_push (av, newSViv ((*m)->w));	819	av_push (av, newSViv ((*m)->w));
683	av_push (av, newSViv ((*m)->h));	820	av_push (av, newSViv ((*m)->h));
684	av_push (av, newSViv (rgb));	821	av_push (av, newSViv (rgb));
…		…
708		845
709	if (RETVAL)	846	if (RETVAL)
710	{	847	{
711	av_clear (texture_av);	848	av_clear (texture_av);
712		849
713	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	850	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	851	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715	#include "glfunc.h"	852	#include "glfunc.h"
716	#undef GL_FUNC	853	#undef GL_FUNC
717	}	854	}
718	}	855	}
…		…
725	char *	862	char *
726	SDL_GetKeyName (int sym)	863	SDL_GetKeyName (int sym)
727		864
728	int	865	int
729	SDL_GetAppState ()	866	SDL_GetAppState ()
		867
		868	int
		869	SDL_GetModState ()
730		870
731	void	871	void
732	poll_events ()	872	poll_events ()
733	PPCODE:	873	PPCODE:
734	{	874	{
…		…
744	{	884	{
745	case SDL_KEYDOWN:	885	case SDL_KEYDOWN:
746	case SDL_KEYUP:	886	case SDL_KEYUP:
747	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	887	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	888	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	889	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
750	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	890	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
751	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	891	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752	break;	892	break;
753		893
754	case SDL_ACTIVEEVENT:	894	case SDL_ACTIVEEVENT:
755	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	895	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
773	x = ev.motion.x;	913	x = ev.motion.x;
774	y = ev.motion.y;	914	y = ev.motion.y;
775	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	915	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776	}	916	}
777		917
778	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	918	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779	hv_store (hv, "state", 5, newSViv (state), 0);	919	hv_store (hv, "state", 5, newSViv (state), 0);
780	hv_store (hv, "x", 1, newSViv (x), 0);	920	hv_store (hv, "x", 1, newSViv (x), 0);
781	hv_store (hv, "y", 1, newSViv (y), 0);	921	hv_store (hv, "y", 1, newSViv (y), 0);
782	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	922	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	923	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784	}	924	}
785	break;	925	break;
786		926
787	case SDL_MOUSEBUTTONDOWN:	927	case SDL_MOUSEBUTTONDOWN:
788	case SDL_MOUSEBUTTONUP:	928	case SDL_MOUSEBUTTONUP:
789	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	929	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790		930
791	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	931	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	932	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	933	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	934	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
799	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	939	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	940	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801	break;	941	break;
802	}	942	}
803		943
804	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	944	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805	}	945	}
806	}	946	}
807		947
808	int	948	int
809	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	949	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810	POSTCALL:	950	POSTCALL:
811	Mix_HookMusicFinished (music_finished);	951	Mix_HookMusicFinished (music_finished);
812	Mix_ChannelFinished (channel_finished);	952	Mix_ChannelFinished (channel_finished);
		953
		954	void
		955	Mix_QuerySpec ()
		956	PPCODE:
		957	{
		958	int freq, channels;
		959	Uint16 format;
		960
		961	if (Mix_QuerySpec (&freq, &format, &channels))
		962	{
		963	EXTEND (SP, 3);
		964	PUSHs (sv_2mortal (newSViv (freq)));
		965	PUSHs (sv_2mortal (newSViv (format)));
		966	PUSHs (sv_2mortal (newSViv (channels)));
		967	}
		968	}
813		969
814	void	970	void
815	Mix_CloseAudio ()	971	Mix_CloseAudio ()
816		972
817	int	973	int
…		…
852	}	1008	}
853	}	1009	}
854	#endif	1010	#endif
855	}	1011	}
856		1012
857	void	1013	int
858	add_font (char *file)	1014	add_font (char *file)
859	CODE:	1015	CODE:
860	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1016	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1017	OUTPUT:
		1018	RETVAL
861		1019
862	void	1020	void
863	load_image_inline (SV *image_)	1021	load_image_inline (SV *image_)
864	ALIAS:	1022	ALIAS:
865	load_image_file = 1	1023	load_image_file = 1
…		…
951	void	1109	void
952	error (char *message)	1110	error (char *message)
953	CODE:	1111	CODE:
954	fprintf (stderr, "ERROR: %s\n", message);	1112	fprintf (stderr, "ERROR: %s\n", message);
955	#ifdef _WIN32	1113	#ifdef _WIN32
956	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1114	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957	#endif	1115	#endif
958		1116
959	void	1117	void
960	fatal (char *message)	1118	fatal (char *message)
961	CODE:	1119	CODE:
962	fprintf (stderr, "FATAL: %s\n", message);	1120	fprintf (stderr, "FATAL: %s\n", message);
963	#ifdef _WIN32	1121	#ifdef _WIN32
964	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1122	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965	#endif	1123	#endif
966	_exit (1);	1124	_exit (1);
967		1125
968	void	1126	void
969	_exit (int retval = 0)	1127	_exit (int retval = 0)
…		…
981	#if DEBUG	1139	#if DEBUG
982	VALGRIND_DO_LEAK_CHECK;	1140	VALGRIND_DO_LEAK_CHECK;
983	#endif	1141	#endif
984	}	1142	}
985		1143
986	MODULE = CFPlus PACKAGE = CFPlus::Font	1144	MODULE = Deliantra::Client PACKAGE = DC::Font
987		1145
988	PROTOTYPES: DISABLE	1146	PROTOTYPES: DISABLE
989		1147
990	CFPlus::Font	1148	DC::Font
991	new_from_file (SV *class, char *path, int id = 0)	1149	new_from_file (SV *class, char *path, int id = 0)
992	CODE:	1150	CODE:
993	{	1151	{
994	int count;	1152	int count;
995	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1153	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
998	}	1156	}
999	OUTPUT:	1157	OUTPUT:
1000	RETVAL	1158	RETVAL
1001		1159
1002	void	1160	void
1003	DESTROY (CFPlus::Font self)	1161	DESTROY (DC::Font self)
1004	CODE:	1162	CODE:
1005	pango_font_description_free (self);	1163	pango_font_description_free (self);
1006		1164
1007	void	1165	void
1008	make_default (CFPlus::Font self)	1166	make_default (DC::Font self)
1009	PROTOTYPE: $	1167	PROTOTYPE: $
1010	CODE:	1168	CODE:
1011	default_font = self;	1169	default_font = self;
1012		1170
1013	MODULE = CFPlus PACKAGE = CFPlus::Layout	1171	MODULE = Deliantra::Client PACKAGE = DC::Layout
1014		1172
1015	PROTOTYPES: DISABLE	1173	PROTOTYPES: DISABLE
1016		1174
1017	void	1175	void
1018	reset_glyph_cache ()	1176	glyph_cache_backup ()
1019	PROTOTYPE:	1177	PROTOTYPE:
1020	CODE:	1178	CODE:
		1179	tc_backup ();
		1180
		1181	void
		1182	glyph_cache_restore ()
		1183	PROTOTYPE:
		1184	CODE:
1021	tc_clear ();	1185	tc_restore ();
1022		1186
1023	CFPlus::Layout	1187	DC::Layout
1024	new (SV *class)	1188	new (SV *class)
1025	CODE:	1189	CODE:
1026	New (0, RETVAL, 1, struct cf_layout);	1190	New (0, RETVAL, 1, struct cf_layout);
1027		1191
1028	RETVAL->pl = pango_layout_new (opengl_context);	1192	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1030	RETVAL->g = 1.;	1194	RETVAL->g = 1.;
1031	RETVAL->b = 1.;	1195	RETVAL->b = 1.;
1032	RETVAL->a = 1.;	1196	RETVAL->a = 1.;
1033	RETVAL->base_height = MIN_FONT_HEIGHT;	1197	RETVAL->base_height = MIN_FONT_HEIGHT;
1034	RETVAL->font = 0;	1198	RETVAL->font = 0;
		1199	RETVAL->rc = rc_alloc ();
1035		1200
1036	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1201	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037	layout_update_font (RETVAL);	1202	layout_update_font (RETVAL);
1038	OUTPUT:	1203	OUTPUT:
1039	RETVAL	1204	RETVAL
1040		1205
1041	void	1206	void
1042	DESTROY (CFPlus::Layout self)	1207	DESTROY (DC::Layout self)
1043	CODE:	1208	CODE:
1044	g_object_unref (self->pl);	1209	g_object_unref (self->pl);
		1210	rc_free (self->rc);
1045	Safefree (self);	1211	Safefree (self);
1046		1212
1047	void	1213	void
1048	set_text (CFPlus::Layout self, SV *text_)	1214	set_text (DC::Layout self, SV *text_)
1049	CODE:	1215	CODE:
1050	{	1216	{
1051	STRLEN textlen;	1217	STRLEN textlen;
1052	char *text = SvPVutf8 (text_, textlen);	1218	char *text = SvPVutf8 (text_, textlen);
1053		1219
1054	pango_layout_set_text (self->pl, text, textlen);	1220	pango_layout_set_text (self->pl, text, textlen);
1055	}	1221	}
1056		1222
1057	void	1223	void
1058	set_markup (CFPlus::Layout self, SV *text_)	1224	set_markup (DC::Layout self, SV *text_)
1059	CODE:	1225	CODE:
1060	{	1226	{
1061	STRLEN textlen;	1227	STRLEN textlen;
1062	char *text = SvPVutf8 (text_, textlen);	1228	char *text = SvPVutf8 (text_, textlen);
1063		1229
1064	pango_layout_set_markup (self->pl, text, textlen);	1230	pango_layout_set_markup (self->pl, text, textlen);
1065	}	1231	}
1066		1232
1067	void	1233	void
1068	set_shapes (CFPlus::Layout self, ...)	1234	set_shapes (DC::Layout self, ...)
1069	CODE:	1235	CODE:
1070	{	1236	{
1071	PangoAttrList *attrs = 0;	1237	PangoAttrList *attrs = 0;
1072	const char *text = pango_layout_get_text (self->pl);	1238	const char *text = pango_layout_get_text (self->pl);
1073	const char *pos = text;	1239	const char *pos = text;
…		…
1108	if (attrs)	1274	if (attrs)
1109	pango_layout_set_attributes (self->pl, attrs);	1275	pango_layout_set_attributes (self->pl, attrs);
1110	}	1276	}
1111		1277
1112	void	1278	void
1113	get_shapes (CFPlus::Layout self)	1279	get_shapes (DC::Layout self)
1114	PPCODE:	1280	PPCODE:
1115	{	1281	{
1116	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1282	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117		1283
1118	do	1284	do
1119	{	1285	{
1120	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1286	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121		1287
1122	if (run && shape_attr_p (run))	1288	if (run && shape_attr_p (run))
1123	{	1289	{
1124	PangoRectangle extents;	1290	PangoRectangle extents;
1125	pango_layout_iter_get_run_extents (iter, 0, &extents);	1291	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1133		1299
1134	pango_layout_iter_free (iter);	1300	pango_layout_iter_free (iter);
1135	}	1301	}
1136		1302
1137	int	1303	int
1138	has_wrapped (CFPlus::Layout self)	1304	has_wrapped (DC::Layout self)
1139	CODE:	1305	CODE:
1140	{	1306	{
1141	int lines = 1;	1307	int lines = 1;
1142	const char *text = pango_layout_get_text (self->pl);	1308	const char *text = pango_layout_get_text (self->pl);
1143		1309
…		…
1148	}	1314	}
1149	OUTPUT:	1315	OUTPUT:
1150	RETVAL	1316	RETVAL
1151		1317
1152	SV *	1318	SV *
1153	get_text (CFPlus::Layout self)	1319	get_text (DC::Layout self)
1154	CODE:	1320	CODE:
1155	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1321	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156	sv_utf8_decode (RETVAL);	1322	sv_utf8_decode (RETVAL);
1157	OUTPUT:	1323	OUTPUT:
1158	RETVAL	1324	RETVAL
1159		1325
1160	void	1326	void
1161	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1327	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1162	CODE:	1328	CODE:
1163	self->r = r;	1329	self->r = r;
1164	self->g = g;	1330	self->g = g;
1165	self->b = b;	1331	self->b = b;
1166	self->a = a;	1332	self->a = a;
1167		1333
1168	void	1334	void
1169	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1335	set_font (DC::Layout self, DC::Font font = 0)
1170	CODE:	1336	CODE:
1171	if (self->font != font)	1337	if (self->font != font)
1172	{	1338	{
1173	self->font = font;	1339	self->font = font;
1174	layout_update_font (self);	1340	layout_update_font (self);
1175	}	1341	}
1176		1342
1177	void	1343	void
1178	set_height (CFPlus::Layout self, int base_height)	1344	set_height (DC::Layout self, int base_height)
1179	CODE:	1345	CODE:
1180	if (self->base_height != base_height)	1346	if (self->base_height != base_height)
1181	{	1347	{
1182	self->base_height = base_height;	1348	self->base_height = base_height;
1183	layout_update_font (self);	1349	layout_update_font (self);
1184	}	1350	}
1185		1351
1186	void	1352	void
1187	set_width (CFPlus::Layout self, int max_width = -1)	1353	set_width (DC::Layout self, int max_width = -1)
1188	CODE:	1354	CODE:
1189	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1355	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1190		1356
1191	void	1357	void
1192	set_indent (CFPlus::Layout self, int indent)	1358	set_indent (DC::Layout self, int indent)
1193	CODE:	1359	CODE:
1194	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1360	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195		1361
1196	void	1362	void
1197	set_spacing (CFPlus::Layout self, int spacing)	1363	set_spacing (DC::Layout self, int spacing)
1198	CODE:	1364	CODE:
1199	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1365	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200		1366
1201	void	1367	void
1202	set_ellipsise (CFPlus::Layout self, int ellipsise)	1368	set_ellipsise (DC::Layout self, int ellipsise)
1203	CODE:	1369	CODE:
1204	pango_layout_set_ellipsize (self->pl,	1370	pango_layout_set_ellipsize (self->pl,
1205	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1371	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1372	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1373	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208	: PANGO_ELLIPSIZE_NONE	1374	: PANGO_ELLIPSIZE_NONE
1209	);	1375	);
1210		1376
1211	void	1377	void
1212	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1378	set_single_paragraph_mode (DC::Layout self, int spm)
1213	CODE:	1379	CODE:
1214	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1380	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215		1381
1216	void	1382	void
1217	size (CFPlus::Layout self)	1383	size (DC::Layout self)
1218	PPCODE:	1384	PPCODE:
1219	{	1385	{
1220	int w, h;	1386	int w, h;
1221		1387
1222	layout_get_pixel_size (self, &w, &h);	1388	layout_get_pixel_size (self, &w, &h);
…		…
1225	PUSHs (sv_2mortal (newSViv (w)));	1391	PUSHs (sv_2mortal (newSViv (w)));
1226	PUSHs (sv_2mortal (newSViv (h)));	1392	PUSHs (sv_2mortal (newSViv (h)));
1227	}	1393	}
1228		1394
1229	int	1395	int
1230	descent (CFPlus::Layout self)	1396	descent (DC::Layout self)
1231	CODE:	1397	CODE:
1232	{	1398	{
1233	PangoRectangle rect;	1399	PangoRectangle rect;
1234	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1400	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235	pango_layout_line_get_pixel_extents (line, 0, &rect);	1401	pango_layout_line_get_pixel_extents (line, 0, &rect);
1236	RETVAL = PANGO_DESCENT (rect);	1402	RETVAL = PANGO_DESCENT (rect);
1237	}	1403	}
1238	OUTPUT:	1404	OUTPUT:
1239	RETVAL	1405	RETVAL
1240		1406
1241	int	1407	int
1242	xy_to_index (CFPlus::Layout self, int x, int y)	1408	xy_to_index (DC::Layout self, int x, int y)
1243	CODE:	1409	CODE:
1244	{	1410	{
1245	int index, trailing;	1411	int index, trailing;
1246	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1412	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1247	RETVAL = index + trailing;	1413	RETVAL = index + trailing;
1248	}	1414	}
1249	OUTPUT:	1415	OUTPUT:
1250	RETVAL	1416	RETVAL
1251		1417
1252	void	1418	void
1253	cursor_pos (CFPlus::Layout self, int index)	1419	cursor_pos (DC::Layout self, int index)
1254	PPCODE:	1420	PPCODE:
1255	{	1421	{
1256	PangoRectangle strong_pos;	1422	PangoRectangle pos;
1257	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1423	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258		1424
1259	EXTEND (SP, 3);	1425	EXTEND (SP, 3);
1260	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1426	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1427	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1428	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263	}	1429	}
1264		1430
1265	void	1431	void
1266	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1432	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267	PPCODE:	1433	PPCODE:
1268	{	1434	{
1269	int line, x;	1435	int line, x;
1270		1436
1271	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1437	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1438	#if !PANGO_VERSION_CHECK (1, 17, 3)
1272	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1439	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273		1440	--line;
		1441	#endif
1274	EXTEND (SP, 2);	1442	EXTEND (SP, 2);
1275	PUSHs (sv_2mortal (newSViv (line - 1)));	1443	PUSHs (sv_2mortal (newSViv (line)));
1276	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1444	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277	}	1445	}
1278		1446
1279	void	1447	void
1280	line_x_to_index (CFPlus::Layout self, int line, int x)	1448	line_x_to_index (DC::Layout self, int line, int x)
1281	PPCODE:	1449	PPCODE:
1282	{	1450	{
1283	PangoLayoutLine *lp;	1451	PangoLayoutLine *lp;
1284	int index, trailing;	1452	int index, trailing;
1285		1453
1286	if (line < 0)	1454	if (line < 0)
1287	XSRETURN_EMPTY;	1455	XSRETURN_EMPTY;
1288		1456
1289	if (!(lp = pango_layout_get_line (self->pl, line)))	1457	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290	XSRETURN_EMPTY; /* do better */	1458	XSRETURN_EMPTY; /* do better */
1291		1459
1292	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1460	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293		1461
1294	EXTEND (SP, 2);	1462	EXTEND (SP, 2);
…		…
1300	PUSHs (sv_2mortal (newSViv (trailing)));	1468	PUSHs (sv_2mortal (newSViv (trailing)));
1301	}	1469	}
1302	}	1470	}
1303		1471
1304	void	1472	void
1305	render (CFPlus::Layout self, float x, float y, int flags = 0)	1473	render (DC::Layout self, float x, float y, int flags = 0)
1306	PPCODE:	1474	CODE:
		1475	rc_clear (self->rc);
1307	pango_opengl_render_layout_subpixel (	1476	pango_opengl_render_layout_subpixel (
1308	self->pl,	1477	self->pl,
		1478	self->rc,
1309	x * PANGO_SCALE, y * PANGO_SCALE,	1479	x * PANGO_SCALE, y * PANGO_SCALE,
1310	self->r, self->g, self->b, self->a,	1480	self->r, self->g, self->b, self->a,
1311	flags	1481	flags
1312	);	1482	);
		1483	// we assume that context_change actually clears/frees stuff
		1484	// and does not do any recomputation...
		1485	pango_layout_context_changed (self->pl);
1313		1486
1314	MODULE = CFPlus PACKAGE = CFPlus::Texture	1487	void
		1488	draw (DC::Layout self)
		1489	CODE:
		1490	{
		1491	glEnable (GL_TEXTURE_2D);
		1492	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1493	glEnable (GL_BLEND);
		1494	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1495	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1496	glEnable (GL_ALPHA_TEST);
		1497	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1498
		1499	rc_draw (self->rc);
		1500
		1501	glDisable (GL_ALPHA_TEST);
		1502	glDisable (GL_BLEND);
		1503	glDisable (GL_TEXTURE_2D);
		1504	}
		1505
		1506	MODULE = Deliantra::Client PACKAGE = DC::Texture
1315		1507
1316	PROTOTYPES: ENABLE	1508	PROTOTYPES: ENABLE
1317
1318	int minpot (int n)
1319		1509
1320	void	1510	void
1321	pad (SV *data_, int ow, int oh, int nw, int nh)	1511	pad (SV *data_, int ow, int oh, int nw, int nh)
1322	CODE:	1512	CODE:
1323	{	1513	{
…		…
1350	HV *hv = (HV *)SvRV (self);	1540	HV *hv = (HV *)SvRV (self);
1351	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1541	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1542	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1543	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354		1544
		1545	if (name <= 0)
		1546	XSRETURN_EMPTY;
		1547
1355	if (items < 5)	1548	if (items < 5)
1356	{	1549	{
1357	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1550	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1551	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359	}	1552	}
…		…
1397	RETVAL = width > 0;	1590	RETVAL = width > 0;
1398	}	1591	}
1399	OUTPUT:	1592	OUTPUT:
1400	RETVAL	1593	RETVAL
1401		1594
1402	MODULE = CFPlus PACKAGE = CFPlus::Map	1595	MODULE = Deliantra::Client PACKAGE = DC::Map
1403		1596
1404	PROTOTYPES: DISABLE	1597	PROTOTYPES: DISABLE
1405		1598
1406	CFPlus::Map	1599	DC::Map
1407	new (SV *class)	1600	new (SV *class)
1408	CODE:	1601	CODE:
1409	New (0, RETVAL, 1, struct map);	1602	New (0, RETVAL, 1, struct map);
1410	RETVAL->x = 0;	1603	RETVAL->x = 0;
1411	RETVAL->y = 0;	1604	RETVAL->y = 0;
…		…
1419	RETVAL->row = 0;	1612	RETVAL->row = 0;
1420	OUTPUT:	1613	OUTPUT:
1421	RETVAL	1614	RETVAL
1422		1615
1423	void	1616	void
1424	DESTROY (CFPlus::Map self)	1617	DESTROY (DC::Map self)
1425	CODE:	1618	CODE:
1426	{	1619	{
1427	map_clear (self);	1620	map_clear (self);
1428	Safefree (self->face2tile);	1621	Safefree (self->face2tile);
1429	Safefree (self->tex);	1622	Safefree (self->tex);
1430	Safefree (self);	1623	Safefree (self);
1431	}	1624	}
1432		1625
1433	void	1626	void
1434	resize (CFPlus::Map self, int map_width, int map_height)	1627	resize (DC::Map self, int map_width, int map_height)
1435	CODE:	1628	CODE:
1436	self->w = map_width;	1629	self->w = map_width;
1437	self->h = map_height;	1630	self->h = map_height;
1438		1631
1439	void	1632	void
1440	clear (CFPlus::Map self)	1633	clear (DC::Map self)
1441	CODE:	1634	CODE:
1442	map_clear (self);	1635	map_clear (self);
1443		1636
1444	void	1637	void
1445	set_tileid (CFPlus::Map self, int face, int tile)	1638	set_tileid (DC::Map self, int face, int tile)
1446	CODE:	1639	CODE:
1447	{	1640	{
1448	need_facenum (self, face); self->face2tile [face] = tile;	1641	need_facenum (self, face); self->face2tile [face] = tile;
1449	need_texid (self, tile);	1642	need_texid (self, tile);
1450	}	1643	}
1451		1644
1452	void	1645	void
1453	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1646	set_smooth (DC::Map self, int face, int smooth, int level)
1454	CODE:	1647	CODE:
1455	{	1648	{
1456	tileid texid;	1649	tileid texid;
1457	maptex *tex;	1650	maptex *tex;
1458		1651
…		…
1471	tex->smoothtile = self->face2tile [smooth];	1664	tex->smoothtile = self->face2tile [smooth];
1472	tex->smoothlevel = level;	1665	tex->smoothlevel = level;
1473	}	1666	}
1474		1667
1475	void	1668	void
1476	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)	1669	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)
1477	CODE:	1670	CODE:
1478	{	1671	{
1479	need_texid (self, texid);	1672	need_texid (self, texid);
1480		1673
1481	{	1674	{
…		…
1501	// from transparent color bleeding and ugly wrapping effects.	1694	// from transparent color bleeding and ugly wrapping effects.
1502	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1695	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503	}	1696	}
1504		1697
1505	int	1698	int
1506	ox (CFPlus::Map self)	1699	ox (DC::Map self)
1507	ALIAS:	1700	ALIAS:
1508	oy = 1	1701	oy = 1
1509	x = 2	1702	x = 2
1510	y = 3	1703	y = 3
1511	w = 4	1704	w = 4
…		…
1522	}	1715	}
1523	OUTPUT:	1716	OUTPUT:
1524	RETVAL	1717	RETVAL
1525		1718
1526	void	1719	void
1527	scroll (CFPlus::Map self, int dx, int dy)	1720	scroll (DC::Map self, int dx, int dy)
1528	CODE:	1721	CODE:
1529	{	1722	{
1530	if (dx > 0)	1723	if (dx > 0)
1531	map_blank (self, self->x, self->y, dx, self->h);	1724	map_blank (self, self->x, self->y, dx, self->h);
1532	else if (dx < 0)	1725	else if (dx < 0)
…		…
1547	self->rows += MAP_EXTEND_Y;	1740	self->rows += MAP_EXTEND_Y;
1548	self->y += MAP_EXTEND_Y;	1741	self->y += MAP_EXTEND_Y;
1549	}	1742	}
1550	}	1743	}
1551		1744
1552	void	1745	SV *
1553	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1746	map1a_update (DC::Map self, SV *data_, int extmap)
1554	CODE:	1747	CODE:
1555	{	1748	{
1556	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1749	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557	uint8_t *data_end = (uint8_t *)SvEND (data_);	1750	uint8_t *data_end = (uint8_t *)SvEND (data_);
1558	mapcell *cell;	1751	mapcell *cell;
1559	int x, y, flags;	1752	int x, y, z, flags;
		1753	AV *missing = newAV ();
		1754	RETVAL = newRV_noinc ((SV *)missing);
1560		1755
1561	while (data < data_end - 1)	1756	while (data < data_end - 1)
1562	{	1757	{
1563	flags = (data [0] << 8) + data [1]; data += 2;	1758	flags = (data [0] << 8) + data [1]; data += 2;
1564		1759
…		…
1584	uint8_t ext, cmd;	1779	uint8_t ext, cmd;
1585		1780
1586	do	1781	do
1587	{	1782	{
1588	ext = *data++;	1783	ext = *data++;
1589	cmd = ext & 0x3f;	1784	cmd = ext & 0x7f;
1590		1785
1591	if (cmd < 4)	1786	if (cmd < 4)
1592	cell->darkness = 255 - ext * 64 + 1;	1787	cell->darkness = 255 - ext * 64 + 1;
1593	else if (cmd == 5) // health	1788	else if (cmd == 5) // health
1594	{	1789	{
…		…
1597	}	1792	}
1598	else if (cmd == 6) // monster width	1793	else if (cmd == 6) // monster width
1599	cell->stat_width = *data++ + 1;	1794	cell->stat_width = *data++ + 1;
1600	else if (cmd == 0x47)	1795	else if (cmd == 0x47)
1601	{	1796	{
1602	if (*data == 4)	1797	if (*data == 1) cell->player = data [1];
1603	; // decode player count	1798	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1799	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1800	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1604		1801
1605	data += *data + 1;	1802	data += *data + 1;
1606	}	1803	}
1607	else if (cmd == 8) // cell flags	1804	else if (cmd == 8) // cell flags
1608	cell->flags = *data++;	1805	cell->flags = *data++;
…		…
1615	}	1812	}
1616	else	1813	else
1617	cell->darkness = *data++ + 1;	1814	cell->darkness = *data++ + 1;
1618	}	1815	}
1619		1816
		1817	for (z = 0; z <= 2; ++z)
1620	if (flags & 4)	1818	if (flags & (4 >> z))
1621	{	1819	{
1622	faceid face = (data [0] << 8) + data [1]; data += 2;	1820	faceid face = (data [0] << 8) + data [1]; data += 2;
1623	need_facenum (self, face);	1821	need_facenum (self, face);
1624	cell->tile [0] = self->face2tile [face];	1822	cell->tile [z] = self->face2tile [face];
		1823
		1824	if (cell->tile [z])
		1825	{
		1826	maptex *tex = self->tex + cell->tile [z];
		1827	if (!tex->name)
		1828	av_push (missing, newSViv (cell->tile [z]));
		1829
		1830	if (tex->smoothtile)
		1831	{
		1832	maptex *smooth = self->tex + tex->smoothtile;
		1833	if (!smooth->name)
		1834	av_push (missing, newSViv (tex->smoothtile));
		1835	}
		1836	}
1625	}	1837	}
1626
1627	if (flags & 2)
1628	{
1629	faceid face = (data [0] << 8) + data [1]; data += 2;
1630	need_facenum (self, face);
1631	cell->tile [1] = self->face2tile [face];
1632	}
1633
1634	if (flags & 1)
1635	{
1636	faceid face = (data [0] << 8) + data [1]; data += 2;
1637	need_facenum (self, face);
1638	cell->tile [2] = self->face2tile [face];
1639	}
1640	}	1838	}
1641	else	1839	else
1642	cell->darkness = 0;	1840	CELL_CLEAR (cell);
1643	}	1841	}
1644	}	1842	}
		1843	OUTPUT:
		1844	RETVAL
1645		1845
1646	SV *	1846	SV *
1647	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1847	mapmap (DC::Map self, int x0, int y0, int w, int h)
1648	CODE:	1848	CODE:
1649	{	1849	{
1650	int x1, x;	1850	int x1, x;
1651	int y1, y;	1851	int y1, y;
1652	int z;	1852	int z;
…		…
1697	}	1897	}
1698	OUTPUT:	1898	OUTPUT:
1699	RETVAL	1899	RETVAL
1700		1900
1701	void	1901	void
1702	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1902	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1703	CODE:	1903	CODE:
1704	{	1904	{
		1905	int x, y, z;
		1906
1705	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1907	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1908	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1707	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1909	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1708	smooth_key skey;	1910	smooth_key skey;
1709	int x, y, z;	1911	int pl_x, pl_y;
1710	int last_name;	1912	maptex pl_tex;
		1913	rc_t *rc = rc_alloc ();
		1914	rc_key_t key;
		1915	rc_array_t *arr;
		1916
		1917	pl_tex.name = 0;
1711		1918
1712	// thats current max. sorry.	1919	// thats current max. sorry.
1713	if (sw > 255) sw = 255;	1920	if (sw > 255) sw = 255;
1714	if (sh > 255) sh = 255;	1921	if (sh > 255) sh = 255;
1715		1922
1716	// clear key, in case of extra padding	1923	// clear key, in case of extra padding
1717	memset (&skey, 0, sizeof (skey));	1924	memset (&skey, 0, sizeof (skey));
1718		1925
1719	glColor4ub (255, 255, 255, 255);	1926	memset (&key, 0, sizeof (key));
1720		1927	key.r = 255;
1721	glEnable (GL_BLEND);	1928	key.g = 255;
1722	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1929	key.b = 255;
1723	glEnable (GL_TEXTURE_2D);	1930	key.a = 255;
1724	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1931	key.mode = GL_QUADS;
1725		1932	key.format = GL_T2F_V3F;
1726	glBegin (GL_QUADS);	1933	key.texname = -1;
1727
1728	last_name = 0;
1729		1934
1730	mx += self->x;	1935	mx += self->x;
1731	my += self->y;	1936	my += self->y;
1732		1937
1733	// first pass: determine smooth_max	1938	// first pass: determine smooth_max
…		…
1749	MAX (self->tex [cell->tile [0]].smoothlevel,	1954	MAX (self->tex [cell->tile [0]].smoothlevel,
1750	MAX (self->tex [cell->tile [1]].smoothlevel,	1955	MAX (self->tex [cell->tile [1]].smoothlevel,
1751	self->tex [cell->tile [2]].smoothlevel));	1956	self->tex [cell->tile [2]].smoothlevel));
1752	}	1957	}
1753	}	1958	}
		1959
		1960	glEnable (GL_BLEND);
		1961	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1962	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1754		1963
1755	for (z = 0; z <= 2; z++)	1964	for (z = 0; z <= 2; z++)
1756	{	1965	{
1757	memset (smooth_level, 0, sizeof (smooth_level));	1966	memset (smooth_level, 0, sizeof (smooth_level));
1758		1967
…		…
1771	{	1980	{
1772	maptex tex = self->tex [tile];	1981	maptex tex = self->tex [tile];
1773	int px = (x + 1) * T - tex.w;	1982	int px = (x + 1) * T - tex.w;
1774	int py = (y + 1) * T - tex.h;	1983	int py = (y + 1) * T - tex.h;
1775		1984
1776	// suppressing texture state switches here
1777	// is only moderately effective, but worth the extra effort
1778	if (last_name != tex.name)	1985	if (key.texname != tex.name)
1779	{	1986	{
1780	if (!tex.name)	1987	if (!tex.name)
1781	tex = self->tex [2]; /* missing, replace by noface */	1988	tex = self->tex [2]; /* missing, replace by noface */
1782		1989
1783	glEnd ();	1990	key.texname = tex.name;
1784	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1991	arr = rc_array (rc, &key);
1785	glBegin (GL_QUADS);
1786	}	1992	}
1787		1993
1788	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1994	if (expect_false (cell->player == player) && expect_false (z == 2))
1789	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1790	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1792
1793	if (cell->flags && z == 2)
1794	{	1995	{
		1996	pl_x = px;
		1997	pl_y = py;
		1998	pl_tex = tex;
		1999	continue;
		2000	}
		2001
		2002	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2003	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2004	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2005	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2006
		2007	if (expect_false (cell->flags) && expect_false (z == 2))
		2008	{
		2009	// overlays such as the speech bubble, probably more to come
1795	if (cell->flags & 1)	2010	if (cell->flags & 1)
1796	{	2011	{
1797	maptex tex = self->tex [1];	2012	maptex tex = self->tex [1];
1798	int px = x * T + T * 2 / 32;	2013	int px = x * T + T * 2 / 32;
1799	int py = y * T - T * 6 / 32;	2014	int py = y * T - T * 6 / 32;
1800		2015
		2016	if (tex.name)
1801	glEnd ();	2017	{
1802	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2018	if (key.texname != tex.name)
		2019	{
		2020	key.texname = tex.name;
		2021	arr = rc_array (rc, &key);
		2022	}
		2023
		2024	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2025	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2026	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2027	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1803	glBegin (GL_QUADS);	2028	}
1804
1805	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809	}	2029	}
1810	}	2030	}
1811		2031
1812	// update smooth hash	2032	// update smooth hash
1813	if (tex.smoothtile)	2033	if (tex.smoothtile)
…		…
1849	}	2069	}
1850	}	2070	}
1851	}	2071	}
1852	}	2072	}
1853		2073
		2074	rc_draw (rc);
		2075	rc_clear (rc);
		2076
1854	// go through all smoothlevels, lowest to highest, then draw.	2077	// go through all smoothlevels, lowest to highest, then draw.
1855	// this is basically counting sort	2078	// this is basically counting sort
1856	{	2079	{
1857	int w, b;	2080	int w, b;
1858		2081
		2082	glEnable (GL_TEXTURE_2D);
		2083	glBegin (GL_QUADS);
1859	for (w = 0; w < 256 / 32; ++w)	2084	for (w = 0; w < 256 / 32; ++w)
1860	{	2085	{
1861	uint32_t smask = smooth_level [w];	2086	uint32_t smask = smooth_level [w];
1862	if (smask)	2087	if (smask)
1863	for (b = 0; b < 32; ++b)	2088	for (b = 0; b < 32; ++b)
…		…
1882	int border = bits & 15;	2107	int border = bits & 15;
1883	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2108	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884	float dx = tex.s * .0625f; // 16 images/row	2109	float dx = tex.s * .0625f; // 16 images/row
1885	float dy = tex.t * .5f ; // 2 images/column	2110	float dy = tex.t * .5f ; // 2 images/column
1886		2111
1887	// this time naively avoiding texture state changes
1888	// save gobs of state changes.
1889	if (last_name != tex.name)	2112	if (tex.name)
1890	{	2113	{
		2114	// this time avoiding texture state changes
		2115	// save gobs of state changes.
1891	if (!tex.name)	2116	if (key.texname != tex.name)
1892	continue; // smoothing not yet available	2117	{
1893
1894	glEnd ();	2118	glEnd ();
1895	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2119	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896	glBegin (GL_QUADS);	2120	glBegin (GL_QUADS);
1897	}	2121	}
1898		2122
1899	if (border)	2123	if (border)
1900	{	2124	{
1901	float ox = border * dx;	2125	float ox = border * dx;
1902		2126
1903	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2127	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2128	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2129	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2130	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907	}	2131	}
1908		2132
1909	if (corner)	2133	if (corner)
1910	{	2134	{
1911	float ox = corner * dx;	2135	float ox = corner * dx;
1912		2136
1913	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2137	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2138	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2139	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2140	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2141	}
1917	}	2142	}
1918	}	2143	}
1919	}	2144	}
1920	}	2145	}
1921	}	2146	}
		2147
		2148	glEnd ();
		2149	glDisable (GL_TEXTURE_2D);
		2150	key.texname = -1;
1922	}	2151	}
1923		2152
1924	hv_clear (smooth);	2153	hv_clear (smooth);
1925	}	2154	}
1926		2155
1927	glEnd ();	2156	if (pl_tex.name)
		2157	{
		2158	maptex tex = pl_tex;
		2159	int px = pl_x + sdx;
		2160	int py = pl_y + sdy;
1928		2161
1929	glDisable (GL_TEXTURE_2D);	2162	key.texname = tex.name;
		2163	arr = rc_array (rc, &key);
		2164
		2165	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2166	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2167	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2168	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2169
		2170	rc_draw (rc);
		2171	}
		2172
1930	glDisable (GL_BLEND);	2173	glDisable (GL_BLEND);
		2174	rc_free (rc);
1931		2175
1932	// top layer: overlays such as the health bar	2176	// top layer: overlays such as the health bar
1933	for (y = 0; y < sh; y++)	2177	for (y = 0; y < sh; y++)
1934	if (0 <= y + my && y + my < self->rows)	2178	if (0 <= y + my && y + my < self->rows)
1935	{	2179	{
…		…
1960	}	2204	}
1961	}	2205	}
1962	}	2206	}
1963		2207
1964	void	2208	void
1965	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2209	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1966	CODE:	2210	CODE:
1967	{	2211	{
1968	static float color[16][3] = {	2212	static float color[16][3] = {
1969	{ 0.00F, 0.00F, 0.00F },	2213	{ 0.00F, 0.00F, 0.00F },
1970	{ 1.00F, 1.00F, 1.00F },	2214	{ 1.00F, 1.00F, 1.00F },
…		…
2020	glDisable (GL_BLEND);	2264	glDisable (GL_BLEND);
2021	glDisable (GL_TEXTURE_2D);	2265	glDisable (GL_TEXTURE_2D);
2022	}	2266	}
2023		2267
2024	void	2268	void
2025	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2269	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2026	PPCODE:	2270	PPCODE:
2027	{	2271	{
2028	int x, y;	2272	int x, y;
2029	int sw1 = sw + 2;	2273	int sw1 = sw + 2;
2030	int sh1 = sh + 2;	2274	int sh1 = sh + 2;
…		…
2038	SvCUR_set (darkness3_sv, sw34 * sh3);	2282	SvCUR_set (darkness3_sv, sw34 * sh3);
2039		2283
2040	mx += self->x - 1;	2284	mx += self->x - 1;
2041	my += self->y - 1;	2285	my += self->y - 1;
2042		2286
2043	memset (darkness1, 255, sw1 * sh1);	2287	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2044		2288
2045	for (y = 0; y < sh1; y++)	2289	for (y = 0; y < sh1; y++)
2046	if (0 <= y + my && y + my < self->rows)	2290	if (0 <= y + my && y + my < self->rows)
2047	{	2291	{
2048	maprow *row = self->row + (y + my);	2292	maprow *row = self->row + (y + my);
…		…
2101	PUSHs (sv_2mortal (newSViv (sh3)));	2345	PUSHs (sv_2mortal (newSViv (sh3)));
2102	PUSHs (darkness3_sv);	2346	PUSHs (darkness3_sv);
2103	}	2347	}
2104		2348
2105	SV *	2349	SV *
2106	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2350	get_rect (DC::Map self, int x0, int y0, int w, int h)
2107	CODE:	2351	CODE:
2108	{	2352	{
2109	int x, y, x1, y1;	2353	int x, y, x1, y1;
2110	SV *data_sv = newSV (w * h * 7 + 5);	2354	SV *data_sv = newSV (w * h * 7 + 5);
2111	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2355	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2168	else	2412	else
2169	*data++ = 0;	2413	*data++ = 0;
2170	}	2414	}
2171	}	2415	}
2172		2416
		2417	/* if size is w*h + 5 then no data has been found */
		2418	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2419	{
2173	SvPOK_only (data_sv);	2420	SvPOK_only (data_sv);
2174	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2421	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2422	}
		2423
2175	RETVAL = data_sv;	2424	RETVAL = data_sv;
2176	}	2425	}
2177	OUTPUT:	2426	OUTPUT:
2178	RETVAL	2427	RETVAL
2179		2428
2180	void	2429	void
2181	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2430	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2182	PPCODE:	2431	PPCODE:
2183	{	2432	{
2184	int x, y, z;	2433	int x, y, z;
2185	int w, h;	2434	int w, h;
2186	int x1, y1;	2435	int x1, y1;
		2436	STRLEN len;
		2437	uint8_t *data, *end;
		2438
		2439	len = SvLEN (data_sv);
		2440	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2441	data = SvPVbyte_nolen (data_sv);
		2442	end = data + len + 8;
		2443
		2444	if (len < 5)
		2445	XSRETURN_EMPTY;
2187		2446
2188	if (*data++ != 0)	2447	if (*data++ != 0)
2189	return; /* version mismatch */	2448	XSRETURN_EMPTY; /* version mismatch */
2190		2449
2191	w = *data++ << 8; w |= *data++;	2450	w = *data++ << 8; w |= *data++;
2192	h = *data++ << 8; h |= *data++;	2451	h = *data++ << 8; h |= *data++;
2193		2452
2194	// we need to do this 'cause we don't keep an absolute coord system for rows	2453	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2206	{	2465	{
2207	maprow *row = map_get_row (self, y);	2466	maprow *row = map_get_row (self, y);
2208		2467
2209	for (x = x0; x < x1; x++)	2468	for (x = x0; x < x1; x++)
2210	{	2469	{
		2470	uint8_t flags;
		2471
		2472	if (data + 7 >= end)
		2473	XSRETURN_EMPTY;
		2474
2211	uint8_t flags = *data++;	2475	flags = *data++;
2212		2476
2213	if (flags)	2477	if (flags)
2214	{	2478	{
2215	mapcell *cell = row_get_cell (row, x);	2479	mapcell *cell = row_get_cell (row, x);
2216	tileid tile[3] = { 0, 0, 0 };	2480	tileid tile[3] = { 0, 0, 0 };
…		…
2219	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2483	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2220	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2484	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2221		2485
2222	if (cell->darkness == 0)	2486	if (cell->darkness == 0)
2223	{	2487	{
2224	cell->darkness = 0;	2488	/*cell->darkness = 0;*/
		2489	EXTEND (SP, 3);
2225		2490
2226	for (z = 0; z <= 2; z++)	2491	for (z = 0; z <= 2; z++)
2227	{	2492	{
2228	tileid t = tile [z];	2493	tileid t = tile [z];
2229		2494
2230	if (t >= self->texs || (t && !self->tex [t].name))	2495	if (t >= self->texs || (t && !self->tex [t].name))
2231	{	2496	{
2232	XPUSHs (sv_2mortal (newSViv (t)));	2497	PUSHs (sv_2mortal (newSViv (t)));
2233	need_texid (self, t);	2498	need_texid (self, t);
2234	}	2499	}
2235		2500
2236	cell->tile [z] = t;	2501	cell->tile [z] = t;
2237	}	2502	}
…		…
2239	}	2504	}
2240	}	2505	}
2241	}	2506	}
2242	}	2507	}
2243		2508
2244	MODULE = CFPlus PACKAGE = CFPlus::RW	2509	MODULE = Deliantra::Client PACKAGE = DC::RW
2245		2510
2246	CFPlus::RW	2511	DC::RW
2247	new (SV *class, SV *data_sv)	2512	new (SV *class, SV *data_sv)
2248	CODE:	2513	CODE:
2249	{	2514	{
2250	STRLEN datalen;	2515	STRLEN datalen;
2251	char *data = SvPVbyte (data_sv, datalen);	2516	char *data = SvPVbyte (data_sv, datalen);
…		…
2253	RETVAL = SDL_RWFromConstMem (data, datalen);	2518	RETVAL = SDL_RWFromConstMem (data, datalen);
2254	}	2519	}
2255	OUTPUT:	2520	OUTPUT:
2256	RETVAL	2521	RETVAL
2257		2522
2258	CFPlus::RW	2523	DC::RW
2259	new_from_file (SV *class, const char *path, const char *mode = "rb")	2524	new_from_file (SV *class, const char *path, const char *mode = "rb")
2260	CODE:	2525	CODE:
2261	RETVAL = SDL_RWFromFile (path, mode);	2526	RETVAL = SDL_RWFromFile (path, mode);
2262	OUTPUT:	2527	OUTPUT:
2263	RETVAL	2528	RETVAL
2264		2529
2265	# fails on win32:	2530	# fails on win32:
2266	# CFPlus.xs(2268) : error C2059: syntax error : '('	2531	# dc.xs(2268) : error C2059: syntax error : '('
2267	#void	2532	#void
2268	#close (CFPlus::RW self)	2533	#close (DC::RW self)
2269	# CODE:	2534	# CODE:
2270	# (self->(close)) (self);	2535	# (self->(close)) (self);
2271		2536
2272	MODULE = CFPlus PACKAGE = CFPlus::Channel	2537	MODULE = Deliantra::Client PACKAGE = DC::Channel
2273		2538
2274	PROTOTYPES: DISABLE	2539	PROTOTYPES: DISABLE
2275		2540
2276	CFPlus::Channel	2541	DC::Channel
2277	find ()	2542	find ()
2278	CODE:	2543	CODE:
2279	{	2544	{
2280	RETVAL = Mix_GroupAvailable (-1);	2545	RETVAL = Mix_GroupAvailable (-1);
2281		2546
…		…
2294	}	2559	}
2295	OUTPUT:	2560	OUTPUT:
2296	RETVAL	2561	RETVAL
2297		2562
2298	void	2563	void
2299	halt (CFPlus::Channel self)	2564	halt (DC::Channel self)
2300	CODE:	2565	CODE:
2301	Mix_HaltChannel (self);	2566	Mix_HaltChannel (self);
2302		2567
2303	void	2568	void
2304	expire (CFPlus::Channel self, int ticks = -1)	2569	expire (DC::Channel self, int ticks = -1)
2305	CODE:	2570	CODE:
2306	Mix_ExpireChannel (self, ticks);	2571	Mix_ExpireChannel (self, ticks);
2307		2572
2308	void	2573	void
2309	fade_out (CFPlus::Channel self, int ticks = -1)	2574	fade_out (DC::Channel self, int ticks = -1)
2310	CODE:	2575	CODE:
2311	Mix_FadeOutChannel (self, ticks);	2576	Mix_FadeOutChannel (self, ticks);
2312		2577
2313	int	2578	int
2314	volume (CFPlus::Channel self, int volume)	2579	volume (DC::Channel self, int volume)
2315	CODE:	2580	CODE:
2316	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2581	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2317	OUTPUT:	2582	OUTPUT:
2318	RETVAL	2583	RETVAL
2319		2584
2320	void	2585	void
2321	unregister_all_effects (CFPlus::Channel self)	2586	unregister_all_effects (DC::Channel self)
2322	CODE:	2587	CODE:
2323	Mix_UnregisterAllEffects (self);	2588	Mix_UnregisterAllEffects (self);
2324		2589
2325	void	2590	void
2326	set_panning (CFPlus::Channel self, int left, int right)	2591	set_panning (DC::Channel self, int left, int right)
2327	CODE:	2592	CODE:
2328	left = CLAMP (left , 0, 255);	2593	left = CLAMP (left , 0, 255);
2329	right = CLAMP (right, 0, 255);	2594	right = CLAMP (right, 0, 255);
2330	Mix_SetPanning (self, left, right);	2595	Mix_SetPanning (self, left, right);
2331		2596
2332	void	2597	void
2333	set_distance (CFPlus::Channel self, int distance)	2598	set_distance (DC::Channel self, int distance)
2334	CODE:	2599	CODE:
2335	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2600	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2336		2601
2337	void	2602	void
2338	set_position (CFPlus::Channel self, int angle, int distance)	2603	set_position (DC::Channel self, int angle, int distance)
2339	CODE:	2604	CODE:
		2605
		2606	void
		2607	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2608	CODE:
		2609	{
		2610	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2611	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2340	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2612	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2613	}
2341		2614
2342	void	2615	void
2343	set_reverse_stereo (CFPlus::Channel self, int flip)	2616	set_reverse_stereo (DC::Channel self, int flip)
2344	CODE:	2617	CODE:
2345	Mix_SetReverseStereo (self, flip);	2618	Mix_SetReverseStereo (self, flip);
2346		2619
2347	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2620	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2348		2621
2349	PROTOTYPES: DISABLE	2622	PROTOTYPES: DISABLE
2350		2623
2351	CFPlus::MixChunk	2624	DC::MixChunk
2352	new (SV *class, CFPlus::RW rwops)	2625	new (SV *class, DC::RW rwops)
2353	CODE:	2626	CODE:
2354	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2627	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2355	OUTPUT:	2628	OUTPUT:
2356	RETVAL	2629	RETVAL
2357		2630
2358	void	2631	void
2359	DESTROY (CFPlus::MixChunk self)	2632	DESTROY (DC::MixChunk self)
2360	CODE:	2633	CODE:
2361	Mix_FreeChunk (self);	2634	Mix_FreeChunk (self);
2362		2635
2363	int	2636	int
2364	volume (CFPlus::MixChunk self, int volume = -1)	2637	volume (DC::MixChunk self, int volume = -1)
2365	CODE:	2638	CODE:
2366	if (items > 1)	2639	if (items > 1)
2367	volume = CLAMP (volume, 0, 128);	2640	volume = CLAMP (volume, 0, 128);
2368	RETVAL = Mix_VolumeChunk (self, volume);	2641	RETVAL = Mix_VolumeChunk (self, volume);
2369	OUTPUT:	2642	OUTPUT:
2370	RETVAL	2643	RETVAL
2371		2644
2372	CFPlus::Channel	2645	DC::Channel
2373	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2646	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2374	CODE:	2647	CODE:
2375	{	2648	{
2376	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2649	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2377		2650
2378	if (RETVAL < 0)	2651	if (RETVAL < 0)
…		…
2385	}	2658	}
2386	}	2659	}
2387	OUTPUT:	2660	OUTPUT:
2388	RETVAL	2661	RETVAL
2389		2662
2390	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2663	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2391		2664
2392	int	2665	int
2393	volume (int volume = -1)	2666	volume (int volume = -1)
2394	PROTOTYPE: ;$	2667	PROTOTYPE: ;$
2395	CODE:	2668	CODE:
…		…
2407	void	2680	void
2408	halt ()	2681	halt ()
2409	CODE:	2682	CODE:
2410	Mix_HaltMusic ();	2683	Mix_HaltMusic ();
2411		2684
2412	CFPlus::MixMusic	2685	DC::MixMusic
2413	new (SV *class, CFPlus::RW rwops)	2686	new (SV *class, DC::RW rwops)
2414	CODE:	2687	CODE:
2415	RETVAL = Mix_LoadMUS_RW (rwops);	2688	RETVAL = Mix_LoadMUS_RW (rwops);
2416	OUTPUT:	2689	OUTPUT:
2417	RETVAL	2690	RETVAL
2418		2691
2419	void	2692	void
2420	DESTROY (CFPlus::MixMusic self)	2693	DESTROY (DC::MixMusic self)
2421	CODE:	2694	CODE:
2422	Mix_FreeMusic (self);	2695	Mix_FreeMusic (self);
2423		2696
2424	int	2697	int
2425	play (CFPlus::MixMusic self, int loops = -1)	2698	play (DC::MixMusic self, int loops = -1)
2426	CODE:	2699	CODE:
2427	RETVAL = Mix_PlayMusic (self, loops);	2700	RETVAL = Mix_PlayMusic (self, loops);
2428	OUTPUT:	2701	OUTPUT:
2429	RETVAL	2702	RETVAL
2430		2703
2431	void	2704	void
2432	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2705	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2433	CODE:	2706	CODE:
2434	Mix_FadeInMusicPos (self, loops, ms, position);	2707	Mix_FadeInMusicPos (self, loops, ms, position);
2435		2708
2436	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2709	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2437		2710
2438	PROTOTYPES: ENABLE	2711	PROTOTYPES: ENABLE
2439		2712
2440	BOOT:	2713	BOOT:
2441	{	2714	{
2442	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2715	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2443	static const struct {	2716	static const struct {
2444	const char *name;	2717	const char *name;
2445	IV iv;	2718	IV iv;
2446	} *civ, const_iv[] = {	2719	} *civ, const_iv[] = {
2447	# define const_iv(name) { # name, (IV)name }	2720	# define const_iv(name) { # name, (IV)name }
…		…
2482	const_iv (GL_INTENSITY),	2755	const_iv (GL_INTENSITY),
2483	const_iv (GL_LUMINANCE),	2756	const_iv (GL_LUMINANCE),
2484	const_iv (GL_LUMINANCE_ALPHA),	2757	const_iv (GL_LUMINANCE_ALPHA),
2485	const_iv (GL_FLOAT),	2758	const_iv (GL_FLOAT),
2486	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2759	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2760	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2761	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2762	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2763	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2764	const_iv (GL_COMPRESSED_RGB_ARB),
		2765	const_iv (GL_COMPRESSED_RGBA_ARB),
2487	const_iv (GL_COMPILE),	2766	const_iv (GL_COMPILE),
2488	const_iv (GL_PROXY_TEXTURE_1D),	2767	const_iv (GL_PROXY_TEXTURE_1D),
2489	const_iv (GL_PROXY_TEXTURE_2D),	2768	const_iv (GL_PROXY_TEXTURE_2D),
2490	const_iv (GL_TEXTURE_1D),	2769	const_iv (GL_TEXTURE_1D),
2491	const_iv (GL_TEXTURE_2D),	2770	const_iv (GL_TEXTURE_2D),
…		…
2530	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2809	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2531	const_iv (GL_POINT_SMOOTH_HINT),	2810	const_iv (GL_POINT_SMOOTH_HINT),
2532	const_iv (GL_LINE_SMOOTH_HINT),	2811	const_iv (GL_LINE_SMOOTH_HINT),
2533	const_iv (GL_POLYGON_SMOOTH_HINT),	2812	const_iv (GL_POLYGON_SMOOTH_HINT),
2534	const_iv (GL_GENERATE_MIPMAP_HINT),	2813	const_iv (GL_GENERATE_MIPMAP_HINT),
		2814	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2535	const_iv (GL_FASTEST),	2815	const_iv (GL_FASTEST),
2536	const_iv (GL_DONT_CARE),	2816	const_iv (GL_DONT_CARE),
2537	const_iv (GL_NICEST),	2817	const_iv (GL_NICEST),
2538	const_iv (GL_V2F),	2818	const_iv (GL_V2F),
2539	const_iv (GL_V3F),	2819	const_iv (GL_V3F),
…		…
2547		2827
2548	texture_av = newAV ();	2828	texture_av = newAV ();
2549	AvREAL_off (texture_av);	2829	AvREAL_off (texture_av);
2550	}	2830	}
2551		2831
		2832	void
		2833	disable_GL_EXT_blend_func_separate ()
		2834	CODE:
		2835	gl.BlendFuncSeparate = 0;
		2836	gl.BlendFuncSeparateEXT = 0;
		2837
2552	char *	2838	char *
2553	gl_vendor ()	2839	gl_vendor ()
2554	CODE:	2840	CODE:
2555	RETVAL = (char *)glGetString (GL_VENDOR);	2841	RETVAL = (char *)glGetString (GL_VENDOR);
2556	OUTPUT:	2842	OUTPUT:
…		…
2677		2963
2678	void glRect (float x1, float y1, float x2, float y2)	2964	void glRect (float x1, float y1, float x2, float y2)
2679	CODE:	2965	CODE:
2680	glRectf (x1, y1, x2, y2);	2966	glRectf (x1, y1, x2, y2);
2681		2967
		2968	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2969	CODE:
		2970	glBegin (GL_LINE_LOOP);
		2971	glVertex2f (x1, y1);
		2972	glVertex2f (x2, y1);
		2973	glVertex2f (x2, y2);
		2974	glVertex2f (x1, y2);
		2975	glEnd ();
		2976
2682	PROTOTYPES: ENABLE	2977	PROTOTYPES: ENABLE
2683		2978
2684	void glBegin (int mode)	2979	void glBegin (int mode)
2685		2980
2686	void glEnd ()	2981	void glEnd ()
…		…
2718	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3013	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2719	CODE:	3014	CODE:
2720	if (gl.SeparableFilter2D)	3015	if (gl.SeparableFilter2D)
2721	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3016	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2722		3017
2723	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3018	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2724		3019
2725	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3020	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2726		3021
2727	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3022	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2728		3023
…		…
2754		3049
2755	void glEndList ()	3050	void glEndList ()
2756		3051
2757	void glCallList (int list)	3052	void glCallList (int list)
2758		3053
2759	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3054	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2760		3055
2761	PROTOTYPES: DISABLE	3056	PROTOTYPES: DISABLE
2762		3057
2763	void	3058	void
2764	find_widget (SV *self, NV x, NV y)	3059	find_widget (SV *self, NV x, NV y)
…		…
2768	XPUSHs (self);	3063	XPUSHs (self);
2769	}	3064	}
2770		3065
2771	BOOT:	3066	BOOT:
2772	{	3067	{
2773	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3068	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2774		3069
2775	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3070	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2776	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3071	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2777	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3072	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2778	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3073	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2779	}	3074	}
2780		3075
2781	void	3076	void
2782	draw (SV *self)	3077	draw (SV *self)
2783	CODE:	3078	CODE:
…		…
2787	NV x, y, w, h;	3082	NV x, y, w, h;
2788	SV *draw_x_sv = GvSV (draw_x_gv);	3083	SV *draw_x_sv = GvSV (draw_x_gv);
2789	SV *draw_y_sv = GvSV (draw_y_gv);	3084	SV *draw_y_sv = GvSV (draw_y_gv);
2790	SV *draw_w_sv = GvSV (draw_w_gv);	3085	SV *draw_w_sv = GvSV (draw_w_gv);
2791	SV *draw_h_sv = GvSV (draw_h_gv);	3086	SV *draw_h_sv = GvSV (draw_h_gv);
2792	SV *hover;
2793	double draw_x, draw_y, draw_w, draw_h;	3087	double draw_x, draw_y;
2794		3088
2795	if (!SvROK (self))	3089	if (!SvROK (self))
2796	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3090	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2797		3091
2798	hv = (HV *)SvRV (self);	3092	hv = (HV *)SvRV (self);
2799		3093
2800	if (SvTYPE (hv) != SVt_PVHV)	3094	if (SvTYPE (hv) != SVt_PVHV)
2801	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3095	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2802		3096
2803	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3097	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2804	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3098	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2805		3099
2806	if (!h || !w)	3100	if (!h || !w)
…		…
2826	{	3120	{
2827	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3121	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2828		3122
2829	if (svp && SvTRUE (*svp))	3123	if (svp && SvTRUE (*svp))
2830	{	3124	{
2831	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3125	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2832	glEnable (GL_BLEND);	3126	glEnable (GL_BLEND);
2833	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3127	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2834	glBegin (GL_QUADS);	3128	glBegin (GL_QUADS);
2835	glVertex2f (0, 0);	3129	glVertex2f (0, 0);
2836	glVertex2f (w, 0);	3130	glVertex2f (w, 0);
…		…
2839	glEnd ();	3133	glEnd ();
2840	glDisable (GL_BLEND);	3134	glDisable (GL_BLEND);
2841	}	3135	}
2842	}	3136	}
2843	#if 0	3137	#if 0
2844	if ($ENV{CFPLUS_DEBUG} & 1) {	3138	// draw borders, for debugging
2845	glPushMatrix;	3139	glPushMatrix ();
2846	glColor 1, 1, 0, 1;	3140	glColor4f (1., 1., 0., 1.);
2847	glTranslate 0.375, 0.375;	3141	glTranslatef (.5, .5, 0.);
2848	glBegin GL_LINE_LOOP;	3142	glBegin (GL_LINE_LOOP);
2849	glVertex 0 , 0;	3143	glVertex2f (0 , 0);
2850	glVertex $self->{w} - 1, 0;	3144	glVertex2f (w - 1, 0);
2851	glVertex $self->{w} - 1, $self->{h} - 1;	3145	glVertex2f (w - 1, h - 1);
2852	glVertex 0 , $self->{h} - 1;	3146	glVertex2f (0 , h - 1);
2853	glEnd;	3147	glEnd ();
2854	glPopMatrix;	3148	glPopMatrix ();
2855	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2856	}
2857	#endif	3149	#endif
2858	PUSHMARK (SP);	3150	PUSHMARK (SP);
2859	XPUSHs (self);	3151	XPUSHs (self);
2860	PUTBACK;	3152	PUTBACK;
2861	call_method ("_draw", G_VOID | G_DISCARD);	3153	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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