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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.251 by root, Fri Dec 28 17:28:01 2007 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	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
		52	# define pango_layout_get_line_readonly pango_layout_get_line_readonly
		53	# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
		54	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
		55	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
		56	#endif
		57
51	#ifndef _WIN32	58	#ifndef _WIN32
52	# include <sys/types.h>	59	# include <sys/types.h>
53	# include <sys/socket.h>	60	# include <sys/socket.h>
54	# include <netinet/in.h>	61	# include <netinet/in.h>
55	# include <netinet/tcp.h>	62	# include <netinet/tcp.h>
…		…
120		127
121	#include "pango-font.c"	128	#include "pango-font.c"
122	#include "pango-fontmap.c"	129	#include "pango-fontmap.c"
123	#include "pango-render.c"	130	#include "pango-render.c"
124		131
125	typedef IV CFPlus__Channel;	132	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	133	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	134	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	135	typedef Mix_Music *DC__MixMusic;
129		136
130	typedef PangoFontDescription *CFPlus__Font;	137	typedef PangoFontDescription *DC__Font;
131		138
132	static int	139	static int
133	shape_attr_p (PangoLayoutRun *run)	140	shape_attr_p (PangoLayoutRun *run)
134	{	141	{
135	GSList *attrs = run->item->analysis.extra_attrs;	142	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		156
150	typedef struct cf_layout {	157	typedef struct cf_layout {
151	PangoLayout *pl;	158	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	159	float r, g, b, a; // default color for rgba mode
153	int base_height;	160	int base_height;
154	CFPlus__Font font;	161	DC__Font font;
155	rc_t *rc;	162	rc_t *rc;
156	} *CFPlus__Layout;	163	} *DC__Layout;
157		164
158	static CFPlus__Font default_font;	165	static DC__Font default_font;
159	static PangoContext *opengl_context;	166	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	167	static PangoFontMap *opengl_fontmap;
161		168
162	static void	169	static void
163	substitute_func (FcPattern *pattern, gpointer data)	170	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	175	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	176	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	177	}
171		178
172	static void	179	static void
173	layout_update_font (CFPlus__Layout self)	180	layout_update_font (DC__Layout self)
174	{	181	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	182	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	183	* reasonably well with bitstream vera
177	*/	184	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	185	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
182		189
183	pango_layout_set_font_description (self->pl, font);	190	pango_layout_set_font_description (self->pl, font);
184	}	191	}
185		192
186	static void	193	static void
187	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	194	layout_get_pixel_size (DC__Layout self, int w, int h)
188	{	195	{
189	PangoRectangle rect;	196	PangoRectangle rect;
190		197
191	// get_pixel_* wrongly rounds down	198	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	199	pango_layout_get_extents (self->pl, 0, &rect);
…		…
203		210
204	typedef uint16_t tileid;	211	typedef uint16_t tileid;
205	typedef uint16_t faceid;	212	typedef uint16_t faceid;
206		213
207	typedef struct {	214	typedef struct {
208	int name;	215	GLuint name;
209	int w, h;	216	int w, h;
210	float s, t;	217	float s, t;
211	uint8_t r, g, b, a;	218	uint8_t r, g, b, a;
212	tileid smoothtile;	219	tileid smoothtile;
213	uint8_t smoothlevel;	220	uint8_t smoothlevel;
…		…
231	int faces; tileid *face2tile; // [faceid]	238	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	239	int texs; maptex *tex; // [tileid]
233		240
234	int32_t rows;	241	int32_t rows;
235	maprow *row;	242	maprow *row;
236	} *CFPlus__Map;	243	} *DC__Map;
237		244
238	static char *	245	static char *
239	prepend (char *ptr, int sze, int inc)	246	prepend (char *ptr, int sze, int inc)
240	{	247	{
241	char *p;	248	char *p;
…		…
279	self->texs *= 2;	286	self->texs *= 2;
280	}	287	}
281	}	288	}
282		289
283	static maprow *	290	static maprow *
284	map_get_row (CFPlus__Map self, int y)	291	map_get_row (DC__Map self, int y)
285	{	292	{
286	if (0 > y)	293	if (0 > y)
287	{	294	{
288	int extend = - y + MAP_EXTEND_Y;	295	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	296	Prepend (maprow, self->row, self->rows, extend);
…		…
327		334
328	return row->col + (x - row->c0);	335	return row->col + (x - row->c0);
329	}	336	}
330		337
331	static mapcell *	338	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	339	map_get_cell (DC__Map self, int x, int y)
333	{	340	{
334	return row_get_cell (map_get_row (self, y), x);	341	return row_get_cell (map_get_row (self, y), x);
335	}	342	}
336		343
337	static void	344	static void
338	map_clear (CFPlus__Map self)	345	map_clear (DC__Map self)
339	{	346	{
340	int r;	347	int r;
341		348
342	for (r = 0; r < self->rows; r++)	349	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	350	Safefree (self->row[r].col);
…		…
351	self->row = 0;	358	self->row = 0;
352	self->rows = 0;	359	self->rows = 0;
353	}	360	}
354		361
355	static void	362	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	363	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	364	{
358	int x, y;	365	int x, y;
359	maprow *row;	366	maprow *row;
360	mapcell *cell;	367	mapcell *cell;
361		368
…		…
440	n \|= n >> 16;	447	n \|= n >> 16;
441		448
442	return n + 1;	449	return n + 1;
443	}	450	}
444		451
		452	static unsigned int
		453	popcount (unsigned int n)
		454	{
		455	n -= (n >> 1) & 0x55555555U;
		456	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		457	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		458	n *= 0x01010101U;
		459
		460	return n >> 24;
		461	}
		462
445	/* SDL should provide this, really. */	463	/* SDL should provide this, really. */
446	#define SDLK_MODIFIER_MIN 300	464	#define SDLK_MODIFIER_MIN 300
447	#define SDLK_MODIFIER_MAX 314	465	#define SDLK_MODIFIER_MAX 314
448		466
449	/******************************************************************************/	467	/******************************************************************************/
…		…
487	return 0;	505	return 0;
488		506
489	return 1;	507	return 1;
490	}	508	}
491		509
492	MODULE = CFPlus PACKAGE = CFPlus	510	MODULE = Deliantra::Client PACKAGE = DC
493		511
494	PROTOTYPES: ENABLE	512	PROTOTYPES: ENABLE
495		513
496	BOOT:	514	BOOT:
497	{	515	{
498	HV *stash = gv_stashpv ("CFPlus", 1);	516	HV *stash = gv_stashpv ("DC", 1);
499	static const struct {	517	static const struct {
500	const char *name;	518	const char *name;
501	IV iv;	519	IV iv;
502	} *civ, const_iv[] = {	520	} *civ, const_iv[] = {
503	# define const_iv(name) { # name, (IV)name }	521	# define const_iv(name) { # name, (IV)name }
…		…
525		543
526	const_iv (SDL_APPINPUTFOCUS),	544	const_iv (SDL_APPINPUTFOCUS),
527	const_iv (SDL_APPMOUSEFOCUS),	545	const_iv (SDL_APPMOUSEFOCUS),
528	const_iv (SDL_APPACTIVE),	546	const_iv (SDL_APPACTIVE),
529		547
		548	const_iv (SDLK_FIRST),
		549	const_iv (SDLK_LAST),
530	const_iv (SDLK_KP0),	550	const_iv (SDLK_KP0),
531	const_iv (SDLK_KP1),	551	const_iv (SDLK_KP1),
532	const_iv (SDLK_KP2),	552	const_iv (SDLK_KP2),
533	const_iv (SDLK_KP3),	553	const_iv (SDLK_KP3),
534	const_iv (SDLK_KP4),	554	const_iv (SDLK_KP4),
…		…
606	const_iv (KMOD_LMETA),	626	const_iv (KMOD_LMETA),
607	const_iv (KMOD_RMETA),	627	const_iv (KMOD_RMETA),
608	const_iv (KMOD_NUM),	628	const_iv (KMOD_NUM),
609	const_iv (KMOD_CAPS),	629	const_iv (KMOD_CAPS),
610	const_iv (KMOD_MODE),	630	const_iv (KMOD_MODE),
		631
		632	const_iv (MIX_DEFAULT_FORMAT),
611	# undef const_iv	633	# undef const_iv
612	};	634	};
613		635
614	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	636	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	637	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
633		655
634	NV floor (NV x)	656	NV floor (NV x)
635		657
636	NV ceil (NV x)	658	NV ceil (NV x)
637		659
		660	IV minpot (UV n)
		661
		662	IV popcount (UV n)
		663
638	void	664	void
639	pango_init ()	665	pango_init ()
640	CODE:	666	CODE:
641	{	667	{
642	opengl_fontmap = pango_opengl_font_map_new ();	668	opengl_fontmap = pango_opengl_font_map_new ();
643	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	669	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	670	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		671	#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
		672	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		673	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		674	#endif
645	}	675	}
646		676
647	char *	677	char *
648	SDL_GetError ()	678	SDL_GetError ()
649		679
…		…
681	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	711	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
682		712
683	if (m && m != (SDL_Rect **)-1)	713	if (m && m != (SDL_Rect **)-1)
684	while (*m)	714	while (*m)
685	{	715	{
686	if ((m)->w >= 640 && (m)->h >= 480)	716	if ((m)->w >= 800 && (m)->h >= 480)
687	{	717	{
688	AV *av = newAV ();	718	AV *av = newAV ();
689	av_push (av, newSViv ((*m)->w));	719	av_push (av, newSViv ((*m)->w));
690	av_push (av, newSViv ((*m)->h));	720	av_push (av, newSViv ((*m)->h));
691	av_push (av, newSViv (rgb));	721	av_push (av, newSViv (rgb));
…		…
715		745
716	if (RETVAL)	746	if (RETVAL)
717	{	747	{
718	av_clear (texture_av);	748	av_clear (texture_av);
719		749
720	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	750	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	751	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722	#include "glfunc.h"	752	#include "glfunc.h"
723	#undef GL_FUNC	753	#undef GL_FUNC
724	}	754	}
725	}	755	}
…		…
806	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	836	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	837	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808	break;	838	break;
809	}	839	}
810		840
811	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	841	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812	}	842	}
813	}	843	}
814		844
815	int	845	int
816	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	846	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817	POSTCALL:	847	POSTCALL:
818	Mix_HookMusicFinished (music_finished);	848	Mix_HookMusicFinished (music_finished);
819	Mix_ChannelFinished (channel_finished);	849	Mix_ChannelFinished (channel_finished);
		850
		851	void
		852	Mix_QuerySpec ()
		853	PPCODE:
		854	{
		855	int freq, channels;
		856	Uint16 format;
		857
		858	if (Mix_QuerySpec (&freq, &format, &channels))
		859	{
		860	EXTEND (SP, 3);
		861	PUSHs (sv_2mortal (newSViv (freq)));
		862	PUSHs (sv_2mortal (newSViv (format)));
		863	PUSHs (sv_2mortal (newSViv (channels)));
		864	}
		865	}
820		866
821	void	867	void
822	Mix_CloseAudio ()	868	Mix_CloseAudio ()
823		869
824	int	870	int
…		…
958	void	1004	void
959	error (char *message)	1005	error (char *message)
960	CODE:	1006	CODE:
961	fprintf (stderr, "ERROR: %s\n", message);	1007	fprintf (stderr, "ERROR: %s\n", message);
962	#ifdef _WIN32	1008	#ifdef _WIN32
963	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1009	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
964	#endif	1010	#endif
965		1011
966	void	1012	void
967	fatal (char *message)	1013	fatal (char *message)
968	CODE:	1014	CODE:
969	fprintf (stderr, "FATAL: %s\n", message);	1015	fprintf (stderr, "FATAL: %s\n", message);
970	#ifdef _WIN32	1016	#ifdef _WIN32
971	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1017	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
972	#endif	1018	#endif
973	_exit (1);	1019	_exit (1);
974		1020
975	void	1021	void
976	_exit (int retval = 0)	1022	_exit (int retval = 0)
…		…
988	#if DEBUG	1034	#if DEBUG
989	VALGRIND_DO_LEAK_CHECK;	1035	VALGRIND_DO_LEAK_CHECK;
990	#endif	1036	#endif
991	}	1037	}
992		1038
993	MODULE = CFPlus PACKAGE = CFPlus::Font	1039	MODULE = Deliantra::Client PACKAGE = DC::Font
994		1040
995	PROTOTYPES: DISABLE	1041	PROTOTYPES: DISABLE
996		1042
997	CFPlus::Font	1043	DC::Font
998	new_from_file (SV class, char path, int id = 0)	1044	new_from_file (SV class, char path, int id = 0)
999	CODE:	1045	CODE:
1000	{	1046	{
1001	int count;	1047	int count;
1002	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1048	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1005	}	1051	}
1006	OUTPUT:	1052	OUTPUT:
1007	RETVAL	1053	RETVAL
1008		1054
1009	void	1055	void
1010	DESTROY (CFPlus::Font self)	1056	DESTROY (DC::Font self)
1011	CODE:	1057	CODE:
1012	pango_font_description_free (self);	1058	pango_font_description_free (self);
1013		1059
1014	void	1060	void
1015	make_default (CFPlus::Font self)	1061	make_default (DC::Font self)
1016	PROTOTYPE: $	1062	PROTOTYPE: $
1017	CODE:	1063	CODE:
1018	default_font = self;	1064	default_font = self;
1019		1065
1020	MODULE = CFPlus PACKAGE = CFPlus::Layout	1066	MODULE = Deliantra::Client PACKAGE = DC::Layout
1021		1067
1022	PROTOTYPES: DISABLE	1068	PROTOTYPES: DISABLE
1023		1069
1024	void	1070	void
1025	reset_glyph_cache ()	1071	glyph_cache_backup ()
1026	PROTOTYPE:	1072	PROTOTYPE:
1027	CODE:	1073	CODE:
		1074	tc_backup ();
		1075
		1076	void
		1077	glyph_cache_restore ()
		1078	PROTOTYPE:
		1079	CODE:
1028	tc_clear ();	1080	tc_restore ();
1029		1081
1030	CFPlus::Layout	1082	DC::Layout
1031	new (SV *class)	1083	new (SV *class)
1032	CODE:	1084	CODE:
1033	New (0, RETVAL, 1, struct cf_layout);	1085	New (0, RETVAL, 1, struct cf_layout);
1034		1086
1035	RETVAL->pl = pango_layout_new (opengl_context);	1087	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1045	layout_update_font (RETVAL);	1097	layout_update_font (RETVAL);
1046	OUTPUT:	1098	OUTPUT:
1047	RETVAL	1099	RETVAL
1048		1100
1049	void	1101	void
1050	DESTROY (CFPlus::Layout self)	1102	DESTROY (DC::Layout self)
1051	CODE:	1103	CODE:
1052	g_object_unref (self->pl);	1104	g_object_unref (self->pl);
1053	rc_free (self->rc);	1105	rc_free (self->rc);
1054	Safefree (self);	1106	Safefree (self);
1055		1107
1056	void	1108	void
1057	set_text (CFPlus::Layout self, SV *text_)	1109	set_text (DC::Layout self, SV *text_)
1058	CODE:	1110	CODE:
1059	{	1111	{
1060	STRLEN textlen;	1112	STRLEN textlen;
1061	char *text = SvPVutf8 (text_, textlen);	1113	char *text = SvPVutf8 (text_, textlen);
1062		1114
1063	pango_layout_set_text (self->pl, text, textlen);	1115	pango_layout_set_text (self->pl, text, textlen);
1064	}	1116	}
1065		1117
1066	void	1118	void
1067	set_markup (CFPlus::Layout self, SV *text_)	1119	set_markup (DC::Layout self, SV *text_)
1068	CODE:	1120	CODE:
1069	{	1121	{
1070	STRLEN textlen;	1122	STRLEN textlen;
1071	char *text = SvPVutf8 (text_, textlen);	1123	char *text = SvPVutf8 (text_, textlen);
1072		1124
1073	pango_layout_set_markup (self->pl, text, textlen);	1125	pango_layout_set_markup (self->pl, text, textlen);
1074	}	1126	}
1075		1127
1076	void	1128	void
1077	set_shapes (CFPlus::Layout self, ...)	1129	set_shapes (DC::Layout self, ...)
1078	CODE:	1130	CODE:
1079	{	1131	{
1080	PangoAttrList *attrs = 0;	1132	PangoAttrList *attrs = 0;
1081	const char *text = pango_layout_get_text (self->pl);	1133	const char *text = pango_layout_get_text (self->pl);
1082	const char *pos = text;	1134	const char *pos = text;
…		…
1117	if (attrs)	1169	if (attrs)
1118	pango_layout_set_attributes (self->pl, attrs);	1170	pango_layout_set_attributes (self->pl, attrs);
1119	}	1171	}
1120		1172
1121	void	1173	void
1122	get_shapes (CFPlus::Layout self)	1174	get_shapes (DC::Layout self)
1123	PPCODE:	1175	PPCODE:
1124	{	1176	{
1125	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1177	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126		1178
1127	do	1179	do
1128	{	1180	{
1129	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1181	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130		1182
1131	if (run && shape_attr_p (run))	1183	if (run && shape_attr_p (run))
1132	{	1184	{
1133	PangoRectangle extents;	1185	PangoRectangle extents;
1134	pango_layout_iter_get_run_extents (iter, 0, &extents);	1186	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1142		1194
1143	pango_layout_iter_free (iter);	1195	pango_layout_iter_free (iter);
1144	}	1196	}
1145		1197
1146	int	1198	int
1147	has_wrapped (CFPlus::Layout self)	1199	has_wrapped (DC::Layout self)
1148	CODE:	1200	CODE:
1149	{	1201	{
1150	int lines = 1;	1202	int lines = 1;
1151	const char *text = pango_layout_get_text (self->pl);	1203	const char *text = pango_layout_get_text (self->pl);
1152		1204
…		…
1157	}	1209	}
1158	OUTPUT:	1210	OUTPUT:
1159	RETVAL	1211	RETVAL
1160		1212
1161	SV *	1213	SV *
1162	get_text (CFPlus::Layout self)	1214	get_text (DC::Layout self)
1163	CODE:	1215	CODE:
1164	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1216	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165	sv_utf8_decode (RETVAL);	1217	sv_utf8_decode (RETVAL);
1166	OUTPUT:	1218	OUTPUT:
1167	RETVAL	1219	RETVAL
1168		1220
1169	void	1221	void
1170	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1222	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171	CODE:	1223	CODE:
1172	self->r = r;	1224	self->r = r;
1173	self->g = g;	1225	self->g = g;
1174	self->b = b;	1226	self->b = b;
1175	self->a = a;	1227	self->a = a;
1176		1228
1177	void	1229	void
1178	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1230	set_font (DC::Layout self, DC::Font font = 0)
1179	CODE:	1231	CODE:
1180	if (self->font != font)	1232	if (self->font != font)
1181	{	1233	{
1182	self->font = font;	1234	self->font = font;
1183	layout_update_font (self);	1235	layout_update_font (self);
1184	}	1236	}
1185		1237
1186	void	1238	void
1187	set_height (CFPlus::Layout self, int base_height)	1239	set_height (DC::Layout self, int base_height)
1188	CODE:	1240	CODE:
1189	if (self->base_height != base_height)	1241	if (self->base_height != base_height)
1190	{	1242	{
1191	self->base_height = base_height;	1243	self->base_height = base_height;
1192	layout_update_font (self);	1244	layout_update_font (self);
1193	}	1245	}
1194		1246
1195	void	1247	void
1196	set_width (CFPlus::Layout self, int max_width = -1)	1248	set_width (DC::Layout self, int max_width = -1)
1197	CODE:	1249	CODE:
1198	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1250	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199		1251
1200	void	1252	void
1201	set_indent (CFPlus::Layout self, int indent)	1253	set_indent (DC::Layout self, int indent)
1202	CODE:	1254	CODE:
1203	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1255	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204		1256
1205	void	1257	void
1206	set_spacing (CFPlus::Layout self, int spacing)	1258	set_spacing (DC::Layout self, int spacing)
1207	CODE:	1259	CODE:
1208	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1260	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209		1261
1210	void	1262	void
1211	set_ellipsise (CFPlus::Layout self, int ellipsise)	1263	set_ellipsise (DC::Layout self, int ellipsise)
1212	CODE:	1264	CODE:
1213	pango_layout_set_ellipsize (self->pl,	1265	pango_layout_set_ellipsize (self->pl,
1214	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1266	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1267	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1268	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217	: PANGO_ELLIPSIZE_NONE	1269	: PANGO_ELLIPSIZE_NONE
1218	);	1270	);
1219		1271
1220	void	1272	void
1221	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1273	set_single_paragraph_mode (DC::Layout self, int spm)
1222	CODE:	1274	CODE:
1223	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1275	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224		1276
1225	void	1277	void
1226	size (CFPlus::Layout self)	1278	size (DC::Layout self)
1227	PPCODE:	1279	PPCODE:
1228	{	1280	{
1229	int w, h;	1281	int w, h;
1230		1282
1231	layout_get_pixel_size (self, &w, &h);	1283	layout_get_pixel_size (self, &w, &h);
…		…
1234	PUSHs (sv_2mortal (newSViv (w)));	1286	PUSHs (sv_2mortal (newSViv (w)));
1235	PUSHs (sv_2mortal (newSViv (h)));	1287	PUSHs (sv_2mortal (newSViv (h)));
1236	}	1288	}
1237		1289
1238	int	1290	int
1239	descent (CFPlus::Layout self)	1291	descent (DC::Layout self)
1240	CODE:	1292	CODE:
1241	{	1293	{
1242	PangoRectangle rect;	1294	PangoRectangle rect;
1243	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1295	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244	pango_layout_line_get_pixel_extents (line, 0, &rect);	1296	pango_layout_line_get_pixel_extents (line, 0, &rect);
1245	RETVAL = PANGO_DESCENT (rect);	1297	RETVAL = PANGO_DESCENT (rect);
1246	}	1298	}
1247	OUTPUT:	1299	OUTPUT:
1248	RETVAL	1300	RETVAL
1249		1301
1250	int	1302	int
1251	xy_to_index (CFPlus::Layout self, int x, int y)	1303	xy_to_index (DC::Layout self, int x, int y)
1252	CODE:	1304	CODE:
1253	{	1305	{
1254	int index, trailing;	1306	int index, trailing;
1255	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1307	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256	RETVAL = index + trailing;	1308	RETVAL = index + trailing;
1257	}	1309	}
1258	OUTPUT:	1310	OUTPUT:
1259	RETVAL	1311	RETVAL
1260		1312
1261	void	1313	void
1262	cursor_pos (CFPlus::Layout self, int index)	1314	cursor_pos (DC::Layout self, int index)
1263	PPCODE:	1315	PPCODE:
1264	{	1316	{
1265	PangoRectangle strong_pos;	1317	PangoRectangle pos;
1266	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1318	pango_layout_get_cursor_pos (self->pl, index, 0, &pos);
1267		1319
1268	EXTEND (SP, 3);	1320	EXTEND (SP, 3);
1269	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1321	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1322	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1323	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272	}	1324	}
1273		1325
1274	void	1326	void
1275	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1327	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276	PPCODE:	1328	PPCODE:
1277	{	1329	{
1278	int line, x;	1330	int line, x;
1279		1331
1280	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1332	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1333	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1281	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1334	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282		1335	--line;
		1336	#endif
1283	EXTEND (SP, 2);	1337	EXTEND (SP, 2);
1284	PUSHs (sv_2mortal (newSViv (line - 1)));	1338	PUSHs (sv_2mortal (newSViv (line)));
1285	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1339	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286	}	1340	}
1287		1341
1288	void	1342	void
1289	line_x_to_index (CFPlus::Layout self, int line, int x)	1343	line_x_to_index (DC::Layout self, int line, int x)
1290	PPCODE:	1344	PPCODE:
1291	{	1345	{
1292	PangoLayoutLine *lp;	1346	PangoLayoutLine *lp;
1293	int index, trailing;	1347	int index, trailing;
1294		1348
1295	if (line < 0)	1349	if (line < 0)
1296	XSRETURN_EMPTY;	1350	XSRETURN_EMPTY;
1297		1351
1298	if (!(lp = pango_layout_get_line (self->pl, line)))	1352	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299	XSRETURN_EMPTY; /* do better */	1353	XSRETURN_EMPTY; /* do better */
1300		1354
1301	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1355	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302		1356
1303	EXTEND (SP, 2);	1357	EXTEND (SP, 2);
…		…
1309	PUSHs (sv_2mortal (newSViv (trailing)));	1363	PUSHs (sv_2mortal (newSViv (trailing)));
1310	}	1364	}
1311	}	1365	}
1312		1366
1313	void	1367	void
1314	render (CFPlus::Layout self, float x, float y, int flags = 0)	1368	render (DC::Layout self, float x, float y, int flags = 0)
1315	CODE:	1369	CODE:
1316	rc_clear (self->rc);	1370	rc_clear (self->rc);
1317	pango_opengl_render_layout_subpixel (	1371	pango_opengl_render_layout_subpixel (
1318	self->pl,	1372	self->pl,
1319	self->rc,	1373	self->rc,
…		…
1324	// we assume that context_change actually clears/frees stuff	1378	// we assume that context_change actually clears/frees stuff
1325	// and does not do any recomputation...	1379	// and does not do any recomputation...
1326	pango_layout_context_changed (self->pl);	1380	pango_layout_context_changed (self->pl);
1327		1381
1328	void	1382	void
1329	draw (CFPlus::Layout self)	1383	draw (DC::Layout self)
1330	CODE:	1384	CODE:
1331	{	1385	{
1332	glEnable (GL_TEXTURE_2D);	1386	glEnable (GL_TEXTURE_2D);
1333	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1387	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334	glEnable (GL_BLEND);	1388	glEnable (GL_BLEND);
…		…
1342	glDisable (GL_ALPHA_TEST);	1396	glDisable (GL_ALPHA_TEST);
1343	glDisable (GL_BLEND);	1397	glDisable (GL_BLEND);
1344	glDisable (GL_TEXTURE_2D);	1398	glDisable (GL_TEXTURE_2D);
1345	}	1399	}
1346		1400
1347	MODULE = CFPlus PACKAGE = CFPlus::Texture	1401	MODULE = Deliantra::Client PACKAGE = DC::Texture
1348		1402
1349	PROTOTYPES: ENABLE	1403	PROTOTYPES: ENABLE
1350
1351	int minpot (int n)
1352		1404
1353	void	1405	void
1354	pad (SV *data_, int ow, int oh, int nw, int nh)	1406	pad (SV *data_, int ow, int oh, int nw, int nh)
1355	CODE:	1407	CODE:
1356	{	1408	{
…		…
1433	RETVAL = width > 0;	1485	RETVAL = width > 0;
1434	}	1486	}
1435	OUTPUT:	1487	OUTPUT:
1436	RETVAL	1488	RETVAL
1437		1489
1438	MODULE = CFPlus PACKAGE = CFPlus::Map	1490	MODULE = Deliantra::Client PACKAGE = DC::Map
1439		1491
1440	PROTOTYPES: DISABLE	1492	PROTOTYPES: DISABLE
1441		1493
1442	CFPlus::Map	1494	DC::Map
1443	new (SV *class)	1495	new (SV *class)
1444	CODE:	1496	CODE:
1445	New (0, RETVAL, 1, struct map);	1497	New (0, RETVAL, 1, struct map);
1446	RETVAL->x = 0;	1498	RETVAL->x = 0;
1447	RETVAL->y = 0;	1499	RETVAL->y = 0;
…		…
1455	RETVAL->row = 0;	1507	RETVAL->row = 0;
1456	OUTPUT:	1508	OUTPUT:
1457	RETVAL	1509	RETVAL
1458		1510
1459	void	1511	void
1460	DESTROY (CFPlus::Map self)	1512	DESTROY (DC::Map self)
1461	CODE:	1513	CODE:
1462	{	1514	{
1463	map_clear (self);	1515	map_clear (self);
1464	Safefree (self->face2tile);	1516	Safefree (self->face2tile);
1465	Safefree (self->tex);	1517	Safefree (self->tex);
1466	Safefree (self);	1518	Safefree (self);
1467	}	1519	}
1468		1520
1469	void	1521	void
1470	resize (CFPlus::Map self, int map_width, int map_height)	1522	resize (DC::Map self, int map_width, int map_height)
1471	CODE:	1523	CODE:
1472	self->w = map_width;	1524	self->w = map_width;
1473	self->h = map_height;	1525	self->h = map_height;
1474		1526
1475	void	1527	void
1476	clear (CFPlus::Map self)	1528	clear (DC::Map self)
1477	CODE:	1529	CODE:
1478	map_clear (self);	1530	map_clear (self);
1479		1531
1480	void	1532	void
1481	set_tileid (CFPlus::Map self, int face, int tile)	1533	set_tileid (DC::Map self, int face, int tile)
1482	CODE:	1534	CODE:
1483	{	1535	{
1484	need_facenum (self, face); self->face2tile [face] = tile;	1536	need_facenum (self, face); self->face2tile [face] = tile;
1485	need_texid (self, tile);	1537	need_texid (self, tile);
1486	}	1538	}
1487		1539
1488	void	1540	void
1489	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1541	set_smooth (DC::Map self, int face, int smooth, int level)
1490	CODE:	1542	CODE:
1491	{	1543	{
1492	tileid texid;	1544	tileid texid;
1493	maptex *tex;	1545	maptex *tex;
1494		1546
…		…
1507	tex->smoothtile = self->face2tile [smooth];	1559	tex->smoothtile = self->face2tile [smooth];
1508	tex->smoothlevel = level;	1560	tex->smoothlevel = level;
1509	}	1561	}
1510		1562
1511	void	1563	void
1512	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)	1564	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)
1513	CODE:	1565	CODE:
1514	{	1566	{
1515	need_texid (self, texid);	1567	need_texid (self, texid);
1516		1568
1517	{	1569	{
…		…
1537	// from transparent color bleeding and ugly wrapping effects.	1589	// from transparent color bleeding and ugly wrapping effects.
1538	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1590	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539	}	1591	}
1540		1592
1541	int	1593	int
1542	ox (CFPlus::Map self)	1594	ox (DC::Map self)
1543	ALIAS:	1595	ALIAS:
1544	oy = 1	1596	oy = 1
1545	x = 2	1597	x = 2
1546	y = 3	1598	y = 3
1547	w = 4	1599	w = 4
…		…
1558	}	1610	}
1559	OUTPUT:	1611	OUTPUT:
1560	RETVAL	1612	RETVAL
1561		1613
1562	void	1614	void
1563	scroll (CFPlus::Map self, int dx, int dy)	1615	scroll (DC::Map self, int dx, int dy)
1564	CODE:	1616	CODE:
1565	{	1617	{
1566	if (dx > 0)	1618	if (dx > 0)
1567	map_blank (self, self->x, self->y, dx, self->h);	1619	map_blank (self, self->x, self->y, dx, self->h);
1568	else if (dx < 0)	1620	else if (dx < 0)
…		…
1584	self->y += MAP_EXTEND_Y;	1636	self->y += MAP_EXTEND_Y;
1585	}	1637	}
1586	}	1638	}
1587		1639
1588	SV *	1640	SV *
1589	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1641	map1a_update (DC::Map self, SV *data_, int extmap)
1590	CODE:	1642	CODE:
1591	{	1643	{
1592	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1644	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1593	uint8_t data_end = (uint8_t )SvEND (data_);	1645	uint8_t data_end = (uint8_t )SvEND (data_);
1594	mapcell *cell;	1646	mapcell *cell;
…		…
1683	}	1735	}
1684	OUTPUT:	1736	OUTPUT:
1685	RETVAL	1737	RETVAL
1686		1738
1687	SV *	1739	SV *
1688	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1740	mapmap (DC::Map self, int x0, int y0, int w, int h)
1689	CODE:	1741	CODE:
1690	{	1742	{
1691	int x1, x;	1743	int x1, x;
1692	int y1, y;	1744	int y1, y;
1693	int z;	1745	int z;
…		…
1738	}	1790	}
1739	OUTPUT:	1791	OUTPUT:
1740	RETVAL	1792	RETVAL
1741		1793
1742	void	1794	void
1743	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1795	draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1744	CODE:	1796	CODE:
1745	{	1797	{
1746	int x, y, z;	1798	int x, y, z;
1747		1799
1748	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1800	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1749	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1801	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1802	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751	smooth_key skey;	1803	smooth_key skey;
1752		1804
1753	rc_t *rc = rc_alloc ();	1805	rc_t *rc = rc_alloc ();
1754	rc_key_t key;	1806	rc_key_t key;
1755	rc_array_t *arr;	1807	rc_array_t *arr;
…		…
1817	if (tile)	1869	if (tile)
1818	{	1870	{
1819	maptex tex = self->tex [tile];	1871	maptex tex = self->tex [tile];
1820	int px, py;	1872	int px, py;
1821		1873
1822	// suppressing texture state switches here
1823	// is only moderately effective, but worth the extra effort
1824	if (key.texname != tex.name)	1874	if (key.texname != tex.name)
1825	{	1875	{
1826	if (!tex.name)	1876	if (!tex.name)
1827	tex = self->tex [2]; /* missing, replace by noface */	1877	tex = self->tex [2]; /* missing, replace by noface */
1828		1878
…		…
1911	// go through all smoothlevels, lowest to highest, then draw.	1961	// go through all smoothlevels, lowest to highest, then draw.
1912	// this is basically counting sort	1962	// this is basically counting sort
1913	{	1963	{
1914	int w, b;	1964	int w, b;
1915		1965
		1966	glEnable (GL_TEXTURE_2D);
		1967	glBegin (GL_QUADS);
1916	for (w = 0; w < 256 / 32; ++w)	1968	for (w = 0; w < 256 / 32; ++w)
1917	{	1969	{
1918	uint32_t smask = smooth_level [w];	1970	uint32_t smask = smooth_level [w];
1919	if (smask)	1971	if (smask)
1920	for (b = 0; b < 32; ++b)	1972	for (b = 0; b < 32; ++b)
…		…
1945	{	1997	{
1946	// this time avoiding texture state changes	1998	// this time avoiding texture state changes
1947	// save gobs of state changes.	1999	// save gobs of state changes.
1948	if (key.texname != tex.name)	2000	if (key.texname != tex.name)
1949	{	2001	{
		2002	glEnd ();
1950	key.texname = tex.name;	2003	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1951	arr = rc_array (rc, &key);	2004	glBegin (GL_QUADS);
1952	}	2005	}
1953		2006
1954	if (border)	2007	if (border)
1955	{	2008	{
1956	float ox = border * dx;	2009	float ox = border * dx;
1957		2010
1958	rc_t2f_v3f (arr, ox , 0.f , px , py , 0);	2011	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1959	rc_t2f_v3f (arr, ox , dy , px , py + T, 0);	2012	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1960	rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);	2013	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1961	rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);	2014	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1962	}	2015	}
1963		2016
1964	if (corner)	2017	if (corner)
1965	{	2018	{
1966	float ox = corner * dx;	2019	float ox = corner * dx;
1967		2020
1968	rc_t2f_v3f (arr, ox , dy , px , py , 0);	2021	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1969	rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);	2022	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1970	rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);	2023	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1971	rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);	2024	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1972	}	2025	}
1973	}	2026	}
1974	}	2027	}
1975	}	2028	}
1976	}	2029	}
1977	}	2030	}
		2031
		2032	glEnd ();
		2033	glDisable (GL_TEXTURE_2D);
		2034	key.texname = -1;
1978	}	2035	}
1979		2036
1980	hv_clear (smooth);	2037	hv_clear (smooth);
1981	rc_draw (rc);
1982	rc_clear (rc);
1983	}	2038	}
1984		2039
1985	glDisable (GL_BLEND);	2040	glDisable (GL_BLEND);
1986	rc_free (rc);	2041	rc_free (rc);
1987		2042
…		…
2016	}	2071	}
2017	}	2072	}
2018	}	2073	}
2019		2074
2020	void	2075	void
2021	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2076	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2022	CODE:	2077	CODE:
2023	{	2078	{
2024	static float color[16][3] = {	2079	static float color[16][3] = {
2025	{ 0.00F, 0.00F, 0.00F },	2080	{ 0.00F, 0.00F, 0.00F },
2026	{ 1.00F, 1.00F, 1.00F },	2081	{ 1.00F, 1.00F, 1.00F },
…		…
2076	glDisable (GL_BLEND);	2131	glDisable (GL_BLEND);
2077	glDisable (GL_TEXTURE_2D);	2132	glDisable (GL_TEXTURE_2D);
2078	}	2133	}
2079		2134
2080	void	2135	void
2081	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2136	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2082	PPCODE:	2137	PPCODE:
2083	{	2138	{
2084	int x, y;	2139	int x, y;
2085	int sw1 = sw + 2;	2140	int sw1 = sw + 2;
2086	int sh1 = sh + 2;	2141	int sh1 = sh + 2;
…		…
2157	PUSHs (sv_2mortal (newSViv (sh3)));	2212	PUSHs (sv_2mortal (newSViv (sh3)));
2158	PUSHs (darkness3_sv);	2213	PUSHs (darkness3_sv);
2159	}	2214	}
2160		2215
2161	SV *	2216	SV *
2162	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2217	get_rect (DC::Map self, int x0, int y0, int w, int h)
2163	CODE:	2218	CODE:
2164	{	2219	{
2165	int x, y, x1, y1;	2220	int x, y, x1, y1;
2166	SV data_sv = newSV (w h * 7 + 5);	2221	SV data_sv = newSV (w h * 7 + 5);
2167	uint8_t data = (uint8_t )SvPVX (data_sv);	2222	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2232	}	2287	}
2233	OUTPUT:	2288	OUTPUT:
2234	RETVAL	2289	RETVAL
2235		2290
2236	void	2291	void
2237	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2292	set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2238	PPCODE:	2293	PPCODE:
2239	{	2294	{
2240	int x, y, z;	2295	int x, y, z;
2241	int w, h;	2296	int w, h;
2242	int x1, y1;	2297	int x1, y1;
2243		2298
2244	if (*data++ != 0)	2299	if (*data++ != 0)
2245	return; /* version mismatch */	2300	XSRETURN_EMPTY; /* version mismatch */
2246		2301
2247	w = data++ << 8; w \|= data++;	2302	w = data++ << 8; w \|= data++;
2248	h = data++ << 8; h \|= data++;	2303	h = data++ << 8; h \|= data++;
2249		2304
2250	// we need to do this 'cause we don't keep an absolute coord system for rows	2305	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2295	}	2350	}
2296	}	2351	}
2297	}	2352	}
2298	}	2353	}
2299		2354
2300	MODULE = CFPlus PACKAGE = CFPlus::RW	2355	MODULE = Deliantra::Client PACKAGE = DC::RW
2301		2356
2302	CFPlus::RW	2357	DC::RW
2303	new (SV class, SV data_sv)	2358	new (SV class, SV data_sv)
2304	CODE:	2359	CODE:
2305	{	2360	{
2306	STRLEN datalen;	2361	STRLEN datalen;
2307	char *data = SvPVbyte (data_sv, datalen);	2362	char *data = SvPVbyte (data_sv, datalen);
…		…
2309	RETVAL = SDL_RWFromConstMem (data, datalen);	2364	RETVAL = SDL_RWFromConstMem (data, datalen);
2310	}	2365	}
2311	OUTPUT:	2366	OUTPUT:
2312	RETVAL	2367	RETVAL
2313		2368
2314	CFPlus::RW	2369	DC::RW
2315	new_from_file (SV class, const char path, const char *mode = "rb")	2370	new_from_file (SV class, const char path, const char *mode = "rb")
2316	CODE:	2371	CODE:
2317	RETVAL = SDL_RWFromFile (path, mode);	2372	RETVAL = SDL_RWFromFile (path, mode);
2318	OUTPUT:	2373	OUTPUT:
2319	RETVAL	2374	RETVAL
2320		2375
2321	# fails on win32:	2376	# fails on win32:
2322	# CFPlus.xs(2268) : error C2059: syntax error : '('	2377	# dc.xs(2268) : error C2059: syntax error : '('
2323	#void	2378	#void
2324	#close (CFPlus::RW self)	2379	#close (DC::RW self)
2325	# CODE:	2380	# CODE:
2326	# (self->(close)) (self);	2381	# (self->(close)) (self);
2327		2382
2328	MODULE = CFPlus PACKAGE = CFPlus::Channel	2383	MODULE = Deliantra::Client PACKAGE = DC::Channel
2329		2384
2330	PROTOTYPES: DISABLE	2385	PROTOTYPES: DISABLE
2331		2386
2332	CFPlus::Channel	2387	DC::Channel
2333	find ()	2388	find ()
2334	CODE:	2389	CODE:
2335	{	2390	{
2336	RETVAL = Mix_GroupAvailable (-1);	2391	RETVAL = Mix_GroupAvailable (-1);
2337		2392
…		…
2350	}	2405	}
2351	OUTPUT:	2406	OUTPUT:
2352	RETVAL	2407	RETVAL
2353		2408
2354	void	2409	void
2355	halt (CFPlus::Channel self)	2410	halt (DC::Channel self)
2356	CODE:	2411	CODE:
2357	Mix_HaltChannel (self);	2412	Mix_HaltChannel (self);
2358		2413
2359	void	2414	void
2360	expire (CFPlus::Channel self, int ticks = -1)	2415	expire (DC::Channel self, int ticks = -1)
2361	CODE:	2416	CODE:
2362	Mix_ExpireChannel (self, ticks);	2417	Mix_ExpireChannel (self, ticks);
2363		2418
2364	void	2419	void
2365	fade_out (CFPlus::Channel self, int ticks = -1)	2420	fade_out (DC::Channel self, int ticks = -1)
2366	CODE:	2421	CODE:
2367	Mix_FadeOutChannel (self, ticks);	2422	Mix_FadeOutChannel (self, ticks);
2368		2423
2369	int	2424	int
2370	volume (CFPlus::Channel self, int volume)	2425	volume (DC::Channel self, int volume)
2371	CODE:	2426	CODE:
2372	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2427	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373	OUTPUT:	2428	OUTPUT:
2374	RETVAL	2429	RETVAL
2375		2430
2376	void	2431	void
2377	unregister_all_effects (CFPlus::Channel self)	2432	unregister_all_effects (DC::Channel self)
2378	CODE:	2433	CODE:
2379	Mix_UnregisterAllEffects (self);	2434	Mix_UnregisterAllEffects (self);
2380		2435
2381	void	2436	void
2382	set_panning (CFPlus::Channel self, int left, int right)	2437	set_panning (DC::Channel self, int left, int right)
2383	CODE:	2438	CODE:
2384	left = CLAMP (left , 0, 255);	2439	left = CLAMP (left , 0, 255);
2385	right = CLAMP (right, 0, 255);	2440	right = CLAMP (right, 0, 255);
2386	Mix_SetPanning (self, left, right);	2441	Mix_SetPanning (self, left, right);
2387		2442
2388	void	2443	void
2389	set_distance (CFPlus::Channel self, int distance)	2444	set_distance (DC::Channel self, int distance)
2390	CODE:	2445	CODE:
2391	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2446	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392		2447
2393	void	2448	void
2394	set_position (CFPlus::Channel self, int angle, int distance)	2449	set_position (DC::Channel self, int angle, int distance)
2395	CODE:	2450	CODE:
2396		2451
2397	void	2452	void
2398	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2453	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399	CODE:	2454	CODE:
2400	{	2455	{
2401	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2456	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2402	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2457	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2403	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2458	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404	}	2459	}
2405		2460
2406	void	2461	void
2407	set_reverse_stereo (CFPlus::Channel self, int flip)	2462	set_reverse_stereo (DC::Channel self, int flip)
2408	CODE:	2463	CODE:
2409	Mix_SetReverseStereo (self, flip);	2464	Mix_SetReverseStereo (self, flip);
2410		2465
2411	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2466	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412		2467
2413	PROTOTYPES: DISABLE	2468	PROTOTYPES: DISABLE
2414		2469
2415	CFPlus::MixChunk	2470	DC::MixChunk
2416	new (SV *class, CFPlus::RW rwops)	2471	new (SV *class, DC::RW rwops)
2417	CODE:	2472	CODE:
2418	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2473	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419	OUTPUT:	2474	OUTPUT:
2420	RETVAL	2475	RETVAL
2421		2476
2422	void	2477	void
2423	DESTROY (CFPlus::MixChunk self)	2478	DESTROY (DC::MixChunk self)
2424	CODE:	2479	CODE:
2425	Mix_FreeChunk (self);	2480	Mix_FreeChunk (self);
2426		2481
2427	int	2482	int
2428	volume (CFPlus::MixChunk self, int volume = -1)	2483	volume (DC::MixChunk self, int volume = -1)
2429	CODE:	2484	CODE:
2430	if (items > 1)	2485	if (items > 1)
2431	volume = CLAMP (volume, 0, 128);	2486	volume = CLAMP (volume, 0, 128);
2432	RETVAL = Mix_VolumeChunk (self, volume);	2487	RETVAL = Mix_VolumeChunk (self, volume);
2433	OUTPUT:	2488	OUTPUT:
2434	RETVAL	2489	RETVAL
2435		2490
2436	CFPlus::Channel	2491	DC::Channel
2437	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2492	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2438	CODE:	2493	CODE:
2439	{	2494	{
2440	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2495	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441		2496
2442	if (RETVAL < 0)	2497	if (RETVAL < 0)
…		…
2449	}	2504	}
2450	}	2505	}
2451	OUTPUT:	2506	OUTPUT:
2452	RETVAL	2507	RETVAL
2453		2508
2454	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2509	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2455		2510
2456	int	2511	int
2457	volume (int volume = -1)	2512	volume (int volume = -1)
2458	PROTOTYPE: ;$	2513	PROTOTYPE: ;$
2459	CODE:	2514	CODE:
…		…
2471	void	2526	void
2472	halt ()	2527	halt ()
2473	CODE:	2528	CODE:
2474	Mix_HaltMusic ();	2529	Mix_HaltMusic ();
2475		2530
2476	CFPlus::MixMusic	2531	DC::MixMusic
2477	new (SV *class, CFPlus::RW rwops)	2532	new (SV *class, DC::RW rwops)
2478	CODE:	2533	CODE:
2479	RETVAL = Mix_LoadMUS_RW (rwops);	2534	RETVAL = Mix_LoadMUS_RW (rwops);
2480	OUTPUT:	2535	OUTPUT:
2481	RETVAL	2536	RETVAL
2482		2537
2483	void	2538	void
2484	DESTROY (CFPlus::MixMusic self)	2539	DESTROY (DC::MixMusic self)
2485	CODE:	2540	CODE:
2486	Mix_FreeMusic (self);	2541	Mix_FreeMusic (self);
2487		2542
2488	int	2543	int
2489	play (CFPlus::MixMusic self, int loops = -1)	2544	play (DC::MixMusic self, int loops = -1)
2490	CODE:	2545	CODE:
2491	RETVAL = Mix_PlayMusic (self, loops);	2546	RETVAL = Mix_PlayMusic (self, loops);
2492	OUTPUT:	2547	OUTPUT:
2493	RETVAL	2548	RETVAL
2494		2549
2495	void	2550	void
2496	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2551	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497	CODE:	2552	CODE:
2498	Mix_FadeInMusicPos (self, loops, ms, position);	2553	Mix_FadeInMusicPos (self, loops, ms, position);
2499		2554
2500	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2555	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501		2556
2502	PROTOTYPES: ENABLE	2557	PROTOTYPES: ENABLE
2503		2558
2504	BOOT:	2559	BOOT:
2505	{	2560	{
2506	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2561	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507	static const struct {	2562	static const struct {
2508	const char *name;	2563	const char *name;
2509	IV iv;	2564	IV iv;
2510	} *civ, const_iv[] = {	2565	} *civ, const_iv[] = {
2511	# define const_iv(name) { # name, (IV)name }	2566	# define const_iv(name) { # name, (IV)name }
…		…
2546	const_iv (GL_INTENSITY),	2601	const_iv (GL_INTENSITY),
2547	const_iv (GL_LUMINANCE),	2602	const_iv (GL_LUMINANCE),
2548	const_iv (GL_LUMINANCE_ALPHA),	2603	const_iv (GL_LUMINANCE_ALPHA),
2549	const_iv (GL_FLOAT),	2604	const_iv (GL_FLOAT),
2550	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2605	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2606	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2607	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2608	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2609	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2610	const_iv (GL_COMPRESSED_RGB_ARB),
		2611	const_iv (GL_COMPRESSED_RGBA_ARB),
2551	const_iv (GL_COMPILE),	2612	const_iv (GL_COMPILE),
2552	const_iv (GL_PROXY_TEXTURE_1D),	2613	const_iv (GL_PROXY_TEXTURE_1D),
2553	const_iv (GL_PROXY_TEXTURE_2D),	2614	const_iv (GL_PROXY_TEXTURE_2D),
2554	const_iv (GL_TEXTURE_1D),	2615	const_iv (GL_TEXTURE_1D),
2555	const_iv (GL_TEXTURE_2D),	2616	const_iv (GL_TEXTURE_2D),
…		…
2594	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2655	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595	const_iv (GL_POINT_SMOOTH_HINT),	2656	const_iv (GL_POINT_SMOOTH_HINT),
2596	const_iv (GL_LINE_SMOOTH_HINT),	2657	const_iv (GL_LINE_SMOOTH_HINT),
2597	const_iv (GL_POLYGON_SMOOTH_HINT),	2658	const_iv (GL_POLYGON_SMOOTH_HINT),
2598	const_iv (GL_GENERATE_MIPMAP_HINT),	2659	const_iv (GL_GENERATE_MIPMAP_HINT),
		2660	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599	const_iv (GL_FASTEST),	2661	const_iv (GL_FASTEST),
2600	const_iv (GL_DONT_CARE),	2662	const_iv (GL_DONT_CARE),
2601	const_iv (GL_NICEST),	2663	const_iv (GL_NICEST),
2602	const_iv (GL_V2F),	2664	const_iv (GL_V2F),
2603	const_iv (GL_V3F),	2665	const_iv (GL_V3F),
…		…
2611		2673
2612	texture_av = newAV ();	2674	texture_av = newAV ();
2613	AvREAL_off (texture_av);	2675	AvREAL_off (texture_av);
2614	}	2676	}
2615		2677
		2678	void
		2679	disable_GL_EXT_blend_func_separate ()
		2680	CODE:
		2681	gl.BlendFuncSeparate = 0;
		2682	gl.BlendFuncSeparateEXT = 0;
		2683
2616	char *	2684	char *
2617	gl_vendor ()	2685	gl_vendor ()
2618	CODE:	2686	CODE:
2619	RETVAL = (char *)glGetString (GL_VENDOR);	2687	RETVAL = (char *)glGetString (GL_VENDOR);
2620	OUTPUT:	2688	OUTPUT:
…		…
2741		2809
2742	void glRect (float x1, float y1, float x2, float y2)	2810	void glRect (float x1, float y1, float x2, float y2)
2743	CODE:	2811	CODE:
2744	glRectf (x1, y1, x2, y2);	2812	glRectf (x1, y1, x2, y2);
2745		2813
		2814	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2815	CODE:
		2816	glBegin (GL_LINE_LOOP);
		2817	glVertex2f (x1, y1);
		2818	glVertex2f (x2, y1);
		2819	glVertex2f (x2, y2);
		2820	glVertex2f (x1, y2);
		2821	glEnd ();
		2822
2746	PROTOTYPES: ENABLE	2823	PROTOTYPES: ENABLE
2747		2824
2748	void glBegin (int mode)	2825	void glBegin (int mode)
2749		2826
2750	void glEnd ()	2827	void glEnd ()
…		…
2782	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2859	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2783	CODE:	2860	CODE:
2784	if (gl.SeparableFilter2D)	2861	if (gl.SeparableFilter2D)
2785	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2862	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786		2863
2787	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2864	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2788		2865
2789	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2866	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2790		2867
2791	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2868	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792		2869
…		…
2818		2895
2819	void glEndList ()	2896	void glEndList ()
2820		2897
2821	void glCallList (int list)	2898	void glCallList (int list)
2822		2899
2823	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2900	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2824		2901
2825	PROTOTYPES: DISABLE	2902	PROTOTYPES: DISABLE
2826		2903
2827	void	2904	void
2828	find_widget (SV *self, NV x, NV y)	2905	find_widget (SV *self, NV x, NV y)
…		…
2832	XPUSHs (self);	2909	XPUSHs (self);
2833	}	2910	}
2834		2911
2835	BOOT:	2912	BOOT:
2836	{	2913	{
2837	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2914	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838		2915
2839	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2916	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2840	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2917	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2841	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2918	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2842	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2919	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2843	}	2920	}
2844		2921
2845	void	2922	void
2846	draw (SV *self)	2923	draw (SV *self)
2847	CODE:	2924	CODE:
…		…
2851	NV x, y, w, h;	2928	NV x, y, w, h;
2852	SV *draw_x_sv = GvSV (draw_x_gv);	2929	SV *draw_x_sv = GvSV (draw_x_gv);
2853	SV *draw_y_sv = GvSV (draw_y_gv);	2930	SV *draw_y_sv = GvSV (draw_y_gv);
2854	SV *draw_w_sv = GvSV (draw_w_gv);	2931	SV *draw_w_sv = GvSV (draw_w_gv);
2855	SV *draw_h_sv = GvSV (draw_h_gv);	2932	SV *draw_h_sv = GvSV (draw_h_gv);
2856	SV *hover;
2857	double draw_x, draw_y, draw_w, draw_h;	2933	double draw_x, draw_y;
2858		2934
2859	if (!SvROK (self))	2935	if (!SvROK (self))
2860	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2936	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861		2937
2862	hv = (HV *)SvRV (self);	2938	hv = (HV *)SvRV (self);
2863		2939
2864	if (SvTYPE (hv) != SVt_PVHV)	2940	if (SvTYPE (hv) != SVt_PVHV)
2865	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2941	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866		2942
2867	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	2943	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2868	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	2944	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2869		2945
2870	if (!h \|\| !w)	2946	if (!h \|\| !w)
…		…
2890	{	2966	{
2891	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	2967	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892		2968
2893	if (svp && SvTRUE (*svp))	2969	if (svp && SvTRUE (*svp))
2894	{	2970	{
2895	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);	2971	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2896	glEnable (GL_BLEND);	2972	glEnable (GL_BLEND);
2897	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	2973	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898	glBegin (GL_QUADS);	2974	glBegin (GL_QUADS);
2899	glVertex2f (0, 0);	2975	glVertex2f (0, 0);
2900	glVertex2f (w, 0);	2976	glVertex2f (w, 0);
…		…
2903	glEnd ();	2979	glEnd ();
2904	glDisable (GL_BLEND);	2980	glDisable (GL_BLEND);
2905	}	2981	}
2906	}	2982	}
2907	#if 0	2983	#if 0
2908	if ($ENV{CFPLUS_DEBUG} & 1) {	2984	// draw borders, for debugging
2909	glPushMatrix;	2985	glPushMatrix ();
2910	glColor 1, 1, 0, 1;	2986	glColor4f (1., 1., 0., 1.);
2911	glTranslate 0.375, 0.375;	2987	glTranslatef (.5, .5, 0.);
2912	glBegin GL_LINE_LOOP;	2988	glBegin (GL_LINE_LOOP);
2913	glVertex 0 , 0;	2989	glVertex2f (0 , 0);
2914	glVertex $self->{w} - 1, 0;	2990	glVertex2f (w - 1, 0);
2915	glVertex $self->{w} - 1, $self->{h} - 1;	2991	glVertex2f (w - 1, h - 1);
2916	glVertex 0 , $self->{h} - 1;	2992	glVertex2f (0 , h - 1);
2917	glEnd;	2993	glEnd ();
2918	glPopMatrix;	2994	glPopMatrix ();
2919	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920	}
2921	#endif	2995	#endif
2922	PUSHMARK (SP);	2996	PUSHMARK (SP);
2923	XPUSHs (self);	2997	XPUSHs (self);
2924	PUTBACK;	2998	PUTBACK;
2925	call_method ("_draw", G_VOID \| G_DISCARD);	2999	call_method ("_draw", G_VOID \| G_DISCARD);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.225 by root, Sat Aug 11 12:07:54 2007 UTC vs. Revision 1.251 by root, Fri Dec 28 17:28:01 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.225 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.251 by root, Fri Dec 28 17:28:01 2007 UTC