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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC vs.
Revision 1.139 by root, Mon Aug 14 03:04:17 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	rect.width = (rect.width + 3) & ~3;
		161
		162	*w = rect.width;
		163	*h = rect.height;
145	}	164	}
146		165
147	typedef uint16_t mapface;	166	typedef uint16_t mapface;
148		167
149	typedef struct {	168	typedef struct {
…		…
172	int texs;	191	int texs;
173	maptex *tex;	192	maptex *tex;
174		193
175	int32_t rows;	194	int32_t rows;
176	maprow *row;	195	maprow *row;
177	} *CFClient__Map;	196	} *CFPlus__Map;
178		197
179	static char *	198	static char *
180	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
181	{	200	{
182	char *p;	201	char *p;
…		…
200		219
201	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#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))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203		222
204	static maprow *	223	static maprow *
205	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
206	{	225	{
207	if (0 > y)	226	if (0 > y)
208	{	227	{
209	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
248		267
249	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
250	}	269	}
251		270
252	static mapcell *	271	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
254	{	273	{
255	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
256	}	275	}
257		276
258	static void	277	static void
259	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
260	{	279	{
261	int r;	280	int r;
262		281
263	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
272	self->row = 0;	291	self->row = 0;
273	self->rows = 0;	292	self->rows = 0;
274	}	293	}
275		294
276	static void	295	static void
277	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278	{	297	{
279	int x, y;	298	int x, y;
280	maprow *row;	299	maprow *row;
281		300
282	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
…		…
339	n \|= n >> 16;	358	n \|= n >> 16;
340		359
341	return n + 1;	360	return n + 1;
342	}	361	}
343		362
344	MODULE = CFClient PACKAGE = CFClient	363	MODULE = CFPlus PACKAGE = CFPlus
345		364
346	PROTOTYPES: ENABLE	365	PROTOTYPES: ENABLE
347		366
348	BOOT:	367	BOOT:
349	{	368	{
350	HV *stash = gv_stashpv ("CFClient", 1);	369	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	370	static const struct {
352	const char *name;	371	const char *name;
353	IV iv;	372	IV iv;
354	} *civ, const_iv[] = {	373	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	374	# define const_iv(name) { # name, (IV)name }
…		…
456		475
457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	476	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	477	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459	}	478	}
460		479
		480	int
		481	in_destruct ()
		482	CODE:
		483	RETVAL = PL_main_cv == Nullcv;
		484	OUTPUT:
		485	RETVAL
		486
461	NV floor (NV x)	487	NV floor (NV x)
462		488
463	NV ceil (NV x)	489	NV ceil (NV x)
464		490
465	void	491	void
466	pango_init ()	492	pango_init ()
467	CODE:	493	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	494	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	495	opengl_fontmap = pango_opengl_font_map_new ();
472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	496	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);	497	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	}	498	}
491		499
492	int	500	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	501	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
494		502
495	void	503	void
496	SDL_Quit ()	504	SDL_Quit ()
497		505
498	void	506	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		524
517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	525	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		526	#if SDL_VERSION_ATLEAST(1,2,10)
		527	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		528	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		529	#endif
518		530
519	SDL_EnableUNICODE (1);	531	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	532	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		533
522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	534	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	621	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	622	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	623	break;
612	}	624	}
613		625
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	626	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	627	}
616	}	628	}
617		629
618	int	630	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	631	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
635	#endif	647	#endif
636		648
637	void	649	void
638	add_font (char *file)	650	add_font (char *file)
639	CODE:	651	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	652	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		653
646	void	654	void
647	load_image_inline (SV *image_)	655	load_image_inline (SV *image_)
648	ALIAS:	656	ALIAS:
649	load_image_file = 1	657	load_image_file = 1
…		…
691		699
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	700	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		701
694	assert (surface2->pitch == surface2->w * 4);	702	assert (surface2->pitch == surface2->w * 4);
695		703
		704	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	705	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	706	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	707	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	708	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)));	709	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	710	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	711	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		712	SDL_UnlockSurface (surface2);
705		713
706	SDL_FreeSurface (surface);	714	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	715	SDL_FreeSurface (surface2);
708	}	716	}
709		717
…		…
752	void	760	void
753	_exit (int retval)	761	_exit (int retval)
754	CODE:	762	CODE:
755	_exit (retval);	763	_exit (retval);
756		764
757	MODULE = CFClient PACKAGE = CFClient::Font	765	MODULE = CFPlus PACKAGE = CFPlus::Font
758		766
759	CFClient::Font	767	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	768	new_from_file (SV class, char path, int id = 0)
761	CODE:	769	CODE:
762	{	770	{
763	int count;	771	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	772	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	775	}
768	OUTPUT:	776	OUTPUT:
769	RETVAL	777	RETVAL
770		778
771	void	779	void
772	DESTROY (CFClient::Font self)	780	DESTROY (CFPlus::Font self)
773	CODE:	781	CODE:
774	pango_font_description_free (self);	782	pango_font_description_free (self);
775		783
776	void	784	void
777	make_default (CFClient::Font self)	785	make_default (CFPlus::Font self)
778	CODE:	786	CODE:
779	default_font = self;	787	default_font = self;
780		788
781	MODULE = CFClient PACKAGE = CFClient::Layout	789	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		790
783	CFClient::Layout	791	void
784	new (SV *class, int rgba = 0)	792	reset_glyph_cache ()
		793	CODE:
		794	tc_clear ();
		795
		796	CFPlus::Layout
		797	new (SV *class)
785	CODE:	798	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	799	New (0, RETVAL, 1, struct cf_layout);
787		800
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	801	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	802	RETVAL->r = 1.;
791	RETVAL->g = 1.;	803	RETVAL->g = 1.;
792	RETVAL->b = 1.;	804	RETVAL->b = 1.;
793	RETVAL->a = 1.;	805	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	806	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	810	layout_update_font (RETVAL);
799	OUTPUT:	811	OUTPUT:
800	RETVAL	812	RETVAL
801		813
802	void	814	void
803	DESTROY (CFClient::Layout self)	815	DESTROY (CFPlus::Layout self)
804	CODE:	816	CODE:
805	g_object_unref (self->pl);	817	g_object_unref (self->pl);
806	Safefree (self);	818	Safefree (self);
807		819
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	820	void
816	set_text (CFClient::Layout self, SV *text_)	821	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	822	CODE:
818	{	823	{
819	STRLEN textlen;	824	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	825	char *text = SvPVutf8 (text_, textlen);
821		826
822	pango_layout_set_text (self->pl, text, textlen);	827	pango_layout_set_text (self->pl, text, textlen);
823	}	828	}
824		829
825	void	830	void
826	set_markup (CFClient::Layout self, SV *text_)	831	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	832	CODE:
828	{	833	{
829	STRLEN textlen;	834	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	835	char *text = SvPVutf8 (text_, textlen);
831		836
832	pango_layout_set_markup (self->pl, text, textlen);	837	pango_layout_set_markup (self->pl, text, textlen);
833	}	838	}
834		839
835	void	840	void
836	set_shapes (CFClient::Layout self, ...)	841	set_shapes (CFPlus::Layout self, ...)
837	CODE:	842	CODE:
838	{	843	{
839	PangoAttrList *attrs = 0;	844	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	845	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	846	const char *pos = text;
…		…
876	if (attrs)	881	if (attrs)
877	pango_layout_set_attributes (self->pl, attrs);	882	pango_layout_set_attributes (self->pl, attrs);
878	}	883	}
879		884
880	void	885	void
881	get_shapes (CFClient::Layout self)	886	get_shapes (CFPlus::Layout self)
882	PPCODE:	887	PPCODE:
883	{	888	{
884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	889	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885		890
886	do	891	do
…		…
890	if (run && shape_attr_p (run))	895	if (run && shape_attr_p (run))
891	{	896	{
892	PangoRectangle extents;	897	PangoRectangle extents;
893	pango_layout_iter_get_run_extents (iter, 0, &extents);	898	pango_layout_iter_get_run_extents (iter, 0, &extents);
894		899
		900	EXTEND (SP, 2);
895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	902	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897	}	903	}
898	}	904	}
899	while (pango_layout_iter_next_run (iter));	905	while (pango_layout_iter_next_run (iter));
900		906
901	pango_layout_iter_free (iter);	907	pango_layout_iter_free (iter);
902	}	908	}
903		909
904	int	910	int
905	has_wrapped (CFClient::Layout self)	911	has_wrapped (CFPlus::Layout self)
906	CODE:	912	CODE:
907	{	913	{
908	int lines = 1;	914	int lines = 1;
909	const char *text = pango_layout_get_text (self->pl);	915	const char *text = pango_layout_get_text (self->pl);
910		916
…		…
915	}	921	}
916	OUTPUT:	922	OUTPUT:
917	RETVAL	923	RETVAL
918		924
919	SV *	925	SV *
920	get_text (CFClient::Layout self)	926	get_text (CFPlus::Layout self)
921	CODE:	927	CODE:
922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	928	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923	sv_utf8_decode (RETVAL);	929	sv_utf8_decode (RETVAL);
924	OUTPUT:	930	OUTPUT:
925	RETVAL	931	RETVAL
926		932
927	void	933	void
928	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	934	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929	CODE:	935	CODE:
930	self->r = r;	936	self->r = r;
931	self->g = g;	937	self->g = g;
932	self->b = b;	938	self->b = b;
933	self->a = a;	939	self->a = a;
934		940
935	void	941	void
936	set_font (CFClient::Layout self, CFClient::Font font = 0)	942	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937	CODE:	943	CODE:
938	if (self->font != font)	944	if (self->font != font)
939	{	945	{
940	self->font = font;	946	self->font = font;
941	layout_update_font (self);	947	layout_update_font (self);
942	}	948	}
943		949
944	void	950	void
945	set_height (CFClient::Layout self, int base_height)	951	set_height (CFPlus::Layout self, int base_height)
946	CODE:	952	CODE:
947	if (self->base_height != base_height)	953	if (self->base_height != base_height)
948	{	954	{
949	self->base_height = base_height;	955	self->base_height = base_height;
950	layout_update_font (self);	956	layout_update_font (self);
951	}	957	}
952		958
953	void	959	void
954	set_width (CFClient::Layout self, int max_width = -1)	960	set_width (CFPlus::Layout self, int max_width = -1)
955	CODE:	961	CODE:
956	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	962	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957		963
958	void	964	void
959	set_indent (CFClient::Layout self, int indent)	965	set_indent (CFPlus::Layout self, int indent)
960	CODE:	966	CODE:
961	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	967	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962		968
963	void	969	void
964	set_spacing (CFClient::Layout self, int spacing)	970	set_spacing (CFPlus::Layout self, int spacing)
965	CODE:	971	CODE:
966	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	972	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967		973
968	void	974	void
969	set_ellipsise (CFClient::Layout self, int ellipsise)	975	set_ellipsise (CFPlus::Layout self, int ellipsise)
970	CODE:	976	CODE:
971	pango_layout_set_ellipsize (self->pl,	977	pango_layout_set_ellipsize (self->pl,
972	ellipsise == 1 ? PANGO_ELLIPSIZE_START	978	ellipsise == 1 ? PANGO_ELLIPSIZE_START
973	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	979	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	980	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
975	: PANGO_ELLIPSIZE_NONE	981	: PANGO_ELLIPSIZE_NONE
976	);	982	);
977		983
978	void	984	void
979	set_single_paragraph_mode (CFClient::Layout self, int spm)	985	set_single_paragraph_mode (CFPlus::Layout self, int spm)
980	CODE:	986	CODE:
981	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	987	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982		988
983	void	989	void
984	size (CFClient::Layout self)	990	size (CFPlus::Layout self)
985	PPCODE:	991	PPCODE:
986	{	992	{
987	int w, h;	993	int w, h;
988		994
989	layout_get_pixel_size (self, &w, &h);	995	layout_get_pixel_size (self, &w, &h);
…		…
992	PUSHs (sv_2mortal (newSViv (w)));	998	PUSHs (sv_2mortal (newSViv (w)));
993	PUSHs (sv_2mortal (newSViv (h)));	999	PUSHs (sv_2mortal (newSViv (h)));
994	}	1000	}
995		1001
996	int	1002	int
997	descent (CFClient::Layout self)	1003	descent (CFPlus::Layout self)
998	CODE:	1004	CODE:
999	{	1005	{
1000	PangoRectangle rect;	1006	PangoRectangle rect;
1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1007	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002	pango_layout_line_get_pixel_extents (line, 0, &rect);	1008	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1004	}	1010	}
1005	OUTPUT:	1011	OUTPUT:
1006	RETVAL	1012	RETVAL
1007		1013
1008	int	1014	int
1009	xy_to_index (CFClient::Layout self, int x, int y)	1015	xy_to_index (CFPlus::Layout self, int x, int y)
1010	CODE:	1016	CODE:
1011	{	1017	{
1012	int index, trailing;	1018	int index, trailing;
1013	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1019	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014	RETVAL = index;	1020	RETVAL = index;
1015	}	1021	}
1016	OUTPUT:	1022	OUTPUT:
1017	RETVAL	1023	RETVAL
1018		1024
1019	void	1025	void
1020	cursor_pos (CFClient::Layout self, int index)	1026	cursor_pos (CFPlus::Layout self, int index)
1021	PPCODE:	1027	PPCODE:
1022	{	1028	{
1023	PangoRectangle strong_pos;	1029	PangoRectangle strong_pos;
1024	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1030	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025		1031
…		…
1028	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1035	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030	}	1036	}
1031		1037
1032	void	1038	void
1033	render (CFClient::Layout self)	1039	render (CFPlus::Layout self, float x, float y, int flags = 0)
1034	PPCODE:	1040	PPCODE:
1035	{	1041	pango_opengl_render_layout_subpixel (
1036	SV *retval;	1042	self->pl,
1037	int w, h;	1043	x * PANGO_SCALE, y * PANGO_SCALE,
1038		1044	self->r, self->g, self->b, self->a,
1039	layout_get_pixel_size (self, &w, &h);
1040
1041	if (self->rgba)
1042	{	1045	flags
1043	cairo_surface_t *surface;
1044	cairo_t *cairo;
1045
1046	retval = newSV (w * h * 4);
1047	SvPOK_only (retval);
1048	SvCUR_set (retval, w * h * 4);
1049
1050	memset (SvPVX (retval), 0, w * h * 4);
1051
1052	surface = cairo_image_surface_create_for_data (
1053	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
1054	cairo = cairo_create (surface);
1055	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1056
1057	pango_cairo_show_layout (cairo, self->pl);
1058
1059	cairo_destroy (cairo);
1060	cairo_surface_destroy (surface);
1061
1062	// what a mess, and its premultiplied, too :(
1063	{
1064	uint32_t p = (uint32_t )SvPVX (retval);
1065	uint32_t e = p + w h;
1066
1067	while (p < e)
1068	{
1069	uint32_t rgba = *p;
1070	rgba = (rgba >> 24) \| (rgba << 8);
1071	#if 0
1072	#ifdef _WIN32
1073	{//D
1074	uint8_t r = rgba >> 24;
1075	uint8_t g = rgba >> 16;
1076	uint8_t b = rgba >> 8;
1077	uint8_t a = rgba >> 0;
1078
1079	rgba = (rgba & 0xffffff00) \| a;
1080	}
1081	#endif
1082	#endif
1083	rgba = SDL_SwapBE32 (rgba);
1084	*p++ = rgba;
1085	}
1086	}
1087
1088	EXTEND (SP, 5);
1089	PUSHs (sv_2mortal (newSViv (w)));
1090	PUSHs (sv_2mortal (newSViv (h)));
1091	PUSHs (sv_2mortal (retval));
1092	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1093	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1094	}	1046	);
1095	else
1096	{
1097	FT_Bitmap bitmap;
1098		1047
1099	retval = newSV (w * h);
1100	SvPOK_only (retval);
1101	SvCUR_set (retval, w * h);
1102
1103	bitmap.rows = h;
1104	bitmap.width = w;
1105	bitmap.pitch = w;
1106	bitmap.buffer = (unsigned char*)SvPVX (retval);
1107	bitmap.num_grays = 256;
1108	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1109
1110	memset (bitmap.buffer, 0, w * h);
1111
1112	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1113
1114	EXTEND (SP, 5);
1115	PUSHs (sv_2mortal (newSViv (w)));
1116	PUSHs (sv_2mortal (newSViv (h)));
1117	PUSHs (sv_2mortal (retval));
1118	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1119	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1120	}
1121	}
1122
1123	MODULE = CFClient PACKAGE = CFClient::Texture	1048	MODULE = CFPlus PACKAGE = CFPlus::Texture
1124		1049
1125	void	1050	void
1126	pad2pot (SV data_, SV w_, SV *h_)	1051	pad2pot (SV data_, SV w_, SV *h_)
1127	CODE:	1052	CODE:
1128	{	1053	{
…		…
1206	glDisable (GL_ALPHA_TEST);	1131	glDisable (GL_ALPHA_TEST);
1207	glDisable (GL_BLEND);	1132	glDisable (GL_BLEND);
1208	}	1133	}
1209	}	1134	}
1210		1135
1211	MODULE = CFClient PACKAGE = CFClient::Map	1136	MODULE = CFPlus PACKAGE = CFPlus::Map
1212		1137
1213	CFClient::Map	1138	CFPlus::Map
1214	new (SV *class, int map_width, int map_height)	1139	new (SV *class, int map_width, int map_height)
1215	CODE:	1140	CODE:
1216	New (0, RETVAL, 1, struct map);	1141	New (0, RETVAL, 1, struct map);
1217	RETVAL->x = 0;	1142	RETVAL->x = 0;
1218	RETVAL->y = 0;	1143	RETVAL->y = 0;
…		…
1228	RETVAL->row = 0;	1153	RETVAL->row = 0;
1229	OUTPUT:	1154	OUTPUT:
1230	RETVAL	1155	RETVAL
1231		1156
1232	void	1157	void
1233	DESTROY (CFClient::Map self)	1158	DESTROY (CFPlus::Map self)
1234	CODE:	1159	CODE:
1235	{	1160	{
1236	map_clear (self);	1161	map_clear (self);
1237	Safefree (self->face);	1162	Safefree (self->face);
1238	Safefree (self->tex);	1163	Safefree (self->tex);
1239	Safefree (self);	1164	Safefree (self);
1240	}	1165	}
1241		1166
1242	void	1167	void
1243	clear (CFClient::Map self)	1168	clear (CFPlus::Map self)
1244	CODE:	1169	CODE:
1245	map_clear (self);	1170	map_clear (self);
1246		1171
1247	void	1172	void
1248	set_face (CFClient::Map self, int face, int texid)	1173	set_face (CFPlus::Map self, int face, int texid)
1249	CODE:	1174	CODE:
1250	{	1175	{
1251	while (self->faces <= face)	1176	while (self->faces <= face)
1252	{	1177	{
1253	Append (mapface, self->face, self->faces, self->faces);	1178	Append (mapface, self->face, self->faces, self->faces);
…		…
1256		1181
1257	self->face [face] = texid;	1182	self->face [face] = texid;
1258	}	1183	}
1259		1184
1260	void	1185	void
1261	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)	1186	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)
1262	CODE:	1187	CODE:
1263	{	1188	{
1264	while (self->texs <= texid)	1189	while (self->texs <= texid)
1265	{	1190	{
1266	Append (maptex, self->tex, self->texs, self->texs);	1191	Append (maptex, self->tex, self->texs, self->texs);
…		…
1290	// from transparent color bleeding and ugly wrapping effects.	1215	// from transparent color bleeding and ugly wrapping effects.
1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1216	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292	}	1217	}
1293		1218
1294	int	1219	int
1295	ox (CFClient::Map self)	1220	ox (CFPlus::Map self)
1296	ALIAS:	1221	ALIAS:
1297	oy = 1	1222	oy = 1
1298	x = 2	1223	x = 2
1299	y = 3	1224	y = 3
1300	w = 4	1225	w = 4
…		…
1311	}	1236	}
1312	OUTPUT:	1237	OUTPUT:
1313	RETVAL	1238	RETVAL
1314		1239
1315	void	1240	void
1316	scroll (CFClient::Map self, int dx, int dy)	1241	scroll (CFPlus::Map self, int dx, int dy)
1317	CODE:	1242	CODE:
1318	{	1243	{
1319	if (dx > 0)	1244	if (dx > 0)
1320	map_blank (self, self->x, self->y, dx - 1, self->h);	1245	map_blank (self, self->x, self->y, dx - 1, self->h);
1321	else if (dx < 0)	1246	else if (dx < 0)
…		…
1337	self->y += MAP_EXTEND_Y;	1262	self->y += MAP_EXTEND_Y;
1338	}	1263	}
1339	}	1264	}
1340		1265
1341	void	1266	void
1342	map1a_update (CFClient::Map self, SV *data_)	1267	map1a_update (CFPlus::Map self, SV *data_)
1343	CODE:	1268	CODE:
1344	{	1269	{
1345	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1270	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1346	uint8_t data_end = (uint8_t )SvEND (data_);	1271	uint8_t data_end = (uint8_t )SvEND (data_);
1347	mapcell *cell;	1272	mapcell *cell;
…		…
1389	cell->darkness = -1;	1314	cell->darkness = -1;
1390	}	1315	}
1391	}	1316	}
1392		1317
1393	SV *	1318	SV *
1394	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1319	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395	CODE:	1320	CODE:
1396	{	1321	{
1397	int x1, x;	1322	int x1, x;
1398	int y1, y;	1323	int y1, y;
1399	int z;	1324	int z;
…		…
1449	}	1374	}
1450	OUTPUT:	1375	OUTPUT:
1451	RETVAL	1376	RETVAL
1452		1377
1453	void	1378	void
1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1379	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1455	CODE:	1380	CODE:
1456	{	1381	{
1457	int vx, vy;	1382	int vx, vy;
1458	int x, y, z;	1383	int x, y, z;
1459	int last_name;	1384	int last_name;
…		…
1524	glDisable (GL_TEXTURE_2D);	1449	glDisable (GL_TEXTURE_2D);
1525	glDisable (GL_BLEND);	1450	glDisable (GL_BLEND);
1526	}	1451	}
1527		1452
1528	void	1453	void
1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1454	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530	CODE:	1455	CODE:
1531	{	1456	{
1532	static float color[16][3] = {	1457	static float color[16][3] = {
1533	{ 0.00, 0.00, 0.00 },	1458	{ 0.00F, 0.00F, 0.00F },
1534	{ 1.00, 1.00, 1.00 },	1459	{ 1.00F, 1.00F, 1.00F },
1535	{ 0.00, 0.00, 0.55 },	1460	{ 0.00F, 0.00F, 0.55F },
1536	{ 1.00, 0.00, 0.00 },	1461	{ 1.00F, 0.00F, 0.00F },
1537		1462
1538	{ 1.00, 0.54, 0.00 },	1463	{ 1.00F, 0.54F, 0.00F },
1539	{ 0.11, 0.56, 1.00 },	1464	{ 0.11F, 0.56F, 1.00F },
1540	{ 0.93, 0.46, 0.00 },	1465	{ 0.93F, 0.46F, 0.00F },
1541	{ 0.18, 0.54, 0.34 },	1466	{ 0.18F, 0.54F, 0.34F },
1542		1467
1543	{ 0.56, 0.73, 0.56 },	1468	{ 0.56F, 0.73F, 0.56F },
1544	{ 0.80, 0.80, 0.80 },	1469	{ 0.80F, 0.80F, 0.80F },
1545	{ 0.55, 0.41, 0.13 },	1470	{ 0.55F, 0.41F, 0.13F },
1546	{ 0.99, 0.77, 0.26 },	1471	{ 0.99F, 0.77F, 0.26F },
1547		1472
1548	{ 0.74, 0.65, 0.41 },	1473	{ 0.74F, 0.65F, 0.41F },
1549		1474
1550	{ 0.00, 1.00, 1.00 },	1475	{ 0.00F, 1.00F, 1.00F },
1551	{ 1.00, 0.00, 1.00 },	1476	{ 1.00F, 0.00F, 1.00F },
1552	{ 1.00, 1.00, 0.00 },	1477	{ 1.00F, 1.00F, 0.00F },
1553	};	1478	};
1554		1479
1555	int x, y;	1480	int x, y;
1556		1481
1557	glEnable (GL_TEXTURE_2D);	1482	glEnable (GL_TEXTURE_2D);
…		…
1584	glDisable (GL_BLEND);	1509	glDisable (GL_BLEND);
1585	glDisable (GL_TEXTURE_2D);	1510	glDisable (GL_TEXTURE_2D);
1586	}	1511	}
1587		1512
1588	void	1513	void
1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1514	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1590	PPCODE:	1515	PPCODE:
1591	{	1516	{
1592	int vx, vy;	1517	int vx, vy;
1593	int x, y;	1518	int x, y;
1594	int sw4 = (sw + 3) & ~3;	1519	int sw4 = (sw + 3) & ~3;
…		…
1623	PUSHs (sv_2mortal (newSViv (sh)));	1548	PUSHs (sv_2mortal (newSViv (sh)));
1624	PUSHs (darkness_sv);	1549	PUSHs (darkness_sv);
1625	}	1550	}
1626		1551
1627	SV *	1552	SV *
1628	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1553	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629	CODE:	1554	CODE:
1630	{	1555	{
1631	int x, y, x1, y1;	1556	int x, y, x1, y1;
1632	SV data_sv = newSV (w h * 7 + 5);	1557	SV data_sv = newSV (w h * 7 + 5);
1633	uint8_t data = (uint8_t )SvPVX (data_sv);	1558	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1695	}	1620	}
1696	OUTPUT:	1621	OUTPUT:
1697	RETVAL	1622	RETVAL
1698		1623
1699	void	1624	void
1700	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1625	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701	PPCODE:	1626	PPCODE:
1702	{	1627	{
1703	int x, y, z;	1628	int x, y, z;
1704	int w, h;	1629	int w, h;
1705	int x1, y1;	1630	int x1, y1;
…		…
1754	}	1679	}
1755	}	1680	}
1756	}	1681	}
1757	}	1682	}
1758		1683
1759	MODULE = CFClient PACKAGE = CFClient::MixChunk	1684	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760		1685
1761	CFClient::MixChunk	1686	CFPlus::MixChunk
1762	new_from_file (SV class, char path)	1687	new_from_file (SV class, char path)
1763	CODE:	1688	CODE:
1764	RETVAL = Mix_LoadWAV (path);	1689	RETVAL = Mix_LoadWAV (path);
1765	OUTPUT:	1690	OUTPUT:
1766	RETVAL	1691	RETVAL
1767		1692
1768	void	1693	void
1769	DESTROY (CFClient::MixChunk self)	1694	DESTROY (CFPlus::MixChunk self)
1770	CODE:	1695	CODE:
1771	Mix_FreeChunk (self);	1696	Mix_FreeChunk (self);
1772		1697
1773	int	1698	int
1774	volume (CFClient::MixChunk self, int volume = -1)	1699	volume (CFPlus::MixChunk self, int volume = -1)
1775	CODE:	1700	CODE:
1776	RETVAL = Mix_VolumeChunk (self, volume);	1701	RETVAL = Mix_VolumeChunk (self, volume);
1777	OUTPUT:	1702	OUTPUT:
1778	RETVAL	1703	RETVAL
1779		1704
1780	int	1705	int
1781	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1706	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782	CODE:	1707	CODE:
1783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1708	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784	OUTPUT:	1709	OUTPUT:
1785	RETVAL	1710	RETVAL
1786		1711
1787	MODULE = CFClient PACKAGE = CFClient::MixMusic	1712	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788		1713
1789	int	1714	int
1790	volume (int volume = -1)	1715	volume (int volume = -1)
1791	CODE:	1716	CODE:
1792	RETVAL = Mix_VolumeMusic (volume);	1717	RETVAL = Mix_VolumeMusic (volume);
1793	OUTPUT:	1718	OUTPUT:
1794	RETVAL	1719	RETVAL
1795		1720
1796	CFClient::MixMusic	1721	CFPlus::MixMusic
1797	new_from_file (SV class, char path)	1722	new_from_file (SV class, char path)
1798	CODE:	1723	CODE:
1799	RETVAL = Mix_LoadMUS (path);	1724	RETVAL = Mix_LoadMUS (path);
1800	OUTPUT:	1725	OUTPUT:
1801	RETVAL	1726	RETVAL
1802		1727
1803	void	1728	void
1804	DESTROY (CFClient::MixMusic self)	1729	DESTROY (CFPlus::MixMusic self)
1805	CODE:	1730	CODE:
1806	Mix_FreeMusic (self);	1731	Mix_FreeMusic (self);
1807		1732
1808	int	1733	int
1809	play (CFClient::MixMusic self, int loops = -1)	1734	play (CFPlus::MixMusic self, int loops = -1)
1810	CODE:	1735	CODE:
1811	RETVAL = Mix_PlayMusic (self, loops);	1736	RETVAL = Mix_PlayMusic (self, loops);
1812	OUTPUT:	1737	OUTPUT:
1813	RETVAL	1738	RETVAL
1814		1739
1815	MODULE = CFClient PACKAGE = CFClient::OpenGL	1740	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816		1741
1817	BOOT:	1742	BOOT:
1818	{	1743	{
1819	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1744	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820	static const struct {	1745	static const struct {
1821	const char *name;	1746	const char *name;
1822	IV iv;	1747	IV iv;
1823	} *civ, const_iv[] = {	1748	} *civ, const_iv[] = {
1824	# define const_iv(name) { # name, (IV)name }	1749	# define const_iv(name) { # name, (IV)name }
…		…
1887	const_iv (GL_SEPARABLE_2D),	1812	const_iv (GL_SEPARABLE_2D),
1888	const_iv (GL_CONVOLUTION_2D),	1813	const_iv (GL_CONVOLUTION_2D),
1889	const_iv (GL_CONVOLUTION_BORDER_MODE),	1814	const_iv (GL_CONVOLUTION_BORDER_MODE),
1890	const_iv (GL_CONSTANT_BORDER),	1815	const_iv (GL_CONSTANT_BORDER),
1891	const_iv (GL_LINES),	1816	const_iv (GL_LINES),
		1817	const_iv (GL_LINE_STRIP),
1892	const_iv (GL_LINE_LOOP),	1818	const_iv (GL_LINE_LOOP),
1893	const_iv (GL_QUADS),	1819	const_iv (GL_QUADS),
1894	const_iv (GL_QUAD_STRIP),	1820	const_iv (GL_QUAD_STRIP),
1895	const_iv (GL_TRIANGLES),	1821	const_iv (GL_TRIANGLES),
1896	const_iv (GL_TRIANGLE_STRIP),	1822	const_iv (GL_TRIANGLE_STRIP),
…		…
2006	r *= a;	1932	r *= a;
2007	g *= a;	1933	g *= a;
2008	b *= a;	1934	b *= a;
2009	}	1935	}
2010	// microsoft visual "c" rounds instead of truncating...	1936	// microsoft visual "c" rounds instead of truncating...
2011	glColor4ub (MIN ((int)(r * 256.f), 255),	1937	glColor4f (r, g, b, a);
2012	MIN ((int)(g * 256.f), 255),
2013	MIN ((int)(b * 256.f), 255),
2014	MIN ((int)(a * 256.f), 255));
2015		1938
2016	void glInterleavedArrays (int format, int stride, char *data)	1939	void glInterleavedArrays (int format, int stride, char *data)
2017		1940
2018	void glDrawElements (int mode, int count, int type, char *indices)	1941	void glDrawElements (int mode, int count, int type, char *indices)
2019		1942
…		…
2096		2019
2097	void glEndList ()	2020	void glEndList ()
2098		2021
2099	void glCallList (int list)	2022	void glCallList (int list)
2100		2023
2101

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC vs. Revision 1.139 by root, Mon Aug 14 03:04:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC vs.
Revision 1.139 by root, Mon Aug 14 03:04:17 2006 UTC