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.215 by root, Tue Jul 31 00:50:04 2007 UTC vs.
Revision 1.279 by root, Thu Oct 2 15:59:40 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	95
66	# define PARACHUTE 0	96	#define KMOD_LRAM 0x10000 // our extension
67	#endif
68		97
69	static AV *texture_av;	98	static AV *texture_av;
70		99
71	static struct	100	static struct
72	{	101	{
…		…
109	av_push (texture_av, (SV *)(size_t)name);	138	av_push (texture_av, (SV *)(size_t)name);
110	glDeleteTextures (1, &name);	139	glDeleteTextures (1, &name);
111	}	140	}
112		141
113	#include "texcache.c"	142	#include "texcache.c"
		143	#include "rendercache.c"
114		144
115	#include "pango-font.c"	145	#include "pango-font.c"
116	#include "pango-fontmap.c"	146	#include "pango-fontmap.c"
117	#include "pango-render.c"	147	#include "pango-render.c"
118		148
119	typedef IV CFPlus__Channel;	149	typedef IV DC__Channel;
120	typedef SDL_RWops *CFPlus__RW;	150	typedef SDL_RWops *DC__RW;
121	typedef Mix_Chunk *CFPlus__MixChunk;	151	typedef Mix_Chunk *DC__MixChunk;
122	typedef Mix_Music *CFPlus__MixMusic;	152	typedef Mix_Music *DC__MixMusic;
123		153
124	typedef PangoFontDescription *CFPlus__Font;	154	typedef PangoFontDescription *DC__Font;
125		155
126	static int	156	static int
127	shape_attr_p (PangoLayoutRun *run)	157	shape_attr_p (PangoLayoutRun *run)
128	{	158	{
129	GSList *attrs = run->item->analysis.extra_attrs;	159	GSList *attrs = run->item->analysis.extra_attrs;
…		…
143		173
144	typedef struct cf_layout {	174	typedef struct cf_layout {
145	PangoLayout *pl;	175	PangoLayout *pl;
146	float r, g, b, a; // default color for rgba mode	176	float r, g, b, a; // default color for rgba mode
147	int base_height;	177	int base_height;
148	CFPlus__Font font;	178	DC__Font font;
		179	rc_t *rc;
149	} *CFPlus__Layout;	180	} *DC__Layout;
150		181
151	static CFPlus__Font default_font;	182	static DC__Font default_font;
152	static PangoContext *opengl_context;	183	static PangoContext *opengl_context;
153	static PangoFontMap *opengl_fontmap;	184	static PangoFontMap *opengl_fontmap;
154		185
155	static void	186	static void
156	substitute_func (FcPattern *pattern, gpointer data)	187	substitute_func (FcPattern *pattern, gpointer data)
…		…
161	#endif	192	#endif
162	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	193	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163	}	194	}
164		195
165	static void	196	static void
166	layout_update_font (CFPlus__Layout self)	197	layout_update_font (DC__Layout self)
167	{	198	{
168	/* 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
169	* reasonably well with bitstream vera	200	* reasonably well with dejavu/bistream fonts
170	*/	201	*/
171	PangoFontDescription *font = self->font ? self->font : default_font;	202	PangoFontDescription *font = self->font ? self->font : default_font;
172		203
173	pango_font_description_set_absolute_size (font,	204	pango_font_description_set_absolute_size (font,
174	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	205	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175		206
176	pango_layout_set_font_description (self->pl, font);	207	pango_layout_set_font_description (self->pl, font);
177	}	208	}
178		209
179	static void	210	static void
180	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	211	layout_get_pixel_size (DC__Layout self, int *w, int *h)
181	{	212	{
182	PangoRectangle rect;	213	PangoRectangle rect;
183		214
184	// get_pixel_* wrongly rounds down	215	// get_pixel_* wrongly rounds down
185	pango_layout_get_extents (self->pl, 0, &rect);	216	pango_layout_get_extents (self->pl, 0, &rect);
…		…
196		227
197	typedef uint16_t tileid;	228	typedef uint16_t tileid;
198	typedef uint16_t faceid;	229	typedef uint16_t faceid;
199		230
200	typedef struct {	231	typedef struct {
201	int name;	232	GLuint name;
202	int w, h;	233	int w, h;
203	float s, t;	234	float s, t;
204	uint8_t r, g, b, a;	235	uint8_t r, g, b, a;
205	tileid smoothtile;	236	tileid smoothtile;
206	uint8_t smoothlevel;	237	uint8_t smoothlevel;
…		…
224	int faces; tileid *face2tile; // [faceid]	255	int faces; tileid *face2tile; // [faceid]
225	int texs; maptex *tex; // [tileid]	256	int texs; maptex *tex; // [tileid]
226		257
227	int32_t rows;	258	int32_t rows;
228	maprow *row;	259	maprow *row;
229	} *CFPlus__Map;	260	} *DC__Map;
230		261
231	static char *	262	static char *
232	prepend (char *ptr, int sze, int inc)	263	prepend (char *ptr, int sze, int inc)
233	{	264	{
234	char *p;	265	char *p;
…		…
272	self->texs *= 2;	303	self->texs *= 2;
273	}	304	}
274	}	305	}
275		306
276	static maprow *	307	static maprow *
277	map_get_row (CFPlus__Map self, int y)	308	map_get_row (DC__Map self, int y)
278	{	309	{
279	if (0 > y)	310	if (0 > y)
280	{	311	{
281	int extend = - y + MAP_EXTEND_Y;	312	int extend = - y + MAP_EXTEND_Y;
282	Prepend (maprow, self->row, self->rows, extend);	313	Prepend (maprow, self->row, self->rows, extend);
…		…
320		351
321	return row->col + (x - row->c0);	352	return row->col + (x - row->c0);
322	}	353	}
323		354
324	static mapcell *	355	static mapcell *
325	map_get_cell (CFPlus__Map self, int x, int y)	356	map_get_cell (DC__Map self, int x, int y)
326	{	357	{
327	return row_get_cell (map_get_row (self, y), x);	358	return row_get_cell (map_get_row (self, y), x);
328	}	359	}
329		360
330	static void	361	static void
331	map_clear (CFPlus__Map self)	362	map_clear (DC__Map self)
332	{	363	{
333	int r;	364	int r;
334		365
335	for (r = 0; r < self->rows; r++)	366	for (r = 0; r < self->rows; r++)
336	Safefree (self->row[r].col);	367	Safefree (self->row[r].col);
…		…
343	self->oy = 0;	374	self->oy = 0;
344	self->row = 0;	375	self->row = 0;
345	self->rows = 0;	376	self->rows = 0;
346	}	377	}
347		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
348	static void	389	static void
349	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)
350	{	391	{
351	int x, y;	392	int x, y;
352	maprow *row;	393	maprow *row;
353	mapcell *cell;	394	mapcell *cell;
354		395
…		…
366	if (x >= row->c1)	407	if (x >= row->c1)
367	break;	408	break;
368		409
369	cell = row->col + x - row->c0;	410	cell = row->col + x - row->c0;
370		411
371	cell->darkness = 0;	412	CELL_CLEAR (cell);
372	cell->stat_hp = 0;
373	cell->flags = 0;
374	cell->player = 0;
375	}	413	}
376	}	414	}
377	}	415	}
378		416
379	typedef struct {	417	typedef struct {
…		…
433	n |= n >> 16;	471	n |= n >> 16;
434		472
435	return n + 1;	473	return n + 1;
436	}	474	}
437		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
438	/* SDL should provide this, really. */	487	/* SDL should provide this, really. */
439	#define SDLK_MODIFIER_MIN 300	488	#define SDLK_MODIFIER_MIN 300
440	#define SDLK_MODIFIER_MAX 314	489	#define SDLK_MODIFIER_MAX 314
441		490
442	/******************************************************************************/	491	/******************************************************************************/
…		…
480	return 0;	529	return 0;
481		530
482	return 1;	531	return 1;
483	}	532	}
484		533
485	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
486		587
487	PROTOTYPES: ENABLE	588	PROTOTYPES: ENABLE
488		589
489	BOOT:	590	BOOT:
490	{	591	{
491	HV *stash = gv_stashpv ("CFPlus", 1);	592	HV *stash = gv_stashpv ("DC", 1);
492	static const struct {	593	static const struct {
493	const char *name;	594	const char *name;
494	IV iv;	595	IV iv;
495	} *civ, const_iv[] = {	596	} *civ, const_iv[] = {
496	# define const_iv(name) { # name, (IV)name }	597	# define const_iv(name) { # name, (IV)name }
…		…
518		619
519	const_iv (SDL_APPINPUTFOCUS),	620	const_iv (SDL_APPINPUTFOCUS),
520	const_iv (SDL_APPMOUSEFOCUS),	621	const_iv (SDL_APPMOUSEFOCUS),
521	const_iv (SDL_APPACTIVE),	622	const_iv (SDL_APPACTIVE),
522		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),
523	const_iv (SDLK_KP0),	676	const_iv (SDLK_KP0),
524	const_iv (SDLK_KP1),	677	const_iv (SDLK_KP1),
525	const_iv (SDLK_KP2),	678	const_iv (SDLK_KP2),
526	const_iv (SDLK_KP3),	679	const_iv (SDLK_KP3),
527	const_iv (SDLK_KP4),	680	const_iv (SDLK_KP4),
…		…
599	const_iv (KMOD_LMETA),	752	const_iv (KMOD_LMETA),
600	const_iv (KMOD_RMETA),	753	const_iv (KMOD_RMETA),
601	const_iv (KMOD_NUM),	754	const_iv (KMOD_NUM),
602	const_iv (KMOD_CAPS),	755	const_iv (KMOD_CAPS),
603	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)
604	# undef const_iv	790	# undef const_iv
605	};	791	};
606		792
607	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; )
608	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	794	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
626		812
627	NV floor (NV x)	813	NV floor (NV x)
628		814
629	NV ceil (NV x)	815	NV ceil (NV x)
630		816
		817	IV minpot (UV n)
		818
		819	IV popcount (UV n)
		820
631	void	821	void
632	pango_init ()	822	pango_init ()
633	CODE:	823	CODE:
634	{	824	{
635	opengl_fontmap = pango_opengl_font_map_new ();	825	opengl_fontmap = pango_opengl_font_map_new ();
636	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);
637	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
638	}	833	}
639		834
640	char *
641	SDL_GetError ()	835	char *SDL_GetError ()
642		836
643	int	837	void SDL_braino ()
644	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645		838
646	void	839	int SDL_Init (U32 flags)
		840
		841	int SDL_InitSubSystem (U32 flags)
		842
		843	void SDL_QuitSubSystem (U32 flags)
		844
647	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
648		855
649	void	856	void
650	SDL_ListModes (int rgb, int alpha)	857	SDL_ListModes (int rgb, int alpha)
651	PPCODE:	858	PPCODE:
652	{	859	{
…		…
664	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	871	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	872	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	873	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667		874
668	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	875	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);	876	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672	#endif
673		877
674	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	878	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675		879
676	if (m && m != (SDL_Rect **)-1)	880	if (m && m != (SDL_Rect **)-1)
677	while (*m)	881	while (*m)
678	{	882	{
679	if ((*m)->w >= 640 && (*m)->h >= 480)	883	if ((*m)->w >= 400 && (*m)->h >= 300)
680	{	884	{
681	AV *av = newAV ();	885	AV *av = newAV ();
682	av_push (av, newSViv ((*m)->w));	886	av_push (av, newSViv ((*m)->w));
683	av_push (av, newSViv ((*m)->h));	887	av_push (av, newSViv ((*m)->h));
684	av_push (av, newSViv (rgb));	888	av_push (av, newSViv (rgb));
…		…
708		912
709	if (RETVAL)	913	if (RETVAL)
710	{	914	{
711	av_clear (texture_av);	915	av_clear (texture_av);
712		916
713	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	917	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714	#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);
715	#include "glfunc.h"	919	#include "glfunc.h"
716	#undef GL_FUNC	920	#undef GL_FUNC
717	}	921	}
718	}	922	}
…		…
725	char *	929	char *
726	SDL_GetKeyName (int sym)	930	SDL_GetKeyName (int sym)
727		931
728	int	932	int
729	SDL_GetAppState ()	933	SDL_GetAppState ()
		934
		935	int
		936	SDL_GetModState ()
730		937
731	void	938	void
732	poll_events ()	939	poll_events ()
733	PPCODE:	940	PPCODE:
734	{	941	{
…		…
744	{	951	{
745	case SDL_KEYDOWN:	952	case SDL_KEYDOWN:
746	case SDL_KEYUP:	953	case SDL_KEYUP:
747	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	954	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	955	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749	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);
750	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 */
751	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	958	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752	break;	959	break;
753		960
754	case SDL_ACTIVEEVENT:	961	case SDL_ACTIVEEVENT:
755	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	962	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
773	x = ev.motion.x;	980	x = ev.motion.x;
774	y = ev.motion.y;	981	y = ev.motion.y;
775	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	982	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776	}	983	}
777		984
778	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	985	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779	hv_store (hv, "state", 5, newSViv (state), 0);	986	hv_store (hv, "state", 5, newSViv (state), 0);
780	hv_store (hv, "x", 1, newSViv (x), 0);	987	hv_store (hv, "x", 1, newSViv (x), 0);
781	hv_store (hv, "y", 1, newSViv (y), 0);	988	hv_store (hv, "y", 1, newSViv (y), 0);
782	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	989	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	990	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784	}	991	}
785	break;	992	break;
786		993
787	case SDL_MOUSEBUTTONDOWN:	994	case SDL_MOUSEBUTTONDOWN:
788	case SDL_MOUSEBUTTONUP:	995	case SDL_MOUSEBUTTONUP:
789	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	996	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790		997
791	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	998	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	999	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1000	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1001	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
799	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1006	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1007	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801	break;	1008	break;
802	}	1009	}
803		1010
804	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))));
805	}	1012	}
806	}	1013	}
807		1014
808	int	1015	int
809	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1016	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810	POSTCALL:	1017	POSTCALL:
811	Mix_HookMusicFinished (music_finished);	1018	Mix_HookMusicFinished (music_finished);
812	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	}
813		1036
814	void	1037	void
815	Mix_CloseAudio ()	1038	Mix_CloseAudio ()
816		1039
817	int	1040	int
…		…
852	}	1075	}
853	}	1076	}
854	#endif	1077	#endif
855	}	1078	}
856		1079
857	void	1080	int
858	add_font (char *file)	1081	add_font (char *file)
859	CODE:	1082	CODE:
860	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1083	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1084	OUTPUT:
		1085	RETVAL
861		1086
862	void	1087	void
863	load_image_inline (SV *image_)	1088	load_image_inline (SV *image_)
864	ALIAS:	1089	ALIAS:
865	load_image_file = 1	1090	load_image_file = 1
…		…
951	void	1176	void
952	error (char *message)	1177	error (char *message)
953	CODE:	1178	CODE:
954	fprintf (stderr, "ERROR: %s\n", message);	1179	fprintf (stderr, "ERROR: %s\n", message);
955	#ifdef _WIN32	1180	#ifdef _WIN32
956	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1181	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957	#endif	1182	#endif
958		1183
959	void	1184	void
960	fatal (char *message)	1185	fatal (char *message)
961	CODE:	1186	CODE:
962	fprintf (stderr, "FATAL: %s\n", message);	1187	fprintf (stderr, "FATAL: %s\n", message);
963	#ifdef _WIN32	1188	#ifdef _WIN32
964	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1189	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965	#endif	1190	#endif
966	_exit (1);	1191	_exit (1);
967		1192
968	void	1193	void
969	_exit (int retval = 0)	1194	_exit (int retval = 0)
…		…
981	#if DEBUG	1206	#if DEBUG
982	VALGRIND_DO_LEAK_CHECK;	1207	VALGRIND_DO_LEAK_CHECK;
983	#endif	1208	#endif
984	}	1209	}
985		1210
986	MODULE = CFPlus PACKAGE = CFPlus::Font	1211	MODULE = Deliantra::Client PACKAGE = DC::Font
987		1212
988	PROTOTYPES: DISABLE	1213	PROTOTYPES: DISABLE
989		1214
990	CFPlus::Font	1215	DC::Font
991	new_from_file (SV *class, char *path, int id = 0)	1216	new_from_file (SV *class, char *path, int id = 0)
992	CODE:	1217	CODE:
993	{	1218	{
994	int count;	1219	int count;
995	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1220	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
998	}	1223	}
999	OUTPUT:	1224	OUTPUT:
1000	RETVAL	1225	RETVAL
1001		1226
1002	void	1227	void
1003	DESTROY (CFPlus::Font self)	1228	DESTROY (DC::Font self)
1004	CODE:	1229	CODE:
1005	pango_font_description_free (self);	1230	pango_font_description_free (self);
1006		1231
1007	void	1232	void
1008	make_default (CFPlus::Font self)	1233	make_default (DC::Font self)
1009	PROTOTYPE: $	1234	PROTOTYPE: $
1010	CODE:	1235	CODE:
1011	default_font = self;	1236	default_font = self;
1012		1237
1013	MODULE = CFPlus PACKAGE = CFPlus::Layout	1238	MODULE = Deliantra::Client PACKAGE = DC::Layout
1014		1239
1015	PROTOTYPES: DISABLE	1240	PROTOTYPES: DISABLE
1016		1241
1017	void	1242	void
1018	reset_glyph_cache ()	1243	glyph_cache_backup ()
1019	PROTOTYPE:	1244	PROTOTYPE:
1020	CODE:	1245	CODE:
		1246	tc_backup ();
		1247
		1248	void
		1249	glyph_cache_restore ()
		1250	PROTOTYPE:
		1251	CODE:
1021	tc_clear ();	1252	tc_restore ();
1022		1253
1023	CFPlus::Layout	1254	DC::Layout
1024	new (SV *class)	1255	new (SV *class)
1025	CODE:	1256	CODE:
1026	New (0, RETVAL, 1, struct cf_layout);	1257	New (0, RETVAL, 1, struct cf_layout);
1027		1258
1028	RETVAL->pl = pango_layout_new (opengl_context);	1259	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1030	RETVAL->g = 1.;	1261	RETVAL->g = 1.;
1031	RETVAL->b = 1.;	1262	RETVAL->b = 1.;
1032	RETVAL->a = 1.;	1263	RETVAL->a = 1.;
1033	RETVAL->base_height = MIN_FONT_HEIGHT;	1264	RETVAL->base_height = MIN_FONT_HEIGHT;
1034	RETVAL->font = 0;	1265	RETVAL->font = 0;
		1266	RETVAL->rc = rc_alloc ();
1035		1267
1036	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1268	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037	layout_update_font (RETVAL);	1269	layout_update_font (RETVAL);
1038	OUTPUT:	1270	OUTPUT:
1039	RETVAL	1271	RETVAL
1040		1272
1041	void	1273	void
1042	DESTROY (CFPlus::Layout self)	1274	DESTROY (DC::Layout self)
1043	CODE:	1275	CODE:
1044	g_object_unref (self->pl);	1276	g_object_unref (self->pl);
		1277	rc_free (self->rc);
1045	Safefree (self);	1278	Safefree (self);
1046		1279
1047	void	1280	void
1048	set_text (CFPlus::Layout self, SV *text_)	1281	set_text (DC::Layout self, SV *text_)
1049	CODE:	1282	CODE:
1050	{	1283	{
1051	STRLEN textlen;	1284	STRLEN textlen;
1052	char *text = SvPVutf8 (text_, textlen);	1285	char *text = SvPVutf8 (text_, textlen);
1053		1286
1054	pango_layout_set_text (self->pl, text, textlen);	1287	pango_layout_set_text (self->pl, text, textlen);
1055	}	1288	}
1056		1289
1057	void	1290	void
1058	set_markup (CFPlus::Layout self, SV *text_)	1291	set_markup (DC::Layout self, SV *text_)
1059	CODE:	1292	CODE:
1060	{	1293	{
1061	STRLEN textlen;	1294	STRLEN textlen;
1062	char *text = SvPVutf8 (text_, textlen);	1295	char *text = SvPVutf8 (text_, textlen);
1063		1296
1064	pango_layout_set_markup (self->pl, text, textlen);	1297	pango_layout_set_markup (self->pl, text, textlen);
1065	}	1298	}
1066		1299
1067	void	1300	void
1068	set_shapes (CFPlus::Layout self, ...)	1301	set_shapes (DC::Layout self, ...)
1069	CODE:	1302	CODE:
1070	{	1303	{
1071	PangoAttrList *attrs = 0;	1304	PangoAttrList *attrs = 0;
1072	const char *text = pango_layout_get_text (self->pl);	1305	const char *text = pango_layout_get_text (self->pl);
1073	const char *pos = text;	1306	const char *pos = text;
…		…
1108	if (attrs)	1341	if (attrs)
1109	pango_layout_set_attributes (self->pl, attrs);	1342	pango_layout_set_attributes (self->pl, attrs);
1110	}	1343	}
1111		1344
1112	void	1345	void
1113	get_shapes (CFPlus::Layout self)	1346	get_shapes (DC::Layout self)
1114	PPCODE:	1347	PPCODE:
1115	{	1348	{
1116	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1349	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117		1350
1118	do	1351	do
1119	{	1352	{
1120	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1353	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121		1354
1122	if (run && shape_attr_p (run))	1355	if (run && shape_attr_p (run))
1123	{	1356	{
1124	PangoRectangle extents;	1357	PangoRectangle extents;
1125	pango_layout_iter_get_run_extents (iter, 0, &extents);	1358	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1133		1366
1134	pango_layout_iter_free (iter);	1367	pango_layout_iter_free (iter);
1135	}	1368	}
1136		1369
1137	int	1370	int
1138	has_wrapped (CFPlus::Layout self)	1371	has_wrapped (DC::Layout self)
1139	CODE:	1372	CODE:
1140	{	1373	{
1141	int lines = 1;	1374	int lines = 1;
1142	const char *text = pango_layout_get_text (self->pl);	1375	const char *text = pango_layout_get_text (self->pl);
1143		1376
…		…
1148	}	1381	}
1149	OUTPUT:	1382	OUTPUT:
1150	RETVAL	1383	RETVAL
1151		1384
1152	SV *	1385	SV *
1153	get_text (CFPlus::Layout self)	1386	get_text (DC::Layout self)
1154	CODE:	1387	CODE:
1155	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1388	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156	sv_utf8_decode (RETVAL);	1389	sv_utf8_decode (RETVAL);
1157	OUTPUT:	1390	OUTPUT:
1158	RETVAL	1391	RETVAL
1159		1392
1160	void	1393	void
1161	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.)
1162	CODE:	1395	CODE:
1163	self->r = r;	1396	self->r = r;
1164	self->g = g;	1397	self->g = g;
1165	self->b = b;	1398	self->b = b;
1166	self->a = a;	1399	self->a = a;
1167		1400
1168	void	1401	void
1169	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1402	set_font (DC::Layout self, DC::Font font = 0)
1170	CODE:	1403	CODE:
1171	if (self->font != font)	1404	if (self->font != font)
1172	{	1405	{
1173	self->font = font;	1406	self->font = font;
1174	layout_update_font (self);	1407	layout_update_font (self);
1175	}	1408	}
1176		1409
1177	void	1410	void
1178	set_height (CFPlus::Layout self, int base_height)	1411	set_height (DC::Layout self, int base_height)
1179	CODE:	1412	CODE:
1180	if (self->base_height != base_height)	1413	if (self->base_height != base_height)
1181	{	1414	{
1182	self->base_height = base_height;	1415	self->base_height = base_height;
1183	layout_update_font (self);	1416	layout_update_font (self);
1184	}	1417	}
1185		1418
1186	void	1419	void
1187	set_width (CFPlus::Layout self, int max_width = -1)	1420	set_width (DC::Layout self, int max_width = -1)
1188	CODE:	1421	CODE:
1189	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);
1190		1423
1191	void	1424	void
1192	set_indent (CFPlus::Layout self, int indent)	1425	set_indent (DC::Layout self, int indent)
1193	CODE:	1426	CODE:
1194	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1427	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195		1428
1196	void	1429	void
1197	set_spacing (CFPlus::Layout self, int spacing)	1430	set_spacing (DC::Layout self, int spacing)
1198	CODE:	1431	CODE:
1199	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1432	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200		1433
1201	void	1434	void
1202	set_ellipsise (CFPlus::Layout self, int ellipsise)	1435	set_ellipsise (DC::Layout self, int ellipsise)
1203	CODE:	1436	CODE:
1204	pango_layout_set_ellipsize (self->pl,	1437	pango_layout_set_ellipsize (self->pl,
1205	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1438	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1439	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1440	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208	: PANGO_ELLIPSIZE_NONE	1441	: PANGO_ELLIPSIZE_NONE
1209	);	1442	);
1210		1443
1211	void	1444	void
1212	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1445	set_single_paragraph_mode (DC::Layout self, int spm)
1213	CODE:	1446	CODE:
1214	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1447	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215		1448
1216	void	1449	void
1217	size (CFPlus::Layout self)	1450	size (DC::Layout self)
1218	PPCODE:	1451	PPCODE:
1219	{	1452	{
1220	int w, h;	1453	int w, h;
1221		1454
1222	layout_get_pixel_size (self, &w, &h);	1455	layout_get_pixel_size (self, &w, &h);
…		…
1225	PUSHs (sv_2mortal (newSViv (w)));	1458	PUSHs (sv_2mortal (newSViv (w)));
1226	PUSHs (sv_2mortal (newSViv (h)));	1459	PUSHs (sv_2mortal (newSViv (h)));
1227	}	1460	}
1228		1461
1229	int	1462	int
1230	descent (CFPlus::Layout self)	1463	descent (DC::Layout self)
1231	CODE:	1464	CODE:
1232	{	1465	{
1233	PangoRectangle rect;	1466	PangoRectangle rect;
1234	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1467	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235	pango_layout_line_get_pixel_extents (line, 0, &rect);	1468	pango_layout_line_get_pixel_extents (line, 0, &rect);
1236	RETVAL = PANGO_DESCENT (rect);	1469	RETVAL = PANGO_DESCENT (rect);
1237	}	1470	}
1238	OUTPUT:	1471	OUTPUT:
1239	RETVAL	1472	RETVAL
1240		1473
1241	int	1474	int
1242	xy_to_index (CFPlus::Layout self, int x, int y)	1475	xy_to_index (DC::Layout self, int x, int y)
1243	CODE:	1476	CODE:
1244	{	1477	{
1245	int index, trailing;	1478	int index, trailing;
1246	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);
1247	RETVAL = index + trailing;	1480	RETVAL = index + trailing;
1248	}	1481	}
1249	OUTPUT:	1482	OUTPUT:
1250	RETVAL	1483	RETVAL
1251		1484
1252	void	1485	void
1253	cursor_pos (CFPlus::Layout self, int index)	1486	cursor_pos (DC::Layout self, int index)
1254	PPCODE:	1487	PPCODE:
1255	{	1488	{
1256	PangoRectangle strong_pos;	1489	PangoRectangle pos;
1257	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1490	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258		1491
1259	EXTEND (SP, 3);	1492	EXTEND (SP, 3);
1260	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1493	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1494	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1495	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263	}	1496	}
1264		1497
1265	void	1498	void
1266	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)
1267	PPCODE:	1500	PPCODE:
1268	{	1501	{
1269	int line, x;	1502	int line, x;
1270		1503
1271	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)
1272	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1506	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273		1507	--line;
		1508	#endif
1274	EXTEND (SP, 2);	1509	EXTEND (SP, 2);
1275	PUSHs (sv_2mortal (newSViv (line - 1)));	1510	PUSHs (sv_2mortal (newSViv (line)));
1276	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1511	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277	}	1512	}
1278		1513
1279	void	1514	void
1280	line_x_to_index (CFPlus::Layout self, int line, int x)	1515	line_x_to_index (DC::Layout self, int line, int x)
1281	PPCODE:	1516	PPCODE:
1282	{	1517	{
1283	PangoLayoutLine *lp;	1518	PangoLayoutLine *lp;
1284	int index, trailing;	1519	int index, trailing;
1285		1520
1286	if (line < 0)	1521	if (line < 0)
1287	XSRETURN_EMPTY;	1522	XSRETURN_EMPTY;
1288		1523
1289	if (!(lp = pango_layout_get_line (self->pl, line)))	1524	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290	XSRETURN_EMPTY; /* do better */	1525	XSRETURN_EMPTY; /* do better */
1291		1526
1292	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);
1293		1528
1294	EXTEND (SP, 2);	1529	EXTEND (SP, 2);
…		…
1300	PUSHs (sv_2mortal (newSViv (trailing)));	1535	PUSHs (sv_2mortal (newSViv (trailing)));
1301	}	1536	}
1302	}	1537	}
1303		1538
1304	void	1539	void
1305	render (CFPlus::Layout self, float x, float y, int flags = 0)	1540	render (DC::Layout self, float x, float y, int flags = 0)
1306	PPCODE:	1541	CODE:
		1542	rc_clear (self->rc);
1307	pango_opengl_render_layout_subpixel (	1543	pango_opengl_render_layout_subpixel (
1308	self->pl,	1544	self->pl,
		1545	self->rc,
1309	x * PANGO_SCALE, y * PANGO_SCALE,	1546	x * PANGO_SCALE, y * PANGO_SCALE,
1310	self->r, self->g, self->b, self->a,	1547	self->r, self->g, self->b, self->a,
1311	flags	1548	flags
1312	);	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);
1313		1553
1314	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
1315		1574
1316	PROTOTYPES: ENABLE	1575	PROTOTYPES: ENABLE
1317
1318	int minpot (int n)
1319		1576
1320	void	1577	void
1321	pad (SV *data_, int ow, int oh, int nw, int nh)	1578	pad (SV *data_, int ow, int oh, int nw, int nh)
1322	CODE:	1579	CODE:
1323	{	1580	{
…		…
1350	HV *hv = (HV *)SvRV (self);	1607	HV *hv = (HV *)SvRV (self);
1351	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1608	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1609	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1610	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354		1611
		1612	if (name <= 0)
		1613	XSRETURN_EMPTY;
		1614
1355	if (items < 5)	1615	if (items < 5)
1356	{	1616	{
1357	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1617	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1618	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359	}	1619	}
…		…
1397	RETVAL = width > 0;	1657	RETVAL = width > 0;
1398	}	1658	}
1399	OUTPUT:	1659	OUTPUT:
1400	RETVAL	1660	RETVAL
1401		1661
1402	MODULE = CFPlus PACKAGE = CFPlus::Map	1662	MODULE = Deliantra::Client PACKAGE = DC::Map
1403		1663
1404	PROTOTYPES: DISABLE	1664	PROTOTYPES: DISABLE
1405		1665
1406	CFPlus::Map	1666	DC::Map
1407	new (SV *class)	1667	new (SV *class)
1408	CODE:	1668	CODE:
1409	New (0, RETVAL, 1, struct map);	1669	New (0, RETVAL, 1, struct map);
1410	RETVAL->x = 0;	1670	RETVAL->x = 0;
1411	RETVAL->y = 0;	1671	RETVAL->y = 0;
…		…
1419	RETVAL->row = 0;	1679	RETVAL->row = 0;
1420	OUTPUT:	1680	OUTPUT:
1421	RETVAL	1681	RETVAL
1422		1682
1423	void	1683	void
1424	DESTROY (CFPlus::Map self)	1684	DESTROY (DC::Map self)
1425	CODE:	1685	CODE:
1426	{	1686	{
1427	map_clear (self);	1687	map_clear (self);
1428	Safefree (self->face2tile);	1688	Safefree (self->face2tile);
1429	Safefree (self->tex);	1689	Safefree (self->tex);
1430	Safefree (self);	1690	Safefree (self);
1431	}	1691	}
1432		1692
1433	void	1693	void
1434	resize (CFPlus::Map self, int map_width, int map_height)	1694	resize (DC::Map self, int map_width, int map_height)
1435	CODE:	1695	CODE:
1436	self->w = map_width;	1696	self->w = map_width;
1437	self->h = map_height;	1697	self->h = map_height;
1438		1698
1439	void	1699	void
1440	clear (CFPlus::Map self)	1700	clear (DC::Map self)
1441	CODE:	1701	CODE:
1442	map_clear (self);	1702	map_clear (self);
1443		1703
1444	void	1704	void
1445	set_tileid (CFPlus::Map self, int face, int tile)	1705	set_tileid (DC::Map self, int face, int tile)
1446	CODE:	1706	CODE:
1447	{	1707	{
1448	need_facenum (self, face); self->face2tile [face] = tile;	1708	need_facenum (self, face); self->face2tile [face] = tile;
1449	need_texid (self, tile);	1709	need_texid (self, tile);
1450	}	1710	}
1451		1711
1452	void	1712	void
1453	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1713	set_smooth (DC::Map self, int face, int smooth, int level)
1454	CODE:	1714	CODE:
1455	{	1715	{
1456	tileid texid;	1716	tileid texid;
1457	maptex *tex;	1717	maptex *tex;
1458		1718
…		…
1471	tex->smoothtile = self->face2tile [smooth];	1731	tex->smoothtile = self->face2tile [smooth];
1472	tex->smoothlevel = level;	1732	tex->smoothlevel = level;
1473	}	1733	}
1474		1734
1475	void	1735	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)	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)
1477	CODE:	1737	CODE:
1478	{	1738	{
1479	need_texid (self, texid);	1739	need_texid (self, texid);
1480		1740
1481	{	1741	{
…		…
1501	// from transparent color bleeding and ugly wrapping effects.	1761	// from transparent color bleeding and ugly wrapping effects.
1502	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503	}	1763	}
1504		1764
1505	int	1765	int
1506	ox (CFPlus::Map self)	1766	ox (DC::Map self)
1507	ALIAS:	1767	ALIAS:
1508	oy = 1	1768	oy = 1
1509	x = 2	1769	x = 2
1510	y = 3	1770	y = 3
1511	w = 4	1771	w = 4
…		…
1522	}	1782	}
1523	OUTPUT:	1783	OUTPUT:
1524	RETVAL	1784	RETVAL
1525		1785
1526	void	1786	void
1527	scroll (CFPlus::Map self, int dx, int dy)	1787	scroll (DC::Map self, int dx, int dy)
1528	CODE:	1788	CODE:
1529	{	1789	{
1530	if (dx > 0)	1790	if (dx > 0)
1531	map_blank (self, self->x, self->y, dx, self->h);	1791	map_blank (self, self->x, self->y, dx, self->h);
1532	else if (dx < 0)	1792	else if (dx < 0)
…		…
1547	self->rows += MAP_EXTEND_Y;	1807	self->rows += MAP_EXTEND_Y;
1548	self->y += MAP_EXTEND_Y;	1808	self->y += MAP_EXTEND_Y;
1549	}	1809	}
1550	}	1810	}
1551		1811
1552	void	1812	SV *
1553	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1813	map1a_update (DC::Map self, SV *data_, int extmap)
1554	CODE:	1814	CODE:
1555	{	1815	{
1556	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1816	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557	uint8_t *data_end = (uint8_t *)SvEND (data_);	1817	uint8_t *data_end = (uint8_t *)SvEND (data_);
1558	mapcell *cell;	1818	mapcell *cell;
1559	int x, y, flags;	1819	int x, y, z, flags;
		1820	AV *missing = newAV ();
		1821	RETVAL = newRV_noinc ((SV *)missing);
1560		1822
1561	while (data < data_end - 1)	1823	while (data < data_end - 1)
1562	{	1824	{
1563	flags = (data [0] << 8) + data [1]; data += 2;	1825	flags = (data [0] << 8) + data [1]; data += 2;
1564		1826
…		…
1584	uint8_t ext, cmd;	1846	uint8_t ext, cmd;
1585		1847
1586	do	1848	do
1587	{	1849	{
1588	ext = *data++;	1850	ext = *data++;
1589	cmd = ext & 0x3f;	1851	cmd = ext & 0x7f;
1590		1852
1591	if (cmd < 4)	1853	if (cmd < 4)
1592	cell->darkness = 255 - ext * 64 + 1;	1854	cell->darkness = 255 - ext * 64 + 1;
1593	else if (cmd == 5) // health	1855	else if (cmd == 5) // health
1594	{	1856	{
…		…
1597	}	1859	}
1598	else if (cmd == 6) // monster width	1860	else if (cmd == 6) // monster width
1599	cell->stat_width = *data++ + 1;	1861	cell->stat_width = *data++ + 1;
1600	else if (cmd == 0x47)	1862	else if (cmd == 0x47)
1601	{	1863	{
1602	if (*data == 4)	1864	if (*data == 1) cell->player = data [1];
1603	; // 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);
1604		1868
1605	data += *data + 1;	1869	data += *data + 1;
1606	}	1870	}
1607	else if (cmd == 8) // cell flags	1871	else if (cmd == 8) // cell flags
1608	cell->flags = *data++;	1872	cell->flags = *data++;
…		…
1615	}	1879	}
1616	else	1880	else
1617	cell->darkness = *data++ + 1;	1881	cell->darkness = *data++ + 1;
1618	}	1882	}
1619		1883
		1884	for (z = 0; z <= 2; ++z)
1620	if (flags & 4)	1885	if (flags & (4 >> z))
1621	{	1886	{
1622	faceid face = (data [0] << 8) + data [1]; data += 2;	1887	faceid face = (data [0] << 8) + data [1]; data += 2;
1623	need_facenum (self, face);	1888	need_facenum (self, face);
1624	cell->tile [0] = self->face2tile [face];	1889	cell->tile [z] = self->face2tile [face];
		1890
		1891	if (cell->tile [z])
		1892	{
		1893	maptex *tex = self->tex + cell->tile [z];
		1894	if (!tex->name)
		1895	av_push (missing, newSViv (cell->tile [z]));
		1896
		1897	if (tex->smoothtile)
		1898	{
		1899	maptex *smooth = self->tex + tex->smoothtile;
		1900	if (!smooth->name)
		1901	av_push (missing, newSViv (tex->smoothtile));
		1902	}
		1903	}
1625	}	1904	}
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	}	1905	}
1641	else	1906	else
1642	cell->darkness = 0;	1907	CELL_CLEAR (cell);
1643	}	1908	}
1644	}	1909	}
		1910	OUTPUT:
		1911	RETVAL
1645		1912
1646	SV *	1913	SV *
1647	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)
1648	CODE:	1915	CODE:
1649	{	1916	{
1650	int x1, x;	1917	int x1, x;
1651	int y1, y;	1918	int y1, y;
1652	int z;	1919	int z;
…		…
1697	}	1964	}
1698	OUTPUT:	1965	OUTPUT:
1699	RETVAL	1966	RETVAL
1700		1967
1701	void	1968	void
1702	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)
1703	CODE:	1970	CODE:
1704	{	1971	{
		1972	int x, y, z;
		1973
1705	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1974	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706	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
1707	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)
1708	smooth_key skey;	1977	smooth_key skey;
1709	int x, y, z;	1978	int pl_x, pl_y;
1710	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;
1711		1985
1712	// thats current max. sorry.	1986	// thats current max. sorry.
1713	if (sw > 255) sw = 255;	1987	if (sw > 255) sw = 255;
1714	if (sh > 255) sh = 255;	1988	if (sh > 255) sh = 255;
1715		1989
1716	// clear key, in case of extra padding	1990	// clear key, in case of extra padding
1717	memset (&skey, 0, sizeof (skey));	1991	memset (&skey, 0, sizeof (skey));
1718		1992
1719	glColor4ub (255, 255, 255, 255);	1993	memset (&key, 0, sizeof (key));
1720		1994	key.r = 255;
1721	glEnable (GL_BLEND);	1995	key.g = 255;
1722	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1996	key.b = 255;
1723	glEnable (GL_TEXTURE_2D);	1997	key.a = 255;
1724	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1998	key.mode = GL_QUADS;
1725		1999	key.format = GL_T2F_V3F;
1726	glBegin (GL_QUADS);	2000	key.texname = -1;
1727
1728	last_name = 0;
1729		2001
1730	mx += self->x;	2002	mx += self->x;
1731	my += self->y;	2003	my += self->y;
1732		2004
1733	// first pass: determine smooth_max	2005	// first pass: determine smooth_max
…		…
1749	MAX (self->tex [cell->tile [0]].smoothlevel,	2021	MAX (self->tex [cell->tile [0]].smoothlevel,
1750	MAX (self->tex [cell->tile [1]].smoothlevel,	2022	MAX (self->tex [cell->tile [1]].smoothlevel,
1751	self->tex [cell->tile [2]].smoothlevel));	2023	self->tex [cell->tile [2]].smoothlevel));
1752	}	2024	}
1753	}	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);
1754		2030
1755	for (z = 0; z <= 2; z++)	2031	for (z = 0; z <= 2; z++)
1756	{	2032	{
1757	memset (smooth_level, 0, sizeof (smooth_level));	2033	memset (smooth_level, 0, sizeof (smooth_level));
1758		2034
…		…
1771	{	2047	{
1772	maptex tex = self->tex [tile];	2048	maptex tex = self->tex [tile];
1773	int px = (x + 1) * T - tex.w;	2049	int px = (x + 1) * T - tex.w;
1774	int py = (y + 1) * T - tex.h;	2050	int py = (y + 1) * T - tex.h;
1775		2051
1776	// suppressing texture state switches here
1777	// is only moderately effective, but worth the extra effort
1778	if (last_name != tex.name)	2052	if (key.texname != tex.name)
1779	{	2053	{
1780	if (!tex.name)	2054	if (!tex.name)
1781	tex = self->tex [2]; /* missing, replace by noface */	2055	tex = self->tex [2]; /* missing, replace by noface */
1782		2056
1783	glEnd ();	2057	key.texname = tex.name;
1784	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2058	arr = rc_array (rc, &key);
1785	glBegin (GL_QUADS);
1786	}	2059	}
1787		2060
1788	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	2061	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	{	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
1795	if (cell->flags & 1)	2077	if (cell->flags & 1)
1796	{	2078	{
1797	maptex tex = self->tex [1];	2079	maptex tex = self->tex [1];
1798	int px = x * T + T * 2 / 32;	2080	int px = x * T + T * 2 / 32;
1799	int py = y * T - T * 6 / 32;	2081	int py = y * T - T * 6 / 32;
1800		2082
		2083	if (tex.name)
1801	glEnd ();	2084	{
1802	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);
1803	glBegin (GL_QUADS);	2095	}
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	}	2096	}
1810	}	2097	}
1811		2098
1812	// update smooth hash	2099	// update smooth hash
1813	if (tex.smoothtile)	2100	if (tex.smoothtile)
…		…
1849	}	2136	}
1850	}	2137	}
1851	}	2138	}
1852	}	2139	}
1853		2140
		2141	rc_draw (rc);
		2142	rc_clear (rc);
		2143
1854	// go through all smoothlevels, lowest to highest, then draw.	2144	// go through all smoothlevels, lowest to highest, then draw.
1855	// this is basically counting sort	2145	// this is basically counting sort
1856	{	2146	{
1857	int w, b;	2147	int w, b;
1858		2148
		2149	glEnable (GL_TEXTURE_2D);
		2150	glBegin (GL_QUADS);
1859	for (w = 0; w < 256 / 32; ++w)	2151	for (w = 0; w < 256 / 32; ++w)
1860	{	2152	{
1861	uint32_t smask = smooth_level [w];	2153	uint32_t smask = smooth_level [w];
1862	if (smask)	2154	if (smask)
1863	for (b = 0; b < 32; ++b)	2155	for (b = 0; b < 32; ++b)
…		…
1882	int border = bits & 15;	2174	int border = bits & 15;
1883	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2175	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884	float dx = tex.s * .0625f; // 16 images/row	2176	float dx = tex.s * .0625f; // 16 images/row
1885	float dy = tex.t * .5f ; // 2 images/column	2177	float dy = tex.t * .5f ; // 2 images/column
1886		2178
1887	// this time naively avoiding texture state changes
1888	// save gobs of state changes.
1889	if (last_name != tex.name)	2179	if (tex.name)
1890	{	2180	{
		2181	// this time avoiding texture state changes
		2182	// save gobs of state changes.
1891	if (!tex.name)	2183	if (key.texname != tex.name)
1892	continue; // smoothing not yet available	2184	{
1893
1894	glEnd ();	2185	glEnd ();
1895	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2186	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896	glBegin (GL_QUADS);	2187	glBegin (GL_QUADS);
1897	}	2188	}
1898		2189
1899	if (border)	2190	if (border)
1900	{	2191	{
1901	float ox = border * dx;	2192	float ox = border * dx;
1902		2193
1903	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2194	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2195	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2196	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2197	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907	}	2198	}
1908		2199
1909	if (corner)	2200	if (corner)
1910	{	2201	{
1911	float ox = corner * dx;	2202	float ox = corner * dx;
1912		2203
1913	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2204	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2205	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2206	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2207	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2208	}
1917	}	2209	}
1918	}	2210	}
1919	}	2211	}
1920	}	2212	}
1921	}	2213	}
		2214
		2215	glEnd ();
		2216	glDisable (GL_TEXTURE_2D);
		2217	key.texname = -1;
1922	}	2218	}
1923		2219
1924	hv_clear (smooth);	2220	hv_clear (smooth);
1925	}	2221	}
1926		2222
1927	glEnd ();	2223	if (pl_tex.name)
		2224	{
		2225	maptex tex = pl_tex;
		2226	int px = pl_x + sdx;
		2227	int py = pl_y + sdy;
1928		2228
1929	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
1930	glDisable (GL_BLEND);	2240	glDisable (GL_BLEND);
		2241	rc_free (rc);
1931		2242
1932	// top layer: overlays such as the health bar	2243	// top layer: overlays such as the health bar
1933	for (y = 0; y < sh; y++)	2244	for (y = 0; y < sh; y++)
1934	if (0 <= y + my && y + my < self->rows)	2245	if (0 <= y + my && y + my < self->rows)
1935	{	2246	{
…		…
1940	{	2251	{
1941	mapcell *cell = row->col + (x + mx - row->c0);	2252	mapcell *cell = row->col + (x + mx - row->c0);
1942		2253
1943	int px = x * T;	2254	int px = x * T;
1944	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	}
1945		2262
1946	if (cell->stat_hp)	2263	if (cell->stat_hp)
1947	{	2264	{
1948	int width = cell->stat_width * T;	2265	int width = cell->stat_width * T;
1949	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2266	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
1960	}	2277	}
1961	}	2278	}
1962	}	2279	}
1963		2280
1964	void	2281	void
1965	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)
1966	CODE:	2283	CODE:
1967	{	2284	{
1968	static float color[16][3] = {	2285	static float color[16][3] = {
1969	{ 0.00F, 0.00F, 0.00F },	2286	{ 0.00F, 0.00F, 0.00F },
1970	{ 1.00F, 1.00F, 1.00F },	2287	{ 1.00F, 1.00F, 1.00F },
…		…
2020	glDisable (GL_BLEND);	2337	glDisable (GL_BLEND);
2021	glDisable (GL_TEXTURE_2D);	2338	glDisable (GL_TEXTURE_2D);
2022	}	2339	}
2023		2340
2024	void	2341	void
2025	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)
2026	PPCODE:	2343	PPCODE:
2027	{	2344	{
2028	int x, y;	2345	int x, y;
2029	int sw1 = sw + 2;	2346	int sw1 = sw + 2;
2030	int sh1 = sh + 2;	2347	int sh1 = sh + 2;
…		…
2038	SvCUR_set (darkness3_sv, sw34 * sh3);	2355	SvCUR_set (darkness3_sv, sw34 * sh3);
2039		2356
2040	mx += self->x - 1;	2357	mx += self->x - 1;
2041	my += self->y - 1;	2358	my += self->y - 1;
2042		2359
2043	memset (darkness1, 255, sw1 * sh1);	2360	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2044		2361
2045	for (y = 0; y < sh1; y++)	2362	for (y = 0; y < sh1; y++)
2046	if (0 <= y + my && y + my < self->rows)	2363	if (0 <= y + my && y + my < self->rows)
2047	{	2364	{
2048	maprow *row = self->row + (y + my);	2365	maprow *row = self->row + (y + my);
…		…
2101	PUSHs (sv_2mortal (newSViv (sh3)));	2418	PUSHs (sv_2mortal (newSViv (sh3)));
2102	PUSHs (darkness3_sv);	2419	PUSHs (darkness3_sv);
2103	}	2420	}
2104		2421
2105	SV *	2422	SV *
2106	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)
2107	CODE:	2424	CODE:
2108	{	2425	{
2109	int x, y, x1, y1;	2426	int x, y, x1, y1;
2110	SV *data_sv = newSV (w * h * 7 + 5);	2427	SV *data_sv = newSV (w * h * 7 + 5);
2111	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2428	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2168	else	2485	else
2169	*data++ = 0;	2486	*data++ = 0;
2170	}	2487	}
2171	}	2488	}
2172		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	{
2173	SvPOK_only (data_sv);	2493	SvPOK_only (data_sv);
2174	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2494	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2495	}
		2496
2175	RETVAL = data_sv;	2497	RETVAL = data_sv;
2176	}	2498	}
2177	OUTPUT:	2499	OUTPUT:
2178	RETVAL	2500	RETVAL
2179		2501
2180	void	2502	void
2181	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)
2182	PPCODE:	2504	PPCODE:
2183	{	2505	{
2184	int x, y, z;	2506	int x, y, z;
2185	int w, h;	2507	int w, h;
2186	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;
2187		2519
2188	if (*data++ != 0)	2520	if (*data++ != 0)
2189	return; /* version mismatch */	2521	XSRETURN_EMPTY; /* version mismatch */
2190		2522
2191	w = *data++ << 8; w |= *data++;	2523	w = *data++ << 8; w |= *data++;
2192	h = *data++ << 8; h |= *data++;	2524	h = *data++ << 8; h |= *data++;
2193		2525
2194	// 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
…		…
2206	{	2538	{
2207	maprow *row = map_get_row (self, y);	2539	maprow *row = map_get_row (self, y);
2208		2540
2209	for (x = x0; x < x1; x++)	2541	for (x = x0; x < x1; x++)
2210	{	2542	{
		2543	uint8_t flags;
		2544
		2545	if (data + 7 >= end)
		2546	XSRETURN_EMPTY;
		2547
2211	uint8_t flags = *data++;	2548	flags = *data++;
2212		2549
2213	if (flags)	2550	if (flags)
2214	{	2551	{
2215	mapcell *cell = row_get_cell (row, x);	2552	mapcell *cell = row_get_cell (row, x);
2216	tileid tile[3] = { 0, 0, 0 };	2553	tileid tile[3] = { 0, 0, 0 };
…		…
2219	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2556	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2220	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2557	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2221		2558
2222	if (cell->darkness == 0)	2559	if (cell->darkness == 0)
2223	{	2560	{
2224	cell->darkness = 0;	2561	/*cell->darkness = 0;*/
		2562	EXTEND (SP, 3);
2225		2563
2226	for (z = 0; z <= 2; z++)	2564	for (z = 0; z <= 2; z++)
2227	{	2565	{
2228	tileid t = tile [z];	2566	tileid t = tile [z];
2229		2567
2230	if (t >= self->texs || (t && !self->tex [t].name))	2568	if (t >= self->texs || (t && !self->tex [t].name))
2231	{	2569	{
2232	XPUSHs (sv_2mortal (newSViv (t)));	2570	PUSHs (sv_2mortal (newSViv (t)));
2233	need_texid (self, t);	2571	need_texid (self, t);
2234	}	2572	}
2235		2573
2236	cell->tile [z] = t;	2574	cell->tile [z] = t;
2237	}	2575	}
…		…
2239	}	2577	}
2240	}	2578	}
2241	}	2579	}
2242	}	2580	}
2243		2581
2244	MODULE = CFPlus PACKAGE = CFPlus::RW	2582	MODULE = Deliantra::Client PACKAGE = DC::RW
2245		2583
2246	CFPlus::RW	2584	DC::RW
2247	new (SV *class, SV *data_sv)	2585	new (SV *class, SV *data_sv)
2248	CODE:	2586	CODE:
2249	{	2587	{
2250	STRLEN datalen;	2588	STRLEN datalen;
2251	char *data = SvPVbyte (data_sv, datalen);	2589	char *data = SvPVbyte (data_sv, datalen);
…		…
2253	RETVAL = SDL_RWFromConstMem (data, datalen);	2591	RETVAL = SDL_RWFromConstMem (data, datalen);
2254	}	2592	}
2255	OUTPUT:	2593	OUTPUT:
2256	RETVAL	2594	RETVAL
2257		2595
2258	CFPlus::RW	2596	DC::RW
2259	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")
2260	CODE:	2598	CODE:
2261	RETVAL = SDL_RWFromFile (path, mode);	2599	RETVAL = SDL_RWFromFile (path, mode);
2262	OUTPUT:	2600	OUTPUT:
2263	RETVAL	2601	RETVAL
2264		2602
		2603	# fails on win32:
		2604	# dc.xs(2268) : error C2059: syntax error : '('
2265	void	2605	#void
2266	close (CFPlus::RW self)	2606	#close (DC::RW self)
2267	CODE:	2607	# CODE:
2268	SDL_RWclose (self);	2608	# (self->(close)) (self);
2269		2609
2270	MODULE = CFPlus PACKAGE = CFPlus::Channel	2610	MODULE = Deliantra::Client PACKAGE = DC::Channel
2271		2611
2272	PROTOTYPES: DISABLE	2612	PROTOTYPES: DISABLE
2273		2613
2274	CFPlus::Channel	2614	DC::Channel
2275	find ()	2615	find ()
2276	CODE:	2616	CODE:
2277	{	2617	{
2278	RETVAL = Mix_GroupAvailable (-1);	2618	RETVAL = Mix_GroupAvailable (-1);
2279		2619
…		…
2292	}	2632	}
2293	OUTPUT:	2633	OUTPUT:
2294	RETVAL	2634	RETVAL
2295		2635
2296	void	2636	void
2297	halt (CFPlus::Channel self)	2637	halt (DC::Channel self)
2298	CODE:	2638	CODE:
2299	Mix_HaltChannel (self);	2639	Mix_HaltChannel (self);
2300		2640
2301	void	2641	void
2302	expire (CFPlus::Channel self, int ticks = -1)	2642	expire (DC::Channel self, int ticks = -1)
2303	CODE:	2643	CODE:
2304	Mix_ExpireChannel (self, ticks);	2644	Mix_ExpireChannel (self, ticks);
2305		2645
2306	void	2646	void
2307	fade_out (CFPlus::Channel self, int ticks = -1)	2647	fade_out (DC::Channel self, int ticks = -1)
2308	CODE:	2648	CODE:
2309	Mix_FadeOutChannel (self, ticks);	2649	Mix_FadeOutChannel (self, ticks);
2310		2650
2311	int	2651	int
2312	volume (CFPlus::Channel self, int volume)	2652	volume (DC::Channel self, int volume)
2313	CODE:	2653	CODE:
2314	RETVAL = Mix_Volume (self, volume);	2654	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2315	OUTPUT:	2655	OUTPUT:
2316	RETVAL	2656	RETVAL
2317		2657
2318	void	2658	void
2319	unregister_all_effects (CFPlus::Channel self)	2659	unregister_all_effects (DC::Channel self)
2320	CODE:	2660	CODE:
2321	Mix_UnregisterAllEffects (self);	2661	Mix_UnregisterAllEffects (self);
2322		2662
2323	void	2663	void
2324	set_panning (CFPlus::Channel self, int left, int right)	2664	set_panning (DC::Channel self, int left, int right)
2325	CODE:	2665	CODE:
		2666	left = CLAMP (left , 0, 255);
		2667	right = CLAMP (right, 0, 255);
2326	Mix_SetPanning (self, left, right);	2668	Mix_SetPanning (self, left, right);
2327		2669
2328	void	2670	void
2329	set_distance (CFPlus::Channel self, int distance)	2671	set_distance (DC::Channel self, int distance)
2330	CODE:	2672	CODE:
2331	Mix_SetDistance (self, distance);	2673	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2332		2674
2333	void	2675	void
2334	set_position (CFPlus::Channel self, int angle, int distance)	2676	set_position (DC::Channel self, int angle, int distance)
2335	CODE:	2677	CODE:
		2678
		2679	void
		2680	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2681	CODE:
		2682	{
		2683	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2684	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2336	Mix_SetPosition (self, angle, distance);	2685	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2686	}
2337		2687
2338	void	2688	void
2339	set_reverse_stereo (CFPlus::Channel self, int flip)	2689	set_reverse_stereo (DC::Channel self, int flip)
2340	CODE:	2690	CODE:
2341	Mix_SetReverseStereo (self, flip);	2691	Mix_SetReverseStereo (self, flip);
2342		2692
2343	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2693	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2344		2694
2345	PROTOTYPES: DISABLE	2695	PROTOTYPES: DISABLE
2346		2696
2347	CFPlus::MixChunk	2697	DC::MixChunk
2348	new (SV *class, CFPlus::RW rwops)	2698	new (SV *class, DC::RW rwops)
2349	CODE:	2699	CODE:
2350	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2700	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2351	OUTPUT:	2701	OUTPUT:
2352	RETVAL	2702	RETVAL
2353		2703
2354	void	2704	void
2355	DESTROY (CFPlus::MixChunk self)	2705	DESTROY (DC::MixChunk self)
2356	CODE:	2706	CODE:
2357	Mix_FreeChunk (self);	2707	Mix_FreeChunk (self);
2358		2708
2359	int	2709	int
2360	volume (CFPlus::MixChunk self, int volume = -1)	2710	volume (DC::MixChunk self, int volume = -1)
2361	CODE:	2711	CODE:
		2712	if (items > 1)
		2713	volume = CLAMP (volume, 0, 128);
2362	RETVAL = Mix_VolumeChunk (self, volume);	2714	RETVAL = Mix_VolumeChunk (self, volume);
2363	OUTPUT:	2715	OUTPUT:
2364	RETVAL	2716	RETVAL
2365		2717
2366	CFPlus::Channel	2718	DC::Channel
2367	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)
2368	CODE:	2720	CODE:
2369	{	2721	{
2370	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2722	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2371		2723
2372	if (RETVAL < 0)	2724	if (RETVAL < 0)
…		…
2379	}	2731	}
2380	}	2732	}
2381	OUTPUT:	2733	OUTPUT:
2382	RETVAL	2734	RETVAL
2383		2735
2384	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2736	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2385		2737
2386	int	2738	int
2387	volume (int volume = -1)	2739	volume (int volume = -1)
2388	PROTOTYPE: ;$	2740	PROTOTYPE: ;$
2389	CODE:	2741	CODE:
		2742	if (items > 0)
		2743	volume = CLAMP (volume, 0, 128);
2390	RETVAL = Mix_VolumeMusic (volume);	2744	RETVAL = Mix_VolumeMusic (volume);
2391	OUTPUT:	2745	OUTPUT:
2392	RETVAL	2746	RETVAL
2393		2747
2394	void	2748	void
…		…
2399	void	2753	void
2400	halt ()	2754	halt ()
2401	CODE:	2755	CODE:
2402	Mix_HaltMusic ();	2756	Mix_HaltMusic ();
2403		2757
2404	CFPlus::MixMusic	2758	DC::MixMusic
2405	new (SV *class, CFPlus::RW rwops)	2759	new (SV *class, DC::RW rwops)
2406	CODE:	2760	CODE:
2407	RETVAL = Mix_LoadMUS_RW (rwops);	2761	RETVAL = Mix_LoadMUS_RW (rwops);
2408	OUTPUT:	2762	OUTPUT:
2409	RETVAL	2763	RETVAL
2410		2764
2411	void	2765	void
2412	DESTROY (CFPlus::MixMusic self)	2766	DESTROY (DC::MixMusic self)
2413	CODE:	2767	CODE:
2414	Mix_FreeMusic (self);	2768	Mix_FreeMusic (self);
2415		2769
2416	int	2770	int
2417	play (CFPlus::MixMusic self, int loops = -1)	2771	play (DC::MixMusic self, int loops = -1)
2418	CODE:	2772	CODE:
2419	RETVAL = Mix_PlayMusic (self, loops);	2773	RETVAL = Mix_PlayMusic (self, loops);
2420	OUTPUT:	2774	OUTPUT:
2421	RETVAL	2775	RETVAL
2422		2776
2423	void	2777	void
2424	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)
2425	CODE:	2779	CODE:
2426	Mix_FadeInMusicPos (self, loops, ms, position);	2780	Mix_FadeInMusicPos (self, loops, ms, position);
2427		2781
2428	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2782	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2429		2783
2430	PROTOTYPES: ENABLE	2784	PROTOTYPES: ENABLE
2431		2785
2432	BOOT:	2786	BOOT:
2433	{	2787	{
2434	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2788	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2435	static const struct {	2789	static const struct {
2436	const char *name;	2790	const char *name;
2437	IV iv;	2791	IV iv;
2438	} *civ, const_iv[] = {	2792	} *civ, const_iv[] = {
2439	# define const_iv(name) { # name, (IV)name }	2793	# define const_iv(name) { # name, (IV)name }
…		…
2474	const_iv (GL_INTENSITY),	2828	const_iv (GL_INTENSITY),
2475	const_iv (GL_LUMINANCE),	2829	const_iv (GL_LUMINANCE),
2476	const_iv (GL_LUMINANCE_ALPHA),	2830	const_iv (GL_LUMINANCE_ALPHA),
2477	const_iv (GL_FLOAT),	2831	const_iv (GL_FLOAT),
2478	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),
2479	const_iv (GL_COMPILE),	2839	const_iv (GL_COMPILE),
2480	const_iv (GL_PROXY_TEXTURE_1D),	2840	const_iv (GL_PROXY_TEXTURE_1D),
2481	const_iv (GL_PROXY_TEXTURE_2D),	2841	const_iv (GL_PROXY_TEXTURE_2D),
2482	const_iv (GL_TEXTURE_1D),	2842	const_iv (GL_TEXTURE_1D),
2483	const_iv (GL_TEXTURE_2D),	2843	const_iv (GL_TEXTURE_2D),
…		…
2522	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2882	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2523	const_iv (GL_POINT_SMOOTH_HINT),	2883	const_iv (GL_POINT_SMOOTH_HINT),
2524	const_iv (GL_LINE_SMOOTH_HINT),	2884	const_iv (GL_LINE_SMOOTH_HINT),
2525	const_iv (GL_POLYGON_SMOOTH_HINT),	2885	const_iv (GL_POLYGON_SMOOTH_HINT),
2526	const_iv (GL_GENERATE_MIPMAP_HINT),	2886	const_iv (GL_GENERATE_MIPMAP_HINT),
		2887	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2527	const_iv (GL_FASTEST),	2888	const_iv (GL_FASTEST),
2528	const_iv (GL_DONT_CARE),	2889	const_iv (GL_DONT_CARE),
2529	const_iv (GL_NICEST),	2890	const_iv (GL_NICEST),
2530	const_iv (GL_V2F),	2891	const_iv (GL_V2F),
2531	const_iv (GL_V3F),	2892	const_iv (GL_V3F),
…		…
2539		2900
2540	texture_av = newAV ();	2901	texture_av = newAV ();
2541	AvREAL_off (texture_av);	2902	AvREAL_off (texture_av);
2542	}	2903	}
2543		2904
		2905	void
		2906	disable_GL_EXT_blend_func_separate ()
		2907	CODE:
		2908	gl.BlendFuncSeparate = 0;
		2909	gl.BlendFuncSeparateEXT = 0;
		2910
2544	char *	2911	char *
2545	gl_vendor ()	2912	gl_vendor ()
2546	CODE:	2913	CODE:
2547	RETVAL = (char *)glGetString (GL_VENDOR);	2914	RETVAL = (char *)glGetString (GL_VENDOR);
2548	OUTPUT:	2915	OUTPUT:
…		…
2640	void glRotate (float angle, float x, float y, float z)	3007	void glRotate (float angle, float x, float y, float z)
2641	CODE:	3008	CODE:
2642	glRotatef (angle, x, y, z);	3009	glRotatef (angle, x, y, z);
2643		3010
2644	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: @
2645	ALIAS:	3013	ALIAS:
2646	glColor_premultiply = 1	3014	glColor_premultiply = 1
2647	CODE:	3015	CODE:
2648	if (ix)	3016	if (ix)
2649	{	3017	{
…		…
2669		3037
2670	void glRect (float x1, float y1, float x2, float y2)	3038	void glRect (float x1, float y1, float x2, float y2)
2671	CODE:	3039	CODE:
2672	glRectf (x1, y1, x2, y2);	3040	glRectf (x1, y1, x2, y2);
2673		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
2674	PROTOTYPES: ENABLE	3051	PROTOTYPES: ENABLE
2675		3052
2676	void glBegin (int mode)	3053	void glBegin (int mode)
2677		3054
2678	void glEnd ()	3055	void glEnd ()
…		…
2710	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)
2711	CODE:	3088	CODE:
2712	if (gl.SeparableFilter2D)	3089	if (gl.SeparableFilter2D)
2713	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3090	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2714		3091
2715	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)
2716		3093
2717	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)
2718		3095
2719	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)
2720		3097
…		…
2746		3123
2747	void glEndList ()	3124	void glEndList ()
2748		3125
2749	void glCallList (int list)	3126	void glCallList (int list)
2750		3127
2751	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3128	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2752		3129
2753	PROTOTYPES: DISABLE	3130	PROTOTYPES: DISABLE
2754		3131
2755	void	3132	void
2756	find_widget (SV *self, NV x, NV y)	3133	find_widget (SV *self, NV x, NV y)
…		…
2760	XPUSHs (self);	3137	XPUSHs (self);
2761	}	3138	}
2762		3139
2763	BOOT:	3140	BOOT:
2764	{	3141	{
2765	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3142	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2766		3143
2767	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);
2768	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);
2769	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);
2770	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);
2771	}	3148	}
2772		3149
2773	void	3150	void
2774	draw (SV *self)	3151	draw (SV *self)
2775	CODE:	3152	CODE:
…		…
2779	NV x, y, w, h;	3156	NV x, y, w, h;
2780	SV *draw_x_sv = GvSV (draw_x_gv);	3157	SV *draw_x_sv = GvSV (draw_x_gv);
2781	SV *draw_y_sv = GvSV (draw_y_gv);	3158	SV *draw_y_sv = GvSV (draw_y_gv);
2782	SV *draw_w_sv = GvSV (draw_w_gv);	3159	SV *draw_w_sv = GvSV (draw_w_gv);
2783	SV *draw_h_sv = GvSV (draw_h_gv);	3160	SV *draw_h_sv = GvSV (draw_h_gv);
2784	SV *hover;
2785	double draw_x, draw_y, draw_w, draw_h;	3161	double draw_x, draw_y;
2786		3162
2787	if (!SvROK (self))	3163	if (!SvROK (self))
2788	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3164	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2789		3165
2790	hv = (HV *)SvRV (self);	3166	hv = (HV *)SvRV (self);
2791		3167
2792	if (SvTYPE (hv) != SVt_PVHV)	3168	if (SvTYPE (hv) != SVt_PVHV)
2793	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3169	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2794		3170
2795	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.;
2796	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.;
2797		3173
2798	if (!h || !w)	3174	if (!h || !w)
…		…
2818	{	3194	{
2819	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3195	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2820		3196
2821	if (svp && SvTRUE (*svp))	3197	if (svp && SvTRUE (*svp))
2822	{	3198	{
2823	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);
2824	glEnable (GL_BLEND);	3200	glEnable (GL_BLEND);
2825	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3201	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2826	glBegin (GL_QUADS);	3202	glBegin (GL_QUADS);
2827	glVertex2f (0, 0);	3203	glVertex2f (0, 0);
2828	glVertex2f (w, 0);	3204	glVertex2f (w, 0);
…		…
2831	glEnd ();	3207	glEnd ();
2832	glDisable (GL_BLEND);	3208	glDisable (GL_BLEND);
2833	}	3209	}
2834	}	3210	}
2835	#if 0	3211	#if 0
2836	if ($ENV{CFPLUS_DEBUG} & 1) {	3212	// draw borders, for debugging
2837	glPushMatrix;	3213	glPushMatrix ();
2838	glColor 1, 1, 0, 1;	3214	glColor4f (1., 1., 0., 1.);
2839	glTranslate 0.375, 0.375;	3215	glTranslatef (.5, .5, 0.);
2840	glBegin GL_LINE_LOOP;	3216	glBegin (GL_LINE_LOOP);
2841	glVertex 0 , 0;	3217	glVertex2f (0 , 0);
2842	glVertex $self->{w} - 1, 0;	3218	glVertex2f (w - 1, 0);
2843	glVertex $self->{w} - 1, $self->{h} - 1;	3219	glVertex2f (w - 1, h - 1);
2844	glVertex 0 , $self->{h} - 1;	3220	glVertex2f (0 , h - 1);
2845	glEnd;	3221	glEnd ();
2846	glPopMatrix;	3222	glPopMatrix ();
2847	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2848	}
2849	#endif	3223	#endif
2850	PUSHMARK (SP);	3224	PUSHMARK (SP);
2851	XPUSHs (self);	3225	XPUSHs (self);
2852	PUTBACK;	3226	PUTBACK;
2853	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