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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.140 by root, Mon Aug 14 03:41:25 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
15	#include <stdlib.h>	20	#include <stdlib.h>
16		21
18	#include <SDL_endian.h>	23	#include <SDL_endian.h>
19	#include <SDL_image.h>	24	#include <SDL_image.h>
20	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
22		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
23	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
24		32
25	#include <pango/pango.h>	33	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		34
30	#ifndef _WIN32	35	#ifndef _WIN32
31	# include <sys/types.h>	36	# include <sys/types.h>
32	# include <sys/socket.h>	37	# include <sys/socket.h>
33	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	45	typedef signed char int8_t;
41	typedef signed short int16_t;	46	typedef signed short int16_t;
42	typedef signed int int32_t;	47	typedef signed int int32_t;
43	#endif	48	#endif
44		49
45	#include "glext.h"
46
47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48		51
49	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
50		53
51	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
52	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
53		56
54	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
55		64
56	static struct	65	static struct
57	{	66	{
58	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
59	#include "glfunc.h"	68	#include "glfunc.h"
…		…
68	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69	else	78	else
70	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
71	}	80	}
72		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
73	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
74	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
75		90
76	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
77		92
78	static int	93	static int
79	shape_attr_p (PangoLayoutRun *run)	94	shape_attr_p (PangoLayoutRun *run)
80	{	95	{
81	GSList *attrs = run->item->analysis.extra_attrs;	96	GSList *attrs = run->item->analysis.extra_attrs;
…		…
92		107
93	return 0;	108	return 0;
94	}	109	}
95		110
96	typedef struct cf_layout {	111	typedef struct cf_layout {
97	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
100	int base_height;	114	int base_height;
101	CFClient__Font font;	115	CFPlus__Font font;
102	} *CFClient__Layout;	116	} *CFPlus__Layout;
103		117
104	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
105	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
106	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
107		121
108	static void	122	static void
109	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
110	{	124	{
111	FcPatternAddBool (pattern, FC_HINTING, 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
112	#ifdef FC_HINT_STYLE	126	#ifdef FC_HINT_STYLE
113	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114	#endif	128	#endif
115	#ifdef _WIN32
116	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117	#else
118	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119	#endif
120	}	130	}
121		131
122	static void	132	static void
123	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
124	{	134	{
125	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
126	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
127	*/	137	*/
128	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
132		142
133	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
134	}	144	}
135		145
136	static void	146	static void
137	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
138	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
139	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
140		153
141	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143		156
144	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
145	}	162	}
146		163
147	typedef uint16_t mapface;	164	typedef uint16_t mapface;
148		165
149	typedef struct {	166	typedef struct {
…		…
172	int texs;	189	int texs;
173	maptex *tex;	190	maptex *tex;
174		191
175	int32_t rows;	192	int32_t rows;
176	maprow *row;	193	maprow *row;
177	} *CFClient__Map;	194	} *CFPlus__Map;
178		195
179	static char *	196	static char *
180	prepend (char *ptr, int sze, int inc)	197	prepend (char *ptr, int sze, int inc)
181	{	198	{
182	char *p;	199	char *p;
…		…
200		217
201	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	218	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
202	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203		220
204	static maprow *	221	static maprow *
205	map_get_row (CFClient__Map self, int y)	222	map_get_row (CFPlus__Map self, int y)
206	{	223	{
207	if (0 > y)	224	if (0 > y)
208	{	225	{
209	int extend = - y + MAP_EXTEND_Y;	226	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	227	Prepend (maprow, self->row, self->rows, extend);
…		…
248		265
249	return row->col + (x - row->c0);	266	return row->col + (x - row->c0);
250	}	267	}
251		268
252	static mapcell *	269	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	270	map_get_cell (CFPlus__Map self, int x, int y)
254	{	271	{
255	return row_get_cell (map_get_row (self, y), x);	272	return row_get_cell (map_get_row (self, y), x);
256	}	273	}
257		274
258	static void	275	static void
259	map_clear (CFClient__Map self)	276	map_clear (CFPlus__Map self)
260	{	277	{
261	int r;	278	int r;
262		279
263	for (r = 0; r < self->rows; r++)	280	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	281	Safefree (self->row[r].col);
…		…
272	self->row = 0;	289	self->row = 0;
273	self->rows = 0;	290	self->rows = 0;
274	}	291	}
275		292
276	static void	293	static void
277	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	294	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278	{	295	{
279	int x, y;	296	int x, y;
280	maprow *row;	297	maprow *row;
281		298
282	for (y = y0; y < y0 + h; y++)	299	for (y = y0; y < y0 + h; y++)
…		…
339	n \|= n >> 16;	356	n \|= n >> 16;
340		357
341	return n + 1;	358	return n + 1;
342	}	359	}
343		360
344	MODULE = CFClient PACKAGE = CFClient	361	MODULE = CFPlus PACKAGE = CFPlus
345		362
346	PROTOTYPES: ENABLE	363	PROTOTYPES: ENABLE
347		364
348	BOOT:	365	BOOT:
349	{	366	{
350	HV *stash = gv_stashpv ("CFClient", 1);	367	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	368	static const struct {
352	const char *name;	369	const char *name;
353	IV iv;	370	IV iv;
354	} *civ, const_iv[] = {	371	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	372	# define const_iv(name) { # name, (IV)name }
…		…
456		473
457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	474	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	475	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459	}	476	}
460		477
		478	int
		479	in_destruct ()
		480	CODE:
		481	RETVAL = PL_main_cv == Nullcv;
		482	OUTPUT:
		483	RETVAL
		484
461	NV floor (NV x)	485	NV floor (NV x)
462		486
463	NV ceil (NV x)	487	NV ceil (NV x)
464		488
465	void	489	void
466	pango_init ()	490	pango_init ()
467	CODE:	491	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	492	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	493	opengl_fontmap = pango_opengl_font_map_new ();
472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	494	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
473	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	495	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474	}
475	{
476	cairo_font_options_t *fopt = cairo_font_options_create ();
477	cairo_fontmap = pango_cairo_font_map_get_default ();
478	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479	#ifdef _WIN32
480	// cairo looks like shit eaten twice on windows
481	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482	#else
483	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484	#endif
485	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487	pango_cairo_context_set_font_options (cairo_context, fopt);
488	cairo_font_options_destroy (fopt);
489	}
490	}	496	}
491		497
492	int	498	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	499	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
494		500
495	void	501	void
496	SDL_Quit ()	502	SDL_Quit ()
497		503
498	void	504	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		522
517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	523	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		524	#if SDL_VERSION_ATLEAST(1,2,10)
		525	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		526	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		527	#endif
518		528
519	SDL_EnableUNICODE (1);	529	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	530	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		531
522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	532	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	619	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	620	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	621	break;
612	}	622	}
613		623
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	624	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	625	}
616	}	626	}
617		627
618	int	628	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	629	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
635	#endif	645	#endif
636		646
637	void	647	void
638	add_font (char *file)	648	add_font (char *file)
639	CODE:	649	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	650	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		651
646	void	652	void
647	load_image_inline (SV *image_)	653	load_image_inline (SV *image_)
648	ALIAS:	654	ALIAS:
649	load_image_file = 1	655	load_image_file = 1
…		…
691		697
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	698	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		699
694	assert (surface2->pitch == surface2->w * 4);	700	assert (surface2->pitch == surface2->w * 4);
695		701
		702	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	703	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	704	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	705	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	706	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701	SDL_UnlockSurface (surface2);
702	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	707	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	708	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	709	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		710	SDL_UnlockSurface (surface2);
705		711
706	SDL_FreeSurface (surface);	712	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	713	SDL_FreeSurface (surface2);
708	}	714	}
709		715
…		…
752	void	758	void
753	_exit (int retval)	759	_exit (int retval)
754	CODE:	760	CODE:
755	_exit (retval);	761	_exit (retval);
756		762
757	MODULE = CFClient PACKAGE = CFClient::Font	763	MODULE = CFPlus PACKAGE = CFPlus::Font
758		764
759	CFClient::Font	765	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	766	new_from_file (SV class, char path, int id = 0)
761	CODE:	767	CODE:
762	{	768	{
763	int count;	769	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	770	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	773	}
768	OUTPUT:	774	OUTPUT:
769	RETVAL	775	RETVAL
770		776
771	void	777	void
772	DESTROY (CFClient::Font self)	778	DESTROY (CFPlus::Font self)
773	CODE:	779	CODE:
774	pango_font_description_free (self);	780	pango_font_description_free (self);
775		781
776	void	782	void
777	make_default (CFClient::Font self)	783	make_default (CFPlus::Font self)
778	CODE:	784	CODE:
779	default_font = self;	785	default_font = self;
780		786
781	MODULE = CFClient PACKAGE = CFClient::Layout	787	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		788
783	CFClient::Layout	789	void
784	new (SV *class, int rgba = 0)	790	reset_glyph_cache ()
		791	CODE:
		792	tc_clear ();
		793
		794	CFPlus::Layout
		795	new (SV *class)
785	CODE:	796	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	797	New (0, RETVAL, 1, struct cf_layout);
787		798
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	799	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	800	RETVAL->r = 1.;
791	RETVAL->g = 1.;	801	RETVAL->g = 1.;
792	RETVAL->b = 1.;	802	RETVAL->b = 1.;
793	RETVAL->a = 1.;	803	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	804	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	808	layout_update_font (RETVAL);
799	OUTPUT:	809	OUTPUT:
800	RETVAL	810	RETVAL
801		811
802	void	812	void
803	DESTROY (CFClient::Layout self)	813	DESTROY (CFPlus::Layout self)
804	CODE:	814	CODE:
805	g_object_unref (self->pl);	815	g_object_unref (self->pl);
806	Safefree (self);	816	Safefree (self);
807		817
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	818	void
816	set_text (CFClient::Layout self, SV *text_)	819	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	820	CODE:
818	{	821	{
819	STRLEN textlen;	822	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	823	char *text = SvPVutf8 (text_, textlen);
821		824
822	pango_layout_set_text (self->pl, text, textlen);	825	pango_layout_set_text (self->pl, text, textlen);
823	}	826	}
824		827
825	void	828	void
826	set_markup (CFClient::Layout self, SV *text_)	829	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	830	CODE:
828	{	831	{
829	STRLEN textlen;	832	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	833	char *text = SvPVutf8 (text_, textlen);
831		834
832	pango_layout_set_markup (self->pl, text, textlen);	835	pango_layout_set_markup (self->pl, text, textlen);
833	}	836	}
834		837
835	void	838	void
836	set_shapes (CFClient::Layout self, ...)	839	set_shapes (CFPlus::Layout self, ...)
837	CODE:	840	CODE:
838	{	841	{
839	PangoAttrList *attrs = 0;	842	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	843	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	844	const char *pos = text;
842	int arg = 2;	845	int arg = 4;
843		846
844	while (arg < items && (pos = strstr (pos, OBJ_STR)))	847	while (arg < items && (pos = strstr (pos, OBJ_STR)))
845	{	848	{
846	PangoRectangle rect;	849	PangoRectangle inkrect, rect;
847	PangoAttribute *attr;	850	PangoAttribute *attr;
848		851
		852	int x = SvIV (ST (arg - 3));
		853	int y = SvIV (ST (arg - 2));
849	int w = SvIV (ST (arg - 1));	854	int w = SvIV (ST (arg - 1));
850	int h = SvIV (ST (arg));	855	int h = SvIV (ST (arg ));
851		856
852	arg += 2;
853
854	rect.x = 0;	857	inkrect.x = 0;
		858	inkrect.y = 0;
		859	inkrect.width = 0;
		860	inkrect.height = 0;
		861
		862	rect.x = x * PANGO_SCALE;
855	rect.y = -h * PANGO_SCALE;	863	rect.y = y * PANGO_SCALE;
856	rect.width = w * PANGO_SCALE;	864	rect.width = w * PANGO_SCALE;
857	rect.height = h * PANGO_SCALE;	865	rect.height = h * PANGO_SCALE;
858		866
859	if (!attrs)	867	if (!attrs)
860	attrs = pango_layout_get_attributes (self->pl);	868	attrs = pango_layout_get_attributes (self->pl);
861		869
862	attr = pango_attr_shape_new (&rect, &rect);	870	attr = pango_attr_shape_new (&inkrect, &rect);
863	attr->start_index = pos - text;	871	attr->start_index = pos - text;
864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;	872	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865	pango_attr_list_insert (attrs, attr);	873	pango_attr_list_insert (attrs, attr);
866		874
		875	arg += 4;
867	pos += sizeof (OBJ_STR) - 1;	876	pos += sizeof (OBJ_STR) - 1;
868	}	877	}
869		878
870	if (attrs)	879	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	880	pango_layout_set_attributes (self->pl, attrs);
872	}	881	}
873		882
874	void	883	void
875	get_shapes (CFClient::Layout self)	884	get_shapes (CFPlus::Layout self)
876	PPCODE:	885	PPCODE:
877	{	886	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	887	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		888
880	do	889	do
…		…
884	if (run && shape_attr_p (run))	893	if (run && shape_attr_p (run))
885	{	894	{
886	PangoRectangle extents;	895	PangoRectangle extents;
887	pango_layout_iter_get_run_extents (iter, 0, &extents);	896	pango_layout_iter_get_run_extents (iter, 0, &extents);
888		897
		898	EXTEND (SP, 2);
889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	899	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891	}	901	}
892	}	902	}
893	while (pango_layout_iter_next_run (iter));	903	while (pango_layout_iter_next_run (iter));
894		904
895	pango_layout_iter_free (iter);	905	pango_layout_iter_free (iter);
896	}	906	}
897		907
898	int	908	int
899	has_wrapped (CFClient::Layout self)	909	has_wrapped (CFPlus::Layout self)
900	CODE:	910	CODE:
901	{	911	{
902	int lines = 1;	912	int lines = 1;
903	const char *text = pango_layout_get_text (self->pl);	913	const char *text = pango_layout_get_text (self->pl);
904		914
…		…
909	}	919	}
910	OUTPUT:	920	OUTPUT:
911	RETVAL	921	RETVAL
912		922
913	SV *	923	SV *
914	get_text (CFClient::Layout self)	924	get_text (CFPlus::Layout self)
915	CODE:	925	CODE:
916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	926	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917	sv_utf8_decode (RETVAL);	927	sv_utf8_decode (RETVAL);
918	OUTPUT:	928	OUTPUT:
919	RETVAL	929	RETVAL
920		930
921	void	931	void
922	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	932	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
923	CODE:	933	CODE:
924	self->r = r;	934	self->r = r;
925	self->g = g;	935	self->g = g;
926	self->b = b;	936	self->b = b;
927	self->a = a;	937	self->a = a;
928		938
929	void	939	void
930	set_font (CFClient::Layout self, CFClient::Font font = 0)	940	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931	CODE:	941	CODE:
932	if (self->font != font)	942	if (self->font != font)
933	{	943	{
934	self->font = font;	944	self->font = font;
935	layout_update_font (self);	945	layout_update_font (self);
936	}	946	}
937		947
938	void	948	void
939	set_height (CFClient::Layout self, int base_height)	949	set_height (CFPlus::Layout self, int base_height)
940	CODE:	950	CODE:
941	if (self->base_height != base_height)	951	if (self->base_height != base_height)
942	{	952	{
943	self->base_height = base_height;	953	self->base_height = base_height;
944	layout_update_font (self);	954	layout_update_font (self);
945	}	955	}
946		956
947	void	957	void
948	set_width (CFClient::Layout self, int max_width = -1)	958	set_width (CFPlus::Layout self, int max_width = -1)
949	CODE:	959	CODE:
950	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	960	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
951		961
952	void	962	void
953	set_indent (CFClient::Layout self, int indent)	963	set_indent (CFPlus::Layout self, int indent)
954	CODE:	964	CODE:
955	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	965	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956		966
957	void	967	void
958	set_spacing (CFClient::Layout self, int spacing)	968	set_spacing (CFPlus::Layout self, int spacing)
959	CODE:	969	CODE:
960	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	970	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961		971
962	void	972	void
963	set_ellipsise (CFClient::Layout self, int ellipsise)	973	set_ellipsise (CFPlus::Layout self, int ellipsise)
964	CODE:	974	CODE:
965	pango_layout_set_ellipsize (self->pl,	975	pango_layout_set_ellipsize (self->pl,
966	ellipsise == 1 ? PANGO_ELLIPSIZE_START	976	ellipsise == 1 ? PANGO_ELLIPSIZE_START
967	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	977	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	978	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
969	: PANGO_ELLIPSIZE_NONE	979	: PANGO_ELLIPSIZE_NONE
970	);	980	);
971		981
972	void	982	void
973	set_single_paragraph_mode (CFClient::Layout self, int spm)	983	set_single_paragraph_mode (CFPlus::Layout self, int spm)
974	CODE:	984	CODE:
975	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	985	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976		986
977	void	987	void
978	size (CFClient::Layout self)	988	size (CFPlus::Layout self)
979	PPCODE:	989	PPCODE:
980	{	990	{
981	int w, h;	991	int w, h;
982		992
983	layout_get_pixel_size (self, &w, &h);	993	layout_get_pixel_size (self, &w, &h);
…		…
986	PUSHs (sv_2mortal (newSViv (w)));	996	PUSHs (sv_2mortal (newSViv (w)));
987	PUSHs (sv_2mortal (newSViv (h)));	997	PUSHs (sv_2mortal (newSViv (h)));
988	}	998	}
989		999
990	int	1000	int
		1001	descent (CFPlus::Layout self)
		1002	CODE:
		1003	{
		1004	PangoRectangle rect;
		1005	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1006	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1007	RETVAL = PANGO_DESCENT (rect);
		1008	}
		1009	OUTPUT:
		1010	RETVAL
		1011
		1012	int
991	xy_to_index (CFClient::Layout self, int x, int y)	1013	xy_to_index (CFPlus::Layout self, int x, int y)
992	CODE:	1014	CODE:
993	{	1015	{
994	int index, trailing;	1016	int index, trailing;
995	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1017	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996	RETVAL = index;	1018	RETVAL = index;
997	}	1019	}
998	OUTPUT:	1020	OUTPUT:
999	RETVAL	1021	RETVAL
1000		1022
1001	void	1023	void
1002	cursor_pos (CFClient::Layout self, int index)	1024	cursor_pos (CFPlus::Layout self, int index)
1003	PPCODE:	1025	PPCODE:
1004	{	1026	{
1005	PangoRectangle strong_pos;	1027	PangoRectangle strong_pos;
1006	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1028	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007		1029
…		…
1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1032	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012	}	1034	}
1013		1035
1014	void	1036	void
1015	render (CFClient::Layout self)	1037	render (CFPlus::Layout self, float x, float y, int flags = 0)
1016	PPCODE:	1038	PPCODE:
1017	{	1039	pango_opengl_render_layout_subpixel (
1018	SV *retval;	1040	self->pl,
1019	int w, h;	1041	x * PANGO_SCALE, y * PANGO_SCALE,
1020		1042	self->r, self->g, self->b, self->a,
1021	layout_get_pixel_size (self, &w, &h);
1022
1023	if (self->rgba)
1024	{	1043	flags
1025	cairo_surface_t *surface;
1026	cairo_t *cairo;
1027
1028	retval = newSV (w * h * 4);
1029	SvPOK_only (retval);
1030	SvCUR_set (retval, w * h * 4);
1031
1032	memset (SvPVX (retval), 0, w * h * 4);
1033
1034	surface = cairo_image_surface_create_for_data (
1035	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
1036	cairo = cairo_create (surface);
1037	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1038
1039	pango_cairo_show_layout (cairo, self->pl);
1040
1041	cairo_destroy (cairo);
1042	cairo_surface_destroy (surface);
1043
1044	// what a mess, and its premultiplied, too :(
1045	{
1046	uint32_t p = (uint32_t )SvPVX (retval);
1047	uint32_t e = p + w h;
1048
1049	while (p < e)
1050	{
1051	uint32_t rgba = *p;
1052	rgba = (rgba >> 24) \| (rgba << 8);
1053	#if 0
1054	#ifdef _WIN32
1055	{//D
1056	uint8_t r = rgba >> 24;
1057	uint8_t g = rgba >> 16;
1058	uint8_t b = rgba >> 8;
1059	uint8_t a = rgba >> 0;
1060
1061	rgba = (rgba & 0xffffff00) \| a;
1062	}
1063	#endif
1064	#endif
1065	rgba = SDL_SwapBE32 (rgba);
1066	*p++ = rgba;
1067	}
1068	}
1069
1070	EXTEND (SP, 5);
1071	PUSHs (sv_2mortal (newSViv (w)));
1072	PUSHs (sv_2mortal (newSViv (h)));
1073	PUSHs (sv_2mortal (retval));
1074	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1075	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076	}	1044	);
1077	else
1078	{
1079	FT_Bitmap bitmap;
1080		1045
1081	retval = newSV (w * h);
1082	SvPOK_only (retval);
1083	SvCUR_set (retval, w * h);
1084
1085	bitmap.rows = h;
1086	bitmap.width = w;
1087	bitmap.pitch = w;
1088	bitmap.buffer = (unsigned char*)SvPVX (retval);
1089	bitmap.num_grays = 256;
1090	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1091
1092	memset (bitmap.buffer, 0, w * h);
1093
1094	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1095
1096	EXTEND (SP, 5);
1097	PUSHs (sv_2mortal (newSViv (w)));
1098	PUSHs (sv_2mortal (newSViv (h)));
1099	PUSHs (sv_2mortal (retval));
1100	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1101	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1102	}
1103	}
1104
1105	MODULE = CFClient PACKAGE = CFClient::Texture	1046	MODULE = CFPlus PACKAGE = CFPlus::Texture
1106		1047
1107	void	1048	void
1108	pad2pot (SV data_, SV w_, SV *h_)	1049	pad2pot (SV data_, SV w_, SV *h_)
1109	CODE:	1050	CODE:
1110	{	1051	{
…		…
1188	glDisable (GL_ALPHA_TEST);	1129	glDisable (GL_ALPHA_TEST);
1189	glDisable (GL_BLEND);	1130	glDisable (GL_BLEND);
1190	}	1131	}
1191	}	1132	}
1192		1133
1193	MODULE = CFClient PACKAGE = CFClient::Map	1134	MODULE = CFPlus PACKAGE = CFPlus::Map
1194		1135
1195	CFClient::Map	1136	CFPlus::Map
1196	new (SV *class, int map_width, int map_height)	1137	new (SV *class, int map_width, int map_height)
1197	CODE:	1138	CODE:
1198	New (0, RETVAL, 1, struct map);	1139	New (0, RETVAL, 1, struct map);
1199	RETVAL->x = 0;	1140	RETVAL->x = 0;
1200	RETVAL->y = 0;	1141	RETVAL->y = 0;
…		…
1210	RETVAL->row = 0;	1151	RETVAL->row = 0;
1211	OUTPUT:	1152	OUTPUT:
1212	RETVAL	1153	RETVAL
1213		1154
1214	void	1155	void
1215	DESTROY (CFClient::Map self)	1156	DESTROY (CFPlus::Map self)
1216	CODE:	1157	CODE:
1217	{	1158	{
1218	map_clear (self);	1159	map_clear (self);
1219	Safefree (self->face);	1160	Safefree (self->face);
1220	Safefree (self->tex);	1161	Safefree (self->tex);
1221	Safefree (self);	1162	Safefree (self);
1222	}	1163	}
1223		1164
1224	void	1165	void
1225	clear (CFClient::Map self)	1166	clear (CFPlus::Map self)
1226	CODE:	1167	CODE:
1227	map_clear (self);	1168	map_clear (self);
1228		1169
1229	void	1170	void
1230	set_face (CFClient::Map self, int face, int texid)	1171	set_face (CFPlus::Map self, int face, int texid)
1231	CODE:	1172	CODE:
1232	{	1173	{
1233	while (self->faces <= face)	1174	while (self->faces <= face)
1234	{	1175	{
1235	Append (mapface, self->face, self->faces, self->faces);	1176	Append (mapface, self->face, self->faces, self->faces);
…		…
1238		1179
1239	self->face [face] = texid;	1180	self->face [face] = texid;
1240	}	1181	}
1241		1182
1242	void	1183	void
1243	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1184	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)
1244	CODE:	1185	CODE:
1245	{	1186	{
1246	while (self->texs <= texid)	1187	while (self->texs <= texid)
1247	{	1188	{
1248	Append (maptex, self->tex, self->texs, self->texs);	1189	Append (maptex, self->tex, self->texs, self->texs);
…		…
1272	// from transparent color bleeding and ugly wrapping effects.	1213	// from transparent color bleeding and ugly wrapping effects.
1273	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1214	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274	}	1215	}
1275		1216
1276	int	1217	int
1277	ox (CFClient::Map self)	1218	ox (CFPlus::Map self)
1278	ALIAS:	1219	ALIAS:
1279	oy = 1	1220	oy = 1
1280	x = 2	1221	x = 2
1281	y = 3	1222	y = 3
1282	w = 4	1223	w = 4
…		…
1293	}	1234	}
1294	OUTPUT:	1235	OUTPUT:
1295	RETVAL	1236	RETVAL
1296		1237
1297	void	1238	void
1298	scroll (CFClient::Map self, int dx, int dy)	1239	scroll (CFPlus::Map self, int dx, int dy)
1299	CODE:	1240	CODE:
1300	{	1241	{
1301	if (dx > 0)	1242	if (dx > 0)
1302	map_blank (self, self->x, self->y, dx - 1, self->h);	1243	map_blank (self, self->x, self->y, dx - 1, self->h);
1303	else if (dx < 0)	1244	else if (dx < 0)
…		…
1319	self->y += MAP_EXTEND_Y;	1260	self->y += MAP_EXTEND_Y;
1320	}	1261	}
1321	}	1262	}
1322		1263
1323	void	1264	void
1324	map1a_update (CFClient::Map self, SV *data_)	1265	map1a_update (CFPlus::Map self, SV *data_)
1325	CODE:	1266	CODE:
1326	{	1267	{
1327	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1268	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1328	uint8_t data_end = (uint8_t )SvEND (data_);	1269	uint8_t data_end = (uint8_t )SvEND (data_);
1329	mapcell *cell;	1270	mapcell *cell;
…		…
1371	cell->darkness = -1;	1312	cell->darkness = -1;
1372	}	1313	}
1373	}	1314	}
1374		1315
1375	SV *	1316	SV *
1376	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1317	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377	CODE:	1318	CODE:
1378	{	1319	{
1379	int x1, x;	1320	int x1, x;
1380	int y1, y;	1321	int y1, y;
1381	int z;	1322	int z;
…		…
1431	}	1372	}
1432	OUTPUT:	1373	OUTPUT:
1433	RETVAL	1374	RETVAL
1434		1375
1435	void	1376	void
1436	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1377	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1437	CODE:	1378	CODE:
1438	{	1379	{
1439	int vx, vy;	1380	int vx, vy;
1440	int x, y, z;	1381	int x, y, z;
1441	int last_name;	1382	int last_name;
…		…
1506	glDisable (GL_TEXTURE_2D);	1447	glDisable (GL_TEXTURE_2D);
1507	glDisable (GL_BLEND);	1448	glDisable (GL_BLEND);
1508	}	1449	}
1509		1450
1510	void	1451	void
1511	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1452	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512	CODE:	1453	CODE:
1513	{	1454	{
1514	static float color[16][3] = {	1455	static float color[16][3] = {
1515	{ 0.00, 0.00, 0.00 },	1456	{ 0.00F, 0.00F, 0.00F },
1516	{ 1.00, 1.00, 1.00 },	1457	{ 1.00F, 1.00F, 1.00F },
1517	{ 0.00, 0.00, 0.55 },	1458	{ 0.00F, 0.00F, 0.55F },
1518	{ 1.00, 0.00, 0.00 },	1459	{ 1.00F, 0.00F, 0.00F },
1519		1460
1520	{ 1.00, 0.54, 0.00 },	1461	{ 1.00F, 0.54F, 0.00F },
1521	{ 0.11, 0.56, 1.00 },	1462	{ 0.11F, 0.56F, 1.00F },
1522	{ 0.93, 0.46, 0.00 },	1463	{ 0.93F, 0.46F, 0.00F },
1523	{ 0.18, 0.54, 0.34 },	1464	{ 0.18F, 0.54F, 0.34F },
1524		1465
1525	{ 0.56, 0.73, 0.56 },	1466	{ 0.56F, 0.73F, 0.56F },
1526	{ 0.80, 0.80, 0.80 },	1467	{ 0.80F, 0.80F, 0.80F },
1527	{ 0.55, 0.41, 0.13 },	1468	{ 0.55F, 0.41F, 0.13F },
1528	{ 0.99, 0.77, 0.26 },	1469	{ 0.99F, 0.77F, 0.26F },
1529		1470
1530	{ 0.74, 0.65, 0.41 },	1471	{ 0.74F, 0.65F, 0.41F },
1531		1472
1532	{ 0.00, 1.00, 1.00 },	1473	{ 0.00F, 1.00F, 1.00F },
1533	{ 1.00, 0.00, 1.00 },	1474	{ 1.00F, 0.00F, 1.00F },
1534	{ 1.00, 1.00, 0.00 },	1475	{ 1.00F, 1.00F, 0.00F },
1535	};	1476	};
1536		1477
1537	int x, y;	1478	int x, y;
1538		1479
1539	glEnable (GL_TEXTURE_2D);	1480	glEnable (GL_TEXTURE_2D);
…		…
1566	glDisable (GL_BLEND);	1507	glDisable (GL_BLEND);
1567	glDisable (GL_TEXTURE_2D);	1508	glDisable (GL_TEXTURE_2D);
1568	}	1509	}
1569		1510
1570	void	1511	void
1571	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1512	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1572	PPCODE:	1513	PPCODE:
1573	{	1514	{
1574	int vx, vy;	1515	int vx, vy;
1575	int x, y;	1516	int x, y;
1576	int sw4 = (sw + 3) & ~3;	1517	int sw4 = (sw + 3) & ~3;
…		…
1605	PUSHs (sv_2mortal (newSViv (sh)));	1546	PUSHs (sv_2mortal (newSViv (sh)));
1606	PUSHs (darkness_sv);	1547	PUSHs (darkness_sv);
1607	}	1548	}
1608		1549
1609	SV *	1550	SV *
1610	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1551	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1611	CODE:	1552	CODE:
1612	{	1553	{
1613	int x, y, x1, y1;	1554	int x, y, x1, y1;
1614	SV data_sv = newSV (w h * 7 + 5);	1555	SV data_sv = newSV (w h * 7 + 5);
1615	uint8_t data = (uint8_t )SvPVX (data_sv);	1556	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1677	}	1618	}
1678	OUTPUT:	1619	OUTPUT:
1679	RETVAL	1620	RETVAL
1680		1621
1681	void	1622	void
1682	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1623	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683	PPCODE:	1624	PPCODE:
1684	{	1625	{
1685	int x, y, z;	1626	int x, y, z;
1686	int w, h;	1627	int w, h;
1687	int x1, y1;	1628	int x1, y1;
…		…
1736	}	1677	}
1737	}	1678	}
1738	}	1679	}
1739	}	1680	}
1740		1681
1741	MODULE = CFClient PACKAGE = CFClient::MixChunk	1682	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742		1683
1743	CFClient::MixChunk	1684	CFPlus::MixChunk
1744	new_from_file (SV class, char path)	1685	new_from_file (SV class, char path)
1745	CODE:	1686	CODE:
1746	RETVAL = Mix_LoadWAV (path);	1687	RETVAL = Mix_LoadWAV (path);
1747	OUTPUT:	1688	OUTPUT:
1748	RETVAL	1689	RETVAL
1749		1690
1750	void	1691	void
1751	DESTROY (CFClient::MixChunk self)	1692	DESTROY (CFPlus::MixChunk self)
1752	CODE:	1693	CODE:
1753	Mix_FreeChunk (self);	1694	Mix_FreeChunk (self);
1754		1695
1755	int	1696	int
1756	volume (CFClient::MixChunk self, int volume = -1)	1697	volume (CFPlus::MixChunk self, int volume = -1)
1757	CODE:	1698	CODE:
1758	RETVAL = Mix_VolumeChunk (self, volume);	1699	RETVAL = Mix_VolumeChunk (self, volume);
1759	OUTPUT:	1700	OUTPUT:
1760	RETVAL	1701	RETVAL
1761		1702
1762	int	1703	int
1763	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1704	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1764	CODE:	1705	CODE:
1765	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1706	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766	OUTPUT:	1707	OUTPUT:
1767	RETVAL	1708	RETVAL
1768		1709
1769	MODULE = CFClient PACKAGE = CFClient::MixMusic	1710	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770		1711
1771	int	1712	int
1772	volume (int volume = -1)	1713	volume (int volume = -1)
1773	CODE:	1714	CODE:
1774	RETVAL = Mix_VolumeMusic (volume);	1715	RETVAL = Mix_VolumeMusic (volume);
1775	OUTPUT:	1716	OUTPUT:
1776	RETVAL	1717	RETVAL
1777		1718
1778	CFClient::MixMusic	1719	CFPlus::MixMusic
1779	new_from_file (SV class, char path)	1720	new_from_file (SV class, char path)
1780	CODE:	1721	CODE:
1781	RETVAL = Mix_LoadMUS (path);	1722	RETVAL = Mix_LoadMUS (path);
1782	OUTPUT:	1723	OUTPUT:
1783	RETVAL	1724	RETVAL
1784		1725
1785	void	1726	void
1786	DESTROY (CFClient::MixMusic self)	1727	DESTROY (CFPlus::MixMusic self)
1787	CODE:	1728	CODE:
1788	Mix_FreeMusic (self);	1729	Mix_FreeMusic (self);
1789		1730
1790	int	1731	int
1791	play (CFClient::MixMusic self, int loops = -1)	1732	play (CFPlus::MixMusic self, int loops = -1)
1792	CODE:	1733	CODE:
1793	RETVAL = Mix_PlayMusic (self, loops);	1734	RETVAL = Mix_PlayMusic (self, loops);
1794	OUTPUT:	1735	OUTPUT:
1795	RETVAL	1736	RETVAL
1796		1737
1797	MODULE = CFClient PACKAGE = CFClient::OpenGL	1738	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798		1739
1799	BOOT:	1740	BOOT:
1800	{	1741	{
1801	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1742	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802	static const struct {	1743	static const struct {
1803	const char *name;	1744	const char *name;
1804	IV iv;	1745	IV iv;
1805	} *civ, const_iv[] = {	1746	} *civ, const_iv[] = {
1806	# define const_iv(name) { # name, (IV)name }	1747	# define const_iv(name) { # name, (IV)name }
…		…
1869	const_iv (GL_SEPARABLE_2D),	1810	const_iv (GL_SEPARABLE_2D),
1870	const_iv (GL_CONVOLUTION_2D),	1811	const_iv (GL_CONVOLUTION_2D),
1871	const_iv (GL_CONVOLUTION_BORDER_MODE),	1812	const_iv (GL_CONVOLUTION_BORDER_MODE),
1872	const_iv (GL_CONSTANT_BORDER),	1813	const_iv (GL_CONSTANT_BORDER),
1873	const_iv (GL_LINES),	1814	const_iv (GL_LINES),
		1815	const_iv (GL_LINE_STRIP),
1874	const_iv (GL_LINE_LOOP),	1816	const_iv (GL_LINE_LOOP),
1875	const_iv (GL_QUADS),	1817	const_iv (GL_QUADS),
1876	const_iv (GL_QUAD_STRIP),	1818	const_iv (GL_QUAD_STRIP),
1877	const_iv (GL_TRIANGLES),	1819	const_iv (GL_TRIANGLES),
1878	const_iv (GL_TRIANGLE_STRIP),	1820	const_iv (GL_TRIANGLE_STRIP),
…		…
1988	r *= a;	1930	r *= a;
1989	g *= a;	1931	g *= a;
1990	b *= a;	1932	b *= a;
1991	}	1933	}
1992	// microsoft visual "c" rounds instead of truncating...	1934	// microsoft visual "c" rounds instead of truncating...
1993	glColor4ub (MIN ((int)(r * 256.f), 255),	1935	glColor4f (r, g, b, a);
1994	MIN ((int)(g * 256.f), 255),
1995	MIN ((int)(b * 256.f), 255),
1996	MIN ((int)(a * 256.f), 255));
1997		1936
1998	void glInterleavedArrays (int format, int stride, char *data)	1937	void glInterleavedArrays (int format, int stride, char *data)
1999		1938
2000	void glDrawElements (int mode, int count, int type, char *indices)	1939	void glDrawElements (int mode, int count, int type, char *indices)
2001		1940
…		…
2078		2017
2079	void glEndList ()	2018	void glEndList ()
2080		2019
2081	void glCallList (int list)	2020	void glCallList (int list)
2082		2021
2083

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs. Revision 1.140 by root, Mon Aug 14 03:41:25 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.140 by root, Mon Aug 14 03:41:25 2006 UTC