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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.117 by root, Thu Jun 15 15:33:57 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 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	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		518	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
498		519
499	SDL_EnableUNICODE (1);	520	SDL_EnableUNICODE (1);
500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	521	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501		522
502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	523	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
589	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	610	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	611	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591	break;	612	break;
592	}	613	}
593		614
594	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	615	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595	}	616	}
596	}	617	}
597		618
598	int	619	int
599	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	620	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
615	#endif	636	#endif
616		637
617	void	638	void
618	add_font (char *file)	639	add_font (char *file)
619	CODE:	640	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	641	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		642
626	void	643	void
627	load_image_inline (SV *image_)	644	load_image_inline (SV *image_)
628	ALIAS:	645	ALIAS:
629	load_image_file = 1	646	load_image_file = 1
…		…
671		688
672	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	689	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673		690
674	assert (surface2->pitch == surface2->w * 4);	691	assert (surface2->pitch == surface2->w * 4);
675		692
		693	SDL_LockSurface (surface2);
676	EXTEND (SP, 5);	694	EXTEND (SP, 6);
677	PUSHs (sv_2mortal (newSViv (surface2->w)));	695	PUSHs (sv_2mortal (newSViv (surface2->w)));
678	PUSHs (sv_2mortal (newSViv (surface2->h)));	696	PUSHs (sv_2mortal (newSViv (surface2->h)));
679	SDL_LockSurface (surface2);
680	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	697	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)));	698	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	699	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	700	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		701	SDL_UnlockSurface (surface2);
685		702
686	SDL_FreeSurface (surface);	703	SDL_FreeSurface (surface);
687	SDL_FreeSurface (surface2);	704	SDL_FreeSurface (surface2);
688	}	705	}
689		706
…		…
732	void	749	void
733	_exit (int retval)	750	_exit (int retval)
734	CODE:	751	CODE:
735	_exit (retval);	752	_exit (retval);
736		753
737	MODULE = CFClient PACKAGE = CFClient::Font	754	MODULE = CFPlus PACKAGE = CFPlus::Font
738		755
739	CFClient::Font	756	CFPlus::Font
740	new_from_file (SV class, char path, int id = 0)	757	new_from_file (SV class, char path, int id = 0)
741	CODE:	758	CODE:
742	{	759	{
743	int count;	760	int count;
744	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	761	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
747	}	764	}
748	OUTPUT:	765	OUTPUT:
749	RETVAL	766	RETVAL
750		767
751	void	768	void
752	DESTROY (CFClient::Font self)	769	DESTROY (CFPlus::Font self)
753	CODE:	770	CODE:
754	pango_font_description_free (self);	771	pango_font_description_free (self);
755		772
756	void	773	void
757	make_default (CFClient::Font self)	774	make_default (CFPlus::Font self)
758	CODE:	775	CODE:
759	default_font = self;	776	default_font = self;
760		777
761	MODULE = CFClient PACKAGE = CFClient::Layout	778	MODULE = CFPlus PACKAGE = CFPlus::Layout
762		779
763	CFClient::Layout	780	void
764	new (SV *class, int rgba = 0)	781	reset_glyph_cache ()
		782	CODE:
		783	tc_clear ();
		784
		785	CFPlus::Layout
		786	new (SV *class)
765	CODE:	787	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	788	New (0, RETVAL, 1, struct cf_layout);
767		789
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	790	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	791	RETVAL->r = 1.;
771	RETVAL->g = 1.;	792	RETVAL->g = 1.;
772	RETVAL->b = 1.;	793	RETVAL->b = 1.;
773	RETVAL->a = 1.;	794	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	795	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
778	layout_update_font (RETVAL);	799	layout_update_font (RETVAL);
779	OUTPUT:	800	OUTPUT:
780	RETVAL	801	RETVAL
781		802
782	void	803	void
783	DESTROY (CFClient::Layout self)	804	DESTROY (CFPlus::Layout self)
784	CODE:	805	CODE:
785	g_object_unref (self->pl);	806	g_object_unref (self->pl);
786	Safefree (self);	807	Safefree (self);
787		808
788	int
789	is_rgba (CFClient::Layout self)
790	CODE:
791	RETVAL = self->rgba;
792	OUTPUT:
793	RETVAL
794
795	void	809	void
796	set_text (CFClient::Layout self, SV *text_)	810	set_text (CFPlus::Layout self, SV *text_)
797	CODE:	811	CODE:
798	{	812	{
799	STRLEN textlen;	813	STRLEN textlen;
800	char *text = SvPVutf8 (text_, textlen);	814	char *text = SvPVutf8 (text_, textlen);
801		815
802	pango_layout_set_text (self->pl, text, textlen);	816	pango_layout_set_text (self->pl, text, textlen);
803	}	817	}
804		818
805	void	819	void
806	set_markup (CFClient::Layout self, SV *text_)	820	set_markup (CFPlus::Layout self, SV *text_)
807	CODE:	821	CODE:
808	{	822	{
809	STRLEN textlen;	823	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
811		825
812	pango_layout_set_markup (self->pl, text, textlen);	826	pango_layout_set_markup (self->pl, text, textlen);
813	}	827	}
814		828
		829	void
		830	set_shapes (CFPlus::Layout self, ...)
		831	CODE:
		832	{
		833	PangoAttrList *attrs = 0;
		834	const char *text = pango_layout_get_text (self->pl);
		835	const char *pos = text;
		836	int arg = 4;
		837
		838	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		839	{
		840	PangoRectangle inkrect, rect;
		841	PangoAttribute *attr;
		842
		843	int x = SvIV (ST (arg - 3));
		844	int y = SvIV (ST (arg - 2));
		845	int w = SvIV (ST (arg - 1));
		846	int h = SvIV (ST (arg ));
		847
		848	inkrect.x = 0;
		849	inkrect.y = 0;
		850	inkrect.width = 0;
		851	inkrect.height = 0;
		852
		853	rect.x = x * PANGO_SCALE;
		854	rect.y = y * PANGO_SCALE;
		855	rect.width = w * PANGO_SCALE;
		856	rect.height = h * PANGO_SCALE;
		857
		858	if (!attrs)
		859	attrs = pango_layout_get_attributes (self->pl);
		860
		861	attr = pango_attr_shape_new (&inkrect, &rect);
		862	attr->start_index = pos - text;
		863	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		864	pango_attr_list_insert (attrs, attr);
		865
		866	arg += 4;
		867	pos += sizeof (OBJ_STR) - 1;
		868	}
		869
		870	if (attrs)
		871	pango_layout_set_attributes (self->pl, attrs);
		872	}
		873
		874	void
		875	get_shapes (CFPlus::Layout self)
		876	PPCODE:
		877	{
		878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		879
		880	do
		881	{
		882	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		883
		884	if (run && shape_attr_p (run))
		885	{
		886	PangoRectangle extents;
		887	pango_layout_iter_get_run_extents (iter, 0, &extents);
		888
		889	EXTEND (SP, 2);
		890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		891	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		892	}
		893	}
		894	while (pango_layout_iter_next_run (iter));
		895
		896	pango_layout_iter_free (iter);
		897	}
		898
		899	int
		900	has_wrapped (CFPlus::Layout self)
		901	CODE:
		902	{
		903	int lines = 1;
		904	const char *text = pango_layout_get_text (self->pl);
		905
		906	while (*text)
		907	lines += *text++ == '\n';
		908
		909	RETVAL = lines < pango_layout_get_line_count (self->pl);
		910	}
		911	OUTPUT:
		912	RETVAL
		913
815	SV *	914	SV *
816	get_text (CFClient::Layout self)	915	get_text (CFPlus::Layout self)
817	CODE:	916	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	917	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819	sv_utf8_decode (RETVAL);	918	sv_utf8_decode (RETVAL);
820	OUTPUT:	919	OUTPUT:
821	RETVAL	920	RETVAL
822		921
823	void	922	void
824	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	923	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825	CODE:	924	CODE:
826	self->r = r;	925	self->r = r;
827	self->g = g;	926	self->g = g;
828	self->b = b;	927	self->b = b;
829	self->a = a;	928	self->a = a;
830		929
831	void	930	void
832	set_font (CFClient::Layout self, CFClient::Font font = 0)	931	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833	CODE:	932	CODE:
834	if (self->font != font)	933	if (self->font != font)
835	{	934	{
836	self->font = font;	935	self->font = font;
837	layout_update_font (self);	936	layout_update_font (self);
838	}	937	}
839		938
840	void	939	void
841	set_height (CFClient::Layout self, int base_height)	940	set_height (CFPlus::Layout self, int base_height)
842	CODE:	941	CODE:
843	if (self->base_height != base_height)	942	if (self->base_height != base_height)
844	{	943	{
845	self->base_height = base_height;	944	self->base_height = base_height;
846	layout_update_font (self);	945	layout_update_font (self);
847	}	946	}
848		947
849	void	948	void
850	set_width (CFClient::Layout self, int max_width = -1)	949	set_width (CFPlus::Layout self, int max_width = -1)
851	CODE:	950	CODE:
852	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	951	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853		952
854	void	953	void
855	set_indent (CFClient::Layout self, int indent)	954	set_indent (CFPlus::Layout self, int indent)
856	CODE:	955	CODE:
857	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	956	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858		957
859	void	958	void
860	set_spacing (CFClient::Layout self, int spacing)	959	set_spacing (CFPlus::Layout self, int spacing)
861	CODE:	960	CODE:
862	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	961	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863		962
864	void	963	void
865	set_ellipsise (CFClient::Layout self, int ellipsise)	964	set_ellipsise (CFPlus::Layout self, int ellipsise)
866	CODE:	965	CODE:
867	pango_layout_set_ellipsize (self->pl,	966	pango_layout_set_ellipsize (self->pl,
868	ellipsise == 1 ? PANGO_ELLIPSIZE_START	967	ellipsise == 1 ? PANGO_ELLIPSIZE_START
869	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	968	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	969	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
871	: PANGO_ELLIPSIZE_NONE	970	: PANGO_ELLIPSIZE_NONE
872	);	971	);
873		972
874	void	973	void
875	set_single_paragraph_mode (CFClient::Layout self, int spm)	974	set_single_paragraph_mode (CFPlus::Layout self, int spm)
876	CODE:	975	CODE:
877	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	976	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878		977
879	void	978	void
880	size (CFClient::Layout self)	979	size (CFPlus::Layout self)
881	PPCODE:	980	PPCODE:
882	{	981	{
883	int w, h;	982	int w, h;
884		983
885	layout_get_pixel_size (self, &w, &h);	984	layout_get_pixel_size (self, &w, &h);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	987	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	988	PUSHs (sv_2mortal (newSViv (h)));
890	}	989	}
891		990
892	int	991	int
		992	descent (CFPlus::Layout self)
		993	CODE:
		994	{
		995	PangoRectangle rect;
		996	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		997	pango_layout_line_get_pixel_extents (line, 0, &rect);
		998	RETVAL = PANGO_DESCENT (rect);
		999	}
		1000	OUTPUT:
		1001	RETVAL
		1002
		1003	int
893	xy_to_index (CFClient::Layout self, int x, int y)	1004	xy_to_index (CFPlus::Layout self, int x, int y)
894	CODE:	1005	CODE:
895	{	1006	{
896	int index, trailing;	1007	int index, trailing;
897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1008	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898	RETVAL = index;	1009	RETVAL = index;
899	}	1010	}
900	OUTPUT:	1011	OUTPUT:
901	RETVAL	1012	RETVAL
902		1013
903	void	1014	void
904	cursor_pos (CFClient::Layout self, int index)	1015	cursor_pos (CFPlus::Layout self, int index)
905	PPCODE:	1016	PPCODE:
906	{	1017	{
907	PangoRectangle strong_pos;	1018	PangoRectangle strong_pos;
908	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1019	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909		1020
…		…
912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1023	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1024	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1025	}
915		1026
916	void	1027	void
917	render (CFClient::Layout self)	1028	render (CFPlus::Layout self, float x, float y)
918	PPCODE:	1029	PPCODE:
919	{	1030	pango_opengl_render_layout_subpixel (
920	SV *retval;	1031	self->pl,
921	int w, h;	1032	x * PANGO_SCALE, y * PANGO_SCALE,
922		1033	self->r, self->g, self->b, self->a
923	layout_get_pixel_size (self, &w, &h);
924
925	if (self->rgba)
926	{	1034	);
927	cairo_surface_t *surface;
928	cairo_t *cairo;
929		1035
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	}
979	else
980	{
981	FT_Bitmap bitmap;
982
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	1036	MODULE = CFPlus PACKAGE = CFPlus::Texture
1008		1037
1009	void	1038	void
1010	pad2pot (SV data_, SV w_, SV *h_)	1039	pad2pot (SV data_, SV w_, SV *h_)
1011	CODE:	1040	CODE:
1012	{	1041	{
…		…
1090	glDisable (GL_ALPHA_TEST);	1119	glDisable (GL_ALPHA_TEST);
1091	glDisable (GL_BLEND);	1120	glDisable (GL_BLEND);
1092	}	1121	}
1093	}	1122	}
1094		1123
1095	MODULE = CFClient PACKAGE = CFClient::Map	1124	MODULE = CFPlus PACKAGE = CFPlus::Map
1096		1125
1097	CFClient::Map	1126	CFPlus::Map
1098	new (SV *class, int map_width, int map_height)	1127	new (SV *class, int map_width, int map_height)
1099	CODE:	1128	CODE:
1100	New (0, RETVAL, 1, struct map);	1129	New (0, RETVAL, 1, struct map);
1101	RETVAL->x = 0;	1130	RETVAL->x = 0;
1102	RETVAL->y = 0;	1131	RETVAL->y = 0;
…		…
1112	RETVAL->row = 0;	1141	RETVAL->row = 0;
1113	OUTPUT:	1142	OUTPUT:
1114	RETVAL	1143	RETVAL
1115		1144
1116	void	1145	void
1117	DESTROY (CFClient::Map self)	1146	DESTROY (CFPlus::Map self)
1118	CODE:	1147	CODE:
1119	{	1148	{
1120	map_clear (self);	1149	map_clear (self);
1121	Safefree (self->face);	1150	Safefree (self->face);
1122	Safefree (self->tex);	1151	Safefree (self->tex);
1123	Safefree (self);	1152	Safefree (self);
1124	}	1153	}
1125		1154
1126	void	1155	void
1127	clear (CFClient::Map self)	1156	clear (CFPlus::Map self)
1128	CODE:	1157	CODE:
1129	map_clear (self);	1158	map_clear (self);
1130		1159
1131	void	1160	void
1132	set_face (CFClient::Map self, int face, int texid)	1161	set_face (CFPlus::Map self, int face, int texid)
1133	CODE:	1162	CODE:
1134	{	1163	{
1135	while (self->faces <= face)	1164	while (self->faces <= face)
1136	{	1165	{
1137	Append (mapface, self->face, self->faces, self->faces);	1166	Append (mapface, self->face, self->faces, self->faces);
…		…
1140		1169
1141	self->face [face] = texid;	1170	self->face [face] = texid;
1142	}	1171	}
1143		1172
1144	void	1173	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)	1174	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:	1175	CODE:
1147	{	1176	{
1148	while (self->texs <= texid)	1177	while (self->texs <= texid)
1149	{	1178	{
1150	Append (maptex, self->tex, self->texs, self->texs);	1179	Append (maptex, self->tex, self->texs, self->texs);
…		…
1174	// from transparent color bleeding and ugly wrapping effects.	1203	// from transparent color bleeding and ugly wrapping effects.
1175	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1204	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176	}	1205	}
1177		1206
1178	int	1207	int
1179	ox (CFClient::Map self)	1208	ox (CFPlus::Map self)
1180	ALIAS:	1209	ALIAS:
1181	oy = 1	1210	oy = 1
1182	x = 2	1211	x = 2
1183	y = 3	1212	y = 3
1184	w = 4	1213	w = 4
…		…
1195	}	1224	}
1196	OUTPUT:	1225	OUTPUT:
1197	RETVAL	1226	RETVAL
1198		1227
1199	void	1228	void
1200	scroll (CFClient::Map self, int dx, int dy)	1229	scroll (CFPlus::Map self, int dx, int dy)
1201	CODE:	1230	CODE:
1202	{	1231	{
1203	if (dx > 0)	1232	if (dx > 0)
1204	map_blank (self, self->x, self->y, dx - 1, self->h);	1233	map_blank (self, self->x, self->y, dx - 1, self->h);
1205	else if (dx < 0)	1234	else if (dx < 0)
…		…
1221	self->y += MAP_EXTEND_Y;	1250	self->y += MAP_EXTEND_Y;
1222	}	1251	}
1223	}	1252	}
1224		1253
1225	void	1254	void
1226	map1a_update (CFClient::Map self, SV *data_)	1255	map1a_update (CFPlus::Map self, SV *data_)
1227	CODE:	1256	CODE:
1228	{	1257	{
1229	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1258	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1230	uint8_t data_end = (uint8_t )SvEND (data_);	1259	uint8_t data_end = (uint8_t )SvEND (data_);
1231	mapcell *cell;	1260	mapcell *cell;
…		…
1233		1262
1234	while (data < data_end)	1263	while (data < data_end)
1235	{	1264	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1265	flags = (data [0] << 8) + data [1]; data += 2;
1237		1266
1238	x = ((flags >> 10) & 63) + self->x;	1267	x = self->x + ((flags >> 10) & 63);
1239	y = ((flags >> 4) & 63) + self->y;	1268	y = self->y + ((flags >> 4) & 63);
1240		1269
1241	cell = map_get_cell (self, x, y);	1270	cell = map_get_cell (self, x, y);
1242		1271
1243	if (flags & 15)	1272	if (flags & 15)
1244	{	1273	{
…		…
1273	cell->darkness = -1;	1302	cell->darkness = -1;
1274	}	1303	}
1275	}	1304	}
1276		1305
1277	SV *	1306	SV *
1278	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1307	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279	CODE:	1308	CODE:
1280	{	1309	{
1281	int x1, x;	1310	int x1, x;
1282	int y1, y;	1311	int y1, y;
1283	int z;	1312	int z;
…		…
1333	}	1362	}
1334	OUTPUT:	1363	OUTPUT:
1335	RETVAL	1364	RETVAL
1336		1365
1337	void	1366	void
1338	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1367	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1339	CODE:	1368	CODE:
1340	{	1369	{
1341	int vx, vy;	1370	int vx, vy;
1342	int x, y, z;	1371	int x, y, z;
1343	int last_name;	1372	int last_name;
1344	mapface face;	1373	mapface face;
1345		1374
1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1375	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1376	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1348		1377
1349	/*	1378	/*
1350	int vx = self->vx = self->w >= sw	1379	int vx = self->vx = self->w >= sw
1351	? self->x + (self->w - sw) / 2	1380	? self->x + (self->w - sw) / 2
1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1381	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1408	glDisable (GL_TEXTURE_2D);	1437	glDisable (GL_TEXTURE_2D);
1409	glDisable (GL_BLEND);	1438	glDisable (GL_BLEND);
1410	}	1439	}
1411		1440
1412	void	1441	void
1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1442	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414	CODE:	1443	CODE:
1415	{	1444	{
1416	static float color[16][3] = {	1445	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1446	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1447	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1448	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1449	{ 1.00F, 0.00F, 0.00F },
1421		1450
1422	{ 1.00, 0.54, 0.00 },	1451	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1452	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1453	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1454	{ 0.18F, 0.54F, 0.34F },
1426		1455
1427	{ 0.56, 0.73, 0.56 },	1456	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1457	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1458	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1459	{ 0.99F, 0.77F, 0.26F },
1431		1460
1432	{ 0.74, 0.65, 0.41 },	1461	{ 0.74F, 0.65F, 0.41F },
1433		1462
1434	{ 0.00, 1.00, 1.00 },	1463	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1464	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1465	{ 1.00F, 1.00F, 0.00F },
1437	};	1466	};
1438		1467
1439	int x, y;	1468	int x, y;
1440		1469
1441	glEnable (GL_TEXTURE_2D);	1470	glEnable (GL_TEXTURE_2D);
…		…
1447	for (y = 0; y < h; y++)	1476	for (y = 0; y < h; y++)
1448	for (x = 0; x < w; x++)	1477	for (x = 0; x < w; x++)
1449	{	1478	{
1450	unsigned char m = data [x + y * w];	1479	unsigned char m = data [x + y * w];
1451		1480
		1481	if (m)
		1482	{
1452	float *c = color [m & 15];	1483	float *c = color [m & 15];
1453		1484
1454	float tx1 = m & 0x40 ? 0.5 : m & 0x80 ? 0.25 : 0.;	1485	float tx1 = m & 0x40 ? 0.5 : 0.;
1455	float tx2 = tx1 + 0.25;	1486	float tx2 = tx1 + 0.5;
1456		1487
1457	glColor4f (c[0], c[1], c[2], 0.75);	1488	glColor4f (c[0], c[1], c[2], 0.75);
1458	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	1489	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1459	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	1490	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1460	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	1491	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1461	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	1492	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1493	}
1462	}	1494	}
1463		1495
1464	glEnd ();	1496	glEnd ();
1465	glDisable (GL_BLEND);	1497	glDisable (GL_BLEND);
1466	glDisable (GL_TEXTURE_2D);	1498	glDisable (GL_TEXTURE_2D);
1467	}	1499	}
1468		1500
1469	void	1501	void
1470	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1502	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1471	PPCODE:	1503	PPCODE:
1472	{	1504	{
1473	int vx, vy;	1505	int vx, vy;
1474	int x, y;	1506	int x, y;
1475	int sw4 = (sw + 3) & ~3;	1507	int sw4 = (sw + 3) & ~3;
…		…
1504	PUSHs (sv_2mortal (newSViv (sh)));	1536	PUSHs (sv_2mortal (newSViv (sh)));
1505	PUSHs (darkness_sv);	1537	PUSHs (darkness_sv);
1506	}	1538	}
1507		1539
1508	SV *	1540	SV *
1509	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1541	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1510	CODE:	1542	CODE:
1511	{	1543	{
1512	int x, y, x1, y1;	1544	int x, y, x1, y1;
1513	SV data_sv = newSV (w h * 7 + 5);	1545	SV data_sv = newSV (w h * 7 + 5);
1514	uint8_t data = (uint8_t )SvPVX (data_sv);	1546	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1576	}	1608	}
1577	OUTPUT:	1609	OUTPUT:
1578	RETVAL	1610	RETVAL
1579		1611
1580	void	1612	void
1581	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1613	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1582	PPCODE:	1614	PPCODE:
1583	{	1615	{
1584	int x, y, z;	1616	int x, y, z;
1585	int w, h;	1617	int w, h;
1586	int x1, y1;	1618	int x1, y1;
…		…
1635	}	1667	}
1636	}	1668	}
1637	}	1669	}
1638	}	1670	}
1639		1671
1640	MODULE = CFClient PACKAGE = CFClient::MixChunk	1672	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1641		1673
1642	CFClient::MixChunk	1674	CFPlus::MixChunk
1643	new_from_file (SV class, char path)	1675	new_from_file (SV class, char path)
1644	CODE:	1676	CODE:
1645	RETVAL = Mix_LoadWAV (path);	1677	RETVAL = Mix_LoadWAV (path);
1646	OUTPUT:	1678	OUTPUT:
1647	RETVAL	1679	RETVAL
1648		1680
1649	void	1681	void
1650	DESTROY (CFClient::MixChunk self)	1682	DESTROY (CFPlus::MixChunk self)
1651	CODE:	1683	CODE:
1652	Mix_FreeChunk (self);	1684	Mix_FreeChunk (self);
1653		1685
1654	int	1686	int
1655	volume (CFClient::MixChunk self, int volume = -1)	1687	volume (CFPlus::MixChunk self, int volume = -1)
1656	CODE:	1688	CODE:
1657	RETVAL = Mix_VolumeChunk (self, volume);	1689	RETVAL = Mix_VolumeChunk (self, volume);
1658	OUTPUT:	1690	OUTPUT:
1659	RETVAL	1691	RETVAL
1660		1692
1661	int	1693	int
1662	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1694	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1663	CODE:	1695	CODE:
1664	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1696	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1665	OUTPUT:	1697	OUTPUT:
1666	RETVAL	1698	RETVAL
1667		1699
1668	MODULE = CFClient PACKAGE = CFClient::MixMusic	1700	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1669		1701
1670	int	1702	int
1671	volume (int volume = -1)	1703	volume (int volume = -1)
1672	CODE:	1704	CODE:
1673	RETVAL = Mix_VolumeMusic (volume);	1705	RETVAL = Mix_VolumeMusic (volume);
1674	OUTPUT:	1706	OUTPUT:
1675	RETVAL	1707	RETVAL
1676		1708
1677	CFClient::MixMusic	1709	CFPlus::MixMusic
1678	new_from_file (SV class, char path)	1710	new_from_file (SV class, char path)
1679	CODE:	1711	CODE:
1680	RETVAL = Mix_LoadMUS (path);	1712	RETVAL = Mix_LoadMUS (path);
1681	OUTPUT:	1713	OUTPUT:
1682	RETVAL	1714	RETVAL
1683		1715
1684	void	1716	void
1685	DESTROY (CFClient::MixMusic self)	1717	DESTROY (CFPlus::MixMusic self)
1686	CODE:	1718	CODE:
1687	Mix_FreeMusic (self);	1719	Mix_FreeMusic (self);
1688		1720
1689	int	1721	int
1690	play (CFClient::MixMusic self, int loops = -1)	1722	play (CFPlus::MixMusic self, int loops = -1)
1691	CODE:	1723	CODE:
1692	RETVAL = Mix_PlayMusic (self, loops);	1724	RETVAL = Mix_PlayMusic (self, loops);
1693	OUTPUT:	1725	OUTPUT:
1694	RETVAL	1726	RETVAL
1695		1727
1696	MODULE = CFClient PACKAGE = CFClient::OpenGL	1728	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1697		1729
1698	BOOT:	1730	BOOT:
1699	{	1731	{
1700	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1732	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1701	static const struct {	1733	static const struct {
1702	const char *name;	1734	const char *name;
1703	IV iv;	1735	IV iv;
1704	} *civ, const_iv[] = {	1736	} *civ, const_iv[] = {
1705	# define const_iv(name) { # name, (IV)name }	1737	# define const_iv(name) { # name, (IV)name }
…		…
1712	const_iv (GL_SCISSOR_TEST),	1744	const_iv (GL_SCISSOR_TEST),
1713	const_iv (GL_DEPTH_TEST),	1745	const_iv (GL_DEPTH_TEST),
1714	const_iv (GL_ALPHA_TEST),	1746	const_iv (GL_ALPHA_TEST),
1715	const_iv (GL_NORMALIZE),	1747	const_iv (GL_NORMALIZE),
1716	const_iv (GL_RESCALE_NORMAL),	1748	const_iv (GL_RESCALE_NORMAL),
		1749	const_iv (GL_FRONT),
		1750	const_iv (GL_BACK),
1717	const_iv (GL_AND),	1751	const_iv (GL_AND),
1718	const_iv (GL_ONE),	1752	const_iv (GL_ONE),
1719	const_iv (GL_ZERO),	1753	const_iv (GL_ZERO),
1720	const_iv (GL_SRC_ALPHA),	1754	const_iv (GL_SRC_ALPHA),
1721	const_iv (GL_DST_ALPHA),	1755	const_iv (GL_DST_ALPHA),
…		…
1843		1877
1844	void glPopMatrix ()	1878	void glPopMatrix ()
1845		1879
1846	void glLoadIdentity ()	1880	void glLoadIdentity ()
1847		1881
		1882	void glDrawBuffer (int buffer)
		1883
		1884	void glReadBuffer (int buffer)
		1885
1848	# near_ and far_ are due to microsofts buggy "c" compiler	1886	# near_ and far_ are due to microsofts buggy "c" compiler
1849	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1887	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1850		1888
1851	# near_ and far_ are due to microsofts buggy "c" compiler	1889	# near_ and far_ are due to microsofts buggy "c" compiler
1852	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1890	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
…		…
1881	r *= a;	1919	r *= a;
1882	g *= a;	1920	g *= a;
1883	b *= a;	1921	b *= a;
1884	}	1922	}
1885	// microsoft visual "c" rounds instead of truncating...	1923	// microsoft visual "c" rounds instead of truncating...
1886	glColor4ub (MIN ((int)(r * 256.f), 255),	1924	glColor4f (r, g, b, a);
1887	MIN ((int)(g * 256.f), 255),
1888	MIN ((int)(b * 256.f), 255),
1889	MIN ((int)(a * 256.f), 255));
1890		1925
1891	void glInterleavedArrays (int format, int stride, char *data)	1926	void glInterleavedArrays (int format, int stride, char *data)
1892		1927
1893	void glDrawElements (int mode, int count, int type, char *indices)	1928	void glDrawElements (int mode, int count, int type, char *indices)
1894		1929

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.117 by root, Thu Jun 15 15:33:57 2006 UTC vs. Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.117 by root, Thu Jun 15 15:33:57 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC