[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.171 by root, Sun Apr 1 01:19:18 2007 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	2	# define WIN32_LEAN_AND_MEAN
		3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
6	#endif	9	#endif
7		10
8	#include "EXTERN.h"	11	#include "EXTERN.h"
9	#include "perl.h"	12	#include "perl.h"
10	#include "XSUB.h"	13	#include "XSUB.h"
11		14
		15	#ifdef _WIN32
		16	# undef pipe
		17	#endif
		18
		19	#include <assert.h>
12	#include <math.h>	20	#include <math.h>
13	#include <string.h>	21	#include <string.h>
14	#include <stdio.h>	22	#include <stdio.h>
		23	#include <stdlib.h>
15		24
16	#include <SDL.h>	25	#include <SDL.h>
17	#include <SDL_endian.h>	26	#include <SDL_endian.h>
18	#include <SDL_image.h>	27	#include <SDL_image.h>
19	#include <SDL_mixer.h>	28	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	29	#include <SDL_opengl.h>
21		30
		31	#define PANGO_ENABLE_BACKEND
		32	#define G_DISABLE_CAST_CHECKS
		33
22	#include <glib/gmacros.h>	34	#include <glib/gmacros.h>
23		35
24	#include <pango/pango.h>	36	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		37
29	#ifndef _WIN32	38	#ifndef _WIN32
30	# include <sys/types.h>	39	# include <sys/types.h>
31	# include <sys/socket.h>	40	# include <sys/socket.h>
32	# include <netinet/in.h>	41	# include <netinet/in.h>
33	# include <netinet/tcp.h>	42	# include <netinet/tcp.h>
34	# include <inttypes.h>	43	# include <inttypes.h>
35	#else
36	typedef unsigned char uint8_t;
37	typedef unsigned short uint16_t;
38	typedef unsigned int uint32_t;
39	typedef signed char int8_t;
40	typedef signed short int16_t;
41	typedef signed int int32_t;
42	#endif	44	#endif
43		45
44	#include "glext.h"	46	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45		47
46	#define FOW_DARKNESS 32	48	#define FOW_DARKNESS 32
47		49
48	#define MAP_EXTEND_X 32	50	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	51	#define MAP_EXTEND_Y 512
50		52
51	#define MIN_FONT_HEIGHT 10	53	#define MIN_FONT_HEIGHT 10
		54
		55	#if 0
		56	# define PARACHUTE SDL_INIT_NOPARACHUTE
		57	#else
		58	# define PARACHUTE 0
		59	#endif
52		60
53	static struct	61	static struct
54	{	62	{
55	#define GL_FUNC(ptr,name) ptr name;	63	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	64	#include "glfunc.h"
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	74	else
67	glBlendFunc (sa, da);	75	glBlendFunc (sa, da);
68	}	76	}
69		77
		78	#include "texcache.c"
		79
		80	#include "pango-font.c"
		81	#include "pango-fontmap.c"
		82	#include "pango-render.c"
		83
70	typedef Mix_Chunk *CFClient__MixChunk;	84	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	85	typedef Mix_Music *CFPlus__MixMusic;
72		86
73	typedef PangoFontDescription *CFClient__Font;	87	typedef PangoFontDescription *CFPlus__Font;
		88
		89	static int
		90	shape_attr_p (PangoLayoutRun *run)
		91	{
		92	GSList *attrs = run->item->analysis.extra_attrs;
		93
		94	while (attrs)
		95	{
		96	PangoAttribute *attr = attrs->data;
		97
		98	if (attr->klass->type == PANGO_ATTR_SHAPE)
		99	return 1;
		100
		101	attrs = attrs->next;
		102	}
		103
		104	return 0;
		105	}
74		106
75	typedef struct cf_layout {	107	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	108	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	109	float r, g, b, a; // default color for rgba mode
79	int base_height;	110	int base_height;
80	CFClient__Font font;	111	CFPlus__Font font;
81	} *CFClient__Layout;	112	} *CFPlus__Layout;
82		113
83	static CFClient__Font default_font;	114	static CFPlus__Font default_font;
84	static PangoContext ft2_context, cairo_context;	115	static PangoContext *opengl_context;
85	static PangoFontMap ft2_fontmap, cairo_fontmap;	116	static PangoFontMap *opengl_fontmap;
86		117
87	static void	118	static void
88	substitute_func (FcPattern *pattern, gpointer data)	119	substitute_func (FcPattern *pattern, gpointer data)
89	{	120	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	121	FcPatternAddBool (pattern, FC_HINTING, 1);
		122	#ifdef FC_HINT_STYLE
91	//FcPatternAddBool (pattern, FC_AUTOHINT, 1);	123	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		124	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	125	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	}	126	}
94		127
95	static void	128	static void
96	layout_update_font (CFClient__Layout self)	129	layout_update_font (CFPlus__Layout self)
97	{	130	{
98	/* use a random scale factor to account for unknown descenders, 0.8 works	131	/* use a random scale factor to account for unknown descenders, 0.8 works
99	* reasonably well with bitstream vera	132	* reasonably well with bitstream vera
100	*/	133	*/
101	PangoFontDescription *font = self->font ? self->font : default_font;	134	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
105		138
106	pango_layout_set_font_description (self->pl, font);	139	pango_layout_set_font_description (self->pl, font);
107	}	140	}
108		141
109	static void	142	static void
110	layout_get_pixel_size (CFClient__Layout self, int w, int h)	143	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
111	{	144	{
		145	PangoRectangle rect;
		146
		147	// get_pixel_* wrongly rounds down
112	pango_layout_get_pixel_size (self->pl, w, h);	148	pango_layout_get_extents (self->pl, 0, &rect);
113		149
114	if (!w) w = 1;	150	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
115	if (!h) h = 1;	151	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
116		152
117	w = (w + 3) & ~3;	153	if (!rect.width) rect.width = 1;
		154	if (!rect.height) rect.height = 1;
		155
		156	*w = rect.width;
		157	*h = rect.height;
118	}	158	}
119		159
120	typedef uint16_t mapface;	160	typedef uint16_t mapface;
121		161
122	typedef struct {	162	typedef struct {
…		…
125	float s, t;	165	float s, t;
126	uint8_t r, g, b, a;	166	uint8_t r, g, b, a;
127	} maptex;	167	} maptex;
128		168
129	typedef struct {	169	typedef struct {
130	int16_t darkness;	170	uint32_t player;
131	mapface face[3];	171	mapface face[3];
		172	uint16_t darkness;
		173	uint8_t stat_width, stat_hp, flags;
132	} mapcell;	174	} mapcell;
133		175
134	typedef struct {	176	typedef struct {
135	int32_t c0, c1;	177	int32_t c0, c1;
136	mapcell *col;	178	mapcell *col;
…		…
145	int texs;	187	int texs;
146	maptex *tex;	188	maptex *tex;
147		189
148	int32_t rows;	190	int32_t rows;
149	maprow *row;	191	maprow *row;
150	} *CFClient__Map;	192	} *CFPlus__Map;
151		193
152	static char *	194	static char *
153	prepend (char *ptr, int sze, int inc)	195	prepend (char *ptr, int sze, int inc)
154	{	196	{
155	char *p;	197	char *p;
…		…
173		215
174	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	216	#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))	217	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176		218
177	static maprow *	219	static maprow *
178	map_get_row (CFClient__Map self, int y)	220	map_get_row (CFPlus__Map self, int y)
179	{	221	{
180	if (0 > y)	222	if (0 > y)
181	{	223	{
182	int extend = - y + MAP_EXTEND_Y;	224	int extend = - y + MAP_EXTEND_Y;
183	Prepend (maprow, self->row, self->rows, extend);	225	Prepend (maprow, self->row, self->rows, extend);
…		…
221		263
222	return row->col + (x - row->c0);	264	return row->col + (x - row->c0);
223	}	265	}
224		266
225	static mapcell *	267	static mapcell *
226	map_get_cell (CFClient__Map self, int x, int y)	268	map_get_cell (CFPlus__Map self, int x, int y)
227	{	269	{
228	return row_get_cell (map_get_row (self, y), x);	270	return row_get_cell (map_get_row (self, y), x);
229	}	271	}
230		272
231	static void	273	static void
232	map_clear (CFClient__Map self)	274	map_clear (CFPlus__Map self)
233	{	275	{
234	int r;	276	int r;
235		277
236	for (r = 0; r < self->rows; r++)	278	for (r = 0; r < self->rows; r++)
237	Safefree (self->row[r].col);	279	Safefree (self->row[r].col);
…		…
245	self->row = 0;	287	self->row = 0;
246	self->rows = 0;	288	self->rows = 0;
247	}	289	}
248		290
249	static void	291	static void
250	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	292	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
251	{	293	{
252	int x, y;	294	int x, y;
253	maprow *row;	295	maprow *row;
		296	mapcell *cell;
254		297
255	for (y = y0; y < y0 + h; y++)	298	for (y = y0; y < y0 + h; y++)
256	if (y >= 0)	299	if (y >= 0)
257	{	300	{
258	if (y >= self->rows)	301	if (y >= self->rows)
…		…
264	if (x >= row->c0)	307	if (x >= row->c0)
265	{	308	{
266	if (x >= row->c1)	309	if (x >= row->c1)
267	break;	310	break;
268		311
269	row->col[x - row->c0].darkness = -1;	312	cell = row->col + x - row->c0;
		313
		314	cell->darkness = 0;
		315	cell->stat_hp = 0;
		316	cell->flags = 0;
		317	cell->player = 0;
270	}	318	}
271	}	319	}
272	}	320	}
273		321
274	static void	322	static void
…		…
295	ev.data2 = 0;	343	ev.data2 = 0;
296		344
297	SDL_PushEvent ((SDL_Event *)&ev);	345	SDL_PushEvent ((SDL_Event *)&ev);
298	}	346	}
299		347
		348	static unsigned int
		349	minpot (unsigned int n)
		350	{
		351	if (!n)
		352	return 0;
		353
		354	--n;
		355
		356	n \|= n >> 1;
		357	n \|= n >> 2;
		358	n \|= n >> 4;
		359	n \|= n >> 8;
		360	n \|= n >> 16;
		361
		362	return n + 1;
		363	}
		364
		365	/* SDL should provide this, really. */
		366	#define SDLK_MODIFIER_MIN 300
		367	#define SDLK_MODIFIER_MAX 314
		368
300	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
301		370
302	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
303		372
304	BOOT:	373	BOOT:
305	{	374	{
306	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
307	static const struct {	376	static const struct {
308	const char *name;	377	const char *name;
309	IV iv;	378	IV iv;
310	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
311	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
		381	const_iv (SDLK_MODIFIER_MIN),
		382	const_iv (SDLK_MODIFIER_MAX),
		383
312	const_iv (SDL_ACTIVEEVENT),	384	const_iv (SDL_ACTIVEEVENT),
313	const_iv (SDL_KEYDOWN),	385	const_iv (SDL_KEYDOWN),
314	const_iv (SDL_KEYUP),	386	const_iv (SDL_KEYUP),
315	const_iv (SDL_MOUSEMOTION),	387	const_iv (SDL_MOUSEMOTION),
316	const_iv (SDL_MOUSEBUTTONDOWN),	388	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
325	const_iv (SDL_EVENT_RESERVEDA),	397	const_iv (SDL_EVENT_RESERVEDA),
326	const_iv (SDL_EVENT_RESERVEDB),	398	const_iv (SDL_EVENT_RESERVEDB),
327	const_iv (SDL_VIDEORESIZE),	399	const_iv (SDL_VIDEORESIZE),
328	const_iv (SDL_VIDEOEXPOSE),	400	const_iv (SDL_VIDEOEXPOSE),
329	const_iv (SDL_USEREVENT),	401	const_iv (SDL_USEREVENT),
		402
		403	const_iv (SDL_APPINPUTFOCUS),
		404	const_iv (SDL_APPMOUSEFOCUS),
		405	const_iv (SDL_APPACTIVE),
		406
330	const_iv (SDLK_KP0),	407	const_iv (SDLK_KP0),
331	const_iv (SDLK_KP1),	408	const_iv (SDLK_KP1),
332	const_iv (SDLK_KP2),	409	const_iv (SDLK_KP2),
333	const_iv (SDLK_KP3),	410	const_iv (SDLK_KP3),
334	const_iv (SDLK_KP4),	411	const_iv (SDLK_KP4),
…		…
389	const_iv (SDLK_BREAK),	466	const_iv (SDLK_BREAK),
390	const_iv (SDLK_MENU),	467	const_iv (SDLK_MENU),
391	const_iv (SDLK_POWER),	468	const_iv (SDLK_POWER),
392	const_iv (SDLK_EURO),	469	const_iv (SDLK_EURO),
393	const_iv (SDLK_UNDO),	470	const_iv (SDLK_UNDO),
		471
394	const_iv (KMOD_NONE),	472	const_iv (KMOD_NONE),
		473	const_iv (KMOD_SHIFT),
395	const_iv (KMOD_LSHIFT),	474	const_iv (KMOD_LSHIFT),
396	const_iv (KMOD_RSHIFT),	475	const_iv (KMOD_RSHIFT),
		476	const_iv (KMOD_CTRL),
397	const_iv (KMOD_LCTRL),	477	const_iv (KMOD_LCTRL),
398	const_iv (KMOD_RCTRL),	478	const_iv (KMOD_RCTRL),
		479	const_iv (KMOD_ALT),
399	const_iv (KMOD_LALT),	480	const_iv (KMOD_LALT),
400	const_iv (KMOD_RALT),	481	const_iv (KMOD_RALT),
		482	const_iv (KMOD_META),
401	const_iv (KMOD_LMETA),	483	const_iv (KMOD_LMETA),
402	const_iv (KMOD_RMETA),	484	const_iv (KMOD_RMETA),
403	const_iv (KMOD_NUM),	485	const_iv (KMOD_NUM),
404	const_iv (KMOD_CAPS),	486	const_iv (KMOD_CAPS),
405	const_iv (KMOD_MODE),	487	const_iv (KMOD_MODE),
406	const_iv (KMOD_CTRL),
407	const_iv (KMOD_SHIFT),
408	const_iv (KMOD_ALT),
409	const_iv (KMOD_META)
410	# undef const_iv	488	# undef const_iv
411	};	489	};
412		490
413	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	491	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
414	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	492	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		493
		494	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		495	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
415	}	496	}
		497
		498	void
		499	weaken (SV *rv)
		500	PROTOTYPE: $
		501	CODE:
		502	sv_rvweaken (rv);
		503
		504	int
		505	in_destruct ()
		506	CODE:
		507	RETVAL = PL_main_cv == Nullcv;
		508	OUTPUT:
		509	RETVAL
		510
		511	NV floor (NV x)
		512
		513	NV ceil (NV x)
416		514
417	void	515	void
418	pango_init ()	516	pango_init ()
419	CODE:	517	CODE:
420	// delayed, so it can pick up new fonts added by AddFontResourceEx
421	{	518	{
422	{
423	ft2_fontmap = pango_ft2_font_map_new ();	519	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	520	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);	521	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	}	522	}
439		523
440	int	524	int
441	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	525	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
442		526
443	void	527	void
444	SDL_Quit ()	528	SDL_Quit ()
445		529
446	void	530	void
…		…
453	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	537	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	538	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	539	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456		540
457	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	541	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	542	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459		543
460	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	544	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	545	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	546	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	547	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464		548
465	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	549	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		550	#if SDL_VERSION_ATLEAST(1,2,10)
		551	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		552	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		553	#endif
466		554
467	SDL_EnableUNICODE (1);	555	SDL_EnableUNICODE (1);
468	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	556	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469		557
470	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	558	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
522	case SDL_KEYDOWN:	610	case SDL_KEYDOWN:
523	case SDL_KEYUP:	611	case SDL_KEYUP:
524	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	612	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
525	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	613	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
526	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	614	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		615	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
527	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	616	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
528	break;	617	break;
529		618
530	case SDL_ACTIVEEVENT:	619	case SDL_ACTIVEEVENT:
531	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	620	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
557	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	646	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	647	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559	break;	648	break;
560	}	649	}
561		650
562	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	651	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563	}	652	}
564	}	653	}
565		654
566	int	655	int
567	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	656	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
581	#ifndef _WIN32	670	#ifndef _WIN32
582	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	671	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
583	#endif	672	#endif
584		673
585	void	674	void
		675	win32_proxy_info ()
		676	PPCODE:
		677	{
		678	#ifdef _WIN32
		679	char buffer[2048];
		680	DWORD buflen;
		681
		682	EXTEND (SP, 3);
		683
		684	buflen = sizeof (buffer);
		685	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		686	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		687	{
		688	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		689
		690	buflen = sizeof (buffer);
		691	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		692	{
		693	PUSHs (newSVpv (buffer, 0));
		694
		695	buflen = sizeof (buffer);
		696	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		697	PUSHs (newSVpv (buffer, 0));
		698	}
		699	}
		700	#endif
		701	}
		702
		703	void
586	add_font (char *file)	704	add_font (char *file)
587	CODE:	705	CODE:
588	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	706	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589	#ifdef _WIN32
590	// cairo... sigh... requires win2000
591	AddFontResourceEx (file, FR_PRIVATE, 0);
592	#endif
593		707
594	void	708	void
595	load_image_inline (SV *image_)	709	load_image_inline (SV *image_)
596	ALIAS:	710	ALIAS:
597	load_image_file = 1	711	load_image_file = 1
…		…
639		753
640	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	754	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641		755
642	assert (surface2->pitch == surface2->w * 4);	756	assert (surface2->pitch == surface2->w * 4);
643		757
		758	SDL_LockSurface (surface2);
644	EXTEND (SP, 5);	759	EXTEND (SP, 6);
645	PUSHs (sv_2mortal (newSViv (surface2->w)));	760	PUSHs (sv_2mortal (newSViv (surface2->w)));
646	PUSHs (sv_2mortal (newSViv (surface2->h)));	761	PUSHs (sv_2mortal (newSViv (surface2->h)));
647	SDL_LockSurface (surface2);
648	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	762	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)));	763	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
651	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	764	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	765	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		766	SDL_UnlockSurface (surface2);
653		767
654	SDL_FreeSurface (surface);	768	SDL_FreeSurface (surface);
655	SDL_FreeSurface (surface2);	769	SDL_FreeSurface (surface2);
656	}	770	}
657		771
…		…
693	CODE:	807	CODE:
694	fprintf (stderr, "FATAL: %s\n", message);	808	fprintf (stderr, "FATAL: %s\n", message);
695	#ifdef _WIN32	809	#ifdef _WIN32
696	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	810	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
697	#endif	811	#endif
698	exit (1);	812	_exit (1);
699		813
		814	void
		815	_exit (int retval = 0)
		816	CODE:
		817	#ifdef WIN32
		818	ExitThread (retval); // unclean, please beam me up
		819	#else
		820	_exit (retval);
		821	#endif
		822
700	MODULE = CFClient PACKAGE = CFClient::Font	823	MODULE = CFPlus PACKAGE = CFPlus::Font
701		824
702	CFClient::Font	825	CFPlus::Font
703	new_from_file (SV class, char path, int id = 0)	826	new_from_file (SV class, char path, int id = 0)
704	CODE:	827	CODE:
705	{	828	{
706	int count;	829	int count;
707	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	830	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
710	}	833	}
711	OUTPUT:	834	OUTPUT:
712	RETVAL	835	RETVAL
713		836
714	void	837	void
715	DESTROY (CFClient::Font self)	838	DESTROY (CFPlus::Font self)
716	CODE:	839	CODE:
717	pango_font_description_free (self);	840	pango_font_description_free (self);
718		841
719	void	842	void
720	make_default (CFClient::Font self)	843	make_default (CFPlus::Font self)
721	CODE:	844	CODE:
722	default_font = self;	845	default_font = self;
723		846
724	MODULE = CFClient PACKAGE = CFClient::Layout	847	MODULE = CFPlus PACKAGE = CFPlus::Layout
725		848
726	CFClient::Layout	849	void
727	new (SV *class, int rgba = 0)	850	reset_glyph_cache ()
728	CODE:	851	CODE:
729	#if _WIN32	852	tc_clear ();
730	//rgba = 0;//D makes text nicer, breaks TextView	853
731	#endif	854	CFPlus::Layout
732	rgba=1;//D	855	new (SV *class)
		856	CODE:
733	New (0, RETVAL, 1, struct cf_layout);	857	New (0, RETVAL, 1, struct cf_layout);
734		858
735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	859	RETVAL->pl = pango_layout_new (opengl_context);
736	RETVAL->rgba = rgba;
737	RETVAL->r = 1.;	860	RETVAL->r = 1.;
738	RETVAL->g = 1.;	861	RETVAL->g = 1.;
739	RETVAL->b = 1.;	862	RETVAL->b = 1.;
740	RETVAL->a = 1.;	863	RETVAL->a = 1.;
741	RETVAL->base_height = MIN_FONT_HEIGHT;	864	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
745	layout_update_font (RETVAL);	868	layout_update_font (RETVAL);
746	OUTPUT:	869	OUTPUT:
747	RETVAL	870	RETVAL
748		871
749	void	872	void
750	DESTROY (CFClient::Layout self)	873	DESTROY (CFPlus::Layout self)
751	CODE:	874	CODE:
752	g_object_unref (self->pl);	875	g_object_unref (self->pl);
753	Safefree (self);	876	Safefree (self);
754		877
755	int
756	is_rgba (CFClient::Layout self)
757	CODE:
758	RETVAL = self->rgba;
759	OUTPUT:
760	RETVAL
761
762	void	878	void
763	set_text (CFClient::Layout self, SV *text_)	879	set_text (CFPlus::Layout self, SV *text_)
764	CODE:	880	CODE:
765	{	881	{
766	STRLEN textlen;	882	STRLEN textlen;
767	char *text = SvPVutf8 (text_, textlen);	883	char *text = SvPVutf8 (text_, textlen);
768		884
769	pango_layout_set_text (self->pl, text, textlen);	885	pango_layout_set_text (self->pl, text, textlen);
770	}	886	}
771		887
772	void	888	void
773	set_markup (CFClient::Layout self, SV *text_)	889	set_markup (CFPlus::Layout self, SV *text_)
774	CODE:	890	CODE:
775	{	891	{
776	STRLEN textlen;	892	STRLEN textlen;
777	char *text = SvPVutf8 (text_, textlen);	893	char *text = SvPVutf8 (text_, textlen);
778		894
779	pango_layout_set_markup (self->pl, text, textlen);	895	pango_layout_set_markup (self->pl, text, textlen);
780	}	896	}
781		897
		898	void
		899	set_shapes (CFPlus::Layout self, ...)
		900	CODE:
		901	{
		902	PangoAttrList *attrs = 0;
		903	const char *text = pango_layout_get_text (self->pl);
		904	const char *pos = text;
		905	int arg = 4;
		906
		907	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		908	{
		909	PangoRectangle inkrect, rect;
		910	PangoAttribute *attr;
		911
		912	int x = SvIV (ST (arg - 3));
		913	int y = SvIV (ST (arg - 2));
		914	int w = SvIV (ST (arg - 1));
		915	int h = SvIV (ST (arg ));
		916
		917	inkrect.x = 0;
		918	inkrect.y = 0;
		919	inkrect.width = 0;
		920	inkrect.height = 0;
		921
		922	rect.x = x * PANGO_SCALE;
		923	rect.y = y * PANGO_SCALE;
		924	rect.width = w * PANGO_SCALE;
		925	rect.height = h * PANGO_SCALE;
		926
		927	if (!attrs)
		928	attrs = pango_layout_get_attributes (self->pl);
		929
		930	attr = pango_attr_shape_new (&inkrect, &rect);
		931	attr->start_index = pos - text;
		932	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		933	pango_attr_list_insert (attrs, attr);
		934
		935	arg += 4;
		936	pos += sizeof (OBJ_STR) - 1;
		937	}
		938
		939	if (attrs)
		940	pango_layout_set_attributes (self->pl, attrs);
		941	}
		942
		943	void
		944	get_shapes (CFPlus::Layout self)
		945	PPCODE:
		946	{
		947	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		948
		949	do
		950	{
		951	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		952
		953	if (run && shape_attr_p (run))
		954	{
		955	PangoRectangle extents;
		956	pango_layout_iter_get_run_extents (iter, 0, &extents);
		957
		958	EXTEND (SP, 2);
		959	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		960	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		961	}
		962	}
		963	while (pango_layout_iter_next_run (iter));
		964
		965	pango_layout_iter_free (iter);
		966	}
		967
		968	int
		969	has_wrapped (CFPlus::Layout self)
		970	CODE:
		971	{
		972	int lines = 1;
		973	const char *text = pango_layout_get_text (self->pl);
		974
		975	while (*text)
		976	lines += *text++ == '\n';
		977
		978	RETVAL = lines < pango_layout_get_line_count (self->pl);
		979	}
		980	OUTPUT:
		981	RETVAL
		982
782	SV *	983	SV *
783	get_text (CFClient::Layout self)	984	get_text (CFPlus::Layout self)
784	CODE:	985	CODE:
785	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	986	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786	SvUTF8_on (RETVAL);	987	sv_utf8_decode (RETVAL);
787	OUTPUT:	988	OUTPUT:
788	RETVAL	989	RETVAL
789		990
790	void	991	void
791	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	992	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
792	CODE:	993	CODE:
793	self->r = r;	994	self->r = r;
794	self->g = g;	995	self->g = g;
795	self->b = b;	996	self->b = b;
796	self->a = a;	997	self->a = a;
797		998
798	void	999	void
799	set_font (CFClient::Layout self, CFClient::Font font = 0)	1000	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800	CODE:	1001	CODE:
801	if (self->font != font)	1002	if (self->font != font)
802	{	1003	{
803	self->font = font;	1004	self->font = font;
804	layout_update_font (self);	1005	layout_update_font (self);
805	}	1006	}
806		1007
807	void	1008	void
808	set_height (CFClient::Layout self, int base_height)	1009	set_height (CFPlus::Layout self, int base_height)
809	CODE:	1010	CODE:
810	if (self->base_height != base_height)	1011	if (self->base_height != base_height)
811	{	1012	{
812	self->base_height = base_height;	1013	self->base_height = base_height;
813	layout_update_font (self);	1014	layout_update_font (self);
814	}	1015	}
815		1016
816	void	1017	void
817	set_width (CFClient::Layout self, int max_width = -1)	1018	set_width (CFPlus::Layout self, int max_width = -1)
818	CODE:	1019	CODE:
819	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1020	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
820		1021
821	void	1022	void
822	set_indent (CFClient::Layout self, int indent)	1023	set_indent (CFPlus::Layout self, int indent)
823	CODE:	1024	CODE:
824	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1025	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825		1026
826	void	1027	void
827	set_spacing (CFClient::Layout self, int spacing)	1028	set_spacing (CFPlus::Layout self, int spacing)
828	CODE:	1029	CODE:
829	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1030	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830		1031
831	void	1032	void
832	set_ellipsise (CFClient::Layout self, int ellipsise)	1033	set_ellipsise (CFPlus::Layout self, int ellipsise)
833	CODE:	1034	CODE:
834	pango_layout_set_ellipsize (self->pl,	1035	pango_layout_set_ellipsize (self->pl,
835	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1036	ellipsise == 1 ? PANGO_ELLIPSIZE_START
836	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1037	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1038	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
838	: PANGO_ELLIPSIZE_NONE	1039	: PANGO_ELLIPSIZE_NONE
839	);	1040	);
840		1041
841	void	1042	void
842	set_single_paragraph_mode (CFClient::Layout self, int spm)	1043	set_single_paragraph_mode (CFPlus::Layout self, int spm)
843	CODE:	1044	CODE:
844	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1045	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845		1046
846	void	1047	void
847	size (CFClient::Layout self)	1048	size (CFPlus::Layout self)
848	PPCODE:	1049	PPCODE:
849	{	1050	{
850	int w, h;	1051	int w, h;
851		1052
852	layout_get_pixel_size (self, &w, &h);	1053	layout_get_pixel_size (self, &w, &h);
…		…
855	PUSHs (sv_2mortal (newSViv (w)));	1056	PUSHs (sv_2mortal (newSViv (w)));
856	PUSHs (sv_2mortal (newSViv (h)));	1057	PUSHs (sv_2mortal (newSViv (h)));
857	}	1058	}
858		1059
859	int	1060	int
		1061	descent (CFPlus::Layout self)
		1062	CODE:
		1063	{
		1064	PangoRectangle rect;
		1065	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1066	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1067	RETVAL = PANGO_DESCENT (rect);
		1068	}
		1069	OUTPUT:
		1070	RETVAL
		1071
		1072	int
860	xy_to_index (CFClient::Layout self, int x, int y)	1073	xy_to_index (CFPlus::Layout self, int x, int y)
861	CODE:	1074	CODE:
862	{	1075	{
863	int index, trailing;	1076	int index, trailing;
864	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1077	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
865	RETVAL = index;	1078	RETVAL = index + trailing;
866	}	1079	}
867	OUTPUT:	1080	OUTPUT:
868	RETVAL	1081	RETVAL
869		1082
870	void	1083	void
871	cursor_pos (CFClient::Layout self, int index)	1084	cursor_pos (CFPlus::Layout self, int index)
872	PPCODE:	1085	PPCODE:
873	{	1086	{
874	PangoRectangle strong_pos;	1087	PangoRectangle strong_pos;
875	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1088	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876		1089
…		…
879	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1092	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1093	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881	}	1094	}
882		1095
883	void	1096	void
884	render (CFClient::Layout self)	1097	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
885	PPCODE:	1098	PPCODE:
886	{	1099	{
887	SV *retval;	1100	int line, x;
888	int w, h;
889		1101
890	layout_get_pixel_size (self, &w, &h);	1102	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1103	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
891		1104
892	if (self->rgba)
893	{
894	cairo_surface_t *surface;
895	cairo_t *cairo;
896
897	retval = newSV (w * h * 4);
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	{
915	uint32_t p = (uint32_t )SvPVX (retval);
916	uint32_t e = p + w h;
917
918	while (p < e)
919	{
920	uint32_t rgba = *p;
921	rgba = (rgba >> 24) \| (rgba << 8);
922	#if 0
923	#ifdef _WIN32
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
930	rgba = (rgba & 0xffffff00) \| a;
931	}
932	#endif
933	#endif
934	rgba = SDL_SwapBE32 (rgba);
935	*p++ = rgba;
936	}
937	}
938
939	EXTEND (SP, 5);	1105	EXTEND (SP, 2);
940	PUSHs (sv_2mortal (newSViv (w)));	1106	PUSHs (sv_2mortal (newSViv (line - 1)));
		1107	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1108	}
		1109
		1110	void
		1111	line_x_to_index (CFPlus::Layout self, int line, int x)
		1112	PPCODE:
		1113	{
		1114	PangoLayoutLine *lp;
		1115	int index, trailing;
		1116
		1117	if (line < 0)
		1118	XSRETURN_EMPTY;
		1119
		1120	if (!(lp = pango_layout_get_line (self->pl, line)))
		1121	XSRETURN_EMPTY; /* do better */
		1122
		1123	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1124
		1125	EXTEND (SP, 2);
		1126	if (GIMME_V == G_SCALAR)
941	PUSHs (sv_2mortal (newSViv (h)));	1127	PUSHs (sv_2mortal (newSViv (index + trailing)));
942	PUSHs (sv_2mortal (retval));
943	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945	}
946	else	1128	else
947	{	1129	{
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)));	1130	PUSHs (sv_2mortal (newSViv (index)));
967	PUSHs (sv_2mortal (newSViv (h)));	1131	PUSHs (sv_2mortal (newSViv (trailing)));
968	PUSHs (sv_2mortal (retval));
969	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971	}	1132	}
972	}	1133	}
973		1134
		1135	void
		1136	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1137	PPCODE:
		1138	pango_opengl_render_layout_subpixel (
		1139	self->pl,
		1140	x * PANGO_SCALE, y * PANGO_SCALE,
		1141	self->r, self->g, self->b, self->a,
		1142	flags
		1143	);
		1144
974	MODULE = CFClient PACKAGE = CFClient::Texture	1145	MODULE = CFPlus PACKAGE = CFPlus::Texture
975		1146
976	void	1147	void
		1148	pad2pot (SV data_, SV w_, SV *h_)
		1149	CODE:
		1150	{
		1151	int ow = SvIV (w_);
		1152	int oh = SvIV (h_);
		1153
		1154	if (ow && oh)
		1155	{
		1156	int nw = minpot (ow);
		1157	int nh = minpot (oh);
		1158
		1159	if (nw != ow \|\| nh != oh)
		1160	{
		1161	if (SvOK (data_))
		1162	{
		1163	STRLEN datalen;
		1164	char *data = SvPVbyte (data_, datalen);
		1165	int bpp = datalen / (ow * oh);
		1166	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1167
		1168	SvPOK_only (result_);
		1169	SvCUR_set (result_, nw * nh * bpp);
		1170
		1171	memset (SvPVX (result_), 0, nw * nh * bpp);
		1172	while (oh--)
		1173	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1174
		1175	sv_setsv (data_, result_);
		1176	}
		1177
		1178	sv_setiv (w_, nw);
		1179	sv_setiv (h_, nh);
		1180	}
		1181	}
		1182	}
		1183
		1184	void
977	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1185	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
978	PROTOTYPE: $$$;$$	1186	PROTOTYPE: $$$;$$
979	ALIAS:	1187	ALIAS:
980	draw_quad_alpha = 1	1188	draw_quad_alpha = 1
981	draw_quad_alpha_premultiplied = 2	1189	draw_quad_alpha_premultiplied = 2
982	CODE:	1190	CODE:
…		…
1020	glDisable (GL_ALPHA_TEST);	1228	glDisable (GL_ALPHA_TEST);
1021	glDisable (GL_BLEND);	1229	glDisable (GL_BLEND);
1022	}	1230	}
1023	}	1231	}
1024		1232
1025	MODULE = CFClient PACKAGE = CFClient::Map	1233	MODULE = CFPlus PACKAGE = CFPlus::Map
1026		1234
1027	CFClient::Map	1235	CFPlus::Map
1028	new (SV *class, int map_width, int map_height)	1236	new (SV *class)
1029	CODE:	1237	CODE:
1030	New (0, RETVAL, 1, struct map);	1238	New (0, RETVAL, 1, struct map);
1031	RETVAL->x = 0;	1239	RETVAL->x = 0;
1032	RETVAL->y = 0;	1240	RETVAL->y = 0;
1033	RETVAL->w = map_width;	1241	RETVAL->w = 0;
1034	RETVAL->h = map_height;	1242	RETVAL->h = 0;
1035	RETVAL->ox = 0;	1243	RETVAL->ox = 0;
1036	RETVAL->oy = 0;	1244	RETVAL->oy = 0;
1037	RETVAL->faces = 8192;	1245	RETVAL->faces = 8192;
1038	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1039	RETVAL->texs = 8192;	1247	RETVAL->texs = 8192;
…		…
1042	RETVAL->row = 0;	1250	RETVAL->row = 0;
1043	OUTPUT:	1251	OUTPUT:
1044	RETVAL	1252	RETVAL
1045		1253
1046	void	1254	void
1047	DESTROY (CFClient::Map self)	1255	DESTROY (CFPlus::Map self)
1048	CODE:	1256	CODE:
1049	{	1257	{
1050	map_clear (self);	1258	map_clear (self);
1051	Safefree (self->face);	1259	Safefree (self->face);
		1260	Safefree (self->tex);
1052	Safefree (self);	1261	Safefree (self);
1053	}	1262	}
1054		1263
1055	void	1264	void
		1265	resize (CFPlus::Map self, int map_width, int map_height)
		1266	CODE:
		1267	self->w = map_width;
		1268	self->h = map_height;
		1269
		1270	void
1056	clear (CFClient::Map self)	1271	clear (CFPlus::Map self)
1057	CODE:	1272	CODE:
1058	map_clear (self);	1273	map_clear (self);
1059		1274
1060	void	1275	void
1061	set_face (CFClient::Map self, int face, int texid)	1276	set_face (CFPlus::Map self, int face, int texid)
1062	CODE:	1277	CODE:
1063	{	1278	{
1064	while (self->faces <= face)	1279	while (self->faces <= face)
1065	{	1280	{
1066	Append (mapface, self->face, self->faces, self->faces);	1281	Append (mapface, self->face, self->faces, self->faces);
…		…
1069		1284
1070	self->face [face] = texid;	1285	self->face [face] = texid;
1071	}	1286	}
1072		1287
1073	void	1288	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)	1289	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:	1290	CODE:
1076	{	1291	{
1077	while (self->texs <= texid)	1292	while (self->texs <= texid)
1078	{	1293	{
1079	Append (maptex, self->tex, self->texs, self->texs);	1294	Append (maptex, self->tex, self->texs, self->texs);
…		…
1103	// from transparent color bleeding and ugly wrapping effects.	1318	// from transparent color bleeding and ugly wrapping effects.
1104	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1319	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105	}	1320	}
1106		1321
1107	int	1322	int
1108	ox (CFClient::Map self)	1323	ox (CFPlus::Map self)
1109	ALIAS:	1324	ALIAS:
1110	oy = 1	1325	oy = 1
1111	x = 2	1326	x = 2
1112	y = 3	1327	y = 3
1113	w = 4	1328	w = 4
…		…
1124	}	1339	}
1125	OUTPUT:	1340	OUTPUT:
1126	RETVAL	1341	RETVAL
1127		1342
1128	void	1343	void
1129	scroll (CFClient::Map self, int dx, int dy)	1344	scroll (CFPlus::Map self, int dx, int dy)
1130	CODE:	1345	CODE:
1131	{	1346	{
1132	if (dx > 0)	1347	if (dx > 0)
1133	map_blank (self, self->x, self->y, dx - 1, self->h);	1348	map_blank (self, self->x, self->y, dx, self->h);
1134	else if (dx < 0)	1349	else if (dx < 0)
1135	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1350	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1136		1351
1137	if (dy > 0)	1352	if (dy > 0)
1138	map_blank (self, self->x, self->y, self->w, dy - 1);	1353	map_blank (self, self->x, self->y, self->w, dy);
1139	else if (dy < 0)	1354	else if (dy < 0)
1140	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1355	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1141		1356
1142	self->ox += dx; self->x += dx;	1357	self->ox += dx; self->x += dx;
1143	self->oy += dy; self->y += dy;	1358	self->oy += dy; self->y += dy;
1144		1359
1145	while (self->y < 0)	1360	while (self->y < 0)
…		…
1150	self->y += MAP_EXTEND_Y;	1365	self->y += MAP_EXTEND_Y;
1151	}	1366	}
1152	}	1367	}
1153		1368
1154	void	1369	void
1155	map1a_update (CFClient::Map self, SV *data_)	1370	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156	CODE:	1371	CODE:
1157	{	1372	{
1158	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1373	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1159	uint8_t data_end = (uint8_t )SvEND (data_);	1374	uint8_t data_end = (uint8_t )SvEND (data_);
1160	mapcell *cell;	1375	mapcell *cell;
1161	int x, y, flags;	1376	int x, y, flags;
1162		1377
1163	while (data < data_end)	1378	while (data < data_end - 1)
1164	{	1379	{
1165	flags = (data [0] << 8) + data [1]; data += 2;	1380	flags = (data [0] << 8) + data [1]; data += 2;
1166		1381
1167	x = ((flags >> 10) & 63) + self->x;	1382	x = self->x + ((flags >> 10) & 63);
1168	y = ((flags >> 4) & 63) + self->y;	1383	y = self->y + ((flags >> 4) & 63);
1169		1384
1170	cell = map_get_cell (self, x, y);	1385	cell = map_get_cell (self, x, y);
1171		1386
1172	if (flags & 15)	1387	if (flags & 15)
1173	{	1388	{
1174	if (cell->darkness < 0)	1389	if (!cell->darkness)
1175	{	1390	{
		1391	memset (cell, 0, sizeof (*cell));
1176	cell->darkness = 0;	1392	cell->darkness = 256;
1177	cell->face [0] = 0;
1178	cell->face [1] = 0;
1179	cell->face [2] = 0;
1180	}	1393	}
1181		1394
1182	cell->darkness = flags & 8 ? *data++ : 255;
1183
1184	//TODO: don't trust server data to be in-range(!)	1395	//TODO: don't trust server data to be in-range(!)
		1396
		1397	if (flags & 8)
		1398	{
		1399	if (extmap)
		1400	{
		1401	uint8_t ext, cmd;
		1402
		1403	do
		1404	{
		1405	ext = *data++;
		1406	cmd = ext & 0x3f;
		1407
		1408	if (cmd < 4)
		1409	cell->darkness = 255 - ext * 64 + 1;
		1410	else if (cmd == 5) // health
		1411	{
		1412	cell->stat_width = 1;
		1413	cell->stat_hp = *data++;
		1414	}
		1415	else if (cmd == 6) // monster width
		1416	cell->stat_width = *data++ + 1;
		1417	else if (cmd == 0x47)
		1418	{
		1419	if (*data == 8)
		1420	; // decode player uuid
		1421
		1422	data += *data + 1;
		1423	}
		1424	else if (cmd == 8) // cell flags
		1425	cell->flags = *data++;
		1426	else if (ext & 0x40) // unknown, multibyte => skip
		1427	data += *data + 1;
		1428	else
		1429	data++;
		1430	}
		1431	while (ext & 0x80);
		1432	}
		1433	else
		1434	cell->darkness = *data++ + 1;
		1435	}
1185		1436
1186	if (flags & 4)	1437	if (flags & 4)
1187	{	1438	{
1188	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1439	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1189	}	1440	}
…		…
1197	{	1448	{
1198	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1449	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1199	}	1450	}
1200	}	1451	}
1201	else	1452	else
1202	cell->darkness = -1;	1453	cell->darkness = 0;
1203	}	1454	}
1204	}	1455	}
1205		1456
1206	SV *	1457	SV *
1207	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1458	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1208	CODE:	1459	CODE:
1209	{	1460	{
1210	int x1, x;	1461	int x1, x;
1211	int y1, y;	1462	int y1, y;
1212	int z;	1463	int z;
…		…
1262	}	1513	}
1263	OUTPUT:	1514	OUTPUT:
1264	RETVAL	1515	RETVAL
1265		1516
1266	void	1517	void
1267	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1518	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1268	PPCODE:	1519	CODE:
1269	{	1520	{
1270	int vx, vy;
1271	int x, y, z;	1521	int x, y, z;
1272	int last_name;	1522	int last_name;
1273	mapface face;	1523	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
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;
1283	vy = self->y + (self->h - sh) / 2 - shift_y;
1284
1285	/*
1286	int vx = self->vx = self->w >= sw
1287	? self->x + (self->w - sw) / 2
1288	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1289
1290	int vy = self->vy = self->h >= sh
1291	? self->y + (self->h - sh) / 2
1292	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1293	*/
1294		1524
1295	glColor4ub (255, 255, 255, 255);	1525	glColor4ub (255, 255, 255, 255);
1296		1526
		1527	glEnable (GL_BLEND);
1297	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298	glEnable (GL_BLEND);
1299	glEnable (GL_TEXTURE_2D);	1529	glEnable (GL_TEXTURE_2D);
1300	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1530	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301		1531
1302	glBegin (GL_QUADS);	1532	glBegin (GL_QUADS);
1303		1533
1304	last_name = 0;	1534	last_name = 0;
1305		1535
		1536	mx += self->x;
		1537	my += self->y;
		1538
1306	for (z = 0; z < 3; z++)	1539	for (z = 0; z < 3; z++)
1307	for (y = 0; y < sh; y++)	1540	for (y = 0; y < sh; y++)
1308	if (0 <= y + vy && y + vy < self->rows)	1541	if (0 <= y + my && y + my < self->rows)
1309	{	1542	{
1310	maprow *row = self->row + (y + vy);	1543	maprow *row = self->row + (y + my);
1311		1544
1312	for (x = 0; x < sw; x++)	1545	for (x = 0; x < sw; x++)
1313	if (row->c0 <= x + vx && x + vx < row->c1)	1546	if (row->c0 <= x + mx && x + mx < row->c1)
1314	{	1547	{
1315	mapcell *cell = row->col + (x + vx - row->c0);	1548	mapcell *cell = row->col + (x + mx - row->c0);
1316
1317	darkness[y * sw4 + x] = cell->darkness < 0
1318	? 255 - FOW_DARKNESS
1319	: 255 - cell->darkness;
1320		1549
1321	face = cell->face [z];	1550	face = cell->face [z];
1322		1551
1323	if (face)	1552	if (face && face < self->texs)
1324	{	1553	{
1325	maptex tex = self->tex [face];	1554	maptex tex = self->tex [face];
1326
1327	int px = (x + 1) * 32 - tex.w;	1555	int px = (x + 1) * T - tex.w;
1328	int py = (y + 1) * 32 - tex.h;	1556	int py = (y + 1) * T - tex.h;
1329		1557
1330	if (last_name != tex.name)	1558	if (last_name != tex.name)
1331	{	1559	{
1332	glEnd ();	1560	glEnd ();
1333	last_name = tex.name;
1334	glBindTexture (GL_TEXTURE_2D, last_name);	1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1335	glBegin (GL_QUADS);	1562	glBegin (GL_QUADS);
1336	}	1563	}
1337		1564
1338	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1565	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1339	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1566	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1340	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1567	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1341	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1568	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1342	}	1569	}
		1570
		1571	if (cell->flags && z == 2)
		1572	{
		1573	if (cell->flags & 1)
		1574	{
		1575	maptex tex = self->tex [1];
		1576	int px = (x + 1) * T - tex.w + 2;
		1577	int py = (y + 1) * T - tex.h - 6;
		1578
		1579	glEnd ();
		1580	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1581	glBegin (GL_QUADS);
		1582
		1583	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1584	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1585	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1586	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1587	}
		1588	}
1343	}	1589	}
1344	}	1590	}
1345		1591
1346	glEnd ();	1592	glEnd ();
1347		1593
1348	glDisable (GL_TEXTURE_2D);	1594	glDisable (GL_TEXTURE_2D);
1349	glDisable (GL_BLEND);	1595	glDisable (GL_BLEND);
		1596
		1597	// top layer: overlays such as the health bar
		1598	for (y = 0; y < sh; y++)
		1599	if (0 <= y + my && y + my < self->rows)
		1600	{
		1601	maprow *row = self->row + (y + my);
		1602
		1603	for (x = 0; x < sw; x++)
		1604	if (row->c0 <= x + mx && x + mx < row->c1)
		1605	{
		1606	mapcell *cell = row->col + (x + mx - row->c0);
		1607
		1608	int px = x * T;
		1609	int py = y * T;
		1610
		1611	if (cell->stat_hp)
		1612	{
		1613	int width = cell->stat_width * T;
		1614	int thick = sh / 28 + 1 + cell->stat_width;
		1615
		1616	glColor3ub (0, 0, 0);
		1617	glRectf (px + 1, py - thick - 2,
		1618	px + width - 1, py);
		1619
		1620	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1621	glRectf (px + 2,
		1622	py - thick - 1,
		1623	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1624	}
		1625	}
		1626	}
		1627	}
		1628
		1629	void
		1630	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1631	CODE:
		1632	{
		1633	static float color[16][3] = {
		1634	{ 0.00F, 0.00F, 0.00F },
		1635	{ 1.00F, 1.00F, 1.00F },
		1636	{ 0.00F, 0.00F, 0.55F },
		1637	{ 1.00F, 0.00F, 0.00F },
		1638
		1639	{ 1.00F, 0.54F, 0.00F },
		1640	{ 0.11F, 0.56F, 1.00F },
		1641	{ 0.93F, 0.46F, 0.00F },
		1642	{ 0.18F, 0.54F, 0.34F },
		1643
		1644	{ 0.56F, 0.73F, 0.56F },
		1645	{ 0.80F, 0.80F, 0.80F },
		1646	{ 0.55F, 0.41F, 0.13F },
		1647	{ 0.99F, 0.77F, 0.26F },
		1648
		1649	{ 0.74F, 0.65F, 0.41F },
		1650
		1651	{ 0.00F, 1.00F, 1.00F },
		1652	{ 1.00F, 0.00F, 1.00F },
		1653	{ 1.00F, 1.00F, 0.00F },
		1654	};
		1655
		1656	int x, y;
		1657
		1658	glEnable (GL_TEXTURE_2D);
		1659	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1660	glEnable (GL_BLEND);
		1661	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1662	glBegin (GL_QUADS);
		1663
		1664	for (y = 0; y < h; y++)
		1665	for (x = 0; x < w; x++)
		1666	{
		1667	unsigned char m = data [x + y * w];
		1668
		1669	if (m)
		1670	{
		1671	float *c = color [m & 15];
		1672
		1673	float tx1 = m & 0x40 ? 0.5 : 0.;
		1674	float tx2 = tx1 + 0.5;
		1675
		1676	glColor4f (c[0], c[1], c[2], 0.75);
		1677	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1678	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1679	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1680	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1681	}
		1682	}
		1683
		1684	glEnd ();
		1685	glDisable (GL_BLEND);
		1686	glDisable (GL_TEXTURE_2D);
		1687	}
		1688
		1689	void
		1690	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1691	PPCODE:
		1692	{
		1693	int x, y;
		1694	int sw4 = (sw + 3) & ~3;
		1695	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1696	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1697
		1698	memset (darkness, 255, sw4 * sh);
		1699	SvPOK_only (darkness_sv);
		1700	SvCUR_set (darkness_sv, sw4 * sh);
		1701
		1702	mx += self->x;
		1703	my += self->y;
		1704
		1705	for (y = 0; y < sh; y++)
		1706	if (0 <= y + my && y + my < self->rows)
		1707	{
		1708	maprow *row = self->row + (y + my);
		1709
		1710	for (x = 0; x < sw; x++)
		1711	if (row->c0 <= x + mx && x + mx < row->c1)
		1712	{
		1713	mapcell *cell = row->col + (x + mx - row->c0);
		1714
		1715	darkness[y * sw4 + x] = cell->darkness
		1716	? 255 - (cell->darkness - 1)
		1717	: 255 - FOW_DARKNESS;
		1718	}
		1719	}
1350		1720
1351	EXTEND (SP, 3);	1721	EXTEND (SP, 3);
1352	PUSHs (sv_2mortal (newSViv (sw4)));	1722	PUSHs (sv_2mortal (newSViv (sw4)));
1353	PUSHs (sv_2mortal (newSViv (sh)));	1723	PUSHs (sv_2mortal (newSViv (sh)));
1354	PUSHs (darkness_sv);	1724	PUSHs (darkness_sv);
1355	}	1725	}
1356		1726
1357	SV *	1727	SV *
1358	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1728	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1359	CODE:	1729	CODE:
1360	{	1730	{
1361	int x, y, x1, y1;	1731	int x, y, x1, y1;
1362	SV data_sv = newSV (w h * 7 + 5);	1732	SV data_sv = newSV (w h * 7 + 5);
1363	uint8_t data = (uint8_t )SvPVX (data_sv);	1733	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1425	}	1795	}
1426	OUTPUT:	1796	OUTPUT:
1427	RETVAL	1797	RETVAL
1428		1798
1429	void	1799	void
1430	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1800	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1431	PPCODE:	1801	PPCODE:
1432	{	1802	{
1433	int x, y, z;	1803	int x, y, z;
1434	int w, h;	1804	int w, h;
1435	int x1, y1;	1805	int x1, y1;
…		…
1467		1837
1468	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1838	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1469	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1839	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1470	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1840	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1471		1841
1472	if (cell->darkness <= 0)	1842	if (cell->darkness == 0)
1473	{	1843	{
1474	cell->darkness = -1;	1844	cell->darkness = 0;
1475		1845
1476	for (z = 0; z <= 2; z++)	1846	for (z = 0; z <= 2; z++)
1477	{	1847	{
1478	cell->face[z] = face[z];	1848	cell->face[z] = face[z];
1479		1849
…		…
1484	}	1854	}
1485	}	1855	}
1486	}	1856	}
1487	}	1857	}
1488		1858
1489	MODULE = CFClient PACKAGE = CFClient::MixChunk	1859	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490		1860
1491	CFClient::MixChunk	1861	CFPlus::MixChunk
1492	new_from_file (SV class, char path)	1862	new_from_file (SV class, char path)
1493	CODE:	1863	CODE:
1494	RETVAL = Mix_LoadWAV (path);	1864	RETVAL = Mix_LoadWAV (path);
1495	OUTPUT:	1865	OUTPUT:
1496	RETVAL	1866	RETVAL
1497		1867
1498	void	1868	void
1499	DESTROY (CFClient::MixChunk self)	1869	DESTROY (CFPlus::MixChunk self)
1500	CODE:	1870	CODE:
1501	Mix_FreeChunk (self);	1871	Mix_FreeChunk (self);
1502		1872
1503	int	1873	int
1504	volume (CFClient::MixChunk self, int volume = -1)	1874	volume (CFPlus::MixChunk self, int volume = -1)
1505	CODE:	1875	CODE:
1506	RETVAL = Mix_VolumeChunk (self, volume);	1876	RETVAL = Mix_VolumeChunk (self, volume);
1507	OUTPUT:	1877	OUTPUT:
1508	RETVAL	1878	RETVAL
1509		1879
1510	int	1880	int
1511	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1881	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1512	CODE:	1882	CODE:
1513	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1883	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514	OUTPUT:	1884	OUTPUT:
1515	RETVAL	1885	RETVAL
1516		1886
1517	MODULE = CFClient PACKAGE = CFClient::MixMusic	1887	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518		1888
1519	int	1889	int
1520	volume (int volume = -1)	1890	volume (int volume = -1)
1521	CODE:	1891	CODE:
1522	RETVAL = Mix_VolumeMusic (volume);	1892	RETVAL = Mix_VolumeMusic (volume);
1523	OUTPUT:	1893	OUTPUT:
1524	RETVAL	1894	RETVAL
1525		1895
1526	CFClient::MixMusic	1896	CFPlus::MixMusic
1527	new_from_file (SV class, char path)	1897	new_from_file (SV class, char path)
1528	CODE:	1898	CODE:
1529	RETVAL = Mix_LoadMUS (path);	1899	RETVAL = Mix_LoadMUS (path);
1530	OUTPUT:	1900	OUTPUT:
1531	RETVAL	1901	RETVAL
1532		1902
1533	void	1903	void
1534	DESTROY (CFClient::MixMusic self)	1904	DESTROY (CFPlus::MixMusic self)
1535	CODE:	1905	CODE:
1536	Mix_FreeMusic (self);	1906	Mix_FreeMusic (self);
1537		1907
1538	int	1908	int
1539	play (CFClient::MixMusic self, int loops = -1)	1909	play (CFPlus::MixMusic self, int loops = -1)
1540	CODE:	1910	CODE:
1541	RETVAL = Mix_PlayMusic (self, loops);	1911	RETVAL = Mix_PlayMusic (self, loops);
1542	OUTPUT:	1912	OUTPUT:
1543	RETVAL	1913	RETVAL
1544		1914
1545	MODULE = CFClient PACKAGE = CFClient::OpenGL	1915	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546		1916
1547	BOOT:	1917	BOOT:
1548	{	1918	{
1549	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1919	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550	static const struct {	1920	static const struct {
1551	const char *name;	1921	const char *name;
1552	IV iv;	1922	IV iv;
1553	} *civ, const_iv[] = {	1923	} *civ, const_iv[] = {
1554	# define const_iv(name) { # name, (IV)name }	1924	# define const_iv(name) { # name, (IV)name }
…		…
1561	const_iv (GL_SCISSOR_TEST),	1931	const_iv (GL_SCISSOR_TEST),
1562	const_iv (GL_DEPTH_TEST),	1932	const_iv (GL_DEPTH_TEST),
1563	const_iv (GL_ALPHA_TEST),	1933	const_iv (GL_ALPHA_TEST),
1564	const_iv (GL_NORMALIZE),	1934	const_iv (GL_NORMALIZE),
1565	const_iv (GL_RESCALE_NORMAL),	1935	const_iv (GL_RESCALE_NORMAL),
		1936	const_iv (GL_FRONT),
		1937	const_iv (GL_BACK),
1566	const_iv (GL_AND),	1938	const_iv (GL_AND),
1567	const_iv (GL_ONE),	1939	const_iv (GL_ONE),
1568	const_iv (GL_ZERO),	1940	const_iv (GL_ZERO),
1569	const_iv (GL_SRC_ALPHA),	1941	const_iv (GL_SRC_ALPHA),
1570	const_iv (GL_DST_ALPHA),	1942	const_iv (GL_DST_ALPHA),
1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1943	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572	const_iv (GL_ONE_MINUS_DST_ALPHA),	1944	const_iv (GL_ONE_MINUS_DST_ALPHA),
1573	const_iv (GL_SRC_ALPHA_SATURATE),	1945	const_iv (GL_SRC_ALPHA_SATURATE),
1574	const_iv (GL_RGB),	1946	const_iv (GL_RGB),
1575	const_iv (GL_RGBA),	1947	const_iv (GL_RGBA),
		1948	const_iv (GL_RGBA4),
		1949	const_iv (GL_RGBA8),
		1950	const_iv (GL_RGB5_A1),
1576	const_iv (GL_UNSIGNED_BYTE),	1951	const_iv (GL_UNSIGNED_BYTE),
1577	const_iv (GL_UNSIGNED_SHORT),	1952	const_iv (GL_UNSIGNED_SHORT),
1578	const_iv (GL_UNSIGNED_INT),	1953	const_iv (GL_UNSIGNED_INT),
1579	const_iv (GL_ALPHA),	1954	const_iv (GL_ALPHA),
1580	const_iv (GL_INTENSITY),	1955	const_iv (GL_INTENSITY),
…		…
1612	const_iv (GL_SEPARABLE_2D),	1987	const_iv (GL_SEPARABLE_2D),
1613	const_iv (GL_CONVOLUTION_2D),	1988	const_iv (GL_CONVOLUTION_2D),
1614	const_iv (GL_CONVOLUTION_BORDER_MODE),	1989	const_iv (GL_CONVOLUTION_BORDER_MODE),
1615	const_iv (GL_CONSTANT_BORDER),	1990	const_iv (GL_CONSTANT_BORDER),
1616	const_iv (GL_LINES),	1991	const_iv (GL_LINES),
		1992	const_iv (GL_LINE_STRIP),
1617	const_iv (GL_LINE_LOOP),	1993	const_iv (GL_LINE_LOOP),
1618	const_iv (GL_QUADS),	1994	const_iv (GL_QUADS),
1619	const_iv (GL_QUAD_STRIP),	1995	const_iv (GL_QUAD_STRIP),
1620	const_iv (GL_TRIANGLES),	1996	const_iv (GL_TRIANGLES),
1621	const_iv (GL_TRIANGLE_STRIP),	1997	const_iv (GL_TRIANGLE_STRIP),
…		…
1654	OUTPUT:	2030	OUTPUT:
1655	RETVAL	2031	RETVAL
1656		2032
1657	int glGetError ()	2033	int glGetError ()
1658		2034
		2035	void glFinish ()
		2036
1659	void glClear (int mask)	2037	void glClear (int mask)
1660		2038
1661	void glClearColor (float r, float g, float b, float a = 1.0)	2039	void glClearColor (float r, float g, float b, float a = 1.0)
1662	PROTOTYPE: @	2040	PROTOTYPE: @
1663		2041
…		…
1686	void glPushMatrix ()	2064	void glPushMatrix ()
1687		2065
1688	void glPopMatrix ()	2066	void glPopMatrix ()
1689		2067
1690	void glLoadIdentity ()	2068	void glLoadIdentity ()
		2069
		2070	void glDrawBuffer (int buffer)
		2071
		2072	void glReadBuffer (int buffer)
1691		2073
1692	# near_ and far_ are due to microsofts buggy "c" compiler	2074	# 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_)	2075	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694		2076
1695	# near_ and far_ are due to microsofts buggy "c" compiler	2077	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1725	r *= a;	2107	r *= a;
1726	g *= a;	2108	g *= a;
1727	b *= a;	2109	b *= a;
1728	}	2110	}
1729	// microsoft visual "c" rounds instead of truncating...	2111	// microsoft visual "c" rounds instead of truncating...
1730	glColor4ub (MIN ((int)(r * 256.f), 255),	2112	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		2113
1735	void glInterleavedArrays (int format, int stride, char *data)	2114	void glInterleavedArrays (int format, int stride, char *data)
1736		2115
1737	void glDrawElements (int mode, int count, int type, char *indices)	2116	void glDrawElements (int mode, int count, int type, char *indices)
1738		2117
…		…
1815		2194
1816	void glEndList ()	2195	void glEndList ()
1817		2196
1818	void glCallList (int list)	2197	void glCallList (int list)
1819		2198
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.171 by root, Sun Apr 1 01:19:18 2007 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.171 by root, Sun Apr 1 01:19:18 2007 UTC