[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.238 by root, Sat Nov 3 12:08:43 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 2008 UTC

…		…
46		46
47	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
48		48
49	#include <pango/pango.h>	49	#include <pango/pango.h>
50		50
		51	#ifndef PANGO_VERSION_CHECK
		52	# define PANGO_VERSION_CHECK(a,b,c) 0
		53	#endif
		54
		55	#if !PANGO_VERSION_CHECK (1, 15, 2)
		56	# define pango_layout_get_line_readonly pango_layout_get_line
		57	# define pango_layout_get_lines_readonly pango_layout_get_lines
		58	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		59	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		60	#endif
		61
51	#ifndef _WIN32	62	#ifndef _WIN32
52	# include <sys/types.h>	63	# include <sys/types.h>
53	# include <sys/socket.h>	64	# include <sys/socket.h>
54	# include <netinet/in.h>	65	# include <netinet/in.h>
55	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
56	# include <inttypes.h>	67	# include <inttypes.h>
57	#endif	68	#endif
58		69
		70	#if __GNUC__ >= 4
		71	# define expect(expr,value) __builtin_expect ((expr),(value))
		72	#else
		73	# define expect(expr,value) (expr)
		74	#endif
		75
		76	#define expect_false(expr) expect ((expr) != 0, 0)
		77	#define expect_true(expr) expect ((expr) != 0, 1)
		78
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		80
61	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
62		82
63	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
65		85
66	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
67		87
68	#if 0	88	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
70	#else
71	# define PARACHUTE 0
72	#endif
73		90
74	static AV *texture_av;	91	static AV *texture_av;
75		92
76	static struct	93	static struct
77	{	94	{
…		…
120		137
121	#include "pango-font.c"	138	#include "pango-font.c"
122	#include "pango-fontmap.c"	139	#include "pango-fontmap.c"
123	#include "pango-render.c"	140	#include "pango-render.c"
124		141
125	typedef IV CFPlus__Channel;	142	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	143	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	144	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	145	typedef Mix_Music *DC__MixMusic;
129		146
130	typedef PangoFontDescription *CFPlus__Font;	147	typedef PangoFontDescription *DC__Font;
131		148
132	static int	149	static int
133	shape_attr_p (PangoLayoutRun *run)	150	shape_attr_p (PangoLayoutRun *run)
134	{	151	{
135	GSList *attrs = run->item->analysis.extra_attrs;	152	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		166
150	typedef struct cf_layout {	167	typedef struct cf_layout {
151	PangoLayout *pl;	168	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	169	float r, g, b, a; // default color for rgba mode
153	int base_height;	170	int base_height;
154	CFPlus__Font font;	171	DC__Font font;
155	rc_t *rc;	172	rc_t *rc;
156	} *CFPlus__Layout;	173	} *DC__Layout;
157		174
158	static CFPlus__Font default_font;	175	static DC__Font default_font;
159	static PangoContext *opengl_context;	176	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	177	static PangoFontMap *opengl_fontmap;
161		178
162	static void	179	static void
163	substitute_func (FcPattern *pattern, gpointer data)	180	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	185	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	186	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	187	}
171		188
172	static void	189	static void
173	layout_update_font (CFPlus__Layout self)	190	layout_update_font (DC__Layout self)
174	{	191	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	192	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
177	*/	194	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
179		196
180	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		199
183	pango_layout_set_font_description (self->pl, font);	200	pango_layout_set_font_description (self->pl, font);
184	}	201	}
185		202
186	static void	203	static void
187	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	204	layout_get_pixel_size (DC__Layout self, int w, int h)
188	{	205	{
189	PangoRectangle rect;	206	PangoRectangle rect;
190		207
191	// get_pixel_* wrongly rounds down	208	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	209	pango_layout_get_extents (self->pl, 0, &rect);
…		…
231	int faces; tileid *face2tile; // [faceid]	248	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	249	int texs; maptex *tex; // [tileid]
233		250
234	int32_t rows;	251	int32_t rows;
235	maprow *row;	252	maprow *row;
236	} *CFPlus__Map;	253	} *DC__Map;
237		254
238	static char *	255	static char *
239	prepend (char *ptr, int sze, int inc)	256	prepend (char *ptr, int sze, int inc)
240	{	257	{
241	char *p;	258	char *p;
…		…
279	self->texs *= 2;	296	self->texs *= 2;
280	}	297	}
281	}	298	}
282		299
283	static maprow *	300	static maprow *
284	map_get_row (CFPlus__Map self, int y)	301	map_get_row (DC__Map self, int y)
285	{	302	{
286	if (0 > y)	303	if (0 > y)
287	{	304	{
288	int extend = - y + MAP_EXTEND_Y;	305	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	306	Prepend (maprow, self->row, self->rows, extend);
…		…
327		344
328	return row->col + (x - row->c0);	345	return row->col + (x - row->c0);
329	}	346	}
330		347
331	static mapcell *	348	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	349	map_get_cell (DC__Map self, int x, int y)
333	{	350	{
334	return row_get_cell (map_get_row (self, y), x);	351	return row_get_cell (map_get_row (self, y), x);
335	}	352	}
336		353
337	static void	354	static void
338	map_clear (CFPlus__Map self)	355	map_clear (DC__Map self)
339	{	356	{
340	int r;	357	int r;
341		358
342	for (r = 0; r < self->rows; r++)	359	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	360	Safefree (self->row[r].col);
…		…
350	self->oy = 0;	367	self->oy = 0;
351	self->row = 0;	368	self->row = 0;
352	self->rows = 0;	369	self->rows = 0;
353	}	370	}
354		371
		372	#define CELL_CLEAR(cell) \
		373	do { \
		374	(cell)->darkness = 0; \
		375	(cell)->stat_hp = 0; \
		376	(cell)->flags = 0; \
		377	(cell)->player = 0; \
		378	} while (0)
		379
355	static void	380	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	381	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	382	{
358	int x, y;	383	int x, y;
359	maprow *row;	384	maprow *row;
360	mapcell *cell;	385	mapcell *cell;
361		386
…		…
373	if (x >= row->c1)	398	if (x >= row->c1)
374	break;	399	break;
375		400
376	cell = row->col + x - row->c0;	401	cell = row->col + x - row->c0;
377		402
378	cell->darkness = 0;	403	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	404	}
383	}	405	}
384	}	406	}
385		407
386	typedef struct {	408	typedef struct {
…		…
498	return 0;	520	return 0;
499		521
500	return 1;	522	return 1;
501	}	523	}
502		524
503	MODULE = CFPlus PACKAGE = CFPlus	525	MODULE = Deliantra::Client PACKAGE = DC
504		526
505	PROTOTYPES: ENABLE	527	PROTOTYPES: ENABLE
506		528
507	BOOT:	529	BOOT:
508	{	530	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	531	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	532	static const struct {
511	const char *name;	533	const char *name;
512	IV iv;	534	IV iv;
513	} *civ, const_iv[] = {	535	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	536	# define const_iv(name) { # name, (IV)name }
…		…
621	const_iv (KMOD_NUM),	643	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	644	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	645	const_iv (KMOD_MODE),
624		646
625	const_iv (MIX_DEFAULT_FORMAT),	647	const_iv (MIX_DEFAULT_FORMAT),
		648
		649	const_iv (SDL_INIT_TIMER),
		650	const_iv (SDL_INIT_AUDIO),
		651	const_iv (SDL_INIT_VIDEO),
		652	const_iv (SDL_INIT_CDROM),
		653	const_iv (SDL_INIT_JOYSTICK),
		654	const_iv (SDL_INIT_EVERYTHING),
		655	const_iv (SDL_INIT_NOPARACHUTE),
		656	const_iv (SDL_INIT_EVENTTHREAD),
		657
		658	const_iv (SDL_GL_RED_SIZE),
		659	const_iv (SDL_GL_GREEN_SIZE),
		660	const_iv (SDL_GL_BLUE_SIZE),
		661	const_iv (SDL_GL_ALPHA_SIZE),
		662	const_iv (SDL_GL_DOUBLEBUFFER),
		663	const_iv (SDL_GL_BUFFER_SIZE),
		664	const_iv (SDL_GL_DEPTH_SIZE),
		665	const_iv (SDL_GL_STENCIL_SIZE),
		666	const_iv (SDL_GL_ACCUM_RED_SIZE),
		667	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		668	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		669	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		670	const_iv (SDL_GL_STEREO),
		671	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		672	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		673	const_iv (SDL_GL_ACCELERATED_VISUAL),
		674	const_iv (SDL_GL_SWAP_CONTROL)
626	# undef const_iv	675	# undef const_iv
627	};	676	};
628		677
629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	678	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	679	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
659	CODE:	708	CODE:
660	{	709	{
661	opengl_fontmap = pango_opengl_font_map_new ();	710	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	711	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	712	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		713	/pango_context_set_font_description (opengl_context, default_font);/
		714	#if PANGO_VERSION_CHECK (1, 15, 2)
		715	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		716	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		717	#endif
664	}	718	}
665		719
666	char *
667	SDL_GetError ()	720	char *SDL_GetError ()
668		721
669	int	722	int SDL_Init (U32 flags)
670	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
671		723
672	void	724	int SDL_InitSubSystem (U32 flags)
		725
		726	void SDL_QuitSubSystem (U32 flags)
		727
673	SDL_Quit ()	728	void SDL_Quit ()
		729
		730	int SDL_GL_SetAttribute (int attr, int value)
		731
		732	int SDL_GL_GetAttribute (int attr)
		733	CODE:
		734	if (SDL_GL_GetAttribute (attr, &RETVAL))
		735	XSRETURN_UNDEF;
		736	OUTPUT:
		737	RETVAL
674		738
675	void	739	void
676	SDL_ListModes (int rgb, int alpha)	740	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	741	PPCODE:
678	{	742	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	754	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	755	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	756	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		757
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	758	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695	#if SDL_VERSION_ATLEAST(1,2,10)
696	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	759	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		760
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	761	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		762
702	if (m && m != (SDL_Rect **)-1)	763	if (m && m != (SDL_Rect **)-1)
703	while (*m)	764	while (*m)
704	{	765	{
705	if ((m)->w >= 800 && (m)->h >= 600)	766	if ((m)->w >= 400 && (m)->h >= 300)
706	{	767	{
707	AV *av = newAV ();	768	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	769	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	770	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	771	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	813	SDL_GetKeyName (int sym)
753		814
754	int	815	int
755	SDL_GetAppState ()	816	SDL_GetAppState ()
756		817
		818	int
		819	SDL_GetModState ()
		820
757	void	821	void
758	poll_events ()	822	poll_events ()
759	PPCODE:	823	PPCODE:
760	{	824	{
761	SDL_Event ev;	825	SDL_Event ev;
…		…
770	{	834	{
771	case SDL_KEYDOWN:	835	case SDL_KEYDOWN:
772	case SDL_KEYUP:	836	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	837	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	838	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	839	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	840	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	841	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	842	break;
779		843
780	case SDL_ACTIVEEVENT:	844	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	845	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	863	x = ev.motion.x;
800	y = ev.motion.y;	864	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	865	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	866	}
803		867
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	868	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	869	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	870	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	871	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	872	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	873	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	874	}
811	break;	875	break;
812		876
813	case SDL_MOUSEBUTTONDOWN:	877	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	878	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	879	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		880
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	881	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	882	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	883	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	884	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	889	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	890	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	891	break;
828	}	892	}
829		893
830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	894	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831	}	895	}
832	}	896	}
833		897
834	int	898	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	899	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
894	}	958	}
895	}	959	}
896	#endif	960	#endif
897	}	961	}
898		962
899	void	963	int
900	add_font (char *file)	964	add_font (char *file)
901	CODE:	965	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	966	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		967	OUTPUT:
		968	RETVAL
903		969
904	void	970	void
905	load_image_inline (SV *image_)	971	load_image_inline (SV *image_)
906	ALIAS:	972	ALIAS:
907	load_image_file = 1	973	load_image_file = 1
…		…
993	void	1059	void
994	error (char *message)	1060	error (char *message)
995	CODE:	1061	CODE:
996	fprintf (stderr, "ERROR: %s\n", message);	1062	fprintf (stderr, "ERROR: %s\n", message);
997	#ifdef _WIN32	1063	#ifdef _WIN32
998	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1064	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
999	#endif	1065	#endif
1000		1066
1001	void	1067	void
1002	fatal (char *message)	1068	fatal (char *message)
1003	CODE:	1069	CODE:
1004	fprintf (stderr, "FATAL: %s\n", message);	1070	fprintf (stderr, "FATAL: %s\n", message);
1005	#ifdef _WIN32	1071	#ifdef _WIN32
1006	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1072	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
1007	#endif	1073	#endif
1008	_exit (1);	1074	_exit (1);
1009		1075
1010	void	1076	void
1011	_exit (int retval = 0)	1077	_exit (int retval = 0)
…		…
1023	#if DEBUG	1089	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1090	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1091	#endif
1026	}	1092	}
1027		1093
1028	MODULE = CFPlus PACKAGE = CFPlus::Font	1094	MODULE = Deliantra::Client PACKAGE = DC::Font
1029		1095
1030	PROTOTYPES: DISABLE	1096	PROTOTYPES: DISABLE
1031		1097
1032	CFPlus::Font	1098	DC::Font
1033	new_from_file (SV class, char path, int id = 0)	1099	new_from_file (SV class, char path, int id = 0)
1034	CODE:	1100	CODE:
1035	{	1101	{
1036	int count;	1102	int count;
1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1103	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1040	}	1106	}
1041	OUTPUT:	1107	OUTPUT:
1042	RETVAL	1108	RETVAL
1043		1109
1044	void	1110	void
1045	DESTROY (CFPlus::Font self)	1111	DESTROY (DC::Font self)
1046	CODE:	1112	CODE:
1047	pango_font_description_free (self);	1113	pango_font_description_free (self);
1048		1114
1049	void	1115	void
1050	make_default (CFPlus::Font self)	1116	make_default (DC::Font self)
1051	PROTOTYPE: $	1117	PROTOTYPE: $
1052	CODE:	1118	CODE:
1053	default_font = self;	1119	default_font = self;
1054		1120
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1121	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1122
1057	PROTOTYPES: DISABLE	1123	PROTOTYPES: DISABLE
1058		1124
1059	void	1125	void
1060	reset_glyph_cache ()	1126	glyph_cache_backup ()
1061	PROTOTYPE:	1127	PROTOTYPE:
1062	CODE:	1128	CODE:
		1129	tc_backup ();
		1130
		1131	void
		1132	glyph_cache_restore ()
		1133	PROTOTYPE:
		1134	CODE:
1063	tc_clear ();	1135	tc_restore ();
1064		1136
1065	CFPlus::Layout	1137	DC::Layout
1066	new (SV *class)	1138	new (SV *class)
1067	CODE:	1139	CODE:
1068	New (0, RETVAL, 1, struct cf_layout);	1140	New (0, RETVAL, 1, struct cf_layout);
1069		1141
1070	RETVAL->pl = pango_layout_new (opengl_context);	1142	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1080	layout_update_font (RETVAL);	1152	layout_update_font (RETVAL);
1081	OUTPUT:	1153	OUTPUT:
1082	RETVAL	1154	RETVAL
1083		1155
1084	void	1156	void
1085	DESTROY (CFPlus::Layout self)	1157	DESTROY (DC::Layout self)
1086	CODE:	1158	CODE:
1087	g_object_unref (self->pl);	1159	g_object_unref (self->pl);
1088	rc_free (self->rc);	1160	rc_free (self->rc);
1089	Safefree (self);	1161	Safefree (self);
1090		1162
1091	void	1163	void
1092	set_text (CFPlus::Layout self, SV *text_)	1164	set_text (DC::Layout self, SV *text_)
1093	CODE:	1165	CODE:
1094	{	1166	{
1095	STRLEN textlen;	1167	STRLEN textlen;
1096	char *text = SvPVutf8 (text_, textlen);	1168	char *text = SvPVutf8 (text_, textlen);
1097		1169
1098	pango_layout_set_text (self->pl, text, textlen);	1170	pango_layout_set_text (self->pl, text, textlen);
1099	}	1171	}
1100		1172
1101	void	1173	void
1102	set_markup (CFPlus::Layout self, SV *text_)	1174	set_markup (DC::Layout self, SV *text_)
1103	CODE:	1175	CODE:
1104	{	1176	{
1105	STRLEN textlen;	1177	STRLEN textlen;
1106	char *text = SvPVutf8 (text_, textlen);	1178	char *text = SvPVutf8 (text_, textlen);
1107		1179
1108	pango_layout_set_markup (self->pl, text, textlen);	1180	pango_layout_set_markup (self->pl, text, textlen);
1109	}	1181	}
1110		1182
1111	void	1183	void
1112	set_shapes (CFPlus::Layout self, ...)	1184	set_shapes (DC::Layout self, ...)
1113	CODE:	1185	CODE:
1114	{	1186	{
1115	PangoAttrList *attrs = 0;	1187	PangoAttrList *attrs = 0;
1116	const char *text = pango_layout_get_text (self->pl);	1188	const char *text = pango_layout_get_text (self->pl);
1117	const char *pos = text;	1189	const char *pos = text;
…		…
1152	if (attrs)	1224	if (attrs)
1153	pango_layout_set_attributes (self->pl, attrs);	1225	pango_layout_set_attributes (self->pl, attrs);
1154	}	1226	}
1155		1227
1156	void	1228	void
1157	get_shapes (CFPlus::Layout self)	1229	get_shapes (DC::Layout self)
1158	PPCODE:	1230	PPCODE:
1159	{	1231	{
1160	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1232	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161		1233
1162	do	1234	do
1163	{	1235	{
1164	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1236	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165		1237
1166	if (run && shape_attr_p (run))	1238	if (run && shape_attr_p (run))
1167	{	1239	{
1168	PangoRectangle extents;	1240	PangoRectangle extents;
1169	pango_layout_iter_get_run_extents (iter, 0, &extents);	1241	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1177		1249
1178	pango_layout_iter_free (iter);	1250	pango_layout_iter_free (iter);
1179	}	1251	}
1180		1252
1181	int	1253	int
1182	has_wrapped (CFPlus::Layout self)	1254	has_wrapped (DC::Layout self)
1183	CODE:	1255	CODE:
1184	{	1256	{
1185	int lines = 1;	1257	int lines = 1;
1186	const char *text = pango_layout_get_text (self->pl);	1258	const char *text = pango_layout_get_text (self->pl);
1187		1259
…		…
1192	}	1264	}
1193	OUTPUT:	1265	OUTPUT:
1194	RETVAL	1266	RETVAL
1195		1267
1196	SV *	1268	SV *
1197	get_text (CFPlus::Layout self)	1269	get_text (DC::Layout self)
1198	CODE:	1270	CODE:
1199	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1271	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200	sv_utf8_decode (RETVAL);	1272	sv_utf8_decode (RETVAL);
1201	OUTPUT:	1273	OUTPUT:
1202	RETVAL	1274	RETVAL
1203		1275
1204	void	1276	void
1205	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1277	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206	CODE:	1278	CODE:
1207	self->r = r;	1279	self->r = r;
1208	self->g = g;	1280	self->g = g;
1209	self->b = b;	1281	self->b = b;
1210	self->a = a;	1282	self->a = a;
1211		1283
1212	void	1284	void
1213	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1285	set_font (DC::Layout self, DC::Font font = 0)
1214	CODE:	1286	CODE:
1215	if (self->font != font)	1287	if (self->font != font)
1216	{	1288	{
1217	self->font = font;	1289	self->font = font;
1218	layout_update_font (self);	1290	layout_update_font (self);
1219	}	1291	}
1220		1292
1221	void	1293	void
1222	set_height (CFPlus::Layout self, int base_height)	1294	set_height (DC::Layout self, int base_height)
1223	CODE:	1295	CODE:
1224	if (self->base_height != base_height)	1296	if (self->base_height != base_height)
1225	{	1297	{
1226	self->base_height = base_height;	1298	self->base_height = base_height;
1227	layout_update_font (self);	1299	layout_update_font (self);
1228	}	1300	}
1229		1301
1230	void	1302	void
1231	set_width (CFPlus::Layout self, int max_width = -1)	1303	set_width (DC::Layout self, int max_width = -1)
1232	CODE:	1304	CODE:
1233	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1305	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234		1306
1235	void	1307	void
1236	set_indent (CFPlus::Layout self, int indent)	1308	set_indent (DC::Layout self, int indent)
1237	CODE:	1309	CODE:
1238	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1310	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239		1311
1240	void	1312	void
1241	set_spacing (CFPlus::Layout self, int spacing)	1313	set_spacing (DC::Layout self, int spacing)
1242	CODE:	1314	CODE:
1243	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1315	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244		1316
1245	void	1317	void
1246	set_ellipsise (CFPlus::Layout self, int ellipsise)	1318	set_ellipsise (DC::Layout self, int ellipsise)
1247	CODE:	1319	CODE:
1248	pango_layout_set_ellipsize (self->pl,	1320	pango_layout_set_ellipsize (self->pl,
1249	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1321	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1322	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1323	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252	: PANGO_ELLIPSIZE_NONE	1324	: PANGO_ELLIPSIZE_NONE
1253	);	1325	);
1254		1326
1255	void	1327	void
1256	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1328	set_single_paragraph_mode (DC::Layout self, int spm)
1257	CODE:	1329	CODE:
1258	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1330	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259		1331
1260	void	1332	void
1261	size (CFPlus::Layout self)	1333	size (DC::Layout self)
1262	PPCODE:	1334	PPCODE:
1263	{	1335	{
1264	int w, h;	1336	int w, h;
1265		1337
1266	layout_get_pixel_size (self, &w, &h);	1338	layout_get_pixel_size (self, &w, &h);
…		…
1269	PUSHs (sv_2mortal (newSViv (w)));	1341	PUSHs (sv_2mortal (newSViv (w)));
1270	PUSHs (sv_2mortal (newSViv (h)));	1342	PUSHs (sv_2mortal (newSViv (h)));
1271	}	1343	}
1272		1344
1273	int	1345	int
1274	descent (CFPlus::Layout self)	1346	descent (DC::Layout self)
1275	CODE:	1347	CODE:
1276	{	1348	{
1277	PangoRectangle rect;	1349	PangoRectangle rect;
1278	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1350	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279	pango_layout_line_get_pixel_extents (line, 0, &rect);	1351	pango_layout_line_get_pixel_extents (line, 0, &rect);
1280	RETVAL = PANGO_DESCENT (rect);	1352	RETVAL = PANGO_DESCENT (rect);
1281	}	1353	}
1282	OUTPUT:	1354	OUTPUT:
1283	RETVAL	1355	RETVAL
1284		1356
1285	int	1357	int
1286	xy_to_index (CFPlus::Layout self, int x, int y)	1358	xy_to_index (DC::Layout self, int x, int y)
1287	CODE:	1359	CODE:
1288	{	1360	{
1289	int index, trailing;	1361	int index, trailing;
1290	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1362	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291	RETVAL = index + trailing;	1363	RETVAL = index + trailing;
1292	}	1364	}
1293	OUTPUT:	1365	OUTPUT:
1294	RETVAL	1366	RETVAL
1295		1367
1296	void	1368	void
1297	cursor_pos (CFPlus::Layout self, int index)	1369	cursor_pos (DC::Layout self, int index)
1298	PPCODE:	1370	PPCODE:
1299	{	1371	{
1300	PangoRectangle strong_pos;	1372	PangoRectangle pos;
1301	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1373	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302		1374
1303	EXTEND (SP, 3);	1375	EXTEND (SP, 3);
1304	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1376	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1377	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1378	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307	}	1379	}
1308		1380
1309	void	1381	void
1310	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1382	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311	PPCODE:	1383	PPCODE:
1312	{	1384	{
1313	int line, x;	1385	int line, x;
1314		1386
1315	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1387	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1388	#if !PANGO_VERSION_CHECK (1, 17, 3)
1316	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1389	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317		1390	--line;
		1391	#endif
1318	EXTEND (SP, 2);	1392	EXTEND (SP, 2);
1319	PUSHs (sv_2mortal (newSViv (line - 1)));	1393	PUSHs (sv_2mortal (newSViv (line)));
1320	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1394	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321	}	1395	}
1322		1396
1323	void	1397	void
1324	line_x_to_index (CFPlus::Layout self, int line, int x)	1398	line_x_to_index (DC::Layout self, int line, int x)
1325	PPCODE:	1399	PPCODE:
1326	{	1400	{
1327	PangoLayoutLine *lp;	1401	PangoLayoutLine *lp;
1328	int index, trailing;	1402	int index, trailing;
1329		1403
1330	if (line < 0)	1404	if (line < 0)
1331	XSRETURN_EMPTY;	1405	XSRETURN_EMPTY;
1332		1406
1333	if (!(lp = pango_layout_get_line (self->pl, line)))	1407	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334	XSRETURN_EMPTY; /* do better */	1408	XSRETURN_EMPTY; /* do better */
1335		1409
1336	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1410	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337		1411
1338	EXTEND (SP, 2);	1412	EXTEND (SP, 2);
…		…
1344	PUSHs (sv_2mortal (newSViv (trailing)));	1418	PUSHs (sv_2mortal (newSViv (trailing)));
1345	}	1419	}
1346	}	1420	}
1347		1421
1348	void	1422	void
1349	render (CFPlus::Layout self, float x, float y, int flags = 0)	1423	render (DC::Layout self, float x, float y, int flags = 0)
1350	CODE:	1424	CODE:
1351	rc_clear (self->rc);	1425	rc_clear (self->rc);
1352	pango_opengl_render_layout_subpixel (	1426	pango_opengl_render_layout_subpixel (
1353	self->pl,	1427	self->pl,
1354	self->rc,	1428	self->rc,
…		…
1359	// we assume that context_change actually clears/frees stuff	1433	// we assume that context_change actually clears/frees stuff
1360	// and does not do any recomputation...	1434	// and does not do any recomputation...
1361	pango_layout_context_changed (self->pl);	1435	pango_layout_context_changed (self->pl);
1362		1436
1363	void	1437	void
1364	draw (CFPlus::Layout self)	1438	draw (DC::Layout self)
1365	CODE:	1439	CODE:
1366	{	1440	{
1367	glEnable (GL_TEXTURE_2D);	1441	glEnable (GL_TEXTURE_2D);
1368	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1442	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369	glEnable (GL_BLEND);	1443	glEnable (GL_BLEND);
…		…
1377	glDisable (GL_ALPHA_TEST);	1451	glDisable (GL_ALPHA_TEST);
1378	glDisable (GL_BLEND);	1452	glDisable (GL_BLEND);
1379	glDisable (GL_TEXTURE_2D);	1453	glDisable (GL_TEXTURE_2D);
1380	}	1454	}
1381		1455
1382	MODULE = CFPlus PACKAGE = CFPlus::Texture	1456	MODULE = Deliantra::Client PACKAGE = DC::Texture
1383		1457
1384	PROTOTYPES: ENABLE	1458	PROTOTYPES: ENABLE
1385		1459
1386	void	1460	void
1387	pad (SV *data_, int ow, int oh, int nw, int nh)	1461	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1466	RETVAL = width > 0;	1540	RETVAL = width > 0;
1467	}	1541	}
1468	OUTPUT:	1542	OUTPUT:
1469	RETVAL	1543	RETVAL
1470		1544
1471	MODULE = CFPlus PACKAGE = CFPlus::Map	1545	MODULE = Deliantra::Client PACKAGE = DC::Map
1472		1546
1473	PROTOTYPES: DISABLE	1547	PROTOTYPES: DISABLE
1474		1548
1475	CFPlus::Map	1549	DC::Map
1476	new (SV *class)	1550	new (SV *class)
1477	CODE:	1551	CODE:
1478	New (0, RETVAL, 1, struct map);	1552	New (0, RETVAL, 1, struct map);
1479	RETVAL->x = 0;	1553	RETVAL->x = 0;
1480	RETVAL->y = 0;	1554	RETVAL->y = 0;
…		…
1488	RETVAL->row = 0;	1562	RETVAL->row = 0;
1489	OUTPUT:	1563	OUTPUT:
1490	RETVAL	1564	RETVAL
1491		1565
1492	void	1566	void
1493	DESTROY (CFPlus::Map self)	1567	DESTROY (DC::Map self)
1494	CODE:	1568	CODE:
1495	{	1569	{
1496	map_clear (self);	1570	map_clear (self);
1497	Safefree (self->face2tile);	1571	Safefree (self->face2tile);
1498	Safefree (self->tex);	1572	Safefree (self->tex);
1499	Safefree (self);	1573	Safefree (self);
1500	}	1574	}
1501		1575
1502	void	1576	void
1503	resize (CFPlus::Map self, int map_width, int map_height)	1577	resize (DC::Map self, int map_width, int map_height)
1504	CODE:	1578	CODE:
1505	self->w = map_width;	1579	self->w = map_width;
1506	self->h = map_height;	1580	self->h = map_height;
1507		1581
1508	void	1582	void
1509	clear (CFPlus::Map self)	1583	clear (DC::Map self)
1510	CODE:	1584	CODE:
1511	map_clear (self);	1585	map_clear (self);
1512		1586
1513	void	1587	void
1514	set_tileid (CFPlus::Map self, int face, int tile)	1588	set_tileid (DC::Map self, int face, int tile)
1515	CODE:	1589	CODE:
1516	{	1590	{
1517	need_facenum (self, face); self->face2tile [face] = tile;	1591	need_facenum (self, face); self->face2tile [face] = tile;
1518	need_texid (self, tile);	1592	need_texid (self, tile);
1519	}	1593	}
1520		1594
1521	void	1595	void
1522	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1596	set_smooth (DC::Map self, int face, int smooth, int level)
1523	CODE:	1597	CODE:
1524	{	1598	{
1525	tileid texid;	1599	tileid texid;
1526	maptex *tex;	1600	maptex *tex;
1527		1601
…		…
1540	tex->smoothtile = self->face2tile [smooth];	1614	tex->smoothtile = self->face2tile [smooth];
1541	tex->smoothlevel = level;	1615	tex->smoothlevel = level;
1542	}	1616	}
1543		1617
1544	void	1618	void
1545	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)	1619	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)
1546	CODE:	1620	CODE:
1547	{	1621	{
1548	need_texid (self, texid);	1622	need_texid (self, texid);
1549		1623
1550	{	1624	{
…		…
1570	// from transparent color bleeding and ugly wrapping effects.	1644	// from transparent color bleeding and ugly wrapping effects.
1571	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1645	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572	}	1646	}
1573		1647
1574	int	1648	int
1575	ox (CFPlus::Map self)	1649	ox (DC::Map self)
1576	ALIAS:	1650	ALIAS:
1577	oy = 1	1651	oy = 1
1578	x = 2	1652	x = 2
1579	y = 3	1653	y = 3
1580	w = 4	1654	w = 4
…		…
1591	}	1665	}
1592	OUTPUT:	1666	OUTPUT:
1593	RETVAL	1667	RETVAL
1594		1668
1595	void	1669	void
1596	scroll (CFPlus::Map self, int dx, int dy)	1670	scroll (DC::Map self, int dx, int dy)
1597	CODE:	1671	CODE:
1598	{	1672	{
1599	if (dx > 0)	1673	if (dx > 0)
1600	map_blank (self, self->x, self->y, dx, self->h);	1674	map_blank (self, self->x, self->y, dx, self->h);
1601	else if (dx < 0)	1675	else if (dx < 0)
…		…
1617	self->y += MAP_EXTEND_Y;	1691	self->y += MAP_EXTEND_Y;
1618	}	1692	}
1619	}	1693	}
1620		1694
1621	SV *	1695	SV *
1622	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1696	map1a_update (DC::Map self, SV *data_, int extmap)
1623	CODE:	1697	CODE:
1624	{	1698	{
1625	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1699	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1626	uint8_t data_end = (uint8_t )SvEND (data_);	1700	uint8_t data_end = (uint8_t )SvEND (data_);
1627	mapcell *cell;	1701	mapcell *cell;
…		…
1655	uint8_t ext, cmd;	1729	uint8_t ext, cmd;
1656		1730
1657	do	1731	do
1658	{	1732	{
1659	ext = *data++;	1733	ext = *data++;
1660	cmd = ext & 0x3f;	1734	cmd = ext & 0x7f;
1661		1735
1662	if (cmd < 4)	1736	if (cmd < 4)
1663	cell->darkness = 255 - ext * 64 + 1;	1737	cell->darkness = 255 - ext * 64 + 1;
1664	else if (cmd == 5) // health	1738	else if (cmd == 5) // health
1665	{	1739	{
…		…
1668	}	1742	}
1669	else if (cmd == 6) // monster width	1743	else if (cmd == 6) // monster width
1670	cell->stat_width = *data++ + 1;	1744	cell->stat_width = *data++ + 1;
1671	else if (cmd == 0x47)	1745	else if (cmd == 0x47)
1672	{	1746	{
1673	if (*data == 4)	1747	if (*data == 1) cell->player = data [1];
1674	; // decode player count	1748	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1749	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1750	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675		1751
1676	data += *data + 1;	1752	data += *data + 1;
1677	}	1753	}
1678	else if (cmd == 8) // cell flags	1754	else if (cmd == 8) // cell flags
1679	cell->flags = *data++;	1755	cell->flags = *data++;
…		…
1709	}	1785	}
1710	}	1786	}
1711	}	1787	}
1712	}	1788	}
1713	else	1789	else
1714	cell->darkness = 0;	1790	CELL_CLEAR (cell);
1715	}	1791	}
1716	}	1792	}
1717	OUTPUT:	1793	OUTPUT:
1718	RETVAL	1794	RETVAL
1719		1795
1720	SV *	1796	SV *
1721	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1797	mapmap (DC::Map self, int x0, int y0, int w, int h)
1722	CODE:	1798	CODE:
1723	{	1799	{
1724	int x1, x;	1800	int x1, x;
1725	int y1, y;	1801	int y1, y;
1726	int z;	1802	int z;
…		…
1771	}	1847	}
1772	OUTPUT:	1848	OUTPUT:
1773	RETVAL	1849	RETVAL
1774		1850
1775	void	1851	void
1776	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1852	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1777	CODE:	1853	CODE:
1778	{	1854	{
1779	int x, y, z;	1855	int x, y, z;
1780		1856
1781	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1857	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1782	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1858	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1783	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1859	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784	smooth_key skey;	1860	smooth_key skey;
1785		1861	int pl_x, pl_y;
		1862	maptex pl_tex;
1786	rc_t *rc = rc_alloc ();	1863	rc_t *rc = rc_alloc ();
1787	rc_key_t key;	1864	rc_key_t key;
1788	rc_array_t *arr;	1865	rc_array_t *arr;
		1866
		1867	pl_tex.name = 0;
1789		1868
1790	// thats current max. sorry.	1869	// thats current max. sorry.
1791	if (sw > 255) sw = 255;	1870	if (sw > 255) sw = 255;
1792	if (sh > 255) sh = 255;	1871	if (sh > 255) sh = 255;
1793		1872
…		…
1848	tileid tile = cell->tile [z];	1927	tileid tile = cell->tile [z];
1849		1928
1850	if (tile)	1929	if (tile)
1851	{	1930	{
1852	maptex tex = self->tex [tile];	1931	maptex tex = self->tex [tile];
1853	int px, py;	1932	int px = (x + 1) * T - tex.w;
		1933	int py = (y + 1) * T - tex.h;
1854		1934
1855	if (key.texname != tex.name)	1935	if (key.texname != tex.name)
1856	{	1936	{
1857	if (!tex.name)	1937	if (!tex.name)
1858	tex = self->tex [2]; /* missing, replace by noface */	1938	tex = self->tex [2]; /* missing, replace by noface */
1859		1939
1860	key.texname = tex.name;	1940	key.texname = tex.name;
1861	arr = rc_array (rc, &key);	1941	arr = rc_array (rc, &key);
1862	}	1942	}
1863		1943
1864	px = (x + 1) * T - tex.w;	1944	if (expect_false (cell->player == player) && expect_false (z == 2))
1865	py = (y + 1) * T - tex.h;	1945	{
		1946	pl_x = px;
		1947	pl_y = py;
		1948	pl_tex = tex;
		1949	continue;
		1950	}
1866		1951
1867	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1952	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1953	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1869	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1954	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1870	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1955	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1871		1956
1872	if (cell->flags && z == 2)	1957	if (expect_false (cell->flags) && expect_false (z == 2))
1873	{	1958	{
1874	// overlays such as the speech bubble, probably more to come	1959	// overlays such as the speech bubble, probably more to come
1875	if (cell->flags & 1)	1960	if (cell->flags & 1)
1876	{	1961	{
1877	maptex tex = self->tex [1];	1962	maptex tex = self->tex [1];
…		…
2016	}	2101	}
2017		2102
2018	hv_clear (smooth);	2103	hv_clear (smooth);
2019	}	2104	}
2020		2105
		2106	if (pl_tex.name)
		2107	{
		2108	maptex tex = pl_tex;
		2109	int px = pl_x + sdx;
		2110	int py = pl_y + sdy;
		2111
		2112	key.texname = tex.name;
		2113	arr = rc_array (rc, &key);
		2114
		2115	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2116	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2117	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2118	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2119
		2120	rc_draw (rc);
		2121	}
		2122
2021	glDisable (GL_BLEND);	2123	glDisable (GL_BLEND);
2022	rc_free (rc);	2124	rc_free (rc);
2023		2125
2024	// top layer: overlays such as the health bar	2126	// top layer: overlays such as the health bar
2025	for (y = 0; y < sh; y++)	2127	for (y = 0; y < sh; y++)
…		…
2052	}	2154	}
2053	}	2155	}
2054	}	2156	}
2055		2157
2056	void	2158	void
2057	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2159	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058	CODE:	2160	CODE:
2059	{	2161	{
2060	static float color[16][3] = {	2162	static float color[16][3] = {
2061	{ 0.00F, 0.00F, 0.00F },	2163	{ 0.00F, 0.00F, 0.00F },
2062	{ 1.00F, 1.00F, 1.00F },	2164	{ 1.00F, 1.00F, 1.00F },
…		…
2112	glDisable (GL_BLEND);	2214	glDisable (GL_BLEND);
2113	glDisable (GL_TEXTURE_2D);	2215	glDisable (GL_TEXTURE_2D);
2114	}	2216	}
2115		2217
2116	void	2218	void
2117	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2219	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118	PPCODE:	2220	PPCODE:
2119	{	2221	{
2120	int x, y;	2222	int x, y;
2121	int sw1 = sw + 2;	2223	int sw1 = sw + 2;
2122	int sh1 = sh + 2;	2224	int sh1 = sh + 2;
…		…
2193	PUSHs (sv_2mortal (newSViv (sh3)));	2295	PUSHs (sv_2mortal (newSViv (sh3)));
2194	PUSHs (darkness3_sv);	2296	PUSHs (darkness3_sv);
2195	}	2297	}
2196		2298
2197	SV *	2299	SV *
2198	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2300	get_rect (DC::Map self, int x0, int y0, int w, int h)
2199	CODE:	2301	CODE:
2200	{	2302	{
2201	int x, y, x1, y1;	2303	int x, y, x1, y1;
2202	SV data_sv = newSV (w h * 7 + 5);	2304	SV data_sv = newSV (w h * 7 + 5);
2203	uint8_t data = (uint8_t )SvPVX (data_sv);	2305	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2260	else	2362	else
2261	*data++ = 0;	2363	*data++ = 0;
2262	}	2364	}
2263	}	2365	}
2264		2366
		2367	/* if size is wh + 5 then no data has been found /
		2368	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2369	{
2265	SvPOK_only (data_sv);	2370	SvPOK_only (data_sv);
2266	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2371	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2372	}
		2373
2267	RETVAL = data_sv;	2374	RETVAL = data_sv;
2268	}	2375	}
2269	OUTPUT:	2376	OUTPUT:
2270	RETVAL	2377	RETVAL
2271		2378
2272	void	2379	void
2273	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2380	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274	PPCODE:	2381	PPCODE:
2275	{	2382	{
2276	int x, y, z;	2383	int x, y, z;
2277	int w, h;	2384	int w, h;
2278	int x1, y1;	2385	int x1, y1;
		2386	STRLEN len;
		2387	uint8_t data, end;
		2388
		2389	len = SvLEN (data_sv);
		2390	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2391	data = SvPVbyte_nolen (data_sv);
		2392	end = data + len + 8;
		2393
		2394	if (len < 5)
		2395	XSRETURN_EMPTY;
2279		2396
2280	if (*data++ != 0)	2397	if (*data++ != 0)
2281	XSRETURN_EMPTY; /* version mismatch */	2398	XSRETURN_EMPTY; /* version mismatch */
2282		2399
2283	w = data++ << 8; w \|= data++;	2400	w = data++ << 8; w \|= data++;
…		…
2298	{	2415	{
2299	maprow *row = map_get_row (self, y);	2416	maprow *row = map_get_row (self, y);
2300		2417
2301	for (x = x0; x < x1; x++)	2418	for (x = x0; x < x1; x++)
2302	{	2419	{
		2420	uint8_t flags;
		2421
		2422	if (data + 7 >= end)
		2423	XSRETURN_EMPTY;
		2424
2303	uint8_t flags = *data++;	2425	flags = *data++;
2304		2426
2305	if (flags)	2427	if (flags)
2306	{	2428	{
2307	mapcell *cell = row_get_cell (row, x);	2429	mapcell *cell = row_get_cell (row, x);
2308	tileid tile[3] = { 0, 0, 0 };	2430	tileid tile[3] = { 0, 0, 0 };
…		…
2311	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2433	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2312	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2434	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2313		2435
2314	if (cell->darkness == 0)	2436	if (cell->darkness == 0)
2315	{	2437	{
2316	cell->darkness = 0;	2438	/cell->darkness = 0;/
		2439	EXTEND (SP, 3);
2317		2440
2318	for (z = 0; z <= 2; z++)	2441	for (z = 0; z <= 2; z++)
2319	{	2442	{
2320	tileid t = tile [z];	2443	tileid t = tile [z];
2321		2444
2322	if (t >= self->texs \|\| (t && !self->tex [t].name))	2445	if (t >= self->texs \|\| (t && !self->tex [t].name))
2323	{	2446	{
2324	XPUSHs (sv_2mortal (newSViv (t)));	2447	PUSHs (sv_2mortal (newSViv (t)));
2325	need_texid (self, t);	2448	need_texid (self, t);
2326	}	2449	}
2327		2450
2328	cell->tile [z] = t;	2451	cell->tile [z] = t;
2329	}	2452	}
…		…
2331	}	2454	}
2332	}	2455	}
2333	}	2456	}
2334	}	2457	}
2335		2458
2336	MODULE = CFPlus PACKAGE = CFPlus::RW	2459	MODULE = Deliantra::Client PACKAGE = DC::RW
2337		2460
2338	CFPlus::RW	2461	DC::RW
2339	new (SV class, SV data_sv)	2462	new (SV class, SV data_sv)
2340	CODE:	2463	CODE:
2341	{	2464	{
2342	STRLEN datalen;	2465	STRLEN datalen;
2343	char *data = SvPVbyte (data_sv, datalen);	2466	char *data = SvPVbyte (data_sv, datalen);
…		…
2345	RETVAL = SDL_RWFromConstMem (data, datalen);	2468	RETVAL = SDL_RWFromConstMem (data, datalen);
2346	}	2469	}
2347	OUTPUT:	2470	OUTPUT:
2348	RETVAL	2471	RETVAL
2349		2472
2350	CFPlus::RW	2473	DC::RW
2351	new_from_file (SV class, const char path, const char *mode = "rb")	2474	new_from_file (SV class, const char path, const char *mode = "rb")
2352	CODE:	2475	CODE:
2353	RETVAL = SDL_RWFromFile (path, mode);	2476	RETVAL = SDL_RWFromFile (path, mode);
2354	OUTPUT:	2477	OUTPUT:
2355	RETVAL	2478	RETVAL
2356		2479
2357	# fails on win32:	2480	# fails on win32:
2358	# CFPlus.xs(2268) : error C2059: syntax error : '('	2481	# dc.xs(2268) : error C2059: syntax error : '('
2359	#void	2482	#void
2360	#close (CFPlus::RW self)	2483	#close (DC::RW self)
2361	# CODE:	2484	# CODE:
2362	# (self->(close)) (self);	2485	# (self->(close)) (self);
2363		2486
2364	MODULE = CFPlus PACKAGE = CFPlus::Channel	2487	MODULE = Deliantra::Client PACKAGE = DC::Channel
2365		2488
2366	PROTOTYPES: DISABLE	2489	PROTOTYPES: DISABLE
2367		2490
2368	CFPlus::Channel	2491	DC::Channel
2369	find ()	2492	find ()
2370	CODE:	2493	CODE:
2371	{	2494	{
2372	RETVAL = Mix_GroupAvailable (-1);	2495	RETVAL = Mix_GroupAvailable (-1);
2373		2496
…		…
2386	}	2509	}
2387	OUTPUT:	2510	OUTPUT:
2388	RETVAL	2511	RETVAL
2389		2512
2390	void	2513	void
2391	halt (CFPlus::Channel self)	2514	halt (DC::Channel self)
2392	CODE:	2515	CODE:
2393	Mix_HaltChannel (self);	2516	Mix_HaltChannel (self);
2394		2517
2395	void	2518	void
2396	expire (CFPlus::Channel self, int ticks = -1)	2519	expire (DC::Channel self, int ticks = -1)
2397	CODE:	2520	CODE:
2398	Mix_ExpireChannel (self, ticks);	2521	Mix_ExpireChannel (self, ticks);
2399		2522
2400	void	2523	void
2401	fade_out (CFPlus::Channel self, int ticks = -1)	2524	fade_out (DC::Channel self, int ticks = -1)
2402	CODE:	2525	CODE:
2403	Mix_FadeOutChannel (self, ticks);	2526	Mix_FadeOutChannel (self, ticks);
2404		2527
2405	int	2528	int
2406	volume (CFPlus::Channel self, int volume)	2529	volume (DC::Channel self, int volume)
2407	CODE:	2530	CODE:
2408	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2531	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409	OUTPUT:	2532	OUTPUT:
2410	RETVAL	2533	RETVAL
2411		2534
2412	void	2535	void
2413	unregister_all_effects (CFPlus::Channel self)	2536	unregister_all_effects (DC::Channel self)
2414	CODE:	2537	CODE:
2415	Mix_UnregisterAllEffects (self);	2538	Mix_UnregisterAllEffects (self);
2416		2539
2417	void	2540	void
2418	set_panning (CFPlus::Channel self, int left, int right)	2541	set_panning (DC::Channel self, int left, int right)
2419	CODE:	2542	CODE:
2420	left = CLAMP (left , 0, 255);	2543	left = CLAMP (left , 0, 255);
2421	right = CLAMP (right, 0, 255);	2544	right = CLAMP (right, 0, 255);
2422	Mix_SetPanning (self, left, right);	2545	Mix_SetPanning (self, left, right);
2423		2546
2424	void	2547	void
2425	set_distance (CFPlus::Channel self, int distance)	2548	set_distance (DC::Channel self, int distance)
2426	CODE:	2549	CODE:
2427	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2550	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428		2551
2429	void	2552	void
2430	set_position (CFPlus::Channel self, int angle, int distance)	2553	set_position (DC::Channel self, int angle, int distance)
2431	CODE:	2554	CODE:
2432		2555
2433	void	2556	void
2434	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2557	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435	CODE:	2558	CODE:
2436	{	2559	{
2437	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2560	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2438	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2561	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2562	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440	}	2563	}
2441		2564
2442	void	2565	void
2443	set_reverse_stereo (CFPlus::Channel self, int flip)	2566	set_reverse_stereo (DC::Channel self, int flip)
2444	CODE:	2567	CODE:
2445	Mix_SetReverseStereo (self, flip);	2568	Mix_SetReverseStereo (self, flip);
2446		2569
2447	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2570	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448		2571
2449	PROTOTYPES: DISABLE	2572	PROTOTYPES: DISABLE
2450		2573
2451	CFPlus::MixChunk	2574	DC::MixChunk
2452	new (SV *class, CFPlus::RW rwops)	2575	new (SV *class, DC::RW rwops)
2453	CODE:	2576	CODE:
2454	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2577	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455	OUTPUT:	2578	OUTPUT:
2456	RETVAL	2579	RETVAL
2457		2580
2458	void	2581	void
2459	DESTROY (CFPlus::MixChunk self)	2582	DESTROY (DC::MixChunk self)
2460	CODE:	2583	CODE:
2461	Mix_FreeChunk (self);	2584	Mix_FreeChunk (self);
2462		2585
2463	int	2586	int
2464	volume (CFPlus::MixChunk self, int volume = -1)	2587	volume (DC::MixChunk self, int volume = -1)
2465	CODE:	2588	CODE:
2466	if (items > 1)	2589	if (items > 1)
2467	volume = CLAMP (volume, 0, 128);	2590	volume = CLAMP (volume, 0, 128);
2468	RETVAL = Mix_VolumeChunk (self, volume);	2591	RETVAL = Mix_VolumeChunk (self, volume);
2469	OUTPUT:	2592	OUTPUT:
2470	RETVAL	2593	RETVAL
2471		2594
2472	CFPlus::Channel	2595	DC::Channel
2473	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2596	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474	CODE:	2597	CODE:
2475	{	2598	{
2476	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2599	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477		2600
2478	if (RETVAL < 0)	2601	if (RETVAL < 0)
…		…
2485	}	2608	}
2486	}	2609	}
2487	OUTPUT:	2610	OUTPUT:
2488	RETVAL	2611	RETVAL
2489		2612
2490	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2613	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491		2614
2492	int	2615	int
2493	volume (int volume = -1)	2616	volume (int volume = -1)
2494	PROTOTYPE: ;$	2617	PROTOTYPE: ;$
2495	CODE:	2618	CODE:
…		…
2507	void	2630	void
2508	halt ()	2631	halt ()
2509	CODE:	2632	CODE:
2510	Mix_HaltMusic ();	2633	Mix_HaltMusic ();
2511		2634
2512	CFPlus::MixMusic	2635	DC::MixMusic
2513	new (SV *class, CFPlus::RW rwops)	2636	new (SV *class, DC::RW rwops)
2514	CODE:	2637	CODE:
2515	RETVAL = Mix_LoadMUS_RW (rwops);	2638	RETVAL = Mix_LoadMUS_RW (rwops);
2516	OUTPUT:	2639	OUTPUT:
2517	RETVAL	2640	RETVAL
2518		2641
2519	void	2642	void
2520	DESTROY (CFPlus::MixMusic self)	2643	DESTROY (DC::MixMusic self)
2521	CODE:	2644	CODE:
2522	Mix_FreeMusic (self);	2645	Mix_FreeMusic (self);
2523		2646
2524	int	2647	int
2525	play (CFPlus::MixMusic self, int loops = -1)	2648	play (DC::MixMusic self, int loops = -1)
2526	CODE:	2649	CODE:
2527	RETVAL = Mix_PlayMusic (self, loops);	2650	RETVAL = Mix_PlayMusic (self, loops);
2528	OUTPUT:	2651	OUTPUT:
2529	RETVAL	2652	RETVAL
2530		2653
2531	void	2654	void
2532	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2655	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533	CODE:	2656	CODE:
2534	Mix_FadeInMusicPos (self, loops, ms, position);	2657	Mix_FadeInMusicPos (self, loops, ms, position);
2535		2658
2536	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2659	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537		2660
2538	PROTOTYPES: ENABLE	2661	PROTOTYPES: ENABLE
2539		2662
2540	BOOT:	2663	BOOT:
2541	{	2664	{
2542	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2665	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543	static const struct {	2666	static const struct {
2544	const char *name;	2667	const char *name;
2545	IV iv;	2668	IV iv;
2546	} *civ, const_iv[] = {	2669	} *civ, const_iv[] = {
2547	# define const_iv(name) { # name, (IV)name }	2670	# define const_iv(name) { # name, (IV)name }
…		…
2840	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2963	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2841	CODE:	2964	CODE:
2842	if (gl.SeparableFilter2D)	2965	if (gl.SeparableFilter2D)
2843	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2966	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844		2967
2845	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2968	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846		2969
2847	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2970	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848		2971
2849	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2972	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850		2973
…		…
2876		2999
2877	void glEndList ()	3000	void glEndList ()
2878		3001
2879	void glCallList (int list)	3002	void glCallList (int list)
2880		3003
2881	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3004	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882		3005
2883	PROTOTYPES: DISABLE	3006	PROTOTYPES: DISABLE
2884		3007
2885	void	3008	void
2886	find_widget (SV *self, NV x, NV y)	3009	find_widget (SV *self, NV x, NV y)
…		…
2890	XPUSHs (self);	3013	XPUSHs (self);
2891	}	3014	}
2892		3015
2893	BOOT:	3016	BOOT:
2894	{	3017	{
2895	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3018	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896		3019
2897	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3020	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2898	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3021	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2899	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3022	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2900	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3023	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901	}	3024	}
2902		3025
2903	void	3026	void
2904	draw (SV *self)	3027	draw (SV *self)
2905	CODE:	3028	CODE:
…		…
2912	SV *draw_w_sv = GvSV (draw_w_gv);	3035	SV *draw_w_sv = GvSV (draw_w_gv);
2913	SV *draw_h_sv = GvSV (draw_h_gv);	3036	SV *draw_h_sv = GvSV (draw_h_gv);
2914	double draw_x, draw_y;	3037	double draw_x, draw_y;
2915		3038
2916	if (!SvROK (self))	3039	if (!SvROK (self))
2917	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3040	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918		3041
2919	hv = (HV *)SvRV (self);	3042	hv = (HV *)SvRV (self);
2920		3043
2921	if (SvTYPE (hv) != SVt_PVHV)	3044	if (SvTYPE (hv) != SVt_PVHV)
2922	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3045	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923		3046
2924	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3047	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2925	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3048	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926		3049
2927	if (!h \|\| !w)	3050	if (!h \|\| !w)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.238 by root, Sat Nov 3 12:08:43 2007 UTC vs. Revision 1.267 by root, Sun Jul 20 02:55:36 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.238 by root, Sat Nov 3 12:08:43 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 2008 UTC