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

Diff Legend

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