[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.141 by root, Fri Aug 18 01:01:00 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;
…		…
876	if (attrs)	879	if (attrs)
877	pango_layout_set_attributes (self->pl, attrs);	880	pango_layout_set_attributes (self->pl, attrs);
878	}	881	}
879		882
880	void	883	void
881	get_shapes (CFClient::Layout self)	884	get_shapes (CFPlus::Layout self)
882	PPCODE:	885	PPCODE:
883	{	886	{
884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	887	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885		888
886	do	889	do
…		…
890	if (run && shape_attr_p (run))	893	if (run && shape_attr_p (run))
891	{	894	{
892	PangoRectangle extents;	895	PangoRectangle extents;
893	pango_layout_iter_get_run_extents (iter, 0, &extents);	896	pango_layout_iter_get_run_extents (iter, 0, &extents);
894		897
		898	EXTEND (SP, 2);
895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	899	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897	}	901	}
898	}	902	}
899	while (pango_layout_iter_next_run (iter));	903	while (pango_layout_iter_next_run (iter));
900		904
901	pango_layout_iter_free (iter);	905	pango_layout_iter_free (iter);
902	}	906	}
903		907
904	int	908	int
905	has_wrapped (CFClient::Layout self)	909	has_wrapped (CFPlus::Layout self)
906	CODE:	910	CODE:
907	{	911	{
908	int lines = 1;	912	int lines = 1;
909	const char *text = pango_layout_get_text (self->pl);	913	const char *text = pango_layout_get_text (self->pl);
910		914
…		…
915	}	919	}
916	OUTPUT:	920	OUTPUT:
917	RETVAL	921	RETVAL
918		922
919	SV *	923	SV *
920	get_text (CFClient::Layout self)	924	get_text (CFPlus::Layout self)
921	CODE:	925	CODE:
922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	926	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923	sv_utf8_decode (RETVAL);	927	sv_utf8_decode (RETVAL);
924	OUTPUT:	928	OUTPUT:
925	RETVAL	929	RETVAL
926		930
927	void	931	void
928	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.)
929	CODE:	933	CODE:
930	self->r = r;	934	self->r = r;
931	self->g = g;	935	self->g = g;
932	self->b = b;	936	self->b = b;
933	self->a = a;	937	self->a = a;
934		938
935	void	939	void
936	set_font (CFClient::Layout self, CFClient::Font font = 0)	940	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937	CODE:	941	CODE:
938	if (self->font != font)	942	if (self->font != font)
939	{	943	{
940	self->font = font;	944	self->font = font;
941	layout_update_font (self);	945	layout_update_font (self);
942	}	946	}
943		947
944	void	948	void
945	set_height (CFClient::Layout self, int base_height)	949	set_height (CFPlus::Layout self, int base_height)
946	CODE:	950	CODE:
947	if (self->base_height != base_height)	951	if (self->base_height != base_height)
948	{	952	{
949	self->base_height = base_height;	953	self->base_height = base_height;
950	layout_update_font (self);	954	layout_update_font (self);
951	}	955	}
952		956
953	void	957	void
954	set_width (CFClient::Layout self, int max_width = -1)	958	set_width (CFPlus::Layout self, int max_width = -1)
955	CODE:	959	CODE:
956	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);
957		961
958	void	962	void
959	set_indent (CFClient::Layout self, int indent)	963	set_indent (CFPlus::Layout self, int indent)
960	CODE:	964	CODE:
961	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	965	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962		966
963	void	967	void
964	set_spacing (CFClient::Layout self, int spacing)	968	set_spacing (CFPlus::Layout self, int spacing)
965	CODE:	969	CODE:
966	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	970	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967		971
968	void	972	void
969	set_ellipsise (CFClient::Layout self, int ellipsise)	973	set_ellipsise (CFPlus::Layout self, int ellipsise)
970	CODE:	974	CODE:
971	pango_layout_set_ellipsize (self->pl,	975	pango_layout_set_ellipsize (self->pl,
972	ellipsise == 1 ? PANGO_ELLIPSIZE_START	976	ellipsise == 1 ? PANGO_ELLIPSIZE_START
973	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	977	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	978	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
975	: PANGO_ELLIPSIZE_NONE	979	: PANGO_ELLIPSIZE_NONE
976	);	980	);
977		981
978	void	982	void
979	set_single_paragraph_mode (CFClient::Layout self, int spm)	983	set_single_paragraph_mode (CFPlus::Layout self, int spm)
980	CODE:	984	CODE:
981	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	985	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982		986
983	void	987	void
984	size (CFClient::Layout self)	988	size (CFPlus::Layout self)
985	PPCODE:	989	PPCODE:
986	{	990	{
987	int w, h;	991	int w, h;
988		992
989	layout_get_pixel_size (self, &w, &h);	993	layout_get_pixel_size (self, &w, &h);
…		…
992	PUSHs (sv_2mortal (newSViv (w)));	996	PUSHs (sv_2mortal (newSViv (w)));
993	PUSHs (sv_2mortal (newSViv (h)));	997	PUSHs (sv_2mortal (newSViv (h)));
994	}	998	}
995		999
996	int	1000	int
997	descent (CFClient::Layout self)	1001	descent (CFPlus::Layout self)
998	CODE:	1002	CODE:
999	{	1003	{
1000	PangoRectangle rect;	1004	PangoRectangle rect;
1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1005	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002	pango_layout_line_get_pixel_extents (line, 0, &rect);	1006	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1004	}	1008	}
1005	OUTPUT:	1009	OUTPUT:
1006	RETVAL	1010	RETVAL
1007		1011
1008	int	1012	int
1009	xy_to_index (CFClient::Layout self, int x, int y)	1013	xy_to_index (CFPlus::Layout self, int x, int y)
1010	CODE:	1014	CODE:
1011	{	1015	{
1012	int index, trailing;	1016	int index, trailing;
1013	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);
1014	RETVAL = index;	1018	RETVAL = index;
1015	}	1019	}
1016	OUTPUT:	1020	OUTPUT:
1017	RETVAL	1021	RETVAL
1018		1022
1019	void	1023	void
1020	cursor_pos (CFClient::Layout self, int index)	1024	cursor_pos (CFPlus::Layout self, int index)
1021	PPCODE:	1025	PPCODE:
1022	{	1026	{
1023	PangoRectangle strong_pos;	1027	PangoRectangle strong_pos;
1024	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1028	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025		1029
…		…
1028	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1032	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030	}	1034	}
1031		1035
1032	void	1036	void
1033	render (CFClient::Layout self)	1037	render (CFPlus::Layout self, float x, float y, int flags = 0)
1034	PPCODE:	1038	PPCODE:
1035	{	1039	pango_opengl_render_layout_subpixel (
1036	SV *retval;	1040	self->pl,
1037	int w, h;	1041	x * PANGO_SCALE, y * PANGO_SCALE,
1038		1042	self->r, self->g, self->b, self->a,
1039	layout_get_pixel_size (self, &w, &h);
1040
1041	if (self->rgba)
1042	{	1043	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	}	1044	);
1095	else
1096	{
1097	FT_Bitmap bitmap;
1098		1045
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	1046	MODULE = CFPlus PACKAGE = CFPlus::Texture
1124		1047
1125	void	1048	void
1126	pad2pot (SV data_, SV w_, SV *h_)	1049	pad2pot (SV data_, SV w_, SV *h_)
1127	CODE:	1050	CODE:
1128	{	1051	{
…		…
1206	glDisable (GL_ALPHA_TEST);	1129	glDisable (GL_ALPHA_TEST);
1207	glDisable (GL_BLEND);	1130	glDisable (GL_BLEND);
1208	}	1131	}
1209	}	1132	}
1210		1133
1211	MODULE = CFClient PACKAGE = CFClient::Map	1134	MODULE = CFPlus PACKAGE = CFPlus::Map
1212		1135
1213	CFClient::Map	1136	CFPlus::Map
1214	new (SV *class, int map_width, int map_height)	1137	new (SV *class, int map_width, int map_height)
1215	CODE:	1138	CODE:
1216	New (0, RETVAL, 1, struct map);	1139	New (0, RETVAL, 1, struct map);
1217	RETVAL->x = 0;	1140	RETVAL->x = 0;
1218	RETVAL->y = 0;	1141	RETVAL->y = 0;
…		…
1228	RETVAL->row = 0;	1151	RETVAL->row = 0;
1229	OUTPUT:	1152	OUTPUT:
1230	RETVAL	1153	RETVAL
1231		1154
1232	void	1155	void
1233	DESTROY (CFClient::Map self)	1156	DESTROY (CFPlus::Map self)
1234	CODE:	1157	CODE:
1235	{	1158	{
1236	map_clear (self);	1159	map_clear (self);
1237	Safefree (self->face);	1160	Safefree (self->face);
1238	Safefree (self->tex);	1161	Safefree (self->tex);
1239	Safefree (self);	1162	Safefree (self);
1240	}	1163	}
1241		1164
1242	void	1165	void
1243	clear (CFClient::Map self)	1166	clear (CFPlus::Map self)
1244	CODE:	1167	CODE:
1245	map_clear (self);	1168	map_clear (self);
1246		1169
1247	void	1170	void
1248	set_face (CFClient::Map self, int face, int texid)	1171	set_face (CFPlus::Map self, int face, int texid)
1249	CODE:	1172	CODE:
1250	{	1173	{
1251	while (self->faces <= face)	1174	while (self->faces <= face)
1252	{	1175	{
1253	Append (mapface, self->face, self->faces, self->faces);	1176	Append (mapface, self->face, self->faces, self->faces);
…		…
1256		1179
1257	self->face [face] = texid;	1180	self->face [face] = texid;
1258	}	1181	}
1259		1182
1260	void	1183	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)	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)
1262	CODE:	1185	CODE:
1263	{	1186	{
1264	while (self->texs <= texid)	1187	while (self->texs <= texid)
1265	{	1188	{
1266	Append (maptex, self->tex, self->texs, self->texs);	1189	Append (maptex, self->tex, self->texs, self->texs);
…		…
1290	// from transparent color bleeding and ugly wrapping effects.	1213	// from transparent color bleeding and ugly wrapping effects.
1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1214	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292	}	1215	}
1293		1216
1294	int	1217	int
1295	ox (CFClient::Map self)	1218	ox (CFPlus::Map self)
1296	ALIAS:	1219	ALIAS:
1297	oy = 1	1220	oy = 1
1298	x = 2	1221	x = 2
1299	y = 3	1222	y = 3
1300	w = 4	1223	w = 4
…		…
1311	}	1234	}
1312	OUTPUT:	1235	OUTPUT:
1313	RETVAL	1236	RETVAL
1314		1237
1315	void	1238	void
1316	scroll (CFClient::Map self, int dx, int dy)	1239	scroll (CFPlus::Map self, int dx, int dy)
1317	CODE:	1240	CODE:
1318	{	1241	{
1319	if (dx > 0)	1242	if (dx > 0)
1320	map_blank (self, self->x, self->y, dx - 1, self->h);	1243	map_blank (self, self->x, self->y, dx - 1, self->h);
1321	else if (dx < 0)	1244	else if (dx < 0)
…		…
1337	self->y += MAP_EXTEND_Y;	1260	self->y += MAP_EXTEND_Y;
1338	}	1261	}
1339	}	1262	}
1340		1263
1341	void	1264	void
1342	map1a_update (CFClient::Map self, SV *data_)	1265	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343	CODE:	1266	CODE:
1344	{	1267	{
1345	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1268	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1346	uint8_t data_end = (uint8_t )SvEND (data_);	1269	uint8_t data_end = (uint8_t )SvEND (data_);
1347	mapcell *cell;	1270	mapcell *cell;
…		…
1364	cell->face [0] = 0;	1287	cell->face [0] = 0;
1365	cell->face [1] = 0;	1288	cell->face [1] = 0;
1366	cell->face [2] = 0;	1289	cell->face [2] = 0;
1367	}	1290	}
1368		1291
		1292	if (flags & 8)
		1293	{
		1294	fprintf (stderr, "oi\n");//D
		1295	if (extmap)
		1296	{
		1297	uint8_t ext, cmd;
		1298
		1299	do
		1300	{
		1301
		1302	ext = *data++;
		1303	cmd = ext & 0x7f;
		1304
		1305	fprintf (stderr, "extcmd = %x\n", ext);//D
		1306
		1307	if (ext < 4)
		1308	cell->darkness = 255 - ext * 64;
		1309	}
		1310	while (cmd & 0x80);
		1311	}
		1312	else
1369	cell->darkness = flags & 8 ? *data++ : 255;	1313	cell->darkness = flags & 8 ? *data++ : 255;
		1314	}
1370		1315
1371	//TODO: don't trust server data to be in-range(!)	1316	//TODO: don't trust server data to be in-range(!)
1372		1317
1373	if (flags & 4)	1318	if (flags & 4)
1374	{	1319	{
…		…
1389	cell->darkness = -1;	1334	cell->darkness = -1;
1390	}	1335	}
1391	}	1336	}
1392		1337
1393	SV *	1338	SV *
1394	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1339	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395	CODE:	1340	CODE:
1396	{	1341	{
1397	int x1, x;	1342	int x1, x;
1398	int y1, y;	1343	int y1, y;
1399	int z;	1344	int z;
…		…
1449	}	1394	}
1450	OUTPUT:	1395	OUTPUT:
1451	RETVAL	1396	RETVAL
1452		1397
1453	void	1398	void
1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1399	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1455	CODE:	1400	CODE:
1456	{	1401	{
1457	int vx, vy;	1402	int vx, vy;
1458	int x, y, z;	1403	int x, y, z;
1459	int last_name;	1404	int last_name;
…		…
1524	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1525	glDisable (GL_BLEND);	1470	glDisable (GL_BLEND);
1526	}	1471	}
1527		1472
1528	void	1473	void
1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1474	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530	CODE:	1475	CODE:
1531	{	1476	{
1532	static float color[16][3] = {	1477	static float color[16][3] = {
1533	{ 0.00, 0.00, 0.00 },	1478	{ 0.00F, 0.00F, 0.00F },
1534	{ 1.00, 1.00, 1.00 },	1479	{ 1.00F, 1.00F, 1.00F },
1535	{ 0.00, 0.00, 0.55 },	1480	{ 0.00F, 0.00F, 0.55F },
1536	{ 1.00, 0.00, 0.00 },	1481	{ 1.00F, 0.00F, 0.00F },
1537		1482
1538	{ 1.00, 0.54, 0.00 },	1483	{ 1.00F, 0.54F, 0.00F },
1539	{ 0.11, 0.56, 1.00 },	1484	{ 0.11F, 0.56F, 1.00F },
1540	{ 0.93, 0.46, 0.00 },	1485	{ 0.93F, 0.46F, 0.00F },
1541	{ 0.18, 0.54, 0.34 },	1486	{ 0.18F, 0.54F, 0.34F },
1542		1487
1543	{ 0.56, 0.73, 0.56 },	1488	{ 0.56F, 0.73F, 0.56F },
1544	{ 0.80, 0.80, 0.80 },	1489	{ 0.80F, 0.80F, 0.80F },
1545	{ 0.55, 0.41, 0.13 },	1490	{ 0.55F, 0.41F, 0.13F },
1546	{ 0.99, 0.77, 0.26 },	1491	{ 0.99F, 0.77F, 0.26F },
1547		1492
1548	{ 0.74, 0.65, 0.41 },	1493	{ 0.74F, 0.65F, 0.41F },
1549		1494
1550	{ 0.00, 1.00, 1.00 },	1495	{ 0.00F, 1.00F, 1.00F },
1551	{ 1.00, 0.00, 1.00 },	1496	{ 1.00F, 0.00F, 1.00F },
1552	{ 1.00, 1.00, 0.00 },	1497	{ 1.00F, 1.00F, 0.00F },
1553	};	1498	};
1554		1499
1555	int x, y;	1500	int x, y;
1556		1501
1557	glEnable (GL_TEXTURE_2D);	1502	glEnable (GL_TEXTURE_2D);
…		…
1584	glDisable (GL_BLEND);	1529	glDisable (GL_BLEND);
1585	glDisable (GL_TEXTURE_2D);	1530	glDisable (GL_TEXTURE_2D);
1586	}	1531	}
1587		1532
1588	void	1533	void
1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1534	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1590	PPCODE:	1535	PPCODE:
1591	{	1536	{
1592	int vx, vy;	1537	int vx, vy;
1593	int x, y;	1538	int x, y;
1594	int sw4 = (sw + 3) & ~3;	1539	int sw4 = (sw + 3) & ~3;
…		…
1623	PUSHs (sv_2mortal (newSViv (sh)));	1568	PUSHs (sv_2mortal (newSViv (sh)));
1624	PUSHs (darkness_sv);	1569	PUSHs (darkness_sv);
1625	}	1570	}
1626		1571
1627	SV *	1572	SV *
1628	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1573	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629	CODE:	1574	CODE:
1630	{	1575	{
1631	int x, y, x1, y1;	1576	int x, y, x1, y1;
1632	SV data_sv = newSV (w h * 7 + 5);	1577	SV data_sv = newSV (w h * 7 + 5);
1633	uint8_t data = (uint8_t )SvPVX (data_sv);	1578	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1695	}	1640	}
1696	OUTPUT:	1641	OUTPUT:
1697	RETVAL	1642	RETVAL
1698		1643
1699	void	1644	void
1700	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1645	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701	PPCODE:	1646	PPCODE:
1702	{	1647	{
1703	int x, y, z;	1648	int x, y, z;
1704	int w, h;	1649	int w, h;
1705	int x1, y1;	1650	int x1, y1;
…		…
1754	}	1699	}
1755	}	1700	}
1756	}	1701	}
1757	}	1702	}
1758		1703
1759	MODULE = CFClient PACKAGE = CFClient::MixChunk	1704	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760		1705
1761	CFClient::MixChunk	1706	CFPlus::MixChunk
1762	new_from_file (SV class, char path)	1707	new_from_file (SV class, char path)
1763	CODE:	1708	CODE:
1764	RETVAL = Mix_LoadWAV (path);	1709	RETVAL = Mix_LoadWAV (path);
1765	OUTPUT:	1710	OUTPUT:
1766	RETVAL	1711	RETVAL
1767		1712
1768	void	1713	void
1769	DESTROY (CFClient::MixChunk self)	1714	DESTROY (CFPlus::MixChunk self)
1770	CODE:	1715	CODE:
1771	Mix_FreeChunk (self);	1716	Mix_FreeChunk (self);
1772		1717
1773	int	1718	int
1774	volume (CFClient::MixChunk self, int volume = -1)	1719	volume (CFPlus::MixChunk self, int volume = -1)
1775	CODE:	1720	CODE:
1776	RETVAL = Mix_VolumeChunk (self, volume);	1721	RETVAL = Mix_VolumeChunk (self, volume);
1777	OUTPUT:	1722	OUTPUT:
1778	RETVAL	1723	RETVAL
1779		1724
1780	int	1725	int
1781	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1726	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782	CODE:	1727	CODE:
1783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1728	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784	OUTPUT:	1729	OUTPUT:
1785	RETVAL	1730	RETVAL
1786		1731
1787	MODULE = CFClient PACKAGE = CFClient::MixMusic	1732	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788		1733
1789	int	1734	int
1790	volume (int volume = -1)	1735	volume (int volume = -1)
1791	CODE:	1736	CODE:
1792	RETVAL = Mix_VolumeMusic (volume);	1737	RETVAL = Mix_VolumeMusic (volume);
1793	OUTPUT:	1738	OUTPUT:
1794	RETVAL	1739	RETVAL
1795		1740
1796	CFClient::MixMusic	1741	CFPlus::MixMusic
1797	new_from_file (SV class, char path)	1742	new_from_file (SV class, char path)
1798	CODE:	1743	CODE:
1799	RETVAL = Mix_LoadMUS (path);	1744	RETVAL = Mix_LoadMUS (path);
1800	OUTPUT:	1745	OUTPUT:
1801	RETVAL	1746	RETVAL
1802		1747
1803	void	1748	void
1804	DESTROY (CFClient::MixMusic self)	1749	DESTROY (CFPlus::MixMusic self)
1805	CODE:	1750	CODE:
1806	Mix_FreeMusic (self);	1751	Mix_FreeMusic (self);
1807		1752
1808	int	1753	int
1809	play (CFClient::MixMusic self, int loops = -1)	1754	play (CFPlus::MixMusic self, int loops = -1)
1810	CODE:	1755	CODE:
1811	RETVAL = Mix_PlayMusic (self, loops);	1756	RETVAL = Mix_PlayMusic (self, loops);
1812	OUTPUT:	1757	OUTPUT:
1813	RETVAL	1758	RETVAL
1814		1759
1815	MODULE = CFClient PACKAGE = CFClient::OpenGL	1760	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816		1761
1817	BOOT:	1762	BOOT:
1818	{	1763	{
1819	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1764	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820	static const struct {	1765	static const struct {
1821	const char *name;	1766	const char *name;
1822	IV iv;	1767	IV iv;
1823	} *civ, const_iv[] = {	1768	} *civ, const_iv[] = {
1824	# define const_iv(name) { # name, (IV)name }	1769	# define const_iv(name) { # name, (IV)name }
…		…
1887	const_iv (GL_SEPARABLE_2D),	1832	const_iv (GL_SEPARABLE_2D),
1888	const_iv (GL_CONVOLUTION_2D),	1833	const_iv (GL_CONVOLUTION_2D),
1889	const_iv (GL_CONVOLUTION_BORDER_MODE),	1834	const_iv (GL_CONVOLUTION_BORDER_MODE),
1890	const_iv (GL_CONSTANT_BORDER),	1835	const_iv (GL_CONSTANT_BORDER),
1891	const_iv (GL_LINES),	1836	const_iv (GL_LINES),
		1837	const_iv (GL_LINE_STRIP),
1892	const_iv (GL_LINE_LOOP),	1838	const_iv (GL_LINE_LOOP),
1893	const_iv (GL_QUADS),	1839	const_iv (GL_QUADS),
1894	const_iv (GL_QUAD_STRIP),	1840	const_iv (GL_QUAD_STRIP),
1895	const_iv (GL_TRIANGLES),	1841	const_iv (GL_TRIANGLES),
1896	const_iv (GL_TRIANGLE_STRIP),	1842	const_iv (GL_TRIANGLE_STRIP),
…		…
2006	r *= a;	1952	r *= a;
2007	g *= a;	1953	g *= a;
2008	b *= a;	1954	b *= a;
2009	}	1955	}
2010	// microsoft visual "c" rounds instead of truncating...	1956	// microsoft visual "c" rounds instead of truncating...
2011	glColor4ub (MIN ((int)(r * 256.f), 255),	1957	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		1958
2016	void glInterleavedArrays (int format, int stride, char *data)	1959	void glInterleavedArrays (int format, int stride, char *data)
2017		1960
2018	void glDrawElements (int mode, int count, int type, char *indices)	1961	void glDrawElements (int mode, int count, int type, char *indices)
2019		1962
…		…
2096		2039
2097	void glEndList ()	2040	void glEndList ()
2098		2041
2099	void glCallList (int list)	2042	void glCallList (int list)
2100		2043
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.141 by root, Fri Aug 18 01:01:00 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.141 by root, Fri Aug 18 01:01:00 2006 UTC