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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC vs.
Revision 1.135 by root, Sun Aug 13 15:14: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"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46		51
47	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
48		53
49	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
51		56
52	#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
53		64
54	static struct	65	static struct
55	{	66	{
56	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	68	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	78	else
68	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
69	}	80	}
70		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
71	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
73		90
74	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
75		110
76	typedef struct cf_layout {	111	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
80	int base_height;	114	int base_height;
81	CFClient__Font font;	115	CFPlus__Font font;
82	} *CFClient__Layout;	116	} *CFPlus__Layout;
83		117
84	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
85	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
86	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
87		121
88	static void	122	static void
89	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
90	{	124	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	126	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	128	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	130	}
101		131
102	static void	132	static void
103	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
104	{	134	{
105	/* 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
106	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
107	*/	137	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		142
113	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
114	}	144	}
115		145
116	static void	146	static void
117	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
118	{	148	{
119	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
120		150
121	if (!w) w = 1;	151	if (!w) w = 1;
122	if (!h) h = 1;	152	if (!h) h = 1;
…		…
152	int texs;	182	int texs;
153	maptex *tex;	183	maptex *tex;
154		184
155	int32_t rows;	185	int32_t rows;
156	maprow *row;	186	maprow *row;
157	} *CFClient__Map;	187	} *CFPlus__Map;
158		188
159	static char *	189	static char *
160	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
161	{	191	{
162	char *p;	192	char *p;
…		…
180		210
181	#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))
182	#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))
183		213
184	static maprow *	214	static maprow *
185	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
186	{	216	{
187	if (0 > y)	217	if (0 > y)
188	{	218	{
189	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
228		258
229	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
230	}	260	}
231		261
232	static mapcell *	262	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
234	{	264	{
235	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
236	}	266	}
237		267
238	static void	268	static void
239	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
240	{	270	{
241	int r;	271	int r;
242		272
243	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
252	self->row = 0;	282	self->row = 0;
253	self->rows = 0;	283	self->rows = 0;
254	}	284	}
255		285
256	static void	286	static void
257	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)
258	{	288	{
259	int x, y;	289	int x, y;
260	maprow *row;	290	maprow *row;
261		291
262	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
319	n \|= n >> 16;	349	n \|= n >> 16;
320		350
321	return n + 1;	351	return n + 1;
322	}	352	}
323		353
324	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
325		355
326	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
327		357
328	BOOT:	358	BOOT:
329	{	359	{
330	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	361	static const struct {
332	const char *name;	362	const char *name;
333	IV iv;	363	IV iv;
334	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
436		466
437	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; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	469	}
440		470
		471	int
		472	in_destruct ()
		473	CODE:
		474	RETVAL = PL_main_cv == Nullcv;
		475	OUTPUT:
		476	RETVAL
		477
441	NV floor (NV x)	478	NV floor (NV x)
442		479
443	NV ceil (NV x)	480	NV ceil (NV x)
444		481
445	void	482	void
446	pango_init ()	483	pango_init ()
447	CODE:	484	CODE:
448	// delayed, so it can pick up new fonts added by AddFontResourceEx
449	{	485	{
450	{
451	ft2_fontmap = pango_ft2_font_map_new ();	486	opengl_fontmap = pango_opengl_font_map_new ();
452	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);
453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	488	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454	}
455	{
456	cairo_font_options_t *fopt = cairo_font_options_create ();
457	cairo_fontmap = pango_cairo_font_map_get_default ();
458	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459	#ifdef _WIN32
460	// cairo looks like shit eaten twice on windows
461	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462	#else
463	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464	#endif
465	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467	pango_cairo_context_set_font_options (cairo_context, fopt);
468	cairo_font_options_destroy (fopt);
469	}
470	}	489	}
471		490
472	int	491	int
473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
474		493
475	void	494	void
476	SDL_Quit ()	495	SDL_Quit ()
477		496
478	void	497	void
…		…
493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496		515
497	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
498		521
499	SDL_EnableUNICODE (1);	522	SDL_EnableUNICODE (1);
500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	523	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501		524
502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	525	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
589	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	612	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	613	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591	break;	614	break;
592	}	615	}
593		616
594	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	617	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595	}	618	}
596	}	619	}
597		620
598	int	621	int
599	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)
…		…
615	#endif	638	#endif
616		639
617	void	640	void
618	add_font (char *file)	641	add_font (char *file)
619	CODE:	642	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	643	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		644
626	void	645	void
627	load_image_inline (SV *image_)	646	load_image_inline (SV *image_)
628	ALIAS:	647	ALIAS:
629	load_image_file = 1	648	load_image_file = 1
…		…
671		690
672	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	691	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673		692
674	assert (surface2->pitch == surface2->w * 4);	693	assert (surface2->pitch == surface2->w * 4);
675		694
		695	SDL_LockSurface (surface2);
676	EXTEND (SP, 5);	696	EXTEND (SP, 6);
677	PUSHs (sv_2mortal (newSViv (surface2->w)));	697	PUSHs (sv_2mortal (newSViv (surface2->w)));
678	PUSHs (sv_2mortal (newSViv (surface2->h)));	698	PUSHs (sv_2mortal (newSViv (surface2->h)));
679	SDL_LockSurface (surface2);
680	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	699	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681	SDL_UnlockSurface (surface2);
682	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)));
683	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	701	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	702	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		703	SDL_UnlockSurface (surface2);
685		704
686	SDL_FreeSurface (surface);	705	SDL_FreeSurface (surface);
687	SDL_FreeSurface (surface2);	706	SDL_FreeSurface (surface2);
688	}	707	}
689		708
…		…
732	void	751	void
733	_exit (int retval)	752	_exit (int retval)
734	CODE:	753	CODE:
735	_exit (retval);	754	_exit (retval);
736		755
737	MODULE = CFClient PACKAGE = CFClient::Font	756	MODULE = CFPlus PACKAGE = CFPlus::Font
738		757
739	CFClient::Font	758	CFPlus::Font
740	new_from_file (SV class, char path, int id = 0)	759	new_from_file (SV class, char path, int id = 0)
741	CODE:	760	CODE:
742	{	761	{
743	int count;	762	int count;
744	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	763	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
747	}	766	}
748	OUTPUT:	767	OUTPUT:
749	RETVAL	768	RETVAL
750		769
751	void	770	void
752	DESTROY (CFClient::Font self)	771	DESTROY (CFPlus::Font self)
753	CODE:	772	CODE:
754	pango_font_description_free (self);	773	pango_font_description_free (self);
755		774
756	void	775	void
757	make_default (CFClient::Font self)	776	make_default (CFPlus::Font self)
758	CODE:	777	CODE:
759	default_font = self;	778	default_font = self;
760		779
761	MODULE = CFClient PACKAGE = CFClient::Layout	780	MODULE = CFPlus PACKAGE = CFPlus::Layout
762		781
763	CFClient::Layout	782	void
764	new (SV *class, int rgba = 0)	783	reset_glyph_cache ()
		784	CODE:
		785	tc_clear ();
		786
		787	CFPlus::Layout
		788	new (SV *class)
765	CODE:	789	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	790	New (0, RETVAL, 1, struct cf_layout);
767		791
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	792	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	793	RETVAL->r = 1.;
771	RETVAL->g = 1.;	794	RETVAL->g = 1.;
772	RETVAL->b = 1.;	795	RETVAL->b = 1.;
773	RETVAL->a = 1.;	796	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	797	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
778	layout_update_font (RETVAL);	801	layout_update_font (RETVAL);
779	OUTPUT:	802	OUTPUT:
780	RETVAL	803	RETVAL
781		804
782	void	805	void
783	DESTROY (CFClient::Layout self)	806	DESTROY (CFPlus::Layout self)
784	CODE:	807	CODE:
785	g_object_unref (self->pl);	808	g_object_unref (self->pl);
786	Safefree (self);	809	Safefree (self);
787		810
788	int
789	is_rgba (CFClient::Layout self)
790	CODE:
791	RETVAL = self->rgba;
792	OUTPUT:
793	RETVAL
794
795	void	811	void
796	set_text (CFClient::Layout self, SV *text_)	812	set_text (CFPlus::Layout self, SV *text_)
797	CODE:	813	CODE:
798	{	814	{
799	STRLEN textlen;	815	STRLEN textlen;
800	char *text = SvPVutf8 (text_, textlen);	816	char *text = SvPVutf8 (text_, textlen);
801		817
802	pango_layout_set_text (self->pl, text, textlen);	818	pango_layout_set_text (self->pl, text, textlen);
803	}	819	}
804		820
805	void	821	void
806	set_markup (CFClient::Layout self, SV *text_)	822	set_markup (CFPlus::Layout self, SV *text_)
807	CODE:	823	CODE:
808	{	824	{
809	STRLEN textlen;	825	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);	826	char *text = SvPVutf8 (text_, textlen);
811		827
812	pango_layout_set_markup (self->pl, text, textlen);	828	pango_layout_set_markup (self->pl, text, textlen);
813	}	829	}
814		830
		831	void
		832	set_shapes (CFPlus::Layout self, ...)
		833	CODE:
		834	{
		835	PangoAttrList *attrs = 0;
		836	const char *text = pango_layout_get_text (self->pl);
		837	const char *pos = text;
		838	int arg = 4;
		839
		840	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		841	{
		842	PangoRectangle inkrect, rect;
		843	PangoAttribute *attr;
		844
		845	int x = SvIV (ST (arg - 3));
		846	int y = SvIV (ST (arg - 2));
		847	int w = SvIV (ST (arg - 1));
		848	int h = SvIV (ST (arg ));
		849
		850	inkrect.x = 0;
		851	inkrect.y = 0;
		852	inkrect.width = 0;
		853	inkrect.height = 0;
		854
		855	rect.x = x * PANGO_SCALE;
		856	rect.y = y * PANGO_SCALE;
		857	rect.width = w * PANGO_SCALE;
		858	rect.height = h * PANGO_SCALE;
		859
		860	if (!attrs)
		861	attrs = pango_layout_get_attributes (self->pl);
		862
		863	attr = pango_attr_shape_new (&inkrect, &rect);
		864	attr->start_index = pos - text;
		865	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		866	pango_attr_list_insert (attrs, attr);
		867
		868	arg += 4;
		869	pos += sizeof (OBJ_STR) - 1;
		870	}
		871
		872	if (attrs)
		873	pango_layout_set_attributes (self->pl, attrs);
		874	}
		875
		876	void
		877	get_shapes (CFPlus::Layout self)
		878	PPCODE:
		879	{
		880	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		881
		882	do
		883	{
		884	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		885
		886	if (run && shape_attr_p (run))
		887	{
		888	PangoRectangle extents;
		889	pango_layout_iter_get_run_extents (iter, 0, &extents);
		890
		891	EXTEND (SP, 2);
		892	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		893	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		894	}
		895	}
		896	while (pango_layout_iter_next_run (iter));
		897
		898	pango_layout_iter_free (iter);
		899	}
		900
		901	int
		902	has_wrapped (CFPlus::Layout self)
		903	CODE:
		904	{
		905	int lines = 1;
		906	const char *text = pango_layout_get_text (self->pl);
		907
		908	while (*text)
		909	lines += *text++ == '\n';
		910
		911	RETVAL = lines < pango_layout_get_line_count (self->pl);
		912	}
		913	OUTPUT:
		914	RETVAL
		915
815	SV *	916	SV *
816	get_text (CFClient::Layout self)	917	get_text (CFPlus::Layout self)
817	CODE:	918	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	919	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819	sv_utf8_decode (RETVAL);	920	sv_utf8_decode (RETVAL);
820	OUTPUT:	921	OUTPUT:
821	RETVAL	922	RETVAL
822		923
823	void	924	void
824	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.)
825	CODE:	926	CODE:
826	self->r = r;	927	self->r = r;
827	self->g = g;	928	self->g = g;
828	self->b = b;	929	self->b = b;
829	self->a = a;	930	self->a = a;
830		931
831	void	932	void
832	set_font (CFClient::Layout self, CFClient::Font font = 0)	933	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833	CODE:	934	CODE:
834	if (self->font != font)	935	if (self->font != font)
835	{	936	{
836	self->font = font;	937	self->font = font;
837	layout_update_font (self);	938	layout_update_font (self);
838	}	939	}
839		940
840	void	941	void
841	set_height (CFClient::Layout self, int base_height)	942	set_height (CFPlus::Layout self, int base_height)
842	CODE:	943	CODE:
843	if (self->base_height != base_height)	944	if (self->base_height != base_height)
844	{	945	{
845	self->base_height = base_height;	946	self->base_height = base_height;
846	layout_update_font (self);	947	layout_update_font (self);
847	}	948	}
848		949
849	void	950	void
850	set_width (CFClient::Layout self, int max_width = -1)	951	set_width (CFPlus::Layout self, int max_width = -1)
851	CODE:	952	CODE:
852	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);
853		954
854	void	955	void
855	set_indent (CFClient::Layout self, int indent)	956	set_indent (CFPlus::Layout self, int indent)
856	CODE:	957	CODE:
857	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	958	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858		959
859	void	960	void
860	set_spacing (CFClient::Layout self, int spacing)	961	set_spacing (CFPlus::Layout self, int spacing)
861	CODE:	962	CODE:
862	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	963	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863		964
864	void	965	void
865	set_ellipsise (CFClient::Layout self, int ellipsise)	966	set_ellipsise (CFPlus::Layout self, int ellipsise)
866	CODE:	967	CODE:
867	pango_layout_set_ellipsize (self->pl,	968	pango_layout_set_ellipsize (self->pl,
868	ellipsise == 1 ? PANGO_ELLIPSIZE_START	969	ellipsise == 1 ? PANGO_ELLIPSIZE_START
869	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	970	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	971	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
871	: PANGO_ELLIPSIZE_NONE	972	: PANGO_ELLIPSIZE_NONE
872	);	973	);
873		974
874	void	975	void
875	set_single_paragraph_mode (CFClient::Layout self, int spm)	976	set_single_paragraph_mode (CFPlus::Layout self, int spm)
876	CODE:	977	CODE:
877	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	978	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878		979
879	void	980	void
880	size (CFClient::Layout self)	981	size (CFPlus::Layout self)
881	PPCODE:	982	PPCODE:
882	{	983	{
883	int w, h;	984	int w, h;
884		985
885	layout_get_pixel_size (self, &w, &h);	986	layout_get_pixel_size (self, &w, &h);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	989	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	990	PUSHs (sv_2mortal (newSViv (h)));
890	}	991	}
891		992
892	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
893	xy_to_index (CFClient::Layout self, int x, int y)	1006	xy_to_index (CFPlus::Layout self, int x, int y)
894	CODE:	1007	CODE:
895	{	1008	{
896	int index, trailing;	1009	int index, trailing;
897	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);
898	RETVAL = index;	1011	RETVAL = index;
899	}	1012	}
900	OUTPUT:	1013	OUTPUT:
901	RETVAL	1014	RETVAL
902		1015
903	void	1016	void
904	cursor_pos (CFClient::Layout self, int index)	1017	cursor_pos (CFPlus::Layout self, int index)
905	PPCODE:	1018	PPCODE:
906	{	1019	{
907	PangoRectangle strong_pos;	1020	PangoRectangle strong_pos;
908	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1021	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909		1022
…		…
912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1025	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1026	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1027	}
915		1028
916	void	1029	void
917	render (CFClient::Layout self)	1030	render (CFPlus::Layout self, float x, float y, int flags = 0)
918	PPCODE:	1031	PPCODE:
919	{	1032	pango_opengl_render_layout_subpixel (
920	SV *retval;	1033	self->pl,
921	int w, h;	1034	x * PANGO_SCALE, y * PANGO_SCALE,
922		1035	self->r, self->g, self->b, self->a,
923	layout_get_pixel_size (self, &w, &h);
924
925	if (self->rgba)
926	{	1036	flags
927	cairo_surface_t *surface;
928	cairo_t *cairo;
929
930	retval = newSV (w * h * 4);
931	SvPOK_only (retval);
932	SvCUR_set (retval, w * h * 4);
933
934	memset (SvPVX (retval), 0, w * h * 4);
935
936	surface = cairo_image_surface_create_for_data (
937	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
938	cairo = cairo_create (surface);
939	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941	pango_cairo_show_layout (cairo, self->pl);
942
943	cairo_destroy (cairo);
944	cairo_surface_destroy (surface);
945
946	// what a mess, and its premultiplied, too :(
947	{
948	uint32_t p = (uint32_t )SvPVX (retval);
949	uint32_t e = p + w h;
950
951	while (p < e)
952	{
953	uint32_t rgba = *p;
954	rgba = (rgba >> 24) \| (rgba << 8);
955	#if 0
956	#ifdef _WIN32
957	{//D
958	uint8_t r = rgba >> 24;
959	uint8_t g = rgba >> 16;
960	uint8_t b = rgba >> 8;
961	uint8_t a = rgba >> 0;
962
963	rgba = (rgba & 0xffffff00) \| a;
964	}
965	#endif
966	#endif
967	rgba = SDL_SwapBE32 (rgba);
968	*p++ = rgba;
969	}
970	}
971
972	EXTEND (SP, 5);
973	PUSHs (sv_2mortal (newSViv (w)));
974	PUSHs (sv_2mortal (newSViv (h)));
975	PUSHs (sv_2mortal (retval));
976	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978	}	1037	);
979	else
980	{
981	FT_Bitmap bitmap;
982		1038
983	retval = newSV (w * h);
984	SvPOK_only (retval);
985	SvCUR_set (retval, w * h);
986
987	bitmap.rows = h;
988	bitmap.width = w;
989	bitmap.pitch = w;
990	bitmap.buffer = (unsigned char*)SvPVX (retval);
991	bitmap.num_grays = 256;
992	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994	memset (bitmap.buffer, 0, w * h);
995
996	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998	EXTEND (SP, 5);
999	PUSHs (sv_2mortal (newSViv (w)));
1000	PUSHs (sv_2mortal (newSViv (h)));
1001	PUSHs (sv_2mortal (retval));
1002	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004	}
1005	}
1006
1007	MODULE = CFClient PACKAGE = CFClient::Texture	1039	MODULE = CFPlus PACKAGE = CFPlus::Texture
1008		1040
1009	void	1041	void
1010	pad2pot (SV data_, SV w_, SV *h_)	1042	pad2pot (SV data_, SV w_, SV *h_)
1011	CODE:	1043	CODE:
1012	{	1044	{
…		…
1090	glDisable (GL_ALPHA_TEST);	1122	glDisable (GL_ALPHA_TEST);
1091	glDisable (GL_BLEND);	1123	glDisable (GL_BLEND);
1092	}	1124	}
1093	}	1125	}
1094		1126
1095	MODULE = CFClient PACKAGE = CFClient::Map	1127	MODULE = CFPlus PACKAGE = CFPlus::Map
1096		1128
1097	CFClient::Map	1129	CFPlus::Map
1098	new (SV *class, int map_width, int map_height)	1130	new (SV *class, int map_width, int map_height)
1099	CODE:	1131	CODE:
1100	New (0, RETVAL, 1, struct map);	1132	New (0, RETVAL, 1, struct map);
1101	RETVAL->x = 0;	1133	RETVAL->x = 0;
1102	RETVAL->y = 0;	1134	RETVAL->y = 0;
…		…
1112	RETVAL->row = 0;	1144	RETVAL->row = 0;
1113	OUTPUT:	1145	OUTPUT:
1114	RETVAL	1146	RETVAL
1115		1147
1116	void	1148	void
1117	DESTROY (CFClient::Map self)	1149	DESTROY (CFPlus::Map self)
1118	CODE:	1150	CODE:
1119	{	1151	{
1120	map_clear (self);	1152	map_clear (self);
1121	Safefree (self->face);	1153	Safefree (self->face);
1122	Safefree (self->tex);	1154	Safefree (self->tex);
1123	Safefree (self);	1155	Safefree (self);
1124	}	1156	}
1125		1157
1126	void	1158	void
1127	clear (CFClient::Map self)	1159	clear (CFPlus::Map self)
1128	CODE:	1160	CODE:
1129	map_clear (self);	1161	map_clear (self);
1130		1162
1131	void	1163	void
1132	set_face (CFClient::Map self, int face, int texid)	1164	set_face (CFPlus::Map self, int face, int texid)
1133	CODE:	1165	CODE:
1134	{	1166	{
1135	while (self->faces <= face)	1167	while (self->faces <= face)
1136	{	1168	{
1137	Append (mapface, self->face, self->faces, self->faces);	1169	Append (mapface, self->face, self->faces, self->faces);
…		…
1140		1172
1141	self->face [face] = texid;	1173	self->face [face] = texid;
1142	}	1174	}
1143		1175
1144	void	1176	void
1145	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)
1146	CODE:	1178	CODE:
1147	{	1179	{
1148	while (self->texs <= texid)	1180	while (self->texs <= texid)
1149	{	1181	{
1150	Append (maptex, self->tex, self->texs, self->texs);	1182	Append (maptex, self->tex, self->texs, self->texs);
…		…
1174	// from transparent color bleeding and ugly wrapping effects.	1206	// from transparent color bleeding and ugly wrapping effects.
1175	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1207	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176	}	1208	}
1177		1209
1178	int	1210	int
1179	ox (CFClient::Map self)	1211	ox (CFPlus::Map self)
1180	ALIAS:	1212	ALIAS:
1181	oy = 1	1213	oy = 1
1182	x = 2	1214	x = 2
1183	y = 3	1215	y = 3
1184	w = 4	1216	w = 4
…		…
1195	}	1227	}
1196	OUTPUT:	1228	OUTPUT:
1197	RETVAL	1229	RETVAL
1198		1230
1199	void	1231	void
1200	scroll (CFClient::Map self, int dx, int dy)	1232	scroll (CFPlus::Map self, int dx, int dy)
1201	CODE:	1233	CODE:
1202	{	1234	{
1203	if (dx > 0)	1235	if (dx > 0)
1204	map_blank (self, self->x, self->y, dx - 1, self->h);	1236	map_blank (self, self->x, self->y, dx - 1, self->h);
1205	else if (dx < 0)	1237	else if (dx < 0)
…		…
1221	self->y += MAP_EXTEND_Y;	1253	self->y += MAP_EXTEND_Y;
1222	}	1254	}
1223	}	1255	}
1224		1256
1225	void	1257	void
1226	map1a_update (CFClient::Map self, SV *data_)	1258	map1a_update (CFPlus::Map self, SV *data_)
1227	CODE:	1259	CODE:
1228	{	1260	{
1229	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1261	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1230	uint8_t data_end = (uint8_t )SvEND (data_);	1262	uint8_t data_end = (uint8_t )SvEND (data_);
1231	mapcell *cell;	1263	mapcell *cell;
…		…
1233		1265
1234	while (data < data_end)	1266	while (data < data_end)
1235	{	1267	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1268	flags = (data [0] << 8) + data [1]; data += 2;
1237		1269
1238	x = ((flags >> 10) & 63) + self->x;	1270	x = self->x + ((flags >> 10) & 63);
1239	y = ((flags >> 4) & 63) + self->y;	1271	y = self->y + ((flags >> 4) & 63);
1240		1272
1241	cell = map_get_cell (self, x, y);	1273	cell = map_get_cell (self, x, y);
1242		1274
1243	if (flags & 15)	1275	if (flags & 15)
1244	{	1276	{
…		…
1273	cell->darkness = -1;	1305	cell->darkness = -1;
1274	}	1306	}
1275	}	1307	}
1276		1308
1277	SV *	1309	SV *
1278	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)
1279	CODE:	1311	CODE:
1280	{	1312	{
1281	int x1, x;	1313	int x1, x;
1282	int y1, y;	1314	int y1, y;
1283	int z;	1315	int z;
…		…
1333	}	1365	}
1334	OUTPUT:	1366	OUTPUT:
1335	RETVAL	1367	RETVAL
1336		1368
1337	void	1369	void
1338	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)
1339	CODE:	1371	CODE:
1340	{	1372	{
1341	int vx, vy;	1373	int vx, vy;
1342	int x, y, z;	1374	int x, y, z;
1343	int last_name;	1375	int last_name;
1344	mapface face;	1376	mapface face;
1345		1377
1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1378	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1379	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1348		1380
1349	/*	1381	/*
1350	int vx = self->vx = self->w >= sw	1382	int vx = self->vx = self->w >= sw
1351	? self->x + (self->w - sw) / 2	1383	? self->x + (self->w - sw) / 2
1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1384	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1408	glDisable (GL_TEXTURE_2D);	1440	glDisable (GL_TEXTURE_2D);
1409	glDisable (GL_BLEND);	1441	glDisable (GL_BLEND);
1410	}	1442	}
1411		1443
1412	void	1444	void
1413	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)
1414	CODE:	1446	CODE:
1415	{	1447	{
1416	static float color[16][3] = {	1448	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1449	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1450	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1451	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1452	{ 1.00F, 0.00F, 0.00F },
1421		1453
1422	{ 1.00, 0.54, 0.00 },	1454	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1455	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1456	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1457	{ 0.18F, 0.54F, 0.34F },
1426		1458
1427	{ 0.56, 0.73, 0.56 },	1459	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1460	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1461	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1462	{ 0.99F, 0.77F, 0.26F },
1431		1463
1432	{ 0.74, 0.65, 0.41 },	1464	{ 0.74F, 0.65F, 0.41F },
1433		1465
1434	{ 0.00, 1.00, 1.00 },	1466	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1467	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1468	{ 1.00F, 1.00F, 0.00F },
1437	};	1469	};
1438		1470
1439	int x, y;	1471	int x, y;
1440		1472
1441	glEnable (GL_TEXTURE_2D);	1473	glEnable (GL_TEXTURE_2D);
…		…
1468	glDisable (GL_BLEND);	1500	glDisable (GL_BLEND);
1469	glDisable (GL_TEXTURE_2D);	1501	glDisable (GL_TEXTURE_2D);
1470	}	1502	}
1471		1503
1472	void	1504	void
1473	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)
1474	PPCODE:	1506	PPCODE:
1475	{	1507	{
1476	int vx, vy;	1508	int vx, vy;
1477	int x, y;	1509	int x, y;
1478	int sw4 = (sw + 3) & ~3;	1510	int sw4 = (sw + 3) & ~3;
…		…
1507	PUSHs (sv_2mortal (newSViv (sh)));	1539	PUSHs (sv_2mortal (newSViv (sh)));
1508	PUSHs (darkness_sv);	1540	PUSHs (darkness_sv);
1509	}	1541	}
1510		1542
1511	SV *	1543	SV *
1512	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)
1513	CODE:	1545	CODE:
1514	{	1546	{
1515	int x, y, x1, y1;	1547	int x, y, x1, y1;
1516	SV data_sv = newSV (w h * 7 + 5);	1548	SV data_sv = newSV (w h * 7 + 5);
1517	uint8_t data = (uint8_t )SvPVX (data_sv);	1549	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1579	}	1611	}
1580	OUTPUT:	1612	OUTPUT:
1581	RETVAL	1613	RETVAL
1582		1614
1583	void	1615	void
1584	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)
1585	PPCODE:	1617	PPCODE:
1586	{	1618	{
1587	int x, y, z;	1619	int x, y, z;
1588	int w, h;	1620	int w, h;
1589	int x1, y1;	1621	int x1, y1;
…		…
1638	}	1670	}
1639	}	1671	}
1640	}	1672	}
1641	}	1673	}
1642		1674
1643	MODULE = CFClient PACKAGE = CFClient::MixChunk	1675	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1644		1676
1645	CFClient::MixChunk	1677	CFPlus::MixChunk
1646	new_from_file (SV class, char path)	1678	new_from_file (SV class, char path)
1647	CODE:	1679	CODE:
1648	RETVAL = Mix_LoadWAV (path);	1680	RETVAL = Mix_LoadWAV (path);
1649	OUTPUT:	1681	OUTPUT:
1650	RETVAL	1682	RETVAL
1651		1683
1652	void	1684	void
1653	DESTROY (CFClient::MixChunk self)	1685	DESTROY (CFPlus::MixChunk self)
1654	CODE:	1686	CODE:
1655	Mix_FreeChunk (self);	1687	Mix_FreeChunk (self);
1656		1688
1657	int	1689	int
1658	volume (CFClient::MixChunk self, int volume = -1)	1690	volume (CFPlus::MixChunk self, int volume = -1)
1659	CODE:	1691	CODE:
1660	RETVAL = Mix_VolumeChunk (self, volume);	1692	RETVAL = Mix_VolumeChunk (self, volume);
1661	OUTPUT:	1693	OUTPUT:
1662	RETVAL	1694	RETVAL
1663		1695
1664	int	1696	int
1665	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)
1666	CODE:	1698	CODE:
1667	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1699	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1668	OUTPUT:	1700	OUTPUT:
1669	RETVAL	1701	RETVAL
1670		1702
1671	MODULE = CFClient PACKAGE = CFClient::MixMusic	1703	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1672		1704
1673	int	1705	int
1674	volume (int volume = -1)	1706	volume (int volume = -1)
1675	CODE:	1707	CODE:
1676	RETVAL = Mix_VolumeMusic (volume);	1708	RETVAL = Mix_VolumeMusic (volume);
1677	OUTPUT:	1709	OUTPUT:
1678	RETVAL	1710	RETVAL
1679		1711
1680	CFClient::MixMusic	1712	CFPlus::MixMusic
1681	new_from_file (SV class, char path)	1713	new_from_file (SV class, char path)
1682	CODE:	1714	CODE:
1683	RETVAL = Mix_LoadMUS (path);	1715	RETVAL = Mix_LoadMUS (path);
1684	OUTPUT:	1716	OUTPUT:
1685	RETVAL	1717	RETVAL
1686		1718
1687	void	1719	void
1688	DESTROY (CFClient::MixMusic self)	1720	DESTROY (CFPlus::MixMusic self)
1689	CODE:	1721	CODE:
1690	Mix_FreeMusic (self);	1722	Mix_FreeMusic (self);
1691		1723
1692	int	1724	int
1693	play (CFClient::MixMusic self, int loops = -1)	1725	play (CFPlus::MixMusic self, int loops = -1)
1694	CODE:	1726	CODE:
1695	RETVAL = Mix_PlayMusic (self, loops);	1727	RETVAL = Mix_PlayMusic (self, loops);
1696	OUTPUT:	1728	OUTPUT:
1697	RETVAL	1729	RETVAL
1698		1730
1699	MODULE = CFClient PACKAGE = CFClient::OpenGL	1731	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1700		1732
1701	BOOT:	1733	BOOT:
1702	{	1734	{
1703	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1735	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1704	static const struct {	1736	static const struct {
1705	const char *name;	1737	const char *name;
1706	IV iv;	1738	IV iv;
1707	} *civ, const_iv[] = {	1739	} *civ, const_iv[] = {
1708	# define const_iv(name) { # name, (IV)name }	1740	# define const_iv(name) { # name, (IV)name }
…		…
1890	r *= a;	1922	r *= a;
1891	g *= a;	1923	g *= a;
1892	b *= a;	1924	b *= a;
1893	}	1925	}
1894	// microsoft visual "c" rounds instead of truncating...	1926	// microsoft visual "c" rounds instead of truncating...
1895	glColor4ub (MIN ((int)(r * 256.f), 255),	1927	glColor4f (r, g, b, a);
1896	MIN ((int)(g * 256.f), 255),
1897	MIN ((int)(b * 256.f), 255),
1898	MIN ((int)(a * 256.f), 255));
1899		1928
1900	void glInterleavedArrays (int format, int stride, char *data)	1929	void glInterleavedArrays (int format, int stride, char *data)
1901		1930
1902	void glDrawElements (int mode, int count, int type, char *indices)	1931	void glDrawElements (int mode, int count, int type, char *indices)
1903		1932

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC vs. Revision 1.135 by root, Sun Aug 13 15:14:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC vs.
Revision 1.135 by root, Sun Aug 13 15:14:17 2006 UTC