[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.137 by root, Sun Aug 13 19:47:05 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	{
139	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
140		150
141	if (!w) w = 1;	151	if (!w) w = 1;
142	if (!h) h = 1;	152	if (!h) h = 1;
…		…
172	int texs;	182	int texs;
173	maptex *tex;	183	maptex *tex;
174		184
175	int32_t rows;	185	int32_t rows;
176	maprow *row;	186	maprow *row;
177	} *CFClient__Map;	187	} *CFPlus__Map;
178		188
179	static char *	189	static char *
180	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
181	{	191	{
182	char *p;	192	char *p;
…		…
200		210
201	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	211	#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))	212	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203		213
204	static maprow *	214	static maprow *
205	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
206	{	216	{
207	if (0 > y)	217	if (0 > y)
208	{	218	{
209	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
248		258
249	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
250	}	260	}
251		261
252	static mapcell *	262	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
254	{	264	{
255	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
256	}	266	}
257		267
258	static void	268	static void
259	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
260	{	270	{
261	int r;	271	int r;
262		272
263	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
272	self->row = 0;	282	self->row = 0;
273	self->rows = 0;	283	self->rows = 0;
274	}	284	}
275		285
276	static void	286	static void
277	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	287	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278	{	288	{
279	int x, y;	289	int x, y;
280	maprow *row;	290	maprow *row;
281		291
282	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
339	n \|= n >> 16;	349	n \|= n >> 16;
340		350
341	return n + 1;	351	return n + 1;
342	}	352	}
343		353
344	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
345		355
346	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
347		357
348	BOOT:	358	BOOT:
349	{	359	{
350	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	361	static const struct {
352	const char *name;	362	const char *name;
353	IV iv;	363	IV iv;
354	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
456		466
457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	467	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459	}	469	}
460		470
		471	int
		472	in_destruct ()
		473	CODE:
		474	RETVAL = PL_main_cv == Nullcv;
		475	OUTPUT:
		476	RETVAL
		477
461	NV floor (NV x)	478	NV floor (NV x)
462		479
463	NV ceil (NV x)	480	NV ceil (NV x)
464		481
465	void	482	void
466	pango_init ()	483	pango_init ()
467	CODE:	484	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	485	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	486	opengl_fontmap = pango_opengl_font_map_new ();
472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	487	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);	488	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	}	489	}
491		490
492	int	491	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
494		493
495	void	494	void
496	SDL_Quit ()	495	SDL_Quit ()
497		496
498	void	497	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		515
517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		517	#if SDL_VERSION_ATLEAST(1,2,10)
		518	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		519	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		520	#endif
518		521
519	SDL_EnableUNICODE (1);	522	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	523	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		524
522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	525	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	612	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	613	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	614	break;
612	}	615	}
613		616
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	617	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	618	}
616	}	619	}
617		620
618	int	621	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	622	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
635	#endif	638	#endif
636		639
637	void	640	void
638	add_font (char *file)	641	add_font (char *file)
639	CODE:	642	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	643	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		644
646	void	645	void
647	load_image_inline (SV *image_)	646	load_image_inline (SV *image_)
648	ALIAS:	647	ALIAS:
649	load_image_file = 1	648	load_image_file = 1
…		…
691		690
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	691	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		692
694	assert (surface2->pitch == surface2->w * 4);	693	assert (surface2->pitch == surface2->w * 4);
695		694
		695	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	696	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	697	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	698	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	699	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)));	700	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	701	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	702	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		703	SDL_UnlockSurface (surface2);
705		704
706	SDL_FreeSurface (surface);	705	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	706	SDL_FreeSurface (surface2);
708	}	707	}
709		708
…		…
752	void	751	void
753	_exit (int retval)	752	_exit (int retval)
754	CODE:	753	CODE:
755	_exit (retval);	754	_exit (retval);
756		755
757	MODULE = CFClient PACKAGE = CFClient::Font	756	MODULE = CFPlus PACKAGE = CFPlus::Font
758		757
759	CFClient::Font	758	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	759	new_from_file (SV class, char path, int id = 0)
761	CODE:	760	CODE:
762	{	761	{
763	int count;	762	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	763	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	766	}
768	OUTPUT:	767	OUTPUT:
769	RETVAL	768	RETVAL
770		769
771	void	770	void
772	DESTROY (CFClient::Font self)	771	DESTROY (CFPlus::Font self)
773	CODE:	772	CODE:
774	pango_font_description_free (self);	773	pango_font_description_free (self);
775		774
776	void	775	void
777	make_default (CFClient::Font self)	776	make_default (CFPlus::Font self)
778	CODE:	777	CODE:
779	default_font = self;	778	default_font = self;
780		779
781	MODULE = CFClient PACKAGE = CFClient::Layout	780	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		781
783	CFClient::Layout	782	void
784	new (SV *class, int rgba = 0)	783	reset_glyph_cache ()
		784	CODE:
		785	tc_clear ();
		786
		787	CFPlus::Layout
		788	new (SV *class)
785	CODE:	789	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	790	New (0, RETVAL, 1, struct cf_layout);
787		791
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	792	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	793	RETVAL->r = 1.;
791	RETVAL->g = 1.;	794	RETVAL->g = 1.;
792	RETVAL->b = 1.;	795	RETVAL->b = 1.;
793	RETVAL->a = 1.;	796	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	797	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	801	layout_update_font (RETVAL);
799	OUTPUT:	802	OUTPUT:
800	RETVAL	803	RETVAL
801		804
802	void	805	void
803	DESTROY (CFClient::Layout self)	806	DESTROY (CFPlus::Layout self)
804	CODE:	807	CODE:
805	g_object_unref (self->pl);	808	g_object_unref (self->pl);
806	Safefree (self);	809	Safefree (self);
807		810
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	811	void
816	set_text (CFClient::Layout self, SV *text_)	812	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	813	CODE:
818	{	814	{
819	STRLEN textlen;	815	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	816	char *text = SvPVutf8 (text_, textlen);
821		817
822	pango_layout_set_text (self->pl, text, textlen);	818	pango_layout_set_text (self->pl, text, textlen);
823	}	819	}
824		820
825	void	821	void
826	set_markup (CFClient::Layout self, SV *text_)	822	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	823	CODE:
828	{	824	{
829	STRLEN textlen;	825	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	826	char *text = SvPVutf8 (text_, textlen);
831		827
832	pango_layout_set_markup (self->pl, text, textlen);	828	pango_layout_set_markup (self->pl, text, textlen);
833	}	829	}
834		830
835	void	831	void
836	set_shapes (CFClient::Layout self, ...)	832	set_shapes (CFPlus::Layout self, ...)
837	CODE:	833	CODE:
838	{	834	{
839	PangoAttrList *attrs = 0;	835	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	836	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	837	const char *pos = text;
842	int arg = 2;	838	int arg = 4;
843		839
844	while (arg < items && (pos = strstr (pos, OBJ_STR)))	840	while (arg < items && (pos = strstr (pos, OBJ_STR)))
845	{	841	{
846	PangoRectangle rect;	842	PangoRectangle inkrect, rect;
847	PangoAttribute *attr;	843	PangoAttribute *attr;
848		844
		845	int x = SvIV (ST (arg - 3));
		846	int y = SvIV (ST (arg - 2));
849	int w = SvIV (ST (arg - 1));	847	int w = SvIV (ST (arg - 1));
850	int h = SvIV (ST (arg));	848	int h = SvIV (ST (arg ));
851		849
852	arg += 2;
853
854	rect.x = 0;	850	inkrect.x = 0;
		851	inkrect.y = 0;
		852	inkrect.width = 0;
		853	inkrect.height = 0;
		854
		855	rect.x = x * PANGO_SCALE;
855	rect.y = -h * PANGO_SCALE;	856	rect.y = y * PANGO_SCALE;
856	rect.width = w * PANGO_SCALE;	857	rect.width = w * PANGO_SCALE;
857	rect.height = h * PANGO_SCALE;	858	rect.height = h * PANGO_SCALE;
858		859
859	if (!attrs)	860	if (!attrs)
860	attrs = pango_layout_get_attributes (self->pl);	861	attrs = pango_layout_get_attributes (self->pl);
861		862
862	attr = pango_attr_shape_new (&rect, &rect);	863	attr = pango_attr_shape_new (&inkrect, &rect);
863	attr->start_index = pos - text;	864	attr->start_index = pos - text;
864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;	865	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865	pango_attr_list_insert (attrs, attr);	866	pango_attr_list_insert (attrs, attr);
866		867
		868	arg += 4;
867	pos += sizeof (OBJ_STR) - 1;	869	pos += sizeof (OBJ_STR) - 1;
868	}	870	}
869		871
870	if (attrs)	872	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	873	pango_layout_set_attributes (self->pl, attrs);
872	}	874	}
873		875
874	void	876	void
875	get_shapes (CFClient::Layout self)	877	get_shapes (CFPlus::Layout self)
876	PPCODE:	878	PPCODE:
877	{	879	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	880	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		881
880	do	882	do
…		…
884	if (run && shape_attr_p (run))	886	if (run && shape_attr_p (run))
885	{	887	{
886	PangoRectangle extents;	888	PangoRectangle extents;
887	pango_layout_iter_get_run_extents (iter, 0, &extents);	889	pango_layout_iter_get_run_extents (iter, 0, &extents);
888		890
		891	EXTEND (SP, 2);
889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	892	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	893	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891	}	894	}
892	}	895	}
893	while (pango_layout_iter_next_run (iter));	896	while (pango_layout_iter_next_run (iter));
894		897
895	pango_layout_iter_free (iter);	898	pango_layout_iter_free (iter);
896	}	899	}
897		900
898	int	901	int
899	has_wrapped (CFClient::Layout self)	902	has_wrapped (CFPlus::Layout self)
900	CODE:	903	CODE:
901	{	904	{
902	int lines = 1;	905	int lines = 1;
903	const char *text = pango_layout_get_text (self->pl);	906	const char *text = pango_layout_get_text (self->pl);
904		907
…		…
909	}	912	}
910	OUTPUT:	913	OUTPUT:
911	RETVAL	914	RETVAL
912		915
913	SV *	916	SV *
914	get_text (CFClient::Layout self)	917	get_text (CFPlus::Layout self)
915	CODE:	918	CODE:
916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	919	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917	sv_utf8_decode (RETVAL);	920	sv_utf8_decode (RETVAL);
918	OUTPUT:	921	OUTPUT:
919	RETVAL	922	RETVAL
920		923
921	void	924	void
922	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	925	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
923	CODE:	926	CODE:
924	self->r = r;	927	self->r = r;
925	self->g = g;	928	self->g = g;
926	self->b = b;	929	self->b = b;
927	self->a = a;	930	self->a = a;
928		931
929	void	932	void
930	set_font (CFClient::Layout self, CFClient::Font font = 0)	933	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931	CODE:	934	CODE:
932	if (self->font != font)	935	if (self->font != font)
933	{	936	{
934	self->font = font;	937	self->font = font;
935	layout_update_font (self);	938	layout_update_font (self);
936	}	939	}
937		940
938	void	941	void
939	set_height (CFClient::Layout self, int base_height)	942	set_height (CFPlus::Layout self, int base_height)
940	CODE:	943	CODE:
941	if (self->base_height != base_height)	944	if (self->base_height != base_height)
942	{	945	{
943	self->base_height = base_height;	946	self->base_height = base_height;
944	layout_update_font (self);	947	layout_update_font (self);
945	}	948	}
946		949
947	void	950	void
948	set_width (CFClient::Layout self, int max_width = -1)	951	set_width (CFPlus::Layout self, int max_width = -1)
949	CODE:	952	CODE:
950	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	953	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
951		954
952	void	955	void
953	set_indent (CFClient::Layout self, int indent)	956	set_indent (CFPlus::Layout self, int indent)
954	CODE:	957	CODE:
955	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	958	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956		959
957	void	960	void
958	set_spacing (CFClient::Layout self, int spacing)	961	set_spacing (CFPlus::Layout self, int spacing)
959	CODE:	962	CODE:
960	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	963	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961		964
962	void	965	void
963	set_ellipsise (CFClient::Layout self, int ellipsise)	966	set_ellipsise (CFPlus::Layout self, int ellipsise)
964	CODE:	967	CODE:
965	pango_layout_set_ellipsize (self->pl,	968	pango_layout_set_ellipsize (self->pl,
966	ellipsise == 1 ? PANGO_ELLIPSIZE_START	969	ellipsise == 1 ? PANGO_ELLIPSIZE_START
967	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	970	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	971	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
969	: PANGO_ELLIPSIZE_NONE	972	: PANGO_ELLIPSIZE_NONE
970	);	973	);
971		974
972	void	975	void
973	set_single_paragraph_mode (CFClient::Layout self, int spm)	976	set_single_paragraph_mode (CFPlus::Layout self, int spm)
974	CODE:	977	CODE:
975	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	978	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976		979
977	void	980	void
978	size (CFClient::Layout self)	981	size (CFPlus::Layout self)
979	PPCODE:	982	PPCODE:
980	{	983	{
981	int w, h;	984	int w, h;
982		985
983	layout_get_pixel_size (self, &w, &h);	986	layout_get_pixel_size (self, &w, &h);
…		…
986	PUSHs (sv_2mortal (newSViv (w)));	989	PUSHs (sv_2mortal (newSViv (w)));
987	PUSHs (sv_2mortal (newSViv (h)));	990	PUSHs (sv_2mortal (newSViv (h)));
988	}	991	}
989		992
990	int	993	int
		994	descent (CFPlus::Layout self)
		995	CODE:
		996	{
		997	PangoRectangle rect;
		998	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		999	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1000	RETVAL = PANGO_DESCENT (rect);
		1001	}
		1002	OUTPUT:
		1003	RETVAL
		1004
		1005	int
991	xy_to_index (CFClient::Layout self, int x, int y)	1006	xy_to_index (CFPlus::Layout self, int x, int y)
992	CODE:	1007	CODE:
993	{	1008	{
994	int index, trailing;	1009	int index, trailing;
995	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1010	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996	RETVAL = index;	1011	RETVAL = index;
997	}	1012	}
998	OUTPUT:	1013	OUTPUT:
999	RETVAL	1014	RETVAL
1000		1015
1001	void	1016	void
1002	cursor_pos (CFClient::Layout self, int index)	1017	cursor_pos (CFPlus::Layout self, int index)
1003	PPCODE:	1018	PPCODE:
1004	{	1019	{
1005	PangoRectangle strong_pos;	1020	PangoRectangle strong_pos;
1006	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1021	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007		1022
…		…
1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1025	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1026	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012	}	1027	}
1013		1028
1014	void	1029	void
1015	render (CFClient::Layout self)	1030	render (CFPlus::Layout self, float x, float y, int flags = 0)
1016	PPCODE:	1031	PPCODE:
1017	{	1032	pango_opengl_render_layout_subpixel (
1018	SV *retval;	1033	self->pl,
1019	int w, h;	1034	x * PANGO_SCALE, y * PANGO_SCALE,
1020		1035	self->r, self->g, self->b, self->a,
1021	layout_get_pixel_size (self, &w, &h);
1022
1023	if (self->rgba)
1024	{	1036	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	}	1037	);
1077	else
1078	{
1079	FT_Bitmap bitmap;
1080		1038
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	1039	MODULE = CFPlus PACKAGE = CFPlus::Texture
1106		1040
1107	void	1041	void
1108	pad2pot (SV data_, SV w_, SV *h_)	1042	pad2pot (SV data_, SV w_, SV *h_)
1109	CODE:	1043	CODE:
1110	{	1044	{
…		…
1188	glDisable (GL_ALPHA_TEST);	1122	glDisable (GL_ALPHA_TEST);
1189	glDisable (GL_BLEND);	1123	glDisable (GL_BLEND);
1190	}	1124	}
1191	}	1125	}
1192		1126
1193	MODULE = CFClient PACKAGE = CFClient::Map	1127	MODULE = CFPlus PACKAGE = CFPlus::Map
1194		1128
1195	CFClient::Map	1129	CFPlus::Map
1196	new (SV *class, int map_width, int map_height)	1130	new (SV *class, int map_width, int map_height)
1197	CODE:	1131	CODE:
1198	New (0, RETVAL, 1, struct map);	1132	New (0, RETVAL, 1, struct map);
1199	RETVAL->x = 0;	1133	RETVAL->x = 0;
1200	RETVAL->y = 0;	1134	RETVAL->y = 0;
…		…
1210	RETVAL->row = 0;	1144	RETVAL->row = 0;
1211	OUTPUT:	1145	OUTPUT:
1212	RETVAL	1146	RETVAL
1213		1147
1214	void	1148	void
1215	DESTROY (CFClient::Map self)	1149	DESTROY (CFPlus::Map self)
1216	CODE:	1150	CODE:
1217	{	1151	{
1218	map_clear (self);	1152	map_clear (self);
1219	Safefree (self->face);	1153	Safefree (self->face);
1220	Safefree (self->tex);	1154	Safefree (self->tex);
1221	Safefree (self);	1155	Safefree (self);
1222	}	1156	}
1223		1157
1224	void	1158	void
1225	clear (CFClient::Map self)	1159	clear (CFPlus::Map self)
1226	CODE:	1160	CODE:
1227	map_clear (self);	1161	map_clear (self);
1228		1162
1229	void	1163	void
1230	set_face (CFClient::Map self, int face, int texid)	1164	set_face (CFPlus::Map self, int face, int texid)
1231	CODE:	1165	CODE:
1232	{	1166	{
1233	while (self->faces <= face)	1167	while (self->faces <= face)
1234	{	1168	{
1235	Append (mapface, self->face, self->faces, self->faces);	1169	Append (mapface, self->face, self->faces, self->faces);
…		…
1238		1172
1239	self->face [face] = texid;	1173	self->face [face] = texid;
1240	}	1174	}
1241		1175
1242	void	1176	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)	1177	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:	1178	CODE:
1245	{	1179	{
1246	while (self->texs <= texid)	1180	while (self->texs <= texid)
1247	{	1181	{
1248	Append (maptex, self->tex, self->texs, self->texs);	1182	Append (maptex, self->tex, self->texs, self->texs);
…		…
1272	// from transparent color bleeding and ugly wrapping effects.	1206	// from transparent color bleeding and ugly wrapping effects.
1273	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1207	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274	}	1208	}
1275		1209
1276	int	1210	int
1277	ox (CFClient::Map self)	1211	ox (CFPlus::Map self)
1278	ALIAS:	1212	ALIAS:
1279	oy = 1	1213	oy = 1
1280	x = 2	1214	x = 2
1281	y = 3	1215	y = 3
1282	w = 4	1216	w = 4
…		…
1293	}	1227	}
1294	OUTPUT:	1228	OUTPUT:
1295	RETVAL	1229	RETVAL
1296		1230
1297	void	1231	void
1298	scroll (CFClient::Map self, int dx, int dy)	1232	scroll (CFPlus::Map self, int dx, int dy)
1299	CODE:	1233	CODE:
1300	{	1234	{
1301	if (dx > 0)	1235	if (dx > 0)
1302	map_blank (self, self->x, self->y, dx - 1, self->h);	1236	map_blank (self, self->x, self->y, dx - 1, self->h);
1303	else if (dx < 0)	1237	else if (dx < 0)
…		…
1319	self->y += MAP_EXTEND_Y;	1253	self->y += MAP_EXTEND_Y;
1320	}	1254	}
1321	}	1255	}
1322		1256
1323	void	1257	void
1324	map1a_update (CFClient::Map self, SV *data_)	1258	map1a_update (CFPlus::Map self, SV *data_)
1325	CODE:	1259	CODE:
1326	{	1260	{
1327	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1261	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1328	uint8_t data_end = (uint8_t )SvEND (data_);	1262	uint8_t data_end = (uint8_t )SvEND (data_);
1329	mapcell *cell;	1263	mapcell *cell;
…		…
1371	cell->darkness = -1;	1305	cell->darkness = -1;
1372	}	1306	}
1373	}	1307	}
1374		1308
1375	SV *	1309	SV *
1376	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1310	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377	CODE:	1311	CODE:
1378	{	1312	{
1379	int x1, x;	1313	int x1, x;
1380	int y1, y;	1314	int y1, y;
1381	int z;	1315	int z;
…		…
1431	}	1365	}
1432	OUTPUT:	1366	OUTPUT:
1433	RETVAL	1367	RETVAL
1434		1368
1435	void	1369	void
1436	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1370	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1437	CODE:	1371	CODE:
1438	{	1372	{
1439	int vx, vy;	1373	int vx, vy;
1440	int x, y, z;	1374	int x, y, z;
1441	int last_name;	1375	int last_name;
…		…
1506	glDisable (GL_TEXTURE_2D);	1440	glDisable (GL_TEXTURE_2D);
1507	glDisable (GL_BLEND);	1441	glDisable (GL_BLEND);
1508	}	1442	}
1509		1443
1510	void	1444	void
1511	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1445	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512	CODE:	1446	CODE:
1513	{	1447	{
1514	static float color[16][3] = {	1448	static float color[16][3] = {
1515	{ 0.00, 0.00, 0.00 },	1449	{ 0.00F, 0.00F, 0.00F },
1516	{ 1.00, 1.00, 1.00 },	1450	{ 1.00F, 1.00F, 1.00F },
1517	{ 0.00, 0.00, 0.55 },	1451	{ 0.00F, 0.00F, 0.55F },
1518	{ 1.00, 0.00, 0.00 },	1452	{ 1.00F, 0.00F, 0.00F },
1519		1453
1520	{ 1.00, 0.54, 0.00 },	1454	{ 1.00F, 0.54F, 0.00F },
1521	{ 0.11, 0.56, 1.00 },	1455	{ 0.11F, 0.56F, 1.00F },
1522	{ 0.93, 0.46, 0.00 },	1456	{ 0.93F, 0.46F, 0.00F },
1523	{ 0.18, 0.54, 0.34 },	1457	{ 0.18F, 0.54F, 0.34F },
1524		1458
1525	{ 0.56, 0.73, 0.56 },	1459	{ 0.56F, 0.73F, 0.56F },
1526	{ 0.80, 0.80, 0.80 },	1460	{ 0.80F, 0.80F, 0.80F },
1527	{ 0.55, 0.41, 0.13 },	1461	{ 0.55F, 0.41F, 0.13F },
1528	{ 0.99, 0.77, 0.26 },	1462	{ 0.99F, 0.77F, 0.26F },
1529		1463
1530	{ 0.74, 0.65, 0.41 },	1464	{ 0.74F, 0.65F, 0.41F },
1531		1465
1532	{ 0.00, 1.00, 1.00 },	1466	{ 0.00F, 1.00F, 1.00F },
1533	{ 1.00, 0.00, 1.00 },	1467	{ 1.00F, 0.00F, 1.00F },
1534	{ 1.00, 1.00, 0.00 },	1468	{ 1.00F, 1.00F, 0.00F },
1535	};	1469	};
1536		1470
1537	int x, y;	1471	int x, y;
1538		1472
1539	glEnable (GL_TEXTURE_2D);	1473	glEnable (GL_TEXTURE_2D);
…		…
1566	glDisable (GL_BLEND);	1500	glDisable (GL_BLEND);
1567	glDisable (GL_TEXTURE_2D);	1501	glDisable (GL_TEXTURE_2D);
1568	}	1502	}
1569		1503
1570	void	1504	void
1571	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1505	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1572	PPCODE:	1506	PPCODE:
1573	{	1507	{
1574	int vx, vy;	1508	int vx, vy;
1575	int x, y;	1509	int x, y;
1576	int sw4 = (sw + 3) & ~3;	1510	int sw4 = (sw + 3) & ~3;
…		…
1605	PUSHs (sv_2mortal (newSViv (sh)));	1539	PUSHs (sv_2mortal (newSViv (sh)));
1606	PUSHs (darkness_sv);	1540	PUSHs (darkness_sv);
1607	}	1541	}
1608		1542
1609	SV *	1543	SV *
1610	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1544	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1611	CODE:	1545	CODE:
1612	{	1546	{
1613	int x, y, x1, y1;	1547	int x, y, x1, y1;
1614	SV data_sv = newSV (w h * 7 + 5);	1548	SV data_sv = newSV (w h * 7 + 5);
1615	uint8_t data = (uint8_t )SvPVX (data_sv);	1549	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1677	}	1611	}
1678	OUTPUT:	1612	OUTPUT:
1679	RETVAL	1613	RETVAL
1680		1614
1681	void	1615	void
1682	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1616	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683	PPCODE:	1617	PPCODE:
1684	{	1618	{
1685	int x, y, z;	1619	int x, y, z;
1686	int w, h;	1620	int w, h;
1687	int x1, y1;	1621	int x1, y1;
…		…
1736	}	1670	}
1737	}	1671	}
1738	}	1672	}
1739	}	1673	}
1740		1674
1741	MODULE = CFClient PACKAGE = CFClient::MixChunk	1675	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742		1676
1743	CFClient::MixChunk	1677	CFPlus::MixChunk
1744	new_from_file (SV class, char path)	1678	new_from_file (SV class, char path)
1745	CODE:	1679	CODE:
1746	RETVAL = Mix_LoadWAV (path);	1680	RETVAL = Mix_LoadWAV (path);
1747	OUTPUT:	1681	OUTPUT:
1748	RETVAL	1682	RETVAL
1749		1683
1750	void	1684	void
1751	DESTROY (CFClient::MixChunk self)	1685	DESTROY (CFPlus::MixChunk self)
1752	CODE:	1686	CODE:
1753	Mix_FreeChunk (self);	1687	Mix_FreeChunk (self);
1754		1688
1755	int	1689	int
1756	volume (CFClient::MixChunk self, int volume = -1)	1690	volume (CFPlus::MixChunk self, int volume = -1)
1757	CODE:	1691	CODE:
1758	RETVAL = Mix_VolumeChunk (self, volume);	1692	RETVAL = Mix_VolumeChunk (self, volume);
1759	OUTPUT:	1693	OUTPUT:
1760	RETVAL	1694	RETVAL
1761		1695
1762	int	1696	int
1763	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1697	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1764	CODE:	1698	CODE:
1765	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1699	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766	OUTPUT:	1700	OUTPUT:
1767	RETVAL	1701	RETVAL
1768		1702
1769	MODULE = CFClient PACKAGE = CFClient::MixMusic	1703	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770		1704
1771	int	1705	int
1772	volume (int volume = -1)	1706	volume (int volume = -1)
1773	CODE:	1707	CODE:
1774	RETVAL = Mix_VolumeMusic (volume);	1708	RETVAL = Mix_VolumeMusic (volume);
1775	OUTPUT:	1709	OUTPUT:
1776	RETVAL	1710	RETVAL
1777		1711
1778	CFClient::MixMusic	1712	CFPlus::MixMusic
1779	new_from_file (SV class, char path)	1713	new_from_file (SV class, char path)
1780	CODE:	1714	CODE:
1781	RETVAL = Mix_LoadMUS (path);	1715	RETVAL = Mix_LoadMUS (path);
1782	OUTPUT:	1716	OUTPUT:
1783	RETVAL	1717	RETVAL
1784		1718
1785	void	1719	void
1786	DESTROY (CFClient::MixMusic self)	1720	DESTROY (CFPlus::MixMusic self)
1787	CODE:	1721	CODE:
1788	Mix_FreeMusic (self);	1722	Mix_FreeMusic (self);
1789		1723
1790	int	1724	int
1791	play (CFClient::MixMusic self, int loops = -1)	1725	play (CFPlus::MixMusic self, int loops = -1)
1792	CODE:	1726	CODE:
1793	RETVAL = Mix_PlayMusic (self, loops);	1727	RETVAL = Mix_PlayMusic (self, loops);
1794	OUTPUT:	1728	OUTPUT:
1795	RETVAL	1729	RETVAL
1796		1730
1797	MODULE = CFClient PACKAGE = CFClient::OpenGL	1731	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798		1732
1799	BOOT:	1733	BOOT:
1800	{	1734	{
1801	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1735	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802	static const struct {	1736	static const struct {
1803	const char *name;	1737	const char *name;
1804	IV iv;	1738	IV iv;
1805	} *civ, const_iv[] = {	1739	} *civ, const_iv[] = {
1806	# define const_iv(name) { # name, (IV)name }	1740	# define const_iv(name) { # name, (IV)name }
…		…
1988	r *= a;	1922	r *= a;
1989	g *= a;	1923	g *= a;
1990	b *= a;	1924	b *= a;
1991	}	1925	}
1992	// microsoft visual "c" rounds instead of truncating...	1926	// microsoft visual "c" rounds instead of truncating...
1993	glColor4ub (MIN ((int)(r * 256.f), 255),	1927	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		1928
1998	void glInterleavedArrays (int format, int stride, char *data)	1929	void glInterleavedArrays (int format, int stride, char *data)
1999		1930
2000	void glDrawElements (int mode, int count, int type, char *indices)	1931	void glDrawElements (int mode, int count, int type, char *indices)
2001		1932
…		…
2078		2009
2079	void glEndList ()	2010	void glEndList ()
2080		2011
2081	void glCallList (int list)	2012	void glCallList (int list)
2082		2013
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.137 by root, Sun Aug 13 19:47:05 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.137 by root, Sun Aug 13 19:47:05 2006 UTC