ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.176 by root, Tue Apr 10 09:39:48 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>
15	#include <stdlib.h>	23	#include <stdlib.h>
16		24
…		…
18	#include <SDL_endian.h>	26	#include <SDL_endian.h>
19	#include <SDL_image.h>	27	#include <SDL_image.h>
20	#include <SDL_mixer.h>	28	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	29	#include <SDL_opengl.h>
22		30
		31	#define PANGO_ENABLE_BACKEND
		32	#define G_DISABLE_CAST_CHECKS
		33
23	#include <glib/gmacros.h>	34	#include <glib/gmacros.h>
24		35
25	#include <pango/pango.h>	36	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		37
30	#ifndef _WIN32	38	#ifndef _WIN32
31	# include <sys/types.h>	39	# include <sys/types.h>
32	# include <sys/socket.h>	40	# include <sys/socket.h>
33	# include <netinet/in.h>	41	# include <netinet/in.h>
34	# include <netinet/tcp.h>	42	# include <netinet/tcp.h>
35	# include <inttypes.h>	43	# include <inttypes.h>
36	#else
37	typedef unsigned char uint8_t;
38	typedef unsigned short uint16_t;
39	typedef unsigned int uint32_t;
40	typedef signed char int8_t;
41	typedef signed short int16_t;
42	typedef signed int int32_t;
43	#endif	44	#endif
44		45
45	#include "glext.h"	46	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46		47
47	#define FOW_DARKNESS 32	48	#define FOW_DARKNESS 32
48		49
49	#define MAP_EXTEND_X 32	50	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	51	#define MAP_EXTEND_Y 512
51		52
52	#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
53		60
54	static struct	61	static struct
55	{	62	{
56	#define GL_FUNC(ptr,name) ptr name;	63	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	64	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	74	else
68	glBlendFunc (sa, da);	75	glBlendFunc (sa, da);
69	}	76	}
70		77
		78	#include "texcache.c"
		79
		80	#include "pango-font.c"
		81	#include "pango-fontmap.c"
		82	#include "pango-render.c"
		83
71	typedef Mix_Chunk *CFClient__MixChunk;	84	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	85	typedef Mix_Music *CFPlus__MixMusic;
73		86
74	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	}
75		106
76	typedef struct cf_layout {	107	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	108	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	109	float r, g, b, a; // default color for rgba mode
80	int base_height;	110	int base_height;
81	CFClient__Font font;	111	CFPlus__Font font;
82	} *CFClient__Layout;	112	} *CFPlus__Layout;
83		113
84	static CFClient__Font default_font;	114	static CFPlus__Font default_font;
85	static PangoContext *ft2_context, *cairo_context;	115	static PangoContext *opengl_context;
86	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	116	static PangoFontMap *opengl_fontmap;
87		117
88	static void	118	static void
89	substitute_func (FcPattern *pattern, gpointer data)	119	substitute_func (FcPattern *pattern, gpointer data)
90	{	120	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	121	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	122	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	123	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	124	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	125	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	126	}
101		127
102	static void	128	static void
103	layout_update_font (CFClient__Layout self)	129	layout_update_font (CFPlus__Layout self)
104	{	130	{
105	/* 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
106	* reasonably well with bitstream vera	132	* reasonably well with bitstream vera
107	*/	133	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	134	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		138
113	pango_layout_set_font_description (self->pl, font);	139	pango_layout_set_font_description (self->pl, font);
114	}	140	}
115		141
116	static void	142	static void
117	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	143	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118	{	144	{
		145	PangoRectangle rect;
		146
		147	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	148	pango_layout_get_extents (self->pl, 0, &rect);
120		149
121	if (!*w) *w = 1;	150	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!*h) *h = 1;	151	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		152
124	*w = (*w + 3) & ~3;	153	if (!rect.width) rect.width = 1;
125	}	154	if (!rect.height) rect.height = 1;
126		155
		156	*w = rect.width;
		157	*h = rect.height;
		158	}
		159
		160	typedef uint16_t tileid;
127	typedef uint16_t mapface;	161	typedef uint16_t faceid;
128		162
129	typedef struct {	163	typedef struct {
130	GLint name;	164	int name;
131	int w, h;	165	int w, h;
132	float s, t;	166	float s, t;
133	uint8_t r, g, b, a;	167	uint8_t r, g, b, a;
		168	tileid smoothtile;
		169	uint8_t smoothlevel;
134	} maptex;	170	} maptex;
135		171
136	typedef struct {	172	typedef struct {
		173	uint32_t player;
		174	tileid tile[3];
137	int16_t darkness;	175	uint16_t darkness;
138	mapface face[3];	176	uint8_t stat_width, stat_hp, flags, smoothmax;
139	} mapcell;	177	} mapcell;
140		178
141	typedef struct {	179	typedef struct {
142	int32_t c0, c1;	180	int32_t c0, c1;
143	mapcell *col;	181	mapcell *col;
144	} maprow;	182	} maprow;
145		183
146	typedef struct map {	184	typedef struct map {
147	int x, y, w, h;	185	int x, y, w, h;
148	int ox, oy; /* offset to virtual global coordinate system */	186	int ox, oy; /* offset to virtual global coordinate system */
149	int faces;	187	int faces; tileid *face2tile; // [faceid]
150	mapface *face;	188	int texs; maptex *tex; // [tileid]
151
152	int texs;
153	maptex *tex;
154		189
155	int32_t rows;	190	int32_t rows;
156	maprow *row;	191	maprow *row;
157	} *CFClient__Map;	192	} *CFPlus__Map;
158		193
159	static char *	194	static char *
160	prepend (char *ptr, int sze, int inc)	195	prepend (char *ptr, int sze, int inc)
161	{	196	{
162	char *p;	197	char *p;
…		…
179	}	214	}
180		215
181	#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))
182	#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))
183		218
		219	static void
		220	need_facenum (struct map *self, faceid face)
		221	{
		222	while (self->faces <= face)
		223	{
		224	Append (tileid, self->face2tile, self->faces, self->faces);
		225	self->faces *= 2;
		226	}
		227	}
		228
		229	static void
		230	need_texid (struct map *self, int texid)
		231	{
		232	while (self->texs <= texid)
		233	{
		234	Append (maptex, self->tex, self->texs, self->texs);
		235	self->texs *= 2;
		236	}
		237	}
		238
184	static maprow *	239	static maprow *
185	map_get_row (CFClient__Map self, int y)	240	map_get_row (CFPlus__Map self, int y)
186	{	241	{
187	if (0 > y)	242	if (0 > y)
188	{	243	{
189	int extend = - y + MAP_EXTEND_Y;	244	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	245	Prepend (maprow, self->row, self->rows, extend);
…		…
228		283
229	return row->col + (x - row->c0);	284	return row->col + (x - row->c0);
230	}	285	}
231		286
232	static mapcell *	287	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	288	map_get_cell (CFPlus__Map self, int x, int y)
234	{	289	{
235	return row_get_cell (map_get_row (self, y), x);	290	return row_get_cell (map_get_row (self, y), x);
236	}	291	}
237		292
238	static void	293	static void
239	map_clear (CFClient__Map self)	294	map_clear (CFPlus__Map self)
240	{	295	{
241	int r;	296	int r;
242		297
243	for (r = 0; r < self->rows; r++)	298	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	299	Safefree (self->row[r].col);
…		…
252	self->row = 0;	307	self->row = 0;
253	self->rows = 0;	308	self->rows = 0;
254	}	309	}
255		310
256	static void	311	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	312	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	313	{
259	int x, y;	314	int x, y;
260	maprow *row;	315	maprow *row;
		316	mapcell *cell;
261		317
262	for (y = y0; y < y0 + h; y++)	318	for (y = y0; y < y0 + h; y++)
263	if (y >= 0)	319	if (y >= 0)
264	{	320	{
265	if (y >= self->rows)	321	if (y >= self->rows)
…		…
271	if (x >= row->c0)	327	if (x >= row->c0)
272	{	328	{
273	if (x >= row->c1)	329	if (x >= row->c1)
274	break;	330	break;
275		331
276	row->col[x - row->c0].darkness = -1;	332	cell = row->col + x - row->c0;
		333
		334	cell->darkness = 0;
		335	cell->stat_hp = 0;
		336	cell->flags = 0;
		337	cell->player = 0;
277	}	338	}
278	}	339	}
		340	}
		341
		342	typedef struct {
		343	tileid tile;
		344	uint8_t x, y, level;
		345	} smooth_key;
		346
		347	static void
		348	smooth_or_bits (HV *hv, smooth_key *key, IV bits)
		349	{
		350	SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1);
		351
		352	if (SvIOK (*sv))
		353	SvIV_set (*sv, SvIVX (*sv) | bits);
		354	else
		355	sv_setiv (*sv, bits);
279	}	356	}
280		357
281	static void	358	static void
282	music_finished (void)	359	music_finished (void)
283	{	360	{
…		…
302	ev.data2 = 0;	379	ev.data2 = 0;
303		380
304	SDL_PushEvent ((SDL_Event *)&ev);	381	SDL_PushEvent ((SDL_Event *)&ev);
305	}	382	}
306		383
		384	static unsigned int
		385	minpot (unsigned int n)
		386	{
		387	if (!n)
		388	return 0;
		389
		390	--n;
		391
		392	n |= n >> 1;
		393	n |= n >> 2;
		394	n |= n >> 4;
		395	n |= n >> 8;
		396	n |= n >> 16;
		397
		398	return n + 1;
		399	}
		400
		401	/* SDL should provide this, really. */
		402	#define SDLK_MODIFIER_MIN 300
		403	#define SDLK_MODIFIER_MAX 314
		404
307	MODULE = CFClient PACKAGE = CFClient	405	MODULE = CFPlus PACKAGE = CFPlus
308		406
309	PROTOTYPES: ENABLE	407	PROTOTYPES: ENABLE
310		408
311	BOOT:	409	BOOT:
312	{	410	{
313	HV *stash = gv_stashpv ("CFClient", 1);	411	HV *stash = gv_stashpv ("CFPlus", 1);
314	static const struct {	412	static const struct {
315	const char *name;	413	const char *name;
316	IV iv;	414	IV iv;
317	} *civ, const_iv[] = {	415	} *civ, const_iv[] = {
318	# define const_iv(name) { # name, (IV)name }	416	# define const_iv(name) { # name, (IV)name }
		417	const_iv (SDLK_MODIFIER_MIN),
		418	const_iv (SDLK_MODIFIER_MAX),
		419
319	const_iv (SDL_ACTIVEEVENT),	420	const_iv (SDL_ACTIVEEVENT),
320	const_iv (SDL_KEYDOWN),	421	const_iv (SDL_KEYDOWN),
321	const_iv (SDL_KEYUP),	422	const_iv (SDL_KEYUP),
322	const_iv (SDL_MOUSEMOTION),	423	const_iv (SDL_MOUSEMOTION),
323	const_iv (SDL_MOUSEBUTTONDOWN),	424	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
332	const_iv (SDL_EVENT_RESERVEDA),	433	const_iv (SDL_EVENT_RESERVEDA),
333	const_iv (SDL_EVENT_RESERVEDB),	434	const_iv (SDL_EVENT_RESERVEDB),
334	const_iv (SDL_VIDEORESIZE),	435	const_iv (SDL_VIDEORESIZE),
335	const_iv (SDL_VIDEOEXPOSE),	436	const_iv (SDL_VIDEOEXPOSE),
336	const_iv (SDL_USEREVENT),	437	const_iv (SDL_USEREVENT),
		438
		439	const_iv (SDL_APPINPUTFOCUS),
		440	const_iv (SDL_APPMOUSEFOCUS),
		441	const_iv (SDL_APPACTIVE),
		442
337	const_iv (SDLK_KP0),	443	const_iv (SDLK_KP0),
338	const_iv (SDLK_KP1),	444	const_iv (SDLK_KP1),
339	const_iv (SDLK_KP2),	445	const_iv (SDLK_KP2),
340	const_iv (SDLK_KP3),	446	const_iv (SDLK_KP3),
341	const_iv (SDLK_KP4),	447	const_iv (SDLK_KP4),
…		…
396	const_iv (SDLK_BREAK),	502	const_iv (SDLK_BREAK),
397	const_iv (SDLK_MENU),	503	const_iv (SDLK_MENU),
398	const_iv (SDLK_POWER),	504	const_iv (SDLK_POWER),
399	const_iv (SDLK_EURO),	505	const_iv (SDLK_EURO),
400	const_iv (SDLK_UNDO),	506	const_iv (SDLK_UNDO),
		507
401	const_iv (KMOD_NONE),	508	const_iv (KMOD_NONE),
		509	const_iv (KMOD_SHIFT),
402	const_iv (KMOD_LSHIFT),	510	const_iv (KMOD_LSHIFT),
403	const_iv (KMOD_RSHIFT),	511	const_iv (KMOD_RSHIFT),
		512	const_iv (KMOD_CTRL),
404	const_iv (KMOD_LCTRL),	513	const_iv (KMOD_LCTRL),
405	const_iv (KMOD_RCTRL),	514	const_iv (KMOD_RCTRL),
		515	const_iv (KMOD_ALT),
406	const_iv (KMOD_LALT),	516	const_iv (KMOD_LALT),
407	const_iv (KMOD_RALT),	517	const_iv (KMOD_RALT),
		518	const_iv (KMOD_META),
408	const_iv (KMOD_LMETA),	519	const_iv (KMOD_LMETA),
409	const_iv (KMOD_RMETA),	520	const_iv (KMOD_RMETA),
410	const_iv (KMOD_NUM),	521	const_iv (KMOD_NUM),
411	const_iv (KMOD_CAPS),	522	const_iv (KMOD_CAPS),
412	const_iv (KMOD_MODE),	523	const_iv (KMOD_MODE),
413	const_iv (KMOD_CTRL),
414	const_iv (KMOD_SHIFT),
415	const_iv (KMOD_ALT),
416	const_iv (KMOD_META)
417	# undef const_iv	524	# undef const_iv
418	};	525	};
419		526
420	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	527	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
421	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	528	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		529
		530	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		531	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
422	}	532	}
		533
		534	void
		535	weaken (SV *rv)
		536	PROTOTYPE: $
		537	CODE:
		538	sv_rvweaken (rv);
		539
		540	int
		541	in_destruct ()
		542	CODE:
		543	RETVAL = PL_main_cv == Nullcv;
		544	OUTPUT:
		545	RETVAL
		546
		547	NV floor (NV x)
		548
		549	NV ceil (NV x)
423		550
424	void	551	void
425	pango_init ()	552	pango_init ()
426	CODE:	553	CODE:
427	// delayed, so it can pick up new fonts added by AddFontResourceEx
428	{	554	{
429	{
430	ft2_fontmap = pango_ft2_font_map_new ();	555	opengl_fontmap = pango_opengl_font_map_new ();
431	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	556	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
432	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	557	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433	}
434	{
435	cairo_font_options_t *fopt = cairo_font_options_create ();
436	cairo_fontmap = pango_cairo_font_map_get_default ();
437	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438	#ifdef _WIN32
439	// cairo looks like shit eaten twice on windows
440	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441	#else
442	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443	#endif
444	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446	pango_cairo_context_set_font_options (cairo_context, fopt);
447	cairo_font_options_destroy (fopt);
448	}
449	}	558	}
450		559
451	int	560	int
452	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	561	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
453		562
454	void	563	void
455	SDL_Quit ()	564	SDL_Quit ()
456		565
457	void	566	void
…		…
464	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	573	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	574	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	575	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467		576
468	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	577	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	578	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470		579
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	580	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	581	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	582	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	583	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
475		584
476	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	585	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		586	#if SDL_VERSION_ATLEAST(1,2,10)
		587	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		588	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		589	#endif
477		590
478	SDL_EnableUNICODE (1);	591	SDL_EnableUNICODE (1);
479	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	592	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
480		593
481	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	594	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
533	case SDL_KEYDOWN:	646	case SDL_KEYDOWN:
534	case SDL_KEYUP:	647	case SDL_KEYUP:
535	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	648	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
536	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	649	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
537	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	650	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		651	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
538	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	652	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
539	break;	653	break;
540		654
541	case SDL_ACTIVEEVENT:	655	case SDL_ACTIVEEVENT:
542	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	656	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
568	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	682	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
569	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	683	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
570	break;	684	break;
571	}	685	}
572		686
573	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	687	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
574	}	688	}
575	}	689	}
576		690
577	int	691	int
578	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	692	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
592	#ifndef _WIN32	706	#ifndef _WIN32
593	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	707	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
594	#endif	708	#endif
595		709
596	void	710	void
		711	win32_proxy_info ()
		712	PPCODE:
		713	{
		714	#ifdef _WIN32
		715	char buffer[2048];
		716	DWORD buflen;
		717
		718	EXTEND (SP, 3);
		719
		720	buflen = sizeof (buffer);
		721	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		722	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		723	{
		724	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		725
		726	buflen = sizeof (buffer);
		727	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		728	{
		729	PUSHs (newSVpv (buffer, 0));
		730
		731	buflen = sizeof (buffer);
		732	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		733	PUSHs (newSVpv (buffer, 0));
		734	}
		735	}
		736	#endif
		737	}
		738
		739	void
597	add_font (char *file)	740	add_font (char *file)
598	CODE:	741	CODE:
599	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	742	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
600	#ifdef _WIN32
601	// cairo... sigh... requires win2000
602	AddFontResourceEx (file, FR_PRIVATE, 0);
603	#endif
604		743
605	void	744	void
606	load_image_inline (SV *image_)	745	load_image_inline (SV *image_)
607	ALIAS:	746	ALIAS:
608	load_image_file = 1	747	load_image_file = 1
…		…
650		789
651	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	790	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
652		791
653	assert (surface2->pitch == surface2->w * 4);	792	assert (surface2->pitch == surface2->w * 4);
654		793
		794	SDL_LockSurface (surface2);
655	EXTEND (SP, 5);	795	EXTEND (SP, 6);
656	PUSHs (sv_2mortal (newSViv (surface2->w)));	796	PUSHs (sv_2mortal (newSViv (surface2->w)));
657	PUSHs (sv_2mortal (newSViv (surface2->h)));	797	PUSHs (sv_2mortal (newSViv (surface2->h)));
658	SDL_LockSurface (surface2);
659	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	798	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
660	SDL_UnlockSurface (surface2);
661	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	799	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
662	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	800	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
663	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	801	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		802	SDL_UnlockSurface (surface2);
664		803
665	SDL_FreeSurface (surface);	804	SDL_FreeSurface (surface);
666	SDL_FreeSurface (surface2);	805	SDL_FreeSurface (surface2);
667	}	806	}
668		807
…		…
704	CODE:	843	CODE:
705	fprintf (stderr, "FATAL: %s\n", message);	844	fprintf (stderr, "FATAL: %s\n", message);
706	#ifdef _WIN32	845	#ifdef _WIN32
707	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	846	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
708	#endif	847	#endif
709	_Exit (1);	848	_exit (1);
710		849
711	void	850	void
712	_exit (int retval)	851	_exit (int retval = 0)
713	CODE:	852	CODE:
		853	#ifdef WIN32
		854	ExitThread (retval); // unclean, please beam me up
		855	#else
714	_Exit (retval);	856	_exit (retval);
		857	#endif
715		858
716	MODULE = CFClient PACKAGE = CFClient::Font	859	MODULE = CFPlus PACKAGE = CFPlus::Font
717		860
718	CFClient::Font	861	CFPlus::Font
719	new_from_file (SV *class, char *path, int id = 0)	862	new_from_file (SV *class, char *path, int id = 0)
720	CODE:	863	CODE:
721	{	864	{
722	int count;	865	int count;
723	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	866	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
726	}	869	}
727	OUTPUT:	870	OUTPUT:
728	RETVAL	871	RETVAL
729		872
730	void	873	void
731	DESTROY (CFClient::Font self)	874	DESTROY (CFPlus::Font self)
732	CODE:	875	CODE:
733	pango_font_description_free (self);	876	pango_font_description_free (self);
734		877
735	void	878	void
736	make_default (CFClient::Font self)	879	make_default (CFPlus::Font self)
737	CODE:	880	CODE:
738	default_font = self;	881	default_font = self;
739		882
740	MODULE = CFClient PACKAGE = CFClient::Layout	883	MODULE = CFPlus PACKAGE = CFPlus::Layout
741		884
742	CFClient::Layout	885	void
743	new (SV *class, int rgba = 0)	886	reset_glyph_cache ()
		887	CODE:
		888	tc_clear ();
		889
		890	CFPlus::Layout
		891	new (SV *class)
744	CODE:	892	CODE:
745	New (0, RETVAL, 1, struct cf_layout);	893	New (0, RETVAL, 1, struct cf_layout);
746		894
747	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	895	RETVAL->pl = pango_layout_new (opengl_context);
748	RETVAL->rgba = rgba;
749	RETVAL->r = 1.;	896	RETVAL->r = 1.;
750	RETVAL->g = 1.;	897	RETVAL->g = 1.;
751	RETVAL->b = 1.;	898	RETVAL->b = 1.;
752	RETVAL->a = 1.;	899	RETVAL->a = 1.;
753	RETVAL->base_height = MIN_FONT_HEIGHT;	900	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
757	layout_update_font (RETVAL);	904	layout_update_font (RETVAL);
758	OUTPUT:	905	OUTPUT:
759	RETVAL	906	RETVAL
760		907
761	void	908	void
762	DESTROY (CFClient::Layout self)	909	DESTROY (CFPlus::Layout self)
763	CODE:	910	CODE:
764	g_object_unref (self->pl);	911	g_object_unref (self->pl);
765	Safefree (self);	912	Safefree (self);
766		913
		914	void
		915	set_text (CFPlus::Layout self, SV *text_)
		916	CODE:
		917	{
		918	STRLEN textlen;
		919	char *text = SvPVutf8 (text_, textlen);
		920
		921	pango_layout_set_text (self->pl, text, textlen);
		922	}
		923
		924	void
		925	set_markup (CFPlus::Layout self, SV *text_)
		926	CODE:
		927	{
		928	STRLEN textlen;
		929	char *text = SvPVutf8 (text_, textlen);
		930
		931	pango_layout_set_markup (self->pl, text, textlen);
		932	}
		933
		934	void
		935	set_shapes (CFPlus::Layout self, ...)
		936	CODE:
		937	{
		938	PangoAttrList *attrs = 0;
		939	const char *text = pango_layout_get_text (self->pl);
		940	const char *pos = text;
		941	int arg = 4;
		942
		943	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		944	{
		945	PangoRectangle inkrect, rect;
		946	PangoAttribute *attr;
		947
		948	int x = SvIV (ST (arg - 3));
		949	int y = SvIV (ST (arg - 2));
		950	int w = SvIV (ST (arg - 1));
		951	int h = SvIV (ST (arg ));
		952
		953	inkrect.x = 0;
		954	inkrect.y = 0;
		955	inkrect.width = 0;
		956	inkrect.height = 0;
		957
		958	rect.x = x * PANGO_SCALE;
		959	rect.y = y * PANGO_SCALE;
		960	rect.width = w * PANGO_SCALE;
		961	rect.height = h * PANGO_SCALE;
		962
		963	if (!attrs)
		964	attrs = pango_layout_get_attributes (self->pl);
		965
		966	attr = pango_attr_shape_new (&inkrect, &rect);
		967	attr->start_index = pos - text;
		968	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		969	pango_attr_list_insert (attrs, attr);
		970
		971	arg += 4;
		972	pos += sizeof (OBJ_STR) - 1;
		973	}
		974
		975	if (attrs)
		976	pango_layout_set_attributes (self->pl, attrs);
		977	}
		978
		979	void
		980	get_shapes (CFPlus::Layout self)
		981	PPCODE:
		982	{
		983	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		984
		985	do
		986	{
		987	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		988
		989	if (run && shape_attr_p (run))
		990	{
		991	PangoRectangle extents;
		992	pango_layout_iter_get_run_extents (iter, 0, &extents);
		993
		994	EXTEND (SP, 2);
		995	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		996	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		997	}
		998	}
		999	while (pango_layout_iter_next_run (iter));
		1000
		1001	pango_layout_iter_free (iter);
		1002	}
		1003
767	int	1004	int
768	is_rgba (CFClient::Layout self)	1005	has_wrapped (CFPlus::Layout self)
769	CODE:	1006	CODE:
770	RETVAL = self->rgba;	1007	{
		1008	int lines = 1;
		1009	const char *text = pango_layout_get_text (self->pl);
		1010
		1011	while (*text)
		1012	lines += *text++ == '\n';
		1013
		1014	RETVAL = lines < pango_layout_get_line_count (self->pl);
		1015	}
771	OUTPUT:	1016	OUTPUT:
772	RETVAL	1017	RETVAL
773		1018
774	void
775	set_text (CFClient::Layout self, SV *text_)
776	CODE:
777	{
778	STRLEN textlen;
779	char *text = SvPVutf8 (text_, textlen);
780
781	pango_layout_set_text (self->pl, text, textlen);
782	}
783
784	void
785	set_markup (CFClient::Layout self, SV *text_)
786	CODE:
787	{
788	STRLEN textlen;
789	char *text = SvPVutf8 (text_, textlen);
790
791	pango_layout_set_markup (self->pl, text, textlen);
792	}
793
794	SV *	1019	SV *
795	get_text (CFClient::Layout self)	1020	get_text (CFPlus::Layout self)
796	CODE:	1021	CODE:
797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1022	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798	sv_utf8_decode (RETVAL);	1023	sv_utf8_decode (RETVAL);
799	OUTPUT:	1024	OUTPUT:
800	RETVAL	1025	RETVAL
801		1026
802	void	1027	void
803	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1028	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
804	CODE:	1029	CODE:
805	self->r = r;	1030	self->r = r;
806	self->g = g;	1031	self->g = g;
807	self->b = b;	1032	self->b = b;
808	self->a = a;	1033	self->a = a;
809		1034
810	void	1035	void
811	set_font (CFClient::Layout self, CFClient::Font font = 0)	1036	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812	CODE:	1037	CODE:
813	if (self->font != font)	1038	if (self->font != font)
814	{	1039	{
815	self->font = font;	1040	self->font = font;
816	layout_update_font (self);	1041	layout_update_font (self);
817	}	1042	}
818		1043
819	void	1044	void
820	set_height (CFClient::Layout self, int base_height)	1045	set_height (CFPlus::Layout self, int base_height)
821	CODE:	1046	CODE:
822	if (self->base_height != base_height)	1047	if (self->base_height != base_height)
823	{	1048	{
824	self->base_height = base_height;	1049	self->base_height = base_height;
825	layout_update_font (self);	1050	layout_update_font (self);
826	}	1051	}
827		1052
828	void	1053	void
829	set_width (CFClient::Layout self, int max_width = -1)	1054	set_width (CFPlus::Layout self, int max_width = -1)
830	CODE:	1055	CODE:
831	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1056	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
832		1057
833	void	1058	void
834	set_indent (CFClient::Layout self, int indent)	1059	set_indent (CFPlus::Layout self, int indent)
835	CODE:	1060	CODE:
836	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1061	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837		1062
838	void	1063	void
839	set_spacing (CFClient::Layout self, int spacing)	1064	set_spacing (CFPlus::Layout self, int spacing)
840	CODE:	1065	CODE:
841	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1066	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842		1067
843	void	1068	void
844	set_ellipsise (CFClient::Layout self, int ellipsise)	1069	set_ellipsise (CFPlus::Layout self, int ellipsise)
845	CODE:	1070	CODE:
846	pango_layout_set_ellipsize (self->pl,	1071	pango_layout_set_ellipsize (self->pl,
847	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1072	ellipsise == 1 ? PANGO_ELLIPSIZE_START
848	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1073	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1074	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
850	: PANGO_ELLIPSIZE_NONE	1075	: PANGO_ELLIPSIZE_NONE
851	);	1076	);
852		1077
853	void	1078	void
854	set_single_paragraph_mode (CFClient::Layout self, int spm)	1079	set_single_paragraph_mode (CFPlus::Layout self, int spm)
855	CODE:	1080	CODE:
856	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1081	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857		1082
858	void	1083	void
859	size (CFClient::Layout self)	1084	size (CFPlus::Layout self)
860	PPCODE:	1085	PPCODE:
861	{	1086	{
862	int w, h;	1087	int w, h;
863		1088
864	layout_get_pixel_size (self, &w, &h);	1089	layout_get_pixel_size (self, &w, &h);
…		…
867	PUSHs (sv_2mortal (newSViv (w)));	1092	PUSHs (sv_2mortal (newSViv (w)));
868	PUSHs (sv_2mortal (newSViv (h)));	1093	PUSHs (sv_2mortal (newSViv (h)));
869	}	1094	}
870		1095
871	int	1096	int
		1097	descent (CFPlus::Layout self)
		1098	CODE:
		1099	{
		1100	PangoRectangle rect;
		1101	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1102	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1103	RETVAL = PANGO_DESCENT (rect);
		1104	}
		1105	OUTPUT:
		1106	RETVAL
		1107
		1108	int
872	xy_to_index (CFClient::Layout self, int x, int y)	1109	xy_to_index (CFPlus::Layout self, int x, int y)
873	CODE:	1110	CODE:
874	{	1111	{
875	int index, trailing;	1112	int index, trailing;
876	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1113	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
877	RETVAL = index;	1114	RETVAL = index + trailing;
878	}	1115	}
879	OUTPUT:	1116	OUTPUT:
880	RETVAL	1117	RETVAL
881		1118
882	void	1119	void
883	cursor_pos (CFClient::Layout self, int index)	1120	cursor_pos (CFPlus::Layout self, int index)
884	PPCODE:	1121	PPCODE:
885	{	1122	{
886	PangoRectangle strong_pos;	1123	PangoRectangle strong_pos;
887	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1124	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888		1125
…		…
891	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1128	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1129	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893	}	1130	}
894		1131
895	void	1132	void
896	render (CFClient::Layout self)	1133	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
897	PPCODE:	1134	PPCODE:
898	{	1135	{
899	SV *retval;	1136	int line, x;
900	int w, h;
901		1137
902	layout_get_pixel_size (self, &w, &h);	1138	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1139	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
903		1140
904	if (self->rgba)
905	{
906	cairo_surface_t *surface;
907	cairo_t *cairo;
908
909	retval = newSV (w * h * 4);
910	SvPOK_only (retval);
911	SvCUR_set (retval, w * h * 4);
912
913	memset (SvPVX (retval), 0, w * h * 4);
914
915	surface = cairo_image_surface_create_for_data (
916	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
917	cairo = cairo_create (surface);
918	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920	pango_cairo_show_layout (cairo, self->pl);
921
922	cairo_destroy (cairo);
923	cairo_surface_destroy (surface);
924
925	// what a mess, and its premultiplied, too :(
926	{
927	uint32_t *p = (uint32_t *)SvPVX (retval);
928	uint32_t *e = p + w * h;
929
930	while (p < e)
931	{
932	uint32_t rgba = *p;
933	rgba = (rgba >> 24) | (rgba << 8);
934	#if 0
935	#ifdef _WIN32
936	{//D
937	uint8_t r = rgba >> 24;
938	uint8_t g = rgba >> 16;
939	uint8_t b = rgba >> 8;
940	uint8_t a = rgba >> 0;
941
942	rgba = (rgba & 0xffffff00) | a;
943	}
944	#endif
945	#endif
946	rgba = SDL_SwapBE32 (rgba);
947	*p++ = rgba;
948	}
949	}
950
951	EXTEND (SP, 5);	1141	EXTEND (SP, 2);
952	PUSHs (sv_2mortal (newSViv (w)));	1142	PUSHs (sv_2mortal (newSViv (line - 1)));
		1143	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1144	}
		1145
		1146	void
		1147	line_x_to_index (CFPlus::Layout self, int line, int x)
		1148	PPCODE:
		1149	{
		1150	PangoLayoutLine *lp;
		1151	int index, trailing;
		1152
		1153	if (line < 0)
		1154	XSRETURN_EMPTY;
		1155
		1156	if (!(lp = pango_layout_get_line (self->pl, line)))
		1157	XSRETURN_EMPTY; /* do better */
		1158
		1159	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1160
		1161	EXTEND (SP, 2);
		1162	if (GIMME_V == G_SCALAR)
953	PUSHs (sv_2mortal (newSViv (h)));	1163	PUSHs (sv_2mortal (newSViv (index + trailing)));
954	PUSHs (sv_2mortal (retval));
955	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957	}
958	else	1164	else
959	{	1165	{
960	FT_Bitmap bitmap;
961
962	retval = newSV (w * h);
963	SvPOK_only (retval);
964	SvCUR_set (retval, w * h);
965
966	bitmap.rows = h;
967	bitmap.width = w;
968	bitmap.pitch = w;
969	bitmap.buffer = (unsigned char*)SvPVX (retval);
970	bitmap.num_grays = 256;
971	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973	memset (bitmap.buffer, 0, w * h);
974
975	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977	EXTEND (SP, 5);
978	PUSHs (sv_2mortal (newSViv (w)));	1166	PUSHs (sv_2mortal (newSViv (index)));
979	PUSHs (sv_2mortal (newSViv (h)));	1167	PUSHs (sv_2mortal (newSViv (trailing)));
980	PUSHs (sv_2mortal (retval));
981	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983	}	1168	}
984	}	1169	}
985		1170
		1171	void
		1172	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1173	PPCODE:
		1174	pango_opengl_render_layout_subpixel (
		1175	self->pl,
		1176	x * PANGO_SCALE, y * PANGO_SCALE,
		1177	self->r, self->g, self->b, self->a,
		1178	flags
		1179	);
		1180
986	MODULE = CFClient PACKAGE = CFClient::Texture	1181	MODULE = CFPlus PACKAGE = CFPlus::Texture
987		1182
988	void	1183	void
		1184	pad2pot (SV *data_, SV *w_, SV *h_)
		1185	CODE:
		1186	{
		1187	int ow = SvIV (w_);
		1188	int oh = SvIV (h_);
		1189
		1190	if (ow && oh)
		1191	{
		1192	int nw = minpot (ow);
		1193	int nh = minpot (oh);
		1194
		1195	if (nw != ow || nh != oh)
		1196	{
		1197	if (SvOK (data_))
		1198	{
		1199	STRLEN datalen;
		1200	char *data = SvPVbyte (data_, datalen);
		1201	int bpp = datalen / (ow * oh);
		1202	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
		1203
		1204	SvPOK_only (result_);
		1205	SvCUR_set (result_, nw * nh * bpp);
		1206
		1207	memset (SvPVX (result_), 0, nw * nh * bpp);
		1208	while (oh--)
		1209	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1210
		1211	sv_setsv (data_, result_);
		1212	}
		1213
		1214	sv_setiv (w_, nw);
		1215	sv_setiv (h_, nh);
		1216	}
		1217	}
		1218	}
		1219
		1220	void
989	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1221	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
990	PROTOTYPE: $$$;$$	1222	PROTOTYPE: $$$;$$
991	ALIAS:	1223	ALIAS:
992	draw_quad_alpha = 1	1224	draw_quad_alpha = 1
993	draw_quad_alpha_premultiplied = 2	1225	draw_quad_alpha_premultiplied = 2
994	CODE:	1226	CODE:
…		…
1032	glDisable (GL_ALPHA_TEST);	1264	glDisable (GL_ALPHA_TEST);
1033	glDisable (GL_BLEND);	1265	glDisable (GL_BLEND);
1034	}	1266	}
1035	}	1267	}
1036		1268
1037	MODULE = CFClient PACKAGE = CFClient::Map	1269	MODULE = CFPlus PACKAGE = CFPlus::Map
1038		1270
1039	CFClient::Map	1271	CFPlus::Map
1040	new (SV *class, int map_width, int map_height)	1272	new (SV *class)
1041	CODE:	1273	CODE:
1042	New (0, RETVAL, 1, struct map);	1274	New (0, RETVAL, 1, struct map);
1043	RETVAL->x = 0;	1275	RETVAL->x = 0;
1044	RETVAL->y = 0;	1276	RETVAL->y = 0;
1045	RETVAL->w = map_width;	1277	RETVAL->w = 0;
1046	RETVAL->h = map_height;	1278	RETVAL->h = 0;
1047	RETVAL->ox = 0;	1279	RETVAL->ox = 0;
1048	RETVAL->oy = 0;	1280	RETVAL->oy = 0;
1049	RETVAL->faces = 8192;	1281	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1050	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1282	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1051	RETVAL->texs = 8192;
1052	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1053	RETVAL->rows = 0;	1283	RETVAL->rows = 0;
1054	RETVAL->row = 0;	1284	RETVAL->row = 0;
1055	OUTPUT:	1285	OUTPUT:
1056	RETVAL	1286	RETVAL
1057		1287
1058	void	1288	void
1059	DESTROY (CFClient::Map self)	1289	DESTROY (CFPlus::Map self)
1060	CODE:	1290	CODE:
1061	{	1291	{
1062	map_clear (self);	1292	map_clear (self);
1063	Safefree (self->face);	1293	Safefree (self->face2tile);
1064	Safefree (self->tex);	1294	Safefree (self->tex);
1065	Safefree (self);	1295	Safefree (self);
1066	}	1296	}
1067		1297
1068	void	1298	void
		1299	resize (CFPlus::Map self, int map_width, int map_height)
		1300	CODE:
		1301	self->w = map_width;
		1302	self->h = map_height;
		1303
		1304	void
1069	clear (CFClient::Map self)	1305	clear (CFPlus::Map self)
1070	CODE:	1306	CODE:
1071	map_clear (self);	1307	map_clear (self);
1072		1308
1073	void	1309	void
1074	set_face (CFClient::Map self, int face, int texid)	1310	set_tileid (CFPlus::Map self, int face, int tile)
1075	CODE:	1311	CODE:
1076	{	1312	{
1077	while (self->faces <= face)	1313	need_facenum (self, face); self->face2tile [face] = tile;
1078	{	1314	need_texid (self, tile);
1079	Append (mapface, self->face, self->faces, self->faces);
1080	self->faces *= 2;
1081	}
1082
1083	self->face [face] = texid;
1084	}	1315	}
1085		1316
1086	void	1317	void
		1318	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1319	CODE:
		1320	{
		1321	tileid texid;
		1322	maptex *tex;
		1323
		1324	if (face < 0 || face >= self->faces)
		1325	return;
		1326
		1327	if (smooth < 0 || smooth >= self->faces)
		1328	return;
		1329
		1330	texid = self->face2tile [face];
		1331
		1332	if (!texid)
		1333	return;
		1334
		1335	tex = self->tex + texid;
		1336	tex->smoothtile = self->face2tile [smooth];
		1337	tex->smoothlevel = level;
		1338	}
		1339
		1340	void
1087	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)	1341	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)
1088	CODE:	1342	CODE:
1089	{	1343	{
1090	while (self->texs <= texid)	1344	need_texid (self, texid);
1091	{
1092	Append (maptex, self->tex, self->texs, self->texs);
1093	self->texs *= 2;
1094	}
1095		1345
1096	{	1346	{
1097	maptex *tex = self->tex + texid;	1347	maptex *tex = self->tex + texid;
1098		1348
1099	tex->name = name;	1349	tex->name = name;
…		…
1116	// from transparent color bleeding and ugly wrapping effects.	1366	// from transparent color bleeding and ugly wrapping effects.
1117	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1367	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118	}	1368	}
1119		1369
1120	int	1370	int
1121	ox (CFClient::Map self)	1371	ox (CFPlus::Map self)
1122	ALIAS:	1372	ALIAS:
1123	oy = 1	1373	oy = 1
1124	x = 2	1374	x = 2
1125	y = 3	1375	y = 3
1126	w = 4	1376	w = 4
…		…
1137	}	1387	}
1138	OUTPUT:	1388	OUTPUT:
1139	RETVAL	1389	RETVAL
1140		1390
1141	void	1391	void
1142	scroll (CFClient::Map self, int dx, int dy)	1392	scroll (CFPlus::Map self, int dx, int dy)
1143	CODE:	1393	CODE:
1144	{	1394	{
1145	if (dx > 0)	1395	if (dx > 0)
1146	map_blank (self, self->x, self->y, dx - 1, self->h);	1396	map_blank (self, self->x, self->y, dx, self->h);
1147	else if (dx < 0)	1397	else if (dx < 0)
1148	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1398	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1149		1399
1150	if (dy > 0)	1400	if (dy > 0)
1151	map_blank (self, self->x, self->y, self->w, dy - 1);	1401	map_blank (self, self->x, self->y, self->w, dy);
1152	else if (dy < 0)	1402	else if (dy < 0)
1153	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1403	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1154		1404
1155	self->ox += dx; self->x += dx;	1405	self->ox += dx; self->x += dx;
1156	self->oy += dy; self->y += dy;	1406	self->oy += dy; self->y += dy;
1157		1407
1158	while (self->y < 0)	1408	while (self->y < 0)
…		…
1163	self->y += MAP_EXTEND_Y;	1413	self->y += MAP_EXTEND_Y;
1164	}	1414	}
1165	}	1415	}
1166		1416
1167	void	1417	void
1168	map1a_update (CFClient::Map self, SV *data_)	1418	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1169	CODE:	1419	CODE:
1170	{	1420	{
1171	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1421	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1172	uint8_t *data_end = (uint8_t *)SvEND (data_);	1422	uint8_t *data_end = (uint8_t *)SvEND (data_);
1173	mapcell *cell;	1423	mapcell *cell;
1174	int x, y, flags;	1424	int x, y, flags;
1175		1425
1176	while (data < data_end)	1426	while (data < data_end - 1)
1177	{	1427	{
1178	flags = (data [0] << 8) + data [1]; data += 2;	1428	flags = (data [0] << 8) + data [1]; data += 2;
1179		1429
1180	x = ((flags >> 10) & 63) + self->x;	1430	x = self->x + ((flags >> 10) & 63);
1181	y = ((flags >> 4) & 63) + self->y;	1431	y = self->y + ((flags >> 4) & 63);
1182		1432
1183	cell = map_get_cell (self, x, y);	1433	cell = map_get_cell (self, x, y);
1184		1434
1185	if (flags & 15)	1435	if (flags & 15)
1186	{	1436	{
1187	if (cell->darkness < 0)	1437	if (!cell->darkness)
1188	{	1438	{
		1439	memset (cell, 0, sizeof (*cell));
1189	cell->darkness = 0;	1440	cell->darkness = 256;
1190	cell->face [0] = 0;
1191	cell->face [1] = 0;
1192	cell->face [2] = 0;
1193	}	1441	}
1194		1442
1195	cell->darkness = flags & 8 ? *data++ : 255;
1196
1197	//TODO: don't trust server data to be in-range(!)	1443	//TODO: don't trust server data to be in-range(!)
		1444
		1445	if (flags & 8)
		1446	{
		1447	if (extmap)
		1448	{
		1449	uint8_t ext, cmd;
		1450
		1451	do
		1452	{
		1453	ext = *data++;
		1454	cmd = ext & 0x3f;
		1455
		1456	if (cmd < 4)
		1457	cell->darkness = 255 - ext * 64 + 1;
		1458	else if (cmd == 5) // health
		1459	{
		1460	cell->stat_width = 1;
		1461	cell->stat_hp = *data++;
		1462	}
		1463	else if (cmd == 6) // monster width
		1464	cell->stat_width = *data++ + 1;
		1465	else if (cmd == 0x47)
		1466	{
		1467	if (*data == 8)
		1468	; // decode player uuid
		1469
		1470	data += *data + 1;
		1471	}
		1472	else if (cmd == 8) // cell flags
		1473	cell->flags = *data++;
		1474	else if (ext & 0x40) // unknown, multibyte => skip
		1475	data += *data + 1;
		1476	else
		1477	data++;
		1478	}
		1479	while (ext & 0x80);
		1480	}
		1481	else
		1482	cell->darkness = *data++ + 1;
		1483	}
1198		1484
1199	if (flags & 4)	1485	if (flags & 4)
1200	{	1486	{
1201	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1487	faceid face = (data [0] << 8) + data [1]; data += 2;
		1488	need_facenum (self, face);
		1489	cell->tile [0] = self->face2tile [face];
1202	}	1490	}
1203		1491
1204	if (flags & 2)	1492	if (flags & 2)
1205	{	1493	{
1206	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1494	faceid face = (data [0] << 8) + data [1]; data += 2;
		1495	need_facenum (self, face);
		1496	cell->tile [1] = self->face2tile [face];
1207	}	1497	}
1208		1498
1209	if (flags & 1)	1499	if (flags & 1)
1210	{	1500	{
1211	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1501	faceid face = (data [0] << 8) + data [1]; data += 2;
		1502	need_facenum (self, face);
		1503	cell->tile [2] = self->face2tile [face];
1212	}	1504	}
1213	}	1505	}
1214	else	1506	else
1215	cell->darkness = -1;	1507	cell->darkness = 0;
1216	}	1508	}
1217	}	1509	}
1218		1510
1219	SV *	1511	SV *
1220	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1512	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1221	CODE:	1513	CODE:
1222	{	1514	{
1223	int x1, x;	1515	int x1, x;
1224	int y1, y;	1516	int y1, y;
1225	int z;	1517	int z;
…		…
1246	{	1538	{
1247	mapcell *cell = row->col + (x - row->c0);	1539	mapcell *cell = row->col + (x - row->c0);
1248		1540
1249	for (z = 0; z <= 0; z++)	1541	for (z = 0; z <= 0; z++)
1250	{	1542	{
1251	mapface face = cell->face [z];
1252
1253	if (face)
1254	{
1255	maptex tex = self->tex [face];	1543	maptex tex = self->tex [cell->tile [z]];
1256	int a0 = 255 - tex.a;	1544	int a0 = 255 - tex.a;
1257	int a1 = tex.a;	1545	int a1 = tex.a;
1258		1546
1259	r = (r * a0 + tex.r * a1) / 255;	1547	r = (r * a0 + tex.r * a1) / 255;
1260	g = (g * a0 + tex.g * a1) / 255;	1548	g = (g * a0 + tex.g * a1) / 255;
1261	b = (b * a0 + tex.b * a1) / 255;	1549	b = (b * a0 + tex.b * a1) / 255;
1262	a = (a * a0 + tex.a * a1) / 255;	1550	a = (a * a0 + tex.a * a1) / 255;
1263	}
1264	}	1551	}
1265	}	1552	}
1266		1553
1267	*map++ = (r )	1554	*map++ = (r )
1268	| (g << 8)	1555	| (g << 8)
…		…
1275	}	1562	}
1276	OUTPUT:	1563	OUTPUT:
1277	RETVAL	1564	RETVAL
1278		1565
1279	void	1566	void
1280	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1567	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1281	PPCODE:	1568	CODE:
1282	{	1569	{
1283	int vx, vy;	1570	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
		1571	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1572	uint8_t smooth_max[256][256];
		1573	smooth_key skey;
1284	int x, y, z;	1574	int x, y, z;
1285	int last_name;	1575	int last_name;
1286	mapface face;	1576
		1577	// thats current max. sorry.
		1578	if (sw > 255) sw = 255;
		1579	if (sh > 255) sh = 255;
		1580
		1581	// clear key, in case of extra padding
		1582	memset (&skey, 0, sizeof (skey));
		1583
		1584	glColor4ub (255, 255, 255, 255);
		1585
		1586	glEnable (GL_BLEND);
		1587	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1588	glEnable (GL_TEXTURE_2D);
		1589	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1590
		1591	glBegin (GL_QUADS);
		1592
		1593	last_name = 0;
		1594
		1595	mx += self->x;
		1596	my += self->y;
		1597
		1598	// first pass: determine smooth_max
		1599	// rather ugly, if you ask me
		1600	// could also be stored inside mapcell and updated on change
		1601	memset (smooth_max, 0, sizeof (smooth_max));
		1602
		1603	for (y = 0; y < sh; y++)
		1604	if (0 <= y + my && y + my < self->rows)
		1605	{
		1606	maprow *row = self->row + (y + my);
		1607
		1608	for (x = 0; x < sw; x++)
		1609	if (row->c0 <= x + mx && x + mx < row->c1)
		1610	{
		1611	mapcell *cell = row->col + (x + mx - row->c0);
		1612
		1613	for (z = 0; z <= 2; z++)
		1614	{
		1615	uint8_t level = self->tex [cell->tile [z]].smoothlevel;
		1616	if (level > smooth_max [x + 1][y + 1])
		1617	smooth_max [x + 1][y + 1] = level;
		1618	}
		1619	}
		1620	}
		1621
		1622	for (z = 0; z <= 2; z++)
		1623	{
		1624	memset (smooth_level, 0, sizeof (smooth_level));
		1625
		1626	for (y = 0; y < sh; y++)
		1627	if (0 <= y + my && y + my < self->rows)
		1628	{
		1629	maprow *row = self->row + (y + my);
		1630
		1631	for (x = 0; x < sw; x++)
		1632	if (row->c0 <= x + mx && x + mx < row->c1)
		1633	{
		1634	mapcell *cell = row->col + (x + mx - row->c0);
		1635	tileid tile = cell->tile [z];
		1636
		1637	if (tile)
		1638	{
		1639	maptex tex = self->tex [tile];
		1640	int px = (x + 1) * T - tex.w;
		1641	int py = (y + 1) * T - tex.h;
		1642
		1643	// suppressing texture state switches here
		1644	// is only moderately effective, but worth the extra effort
		1645	if (last_name != tex.name)
		1646	{
		1647	if (!tex.name)
		1648	tex = self->tex [2]; /* missing, replace by noface */
		1649
		1650	glEnd ();
		1651	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1652	glBegin (GL_QUADS);
		1653	}
		1654
		1655	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1656	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1657	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1658	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1659
		1660	if (cell->flags && z == 2)
		1661	{
		1662	if (cell->flags & 1)
		1663	{
		1664	maptex tex = self->tex [1];
		1665	int px = x * T + T * 2 / 32;
		1666	int py = y * T - T * 6 / 32;
		1667
		1668	glEnd ();
		1669	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1670	glBegin (GL_QUADS);
		1671
		1672	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1673	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1674	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1675	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1676	}
		1677	}
		1678
		1679	// update smooth hash
		1680	if (tex.smoothtile)
		1681	{
		1682	skey.tile = tex.smoothtile;
		1683	skey.level = tex.smoothlevel;
		1684
		1685	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1686
		1687	// add bits to current tile and all neighbours. skey.x|y is
		1688	// shifted +1|+1 so we always stay positive.
		1689
		1690	// full tile
		1691	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1692
		1693	// borders
		1694	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
		1695	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
		1696	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1697	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1698
		1699	// corners
		1700	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1701	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1702	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1703	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1704	}
		1705	}
		1706	}
		1707	}
		1708
		1709	// go through all smoothlevels, lowest to highest, then draw
		1710	// this is basically counting sort
		1711	{
		1712	int w, b;
		1713
		1714	for (w = 0; w < 256 / 32; ++w)
		1715	{
		1716	uint32_t smask = smooth_level [w];
		1717	if (smask)
		1718	for (b = 0; b < 32; ++b)
		1719	if (smask & (((uint32_t)1) << b))
		1720	{
		1721	int level = (w << 5) | b;
		1722	HE *he;
		1723
		1724	hv_iterinit (smooth);
		1725	while ((he = hv_iternext (smooth)))
		1726	{
		1727	smooth_key *skey = (smooth_key *)HeKEY (he);
		1728	IV bits = SvIVX (HeVAL (he));
		1729
		1730	// bits is ___n cccc CCCC bbbb
		1731	// n do not draw borders&corners
		1732	// c draw these corners, but...
		1733	// C ... not these
		1734	// b draw these borders
		1735
		1736	if (!(bits & 0x1000)
		1737	&& skey->level == level
		1738	&& level >= smooth_max [skey->x][skey->y])
		1739	{
		1740	maptex tex = self->tex [skey->tile];
		1741	int px = (((int)skey->x) - 1) * T;
		1742	int py = (((int)skey->y) - 1) * T;
		1743	int border = bits & 15;
		1744	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1745	float dx = tex.s * .0625f; // 16 images/row
		1746	float dy = tex.t * .5f ; // 2 images/column
		1747
		1748	// this time naively avoiding texture state changes
		1749	// save gobs of state changes.
		1750	if (last_name != tex.name)
		1751	{
		1752	if (!tex.name)
		1753	continue; // smoothing not yet available
		1754
		1755	glEnd ();
		1756	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1757	glBegin (GL_QUADS);
		1758	}
		1759
		1760	if (border)
		1761	{
		1762	float ox = border * dx;
		1763
		1764	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1765	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1766	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1767	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1768	}
		1769
		1770	if (corner)
		1771	{
		1772	float ox = corner * dx;
		1773
		1774	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1775	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1776	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1777	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1778	}
		1779	}
		1780	}
		1781	}
		1782	}
		1783	}
		1784
		1785	hv_clear (smooth);
		1786	}
		1787
		1788	glEnd ();
		1789
		1790	glDisable (GL_TEXTURE_2D);
		1791	glDisable (GL_BLEND);
		1792
		1793	// top layer: overlays such as the health bar
		1794	for (y = 0; y < sh; y++)
		1795	if (0 <= y + my && y + my < self->rows)
		1796	{
		1797	maprow *row = self->row + (y + my);
		1798
		1799	for (x = 0; x < sw; x++)
		1800	if (row->c0 <= x + mx && x + mx < row->c1)
		1801	{
		1802	mapcell *cell = row->col + (x + mx - row->c0);
		1803
		1804	int px = x * T;
		1805	int py = y * T;
		1806
		1807	if (cell->stat_hp)
		1808	{
		1809	int width = cell->stat_width * T;
		1810	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1811
		1812	glColor3ub (0, 0, 0);
		1813	glRectf (px + 1, py - thick - 2,
		1814	px + width - 1, py);
		1815
		1816	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1817	glRectf (px + 2,
		1818	py - thick - 1,
		1819	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1820	}
		1821	}
		1822	}
		1823	}
		1824
		1825	void
		1826	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1827	CODE:
		1828	{
		1829	static float color[16][3] = {
		1830	{ 0.00F, 0.00F, 0.00F },
		1831	{ 1.00F, 1.00F, 1.00F },
		1832	{ 0.00F, 0.00F, 0.55F },
		1833	{ 1.00F, 0.00F, 0.00F },
		1834
		1835	{ 1.00F, 0.54F, 0.00F },
		1836	{ 0.11F, 0.56F, 1.00F },
		1837	{ 0.93F, 0.46F, 0.00F },
		1838	{ 0.18F, 0.54F, 0.34F },
		1839
		1840	{ 0.56F, 0.73F, 0.56F },
		1841	{ 0.80F, 0.80F, 0.80F },
		1842	{ 0.55F, 0.41F, 0.13F },
		1843	{ 0.99F, 0.77F, 0.26F },
		1844
		1845	{ 0.74F, 0.65F, 0.41F },
		1846
		1847	{ 0.00F, 1.00F, 1.00F },
		1848	{ 1.00F, 0.00F, 1.00F },
		1849	{ 1.00F, 1.00F, 0.00F },
		1850	};
		1851
		1852	int x, y;
		1853
		1854	glEnable (GL_TEXTURE_2D);
		1855	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1856	glEnable (GL_BLEND);
		1857	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1858	glBegin (GL_QUADS);
		1859
		1860	for (y = 0; y < h; y++)
		1861	for (x = 0; x < w; x++)
		1862	{
		1863	unsigned char m = data [x + y * w];
		1864
		1865	if (m)
		1866	{
		1867	float *c = color [m & 15];
		1868
		1869	float tx1 = m & 0x40 ? 0.5 : 0.;
		1870	float tx2 = tx1 + 0.5;
		1871
		1872	glColor4f (c[0], c[1], c[2], 0.75);
		1873	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1874	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1875	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1876	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1877	}
		1878	}
		1879
		1880	glEnd ();
		1881	glDisable (GL_BLEND);
		1882	glDisable (GL_TEXTURE_2D);
		1883	}
		1884
		1885	void
		1886	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1887	PPCODE:
		1888	{
		1889	int x, y;
1287	int sw4 = (sw + 3) & ~3;	1890	int sw4 = (sw + 3) & ~3;
1288	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1891	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1289	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1892	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1290		1893
1291	memset (darkness, 255, sw4 * sh);	1894	memset (darkness, 255, sw4 * sh);
1292	SvPOK_only (darkness_sv);	1895	SvPOK_only (darkness_sv);
1293	SvCUR_set (darkness_sv, sw4 * sh);	1896	SvCUR_set (darkness_sv, sw4 * sh);
1294		1897
1295	vx = self->x + (self->w - sw) / 2 - shift_x;	1898	mx += self->x;
1296	vy = self->y + (self->h - sh) / 2 - shift_y;	1899	my += self->y;
1297		1900
1298	/*
1299	int vx = self->vx = self->w >= sw
1300	? self->x + (self->w - sw) / 2
1301	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1302
1303	int vy = self->vy = self->h >= sh
1304	? self->y + (self->h - sh) / 2
1305	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306	*/
1307
1308	glColor4ub (255, 255, 255, 255);
1309
1310	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311	glEnable (GL_BLEND);
1312	glEnable (GL_TEXTURE_2D);
1313	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314
1315	glBegin (GL_QUADS);
1316
1317	last_name = 0;
1318
1319	for (z = 0; z < 3; z++)
1320	for (y = 0; y < sh; y++)	1901	for (y = 0; y < sh; y++)
1321	if (0 <= y + vy && y + vy < self->rows)	1902	if (0 <= y + my && y + my < self->rows)
1322	{	1903	{
1323	maprow *row = self->row + (y + vy);	1904	maprow *row = self->row + (y + my);
1324		1905
1325	for (x = 0; x < sw; x++)	1906	for (x = 0; x < sw; x++)
1326	if (row->c0 <= x + vx && x + vx < row->c1)	1907	if (row->c0 <= x + mx && x + mx < row->c1)
1327	{	1908	{
1328	mapcell *cell = row->col + (x + vx - row->c0);	1909	mapcell *cell = row->col + (x + mx - row->c0);
1329		1910
1330	darkness[y * sw4 + x] = cell->darkness < 0	1911	darkness[y * sw4 + x] = cell->darkness
		1912	? 255 - (cell->darkness - 1)
1331	? 255 - FOW_DARKNESS	1913	: 255 - FOW_DARKNESS;
1332	: 255 - cell->darkness;
1333
1334	face = cell->face [z];
1335
1336	if (face)
1337	{
1338	maptex tex = self->tex [face];
1339
1340	int px = (x + 1) * 32 - tex.w;
1341	int py = (y + 1) * 32 - tex.h;
1342
1343	if (last_name != tex.name)
1344	{
1345	glEnd ();
1346	last_name = tex.name;
1347	glBindTexture (GL_TEXTURE_2D, last_name);
1348	glBegin (GL_QUADS);
1349	}
1350
1351	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1352	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1353	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1354	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1355	}
1356	}	1914	}
1357	}	1915	}
1358
1359	glEnd ();
1360
1361	glDisable (GL_TEXTURE_2D);
1362	glDisable (GL_BLEND);
1363		1916
1364	EXTEND (SP, 3);	1917	EXTEND (SP, 3);
1365	PUSHs (sv_2mortal (newSViv (sw4)));	1918	PUSHs (sv_2mortal (newSViv (sw4)));
1366	PUSHs (sv_2mortal (newSViv (sh)));	1919	PUSHs (sv_2mortal (newSViv (sh)));
1367	PUSHs (darkness_sv);	1920	PUSHs (darkness_sv);
1368	}	1921	}
1369		1922
1370	SV *	1923	SV *
1371	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1924	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1372	CODE:	1925	CODE:
1373	{	1926	{
1374	int x, y, x1, y1;	1927	int x, y, x1, y1;
1375	SV *data_sv = newSV (w * h * 7 + 5);	1928	SV *data_sv = newSV (w * h * 7 + 5);
1376	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1929	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1401	if (row && row->c0 <= x && x < row->c1)	1954	if (row && row->c0 <= x && x < row->c1)
1402	{	1955	{
1403	mapcell *cell = row->col + (x - row->c0);	1956	mapcell *cell = row->col + (x - row->c0);
1404	uint8_t flags = 0;	1957	uint8_t flags = 0;
1405		1958
1406	if (cell->face [0]) flags |= 1;	1959	if (cell->tile [0]) flags |= 1;
1407	if (cell->face [1]) flags |= 2;	1960	if (cell->tile [1]) flags |= 2;
1408	if (cell->face [2]) flags |= 4;	1961	if (cell->tile [2]) flags |= 4;
1409		1962
1410	*data++ = flags;	1963	*data++ = flags;
1411		1964
1412	if (flags & 1)	1965	if (flags & 1)
1413	{	1966	{
		1967	tileid tile = cell->tile [0];
1414	*data++ = cell->face [0] >> 8;	1968	*data++ = tile >> 8;
1415	*data++ = cell->face [0];	1969	*data++ = tile;
1416	}	1970	}
1417		1971
1418	if (flags & 2)	1972	if (flags & 2)
1419	{	1973	{
		1974	tileid tile = cell->tile [1];
1420	*data++ = cell->face [1] >> 8;	1975	*data++ = tile >> 8;
1421	*data++ = cell->face [1];	1976	*data++ = tile;
1422	}	1977	}
1423		1978
1424	if (flags & 4)	1979	if (flags & 4)
1425	{	1980	{
		1981	tileid tile = cell->tile [2];
1426	*data++ = cell->face [2] >> 8;	1982	*data++ = tile >> 8;
1427	*data++ = cell->face [2];	1983	*data++ = tile;
1428	}	1984	}
1429	}	1985	}
1430	else	1986	else
1431	*data++ = 0;	1987	*data++ = 0;
1432	}	1988	}
…		…
1438	}	1994	}
1439	OUTPUT:	1995	OUTPUT:
1440	RETVAL	1996	RETVAL
1441		1997
1442	void	1998	void
1443	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1999	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1444	PPCODE:	2000	PPCODE:
1445	{	2001	{
1446	int x, y, z;	2002	int x, y, z;
1447	int w, h;	2003	int w, h;
1448	int x1, y1;	2004	int x1, y1;
…		…
1472	{	2028	{
1473	uint8_t flags = *data++;	2029	uint8_t flags = *data++;
1474		2030
1475	if (flags)	2031	if (flags)
1476	{	2032	{
1477	mapface face[3] = { 0, 0, 0 };
1478
1479	mapcell *cell = row_get_cell (row, x);	2033	mapcell *cell = row_get_cell (row, x);
		2034	tileid tile[3] = { 0, 0, 0 };
1480		2035
1481	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2036	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1482	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2037	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1483	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2038	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1484		2039
1485	if (cell->darkness <= 0)	2040	if (cell->darkness == 0)
1486	{	2041	{
1487	cell->darkness = -1;	2042	cell->darkness = 0;
1488		2043
1489	for (z = 0; z <= 2; z++)	2044	for (z = 0; z <= 2; z++)
1490	{	2045	{
1491	cell->face[z] = face[z];	2046	tileid t = tile [z];
1492		2047
1493	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2048	if (t >= self->texs || (t && !self->tex [t].name))
		2049	{
1494	XPUSHs (sv_2mortal (newSViv (face[z])));	2050	XPUSHs (sv_2mortal (newSViv (t)));
		2051	need_texid (self, t);
		2052	}
		2053
		2054	cell->tile [z] = t;
1495	}	2055	}
1496	}	2056	}
1497	}	2057	}
1498	}	2058	}
1499	}	2059	}
1500	}	2060	}
1501		2061
1502	MODULE = CFClient PACKAGE = CFClient::MixChunk	2062	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503		2063
1504	CFClient::MixChunk	2064	CFPlus::MixChunk
1505	new_from_file (SV *class, char *path)	2065	new_from_file (SV *class, char *path)
1506	CODE:	2066	CODE:
1507	RETVAL = Mix_LoadWAV (path);	2067	RETVAL = Mix_LoadWAV (path);
1508	OUTPUT:	2068	OUTPUT:
1509	RETVAL	2069	RETVAL
1510		2070
1511	void	2071	void
1512	DESTROY (CFClient::MixChunk self)	2072	DESTROY (CFPlus::MixChunk self)
1513	CODE:	2073	CODE:
1514	Mix_FreeChunk (self);	2074	Mix_FreeChunk (self);
1515		2075
1516	int	2076	int
1517	volume (CFClient::MixChunk self, int volume = -1)	2077	volume (CFPlus::MixChunk self, int volume = -1)
1518	CODE:	2078	CODE:
1519	RETVAL = Mix_VolumeChunk (self, volume);	2079	RETVAL = Mix_VolumeChunk (self, volume);
1520	OUTPUT:	2080	OUTPUT:
1521	RETVAL	2081	RETVAL
1522		2082
1523	int	2083	int
1524	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2084	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1525	CODE:	2085	CODE:
1526	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2086	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527	OUTPUT:	2087	OUTPUT:
1528	RETVAL	2088	RETVAL
1529		2089
1530	MODULE = CFClient PACKAGE = CFClient::MixMusic	2090	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531		2091
1532	int	2092	int
1533	volume (int volume = -1)	2093	volume (int volume = -1)
1534	CODE:	2094	CODE:
1535	RETVAL = Mix_VolumeMusic (volume);	2095	RETVAL = Mix_VolumeMusic (volume);
1536	OUTPUT:	2096	OUTPUT:
1537	RETVAL	2097	RETVAL
1538		2098
1539	CFClient::MixMusic	2099	CFPlus::MixMusic
1540	new_from_file (SV *class, char *path)	2100	new_from_file (SV *class, char *path)
1541	CODE:	2101	CODE:
1542	RETVAL = Mix_LoadMUS (path);	2102	RETVAL = Mix_LoadMUS (path);
1543	OUTPUT:	2103	OUTPUT:
1544	RETVAL	2104	RETVAL
1545		2105
1546	void	2106	void
1547	DESTROY (CFClient::MixMusic self)	2107	DESTROY (CFPlus::MixMusic self)
1548	CODE:	2108	CODE:
1549	Mix_FreeMusic (self);	2109	Mix_FreeMusic (self);
1550		2110
1551	int	2111	int
1552	play (CFClient::MixMusic self, int loops = -1)	2112	play (CFPlus::MixMusic self, int loops = -1)
1553	CODE:	2113	CODE:
1554	RETVAL = Mix_PlayMusic (self, loops);	2114	RETVAL = Mix_PlayMusic (self, loops);
1555	OUTPUT:	2115	OUTPUT:
1556	RETVAL	2116	RETVAL
1557		2117
1558	MODULE = CFClient PACKAGE = CFClient::OpenGL	2118	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559		2119
1560	BOOT:	2120	BOOT:
1561	{	2121	{
1562	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2122	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563	static const struct {	2123	static const struct {
1564	const char *name;	2124	const char *name;
1565	IV iv;	2125	IV iv;
1566	} *civ, const_iv[] = {	2126	} *civ, const_iv[] = {
1567	# define const_iv(name) { # name, (IV)name }	2127	# define const_iv(name) { # name, (IV)name }
…		…
1574	const_iv (GL_SCISSOR_TEST),	2134	const_iv (GL_SCISSOR_TEST),
1575	const_iv (GL_DEPTH_TEST),	2135	const_iv (GL_DEPTH_TEST),
1576	const_iv (GL_ALPHA_TEST),	2136	const_iv (GL_ALPHA_TEST),
1577	const_iv (GL_NORMALIZE),	2137	const_iv (GL_NORMALIZE),
1578	const_iv (GL_RESCALE_NORMAL),	2138	const_iv (GL_RESCALE_NORMAL),
		2139	const_iv (GL_FRONT),
		2140	const_iv (GL_BACK),
1579	const_iv (GL_AND),	2141	const_iv (GL_AND),
1580	const_iv (GL_ONE),	2142	const_iv (GL_ONE),
1581	const_iv (GL_ZERO),	2143	const_iv (GL_ZERO),
1582	const_iv (GL_SRC_ALPHA),	2144	const_iv (GL_SRC_ALPHA),
1583	const_iv (GL_DST_ALPHA),	2145	const_iv (GL_DST_ALPHA),
1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2146	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585	const_iv (GL_ONE_MINUS_DST_ALPHA),	2147	const_iv (GL_ONE_MINUS_DST_ALPHA),
1586	const_iv (GL_SRC_ALPHA_SATURATE),	2148	const_iv (GL_SRC_ALPHA_SATURATE),
1587	const_iv (GL_RGB),	2149	const_iv (GL_RGB),
1588	const_iv (GL_RGBA),	2150	const_iv (GL_RGBA),
		2151	const_iv (GL_RGBA4),
		2152	const_iv (GL_RGBA8),
		2153	const_iv (GL_RGB5_A1),
1589	const_iv (GL_UNSIGNED_BYTE),	2154	const_iv (GL_UNSIGNED_BYTE),
1590	const_iv (GL_UNSIGNED_SHORT),	2155	const_iv (GL_UNSIGNED_SHORT),
1591	const_iv (GL_UNSIGNED_INT),	2156	const_iv (GL_UNSIGNED_INT),
1592	const_iv (GL_ALPHA),	2157	const_iv (GL_ALPHA),
1593	const_iv (GL_INTENSITY),	2158	const_iv (GL_INTENSITY),
…		…
1625	const_iv (GL_SEPARABLE_2D),	2190	const_iv (GL_SEPARABLE_2D),
1626	const_iv (GL_CONVOLUTION_2D),	2191	const_iv (GL_CONVOLUTION_2D),
1627	const_iv (GL_CONVOLUTION_BORDER_MODE),	2192	const_iv (GL_CONVOLUTION_BORDER_MODE),
1628	const_iv (GL_CONSTANT_BORDER),	2193	const_iv (GL_CONSTANT_BORDER),
1629	const_iv (GL_LINES),	2194	const_iv (GL_LINES),
		2195	const_iv (GL_LINE_STRIP),
1630	const_iv (GL_LINE_LOOP),	2196	const_iv (GL_LINE_LOOP),
1631	const_iv (GL_QUADS),	2197	const_iv (GL_QUADS),
1632	const_iv (GL_QUAD_STRIP),	2198	const_iv (GL_QUAD_STRIP),
1633	const_iv (GL_TRIANGLES),	2199	const_iv (GL_TRIANGLES),
1634	const_iv (GL_TRIANGLE_STRIP),	2200	const_iv (GL_TRIANGLE_STRIP),
…		…
1667	OUTPUT:	2233	OUTPUT:
1668	RETVAL	2234	RETVAL
1669		2235
1670	int glGetError ()	2236	int glGetError ()
1671		2237
		2238	void glFinish ()
		2239
1672	void glClear (int mask)	2240	void glClear (int mask)
1673		2241
1674	void glClearColor (float r, float g, float b, float a = 1.0)	2242	void glClearColor (float r, float g, float b, float a = 1.0)
1675	PROTOTYPE: @	2243	PROTOTYPE: @
1676		2244
…		…
1699	void glPushMatrix ()	2267	void glPushMatrix ()
1700		2268
1701	void glPopMatrix ()	2269	void glPopMatrix ()
1702		2270
1703	void glLoadIdentity ()	2271	void glLoadIdentity ()
		2272
		2273	void glDrawBuffer (int buffer)
		2274
		2275	void glReadBuffer (int buffer)
1704		2276
1705	# near_ and far_ are due to microsofts buggy "c" compiler	2277	# near_ and far_ are due to microsofts buggy "c" compiler
1706	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2278	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1707		2279
1708	# near_ and far_ are due to microsofts buggy "c" compiler	2280	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1738	r *= a;	2310	r *= a;
1739	g *= a;	2311	g *= a;
1740	b *= a;	2312	b *= a;
1741	}	2313	}
1742	// microsoft visual "c" rounds instead of truncating...	2314	// microsoft visual "c" rounds instead of truncating...
1743	glColor4ub (MIN ((int)(r * 256.f), 255),	2315	glColor4f (r, g, b, a);
1744	MIN ((int)(g * 256.f), 255),
1745	MIN ((int)(b * 256.f), 255),
1746	MIN ((int)(a * 256.f), 255));
1747		2316
1748	void glInterleavedArrays (int format, int stride, char *data)	2317	void glInterleavedArrays (int format, int stride, char *data)
1749		2318
1750	void glDrawElements (int mode, int count, int type, char *indices)	2319	void glDrawElements (int mode, int count, int type, char *indices)
1751		2320
…		…
1828		2397
1829	void glEndList ()	2398	void glEndList ()
1830		2399
1831	void glCallList (int list)	2400	void glCallList (int list)
1832		2401
1833

Diff Legend

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