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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	long _ftol (double); /* defined by VC6 C libs */
		3	long _ftol2 (double dblSource) { return _ftol (dblSource); }
		4	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	5	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	6	# include <malloc.h>
4	# include <windows.h>	7	# include <windows.h>
		8	# include <wininet.h>
5	# pragma warning(disable:4244)	9	# pragma warning(disable:4244)
6	#endif	10	#endif
7		11
8	#include "EXTERN.h"	12	#include "EXTERN.h"
9	#include "perl.h"	13	#include "perl.h"
10	#include "XSUB.h"	14	#include "XSUB.h"
		15
		16	#ifdef _WIN32
		17	# undef pipe
		18	#endif
11		19
12	#include <math.h>	20	#include <math.h>
13	#include <string.h>	21	#include <string.h>
14	#include <stdio.h>	22	#include <stdio.h>
15	#include <stdlib.h>	23	#include <stdlib.h>
18	#include <SDL_endian.h>	26	#include <SDL_endian.h>
19	#include <SDL_image.h>	27	#include <SDL_image.h>
20	#include <SDL_mixer.h>	28	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	29	#include <SDL_opengl.h>
22		30
		31	#define PANGO_ENABLE_BACKEND
		32	#define G_DISABLE_CAST_CHECKS
		33
23	#include <glib/gmacros.h>	34	#include <glib/gmacros.h>
24		35
25	#include <pango/pango.h>	36	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		37
30	#ifndef _WIN32	38	#ifndef _WIN32
31	# include <sys/types.h>	39	# include <sys/types.h>
32	# include <sys/socket.h>	40	# include <sys/socket.h>
33	# include <netinet/in.h>	41	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	48	typedef signed char int8_t;
41	typedef signed short int16_t;	49	typedef signed short int16_t;
42	typedef signed int int32_t;	50	typedef signed int int32_t;
43	#endif	51	#endif
44		52
45	#include "glext.h"
46
47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	53	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48		54
49	#define FOW_DARKNESS 32	55	#define FOW_DARKNESS 32
50		56
51	#define MAP_EXTEND_X 32	57	#define MAP_EXTEND_X 32
52	#define MAP_EXTEND_Y 512	58	#define MAP_EXTEND_Y 512
53		59
54	#define MIN_FONT_HEIGHT 10	60	#define MIN_FONT_HEIGHT 10
		61
		62	#if 0
		63	# define PARACHUTE SDL_INIT_NOPARACHUTE
		64	#else
		65	# define PARACHUTE 0
		66	#endif
55		67
56	static struct	68	static struct
57	{	69	{
58	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
59	#include "glfunc.h"	71	#include "glfunc.h"
…		…
68	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	80	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69	else	81	else
70	glBlendFunc (sa, da);	82	glBlendFunc (sa, da);
71	}	83	}
72		84
		85	#include "texcache.c"
		86
		87	#include "pango-font.c"
		88	#include "pango-fontmap.c"
		89	#include "pango-render.c"
		90
73	typedef Mix_Chunk *CFClient__MixChunk;	91	typedef Mix_Chunk *CFPlus__MixChunk;
74	typedef Mix_Music *CFClient__MixMusic;	92	typedef Mix_Music *CFPlus__MixMusic;
75		93
76	typedef PangoFontDescription *CFClient__Font;	94	typedef PangoFontDescription *CFPlus__Font;
77		95
78	static int	96	static int
79	shape_attr_p (PangoLayoutRun *run)	97	shape_attr_p (PangoLayoutRun *run)
80	{	98	{
81	GSList *attrs = run->item->analysis.extra_attrs;	99	GSList *attrs = run->item->analysis.extra_attrs;
…		…
92		110
93	return 0;	111	return 0;
94	}	112	}
95		113
96	typedef struct cf_layout {	114	typedef struct cf_layout {
97	PangoLayout *pl; // either derived from a cairo or ft2 context	115	PangoLayout *pl;
98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99	float r, g, b, a; // default color for rgba mode	116	float r, g, b, a; // default color for rgba mode
100	int base_height;	117	int base_height;
101	CFClient__Font font;	118	CFPlus__Font font;
102	} *CFClient__Layout;	119	} *CFPlus__Layout;
103		120
104	static CFClient__Font default_font;	121	static CFPlus__Font default_font;
105	static PangoContext ft2_context, cairo_context;	122	static PangoContext *opengl_context;
106	static PangoFontMap ft2_fontmap, cairo_fontmap;	123	static PangoFontMap *opengl_fontmap;
107		124
108	static void	125	static void
109	substitute_func (FcPattern *pattern, gpointer data)	126	substitute_func (FcPattern *pattern, gpointer data)
110	{	127	{
111	FcPatternAddBool (pattern, FC_HINTING, 1);	128	FcPatternAddBool (pattern, FC_HINTING, 1);
112	#ifdef FC_HINT_STYLE	129	#ifdef FC_HINT_STYLE
113	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	130	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114	#endif	131	#endif
115	#ifdef _WIN32
116	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117	#else
118	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	132	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119	#endif
120	}	133	}
121		134
122	static void	135	static void
123	layout_update_font (CFClient__Layout self)	136	layout_update_font (CFPlus__Layout self)
124	{	137	{
125	/* use a random scale factor to account for unknown descenders, 0.8 works	138	/* use a random scale factor to account for unknown descenders, 0.8 works
126	* reasonably well with bitstream vera	139	* reasonably well with bitstream vera
127	*/	140	*/
128	PangoFontDescription *font = self->font ? self->font : default_font;	141	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
132		145
133	pango_layout_set_font_description (self->pl, font);	146	pango_layout_set_font_description (self->pl, font);
134	}	147	}
135		148
136	static void	149	static void
137	layout_get_pixel_size (CFClient__Layout self, int w, int h)	150	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
138	{	151	{
		152	PangoRectangle rect;
		153
		154	// get_pixel_* wrongly rounds down
139	pango_layout_get_pixel_size (self->pl, w, h);	155	pango_layout_get_extents (self->pl, 0, &rect);
140		156
141	if (!w) w = 1;	157	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142	if (!h) h = 1;	158	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143		159
144	w = (w + 3) & ~3;	160	if (!rect.width) rect.width = 1;
		161	if (!rect.height) rect.height = 1;
		162
		163	*w = rect.width;
		164	*h = rect.height;
145	}	165	}
146		166
147	typedef uint16_t mapface;	167	typedef uint16_t mapface;
148		168
149	typedef struct {	169	typedef struct {
…		…
152	float s, t;	172	float s, t;
153	uint8_t r, g, b, a;	173	uint8_t r, g, b, a;
154	} maptex;	174	} maptex;
155		175
156	typedef struct {	176	typedef struct {
157	int16_t darkness;	177	uint32_t player;
158	mapface face[3];	178	mapface face[3];
		179	uint16_t darkness;
		180	uint8_t stat_width, stat_hp, flags;
159	} mapcell;	181	} mapcell;
160		182
161	typedef struct {	183	typedef struct {
162	int32_t c0, c1;	184	int32_t c0, c1;
163	mapcell *col;	185	mapcell *col;
…		…
172	int texs;	194	int texs;
173	maptex *tex;	195	maptex *tex;
174		196
175	int32_t rows;	197	int32_t rows;
176	maprow *row;	198	maprow *row;
177	} *CFClient__Map;	199	} *CFPlus__Map;
178		200
179	static char *	201	static char *
180	prepend (char *ptr, int sze, int inc)	202	prepend (char *ptr, int sze, int inc)
181	{	203	{
182	char *p;	204	char *p;
…		…
200		222
201	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	223	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
202	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	224	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203		225
204	static maprow *	226	static maprow *
205	map_get_row (CFClient__Map self, int y)	227	map_get_row (CFPlus__Map self, int y)
206	{	228	{
207	if (0 > y)	229	if (0 > y)
208	{	230	{
209	int extend = - y + MAP_EXTEND_Y;	231	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	232	Prepend (maprow, self->row, self->rows, extend);
…		…
248		270
249	return row->col + (x - row->c0);	271	return row->col + (x - row->c0);
250	}	272	}
251		273
252	static mapcell *	274	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	275	map_get_cell (CFPlus__Map self, int x, int y)
254	{	276	{
255	return row_get_cell (map_get_row (self, y), x);	277	return row_get_cell (map_get_row (self, y), x);
256	}	278	}
257		279
258	static void	280	static void
259	map_clear (CFClient__Map self)	281	map_clear (CFPlus__Map self)
260	{	282	{
261	int r;	283	int r;
262		284
263	for (r = 0; r < self->rows; r++)	285	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	286	Safefree (self->row[r].col);
…		…
272	self->row = 0;	294	self->row = 0;
273	self->rows = 0;	295	self->rows = 0;
274	}	296	}
275		297
276	static void	298	static void
277	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	299	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278	{	300	{
279	int x, y;	301	int x, y;
280	maprow *row;	302	maprow *row;
		303	mapcell *cell;
281		304
282	for (y = y0; y < y0 + h; y++)	305	for (y = y0; y < y0 + h; y++)
283	if (y >= 0)	306	if (y >= 0)
284	{	307	{
285	if (y >= self->rows)	308	if (y >= self->rows)
…		…
291	if (x >= row->c0)	314	if (x >= row->c0)
292	{	315	{
293	if (x >= row->c1)	316	if (x >= row->c1)
294	break;	317	break;
295		318
296	row->col[x - row->c0].darkness = -1;	319	cell = row->col + x - row->c0;
		320
		321	cell->darkness = 0;
		322	cell->stat_hp = 0;
		323	cell->flags = 0;
		324	cell->player = 0;
297	}	325	}
298	}	326	}
299	}	327	}
300		328
301	static void	329	static void
…		…
339	n \|= n >> 16;	367	n \|= n >> 16;
340		368
341	return n + 1;	369	return n + 1;
342	}	370	}
343		371
344	MODULE = CFClient PACKAGE = CFClient	372	MODULE = CFPlus PACKAGE = CFPlus
345		373
346	PROTOTYPES: ENABLE	374	PROTOTYPES: ENABLE
347		375
348	BOOT:	376	BOOT:
349	{	377	{
350	HV *stash = gv_stashpv ("CFClient", 1);	378	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	379	static const struct {
352	const char *name;	380	const char *name;
353	IV iv;	381	IV iv;
354	} *civ, const_iv[] = {	382	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	383	# define const_iv(name) { # name, (IV)name }
…		…
456		484
457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	485	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	486	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459	}	487	}
460		488
		489	int
		490	in_destruct ()
		491	CODE:
		492	RETVAL = PL_main_cv == Nullcv;
		493	OUTPUT:
		494	RETVAL
		495
461	NV floor (NV x)	496	NV floor (NV x)
462		497
463	NV ceil (NV x)	498	NV ceil (NV x)
464		499
465	void	500	void
466	pango_init ()	501	pango_init ()
467	CODE:	502	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	503	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	504	opengl_fontmap = pango_opengl_font_map_new ();
472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	505	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
473	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	506	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474	}
475	{
476	cairo_font_options_t *fopt = cairo_font_options_create ();
477	cairo_fontmap = pango_cairo_font_map_get_default ();
478	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479	#ifdef _WIN32
480	// cairo looks like shit eaten twice on windows
481	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482	#else
483	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484	#endif
485	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487	pango_cairo_context_set_font_options (cairo_context, fopt);
488	cairo_font_options_destroy (fopt);
489	}
490	}	507	}
491		508
492	int	509	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	510	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
494		511
495	void	512	void
496	SDL_Quit ()	513	SDL_Quit ()
497		514
498	void	515	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	531	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	532	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		533
517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	534	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		535	#if SDL_VERSION_ATLEAST(1,2,10)
		536	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		537	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		538	#endif
518		539
519	SDL_EnableUNICODE (1);	540	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	541	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		542
522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	543	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	630	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	631	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	632	break;
612	}	633	}
613		634
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	635	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	636	}
616	}	637	}
617		638
618	int	639	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	640	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
633	#ifndef _WIN32	654	#ifndef _WIN32
634	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	655	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
635	#endif	656	#endif
636		657
637	void	658	void
		659	win32_proxy_info ()
		660	PPCODE:
		661	{
		662	#ifdef _WIN32
		663	char buffer[2048];
		664	DWORD buflen;
		665
		666	EXTEND (SP, 3);
		667
		668	buflen = sizeof (buffer);
		669	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		670	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		671	{
		672	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		673
		674	buflen = sizeof (buffer);
		675	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		676	{
		677	PUSHs (newSVpv (buffer, 0));
		678
		679	buflen = sizeof (buffer);
		680	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		681	PUSHs (newSVpv (buffer, 0));
		682	}
		683	}
		684	#endif
		685	}
		686
		687	void
638	add_font (char *file)	688	add_font (char *file)
639	CODE:	689	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	690	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		691
646	void	692	void
647	load_image_inline (SV *image_)	693	load_image_inline (SV *image_)
648	ALIAS:	694	ALIAS:
649	load_image_file = 1	695	load_image_file = 1
…		…
691		737
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	738	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		739
694	assert (surface2->pitch == surface2->w * 4);	740	assert (surface2->pitch == surface2->w * 4);
695		741
		742	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	743	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	744	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	745	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	746	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701	SDL_UnlockSurface (surface2);
702	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	747	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	748	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	749	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		750	SDL_UnlockSurface (surface2);
705		751
706	SDL_FreeSurface (surface);	752	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	753	SDL_FreeSurface (surface2);
708	}	754	}
709		755
…		…
748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	794	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
749	#endif	795	#endif
750	_exit (1);	796	_exit (1);
751		797
752	void	798	void
753	_exit (int retval)	799	_exit (int retval = 0)
754	CODE:	800	CODE:
755	_exit (retval);	801	_exit (retval);
756		802
757	MODULE = CFClient PACKAGE = CFClient::Font	803	MODULE = CFPlus PACKAGE = CFPlus::Font
758		804
759	CFClient::Font	805	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	806	new_from_file (SV class, char path, int id = 0)
761	CODE:	807	CODE:
762	{	808	{
763	int count;	809	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	810	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	813	}
768	OUTPUT:	814	OUTPUT:
769	RETVAL	815	RETVAL
770		816
771	void	817	void
772	DESTROY (CFClient::Font self)	818	DESTROY (CFPlus::Font self)
773	CODE:	819	CODE:
774	pango_font_description_free (self);	820	pango_font_description_free (self);
775		821
776	void	822	void
777	make_default (CFClient::Font self)	823	make_default (CFPlus::Font self)
778	CODE:	824	CODE:
779	default_font = self;	825	default_font = self;
780		826
781	MODULE = CFClient PACKAGE = CFClient::Layout	827	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		828
783	CFClient::Layout	829	void
784	new (SV *class, int rgba = 0)	830	reset_glyph_cache ()
		831	CODE:
		832	tc_clear ();
		833
		834	CFPlus::Layout
		835	new (SV *class)
785	CODE:	836	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	837	New (0, RETVAL, 1, struct cf_layout);
787		838
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	839	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	840	RETVAL->r = 1.;
791	RETVAL->g = 1.;	841	RETVAL->g = 1.;
792	RETVAL->b = 1.;	842	RETVAL->b = 1.;
793	RETVAL->a = 1.;	843	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	844	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	848	layout_update_font (RETVAL);
799	OUTPUT:	849	OUTPUT:
800	RETVAL	850	RETVAL
801		851
802	void	852	void
803	DESTROY (CFClient::Layout self)	853	DESTROY (CFPlus::Layout self)
804	CODE:	854	CODE:
805	g_object_unref (self->pl);	855	g_object_unref (self->pl);
806	Safefree (self);	856	Safefree (self);
807		857
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	858	void
816	set_text (CFClient::Layout self, SV *text_)	859	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	860	CODE:
818	{	861	{
819	STRLEN textlen;	862	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	863	char *text = SvPVutf8 (text_, textlen);
821		864
822	pango_layout_set_text (self->pl, text, textlen);	865	pango_layout_set_text (self->pl, text, textlen);
823	}	866	}
824		867
825	void	868	void
826	set_markup (CFClient::Layout self, SV *text_)	869	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	870	CODE:
828	{	871	{
829	STRLEN textlen;	872	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	873	char *text = SvPVutf8 (text_, textlen);
831		874
832	pango_layout_set_markup (self->pl, text, textlen);	875	pango_layout_set_markup (self->pl, text, textlen);
833	}	876	}
834		877
835	void	878	void
836	set_shapes (CFClient::Layout self, ...)	879	set_shapes (CFPlus::Layout self, ...)
837	CODE:	880	CODE:
838	{	881	{
839	PangoAttrList *attrs = 0;	882	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	883	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	884	const char *pos = text;
842	int arg = 2;	885	int arg = 4;
843		886
844	while (arg < items && (pos = strstr (pos, OBJ_STR)))	887	while (arg < items && (pos = strstr (pos, OBJ_STR)))
845	{	888	{
846	PangoRectangle rect;	889	PangoRectangle inkrect, rect;
847	PangoAttribute *attr;	890	PangoAttribute *attr;
848		891
		892	int x = SvIV (ST (arg - 3));
		893	int y = SvIV (ST (arg - 2));
849	int w = SvIV (ST (arg - 1));	894	int w = SvIV (ST (arg - 1));
850	int h = SvIV (ST (arg));	895	int h = SvIV (ST (arg ));
851		896
852	arg += 2;
853
854	rect.x = 0;	897	inkrect.x = 0;
		898	inkrect.y = 0;
		899	inkrect.width = 0;
		900	inkrect.height = 0;
		901
		902	rect.x = x * PANGO_SCALE;
855	rect.y = -h * PANGO_SCALE;	903	rect.y = y * PANGO_SCALE;
856	rect.width = w * PANGO_SCALE;	904	rect.width = w * PANGO_SCALE;
857	rect.height = h * PANGO_SCALE;	905	rect.height = h * PANGO_SCALE;
858		906
859	if (!attrs)	907	if (!attrs)
860	attrs = pango_layout_get_attributes (self->pl);	908	attrs = pango_layout_get_attributes (self->pl);
861		909
862	attr = pango_attr_shape_new (&rect, &rect);	910	attr = pango_attr_shape_new (&inkrect, &rect);
863	attr->start_index = pos - text;	911	attr->start_index = pos - text;
864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;	912	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865	pango_attr_list_insert (attrs, attr);	913	pango_attr_list_insert (attrs, attr);
866		914
		915	arg += 4;
867	pos += sizeof (OBJ_STR) - 1;	916	pos += sizeof (OBJ_STR) - 1;
868	}	917	}
869		918
870	if (attrs)	919	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	920	pango_layout_set_attributes (self->pl, attrs);
872	}	921	}
873		922
874	void	923	void
875	get_shapes (CFClient::Layout self)	924	get_shapes (CFPlus::Layout self)
876	PPCODE:	925	PPCODE:
877	{	926	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	927	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		928
880	do	929	do
…		…
884	if (run && shape_attr_p (run))	933	if (run && shape_attr_p (run))
885	{	934	{
886	PangoRectangle extents;	935	PangoRectangle extents;
887	pango_layout_iter_get_run_extents (iter, 0, &extents);	936	pango_layout_iter_get_run_extents (iter, 0, &extents);
888		937
		938	EXTEND (SP, 2);
889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	939	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	940	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891	}	941	}
892	}	942	}
893	while (pango_layout_iter_next_run (iter));	943	while (pango_layout_iter_next_run (iter));
894		944
895	pango_layout_iter_free (iter);	945	pango_layout_iter_free (iter);
896	}	946	}
897		947
898	int	948	int
899	has_wrapped (CFClient::Layout self)	949	has_wrapped (CFPlus::Layout self)
900	CODE:	950	CODE:
901	{	951	{
902	int lines = 1;	952	int lines = 1;
903	const char *text = pango_layout_get_text (self->pl);	953	const char *text = pango_layout_get_text (self->pl);
904		954
…		…
909	}	959	}
910	OUTPUT:	960	OUTPUT:
911	RETVAL	961	RETVAL
912		962
913	SV *	963	SV *
914	get_text (CFClient::Layout self)	964	get_text (CFPlus::Layout self)
915	CODE:	965	CODE:
916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	966	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917	sv_utf8_decode (RETVAL);	967	sv_utf8_decode (RETVAL);
918	OUTPUT:	968	OUTPUT:
919	RETVAL	969	RETVAL
920		970
921	void	971	void
922	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	972	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
923	CODE:	973	CODE:
924	self->r = r;	974	self->r = r;
925	self->g = g;	975	self->g = g;
926	self->b = b;	976	self->b = b;
927	self->a = a;	977	self->a = a;
928		978
929	void	979	void
930	set_font (CFClient::Layout self, CFClient::Font font = 0)	980	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931	CODE:	981	CODE:
932	if (self->font != font)	982	if (self->font != font)
933	{	983	{
934	self->font = font;	984	self->font = font;
935	layout_update_font (self);	985	layout_update_font (self);
936	}	986	}
937		987
938	void	988	void
939	set_height (CFClient::Layout self, int base_height)	989	set_height (CFPlus::Layout self, int base_height)
940	CODE:	990	CODE:
941	if (self->base_height != base_height)	991	if (self->base_height != base_height)
942	{	992	{
943	self->base_height = base_height;	993	self->base_height = base_height;
944	layout_update_font (self);	994	layout_update_font (self);
945	}	995	}
946		996
947	void	997	void
948	set_width (CFClient::Layout self, int max_width = -1)	998	set_width (CFPlus::Layout self, int max_width = -1)
949	CODE:	999	CODE:
950	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1000	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
951		1001
952	void	1002	void
953	set_indent (CFClient::Layout self, int indent)	1003	set_indent (CFPlus::Layout self, int indent)
954	CODE:	1004	CODE:
955	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1005	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956		1006
957	void	1007	void
958	set_spacing (CFClient::Layout self, int spacing)	1008	set_spacing (CFPlus::Layout self, int spacing)
959	CODE:	1009	CODE:
960	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1010	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961		1011
962	void	1012	void
963	set_ellipsise (CFClient::Layout self, int ellipsise)	1013	set_ellipsise (CFPlus::Layout self, int ellipsise)
964	CODE:	1014	CODE:
965	pango_layout_set_ellipsize (self->pl,	1015	pango_layout_set_ellipsize (self->pl,
966	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1016	ellipsise == 1 ? PANGO_ELLIPSIZE_START
967	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1017	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1018	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
969	: PANGO_ELLIPSIZE_NONE	1019	: PANGO_ELLIPSIZE_NONE
970	);	1020	);
971		1021
972	void	1022	void
973	set_single_paragraph_mode (CFClient::Layout self, int spm)	1023	set_single_paragraph_mode (CFPlus::Layout self, int spm)
974	CODE:	1024	CODE:
975	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1025	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976		1026
977	void	1027	void
978	size (CFClient::Layout self)	1028	size (CFPlus::Layout self)
979	PPCODE:	1029	PPCODE:
980	{	1030	{
981	int w, h;	1031	int w, h;
982		1032
983	layout_get_pixel_size (self, &w, &h);	1033	layout_get_pixel_size (self, &w, &h);
…		…
986	PUSHs (sv_2mortal (newSViv (w)));	1036	PUSHs (sv_2mortal (newSViv (w)));
987	PUSHs (sv_2mortal (newSViv (h)));	1037	PUSHs (sv_2mortal (newSViv (h)));
988	}	1038	}
989		1039
990	int	1040	int
		1041	descent (CFPlus::Layout self)
		1042	CODE:
		1043	{
		1044	PangoRectangle rect;
		1045	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1046	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1047	RETVAL = PANGO_DESCENT (rect);
		1048	}
		1049	OUTPUT:
		1050	RETVAL
		1051
		1052	int
991	xy_to_index (CFClient::Layout self, int x, int y)	1053	xy_to_index (CFPlus::Layout self, int x, int y)
992	CODE:	1054	CODE:
993	{	1055	{
994	int index, trailing;	1056	int index, trailing;
995	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1057	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996	RETVAL = index;	1058	RETVAL = index;
997	}	1059	}
998	OUTPUT:	1060	OUTPUT:
999	RETVAL	1061	RETVAL
1000		1062
1001	void	1063	void
1002	cursor_pos (CFClient::Layout self, int index)	1064	cursor_pos (CFPlus::Layout self, int index)
1003	PPCODE:	1065	PPCODE:
1004	{	1066	{
1005	PangoRectangle strong_pos;	1067	PangoRectangle strong_pos;
1006	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1068	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007		1069
…		…
1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1073	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012	}	1074	}
1013		1075
1014	void	1076	void
1015	render (CFClient::Layout self)	1077	render (CFPlus::Layout self, float x, float y, int flags = 0)
1016	PPCODE:	1078	PPCODE:
1017	{	1079	pango_opengl_render_layout_subpixel (
1018	SV *retval;	1080	self->pl,
1019	int w, h;	1081	x * PANGO_SCALE, y * PANGO_SCALE,
1020		1082	self->r, self->g, self->b, self->a,
1021	layout_get_pixel_size (self, &w, &h);
1022
1023	if (self->rgba)
1024	{	1083	flags
1025	cairo_surface_t *surface;
1026	cairo_t *cairo;
1027
1028	retval = newSV (w * h * 4);
1029	SvPOK_only (retval);
1030	SvCUR_set (retval, w * h * 4);
1031
1032	memset (SvPVX (retval), 0, w * h * 4);
1033
1034	surface = cairo_image_surface_create_for_data (
1035	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
1036	cairo = cairo_create (surface);
1037	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1038
1039	pango_cairo_show_layout (cairo, self->pl);
1040
1041	cairo_destroy (cairo);
1042	cairo_surface_destroy (surface);
1043
1044	// what a mess, and its premultiplied, too :(
1045	{
1046	uint32_t p = (uint32_t )SvPVX (retval);
1047	uint32_t e = p + w h;
1048
1049	while (p < e)
1050	{
1051	uint32_t rgba = *p;
1052	rgba = (rgba >> 24) \| (rgba << 8);
1053	#if 0
1054	#ifdef _WIN32
1055	{//D
1056	uint8_t r = rgba >> 24;
1057	uint8_t g = rgba >> 16;
1058	uint8_t b = rgba >> 8;
1059	uint8_t a = rgba >> 0;
1060
1061	rgba = (rgba & 0xffffff00) \| a;
1062	}
1063	#endif
1064	#endif
1065	rgba = SDL_SwapBE32 (rgba);
1066	*p++ = rgba;
1067	}
1068	}
1069
1070	EXTEND (SP, 5);
1071	PUSHs (sv_2mortal (newSViv (w)));
1072	PUSHs (sv_2mortal (newSViv (h)));
1073	PUSHs (sv_2mortal (retval));
1074	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1075	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076	}	1084	);
1077	else
1078	{
1079	FT_Bitmap bitmap;
1080		1085
1081	retval = newSV (w * h);
1082	SvPOK_only (retval);
1083	SvCUR_set (retval, w * h);
1084
1085	bitmap.rows = h;
1086	bitmap.width = w;
1087	bitmap.pitch = w;
1088	bitmap.buffer = (unsigned char*)SvPVX (retval);
1089	bitmap.num_grays = 256;
1090	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1091
1092	memset (bitmap.buffer, 0, w * h);
1093
1094	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1095
1096	EXTEND (SP, 5);
1097	PUSHs (sv_2mortal (newSViv (w)));
1098	PUSHs (sv_2mortal (newSViv (h)));
1099	PUSHs (sv_2mortal (retval));
1100	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1101	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1102	}
1103	}
1104
1105	MODULE = CFClient PACKAGE = CFClient::Texture	1086	MODULE = CFPlus PACKAGE = CFPlus::Texture
1106		1087
1107	void	1088	void
1108	pad2pot (SV data_, SV w_, SV *h_)	1089	pad2pot (SV data_, SV w_, SV *h_)
1109	CODE:	1090	CODE:
1110	{	1091	{
…		…
1188	glDisable (GL_ALPHA_TEST);	1169	glDisable (GL_ALPHA_TEST);
1189	glDisable (GL_BLEND);	1170	glDisable (GL_BLEND);
1190	}	1171	}
1191	}	1172	}
1192		1173
1193	MODULE = CFClient PACKAGE = CFClient::Map	1174	MODULE = CFPlus PACKAGE = CFPlus::Map
1194		1175
1195	CFClient::Map	1176	CFPlus::Map
1196	new (SV *class, int map_width, int map_height)	1177	new (SV *class, int map_width, int map_height)
1197	CODE:	1178	CODE:
1198	New (0, RETVAL, 1, struct map);	1179	New (0, RETVAL, 1, struct map);
1199	RETVAL->x = 0;	1180	RETVAL->x = 0;
1200	RETVAL->y = 0;	1181	RETVAL->y = 0;
…		…
1210	RETVAL->row = 0;	1191	RETVAL->row = 0;
1211	OUTPUT:	1192	OUTPUT:
1212	RETVAL	1193	RETVAL
1213		1194
1214	void	1195	void
1215	DESTROY (CFClient::Map self)	1196	DESTROY (CFPlus::Map self)
1216	CODE:	1197	CODE:
1217	{	1198	{
1218	map_clear (self);	1199	map_clear (self);
1219	Safefree (self->face);	1200	Safefree (self->face);
1220	Safefree (self->tex);	1201	Safefree (self->tex);
1221	Safefree (self);	1202	Safefree (self);
1222	}	1203	}
1223		1204
1224	void	1205	void
1225	clear (CFClient::Map self)	1206	clear (CFPlus::Map self)
1226	CODE:	1207	CODE:
1227	map_clear (self);	1208	map_clear (self);
1228		1209
1229	void	1210	void
1230	set_face (CFClient::Map self, int face, int texid)	1211	set_face (CFPlus::Map self, int face, int texid)
1231	CODE:	1212	CODE:
1232	{	1213	{
1233	while (self->faces <= face)	1214	while (self->faces <= face)
1234	{	1215	{
1235	Append (mapface, self->face, self->faces, self->faces);	1216	Append (mapface, self->face, self->faces, self->faces);
…		…
1238		1219
1239	self->face [face] = texid;	1220	self->face [face] = texid;
1240	}	1221	}
1241		1222
1242	void	1223	void
1243	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)	1224	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)
1244	CODE:	1225	CODE:
1245	{	1226	{
1246	while (self->texs <= texid)	1227	while (self->texs <= texid)
1247	{	1228	{
1248	Append (maptex, self->tex, self->texs, self->texs);	1229	Append (maptex, self->tex, self->texs, self->texs);
…		…
1272	// from transparent color bleeding and ugly wrapping effects.	1253	// from transparent color bleeding and ugly wrapping effects.
1273	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1254	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274	}	1255	}
1275		1256
1276	int	1257	int
1277	ox (CFClient::Map self)	1258	ox (CFPlus::Map self)
1278	ALIAS:	1259	ALIAS:
1279	oy = 1	1260	oy = 1
1280	x = 2	1261	x = 2
1281	y = 3	1262	y = 3
1282	w = 4	1263	w = 4
…		…
1293	}	1274	}
1294	OUTPUT:	1275	OUTPUT:
1295	RETVAL	1276	RETVAL
1296		1277
1297	void	1278	void
1298	scroll (CFClient::Map self, int dx, int dy)	1279	scroll (CFPlus::Map self, int dx, int dy)
1299	CODE:	1280	CODE:
1300	{	1281	{
1301	if (dx > 0)	1282	if (dx > 0)
1302	map_blank (self, self->x, self->y, dx - 1, self->h);	1283	map_blank (self, self->x, self->y, dx, self->h);
1303	else if (dx < 0)	1284	else if (dx < 0)
1304	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1285	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1305		1286
1306	if (dy > 0)	1287	if (dy > 0)
1307	map_blank (self, self->x, self->y, self->w, dy - 1);	1288	map_blank (self, self->x, self->y, self->w, dy);
1308	else if (dy < 0)	1289	else if (dy < 0)
1309	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1290	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1310		1291
1311	self->ox += dx; self->x += dx;	1292	self->ox += dx; self->x += dx;
1312	self->oy += dy; self->y += dy;	1293	self->oy += dy; self->y += dy;
1313		1294
1314	while (self->y < 0)	1295	while (self->y < 0)
…		…
1319	self->y += MAP_EXTEND_Y;	1300	self->y += MAP_EXTEND_Y;
1320	}	1301	}
1321	}	1302	}
1322		1303
1323	void	1304	void
1324	map1a_update (CFClient::Map self, SV *data_)	1305	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1325	CODE:	1306	CODE:
1326	{	1307	{
1327	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1308	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1328	uint8_t data_end = (uint8_t )SvEND (data_);	1309	uint8_t data_end = (uint8_t )SvEND (data_);
1329	mapcell *cell;	1310	mapcell *cell;
1330	int x, y, flags;	1311	int x, y, flags;
1331		1312
1332	while (data < data_end)	1313	while (data < data_end - 1)
1333	{	1314	{
1334	flags = (data [0] << 8) + data [1]; data += 2;	1315	flags = (data [0] << 8) + data [1]; data += 2;
1335		1316
1336	x = self->x + ((flags >> 10) & 63);	1317	x = self->x + ((flags >> 10) & 63);
1337	y = self->y + ((flags >> 4) & 63);	1318	y = self->y + ((flags >> 4) & 63);
1338		1319
1339	cell = map_get_cell (self, x, y);	1320	cell = map_get_cell (self, x, y);
1340		1321
1341	if (flags & 15)	1322	if (flags & 15)
1342	{	1323	{
1343	if (cell->darkness < 0)	1324	if (!cell->darkness)
1344	{	1325	{
		1326	memset (cell, 0, sizeof (*cell));
1345	cell->darkness = 0;	1327	cell->darkness = 256;
1346	cell->face [0] = 0;
1347	cell->face [1] = 0;
1348	cell->face [2] = 0;
1349	}	1328	}
1350		1329
1351	cell->darkness = flags & 8 ? *data++ : 255;
1352
1353	//TODO: don't trust server data to be in-range(!)	1330	//TODO: don't trust server data to be in-range(!)
		1331
		1332	if (flags & 8)
		1333	{
		1334	if (extmap)
		1335	{
		1336	uint8_t ext, cmd;
		1337
		1338	do
		1339	{
		1340	ext = *data++;
		1341	cmd = ext & 0x3f;
		1342
		1343	if (cmd < 4)
		1344	cell->darkness = 255 - ext * 64 + 1;
		1345	else if (cmd == 5) // health
		1346	{
		1347	cell->stat_width = 1;
		1348	cell->stat_hp = *data++;
		1349	}
		1350	else if (cmd == 6) // monster width
		1351	cell->stat_width = *data++ + 1;
		1352	else if (cmd == 0x47) // monster width
		1353	{
		1354	if (*data == 4)
		1355	; // decode player tag
		1356
		1357	data += *data + 1;
		1358	}
		1359	else if (cmd == 8) // cell flags
		1360	cell->flags = *data++;
		1361	else if (ext & 0x40) // unknown, multibyte => skip
		1362	data += *data + 1;
		1363	else
		1364	data++;
		1365	}
		1366	while (ext & 0x80);
		1367	}
		1368	else
		1369	cell->darkness = *data++ + 1;
		1370	}
1354		1371
1355	if (flags & 4)	1372	if (flags & 4)
1356	{	1373	{
1357	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1374	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1358	}	1375	}
…		…
1366	{	1383	{
1367	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1384	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1368	}	1385	}
1369	}	1386	}
1370	else	1387	else
1371	cell->darkness = -1;	1388	cell->darkness = 0;
1372	}	1389	}
1373	}	1390	}
1374		1391
1375	SV *	1392	SV *
1376	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1393	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377	CODE:	1394	CODE:
1378	{	1395	{
1379	int x1, x;	1396	int x1, x;
1380	int y1, y;	1397	int y1, y;
1381	int z;	1398	int z;
…		…
1431	}	1448	}
1432	OUTPUT:	1449	OUTPUT:
1433	RETVAL	1450	RETVAL
1434		1451
1435	void	1452	void
1436	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1453	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1437	CODE:	1454	CODE:
1438	{	1455	{
1439	int vx, vy;	1456	int vx, vy;
1440	int x, y, z;	1457	int x, y, z;
1441	int last_name;	1458	int last_name;
…		…
1476	{	1493	{
1477	mapcell *cell = row->col + (x + vx - row->c0);	1494	mapcell *cell = row->col + (x + vx - row->c0);
1478		1495
1479	face = cell->face [z];	1496	face = cell->face [z];
1480		1497
1481	if (face)	1498	if (face && face < self->texs)
1482	{	1499	{
1483	maptex tex = self->tex [face];	1500	maptex tex = self->tex [face];
1484
1485	int px = (x + 1) * 32 - tex.w;	1501	int px = (x + 1) * 32 - tex.w;
1486	int py = (y + 1) * 32 - tex.h;	1502	int py = (y + 1) * 32 - tex.h;
1487		1503
1488	if (last_name != tex.name)	1504	if (last_name != tex.name)
1489	{	1505	{
1490	glEnd ();	1506	glEnd ();
1491	last_name = tex.name;
1492	glBindTexture (GL_TEXTURE_2D, last_name);	1507	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1493	glBegin (GL_QUADS);	1508	glBegin (GL_QUADS);
1494	}	1509	}
1495		1510
1496	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1511	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1497	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1512	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1498	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1513	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1499	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1514	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1500	}	1515	}
		1516
		1517	if (cell->flags && z == 2)
		1518	{
		1519	if (cell->flags & 1)
		1520	{
		1521	maptex tex = self->tex [1];
		1522	int px = (x + 1) * 32 - tex.w + 2;
		1523	int py = (y + 1) * 32 - tex.h - 6;
		1524
		1525	glEnd ();
		1526	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1527	glBegin (GL_QUADS);
		1528
		1529	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1530	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1531	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1532	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1533	}
		1534	}
1501	}	1535	}
1502	}	1536	}
1503		1537
1504	glEnd ();	1538	glEnd ();
1505		1539
1506	glDisable (GL_TEXTURE_2D);	1540	glDisable (GL_TEXTURE_2D);
1507	glDisable (GL_BLEND);	1541	glDisable (GL_BLEND);
1508	}
1509		1542
		1543	// top layer: overlays such as the health bar
		1544	for (y = 0; y < sh; y++)
		1545	if (0 <= y + vy && y + vy < self->rows)
		1546	{
		1547	maprow *row = self->row + (y + vy);
		1548
		1549	for (x = 0; x < sw; x++)
		1550	if (row->c0 <= x + vx && x + vx < row->c1)
		1551	{
		1552	mapcell *cell = row->col + (x + vx - row->c0);
		1553
		1554	int px = x * 32;
		1555	int py = y * 32;
		1556
		1557	if (cell->stat_hp)
		1558	{
		1559	int width = cell->stat_width * 32;
		1560	int thick = sh / 28 + 1 + cell->stat_width;
		1561
		1562	glColor3ub (0, 0, 0);
		1563	glRectf (px + 1, py - thick - 2,
		1564	px + width - 1, py);
		1565
		1566	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1567	glRectf (px + 2,
		1568	py - thick - 1,
		1569	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1570	}
		1571	}
		1572	}
		1573	}
		1574
1510	void	1575	void
1511	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1576	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512	CODE:	1577	CODE:
1513	{	1578	{
1514	static float color[16][3] = {	1579	static float color[16][3] = {
1515	{ 0.00, 0.00, 0.00 },	1580	{ 0.00F, 0.00F, 0.00F },
1516	{ 1.00, 1.00, 1.00 },	1581	{ 1.00F, 1.00F, 1.00F },
1517	{ 0.00, 0.00, 0.55 },	1582	{ 0.00F, 0.00F, 0.55F },
1518	{ 1.00, 0.00, 0.00 },	1583	{ 1.00F, 0.00F, 0.00F },
1519		1584
1520	{ 1.00, 0.54, 0.00 },	1585	{ 1.00F, 0.54F, 0.00F },
1521	{ 0.11, 0.56, 1.00 },	1586	{ 0.11F, 0.56F, 1.00F },
1522	{ 0.93, 0.46, 0.00 },	1587	{ 0.93F, 0.46F, 0.00F },
1523	{ 0.18, 0.54, 0.34 },	1588	{ 0.18F, 0.54F, 0.34F },
1524		1589
1525	{ 0.56, 0.73, 0.56 },	1590	{ 0.56F, 0.73F, 0.56F },
1526	{ 0.80, 0.80, 0.80 },	1591	{ 0.80F, 0.80F, 0.80F },
1527	{ 0.55, 0.41, 0.13 },	1592	{ 0.55F, 0.41F, 0.13F },
1528	{ 0.99, 0.77, 0.26 },	1593	{ 0.99F, 0.77F, 0.26F },
1529		1594
1530	{ 0.74, 0.65, 0.41 },	1595	{ 0.74F, 0.65F, 0.41F },
1531		1596
1532	{ 0.00, 1.00, 1.00 },	1597	{ 0.00F, 1.00F, 1.00F },
1533	{ 1.00, 0.00, 1.00 },	1598	{ 1.00F, 0.00F, 1.00F },
1534	{ 1.00, 1.00, 0.00 },	1599	{ 1.00F, 1.00F, 0.00F },
1535	};	1600	};
1536		1601
1537	int x, y;	1602	int x, y;
1538		1603
1539	glEnable (GL_TEXTURE_2D);	1604	glEnable (GL_TEXTURE_2D);
…		…
1566	glDisable (GL_BLEND);	1631	glDisable (GL_BLEND);
1567	glDisable (GL_TEXTURE_2D);	1632	glDisable (GL_TEXTURE_2D);
1568	}	1633	}
1569		1634
1570	void	1635	void
1571	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1636	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1572	PPCODE:	1637	PPCODE:
1573	{	1638	{
1574	int vx, vy;	1639	int vx, vy;
1575	int x, y;	1640	int x, y;
1576	int sw4 = (sw + 3) & ~3;	1641	int sw4 = (sw + 3) & ~3;
…		…
1592	for (x = 0; x < sw; x++)	1657	for (x = 0; x < sw; x++)
1593	if (row->c0 <= x + vx && x + vx < row->c1)	1658	if (row->c0 <= x + vx && x + vx < row->c1)
1594	{	1659	{
1595	mapcell *cell = row->col + (x + vx - row->c0);	1660	mapcell *cell = row->col + (x + vx - row->c0);
1596		1661
1597	darkness[y * sw4 + x] = cell->darkness < 0	1662	darkness[y * sw4 + x] = cell->darkness
		1663	? 255 - (cell->darkness - 1)
1598	? 255 - FOW_DARKNESS	1664	: 255 - FOW_DARKNESS;
1599	: 255 - cell->darkness;
1600	}	1665	}
1601	}	1666	}
1602		1667
1603	EXTEND (SP, 3);	1668	EXTEND (SP, 3);
1604	PUSHs (sv_2mortal (newSViv (sw4)));	1669	PUSHs (sv_2mortal (newSViv (sw4)));
1605	PUSHs (sv_2mortal (newSViv (sh)));	1670	PUSHs (sv_2mortal (newSViv (sh)));
1606	PUSHs (darkness_sv);	1671	PUSHs (darkness_sv);
1607	}	1672	}
1608		1673
1609	SV *	1674	SV *
1610	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1675	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1611	CODE:	1676	CODE:
1612	{	1677	{
1613	int x, y, x1, y1;	1678	int x, y, x1, y1;
1614	SV data_sv = newSV (w h * 7 + 5);	1679	SV data_sv = newSV (w h * 7 + 5);
1615	uint8_t data = (uint8_t )SvPVX (data_sv);	1680	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1677	}	1742	}
1678	OUTPUT:	1743	OUTPUT:
1679	RETVAL	1744	RETVAL
1680		1745
1681	void	1746	void
1682	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1747	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683	PPCODE:	1748	PPCODE:
1684	{	1749	{
1685	int x, y, z;	1750	int x, y, z;
1686	int w, h;	1751	int w, h;
1687	int x1, y1;	1752	int x1, y1;
…		…
1719		1784
1720	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1785	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1721	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1786	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1722	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1787	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1723		1788
1724	if (cell->darkness <= 0)	1789	if (cell->darkness == 0)
1725	{	1790	{
1726	cell->darkness = -1;	1791	cell->darkness = 0;
1727		1792
1728	for (z = 0; z <= 2; z++)	1793	for (z = 0; z <= 2; z++)
1729	{	1794	{
1730	cell->face[z] = face[z];	1795	cell->face[z] = face[z];
1731		1796
…		…
1736	}	1801	}
1737	}	1802	}
1738	}	1803	}
1739	}	1804	}
1740		1805
1741	MODULE = CFClient PACKAGE = CFClient::MixChunk	1806	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742		1807
1743	CFClient::MixChunk	1808	CFPlus::MixChunk
1744	new_from_file (SV class, char path)	1809	new_from_file (SV class, char path)
1745	CODE:	1810	CODE:
1746	RETVAL = Mix_LoadWAV (path);	1811	RETVAL = Mix_LoadWAV (path);
1747	OUTPUT:	1812	OUTPUT:
1748	RETVAL	1813	RETVAL
1749		1814
1750	void	1815	void
1751	DESTROY (CFClient::MixChunk self)	1816	DESTROY (CFPlus::MixChunk self)
1752	CODE:	1817	CODE:
1753	Mix_FreeChunk (self);	1818	Mix_FreeChunk (self);
1754		1819
1755	int	1820	int
1756	volume (CFClient::MixChunk self, int volume = -1)	1821	volume (CFPlus::MixChunk self, int volume = -1)
1757	CODE:	1822	CODE:
1758	RETVAL = Mix_VolumeChunk (self, volume);	1823	RETVAL = Mix_VolumeChunk (self, volume);
1759	OUTPUT:	1824	OUTPUT:
1760	RETVAL	1825	RETVAL
1761		1826
1762	int	1827	int
1763	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1828	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1764	CODE:	1829	CODE:
1765	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1830	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766	OUTPUT:	1831	OUTPUT:
1767	RETVAL	1832	RETVAL
1768		1833
1769	MODULE = CFClient PACKAGE = CFClient::MixMusic	1834	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770		1835
1771	int	1836	int
1772	volume (int volume = -1)	1837	volume (int volume = -1)
1773	CODE:	1838	CODE:
1774	RETVAL = Mix_VolumeMusic (volume);	1839	RETVAL = Mix_VolumeMusic (volume);
1775	OUTPUT:	1840	OUTPUT:
1776	RETVAL	1841	RETVAL
1777		1842
1778	CFClient::MixMusic	1843	CFPlus::MixMusic
1779	new_from_file (SV class, char path)	1844	new_from_file (SV class, char path)
1780	CODE:	1845	CODE:
1781	RETVAL = Mix_LoadMUS (path);	1846	RETVAL = Mix_LoadMUS (path);
1782	OUTPUT:	1847	OUTPUT:
1783	RETVAL	1848	RETVAL
1784		1849
1785	void	1850	void
1786	DESTROY (CFClient::MixMusic self)	1851	DESTROY (CFPlus::MixMusic self)
1787	CODE:	1852	CODE:
1788	Mix_FreeMusic (self);	1853	Mix_FreeMusic (self);
1789		1854
1790	int	1855	int
1791	play (CFClient::MixMusic self, int loops = -1)	1856	play (CFPlus::MixMusic self, int loops = -1)
1792	CODE:	1857	CODE:
1793	RETVAL = Mix_PlayMusic (self, loops);	1858	RETVAL = Mix_PlayMusic (self, loops);
1794	OUTPUT:	1859	OUTPUT:
1795	RETVAL	1860	RETVAL
1796		1861
1797	MODULE = CFClient PACKAGE = CFClient::OpenGL	1862	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798		1863
1799	BOOT:	1864	BOOT:
1800	{	1865	{
1801	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1866	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802	static const struct {	1867	static const struct {
1803	const char *name;	1868	const char *name;
1804	IV iv;	1869	IV iv;
1805	} *civ, const_iv[] = {	1870	} *civ, const_iv[] = {
1806	# define const_iv(name) { # name, (IV)name }	1871	# define const_iv(name) { # name, (IV)name }
…		…
1869	const_iv (GL_SEPARABLE_2D),	1934	const_iv (GL_SEPARABLE_2D),
1870	const_iv (GL_CONVOLUTION_2D),	1935	const_iv (GL_CONVOLUTION_2D),
1871	const_iv (GL_CONVOLUTION_BORDER_MODE),	1936	const_iv (GL_CONVOLUTION_BORDER_MODE),
1872	const_iv (GL_CONSTANT_BORDER),	1937	const_iv (GL_CONSTANT_BORDER),
1873	const_iv (GL_LINES),	1938	const_iv (GL_LINES),
		1939	const_iv (GL_LINE_STRIP),
1874	const_iv (GL_LINE_LOOP),	1940	const_iv (GL_LINE_LOOP),
1875	const_iv (GL_QUADS),	1941	const_iv (GL_QUADS),
1876	const_iv (GL_QUAD_STRIP),	1942	const_iv (GL_QUAD_STRIP),
1877	const_iv (GL_TRIANGLES),	1943	const_iv (GL_TRIANGLES),
1878	const_iv (GL_TRIANGLE_STRIP),	1944	const_iv (GL_TRIANGLE_STRIP),
…		…
1988	r *= a;	2054	r *= a;
1989	g *= a;	2055	g *= a;
1990	b *= a;	2056	b *= a;
1991	}	2057	}
1992	// microsoft visual "c" rounds instead of truncating...	2058	// microsoft visual "c" rounds instead of truncating...
1993	glColor4ub (MIN ((int)(r * 256.f), 255),	2059	glColor4f (r, g, b, a);
1994	MIN ((int)(g * 256.f), 255),
1995	MIN ((int)(b * 256.f), 255),
1996	MIN ((int)(a * 256.f), 255));
1997		2060
1998	void glInterleavedArrays (int format, int stride, char *data)	2061	void glInterleavedArrays (int format, int stride, char *data)
1999		2062
2000	void glDrawElements (int mode, int count, int type, char *indices)	2063	void glDrawElements (int mode, int count, int type, char *indices)
2001		2064
…		…
2078		2141
2079	void glEndList ()	2142	void glEndList ()
2080		2143
2081	void glCallList (int list)	2144	void glCallList (int list)
2082		2145
2083

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs. Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC