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

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

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
15	#include <stdlib.h>	20	#include <stdlib.h>
16		21
18	#include <SDL_endian.h>	23	#include <SDL_endian.h>
19	#include <SDL_image.h>	24	#include <SDL_image.h>
20	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
22		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
23	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
24		32
25	#include <pango/pango.h>	33	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		34
30	#ifndef _WIN32	35	#ifndef _WIN32
31	# include <sys/types.h>	36	# include <sys/types.h>
32	# include <sys/socket.h>	37	# include <sys/socket.h>
33	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	45	typedef signed char int8_t;
41	typedef signed short int16_t;	46	typedef signed short int16_t;
42	typedef signed int int32_t;	47	typedef signed int int32_t;
43	#endif	48	#endif
44		49
45	#include "glext.h"	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	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
120		153
121	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		156
124	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	rect.width = (rect.width + 3) & ~3;
		161
		162	*w = rect.width;
		163	*h = rect.height;
125	}	164	}
126		165
127	typedef uint16_t mapface;	166	typedef uint16_t mapface;
128		167
129	typedef struct {	168	typedef struct {
…		…
152	int texs;	191	int texs;
153	maptex *tex;	192	maptex *tex;
154		193
155	int32_t rows;	194	int32_t rows;
156	maprow *row;	195	maprow *row;
157	} *CFClient__Map;	196	} *CFPlus__Map;
158		197
159	static char *	198	static char *
160	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
161	{	200	{
162	char *p;	201	char *p;
…		…
180		219
181	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183		222
184	static maprow *	223	static maprow *
185	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
186	{	225	{
187	if (0 > y)	226	if (0 > y)
188	{	227	{
189	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
228		267
229	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
230	}	269	}
231		270
232	static mapcell *	271	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
234	{	273	{
235	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
236	}	275	}
237		276
238	static void	277	static void
239	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
240	{	279	{
241	int r;	280	int r;
242		281
243	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
252	self->row = 0;	291	self->row = 0;
253	self->rows = 0;	292	self->rows = 0;
254	}	293	}
255		294
256	static void	295	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	297	{
259	int x, y;	298	int x, y;
260	maprow *row;	299	maprow *row;
261		300
262	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
…		…
319	n \|= n >> 16;	358	n \|= n >> 16;
320		359
321	return n + 1;	360	return n + 1;
322	}	361	}
323		362
324	MODULE = CFClient PACKAGE = CFClient	363	MODULE = CFPlus PACKAGE = CFPlus
325		364
326	PROTOTYPES: ENABLE	365	PROTOTYPES: ENABLE
327		366
328	BOOT:	367	BOOT:
329	{	368	{
330	HV *stash = gv_stashpv ("CFClient", 1);	369	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	370	static const struct {
332	const char *name;	371	const char *name;
333	IV iv;	372	IV iv;
334	} *civ, const_iv[] = {	373	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	374	# define const_iv(name) { # name, (IV)name }
…		…
436		475
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	476	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	477	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	478	}
440		479
		480	int
		481	in_destruct ()
		482	CODE:
		483	RETVAL = PL_main_cv == Nullcv;
		484	OUTPUT:
		485	RETVAL
		486
441	NV floor (NV x)	487	NV floor (NV x)
442		488
443	NV ceil (NV x)	489	NV ceil (NV x)
444		490
445	void	491	void
446	pango_init ()	492	pango_init ()
447	CODE:	493	CODE:
448	// delayed, so it can pick up new fonts added by AddFontResourceEx
449	{	494	{
450	{
451	ft2_fontmap = pango_ft2_font_map_new ();	495	opengl_fontmap = pango_opengl_font_map_new ();
452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	496	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	497	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	}	498	}
471		499
472	int	500	int
473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	501	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
474		502
475	void	503	void
476	SDL_Quit ()	504	SDL_Quit ()
477		505
478	void	506	void
…		…
493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496		524
497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	525	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		526	#if SDL_VERSION_ATLEAST(1,2,10)
		527	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		528	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		529	#endif
498		530
499	SDL_EnableUNICODE (1);	531	SDL_EnableUNICODE (1);
500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	532	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501		533
502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	534	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
589	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	621	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	622	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591	break;	623	break;
592	}	624	}
593		625
594	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	626	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595	}	627	}
596	}	628	}
597		629
598	int	630	int
599	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	631	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
615	#endif	647	#endif
616		648
617	void	649	void
618	add_font (char *file)	650	add_font (char *file)
619	CODE:	651	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	652	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		653
626	void	654	void
627	load_image_inline (SV *image_)	655	load_image_inline (SV *image_)
628	ALIAS:	656	ALIAS:
629	load_image_file = 1	657	load_image_file = 1
…		…
671		699
672	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	700	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673		701
674	assert (surface2->pitch == surface2->w * 4);	702	assert (surface2->pitch == surface2->w * 4);
675		703
		704	SDL_LockSurface (surface2);
676	EXTEND (SP, 5);	705	EXTEND (SP, 6);
677	PUSHs (sv_2mortal (newSViv (surface2->w)));	706	PUSHs (sv_2mortal (newSViv (surface2->w)));
678	PUSHs (sv_2mortal (newSViv (surface2->h)));	707	PUSHs (sv_2mortal (newSViv (surface2->h)));
679	SDL_LockSurface (surface2);
680	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	708	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)));	709	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	710	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	711	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		712	SDL_UnlockSurface (surface2);
685		713
686	SDL_FreeSurface (surface);	714	SDL_FreeSurface (surface);
687	SDL_FreeSurface (surface2);	715	SDL_FreeSurface (surface2);
688	}	716	}
689		717
…		…
732	void	760	void
733	_exit (int retval)	761	_exit (int retval)
734	CODE:	762	CODE:
735	_exit (retval);	763	_exit (retval);
736		764
737	MODULE = CFClient PACKAGE = CFClient::Font	765	MODULE = CFPlus PACKAGE = CFPlus::Font
738		766
739	CFClient::Font	767	CFPlus::Font
740	new_from_file (SV class, char path, int id = 0)	768	new_from_file (SV class, char path, int id = 0)
741	CODE:	769	CODE:
742	{	770	{
743	int count;	771	int count;
744	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	772	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
747	}	775	}
748	OUTPUT:	776	OUTPUT:
749	RETVAL	777	RETVAL
750		778
751	void	779	void
752	DESTROY (CFClient::Font self)	780	DESTROY (CFPlus::Font self)
753	CODE:	781	CODE:
754	pango_font_description_free (self);	782	pango_font_description_free (self);
755		783
756	void	784	void
757	make_default (CFClient::Font self)	785	make_default (CFPlus::Font self)
758	CODE:	786	CODE:
759	default_font = self;	787	default_font = self;
760		788
761	MODULE = CFClient PACKAGE = CFClient::Layout	789	MODULE = CFPlus PACKAGE = CFPlus::Layout
762		790
763	CFClient::Layout	791	void
764	new (SV *class, int rgba = 0)	792	reset_glyph_cache ()
		793	CODE:
		794	tc_clear ();
		795
		796	CFPlus::Layout
		797	new (SV *class)
765	CODE:	798	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	799	New (0, RETVAL, 1, struct cf_layout);
767		800
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	801	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	802	RETVAL->r = 1.;
771	RETVAL->g = 1.;	803	RETVAL->g = 1.;
772	RETVAL->b = 1.;	804	RETVAL->b = 1.;
773	RETVAL->a = 1.;	805	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	806	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
778	layout_update_font (RETVAL);	810	layout_update_font (RETVAL);
779	OUTPUT:	811	OUTPUT:
780	RETVAL	812	RETVAL
781		813
782	void	814	void
783	DESTROY (CFClient::Layout self)	815	DESTROY (CFPlus::Layout self)
784	CODE:	816	CODE:
785	g_object_unref (self->pl);	817	g_object_unref (self->pl);
786	Safefree (self);	818	Safefree (self);
787		819
788	int
789	is_rgba (CFClient::Layout self)
790	CODE:
791	RETVAL = self->rgba;
792	OUTPUT:
793	RETVAL
794
795	void	820	void
796	set_text (CFClient::Layout self, SV *text_)	821	set_text (CFPlus::Layout self, SV *text_)
797	CODE:	822	CODE:
798	{	823	{
799	STRLEN textlen;	824	STRLEN textlen;
800	char *text = SvPVutf8 (text_, textlen);	825	char *text = SvPVutf8 (text_, textlen);
801		826
802	pango_layout_set_text (self->pl, text, textlen);	827	pango_layout_set_text (self->pl, text, textlen);
803	}	828	}
804		829
805	void	830	void
806	set_markup (CFClient::Layout self, SV *text_)	831	set_markup (CFPlus::Layout self, SV *text_)
807	CODE:	832	CODE:
808	{	833	{
809	STRLEN textlen;	834	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);	835	char *text = SvPVutf8 (text_, textlen);
811		836
812	pango_layout_set_markup (self->pl, text, textlen);	837	pango_layout_set_markup (self->pl, text, textlen);
813	}	838	}
814		839
		840	void
		841	set_shapes (CFPlus::Layout self, ...)
		842	CODE:
		843	{
		844	PangoAttrList *attrs = 0;
		845	const char *text = pango_layout_get_text (self->pl);
		846	const char *pos = text;
		847	int arg = 4;
		848
		849	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		850	{
		851	PangoRectangle inkrect, rect;
		852	PangoAttribute *attr;
		853
		854	int x = SvIV (ST (arg - 3));
		855	int y = SvIV (ST (arg - 2));
		856	int w = SvIV (ST (arg - 1));
		857	int h = SvIV (ST (arg ));
		858
		859	inkrect.x = 0;
		860	inkrect.y = 0;
		861	inkrect.width = 0;
		862	inkrect.height = 0;
		863
		864	rect.x = x * PANGO_SCALE;
		865	rect.y = y * PANGO_SCALE;
		866	rect.width = w * PANGO_SCALE;
		867	rect.height = h * PANGO_SCALE;
		868
		869	if (!attrs)
		870	attrs = pango_layout_get_attributes (self->pl);
		871
		872	attr = pango_attr_shape_new (&inkrect, &rect);
		873	attr->start_index = pos - text;
		874	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		875	pango_attr_list_insert (attrs, attr);
		876
		877	arg += 4;
		878	pos += sizeof (OBJ_STR) - 1;
		879	}
		880
		881	if (attrs)
		882	pango_layout_set_attributes (self->pl, attrs);
		883	}
		884
		885	void
		886	get_shapes (CFPlus::Layout self)
		887	PPCODE:
		888	{
		889	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		890
		891	do
		892	{
		893	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		894
		895	if (run && shape_attr_p (run))
		896	{
		897	PangoRectangle extents;
		898	pango_layout_iter_get_run_extents (iter, 0, &extents);
		899
		900	EXTEND (SP, 2);
		901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		902	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		903	}
		904	}
		905	while (pango_layout_iter_next_run (iter));
		906
		907	pango_layout_iter_free (iter);
		908	}
		909
		910	int
		911	has_wrapped (CFPlus::Layout self)
		912	CODE:
		913	{
		914	int lines = 1;
		915	const char *text = pango_layout_get_text (self->pl);
		916
		917	while (*text)
		918	lines += *text++ == '\n';
		919
		920	RETVAL = lines < pango_layout_get_line_count (self->pl);
		921	}
		922	OUTPUT:
		923	RETVAL
		924
815	SV *	925	SV *
816	get_text (CFClient::Layout self)	926	get_text (CFPlus::Layout self)
817	CODE:	927	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	928	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819	sv_utf8_decode (RETVAL);	929	sv_utf8_decode (RETVAL);
820	OUTPUT:	930	OUTPUT:
821	RETVAL	931	RETVAL
822		932
823	void	933	void
824	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	934	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825	CODE:	935	CODE:
826	self->r = r;	936	self->r = r;
827	self->g = g;	937	self->g = g;
828	self->b = b;	938	self->b = b;
829	self->a = a;	939	self->a = a;
830		940
831	void	941	void
832	set_font (CFClient::Layout self, CFClient::Font font = 0)	942	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833	CODE:	943	CODE:
834	if (self->font != font)	944	if (self->font != font)
835	{	945	{
836	self->font = font;	946	self->font = font;
837	layout_update_font (self);	947	layout_update_font (self);
838	}	948	}
839		949
840	void	950	void
841	set_height (CFClient::Layout self, int base_height)	951	set_height (CFPlus::Layout self, int base_height)
842	CODE:	952	CODE:
843	if (self->base_height != base_height)	953	if (self->base_height != base_height)
844	{	954	{
845	self->base_height = base_height;	955	self->base_height = base_height;
846	layout_update_font (self);	956	layout_update_font (self);
847	}	957	}
848		958
849	void	959	void
850	set_width (CFClient::Layout self, int max_width = -1)	960	set_width (CFPlus::Layout self, int max_width = -1)
851	CODE:	961	CODE:
852	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	962	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853		963
854	void	964	void
855	set_indent (CFClient::Layout self, int indent)	965	set_indent (CFPlus::Layout self, int indent)
856	CODE:	966	CODE:
857	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	967	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858		968
859	void	969	void
860	set_spacing (CFClient::Layout self, int spacing)	970	set_spacing (CFPlus::Layout self, int spacing)
861	CODE:	971	CODE:
862	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	972	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863		973
864	void	974	void
865	set_ellipsise (CFClient::Layout self, int ellipsise)	975	set_ellipsise (CFPlus::Layout self, int ellipsise)
866	CODE:	976	CODE:
867	pango_layout_set_ellipsize (self->pl,	977	pango_layout_set_ellipsize (self->pl,
868	ellipsise == 1 ? PANGO_ELLIPSIZE_START	978	ellipsise == 1 ? PANGO_ELLIPSIZE_START
869	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	979	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	980	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
871	: PANGO_ELLIPSIZE_NONE	981	: PANGO_ELLIPSIZE_NONE
872	);	982	);
873		983
874	void	984	void
875	set_single_paragraph_mode (CFClient::Layout self, int spm)	985	set_single_paragraph_mode (CFPlus::Layout self, int spm)
876	CODE:	986	CODE:
877	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	987	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878		988
879	void	989	void
880	size (CFClient::Layout self)	990	size (CFPlus::Layout self)
881	PPCODE:	991	PPCODE:
882	{	992	{
883	int w, h;	993	int w, h;
884		994
885	layout_get_pixel_size (self, &w, &h);	995	layout_get_pixel_size (self, &w, &h);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	998	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	999	PUSHs (sv_2mortal (newSViv (h)));
890	}	1000	}
891		1001
892	int	1002	int
		1003	descent (CFPlus::Layout self)
		1004	CODE:
		1005	{
		1006	PangoRectangle rect;
		1007	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1008	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1009	RETVAL = PANGO_DESCENT (rect);
		1010	}
		1011	OUTPUT:
		1012	RETVAL
		1013
		1014	int
893	xy_to_index (CFClient::Layout self, int x, int y)	1015	xy_to_index (CFPlus::Layout self, int x, int y)
894	CODE:	1016	CODE:
895	{	1017	{
896	int index, trailing;	1018	int index, trailing;
897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1019	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898	RETVAL = index;	1020	RETVAL = index;
899	}	1021	}
900	OUTPUT:	1022	OUTPUT:
901	RETVAL	1023	RETVAL
902		1024
903	void	1025	void
904	cursor_pos (CFClient::Layout self, int index)	1026	cursor_pos (CFPlus::Layout self, int index)
905	PPCODE:	1027	PPCODE:
906	{	1028	{
907	PangoRectangle strong_pos;	1029	PangoRectangle strong_pos;
908	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1030	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909		1031
…		…
912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1035	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1036	}
915		1037
916	void	1038	void
917	render (CFClient::Layout self)	1039	render (CFPlus::Layout self, float x, float y, int flags = 0)
918	PPCODE:	1040	PPCODE:
919	{	1041	pango_opengl_render_layout_subpixel (
920	SV *retval;	1042	self->pl,
921	int w, h;	1043	x * PANGO_SCALE, y * PANGO_SCALE,
922		1044	self->r, self->g, self->b, self->a,
923	layout_get_pixel_size (self, &w, &h);
924
925	if (self->rgba)
926	{	1045	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	}	1046	);
979	else
980	{
981	FT_Bitmap bitmap;
982		1047
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	1048	MODULE = CFPlus PACKAGE = CFPlus::Texture
1008		1049
1009	void	1050	void
1010	pad2pot (SV data_, SV w_, SV *h_)	1051	pad2pot (SV data_, SV w_, SV *h_)
1011	CODE:	1052	CODE:
1012	{	1053	{
…		…
1090	glDisable (GL_ALPHA_TEST);	1131	glDisable (GL_ALPHA_TEST);
1091	glDisable (GL_BLEND);	1132	glDisable (GL_BLEND);
1092	}	1133	}
1093	}	1134	}
1094		1135
1095	MODULE = CFClient PACKAGE = CFClient::Map	1136	MODULE = CFPlus PACKAGE = CFPlus::Map
1096		1137
1097	CFClient::Map	1138	CFPlus::Map
1098	new (SV *class, int map_width, int map_height)	1139	new (SV *class, int map_width, int map_height)
1099	CODE:	1140	CODE:
1100	New (0, RETVAL, 1, struct map);	1141	New (0, RETVAL, 1, struct map);
1101	RETVAL->x = 0;	1142	RETVAL->x = 0;
1102	RETVAL->y = 0;	1143	RETVAL->y = 0;
…		…
1112	RETVAL->row = 0;	1153	RETVAL->row = 0;
1113	OUTPUT:	1154	OUTPUT:
1114	RETVAL	1155	RETVAL
1115		1156
1116	void	1157	void
1117	DESTROY (CFClient::Map self)	1158	DESTROY (CFPlus::Map self)
1118	CODE:	1159	CODE:
1119	{	1160	{
1120	map_clear (self);	1161	map_clear (self);
1121	Safefree (self->face);	1162	Safefree (self->face);
1122	Safefree (self->tex);	1163	Safefree (self->tex);
1123	Safefree (self);	1164	Safefree (self);
1124	}	1165	}
1125		1166
1126	void	1167	void
1127	clear (CFClient::Map self)	1168	clear (CFPlus::Map self)
1128	CODE:	1169	CODE:
1129	map_clear (self);	1170	map_clear (self);
1130		1171
1131	void	1172	void
1132	set_face (CFClient::Map self, int face, int texid)	1173	set_face (CFPlus::Map self, int face, int texid)
1133	CODE:	1174	CODE:
1134	{	1175	{
1135	while (self->faces <= face)	1176	while (self->faces <= face)
1136	{	1177	{
1137	Append (mapface, self->face, self->faces, self->faces);	1178	Append (mapface, self->face, self->faces, self->faces);
…		…
1140		1181
1141	self->face [face] = texid;	1182	self->face [face] = texid;
1142	}	1183	}
1143		1184
1144	void	1185	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)	1186	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1146	CODE:	1187	CODE:
1147	{	1188	{
1148	while (self->texs <= texid)	1189	while (self->texs <= texid)
1149	{	1190	{
1150	Append (maptex, self->tex, self->texs, self->texs);	1191	Append (maptex, self->tex, self->texs, self->texs);
…		…
1174	// from transparent color bleeding and ugly wrapping effects.	1215	// from transparent color bleeding and ugly wrapping effects.
1175	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1216	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176	}	1217	}
1177		1218
1178	int	1219	int
1179	ox (CFClient::Map self)	1220	ox (CFPlus::Map self)
1180	ALIAS:	1221	ALIAS:
1181	oy = 1	1222	oy = 1
1182	x = 2	1223	x = 2
1183	y = 3	1224	y = 3
1184	w = 4	1225	w = 4
…		…
1195	}	1236	}
1196	OUTPUT:	1237	OUTPUT:
1197	RETVAL	1238	RETVAL
1198		1239
1199	void	1240	void
1200	scroll (CFClient::Map self, int dx, int dy)	1241	scroll (CFPlus::Map self, int dx, int dy)
1201	CODE:	1242	CODE:
1202	{	1243	{
1203	if (dx > 0)	1244	if (dx > 0)
1204	map_blank (self, self->x, self->y, dx - 1, self->h);	1245	map_blank (self, self->x, self->y, dx - 1, self->h);
1205	else if (dx < 0)	1246	else if (dx < 0)
…		…
1221	self->y += MAP_EXTEND_Y;	1262	self->y += MAP_EXTEND_Y;
1222	}	1263	}
1223	}	1264	}
1224		1265
1225	void	1266	void
1226	map1a_update (CFClient::Map self, SV *data_)	1267	map1a_update (CFPlus::Map self, SV *data_)
1227	CODE:	1268	CODE:
1228	{	1269	{
1229	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1270	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1230	uint8_t data_end = (uint8_t )SvEND (data_);	1271	uint8_t data_end = (uint8_t )SvEND (data_);
1231	mapcell *cell;	1272	mapcell *cell;
…		…
1233		1274
1234	while (data < data_end)	1275	while (data < data_end)
1235	{	1276	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1277	flags = (data [0] << 8) + data [1]; data += 2;
1237		1278
1238	x = ((flags >> 10) & 63) + self->x;	1279	x = self->x + ((flags >> 10) & 63);
1239	y = ((flags >> 4) & 63) + self->y;	1280	y = self->y + ((flags >> 4) & 63);
1240		1281
1241	cell = map_get_cell (self, x, y);	1282	cell = map_get_cell (self, x, y);
1242		1283
1243	if (flags & 15)	1284	if (flags & 15)
1244	{	1285	{
…		…
1273	cell->darkness = -1;	1314	cell->darkness = -1;
1274	}	1315	}
1275	}	1316	}
1276		1317
1277	SV *	1318	SV *
1278	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1319	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279	CODE:	1320	CODE:
1280	{	1321	{
1281	int x1, x;	1322	int x1, x;
1282	int y1, y;	1323	int y1, y;
1283	int z;	1324	int z;
…		…
1333	}	1374	}
1334	OUTPUT:	1375	OUTPUT:
1335	RETVAL	1376	RETVAL
1336		1377
1337	void	1378	void
1338	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1379	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1339	CODE:	1380	CODE:
1340	{	1381	{
1341	int vx, vy;	1382	int vx, vy;
1342	int x, y, z;	1383	int x, y, z;
1343	int last_name;	1384	int last_name;
1344	mapface face;	1385	mapface face;
1345		1386
1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1387	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1388	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1348		1389
1349	/*	1390	/*
1350	int vx = self->vx = self->w >= sw	1391	int vx = self->vx = self->w >= sw
1351	? self->x + (self->w - sw) / 2	1392	? self->x + (self->w - sw) / 2
1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1393	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1408	glDisable (GL_TEXTURE_2D);	1449	glDisable (GL_TEXTURE_2D);
1409	glDisable (GL_BLEND);	1450	glDisable (GL_BLEND);
1410	}	1451	}
1411		1452
1412	void	1453	void
1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1454	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414	CODE:	1455	CODE:
1415	{	1456	{
1416	static float color[16][3] = {	1457	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1458	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1459	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1460	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1461	{ 1.00F, 0.00F, 0.00F },
1421		1462
1422	{ 1.00, 0.54, 0.00 },	1463	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1464	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1465	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1466	{ 0.18F, 0.54F, 0.34F },
1426		1467
1427	{ 0.56, 0.73, 0.56 },	1468	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1469	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1470	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1471	{ 0.99F, 0.77F, 0.26F },
1431		1472
1432	{ 0.74, 0.65, 0.41 },	1473	{ 0.74F, 0.65F, 0.41F },
1433		1474
1434	{ 0.00, 1.00, 1.00 },	1475	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1476	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1477	{ 1.00F, 1.00F, 0.00F },
1437	};	1478	};
1438		1479
1439	int x, y;	1480	int x, y;
1440		1481
1441	glEnable (GL_TEXTURE_2D);	1482	glEnable (GL_TEXTURE_2D);
…		…
1468	glDisable (GL_BLEND);	1509	glDisable (GL_BLEND);
1469	glDisable (GL_TEXTURE_2D);	1510	glDisable (GL_TEXTURE_2D);
1470	}	1511	}
1471		1512
1472	void	1513	void
1473	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1514	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1474	PPCODE:	1515	PPCODE:
1475	{	1516	{
1476	int vx, vy;	1517	int vx, vy;
1477	int x, y;	1518	int x, y;
1478	int sw4 = (sw + 3) & ~3;	1519	int sw4 = (sw + 3) & ~3;
…		…
1507	PUSHs (sv_2mortal (newSViv (sh)));	1548	PUSHs (sv_2mortal (newSViv (sh)));
1508	PUSHs (darkness_sv);	1549	PUSHs (darkness_sv);
1509	}	1550	}
1510		1551
1511	SV *	1552	SV *
1512	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1553	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1513	CODE:	1554	CODE:
1514	{	1555	{
1515	int x, y, x1, y1;	1556	int x, y, x1, y1;
1516	SV data_sv = newSV (w h * 7 + 5);	1557	SV data_sv = newSV (w h * 7 + 5);
1517	uint8_t data = (uint8_t )SvPVX (data_sv);	1558	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1579	}	1620	}
1580	OUTPUT:	1621	OUTPUT:
1581	RETVAL	1622	RETVAL
1582		1623
1583	void	1624	void
1584	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1625	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1585	PPCODE:	1626	PPCODE:
1586	{	1627	{
1587	int x, y, z;	1628	int x, y, z;
1588	int w, h;	1629	int w, h;
1589	int x1, y1;	1630	int x1, y1;
…		…
1638	}	1679	}
1639	}	1680	}
1640	}	1681	}
1641	}	1682	}
1642		1683
1643	MODULE = CFClient PACKAGE = CFClient::MixChunk	1684	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1644		1685
1645	CFClient::MixChunk	1686	CFPlus::MixChunk
1646	new_from_file (SV class, char path)	1687	new_from_file (SV class, char path)
1647	CODE:	1688	CODE:
1648	RETVAL = Mix_LoadWAV (path);	1689	RETVAL = Mix_LoadWAV (path);
1649	OUTPUT:	1690	OUTPUT:
1650	RETVAL	1691	RETVAL
1651		1692
1652	void	1693	void
1653	DESTROY (CFClient::MixChunk self)	1694	DESTROY (CFPlus::MixChunk self)
1654	CODE:	1695	CODE:
1655	Mix_FreeChunk (self);	1696	Mix_FreeChunk (self);
1656		1697
1657	int	1698	int
1658	volume (CFClient::MixChunk self, int volume = -1)	1699	volume (CFPlus::MixChunk self, int volume = -1)
1659	CODE:	1700	CODE:
1660	RETVAL = Mix_VolumeChunk (self, volume);	1701	RETVAL = Mix_VolumeChunk (self, volume);
1661	OUTPUT:	1702	OUTPUT:
1662	RETVAL	1703	RETVAL
1663		1704
1664	int	1705	int
1665	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1706	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1666	CODE:	1707	CODE:
1667	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1708	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1668	OUTPUT:	1709	OUTPUT:
1669	RETVAL	1710	RETVAL
1670		1711
1671	MODULE = CFClient PACKAGE = CFClient::MixMusic	1712	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1672		1713
1673	int	1714	int
1674	volume (int volume = -1)	1715	volume (int volume = -1)
1675	CODE:	1716	CODE:
1676	RETVAL = Mix_VolumeMusic (volume);	1717	RETVAL = Mix_VolumeMusic (volume);
1677	OUTPUT:	1718	OUTPUT:
1678	RETVAL	1719	RETVAL
1679		1720
1680	CFClient::MixMusic	1721	CFPlus::MixMusic
1681	new_from_file (SV class, char path)	1722	new_from_file (SV class, char path)
1682	CODE:	1723	CODE:
1683	RETVAL = Mix_LoadMUS (path);	1724	RETVAL = Mix_LoadMUS (path);
1684	OUTPUT:	1725	OUTPUT:
1685	RETVAL	1726	RETVAL
1686		1727
1687	void	1728	void
1688	DESTROY (CFClient::MixMusic self)	1729	DESTROY (CFPlus::MixMusic self)
1689	CODE:	1730	CODE:
1690	Mix_FreeMusic (self);	1731	Mix_FreeMusic (self);
1691		1732
1692	int	1733	int
1693	play (CFClient::MixMusic self, int loops = -1)	1734	play (CFPlus::MixMusic self, int loops = -1)
1694	CODE:	1735	CODE:
1695	RETVAL = Mix_PlayMusic (self, loops);	1736	RETVAL = Mix_PlayMusic (self, loops);
1696	OUTPUT:	1737	OUTPUT:
1697	RETVAL	1738	RETVAL
1698		1739
1699	MODULE = CFClient PACKAGE = CFClient::OpenGL	1740	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1700		1741
1701	BOOT:	1742	BOOT:
1702	{	1743	{
1703	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1744	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1704	static const struct {	1745	static const struct {
1705	const char *name;	1746	const char *name;
1706	IV iv;	1747	IV iv;
1707	} *civ, const_iv[] = {	1748	} *civ, const_iv[] = {
1708	# define const_iv(name) { # name, (IV)name }	1749	# define const_iv(name) { # name, (IV)name }
…		…
1715	const_iv (GL_SCISSOR_TEST),	1756	const_iv (GL_SCISSOR_TEST),
1716	const_iv (GL_DEPTH_TEST),	1757	const_iv (GL_DEPTH_TEST),
1717	const_iv (GL_ALPHA_TEST),	1758	const_iv (GL_ALPHA_TEST),
1718	const_iv (GL_NORMALIZE),	1759	const_iv (GL_NORMALIZE),
1719	const_iv (GL_RESCALE_NORMAL),	1760	const_iv (GL_RESCALE_NORMAL),
		1761	const_iv (GL_FRONT),
		1762	const_iv (GL_BACK),
1720	const_iv (GL_AND),	1763	const_iv (GL_AND),
1721	const_iv (GL_ONE),	1764	const_iv (GL_ONE),
1722	const_iv (GL_ZERO),	1765	const_iv (GL_ZERO),
1723	const_iv (GL_SRC_ALPHA),	1766	const_iv (GL_SRC_ALPHA),
1724	const_iv (GL_DST_ALPHA),	1767	const_iv (GL_DST_ALPHA),
…		…
1769	const_iv (GL_SEPARABLE_2D),	1812	const_iv (GL_SEPARABLE_2D),
1770	const_iv (GL_CONVOLUTION_2D),	1813	const_iv (GL_CONVOLUTION_2D),
1771	const_iv (GL_CONVOLUTION_BORDER_MODE),	1814	const_iv (GL_CONVOLUTION_BORDER_MODE),
1772	const_iv (GL_CONSTANT_BORDER),	1815	const_iv (GL_CONSTANT_BORDER),
1773	const_iv (GL_LINES),	1816	const_iv (GL_LINES),
		1817	const_iv (GL_LINE_STRIP),
1774	const_iv (GL_LINE_LOOP),	1818	const_iv (GL_LINE_LOOP),
1775	const_iv (GL_QUADS),	1819	const_iv (GL_QUADS),
1776	const_iv (GL_QUAD_STRIP),	1820	const_iv (GL_QUAD_STRIP),
1777	const_iv (GL_TRIANGLES),	1821	const_iv (GL_TRIANGLES),
1778	const_iv (GL_TRIANGLE_STRIP),	1822	const_iv (GL_TRIANGLE_STRIP),
…		…
1846		1890
1847	void glPopMatrix ()	1891	void glPopMatrix ()
1848		1892
1849	void glLoadIdentity ()	1893	void glLoadIdentity ()
1850		1894
		1895	void glDrawBuffer (int buffer)
		1896
		1897	void glReadBuffer (int buffer)
		1898
1851	# near_ and far_ are due to microsofts buggy "c" compiler	1899	# near_ and far_ are due to microsofts buggy "c" compiler
1852	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1900	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1853		1901
1854	# near_ and far_ are due to microsofts buggy "c" compiler	1902	# near_ and far_ are due to microsofts buggy "c" compiler
1855	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1903	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
…		…
1884	r *= a;	1932	r *= a;
1885	g *= a;	1933	g *= a;
1886	b *= a;	1934	b *= a;
1887	}	1935	}
1888	// microsoft visual "c" rounds instead of truncating...	1936	// microsoft visual "c" rounds instead of truncating...
1889	glColor4ub (MIN ((int)(r * 256.f), 255),	1937	glColor4f (r, g, b, a);
1890	MIN ((int)(g * 256.f), 255),
1891	MIN ((int)(b * 256.f), 255),
1892	MIN ((int)(a * 256.f), 255));
1893		1938
1894	void glInterleavedArrays (int format, int stride, char *data)	1939	void glInterleavedArrays (int format, int stride, char *data)
1895		1940
1896	void glDrawElements (int mode, int count, int type, char *indices)	1941	void glDrawElements (int mode, int count, int type, char *indices)
1897		1942
…		…
1974		2019
1975	void glEndList ()	2020	void glEndList ()
1976		2021
1977	void glCallList (int list)	2022	void glCallList (int list)
1978		2023
1979

Diff Legend

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

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

Diff Legend

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