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.105 by root, Mon Jun 5 03:33:09 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>
		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;
118	}	154	if (!rect.height) rect.height = 1;
119		155
		156	*w = rect.width;
		157	*h = rect.height;
		158	}
		159
		160	typedef uint16_t tileid;
120	typedef uint16_t mapface;	161	typedef uint16_t faceid;
121		162
122	typedef struct {	163	typedef struct {
123	GLint name;	164	int name;
124	int w, h;	165	int w, h;
125	float s, t;	166	float s, t;
126	uint8_t r, g, b, a;	167	uint8_t r, g, b, a;
		168	tileid smoothtile;
		169	uint8_t smoothlevel;
127	} maptex;	170	} maptex;
128		171
129	typedef struct {	172	typedef struct {
		173	uint32_t player;
		174	tileid tile[3];
130	int16_t darkness;	175	uint16_t darkness;
131	mapface face[3];	176	uint8_t stat_width, stat_hp, flags, smoothmax;
132	} mapcell;	177	} mapcell;
133		178
134	typedef struct {	179	typedef struct {
135	int32_t c0, c1;	180	int32_t c0, c1;
136	mapcell *col;	181	mapcell *col;
137	} maprow;	182	} maprow;
138		183
139	typedef struct map {	184	typedef struct map {
140	int x, y, w, h;	185	int x, y, w, h;
141	int ox, oy; /* offset to virtual global coordinate system */	186	int ox, oy; /* offset to virtual global coordinate system */
142	int faces;	187	int faces; tileid *face2tile; // [faceid]
143	mapface *face;	188	int texs; maptex *tex; // [tileid]
144
145	int texs;
146	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;
…		…
172	}	214	}
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
		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
177	static maprow *	239	static maprow *
178	map_get_row (CFClient__Map self, int y)	240	map_get_row (CFPlus__Map self, int y)
179	{	241	{
180	if (0 > y)	242	if (0 > y)
181	{	243	{
182	int extend = - y + MAP_EXTEND_Y;	244	int extend = - y + MAP_EXTEND_Y;
183	Prepend (maprow, self->row, self->rows, extend);	245	Prepend (maprow, self->row, self->rows, extend);
…		…
221		283
222	return row->col + (x - row->c0);	284	return row->col + (x - row->c0);
223	}	285	}
224		286
225	static mapcell *	287	static mapcell *
226	map_get_cell (CFClient__Map self, int x, int y)	288	map_get_cell (CFPlus__Map self, int x, int y)
227	{	289	{
228	return row_get_cell (map_get_row (self, y), x);	290	return row_get_cell (map_get_row (self, y), x);
229	}	291	}
230		292
231	static void	293	static void
232	map_clear (CFClient__Map self)	294	map_clear (CFPlus__Map self)
233	{	295	{
234	int r;	296	int r;
235		297
236	for (r = 0; r < self->rows; r++)	298	for (r = 0; r < self->rows; r++)
237	Safefree (self->row[r].col);	299	Safefree (self->row[r].col);
…		…
245	self->row = 0;	307	self->row = 0;
246	self->rows = 0;	308	self->rows = 0;
247	}	309	}
248		310
249	static void	311	static void
250	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)
251	{	313	{
252	int x, y;	314	int x, y;
253	maprow *row;	315	maprow *row;
		316	mapcell *cell;
254		317
255	for (y = y0; y < y0 + h; y++)	318	for (y = y0; y < y0 + h; y++)
256	if (y >= 0)	319	if (y >= 0)
257	{	320	{
258	if (y >= self->rows)	321	if (y >= self->rows)
…		…
264	if (x >= row->c0)	327	if (x >= row->c0)
265	{	328	{
266	if (x >= row->c1)	329	if (x >= row->c1)
267	break;	330	break;
268		331
269	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;
270	}	338	}
271	}	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);
272	}	356	}
273		357
274	static void	358	static void
275	music_finished (void)	359	music_finished (void)
276	{	360	{
…		…
295	ev.data2 = 0;	379	ev.data2 = 0;
296		380
297	SDL_PushEvent ((SDL_Event *)&ev);	381	SDL_PushEvent ((SDL_Event *)&ev);
298	}	382	}
299		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
300	MODULE = CFClient PACKAGE = CFClient	405	MODULE = CFPlus PACKAGE = CFPlus
301		406
302	PROTOTYPES: ENABLE	407	PROTOTYPES: ENABLE
303		408
304	BOOT:	409	BOOT:
305	{	410	{
306	HV *stash = gv_stashpv ("CFClient", 1);	411	HV *stash = gv_stashpv ("CFPlus", 1);
307	static const struct {	412	static const struct {
308	const char *name;	413	const char *name;
309	IV iv;	414	IV iv;
310	} *civ, const_iv[] = {	415	} *civ, const_iv[] = {
311	# 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
312	const_iv (SDL_ACTIVEEVENT),	420	const_iv (SDL_ACTIVEEVENT),
313	const_iv (SDL_KEYDOWN),	421	const_iv (SDL_KEYDOWN),
314	const_iv (SDL_KEYUP),	422	const_iv (SDL_KEYUP),
315	const_iv (SDL_MOUSEMOTION),	423	const_iv (SDL_MOUSEMOTION),
316	const_iv (SDL_MOUSEBUTTONDOWN),	424	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
325	const_iv (SDL_EVENT_RESERVEDA),	433	const_iv (SDL_EVENT_RESERVEDA),
326	const_iv (SDL_EVENT_RESERVEDB),	434	const_iv (SDL_EVENT_RESERVEDB),
327	const_iv (SDL_VIDEORESIZE),	435	const_iv (SDL_VIDEORESIZE),
328	const_iv (SDL_VIDEOEXPOSE),	436	const_iv (SDL_VIDEOEXPOSE),
329	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
330	const_iv (SDLK_KP0),	443	const_iv (SDLK_KP0),
331	const_iv (SDLK_KP1),	444	const_iv (SDLK_KP1),
332	const_iv (SDLK_KP2),	445	const_iv (SDLK_KP2),
333	const_iv (SDLK_KP3),	446	const_iv (SDLK_KP3),
334	const_iv (SDLK_KP4),	447	const_iv (SDLK_KP4),
…		…
389	const_iv (SDLK_BREAK),	502	const_iv (SDLK_BREAK),
390	const_iv (SDLK_MENU),	503	const_iv (SDLK_MENU),
391	const_iv (SDLK_POWER),	504	const_iv (SDLK_POWER),
392	const_iv (SDLK_EURO),	505	const_iv (SDLK_EURO),
393	const_iv (SDLK_UNDO),	506	const_iv (SDLK_UNDO),
		507
394	const_iv (KMOD_NONE),	508	const_iv (KMOD_NONE),
		509	const_iv (KMOD_SHIFT),
395	const_iv (KMOD_LSHIFT),	510	const_iv (KMOD_LSHIFT),
396	const_iv (KMOD_RSHIFT),	511	const_iv (KMOD_RSHIFT),
		512	const_iv (KMOD_CTRL),
397	const_iv (KMOD_LCTRL),	513	const_iv (KMOD_LCTRL),
398	const_iv (KMOD_RCTRL),	514	const_iv (KMOD_RCTRL),
		515	const_iv (KMOD_ALT),
399	const_iv (KMOD_LALT),	516	const_iv (KMOD_LALT),
400	const_iv (KMOD_RALT),	517	const_iv (KMOD_RALT),
		518	const_iv (KMOD_META),
401	const_iv (KMOD_LMETA),	519	const_iv (KMOD_LMETA),
402	const_iv (KMOD_RMETA),	520	const_iv (KMOD_RMETA),
403	const_iv (KMOD_NUM),	521	const_iv (KMOD_NUM),
404	const_iv (KMOD_CAPS),	522	const_iv (KMOD_CAPS),
405	const_iv (KMOD_MODE),	523	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	524	# undef const_iv
411	};	525	};
412		526
413	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; )
414	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);
415	}	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)
416		550
417	void	551	void
418	pango_init ()	552	pango_init ()
419	CODE:	553	CODE:
420	// delayed, so it can pick up new fonts added by AddFontResourceEx
421	{	554	{
422	{
423	ft2_fontmap = pango_ft2_font_map_new ();	555	opengl_fontmap = pango_opengl_font_map_new ();
424	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);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	557	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	}	558	}
439		559
440	int	560	int
441	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	561	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
442		562
443	void	563	void
444	SDL_Quit ()	564	SDL_Quit ()
445		565
446	void	566	void
…		…
453	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	573	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	574	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	575	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456		576
457	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	577	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	578	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459		579
460	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	580	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	581	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	582	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	583	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464		584
465	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
466		590
467	SDL_EnableUNICODE (1);	591	SDL_EnableUNICODE (1);
468	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	592	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469		593
470	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	594	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
522	case SDL_KEYDOWN:	646	case SDL_KEYDOWN:
523	case SDL_KEYUP:	647	case SDL_KEYUP:
524	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	648	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
525	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	649	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
526	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 */
527	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	652	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
528	break;	653	break;
529		654
530	case SDL_ACTIVEEVENT:	655	case SDL_ACTIVEEVENT:
531	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	656	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
557	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	682	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	683	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559	break;	684	break;
560	}	685	}
561		686
562	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	687	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563	}	688	}
564	}	689	}
565		690
566	int	691	int
567	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)
…		…
581	#ifndef _WIN32	706	#ifndef _WIN32
582	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	707	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
583	#endif	708	#endif
584		709
585	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
586	add_font (char *file)	740	add_font (char *file)
587	CODE:	741	CODE:
588	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	742	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589	#ifdef _WIN32
590	// cairo... sigh... requires win2000
591	AddFontResourceEx (file, FR_PRIVATE, 0);
592	#endif
593		743
594	void	744	void
595	load_image_inline (SV *image_)	745	load_image_inline (SV *image_)
596	ALIAS:	746	ALIAS:
597	load_image_file = 1	747	load_image_file = 1
…		…
639		789
640	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	790	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641		791
642	assert (surface2->pitch == surface2->w * 4);	792	assert (surface2->pitch == surface2->w * 4);
643		793
		794	SDL_LockSurface (surface2);
644	EXTEND (SP, 5);	795	EXTEND (SP, 6);
645	PUSHs (sv_2mortal (newSViv (surface2->w)));	796	PUSHs (sv_2mortal (newSViv (surface2->w)));
646	PUSHs (sv_2mortal (newSViv (surface2->h)));	797	PUSHs (sv_2mortal (newSViv (surface2->h)));
647	SDL_LockSurface (surface2);
648	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	798	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)));	799	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
651	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	800	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	801	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		802	SDL_UnlockSurface (surface2);
653		803
654	SDL_FreeSurface (surface);	804	SDL_FreeSurface (surface);
655	SDL_FreeSurface (surface2);	805	SDL_FreeSurface (surface2);
656	}	806	}
657		807
…		…
693	CODE:	843	CODE:
694	fprintf (stderr, "FATAL: %s\n", message);	844	fprintf (stderr, "FATAL: %s\n", message);
695	#ifdef _WIN32	845	#ifdef _WIN32
696	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	846	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
697	#endif	847	#endif
698	exit (1);	848	_exit (1);
699		849
		850	void
		851	_exit (int retval = 0)
		852	CODE:
		853	#ifdef WIN32
		854	ExitThread (retval); // unclean, please beam me up
		855	#else
		856	_exit (retval);
		857	#endif
		858
700	MODULE = CFClient PACKAGE = CFClient::Font	859	MODULE = CFPlus PACKAGE = CFPlus::Font
701		860
702	CFClient::Font	861	CFPlus::Font
703	new_from_file (SV *class, char *path, int id = 0)	862	new_from_file (SV *class, char *path, int id = 0)
704	CODE:	863	CODE:
705	{	864	{
706	int count;	865	int count;
707	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	866	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
710	}	869	}
711	OUTPUT:	870	OUTPUT:
712	RETVAL	871	RETVAL
713		872
714	void	873	void
715	DESTROY (CFClient::Font self)	874	DESTROY (CFPlus::Font self)
716	CODE:	875	CODE:
717	pango_font_description_free (self);	876	pango_font_description_free (self);
718		877
719	void	878	void
720	make_default (CFClient::Font self)	879	make_default (CFPlus::Font self)
721	CODE:	880	CODE:
722	default_font = self;	881	default_font = self;
723		882
724	MODULE = CFClient PACKAGE = CFClient::Layout	883	MODULE = CFPlus PACKAGE = CFPlus::Layout
725		884
726	CFClient::Layout	885	void
727	new (SV *class, int rgba = 0)	886	reset_glyph_cache ()
728	CODE:	887	CODE:
729	#if _WIN32	888	tc_clear ();
730	//rgba = 0;//D makes text nicer, breaks TextView	889
731	#endif	890	CFPlus::Layout
732	rgba=1;//D	891	new (SV *class)
		892	CODE:
733	New (0, RETVAL, 1, struct cf_layout);	893	New (0, RETVAL, 1, struct cf_layout);
734		894
735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	895	RETVAL->pl = pango_layout_new (opengl_context);
736	RETVAL->rgba = rgba;
737	RETVAL->r = 1.;	896	RETVAL->r = 1.;
738	RETVAL->g = 1.;	897	RETVAL->g = 1.;
739	RETVAL->b = 1.;	898	RETVAL->b = 1.;
740	RETVAL->a = 1.;	899	RETVAL->a = 1.;
741	RETVAL->base_height = MIN_FONT_HEIGHT;	900	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
745	layout_update_font (RETVAL);	904	layout_update_font (RETVAL);
746	OUTPUT:	905	OUTPUT:
747	RETVAL	906	RETVAL
748		907
749	void	908	void
750	DESTROY (CFClient::Layout self)	909	DESTROY (CFPlus::Layout self)
751	CODE:	910	CODE:
752	g_object_unref (self->pl);	911	g_object_unref (self->pl);
753	Safefree (self);	912	Safefree (self);
754		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
755	int	1004	int
756	is_rgba (CFClient::Layout self)	1005	has_wrapped (CFPlus::Layout self)
757	CODE:	1006	CODE:
758	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	}
759	OUTPUT:	1016	OUTPUT:
760	RETVAL	1017	RETVAL
761		1018
762	void
763	set_text (CFClient::Layout self, SV *text_)
764	CODE:
765	{
766	STRLEN textlen;
767	char *text = SvPVutf8 (text_, textlen);
768
769	pango_layout_set_text (self->pl, text, textlen);
770	}
771
772	void
773	set_markup (CFClient::Layout self, SV *text_)
774	CODE:
775	{
776	STRLEN textlen;
777	char *text = SvPVutf8 (text_, textlen);
778
779	pango_layout_set_markup (self->pl, text, textlen);
780	}
781
782	SV *	1019	SV *
783	get_text (CFClient::Layout self)	1020	get_text (CFPlus::Layout self)
784	CODE:	1021	CODE:
785	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1022	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786	SvUTF8_on (RETVAL);	1023	sv_utf8_decode (RETVAL);
787	OUTPUT:	1024	OUTPUT:
788	RETVAL	1025	RETVAL
789		1026
790	void	1027	void
791	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.)
792	CODE:	1029	CODE:
793	self->r = r;	1030	self->r = r;
794	self->g = g;	1031	self->g = g;
795	self->b = b;	1032	self->b = b;
796	self->a = a;	1033	self->a = a;
797		1034
798	void	1035	void
799	set_font (CFClient::Layout self, CFClient::Font font = 0)	1036	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800	CODE:	1037	CODE:
801	if (self->font != font)	1038	if (self->font != font)
802	{	1039	{
803	self->font = font;	1040	self->font = font;
804	layout_update_font (self);	1041	layout_update_font (self);
805	}	1042	}
806		1043
807	void	1044	void
808	set_height (CFClient::Layout self, int base_height)	1045	set_height (CFPlus::Layout self, int base_height)
809	CODE:	1046	CODE:
810	if (self->base_height != base_height)	1047	if (self->base_height != base_height)
811	{	1048	{
812	self->base_height = base_height;	1049	self->base_height = base_height;
813	layout_update_font (self);	1050	layout_update_font (self);
814	}	1051	}
815		1052
816	void	1053	void
817	set_width (CFClient::Layout self, int max_width = -1)	1054	set_width (CFPlus::Layout self, int max_width = -1)
818	CODE:	1055	CODE:
819	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);
820		1057
821	void	1058	void
822	set_indent (CFClient::Layout self, int indent)	1059	set_indent (CFPlus::Layout self, int indent)
823	CODE:	1060	CODE:
824	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1061	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825		1062
826	void	1063	void
827	set_spacing (CFClient::Layout self, int spacing)	1064	set_spacing (CFPlus::Layout self, int spacing)
828	CODE:	1065	CODE:
829	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1066	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830		1067
831	void	1068	void
832	set_ellipsise (CFClient::Layout self, int ellipsise)	1069	set_ellipsise (CFPlus::Layout self, int ellipsise)
833	CODE:	1070	CODE:
834	pango_layout_set_ellipsize (self->pl,	1071	pango_layout_set_ellipsize (self->pl,
835	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1072	ellipsise == 1 ? PANGO_ELLIPSIZE_START
836	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1073	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1074	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
838	: PANGO_ELLIPSIZE_NONE	1075	: PANGO_ELLIPSIZE_NONE
839	);	1076	);
840		1077
841	void	1078	void
842	set_single_paragraph_mode (CFClient::Layout self, int spm)	1079	set_single_paragraph_mode (CFPlus::Layout self, int spm)
843	CODE:	1080	CODE:
844	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1081	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845		1082
846	void	1083	void
847	size (CFClient::Layout self)	1084	size (CFPlus::Layout self)
848	PPCODE:	1085	PPCODE:
849	{	1086	{
850	int w, h;	1087	int w, h;
851		1088
852	layout_get_pixel_size (self, &w, &h);	1089	layout_get_pixel_size (self, &w, &h);
…		…
855	PUSHs (sv_2mortal (newSViv (w)));	1092	PUSHs (sv_2mortal (newSViv (w)));
856	PUSHs (sv_2mortal (newSViv (h)));	1093	PUSHs (sv_2mortal (newSViv (h)));
857	}	1094	}
858		1095
859	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
860	xy_to_index (CFClient::Layout self, int x, int y)	1109	xy_to_index (CFPlus::Layout self, int x, int y)
861	CODE:	1110	CODE:
862	{	1111	{
863	int index, trailing;	1112	int index, trailing;
864	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);
865	RETVAL = index;	1114	RETVAL = index + trailing;
866	}	1115	}
867	OUTPUT:	1116	OUTPUT:
868	RETVAL	1117	RETVAL
869		1118
870	void	1119	void
871	cursor_pos (CFClient::Layout self, int index)	1120	cursor_pos (CFPlus::Layout self, int index)
872	PPCODE:	1121	PPCODE:
873	{	1122	{
874	PangoRectangle strong_pos;	1123	PangoRectangle strong_pos;
875	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1124	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876		1125
…		…
879	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1128	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1129	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881	}	1130	}
882		1131
883	void	1132	void
884	render (CFClient::Layout self)	1133	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
885	PPCODE:	1134	PPCODE:
886	{	1135	{
887	SV *retval;	1136	int line, x;
888	int w, h;
889		1137
890	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 */
891		1140
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);	1141	EXTEND (SP, 2);
940	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)
941	PUSHs (sv_2mortal (newSViv (h)));	1163	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	1164	else
947	{	1165	{
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)));	1166	PUSHs (sv_2mortal (newSViv (index)));
967	PUSHs (sv_2mortal (newSViv (h)));	1167	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	}	1168	}
972	}	1169	}
973		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
974	MODULE = CFClient PACKAGE = CFClient::Texture	1181	MODULE = CFPlus PACKAGE = CFPlus::Texture
975		1182
976	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
977	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.)
978	PROTOTYPE: $$$;$$	1222	PROTOTYPE: $$$;$$
979	ALIAS:	1223	ALIAS:
980	draw_quad_alpha = 1	1224	draw_quad_alpha = 1
981	draw_quad_alpha_premultiplied = 2	1225	draw_quad_alpha_premultiplied = 2
982	CODE:	1226	CODE:
…		…
1020	glDisable (GL_ALPHA_TEST);	1264	glDisable (GL_ALPHA_TEST);
1021	glDisable (GL_BLEND);	1265	glDisable (GL_BLEND);
1022	}	1266	}
1023	}	1267	}
1024		1268
1025	MODULE = CFClient PACKAGE = CFClient::Map	1269	MODULE = CFPlus PACKAGE = CFPlus::Map
1026		1270
1027	CFClient::Map	1271	CFPlus::Map
1028	new (SV *class, int map_width, int map_height)	1272	new (SV *class)
1029	CODE:	1273	CODE:
1030	New (0, RETVAL, 1, struct map);	1274	New (0, RETVAL, 1, struct map);
1031	RETVAL->x = 0;	1275	RETVAL->x = 0;
1032	RETVAL->y = 0;	1276	RETVAL->y = 0;
1033	RETVAL->w = map_width;	1277	RETVAL->w = 0;
1034	RETVAL->h = map_height;	1278	RETVAL->h = 0;
1035	RETVAL->ox = 0;	1279	RETVAL->ox = 0;
1036	RETVAL->oy = 0;	1280	RETVAL->oy = 0;
1037	RETVAL->faces = 8192;	1281	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1038	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1282	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1039	RETVAL->texs = 8192;
1040	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1041	RETVAL->rows = 0;	1283	RETVAL->rows = 0;
1042	RETVAL->row = 0;	1284	RETVAL->row = 0;
1043	OUTPUT:	1285	OUTPUT:
1044	RETVAL	1286	RETVAL
1045		1287
1046	void	1288	void
1047	DESTROY (CFClient::Map self)	1289	DESTROY (CFPlus::Map self)
1048	CODE:	1290	CODE:
1049	{	1291	{
1050	map_clear (self);	1292	map_clear (self);
1051	Safefree (self->face);	1293	Safefree (self->face2tile);
		1294	Safefree (self->tex);
1052	Safefree (self);	1295	Safefree (self);
1053	}	1296	}
1054		1297
1055	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
1056	clear (CFClient::Map self)	1305	clear (CFPlus::Map self)
1057	CODE:	1306	CODE:
1058	map_clear (self);	1307	map_clear (self);
1059		1308
1060	void	1309	void
1061	set_face (CFClient::Map self, int face, int texid)	1310	set_tileid (CFPlus::Map self, int face, int tile)
1062	CODE:	1311	CODE:
1063	{	1312	{
1064	while (self->faces <= face)	1313	need_facenum (self, face); self->face2tile [face] = tile;
1065	{	1314	need_texid (self, tile);
1066	Append (mapface, self->face, self->faces, self->faces);
1067	self->faces *= 2;
1068	}
1069
1070	self->face [face] = texid;
1071	}	1315	}
1072		1316
1073	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
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)	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)
1075	CODE:	1342	CODE:
1076	{	1343	{
1077	while (self->texs <= texid)	1344	need_texid (self, texid);
1078	{
1079	Append (maptex, self->tex, self->texs, self->texs);
1080	self->texs *= 2;
1081	}
1082		1345
1083	{	1346	{
1084	maptex *tex = self->tex + texid;	1347	maptex *tex = self->tex + texid;
1085		1348
1086	tex->name = name;	1349	tex->name = name;
…		…
1103	// from transparent color bleeding and ugly wrapping effects.	1366	// from transparent color bleeding and ugly wrapping effects.
1104	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1367	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105	}	1368	}
1106		1369
1107	int	1370	int
1108	ox (CFClient::Map self)	1371	ox (CFPlus::Map self)
1109	ALIAS:	1372	ALIAS:
1110	oy = 1	1373	oy = 1
1111	x = 2	1374	x = 2
1112	y = 3	1375	y = 3
1113	w = 4	1376	w = 4
…		…
1124	}	1387	}
1125	OUTPUT:	1388	OUTPUT:
1126	RETVAL	1389	RETVAL
1127		1390
1128	void	1391	void
1129	scroll (CFClient::Map self, int dx, int dy)	1392	scroll (CFPlus::Map self, int dx, int dy)
1130	CODE:	1393	CODE:
1131	{	1394	{
1132	if (dx > 0)	1395	if (dx > 0)
1133	map_blank (self, self->x, self->y, dx - 1, self->h);	1396	map_blank (self, self->x, self->y, dx, self->h);
1134	else if (dx < 0)	1397	else if (dx < 0)
1135	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);
1136		1399
1137	if (dy > 0)	1400	if (dy > 0)
1138	map_blank (self, self->x, self->y, self->w, dy - 1);	1401	map_blank (self, self->x, self->y, self->w, dy);
1139	else if (dy < 0)	1402	else if (dy < 0)
1140	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);
1141		1404
1142	self->ox += dx; self->x += dx;	1405	self->ox += dx; self->x += dx;
1143	self->oy += dy; self->y += dy;	1406	self->oy += dy; self->y += dy;
1144		1407
1145	while (self->y < 0)	1408	while (self->y < 0)
…		…
1150	self->y += MAP_EXTEND_Y;	1413	self->y += MAP_EXTEND_Y;
1151	}	1414	}
1152	}	1415	}
1153		1416
1154	void	1417	void
1155	map1a_update (CFClient::Map self, SV *data_)	1418	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156	CODE:	1419	CODE:
1157	{	1420	{
1158	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1421	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1159	uint8_t *data_end = (uint8_t *)SvEND (data_);	1422	uint8_t *data_end = (uint8_t *)SvEND (data_);
1160	mapcell *cell;	1423	mapcell *cell;
1161	int x, y, flags;	1424	int x, y, flags;
1162		1425
1163	while (data < data_end)	1426	while (data < data_end - 1)
1164	{	1427	{
1165	flags = (data [0] << 8) + data [1]; data += 2;	1428	flags = (data [0] << 8) + data [1]; data += 2;
1166		1429
1167	x = ((flags >> 10) & 63) + self->x;	1430	x = self->x + ((flags >> 10) & 63);
1168	y = ((flags >> 4) & 63) + self->y;	1431	y = self->y + ((flags >> 4) & 63);
1169		1432
1170	cell = map_get_cell (self, x, y);	1433	cell = map_get_cell (self, x, y);
1171		1434
1172	if (flags & 15)	1435	if (flags & 15)
1173	{	1436	{
1174	if (cell->darkness < 0)	1437	if (!cell->darkness)
1175	{	1438	{
		1439	memset (cell, 0, sizeof (*cell));
1176	cell->darkness = 0;	1440	cell->darkness = 256;
1177	cell->face [0] = 0;
1178	cell->face [1] = 0;
1179	cell->face [2] = 0;
1180	}	1441	}
1181		1442
1182	cell->darkness = flags & 8 ? *data++ : 255;
1183
1184	//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	}
1185		1484
1186	if (flags & 4)	1485	if (flags & 4)
1187	{	1486	{
1188	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];
1189	}	1490	}
1190		1491
1191	if (flags & 2)	1492	if (flags & 2)
1192	{	1493	{
1193	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];
1194	}	1497	}
1195		1498
1196	if (flags & 1)	1499	if (flags & 1)
1197	{	1500	{
1198	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];
1199	}	1504	}
1200	}	1505	}
1201	else	1506	else
1202	cell->darkness = -1;	1507	cell->darkness = 0;
1203	}	1508	}
1204	}	1509	}
1205		1510
1206	SV *	1511	SV *
1207	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)
1208	CODE:	1513	CODE:
1209	{	1514	{
1210	int x1, x;	1515	int x1, x;
1211	int y1, y;	1516	int y1, y;
1212	int z;	1517	int z;
…		…
1233	{	1538	{
1234	mapcell *cell = row->col + (x - row->c0);	1539	mapcell *cell = row->col + (x - row->c0);
1235		1540
1236	for (z = 0; z <= 0; z++)	1541	for (z = 0; z <= 0; z++)
1237	{	1542	{
1238	mapface face = cell->face [z];
1239
1240	if (face)
1241	{
1242	maptex tex = self->tex [face];	1543	maptex tex = self->tex [cell->tile [z]];
1243	int a0 = 255 - tex.a;	1544	int a0 = 255 - tex.a;
1244	int a1 = tex.a;	1545	int a1 = tex.a;
1245		1546
1246	r = (r * a0 + tex.r * a1) / 255;	1547	r = (r * a0 + tex.r * a1) / 255;
1247	g = (g * a0 + tex.g * a1) / 255;	1548	g = (g * a0 + tex.g * a1) / 255;
1248	b = (b * a0 + tex.b * a1) / 255;	1549	b = (b * a0 + tex.b * a1) / 255;
1249	a = (a * a0 + tex.a * a1) / 255;	1550	a = (a * a0 + tex.a * a1) / 255;
1250	}
1251	}	1551	}
1252	}	1552	}
1253		1553
1254	*map++ = (r )	1554	*map++ = (r )
1255	| (g << 8)	1555	| (g << 8)
…		…
1262	}	1562	}
1263	OUTPUT:	1563	OUTPUT:
1264	RETVAL	1564	RETVAL
1265		1565
1266	void	1566	void
1267	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)
1268	PPCODE:	1568	CODE:
1269	{	1569	{
1270	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;
1271	int x, y, z;	1574	int x, y, z;
1272	int last_name;	1575	int last_name;
1273	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;
1274	int sw4 = (sw + 3) & ~3;	1890	int sw4 = (sw + 3) & ~3;
1275	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1891	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1276	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1892	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1277		1893
1278	memset (darkness, 255, sw4 * sh);	1894	memset (darkness, 255, sw4 * sh);
1279	SvPOK_only (darkness_sv);	1895	SvPOK_only (darkness_sv);
1280	SvCUR_set (darkness_sv, sw4 * sh);	1896	SvCUR_set (darkness_sv, sw4 * sh);
1281		1897
1282	vx = self->x + (self->w - sw) / 2 - shift_x;	1898	mx += self->x;
1283	vy = self->y + (self->h - sh) / 2 - shift_y;	1899	my += self->y;
1284		1900
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
1295	glColor4ub (255, 255, 255, 255);
1296
1297	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298	glEnable (GL_BLEND);
1299	glEnable (GL_TEXTURE_2D);
1300	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301
1302	glBegin (GL_QUADS);
1303
1304	last_name = 0;
1305
1306	for (z = 0; z < 3; z++)
1307	for (y = 0; y < sh; y++)	1901	for (y = 0; y < sh; y++)
1308	if (0 <= y + vy && y + vy < self->rows)	1902	if (0 <= y + my && y + my < self->rows)
1309	{	1903	{
1310	maprow *row = self->row + (y + vy);	1904	maprow *row = self->row + (y + my);
1311		1905
1312	for (x = 0; x < sw; x++)	1906	for (x = 0; x < sw; x++)
1313	if (row->c0 <= x + vx && x + vx < row->c1)	1907	if (row->c0 <= x + mx && x + mx < row->c1)
1314	{	1908	{
1315	mapcell *cell = row->col + (x + vx - row->c0);	1909	mapcell *cell = row->col + (x + mx - row->c0);
1316		1910
1317	darkness[y * sw4 + x] = cell->darkness < 0	1911	darkness[y * sw4 + x] = cell->darkness
		1912	? 255 - (cell->darkness - 1)
1318	? 255 - FOW_DARKNESS	1913	: 255 - FOW_DARKNESS;
1319	: 255 - cell->darkness;
1320
1321	face = cell->face [z];
1322
1323	if (face)
1324	{
1325	maptex tex = self->tex [face];
1326
1327	int px = (x + 1) * 32 - tex.w;
1328	int py = (y + 1) * 32 - tex.h;
1329
1330	if (last_name != tex.name)
1331	{
1332	glEnd ();
1333	last_name = tex.name;
1334	glBindTexture (GL_TEXTURE_2D, last_name);
1335	glBegin (GL_QUADS);
1336	}
1337
1338	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1339	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1340	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1341	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1342	}
1343	}	1914	}
1344	}	1915	}
1345
1346	glEnd ();
1347
1348	glDisable (GL_TEXTURE_2D);
1349	glDisable (GL_BLEND);
1350		1916
1351	EXTEND (SP, 3);	1917	EXTEND (SP, 3);
1352	PUSHs (sv_2mortal (newSViv (sw4)));	1918	PUSHs (sv_2mortal (newSViv (sw4)));
1353	PUSHs (sv_2mortal (newSViv (sh)));	1919	PUSHs (sv_2mortal (newSViv (sh)));
1354	PUSHs (darkness_sv);	1920	PUSHs (darkness_sv);
1355	}	1921	}
1356		1922
1357	SV *	1923	SV *
1358	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)
1359	CODE:	1925	CODE:
1360	{	1926	{
1361	int x, y, x1, y1;	1927	int x, y, x1, y1;
1362	SV *data_sv = newSV (w * h * 7 + 5);	1928	SV *data_sv = newSV (w * h * 7 + 5);
1363	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1929	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1388	if (row && row->c0 <= x && x < row->c1)	1954	if (row && row->c0 <= x && x < row->c1)
1389	{	1955	{
1390	mapcell *cell = row->col + (x - row->c0);	1956	mapcell *cell = row->col + (x - row->c0);
1391	uint8_t flags = 0;	1957	uint8_t flags = 0;
1392		1958
1393	if (cell->face [0]) flags |= 1;	1959	if (cell->tile [0]) flags |= 1;
1394	if (cell->face [1]) flags |= 2;	1960	if (cell->tile [1]) flags |= 2;
1395	if (cell->face [2]) flags |= 4;	1961	if (cell->tile [2]) flags |= 4;
1396		1962
1397	*data++ = flags;	1963	*data++ = flags;
1398		1964
1399	if (flags & 1)	1965	if (flags & 1)
1400	{	1966	{
		1967	tileid tile = cell->tile [0];
1401	*data++ = cell->face [0] >> 8;	1968	*data++ = tile >> 8;
1402	*data++ = cell->face [0];	1969	*data++ = tile;
1403	}	1970	}
1404		1971
1405	if (flags & 2)	1972	if (flags & 2)
1406	{	1973	{
		1974	tileid tile = cell->tile [1];
1407	*data++ = cell->face [1] >> 8;	1975	*data++ = tile >> 8;
1408	*data++ = cell->face [1];	1976	*data++ = tile;
1409	}	1977	}
1410		1978
1411	if (flags & 4)	1979	if (flags & 4)
1412	{	1980	{
		1981	tileid tile = cell->tile [2];
1413	*data++ = cell->face [2] >> 8;	1982	*data++ = tile >> 8;
1414	*data++ = cell->face [2];	1983	*data++ = tile;
1415	}	1984	}
1416	}	1985	}
1417	else	1986	else
1418	*data++ = 0;	1987	*data++ = 0;
1419	}	1988	}
…		…
1425	}	1994	}
1426	OUTPUT:	1995	OUTPUT:
1427	RETVAL	1996	RETVAL
1428		1997
1429	void	1998	void
1430	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)
1431	PPCODE:	2000	PPCODE:
1432	{	2001	{
1433	int x, y, z;	2002	int x, y, z;
1434	int w, h;	2003	int w, h;
1435	int x1, y1;	2004	int x1, y1;
…		…
1459	{	2028	{
1460	uint8_t flags = *data++;	2029	uint8_t flags = *data++;
1461		2030
1462	if (flags)	2031	if (flags)
1463	{	2032	{
1464	mapface face[3] = { 0, 0, 0 };
1465
1466	mapcell *cell = row_get_cell (row, x);	2033	mapcell *cell = row_get_cell (row, x);
		2034	tileid tile[3] = { 0, 0, 0 };
1467		2035
1468	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2036	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1469	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2037	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1470	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2038	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1471		2039
1472	if (cell->darkness <= 0)	2040	if (cell->darkness == 0)
1473	{	2041	{
1474	cell->darkness = -1;	2042	cell->darkness = 0;
1475		2043
1476	for (z = 0; z <= 2; z++)	2044	for (z = 0; z <= 2; z++)
1477	{	2045	{
1478	cell->face[z] = face[z];	2046	tileid t = tile [z];
1479		2047
1480	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2048	if (t >= self->texs || (t && !self->tex [t].name))
		2049	{
1481	XPUSHs (sv_2mortal (newSViv (face[z])));	2050	XPUSHs (sv_2mortal (newSViv (t)));
		2051	need_texid (self, t);
		2052	}
		2053
		2054	cell->tile [z] = t;
1482	}	2055	}
1483	}	2056	}
1484	}	2057	}
1485	}	2058	}
1486	}	2059	}
1487	}	2060	}
1488		2061
1489	MODULE = CFClient PACKAGE = CFClient::MixChunk	2062	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490		2063
1491	CFClient::MixChunk	2064	CFPlus::MixChunk
1492	new_from_file (SV *class, char *path)	2065	new_from_file (SV *class, char *path)
1493	CODE:	2066	CODE:
1494	RETVAL = Mix_LoadWAV (path);	2067	RETVAL = Mix_LoadWAV (path);
1495	OUTPUT:	2068	OUTPUT:
1496	RETVAL	2069	RETVAL
1497		2070
1498	void	2071	void
1499	DESTROY (CFClient::MixChunk self)	2072	DESTROY (CFPlus::MixChunk self)
1500	CODE:	2073	CODE:
1501	Mix_FreeChunk (self);	2074	Mix_FreeChunk (self);
1502		2075
1503	int	2076	int
1504	volume (CFClient::MixChunk self, int volume = -1)	2077	volume (CFPlus::MixChunk self, int volume = -1)
1505	CODE:	2078	CODE:
1506	RETVAL = Mix_VolumeChunk (self, volume);	2079	RETVAL = Mix_VolumeChunk (self, volume);
1507	OUTPUT:	2080	OUTPUT:
1508	RETVAL	2081	RETVAL
1509		2082
1510	int	2083	int
1511	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)
1512	CODE:	2085	CODE:
1513	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2086	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514	OUTPUT:	2087	OUTPUT:
1515	RETVAL	2088	RETVAL
1516		2089
1517	MODULE = CFClient PACKAGE = CFClient::MixMusic	2090	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518		2091
1519	int	2092	int
1520	volume (int volume = -1)	2093	volume (int volume = -1)
1521	CODE:	2094	CODE:
1522	RETVAL = Mix_VolumeMusic (volume);	2095	RETVAL = Mix_VolumeMusic (volume);
1523	OUTPUT:	2096	OUTPUT:
1524	RETVAL	2097	RETVAL
1525		2098
1526	CFClient::MixMusic	2099	CFPlus::MixMusic
1527	new_from_file (SV *class, char *path)	2100	new_from_file (SV *class, char *path)
1528	CODE:	2101	CODE:
1529	RETVAL = Mix_LoadMUS (path);	2102	RETVAL = Mix_LoadMUS (path);
1530	OUTPUT:	2103	OUTPUT:
1531	RETVAL	2104	RETVAL
1532		2105
1533	void	2106	void
1534	DESTROY (CFClient::MixMusic self)	2107	DESTROY (CFPlus::MixMusic self)
1535	CODE:	2108	CODE:
1536	Mix_FreeMusic (self);	2109	Mix_FreeMusic (self);
1537		2110
1538	int	2111	int
1539	play (CFClient::MixMusic self, int loops = -1)	2112	play (CFPlus::MixMusic self, int loops = -1)
1540	CODE:	2113	CODE:
1541	RETVAL = Mix_PlayMusic (self, loops);	2114	RETVAL = Mix_PlayMusic (self, loops);
1542	OUTPUT:	2115	OUTPUT:
1543	RETVAL	2116	RETVAL
1544		2117
1545	MODULE = CFClient PACKAGE = CFClient::OpenGL	2118	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546		2119
1547	BOOT:	2120	BOOT:
1548	{	2121	{
1549	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2122	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550	static const struct {	2123	static const struct {
1551	const char *name;	2124	const char *name;
1552	IV iv;	2125	IV iv;
1553	} *civ, const_iv[] = {	2126	} *civ, const_iv[] = {
1554	# define const_iv(name) { # name, (IV)name }	2127	# define const_iv(name) { # name, (IV)name }
…		…
1561	const_iv (GL_SCISSOR_TEST),	2134	const_iv (GL_SCISSOR_TEST),
1562	const_iv (GL_DEPTH_TEST),	2135	const_iv (GL_DEPTH_TEST),
1563	const_iv (GL_ALPHA_TEST),	2136	const_iv (GL_ALPHA_TEST),
1564	const_iv (GL_NORMALIZE),	2137	const_iv (GL_NORMALIZE),
1565	const_iv (GL_RESCALE_NORMAL),	2138	const_iv (GL_RESCALE_NORMAL),
		2139	const_iv (GL_FRONT),
		2140	const_iv (GL_BACK),
1566	const_iv (GL_AND),	2141	const_iv (GL_AND),
1567	const_iv (GL_ONE),	2142	const_iv (GL_ONE),
1568	const_iv (GL_ZERO),	2143	const_iv (GL_ZERO),
1569	const_iv (GL_SRC_ALPHA),	2144	const_iv (GL_SRC_ALPHA),
1570	const_iv (GL_DST_ALPHA),	2145	const_iv (GL_DST_ALPHA),
1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2146	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572	const_iv (GL_ONE_MINUS_DST_ALPHA),	2147	const_iv (GL_ONE_MINUS_DST_ALPHA),
1573	const_iv (GL_SRC_ALPHA_SATURATE),	2148	const_iv (GL_SRC_ALPHA_SATURATE),
1574	const_iv (GL_RGB),	2149	const_iv (GL_RGB),
1575	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),
1576	const_iv (GL_UNSIGNED_BYTE),	2154	const_iv (GL_UNSIGNED_BYTE),
1577	const_iv (GL_UNSIGNED_SHORT),	2155	const_iv (GL_UNSIGNED_SHORT),
1578	const_iv (GL_UNSIGNED_INT),	2156	const_iv (GL_UNSIGNED_INT),
1579	const_iv (GL_ALPHA),	2157	const_iv (GL_ALPHA),
1580	const_iv (GL_INTENSITY),	2158	const_iv (GL_INTENSITY),
…		…
1612	const_iv (GL_SEPARABLE_2D),	2190	const_iv (GL_SEPARABLE_2D),
1613	const_iv (GL_CONVOLUTION_2D),	2191	const_iv (GL_CONVOLUTION_2D),
1614	const_iv (GL_CONVOLUTION_BORDER_MODE),	2192	const_iv (GL_CONVOLUTION_BORDER_MODE),
1615	const_iv (GL_CONSTANT_BORDER),	2193	const_iv (GL_CONSTANT_BORDER),
1616	const_iv (GL_LINES),	2194	const_iv (GL_LINES),
		2195	const_iv (GL_LINE_STRIP),
1617	const_iv (GL_LINE_LOOP),	2196	const_iv (GL_LINE_LOOP),
1618	const_iv (GL_QUADS),	2197	const_iv (GL_QUADS),
1619	const_iv (GL_QUAD_STRIP),	2198	const_iv (GL_QUAD_STRIP),
1620	const_iv (GL_TRIANGLES),	2199	const_iv (GL_TRIANGLES),
1621	const_iv (GL_TRIANGLE_STRIP),	2200	const_iv (GL_TRIANGLE_STRIP),
…		…
1654	OUTPUT:	2233	OUTPUT:
1655	RETVAL	2234	RETVAL
1656		2235
1657	int glGetError ()	2236	int glGetError ()
1658		2237
		2238	void glFinish ()
		2239
1659	void glClear (int mask)	2240	void glClear (int mask)
1660		2241
1661	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)
1662	PROTOTYPE: @	2243	PROTOTYPE: @
1663		2244
…		…
1686	void glPushMatrix ()	2267	void glPushMatrix ()
1687		2268
1688	void glPopMatrix ()	2269	void glPopMatrix ()
1689		2270
1690	void glLoadIdentity ()	2271	void glLoadIdentity ()
		2272
		2273	void glDrawBuffer (int buffer)
		2274
		2275	void glReadBuffer (int buffer)
1691		2276
1692	# near_ and far_ are due to microsofts buggy "c" compiler	2277	# 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_)	2278	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694		2279
1695	# near_ and far_ are due to microsofts buggy "c" compiler	2280	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1725	r *= a;	2310	r *= a;
1726	g *= a;	2311	g *= a;
1727	b *= a;	2312	b *= a;
1728	}	2313	}
1729	// microsoft visual "c" rounds instead of truncating...	2314	// microsoft visual "c" rounds instead of truncating...
1730	glColor4ub (MIN ((int)(r * 256.f), 255),	2315	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		2316
1735	void glInterleavedArrays (int format, int stride, char *data)	2317	void glInterleavedArrays (int format, int stride, char *data)
1736		2318
1737	void glDrawElements (int mode, int count, int type, char *indices)	2319	void glDrawElements (int mode, int count, int type, char *indices)
1738		2320
…		…
1815		2397
1816	void glEndList ()	2398	void glEndList ()
1817		2399
1818	void glCallList (int list)	2400	void glCallList (int list)
1819		2401
1820

Diff Legend

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