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.179 by root, Wed Apr 11 04:32:51 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
		889	new (SV *class)
		890	CODE:
725	New (0, RETVAL, 1, struct cf_layout);	891	New (0, RETVAL, 1, struct cf_layout);
726		892
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	893	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	894	RETVAL->r = 1.;
730	RETVAL->g = 1.;	895	RETVAL->g = 1.;
731	RETVAL->b = 1.;	896	RETVAL->b = 1.;
732	RETVAL->a = 1.;	897	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	898	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
737	layout_update_font (RETVAL);	902	layout_update_font (RETVAL);
738	OUTPUT:	903	OUTPUT:
739	RETVAL	904	RETVAL
740		905
741	void	906	void
742	DESTROY (CFClient::Layout self)	907	DESTROY (CFPlus::Layout self)
743	CODE:	908	CODE:
744	g_object_unref (self->pl);	909	g_object_unref (self->pl);
745	Safefree (self);	910	Safefree (self);
746		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
747	int	1002	int
748	is_rgba (CFClient::Layout self)	1003	has_wrapped (CFPlus::Layout self)
749	CODE:	1004	CODE:
750	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	}
751	OUTPUT:	1014	OUTPUT:
752	RETVAL	1015	RETVAL
753		1016
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 *	1017	SV *
775	get_text (CFClient::Layout self)	1018	get_text (CFPlus::Layout self)
776	CODE:	1019	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1020	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	1021	sv_utf8_decode (RETVAL);
779	OUTPUT:	1022	OUTPUT:
780	RETVAL	1023	RETVAL
781		1024
782	void	1025	void
783	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.)
784	CODE:	1027	CODE:
785	self->r = r;	1028	self->r = r;
786	self->g = g;	1029	self->g = g;
787	self->b = b;	1030	self->b = b;
788	self->a = a;	1031	self->a = a;
789		1032
790	void	1033	void
791	set_font (CFClient::Layout self, CFClient::Font font = 0)	1034	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792	CODE:	1035	CODE:
793	if (self->font != font)	1036	if (self->font != font)
794	{	1037	{
795	self->font = font;	1038	self->font = font;
796	layout_update_font (self);	1039	layout_update_font (self);
797	}	1040	}
798		1041
799	void	1042	void
800	set_height (CFClient::Layout self, int base_height)	1043	set_height (CFPlus::Layout self, int base_height)
801	CODE:	1044	CODE:
802	if (self->base_height != base_height)	1045	if (self->base_height != base_height)
803	{	1046	{
804	self->base_height = base_height;	1047	self->base_height = base_height;
805	layout_update_font (self);	1048	layout_update_font (self);
806	}	1049	}
807		1050
808	void	1051	void
809	set_width (CFClient::Layout self, int max_width = -1)	1052	set_width (CFPlus::Layout self, int max_width = -1)
810	CODE:	1053	CODE:
811	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);
812		1055
813	void	1056	void
814	set_indent (CFClient::Layout self, int indent)	1057	set_indent (CFPlus::Layout self, int indent)
815	CODE:	1058	CODE:
816	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1059	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817		1060
818	void	1061	void
819	set_spacing (CFClient::Layout self, int spacing)	1062	set_spacing (CFPlus::Layout self, int spacing)
820	CODE:	1063	CODE:
821	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1064	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822		1065
823	void	1066	void
824	set_ellipsise (CFClient::Layout self, int ellipsise)	1067	set_ellipsise (CFPlus::Layout self, int ellipsise)
825	CODE:	1068	CODE:
826	pango_layout_set_ellipsize (self->pl,	1069	pango_layout_set_ellipsize (self->pl,
827	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1070	ellipsise == 1 ? PANGO_ELLIPSIZE_START
828	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1071	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1072	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
830	: PANGO_ELLIPSIZE_NONE	1073	: PANGO_ELLIPSIZE_NONE
831	);	1074	);
832		1075
833	void	1076	void
834	set_single_paragraph_mode (CFClient::Layout self, int spm)	1077	set_single_paragraph_mode (CFPlus::Layout self, int spm)
835	CODE:	1078	CODE:
836	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1079	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837		1080
838	void	1081	void
839	size (CFClient::Layout self)	1082	size (CFPlus::Layout self)
840	PPCODE:	1083	PPCODE:
841	{	1084	{
842	int w, h;	1085	int w, h;
843		1086
844	layout_get_pixel_size (self, &w, &h);	1087	layout_get_pixel_size (self, &w, &h);
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	1090	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	1091	PUSHs (sv_2mortal (newSViv (h)));
849	}	1092	}
850		1093
851	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
852	xy_to_index (CFClient::Layout self, int x, int y)	1107	xy_to_index (CFPlus::Layout self, int x, int y)
853	CODE:	1108	CODE:
854	{	1109	{
855	int index, trailing;	1110	int index, trailing;
856	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);
857	RETVAL = index;	1112	RETVAL = index + trailing;
858	}	1113	}
859	OUTPUT:	1114	OUTPUT:
860	RETVAL	1115	RETVAL
861		1116
862	void	1117	void
863	cursor_pos (CFClient::Layout self, int index)	1118	cursor_pos (CFPlus::Layout self, int index)
864	PPCODE:	1119	PPCODE:
865	{	1120	{
866	PangoRectangle strong_pos;	1121	PangoRectangle strong_pos;
867	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1122	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868		1123
…		…
871	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1126	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1127	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1128	}
874		1129
875	void	1130	void
876	render (CFClient::Layout self)	1131	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
877	PPCODE:	1132	PPCODE:
878	{	1133	{
879	SV *retval;	1134	int line, x;
880	int w, h;
881		1135
882	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 */
883		1138
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);	1139	EXTEND (SP, 2);
932	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)
933	PUSHs (sv_2mortal (newSViv (h)));	1161	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	1162	else
939	{	1163	{
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)));	1164	PUSHs (sv_2mortal (newSViv (index)));
959	PUSHs (sv_2mortal (newSViv (h)));	1165	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	}	1166	}
964	}	1167	}
965		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
966	MODULE = CFClient PACKAGE = CFClient::Texture	1179	MODULE = CFPlus PACKAGE = CFPlus::Texture
967		1180
968	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
969	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.)
970	PROTOTYPE: $$$;$$	1220	PROTOTYPE: $$$;$$
971	ALIAS:	1221	ALIAS:
972	draw_quad_alpha = 1	1222	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1223	draw_quad_alpha_premultiplied = 2
974	CODE:	1224	CODE:
…		…
990		1240
991	if (ix == 2)	1241	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1242	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1243	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1244	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1245	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1246
997	glEnable (GL_ALPHA_TEST);	1247	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1248	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1249	}
1000		1250
…		…
1012	glDisable (GL_ALPHA_TEST);	1262	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1263	glDisable (GL_BLEND);
1014	}	1264	}
1015	}	1265	}
1016		1266
1017	MODULE = CFClient PACKAGE = CFClient::Map	1267	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1268
1019	CFClient::Map	1269	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1270	new (SV *class)
1021	CODE:	1271	CODE:
1022	New (0, RETVAL, 1, struct map);	1272	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1273	RETVAL->x = 0;
1024	RETVAL->y = 0;	1274	RETVAL->y = 0;
1025	RETVAL->w = map_width;	1275	RETVAL->w = 0;
1026	RETVAL->h = map_height;	1276	RETVAL->h = 0;
1027	RETVAL->ox = 0;	1277	RETVAL->ox = 0;
1028	RETVAL->oy = 0;	1278	RETVAL->oy = 0;
1029	RETVAL->faces = 8192;	1279	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1030	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1280	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;	1281	RETVAL->rows = 0;
1034	RETVAL->row = 0;	1282	RETVAL->row = 0;
1035	OUTPUT:	1283	OUTPUT:
1036	RETVAL	1284	RETVAL
1037		1285
1038	void	1286	void
1039	DESTROY (CFClient::Map self)	1287	DESTROY (CFPlus::Map self)
1040	CODE:	1288	CODE:
1041	{	1289	{
1042	map_clear (self);	1290	map_clear (self);
1043	Safefree (self->face);	1291	Safefree (self->face2tile);
		1292	Safefree (self->tex);
1044	Safefree (self);	1293	Safefree (self);
1045	}	1294	}
1046		1295
1047	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
1048	clear (CFClient::Map self)	1303	clear (CFPlus::Map self)
1049	CODE:	1304	CODE:
1050	map_clear (self);	1305	map_clear (self);
1051		1306
1052	void	1307	void
1053	set_face (CFClient::Map self, int face, int texid)	1308	set_tileid (CFPlus::Map self, int face, int tile)
1054	CODE:	1309	CODE:
1055	{	1310	{
1056	while (self->faces <= face)	1311	need_facenum (self, face); self->face2tile [face] = tile;
1057	{	1312	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	}	1313	}
1064		1314
1065	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
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)	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)
1067	CODE:	1340	CODE:
1068	{	1341	{
1069	while (self->texs <= texid)	1342	need_texid (self, texid);
1070	{
1071	Append (maptex, self->tex, self->texs, self->texs);
1072	self->texs *= 2;
1073	}
1074		1343
1075	{	1344	{
1076	maptex *tex = self->tex + texid;	1345	maptex *tex = self->tex + texid;
1077		1346
1078	tex->name = name;	1347	tex->name = name;
…		…
1095	// from transparent color bleeding and ugly wrapping effects.	1364	// from transparent color bleeding and ugly wrapping effects.
1096	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1365	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097	}	1366	}
1098		1367
1099	int	1368	int
1100	ox (CFClient::Map self)	1369	ox (CFPlus::Map self)
1101	ALIAS:	1370	ALIAS:
1102	oy = 1	1371	oy = 1
1103	x = 2	1372	x = 2
1104	y = 3	1373	y = 3
1105	w = 4	1374	w = 4
…		…
1116	}	1385	}
1117	OUTPUT:	1386	OUTPUT:
1118	RETVAL	1387	RETVAL
1119		1388
1120	void	1389	void
1121	scroll (CFClient::Map self, int dx, int dy)	1390	scroll (CFPlus::Map self, int dx, int dy)
1122	CODE:	1391	CODE:
1123	{	1392	{
1124	if (dx > 0)	1393	if (dx > 0)
1125	map_blank (self, self->x, self->y, dx - 1, self->h);	1394	map_blank (self, self->x, self->y, dx, self->h);
1126	else if (dx < 0)	1395	else if (dx < 0)
1127	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);
1128		1397
1129	if (dy > 0)	1398	if (dy > 0)
1130	map_blank (self, self->x, self->y, self->w, dy - 1);	1399	map_blank (self, self->x, self->y, self->w, dy);
1131	else if (dy < 0)	1400	else if (dy < 0)
1132	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);
1133		1402
1134	self->ox += dx; self->x += dx;	1403	self->ox += dx; self->x += dx;
1135	self->oy += dy; self->y += dy;	1404	self->oy += dy; self->y += dy;
1136		1405
1137	while (self->y < 0)	1406	while (self->y < 0)
…		…
1142	self->y += MAP_EXTEND_Y;	1411	self->y += MAP_EXTEND_Y;
1143	}	1412	}
1144	}	1413	}
1145		1414
1146	void	1415	void
1147	map1a_update (CFClient::Map self, SV *data_)	1416	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1148	CODE:	1417	CODE:
1149	{	1418	{
1150	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1419	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1151	uint8_t *data_end = (uint8_t *)SvEND (data_);	1420	uint8_t *data_end = (uint8_t *)SvEND (data_);
1152	mapcell *cell;	1421	mapcell *cell;
1153	int x, y, flags;	1422	int x, y, flags;
1154		1423
1155	while (data < data_end)	1424	while (data < data_end - 1)
1156	{	1425	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1426	flags = (data [0] << 8) + data [1]; data += 2;
1158		1427
1159	x = ((flags >> 10) & 63) + self->x;	1428	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1429	y = self->y + ((flags >> 4) & 63);
1161		1430
1162	cell = map_get_cell (self, x, y);	1431	cell = map_get_cell (self, x, y);
1163		1432
1164	if (flags & 15)	1433	if (flags & 15)
1165	{	1434	{
1166	if (cell->darkness < 0)	1435	if (!cell->darkness)
1167	{	1436	{
		1437	memset (cell, 0, sizeof (*cell));
1168	cell->darkness = 0;	1438	cell->darkness = 256;
1169	cell->face [0] = 0;
1170	cell->face [1] = 0;
1171	cell->face [2] = 0;
1172	}	1439	}
1173		1440
1174	cell->darkness = flags & 8 ? *data++ : 255;
1175
1176	//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	}
1177		1482
1178	if (flags & 4)	1483	if (flags & 4)
1179	{	1484	{
1180	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];
1181	}	1488	}
1182		1489
1183	if (flags & 2)	1490	if (flags & 2)
1184	{	1491	{
1185	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];
1186	}	1495	}
1187		1496
1188	if (flags & 1)	1497	if (flags & 1)
1189	{	1498	{
1190	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];
1191	}	1502	}
1192	}	1503	}
1193	else	1504	else
1194	cell->darkness = -1;	1505	cell->darkness = 0;
1195	}	1506	}
1196	}	1507	}
1197		1508
1198	SV *	1509	SV *
1199	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)
1200	CODE:	1511	CODE:
1201	{	1512	{
1202	int x1, x;	1513	int x1, x;
1203	int y1, y;	1514	int y1, y;
1204	int z;	1515	int z;
…		…
1225	{	1536	{
1226	mapcell *cell = row->col + (x - row->c0);	1537	mapcell *cell = row->col + (x - row->c0);
1227		1538
1228	for (z = 0; z <= 0; z++)	1539	for (z = 0; z <= 0; z++)
1229	{	1540	{
1230	mapface face = cell->face [z];
1231
1232	if (face)
1233	{
1234	maptex tex = self->tex [face];	1541	maptex tex = self->tex [cell->tile [z]];
1235	int a0 = 255 - tex.a;	1542	int a0 = 255 - tex.a;
1236	int a1 = tex.a;	1543	int a1 = tex.a;
1237		1544
1238	r = (r * a0 + tex.r * a1) / 255;	1545	r = (r * a0 + tex.r * a1) / 255;
1239	g = (g * a0 + tex.g * a1) / 255;	1546	g = (g * a0 + tex.g * a1) / 255;
1240	b = (b * a0 + tex.b * a1) / 255;	1547	b = (b * a0 + tex.b * a1) / 255;
1241	a = (a * a0 + tex.a * a1) / 255;	1548	a = (a * a0 + tex.a * a1) / 255;
1242	}
1243	}	1549	}
1244	}	1550	}
1245		1551
1246	*map++ = (r )	1552	*map++ = (r )
1247	| (g << 8)	1553	| (g << 8)
…		…
1254	}	1560	}
1255	OUTPUT:	1561	OUTPUT:
1256	RETVAL	1562	RETVAL
1257		1563
1258	void	1564	void
1259	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)
1260	PPCODE:	1566	CODE:
1261	{	1567	{
1262	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;
1263	int x, y, z;	1572	int x, y, z;
1264	int last_name;	1573	int last_name;
1265	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	// full tile
		1687	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1688
		1689	// borders
		1690	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
		1691	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
		1692	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1693	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1694
		1695	// corners
		1696	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1697	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1698	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1699	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1700	}
		1701	}
		1702	}
		1703	}
		1704
		1705	// go through all smoothlevels, lowest to highest, then draw
		1706	// this is basically counting sort
		1707	{
		1708	int w, b;
		1709
		1710	for (w = 0; w < 256 / 32; ++w)
		1711	{
		1712	uint32_t smask = smooth_level [w];
		1713	if (smask)
		1714	for (b = 0; b < 32; ++b)
		1715	if (smask & (((uint32_t)1) << b))
		1716	{
		1717	int level = (w << 5) | b;
		1718	HE *he;
		1719
		1720	hv_iterinit (smooth);
		1721	while ((he = hv_iternext (smooth)))
		1722	{
		1723	smooth_key *skey = (smooth_key *)HeKEY (he);
		1724	IV bits = SvIVX (HeVAL (he));
		1725
		1726	// bits is ___n cccc CCCC bbbb
		1727	// n do not draw borders&corners
		1728	// c draw these corners, but...
		1729	// C ... not these
		1730	// b draw these borders
		1731
		1732	if (!(bits & 0x1000)
		1733	&& skey->level == level
		1734	&& level >= smooth_max [skey->x][skey->y])
		1735	{
		1736	maptex tex = self->tex [skey->tile];
		1737	int px = (((int)skey->x) - 1) * T;
		1738	int py = (((int)skey->y) - 1) * T;
		1739	int border = bits & 15;
		1740	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1741	float dx = tex.s * .0625f; // 16 images/row
		1742	float dy = tex.t * .5f ; // 2 images/column
		1743
		1744	// this time naively avoiding texture state changes
		1745	// save gobs of state changes.
		1746	if (last_name != tex.name)
		1747	{
		1748	if (!tex.name)
		1749	continue; // smoothing not yet available
		1750
		1751	glEnd ();
		1752	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1753	glBegin (GL_QUADS);
		1754	}
		1755
		1756	if (border)
		1757	{
		1758	float ox = border * dx;
		1759
		1760	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1761	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1762	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1763	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1764	}
		1765
		1766	if (corner)
		1767	{
		1768	float ox = corner * dx;
		1769
		1770	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1771	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1772	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1773	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1774	}
		1775	}
		1776	}
		1777	}
		1778	}
		1779	}
		1780
		1781	hv_clear (smooth);
		1782	}
		1783
		1784	glEnd ();
		1785
		1786	glDisable (GL_TEXTURE_2D);
		1787	glDisable (GL_BLEND);
		1788
		1789	// top layer: overlays such as the health bar
		1790	for (y = 0; y < sh; y++)
		1791	if (0 <= y + my && y + my < self->rows)
		1792	{
		1793	maprow *row = self->row + (y + my);
		1794
		1795	for (x = 0; x < sw; x++)
		1796	if (row->c0 <= x + mx && x + mx < row->c1)
		1797	{
		1798	mapcell *cell = row->col + (x + mx - row->c0);
		1799
		1800	int px = x * T;
		1801	int py = y * T;
		1802
		1803	if (cell->stat_hp)
		1804	{
		1805	int width = cell->stat_width * T;
		1806	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1807
		1808	glColor3ub (0, 0, 0);
		1809	glRectf (px + 1, py - thick - 2,
		1810	px + width - 1, py);
		1811
		1812	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1813	glRectf (px + 2,
		1814	py - thick - 1,
		1815	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1816	}
		1817	}
		1818	}
		1819	}
		1820
		1821	void
		1822	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1823	CODE:
		1824	{
		1825	static float color[16][3] = {
		1826	{ 0.00F, 0.00F, 0.00F },
		1827	{ 1.00F, 1.00F, 1.00F },
		1828	{ 0.00F, 0.00F, 0.55F },
		1829	{ 1.00F, 0.00F, 0.00F },
		1830
		1831	{ 1.00F, 0.54F, 0.00F },
		1832	{ 0.11F, 0.56F, 1.00F },
		1833	{ 0.93F, 0.46F, 0.00F },
		1834	{ 0.18F, 0.54F, 0.34F },
		1835
		1836	{ 0.56F, 0.73F, 0.56F },
		1837	{ 0.80F, 0.80F, 0.80F },
		1838	{ 0.55F, 0.41F, 0.13F },
		1839	{ 0.99F, 0.77F, 0.26F },
		1840
		1841	{ 0.74F, 0.65F, 0.41F },
		1842
		1843	{ 0.00F, 1.00F, 1.00F },
		1844	{ 1.00F, 0.00F, 1.00F },
		1845	{ 1.00F, 1.00F, 0.00F },
		1846	};
		1847
		1848	int x, y;
		1849
		1850	glEnable (GL_TEXTURE_2D);
		1851	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1852	glEnable (GL_BLEND);
		1853	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1854	glBegin (GL_QUADS);
		1855
		1856	for (y = 0; y < h; y++)
		1857	for (x = 0; x < w; x++)
		1858	{
		1859	unsigned char m = data [x + y * w];
		1860
		1861	if (m)
		1862	{
		1863	float *c = color [m & 15];
		1864
		1865	float tx1 = m & 0x40 ? 0.5 : 0.;
		1866	float tx2 = tx1 + 0.5;
		1867
		1868	glColor4f (c[0], c[1], c[2], 0.75);
		1869	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1870	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1871	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1872	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1873	}
		1874	}
		1875
		1876	glEnd ();
		1877	glDisable (GL_BLEND);
		1878	glDisable (GL_TEXTURE_2D);
		1879	}
		1880
		1881	void
		1882	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1883	PPCODE:
		1884	{
		1885	int x, y;
1266	int sw4 = (sw + 3) & ~3;	1886	int sw4 = (sw + 3) & ~3;
1267	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1887	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1268	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1888	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1269		1889
1270	memset (darkness, 255, sw4 * sh);	1890	memset (darkness, 255, sw4 * sh);
1271	SvPOK_only (darkness_sv);	1891	SvPOK_only (darkness_sv);
1272	SvCUR_set (darkness_sv, sw4 * sh);	1892	SvCUR_set (darkness_sv, sw4 * sh);
1273		1893
1274	vx = self->x + (self->w - sw) / 2 - shift_x;	1894	mx += self->x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1895	my += self->y;
1276		1896
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++)	1897	for (y = 0; y < sh; y++)
1300	if (0 <= y + vy && y + vy < self->rows)	1898	if (0 <= y + my && y + my < self->rows)
1301	{	1899	{
1302	maprow *row = self->row + (y + vy);	1900	maprow *row = self->row + (y + my);
1303		1901
1304	for (x = 0; x < sw; x++)	1902	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1903	if (row->c0 <= x + mx && x + mx < row->c1)
1306	{	1904	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1905	mapcell *cell = row->col + (x + mx - row->c0);
1308		1906
1309	darkness[y * sw4 + x] = cell->darkness < 0	1907	darkness[y * sw4 + x] = cell->darkness
		1908	? 255 - (cell->darkness - 1)
1310	? 255 - FOW_DARKNESS	1909	: 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	}	1910	}
1336	}	1911	}
1337
1338	glEnd ();
1339
1340	glDisable (GL_TEXTURE_2D);
1341	glDisable (GL_BLEND);
1342		1912
1343	EXTEND (SP, 3);	1913	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1914	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1915	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1916	PUSHs (darkness_sv);
1347	}	1917	}
1348		1918
1349	SV *	1919	SV *
1350	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1920	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1351	CODE:	1921	CODE:
1352	{	1922	{
1353	int x, y, x1, y1;	1923	int x, y, x1, y1;
1354	SV *data_sv = newSV (w * h * 7 + 5);	1924	SV *data_sv = newSV (w * h * 7 + 5);
1355	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1925	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1380	if (row && row->c0 <= x && x < row->c1)	1950	if (row && row->c0 <= x && x < row->c1)
1381	{	1951	{
1382	mapcell *cell = row->col + (x - row->c0);	1952	mapcell *cell = row->col + (x - row->c0);
1383	uint8_t flags = 0;	1953	uint8_t flags = 0;
1384		1954
1385	if (cell->face [0]) flags |= 1;	1955	if (cell->tile [0]) flags |= 1;
1386	if (cell->face [1]) flags |= 2;	1956	if (cell->tile [1]) flags |= 2;
1387	if (cell->face [2]) flags |= 4;	1957	if (cell->tile [2]) flags |= 4;
1388		1958
1389	*data++ = flags;	1959	*data++ = flags;
1390		1960
1391	if (flags & 1)	1961	if (flags & 1)
1392	{	1962	{
		1963	tileid tile = cell->tile [0];
1393	*data++ = cell->face [0] >> 8;	1964	*data++ = tile >> 8;
1394	*data++ = cell->face [0];	1965	*data++ = tile;
1395	}	1966	}
1396		1967
1397	if (flags & 2)	1968	if (flags & 2)
1398	{	1969	{
		1970	tileid tile = cell->tile [1];
1399	*data++ = cell->face [1] >> 8;	1971	*data++ = tile >> 8;
1400	*data++ = cell->face [1];	1972	*data++ = tile;
1401	}	1973	}
1402		1974
1403	if (flags & 4)	1975	if (flags & 4)
1404	{	1976	{
		1977	tileid tile = cell->tile [2];
1405	*data++ = cell->face [2] >> 8;	1978	*data++ = tile >> 8;
1406	*data++ = cell->face [2];	1979	*data++ = tile;
1407	}	1980	}
1408	}	1981	}
1409	else	1982	else
1410	*data++ = 0;	1983	*data++ = 0;
1411	}	1984	}
…		…
1417	}	1990	}
1418	OUTPUT:	1991	OUTPUT:
1419	RETVAL	1992	RETVAL
1420		1993
1421	void	1994	void
1422	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1995	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423	PPCODE:	1996	PPCODE:
1424	{	1997	{
1425	int x, y, z;	1998	int x, y, z;
1426	int w, h;	1999	int w, h;
1427	int x1, y1;	2000	int x1, y1;
…		…
1451	{	2024	{
1452	uint8_t flags = *data++;	2025	uint8_t flags = *data++;
1453		2026
1454	if (flags)	2027	if (flags)
1455	{	2028	{
1456	mapface face[3] = { 0, 0, 0 };
1457
1458	mapcell *cell = row_get_cell (row, x);	2029	mapcell *cell = row_get_cell (row, x);
		2030	tileid tile[3] = { 0, 0, 0 };
1459		2031
1460	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2032	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1461	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2033	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1462	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2034	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1463		2035
1464	if (cell->darkness <= 0)	2036	if (cell->darkness == 0)
1465	{	2037	{
1466	cell->darkness = -1;	2038	cell->darkness = 0;
1467		2039
1468	for (z = 0; z <= 2; z++)	2040	for (z = 0; z <= 2; z++)
1469	{	2041	{
1470	cell->face[z] = face[z];	2042	tileid t = tile [z];
1471		2043
1472	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2044	if (t >= self->texs || (t && !self->tex [t].name))
		2045	{
1473	XPUSHs (sv_2mortal (newSViv (face[z])));	2046	XPUSHs (sv_2mortal (newSViv (t)));
		2047	need_texid (self, t);
		2048	}
		2049
		2050	cell->tile [z] = t;
1474	}	2051	}
1475	}	2052	}
1476	}	2053	}
1477	}	2054	}
1478	}	2055	}
1479	}	2056	}
1480		2057
1481	MODULE = CFClient PACKAGE = CFClient::MixChunk	2058	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482		2059
1483	CFClient::MixChunk	2060	CFPlus::MixChunk
1484	new_from_file (SV *class, char *path)	2061	new_from_file (SV *class, char *path)
1485	CODE:	2062	CODE:
1486	RETVAL = Mix_LoadWAV (path);	2063	RETVAL = Mix_LoadWAV (path);
1487	OUTPUT:	2064	OUTPUT:
1488	RETVAL	2065	RETVAL
1489		2066
1490	void	2067	void
1491	DESTROY (CFClient::MixChunk self)	2068	DESTROY (CFPlus::MixChunk self)
1492	CODE:	2069	CODE:
1493	Mix_FreeChunk (self);	2070	Mix_FreeChunk (self);
1494		2071
1495	int	2072	int
1496	volume (CFClient::MixChunk self, int volume = -1)	2073	volume (CFPlus::MixChunk self, int volume = -1)
1497	CODE:	2074	CODE:
1498	RETVAL = Mix_VolumeChunk (self, volume);	2075	RETVAL = Mix_VolumeChunk (self, volume);
1499	OUTPUT:	2076	OUTPUT:
1500	RETVAL	2077	RETVAL
1501		2078
1502	int	2079	int
1503	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2080	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1504	CODE:	2081	CODE:
1505	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2082	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506	OUTPUT:	2083	OUTPUT:
1507	RETVAL	2084	RETVAL
1508		2085
1509	MODULE = CFClient PACKAGE = CFClient::MixMusic	2086	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510		2087
1511	int	2088	int
1512	volume (int volume = -1)	2089	volume (int volume = -1)
1513	CODE:	2090	CODE:
1514	RETVAL = Mix_VolumeMusic (volume);	2091	RETVAL = Mix_VolumeMusic (volume);
1515	OUTPUT:	2092	OUTPUT:
1516	RETVAL	2093	RETVAL
1517		2094
1518	CFClient::MixMusic	2095	CFPlus::MixMusic
1519	new_from_file (SV *class, char *path)	2096	new_from_file (SV *class, char *path)
1520	CODE:	2097	CODE:
1521	RETVAL = Mix_LoadMUS (path);	2098	RETVAL = Mix_LoadMUS (path);
1522	OUTPUT:	2099	OUTPUT:
1523	RETVAL	2100	RETVAL
1524		2101
1525	void	2102	void
1526	DESTROY (CFClient::MixMusic self)	2103	DESTROY (CFPlus::MixMusic self)
1527	CODE:	2104	CODE:
1528	Mix_FreeMusic (self);	2105	Mix_FreeMusic (self);
1529		2106
1530	int	2107	int
1531	play (CFClient::MixMusic self, int loops = -1)	2108	play (CFPlus::MixMusic self, int loops = -1)
1532	CODE:	2109	CODE:
1533	RETVAL = Mix_PlayMusic (self, loops);	2110	RETVAL = Mix_PlayMusic (self, loops);
1534	OUTPUT:	2111	OUTPUT:
1535	RETVAL	2112	RETVAL
1536		2113
1537	MODULE = CFClient PACKAGE = CFClient::OpenGL	2114	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538		2115
1539	BOOT:	2116	BOOT:
1540	{	2117	{
1541	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2118	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542	static const struct {	2119	static const struct {
1543	const char *name;	2120	const char *name;
1544	IV iv;	2121	IV iv;
1545	} *civ, const_iv[] = {	2122	} *civ, const_iv[] = {
1546	# define const_iv(name) { # name, (IV)name }	2123	# define const_iv(name) { # name, (IV)name }
…		…
1553	const_iv (GL_SCISSOR_TEST),	2130	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	2131	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	2132	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	2133	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	2134	const_iv (GL_RESCALE_NORMAL),
		2135	const_iv (GL_FRONT),
		2136	const_iv (GL_BACK),
1558	const_iv (GL_AND),	2137	const_iv (GL_AND),
1559	const_iv (GL_ONE),	2138	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	2139	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	2140	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	2141	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2142	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	2143	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2144	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	2145	const_iv (GL_RGB),
1566	const_iv (GL_RGBA),	2146	const_iv (GL_RGBA),
		2147	const_iv (GL_RGBA4),
		2148	const_iv (GL_RGBA8),
		2149	const_iv (GL_RGB5_A1),
1567	const_iv (GL_UNSIGNED_BYTE),	2150	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	2151	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	2152	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	2153	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	2154	const_iv (GL_INTENSITY),
…		…
1603	const_iv (GL_SEPARABLE_2D),	2186	const_iv (GL_SEPARABLE_2D),
1604	const_iv (GL_CONVOLUTION_2D),	2187	const_iv (GL_CONVOLUTION_2D),
1605	const_iv (GL_CONVOLUTION_BORDER_MODE),	2188	const_iv (GL_CONVOLUTION_BORDER_MODE),
1606	const_iv (GL_CONSTANT_BORDER),	2189	const_iv (GL_CONSTANT_BORDER),
1607	const_iv (GL_LINES),	2190	const_iv (GL_LINES),
		2191	const_iv (GL_LINE_STRIP),
1608	const_iv (GL_LINE_LOOP),	2192	const_iv (GL_LINE_LOOP),
1609	const_iv (GL_QUADS),	2193	const_iv (GL_QUADS),
1610	const_iv (GL_QUAD_STRIP),	2194	const_iv (GL_QUAD_STRIP),
1611	const_iv (GL_TRIANGLES),	2195	const_iv (GL_TRIANGLES),
1612	const_iv (GL_TRIANGLE_STRIP),	2196	const_iv (GL_TRIANGLE_STRIP),
…		…
1645	OUTPUT:	2229	OUTPUT:
1646	RETVAL	2230	RETVAL
1647		2231
1648	int glGetError ()	2232	int glGetError ()
1649		2233
		2234	void glFinish ()
		2235
1650	void glClear (int mask)	2236	void glClear (int mask)
1651		2237
1652	void glClearColor (float r, float g, float b, float a = 1.0)	2238	void glClearColor (float r, float g, float b, float a = 1.0)
1653	PROTOTYPE: @	2239	PROTOTYPE: @
1654		2240
…		…
1677	void glPushMatrix ()	2263	void glPushMatrix ()
1678		2264
1679	void glPopMatrix ()	2265	void glPopMatrix ()
1680		2266
1681	void glLoadIdentity ()	2267	void glLoadIdentity ()
		2268
		2269	void glDrawBuffer (int buffer)
		2270
		2271	void glReadBuffer (int buffer)
1682		2272
1683	# near_ and far_ are due to microsofts buggy "c" compiler	2273	# 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_)	2274	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685		2275
1686	# near_ and far_ are due to microsofts buggy "c" compiler	2276	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1716	r *= a;	2306	r *= a;
1717	g *= a;	2307	g *= a;
1718	b *= a;	2308	b *= a;
1719	}	2309	}
1720	// microsoft visual "c" rounds instead of truncating...	2310	// microsoft visual "c" rounds instead of truncating...
1721	glColor4ub (MIN ((int)(r * 256.f), 255),	2311	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		2312
1726	void glInterleavedArrays (int format, int stride, char *data)	2313	void glInterleavedArrays (int format, int stride, char *data)
1727		2314
1728	void glDrawElements (int mode, int count, int type, char *indices)	2315	void glDrawElements (int mode, int count, int type, char *indices)
1729		2316
…		…
1806		2393
1807	void glEndList ()	2394	void glEndList ()
1808		2395
1809	void glCallList (int list)	2396	void glCallList (int list)
1810		2397
1811

Diff Legend

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