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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.240 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.268 by root, Sun Jul 20 02:57:43 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	if ((cell)->player) \
		375	(cell)->tile [2] = 0; \
		376	(cell)->darkness = 0; \
		377	(cell)->stat_hp = 0; \
		378	(cell)->flags = 0; \
		379	(cell)->player = 0; \
		380	} while (0)
		381
355	static void	382	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	383	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	384	{
358	int x, y;	385	int x, y;
359	maprow *row;	386	maprow *row;
360	mapcell *cell;	387	mapcell *cell;
361		388
…		…
373	if (x >= row->c1)	400	if (x >= row->c1)
374	break;	401	break;
375		402
376	cell = row->col + x - row->c0;	403	cell = row->col + x - row->c0;
377		404
378	cell->darkness = 0;	405	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	406	}
383	}	407	}
384	}	408	}
385		409
386	typedef struct {	410	typedef struct {
…		…
498	return 0;	522	return 0;
499		523
500	return 1;	524	return 1;
501	}	525	}
502		526
503	MODULE = CFPlus PACKAGE = CFPlus	527	MODULE = Deliantra::Client PACKAGE = DC
504		528
505	PROTOTYPES: ENABLE	529	PROTOTYPES: ENABLE
506		530
507	BOOT:	531	BOOT:
508	{	532	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	533	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	534	static const struct {
511	const char *name;	535	const char *name;
512	IV iv;	536	IV iv;
513	} *civ, const_iv[] = {	537	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	538	# define const_iv(name) { # name, (IV)name }
…		…
621	const_iv (KMOD_NUM),	645	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	646	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	647	const_iv (KMOD_MODE),
624		648
625	const_iv (MIX_DEFAULT_FORMAT),	649	const_iv (MIX_DEFAULT_FORMAT),
		650
		651	const_iv (SDL_INIT_TIMER),
		652	const_iv (SDL_INIT_AUDIO),
		653	const_iv (SDL_INIT_VIDEO),
		654	const_iv (SDL_INIT_CDROM),
		655	const_iv (SDL_INIT_JOYSTICK),
		656	const_iv (SDL_INIT_EVERYTHING),
		657	const_iv (SDL_INIT_NOPARACHUTE),
		658	const_iv (SDL_INIT_EVENTTHREAD),
		659
		660	const_iv (SDL_GL_RED_SIZE),
		661	const_iv (SDL_GL_GREEN_SIZE),
		662	const_iv (SDL_GL_BLUE_SIZE),
		663	const_iv (SDL_GL_ALPHA_SIZE),
		664	const_iv (SDL_GL_DOUBLEBUFFER),
		665	const_iv (SDL_GL_BUFFER_SIZE),
		666	const_iv (SDL_GL_DEPTH_SIZE),
		667	const_iv (SDL_GL_STENCIL_SIZE),
		668	const_iv (SDL_GL_ACCUM_RED_SIZE),
		669	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		670	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		671	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		672	const_iv (SDL_GL_STEREO),
		673	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		674	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		675	const_iv (SDL_GL_ACCELERATED_VISUAL),
		676	const_iv (SDL_GL_SWAP_CONTROL)
626	# undef const_iv	677	# undef const_iv
627	};	678	};
628		679
629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	680	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	681	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
659	CODE:	710	CODE:
660	{	711	{
661	opengl_fontmap = pango_opengl_font_map_new ();	712	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	713	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);	714	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		715	/pango_context_set_font_description (opengl_context, default_font);/
		716	#if PANGO_VERSION_CHECK (1, 15, 2)
		717	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		718	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		719	#endif
664	}	720	}
665		721
666	char *
667	SDL_GetError ()	722	char *SDL_GetError ()
668		723
669	int	724	int SDL_Init (U32 flags)
670	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
671		725
672	void	726	int SDL_InitSubSystem (U32 flags)
		727
		728	void SDL_QuitSubSystem (U32 flags)
		729
673	SDL_Quit ()	730	void SDL_Quit ()
		731
		732	int SDL_GL_SetAttribute (int attr, int value)
		733
		734	int SDL_GL_GetAttribute (int attr)
		735	CODE:
		736	if (SDL_GL_GetAttribute (attr, &RETVAL))
		737	XSRETURN_UNDEF;
		738	OUTPUT:
		739	RETVAL
674		740
675	void	741	void
676	SDL_ListModes (int rgb, int alpha)	742	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	743	PPCODE:
678	{	744	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	756	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	757	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	758	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		759
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	760	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);	761	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		762
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	763	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		764
702	if (m && m != (SDL_Rect **)-1)	765	if (m && m != (SDL_Rect **)-1)
703	while (*m)	766	while (*m)
704	{	767	{
705	if ((m)->w >= 800 && (m)->h >= 600)	768	if ((m)->w >= 400 && (m)->h >= 300)
706	{	769	{
707	AV *av = newAV ();	770	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	771	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	772	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	773	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	815	SDL_GetKeyName (int sym)
753		816
754	int	817	int
755	SDL_GetAppState ()	818	SDL_GetAppState ()
756		819
		820	int
		821	SDL_GetModState ()
		822
757	void	823	void
758	poll_events ()	824	poll_events ()
759	PPCODE:	825	PPCODE:
760	{	826	{
761	SDL_Event ev;	827	SDL_Event ev;
…		…
770	{	836	{
771	case SDL_KEYDOWN:	837	case SDL_KEYDOWN:
772	case SDL_KEYUP:	838	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	839	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	840	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	841	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 */	842	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);	843	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	844	break;
779		845
780	case SDL_ACTIVEEVENT:	846	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	847	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	865	x = ev.motion.x;
800	y = ev.motion.y;	866	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	867	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	868	}
803		869
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	870	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	871	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	872	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	873	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	874	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	875	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	876	}
811	break;	877	break;
812		878
813	case SDL_MOUSEBUTTONDOWN:	879	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	880	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	881	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		882
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	883	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	884	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	885	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	886	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	891	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	892	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	893	break;
828	}	894	}
829		895
830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	896	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831	}	897	}
832	}	898	}
833		899
834	int	900	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	901	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
894	}	960	}
895	}	961	}
896	#endif	962	#endif
897	}	963	}
898		964
899	void	965	int
900	add_font (char *file)	966	add_font (char *file)
901	CODE:	967	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	968	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		969	OUTPUT:
		970	RETVAL
903		971
904	void	972	void
905	load_image_inline (SV *image_)	973	load_image_inline (SV *image_)
906	ALIAS:	974	ALIAS:
907	load_image_file = 1	975	load_image_file = 1
…		…
1023	#if DEBUG	1091	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1092	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1093	#endif
1026	}	1094	}
1027		1095
1028	MODULE = CFPlus PACKAGE = CFPlus::Font	1096	MODULE = Deliantra::Client PACKAGE = DC::Font
1029		1097
1030	PROTOTYPES: DISABLE	1098	PROTOTYPES: DISABLE
1031		1099
1032	CFPlus::Font	1100	DC::Font
1033	new_from_file (SV class, char path, int id = 0)	1101	new_from_file (SV class, char path, int id = 0)
1034	CODE:	1102	CODE:
1035	{	1103	{
1036	int count;	1104	int count;
1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1105	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1040	}	1108	}
1041	OUTPUT:	1109	OUTPUT:
1042	RETVAL	1110	RETVAL
1043		1111
1044	void	1112	void
1045	DESTROY (CFPlus::Font self)	1113	DESTROY (DC::Font self)
1046	CODE:	1114	CODE:
1047	pango_font_description_free (self);	1115	pango_font_description_free (self);
1048		1116
1049	void	1117	void
1050	make_default (CFPlus::Font self)	1118	make_default (DC::Font self)
1051	PROTOTYPE: $	1119	PROTOTYPE: $
1052	CODE:	1120	CODE:
1053	default_font = self;	1121	default_font = self;
1054		1122
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1123	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1124
1057	PROTOTYPES: DISABLE	1125	PROTOTYPES: DISABLE
1058		1126
1059	void	1127	void
1060	glyph_cache_backup ()	1128	glyph_cache_backup ()
…		…
1066	glyph_cache_restore ()	1134	glyph_cache_restore ()
1067	PROTOTYPE:	1135	PROTOTYPE:
1068	CODE:	1136	CODE:
1069	tc_restore ();	1137	tc_restore ();
1070		1138
1071	CFPlus::Layout	1139	DC::Layout
1072	new (SV *class)	1140	new (SV *class)
1073	CODE:	1141	CODE:
1074	New (0, RETVAL, 1, struct cf_layout);	1142	New (0, RETVAL, 1, struct cf_layout);
1075		1143
1076	RETVAL->pl = pango_layout_new (opengl_context);	1144	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1086	layout_update_font (RETVAL);	1154	layout_update_font (RETVAL);
1087	OUTPUT:	1155	OUTPUT:
1088	RETVAL	1156	RETVAL
1089		1157
1090	void	1158	void
1091	DESTROY (CFPlus::Layout self)	1159	DESTROY (DC::Layout self)
1092	CODE:	1160	CODE:
1093	g_object_unref (self->pl);	1161	g_object_unref (self->pl);
1094	rc_free (self->rc);	1162	rc_free (self->rc);
1095	Safefree (self);	1163	Safefree (self);
1096		1164
1097	void	1165	void
1098	set_text (CFPlus::Layout self, SV *text_)	1166	set_text (DC::Layout self, SV *text_)
1099	CODE:	1167	CODE:
1100	{	1168	{
1101	STRLEN textlen;	1169	STRLEN textlen;
1102	char *text = SvPVutf8 (text_, textlen);	1170	char *text = SvPVutf8 (text_, textlen);
1103		1171
1104	pango_layout_set_text (self->pl, text, textlen);	1172	pango_layout_set_text (self->pl, text, textlen);
1105	}	1173	}
1106		1174
1107	void	1175	void
1108	set_markup (CFPlus::Layout self, SV *text_)	1176	set_markup (DC::Layout self, SV *text_)
1109	CODE:	1177	CODE:
1110	{	1178	{
1111	STRLEN textlen;	1179	STRLEN textlen;
1112	char *text = SvPVutf8 (text_, textlen);	1180	char *text = SvPVutf8 (text_, textlen);
1113		1181
1114	pango_layout_set_markup (self->pl, text, textlen);	1182	pango_layout_set_markup (self->pl, text, textlen);
1115	}	1183	}
1116		1184
1117	void	1185	void
1118	set_shapes (CFPlus::Layout self, ...)	1186	set_shapes (DC::Layout self, ...)
1119	CODE:	1187	CODE:
1120	{	1188	{
1121	PangoAttrList *attrs = 0;	1189	PangoAttrList *attrs = 0;
1122	const char *text = pango_layout_get_text (self->pl);	1190	const char *text = pango_layout_get_text (self->pl);
1123	const char *pos = text;	1191	const char *pos = text;
…		…
1158	if (attrs)	1226	if (attrs)
1159	pango_layout_set_attributes (self->pl, attrs);	1227	pango_layout_set_attributes (self->pl, attrs);
1160	}	1228	}
1161		1229
1162	void	1230	void
1163	get_shapes (CFPlus::Layout self)	1231	get_shapes (DC::Layout self)
1164	PPCODE:	1232	PPCODE:
1165	{	1233	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1234	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1235
1168	do	1236	do
1169	{	1237	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1238	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1239
1172	if (run && shape_attr_p (run))	1240	if (run && shape_attr_p (run))
1173	{	1241	{
1174	PangoRectangle extents;	1242	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1243	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1183		1251
1184	pango_layout_iter_free (iter);	1252	pango_layout_iter_free (iter);
1185	}	1253	}
1186		1254
1187	int	1255	int
1188	has_wrapped (CFPlus::Layout self)	1256	has_wrapped (DC::Layout self)
1189	CODE:	1257	CODE:
1190	{	1258	{
1191	int lines = 1;	1259	int lines = 1;
1192	const char *text = pango_layout_get_text (self->pl);	1260	const char *text = pango_layout_get_text (self->pl);
1193		1261
…		…
1198	}	1266	}
1199	OUTPUT:	1267	OUTPUT:
1200	RETVAL	1268	RETVAL
1201		1269
1202	SV *	1270	SV *
1203	get_text (CFPlus::Layout self)	1271	get_text (DC::Layout self)
1204	CODE:	1272	CODE:
1205	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1273	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206	sv_utf8_decode (RETVAL);	1274	sv_utf8_decode (RETVAL);
1207	OUTPUT:	1275	OUTPUT:
1208	RETVAL	1276	RETVAL
1209		1277
1210	void	1278	void
1211	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1279	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212	CODE:	1280	CODE:
1213	self->r = r;	1281	self->r = r;
1214	self->g = g;	1282	self->g = g;
1215	self->b = b;	1283	self->b = b;
1216	self->a = a;	1284	self->a = a;
1217		1285
1218	void	1286	void
1219	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1287	set_font (DC::Layout self, DC::Font font = 0)
1220	CODE:	1288	CODE:
1221	if (self->font != font)	1289	if (self->font != font)
1222	{	1290	{
1223	self->font = font;	1291	self->font = font;
1224	layout_update_font (self);	1292	layout_update_font (self);
1225	}	1293	}
1226		1294
1227	void	1295	void
1228	set_height (CFPlus::Layout self, int base_height)	1296	set_height (DC::Layout self, int base_height)
1229	CODE:	1297	CODE:
1230	if (self->base_height != base_height)	1298	if (self->base_height != base_height)
1231	{	1299	{
1232	self->base_height = base_height;	1300	self->base_height = base_height;
1233	layout_update_font (self);	1301	layout_update_font (self);
1234	}	1302	}
1235		1303
1236	void	1304	void
1237	set_width (CFPlus::Layout self, int max_width = -1)	1305	set_width (DC::Layout self, int max_width = -1)
1238	CODE:	1306	CODE:
1239	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1307	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240		1308
1241	void	1309	void
1242	set_indent (CFPlus::Layout self, int indent)	1310	set_indent (DC::Layout self, int indent)
1243	CODE:	1311	CODE:
1244	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1312	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245		1313
1246	void	1314	void
1247	set_spacing (CFPlus::Layout self, int spacing)	1315	set_spacing (DC::Layout self, int spacing)
1248	CODE:	1316	CODE:
1249	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1317	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250		1318
1251	void	1319	void
1252	set_ellipsise (CFPlus::Layout self, int ellipsise)	1320	set_ellipsise (DC::Layout self, int ellipsise)
1253	CODE:	1321	CODE:
1254	pango_layout_set_ellipsize (self->pl,	1322	pango_layout_set_ellipsize (self->pl,
1255	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1323	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1324	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1325	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258	: PANGO_ELLIPSIZE_NONE	1326	: PANGO_ELLIPSIZE_NONE
1259	);	1327	);
1260		1328
1261	void	1329	void
1262	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1330	set_single_paragraph_mode (DC::Layout self, int spm)
1263	CODE:	1331	CODE:
1264	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1332	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265		1333
1266	void	1334	void
1267	size (CFPlus::Layout self)	1335	size (DC::Layout self)
1268	PPCODE:	1336	PPCODE:
1269	{	1337	{
1270	int w, h;	1338	int w, h;
1271		1339
1272	layout_get_pixel_size (self, &w, &h);	1340	layout_get_pixel_size (self, &w, &h);
…		…
1275	PUSHs (sv_2mortal (newSViv (w)));	1343	PUSHs (sv_2mortal (newSViv (w)));
1276	PUSHs (sv_2mortal (newSViv (h)));	1344	PUSHs (sv_2mortal (newSViv (h)));
1277	}	1345	}
1278		1346
1279	int	1347	int
1280	descent (CFPlus::Layout self)	1348	descent (DC::Layout self)
1281	CODE:	1349	CODE:
1282	{	1350	{
1283	PangoRectangle rect;	1351	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1352	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1353	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1354	RETVAL = PANGO_DESCENT (rect);
1287	}	1355	}
1288	OUTPUT:	1356	OUTPUT:
1289	RETVAL	1357	RETVAL
1290		1358
1291	int	1359	int
1292	xy_to_index (CFPlus::Layout self, int x, int y)	1360	xy_to_index (DC::Layout self, int x, int y)
1293	CODE:	1361	CODE:
1294	{	1362	{
1295	int index, trailing;	1363	int index, trailing;
1296	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1364	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297	RETVAL = index + trailing;	1365	RETVAL = index + trailing;
1298	}	1366	}
1299	OUTPUT:	1367	OUTPUT:
1300	RETVAL	1368	RETVAL
1301		1369
1302	void	1370	void
1303	cursor_pos (CFPlus::Layout self, int index)	1371	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1372	PPCODE:
1305	{	1373	{
1306	PangoRectangle strong_pos;	1374	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1375	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308		1376
1309	EXTEND (SP, 3);	1377	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1378	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1379	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1380	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1381	}
1314		1382
1315	void	1383	void
1316	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1384	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317	PPCODE:	1385	PPCODE:
1318	{	1386	{
1319	int line, x;	1387	int line, x;
1320		1388
1321	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1389	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1390	#if !PANGO_VERSION_CHECK (1, 17, 3)
1322	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1391	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323		1392	--line;
		1393	#endif
1324	EXTEND (SP, 2);	1394	EXTEND (SP, 2);
1325	PUSHs (sv_2mortal (newSViv (line - 1)));	1395	PUSHs (sv_2mortal (newSViv (line)));
1326	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1396	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327	}	1397	}
1328		1398
1329	void	1399	void
1330	line_x_to_index (CFPlus::Layout self, int line, int x)	1400	line_x_to_index (DC::Layout self, int line, int x)
1331	PPCODE:	1401	PPCODE:
1332	{	1402	{
1333	PangoLayoutLine *lp;	1403	PangoLayoutLine *lp;
1334	int index, trailing;	1404	int index, trailing;
1335		1405
1336	if (line < 0)	1406	if (line < 0)
1337	XSRETURN_EMPTY;	1407	XSRETURN_EMPTY;
1338		1408
1339	if (!(lp = pango_layout_get_line (self->pl, line)))	1409	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340	XSRETURN_EMPTY; /* do better */	1410	XSRETURN_EMPTY; /* do better */
1341		1411
1342	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1412	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343		1413
1344	EXTEND (SP, 2);	1414	EXTEND (SP, 2);
…		…
1350	PUSHs (sv_2mortal (newSViv (trailing)));	1420	PUSHs (sv_2mortal (newSViv (trailing)));
1351	}	1421	}
1352	}	1422	}
1353		1423
1354	void	1424	void
1355	render (CFPlus::Layout self, float x, float y, int flags = 0)	1425	render (DC::Layout self, float x, float y, int flags = 0)
1356	CODE:	1426	CODE:
1357	rc_clear (self->rc);	1427	rc_clear (self->rc);
1358	pango_opengl_render_layout_subpixel (	1428	pango_opengl_render_layout_subpixel (
1359	self->pl,	1429	self->pl,
1360	self->rc,	1430	self->rc,
…		…
1365	// we assume that context_change actually clears/frees stuff	1435	// we assume that context_change actually clears/frees stuff
1366	// and does not do any recomputation...	1436	// and does not do any recomputation...
1367	pango_layout_context_changed (self->pl);	1437	pango_layout_context_changed (self->pl);
1368		1438
1369	void	1439	void
1370	draw (CFPlus::Layout self)	1440	draw (DC::Layout self)
1371	CODE:	1441	CODE:
1372	{	1442	{
1373	glEnable (GL_TEXTURE_2D);	1443	glEnable (GL_TEXTURE_2D);
1374	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1444	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375	glEnable (GL_BLEND);	1445	glEnable (GL_BLEND);
…		…
1383	glDisable (GL_ALPHA_TEST);	1453	glDisable (GL_ALPHA_TEST);
1384	glDisable (GL_BLEND);	1454	glDisable (GL_BLEND);
1385	glDisable (GL_TEXTURE_2D);	1455	glDisable (GL_TEXTURE_2D);
1386	}	1456	}
1387		1457
1388	MODULE = CFPlus PACKAGE = CFPlus::Texture	1458	MODULE = Deliantra::Client PACKAGE = DC::Texture
1389		1459
1390	PROTOTYPES: ENABLE	1460	PROTOTYPES: ENABLE
1391		1461
1392	void	1462	void
1393	pad (SV *data_, int ow, int oh, int nw, int nh)	1463	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1472	RETVAL = width > 0;	1542	RETVAL = width > 0;
1473	}	1543	}
1474	OUTPUT:	1544	OUTPUT:
1475	RETVAL	1545	RETVAL
1476		1546
1477	MODULE = CFPlus PACKAGE = CFPlus::Map	1547	MODULE = Deliantra::Client PACKAGE = DC::Map
1478		1548
1479	PROTOTYPES: DISABLE	1549	PROTOTYPES: DISABLE
1480		1550
1481	CFPlus::Map	1551	DC::Map
1482	new (SV *class)	1552	new (SV *class)
1483	CODE:	1553	CODE:
1484	New (0, RETVAL, 1, struct map);	1554	New (0, RETVAL, 1, struct map);
1485	RETVAL->x = 0;	1555	RETVAL->x = 0;
1486	RETVAL->y = 0;	1556	RETVAL->y = 0;
…		…
1494	RETVAL->row = 0;	1564	RETVAL->row = 0;
1495	OUTPUT:	1565	OUTPUT:
1496	RETVAL	1566	RETVAL
1497		1567
1498	void	1568	void
1499	DESTROY (CFPlus::Map self)	1569	DESTROY (DC::Map self)
1500	CODE:	1570	CODE:
1501	{	1571	{
1502	map_clear (self);	1572	map_clear (self);
1503	Safefree (self->face2tile);	1573	Safefree (self->face2tile);
1504	Safefree (self->tex);	1574	Safefree (self->tex);
1505	Safefree (self);	1575	Safefree (self);
1506	}	1576	}
1507		1577
1508	void	1578	void
1509	resize (CFPlus::Map self, int map_width, int map_height)	1579	resize (DC::Map self, int map_width, int map_height)
1510	CODE:	1580	CODE:
1511	self->w = map_width;	1581	self->w = map_width;
1512	self->h = map_height;	1582	self->h = map_height;
1513		1583
1514	void	1584	void
1515	clear (CFPlus::Map self)	1585	clear (DC::Map self)
1516	CODE:	1586	CODE:
1517	map_clear (self);	1587	map_clear (self);
1518		1588
1519	void	1589	void
1520	set_tileid (CFPlus::Map self, int face, int tile)	1590	set_tileid (DC::Map self, int face, int tile)
1521	CODE:	1591	CODE:
1522	{	1592	{
1523	need_facenum (self, face); self->face2tile [face] = tile;	1593	need_facenum (self, face); self->face2tile [face] = tile;
1524	need_texid (self, tile);	1594	need_texid (self, tile);
1525	}	1595	}
1526		1596
1527	void	1597	void
1528	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1598	set_smooth (DC::Map self, int face, int smooth, int level)
1529	CODE:	1599	CODE:
1530	{	1600	{
1531	tileid texid;	1601	tileid texid;
1532	maptex *tex;	1602	maptex *tex;
1533		1603
…		…
1546	tex->smoothtile = self->face2tile [smooth];	1616	tex->smoothtile = self->face2tile [smooth];
1547	tex->smoothlevel = level;	1617	tex->smoothlevel = level;
1548	}	1618	}
1549		1619
1550	void	1620	void
1551	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)	1621	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)
1552	CODE:	1622	CODE:
1553	{	1623	{
1554	need_texid (self, texid);	1624	need_texid (self, texid);
1555		1625
1556	{	1626	{
…		…
1576	// from transparent color bleeding and ugly wrapping effects.	1646	// from transparent color bleeding and ugly wrapping effects.
1577	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1647	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578	}	1648	}
1579		1649
1580	int	1650	int
1581	ox (CFPlus::Map self)	1651	ox (DC::Map self)
1582	ALIAS:	1652	ALIAS:
1583	oy = 1	1653	oy = 1
1584	x = 2	1654	x = 2
1585	y = 3	1655	y = 3
1586	w = 4	1656	w = 4
…		…
1597	}	1667	}
1598	OUTPUT:	1668	OUTPUT:
1599	RETVAL	1669	RETVAL
1600		1670
1601	void	1671	void
1602	scroll (CFPlus::Map self, int dx, int dy)	1672	scroll (DC::Map self, int dx, int dy)
1603	CODE:	1673	CODE:
1604	{	1674	{
1605	if (dx > 0)	1675	if (dx > 0)
1606	map_blank (self, self->x, self->y, dx, self->h);	1676	map_blank (self, self->x, self->y, dx, self->h);
1607	else if (dx < 0)	1677	else if (dx < 0)
…		…
1623	self->y += MAP_EXTEND_Y;	1693	self->y += MAP_EXTEND_Y;
1624	}	1694	}
1625	}	1695	}
1626		1696
1627	SV *	1697	SV *
1628	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1698	map1a_update (DC::Map self, SV *data_, int extmap)
1629	CODE:	1699	CODE:
1630	{	1700	{
1631	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1701	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1632	uint8_t data_end = (uint8_t )SvEND (data_);	1702	uint8_t data_end = (uint8_t )SvEND (data_);
1633	mapcell *cell;	1703	mapcell *cell;
…		…
1661	uint8_t ext, cmd;	1731	uint8_t ext, cmd;
1662		1732
1663	do	1733	do
1664	{	1734	{
1665	ext = *data++;	1735	ext = *data++;
1666	cmd = ext & 0x3f;	1736	cmd = ext & 0x7f;
1667		1737
1668	if (cmd < 4)	1738	if (cmd < 4)
1669	cell->darkness = 255 - ext * 64 + 1;	1739	cell->darkness = 255 - ext * 64 + 1;
1670	else if (cmd == 5) // health	1740	else if (cmd == 5) // health
1671	{	1741	{
…		…
1674	}	1744	}
1675	else if (cmd == 6) // monster width	1745	else if (cmd == 6) // monster width
1676	cell->stat_width = *data++ + 1;	1746	cell->stat_width = *data++ + 1;
1677	else if (cmd == 0x47)	1747	else if (cmd == 0x47)
1678	{	1748	{
1679	if (*data == 4)	1749	if (*data == 1) cell->player = data [1];
1680	; // decode player count	1750	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1751	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1752	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681		1753
1682	data += *data + 1;	1754	data += *data + 1;
1683	}	1755	}
1684	else if (cmd == 8) // cell flags	1756	else if (cmd == 8) // cell flags
1685	cell->flags = *data++;	1757	cell->flags = *data++;
…		…
1715	}	1787	}
1716	}	1788	}
1717	}	1789	}
1718	}	1790	}
1719	else	1791	else
1720	cell->darkness = 0;	1792	CELL_CLEAR (cell);
1721	}	1793	}
1722	}	1794	}
1723	OUTPUT:	1795	OUTPUT:
1724	RETVAL	1796	RETVAL
1725		1797
1726	SV *	1798	SV *
1727	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1799	mapmap (DC::Map self, int x0, int y0, int w, int h)
1728	CODE:	1800	CODE:
1729	{	1801	{
1730	int x1, x;	1802	int x1, x;
1731	int y1, y;	1803	int y1, y;
1732	int z;	1804	int z;
…		…
1777	}	1849	}
1778	OUTPUT:	1850	OUTPUT:
1779	RETVAL	1851	RETVAL
1780		1852
1781	void	1853	void
1782	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1854	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783	CODE:	1855	CODE:
1784	{	1856	{
1785	int x, y, z;	1857	int x, y, z;
1786		1858
1787	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1859	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1788	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1860	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1861	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790	smooth_key skey;	1862	smooth_key skey;
1791		1863	int pl_x, pl_y;
		1864	maptex pl_tex;
1792	rc_t *rc = rc_alloc ();	1865	rc_t *rc = rc_alloc ();
1793	rc_key_t key;	1866	rc_key_t key;
1794	rc_array_t *arr;	1867	rc_array_t *arr;
		1868
		1869	pl_tex.name = 0;
1795		1870
1796	// thats current max. sorry.	1871	// thats current max. sorry.
1797	if (sw > 255) sw = 255;	1872	if (sw > 255) sw = 255;
1798	if (sh > 255) sh = 255;	1873	if (sh > 255) sh = 255;
1799		1874
…		…
1854	tileid tile = cell->tile [z];	1929	tileid tile = cell->tile [z];
1855		1930
1856	if (tile)	1931	if (tile)
1857	{	1932	{
1858	maptex tex = self->tex [tile];	1933	maptex tex = self->tex [tile];
1859	int px, py;	1934	int px = (x + 1) * T - tex.w;
		1935	int py = (y + 1) * T - tex.h;
1860		1936
1861	if (key.texname != tex.name)	1937	if (key.texname != tex.name)
1862	{	1938	{
1863	if (!tex.name)	1939	if (!tex.name)
1864	tex = self->tex [2]; /* missing, replace by noface */	1940	tex = self->tex [2]; /* missing, replace by noface */
1865		1941
1866	key.texname = tex.name;	1942	key.texname = tex.name;
1867	arr = rc_array (rc, &key);	1943	arr = rc_array (rc, &key);
1868	}	1944	}
1869		1945
1870	px = (x + 1) * T - tex.w;	1946	if (expect_false (cell->player == player) && expect_false (z == 2))
1871	py = (y + 1) * T - tex.h;	1947	{
		1948	pl_x = px;
		1949	pl_y = py;
		1950	pl_tex = tex;
		1951	continue;
		1952	}
1872		1953
1873	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1954	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1955	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1956	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1957	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877		1958
1878	if (cell->flags && z == 2)	1959	if (expect_false (cell->flags) && expect_false (z == 2))
1879	{	1960	{
1880	// overlays such as the speech bubble, probably more to come	1961	// overlays such as the speech bubble, probably more to come
1881	if (cell->flags & 1)	1962	if (cell->flags & 1)
1882	{	1963	{
1883	maptex tex = self->tex [1];	1964	maptex tex = self->tex [1];
…		…
2022	}	2103	}
2023		2104
2024	hv_clear (smooth);	2105	hv_clear (smooth);
2025	}	2106	}
2026		2107
		2108	if (pl_tex.name)
		2109	{
		2110	maptex tex = pl_tex;
		2111	int px = pl_x + sdx;
		2112	int py = pl_y + sdy;
		2113
		2114	key.texname = tex.name;
		2115	arr = rc_array (rc, &key);
		2116
		2117	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2118	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2119	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2120	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2121
		2122	rc_draw (rc);
		2123	}
		2124
2027	glDisable (GL_BLEND);	2125	glDisable (GL_BLEND);
2028	rc_free (rc);	2126	rc_free (rc);
2029		2127
2030	// top layer: overlays such as the health bar	2128	// top layer: overlays such as the health bar
2031	for (y = 0; y < sh; y++)	2129	for (y = 0; y < sh; y++)
…		…
2058	}	2156	}
2059	}	2157	}
2060	}	2158	}
2061		2159
2062	void	2160	void
2063	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2161	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2064	CODE:	2162	CODE:
2065	{	2163	{
2066	static float color[16][3] = {	2164	static float color[16][3] = {
2067	{ 0.00F, 0.00F, 0.00F },	2165	{ 0.00F, 0.00F, 0.00F },
2068	{ 1.00F, 1.00F, 1.00F },	2166	{ 1.00F, 1.00F, 1.00F },
…		…
2118	glDisable (GL_BLEND);	2216	glDisable (GL_BLEND);
2119	glDisable (GL_TEXTURE_2D);	2217	glDisable (GL_TEXTURE_2D);
2120	}	2218	}
2121		2219
2122	void	2220	void
2123	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2221	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124	PPCODE:	2222	PPCODE:
2125	{	2223	{
2126	int x, y;	2224	int x, y;
2127	int sw1 = sw + 2;	2225	int sw1 = sw + 2;
2128	int sh1 = sh + 2;	2226	int sh1 = sh + 2;
…		…
2199	PUSHs (sv_2mortal (newSViv (sh3)));	2297	PUSHs (sv_2mortal (newSViv (sh3)));
2200	PUSHs (darkness3_sv);	2298	PUSHs (darkness3_sv);
2201	}	2299	}
2202		2300
2203	SV *	2301	SV *
2204	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2302	get_rect (DC::Map self, int x0, int y0, int w, int h)
2205	CODE:	2303	CODE:
2206	{	2304	{
2207	int x, y, x1, y1;	2305	int x, y, x1, y1;
2208	SV data_sv = newSV (w h * 7 + 5);	2306	SV data_sv = newSV (w h * 7 + 5);
2209	uint8_t data = (uint8_t )SvPVX (data_sv);	2307	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2266	else	2364	else
2267	*data++ = 0;	2365	*data++ = 0;
2268	}	2366	}
2269	}	2367	}
2270		2368
		2369	/* if size is wh + 5 then no data has been found /
		2370	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2371	{
2271	SvPOK_only (data_sv);	2372	SvPOK_only (data_sv);
2272	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2373	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2374	}
		2375
2273	RETVAL = data_sv;	2376	RETVAL = data_sv;
2274	}	2377	}
2275	OUTPUT:	2378	OUTPUT:
2276	RETVAL	2379	RETVAL
2277		2380
2278	void	2381	void
2279	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2382	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280	PPCODE:	2383	PPCODE:
2281	{	2384	{
2282	int x, y, z;	2385	int x, y, z;
2283	int w, h;	2386	int w, h;
2284	int x1, y1;	2387	int x1, y1;
		2388	STRLEN len;
		2389	uint8_t data, end;
		2390
		2391	len = SvLEN (data_sv);
		2392	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2393	data = SvPVbyte_nolen (data_sv);
		2394	end = data + len + 8;
		2395
		2396	if (len < 5)
		2397	XSRETURN_EMPTY;
2285		2398
2286	if (*data++ != 0)	2399	if (*data++ != 0)
2287	XSRETURN_EMPTY; /* version mismatch */	2400	XSRETURN_EMPTY; /* version mismatch */
2288		2401
2289	w = data++ << 8; w \|= data++;	2402	w = data++ << 8; w \|= data++;
…		…
2304	{	2417	{
2305	maprow *row = map_get_row (self, y);	2418	maprow *row = map_get_row (self, y);
2306		2419
2307	for (x = x0; x < x1; x++)	2420	for (x = x0; x < x1; x++)
2308	{	2421	{
		2422	uint8_t flags;
		2423
		2424	if (data + 7 >= end)
		2425	XSRETURN_EMPTY;
		2426
2309	uint8_t flags = *data++;	2427	flags = *data++;
2310		2428
2311	if (flags)	2429	if (flags)
2312	{	2430	{
2313	mapcell *cell = row_get_cell (row, x);	2431	mapcell *cell = row_get_cell (row, x);
2314	tileid tile[3] = { 0, 0, 0 };	2432	tileid tile[3] = { 0, 0, 0 };
…		…
2317	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2435	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2318	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2436	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2319		2437
2320	if (cell->darkness == 0)	2438	if (cell->darkness == 0)
2321	{	2439	{
2322	cell->darkness = 0;	2440	/cell->darkness = 0;/
		2441	EXTEND (SP, 3);
2323		2442
2324	for (z = 0; z <= 2; z++)	2443	for (z = 0; z <= 2; z++)
2325	{	2444	{
2326	tileid t = tile [z];	2445	tileid t = tile [z];
2327		2446
2328	if (t >= self->texs \|\| (t && !self->tex [t].name))	2447	if (t >= self->texs \|\| (t && !self->tex [t].name))
2329	{	2448	{
2330	XPUSHs (sv_2mortal (newSViv (t)));	2449	PUSHs (sv_2mortal (newSViv (t)));
2331	need_texid (self, t);	2450	need_texid (self, t);
2332	}	2451	}
2333		2452
2334	cell->tile [z] = t;	2453	cell->tile [z] = t;
2335	}	2454	}
…		…
2337	}	2456	}
2338	}	2457	}
2339	}	2458	}
2340	}	2459	}
2341		2460
2342	MODULE = CFPlus PACKAGE = CFPlus::RW	2461	MODULE = Deliantra::Client PACKAGE = DC::RW
2343		2462
2344	CFPlus::RW	2463	DC::RW
2345	new (SV class, SV data_sv)	2464	new (SV class, SV data_sv)
2346	CODE:	2465	CODE:
2347	{	2466	{
2348	STRLEN datalen;	2467	STRLEN datalen;
2349	char *data = SvPVbyte (data_sv, datalen);	2468	char *data = SvPVbyte (data_sv, datalen);
…		…
2351	RETVAL = SDL_RWFromConstMem (data, datalen);	2470	RETVAL = SDL_RWFromConstMem (data, datalen);
2352	}	2471	}
2353	OUTPUT:	2472	OUTPUT:
2354	RETVAL	2473	RETVAL
2355		2474
2356	CFPlus::RW	2475	DC::RW
2357	new_from_file (SV class, const char path, const char *mode = "rb")	2476	new_from_file (SV class, const char path, const char *mode = "rb")
2358	CODE:	2477	CODE:
2359	RETVAL = SDL_RWFromFile (path, mode);	2478	RETVAL = SDL_RWFromFile (path, mode);
2360	OUTPUT:	2479	OUTPUT:
2361	RETVAL	2480	RETVAL
2362		2481
2363	# fails on win32:	2482	# fails on win32:
2364	# CFPlus.xs(2268) : error C2059: syntax error : '('	2483	# dc.xs(2268) : error C2059: syntax error : '('
2365	#void	2484	#void
2366	#close (CFPlus::RW self)	2485	#close (DC::RW self)
2367	# CODE:	2486	# CODE:
2368	# (self->(close)) (self);	2487	# (self->(close)) (self);
2369		2488
2370	MODULE = CFPlus PACKAGE = CFPlus::Channel	2489	MODULE = Deliantra::Client PACKAGE = DC::Channel
2371		2490
2372	PROTOTYPES: DISABLE	2491	PROTOTYPES: DISABLE
2373		2492
2374	CFPlus::Channel	2493	DC::Channel
2375	find ()	2494	find ()
2376	CODE:	2495	CODE:
2377	{	2496	{
2378	RETVAL = Mix_GroupAvailable (-1);	2497	RETVAL = Mix_GroupAvailable (-1);
2379		2498
…		…
2392	}	2511	}
2393	OUTPUT:	2512	OUTPUT:
2394	RETVAL	2513	RETVAL
2395		2514
2396	void	2515	void
2397	halt (CFPlus::Channel self)	2516	halt (DC::Channel self)
2398	CODE:	2517	CODE:
2399	Mix_HaltChannel (self);	2518	Mix_HaltChannel (self);
2400		2519
2401	void	2520	void
2402	expire (CFPlus::Channel self, int ticks = -1)	2521	expire (DC::Channel self, int ticks = -1)
2403	CODE:	2522	CODE:
2404	Mix_ExpireChannel (self, ticks);	2523	Mix_ExpireChannel (self, ticks);
2405		2524
2406	void	2525	void
2407	fade_out (CFPlus::Channel self, int ticks = -1)	2526	fade_out (DC::Channel self, int ticks = -1)
2408	CODE:	2527	CODE:
2409	Mix_FadeOutChannel (self, ticks);	2528	Mix_FadeOutChannel (self, ticks);
2410		2529
2411	int	2530	int
2412	volume (CFPlus::Channel self, int volume)	2531	volume (DC::Channel self, int volume)
2413	CODE:	2532	CODE:
2414	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2533	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415	OUTPUT:	2534	OUTPUT:
2416	RETVAL	2535	RETVAL
2417		2536
2418	void	2537	void
2419	unregister_all_effects (CFPlus::Channel self)	2538	unregister_all_effects (DC::Channel self)
2420	CODE:	2539	CODE:
2421	Mix_UnregisterAllEffects (self);	2540	Mix_UnregisterAllEffects (self);
2422		2541
2423	void	2542	void
2424	set_panning (CFPlus::Channel self, int left, int right)	2543	set_panning (DC::Channel self, int left, int right)
2425	CODE:	2544	CODE:
2426	left = CLAMP (left , 0, 255);	2545	left = CLAMP (left , 0, 255);
2427	right = CLAMP (right, 0, 255);	2546	right = CLAMP (right, 0, 255);
2428	Mix_SetPanning (self, left, right);	2547	Mix_SetPanning (self, left, right);
2429		2548
2430	void	2549	void
2431	set_distance (CFPlus::Channel self, int distance)	2550	set_distance (DC::Channel self, int distance)
2432	CODE:	2551	CODE:
2433	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2552	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434		2553
2435	void	2554	void
2436	set_position (CFPlus::Channel self, int angle, int distance)	2555	set_position (DC::Channel self, int angle, int distance)
2437	CODE:	2556	CODE:
2438		2557
2439	void	2558	void
2440	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2559	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441	CODE:	2560	CODE:
2442	{	2561	{
2443	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2562	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2563	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2445	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2564	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446	}	2565	}
2447		2566
2448	void	2567	void
2449	set_reverse_stereo (CFPlus::Channel self, int flip)	2568	set_reverse_stereo (DC::Channel self, int flip)
2450	CODE:	2569	CODE:
2451	Mix_SetReverseStereo (self, flip);	2570	Mix_SetReverseStereo (self, flip);
2452		2571
2453	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2572	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454		2573
2455	PROTOTYPES: DISABLE	2574	PROTOTYPES: DISABLE
2456		2575
2457	CFPlus::MixChunk	2576	DC::MixChunk
2458	new (SV *class, CFPlus::RW rwops)	2577	new (SV *class, DC::RW rwops)
2459	CODE:	2578	CODE:
2460	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2579	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461	OUTPUT:	2580	OUTPUT:
2462	RETVAL	2581	RETVAL
2463		2582
2464	void	2583	void
2465	DESTROY (CFPlus::MixChunk self)	2584	DESTROY (DC::MixChunk self)
2466	CODE:	2585	CODE:
2467	Mix_FreeChunk (self);	2586	Mix_FreeChunk (self);
2468		2587
2469	int	2588	int
2470	volume (CFPlus::MixChunk self, int volume = -1)	2589	volume (DC::MixChunk self, int volume = -1)
2471	CODE:	2590	CODE:
2472	if (items > 1)	2591	if (items > 1)
2473	volume = CLAMP (volume, 0, 128);	2592	volume = CLAMP (volume, 0, 128);
2474	RETVAL = Mix_VolumeChunk (self, volume);	2593	RETVAL = Mix_VolumeChunk (self, volume);
2475	OUTPUT:	2594	OUTPUT:
2476	RETVAL	2595	RETVAL
2477		2596
2478	CFPlus::Channel	2597	DC::Channel
2479	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2598	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480	CODE:	2599	CODE:
2481	{	2600	{
2482	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2601	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483		2602
2484	if (RETVAL < 0)	2603	if (RETVAL < 0)
…		…
2491	}	2610	}
2492	}	2611	}
2493	OUTPUT:	2612	OUTPUT:
2494	RETVAL	2613	RETVAL
2495		2614
2496	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2615	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497		2616
2498	int	2617	int
2499	volume (int volume = -1)	2618	volume (int volume = -1)
2500	PROTOTYPE: ;$	2619	PROTOTYPE: ;$
2501	CODE:	2620	CODE:
…		…
2513	void	2632	void
2514	halt ()	2633	halt ()
2515	CODE:	2634	CODE:
2516	Mix_HaltMusic ();	2635	Mix_HaltMusic ();
2517		2636
2518	CFPlus::MixMusic	2637	DC::MixMusic
2519	new (SV *class, CFPlus::RW rwops)	2638	new (SV *class, DC::RW rwops)
2520	CODE:	2639	CODE:
2521	RETVAL = Mix_LoadMUS_RW (rwops);	2640	RETVAL = Mix_LoadMUS_RW (rwops);
2522	OUTPUT:	2641	OUTPUT:
2523	RETVAL	2642	RETVAL
2524		2643
2525	void	2644	void
2526	DESTROY (CFPlus::MixMusic self)	2645	DESTROY (DC::MixMusic self)
2527	CODE:	2646	CODE:
2528	Mix_FreeMusic (self);	2647	Mix_FreeMusic (self);
2529		2648
2530	int	2649	int
2531	play (CFPlus::MixMusic self, int loops = -1)	2650	play (DC::MixMusic self, int loops = -1)
2532	CODE:	2651	CODE:
2533	RETVAL = Mix_PlayMusic (self, loops);	2652	RETVAL = Mix_PlayMusic (self, loops);
2534	OUTPUT:	2653	OUTPUT:
2535	RETVAL	2654	RETVAL
2536		2655
2537	void	2656	void
2538	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2657	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539	CODE:	2658	CODE:
2540	Mix_FadeInMusicPos (self, loops, ms, position);	2659	Mix_FadeInMusicPos (self, loops, ms, position);
2541		2660
2542	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2661	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543		2662
2544	PROTOTYPES: ENABLE	2663	PROTOTYPES: ENABLE
2545		2664
2546	BOOT:	2665	BOOT:
2547	{	2666	{
2548	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2667	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549	static const struct {	2668	static const struct {
2550	const char *name;	2669	const char *name;
2551	IV iv;	2670	IV iv;
2552	} *civ, const_iv[] = {	2671	} *civ, const_iv[] = {
2553	# define const_iv(name) { # name, (IV)name }	2672	# define const_iv(name) { # name, (IV)name }
…		…
2846	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2965	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2847	CODE:	2966	CODE:
2848	if (gl.SeparableFilter2D)	2967	if (gl.SeparableFilter2D)
2849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2968	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850		2969
2851	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2970	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852		2971
2853	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2972	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854		2973
2855	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2974	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856		2975
…		…
2882		3001
2883	void glEndList ()	3002	void glEndList ()
2884		3003
2885	void glCallList (int list)	3004	void glCallList (int list)
2886		3005
2887	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3006	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888		3007
2889	PROTOTYPES: DISABLE	3008	PROTOTYPES: DISABLE
2890		3009
2891	void	3010	void
2892	find_widget (SV *self, NV x, NV y)	3011	find_widget (SV *self, NV x, NV y)
…		…
2896	XPUSHs (self);	3015	XPUSHs (self);
2897	}	3016	}
2898		3017
2899	BOOT:	3018	BOOT:
2900	{	3019	{
2901	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3020	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902		3021
2903	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3022	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3023	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3024	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3025	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907	}	3026	}
2908		3027
2909	void	3028	void
2910	draw (SV *self)	3029	draw (SV *self)
2911	CODE:	3030	CODE:
…		…
2918	SV *draw_w_sv = GvSV (draw_w_gv);	3037	SV *draw_w_sv = GvSV (draw_w_gv);
2919	SV *draw_h_sv = GvSV (draw_h_gv);	3038	SV *draw_h_sv = GvSV (draw_h_gv);
2920	double draw_x, draw_y;	3039	double draw_x, draw_y;
2921		3040
2922	if (!SvROK (self))	3041	if (!SvROK (self))
2923	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3042	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924		3043
2925	hv = (HV *)SvRV (self);	3044	hv = (HV *)SvRV (self);
2926		3045
2927	if (SvTYPE (hv) != SVt_PVHV)	3046	if (SvTYPE (hv) != SVt_PVHV)
2928	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3047	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929		3048
2930	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3049	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3050	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932		3051
2933	if (!h \|\| !w)	3052	if (!h \|\| !w)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.240 by root, Wed Dec 26 18:09:30 2007 UTC vs. Revision 1.268 by root, Sun Jul 20 02:57:43 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.240 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.268 by root, Sun Jul 20 02:57:43 2008 UTC