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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.105 by root, Mon Jun 5 03:33:09 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#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
52		64
53	static struct	65	static struct
54	{	66	{
55	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	68	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	78	else
67	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
68	}	80	}
69		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
70	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
72		90
73	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	}
74		110
75	typedef struct cf_layout {	111	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
79	int base_height;	114	int base_height;
80	CFClient__Font font;	115	CFPlus__Font font;
81	} *CFClient__Layout;	116	} *CFPlus__Layout;
82		117
83	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
84	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
85	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
86		121
87	static void	122	static void
88	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
89	{	124	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
		126	#ifdef FC_HINT_STYLE
91	//FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	}	130	}
94		131
95	static void	132	static void
96	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
97	{	134	{
98	/* 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
99	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
100	*/	137	*/
101	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
105		142
106	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
107	}	144	}
108		145
109	static void	146	static void
110	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
111	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
112	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
113		153
114	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
115	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
116		156
117	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
118	}	162	}
119		163
120	typedef uint16_t mapface;	164	typedef uint16_t mapface;
121		165
122	typedef struct {	166	typedef struct {
…		…
145	int texs;	189	int texs;
146	maptex *tex;	190	maptex *tex;
147		191
148	int32_t rows;	192	int32_t rows;
149	maprow *row;	193	maprow *row;
150	} *CFClient__Map;	194	} *CFPlus__Map;
151		195
152	static char *	196	static char *
153	prepend (char *ptr, int sze, int inc)	197	prepend (char *ptr, int sze, int inc)
154	{	198	{
155	char *p;	199	char *p;
…		…
173		217
174	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	218	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
175	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176		220
177	static maprow *	221	static maprow *
178	map_get_row (CFClient__Map self, int y)	222	map_get_row (CFPlus__Map self, int y)
179	{	223	{
180	if (0 > y)	224	if (0 > y)
181	{	225	{
182	int extend = - y + MAP_EXTEND_Y;	226	int extend = - y + MAP_EXTEND_Y;
183	Prepend (maprow, self->row, self->rows, extend);	227	Prepend (maprow, self->row, self->rows, extend);
…		…
221		265
222	return row->col + (x - row->c0);	266	return row->col + (x - row->c0);
223	}	267	}
224		268
225	static mapcell *	269	static mapcell *
226	map_get_cell (CFClient__Map self, int x, int y)	270	map_get_cell (CFPlus__Map self, int x, int y)
227	{	271	{
228	return row_get_cell (map_get_row (self, y), x);	272	return row_get_cell (map_get_row (self, y), x);
229	}	273	}
230		274
231	static void	275	static void
232	map_clear (CFClient__Map self)	276	map_clear (CFPlus__Map self)
233	{	277	{
234	int r;	278	int r;
235		279
236	for (r = 0; r < self->rows; r++)	280	for (r = 0; r < self->rows; r++)
237	Safefree (self->row[r].col);	281	Safefree (self->row[r].col);
…		…
245	self->row = 0;	289	self->row = 0;
246	self->rows = 0;	290	self->rows = 0;
247	}	291	}
248		292
249	static void	293	static void
250	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	294	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
251	{	295	{
252	int x, y;	296	int x, y;
253	maprow *row;	297	maprow *row;
254		298
255	for (y = y0; y < y0 + h; y++)	299	for (y = y0; y < y0 + h; y++)
…		…
295	ev.data2 = 0;	339	ev.data2 = 0;
296		340
297	SDL_PushEvent ((SDL_Event *)&ev);	341	SDL_PushEvent ((SDL_Event *)&ev);
298	}	342	}
299		343
		344	static unsigned int
		345	minpot (unsigned int n)
		346	{
		347	if (!n)
		348	return 0;
		349
		350	--n;
		351
		352	n \|= n >> 1;
		353	n \|= n >> 2;
		354	n \|= n >> 4;
		355	n \|= n >> 8;
		356	n \|= n >> 16;
		357
		358	return n + 1;
		359	}
		360
300	MODULE = CFClient PACKAGE = CFClient	361	MODULE = CFPlus PACKAGE = CFPlus
301		362
302	PROTOTYPES: ENABLE	363	PROTOTYPES: ENABLE
303		364
304	BOOT:	365	BOOT:
305	{	366	{
306	HV *stash = gv_stashpv ("CFClient", 1);	367	HV *stash = gv_stashpv ("CFPlus", 1);
307	static const struct {	368	static const struct {
308	const char *name;	369	const char *name;
309	IV iv;	370	IV iv;
310	} *civ, const_iv[] = {	371	} *civ, const_iv[] = {
311	# define const_iv(name) { # name, (IV)name }	372	# define const_iv(name) { # name, (IV)name }
…		…
412		473
413	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	474	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
414	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	475	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
415	}	476	}
416		477
		478	int
		479	in_destruct ()
		480	CODE:
		481	RETVAL = PL_main_cv == Nullcv;
		482	OUTPUT:
		483	RETVAL
		484
		485	NV floor (NV x)
		486
		487	NV ceil (NV x)
		488
417	void	489	void
418	pango_init ()	490	pango_init ()
419	CODE:	491	CODE:
420	// delayed, so it can pick up new fonts added by AddFontResourceEx
421	{	492	{
422	{
423	ft2_fontmap = pango_ft2_font_map_new ();	493	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	494	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	495	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426	}
427
428	{
429	cairo_font_options_t *fopt = cairo_font_options_create ();
430	cairo_fontmap = pango_cairo_font_map_get_default ();
431	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435	pango_cairo_context_set_font_options (cairo_context, fopt);
436	cairo_font_options_destroy (fopt);
437	}
438	}	496	}
439		497
440	int	498	int
441	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	499	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
442		500
443	void	501	void
444	SDL_Quit ()	502	SDL_Quit ()
445		503
446	void	504	void
…		…
453	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	513	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456		514
457	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	515	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	516	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459		517
460	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	518	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464		522
465	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	523	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		524	#if SDL_VERSION_ATLEAST(1,2,10)
		525	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		526	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		527	#endif
466		528
467	SDL_EnableUNICODE (1);	529	SDL_EnableUNICODE (1);
468	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	530	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469		531
470	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	532	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
557	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	619	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	620	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559	break;	621	break;
560	}	622	}
561		623
562	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	624	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563	}	625	}
564	}	626	}
565		627
566	int	628	int
567	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	629	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
583	#endif	645	#endif
584		646
585	void	647	void
586	add_font (char *file)	648	add_font (char *file)
587	CODE:	649	CODE:
588	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	650	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589	#ifdef _WIN32
590	// cairo... sigh... requires win2000
591	AddFontResourceEx (file, FR_PRIVATE, 0);
592	#endif
593		651
594	void	652	void
595	load_image_inline (SV *image_)	653	load_image_inline (SV *image_)
596	ALIAS:	654	ALIAS:
597	load_image_file = 1	655	load_image_file = 1
…		…
639		697
640	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	698	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641		699
642	assert (surface2->pitch == surface2->w * 4);	700	assert (surface2->pitch == surface2->w * 4);
643		701
		702	SDL_LockSurface (surface2);
644	EXTEND (SP, 5);	703	EXTEND (SP, 6);
645	PUSHs (sv_2mortal (newSViv (surface2->w)));	704	PUSHs (sv_2mortal (newSViv (surface2->w)));
646	PUSHs (sv_2mortal (newSViv (surface2->h)));	705	PUSHs (sv_2mortal (newSViv (surface2->h)));
647	SDL_LockSurface (surface2);
648	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	706	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
649	SDL_UnlockSurface (surface2);
650	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	707	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
651	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	708	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	709	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		710	SDL_UnlockSurface (surface2);
653		711
654	SDL_FreeSurface (surface);	712	SDL_FreeSurface (surface);
655	SDL_FreeSurface (surface2);	713	SDL_FreeSurface (surface2);
656	}	714	}
657		715
…		…
693	CODE:	751	CODE:
694	fprintf (stderr, "FATAL: %s\n", message);	752	fprintf (stderr, "FATAL: %s\n", message);
695	#ifdef _WIN32	753	#ifdef _WIN32
696	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	754	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
697	#endif	755	#endif
698	exit (1);	756	_exit (1);
699		757
		758	void
		759	_exit (int retval)
		760	CODE:
		761	_exit (retval);
		762
700	MODULE = CFClient PACKAGE = CFClient::Font	763	MODULE = CFPlus PACKAGE = CFPlus::Font
701		764
702	CFClient::Font	765	CFPlus::Font
703	new_from_file (SV class, char path, int id = 0)	766	new_from_file (SV class, char path, int id = 0)
704	CODE:	767	CODE:
705	{	768	{
706	int count;	769	int count;
707	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	770	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
710	}	773	}
711	OUTPUT:	774	OUTPUT:
712	RETVAL	775	RETVAL
713		776
714	void	777	void
715	DESTROY (CFClient::Font self)	778	DESTROY (CFPlus::Font self)
716	CODE:	779	CODE:
717	pango_font_description_free (self);	780	pango_font_description_free (self);
718		781
719	void	782	void
720	make_default (CFClient::Font self)	783	make_default (CFPlus::Font self)
721	CODE:	784	CODE:
722	default_font = self;	785	default_font = self;
723		786
724	MODULE = CFClient PACKAGE = CFClient::Layout	787	MODULE = CFPlus PACKAGE = CFPlus::Layout
725		788
726	CFClient::Layout	789	void
727	new (SV *class, int rgba = 0)	790	reset_glyph_cache ()
728	CODE:	791	CODE:
729	#if _WIN32	792	tc_clear ();
730	//rgba = 0;//D makes text nicer, breaks TextView	793
731	#endif	794	CFPlus::Layout
732	rgba=1;//D	795	new (SV *class)
		796	CODE:
733	New (0, RETVAL, 1, struct cf_layout);	797	New (0, RETVAL, 1, struct cf_layout);
734		798
735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	799	RETVAL->pl = pango_layout_new (opengl_context);
736	RETVAL->rgba = rgba;
737	RETVAL->r = 1.;	800	RETVAL->r = 1.;
738	RETVAL->g = 1.;	801	RETVAL->g = 1.;
739	RETVAL->b = 1.;	802	RETVAL->b = 1.;
740	RETVAL->a = 1.;	803	RETVAL->a = 1.;
741	RETVAL->base_height = MIN_FONT_HEIGHT;	804	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
745	layout_update_font (RETVAL);	808	layout_update_font (RETVAL);
746	OUTPUT:	809	OUTPUT:
747	RETVAL	810	RETVAL
748		811
749	void	812	void
750	DESTROY (CFClient::Layout self)	813	DESTROY (CFPlus::Layout self)
751	CODE:	814	CODE:
752	g_object_unref (self->pl);	815	g_object_unref (self->pl);
753	Safefree (self);	816	Safefree (self);
754		817
755	int
756	is_rgba (CFClient::Layout self)
757	CODE:
758	RETVAL = self->rgba;
759	OUTPUT:
760	RETVAL
761
762	void	818	void
763	set_text (CFClient::Layout self, SV *text_)	819	set_text (CFPlus::Layout self, SV *text_)
764	CODE:	820	CODE:
765	{	821	{
766	STRLEN textlen;	822	STRLEN textlen;
767	char *text = SvPVutf8 (text_, textlen);	823	char *text = SvPVutf8 (text_, textlen);
768		824
769	pango_layout_set_text (self->pl, text, textlen);	825	pango_layout_set_text (self->pl, text, textlen);
770	}	826	}
771		827
772	void	828	void
773	set_markup (CFClient::Layout self, SV *text_)	829	set_markup (CFPlus::Layout self, SV *text_)
774	CODE:	830	CODE:
775	{	831	{
776	STRLEN textlen;	832	STRLEN textlen;
777	char *text = SvPVutf8 (text_, textlen);	833	char *text = SvPVutf8 (text_, textlen);
778		834
779	pango_layout_set_markup (self->pl, text, textlen);	835	pango_layout_set_markup (self->pl, text, textlen);
780	}	836	}
781		837
		838	void
		839	set_shapes (CFPlus::Layout self, ...)
		840	CODE:
		841	{
		842	PangoAttrList *attrs = 0;
		843	const char *text = pango_layout_get_text (self->pl);
		844	const char *pos = text;
		845	int arg = 4;
		846
		847	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		848	{
		849	PangoRectangle inkrect, rect;
		850	PangoAttribute *attr;
		851
		852	int x = SvIV (ST (arg - 3));
		853	int y = SvIV (ST (arg - 2));
		854	int w = SvIV (ST (arg - 1));
		855	int h = SvIV (ST (arg ));
		856
		857	inkrect.x = 0;
		858	inkrect.y = 0;
		859	inkrect.width = 0;
		860	inkrect.height = 0;
		861
		862	rect.x = x * PANGO_SCALE;
		863	rect.y = y * PANGO_SCALE;
		864	rect.width = w * PANGO_SCALE;
		865	rect.height = h * PANGO_SCALE;
		866
		867	if (!attrs)
		868	attrs = pango_layout_get_attributes (self->pl);
		869
		870	attr = pango_attr_shape_new (&inkrect, &rect);
		871	attr->start_index = pos - text;
		872	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		873	pango_attr_list_insert (attrs, attr);
		874
		875	arg += 4;
		876	pos += sizeof (OBJ_STR) - 1;
		877	}
		878
		879	if (attrs)
		880	pango_layout_set_attributes (self->pl, attrs);
		881	}
		882
		883	void
		884	get_shapes (CFPlus::Layout self)
		885	PPCODE:
		886	{
		887	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		888
		889	do
		890	{
		891	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		892
		893	if (run && shape_attr_p (run))
		894	{
		895	PangoRectangle extents;
		896	pango_layout_iter_get_run_extents (iter, 0, &extents);
		897
		898	EXTEND (SP, 2);
		899	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		901	}
		902	}
		903	while (pango_layout_iter_next_run (iter));
		904
		905	pango_layout_iter_free (iter);
		906	}
		907
		908	int
		909	has_wrapped (CFPlus::Layout self)
		910	CODE:
		911	{
		912	int lines = 1;
		913	const char *text = pango_layout_get_text (self->pl);
		914
		915	while (*text)
		916	lines += *text++ == '\n';
		917
		918	RETVAL = lines < pango_layout_get_line_count (self->pl);
		919	}
		920	OUTPUT:
		921	RETVAL
		922
782	SV *	923	SV *
783	get_text (CFClient::Layout self)	924	get_text (CFPlus::Layout self)
784	CODE:	925	CODE:
785	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	926	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786	SvUTF8_on (RETVAL);	927	sv_utf8_decode (RETVAL);
787	OUTPUT:	928	OUTPUT:
788	RETVAL	929	RETVAL
789		930
790	void	931	void
791	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	932	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
792	CODE:	933	CODE:
793	self->r = r;	934	self->r = r;
794	self->g = g;	935	self->g = g;
795	self->b = b;	936	self->b = b;
796	self->a = a;	937	self->a = a;
797		938
798	void	939	void
799	set_font (CFClient::Layout self, CFClient::Font font = 0)	940	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800	CODE:	941	CODE:
801	if (self->font != font)	942	if (self->font != font)
802	{	943	{
803	self->font = font;	944	self->font = font;
804	layout_update_font (self);	945	layout_update_font (self);
805	}	946	}
806		947
807	void	948	void
808	set_height (CFClient::Layout self, int base_height)	949	set_height (CFPlus::Layout self, int base_height)
809	CODE:	950	CODE:
810	if (self->base_height != base_height)	951	if (self->base_height != base_height)
811	{	952	{
812	self->base_height = base_height;	953	self->base_height = base_height;
813	layout_update_font (self);	954	layout_update_font (self);
814	}	955	}
815		956
816	void	957	void
817	set_width (CFClient::Layout self, int max_width = -1)	958	set_width (CFPlus::Layout self, int max_width = -1)
818	CODE:	959	CODE:
819	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	960	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
820		961
821	void	962	void
822	set_indent (CFClient::Layout self, int indent)	963	set_indent (CFPlus::Layout self, int indent)
823	CODE:	964	CODE:
824	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	965	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825		966
826	void	967	void
827	set_spacing (CFClient::Layout self, int spacing)	968	set_spacing (CFPlus::Layout self, int spacing)
828	CODE:	969	CODE:
829	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	970	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830		971
831	void	972	void
832	set_ellipsise (CFClient::Layout self, int ellipsise)	973	set_ellipsise (CFPlus::Layout self, int ellipsise)
833	CODE:	974	CODE:
834	pango_layout_set_ellipsize (self->pl,	975	pango_layout_set_ellipsize (self->pl,
835	ellipsise == 1 ? PANGO_ELLIPSIZE_START	976	ellipsise == 1 ? PANGO_ELLIPSIZE_START
836	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	977	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	978	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
838	: PANGO_ELLIPSIZE_NONE	979	: PANGO_ELLIPSIZE_NONE
839	);	980	);
840		981
841	void	982	void
842	set_single_paragraph_mode (CFClient::Layout self, int spm)	983	set_single_paragraph_mode (CFPlus::Layout self, int spm)
843	CODE:	984	CODE:
844	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	985	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845		986
846	void	987	void
847	size (CFClient::Layout self)	988	size (CFPlus::Layout self)
848	PPCODE:	989	PPCODE:
849	{	990	{
850	int w, h;	991	int w, h;
851		992
852	layout_get_pixel_size (self, &w, &h);	993	layout_get_pixel_size (self, &w, &h);
…		…
855	PUSHs (sv_2mortal (newSViv (w)));	996	PUSHs (sv_2mortal (newSViv (w)));
856	PUSHs (sv_2mortal (newSViv (h)));	997	PUSHs (sv_2mortal (newSViv (h)));
857	}	998	}
858		999
859	int	1000	int
		1001	descent (CFPlus::Layout self)
		1002	CODE:
		1003	{
		1004	PangoRectangle rect;
		1005	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1006	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1007	RETVAL = PANGO_DESCENT (rect);
		1008	}
		1009	OUTPUT:
		1010	RETVAL
		1011
		1012	int
860	xy_to_index (CFClient::Layout self, int x, int y)	1013	xy_to_index (CFPlus::Layout self, int x, int y)
861	CODE:	1014	CODE:
862	{	1015	{
863	int index, trailing;	1016	int index, trailing;
864	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1017	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
865	RETVAL = index;	1018	RETVAL = index;
866	}	1019	}
867	OUTPUT:	1020	OUTPUT:
868	RETVAL	1021	RETVAL
869		1022
870	void	1023	void
871	cursor_pos (CFClient::Layout self, int index)	1024	cursor_pos (CFPlus::Layout self, int index)
872	PPCODE:	1025	PPCODE:
873	{	1026	{
874	PangoRectangle strong_pos;	1027	PangoRectangle strong_pos;
875	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1028	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876		1029
…		…
879	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1032	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881	}	1034	}
882		1035
883	void	1036	void
884	render (CFClient::Layout self)	1037	render (CFPlus::Layout self, float x, float y, int flags = 0)
885	PPCODE:	1038	PPCODE:
886	{	1039	pango_opengl_render_layout_subpixel (
887	SV *retval;	1040	self->pl,
888	int w, h;	1041	x * PANGO_SCALE, y * PANGO_SCALE,
		1042	self->r, self->g, self->b, self->a,
		1043	flags
		1044	);
889		1045
890	layout_get_pixel_size (self, &w, &h);	1046	MODULE = CFPlus PACKAGE = CFPlus::Texture
891		1047
892	if (self->rgba)	1048	void
		1049	pad2pot (SV data_, SV w_, SV *h_)
		1050	CODE:
		1051	{
		1052	int ow = SvIV (w_);
		1053	int oh = SvIV (h_);
		1054
		1055	if (ow && oh)
893	{	1056	{
894	cairo_surface_t *surface;	1057	int nw = minpot (ow);
895	cairo_t *cairo;	1058	int nh = minpot (oh);
896		1059
897	retval = newSV (w * h * 4);	1060	if (nw != ow \|\| nh != oh)
898	SvPOK_only (retval);
899	SvCUR_set (retval, w * h * 4);
900
901	memset (SvPVX (retval), 0, w * h * 4);
902
903	surface = cairo_image_surface_create_for_data (
904	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
905	cairo = cairo_create (surface);
906	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
907
908	pango_cairo_show_layout (cairo, self->pl);
909
910	cairo_destroy (cairo);
911	cairo_surface_destroy (surface);
912
913	// what a mess, and its premultiplied, too :(
914	{	1061	{
915	uint32_t p = (uint32_t )SvPVX (retval);	1062	if (SvOK (data_))
916	uint32_t e = p + w h;
917
918	while (p < e)
919	{	1063	{
920	uint32_t rgba = *p;	1064	STRLEN datalen;
921	rgba = (rgba >> 24) \| (rgba << 8);	1065	char *data = SvPVbyte (data_, datalen);
922	#if 0	1066	int bpp = datalen / (ow * oh);
923	#ifdef _WIN32	1067	SV result_ = sv_2mortal (newSV (nw nh * bpp));
924	{//D
925	uint8_t r = rgba >> 24;
926	uint8_t g = rgba >> 16;
927	uint8_t b = rgba >> 8;
928	uint8_t a = rgba >> 0;
929		1068
930	rgba = (rgba & 0xffffff00) \| a;	1069	SvPOK_only (result_);
		1070	SvCUR_set (result_, nw * nh * bpp);
		1071
		1072	memset (SvPVX (result_), 0, nw * nh * bpp);
		1073	while (oh--)
		1074	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1075
		1076	sv_setsv (data_, result_);
931	}	1077	}
932	#endif	1078
933	#endif	1079	sv_setiv (w_, nw);
934	rgba = SDL_SwapBE32 (rgba);	1080	sv_setiv (h_, nh);
935	*p++ = rgba;
936	}	1081	}
937	}
938
939	EXTEND (SP, 5);
940	PUSHs (sv_2mortal (newSViv (w)));
941	PUSHs (sv_2mortal (newSViv (h)));
942	PUSHs (sv_2mortal (retval));
943	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945	}	1082	}
946	else
947	{
948	FT_Bitmap bitmap;
949
950	retval = newSV (w * h);
951	SvPOK_only (retval);
952	SvCUR_set (retval, w * h);
953
954	bitmap.rows = h;
955	bitmap.width = w;
956	bitmap.pitch = w;
957	bitmap.buffer = (unsigned char*)SvPVX (retval);
958	bitmap.num_grays = 256;
959	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
960
961	memset (bitmap.buffer, 0, w * h);
962
963	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
964
965	EXTEND (SP, 5);
966	PUSHs (sv_2mortal (newSViv (w)));
967	PUSHs (sv_2mortal (newSViv (h)));
968	PUSHs (sv_2mortal (retval));
969	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971	}
972	}	1083	}
973		1084
974	MODULE = CFClient PACKAGE = CFClient::Texture
975
976	void	1085	void
977	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1086	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
978	PROTOTYPE: $$$;$$	1087	PROTOTYPE: $$$;$$
979	ALIAS:	1088	ALIAS:
980	draw_quad_alpha = 1	1089	draw_quad_alpha = 1
981	draw_quad_alpha_premultiplied = 2	1090	draw_quad_alpha_premultiplied = 2
982	CODE:	1091	CODE:
…		…
1020	glDisable (GL_ALPHA_TEST);	1129	glDisable (GL_ALPHA_TEST);
1021	glDisable (GL_BLEND);	1130	glDisable (GL_BLEND);
1022	}	1131	}
1023	}	1132	}
1024		1133
1025	MODULE = CFClient PACKAGE = CFClient::Map	1134	MODULE = CFPlus PACKAGE = CFPlus::Map
1026		1135
1027	CFClient::Map	1136	CFPlus::Map
1028	new (SV *class, int map_width, int map_height)	1137	new (SV *class, int map_width, int map_height)
1029	CODE:	1138	CODE:
1030	New (0, RETVAL, 1, struct map);	1139	New (0, RETVAL, 1, struct map);
1031	RETVAL->x = 0;	1140	RETVAL->x = 0;
1032	RETVAL->y = 0;	1141	RETVAL->y = 0;
…		…
1042	RETVAL->row = 0;	1151	RETVAL->row = 0;
1043	OUTPUT:	1152	OUTPUT:
1044	RETVAL	1153	RETVAL
1045		1154
1046	void	1155	void
1047	DESTROY (CFClient::Map self)	1156	DESTROY (CFPlus::Map self)
1048	CODE:	1157	CODE:
1049	{	1158	{
1050	map_clear (self);	1159	map_clear (self);
1051	Safefree (self->face);	1160	Safefree (self->face);
		1161	Safefree (self->tex);
1052	Safefree (self);	1162	Safefree (self);
1053	}	1163	}
1054		1164
1055	void	1165	void
1056	clear (CFClient::Map self)	1166	clear (CFPlus::Map self)
1057	CODE:	1167	CODE:
1058	map_clear (self);	1168	map_clear (self);
1059		1169
1060	void	1170	void
1061	set_face (CFClient::Map self, int face, int texid)	1171	set_face (CFPlus::Map self, int face, int texid)
1062	CODE:	1172	CODE:
1063	{	1173	{
1064	while (self->faces <= face)	1174	while (self->faces <= face)
1065	{	1175	{
1066	Append (mapface, self->face, self->faces, self->faces);	1176	Append (mapface, self->face, self->faces, self->faces);
…		…
1069		1179
1070	self->face [face] = texid;	1180	self->face [face] = texid;
1071	}	1181	}
1072		1182
1073	void	1183	void
1074	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1184	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1075	CODE:	1185	CODE:
1076	{	1186	{
1077	while (self->texs <= texid)	1187	while (self->texs <= texid)
1078	{	1188	{
1079	Append (maptex, self->tex, self->texs, self->texs);	1189	Append (maptex, self->tex, self->texs, self->texs);
…		…
1103	// from transparent color bleeding and ugly wrapping effects.	1213	// from transparent color bleeding and ugly wrapping effects.
1104	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1214	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105	}	1215	}
1106		1216
1107	int	1217	int
1108	ox (CFClient::Map self)	1218	ox (CFPlus::Map self)
1109	ALIAS:	1219	ALIAS:
1110	oy = 1	1220	oy = 1
1111	x = 2	1221	x = 2
1112	y = 3	1222	y = 3
1113	w = 4	1223	w = 4
…		…
1124	}	1234	}
1125	OUTPUT:	1235	OUTPUT:
1126	RETVAL	1236	RETVAL
1127		1237
1128	void	1238	void
1129	scroll (CFClient::Map self, int dx, int dy)	1239	scroll (CFPlus::Map self, int dx, int dy)
1130	CODE:	1240	CODE:
1131	{	1241	{
1132	if (dx > 0)	1242	if (dx > 0)
1133	map_blank (self, self->x, self->y, dx - 1, self->h);	1243	map_blank (self, self->x, self->y, dx - 1, self->h);
1134	else if (dx < 0)	1244	else if (dx < 0)
…		…
1150	self->y += MAP_EXTEND_Y;	1260	self->y += MAP_EXTEND_Y;
1151	}	1261	}
1152	}	1262	}
1153		1263
1154	void	1264	void
1155	map1a_update (CFClient::Map self, SV *data_)	1265	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156	CODE:	1266	CODE:
1157	{	1267	{
1158	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1268	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1159	uint8_t data_end = (uint8_t )SvEND (data_);	1269	uint8_t data_end = (uint8_t )SvEND (data_);
1160	mapcell *cell;	1270	mapcell *cell;
…		…
1162		1272
1163	while (data < data_end)	1273	while (data < data_end)
1164	{	1274	{
1165	flags = (data [0] << 8) + data [1]; data += 2;	1275	flags = (data [0] << 8) + data [1]; data += 2;
1166		1276
1167	x = ((flags >> 10) & 63) + self->x;	1277	x = self->x + ((flags >> 10) & 63);
1168	y = ((flags >> 4) & 63) + self->y;	1278	y = self->y + ((flags >> 4) & 63);
1169		1279
1170	cell = map_get_cell (self, x, y);	1280	cell = map_get_cell (self, x, y);
1171		1281
1172	if (flags & 15)	1282	if (flags & 15)
1173	{	1283	{
…		…
1177	cell->face [0] = 0;	1287	cell->face [0] = 0;
1178	cell->face [1] = 0;	1288	cell->face [1] = 0;
1179	cell->face [2] = 0;	1289	cell->face [2] = 0;
1180	}	1290	}
1181		1291
		1292	if (flags & 8)
		1293	{
		1294	fprintf (stderr, "oi\n");//D
		1295	if (extmap)
		1296	{
		1297	uint8_t ext, cmd;
		1298
		1299	do
		1300	{
		1301
		1302	ext = *data++;
		1303	cmd = ext & 0x7f;
		1304
		1305	fprintf (stderr, "extcmd = %x\n", ext);//D
		1306
		1307	if (ext < 4)
		1308	cell->darkness = 255 - ext * 64;
		1309	}
		1310	while (cmd & 0x80);
		1311	}
		1312	else
1182	cell->darkness = flags & 8 ? *data++ : 255;	1313	cell->darkness = flags & 8 ? *data++ : 255;
		1314	}
1183		1315
1184	//TODO: don't trust server data to be in-range(!)	1316	//TODO: don't trust server data to be in-range(!)
1185		1317
1186	if (flags & 4)	1318	if (flags & 4)
1187	{	1319	{
…		…
1202	cell->darkness = -1;	1334	cell->darkness = -1;
1203	}	1335	}
1204	}	1336	}
1205		1337
1206	SV *	1338	SV *
1207	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1339	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1208	CODE:	1340	CODE:
1209	{	1341	{
1210	int x1, x;	1342	int x1, x;
1211	int y1, y;	1343	int y1, y;
1212	int z;	1344	int z;
…		…
1262	}	1394	}
1263	OUTPUT:	1395	OUTPUT:
1264	RETVAL	1396	RETVAL
1265		1397
1266	void	1398	void
1267	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1399	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1268	PPCODE:	1400	CODE:
1269	{	1401	{
1270	int vx, vy;	1402	int vx, vy;
1271	int x, y, z;	1403	int x, y, z;
1272	int last_name;	1404	int last_name;
1273	mapface face;	1405	mapface face;
1274	int sw4 = (sw + 3) & ~3;
1275	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1276	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1277		1406
1278	memset (darkness, 255, sw4 * sh);
1279	SvPOK_only (darkness_sv);
1280	SvCUR_set (darkness_sv, sw4 * sh);
1281
1282	vx = self->x + (self->w - sw) / 2 - shift_x;	1407	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1283	vy = self->y + (self->h - sh) / 2 - shift_y;	1408	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1284		1409
1285	/*	1410	/*
1286	int vx = self->vx = self->w >= sw	1411	int vx = self->vx = self->w >= sw
1287	? self->x + (self->w - sw) / 2	1412	? self->x + (self->w - sw) / 2
1288	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1413	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1292	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1417	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1293	*/	1418	*/
1294		1419
1295	glColor4ub (255, 255, 255, 255);	1420	glColor4ub (255, 255, 255, 255);
1296		1421
		1422	glEnable (GL_BLEND);
1297	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1423	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298	glEnable (GL_BLEND);
1299	glEnable (GL_TEXTURE_2D);	1424	glEnable (GL_TEXTURE_2D);
1300	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1425	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301		1426
1302	glBegin (GL_QUADS);	1427	glBegin (GL_QUADS);
1303		1428
…		…
1311		1436
1312	for (x = 0; x < sw; x++)	1437	for (x = 0; x < sw; x++)
1313	if (row->c0 <= x + vx && x + vx < row->c1)	1438	if (row->c0 <= x + vx && x + vx < row->c1)
1314	{	1439	{
1315	mapcell *cell = row->col + (x + vx - row->c0);	1440	mapcell *cell = row->col + (x + vx - row->c0);
1316
1317	darkness[y * sw4 + x] = cell->darkness < 0
1318	? 255 - FOW_DARKNESS
1319	: 255 - cell->darkness;
1320		1441
1321	face = cell->face [z];	1442	face = cell->face [z];
1322		1443
1323	if (face)	1444	if (face)
1324	{	1445	{
…		…
1345		1466
1346	glEnd ();	1467	glEnd ();
1347		1468
1348	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1349	glDisable (GL_BLEND);	1470	glDisable (GL_BLEND);
		1471	}
		1472
		1473	void
		1474	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1475	CODE:
		1476	{
		1477	static float color[16][3] = {
		1478	{ 0.00F, 0.00F, 0.00F },
		1479	{ 1.00F, 1.00F, 1.00F },
		1480	{ 0.00F, 0.00F, 0.55F },
		1481	{ 1.00F, 0.00F, 0.00F },
		1482
		1483	{ 1.00F, 0.54F, 0.00F },
		1484	{ 0.11F, 0.56F, 1.00F },
		1485	{ 0.93F, 0.46F, 0.00F },
		1486	{ 0.18F, 0.54F, 0.34F },
		1487
		1488	{ 0.56F, 0.73F, 0.56F },
		1489	{ 0.80F, 0.80F, 0.80F },
		1490	{ 0.55F, 0.41F, 0.13F },
		1491	{ 0.99F, 0.77F, 0.26F },
		1492
		1493	{ 0.74F, 0.65F, 0.41F },
		1494
		1495	{ 0.00F, 1.00F, 1.00F },
		1496	{ 1.00F, 0.00F, 1.00F },
		1497	{ 1.00F, 1.00F, 0.00F },
		1498	};
		1499
		1500	int x, y;
		1501
		1502	glEnable (GL_TEXTURE_2D);
		1503	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1504	glEnable (GL_BLEND);
		1505	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1506	glBegin (GL_QUADS);
		1507
		1508	for (y = 0; y < h; y++)
		1509	for (x = 0; x < w; x++)
		1510	{
		1511	unsigned char m = data [x + y * w];
		1512
		1513	if (m)
		1514	{
		1515	float *c = color [m & 15];
		1516
		1517	float tx1 = m & 0x40 ? 0.5 : 0.;
		1518	float tx2 = tx1 + 0.5;
		1519
		1520	glColor4f (c[0], c[1], c[2], 0.75);
		1521	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1522	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1523	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1524	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1525	}
		1526	}
		1527
		1528	glEnd ();
		1529	glDisable (GL_BLEND);
		1530	glDisable (GL_TEXTURE_2D);
		1531	}
		1532
		1533	void
		1534	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1535	PPCODE:
		1536	{
		1537	int vx, vy;
		1538	int x, y;
		1539	int sw4 = (sw + 3) & ~3;
		1540	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1541	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1542
		1543	memset (darkness, 255, sw4 * sh);
		1544	SvPOK_only (darkness_sv);
		1545	SvCUR_set (darkness_sv, sw4 * sh);
		1546
		1547	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1548	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1549
		1550	for (y = 0; y < sh; y++)
		1551	if (0 <= y + vy && y + vy < self->rows)
		1552	{
		1553	maprow *row = self->row + (y + vy);
		1554
		1555	for (x = 0; x < sw; x++)
		1556	if (row->c0 <= x + vx && x + vx < row->c1)
		1557	{
		1558	mapcell *cell = row->col + (x + vx - row->c0);
		1559
		1560	darkness[y * sw4 + x] = cell->darkness < 0
		1561	? 255 - FOW_DARKNESS
		1562	: 255 - cell->darkness;
		1563	}
		1564	}
1350		1565
1351	EXTEND (SP, 3);	1566	EXTEND (SP, 3);
1352	PUSHs (sv_2mortal (newSViv (sw4)));	1567	PUSHs (sv_2mortal (newSViv (sw4)));
1353	PUSHs (sv_2mortal (newSViv (sh)));	1568	PUSHs (sv_2mortal (newSViv (sh)));
1354	PUSHs (darkness_sv);	1569	PUSHs (darkness_sv);
1355	}	1570	}
1356		1571
1357	SV *	1572	SV *
1358	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1573	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1359	CODE:	1574	CODE:
1360	{	1575	{
1361	int x, y, x1, y1;	1576	int x, y, x1, y1;
1362	SV data_sv = newSV (w h * 7 + 5);	1577	SV data_sv = newSV (w h * 7 + 5);
1363	uint8_t data = (uint8_t )SvPVX (data_sv);	1578	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1425	}	1640	}
1426	OUTPUT:	1641	OUTPUT:
1427	RETVAL	1642	RETVAL
1428		1643
1429	void	1644	void
1430	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1645	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1431	PPCODE:	1646	PPCODE:
1432	{	1647	{
1433	int x, y, z;	1648	int x, y, z;
1434	int w, h;	1649	int w, h;
1435	int x1, y1;	1650	int x1, y1;
…		…
1484	}	1699	}
1485	}	1700	}
1486	}	1701	}
1487	}	1702	}
1488		1703
1489	MODULE = CFClient PACKAGE = CFClient::MixChunk	1704	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490		1705
1491	CFClient::MixChunk	1706	CFPlus::MixChunk
1492	new_from_file (SV class, char path)	1707	new_from_file (SV class, char path)
1493	CODE:	1708	CODE:
1494	RETVAL = Mix_LoadWAV (path);	1709	RETVAL = Mix_LoadWAV (path);
1495	OUTPUT:	1710	OUTPUT:
1496	RETVAL	1711	RETVAL
1497		1712
1498	void	1713	void
1499	DESTROY (CFClient::MixChunk self)	1714	DESTROY (CFPlus::MixChunk self)
1500	CODE:	1715	CODE:
1501	Mix_FreeChunk (self);	1716	Mix_FreeChunk (self);
1502		1717
1503	int	1718	int
1504	volume (CFClient::MixChunk self, int volume = -1)	1719	volume (CFPlus::MixChunk self, int volume = -1)
1505	CODE:	1720	CODE:
1506	RETVAL = Mix_VolumeChunk (self, volume);	1721	RETVAL = Mix_VolumeChunk (self, volume);
1507	OUTPUT:	1722	OUTPUT:
1508	RETVAL	1723	RETVAL
1509		1724
1510	int	1725	int
1511	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1726	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1512	CODE:	1727	CODE:
1513	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1728	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514	OUTPUT:	1729	OUTPUT:
1515	RETVAL	1730	RETVAL
1516		1731
1517	MODULE = CFClient PACKAGE = CFClient::MixMusic	1732	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518		1733
1519	int	1734	int
1520	volume (int volume = -1)	1735	volume (int volume = -1)
1521	CODE:	1736	CODE:
1522	RETVAL = Mix_VolumeMusic (volume);	1737	RETVAL = Mix_VolumeMusic (volume);
1523	OUTPUT:	1738	OUTPUT:
1524	RETVAL	1739	RETVAL
1525		1740
1526	CFClient::MixMusic	1741	CFPlus::MixMusic
1527	new_from_file (SV class, char path)	1742	new_from_file (SV class, char path)
1528	CODE:	1743	CODE:
1529	RETVAL = Mix_LoadMUS (path);	1744	RETVAL = Mix_LoadMUS (path);
1530	OUTPUT:	1745	OUTPUT:
1531	RETVAL	1746	RETVAL
1532		1747
1533	void	1748	void
1534	DESTROY (CFClient::MixMusic self)	1749	DESTROY (CFPlus::MixMusic self)
1535	CODE:	1750	CODE:
1536	Mix_FreeMusic (self);	1751	Mix_FreeMusic (self);
1537		1752
1538	int	1753	int
1539	play (CFClient::MixMusic self, int loops = -1)	1754	play (CFPlus::MixMusic self, int loops = -1)
1540	CODE:	1755	CODE:
1541	RETVAL = Mix_PlayMusic (self, loops);	1756	RETVAL = Mix_PlayMusic (self, loops);
1542	OUTPUT:	1757	OUTPUT:
1543	RETVAL	1758	RETVAL
1544		1759
1545	MODULE = CFClient PACKAGE = CFClient::OpenGL	1760	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546		1761
1547	BOOT:	1762	BOOT:
1548	{	1763	{
1549	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1764	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550	static const struct {	1765	static const struct {
1551	const char *name;	1766	const char *name;
1552	IV iv;	1767	IV iv;
1553	} *civ, const_iv[] = {	1768	} *civ, const_iv[] = {
1554	# define const_iv(name) { # name, (IV)name }	1769	# define const_iv(name) { # name, (IV)name }
…		…
1561	const_iv (GL_SCISSOR_TEST),	1776	const_iv (GL_SCISSOR_TEST),
1562	const_iv (GL_DEPTH_TEST),	1777	const_iv (GL_DEPTH_TEST),
1563	const_iv (GL_ALPHA_TEST),	1778	const_iv (GL_ALPHA_TEST),
1564	const_iv (GL_NORMALIZE),	1779	const_iv (GL_NORMALIZE),
1565	const_iv (GL_RESCALE_NORMAL),	1780	const_iv (GL_RESCALE_NORMAL),
		1781	const_iv (GL_FRONT),
		1782	const_iv (GL_BACK),
1566	const_iv (GL_AND),	1783	const_iv (GL_AND),
1567	const_iv (GL_ONE),	1784	const_iv (GL_ONE),
1568	const_iv (GL_ZERO),	1785	const_iv (GL_ZERO),
1569	const_iv (GL_SRC_ALPHA),	1786	const_iv (GL_SRC_ALPHA),
1570	const_iv (GL_DST_ALPHA),	1787	const_iv (GL_DST_ALPHA),
1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1788	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572	const_iv (GL_ONE_MINUS_DST_ALPHA),	1789	const_iv (GL_ONE_MINUS_DST_ALPHA),
1573	const_iv (GL_SRC_ALPHA_SATURATE),	1790	const_iv (GL_SRC_ALPHA_SATURATE),
1574	const_iv (GL_RGB),	1791	const_iv (GL_RGB),
1575	const_iv (GL_RGBA),	1792	const_iv (GL_RGBA),
		1793	const_iv (GL_RGBA4),
		1794	const_iv (GL_RGBA8),
		1795	const_iv (GL_RGB5_A1),
1576	const_iv (GL_UNSIGNED_BYTE),	1796	const_iv (GL_UNSIGNED_BYTE),
1577	const_iv (GL_UNSIGNED_SHORT),	1797	const_iv (GL_UNSIGNED_SHORT),
1578	const_iv (GL_UNSIGNED_INT),	1798	const_iv (GL_UNSIGNED_INT),
1579	const_iv (GL_ALPHA),	1799	const_iv (GL_ALPHA),
1580	const_iv (GL_INTENSITY),	1800	const_iv (GL_INTENSITY),
…		…
1612	const_iv (GL_SEPARABLE_2D),	1832	const_iv (GL_SEPARABLE_2D),
1613	const_iv (GL_CONVOLUTION_2D),	1833	const_iv (GL_CONVOLUTION_2D),
1614	const_iv (GL_CONVOLUTION_BORDER_MODE),	1834	const_iv (GL_CONVOLUTION_BORDER_MODE),
1615	const_iv (GL_CONSTANT_BORDER),	1835	const_iv (GL_CONSTANT_BORDER),
1616	const_iv (GL_LINES),	1836	const_iv (GL_LINES),
		1837	const_iv (GL_LINE_STRIP),
1617	const_iv (GL_LINE_LOOP),	1838	const_iv (GL_LINE_LOOP),
1618	const_iv (GL_QUADS),	1839	const_iv (GL_QUADS),
1619	const_iv (GL_QUAD_STRIP),	1840	const_iv (GL_QUAD_STRIP),
1620	const_iv (GL_TRIANGLES),	1841	const_iv (GL_TRIANGLES),
1621	const_iv (GL_TRIANGLE_STRIP),	1842	const_iv (GL_TRIANGLE_STRIP),
…		…
1654	OUTPUT:	1875	OUTPUT:
1655	RETVAL	1876	RETVAL
1656		1877
1657	int glGetError ()	1878	int glGetError ()
1658		1879
		1880	void glFinish ()
		1881
1659	void glClear (int mask)	1882	void glClear (int mask)
1660		1883
1661	void glClearColor (float r, float g, float b, float a = 1.0)	1884	void glClearColor (float r, float g, float b, float a = 1.0)
1662	PROTOTYPE: @	1885	PROTOTYPE: @
1663		1886
…		…
1686	void glPushMatrix ()	1909	void glPushMatrix ()
1687		1910
1688	void glPopMatrix ()	1911	void glPopMatrix ()
1689		1912
1690	void glLoadIdentity ()	1913	void glLoadIdentity ()
		1914
		1915	void glDrawBuffer (int buffer)
		1916
		1917	void glReadBuffer (int buffer)
1691		1918
1692	# near_ and far_ are due to microsofts buggy "c" compiler	1919	# near_ and far_ are due to microsofts buggy "c" compiler
1693	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1920	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694		1921
1695	# near_ and far_ are due to microsofts buggy "c" compiler	1922	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1725	r *= a;	1952	r *= a;
1726	g *= a;	1953	g *= a;
1727	b *= a;	1954	b *= a;
1728	}	1955	}
1729	// microsoft visual "c" rounds instead of truncating...	1956	// microsoft visual "c" rounds instead of truncating...
1730	glColor4ub (MIN ((int)(r * 256.f), 255),	1957	glColor4f (r, g, b, a);
1731	MIN ((int)(g * 256.f), 255),
1732	MIN ((int)(b * 256.f), 255),
1733	MIN ((int)(a * 256.f), 255));
1734		1958
1735	void glInterleavedArrays (int format, int stride, char *data)	1959	void glInterleavedArrays (int format, int stride, char *data)
1736		1960
1737	void glDrawElements (int mode, int count, int type, char *indices)	1961	void glDrawElements (int mode, int count, int type, char *indices)
1738		1962
…		…
1815		2039
1816	void glEndList ()	2040	void glEndList ()
1817		2041
1818	void glCallList (int list)	2042	void glCallList (int list)
1819		2043
1820

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.105 by root, Mon Jun 5 03:33:09 2006 UTC vs. Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.105 by root, Mon Jun 5 03:33:09 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC