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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.279 by root, Thu Oct 2 15:59:40 2008 UTC

…		…
39	#include <SDL_endian.h>	39	#include <SDL_endian.h>
40	#include <SDL_image.h>	40	#include <SDL_image.h>
41	#include <SDL_mixer.h>	41	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	42	#include <SDL_opengl.h>
43		43
		44	/* work around os x broken headers */
		45	#ifdef __MACOSX__
		46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		47	#endif
		48
44	#define PANGO_ENABLE_BACKEND	49	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	50	#define G_DISABLE_CAST_CHECKS
46		51
47	#include <glib/gmacros.h>	52	#include <glib/gmacros.h>
48		53
49	#include <pango/pango.h>	54	#include <pango/pango.h>
		55
		56	#ifndef PANGO_VERSION_CHECK
		57	# define PANGO_VERSION_CHECK(a,b,c) 0
		58	#endif
		59
		60	#if !PANGO_VERSION_CHECK (1, 15, 2)
		61	# define pango_layout_get_line_readonly pango_layout_get_line
		62	# define pango_layout_get_lines_readonly pango_layout_get_lines
		63	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		64	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		65	#endif
50		66
51	#ifndef _WIN32	67	#ifndef _WIN32
52	# include <sys/types.h>	68	# include <sys/types.h>
53	# include <sys/socket.h>	69	# include <sys/socket.h>
54	# include <netinet/in.h>	70	# include <netinet/in.h>
55	# include <netinet/tcp.h>	71	# include <netinet/tcp.h>
56	# include <inttypes.h>	72	# include <inttypes.h>
57	#endif	73	#endif
58		74
		75	#if __GNUC__ >= 4
		76	# define expect(expr,value) __builtin_expect ((expr),(value))
		77	#else
		78	# define expect(expr,value) (expr)
		79	#endif
		80
		81	#define expect_false(expr) expect ((expr) != 0, 0)
		82	#define expect_true(expr) expect ((expr) != 0, 1)
		83
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		85
61	#define FOW_DARKNESS 32	86	#define FOW_DARKNESS 32
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
73		97
74	static AV *texture_av;	98	static AV *texture_av;
75		99
76	static struct	100	static struct
77	{	101	{
…		…
114	av_push (texture_av, (SV *)(size_t)name);	138	av_push (texture_av, (SV *)(size_t)name);
115	glDeleteTextures (1, &name);	139	glDeleteTextures (1, &name);
116	}	140	}
117		141
118	#include "texcache.c"	142	#include "texcache.c"
		143	#include "rendercache.c"
119		144
120	#include "pango-font.c"	145	#include "pango-font.c"
121	#include "pango-fontmap.c"	146	#include "pango-fontmap.c"
122	#include "pango-render.c"	147	#include "pango-render.c"
123		148
124	typedef IV CFPlus__Channel;	149	typedef IV DC__Channel;
125	typedef SDL_RWops *CFPlus__RW;	150	typedef SDL_RWops *DC__RW;
126	typedef Mix_Chunk *CFPlus__MixChunk;	151	typedef Mix_Chunk *DC__MixChunk;
127	typedef Mix_Music *CFPlus__MixMusic;	152	typedef Mix_Music *DC__MixMusic;
128		153
129	typedef PangoFontDescription *CFPlus__Font;	154	typedef PangoFontDescription *DC__Font;
130		155
131	static int	156	static int
132	shape_attr_p (PangoLayoutRun *run)	157	shape_attr_p (PangoLayoutRun *run)
133	{	158	{
134	GSList *attrs = run->item->analysis.extra_attrs;	159	GSList *attrs = run->item->analysis.extra_attrs;
…		…
148		173
149	typedef struct cf_layout {	174	typedef struct cf_layout {
150	PangoLayout *pl;	175	PangoLayout *pl;
151	float r, g, b, a; // default color for rgba mode	176	float r, g, b, a; // default color for rgba mode
152	int base_height;	177	int base_height;
153	CFPlus__Font font;	178	DC__Font font;
		179	rc_t *rc;
154	} *CFPlus__Layout;	180	} *DC__Layout;
155		181
156	static CFPlus__Font default_font;	182	static DC__Font default_font;
157	static PangoContext *opengl_context;	183	static PangoContext *opengl_context;
158	static PangoFontMap *opengl_fontmap;	184	static PangoFontMap *opengl_fontmap;
159		185
160	static void	186	static void
161	substitute_func (FcPattern *pattern, gpointer data)	187	substitute_func (FcPattern *pattern, gpointer data)
…		…
166	#endif	192	#endif
167	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	193	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168	}	194	}
169		195
170	static void	196	static void
171	layout_update_font (CFPlus__Layout self)	197	layout_update_font (DC__Layout self)
172	{	198	{
173	/* use a random scale factor to account for unknown descenders, 0.8 works	199	/* use a random scale factor to account for unknown descenders, 0.8 works
174	* reasonably well with bitstream vera	200	* reasonably well with dejavu/bistream fonts
175	*/	201	*/
176	PangoFontDescription *font = self->font ? self->font : default_font;	202	PangoFontDescription *font = self->font ? self->font : default_font;
177		203
178	pango_font_description_set_absolute_size (font,	204	pango_font_description_set_absolute_size (font,
179	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	205	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180		206
181	pango_layout_set_font_description (self->pl, font);	207	pango_layout_set_font_description (self->pl, font);
182	}	208	}
183		209
184	static void	210	static void
185	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	211	layout_get_pixel_size (DC__Layout self, int *w, int *h)
186	{	212	{
187	PangoRectangle rect;	213	PangoRectangle rect;
188		214
189	// get_pixel_* wrongly rounds down	215	// get_pixel_* wrongly rounds down
190	pango_layout_get_extents (self->pl, 0, &rect);	216	pango_layout_get_extents (self->pl, 0, &rect);
…		…
201		227
202	typedef uint16_t tileid;	228	typedef uint16_t tileid;
203	typedef uint16_t faceid;	229	typedef uint16_t faceid;
204		230
205	typedef struct {	231	typedef struct {
206	int name;	232	GLuint name;
207	int w, h;	233	int w, h;
208	float s, t;	234	float s, t;
209	uint8_t r, g, b, a;	235	uint8_t r, g, b, a;
210	tileid smoothtile;	236	tileid smoothtile;
211	uint8_t smoothlevel;	237	uint8_t smoothlevel;
…		…
229	int faces; tileid *face2tile; // [faceid]	255	int faces; tileid *face2tile; // [faceid]
230	int texs; maptex *tex; // [tileid]	256	int texs; maptex *tex; // [tileid]
231		257
232	int32_t rows;	258	int32_t rows;
233	maprow *row;	259	maprow *row;
234	} *CFPlus__Map;	260	} *DC__Map;
235		261
236	static char *	262	static char *
237	prepend (char *ptr, int sze, int inc)	263	prepend (char *ptr, int sze, int inc)
238	{	264	{
239	char *p;	265	char *p;
…		…
277	self->texs *= 2;	303	self->texs *= 2;
278	}	304	}
279	}	305	}
280		306
281	static maprow *	307	static maprow *
282	map_get_row (CFPlus__Map self, int y)	308	map_get_row (DC__Map self, int y)
283	{	309	{
284	if (0 > y)	310	if (0 > y)
285	{	311	{
286	int extend = - y + MAP_EXTEND_Y;	312	int extend = - y + MAP_EXTEND_Y;
287	Prepend (maprow, self->row, self->rows, extend);	313	Prepend (maprow, self->row, self->rows, extend);
…		…
325		351
326	return row->col + (x - row->c0);	352	return row->col + (x - row->c0);
327	}	353	}
328		354
329	static mapcell *	355	static mapcell *
330	map_get_cell (CFPlus__Map self, int x, int y)	356	map_get_cell (DC__Map self, int x, int y)
331	{	357	{
332	return row_get_cell (map_get_row (self, y), x);	358	return row_get_cell (map_get_row (self, y), x);
333	}	359	}
334		360
335	static void	361	static void
336	map_clear (CFPlus__Map self)	362	map_clear (DC__Map self)
337	{	363	{
338	int r;	364	int r;
339		365
340	for (r = 0; r < self->rows; r++)	366	for (r = 0; r < self->rows; r++)
341	Safefree (self->row[r].col);	367	Safefree (self->row[r].col);
…		…
348	self->oy = 0;	374	self->oy = 0;
349	self->row = 0;	375	self->row = 0;
350	self->rows = 0;	376	self->rows = 0;
351	}	377	}
352		378
		379	#define CELL_CLEAR(cell) \
		380	do { \
		381	if ((cell)->player) \
		382	(cell)->tile [2] = 0; \
		383	(cell)->darkness = 0; \
		384	(cell)->stat_hp = 0; \
		385	(cell)->flags = 0; \
		386	(cell)->player = 0; \
		387	} while (0)
		388
353	static void	389	static void
354	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	390	map_blank (DC__Map self, int x0, int y0, int w, int h)
355	{	391	{
356	int x, y;	392	int x, y;
357	maprow *row;	393	maprow *row;
358	mapcell *cell;	394	mapcell *cell;
359		395
…		…
371	if (x >= row->c1)	407	if (x >= row->c1)
372	break;	408	break;
373		409
374	cell = row->col + x - row->c0;	410	cell = row->col + x - row->c0;
375		411
376	cell->darkness = 0;	412	CELL_CLEAR (cell);
377	cell->stat_hp = 0;
378	cell->flags = 0;
379	cell->player = 0;
380	}	413	}
381	}	414	}
382	}	415	}
383		416
384	typedef struct {	417	typedef struct {
…		…
438	n |= n >> 16;	471	n |= n >> 16;
439		472
440	return n + 1;	473	return n + 1;
441	}	474	}
442		475
		476	static unsigned int
		477	popcount (unsigned int n)
		478	{
		479	n -= (n >> 1) & 0x55555555U;
		480	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		481	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		482	n *= 0x01010101U;
		483
		484	return n >> 24;
		485	}
		486
443	/* SDL should provide this, really. */	487	/* SDL should provide this, really. */
444	#define SDLK_MODIFIER_MIN 300	488	#define SDLK_MODIFIER_MIN 300
445	#define SDLK_MODIFIER_MAX 314	489	#define SDLK_MODIFIER_MAX 314
446		490
447	/******************************************************************************/	491	/******************************************************************************/
…		…
485	return 0;	529	return 0;
486		530
487	return 1;	531	return 1;
488	}	532	}
489		533
490	MODULE = CFPlus PACKAGE = CFPlus	534	/******************************************************************************/
		535
		536	/* process keyboard modifiers */
		537	static int
		538	mod_munge (int mod)
		539	{
		540	mod &= MOD_MASK;
		541
		542	if (mod & (KMOD_META | KMOD_ALT))
		543	mod |= KMOD_LRAM;
		544
		545	return mod;
		546	}
		547
		548	static void
		549	deliantra_main ()
		550	{
		551	char *argv[] = { 0 };
		552	call_argv ("::main", G_DISCARD | G_VOID, argv);
		553	}
		554
		555	#ifdef __MACOSX__
		556	/* to due surprising braindamage on the side of SDL design, we
		557	* do some mind-boggling hack here: SDL requires a custom main()
		558	* on OS X, so... we provide one and call the original main(), which,
		559	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		560	* and which calls our main (== SDL_main) back.
		561	*/
		562	extern C_LINKAGE int
		563	main (int argc, char *argv[])
		564	{
		565	deliantra_main ();
		566	}
		567
		568	#undef main
		569
		570	extern C_LINKAGE int main (int argc, char *argv[]);
		571
		572	static void
		573	SDL_braino (void)
		574	{
		575	char *argv[] = { "deliantra client", 0 };
		576	(main) (1, argv);
		577	}
		578	#else
		579	static void
		580	SDL_braino (void)
		581	{
		582	deliantra_main ();
		583	}
		584	#endif
		585
		586	MODULE = Deliantra::Client PACKAGE = DC
491		587
492	PROTOTYPES: ENABLE	588	PROTOTYPES: ENABLE
493		589
494	BOOT:	590	BOOT:
495	{	591	{
496	HV *stash = gv_stashpv ("CFPlus", 1);	592	HV *stash = gv_stashpv ("DC", 1);
497	static const struct {	593	static const struct {
498	const char *name;	594	const char *name;
499	IV iv;	595	IV iv;
500	} *civ, const_iv[] = {	596	} *civ, const_iv[] = {
501	# define const_iv(name) { # name, (IV)name }	597	# define const_iv(name) { # name, (IV)name }
…		…
523		619
524	const_iv (SDL_APPINPUTFOCUS),	620	const_iv (SDL_APPINPUTFOCUS),
525	const_iv (SDL_APPMOUSEFOCUS),	621	const_iv (SDL_APPMOUSEFOCUS),
526	const_iv (SDL_APPACTIVE),	622	const_iv (SDL_APPACTIVE),
527		623
		624
		625	const_iv (SDLK_UNKNOWN),
		626	const_iv (SDLK_FIRST),
		627	const_iv (SDLK_BACKSPACE),
		628	const_iv (SDLK_TAB),
		629	const_iv (SDLK_CLEAR),
		630	const_iv (SDLK_RETURN),
		631	const_iv (SDLK_PAUSE),
		632	const_iv (SDLK_ESCAPE),
		633	const_iv (SDLK_SPACE),
		634	const_iv (SDLK_EXCLAIM),
		635	const_iv (SDLK_QUOTEDBL),
		636	const_iv (SDLK_HASH),
		637	const_iv (SDLK_DOLLAR),
		638	const_iv (SDLK_AMPERSAND),
		639	const_iv (SDLK_QUOTE),
		640	const_iv (SDLK_LEFTPAREN),
		641	const_iv (SDLK_RIGHTPAREN),
		642	const_iv (SDLK_ASTERISK),
		643	const_iv (SDLK_PLUS),
		644	const_iv (SDLK_COMMA),
		645	const_iv (SDLK_MINUS),
		646	const_iv (SDLK_PERIOD),
		647	const_iv (SDLK_SLASH),
		648	const_iv (SDLK_0),
		649	const_iv (SDLK_1),
		650	const_iv (SDLK_2),
		651	const_iv (SDLK_3),
		652	const_iv (SDLK_4),
		653	const_iv (SDLK_5),
		654	const_iv (SDLK_6),
		655	const_iv (SDLK_7),
		656	const_iv (SDLK_8),
		657	const_iv (SDLK_9),
		658	const_iv (SDLK_COLON),
		659	const_iv (SDLK_SEMICOLON),
		660	const_iv (SDLK_LESS),
		661	const_iv (SDLK_EQUALS),
		662	const_iv (SDLK_GREATER),
		663	const_iv (SDLK_QUESTION),
		664	const_iv (SDLK_AT),
		665
		666	const_iv (SDLK_LEFTBRACKET),
		667	const_iv (SDLK_BACKSLASH),
		668	const_iv (SDLK_RIGHTBRACKET),
		669	const_iv (SDLK_CARET),
		670	const_iv (SDLK_UNDERSCORE),
		671	const_iv (SDLK_BACKQUOTE),
		672	const_iv (SDLK_DELETE),
		673
		674	const_iv (SDLK_FIRST),
		675	const_iv (SDLK_LAST),
528	const_iv (SDLK_KP0),	676	const_iv (SDLK_KP0),
529	const_iv (SDLK_KP1),	677	const_iv (SDLK_KP1),
530	const_iv (SDLK_KP2),	678	const_iv (SDLK_KP2),
531	const_iv (SDLK_KP3),	679	const_iv (SDLK_KP3),
532	const_iv (SDLK_KP4),	680	const_iv (SDLK_KP4),
…		…
604	const_iv (KMOD_LMETA),	752	const_iv (KMOD_LMETA),
605	const_iv (KMOD_RMETA),	753	const_iv (KMOD_RMETA),
606	const_iv (KMOD_NUM),	754	const_iv (KMOD_NUM),
607	const_iv (KMOD_CAPS),	755	const_iv (KMOD_CAPS),
608	const_iv (KMOD_MODE),	756	const_iv (KMOD_MODE),
		757
		758	const_iv (KMOD_LRAM),
		759
		760	const_iv (MIX_DEFAULT_FORMAT),
		761
		762	const_iv (SDL_INIT_TIMER),
		763	const_iv (SDL_INIT_AUDIO),
		764	const_iv (SDL_INIT_VIDEO),
		765	const_iv (SDL_INIT_CDROM),
		766	const_iv (SDL_INIT_JOYSTICK),
		767	const_iv (SDL_INIT_EVERYTHING),
		768	const_iv (SDL_INIT_NOPARACHUTE),
		769	const_iv (SDL_INIT_EVENTTHREAD),
		770
		771	const_iv (SDL_GL_RED_SIZE),
		772	const_iv (SDL_GL_GREEN_SIZE),
		773	const_iv (SDL_GL_BLUE_SIZE),
		774	const_iv (SDL_GL_ALPHA_SIZE),
		775	const_iv (SDL_GL_DOUBLEBUFFER),
		776	const_iv (SDL_GL_BUFFER_SIZE),
		777	const_iv (SDL_GL_DEPTH_SIZE),
		778	const_iv (SDL_GL_STENCIL_SIZE),
		779	const_iv (SDL_GL_ACCUM_RED_SIZE),
		780	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		781	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		782	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		783	const_iv (SDL_GL_STEREO),
		784	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		785	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		786	const_iv (SDL_GL_ACCELERATED_VISUAL),
		787	const_iv (SDL_GL_SWAP_CONTROL),
		788
		789	const_iv (FOW_DARKNESS)
609	# undef const_iv	790	# undef const_iv
610	};	791	};
611		792
612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	793	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	794	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
631		812
632	NV floor (NV x)	813	NV floor (NV x)
633		814
634	NV ceil (NV x)	815	NV ceil (NV x)
635		816
		817	IV minpot (UV n)
		818
		819	IV popcount (UV n)
		820
636	void	821	void
637	pango_init ()	822	pango_init ()
638	CODE:	823	CODE:
639	{	824	{
640	opengl_fontmap = pango_opengl_font_map_new ();	825	opengl_fontmap = pango_opengl_font_map_new ();
641	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	826	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
642	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	827	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		828	/*pango_context_set_font_description (opengl_context, default_font);*/
		829	#if PANGO_VERSION_CHECK (1, 15, 2)
		830	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		831	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		832	#endif
643	}	833	}
644		834
645	char *
646	SDL_GetError ()	835	char *SDL_GetError ()
647		836
648	int	837	void SDL_braino ()
649	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
650		838
651	void	839	int SDL_Init (U32 flags)
		840
		841	int SDL_InitSubSystem (U32 flags)
		842
		843	void SDL_QuitSubSystem (U32 flags)
		844
652	SDL_Quit ()	845	void SDL_Quit ()
		846
		847	int SDL_GL_SetAttribute (int attr, int value)
		848
		849	int SDL_GL_GetAttribute (int attr)
		850	CODE:
		851	if (SDL_GL_GetAttribute (attr, &RETVAL))
		852	XSRETURN_UNDEF;
		853	OUTPUT:
		854	RETVAL
653		855
654	void	856	void
655	SDL_ListModes (int rgb, int alpha)	857	SDL_ListModes (int rgb, int alpha)
656	PPCODE:	858	PPCODE:
657	{	859	{
…		…
669	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	871	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	872	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	873	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672		874
673	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	875	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
674	#if SDL_VERSION_ATLEAST(1,2,10)
675	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
676	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	876	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677	#endif
678		877
679	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	878	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680		879
681	if (m && m != (SDL_Rect **)-1)	880	if (m && m != (SDL_Rect **)-1)
682	while (*m)	881	while (*m)
683	{	882	{
684	if ((*m)->w >= 640 && (*m)->h >= 480)	883	if ((*m)->w >= 400 && (*m)->h >= 300)
685	{	884	{
686	AV *av = newAV ();	885	AV *av = newAV ();
687	av_push (av, newSViv ((*m)->w));	886	av_push (av, newSViv ((*m)->w));
688	av_push (av, newSViv ((*m)->h));	887	av_push (av, newSViv ((*m)->h));
689	av_push (av, newSViv (rgb));	888	av_push (av, newSViv (rgb));
…		…
713		912
714	if (RETVAL)	913	if (RETVAL)
715	{	914	{
716	av_clear (texture_av);	915	av_clear (texture_av);
717		916
718	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	917	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	918	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
720	#include "glfunc.h"	919	#include "glfunc.h"
721	#undef GL_FUNC	920	#undef GL_FUNC
722	}	921	}
723	}	922	}
…		…
730	char *	929	char *
731	SDL_GetKeyName (int sym)	930	SDL_GetKeyName (int sym)
732		931
733	int	932	int
734	SDL_GetAppState ()	933	SDL_GetAppState ()
		934
		935	int
		936	SDL_GetModState ()
735		937
736	void	938	void
737	poll_events ()	939	poll_events ()
738	PPCODE:	940	PPCODE:
739	{	941	{
…		…
749	{	951	{
750	case SDL_KEYDOWN:	952	case SDL_KEYDOWN:
751	case SDL_KEYUP:	953	case SDL_KEYUP:
752	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	954	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	955	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	956	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
755	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	957	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
756	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	958	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757	break;	959	break;
758		960
759	case SDL_ACTIVEEVENT:	961	case SDL_ACTIVEEVENT:
760	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	962	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
778	x = ev.motion.x;	980	x = ev.motion.x;
779	y = ev.motion.y;	981	y = ev.motion.y;
780	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	982	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781	}	983	}
782		984
783	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	985	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
784	hv_store (hv, "state", 5, newSViv (state), 0);	986	hv_store (hv, "state", 5, newSViv (state), 0);
785	hv_store (hv, "x", 1, newSViv (x), 0);	987	hv_store (hv, "x", 1, newSViv (x), 0);
786	hv_store (hv, "y", 1, newSViv (y), 0);	988	hv_store (hv, "y", 1, newSViv (y), 0);
787	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	989	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	990	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789	}	991	}
790	break;	992	break;
791		993
792	case SDL_MOUSEBUTTONDOWN:	994	case SDL_MOUSEBUTTONDOWN:
793	case SDL_MOUSEBUTTONUP:	995	case SDL_MOUSEBUTTONUP:
794	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	996	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795		997
796	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	998	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	999	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1000	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1001	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
804	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1006	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1007	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806	break;	1008	break;
807	}	1009	}
808		1010
809	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	1011	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
810	}	1012	}
811	}	1013	}
812		1014
813	int	1015	int
814	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	1016	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815	POSTCALL:	1017	POSTCALL:
816	Mix_HookMusicFinished (music_finished);	1018	Mix_HookMusicFinished (music_finished);
817	Mix_ChannelFinished (channel_finished);	1019	Mix_ChannelFinished (channel_finished);
		1020
		1021	void
		1022	Mix_QuerySpec ()
		1023	PPCODE:
		1024	{
		1025	int freq, channels;
		1026	Uint16 format;
		1027
		1028	if (Mix_QuerySpec (&freq, &format, &channels))
		1029	{
		1030	EXTEND (SP, 3);
		1031	PUSHs (sv_2mortal (newSViv (freq)));
		1032	PUSHs (sv_2mortal (newSViv (format)));
		1033	PUSHs (sv_2mortal (newSViv (channels)));
		1034	}
		1035	}
818		1036
819	void	1037	void
820	Mix_CloseAudio ()	1038	Mix_CloseAudio ()
821		1039
822	int	1040	int
…		…
857	}	1075	}
858	}	1076	}
859	#endif	1077	#endif
860	}	1078	}
861		1079
862	void	1080	int
863	add_font (char *file)	1081	add_font (char *file)
864	CODE:	1082	CODE:
865	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1083	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1084	OUTPUT:
		1085	RETVAL
866		1086
867	void	1087	void
868	load_image_inline (SV *image_)	1088	load_image_inline (SV *image_)
869	ALIAS:	1089	ALIAS:
870	load_image_file = 1	1090	load_image_file = 1
…		…
956	void	1176	void
957	error (char *message)	1177	error (char *message)
958	CODE:	1178	CODE:
959	fprintf (stderr, "ERROR: %s\n", message);	1179	fprintf (stderr, "ERROR: %s\n", message);
960	#ifdef _WIN32	1180	#ifdef _WIN32
961	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1181	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962	#endif	1182	#endif
963		1183
964	void	1184	void
965	fatal (char *message)	1185	fatal (char *message)
966	CODE:	1186	CODE:
967	fprintf (stderr, "FATAL: %s\n", message);	1187	fprintf (stderr, "FATAL: %s\n", message);
968	#ifdef _WIN32	1188	#ifdef _WIN32
969	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1189	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970	#endif	1190	#endif
971	_exit (1);	1191	_exit (1);
972		1192
973	void	1193	void
974	_exit (int retval = 0)	1194	_exit (int retval = 0)
…		…
986	#if DEBUG	1206	#if DEBUG
987	VALGRIND_DO_LEAK_CHECK;	1207	VALGRIND_DO_LEAK_CHECK;
988	#endif	1208	#endif
989	}	1209	}
990		1210
991	MODULE = CFPlus PACKAGE = CFPlus::Font	1211	MODULE = Deliantra::Client PACKAGE = DC::Font
992		1212
993	PROTOTYPES: DISABLE	1213	PROTOTYPES: DISABLE
994		1214
995	CFPlus::Font	1215	DC::Font
996	new_from_file (SV *class, char *path, int id = 0)	1216	new_from_file (SV *class, char *path, int id = 0)
997	CODE:	1217	CODE:
998	{	1218	{
999	int count;	1219	int count;
1000	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1220	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1003	}	1223	}
1004	OUTPUT:	1224	OUTPUT:
1005	RETVAL	1225	RETVAL
1006		1226
1007	void	1227	void
1008	DESTROY (CFPlus::Font self)	1228	DESTROY (DC::Font self)
1009	CODE:	1229	CODE:
1010	pango_font_description_free (self);	1230	pango_font_description_free (self);
1011		1231
1012	void	1232	void
1013	make_default (CFPlus::Font self)	1233	make_default (DC::Font self)
1014	PROTOTYPE: $	1234	PROTOTYPE: $
1015	CODE:	1235	CODE:
1016	default_font = self;	1236	default_font = self;
1017		1237
1018	MODULE = CFPlus PACKAGE = CFPlus::Layout	1238	MODULE = Deliantra::Client PACKAGE = DC::Layout
1019		1239
1020	PROTOTYPES: DISABLE	1240	PROTOTYPES: DISABLE
1021		1241
1022	void	1242	void
1023	reset_glyph_cache ()	1243	glyph_cache_backup ()
1024	PROTOTYPE:	1244	PROTOTYPE:
1025	CODE:	1245	CODE:
		1246	tc_backup ();
		1247
		1248	void
		1249	glyph_cache_restore ()
		1250	PROTOTYPE:
		1251	CODE:
1026	tc_clear ();	1252	tc_restore ();
1027		1253
1028	CFPlus::Layout	1254	DC::Layout
1029	new (SV *class)	1255	new (SV *class)
1030	CODE:	1256	CODE:
1031	New (0, RETVAL, 1, struct cf_layout);	1257	New (0, RETVAL, 1, struct cf_layout);
1032		1258
1033	RETVAL->pl = pango_layout_new (opengl_context);	1259	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1035	RETVAL->g = 1.;	1261	RETVAL->g = 1.;
1036	RETVAL->b = 1.;	1262	RETVAL->b = 1.;
1037	RETVAL->a = 1.;	1263	RETVAL->a = 1.;
1038	RETVAL->base_height = MIN_FONT_HEIGHT;	1264	RETVAL->base_height = MIN_FONT_HEIGHT;
1039	RETVAL->font = 0;	1265	RETVAL->font = 0;
		1266	RETVAL->rc = rc_alloc ();
1040		1267
1041	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1268	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042	layout_update_font (RETVAL);	1269	layout_update_font (RETVAL);
1043	OUTPUT:	1270	OUTPUT:
1044	RETVAL	1271	RETVAL
1045		1272
1046	void	1273	void
1047	DESTROY (CFPlus::Layout self)	1274	DESTROY (DC::Layout self)
1048	CODE:	1275	CODE:
1049	g_object_unref (self->pl);	1276	g_object_unref (self->pl);
		1277	rc_free (self->rc);
1050	Safefree (self);	1278	Safefree (self);
1051		1279
1052	void	1280	void
1053	set_text (CFPlus::Layout self, SV *text_)	1281	set_text (DC::Layout self, SV *text_)
1054	CODE:	1282	CODE:
1055	{	1283	{
1056	STRLEN textlen;	1284	STRLEN textlen;
1057	char *text = SvPVutf8 (text_, textlen);	1285	char *text = SvPVutf8 (text_, textlen);
1058		1286
1059	pango_layout_set_text (self->pl, text, textlen);	1287	pango_layout_set_text (self->pl, text, textlen);
1060	}	1288	}
1061		1289
1062	void	1290	void
1063	set_markup (CFPlus::Layout self, SV *text_)	1291	set_markup (DC::Layout self, SV *text_)
1064	CODE:	1292	CODE:
1065	{	1293	{
1066	STRLEN textlen;	1294	STRLEN textlen;
1067	char *text = SvPVutf8 (text_, textlen);	1295	char *text = SvPVutf8 (text_, textlen);
1068		1296
1069	pango_layout_set_markup (self->pl, text, textlen);	1297	pango_layout_set_markup (self->pl, text, textlen);
1070	}	1298	}
1071		1299
1072	void	1300	void
1073	set_shapes (CFPlus::Layout self, ...)	1301	set_shapes (DC::Layout self, ...)
1074	CODE:	1302	CODE:
1075	{	1303	{
1076	PangoAttrList *attrs = 0;	1304	PangoAttrList *attrs = 0;
1077	const char *text = pango_layout_get_text (self->pl);	1305	const char *text = pango_layout_get_text (self->pl);
1078	const char *pos = text;	1306	const char *pos = text;
…		…
1113	if (attrs)	1341	if (attrs)
1114	pango_layout_set_attributes (self->pl, attrs);	1342	pango_layout_set_attributes (self->pl, attrs);
1115	}	1343	}
1116		1344
1117	void	1345	void
1118	get_shapes (CFPlus::Layout self)	1346	get_shapes (DC::Layout self)
1119	PPCODE:	1347	PPCODE:
1120	{	1348	{
1121	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1349	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122		1350
1123	do	1351	do
1124	{	1352	{
1125	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1353	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126		1354
1127	if (run && shape_attr_p (run))	1355	if (run && shape_attr_p (run))
1128	{	1356	{
1129	PangoRectangle extents;	1357	PangoRectangle extents;
1130	pango_layout_iter_get_run_extents (iter, 0, &extents);	1358	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1138		1366
1139	pango_layout_iter_free (iter);	1367	pango_layout_iter_free (iter);
1140	}	1368	}
1141		1369
1142	int	1370	int
1143	has_wrapped (CFPlus::Layout self)	1371	has_wrapped (DC::Layout self)
1144	CODE:	1372	CODE:
1145	{	1373	{
1146	int lines = 1;	1374	int lines = 1;
1147	const char *text = pango_layout_get_text (self->pl);	1375	const char *text = pango_layout_get_text (self->pl);
1148		1376
…		…
1153	}	1381	}
1154	OUTPUT:	1382	OUTPUT:
1155	RETVAL	1383	RETVAL
1156		1384
1157	SV *	1385	SV *
1158	get_text (CFPlus::Layout self)	1386	get_text (DC::Layout self)
1159	CODE:	1387	CODE:
1160	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1388	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161	sv_utf8_decode (RETVAL);	1389	sv_utf8_decode (RETVAL);
1162	OUTPUT:	1390	OUTPUT:
1163	RETVAL	1391	RETVAL
1164		1392
1165	void	1393	void
1166	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1394	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167	CODE:	1395	CODE:
1168	self->r = r;	1396	self->r = r;
1169	self->g = g;	1397	self->g = g;
1170	self->b = b;	1398	self->b = b;
1171	self->a = a;	1399	self->a = a;
1172		1400
1173	void	1401	void
1174	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1402	set_font (DC::Layout self, DC::Font font = 0)
1175	CODE:	1403	CODE:
1176	if (self->font != font)	1404	if (self->font != font)
1177	{	1405	{
1178	self->font = font;	1406	self->font = font;
1179	layout_update_font (self);	1407	layout_update_font (self);
1180	}	1408	}
1181		1409
1182	void	1410	void
1183	set_height (CFPlus::Layout self, int base_height)	1411	set_height (DC::Layout self, int base_height)
1184	CODE:	1412	CODE:
1185	if (self->base_height != base_height)	1413	if (self->base_height != base_height)
1186	{	1414	{
1187	self->base_height = base_height;	1415	self->base_height = base_height;
1188	layout_update_font (self);	1416	layout_update_font (self);
1189	}	1417	}
1190		1418
1191	void	1419	void
1192	set_width (CFPlus::Layout self, int max_width = -1)	1420	set_width (DC::Layout self, int max_width = -1)
1193	CODE:	1421	CODE:
1194	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1422	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195		1423
1196	void	1424	void
1197	set_indent (CFPlus::Layout self, int indent)	1425	set_indent (DC::Layout self, int indent)
1198	CODE:	1426	CODE:
1199	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1427	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200		1428
1201	void	1429	void
1202	set_spacing (CFPlus::Layout self, int spacing)	1430	set_spacing (DC::Layout self, int spacing)
1203	CODE:	1431	CODE:
1204	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1432	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205		1433
1206	void	1434	void
1207	set_ellipsise (CFPlus::Layout self, int ellipsise)	1435	set_ellipsise (DC::Layout self, int ellipsise)
1208	CODE:	1436	CODE:
1209	pango_layout_set_ellipsize (self->pl,	1437	pango_layout_set_ellipsize (self->pl,
1210	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1438	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1439	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1440	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213	: PANGO_ELLIPSIZE_NONE	1441	: PANGO_ELLIPSIZE_NONE
1214	);	1442	);
1215		1443
1216	void	1444	void
1217	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1445	set_single_paragraph_mode (DC::Layout self, int spm)
1218	CODE:	1446	CODE:
1219	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1447	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220		1448
1221	void	1449	void
1222	size (CFPlus::Layout self)	1450	size (DC::Layout self)
1223	PPCODE:	1451	PPCODE:
1224	{	1452	{
1225	int w, h;	1453	int w, h;
1226		1454
1227	layout_get_pixel_size (self, &w, &h);	1455	layout_get_pixel_size (self, &w, &h);
…		…
1230	PUSHs (sv_2mortal (newSViv (w)));	1458	PUSHs (sv_2mortal (newSViv (w)));
1231	PUSHs (sv_2mortal (newSViv (h)));	1459	PUSHs (sv_2mortal (newSViv (h)));
1232	}	1460	}
1233		1461
1234	int	1462	int
1235	descent (CFPlus::Layout self)	1463	descent (DC::Layout self)
1236	CODE:	1464	CODE:
1237	{	1465	{
1238	PangoRectangle rect;	1466	PangoRectangle rect;
1239	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1467	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240	pango_layout_line_get_pixel_extents (line, 0, &rect);	1468	pango_layout_line_get_pixel_extents (line, 0, &rect);
1241	RETVAL = PANGO_DESCENT (rect);	1469	RETVAL = PANGO_DESCENT (rect);
1242	}	1470	}
1243	OUTPUT:	1471	OUTPUT:
1244	RETVAL	1472	RETVAL
1245		1473
1246	int	1474	int
1247	xy_to_index (CFPlus::Layout self, int x, int y)	1475	xy_to_index (DC::Layout self, int x, int y)
1248	CODE:	1476	CODE:
1249	{	1477	{
1250	int index, trailing;	1478	int index, trailing;
1251	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1479	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252	RETVAL = index + trailing;	1480	RETVAL = index + trailing;
1253	}	1481	}
1254	OUTPUT:	1482	OUTPUT:
1255	RETVAL	1483	RETVAL
1256		1484
1257	void	1485	void
1258	cursor_pos (CFPlus::Layout self, int index)	1486	cursor_pos (DC::Layout self, int index)
1259	PPCODE:	1487	PPCODE:
1260	{	1488	{
1261	PangoRectangle strong_pos;	1489	PangoRectangle pos;
1262	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1490	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263		1491
1264	EXTEND (SP, 3);	1492	EXTEND (SP, 3);
1265	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1493	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1494	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1495	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268	}	1496	}
1269		1497
1270	void	1498	void
1271	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1499	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272	PPCODE:	1500	PPCODE:
1273	{	1501	{
1274	int line, x;	1502	int line, x;
1275		1503
1276	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1504	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1505	#if !PANGO_VERSION_CHECK (1, 17, 3)
1277	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1506	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278		1507	--line;
		1508	#endif
1279	EXTEND (SP, 2);	1509	EXTEND (SP, 2);
1280	PUSHs (sv_2mortal (newSViv (line - 1)));	1510	PUSHs (sv_2mortal (newSViv (line)));
1281	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1511	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282	}	1512	}
1283		1513
1284	void	1514	void
1285	line_x_to_index (CFPlus::Layout self, int line, int x)	1515	line_x_to_index (DC::Layout self, int line, int x)
1286	PPCODE:	1516	PPCODE:
1287	{	1517	{
1288	PangoLayoutLine *lp;	1518	PangoLayoutLine *lp;
1289	int index, trailing;	1519	int index, trailing;
1290		1520
1291	if (line < 0)	1521	if (line < 0)
1292	XSRETURN_EMPTY;	1522	XSRETURN_EMPTY;
1293		1523
1294	if (!(lp = pango_layout_get_line (self->pl, line)))	1524	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295	XSRETURN_EMPTY; /* do better */	1525	XSRETURN_EMPTY; /* do better */
1296		1526
1297	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1527	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1298		1528
1299	EXTEND (SP, 2);	1529	EXTEND (SP, 2);
…		…
1305	PUSHs (sv_2mortal (newSViv (trailing)));	1535	PUSHs (sv_2mortal (newSViv (trailing)));
1306	}	1536	}
1307	}	1537	}
1308		1538
1309	void	1539	void
1310	render (CFPlus::Layout self, float x, float y, int flags = 0)	1540	render (DC::Layout self, float x, float y, int flags = 0)
1311	PPCODE:	1541	CODE:
		1542	rc_clear (self->rc);
1312	pango_opengl_render_layout_subpixel (	1543	pango_opengl_render_layout_subpixel (
1313	self->pl,	1544	self->pl,
		1545	self->rc,
1314	x * PANGO_SCALE, y * PANGO_SCALE,	1546	x * PANGO_SCALE, y * PANGO_SCALE,
1315	self->r, self->g, self->b, self->a,	1547	self->r, self->g, self->b, self->a,
1316	flags	1548	flags
1317	);	1549	);
		1550	// we assume that context_change actually clears/frees stuff
		1551	// and does not do any recomputation...
		1552	pango_layout_context_changed (self->pl);
1318		1553
1319	MODULE = CFPlus PACKAGE = CFPlus::Texture	1554	void
		1555	draw (DC::Layout self)
		1556	CODE:
		1557	{
		1558	glEnable (GL_TEXTURE_2D);
		1559	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1560	glEnable (GL_BLEND);
		1561	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1562	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1563	glEnable (GL_ALPHA_TEST);
		1564	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1565
		1566	rc_draw (self->rc);
		1567
		1568	glDisable (GL_ALPHA_TEST);
		1569	glDisable (GL_BLEND);
		1570	glDisable (GL_TEXTURE_2D);
		1571	}
		1572
		1573	MODULE = Deliantra::Client PACKAGE = DC::Texture
1320		1574
1321	PROTOTYPES: ENABLE	1575	PROTOTYPES: ENABLE
1322
1323	int minpot (int n)
1324		1576
1325	void	1577	void
1326	pad (SV *data_, int ow, int oh, int nw, int nh)	1578	pad (SV *data_, int ow, int oh, int nw, int nh)
1327	CODE:	1579	CODE:
1328	{	1580	{
…		…
1405	RETVAL = width > 0;	1657	RETVAL = width > 0;
1406	}	1658	}
1407	OUTPUT:	1659	OUTPUT:
1408	RETVAL	1660	RETVAL
1409		1661
1410	MODULE = CFPlus PACKAGE = CFPlus::Map	1662	MODULE = Deliantra::Client PACKAGE = DC::Map
1411		1663
1412	PROTOTYPES: DISABLE	1664	PROTOTYPES: DISABLE
1413		1665
1414	CFPlus::Map	1666	DC::Map
1415	new (SV *class)	1667	new (SV *class)
1416	CODE:	1668	CODE:
1417	New (0, RETVAL, 1, struct map);	1669	New (0, RETVAL, 1, struct map);
1418	RETVAL->x = 0;	1670	RETVAL->x = 0;
1419	RETVAL->y = 0;	1671	RETVAL->y = 0;
…		…
1427	RETVAL->row = 0;	1679	RETVAL->row = 0;
1428	OUTPUT:	1680	OUTPUT:
1429	RETVAL	1681	RETVAL
1430		1682
1431	void	1683	void
1432	DESTROY (CFPlus::Map self)	1684	DESTROY (DC::Map self)
1433	CODE:	1685	CODE:
1434	{	1686	{
1435	map_clear (self);	1687	map_clear (self);
1436	Safefree (self->face2tile);	1688	Safefree (self->face2tile);
1437	Safefree (self->tex);	1689	Safefree (self->tex);
1438	Safefree (self);	1690	Safefree (self);
1439	}	1691	}
1440		1692
1441	void	1693	void
1442	resize (CFPlus::Map self, int map_width, int map_height)	1694	resize (DC::Map self, int map_width, int map_height)
1443	CODE:	1695	CODE:
1444	self->w = map_width;	1696	self->w = map_width;
1445	self->h = map_height;	1697	self->h = map_height;
1446		1698
1447	void	1699	void
1448	clear (CFPlus::Map self)	1700	clear (DC::Map self)
1449	CODE:	1701	CODE:
1450	map_clear (self);	1702	map_clear (self);
1451		1703
1452	void	1704	void
1453	set_tileid (CFPlus::Map self, int face, int tile)	1705	set_tileid (DC::Map self, int face, int tile)
1454	CODE:	1706	CODE:
1455	{	1707	{
1456	need_facenum (self, face); self->face2tile [face] = tile;	1708	need_facenum (self, face); self->face2tile [face] = tile;
1457	need_texid (self, tile);	1709	need_texid (self, tile);
1458	}	1710	}
1459		1711
1460	void	1712	void
1461	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1713	set_smooth (DC::Map self, int face, int smooth, int level)
1462	CODE:	1714	CODE:
1463	{	1715	{
1464	tileid texid;	1716	tileid texid;
1465	maptex *tex;	1717	maptex *tex;
1466		1718
…		…
1479	tex->smoothtile = self->face2tile [smooth];	1731	tex->smoothtile = self->face2tile [smooth];
1480	tex->smoothlevel = level;	1732	tex->smoothlevel = level;
1481	}	1733	}
1482		1734
1483	void	1735	void
1484	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)	1736	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)
1485	CODE:	1737	CODE:
1486	{	1738	{
1487	need_texid (self, texid);	1739	need_texid (self, texid);
1488		1740
1489	{	1741	{
…		…
1509	// from transparent color bleeding and ugly wrapping effects.	1761	// from transparent color bleeding and ugly wrapping effects.
1510	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511	}	1763	}
1512		1764
1513	int	1765	int
1514	ox (CFPlus::Map self)	1766	ox (DC::Map self)
1515	ALIAS:	1767	ALIAS:
1516	oy = 1	1768	oy = 1
1517	x = 2	1769	x = 2
1518	y = 3	1770	y = 3
1519	w = 4	1771	w = 4
…		…
1530	}	1782	}
1531	OUTPUT:	1783	OUTPUT:
1532	RETVAL	1784	RETVAL
1533		1785
1534	void	1786	void
1535	scroll (CFPlus::Map self, int dx, int dy)	1787	scroll (DC::Map self, int dx, int dy)
1536	CODE:	1788	CODE:
1537	{	1789	{
1538	if (dx > 0)	1790	if (dx > 0)
1539	map_blank (self, self->x, self->y, dx, self->h);	1791	map_blank (self, self->x, self->y, dx, self->h);
1540	else if (dx < 0)	1792	else if (dx < 0)
…		…
1556	self->y += MAP_EXTEND_Y;	1808	self->y += MAP_EXTEND_Y;
1557	}	1809	}
1558	}	1810	}
1559		1811
1560	SV *	1812	SV *
1561	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1813	map1a_update (DC::Map self, SV *data_, int extmap)
1562	CODE:	1814	CODE:
1563	{	1815	{
1564	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1816	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565	uint8_t *data_end = (uint8_t *)SvEND (data_);	1817	uint8_t *data_end = (uint8_t *)SvEND (data_);
1566	mapcell *cell;	1818	mapcell *cell;
…		…
1594	uint8_t ext, cmd;	1846	uint8_t ext, cmd;
1595		1847
1596	do	1848	do
1597	{	1849	{
1598	ext = *data++;	1850	ext = *data++;
1599	cmd = ext & 0x3f;	1851	cmd = ext & 0x7f;
1600		1852
1601	if (cmd < 4)	1853	if (cmd < 4)
1602	cell->darkness = 255 - ext * 64 + 1;	1854	cell->darkness = 255 - ext * 64 + 1;
1603	else if (cmd == 5) // health	1855	else if (cmd == 5) // health
1604	{	1856	{
…		…
1607	}	1859	}
1608	else if (cmd == 6) // monster width	1860	else if (cmd == 6) // monster width
1609	cell->stat_width = *data++ + 1;	1861	cell->stat_width = *data++ + 1;
1610	else if (cmd == 0x47)	1862	else if (cmd == 0x47)
1611	{	1863	{
1612	if (*data == 4)	1864	if (*data == 1) cell->player = data [1];
1613	; // decode player count	1865	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1866	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1867	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1614		1868
1615	data += *data + 1;	1869	data += *data + 1;
1616	}	1870	}
1617	else if (cmd == 8) // cell flags	1871	else if (cmd == 8) // cell flags
1618	cell->flags = *data++;	1872	cell->flags = *data++;
…		…
1648	}	1902	}
1649	}	1903	}
1650	}	1904	}
1651	}	1905	}
1652	else	1906	else
1653	cell->darkness = 0;	1907	CELL_CLEAR (cell);
1654	}	1908	}
1655	}	1909	}
1656	OUTPUT:	1910	OUTPUT:
1657	RETVAL	1911	RETVAL
1658		1912
1659	SV *	1913	SV *
1660	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1914	mapmap (DC::Map self, int x0, int y0, int w, int h)
1661	CODE:	1915	CODE:
1662	{	1916	{
1663	int x1, x;	1917	int x1, x;
1664	int y1, y;	1918	int y1, y;
1665	int z;	1919	int z;
…		…
1710	}	1964	}
1711	OUTPUT:	1965	OUTPUT:
1712	RETVAL	1966	RETVAL
1713		1967
1714	void	1968	void
1715	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1969	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1716	CODE:	1970	CODE:
1717	{	1971	{
		1972	int x, y, z;
		1973
1718	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1974	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1975	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1720	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1976	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721	smooth_key skey;	1977	smooth_key skey;
1722	int x, y, z;	1978	int pl_x, pl_y;
1723	int last_name;	1979	maptex pl_tex;
		1980	rc_t *rc = rc_alloc ();
		1981	rc_key_t key;
		1982	rc_array_t *arr;
		1983
		1984	pl_tex.name = 0;
1724		1985
1725	// thats current max. sorry.	1986	// thats current max. sorry.
1726	if (sw > 255) sw = 255;	1987	if (sw > 255) sw = 255;
1727	if (sh > 255) sh = 255;	1988	if (sh > 255) sh = 255;
1728		1989
1729	// clear key, in case of extra padding	1990	// clear key, in case of extra padding
1730	memset (&skey, 0, sizeof (skey));	1991	memset (&skey, 0, sizeof (skey));
1731		1992
1732	glColor4ub (255, 255, 255, 255);	1993	memset (&key, 0, sizeof (key));
1733		1994	key.r = 255;
1734	glEnable (GL_BLEND);	1995	key.g = 255;
1735	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1996	key.b = 255;
1736	glEnable (GL_TEXTURE_2D);	1997	key.a = 255;
1737	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1998	key.mode = GL_QUADS;
1738		1999	key.format = GL_T2F_V3F;
1739	glBegin (GL_QUADS);
1740
1741	last_name = -1;	2000	key.texname = -1;
1742		2001
1743	mx += self->x;	2002	mx += self->x;
1744	my += self->y;	2003	my += self->y;
1745		2004
1746	// first pass: determine smooth_max	2005	// first pass: determine smooth_max
…		…
1762	MAX (self->tex [cell->tile [0]].smoothlevel,	2021	MAX (self->tex [cell->tile [0]].smoothlevel,
1763	MAX (self->tex [cell->tile [1]].smoothlevel,	2022	MAX (self->tex [cell->tile [1]].smoothlevel,
1764	self->tex [cell->tile [2]].smoothlevel));	2023	self->tex [cell->tile [2]].smoothlevel));
1765	}	2024	}
1766	}	2025	}
		2026
		2027	glEnable (GL_BLEND);
		2028	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		2029	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1767		2030
1768	for (z = 0; z <= 2; z++)	2031	for (z = 0; z <= 2; z++)
1769	{	2032	{
1770	memset (smooth_level, 0, sizeof (smooth_level));	2033	memset (smooth_level, 0, sizeof (smooth_level));
1771		2034
…		…
1781	tileid tile = cell->tile [z];	2044	tileid tile = cell->tile [z];
1782		2045
1783	if (tile)	2046	if (tile)
1784	{	2047	{
1785	maptex tex = self->tex [tile];	2048	maptex tex = self->tex [tile];
1786	int px, py;	2049	int px = (x + 1) * T - tex.w;
		2050	int py = (y + 1) * T - tex.h;
1787		2051
1788	// suppressing texture state switches here
1789	// is only moderately effective, but worth the extra effort
1790	if (last_name != tex.name)	2052	if (key.texname != tex.name)
1791	{	2053	{
1792	if (!tex.name)	2054	if (!tex.name)
1793	tex = self->tex [2]; /* missing, replace by noface */	2055	tex = self->tex [2]; /* missing, replace by noface */
1794		2056
1795	glEnd ();	2057	key.texname = tex.name;
1796	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2058	arr = rc_array (rc, &key);
1797	glBegin (GL_QUADS);
1798	}	2059	}
1799		2060
1800	px = (x + 1) * T - tex.w;	2061	if (expect_false (cell->player == player) && expect_false (z == 2))
1801	py = (y + 1) * T - tex.h;
1802
1803	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1804	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808	if (cell->flags && z == 2)
1809	{	2062	{
		2063	pl_x = px;
		2064	pl_y = py;
		2065	pl_tex = tex;
		2066	continue;
		2067	}
		2068
		2069	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2070	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2071	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2072	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2073
		2074	if (expect_false (cell->flags) && expect_false (z == 2))
		2075	{
		2076	// overlays such as the speech bubble, probably more to come
1810	if (cell->flags & 1)	2077	if (cell->flags & 1)
1811	{	2078	{
1812	maptex tex = self->tex [1];	2079	maptex tex = self->tex [1];
1813	int px = x * T + T * 2 / 32;	2080	int px = x * T + T * 2 / 32;
1814	int py = y * T - T * 6 / 32;	2081	int py = y * T - T * 6 / 32;
1815		2082
		2083	if (tex.name)
1816	glEnd ();	2084	{
1817	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2085	if (key.texname != tex.name)
		2086	{
		2087	key.texname = tex.name;
		2088	arr = rc_array (rc, &key);
		2089	}
		2090
		2091	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2092	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2093	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2094	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1818	glBegin (GL_QUADS);	2095	}
1819
1820	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824	}	2096	}
1825	}	2097	}
1826		2098
1827	// update smooth hash	2099	// update smooth hash
1828	if (tex.smoothtile)	2100	if (tex.smoothtile)
…		…
1864	}	2136	}
1865	}	2137	}
1866	}	2138	}
1867	}	2139	}
1868		2140
		2141	rc_draw (rc);
		2142	rc_clear (rc);
		2143
1869	// go through all smoothlevels, lowest to highest, then draw.	2144	// go through all smoothlevels, lowest to highest, then draw.
1870	// this is basically counting sort	2145	// this is basically counting sort
1871	{	2146	{
1872	int w, b;	2147	int w, b;
1873		2148
		2149	glEnable (GL_TEXTURE_2D);
		2150	glBegin (GL_QUADS);
1874	for (w = 0; w < 256 / 32; ++w)	2151	for (w = 0; w < 256 / 32; ++w)
1875	{	2152	{
1876	uint32_t smask = smooth_level [w];	2153	uint32_t smask = smooth_level [w];
1877	if (smask)	2154	if (smask)
1878	for (b = 0; b < 32; ++b)	2155	for (b = 0; b < 32; ++b)
…		…
1897	int border = bits & 15;	2174	int border = bits & 15;
1898	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2175	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899	float dx = tex.s * .0625f; // 16 images/row	2176	float dx = tex.s * .0625f; // 16 images/row
1900	float dy = tex.t * .5f ; // 2 images/column	2177	float dy = tex.t * .5f ; // 2 images/column
1901		2178
1902	// this time naively avoiding texture state changes
1903	// save gobs of state changes.
1904	if (last_name != tex.name)	2179	if (tex.name)
1905	{	2180	{
		2181	// this time avoiding texture state changes
		2182	// save gobs of state changes.
1906	if (!tex.name)	2183	if (key.texname != tex.name)
1907	continue; // smoothing not yet available	2184	{
1908
1909	glEnd ();	2185	glEnd ();
1910	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2186	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911	glBegin (GL_QUADS);	2187	glBegin (GL_QUADS);
1912	}	2188	}
1913		2189
1914	if (border)	2190	if (border)
1915	{	2191	{
1916	float ox = border * dx;	2192	float ox = border * dx;
1917		2193
1918	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2194	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2195	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2196	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2197	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922	}	2198	}
1923		2199
1924	if (corner)	2200	if (corner)
1925	{	2201	{
1926	float ox = corner * dx;	2202	float ox = corner * dx;
1927		2203
1928	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2204	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2205	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2206	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2207	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2208	}
1932	}	2209	}
1933	}	2210	}
1934	}	2211	}
1935	}	2212	}
1936	}	2213	}
		2214
		2215	glEnd ();
		2216	glDisable (GL_TEXTURE_2D);
		2217	key.texname = -1;
1937	}	2218	}
1938		2219
1939	hv_clear (smooth);	2220	hv_clear (smooth);
1940	}	2221	}
1941		2222
1942	glEnd ();	2223	if (pl_tex.name)
		2224	{
		2225	maptex tex = pl_tex;
		2226	int px = pl_x + sdx;
		2227	int py = pl_y + sdy;
1943		2228
1944	glDisable (GL_TEXTURE_2D);	2229	key.texname = tex.name;
		2230	arr = rc_array (rc, &key);
		2231
		2232	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2233	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2234	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2235	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2236
		2237	rc_draw (rc);
		2238	}
		2239
1945	glDisable (GL_BLEND);	2240	glDisable (GL_BLEND);
		2241	rc_free (rc);
1946		2242
1947	// top layer: overlays such as the health bar	2243	// top layer: overlays such as the health bar
1948	for (y = 0; y < sh; y++)	2244	for (y = 0; y < sh; y++)
1949	if (0 <= y + my && y + my < self->rows)	2245	if (0 <= y + my && y + my < self->rows)
1950	{	2246	{
…		…
1955	{	2251	{
1956	mapcell *cell = row->col + (x + mx - row->c0);	2252	mapcell *cell = row->col + (x + mx - row->c0);
1957		2253
1958	int px = x * T;	2254	int px = x * T;
1959	int py = y * T;	2255	int py = y * T;
		2256
		2257	if (expect_false (cell->player == player))
		2258	{
		2259	px += sdx;
		2260	py += sdy;
		2261	}
1960		2262
1961	if (cell->stat_hp)	2263	if (cell->stat_hp)
1962	{	2264	{
1963	int width = cell->stat_width * T;	2265	int width = cell->stat_width * T;
1964	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2266	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
1975	}	2277	}
1976	}	2278	}
1977	}	2279	}
1978		2280
1979	void	2281	void
1980	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2282	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981	CODE:	2283	CODE:
1982	{	2284	{
1983	static float color[16][3] = {	2285	static float color[16][3] = {
1984	{ 0.00F, 0.00F, 0.00F },	2286	{ 0.00F, 0.00F, 0.00F },
1985	{ 1.00F, 1.00F, 1.00F },	2287	{ 1.00F, 1.00F, 1.00F },
…		…
2035	glDisable (GL_BLEND);	2337	glDisable (GL_BLEND);
2036	glDisable (GL_TEXTURE_2D);	2338	glDisable (GL_TEXTURE_2D);
2037	}	2339	}
2038		2340
2039	void	2341	void
2040	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2342	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041	PPCODE:	2343	PPCODE:
2042	{	2344	{
2043	int x, y;	2345	int x, y;
2044	int sw1 = sw + 2;	2346	int sw1 = sw + 2;
2045	int sh1 = sh + 2;	2347	int sh1 = sh + 2;
…		…
2053	SvCUR_set (darkness3_sv, sw34 * sh3);	2355	SvCUR_set (darkness3_sv, sw34 * sh3);
2054		2356
2055	mx += self->x - 1;	2357	mx += self->x - 1;
2056	my += self->y - 1;	2358	my += self->y - 1;
2057		2359
2058	memset (darkness1, 255, sw1 * sh1);	2360	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2059		2361
2060	for (y = 0; y < sh1; y++)	2362	for (y = 0; y < sh1; y++)
2061	if (0 <= y + my && y + my < self->rows)	2363	if (0 <= y + my && y + my < self->rows)
2062	{	2364	{
2063	maprow *row = self->row + (y + my);	2365	maprow *row = self->row + (y + my);
…		…
2116	PUSHs (sv_2mortal (newSViv (sh3)));	2418	PUSHs (sv_2mortal (newSViv (sh3)));
2117	PUSHs (darkness3_sv);	2419	PUSHs (darkness3_sv);
2118	}	2420	}
2119		2421
2120	SV *	2422	SV *
2121	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2423	get_rect (DC::Map self, int x0, int y0, int w, int h)
2122	CODE:	2424	CODE:
2123	{	2425	{
2124	int x, y, x1, y1;	2426	int x, y, x1, y1;
2125	SV *data_sv = newSV (w * h * 7 + 5);	2427	SV *data_sv = newSV (w * h * 7 + 5);
2126	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2428	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2183	else	2485	else
2184	*data++ = 0;	2486	*data++ = 0;
2185	}	2487	}
2186	}	2488	}
2187		2489
		2490	/* if size is w*h + 5 then no data has been found */
		2491	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2492	{
2188	SvPOK_only (data_sv);	2493	SvPOK_only (data_sv);
2189	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2494	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2495	}
		2496
2190	RETVAL = data_sv;	2497	RETVAL = data_sv;
2191	}	2498	}
2192	OUTPUT:	2499	OUTPUT:
2193	RETVAL	2500	RETVAL
2194		2501
2195	void	2502	void
2196	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2503	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197	PPCODE:	2504	PPCODE:
2198	{	2505	{
2199	int x, y, z;	2506	int x, y, z;
2200	int w, h;	2507	int w, h;
2201	int x1, y1;	2508	int x1, y1;
		2509	STRLEN len;
		2510	uint8_t *data, *end;
		2511
		2512	len = SvLEN (data_sv);
		2513	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2514	data = SvPVbyte_nolen (data_sv);
		2515	end = data + len + 8;
		2516
		2517	if (len < 5)
		2518	XSRETURN_EMPTY;
2202		2519
2203	if (*data++ != 0)	2520	if (*data++ != 0)
2204	return; /* version mismatch */	2521	XSRETURN_EMPTY; /* version mismatch */
2205		2522
2206	w = *data++ << 8; w |= *data++;	2523	w = *data++ << 8; w |= *data++;
2207	h = *data++ << 8; h |= *data++;	2524	h = *data++ << 8; h |= *data++;
2208		2525
2209	// we need to do this 'cause we don't keep an absolute coord system for rows	2526	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2221	{	2538	{
2222	maprow *row = map_get_row (self, y);	2539	maprow *row = map_get_row (self, y);
2223		2540
2224	for (x = x0; x < x1; x++)	2541	for (x = x0; x < x1; x++)
2225	{	2542	{
		2543	uint8_t flags;
		2544
		2545	if (data + 7 >= end)
		2546	XSRETURN_EMPTY;
		2547
2226	uint8_t flags = *data++;	2548	flags = *data++;
2227		2549
2228	if (flags)	2550	if (flags)
2229	{	2551	{
2230	mapcell *cell = row_get_cell (row, x);	2552	mapcell *cell = row_get_cell (row, x);
2231	tileid tile[3] = { 0, 0, 0 };	2553	tileid tile[3] = { 0, 0, 0 };
…		…
2234	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2556	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2557	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236		2558
2237	if (cell->darkness == 0)	2559	if (cell->darkness == 0)
2238	{	2560	{
2239	cell->darkness = 0;	2561	/*cell->darkness = 0;*/
		2562	EXTEND (SP, 3);
2240		2563
2241	for (z = 0; z <= 2; z++)	2564	for (z = 0; z <= 2; z++)
2242	{	2565	{
2243	tileid t = tile [z];	2566	tileid t = tile [z];
2244		2567
2245	if (t >= self->texs || (t && !self->tex [t].name))	2568	if (t >= self->texs || (t && !self->tex [t].name))
2246	{	2569	{
2247	XPUSHs (sv_2mortal (newSViv (t)));	2570	PUSHs (sv_2mortal (newSViv (t)));
2248	need_texid (self, t);	2571	need_texid (self, t);
2249	}	2572	}
2250		2573
2251	cell->tile [z] = t;	2574	cell->tile [z] = t;
2252	}	2575	}
…		…
2254	}	2577	}
2255	}	2578	}
2256	}	2579	}
2257	}	2580	}
2258		2581
2259	MODULE = CFPlus PACKAGE = CFPlus::RW	2582	MODULE = Deliantra::Client PACKAGE = DC::RW
2260		2583
2261	CFPlus::RW	2584	DC::RW
2262	new (SV *class, SV *data_sv)	2585	new (SV *class, SV *data_sv)
2263	CODE:	2586	CODE:
2264	{	2587	{
2265	STRLEN datalen;	2588	STRLEN datalen;
2266	char *data = SvPVbyte (data_sv, datalen);	2589	char *data = SvPVbyte (data_sv, datalen);
…		…
2268	RETVAL = SDL_RWFromConstMem (data, datalen);	2591	RETVAL = SDL_RWFromConstMem (data, datalen);
2269	}	2592	}
2270	OUTPUT:	2593	OUTPUT:
2271	RETVAL	2594	RETVAL
2272		2595
2273	CFPlus::RW	2596	DC::RW
2274	new_from_file (SV *class, const char *path, const char *mode = "rb")	2597	new_from_file (SV *class, const char *path, const char *mode = "rb")
2275	CODE:	2598	CODE:
2276	RETVAL = SDL_RWFromFile (path, mode);	2599	RETVAL = SDL_RWFromFile (path, mode);
2277	OUTPUT:	2600	OUTPUT:
2278	RETVAL	2601	RETVAL
2279		2602
2280	# fails on win32:	2603	# fails on win32:
2281	# CFPlus.xs(2268) : error C2059: syntax error : '('	2604	# dc.xs(2268) : error C2059: syntax error : '('
2282	#void	2605	#void
2283	#close (CFPlus::RW self)	2606	#close (DC::RW self)
2284	# CODE:	2607	# CODE:
2285	# (self->(close)) (self);	2608	# (self->(close)) (self);
2286		2609
2287	MODULE = CFPlus PACKAGE = CFPlus::Channel	2610	MODULE = Deliantra::Client PACKAGE = DC::Channel
2288		2611
2289	PROTOTYPES: DISABLE	2612	PROTOTYPES: DISABLE
2290		2613
2291	CFPlus::Channel	2614	DC::Channel
2292	find ()	2615	find ()
2293	CODE:	2616	CODE:
2294	{	2617	{
2295	RETVAL = Mix_GroupAvailable (-1);	2618	RETVAL = Mix_GroupAvailable (-1);
2296		2619
…		…
2309	}	2632	}
2310	OUTPUT:	2633	OUTPUT:
2311	RETVAL	2634	RETVAL
2312		2635
2313	void	2636	void
2314	halt (CFPlus::Channel self)	2637	halt (DC::Channel self)
2315	CODE:	2638	CODE:
2316	Mix_HaltChannel (self);	2639	Mix_HaltChannel (self);
2317		2640
2318	void	2641	void
2319	expire (CFPlus::Channel self, int ticks = -1)	2642	expire (DC::Channel self, int ticks = -1)
2320	CODE:	2643	CODE:
2321	Mix_ExpireChannel (self, ticks);	2644	Mix_ExpireChannel (self, ticks);
2322		2645
2323	void	2646	void
2324	fade_out (CFPlus::Channel self, int ticks = -1)	2647	fade_out (DC::Channel self, int ticks = -1)
2325	CODE:	2648	CODE:
2326	Mix_FadeOutChannel (self, ticks);	2649	Mix_FadeOutChannel (self, ticks);
2327		2650
2328	int	2651	int
2329	volume (CFPlus::Channel self, int volume)	2652	volume (DC::Channel self, int volume)
2330	CODE:	2653	CODE:
2331	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2654	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332	OUTPUT:	2655	OUTPUT:
2333	RETVAL	2656	RETVAL
2334		2657
2335	void	2658	void
2336	unregister_all_effects (CFPlus::Channel self)	2659	unregister_all_effects (DC::Channel self)
2337	CODE:	2660	CODE:
2338	Mix_UnregisterAllEffects (self);	2661	Mix_UnregisterAllEffects (self);
2339		2662
2340	void	2663	void
2341	set_panning (CFPlus::Channel self, int left, int right)	2664	set_panning (DC::Channel self, int left, int right)
2342	CODE:	2665	CODE:
2343	left = CLAMP (left , 0, 255);	2666	left = CLAMP (left , 0, 255);
2344	right = CLAMP (right, 0, 255);	2667	right = CLAMP (right, 0, 255);
2345	Mix_SetPanning (self, left, right);	2668	Mix_SetPanning (self, left, right);
2346		2669
2347	void	2670	void
2348	set_distance (CFPlus::Channel self, int distance)	2671	set_distance (DC::Channel self, int distance)
2349	CODE:	2672	CODE:
2350	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2673	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351		2674
2352	void	2675	void
2353	set_position (CFPlus::Channel self, int angle, int distance)	2676	set_position (DC::Channel self, int angle, int distance)
2354	CODE:	2677	CODE:
2355		2678
2356	void	2679	void
2357	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2680	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358	CODE:	2681	CODE:
2359	{	2682	{
2360	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2683	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2684	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2685	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363	}	2686	}
2364		2687
2365	void	2688	void
2366	set_reverse_stereo (CFPlus::Channel self, int flip)	2689	set_reverse_stereo (DC::Channel self, int flip)
2367	CODE:	2690	CODE:
2368	Mix_SetReverseStereo (self, flip);	2691	Mix_SetReverseStereo (self, flip);
2369		2692
2370	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2693	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371		2694
2372	PROTOTYPES: DISABLE	2695	PROTOTYPES: DISABLE
2373		2696
2374	CFPlus::MixChunk	2697	DC::MixChunk
2375	new (SV *class, CFPlus::RW rwops)	2698	new (SV *class, DC::RW rwops)
2376	CODE:	2699	CODE:
2377	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2700	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378	OUTPUT:	2701	OUTPUT:
2379	RETVAL	2702	RETVAL
2380		2703
2381	void	2704	void
2382	DESTROY (CFPlus::MixChunk self)	2705	DESTROY (DC::MixChunk self)
2383	CODE:	2706	CODE:
2384	Mix_FreeChunk (self);	2707	Mix_FreeChunk (self);
2385		2708
2386	int	2709	int
2387	volume (CFPlus::MixChunk self, int volume = -1)	2710	volume (DC::MixChunk self, int volume = -1)
2388	CODE:	2711	CODE:
2389	if (items > 1)	2712	if (items > 1)
2390	volume = CLAMP (volume, 0, 128);	2713	volume = CLAMP (volume, 0, 128);
2391	RETVAL = Mix_VolumeChunk (self, volume);	2714	RETVAL = Mix_VolumeChunk (self, volume);
2392	OUTPUT:	2715	OUTPUT:
2393	RETVAL	2716	RETVAL
2394		2717
2395	CFPlus::Channel	2718	DC::Channel
2396	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2719	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397	CODE:	2720	CODE:
2398	{	2721	{
2399	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2722	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400		2723
2401	if (RETVAL < 0)	2724	if (RETVAL < 0)
…		…
2408	}	2731	}
2409	}	2732	}
2410	OUTPUT:	2733	OUTPUT:
2411	RETVAL	2734	RETVAL
2412		2735
2413	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2736	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414		2737
2415	int	2738	int
2416	volume (int volume = -1)	2739	volume (int volume = -1)
2417	PROTOTYPE: ;$	2740	PROTOTYPE: ;$
2418	CODE:	2741	CODE:
…		…
2430	void	2753	void
2431	halt ()	2754	halt ()
2432	CODE:	2755	CODE:
2433	Mix_HaltMusic ();	2756	Mix_HaltMusic ();
2434		2757
2435	CFPlus::MixMusic	2758	DC::MixMusic
2436	new (SV *class, CFPlus::RW rwops)	2759	new (SV *class, DC::RW rwops)
2437	CODE:	2760	CODE:
2438	RETVAL = Mix_LoadMUS_RW (rwops);	2761	RETVAL = Mix_LoadMUS_RW (rwops);
2439	OUTPUT:	2762	OUTPUT:
2440	RETVAL	2763	RETVAL
2441		2764
2442	void	2765	void
2443	DESTROY (CFPlus::MixMusic self)	2766	DESTROY (DC::MixMusic self)
2444	CODE:	2767	CODE:
2445	Mix_FreeMusic (self);	2768	Mix_FreeMusic (self);
2446		2769
2447	int	2770	int
2448	play (CFPlus::MixMusic self, int loops = -1)	2771	play (DC::MixMusic self, int loops = -1)
2449	CODE:	2772	CODE:
2450	RETVAL = Mix_PlayMusic (self, loops);	2773	RETVAL = Mix_PlayMusic (self, loops);
2451	OUTPUT:	2774	OUTPUT:
2452	RETVAL	2775	RETVAL
2453		2776
2454	void	2777	void
2455	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2778	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456	CODE:	2779	CODE:
2457	Mix_FadeInMusicPos (self, loops, ms, position);	2780	Mix_FadeInMusicPos (self, loops, ms, position);
2458		2781
2459	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2782	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460		2783
2461	PROTOTYPES: ENABLE	2784	PROTOTYPES: ENABLE
2462		2785
2463	BOOT:	2786	BOOT:
2464	{	2787	{
2465	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2788	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466	static const struct {	2789	static const struct {
2467	const char *name;	2790	const char *name;
2468	IV iv;	2791	IV iv;
2469	} *civ, const_iv[] = {	2792	} *civ, const_iv[] = {
2470	# define const_iv(name) { # name, (IV)name }	2793	# define const_iv(name) { # name, (IV)name }
…		…
2505	const_iv (GL_INTENSITY),	2828	const_iv (GL_INTENSITY),
2506	const_iv (GL_LUMINANCE),	2829	const_iv (GL_LUMINANCE),
2507	const_iv (GL_LUMINANCE_ALPHA),	2830	const_iv (GL_LUMINANCE_ALPHA),
2508	const_iv (GL_FLOAT),	2831	const_iv (GL_FLOAT),
2509	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2832	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2833	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2834	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2835	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2836	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2837	const_iv (GL_COMPRESSED_RGB_ARB),
		2838	const_iv (GL_COMPRESSED_RGBA_ARB),
2510	const_iv (GL_COMPILE),	2839	const_iv (GL_COMPILE),
2511	const_iv (GL_PROXY_TEXTURE_1D),	2840	const_iv (GL_PROXY_TEXTURE_1D),
2512	const_iv (GL_PROXY_TEXTURE_2D),	2841	const_iv (GL_PROXY_TEXTURE_2D),
2513	const_iv (GL_TEXTURE_1D),	2842	const_iv (GL_TEXTURE_1D),
2514	const_iv (GL_TEXTURE_2D),	2843	const_iv (GL_TEXTURE_2D),
…		…
2553	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2882	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554	const_iv (GL_POINT_SMOOTH_HINT),	2883	const_iv (GL_POINT_SMOOTH_HINT),
2555	const_iv (GL_LINE_SMOOTH_HINT),	2884	const_iv (GL_LINE_SMOOTH_HINT),
2556	const_iv (GL_POLYGON_SMOOTH_HINT),	2885	const_iv (GL_POLYGON_SMOOTH_HINT),
2557	const_iv (GL_GENERATE_MIPMAP_HINT),	2886	const_iv (GL_GENERATE_MIPMAP_HINT),
		2887	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558	const_iv (GL_FASTEST),	2888	const_iv (GL_FASTEST),
2559	const_iv (GL_DONT_CARE),	2889	const_iv (GL_DONT_CARE),
2560	const_iv (GL_NICEST),	2890	const_iv (GL_NICEST),
2561	const_iv (GL_V2F),	2891	const_iv (GL_V2F),
2562	const_iv (GL_V3F),	2892	const_iv (GL_V3F),
…		…
2570		2900
2571	texture_av = newAV ();	2901	texture_av = newAV ();
2572	AvREAL_off (texture_av);	2902	AvREAL_off (texture_av);
2573	}	2903	}
2574		2904
		2905	void
		2906	disable_GL_EXT_blend_func_separate ()
		2907	CODE:
		2908	gl.BlendFuncSeparate = 0;
		2909	gl.BlendFuncSeparateEXT = 0;
		2910
2575	char *	2911	char *
2576	gl_vendor ()	2912	gl_vendor ()
2577	CODE:	2913	CODE:
2578	RETVAL = (char *)glGetString (GL_VENDOR);	2914	RETVAL = (char *)glGetString (GL_VENDOR);
2579	OUTPUT:	2915	OUTPUT:
…		…
2671	void glRotate (float angle, float x, float y, float z)	3007	void glRotate (float angle, float x, float y, float z)
2672	CODE:	3008	CODE:
2673	glRotatef (angle, x, y, z);	3009	glRotatef (angle, x, y, z);
2674		3010
2675	void glColor (float r, float g, float b, float a = 1.0)	3011	void glColor (float r, float g, float b, float a = 1.0)
		3012	PROTOTYPE: @
2676	ALIAS:	3013	ALIAS:
2677	glColor_premultiply = 1	3014	glColor_premultiply = 1
2678	CODE:	3015	CODE:
2679	if (ix)	3016	if (ix)
2680	{	3017	{
…		…
2700		3037
2701	void glRect (float x1, float y1, float x2, float y2)	3038	void glRect (float x1, float y1, float x2, float y2)
2702	CODE:	3039	CODE:
2703	glRectf (x1, y1, x2, y2);	3040	glRectf (x1, y1, x2, y2);
2704		3041
		3042	void glRect_lineloop (float x1, float y1, float x2, float y2)
		3043	CODE:
		3044	glBegin (GL_LINE_LOOP);
		3045	glVertex2f (x1, y1);
		3046	glVertex2f (x2, y1);
		3047	glVertex2f (x2, y2);
		3048	glVertex2f (x1, y2);
		3049	glEnd ();
		3050
2705	PROTOTYPES: ENABLE	3051	PROTOTYPES: ENABLE
2706		3052
2707	void glBegin (int mode)	3053	void glBegin (int mode)
2708		3054
2709	void glEnd ()	3055	void glEnd ()
…		…
2741	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3087	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742	CODE:	3088	CODE:
2743	if (gl.SeparableFilter2D)	3089	if (gl.SeparableFilter2D)
2744	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3090	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745		3091
2746	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3092	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747		3093
2748	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3094	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749		3095
2750	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3096	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751		3097
…		…
2777		3123
2778	void glEndList ()	3124	void glEndList ()
2779		3125
2780	void glCallList (int list)	3126	void glCallList (int list)
2781		3127
2782	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3128	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783		3129
2784	PROTOTYPES: DISABLE	3130	PROTOTYPES: DISABLE
2785		3131
2786	void	3132	void
2787	find_widget (SV *self, NV x, NV y)	3133	find_widget (SV *self, NV x, NV y)
…		…
2791	XPUSHs (self);	3137	XPUSHs (self);
2792	}	3138	}
2793		3139
2794	BOOT:	3140	BOOT:
2795	{	3141	{
2796	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3142	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797		3143
2798	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3144	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3145	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3146	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3147	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802	}	3148	}
2803		3149
2804	void	3150	void
2805	draw (SV *self)	3151	draw (SV *self)
2806	CODE:	3152	CODE:
…		…
2810	NV x, y, w, h;	3156	NV x, y, w, h;
2811	SV *draw_x_sv = GvSV (draw_x_gv);	3157	SV *draw_x_sv = GvSV (draw_x_gv);
2812	SV *draw_y_sv = GvSV (draw_y_gv);	3158	SV *draw_y_sv = GvSV (draw_y_gv);
2813	SV *draw_w_sv = GvSV (draw_w_gv);	3159	SV *draw_w_sv = GvSV (draw_w_gv);
2814	SV *draw_h_sv = GvSV (draw_h_gv);	3160	SV *draw_h_sv = GvSV (draw_h_gv);
2815	SV *hover;
2816	double draw_x, draw_y, draw_w, draw_h;	3161	double draw_x, draw_y;
2817		3162
2818	if (!SvROK (self))	3163	if (!SvROK (self))
2819	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3164	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820		3165
2821	hv = (HV *)SvRV (self);	3166	hv = (HV *)SvRV (self);
2822		3167
2823	if (SvTYPE (hv) != SVt_PVHV)	3168	if (SvTYPE (hv) != SVt_PVHV)
2824	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3169	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825		3170
2826	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3171	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3172	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828		3173
2829	if (!h || !w)	3174	if (!h || !w)
…		…
2849	{	3194	{
2850	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3195	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851		3196
2852	if (svp && SvTRUE (*svp))	3197	if (svp && SvTRUE (*svp))
2853	{	3198	{
2854	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3199	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855	glEnable (GL_BLEND);	3200	glEnable (GL_BLEND);
2856	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3201	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857	glBegin (GL_QUADS);	3202	glBegin (GL_QUADS);
2858	glVertex2f (0, 0);	3203	glVertex2f (0, 0);
2859	glVertex2f (w, 0);	3204	glVertex2f (w, 0);
…		…
2862	glEnd ();	3207	glEnd ();
2863	glDisable (GL_BLEND);	3208	glDisable (GL_BLEND);
2864	}	3209	}
2865	}	3210	}
2866	#if 0	3211	#if 0
2867	if ($ENV{CFPLUS_DEBUG} & 1) {	3212	// draw borders, for debugging
2868	glPushMatrix;	3213	glPushMatrix ();
2869	glColor 1, 1, 0, 1;	3214	glColor4f (1., 1., 0., 1.);
2870	glTranslate 0.375, 0.375;	3215	glTranslatef (.5, .5, 0.);
2871	glBegin GL_LINE_LOOP;	3216	glBegin (GL_LINE_LOOP);
2872	glVertex 0 , 0;	3217	glVertex2f (0 , 0);
2873	glVertex $self->{w} - 1, 0;	3218	glVertex2f (w - 1, 0);
2874	glVertex $self->{w} - 1, $self->{h} - 1;	3219	glVertex2f (w - 1, h - 1);
2875	glVertex 0 , $self->{h} - 1;	3220	glVertex2f (0 , h - 1);
2876	glEnd;	3221	glEnd ();
2877	glPopMatrix;	3222	glPopMatrix ();
2878	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879	}
2880	#endif	3223	#endif
2881	PUSHMARK (SP);	3224	PUSHMARK (SP);
2882	XPUSHs (self);	3225	XPUSHs (self);
2883	PUTBACK;	3226	PUTBACK;
2884	call_method ("_draw", G_VOID | G_DISCARD);	3227	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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