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.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.177 by root, Tue Apr 10 10:13:10 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)
…		…
574	#ifndef _WIN32	706	#ifndef _WIN32
575	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	707	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
576	#endif	708	#endif
577		709
578	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
579	add_font (char *file)	740	add_font (char *file)
580	CODE:	741	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	742	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		743
587	void	744	void
588	load_image_inline (SV *image_)	745	load_image_inline (SV *image_)
589	ALIAS:	746	ALIAS:
590	load_image_file = 1	747	load_image_file = 1
…		…
632		789
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	790	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		791
635	assert (surface2->pitch == surface2->w * 4);	792	assert (surface2->pitch == surface2->w * 4);
636		793
		794	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	795	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	796	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	797	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	798	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)));	799	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	800	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	801	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		802	SDL_UnlockSurface (surface2);
646		803
647	SDL_FreeSurface (surface);	804	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	805	SDL_FreeSurface (surface2);
649	}	806	}
650		807
…		…
686	CODE:	843	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	844	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	845	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	846	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690	#endif	847	#endif
691	exit (1);	848	_exit (1);
692		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
693	MODULE = CFClient PACKAGE = CFClient::Font	859	MODULE = CFPlus PACKAGE = CFPlus::Font
694		860
695	CFClient::Font	861	CFPlus::Font
696	new_from_file (SV *class, char *path, int id = 0)	862	new_from_file (SV *class, char *path, int id = 0)
697	CODE:	863	CODE:
698	{	864	{
699	int count;	865	int count;
700	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	866	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
703	}	869	}
704	OUTPUT:	870	OUTPUT:
705	RETVAL	871	RETVAL
706		872
707	void	873	void
708	DESTROY (CFClient::Font self)	874	DESTROY (CFPlus::Font self)
709	CODE:	875	CODE:
710	pango_font_description_free (self);	876	pango_font_description_free (self);
711		877
712	void	878	void
713	make_default (CFClient::Font self)	879	make_default (CFPlus::Font self)
714	CODE:	880	CODE:
715	default_font = self;	881	default_font = self;
716		882
717	MODULE = CFClient PACKAGE = CFClient::Layout	883	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		884
719	CFClient::Layout	885	void
720	new (SV *class, int rgba = 0)	886	reset_glyph_cache ()
721	CODE:	887	CODE:
722	#if _WIN32	888	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	889
724	#endif	890	CFPlus::Layout
		891	new (SV *class)
		892	CODE:
725	New (0, RETVAL, 1, struct cf_layout);	893	New (0, RETVAL, 1, struct cf_layout);
726		894
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	895	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	896	RETVAL->r = 1.;
730	RETVAL->g = 1.;	897	RETVAL->g = 1.;
731	RETVAL->b = 1.;	898	RETVAL->b = 1.;
732	RETVAL->a = 1.;	899	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	900	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
737	layout_update_font (RETVAL);	904	layout_update_font (RETVAL);
738	OUTPUT:	905	OUTPUT:
739	RETVAL	906	RETVAL
740		907
741	void	908	void
742	DESTROY (CFClient::Layout self)	909	DESTROY (CFPlus::Layout self)
743	CODE:	910	CODE:
744	g_object_unref (self->pl);	911	g_object_unref (self->pl);
745	Safefree (self);	912	Safefree (self);
746		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
747	int	1004	int
748	is_rgba (CFClient::Layout self)	1005	has_wrapped (CFPlus::Layout self)
749	CODE:	1006	CODE:
750	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	}
751	OUTPUT:	1016	OUTPUT:
752	RETVAL	1017	RETVAL
753		1018
754	void
755	set_text (CFClient::Layout self, SV *text_)
756	CODE:
757	{
758	STRLEN textlen;
759	char *text = SvPVutf8 (text_, textlen);
760
761	pango_layout_set_text (self->pl, text, textlen);
762	}
763
764	void
765	set_markup (CFClient::Layout self, SV *text_)
766	CODE:
767	{
768	STRLEN textlen;
769	char *text = SvPVutf8 (text_, textlen);
770
771	pango_layout_set_markup (self->pl, text, textlen);
772	}
773
774	SV *	1019	SV *
775	get_text (CFClient::Layout self)	1020	get_text (CFPlus::Layout self)
776	CODE:	1021	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1022	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	1023	sv_utf8_decode (RETVAL);
779	OUTPUT:	1024	OUTPUT:
780	RETVAL	1025	RETVAL
781		1026
782	void	1027	void
783	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.)
784	CODE:	1029	CODE:
785	self->r = r;	1030	self->r = r;
786	self->g = g;	1031	self->g = g;
787	self->b = b;	1032	self->b = b;
788	self->a = a;	1033	self->a = a;
789		1034
790	void	1035	void
791	set_font (CFClient::Layout self, CFClient::Font font = 0)	1036	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792	CODE:	1037	CODE:
793	if (self->font != font)	1038	if (self->font != font)
794	{	1039	{
795	self->font = font;	1040	self->font = font;
796	layout_update_font (self);	1041	layout_update_font (self);
797	}	1042	}
798		1043
799	void	1044	void
800	set_height (CFClient::Layout self, int base_height)	1045	set_height (CFPlus::Layout self, int base_height)
801	CODE:	1046	CODE:
802	if (self->base_height != base_height)	1047	if (self->base_height != base_height)
803	{	1048	{
804	self->base_height = base_height;	1049	self->base_height = base_height;
805	layout_update_font (self);	1050	layout_update_font (self);
806	}	1051	}
807		1052
808	void	1053	void
809	set_width (CFClient::Layout self, int max_width = -1)	1054	set_width (CFPlus::Layout self, int max_width = -1)
810	CODE:	1055	CODE:
811	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);
812		1057
813	void	1058	void
814	set_indent (CFClient::Layout self, int indent)	1059	set_indent (CFPlus::Layout self, int indent)
815	CODE:	1060	CODE:
816	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1061	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817		1062
818	void	1063	void
819	set_spacing (CFClient::Layout self, int spacing)	1064	set_spacing (CFPlus::Layout self, int spacing)
820	CODE:	1065	CODE:
821	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1066	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822		1067
823	void	1068	void
824	set_ellipsise (CFClient::Layout self, int ellipsise)	1069	set_ellipsise (CFPlus::Layout self, int ellipsise)
825	CODE:	1070	CODE:
826	pango_layout_set_ellipsize (self->pl,	1071	pango_layout_set_ellipsize (self->pl,
827	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1072	ellipsise == 1 ? PANGO_ELLIPSIZE_START
828	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1073	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1074	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
830	: PANGO_ELLIPSIZE_NONE	1075	: PANGO_ELLIPSIZE_NONE
831	);	1076	);
832		1077
833	void	1078	void
834	set_single_paragraph_mode (CFClient::Layout self, int spm)	1079	set_single_paragraph_mode (CFPlus::Layout self, int spm)
835	CODE:	1080	CODE:
836	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1081	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837		1082
838	void	1083	void
839	size (CFClient::Layout self)	1084	size (CFPlus::Layout self)
840	PPCODE:	1085	PPCODE:
841	{	1086	{
842	int w, h;	1087	int w, h;
843		1088
844	layout_get_pixel_size (self, &w, &h);	1089	layout_get_pixel_size (self, &w, &h);
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	1092	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	1093	PUSHs (sv_2mortal (newSViv (h)));
849	}	1094	}
850		1095
851	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
852	xy_to_index (CFClient::Layout self, int x, int y)	1109	xy_to_index (CFPlus::Layout self, int x, int y)
853	CODE:	1110	CODE:
854	{	1111	{
855	int index, trailing;	1112	int index, trailing;
856	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);
857	RETVAL = index;	1114	RETVAL = index + trailing;
858	}	1115	}
859	OUTPUT:	1116	OUTPUT:
860	RETVAL	1117	RETVAL
861		1118
862	void	1119	void
863	cursor_pos (CFClient::Layout self, int index)	1120	cursor_pos (CFPlus::Layout self, int index)
864	PPCODE:	1121	PPCODE:
865	{	1122	{
866	PangoRectangle strong_pos;	1123	PangoRectangle strong_pos;
867	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1124	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868		1125
…		…
871	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1128	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1129	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1130	}
874		1131
875	void	1132	void
876	render (CFClient::Layout self)	1133	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
877	PPCODE:	1134	PPCODE:
878	{	1135	{
879	SV *retval;	1136	int line, x;
880	int w, h;
881		1137
882	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 */
883		1140
884	if (self->rgba)
885	{
886	cairo_surface_t *surface;
887	cairo_t *cairo;
888
889	retval = newSV (w * h * 4);
890	SvPOK_only (retval);
891	SvCUR_set (retval, w * h * 4);
892
893	memset (SvPVX (retval), 0, w * h * 4);
894
895	surface = cairo_image_surface_create_for_data (
896	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
897	cairo = cairo_create (surface);
898	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900	pango_cairo_show_layout (cairo, self->pl);
901
902	cairo_destroy (cairo);
903	cairo_surface_destroy (surface);
904
905	// what a mess, and its premultiplied, too :(
906	{
907	uint32_t *p = (uint32_t *)SvPVX (retval);
908	uint32_t *e = p + w * h;
909
910	while (p < e)
911	{
912	uint32_t rgba = *p;
913	rgba = (rgba >> 24) | (rgba << 8);
914	#if 0
915	#ifdef _WIN32
916	{//D
917	uint8_t r = rgba >> 24;
918	uint8_t g = rgba >> 16;
919	uint8_t b = rgba >> 8;
920	uint8_t a = rgba >> 0;
921
922	rgba = (rgba & 0xffffff00) | a;
923	}
924	#endif
925	#endif
926	rgba = SDL_SwapBE32 (rgba);
927	*p++ = rgba;
928	}
929	}
930
931	EXTEND (SP, 5);	1141	EXTEND (SP, 2);
932	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)
933	PUSHs (sv_2mortal (newSViv (h)));	1163	PUSHs (sv_2mortal (newSViv (index + trailing)));
934	PUSHs (sv_2mortal (retval));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	}
938	else	1164	else
939	{	1165	{
940	FT_Bitmap bitmap;
941
942	retval = newSV (w * h);
943	SvPOK_only (retval);
944	SvCUR_set (retval, w * h);
945
946	bitmap.rows = h;
947	bitmap.width = w;
948	bitmap.pitch = w;
949	bitmap.buffer = (unsigned char*)SvPVX (retval);
950	bitmap.num_grays = 256;
951	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953	memset (bitmap.buffer, 0, w * h);
954
955	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957	EXTEND (SP, 5);
958	PUSHs (sv_2mortal (newSViv (w)));	1166	PUSHs (sv_2mortal (newSViv (index)));
959	PUSHs (sv_2mortal (newSViv (h)));	1167	PUSHs (sv_2mortal (newSViv (trailing)));
960	PUSHs (sv_2mortal (retval));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	}	1168	}
964	}	1169	}
965		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
966	MODULE = CFClient PACKAGE = CFClient::Texture	1181	MODULE = CFPlus PACKAGE = CFPlus::Texture
967		1182
968	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
969	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.)
970	PROTOTYPE: $$$;$$	1222	PROTOTYPE: $$$;$$
971	ALIAS:	1223	ALIAS:
972	draw_quad_alpha = 1	1224	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1225	draw_quad_alpha_premultiplied = 2
974	CODE:	1226	CODE:
…		…
990		1242
991	if (ix == 2)	1243	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1244	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1245	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1246	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1247	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1248
997	glEnable (GL_ALPHA_TEST);	1249	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1250	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1251	}
1000		1252
…		…
1012	glDisable (GL_ALPHA_TEST);	1264	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1265	glDisable (GL_BLEND);
1014	}	1266	}
1015	}	1267	}
1016		1268
1017	MODULE = CFClient PACKAGE = CFClient::Map	1269	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1270
1019	CFClient::Map	1271	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1272	new (SV *class)
1021	CODE:	1273	CODE:
1022	New (0, RETVAL, 1, struct map);	1274	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1275	RETVAL->x = 0;
1024	RETVAL->y = 0;	1276	RETVAL->y = 0;
1025	RETVAL->w = map_width;	1277	RETVAL->w = 0;
1026	RETVAL->h = map_height;	1278	RETVAL->h = 0;
1027	RETVAL->ox = 0;	1279	RETVAL->ox = 0;
1028	RETVAL->oy = 0;	1280	RETVAL->oy = 0;
1029	RETVAL->faces = 8192;	1281	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1030	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1282	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1031	RETVAL->texs = 8192;
1032	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1033	RETVAL->rows = 0;	1283	RETVAL->rows = 0;
1034	RETVAL->row = 0;	1284	RETVAL->row = 0;
1035	OUTPUT:	1285	OUTPUT:
1036	RETVAL	1286	RETVAL
1037		1287
1038	void	1288	void
1039	DESTROY (CFClient::Map self)	1289	DESTROY (CFPlus::Map self)
1040	CODE:	1290	CODE:
1041	{	1291	{
1042	map_clear (self);	1292	map_clear (self);
1043	Safefree (self->face);	1293	Safefree (self->face2tile);
		1294	Safefree (self->tex);
1044	Safefree (self);	1295	Safefree (self);
1045	}	1296	}
1046		1297
1047	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
1048	clear (CFClient::Map self)	1305	clear (CFPlus::Map self)
1049	CODE:	1306	CODE:
1050	map_clear (self);	1307	map_clear (self);
1051		1308
1052	void	1309	void
1053	set_face (CFClient::Map self, int face, int texid)	1310	set_tileid (CFPlus::Map self, int face, int tile)
1054	CODE:	1311	CODE:
1055	{	1312	{
1056	while (self->faces <= face)	1313	need_facenum (self, face); self->face2tile [face] = tile;
1057	{	1314	need_texid (self, tile);
1058	Append (mapface, self->face, self->faces, self->faces);
1059	self->faces *= 2;
1060	}
1061
1062	self->face [face] = texid;
1063	}	1315	}
1064		1316
1065	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
1066	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)
1067	CODE:	1342	CODE:
1068	{	1343	{
1069	while (self->texs <= texid)	1344	need_texid (self, texid);
1070	{
1071	Append (maptex, self->tex, self->texs, self->texs);
1072	self->texs *= 2;
1073	}
1074		1345
1075	{	1346	{
1076	maptex *tex = self->tex + texid;	1347	maptex *tex = self->tex + texid;
1077		1348
1078	tex->name = name;	1349	tex->name = name;
…		…
1095	// from transparent color bleeding and ugly wrapping effects.	1366	// from transparent color bleeding and ugly wrapping effects.
1096	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1367	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097	}	1368	}
1098		1369
1099	int	1370	int
1100	ox (CFClient::Map self)	1371	ox (CFPlus::Map self)
1101	ALIAS:	1372	ALIAS:
1102	oy = 1	1373	oy = 1
1103	x = 2	1374	x = 2
1104	y = 3	1375	y = 3
1105	w = 4	1376	w = 4
…		…
1116	}	1387	}
1117	OUTPUT:	1388	OUTPUT:
1118	RETVAL	1389	RETVAL
1119		1390
1120	void	1391	void
1121	scroll (CFClient::Map self, int dx, int dy)	1392	scroll (CFPlus::Map self, int dx, int dy)
1122	CODE:	1393	CODE:
1123	{	1394	{
1124	if (dx > 0)	1395	if (dx > 0)
1125	map_blank (self, self->x, self->y, dx - 1, self->h);	1396	map_blank (self, self->x, self->y, dx, self->h);
1126	else if (dx < 0)	1397	else if (dx < 0)
1127	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);
1128		1399
1129	if (dy > 0)	1400	if (dy > 0)
1130	map_blank (self, self->x, self->y, self->w, dy - 1);	1401	map_blank (self, self->x, self->y, self->w, dy);
1131	else if (dy < 0)	1402	else if (dy < 0)
1132	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);
1133		1404
1134	self->ox += dx; self->x += dx;	1405	self->ox += dx; self->x += dx;
1135	self->oy += dy; self->y += dy;	1406	self->oy += dy; self->y += dy;
1136		1407
1137	while (self->y < 0)	1408	while (self->y < 0)
…		…
1142	self->y += MAP_EXTEND_Y;	1413	self->y += MAP_EXTEND_Y;
1143	}	1414	}
1144	}	1415	}
1145		1416
1146	void	1417	void
1147	map1a_update (CFClient::Map self, SV *data_)	1418	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1148	CODE:	1419	CODE:
1149	{	1420	{
1150	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1421	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1151	uint8_t *data_end = (uint8_t *)SvEND (data_);	1422	uint8_t *data_end = (uint8_t *)SvEND (data_);
1152	mapcell *cell;	1423	mapcell *cell;
1153	int x, y, flags;	1424	int x, y, flags;
1154		1425
1155	while (data < data_end)	1426	while (data < data_end - 1)
1156	{	1427	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1428	flags = (data [0] << 8) + data [1]; data += 2;
1158		1429
1159	x = ((flags >> 10) & 63) + self->x;	1430	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1431	y = self->y + ((flags >> 4) & 63);
1161		1432
1162	cell = map_get_cell (self, x, y);	1433	cell = map_get_cell (self, x, y);
1163		1434
1164	if (flags & 15)	1435	if (flags & 15)
1165	{	1436	{
1166	if (cell->darkness < 0)	1437	if (!cell->darkness)
1167	{	1438	{
		1439	memset (cell, 0, sizeof (*cell));
1168	cell->darkness = 0;	1440	cell->darkness = 256;
1169	cell->face [0] = 0;
1170	cell->face [1] = 0;
1171	cell->face [2] = 0;
1172	}	1441	}
1173		1442
1174	cell->darkness = flags & 8 ? *data++ : 255;
1175
1176	//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	}
1177		1484
1178	if (flags & 4)	1485	if (flags & 4)
1179	{	1486	{
1180	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];
1181	}	1490	}
1182		1491
1183	if (flags & 2)	1492	if (flags & 2)
1184	{	1493	{
1185	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];
1186	}	1497	}
1187		1498
1188	if (flags & 1)	1499	if (flags & 1)
1189	{	1500	{
1190	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];
1191	}	1504	}
1192	}	1505	}
1193	else	1506	else
1194	cell->darkness = -1;	1507	cell->darkness = 0;
1195	}	1508	}
1196	}	1509	}
1197		1510
1198	SV *	1511	SV *
1199	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)
1200	CODE:	1513	CODE:
1201	{	1514	{
1202	int x1, x;	1515	int x1, x;
1203	int y1, y;	1516	int y1, y;
1204	int z;	1517	int z;
…		…
1225	{	1538	{
1226	mapcell *cell = row->col + (x - row->c0);	1539	mapcell *cell = row->col + (x - row->c0);
1227		1540
1228	for (z = 0; z <= 0; z++)	1541	for (z = 0; z <= 0; z++)
1229	{	1542	{
1230	mapface face = cell->face [z];
1231
1232	if (face)
1233	{
1234	maptex tex = self->tex [face];	1543	maptex tex = self->tex [cell->tile [z]];
1235	int a0 = 255 - tex.a;	1544	int a0 = 255 - tex.a;
1236	int a1 = tex.a;	1545	int a1 = tex.a;
1237		1546
1238	r = (r * a0 + tex.r * a1) / 255;	1547	r = (r * a0 + tex.r * a1) / 255;
1239	g = (g * a0 + tex.g * a1) / 255;	1548	g = (g * a0 + tex.g * a1) / 255;
1240	b = (b * a0 + tex.b * a1) / 255;	1549	b = (b * a0 + tex.b * a1) / 255;
1241	a = (a * a0 + tex.a * a1) / 255;	1550	a = (a * a0 + tex.a * a1) / 255;
1242	}
1243	}	1551	}
1244	}	1552	}
1245		1553
1246	*map++ = (r )	1554	*map++ = (r )
1247	| (g << 8)	1555	| (g << 8)
…		…
1254	}	1562	}
1255	OUTPUT:	1563	OUTPUT:
1256	RETVAL	1564	RETVAL
1257		1565
1258	void	1566	void
1259	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)
1260	PPCODE:	1568	CODE:
1261	{	1569	{
1262	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;
1263	int x, y, z;	1574	int x, y, z;
1264	int last_name;	1575	int last_name;
1265	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	smooth_max[x + 1][y + 1] =
		1614	MAX (self->tex [cell->tile [0]].smoothlevel,
		1615	MAX (self->tex [cell->tile [1]].smoothlevel,
		1616	self->tex [cell->tile [2]].smoothlevel));
		1617	}
		1618	}
		1619
		1620	for (z = 0; z <= 2; z++)
		1621	{
		1622	memset (smooth_level, 0, sizeof (smooth_level));
		1623
		1624	for (y = 0; y < sh; y++)
		1625	if (0 <= y + my && y + my < self->rows)
		1626	{
		1627	maprow *row = self->row + (y + my);
		1628
		1629	for (x = 0; x < sw; x++)
		1630	if (row->c0 <= x + mx && x + mx < row->c1)
		1631	{
		1632	mapcell *cell = row->col + (x + mx - row->c0);
		1633	tileid tile = cell->tile [z];
		1634
		1635	if (tile)
		1636	{
		1637	maptex tex = self->tex [tile];
		1638	int px = (x + 1) * T - tex.w;
		1639	int py = (y + 1) * T - tex.h;
		1640
		1641	// suppressing texture state switches here
		1642	// is only moderately effective, but worth the extra effort
		1643	if (last_name != tex.name)
		1644	{
		1645	if (!tex.name)
		1646	tex = self->tex [2]; /* missing, replace by noface */
		1647
		1648	glEnd ();
		1649	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1650	glBegin (GL_QUADS);
		1651	}
		1652
		1653	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1654	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1655	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1656	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1657
		1658	if (cell->flags && z == 2)
		1659	{
		1660	if (cell->flags & 1)
		1661	{
		1662	maptex tex = self->tex [1];
		1663	int px = x * T + T * 2 / 32;
		1664	int py = y * T - T * 6 / 32;
		1665
		1666	glEnd ();
		1667	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1668	glBegin (GL_QUADS);
		1669
		1670	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1671	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1672	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1673	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1674	}
		1675	}
		1676
		1677	// update smooth hash
		1678	if (tex.smoothtile)
		1679	{
		1680	skey.tile = tex.smoothtile;
		1681	skey.level = tex.smoothlevel;
		1682
		1683	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1684
		1685	// add bits to current tile and all neighbours. skey.x|y is
		1686	// shifted +1|+1 so we always stay positive.
		1687
		1688	// full tile
		1689	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1690
		1691	// borders
		1692	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
		1693	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
		1694	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1695	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1696
		1697	// corners
		1698	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1699	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1700	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1701	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1702	}
		1703	}
		1704	}
		1705	}
		1706
		1707	// go through all smoothlevels, lowest to highest, then draw
		1708	// this is basically counting sort
		1709	{
		1710	int w, b;
		1711
		1712	for (w = 0; w < 256 / 32; ++w)
		1713	{
		1714	uint32_t smask = smooth_level [w];
		1715	if (smask)
		1716	for (b = 0; b < 32; ++b)
		1717	if (smask & (((uint32_t)1) << b))
		1718	{
		1719	int level = (w << 5) | b;
		1720	HE *he;
		1721
		1722	hv_iterinit (smooth);
		1723	while ((he = hv_iternext (smooth)))
		1724	{
		1725	smooth_key *skey = (smooth_key *)HeKEY (he);
		1726	IV bits = SvIVX (HeVAL (he));
		1727
		1728	// bits is ___n cccc CCCC bbbb
		1729	// n do not draw borders&corners
		1730	// c draw these corners, but...
		1731	// C ... not these
		1732	// b draw these borders
		1733
		1734	if (!(bits & 0x1000)
		1735	&& skey->level == level
		1736	&& level >= smooth_max [skey->x][skey->y])
		1737	{
		1738	maptex tex = self->tex [skey->tile];
		1739	int px = (((int)skey->x) - 1) * T;
		1740	int py = (((int)skey->y) - 1) * T;
		1741	int border = bits & 15;
		1742	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1743	float dx = tex.s * .0625f; // 16 images/row
		1744	float dy = tex.t * .5f ; // 2 images/column
		1745
		1746	// this time naively avoiding texture state changes
		1747	// save gobs of state changes.
		1748	if (last_name != tex.name)
		1749	{
		1750	if (!tex.name)
		1751	continue; // smoothing not yet available
		1752
		1753	glEnd ();
		1754	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1755	glBegin (GL_QUADS);
		1756	}
		1757
		1758	if (border)
		1759	{
		1760	float ox = border * dx;
		1761
		1762	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1763	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1764	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1765	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1766	}
		1767
		1768	if (corner)
		1769	{
		1770	float ox = corner * dx;
		1771
		1772	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1773	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1774	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1775	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1776	}
		1777	}
		1778	}
		1779	}
		1780	}
		1781	}
		1782
		1783	hv_clear (smooth);
		1784	}
		1785
		1786	glEnd ();
		1787
		1788	glDisable (GL_TEXTURE_2D);
		1789	glDisable (GL_BLEND);
		1790
		1791	// top layer: overlays such as the health bar
		1792	for (y = 0; y < sh; y++)
		1793	if (0 <= y + my && y + my < self->rows)
		1794	{
		1795	maprow *row = self->row + (y + my);
		1796
		1797	for (x = 0; x < sw; x++)
		1798	if (row->c0 <= x + mx && x + mx < row->c1)
		1799	{
		1800	mapcell *cell = row->col + (x + mx - row->c0);
		1801
		1802	int px = x * T;
		1803	int py = y * T;
		1804
		1805	if (cell->stat_hp)
		1806	{
		1807	int width = cell->stat_width * T;
		1808	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1809
		1810	glColor3ub (0, 0, 0);
		1811	glRectf (px + 1, py - thick - 2,
		1812	px + width - 1, py);
		1813
		1814	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1815	glRectf (px + 2,
		1816	py - thick - 1,
		1817	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1818	}
		1819	}
		1820	}
		1821	}
		1822
		1823	void
		1824	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1825	CODE:
		1826	{
		1827	static float color[16][3] = {
		1828	{ 0.00F, 0.00F, 0.00F },
		1829	{ 1.00F, 1.00F, 1.00F },
		1830	{ 0.00F, 0.00F, 0.55F },
		1831	{ 1.00F, 0.00F, 0.00F },
		1832
		1833	{ 1.00F, 0.54F, 0.00F },
		1834	{ 0.11F, 0.56F, 1.00F },
		1835	{ 0.93F, 0.46F, 0.00F },
		1836	{ 0.18F, 0.54F, 0.34F },
		1837
		1838	{ 0.56F, 0.73F, 0.56F },
		1839	{ 0.80F, 0.80F, 0.80F },
		1840	{ 0.55F, 0.41F, 0.13F },
		1841	{ 0.99F, 0.77F, 0.26F },
		1842
		1843	{ 0.74F, 0.65F, 0.41F },
		1844
		1845	{ 0.00F, 1.00F, 1.00F },
		1846	{ 1.00F, 0.00F, 1.00F },
		1847	{ 1.00F, 1.00F, 0.00F },
		1848	};
		1849
		1850	int x, y;
		1851
		1852	glEnable (GL_TEXTURE_2D);
		1853	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1854	glEnable (GL_BLEND);
		1855	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1856	glBegin (GL_QUADS);
		1857
		1858	for (y = 0; y < h; y++)
		1859	for (x = 0; x < w; x++)
		1860	{
		1861	unsigned char m = data [x + y * w];
		1862
		1863	if (m)
		1864	{
		1865	float *c = color [m & 15];
		1866
		1867	float tx1 = m & 0x40 ? 0.5 : 0.;
		1868	float tx2 = tx1 + 0.5;
		1869
		1870	glColor4f (c[0], c[1], c[2], 0.75);
		1871	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1872	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1873	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1874	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1875	}
		1876	}
		1877
		1878	glEnd ();
		1879	glDisable (GL_BLEND);
		1880	glDisable (GL_TEXTURE_2D);
		1881	}
		1882
		1883	void
		1884	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1885	PPCODE:
		1886	{
		1887	int x, y;
1266	int sw4 = (sw + 3) & ~3;	1888	int sw4 = (sw + 3) & ~3;
1267	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1889	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1268	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1890	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1269		1891
1270	memset (darkness, 255, sw4 * sh);	1892	memset (darkness, 255, sw4 * sh);
1271	SvPOK_only (darkness_sv);	1893	SvPOK_only (darkness_sv);
1272	SvCUR_set (darkness_sv, sw4 * sh);	1894	SvCUR_set (darkness_sv, sw4 * sh);
1273		1895
1274	vx = self->x + (self->w - sw) / 2 - shift_x;	1896	mx += self->x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1897	my += self->y;
1276		1898
1277	/*
1278	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2
1280	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1281
1282	int vy = self->vy = self->h >= sh
1283	? self->y + (self->h - sh) / 2
1284	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285	*/
1286
1287	glColor4ub (255, 255, 255, 255);
1288
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293
1294	glBegin (GL_QUADS);
1295
1296	last_name = 0;
1297
1298	for (z = 0; z < 3; z++)
1299	for (y = 0; y < sh; y++)	1899	for (y = 0; y < sh; y++)
1300	if (0 <= y + vy && y + vy < self->rows)	1900	if (0 <= y + my && y + my < self->rows)
1301	{	1901	{
1302	maprow *row = self->row + (y + vy);	1902	maprow *row = self->row + (y + my);
1303		1903
1304	for (x = 0; x < sw; x++)	1904	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1905	if (row->c0 <= x + mx && x + mx < row->c1)
1306	{	1906	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1907	mapcell *cell = row->col + (x + mx - row->c0);
1308		1908
1309	darkness[y * sw4 + x] = cell->darkness < 0	1909	darkness[y * sw4 + x] = cell->darkness
		1910	? 255 - (cell->darkness - 1)
1310	? 255 - FOW_DARKNESS	1911	: 255 - FOW_DARKNESS;
1311	: 255 - cell->darkness;
1312
1313	face = cell->face [z];
1314
1315	if (face)
1316	{
1317	maptex tex = self->tex [face];
1318
1319	int px = (x + 1) * 32 - tex.w;
1320	int py = (y + 1) * 32 - tex.h;
1321
1322	if (last_name != tex.name)
1323	{
1324	glEnd ();
1325	last_name = tex.name;
1326	glBindTexture (GL_TEXTURE_2D, last_name);
1327	glBegin (GL_QUADS);
1328	}
1329
1330	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1331	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1332	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1333	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1334	}
1335	}	1912	}
1336	}	1913	}
1337
1338	glEnd ();
1339
1340	glDisable (GL_TEXTURE_2D);
1341	glDisable (GL_BLEND);
1342		1914
1343	EXTEND (SP, 3);	1915	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1916	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1917	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1918	PUSHs (darkness_sv);
1347	}	1919	}
1348		1920
1349	SV *	1921	SV *
1350	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1922	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1351	CODE:	1923	CODE:
1352	{	1924	{
1353	int x, y, x1, y1;	1925	int x, y, x1, y1;
1354	SV *data_sv = newSV (w * h * 7 + 5);	1926	SV *data_sv = newSV (w * h * 7 + 5);
1355	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1927	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1380	if (row && row->c0 <= x && x < row->c1)	1952	if (row && row->c0 <= x && x < row->c1)
1381	{	1953	{
1382	mapcell *cell = row->col + (x - row->c0);	1954	mapcell *cell = row->col + (x - row->c0);
1383	uint8_t flags = 0;	1955	uint8_t flags = 0;
1384		1956
1385	if (cell->face [0]) flags |= 1;	1957	if (cell->tile [0]) flags |= 1;
1386	if (cell->face [1]) flags |= 2;	1958	if (cell->tile [1]) flags |= 2;
1387	if (cell->face [2]) flags |= 4;	1959	if (cell->tile [2]) flags |= 4;
1388		1960
1389	*data++ = flags;	1961	*data++ = flags;
1390		1962
1391	if (flags & 1)	1963	if (flags & 1)
1392	{	1964	{
		1965	tileid tile = cell->tile [0];
1393	*data++ = cell->face [0] >> 8;	1966	*data++ = tile >> 8;
1394	*data++ = cell->face [0];	1967	*data++ = tile;
1395	}	1968	}
1396		1969
1397	if (flags & 2)	1970	if (flags & 2)
1398	{	1971	{
		1972	tileid tile = cell->tile [1];
1399	*data++ = cell->face [1] >> 8;	1973	*data++ = tile >> 8;
1400	*data++ = cell->face [1];	1974	*data++ = tile;
1401	}	1975	}
1402		1976
1403	if (flags & 4)	1977	if (flags & 4)
1404	{	1978	{
		1979	tileid tile = cell->tile [2];
1405	*data++ = cell->face [2] >> 8;	1980	*data++ = tile >> 8;
1406	*data++ = cell->face [2];	1981	*data++ = tile;
1407	}	1982	}
1408	}	1983	}
1409	else	1984	else
1410	*data++ = 0;	1985	*data++ = 0;
1411	}	1986	}
…		…
1417	}	1992	}
1418	OUTPUT:	1993	OUTPUT:
1419	RETVAL	1994	RETVAL
1420		1995
1421	void	1996	void
1422	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1997	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423	PPCODE:	1998	PPCODE:
1424	{	1999	{
1425	int x, y, z;	2000	int x, y, z;
1426	int w, h;	2001	int w, h;
1427	int x1, y1;	2002	int x1, y1;
…		…
1451	{	2026	{
1452	uint8_t flags = *data++;	2027	uint8_t flags = *data++;
1453		2028
1454	if (flags)	2029	if (flags)
1455	{	2030	{
1456	mapface face[3] = { 0, 0, 0 };
1457
1458	mapcell *cell = row_get_cell (row, x);	2031	mapcell *cell = row_get_cell (row, x);
		2032	tileid tile[3] = { 0, 0, 0 };
1459		2033
1460	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2034	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1461	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2035	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1462	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2036	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1463		2037
1464	if (cell->darkness <= 0)	2038	if (cell->darkness == 0)
1465	{	2039	{
1466	cell->darkness = -1;	2040	cell->darkness = 0;
1467		2041
1468	for (z = 0; z <= 2; z++)	2042	for (z = 0; z <= 2; z++)
1469	{	2043	{
1470	cell->face[z] = face[z];	2044	tileid t = tile [z];
1471		2045
1472	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2046	if (t >= self->texs || (t && !self->tex [t].name))
		2047	{
1473	XPUSHs (sv_2mortal (newSViv (face[z])));	2048	XPUSHs (sv_2mortal (newSViv (t)));
		2049	need_texid (self, t);
		2050	}
		2051
		2052	cell->tile [z] = t;
1474	}	2053	}
1475	}	2054	}
1476	}	2055	}
1477	}	2056	}
1478	}	2057	}
1479	}	2058	}
1480		2059
1481	MODULE = CFClient PACKAGE = CFClient::MixChunk	2060	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482		2061
1483	CFClient::MixChunk	2062	CFPlus::MixChunk
1484	new_from_file (SV *class, char *path)	2063	new_from_file (SV *class, char *path)
1485	CODE:	2064	CODE:
1486	RETVAL = Mix_LoadWAV (path);	2065	RETVAL = Mix_LoadWAV (path);
1487	OUTPUT:	2066	OUTPUT:
1488	RETVAL	2067	RETVAL
1489		2068
1490	void	2069	void
1491	DESTROY (CFClient::MixChunk self)	2070	DESTROY (CFPlus::MixChunk self)
1492	CODE:	2071	CODE:
1493	Mix_FreeChunk (self);	2072	Mix_FreeChunk (self);
1494		2073
1495	int	2074	int
1496	volume (CFClient::MixChunk self, int volume = -1)	2075	volume (CFPlus::MixChunk self, int volume = -1)
1497	CODE:	2076	CODE:
1498	RETVAL = Mix_VolumeChunk (self, volume);	2077	RETVAL = Mix_VolumeChunk (self, volume);
1499	OUTPUT:	2078	OUTPUT:
1500	RETVAL	2079	RETVAL
1501		2080
1502	int	2081	int
1503	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2082	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1504	CODE:	2083	CODE:
1505	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2084	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506	OUTPUT:	2085	OUTPUT:
1507	RETVAL	2086	RETVAL
1508		2087
1509	MODULE = CFClient PACKAGE = CFClient::MixMusic	2088	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510		2089
1511	int	2090	int
1512	volume (int volume = -1)	2091	volume (int volume = -1)
1513	CODE:	2092	CODE:
1514	RETVAL = Mix_VolumeMusic (volume);	2093	RETVAL = Mix_VolumeMusic (volume);
1515	OUTPUT:	2094	OUTPUT:
1516	RETVAL	2095	RETVAL
1517		2096
1518	CFClient::MixMusic	2097	CFPlus::MixMusic
1519	new_from_file (SV *class, char *path)	2098	new_from_file (SV *class, char *path)
1520	CODE:	2099	CODE:
1521	RETVAL = Mix_LoadMUS (path);	2100	RETVAL = Mix_LoadMUS (path);
1522	OUTPUT:	2101	OUTPUT:
1523	RETVAL	2102	RETVAL
1524		2103
1525	void	2104	void
1526	DESTROY (CFClient::MixMusic self)	2105	DESTROY (CFPlus::MixMusic self)
1527	CODE:	2106	CODE:
1528	Mix_FreeMusic (self);	2107	Mix_FreeMusic (self);
1529		2108
1530	int	2109	int
1531	play (CFClient::MixMusic self, int loops = -1)	2110	play (CFPlus::MixMusic self, int loops = -1)
1532	CODE:	2111	CODE:
1533	RETVAL = Mix_PlayMusic (self, loops);	2112	RETVAL = Mix_PlayMusic (self, loops);
1534	OUTPUT:	2113	OUTPUT:
1535	RETVAL	2114	RETVAL
1536		2115
1537	MODULE = CFClient PACKAGE = CFClient::OpenGL	2116	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538		2117
1539	BOOT:	2118	BOOT:
1540	{	2119	{
1541	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2120	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542	static const struct {	2121	static const struct {
1543	const char *name;	2122	const char *name;
1544	IV iv;	2123	IV iv;
1545	} *civ, const_iv[] = {	2124	} *civ, const_iv[] = {
1546	# define const_iv(name) { # name, (IV)name }	2125	# define const_iv(name) { # name, (IV)name }
…		…
1553	const_iv (GL_SCISSOR_TEST),	2132	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	2133	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	2134	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	2135	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	2136	const_iv (GL_RESCALE_NORMAL),
		2137	const_iv (GL_FRONT),
		2138	const_iv (GL_BACK),
1558	const_iv (GL_AND),	2139	const_iv (GL_AND),
1559	const_iv (GL_ONE),	2140	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	2141	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	2142	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	2143	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2144	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	2145	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2146	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	2147	const_iv (GL_RGB),
1566	const_iv (GL_RGBA),	2148	const_iv (GL_RGBA),
		2149	const_iv (GL_RGBA4),
		2150	const_iv (GL_RGBA8),
		2151	const_iv (GL_RGB5_A1),
1567	const_iv (GL_UNSIGNED_BYTE),	2152	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	2153	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	2154	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	2155	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	2156	const_iv (GL_INTENSITY),
…		…
1603	const_iv (GL_SEPARABLE_2D),	2188	const_iv (GL_SEPARABLE_2D),
1604	const_iv (GL_CONVOLUTION_2D),	2189	const_iv (GL_CONVOLUTION_2D),
1605	const_iv (GL_CONVOLUTION_BORDER_MODE),	2190	const_iv (GL_CONVOLUTION_BORDER_MODE),
1606	const_iv (GL_CONSTANT_BORDER),	2191	const_iv (GL_CONSTANT_BORDER),
1607	const_iv (GL_LINES),	2192	const_iv (GL_LINES),
		2193	const_iv (GL_LINE_STRIP),
1608	const_iv (GL_LINE_LOOP),	2194	const_iv (GL_LINE_LOOP),
1609	const_iv (GL_QUADS),	2195	const_iv (GL_QUADS),
1610	const_iv (GL_QUAD_STRIP),	2196	const_iv (GL_QUAD_STRIP),
1611	const_iv (GL_TRIANGLES),	2197	const_iv (GL_TRIANGLES),
1612	const_iv (GL_TRIANGLE_STRIP),	2198	const_iv (GL_TRIANGLE_STRIP),
…		…
1645	OUTPUT:	2231	OUTPUT:
1646	RETVAL	2232	RETVAL
1647		2233
1648	int glGetError ()	2234	int glGetError ()
1649		2235
		2236	void glFinish ()
		2237
1650	void glClear (int mask)	2238	void glClear (int mask)
1651		2239
1652	void glClearColor (float r, float g, float b, float a = 1.0)	2240	void glClearColor (float r, float g, float b, float a = 1.0)
1653	PROTOTYPE: @	2241	PROTOTYPE: @
1654		2242
…		…
1677	void glPushMatrix ()	2265	void glPushMatrix ()
1678		2266
1679	void glPopMatrix ()	2267	void glPopMatrix ()
1680		2268
1681	void glLoadIdentity ()	2269	void glLoadIdentity ()
		2270
		2271	void glDrawBuffer (int buffer)
		2272
		2273	void glReadBuffer (int buffer)
1682		2274
1683	# near_ and far_ are due to microsofts buggy "c" compiler	2275	# near_ and far_ are due to microsofts buggy "c" compiler
1684	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2276	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685		2277
1686	# near_ and far_ are due to microsofts buggy "c" compiler	2278	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1716	r *= a;	2308	r *= a;
1717	g *= a;	2309	g *= a;
1718	b *= a;	2310	b *= a;
1719	}	2311	}
1720	// microsoft visual "c" rounds instead of truncating...	2312	// microsoft visual "c" rounds instead of truncating...
1721	glColor4ub (MIN ((int)(r * 256.f), 255),	2313	glColor4f (r, g, b, a);
1722	MIN ((int)(g * 256.f), 255),
1723	MIN ((int)(b * 256.f), 255),
1724	MIN ((int)(a * 256.f), 255));
1725		2314
1726	void glInterleavedArrays (int format, int stride, char *data)	2315	void glInterleavedArrays (int format, int stride, char *data)
1727		2316
1728	void glDrawElements (int mode, int count, int type, char *indices)	2317	void glDrawElements (int mode, int count, int type, char *indices)
1729		2318
…		…
1806		2395
1807	void glEndList ()	2396	void glEndList ()
1808		2397
1809	void glCallList (int list)	2398	void glCallList (int list)
1810		2399
1811

Diff Legend

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